Mercurial > pidgin.yaz

--- a/ChangeLog	Sun Jul 19 08:09:24 2009 +0000
+++ b/ChangeLog	Sun Jul 19 08:17:45 2009 +0000
@@ -20,10 +20,16 @@
 	  PURPLE_GNUTLS_DEBUG environment variable, which is an integer between
 	  0 and 9 (higher is more verbose). Higher values may reveal sensitive
 	  information.
-	* PURPLE_VERBOSE_DEBUG environment variable.  Currently this is an "on" or
+	* PURPLE_VERBOSE_DEBUG environment variable.  Currently, this is an "on" or
 	  "off" variable.  Set it to any value to turn it on and unset it to turn
 	  it off.  This will optionally be used to only show less useful debug
 	  information on an as-needed basis.
+	* PURPLE_LEAKCHECK_HELP environment variable.  Currently, this is an "on"
+	  or "off" variable.  Set it to any value to turn it on and unset it to
+	  turn it off.  This will be used to perform various actions that are
+	  useful when running libpurple inside of Valgrind or similar programs.
+	  Currently, it keeps plugins in memory, allowing Valgrind to perform
+	  symbol resolution of leak traces at shutdown.
 	* Add support for receiving handwritten (ink) messages on MSN.
 	* Don't do IPv6 address lookups if the computer does not have an IPv6
 	  address configured.
@@ -105,6 +111,10 @@
 	  markup if they support it.
 	* Removed support for obsoleted XEP-0022 (Message Events) and XEP-0091
 	  (Legacy Entity Time).
+	* When the GNU IDN library (libidn) is available, it is used for
+	  normalization of Jabber IDs and support for internationalized domain
+	  names (IDNA).  When unavailable, internal routines are used (as in
+	  previous versions) for normalization and IDNA is unavailable.

 	Yahoo!/Yahoo! JAPAN:
 	* P2P file transfers.  (Sulabh Mahajan)
@@ -153,6 +163,8 @@
 	  (Kosta Arvanitis)
 	* When file transfers are complete, the received file name written to the
 	  conversation window is now linked to the file.
+	* Fix a crash when closing a conversation tab that has unread messages
+	  when the Message Notification plugin is loaded.

 	Finch:
 	* The hardware cursor is updated correctly. This will be useful
--- a/configure.ac	Sun Jul 19 08:09:24 2009 +0000
+++ b/configure.ac	Sun Jul 19 08:17:45 2009 +0000
@@ -604,7 +604,7 @@
 ])
 			fi])
 	fi
-
+

 else # GTK
 	enable_cap=no
@@ -808,6 +808,25 @@
 	fi
 fi

+AC_ARG_ENABLE(idn,
+	[AC_HELP_STRING([--disable-idn], [compile without IDN support])],
+	[enable_idn="$enableval" force_idn=$enableval], [enable_idn="yes" force_idn=no])
+if test "x$enable_idn" != "xno"; then
+	PKG_CHECK_MODULES(IDN, libidn >= 0.0.0, [
+		AC_DEFINE(USE_IDN, 1, [Use GNU Libidn for stringprep and IDN])
+		AC_SUBST(IDN_CFLAGS)
+		AC_SUBST(IDN_LIBS)
+	], [
+		AC_MSG_RESULT(no)
+		if test "x$force_deps" = "xyes" ; then
+			AC_MSG_ERROR([
+GNU Libidn development headers not found.
+Use --disable-idn if you do not need it.
+])
+		fi
+	])
+fi
+
 dnl #######################################################################
 dnl # Check for Meanwhile headers (for Sametime)
 dnl #######################################################################
@@ -1984,7 +2003,7 @@

 				if test "x$ac_cv_moz_nss_libs" = "xno"; then
 					nsslibs="-lssl3 -lsmime3 -lnss3 -lsoftokn3"
-					LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs"
+					LDFLAGS="$LDFLAGS -L$with_nspr_libs -L$with_nss_libs"
 					LIBS="$LIBS $nsslibs"
 					AC_TRY_LINK_FUNC(NSS_Init,
 						[ac_cv_moz_nss_libs="yes"],
@@ -2026,7 +2045,7 @@
 	AC_SUBST(NSS_CFLAGS)
 	AC_SUBST(NSS_LIBS)
 fi
-
+
 if test "x$enable_nss" = "xyes"; then
 	AC_MSG_CHECKING(for NSS_SetAlgorithmPolicy)
 	LIBS_save="$LIBS"
@@ -2546,6 +2565,7 @@
 if test "x$enable_dbus" = "xyes" ; then
 	eval eval echo D-Bus services directory...... : $DBUS_SERVICES_DIR
 fi
+echo Build with GNU Libidn......... : $enable_idn
 echo Build with NetworkManager..... : $enable_nm
 echo SSL Library/Libraries......... : $msg_ssl
 if test "x$SSL_CERTIFICATES_DIR" != "x" ; then
--- a/libpurple/blist.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/blist.c	Sun Jul 19 08:17:45 2009 +0000
@@ -92,13 +92,15 @@
 /* This function must not use purple_normalize */
 static guint _purple_blist_hbuddy_hash(struct _purple_hbuddy *hb)
 {
-	return g_str_hash(hb->name);
+	return g_str_hash(hb->name) ^ g_direct_hash(hb->group) ^ g_direct_hash(hb->account);
 }

 /* This function must not use purple_normalize */
 static guint _purple_blist_hbuddy_equal(struct _purple_hbuddy *hb1, struct _purple_hbuddy *hb2)
 {
-	return (purple_strequal(hb1->name, hb2->name) && hb1->account == hb2->account && hb1->group == hb2->group);
+	return (hb1->group == hb2->group &&
+	        hb1->account == hb2->account &&
+	        g_str_equal(hb1->name, hb2->name));
 }

 static void _purple_blist_hbuddy_free_key(struct _purple_hbuddy *hb)
@@ -948,15 +950,14 @@
 	g_return_if_fail(buddy != NULL);

 	hb = g_new(struct _purple_hbuddy, 1);
-	hb->name = g_strdup(purple_normalize(buddy->account, buddy->name));
+	hb->name = (gchar *)purple_normalize(buddy->account, buddy->name);
 	hb->account = buddy->account;
 	hb->group = ((PurpleBlistNode *)buddy)->parent->parent;
 	g_hash_table_remove(purplebuddylist->buddies, hb);
-
+
 	account_buddies = g_hash_table_lookup(buddies_cache, buddy->account);
 	g_hash_table_remove(account_buddies, hb);

-	g_free(hb->name);
 	hb->name = g_strdup(purple_normalize(buddy->account, name));
 	g_hash_table_replace(purplebuddylist->buddies, hb, buddy);

@@ -1603,17 +1604,14 @@
 		purple_blist_schedule_save();

 		if (bnode->parent->parent != (PurpleBlistNode*)g) {
-			hb = g_new(struct _purple_hbuddy, 1);
-			hb->name = g_strdup(purple_normalize(buddy->account, buddy->name));
-			hb->account = buddy->account;
-			hb->group = bnode->parent->parent;
-			g_hash_table_remove(purplebuddylist->buddies, hb);
+			struct _purple_hbuddy hb;
+			hb.name = (gchar *)purple_normalize(buddy->account, buddy->name);
+			hb.account = buddy->account;
+			hb.group = bnode->parent->parent;
+			g_hash_table_remove(purplebuddylist->buddies, &hb);

 			account_buddies = g_hash_table_lookup(buddies_cache, buddy->account);
-			g_hash_table_remove(account_buddies, hb);
-
-			g_free(hb->name);
-			g_free(hb);
+			g_hash_table_remove(account_buddies, &hb);
 		}

 		if (!bnode->parent->child) {
@@ -1831,7 +1829,7 @@
 				GHashTable *account_buddies;

 				struct _purple_hbuddy *hb, *hb2;
-
+
 				hb = g_new(struct _purple_hbuddy, 1);
 				hb->name = g_strdup(purple_normalize(b->account, b->name));
 				hb->account = b->account;
@@ -1973,6 +1971,9 @@

 	if (!purplebuddylist->root) {
 		purplebuddylist->root = gnode;
+
+		key = g_utf8_collate_key(group->name, -1);
+		g_hash_table_insert(groups_cache, key, group);
 		return;
 	}

@@ -1992,6 +1993,9 @@
 			gnode->prev->next = gnode->next;
 		if (gnode->next)
 			gnode->next->prev = gnode->prev;
+	} else {
+		key = g_utf8_collate_key(group->name, -1);
+		g_hash_table_insert(groups_cache, key, group);
 	}

 	if (node && PURPLE_BLIST_NODE_IS_GROUP(node)) {
@@ -2008,9 +2012,6 @@
 		purplebuddylist->root = gnode;
 	}

-	key = g_utf8_collate_key(group->name, -1);
-	g_hash_table_insert(groups_cache, key, group);
-
 	purple_blist_schedule_save();

 	if (ops && ops->update) {
@@ -2121,7 +2122,7 @@
 	purple_blist_schedule_save();

 	/* Remove this buddy from the buddies hash table */
-	hb.name = g_strdup(purple_normalize(buddy->account, buddy->name));
+	hb.name = (gchar *)purple_normalize(buddy->account, buddy->name);
 	hb.account = buddy->account;
 	hb.group = gnode;
 	g_hash_table_remove(purplebuddylist->buddies, &hb);
@@ -2129,8 +2130,6 @@
 	account_buddies = g_hash_table_lookup(buddies_cache, buddy->account);
 	g_hash_table_remove(account_buddies, &hb);

-	g_free(hb.name);
-
 	/* Update the UI */
 	if (ops && ops->remove)
 		ops->remove(purplebuddylist, node);
@@ -2397,20 +2396,16 @@
 		PurpleGroup *group)
 {
 	struct _purple_hbuddy hb;
-	PurpleBuddy *ret;

 	g_return_val_if_fail(purplebuddylist != NULL, NULL);
 	g_return_val_if_fail(account != NULL, NULL);
 	g_return_val_if_fail((name != NULL) && (*name != '\0'), NULL);

-	hb.name = g_strdup(purple_normalize(account, name));
+	hb.name = (gchar *)purple_normalize(account, name);
 	hb.account = account;
 	hb.group = (PurpleBlistNode*)group;

-	ret = g_hash_table_lookup(purplebuddylist->buddies, &hb);
-	g_free(hb.name);
-
-	return ret;
+	return g_hash_table_lookup(purplebuddylist->buddies, &hb);
 }

 static void find_acct_buddies(gpointer key, gpointer value, gpointer data)
@@ -2433,7 +2428,7 @@
 	if ((name != NULL) && (*name != '\0')) {
 		struct _purple_hbuddy hb;

-		hb.name = g_strdup(purple_normalize(account, name));
+		hb.name = (gchar *)purple_normalize(account, name);
 		hb.account = account;

 		for (node = purplebuddylist->root; node != NULL; node = node->next) {
@@ -2441,7 +2436,6 @@
 			if ((buddy = g_hash_table_lookup(purplebuddylist->buddies, &hb)) != NULL)
 				ret = g_slist_prepend(ret, buddy);
 		}
-		g_free(hb.name);
 	} else {
 		GSList *list = NULL;
 		GHashTable *buddies = g_hash_table_lookup(buddies_cache, account);
--- a/libpurple/plugin.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/plugin.c	Sun Jul 19 08:17:45 2009 +0000
@@ -870,8 +870,16 @@
 		if (plugin->info != NULL && plugin->info->destroy != NULL)
 			plugin->info->destroy(plugin);

-		if (plugin->handle != NULL)
-			g_module_close(plugin->handle);
+		/*
+		 * I find it extremely useful to do this when using valgrind, as
+		 * it keeps all the plugins open, meaning that valgrind is able to
+		 * resolve symbol names in leak traces from plugins.
+		 */
+		if (!g_getenv("PURPLE_LEAKCHECK_HELP"))
+		{
+			if (plugin->handle != NULL)
+				g_module_close(plugin->handle);
+		}
 	}
 	else
 	{
--- a/libpurple/protocols/jabber/Makefile.am	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/jabber/Makefile.am	Sun Jul 19 08:17:45 2009 +0000
@@ -88,7 +88,7 @@
 st =
 pkg_LTLIBRARIES      = libjabber.la libxmpp.la
 libjabber_la_SOURCES = $(JABBERSOURCES)
-libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS)
+libjabber_la_LIBADD  = $(GLIB_LIBS) $(SASL_LIBS) $(LIBXML_LIBS) $(IDN_LIBS)

 libxmpp_la_SOURCES = libxmpp.c
 libxmpp_la_LIBADD = libjabber.la
@@ -100,4 +100,5 @@
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS) \
+	$(IDN_CFLAGS) \
 	$(LIBXML_CFLAGS)
--- a/libpurple/protocols/jabber/buddy.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sun Jul 19 08:17:45 2009 +0000
@@ -702,7 +702,7 @@
 		const char *status_name = jabber_buddy_state_get_name(jbr->state);

 		if (jbr->status) {
-			purdy = purple_strreplace(jbr->status, "\n", "<br />\n");
+			purdy = purple_strdup_withhtml(jbr->status);

 			if (purple_strequal(status_name, purdy))
 				status_name = NULL;
--- a/libpurple/protocols/jabber/jabber.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sun Jul 19 08:17:45 2009 +0000
@@ -657,8 +657,11 @@
 			purple_debug_error("jabber", "Unable to connect to server: %s.  Trying next SRV record.\n", error);
 			try_srv_connect(js);
 		} else {
+			char *ascii_domain = jabber_try_idna_to_ascii(js->user->domain);
 			purple_debug_info("jabber","Couldn't connect directly to %s. Trying to find alternative connection methods, like BOSH.\n", js->user->domain);
-			js->srv_query_data = purple_txt_resolve("_xmppconnect", js->user->domain, txt_resolved_cb, js);
+			js->srv_query_data = purple_txt_resolve("_xmppconnect",
+					ascii_domain, txt_resolved_cb, js);
+			g_free(ascii_domain);
 		}
 		return;
 	}
@@ -701,20 +704,23 @@
 }

 static gboolean jabber_login_connect(JabberStream *js, const char *domain, const char *host, int port,
-				 gboolean fatal_failure)
+				 gboolean fatal_failure, gboolean use_domain)
 {
 	/* host should be used in preference to domain to
 	 * allow SASL authentication to work with FQDN of the server,
 	 * but we use domain as fallback for when users enter IP address
-	 * in connect server */
+	 * in connect server.
+	 * We also want to use the domain if the hostname is the result of the
+	 * IDNA ToASCII operation.
+	 */
 	g_free(js->serverFQDN);
-	if (purple_ip_address_is_valid(host))
+	if (use_domain || purple_ip_address_is_valid(host))
 		js->serverFQDN = g_strdup(domain);
 	else
 		js->serverFQDN = g_strdup(host);

-	if (purple_proxy_connect(js->gc, js->gc->account, host,
-			port, jabber_login_callback, js->gc) == NULL) {
+	if (purple_proxy_connect(js->gc, purple_connection_get_account(js->gc),
+			host, port, jabber_login_callback, js->gc) == NULL) {
 		if (fatal_failure) {
 			purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
@@ -729,18 +735,23 @@

 static void try_srv_connect(JabberStream *js)
 {
+	char *ascii_domain;
+
 	while (js->srv_rec != NULL && js->srv_rec_idx < js->max_srv_rec_idx) {
 		PurpleSrvResponse *tmp_resp = js->srv_rec + (js->srv_rec_idx++);
-		if (jabber_login_connect(js, tmp_resp->hostname, tmp_resp->hostname, tmp_resp->port, FALSE))
+		if (jabber_login_connect(js, tmp_resp->hostname, tmp_resp->hostname, tmp_resp->port, FALSE, FALSE))
 			return;
 	}

 	g_free(js->srv_rec);
 	js->srv_rec = NULL;

+	ascii_domain = jabber_try_idna_to_ascii(js->user->domain);
 	/* Fall back to the defaults (I'm not sure if we should actually do this) */
-	jabber_login_connect(js, js->user->domain, js->user->domain,
-		purple_account_get_int(js->gc->account, "port", 5222), TRUE);
+	jabber_login_connect(js, js->user->domain, ascii_domain,
+			purple_account_get_int(purple_connection_get_account(js->gc), "port", 5222),
+			TRUE, TRUE);
+	g_free(ascii_domain);
 }

 static void srv_resolved_cb(PurpleSrvResponse *resp, int results, gpointer data)
@@ -754,36 +765,71 @@
 		js->max_srv_rec_idx = results;
 		try_srv_connect(js);
 	} else {
-		jabber_login_connect(js, js->user->domain, js->user->domain,
-			purple_account_get_int(js->gc->account, "port", 5222), TRUE);
+		char *ascii_domain = jabber_try_idna_to_ascii(js->user->domain);
+		jabber_login_connect(js, js->user->domain, ascii_domain,
+				purple_account_get_int(purple_connection_get_account(js->gc), "port", 5222),
+				TRUE, TRUE);
+		g_free(ascii_domain);
 	}
 }

-void
-jabber_login(PurpleAccount *account)
+static JabberStream *
+jabber_stream_new(PurpleAccount *account)
 {
 	PurpleConnection *gc = purple_account_get_connection(account);
-	const char *connect_server = purple_account_get_string(account,
-			"connect_server", "");
-	const char *bosh_url = purple_account_get_string(account,
-			"bosh_url", "");
 	JabberStream *js;
+	JabberBuddy *my_jb;
 	PurplePresence *presence;
-	PurpleStoredImage *image;
-	JabberBuddy *my_jb = NULL;
-
-	gc->flags |= PURPLE_CONNECTION_HTML |
-		PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY;
+	gchar *user;
+	gchar *slash;
+
 	js = gc->proto_data = g_new0(JabberStream, 1);
 	js->gc = gc;
 	js->fd = -1;
-	js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, g_free);
+
+	user = g_strdup(purple_account_get_username(account));
+	/* jabber_id_new doesn't accept "user@domain/" as valid */
+	slash = strchr(user, '/');
+	if (slash && *(slash + 1) == '\0')
+		*slash = '\0';
+	js->user = jabber_id_new(user);
+
+	if (!js->user) {
+		purple_connection_error_reason(gc,
+			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
+			_("Invalid XMPP ID"));
+		/* Destroying the connection will free the JabberStream */
+		return NULL;
+	}
+
+	if (!js->user->domain || *(js->user->domain) == '\0') {
+		purple_connection_error_reason(gc,
+			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
+			_("Invalid XMPP ID. Domain must be set."));
+		/* Destroying the connection will free the JabberStream */
+		return NULL;
+	}
+
 	js->buddies = g_hash_table_new_full(g_str_hash, g_str_equal,
 			g_free, (GDestroyNotify)jabber_buddy_free);
+
+	my_jb = jabber_buddy_find(js, user, TRUE);
+	g_free(user);
+	if (!my_jb) {
+		/* This basically *can't* fail, but for good measure... */
+		purple_connection_error_reason(gc,
+			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
+			_("Invalid XMPP ID"));
+		/* Destroying the connection will free the JabberStream */
+		g_return_val_if_reached(NULL);
+	}
+
+	my_jb->subscription |= JABBER_SUB_BOTH;
+
+	js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal,
+			g_free, g_free);
 	js->chats = g_hash_table_new_full(g_str_hash, g_str_equal,
 			g_free, (GDestroyNotify)jabber_chat_free);
-	js->user = jabber_id_new(purple_account_get_username(account));
 	js->next_id = g_random_int();
 	js->write_buffer = purple_circ_buffer_new(512);
 	js->old_length = 0;
@@ -802,37 +848,22 @@
 	if (purple_presence_is_idle(presence))
 		js->idle = purple_presence_get_idle_time(presence);

-	if(!js->user) {
-		purple_connection_error_reason(gc,
-			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
-			_("Invalid XMPP ID"));
-		return;
-	}
-
-	if (!js->user->domain || *(js->user->domain) == '\0') {
-		purple_connection_error_reason(gc,
-			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
-			_("Invalid XMPP ID. Domain must be set."));
-		return;
-	}
-
-	/*
-	 * Calculate the avatar hash for our current image so we know (when we
-	 * fetch our vCard and PEP avatar) if we should send our avatar to the
-	 * server.
-	 */
-	if ((image = purple_buddy_icons_find_account_icon(account))) {
-		js->initial_avatar_hash = jabber_calculate_data_sha1sum(purple_imgstore_get_data(image),
-					purple_imgstore_get_size(image));
-		purple_imgstore_unref(image);
-	}
-
-	if((my_jb = jabber_buddy_find(js, purple_account_get_username(account), TRUE)))
-		my_jb->subscription |= JABBER_SUB_BOTH;
+	return js;
+}
+
+static void
+jabber_stream_connect(JabberStream *js)
+{
+	PurpleConnection *gc = js->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+	const char *connect_server = purple_account_get_string(account,
+			"connect_server", "");
+	const char *bosh_url = purple_account_get_string(account,
+			"bosh_url", "");
+	char *ascii_domain;

 	jabber_stream_set_state(js, JABBER_STREAM_CONNECTING);

-	/* TODO: Just use purple_url_parse? */
 	/* If both BOSH and a Connect Server are specified, we prefer BOSH. I'm not
 	 * attached to that choice, though.
 	 */
@@ -842,7 +873,7 @@
 		if (js->bosh)
 			jabber_bosh_connection_connect(js->bosh);
 		else {
-			purple_connection_error_reason(js->gc,
+			purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
 				_("Malformed BOSH URL"));
 		}
@@ -852,35 +883,78 @@

 	js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user->domain);

+	ascii_domain = jabber_try_idna_to_ascii(js->certificate_CN);
+	if (ascii_domain == NULL) {
+		purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
+				_("Invalid XMPP ID"));
+		return;
+	}
+
 	/* if they've got old-ssl mode going, we probably want to ignore SRV lookups */
-	if(purple_account_get_bool(js->gc->account, "old_ssl", FALSE)) {
+	if(purple_account_get_bool(account, "old_ssl", FALSE)) {
 		if(purple_ssl_is_supported()) {
-			js->gsc = purple_ssl_connect(js->gc->account,
-					js->certificate_CN,
-					purple_account_get_int(account, "port", 5223), jabber_login_callback_ssl,
-					jabber_ssl_connect_failure, js->gc);
+			js->gsc = purple_ssl_connect_with_ssl_cn(account, ascii_domain,
+					purple_account_get_int(account, "port", 5223),
+					jabber_login_callback_ssl, jabber_ssl_connect_failure,
+					js->certificate_CN, gc);
+			g_free(ascii_domain);
 			if (!js->gsc) {
-				purple_connection_error_reason(js->gc,
+				purple_connection_error_reason(gc,
 					PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 					_("Unable to establish SSL connection"));
 			}
 		} else {
-			purple_connection_error_reason(js->gc,
+			purple_connection_error_reason(gc,
 				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 				_("SSL support unavailable"));
 		}

+		g_free(ascii_domain);
 		return;
 	}

 	/* no old-ssl, so if they've specified a connect server, we'll use that, otherwise we'll
 	 * invoke the magic of SRV lookups, to figure out host and port */
 	if(connect_server[0]) {
-		jabber_login_connect(js, js->user->domain, connect_server, purple_account_get_int(account, "port", 5222), TRUE);
+		jabber_login_connect(js, js->user->domain, ascii_domain,
+				purple_account_get_int(account, "port", 5222),
+				TRUE, TRUE);
 	} else {
 		js->srv_query_data = purple_srv_resolve("xmpp-client",
-				"tcp", js->user->domain, srv_resolved_cb, js);
+				"tcp", ascii_domain, srv_resolved_cb, js);
 	}
+
+	g_free(ascii_domain);
+}
+
+void
+jabber_login(PurpleAccount *account)
+{
+	PurpleConnection *gc = purple_account_get_connection(account);
+	JabberStream *js;
+	PurpleStoredImage *image;
+
+	gc->flags |= PURPLE_CONNECTION_HTML |
+		PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY;
+	js = jabber_stream_new(account);
+	if (js == NULL)
+		return;
+
+	/*
+	 * Calculate the avatar hash for our current image so we know (when we
+	 * fetch our vCard and PEP avatar) if we should send our avatar to the
+	 * server.
+	 */
+	image = purple_buddy_icons_find_account_icon(account);
+	if (image != NULL) {
+		js->initial_avatar_hash =
+			jabber_calculate_data_sha1sum(purple_imgstore_get_data(image),
+					purple_imgstore_get_size(image));
+		purple_imgstore_unref(image);
+	}
+
+	jabber_stream_connect(js);
 }


@@ -1293,90 +1367,14 @@

 void jabber_register_account(PurpleAccount *account)
 {
-	PurpleConnection *gc = purple_account_get_connection(account);
 	JabberStream *js;
-	JabberBuddy *my_jb = NULL;
-	const char *connect_server = purple_account_get_string(account,
-			"connect_server", "");
-	const char *server;
-
-	js = gc->proto_data = g_new0(JabberStream, 1);
-	js->gc = gc;
-	js->registration = TRUE;
-	js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal,
-			g_free, g_free);
-	js->user = jabber_id_new(purple_account_get_username(account));
-	js->next_id = g_random_int();
-	js->old_length = 0;
-	js->keepalive_timeout = 0;
-
-	if(!js->user) {
-		purple_connection_error_reason(gc,
-			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
-			_("Invalid XMPP ID"));
+
+	js = jabber_stream_new(account);
+	if (js == NULL)
 		return;
-	}
-
-	js->write_buffer = purple_circ_buffer_new(512);
-
-	if((my_jb = jabber_buddy_find(js, purple_account_get_username(account), TRUE)))
-		my_jb->subscription |= JABBER_SUB_BOTH;
-
-	server = connect_server[0] ? connect_server : js->user->domain;
-	js->certificate_CN = g_strdup(server);
-
-	js->stun_ip = NULL;
-	js->stun_port = 0;
-	js->stun_query = NULL;
-
-	jabber_stream_set_state(js, JABBER_STREAM_CONNECTING);
-
-	/* TODO: Just use purple_url_parse? */
-	if (!g_ascii_strncasecmp(connect_server, "http://", 7) || !g_ascii_strncasecmp(connect_server, "https://", 8)) {
-		js->use_bosh = TRUE;
-		js->bosh = jabber_bosh_connection_init(js, connect_server);
-		if (!js->bosh) {
-			purple_connection_error_reason(js->gc,
-				PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
-				_("Malformed BOSH Connect Server"));
-			return;
-		}
-		jabber_bosh_connection_connect(js->bosh);
-		return;
-	} else {
-		js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user->domain);
-	}
-
-	if(purple_account_get_bool(account, "old_ssl", FALSE)) {
-		if(purple_ssl_is_supported()) {
-			js->gsc = purple_ssl_connect(account, server,
-					purple_account_get_int(account, "port", 5222),
-					jabber_login_callback_ssl, jabber_ssl_connect_failure, gc);
-			if (!js->gsc) {
-				purple_connection_error_reason(js->gc,
-					PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-					_("Unable to establish SSL connection"));
-			}
-		} else {
-			purple_connection_error_reason(gc,
-				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
-				_("SSL support unavailable"));
-		}
-
-		return;
-	}
-
-	if (connect_server[0]) {
-		jabber_login_connect(js, js->user->domain, server,
-		                     purple_account_get_int(account,
-		                                            "port", 5222), TRUE);
-	} else {
-		js->srv_query_data = purple_srv_resolve("xmpp-client",
-		                                        "tcp",
-		                                        js->user->domain,
-		                                        srv_resolved_cb,
-		                                        js);
-	}
+
+	js->registration = TRUE;
+	jabber_stream_connect(js);
 }

 static void
@@ -1466,7 +1464,7 @@
 	if (!gc->disconnect_timeout) {
 		if (js->use_bosh)
 			jabber_bosh_connection_close(js->bosh);
-		else
+		else if ((js->gsc && js->gsc->fd > 0) || js->fd > 0)
 			jabber_send_raw(js, "</stream:stream>", -1);
 	}
--- a/libpurple/protocols/jabber/jutil.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/jabber/jutil.c	Sun Jul 19 08:17:45 2009 +0000
@@ -31,9 +31,165 @@
 #include "presence.h"
 #include "jutil.h"

+#ifdef USE_IDN
+#include <idna.h>
+#include <stringprep.h>
+static char idn_buffer[1024];
+#endif
+
+gchar *jabber_try_idna_to_ascii(const char *input)
+{
+#ifndef USE_IDN
+	return g_strdup(input);
+#else
+	gchar *out;
+	char *tmp;
+
+	g_return_val_if_fail(input != NULL, NULL);
+	g_return_val_if_fail(*input != '\0', NULL);
+
+	if (idna_to_ascii_8z(input, &tmp, IDNA_USE_STD3_ASCII_RULES) != IDNA_SUCCESS) {
+		return NULL;
+	}
+
+	out = g_strdup(tmp);
+	/* This *MUST* be freed with free, not g_free */
+	free(tmp);
+	return out;
+#endif
+}
+
+#ifdef USE_IDN
+static gboolean jabber_nodeprep(char *str, size_t buflen)
+{
+	return stringprep_xmpp_nodeprep(str, buflen) == STRINGPREP_OK;
+}
+
+static gboolean jabber_resourceprep(char *str, size_t buflen)
+{
+	return stringprep_xmpp_resourceprep(str, buflen) == STRINGPREP_OK;
+}
+
+static JabberID*
+jabber_idn_validate(const char *str, const char *at, const char *slash,
+                    const char *null)
+{
+	const char *node = NULL;
+	const char *domain = NULL;
+	const char *resource = NULL;
+	int node_len = 0;
+	int domain_len = 0;
+	int resource_len = 0;
+	char *out;
+	JabberID *jid;
+
+	/* Ensure no parts are > 1023 bytes */
+	if (at) {
+		node = str;
+		node_len = at - str;
+
+		domain = at + 1;
+		if (slash) {
+			domain_len = slash - (at + 1);
+			resource = slash + 1;
+			resource_len = null - (slash + 1);
+		} else {
+			domain_len = null - (at + 1);
+		}
+	} else {
+		domain = str;
+
+		if (slash) {
+			domain_len = slash - str;
+			resource = slash;
+			resource_len = null - (slash + 1);
+		} else {
+			domain_len = null - (str + 1);
+		}
+	}
+
+	if (node && node_len > 1023)
+		return NULL;
+	if (domain_len > 1023)
+		return NULL;
+	if (resource && resource_len > 1023)
+		return NULL;
+
+	jid = g_new0(JabberID, 1);
+
+	if (node) {
+		strncpy(idn_buffer, node, node_len);
+		idn_buffer[node_len] = '\0';
+
+		if (!jabber_nodeprep(idn_buffer, sizeof(idn_buffer))) {
+			jabber_id_free(jid);
+			jid = NULL;
+			goto out;
+		}
+
+		jid->node = g_strdup(idn_buffer);
+	}
+
+	/* domain *must* be here */
+	strncpy(idn_buffer, domain, domain_len);
+	idn_buffer[domain_len] = '\0';
+	if (domain[0] == '[') { /* IPv6 address */
+		gboolean valid = FALSE;
+
+		if (idn_buffer[domain_len - 1] == ']') {
+			idn_buffer[domain_len - 1] = '\0';
+			valid = purple_ipv6_address_is_valid(idn_buffer + 1);
+		}
+
+		if (!valid) {
+			jabber_id_free(jid);
+			jid = NULL;
+			goto out;
+		}
+	} else {
+		/* Apply nameprep */
+		if (stringprep_nameprep(idn_buffer, sizeof(idn_buffer)) != STRINGPREP_OK) {
+			jabber_id_free(jid);
+			jid = NULL;
+			goto out;
+		}
+
+		/* And now ToASCII */
+		if (idna_to_ascii_8z(idn_buffer, &out, IDNA_USE_STD3_ASCII_RULES) != IDNA_SUCCESS) {
+			jabber_id_free(jid);
+			jid = NULL;
+			goto out;
+		}
+
+		/* This *MUST* be freed using 'free', not 'g_free' */
+		free(out);
+		jid->domain = g_strdup(idn_buffer);
+	}
+
+	if (resource) {
+		strncpy(idn_buffer, resource, resource_len);
+		idn_buffer[resource_len] = '\0';
+
+		if (!jabber_resourceprep(idn_buffer, sizeof(idn_buffer))) {
+			jabber_id_free(jid);
+			jid = NULL;
+			/* goto out; */
+		}
+	}
+
+out:
+	return jid;
+}
+
+#endif /* USE_IDN */
+
 gboolean jabber_nodeprep_validate(const char *str)
 {
+#ifdef USE_IDN
+	gboolean result;
+#else
 	const char *c;
+#endif

 	if(!str)
 		return TRUE;
@@ -41,6 +197,12 @@
 	if(strlen(str) > 1023)
 		return FALSE;

+#ifdef USE_IDN
+	strncpy(idn_buffer, str, sizeof(idn_buffer) - 1);
+	idn_buffer[sizeof(idn_buffer) - 1] = '\0';
+	result = jabber_nodeprep(idn_buffer, sizeof(idn_buffer));
+	return result;
+#else /* USE_IDN */
 	c = str;
 	while(c && *c) {
 		gunichar ch = g_utf8_get_char(c);
@@ -52,6 +214,7 @@
 	}

 	return TRUE;
+#endif /* USE_IDN */
 }

 gboolean jabber_domain_validate(const char *str)
@@ -101,7 +264,11 @@

 gboolean jabber_resourceprep_validate(const char *str)
 {
+#ifdef USE_IDN
+	gboolean result;
+#else
 	const char *c;
+#endif

 	if(!str)
 		return TRUE;
@@ -109,6 +276,12 @@
 	if(strlen(str) > 1023)
 		return FALSE;

+#ifdef USE_IDN
+	strncpy(idn_buffer, str, sizeof(idn_buffer) - 1);
+	idn_buffer[sizeof(idn_buffer) - 1] = '\0';
+	result = jabber_resourceprep(idn_buffer, sizeof(idn_buffer));
+	return result;
+#else /* USE_IDN */
 	c = str;
 	while(c && *c) {
 		gunichar ch = g_utf8_get_char(c);
@@ -119,9 +292,9 @@
 	}

 	return TRUE;
+#endif /* USE_IDN */
 }

-
 JabberID*
 jabber_id_new(const char *str)
 {
@@ -132,8 +305,10 @@
 #if 0
 	gboolean node_is_required = FALSE;
 #endif
+#ifndef USE_IDN
 	char *node = NULL;
 	char *domain;
+#endif
 	JabberID *jid;

 	if (!str)
@@ -253,23 +428,27 @@
 	if (!g_utf8_validate(str, -1, NULL))
 		return NULL;

+#ifdef USE_IDN
+	return jabber_idn_validate(str, at, slash, c /* points to the null */);
+#else /* USE_IDN */
+
 	jid = g_new0(JabberID, 1);

 	/* normalization */
 	if(at) {
-		node = g_utf8_strdown(str, at-str);
+		node = g_utf8_casefold(str, at-str);
 		if(slash) {
-			domain = g_utf8_strdown(at+1, slash-(at+1));
+			domain = g_utf8_casefold(at+1, slash-(at+1));
 			jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
 		} else {
-			domain = g_utf8_strdown(at+1, -1);
+			domain = g_utf8_casefold(at+1, -1);
 		}
 	} else {
 		if(slash) {
-			domain = g_utf8_strdown(str, slash-str);
+			domain = g_utf8_casefold(str, slash-str);
 			jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
 		} else {
-			domain = g_utf8_strdown(str, -1);
+			domain = g_utf8_casefold(str, -1);
 		}
 	}

@@ -292,6 +471,7 @@
 	}

 	return jid;
+#endif /* USE_IDN */
 }

 void
--- a/libpurple/protocols/jabber/jutil.h	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/jabber/jutil.h	Sun Jul 19 08:17:45 2009 +0000
@@ -44,6 +44,11 @@
 /* Returns true if JID is the bare JID of our account. */
 gboolean jabber_is_own_account(JabberStream *js, const char *jid);

+/* Try to convert an IDNA domain name to something we can pass to a DNS lookup.
+ * If IDN support is not available, returns a copy of the input string.
+ */
+gchar *jabber_try_idna_to_ascii(const gchar *input);
+
 gboolean jabber_nodeprep_validate(const char *);
 gboolean jabber_domain_validate(const char *);
 gboolean jabber_resourceprep_validate(const char *);
--- a/libpurple/protocols/jabber/message.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/jabber/message.c	Sun Jul 19 08:17:45 2009 +0000
@@ -742,7 +742,12 @@
 			if(timestamp)
 				jm->sent = purple_str_to_time(timestamp, TRUE, NULL, NULL, NULL);
 		} else if(!strcmp(child->name, "x")) {
-			if(!strcmp(xmlns, "jabber:x:conference") &&
+			if(!strcmp(xmlns, "jabber:x:delay")) {
+				const char *timestamp = xmlnode_get_attrib(child, "stamp");
+				jm->delayed = TRUE;
+				if(timestamp)
+					jm->sent = purple_str_to_time(timestamp, TRUE, NULL, NULL, NULL);
+			} else if(!strcmp(xmlns, "jabber:x:conference") &&
 					jm->type != JABBER_MESSAGE_GROUPCHAT_INVITE &&
 					jm->type != JABBER_MESSAGE_ERROR) {
 				const char *jid = xmlnode_get_attrib(child, "jid");
--- a/libpurple/protocols/jabber/presence.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sun Jul 19 08:17:45 2009 +0000
@@ -67,7 +67,7 @@
 	g_return_if_fail(js->user != NULL);

 	account = purple_connection_get_account(js->gc);
-	username = purple_account_get_username(account);
+	username = purple_connection_get_display_name(js->gc);
 	if (status == NULL)
 		status = purple_account_get_active_status(account);

@@ -613,7 +613,7 @@
 			/* The rest of the cases used to check xmlns individually. */
 			continue;
 		} else if(!strcmp(y->name, "delay") && !strcmp(xmlns, "urn:xmpp:delay")) {
-			/* XXX: compare the time.  urn:xmpp:delay can happen on presence packets that aren't really and truly delayed */
+			/* XXX: compare the time.  jabber:x:delay can happen on presence packets that aren't really and truly delayed */
 			delayed = TRUE;
 			stamp = xmlnode_get_attrib(y, "stamp");
 		} else if(!strcmp(y->name, "c") && !strcmp(xmlns, "http://jabber.org/protocol/caps")) {
@@ -621,7 +621,11 @@
 		} else if (g_str_equal(y->name, "nick") && g_str_equal(xmlns, "http://jabber.org/protocol/nick")) {
 			nickname = xmlnode_get_data(y);
 		} else if(!strcmp(y->name, "x")) {
-			if(!strcmp(xmlns, "http://jabber.org/protocol/muc#user")) {
+			if(!strcmp(xmlns, "jabber:x:delay")) {
+				/* XXX: compare the time.  jabber:x:delay can happen on presence packets that aren't really and truly delayed */
+				delayed = TRUE;
+				stamp = xmlnode_get_attrib(y, "stamp");
+			} else if(!strcmp(xmlns, "http://jabber.org/protocol/muc#user")) {
 			} else if(!strcmp(xmlns, "vcard-temp:x:update")) {
 				xmlnode *photo = xmlnode_get_child(y, "photo");
 				if(photo) {
@@ -801,6 +805,7 @@
 				const char *nick;
 				const char *code = NULL;
 				const char *item_jid = NULL;
+				const char *to;
 				xmlnode *stat;
 				xmlnode *item;

@@ -808,7 +813,6 @@
 				if (item)
 					item_jid = xmlnode_get_attrib(item, "jid");

-
 				stat = xmlnode_get_child(x, "status");

 				if (stat)
@@ -885,7 +889,8 @@
 				 * Also possibly works around bits of an Openfire bug. See
 				 * #8319.
 				 */
-				if (is_our_resource && !purple_strequal(from, item_jid)) {
+				to = xmlnode_get_attrib(packet, "to");
+				if (is_our_resource && item_jid && !purple_strequal(to, item_jid)) {
 					/* TODO: When the above is a loop, this needs to still act
 					 * sanely for all cases (this code is a little fragile). */
 					if (!kick && !nick_change)
--- a/libpurple/protocols/oscar/peer.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/oscar/peer.c	Sun Jul 19 08:17:45 2009 +0000
@@ -710,9 +710,18 @@
 	}
 	else if (conn->type == OSCAR_CAPABILITY_SENDFILE)
 	{
+		const guchar *ip_atoi = purple_network_ip_atoi(listener_ip);
+		if (ip_atoi == NULL) {
+			purple_debug_error("oscar", "Cannot send file. IP %s failed atoi.\n"
+					"Other possibly useful information: fd = %d, port = %d\n",
+			                   listener_ip ? listener_ip : "(null!)", conn->listenerfd,
+							   listener_port);
+			purple_xfer_cancel_local(conn->xfer);
+			return;
+		}
 		aim_im_sendch2_sendfile_requestdirect(od,
 				conn->cookie, conn->bn,
-				purple_network_ip_atoi(listener_ip),
+				ip_atoi,
 				listener_port, ++conn->lastrequestnumber,
 				(const gchar *)conn->xferdata.name,
 				conn->xferdata.size, conn->xferdata.totfiles);
--- a/libpurple/protocols/yahoo/libymsg.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Sun Jul 19 08:17:45 2009 +0000
@@ -1143,7 +1143,7 @@
 	if (add_req->protocol == 2)
 		who += 4;

-	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH_REQ_15, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH_REQ_15, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "ssiii",
 					  1, add_req->id,
 					  5, who,
@@ -1172,7 +1172,7 @@
 		encoded_msg = yahoo_string_encode(add_req->gc, msg, NULL);

 	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH_REQ_15,
-			YAHOO_STATUS_AVAILABLE, 0);
+			YAHOO_STATUS_AVAILABLE, yd->session_id);

 	yahoo_packet_hash(pkt, "ssiiiis",
 			1, add_req->id,
@@ -1623,28 +1623,18 @@

 	purple_debug_info("yahoo", "yahoo status: %d\n", yd->current_status);
 	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTHRESP, yd->current_status, yd->session_id);
-	if(yd->jp) {
-		yahoo_packet_hash(pkt, "ssssssss",
-					1, name,
-					0, name,
-					277, yd->cookie_y,
-					278, yd->cookie_t,
-					307, base64_string,
-					2, name,
-					2, "1",
-					135, YAHOOJP_CLIENT_VERSION);
-	} else	{
-		yahoo_packet_hash(pkt, "sssssssss",
-					1, name,
-					0, name,
-					277, yd->cookie_y,
-					278, yd->cookie_t,
-					307, base64_string,
-					244, YAHOO_CLIENT_VERSION_ID,
-					2, name,
-					2, "1",
-					135, YAHOO_CLIENT_VERSION);
-	}
+
+	yahoo_packet_hash(pkt, "sssssssss",
+				1, name,
+				0, name,
+				277, yd->cookie_y,
+				278, yd->cookie_t,
+				307, base64_string,
+				244, yd->jp ? YAHOOJP_CLIENT_VERSION_ID : YAHOO_CLIENT_VERSION_ID,
+				2, name,
+				2, "1",
+				135, yd->jp ? YAHOOJP_CLIENT_VERSION : YAHOO_CLIENT_VERSION);
+
 	if (yd->picture_checksum)
 		yahoo_packet_hash_int(pkt, 192, yd->picture_checksum);
 	yahoo_packet_send_and_free(pkt, yd);
@@ -2087,6 +2077,10 @@
 		msg = g_strdup(_("Your account is locked, please log in to the Yahoo! website."));
 		reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 		break;
+	case 1013:
+		msg = g_strdup(_("Invalid username"));
+		reason = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
+		break;
 	default:
 		msg = g_strdup_printf(_("Unknown error number %d. Logging into the Yahoo! website may fix this."), err);
 	}
@@ -3034,7 +3028,7 @@
 	yd = gc->proto_data;
 	yd->fd = source;

-	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH, yd->current_status, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_AUTH, yd->current_status, yd->session_id);

 	yahoo_packet_hash_str(pkt, 1, purple_normalize(gc->account, purple_account_get_username(purple_connection_get_account(gc))));
 	yahoo_packet_send_and_free(pkt, yd);
@@ -3060,7 +3054,7 @@
 	yd = gc->proto_data;
 	yd->fd = source;

-	pkt = yahoo_packet_new(YAHOO_SERVICE_WEBLOGIN, YAHOO_STATUS_WEBLOGIN, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_WEBLOGIN, YAHOO_STATUS_WEBLOGIN, yd->session_id);

 	yahoo_packet_hash(pkt, "sss", 0,
 	                  purple_normalize(gc->account, purple_account_get_username(purple_connection_get_account(gc))),
@@ -3963,7 +3957,7 @@
 	struct yahoo_data *yd = gc->proto_data;
 	const char *name = yd->profiles[purple_request_fields_get_choice(fields, "id")];

-	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_IDACT, YAHOO_STATUS_AVAILABLE, 0);
+	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_IDACT, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash_str(pkt, 3, name);
 	yahoo_packet_send_and_free(pkt, yd);

@@ -4299,7 +4293,7 @@
 		}

 		alias = purple_account_get_alias(account);
-		pkt = yahoo_packet_new(YAHOO_SERVICE_SMS_MSG, YAHOO_STATUS_AVAILABLE, 0);
+		pkt = yahoo_packet_new(YAHOO_SERVICE_SMS_MSG, YAHOO_STATUS_AVAILABLE, yd->session_id);
 		yahoo_packet_hash(pkt, "sssss",
 			1, purple_connection_get_display_name(gc),
 			69, alias,
@@ -4314,7 +4308,7 @@
 		return ret;
 	}

-	pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_MESSAGE, YAHOO_STATUS_OFFLINE, yd->session_id);
 	if(msn) {
 		yahoo_packet_hash(pkt, "ss", 1, purple_connection_get_display_name(gc), 5, who+4);
 		yahoo_packet_hash_int(pkt, 241, 2);
@@ -4396,7 +4390,7 @@
 	if( strncmp(who, "+", 1) == 0 )
 		return 0;

-	pkt = yahoo_packet_new(YAHOO_SERVICE_NOTIFY, YAHOO_STATUS_TYPING, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_NOTIFY, YAHOO_STATUS_TYPING, yd->session_id);

 	/* check to see if p2p link exists, send through it */
 	if( (p2p_data = g_hash_table_lookup(yd->peers, who)) && !msn ) {
@@ -4468,14 +4462,14 @@
 	}

 	if (yd->current_status == YAHOO_STATUS_INVISIBLE) {
-		pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE, YAHOO_STATUS_AVAILABLE, 0);
+		pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 		yahoo_packet_hash_str(pkt, 13, "2");
 		yahoo_packet_send_and_free(pkt, yd);

 		return;
 	}

-	pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash_int(pkt, 10, yd->current_status);

 	if (yd->current_status == YAHOO_STATUS_CUSTOM) {
@@ -4495,7 +4489,7 @@
 	yahoo_packet_send_and_free(pkt, yd);

 	if (old_status == YAHOO_STATUS_INVISIBLE) {
-		pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE, YAHOO_STATUS_AVAILABLE, 0);
+		pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_VISIBLE_TOGGLE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 		yahoo_packet_hash_str(pkt, 13, "1");
 		yahoo_packet_send_and_free(pkt, yd);

@@ -4519,7 +4513,7 @@
 		yd->current_status = get_yahoo_status_from_purple_status(status);
 	}

-	pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_Y6_STATUS_UPDATE, YAHOO_STATUS_AVAILABLE, yd->session_id);

 	yahoo_packet_hash_int(pkt, 10, yd->current_status);
 	if (yd->current_status == YAHOO_STATUS_CUSTOM) {
@@ -4625,19 +4619,19 @@
 			if (yd->wm) {
 				ycht_chat_send_keepalive(yd->ycht);
 			} else {
-				pkt = yahoo_packet_new(YAHOO_SERVICE_CHATPING, YAHOO_STATUS_AVAILABLE, 0);
+				pkt = yahoo_packet_new(YAHOO_SERVICE_CHATPING, YAHOO_STATUS_AVAILABLE, yd->session_id);
 				yahoo_packet_hash_str(pkt, 109, purple_connection_get_display_name(gc));
 				yahoo_packet_send_and_free(pkt, yd);
 			}
 		} else {
-			pkt = yahoo_packet_new(YAHOO_SERVICE_PING, YAHOO_STATUS_AVAILABLE, 0);
+			pkt = yahoo_packet_new(YAHOO_SERVICE_PING, YAHOO_STATUS_AVAILABLE, yd->session_id);
 			yahoo_packet_send_and_free(pkt, yd);
 		}
 	}

 	if ((now - yd->last_keepalive) >= KEEPALIVE_TIMEOUT) {
 		yd->last_keepalive = now;
-		pkt = yahoo_packet_new(YAHOO_SERVICE_KEEPALIVE, YAHOO_STATUS_AVAILABLE, 0);
+		pkt = yahoo_packet_new(YAHOO_SERVICE_KEEPALIVE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 		yahoo_packet_hash_str(pkt, 0, purple_connection_get_display_name(gc));
 		yahoo_packet_send_and_free(pkt, yd);
 	}
@@ -4671,7 +4665,7 @@
 		group = "Buddies";

 	group2 = yahoo_string_encode(gc, group, NULL);
-	pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_ADDBUDDY, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	if(msn) {
 		yahoo_packet_hash(pkt, "sssssssssss",
 			14, "",
@@ -4743,7 +4737,7 @@
 		g_hash_table_remove(yd->friends, bname);

 	cg = yahoo_string_encode(gc, gname, NULL);
-	pkt = yahoo_packet_new(YAHOO_SERVICE_REMBUDDY, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_REMBUDDY, YAHOO_STATUS_AVAILABLE, yd->session_id);

 	if(msn)
 		yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc),
@@ -4767,7 +4761,7 @@
 	if (!who || who[0] == '\0')
 		return;

-	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc),
 	                  7, who, 13, "1");
 	yahoo_packet_send_and_free(pkt, yd);
@@ -4783,7 +4777,7 @@
 	if (!who || who[0] == '\0')
 		return;

-	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc), 7, who, 13, "2");
 	yahoo_packet_send_and_free(pkt, yd);
 }
@@ -4846,7 +4840,7 @@
 		return;
 	}

-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHGRP_15, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHGRP_15, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	if(f->protocol)
 		yahoo_packet_hash(pkt, "ssssissss", 1, purple_connection_get_display_name(gc),
 	                  302, "240", 300, "240", 7, temp, 241, f->protocol, 224, gpo, 264, gpn, 301,
@@ -4876,7 +4870,7 @@
 		return;
 	}

-	pkt = yahoo_packet_new(YAHOO_SERVICE_GROUPRENAME, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_GROUPRENAME, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc),
 	                  65, gpo, 67, gpn);
 	yahoo_packet_send_and_free(pkt, yd);
--- a/libpurple/protocols/yahoo/libymsg.h	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/yahoo/libymsg.h	Sun Jul 19 08:17:45 2009 +0000
@@ -88,10 +88,10 @@
 #define YAHOO_STATUS_TYPE_MOBILE "mobile"

 #define YAHOO_CLIENT_VERSION_ID "4194239"
-#define YAHOO_CLIENT_VERSION "9.0.0.2152"
+#define YAHOO_CLIENT_VERSION "9.0.0.2162"

 #define YAHOOJP_CLIENT_VERSION_ID "4194239"
-#define YAHOOJP_CLIENT_VERSION "9.0.0.2152"
+#define YAHOOJP_CLIENT_VERSION "9.0.0.2162"

 #define YAHOO_CLIENT_USERAGENT "Mozilla/5.0"
--- a/libpurple/protocols/yahoo/yahoo_doodle.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo_doodle.c	Sun Jul 19 08:17:45 2009 +0000
@@ -392,7 +392,7 @@
 	yd = gc->proto_data;

 	/* Make and send an acknowledge (ready) Doodle packet */
-	pkt = yahoo_packet_new(YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_P2PFILEXFER, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash_str(pkt, 49,  "IMVIRONMENT");
 	yahoo_packet_hash_str(pkt, 1,    purple_account_get_username(gc->account));
 	yahoo_packet_hash_str(pkt, 14,   message);
--- a/libpurple/protocols/yahoo/yahoo_picture.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo_picture.c	Sun Jul 19 08:17:45 2009 +0000
@@ -276,7 +276,7 @@
 		return;
 	}

-	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "ssssi", 1, purple_connection_get_display_name(gc),
 	                  5, who,
 	                  13, "2", 20, yd->picture_url, 192, yd->picture_checksum);
@@ -288,7 +288,7 @@
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt;

-	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash_str(pkt, 1, purple_connection_get_display_name(gc)); /* me */
 	yahoo_packet_hash_str(pkt, 5, who); /* the other guy */
 	yahoo_packet_hash_str(pkt, 13, "1"); /* 1 = request, 2 = reply */
@@ -300,7 +300,7 @@
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt;

-	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_CHECKSUM, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_PICTURE_CHECKSUM, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "ssi", 1, purple_connection_get_display_name(gc),
 			  212, "1", 192, yd->picture_checksum);
 	yahoo_packet_send_and_free(pkt, yd);
@@ -311,7 +311,7 @@
 	struct yahoo_data *yd = gc->proto_data;
 	struct yahoo_packet *pkt;

-	pkt = yahoo_packet_new(YAHOO_SERVICE_AVATAR_UPDATE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_AVATAR_UPDATE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "si", 3, who, 213, type);
 	yahoo_packet_send_and_free(pkt, yd);
 }
--- a/libpurple/protocols/yahoo/yahoochat.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoochat.c	Sun Jul 19 08:17:45 2009 +0000
@@ -65,14 +65,14 @@
 	rll = purple_account_get_string(purple_connection_get_account(gc),
 								  "room_list_locale", YAHOO_ROOMLIST_LOCALE);

-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATONLINE, YAHOO_STATUS_AVAILABLE,0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATONLINE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sssss",
 					  109, purple_connection_get_display_name(gc),
 					  1, purple_connection_get_display_name(gc),
 					  6, "abcde",
 					/* I'm not sure this is the correct way to set this. */
 					  98, rll,
-					  135, "ym8.1.0.415");
+					  135, yd->jp ? YAHOO_CLIENT_VERSION : YAHOOJP_CLIENT_VERSION);
 	yahoo_packet_send_and_free(pkt, yd);
 }

@@ -121,12 +121,29 @@
 	char *msg = NULL;
 	GString *members = NULL;
 	GHashTable *components;
+	PurpleConversation *c = NULL;

-	if (pkt->status == 2)
-		return; /* XXX */
+	if ( (pkt->status == 2) || (pkt->status == 11) )
+		return; /* Status is 11 when we are being notified about invitation being sent to someone else */

 	account = purple_connection_get_account(gc);

+	for (l = pkt->hash; l; l = l->next) {
+		struct yahoo_pair *pair = l->data;
+		if (pair->key == 57)
+		{
+			room = yahoo_string_decode(gc, pair->value, FALSE);
+			if((c = yahoo_find_conference(gc, room)))
+			{
+				/* Looks like we got invited to an already open conference. */
+				/* Laters: Should we accept this conference rather than ignoring the invitation ? */
+				purple_debug_info("yahoo","Ignoring invitation for an already existing chat, room:%s\n",room);
+				g_free(room);
+				return;
+			}
+		}
+	}
+
 	members = g_string_sized_new(512);

 	for (l = pkt->hash; l; l = l->next) {
@@ -143,8 +160,11 @@
 			who = pair->value;
 			g_string_append_printf(members, "%s\n", who);
 			break;
-		case 52: /* invitee (me) */
-		case 53: /* members */
+		case 51: /* This user is being invited to the conference. Comes with status = 11, so we wont reach here */
+			break;
+		case 52: /* Invited users. Assuming us invited, since we got this packet */
+			break; /* break needed, or else we add the users to the conference before they accept the invitation */
+		case 53: /* members who have already joined the conference */
 			g_string_append_printf(members, "%s\n", pair->value);
 			break;
 		case 58:
@@ -254,7 +274,10 @@
 	if (who && room) {
 		c = yahoo_find_conference(gc, room);
 		if (c)
-			yahoo_chat_add_user(PURPLE_CONV_CHAT(c), who, NULL);
+		{	/* Prevent duplicate users in the chat */
+			if( !purple_conv_chat_find_user(PURPLE_CONV_CHAT(c), who) )
+				yahoo_chat_add_user(PURPLE_CONV_CHAT(c), who, NULL);
+		}
 		g_free(room);
 	}
 }
@@ -353,7 +376,7 @@
 	 * so we don't have to actually pass the flag in the packet. Or something. */
 	room2 = yahoo_string_encode(gc, room, &utf8);

-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATJOIN, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATJOIN, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "ssss",
 						1, purple_connection_get_display_name(gc),
 						104, room2,
@@ -373,7 +396,7 @@

 		/* We need to goto a user in chat */
 		if (yd->pending_chat_goto) {
-			struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_CHATGOTO, YAHOO_STATUS_AVAILABLE, 0);
+			struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_CHATGOTO, YAHOO_STATUS_AVAILABLE, yd->session_id);
 			yahoo_packet_hash(pkt, "sss",
 				109, yd->pending_chat_goto,
 				1, purple_connection_get_display_name(gc),
@@ -741,7 +764,7 @@

 	purple_debug_misc("yahoo", "leaving conference %s\n", room);

-	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGOFF, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGOFF, YAHOO_STATUS_AVAILABLE, yd->session_id);

 	yahoo_packet_hash_str(pkt, 1, dn);
 	for (w = who; w; w = w->next) {
@@ -765,7 +788,7 @@
 	msg = yahoo_html_to_codes(what);
 	msg2 = yahoo_string_encode(gc, msg, &utf8);

-	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFMSG, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFMSG, YAHOO_STATUS_AVAILABLE, yd->session_id);

 	yahoo_packet_hash_str(pkt, 1, dn);
 	for (who = members; who; who = who->next) {
@@ -793,7 +816,7 @@
 	if (members)
 		memarr = g_strsplit(members, "\n", 0);

-	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGON, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFLOGON, YAHOO_STATUS_AVAILABLE, yd->session_id);

 	yahoo_packet_hash(pkt, "sss", 1, dn, 3, dn, 57, room);
 	if (memarr) {
@@ -823,7 +846,7 @@

 	members = purple_conv_chat_get_users(PURPLE_CONV_CHAT(c));

-	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFADDINVITE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CONFADDINVITE, YAHOO_STATUS_AVAILABLE, yd->session_id);

 	yahoo_packet_hash(pkt, "sssss", 1, dn, 51, buddy, 57, room, 58, msg?msg2:"", 13, "0");
 	for(; members; members = members->next) {
@@ -859,7 +882,7 @@

 	eroom = yahoo_string_encode(gc, room, &utf8);

-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATEXIT, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATEXIT, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sss", 104, eroom, 109, dn, 108, "1");
 	yahoo_packet_hash_str(pkt, 112, "0"); /* what does this one mean? */
 	yahoo_packet_send_and_free(pkt, yd);
@@ -877,7 +900,7 @@
 		return;

 	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATLOGOUT,
-			YAHOO_STATUS_AVAILABLE, 0);
+			YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash_str(pkt, 1, dn);
 	yahoo_packet_send_and_free(pkt, yd);

@@ -918,7 +941,7 @@
 	g_free(msg2);
 	room2 = yahoo_string_encode(gc, room, NULL);

-	pkt = yahoo_packet_new(YAHOO_SERVICE_COMMENT, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_COMMENT, YAHOO_STATUS_AVAILABLE, yd->session_id);

 	yahoo_packet_hash(pkt, "sss", 1, dn, 104, room2, 117, msg1);
 	if (me)
@@ -955,7 +978,7 @@
 	if (msg)
 		msg2 = yahoo_string_encode(gc, msg, NULL);

-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATADDINVITE, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATADDINVITE, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sssss", 1, dn, 118, buddy, 104, room2, 117, (msg2?msg2:""), 129, "0");
 	yahoo_packet_send_and_free(pkt, yd);

@@ -989,7 +1012,7 @@
 		return;
 	}

-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATGOTO, YAHOO_STATUS_AVAILABLE, 0);
+	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATGOTO, YAHOO_STATUS_AVAILABLE, yd->session_id);
 	yahoo_packet_hash(pkt, "sss", 109, name, 1, purple_connection_get_display_name(gc), 62, "2");
 	yahoo_packet_send_and_free(pkt, yd);
 }
--- a/libpurple/tests/test_jabber_jutil.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/tests/test_jabber_jutil.c	Sun Jul 19 08:17:45 2009 +0000
@@ -44,6 +44,10 @@
 	longnode = g_strnfill(1023, 'a');
 	fail_unless(jabber_nodeprep_validate(longnode));
 	g_free(longnode);
+
+	longnode = g_strnfill(1024, 'a');
+	fail_if(jabber_nodeprep_validate(longnode));
+	g_free(longnode);
 }
 END_TEST

@@ -132,7 +136,19 @@
 	/* Ensure that jabber_id_new is properly lowercasing node and domains */
 	assert_jid_parts("paul", "darkrain42.org", "PaUL@darkrain42.org");
 	assert_jid_parts("paul", "darkrain42.org", "paul@DaRkRaIn42.org");
-	assert_jid_parts("ꙥ", "darkrain42.org", "Ꙥ@darkrain42.org");
+
+	/* These case-mapping tests culled from examining RFC3454 B.2 */
+
+	/* Cyrillic capital EF (U+0424) maps to lowercase EF (U+0444) */
+	assert_jid_parts("ф", "darkrain42.org", "Ф@darkrain42.org");
+	/*
+	 * These character (U+A664 and U+A665) are not mapped to anything in
+	 * RFC3454 B.2. This first test *fails* when not using IDN because glib's
+	 * case-folding/utf8_strdown improperly lowercases the character.
+	 */
+	assert_jid_parts("Ꙥ", "darkrain42.org", "Ꙥ@darkrain42.org");
+	assert_jid_parts("ꙥ", "darkrain42.org", "ꙥ@darkrain42.org");
+	/* U+04E9 to U+04E9 */
 	assert_jid_parts("paul", "өarkrain42.org", "paul@Өarkrain42.org");
 }
 END_TEST
--- a/libpurple/win32/libc_internal.h	Sun Jul 19 08:09:24 2009 +0000
+++ b/libpurple/win32/libc_internal.h	Sun Jul 19 08:17:45 2009 +0000
@@ -120,10 +120,14 @@
 # define ifc_req ifc_ifcu.ifcu_req /* Array of structures.  */

 /* sys/time.h */
+#if __MINGW32_MAJOR_VERSION < 3 || (__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION < 10)
 struct timezone {
 	int tz_minuteswest;
 	int tz_dsttime;
 };
+#else
+#    include <sys/time.h>
+#endif
 int wpurple_gettimeofday(struct timeval *p, struct timezone *z);

 /* time.h */
--- a/pidgin/plugins/notify.c	Sun Jul 19 08:09:24 2009 +0000
+++ b/pidgin/plugins/notify.c	Sun Jul 19 08:17:45 2009 +0000
@@ -572,6 +572,9 @@
 static void
 handle_present(PurpleConversation *conv)
 {
+	if (pidgin_conv_is_hidden(PIDGIN_CONVERSATION(conv)))
+		return;
+
 	purple_conversation_present(conv);
 }
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Sun Jul 19 08:09:24 2009 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Sun Jul 19 08:17:45 2009 +0000
@@ -714,13 +714,16 @@
     Delete "$INSTDIR\ca-certs\CAcert_Class3.pem"
     Delete "$INSTDIR\ca-certs\CAcert_Root.pem"
     Delete "$INSTDIR\ca-certs\Equifax_Secure_CA.pem"
+    Delete "$INSTDIR\ca-certs\Equifax_Secure_Global_eBusiness_CA-1.pem"
     Delete "$INSTDIR\ca-certs\GTE_CyberTrust_Global_Root.pem"
     Delete "$INSTDIR\ca-certs\Microsoft_Internet_Authority.pem"
     Delete "$INSTDIR\ca-certs\Microsoft_Secure_Server_Authority.pem"
     Delete "$INSTDIR\ca-certs\StartCom_Certification_Authority.pem"
     Delete "$INSTDIR\ca-certs\StartCom_Free_SSL_CA.pem"
+	Delete "$INSTDIR\ca-certs\VeriSign_Class3_Extended_Validation_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem"
+	Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem"
     Delete "$INSTDIR\ca-certs\VeriSign_International_Server_Class_3_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_RSA_Secure_Server_CA.pem"
     RMDir "$INSTDIR\ca-certs"
--- a/po/ChangeLog	Sun Jul 19 08:09:24 2009 +0000
+++ b/po/ChangeLog	Sun Jul 19 08:17:45 2009 +0000
@@ -4,13 +4,18 @@
 	* Armenian translation added (David Avsharyan)
 	* Catalan translation updated (Josep Puigdemont)
 	* Finnish translation updated (Timo Jyrinki)
+	* French translation updated (Éric Boumaour)
+	* Galician translation updated (Frco. Javier Rial Rodríguez)
 	* German translation updated (Jochen Kemnade and Björn Voigt)
+	* Greek translation updated (Bouklis Panos)
 	* Lao translation updated (Anousak Souphavah)
 	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Punjabi translation updated (Amanpreet Singh Alam)
 	* Russian translation updated (Антон Самохвалов)
+	* Simplified Chinese translation updated under new translator (Aron Xu)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Swahili translation added (Paul Msegeya)
-	* Simplified Chinese translation updated under new translator (Aron Xu)
+	* Swedish translation updated (Peter Hjalmarsson)

 version 2.5.8
 	* No changes
--- a/po/el.po	Sun Jul 19 08:09:24 2009 +0000
+++ b/po/el.po	Sun Jul 19 08:17:45 2009 +0000
@@ -2,7 +2,7 @@
 #
 # This file is distributed under the same license as the Pidgin package.
 #
-# Copyright (C) Bouklis Panos <panos@echidna-band.com>, 2005-2008.
+# Copyright (C) Bouklis Panos <panos@echidna-band.com>, 2005-2009.
 # Copyright (C) Panayotis Katsaloulis <panayotis@panayotis.com>, 2005.
 # Copyright (C) Ubuntu Greek Translators <ubuntu-gr@lists.ubuntu.com.>, 2005.
 #
@@ -10,15 +10,15 @@
 msgstr ""
 "Project-Id-Version: pidgin[el]\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2008-12-17 23:56+0200\n"
+"POT-Creation-Date: 2009-07-19 00:16-0700\n"
+"PO-Revision-Date: 2009-07-16 16:48+0300\n"
 "Last-Translator: Bouklis Panos <panos@echidna-band.com>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: Plural-Forms:  nplurals=2; plural=(n != 1)\n"
-"X-Generator: Lokalize 0.2\n"
+"X-Generator: Lokalize 0.3\n"

 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -29,7 +29,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Δοκιμάστε `%s -h' για περισσότερες πληροφορίες.\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -40,11 +40,11 @@
 "  -n, --nologin       don't automatically login\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-"Pidgin %s\n"
+"%s\n"
 "Χρήση: %s [ΕΠΙΛΟΓΉ]...\n"
 "\n"
 "  -c, --config=DIR    χρήση του DIR για τα αρχεία ρυθμίσεων\n"
-"  -d, --debug         τύπωμα των μηνυμάτων αποσφαλμάτωσης στο stdout\n"
+"  -d, --debug         τύπωμα των μηνυμάτων αποσφαλμάτωσης στο stderr\n"
 "  -h, --help          εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "  -n, --nologin       χωρίς αυτόματη είσοδο\n"
 "  -v, --version       εμφάνιση τρέχουσας έκδοσης και έξοδος\n"
@@ -100,7 +100,7 @@

 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "Δημιουργία αυτού του νέου λογαριασμού στον εξυπηρετητή"
+msgstr "Δημιουργία αυτού του λογαριασμού στον εξυπηρετητή"

 #. Cancel button
 #. Cancel
@@ -234,6 +234,8 @@

 msgid "You can edit more information from the context menu later."
 msgstr ""
+"Μπορείτε αργότερα να επεξεργαστείτε περισσότερες πληροφορίες από το σχετικό "
+"μενού."

 msgid "Error adding group"
 msgstr "Σφάλμα κατά την προσθήκη ομάδας"
@@ -278,7 +280,7 @@
 msgstr "Αποκλεισμένος"

 msgid "Show when offline"
-msgstr ""
+msgstr "Εμφάνιση και χωρίς σύνδεση"

 #, c-format
 msgid "Please enter the new name for %s"
@@ -349,7 +351,7 @@
 msgstr "Πρόσθετα"

 msgid "Block/Unblock"
-msgstr "Αποκλεισμός / Ακύρωση αποκλεισμού"
+msgstr "Αποκλεισμός/Ακύρωση αποκλεισμού"

 msgid "Block"
 msgstr "Αποκλεισμός"
@@ -362,7 +364,7 @@
 "Unblock."
 msgstr ""
 "Παρακαλούμε εισάγετε το όνομα χρήστη ή το ψευδώνυμο του ατόμου το οποίο "
-"θέλετε να αποκλείσετε / ακυρώσετε τον αποκλεισμό του."
+"θέλετε να αποκλείσετε/ακυρώσετε τον αποκλεισμό του."

 #. Not multiline
 #. Not masked?
@@ -406,7 +408,7 @@
 msgstr "Αποστολή άμεσου μηνύματος..."

 msgid "Block/Unblock..."
-msgstr "Αποκλεισμός / Ακύρωση αποκλεισμού"
+msgstr "Αποκλεισμός/Ακύρωση αποκλεισμού"

 msgid "Join Chat..."
 msgstr "Συμμετοχή σε συζήτηση..."
@@ -688,7 +690,7 @@
 "τρέχουσα συνομιλία."

 msgid "clear: Clears the conversation scrollback."
-msgstr ""
+msgstr "clear: Καθαρίζει την αναδίφηση της συζήτησης."

 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;εντολή&gt;:  Βοήθεια σε μια συγκεκριμένη εντολή."
@@ -866,9 +868,8 @@
 msgid "System Log"
 msgstr "Καταγραφή συστήματος"

-#, fuzzy
 msgid "Calling ... "
-msgstr "Υπολογισμός..."
+msgstr "Κλήση... "

 msgid "Hangup"
 msgstr ""
@@ -881,25 +882,26 @@
 msgstr "Απόρριψη"

 msgid "Call in progress."
-msgstr ""
+msgstr "Κλήση σε εξέλιξη."

 msgid "The call has been terminated."
-msgstr ""
+msgstr "Η κλήση τερματίστηκε."

 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s επιθυμεί να ξεκινήσει μαζί σας μία συνεδρία ήχου."

 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
-
-#, fuzzy
+"%s προσπαθεί να ξεκινήσει μαζί σας μία συνεδρία πολυμέσων που δεν "
+"υποστηρίζεται."
+
 msgid "You have rejected the call."
-msgstr "Αποχωρίσατε από το κανάλι%s%s"
+msgstr "Απορρίψατε την κλήση."

 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call: Πραγματοποίηση μίας κλήσης ήχου."

 msgid "Emails"
 msgstr "Emails"
@@ -1564,20 +1566,21 @@
 msgstr ""

 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "Δημιουργία TinyURL μόνο για url μεγαλύτερα από αυτό το μήκος"

 msgid "TinyURL (or other) address prefix"
 msgstr ""

-#, fuzzy
 msgid "TinyURL"
-msgstr "URL"
+msgstr "TinyURL"

 msgid "TinyURL plugin"
-msgstr ""
+msgstr "Πρόσθετο TinyURL"

 msgid "When receiving a message with URL(s), TinyURL for easier copying"
 msgstr ""
+"Κατά τη λήψη ενός μηνήματος με URL, χρήση του TinyURL για ευκολότερη "
+"αντιγραφή"

 msgid "accounts"
 msgstr "λογαριασμοί"
@@ -1769,7 +1772,6 @@
 msgstr "+++ %s αποσυνδέθηκε"

 #. Unknown error
-#. Unknown error!
 msgid "Unknown error"
 msgstr "Άγνωστο σφάλμα"

@@ -1816,7 +1818,6 @@
 msgid "%s left the room (%s)."
 msgstr "%s έφυγε από το δωμάτιο (%s)."

-#, fuzzy
 msgid "Invite to chat"
 msgstr "Πρόσκληση σε συζήτηση"

@@ -1959,6 +1960,10 @@
 msgstr "Εκκίνηση μεταφοράς του %s από %s"

 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Η μεταφορά του αρχείου <A HREF=\"file://%s\">%s</A> ολοκληρώθηκε"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Η μεταφορά του αρχείου %s ολοκληρώθηκε"

@@ -2174,9 +2179,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <ΑΥΤΟΜΑΤΗ-ΑΠΑΝΤΗΣΗ>: %s\n"

-#, fuzzy
 msgid "Error creating conference."
-msgstr "Σφάλμα δημιουργίας σύνδεσης"
+msgstr "Σφάλμα δημιουργίας συζήτησης."

 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2585,7 +2589,6 @@
 "καταγραφών."

 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2595,9 +2598,10 @@
 msgstr ""
 "Κατά την προβολή των καταγραφών, αυτό το πρόσθετο θα περιλάβει τις "
 "καταγραφές από άλλους πελάτες άμεσων μηνυμάτων. Αυτή τη στιγμή, αυτό "
-"περιλαμβάνει τα Adium, Fire, Messenger Plus!, MSN Messenger, και Trillian. \n"
+"περιλαμβάνει τα Adium, MSN Messenger, aMSN, και Trillian. \n"
+"\n"
 "ΠΡΟΕΙΔΟΠΟΙΗΣΗ: Αυτό το πρόσθετο είναι ακόμη σε κώδικα aplha και μπορεί να "
-"κρασάρει συχνά.  Χρησιμοποιείστε το με δική σας ευθύνη!"
+"καταρρέει συχνά.  Χρησιμοποιείστε το με δική σας ευθύνη!"

 msgid "Mono Plugin Loader"
 msgstr "Φορτωτής προσθέτων Mono"
@@ -2644,7 +2648,6 @@
 "Αποθήκευση μηνυμάτων που στέλνονται σε έναν αποσυνδεδεμένο χρήστη ως "
 "εφόρμηση."

-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -2681,9 +2684,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "Χωρίς ερώτηση. Πάντα αποθήκευση ως εφόρμηση."

-#, fuzzy
 msgid "One Time Password"
-msgstr "Εισαγωγή κωδικού"
+msgstr "Κωδικός μίας χρήσης"

 #. *< type
 #. *< ui_requirement
@@ -2692,13 +2694,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Υποστήριξη κωδικών μιας χρήσης"

 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Εξαναγκασμός χρήσης κωδικών για μια φορά μόνο."

 #. *  description
 msgid ""
@@ -2706,6 +2708,9 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Σας επιτρέπει να εξαναγκάσετε, ανα λογαριασμό, ώστε οι κωδικοί που δεν "
+"αποθηκεύονται να χρησιμοποιούνται σε μόνο μία επιτυχημένη σύνδεση.\n"
+"Σημείωση: Για να λειτουργήσει δεν πρέπει να αποθηκευτεί ο κωδικός λογαριασμού"

 #. *< type
 #. *< ui_requirement
@@ -2900,18 +2905,15 @@
 "χρησιμοποιήσετε πρόσθετα TCL εγκαταστήστε το ActiveTCL από το http://www."
 "activestate.com\n"

-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"Δε βρέθηκε το σετ εργαλείων Apple Bonjour για Windows, δείτε τις Συχνές "
-"Ερωτήσεις στο: http://d.pidgin.im/BonjourWindows για περισσότερες "
-"πληροφορίες."
-
-#, fuzzy
+"Δε βρέθηκε το σετ εργαλείων της Apple, \"Bonjour για Windows\", δείτε το "
+"http://d.pidgin.im/BonjourWindows για περισσότερες πληροφορίες."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "Αδυναμία ακρόασης εισερχόμενων συνδέσεων άμεσων μηνυμάτων\n"
+msgstr "Αδυναμία ακρόασης εισερχόμενων συνδέσεων άμεσων μηνυμάτων"

 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2951,9 +2953,8 @@
 msgstr ""

 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Συνοικία"
+msgstr "Τοπική θύρα"

 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2965,21 +2966,17 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Αδύνατο να σταλεί το μήνυμα, η συνομιλία δεν ξεκίνησε."

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"Αδυναμία δημιουργίας υποδοχέα\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Αδυναμία δημιουργίας υποδοχέα: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Αδυναμία απαγόρευσης εισόδου σε %s"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"Αδυναμία δημιουργίας υποδοχέα\n"
-"%s"
+msgstr "Αδυναμία ακρόασης στον υποδοχέα: %s"

 msgid "Error communicating with local mDNSResponder."
 msgstr ""
@@ -3028,17 +3025,14 @@
 msgid "Load buddylist from file..."
 msgstr "Φόρτωμα λίστας φίλων από αρχείο..."

-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Συμπληρώστε τα πεδία καταχώρησης."
-
-#, fuzzy
+msgstr "Πρέπει να συμπληρώσετε τα πεδία εγγραφής"
+
 msgid "Passwords do not match"
-msgstr "Οι κωδικοί δεν ταιριάζουν."
-
-#, fuzzy
+msgstr "Οι κωδικοί δεν ταιριάζουν"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Αδυναμία καταχώρησης νέου λογαριασμού. Συνέβη σφάλμα.\n"
+msgstr "Αδυναμία καταχώρησης νέου λογαριασμού. Συνέβη ένα άγνωστο σφάλμα."

 msgid "New Gadu-Gadu Account Registered"
 msgstr "Καταχωρήθηκε νέος λογαριασμός Gadu-Gadu"
@@ -3196,9 +3190,9 @@
 msgid "Chat _name:"
 msgstr "Όνομα _συζήτησης:"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Αδύνατη η σύνδεση με τον εξυπηρετητή."
+msgstr ""

 #. 1. connect to server
 #. connect to the server
@@ -3211,9 +3205,8 @@
 msgid "This chat name is already in use"
 msgstr "Αυτό το όνομα συζήτησης χρησιμοποιείται ήδη"

-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Δεν είστε συνδεδεμένοι με τον εξυπηρετητή."
+msgstr "Δεν υπάρχει σύνδεση με τον εξυπηρετητή"

 msgid "Find buddies..."
 msgstr "Εύρεση φίλων..."
@@ -3254,9 +3247,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Χρήστης Gadu-Gadu"

-#, fuzzy
 msgid "GG server"
-msgstr "Λήψη εξυπηρετητή"
+msgstr "Εξυπηρετητής GG"

 #, c-format
 msgid "Unknown command: %s"
@@ -3272,9 +3264,8 @@
 msgid "File Transfer Failed"
 msgstr "Αποτυχία μεταφοράς αρχείου"

-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "Αδυναμία ανοίγματος μιας θύρας ακρόασης."
+msgstr "Αδυναμία ανοίγματος μιας θύρας ακρόασης"

 msgid "Error displaying MOTD"
 msgstr "Σφάλμα εμφάνισης μηνύματος της ημέρας"
@@ -3296,11 +3287,9 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"Η σύνδεση με τον εξυπηρετητή χάθηκε:\n"
-"%s"
+msgstr "Η σύνδεση με τον εξυπηρετητή χάθηκε: %s"

 msgid "View MOTD"
 msgstr "Εμφάνιση μηνύματος της ημέρας"
@@ -3311,9 +3300,8 @@
 msgid "_Password:"
 msgstr "_Κωδικός:"

-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Τα ψευδώνυμα IRC δεν πρέπει να περιέχουν κενά"
+msgstr "Τα ψευδώνυμα και οι εξυπηρετητές IRC δεν πρέπει να περιέχουν κενά"

 msgid "SSL support unavailable"
 msgstr "Υποστήριξη SSL μη διαθέσιμη"
@@ -3322,11 +3310,11 @@
 msgstr "Αδυναμία σύνδεσης"

 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Αδυναμία σύνδεσης με %s"
-
-#, fuzzy, c-format
+msgstr "Αδυναμία σύνδεσης: %s"
+
+#, c-format
 msgid "Server closed the connection"
 msgstr "Ο εξυπηρετητής έκλεισε τη σύνδεση"

@@ -3512,13 +3500,12 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "Αυτό το όνομα συζήτησης χρησιμοποιείται ήδη"
-
-#, fuzzy
+msgstr "Το ψευδώνυμο \"%s\" χρησιμοποιείται ήδη."
+
 msgid "Nickname in use"
-msgstr "Ψευδώνυμο"
+msgstr "Ψευδώνυμο που χρησιμοποιείται"

 msgid "Cannot change nick"
 msgstr "Δεν είναι δυνατή η αλλαγή του ψευδωνύμου"
@@ -3761,15 +3748,11 @@
 msgid "execute"
 msgstr "εκτέλεση"

-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"Ο εξυπηρετητής απαιτεί TLS/SSL για να γίνει σύνδεση.  Δε βρέθηκε υποστήριξη "
-"TLS/SSL."
-
-#, fuzzy
+msgstr "Ο εξυπηρετητής απαιτεί TLS/SSL, όμως δε βρέθηκε υποστήριξη TLS/SSL."
+
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Θέλετε κρυπτογράφηση αλλά δε βρέθηκε υποστήριξη TLS/SSL."
+msgstr "Θέλετε κρυπτογράφηση, όμως δε βρέθηκε υποστήριξη TLS/SSL."

 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
@@ -3787,13 +3770,11 @@
 msgid "Plaintext Authentication"
 msgstr "Έγκριση με σκέτο κείμενο"

-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Αποτυχία έγκρισης"
-
-#, fuzzy
+msgstr "Αποτυχία έγκρισης SASL"
+
 msgid "Invalid response from server"
-msgstr "Λανθασμένη ανταπόκριση του εξυπηρετητή."
+msgstr "Λανθασμένη ανταπόκριση του εξυπηρετητή"

 msgid "Server does not use any supported authentication method"
 msgstr "Ο εξυπηρετητής δε χρησιμοποιεί καμία υποστηριζόμενη μέθοδο έγκρισης"
@@ -3805,36 +3786,28 @@
 msgid "Invalid challenge from server"
 msgstr "Μη έγκυρη πρόκληση από τον εξυπηρετητή"

-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "Σφάλμα SASL"
+msgstr "Σφάλμα SASL: %s"

 msgid "The BOSH connection manager terminated your session."
 msgstr ""

-#, fuzzy
 msgid "No session ID given"
-msgstr "Δεν δόθηκε αιτία"
-
-#, fuzzy
+msgstr "Δε δόθηκε ID συνεδρίας"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Μη υποστηριζόμενη έκδοση"
-
-#, fuzzy
+msgstr "Μη υποστηριζόμενη έκδοση του πρωτοκόλλου BOSH"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή:\n"
-"%s"
-
-#, fuzzy
+msgstr "Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Αδυναμία δημιουργίας σύνδεσης"
+msgstr "Αδυναμίας δημιουργίας σύνδεσης SSL"

 msgid "Full Name"
 msgstr "Ονοματεπώνυμο"
@@ -3902,9 +3875,8 @@
 msgid "Operating System"
 msgstr "Λειτουργικό σύστημα"

-#, fuzzy
 msgid "Local Time"
-msgstr "Τοπικό αρχείο:"
+msgstr "Τοπική ώρα"

 msgid "Priority"
 msgstr "Προτεραιότητα"
@@ -3916,9 +3888,8 @@
 msgid "%s ago"
 msgstr ""

-#, fuzzy
 msgid "Logged Off"
-msgstr "Συνδεδεμένος"
+msgstr "Αποσυνδεδεμένος"

 msgid "Middle Name"
 msgstr "Πατρώνυμο"
@@ -4086,19 +4057,15 @@
 msgid "Find Rooms"
 msgstr "Εύρεση δωματίων"

-#, fuzzy
 msgid "Affiliations:"
-msgstr "Γνωστός ως:"
-
-#, fuzzy
+msgstr ""
+
 msgid "No users found"
-msgstr "Δε βρέθηκαν χρήστες που να ταιριάζουν"
-
-#, fuzzy
+msgstr "Δε βρέθηκαν χρήστες"
+
 msgid "Roles:"
-msgstr "Ρόλος"
-
-#, fuzzy
+msgstr "Ρόλοι:"
+
 msgid "Ping timed out"
 msgstr "Τέλος χρονικού ορίου για ping"

@@ -4113,9 +4080,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr ""

-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "Αποτυχία σύνδεσης με τον εξυπηρετητή."
+msgstr "Παραμορφωμένο BOSH URL"

 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4187,10 +4153,6 @@
 msgid "Change Registration"
 msgstr "Αλλαγή καταχώρησης"

-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "Αποτυχία σύνδεσης με τον εξυπηρετητή."
-
 msgid "Error unregistering account"
 msgstr "Σφάλμα κατά την διαγραφή της καταχώρησης του λογαριασμού"

@@ -4210,7 +4172,7 @@
 msgstr "Επανεκκίνηση ροής"

 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "Ο εξυπηρετητής δεν υπηστηρίζει αποκλεισμούς"

 msgid "Not Authorized"
 msgstr "Δεν εγκρίθηκε"
@@ -4503,35 +4465,34 @@
 msgid "%s has buzzed you!"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Αδυναμία αποστολής αρχείου σε %s, μη έγκυρο JID"
-
-#, fuzzy, c-format
+msgstr "Αδυναμία εκκίνησης πολυμέσων με %s: μη έγκυρο JID"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Αδυναμία αποστολής αρχείου σε %s, ο χρήστης δεν είναι συνδεδεμένος"
+msgstr "Αδυναμία εκκίνησης πολυμέσων με %s: ο χρήστης δεν είναι συνδεδεμένος"

 #, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""

-#, fuzzy
 msgid "Media Initiation Failed"
-msgstr "Αποτυχία καταχώρησης"
-
-#, fuzzy, c-format
+msgstr "Αδυναμία εκκίνησης πολυμέσων"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
-"Παρακαλούμε επιλέξτε την πηγή του %s στο οποίο θέλετε να στείλετε ένα αρχείο"
+"Παρακαλούμε εισάγετε την πηγή του %s με την οποία θέλετε να ξεκινήσετε τη "
+"συνεδρία πολυμέσων."

 msgid "Select a Resource"
 msgstr "Επιλογή πηγής"

-#, fuzzy
 msgid "Initiate Media"
-msgstr "Έναρξη _συζήτησης"
+msgstr "Έναρξη πολυμέσων"

 msgid "config:  Configure a chat room."
 msgstr "config:  Ρύθμιση του δωματίου συζήτησης."
@@ -4557,13 +4518,12 @@
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""

-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;χρήστης&gt; &lt;moderator|participant|visitor|none&gt;: Ορίζει το "
-"ρόλο ενός χρήστη στο δωμάτιο."
+"role &lt;moderator|participant|visitor|none&gt; [ψευδώνυμο 1] [ψευδώνυμο "
+"2] ... : Ορίζει το ρόλο ενός χρήστη στο δωμάτιο."

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;χρήστης&gt; [μήνυμα]:  Πρόσκληση ενός χρήστη στο δωμάτιο."
@@ -4627,7 +4587,7 @@
 msgstr "Διαμεσολαβητές μεταφοράς αρχείων"

 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"

 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4691,29 +4651,25 @@
 msgid "_Accept Defaults"
 msgstr "_Αποδοχή προεπιλεγμένων"

-#, fuzzy
 msgid "No reason"
-msgstr "Δεν δόθηκε αιτία"
-
-#, fuzzy, c-format
+msgstr "Χωρίς αιτία"
+
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Έχετε εκδιωχθεί από τον %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Έχετε εκδιωχθεί: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Εκδιωγμένος από τον %s (%s)"
-
-#, fuzzy
+msgstr "Εκδιωγμένος (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Ένα σφάλμα συνέβη κατά το άνοιγμα του αρχείου."
-
-#, fuzzy
+msgstr ""
+
 msgid "Transfer was closed."
-msgstr "Αποτυχία μεταφοράς αρχείου"
-
-#, fuzzy
+msgstr "Η μεταφορά έκλεισε."
+
 msgid "Failed to open the file"
-msgstr "Αποτυχία κατά το άνοιγμα του αρχείου '%s': %s"
+msgstr "Αποτυχία κατά το άνοιγμα του αρχείου"

 msgid "Failed to open in-band bytestream"
 msgstr ""
@@ -5039,21 +4995,38 @@
 msgid "Non-IM Contacts"
 msgstr "Επαφές μη-άμεσων μηνυμάτων"

-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr ""
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s σας έστειλε πρόσκληση με κάμερα, κάτι το οποίο δεν υποστηρίζεται ακόμα."
+"%s σας έστειλε πρόσκληση για συζήτηση με φωνή, κάτι το οποίο δεν "
+"υποστηρίζεται ακόμα."

 msgid "Nudge"
-msgstr ""
+msgstr "Σκούντηγμα"

 #, c-format
 msgid "%s has nudged you!"
-msgstr ""
+msgstr "%s σας σκούντηξε"

 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "Σκούντηγμα %s..."

 msgid "Email Address..."
 msgstr "Διεύθυνση email..."
@@ -5171,7 +5144,7 @@
 msgstr "Ορισμός τηλεφώνου εργασίας..."

 msgid "Set Mobile Phone Number..."
-msgstr "Ορισμός κινητού τηλεφώνου..."
+msgstr "Ορισ�ός κινητού τηλεφώνου..."

 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ενεργοποίηση/Απενεργοποίηση φορητών συσκευών..."
@@ -5196,6 +5169,30 @@
 "Χρειάζεται υποστήριξη SSL για το MSN. Παρακαλούμε εγκαταστήστε μία "
 "υποστηριζόμενη βιβλιοθήκη SSL."

+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Δεν ήταν δυνατή η προσθήκη του φίλου %s επειδή το όνομα χρήστη δεν είναι "
+"έγκυρο.  Τα ονόματα χρήστη πρέπει να είναι μία έγκυρη διεύθυνση ηλεκτρονικού "
+"ταχυδρομείου."
+
+msgid "Unable to Add"
+msgstr "Αδυναμία προσθήκης"
+
+msgid "Authorization Request Message:"
+msgstr "Μήνυμα αίτησης έγκρισης:"
+
+msgid "Please authorize me!"
+msgstr "Παρακαλώ δώστε μου έγκριση!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Εντάξει"
+
 msgid "Error retrieving profile"
 msgstr "Σφάλμα κατά τη λήψη του προφίλ"

@@ -5376,7 +5373,7 @@
 msgstr "Εμφάνισε τις προσαρμοσμένες φατσούλες"

 msgid "nudge: nudge a user to get their attention"
-msgstr ""
+msgstr "nudge: σκούντηγμα ενός χρήστη για να ζητήσετε την προσοχή του"

 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Έγκριση Windows Live ID:Αδυναμία σύνδεσης"
@@ -5386,15 +5383,16 @@

 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%s μόλις σας σκούντηξε!"
+
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Άγνωστο σφάλμα (%d)"
+msgstr "Άγνωστο σφάλμα (%d): %s"

 msgid "Unable to add user"
 msgstr "Αδυναμία προσθήκης χρήστη"

+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Άγνωστο σφάλμα (%d)"
@@ -5463,26 +5461,22 @@
 "Σφάλμα σύνδεσης από %s διακομιστή:\n"
 "%s"

-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Το πρωτόκολλό μας δεν υποστηρίζεται από τον εξυπηρετητή."
-
-#, fuzzy
+msgstr "Το πρωτόκολλό μας δεν υποστηρίζεται από τον εξυπηρετητή"
+
 msgid "Error parsing HTTP"
-msgstr "Σφάλμα ανάλυσης HTTP."
-
-#, fuzzy
+msgstr "Σφάλμα ανάλυσης HTTP"
+
 msgid "You have signed on from another location"
-msgstr "Έχετε συνδεθεί από άλλη τοποθεσία."
+msgstr "Έχετε συνδεθεί από άλλη τοποθεσία"

 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Οι εξυπηρετητές του MSN είναι προσωρινά μη διαθέσιμοι. Παρακαλούμε "
 "περιμένετε και ξαναδοκιμάστε."

-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "Οι εξυπηρετητές του MSN κλείνουν προσωρινά."
+msgstr "Οι εξυπηρετητές του MSN κλείνουν προσωρινά"

 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5512,7 +5506,7 @@
 msgid "Retrieving buddy list"
 msgstr "Λήψη λίστας φίλων"

-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
 "%s σας έστειλε πρόσκληση με κάμερα, κάτι το οποίο δεν υποστηρίζεται ακόμα."
@@ -5714,16 +5708,16 @@
 msgid "Protocol error, code %d: %s"
 msgstr "Σφάλμα πρωτοκόλλου, κώδικας %d: %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Ο κωδικό σας είναι %d χαρακτήρες, μεγαλύτερος από το μέγιστο επιτρεπόμενο "
-"μήκος των %d για το MySpaceIM. Παρακαλούμε μικρύνετε τον κωδικό σας στο "
-"http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword και δοκιμάστε ξανά."
+"%s Ο κωδικός σας είναι %zu χαρακτήρες, μεγαλύτερος από το μέγιστο "
+"επιτρεπόμενο μήκος των %d. Παρακαλούμε μικρύνετε τον κωδικό σας στο http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"και δοκιμάστε ξανά."

 msgid "Incorrect username or password"
 msgstr "Λανθασμένο όνομα χρήστη ή κωδικός."
@@ -6085,9 +6079,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "Άγνωστο σφάλμα: 0x%X"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Αδυναμία εισόδου"
+msgstr "Αδυναμία εισόδου: %s"

 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6227,7 +6221,6 @@
 "%s φαίνεται ότι δεν είναι συνδεδεμένος και δεν έλαβε το μήνυμα που μόλις "
 "στείλατε."

-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6257,9 +6250,8 @@
 msgid "Server port"
 msgstr "Θύρα εξυπηρετητή"

-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "Λήφθηκε αναπάντεχη ανταπόκριση HTTP από τον εξυπηρετητή."
+msgstr "Λήφθηκε αναπάντεχη ανταπόκριση από "

 #. username connecting too frequently
 msgid ""
@@ -6270,9 +6262,9 @@
 "ξαναπροσπαθήστε. Αν συνεχίσετε να προσπαθείτε, θα πρέπει να περιμένετε ακόμα "
 "περισσότερο."

-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Σφάλμα εύρεσης του %s"
+msgstr "Σφάλμα αίτησης "

 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
@@ -6283,9 +6275,8 @@
 msgid "Invalid chat room name"
 msgstr "Μη έγκυρο όνομα δωματίου"

-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "Λήφθηκαν μη έγκυρα δεδομένα κατά τη σύνδεση με τον εξυπηρετητή."
+msgstr "Λήφθηκαν μη έγκυρα δεδομένα κατά τη σύνδεση με τον εξυπηρετητή"

 #. *< type
 #. *< ui_requirement
@@ -6333,7 +6324,6 @@
 msgstr ""
 "Λήφθηκαν μη έγκυρα δεδομένα κατά τη σύνδεση με τον απομακρυσμένο χρήστη."

-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "Δεν ήταν δυνατή η δημιουργία σύνδεσης με τον απομακρυσμένο χρήστη."

@@ -6537,15 +6527,13 @@
 msgid "Buddy Comment"
 msgstr "Σχόλιο φίλου"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή πιστοποίησης:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή πιστοποίησης: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Αδύνατη η σύνδεση με τον εξυπηρετητή."
+msgstr "Δεν ήταν δυνατή η σύνδεση με τον εξυπηρετητή BOS: %s"

 msgid "Username sent"
 msgstr "Το όνομα χρήστη στάλθηκε"
@@ -6557,20 +6545,22 @@
 msgid "Finalizing connection"
 msgstr "Ολοκλήρωση σύνδεσης"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to 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 ""
-"Αδυναμία εισόδου: Δεν ήταν δυνατό να συνδεθείτε ως %s επειδή το όνομα χρήστη "
-"δεν είναι έγκυρο.  Τα ονόματα χρήστη πρέπει είτε να είναι μία έγκυρη "
-"διεύθυνση ηλεκτρονικού ταχυδρομείου, είτε να ξεκινούν με ένα γράμμα και να "
-"περιέχουν μόνο γράμματα, αριθμούς και κενά, είτε να περιέχουν μόνο αριθμούς."
-
-#, fuzzy, c-format
+"Αδυναμία εισόδου ως %s επειδή το όνομα χρήστη δεν είναι έγκυρο.  Τα ονόματα "
+"χρήστη πρέπει είτε να είναι μία έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου, "
+"είτε να ξεκινούν με ένα γράμμα και να περιέχουν μόνο γράμματα, αριθμούς και "
+"κενά, είτε να περιέχουν μόνο αριθμούς."
+
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Αποσυνδεθήκατε πολύ γρήγορα.  Ελέγξτε το %s για αναβαθμίσεις."
+msgstr ""
+"Μπορεί να αποσυνδεθείτε πολύ γρήγορα.  Αν γίνει αυτό, ελέγξτε το %s για "
+"αναβαθμίσεις."

 msgid "Unable to get a valid AIM login hash."
 msgstr "Αδυναμία λήψης ενός έγκυρου hash εισόδου στο AIM."
@@ -6584,19 +6574,18 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "Ο χρήστης δεν υπάρχει"
+msgstr "Το όνομα χρήστη δεν υπάρχει"

 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Ο λογαριασμός σας είναι προς το παρόν σε αναστολή."
+msgstr "Ο λογαριασμός σας είναι προς το παρόν σε αναστολή"

 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Η υπηρεσία AOL Instant Messenger είναι προσωρινά μη διαθέσιμη."

+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
@@ -6604,18 +6593,16 @@
 "σε %s"

 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"Συνδεόσασταν και αποσυνδεόσασταν πολύ γρήγορα. Περιμένετε δέκα λεπτά και "
+"Συνδεόσασταν και αποσυνδεόσασταν πολύ γρήγορα. Περιμένετε ένα λεπτό και "
 "ξαναπροσπαθήστε. Αν συνεχίσετε να προσπαθείτε, θα πρέπει να περιμένετε ακόμα "
 "περισσότερο."

-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο."
+msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"

 msgid "Enter SecurID"
 msgstr "Εισαγωγή SecurID"
@@ -6623,12 +6610,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Δώστε τα 6 ψηφία από τη ψηφιακή οθόνη."

-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_Εντάξει"
-
 msgid "Password sent"
 msgstr "Κωδικός στάλθηκε"

@@ -6639,12 +6620,6 @@
 msgstr ""
 "Παρακαλώ δώστε μου έγκριση ώστε να μπορώ να σας προσθέσω στη λίστα φίλων μου."

-msgid "Authorization Request Message:"
-msgstr "Μήνυμα αίτησης έγκρισης:"
-
-msgid "Please authorize me!"
-msgstr "Παρακαλώ δώστε μου έγκριση!"
-
 msgid "No reason given."
 msgstr "Δεν δόθηκε αιτία."

@@ -6976,7 +6951,7 @@
 msgid "Away message too long."
 msgstr "Πολύ μεγάλο μήνυμα απουσίας."

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to 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, "
@@ -6987,9 +6962,6 @@
 "ταχυδρομείου, ή ξεκινούν με ένα γράμμα και να  περιέχουν μόνο γράμματα, "
 "αριθμούς και κενά, ή να περιέχουν μόνο αριθμούς."

-msgid "Unable to Add"
-msgstr "Αδυναμία προσθήκης"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Αδυναμία λήψης της λίστας φίλων"

@@ -7003,7 +6975,7 @@
 msgid "Orphans"
 msgstr "Ορφανά"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
@@ -7014,7 +6986,7 @@
 msgid "(no name)"
 msgstr "(χωρίς όνομα)"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Δεν ήταν δυνατή η προσθήκη του φίλου %s για άγνωστο λόγο."

@@ -7180,9 +7152,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Αναζήτηση φίλου με πληροφορίες"

-#, fuzzy
 msgid "Use clientLogin"
-msgstr "Ο χρήστης δεν είναι συνδεδεμένος"
+msgstr ""

 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7381,24 +7352,20 @@
 msgstr "Σημείωση"

 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Εικονίδιο φίλου"
+msgstr ""

 msgid "Change his/her memo as you like"
 msgstr ""

-#, fuzzy
 msgid "_Modify"
-msgstr "Τροποποίηση"
-
-#, fuzzy
+msgstr "_Τροποποίηση"
+
 msgid "Memo Modify"
-msgstr "Τροποποίηση"
-
-#, fuzzy
+msgstr ""
+
 msgid "Server says:"
-msgstr "Ο εξυπηρετητής είναι απασχολημένος"
+msgstr "Ο εξυπηρετητής λέει:"

 msgid "Your request was accepted."
 msgstr ""
@@ -7677,7 +7644,7 @@

 #, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr ""
+msgstr "<b>Αποστολή ξανά</b>: %lu<br>\n"

 #, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
@@ -7712,11 +7679,10 @@
 msgstr ""

 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr ""
-
-#, fuzzy
+msgstr "<p><b>Αναγνώριση</b>:<br>\n"
+
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b>Αρχικός συγγραφέας</b>:<br>\n"
+msgstr "<p><b>Προσεκτικοί Δοκιμαστές</b>:<br>\n"

 msgid "and more, please let me know... thank you!))"
 msgstr ""
@@ -7746,9 +7712,8 @@
 msgid "About OpenQ"
 msgstr "Σχετικά με το OpenQ"

-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "Τροποποίηση διεύθυνσης"
+msgstr ""

 #. *< type
 #. *< ui_requirement
@@ -7788,7 +7753,7 @@
 msgstr "Εμφάνιση νέων εξυπηρετητή"

 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "Εμφάνιση δωματίου συζήτησης όταν λαμβάνεται μήνυμα"

 msgid "Keep alive interval (seconds)"
 msgstr ""
@@ -7796,9 +7761,8 @@
 msgid "Update interval (seconds)"
 msgstr ""

-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "Δεν ήταν δυνατή η απόκρυψη της απάντησης του εξυπηρετητή"
+msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση της απάντησης του εξυπηρετητή"

 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -7864,9 +7828,8 @@
 msgid "Requesting token"
 msgstr ""

-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "Αδύνατη η σύνδεση με τον εξυπηρετητή."
+msgstr ""

 msgid "Invalid server or port"
 msgstr "Μη έγκυρος εξυπηρετητής ή θύρα"
@@ -7919,7 +7882,6 @@
 msgid "QQ Qun Command"
 msgstr "Εντολή QQ Qun"

-#, fuzzy
 msgid "Unable to decrypt login reply"
 msgstr "Δεν ήταν δυνατή η αποκρυπτογράφηση της απάντησης εισόδου"

@@ -8895,7 +8857,6 @@
 msgid "Disconnected by server"
 msgstr "Έγινε αποσύνδεση από τον εξυπηρετητή"

-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "Σφάλμα κατά τη σύνδεση με τον εξυπηρετητή SILC"

@@ -8911,24 +8872,21 @@
 msgid "Performing key exchange"
 msgstr "Γίνεται ανταλλαγή κλειδιού"

-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "Αδυναμία φορτώματος του κλειδιού SILC"
+msgstr "Αδυναμία φορτώματος του ζεύγους κλειδιών SILC"

 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Γίνεται σύνδεση με τον εξυπηρετητή SILC"

-#, fuzzy
 msgid "Unable to not load SILC key pair"
-msgstr "Αδυναμία φορτώματος του κλειδιού SILC"
+msgstr "Αδυναμία μη φορτώματος του ζεύγους κλειδιών SILC"

 msgid "Out of memory"
 msgstr "Τέλος μνήμης"

-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "Αδυναμία εκκίνησης πρωτοκόλλου SILC"
+msgstr "Αδυναμία αρχικοποίησης πρωτοκόλλου SILC"

 msgid "Error loading SILC key pair"
 msgstr "Σφάλμα κατά το φόρτωμα του κλειδιού SILC"
@@ -9235,9 +9193,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Δημιουργία κλειδιού SILC..."

-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Αδύνατη η δημιουργία κλειδιού SILC\n"
+msgstr "Αδύνατη η δημιουργία του ζεύγους κλειδιών SILC"

 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9376,34 +9333,30 @@
 msgid "Failure: Authentication failed"
 msgstr "Αποτυχία: Η έγκρισή απέτυχε"

-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Αδυναμία έναρξης σύνδεσης του πελάτη SILC"
+msgstr "Αδυναμία αρχικοποίησης σύνδεσης του πελάτη SILC"

 msgid "John Noname"
 msgstr "Γιάννης Χωρίς-όνομα"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Δεν ήταν δυνατό το φόρτωμα του ζεύγους κλειδιών SILC: %s"

 msgid "Unable to create connection"
 msgstr "Αδυναμία δημιουργίας σύνδεσης"

-#, fuzzy
 msgid "Unknown server response"
-msgstr "Άγνωστη απάντηση εξυπηρετητή."
-
-#, fuzzy
+msgstr "Άγνωστη απάντηση εξυπηρετητή"
+
 msgid "Unable to create listen socket"
-msgstr "Αδυναμία δημιουργίας υποδοχέα"
+msgstr "Αδυναμία δημιουργίας υποδοχέα ακρόασης"

 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Τα ονόματα χρήστη χρηστών SIP δεν πρέπει να περιέχουν κενά ή σύμβολα @"

-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "Εμφάνιση μηνύματος εξυπηρετητή"
+msgstr "Δεν ορίστηκε εξυπηρετητής SIP"

 #. *< type
 #. *< ui_requirement
@@ -9461,9 +9414,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Πρόσθετο πρωτοκόλλου Yahoo"
+msgstr "Πρόσθετο πρωτοκόλλου Yahoo!"

 msgid "Pager server"
 msgstr "Εξυπηρετητής τηλεειδοποίησης"
@@ -9492,9 +9444,8 @@
 msgid "Yahoo Chat port"
 msgstr "Θύρα συζητήσεων Yahoo"

-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo ID..."
+msgstr "Yahoo JAPAN ID..."

 #. *< type
 #. *< ui_requirement
@@ -9506,12 +9457,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Πρόσθετο πρωτοκόλλου Yahoo"
+msgstr "Πρόσθετο πρωτοκόλλου Yahoo! JAPAN"

 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Το SMS σας δεν παραδόθηκε"

 msgid "Your Yahoo! message did not get sent."
 msgstr "Το μήνυμα σας Yahoo! δε στάλθηκε."
@@ -9537,32 +9487,28 @@
 msgstr "Η προσθήκη φίλου απορρίφθηκε"

 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "Λήφθηκαν μη έγκυρα δεδομένα κατά τη σύνδεση με τον εξυπηρετητή."
+msgstr "Λήφθηκαν μη έγκυρα δεδομένα"

 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Άγνωστο σφάλμα με αριθμό %d. Αν συνδεθείτε στην ιστοσελίδα του Yahoo! ίσως "
-"διορθωθεί."
+"Ο λογαριασμός κλειδώθηκε: Πολλές αποτυχημένες προσπάθειες εισόδου. Η είσοδος "
+"στην ιστοσελίδα του Yahoo! πιθανώς να το διορθώσει αυτό."

 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Άγνωστο σφάλμα με αριθμό %d. Αν συνδεθείτε στην ιστοσελίδα του Yahoo! ίσως "
-"διορθωθεί."
+"Ο λογαριασμός κλειδώθηκε: Άγνωστη αιτία. Η είσοδος στην ιστοσελίδα του "
+"Yahoo! πιθανώς να το διορθώσει αυτό."

 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Λανθασμένο όνομα χρήστη ή κωδικός."
+msgstr "Λείπει το όνομα χρήστη ή ο κωδικός."

 #, c-format
 msgid ""
@@ -9599,13 +9545,12 @@
 "Άγνωστο σφάλμα με αριθμό %d. Αν συνδεθείτε στην ιστοσελίδα του Yahoo! ίσως "
 "διορθωθεί."

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Δεν ήταν δυνατή η προσθήκη του φίλου %s στην ομάδα %s της λίστας εξυπηρετητή "
-"στο λογαριασμό %s."
-
-#, fuzzy
+"Δεν ήταν δυνατή η προσθήκη του φίλου %s στην ομάδα %s στη λίστα του "
+"εξυπηρετητή για το λογαριασμό %s."
+
 msgid "Unable to add buddy to server list"
 msgstr "Δεν ήταν δυνατή η προσθήκη του φίλου στη λίστα εξυπηρετητή"

@@ -9613,21 +9558,16 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ %s/%s/%s.swf με ήχο ] %s"

-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Λήφθηκε αναπάντεχη ανταπόκριση HTTP από τον εξυπηρετητή."
-
-#, fuzzy, c-format
+msgstr "Λήφθηκε αναπάντεχη ανταπόκριση HTTP από τον εξυπηρετητή"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Χάθηκε η σύνδεση με %s:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Χάθηκε η σύνδεση με %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"Αδυναμία δημιουργίας σύνδεσης με τον εξυπηρετητή:\n"
-"%s"
+msgstr "Αδυναμία δημιουργίας σύνδεσης με %s: %s"

 msgid "Not at Home"
 msgstr "Εκτός σπιτιού"
@@ -9834,9 +9774,8 @@
 msgid "User Rooms"
 msgstr "Δωμάτια χρηστών"

-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Πρόβλημα σύνδεσης με τον εξυπηρετητή YCHT."
+msgstr "Πρόβλημα σύνδεσης με τον εξυπηρετητή YCHT"

 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9955,15 +9894,15 @@
 msgid "Exposure"
 msgstr "Έκθεση"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Αδυναμία ανάλυσης της ανταπόκρισης του διακομιστή HTTP: %s\n"
+msgstr "Αδυναμία ανάλυσης της ανταπόκρισης του διακομιστή HTTP: %s"

 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Σφάλμα σύνδεσης διαμεσολαβητή HTTP %d"

-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Άρνηση πρόσβασης: ο διαμεσολαβητής HTTP απαγορεύει την σηράγγωση της θύρας %"
@@ -10211,7 +10150,7 @@
 msgid "Error Reading %s"
 msgstr "Σφάλμα ανάγνωσης του %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
@@ -10261,7 +10200,7 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Χρήση αυτού του _εικονιδίου φίλου για αυτόν το λογαριασμό."

-msgid "_Advanced"
+msgid "Ad_vanced"
 msgstr "_Για προχωρημένους"

 msgid "Use GNOME Proxy Settings"
@@ -10324,9 +10263,8 @@
 msgid "Create _this new account on the server"
 msgstr "Δημιουργία αυτού του νέου _λογαριασμού στον εξυπηρετητή"

-#, fuzzy
-msgid "_Proxy"
-msgstr "Διαμεσολαβητής"
+msgid "P_roxy"
+msgstr "_Διαμεσολαβητής"

 msgid "Enabled"
 msgstr "Ενεργοποιήθηκε"
@@ -10374,9 +10312,8 @@
 msgid "Please update the necessary fields."
 msgstr "Παρακαλούμε ανανεώστε τα απαραίτητα πεδία."

-#, fuzzy
 msgid "A_ccount"
-msgstr "_Λογαριασμός:"
+msgstr "_Λογαριασμός"

 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10403,16 +10340,14 @@
 msgid "I_M"
 msgstr "_Μήνυμα"

-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Προσθήκη συζήτησης"
+msgstr "Κλήση _ήχου"

 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Ήχος/_Κλήση βίντεο"
+
 msgid "_Video Call"
-msgstr "Βιντεοσυνομιλία"
+msgstr "Κλήση _βίντεο"

 msgid "_Send File..."
 msgstr "_Αποστολή αρχείου..."
@@ -10426,9 +10361,8 @@
 msgid "Hide When Offline"
 msgstr ""

-#, fuzzy
 msgid "Show When Offline"
-msgstr "Εμφάνιση μη συνδεδεμένων φίλων"
+msgstr "Εμφάνιση και χωρίς σύνδεση"

 msgid "_Alias..."
 msgstr "_Γνωστός ως..."
@@ -10465,7 +10399,7 @@
 msgstr ""

 msgid "_Edit Settings..."
-msgstr "_Επεξεργασία ρυθμίσεων..."
+msgstr "_Επεξεργασία ρυ�μίσεων..."

 msgid "_Collapse"
 msgstr "_Σύμπτυξη"
@@ -10554,9 +10488,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/Εργαλεία/_Πιστοποιητικά"

-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Εργαλεία/Smile_y"
+msgstr "/Εργαλεία/Προσαρμοσμένες _φατσούλες"

 msgid "/Tools/Plu_gins"
 msgstr "/Εργαλεία/_Πρόσθετα"
@@ -10702,7 +10635,7 @@
 msgstr "Επανενεργοποίηση"

 msgid "SSL FAQs"
-msgstr ""
+msgstr "Συχνές ερωτήσεις SSL"

 msgid "Welcome back!"
 msgstr "Καλώς ήρθατε πίσω!"
@@ -10835,92 +10768,79 @@
 msgid "Background Color"
 msgstr "Χρώμα παρασκηνίου"

-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "Αυτή η ομάδα προστέθηκε στη λίστα φίλων σας"
-
-#, fuzzy
+msgstr "Το χρώμα παρασκηνίου της λίστας φίλων"
+
 msgid "Layout"
-msgstr "Αποσύνδεση"
+msgstr ""

 msgid "The layout of icons, name, and status of the blist"
 msgstr ""

 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Χρώμα παρασκηνίου"
+msgstr ""

 msgid "The background color of an expanded group"
 msgstr ""

-#, fuzzy
 msgid "Expanded Text"
-msgstr "_Ανάπτυξη"
+msgstr ""

 msgid "The text information for when a group is expanded"
 msgstr ""

-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "Επιλογή χρώματος παρασκηνίου"
+msgstr ""

 msgid "The background color of a collapsed group"
 msgstr ""

-#, fuzzy
 msgid "Collapsed Text"
-msgstr "_Σύμπτυξη"
+msgstr ""

 msgid "The text information for when a group is collapsed"
 msgstr ""

 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Επιλογή χρώματος παρασκηνίου"
+msgstr "Χρώμα παρασκηνίου συζητήσεων/επαφών"

 msgid "The background color of a contact or chat"
 msgstr ""

-#, fuzzy
 msgid "Contact Text"
-msgstr "Συντόμευση"
+msgstr "Κείμενο επαφών"

 msgid "The text information for when a contact is expanded"
 msgstr ""

-#, fuzzy
 msgid "On-line Text"
-msgstr "Συνδεδεμένος"
+msgstr ""

 msgid "The text information for when a buddy is online"
 msgstr ""

-#, fuzzy
 msgid "Away Text"
-msgstr "Απών"
+msgstr ""

 msgid "The text information for when a buddy is away"
 msgstr ""

-#, fuzzy
 msgid "Off-line Text"
-msgstr "Χωρίς σύνδεση"
+msgstr ""

 msgid "The text information for when a buddy is off-line"
 msgstr ""

-#, fuzzy
 msgid "Idle Text"
-msgstr "Κείμενο διάθεσης"
+msgstr ""

 msgid "The text information for when a buddy is idle"
 msgstr ""

-#, fuzzy
 msgid "Message Text"
-msgstr "Στάλθηκε μήνυμα"
+msgstr "Κείμενο μηνύματος"

 msgid "The text information for when a buddy has an unread message"
 msgstr ""
@@ -10932,15 +10852,14 @@
 "The text information for when a chat has an unread message that mentions "
 "your nick"
 msgstr ""
-
-#, fuzzy
+"Το κείμενο πληροφορίας για όταν μία συζήτηση έχει ένα μη αναγνωσμένο μήνυμα "
+"που αναφέρει το ψυεδώνυμό σας"
+
 msgid "The text information for a buddy's status"
-msgstr "Αλλαγή πληροφοριών χρήστη για %s"
-
-#, fuzzy
+msgstr "Το κείμενο πληροφοριών για την κατάσταση ενός φίλου"
+
 msgid "Type the host name for this certificate."
-msgstr ""
-"Εισάγετε το όνομα του υπολογιστή για τον οποίο είναι αυτό το πιστοποιητικό."
+msgstr "Εισάγετε το όνομα του υπολογιστή για αυτό το πιστοποιητικό"

 #. Widget creation function
 msgid "SSL Servers"
@@ -10989,7 +10908,6 @@
 msgid "Get Away Message"
 msgstr "Λήψη μηνύματος απουσίας"

-#, fuzzy
 msgid "Last Said"
 msgstr "Τελευταία φράση"

@@ -11036,21 +10954,17 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Συνομιλία/_Καθαρισμός αναδίφησης"

-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Συνομιλία/Π_ερισσότερα"
-
-#, fuzzy
+msgstr "/Συνομιλία/Πολυ_μέσα"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Συνομιλία/Π_ερισσότερα"
-
-#, fuzzy
+msgstr "/Συνομιλία/Πολυμέσα/_Κλήση ήχου"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Συνομιλία/Π_ερισσότερα"
-
-#, fuzzy
+msgstr "/Συνομιλία/Πολυμέσα/Κλήση _βίντεο"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Συνομιλία/Εμφάνιση _καταγραφής"
+msgstr "/Συνομιλία/Πολυμέσα/Ήχος\\/Κλήση _βίντεο"

 msgid "/Conversation/Se_nd File..."
 msgstr "/Συνομιλία/_Αποστολή αρχείου..."
@@ -11124,17 +11038,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Συνομιλία/Εμφάνιση καταγραφής"

-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Συνομιλία/Περισσότερα"
-
-#, fuzzy
+msgstr "/Συνομιλία/Πολυμέσα/Κλήση ήχου"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Συνομιλία/Εμφάνιση καταγραφής"
-
-#, fuzzy
+msgstr "/Συνομιλία/Πολυμέσα/Κλήση βίντεο"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Συνομιλία/Περισσότερα"
+msgstr "/Συνομιλία/Πολυμέσα/Ήχος\\/Κλήση βίντεο"

 msgid "/Conversation/Send File..."
 msgstr "/Συνομιλία/Αποστολή αρχείου..."
@@ -11225,7 +11136,7 @@
 msgstr "Νέο γεγονός"

 msgid "clear: Clears all conversation scrollbacks."
-msgstr ""
+msgstr "clear: Καθαρίζει όλες τις αναδιφήσεις συνομιλιών"

 msgid "Confirm close"
 msgstr "Επιβεβαίωση κλεισίματος"
@@ -11318,10 +11229,10 @@

 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"

 msgid "voice and video"
-msgstr ""
+msgstr "Φωνή και βίντεο"

 msgid "support"
 msgstr "υποστήριξη"
@@ -11447,9 +11358,8 @@
 msgid "Hungarian"
 msgstr "Ουγγρικά"

-#, fuzzy
 msgid "Armenian"
-msgstr "Ρουμάνικα"
+msgstr "Αρμένικα"

 msgid "Indonesian"
 msgstr "Ινδονησιακά"
@@ -11466,9 +11376,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Γεωργιανοί μεταφραστές Ubuntu"

-#, fuzzy
 msgid "Khmer"
-msgstr "Άλλο"
+msgstr ""

 msgid "Kannada"
 msgstr ""
@@ -11491,9 +11400,8 @@
 msgid "Macedonian"
 msgstr "Μακεδονικά (Σλαβικά)"

-#, fuzzy
 msgid "Mongolian"
-msgstr "Μακεδονικά (Σλαβικά)"
+msgstr "Μογγολικά"

 msgid "Bokmål Norwegian"
 msgstr ""
@@ -11617,21 +11525,26 @@
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">Συχνές ερωτήσεις:</FONT> <A HREF=\"http://developer.pidgin."
+"im/wiki/FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"

 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 msgstr ""
-
-#, fuzzy, c-format
+"<FONT SIZE=\"4\">Βοήθεια μέσω ηλ. ταχυδρομίου:</FONT> <A HREF=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin στο irc.freenode.net<BR><BR>"
-
-#, fuzzy, c-format
+msgstr ""
+"<FONT SIZE=\"4\">Κανάλι IRC:</FONT> #pidgin στο irc.freenode.net<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin στο irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"

 msgid "Current Developers"
 msgstr "Υπεύθυνοι ανάπτυξης"
@@ -11643,7 +11556,7 @@
 msgstr "Υπεύθυνοι ανάπτυξης που έχουν πλέον αποσυρθεί"

 msgid "Retired Crazy Patch Writers"
-msgstr ""
+msgstr "Τρελοί συγγραφείς μπαλωμάτων που έχουν πλέον αποσυρθεί"

 msgid "Current Translators"
 msgstr "Τωρινοί μεταφραστές"
@@ -11880,9 +11793,8 @@
 msgstr "Χρώμα για να ζωγραφιστούν οι υπερσύνδεσμοι."

 msgid "Hyperlink visited color"
-msgstr ""
-
-#, fuzzy
+msgstr "Χρώμα υπερσυνδέσμου που έχει επισκεφτεί"
+
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Χρώμα για να ζωγραφιστούν οι υπερσύνδεσμοι αφού τους έχετε επισκεφτεί (ή "
@@ -11924,21 +11836,18 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""

-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "Χρώμα που θα ζωγραφίζεται το όνομα ενός μηνύματος ενέργειας."
+msgstr ""

 msgid "Whisper Message Name Color"
 msgstr ""

-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "Χρώμα που θα ζωγραφίζεται το όνομα ενός μηνύματος ενέργειας."
+msgstr ""

 msgid "Typing notification color"
 msgstr "Χρώμα ειδοποίησης πληκτρολόγησης"

-#, fuzzy
 msgid "The color to use for the typing notification"
 msgstr ""
 "Το χρώμα που θα χρησιμοποιείται για τη γραμματοσειρά ειδοποίησης "
@@ -12197,7 +12106,7 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Δοκιμάστε `%s -h' για περισσότερες πληροφορίες.\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12222,14 +12131,16 @@
 "  -h, --help          εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       χωρίς αυτόματη είσοδο\n"
-"  -l, --login[=ΟΝΟΜΑ] αυτόματη είσοδος (το όρισμα ΟΝΟΜΑ προσδιορίζει\n"
-"                      τους λογαριασμούς που θα χρησιμοποιηθούν, χωρισμένους "
-"με κόμμα\n"
-"Χωρίς αυτό θα ενεργοποιηθεί μόνο ο πρώτος λογαριασμός)\n"
-"  --display=DISPLAY   Οθόνη X που θα χρησιμοποιηθεί\n"
+"  -l, --login[=ΟΝΟΜΑ] ενεργοποίηση συγκεκριμένων λογαριασμών (το όρισμα "
+"ΟΝΟΜΑ προσδιορίζει\n"
+"                        τους λογαριασμούς που θα χρησιμοποιηθούν, "
+"χωρισμένους με κόμματα.\n"
+"                        Χωρίς αυτό θα ενεργοποιηθεί μόνο ο πρώτος "
+"λογαριασμός)\n"
+"  --display=ΟΘΟΝΗ   Οθόνη X που θα χρησιμοποιηθεί\n"
 "  -v, --version       εμφάνιση τρέχουσας έκδοσης και έξοδος\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12253,10 +12164,12 @@
 "  -h, --help          εμφάνιση αυτής της βοήθειας και έξοδος\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       χωρίς αυτόματη είσοδο\n"
-"  -l, --login[=ΟΝΟΜΑ] αυτόματη είσοδος (το όρισμα ΟΝΟΜΑ προσδιορίζει\n"
+"  -l, --login[=ΟΝΟΜΑ] ενεργοποίηση συγκεκριμένων λογαριασμών (το όρισμα "
+"ΟΝΟΜΑ προσδιορίζει\n"
 "                      τους λογαριασμούς που θα χρησιμοποιηθούν, χωρισμένους "
-"με κόμμα)\n"
-"Χωρίς αυτό θα ενεργοποιηθεί μόνο ο πρώτος λογαριασμός)\n"
+"με κόμματα.\n"
+"                      Χωρίς αυτό θα ενεργοποιηθεί μόνο ο πρώτος "
+"λογαριασμός).\n"
 "  -v, --version       εμφάνιση τρέχουσας έκδοσης και έξοδος\n"

 #, c-format
@@ -12282,25 +12195,24 @@

 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "Έξοδος επειδή ήδη τρέχει ένας άλλος πελάτης της libpurple.\n"

 msgid "/_Media"
-msgstr ""
+msgstr "/_Πολυμέσα"

 msgid "/Media/_Hangup"
 msgstr ""

-#, fuzzy
 msgid "Calling..."
-msgstr "Υπολογισμός..."
+msgstr "Κλήση..."

 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s επιθυμεί να ξεκινήσει μία συνεδρία ήχου/βίντεο μαζί σας."

 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s επιθυμεί να ξεκινήσει μία συνεδρία βίντεο μαζί σας."

 #, c-format
 msgid "%s has %d new message."
@@ -12331,9 +12243,8 @@
 "Έχει επιλεχθεί η 'με το χέρι' εντολή του περιηγητή, αλλά δεν έχει ορισθεί "
 "καμία εντολή."

-#, fuzzy
 msgid "No message"
-msgstr "Άγνωστο μήνυμα"
+msgstr "Χωρίς μήνυμα"

 msgid "Open All Messages"
 msgstr "Άνοιγμα όλων των μηνυμάτων"
@@ -12344,19 +12255,14 @@
 "\n"
 "%s"

-#, fuzzy
 msgid "New Pounces"
-msgstr "Νέα εφόρμηση φίλου"
+msgstr "Νέες εφορμήσεις"

 msgid "Dismiss"
 msgstr ""

-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr ""
-"<span weight=\"bold\" size=\"larger\">Έχετε αλληλογραφία!</span>\n"
-"\n"
-"%s"

 msgid "The following plugins will be unloaded."
 msgstr "Τα ακόλουθα πρόσθετα θα αποφορτωθούν."
@@ -12406,7 +12312,6 @@
 msgid "Select a file"
 msgstr "Επιλογή αρχείου"

-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "Επεξεργασία εφόρμησης φίλου"

@@ -12483,57 +12388,55 @@
 msgid "Pounce Target"
 msgstr "Στόχος εφόρμησης"

-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
-msgstr "Ξεκινάει να πληκτρολογεί"
-
-#, fuzzy, c-format
+msgstr "Ξεκίνησε να πληκτρολογεί"
+
+#, c-format
 msgid "Paused while typing"
-msgstr "Κάνει παύση κατά την πληκτρολόγηση"
-
-#, fuzzy, c-format
+msgstr "Έκανε παύση κατά την πληκτρολόγηση"
+
+#, c-format
 msgid "Signed on"
-msgstr "Συνδέεται"
-
-#, fuzzy, c-format
+msgstr "Συνδέθηκε"
+
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s δεν είναι πια ανενεργός (%s)"
-
-#, fuzzy, c-format
+msgstr ""
+
+#, c-format
 msgid "Returned from being away"
 msgstr "Επιστρέφει από απών"

-#, fuzzy, c-format
+#, c-format
 msgid "Stopped typing"
 msgstr "Σταμάτησε την πληκτρολόγηση"

-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
-msgstr "Αποσυνδέεται"
-
-#, fuzzy, c-format
+msgstr "Αποσυνδέθηκε"
+
+#, c-format
 msgid "Became idle"
-msgstr "Γίνεται ανενεργός"
-
-#, fuzzy, c-format
+msgstr "Έγινε ανενεργός"
+
+#, c-format
 msgid "Went away"
-msgstr "Κατά την απουσία"
-
-#, fuzzy, c-format
+msgstr "Έγινε απών"
+
+#, c-format
 msgid "Sent a message"
-msgstr "Αποστολή μηνύματος"
-
-#, fuzzy, c-format
+msgstr "Έστειλε ένα μήνυμα"
+
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "Άγνωστο γεγονός εφόρμησης. Παρακαλούμε αναφέρετέ το!"
-
-#, fuzzy
+msgstr "Άγνωστο.... Παρακαλούμε αναφέρετέ το!"
+
 msgid "Theme failed to unpack."
-msgstr "Το GStreamer απέτυχε να αρχικοποιηθεί."
-
-#, fuzzy
+msgstr ""
+
 msgid "Theme failed to load."
-msgstr "Αποτυχία φορτώματος εικόνας"
+msgstr "Αποτυχία φορτώματος του θέματος"

 msgid "Theme failed to copy."
 msgstr ""
@@ -12559,9 +12462,8 @@
 msgstr "_Κλείσιμο των συνομιλιών με το Escape"

 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Λίστα φίλων"
+msgstr "Θέμα λίστα φίλων"

 #. System Tray
 msgid "System Tray Icon"
@@ -12573,9 +12475,8 @@
 msgid "On unread messages"
 msgstr "Όταν υπάρχουν μη αναγνωσμένα μηνύματα"

-#, fuzzy
 msgid "Conversation Window"
-msgstr "Παράθυρα άμεσων μηνυμάτων"
+msgstr "Παράθυρο συζήτησης"

 msgid "_Hide new IM conversations:"
 msgstr "_Απόκρυψη νέων συνομιλιών άμεσων μηνυμάτων:"
@@ -12651,7 +12552,7 @@
 msgstr "Γραμματοσειρά"

 msgid "Use document font from _theme"
-msgstr ""
+msgstr "Χρήση γραμματοσειράς κειμένου από το _θέμα"

 msgid "Use font from _theme"
 msgstr "Χρήση γραμματοσειράς _θέματος"
@@ -12678,9 +12579,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Παράδειγμα: stunserver.org</span>"

-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Αυτόματος εντοπισμός διεύθυνσης IP"
+msgstr "Χρήση _αυτόματου εντοπισμού διεύθυνσης IP: %s"

 msgid "Public _IP:"
 msgstr "Δημόσια _IP:"
@@ -13055,12 +12956,12 @@
 msgid "Status for %s"
 msgstr "Κατάσταση %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"Υπάρχει ήδη μία προσπαρμοσμένη φατσούλα για την επιλεγμένη συντόμευση. "
-"Παρακαλούμε εισάγετε μία διαφορετική συντόμευση."
+"Υπάρχει ήδη μία προσπαρμοσμένη φατσούλα για το %s. Παρακαλούμε "
+"χρησιμοποιείστε μία διαφορετική συντόμευση."

 msgid "Custom Smiley"
 msgstr "Προσαρμοσμένη φατσούλα"
@@ -13074,28 +12975,24 @@
 msgid "Add Smiley"
 msgstr "Προσθήκη φατσούλας"

-#, fuzzy
 msgid "_Image:"
-msgstr "Ει_κόνα"
+msgstr "Ει_κόνα:"

 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Συντόμευση"
+msgstr "_Κείμενο συντόμευσης:"

 msgid "Smiley"
 msgstr "Φατσούλα"

-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Συντόμευση"
+msgstr "Κείμενο συντόμευσης"

 msgid "Custom Smiley Manager"
 msgstr "Διαχειριστής προσαρμοσμένων φατσουλών"

-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Επιλογή φίλου"
+msgstr "Επιλογή εικονιδίου φίλου"

 msgid "Click to change your buddyicon for this account."
 msgstr "Κάντε κλικ για να αλλάξετε την εικόνα φίλου για αυτό το λογαριασμό."
@@ -13182,7 +13079,6 @@
 msgid "Cannot send launcher"
 msgstr "Δεν είναι δυνατή η αποστολή συντόμευσης"

-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13223,9 +13119,8 @@
 "Αποτυχία κατά το φόρτωμα της εικόνας '%s': άγνωστη αιτία, πιθανώς ένα "
 "κατεστραμμένο αρχείο εικόνας"

-#, fuzzy
 msgid "_Open Link"
-msgstr "_Άνοιγμα συνδέσμου σε:"
+msgstr "_Άνοιγμα συνδέσμου"

 msgid "_Copy Link Location"
 msgstr "_Αντιγραφή τοποθεσίας συνδέσμου"
@@ -13233,9 +13128,21 @@
 msgid "_Copy Email Address"
 msgstr "_Αντιγραφή διεύθυνσης email"

+msgid "_Open File"
+msgstr "_Άνοιγμα αρχείου"
+
+msgid "Open _Containing Directory"
+msgstr "Άνοιγμα _περιεχόμενου καταλόγου"
+
 msgid "Save File"
 msgstr "Αποθήκευση αρχείου"

+msgid "_Play Sound"
+msgstr "Αναπαραγωγή _ήχου"
+
+msgid "_Save File"
+msgstr "_Αποθήκευση αρχείου"
+
 msgid "Select color"
 msgstr "Επιλογή χρώματος"

@@ -13324,78 +13231,63 @@
 msgstr ""
 "Εμφανίζει στατιστικές πληροφορίες σχετικά με τη διαθεσιμότητα των φίλων σας"

-#, fuzzy
 msgid "Server name request"
-msgstr "Διεύθυνση εξυπηρετητή"
-
-#, fuzzy
+msgstr "Αίτημα ονόματος εξυπηρετητή"
+
 msgid "Enter an XMPP Server"
-msgstr "Είσοδος σε εξυπηρετητή συζητήσεων"
-
-#, fuzzy
+msgstr "Εισάγετε έναν εξυπηρετητή XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Επιλέξτε τον εξυπηρετητή συνομιλίας που θέλετε να ζητήσετε πληροφορίες"
-
-#, fuzzy
+msgstr "Επιλέξτε έναν εξυπηρετητή XMPP για ερώτημα"
+
 msgid "Find Services"
-msgstr "Υπηρεσίες με σύνδεση"
-
-#, fuzzy
+msgstr "Εύρεση υπηρεσιών"
+
 msgid "Add to Buddy List"
-msgstr "Αποστολή λίστας φίλων"
-
-#, fuzzy
+msgstr "Προσθήκη στη λίστα φίλων"
+
 msgid "Gateway"
-msgstr "Γίνεται απών"
-
-#, fuzzy
+msgstr ""
+
 msgid "Directory"
-msgstr "Κατάλογος καταγραφών"
-
-#, fuzzy
+msgstr "Κατάλογος"
+
 msgid "PubSub Collection"
-msgstr "Επιλογή ήχου"
+msgstr ""

 msgid "PubSub Leaf"
 msgstr ""

-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Περιγραφή"
+msgstr ""
+"\n"
+"<b>Περιγραφή:</b> "

 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Κατάλογος αναζήτησης"
-
-#, fuzzy
+msgstr "Ανακάλυψη υπηρεσιών"
+
 msgid "_Browse"
-msgstr "_Περιηγητής:"
-
-#, fuzzy
+msgstr "_Περιήγηση"
+
 msgid "Server does not exist"
-msgstr "Ο χρήστης δεν υπάρχει"
-
-#, fuzzy
+msgstr "Ο εξυπηρετητής δεν υπάρχει"
+
 msgid "Server does not support service discovery"
-msgstr "Ο εξυπηρετητής δε χρησιμοποιεί καμία υποστηριζόμενη μέθοδο έγκρισης"
-
-#, fuzzy
+msgstr "Ο εξυπηρετητής δεν επιτρέπη την ανακάλυψη υπηρεσιών"
+
 msgid "XMPP Service Discovery"
-msgstr "υπεύθυνος ανάπτυξης XMPP"
+msgstr "Ανακάλυψη υπηρεσιών XMPP"

 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Επιτρέπει την περιήγηση και την εγγραφή σε υπηρεσίες."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
-"Αυτό το πρόσθετο είναι χρήσιμο για την αποσφαλμάτωση εξυπηρετητών και "
-"πελατών XMPP."

 msgid "Buddy is idle"
 msgstr "Ο φίλος είναι ανενεργός"
@@ -13800,7 +13692,6 @@
 msgstr "Πρόσθετο μουσικών μηνυμάτων για συνεργαζόμενη σύνθεση."

 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -13839,7 +13730,7 @@
 msgstr "Καθορισμός της υπόδειξης \"_URGENT\" του διαχειριστή παραθύρων"

 msgid "_Flash window"
-msgstr ""
+msgstr "_Αναβόσβημα παραθύρου"

 #. Raise window method button
 msgid "R_aise conversation window"
@@ -13847,7 +13738,7 @@

 #. Present conversation method button
 msgid "_Present conversation window"
-msgstr ""
+msgstr "_Παράθυρο τρέχουσας συνομιλίας"

 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -13926,7 +13817,6 @@
 msgid "Highlighted Message Name Color"
 msgstr "Χρώμα ονομάτων τονισμένων μηνυμάτων"

-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "Χρώμα ειδοποίησης πληκτρολόγησης"

@@ -13959,23 +13849,20 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Θέμα κειμένου συντόμευσης GTK+"

-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Ενεργοποίηση ειδοποίησης πληκτρολόγησης"
-
-#, fuzzy
+msgstr "Απενεργοποίηση κειμένου ειδοποίησης πληκτρολόγησης"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Έλεγχος θεμάτων Pidgin GTK+"
-
-#, fuzzy
+msgstr "Ρυθμίσεις ελέγχου θεμάτων GTK+"
+
 msgid "Colors"
-msgstr "Κλείσιμο"
+msgstr "Χρώματα"

 msgid "Fonts"
 msgstr "Γραμματοσειρές"

 msgid "Miscellaneous"
-msgstr ""
+msgstr "Διάφορα"

 msgid "Gtkrc File Tools"
 msgstr "Εργαλεία αρχείων Gtkrc"
@@ -14062,13 +13949,12 @@
 msgstr "Κουμπί αποστολής παραθύρου συνομιλίας."

 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
 msgstr ""
-"Προσθέτει ένα κουμπί αποστολής στο πεδίο εισαγωγής στο παράθυρο συνομιλίας. "
-"Προορίζεται για περιπτώσης που δεν υπάρχει πραγματικό πληκτρολόγιο."
+"Προσθέτει ένα κουμπί Αποστολή στο πεδίο εισαγωγής στο παράθυρο συνομιλίας. "
+"Προορίζεται για περιπτώσεις που δεν υπάρχει πραγματικό πληκτρολόγιο."

 msgid "Duplicate Correction"
 msgstr "Διόρθωση επανάληψης"
@@ -14123,94 +14009,78 @@
 "Αντικαθιστά το κείμενο στα εξερχόμενα μηνύματα σύμφωνα με ορισμένους από τον "
 "χρήστη κανόνες."

-#, fuzzy
 msgid "Just logged in"
-msgstr "Αποσυνδεδεμένος"
-
-#, fuzzy
+msgstr "Μόλις συνδέθηκε"
+
 msgid "Just logged out"
-msgstr "Αποσυνδεδεμένος"
+msgstr "Μόλις αποσυνδέθηκε"

 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Εικονίδιο για επαφή/\n"
+"Εικονίδιο για άγνωστο άτομο"
+
 msgid "Icon for Chat"
-msgstr "Συμμετοχή σε συζήτηση"
-
-#, fuzzy
+msgstr "Εικονίδιο για συζήτηση"
+
 msgid "Ignored"
-msgstr "Παράβλεψη"
-
-#, fuzzy
+msgstr "Παραβλέφθηκε"
+
 msgid "Founder"
-msgstr "Περισσότερο θορυβώδης"
-
-#, fuzzy
+msgstr "Ιδρυτής"
+
 msgid "Operator"
-msgstr "Opera"
+msgstr ""

 msgid "Half Operator"
 msgstr ""

-#, fuzzy
 msgid "Authorization dialog"
-msgstr "Δόθηκε έγκριση"
-
-#, fuzzy
+msgstr "Διάλογος έγκρισης"
+
 msgid "Error dialog"
-msgstr "Σφάλμα "
-
-#, fuzzy
+msgstr "Διάλογος σφάλματος"
+
 msgid "Information dialog"
-msgstr "Πληροφορίες"
+msgstr "Διάλογος πληροφοριών"

 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Διάλογος αλληλογραφίας"
+
 msgid "Question dialog"
-msgstr "Διάλογος αιτήματος"
-
-#, fuzzy
+msgstr "Διάλογος ερώτησης"
+
 msgid "Warning dialog"
-msgstr "Επίπεδο προειδοποίησης"
+msgstr "Διάλογος προειδοποίησης"

 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Τι είδος διαλόγου είναι αυτό;"
+
 msgid "Status Icons"
-msgstr "Κατάσταση %s"
-
-#, fuzzy
+msgstr "Εικονίδια κατάστασης"
+
 msgid "Chatroom Emblems"
-msgstr "Εντοπιότητα δωματίου συζήτησης"
-
-#, fuzzy
+msgstr "Εμβλήματα δωματίων συζητήσεων"
+
 msgid "Dialog Icons"
-msgstr "Αλλαγή εικόνας"
-
-#, fuzzy
+msgstr "Εικονίδια διαλόγων"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Έλεγχος θεμάτων Pidgin GTK+"
-
-#, fuzzy
+msgstr "Έλεγχος θεμάτων εικονιδίων Pidgin"
+
 msgid "Contact"
-msgstr "Πληροφορίες επικοινωνίας"
-
-#, fuzzy
+msgstr "Επικοινωνία"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Λίστα φίλων"
-
-#, fuzzy
+msgstr "Επεξεργαστής θεμάτων λίστα φίλων Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Λίστα φίλων"
+msgstr "Επεξεργασία θεμάτων λίστας φίλων"

 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Επεξεργασία θέματος εικονιδίων"

 #. *< type
 #. *< ui_requirement
@@ -14219,16 +14089,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Έλεγχος θεμάτων Pidgin GTK+"
+msgstr "Επεξεργαστής θεμάτων Pidgin"

 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Έλεγχος θεμάτων Pidgin GTK+"
+msgstr "Επεξεργαστής θεμάτων Pidgin"

 #. *< type
 #. *< ui_requirement
@@ -14397,12 +14265,11 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Επιλογές ειδικά για το Pidgin για Windows."

-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Παρέχει επιλογές ειδικά για το Windows Pidgin, όπως είναι η προσάρτηση της "
-"λίστας φίλων."
+"Παρέχει επιλογές ειδικά για το Pidgin για Windows, όπως είναι η προσάρτηση "
+"της λίστας φίλων."

 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Αποσυνδέθηκε.</font>"
@@ -14443,6 +14310,10 @@
 "Αυτό το πρόσθετο είναι χρήσιμο για την αποσφαλμάτωση εξυπηρετητών και "
 "πελατών XMPP."

+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "Διαμεσολαβητής"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "Δεν είναι δυνατό το άνοιγμα του υποδοχέα"
--- a/po/fi.po	Sun Jul 19 08:09:24 2009 +0000
+++ b/po/fi.po	Sun Jul 19 08:17:45 2009 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-07-05 01:14+0300\n"
+"POT-Creation-Date: 2009-07-16 21:37+0300\n"
+"PO-Revision-Date: 2009-07-16 21:36+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -1776,7 +1776,6 @@
 msgstr "+++ %s kirjautui ulos"

 #. Unknown error
-#. Unknown error!
 msgid "Unknown error"
 msgstr "Tuntematon virhe"

@@ -1964,6 +1963,10 @@
 msgstr "Aloitetaan tiedoston %s siirto käyttäjältä %s"

 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Tiedoston <A HREF=\"file://%s\">%s</A> siirto valmis"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Tiedoston %s siirto valmis"

@@ -2893,18 +2896,15 @@
 "ActiveTCL-asennusta ei havaittu. Jos haluat käyttää TCL-liitännäisiä, asenna "
 "ActiveTCL osoitteesta http://www.activestate.com\n"

-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"Apple Bonjour for Windows -työkalupakettia ei löytynyt, tarkista usein "
-"kysytyt kysymykset osoitteessa http://developer.pidgin.im/wiki/Using%"
-"20Pidgin#CanIusePidginforBonjourLink-LocalMessaging ."
-
-#, fuzzy
+"Applen ”Bonjour for Windows” -työkalupakettia ei löytynyt, katso lisätietoja "
+"osoitteesta http://d.pidgin.im/BonjourWindows."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "Sisääntulevia pikaviestintäyhteyksiä ei voi kuunnella\n"
+msgstr "Sisääntulevia pikaviestintäyhteyksiä ei voi kuunnella"

 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2956,21 +2956,17 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Viestiä ei voi lähettää, keskustelua ei voi aloittaa."

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"Pistokkeen luonti epäonnistui:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Pistokkeen luonti epäonnistui: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Pistoketta ei voi liittää porttiin"
-
-#, fuzzy, c-format
+msgstr "Pistoketta ei voi liittää porttiin: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"Pistokkeen luonti epäonnistui:\n"
-"%s"
+msgstr "Pistokkeen kuuntelu epäonnistui: %s"

 msgid "Error communicating with local mDNSResponder."
 msgstr "Virhe viestittäessä paikallisen mDNSResponderin kanssa."
@@ -3018,17 +3014,15 @@
 msgid "Load buddylist from file..."
 msgstr "Tuo tuttavat tiedostosta..."

-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Täytä rekisteröitymiskentät."
-
-#, fuzzy
+msgstr "Täytä kaikki rekisteröitymiskentät"
+
 msgid "Passwords do not match"
-msgstr "Salasanat eivät täsmää."
-
-#, fuzzy
+msgstr "Salasanat eivät täsmää"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Uuden käyttäjätilin rekisteröinti epäonnistui virheen takia.\n"
+msgstr ""
+"Uuden käyttäjätilin rekisteröinti epäonnistui tuntemattoman virheen takia."

 msgid "New Gadu-Gadu Account Registered"
 msgstr "Uusi Gadu-Gadu-käyttäjätili rekisteröity"
@@ -3043,11 +3037,10 @@
 msgstr "Salasana (uudelleen)"

 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Syötä captcha-teksti"
+
 msgid "Captcha"
-msgstr "Captcha-kuva"
+msgstr "Captcha"

 msgid "Register New Gadu-Gadu Account"
 msgstr "Rekisteröi uusi Gadu-Gadu-käyttäjätili"
@@ -3186,9 +3179,9 @@
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Ei kyetty selvittämään palvelimen nimeä."
+msgstr "Ei kyetty selvittämään palvelimen nimeä ”%s”: %s"

 #. 1. connect to server
 #. connect to the server
@@ -3201,9 +3194,8 @@
 msgid "This chat name is already in use"
 msgstr "Tämä keskustelunimi on jo käytössä"

-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Ei yhdistettynä palvelimeen."
+msgstr "Ei yhdistettynä palvelimeen"

 msgid "Find buddies..."
 msgstr "Etsi tuttavia..."
@@ -3261,7 +3253,6 @@
 msgid "File Transfer Failed"
 msgstr "Tiedostonsiirto epäonnistui"

-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "Kuuntelevaa porttia ei voi avata."

@@ -3285,11 +3276,9 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"Yhteys palvelimeen katkesi:\n"
-"%s"
+msgstr "Yhteys palvelimeen katkesi: %s"

 msgid "View MOTD"
 msgstr "Näytä MOTD"
@@ -3310,13 +3299,13 @@
 msgstr "Yhteyden muodostaminen epäonnistui"

 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Kohteeseen %s ei kyetty muodostamaan yhteyttä"
-
-#, fuzzy, c-format
+msgstr "Ei voi yhdistää: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "Palvelin on katkaissut yhteyden."
+msgstr "Palvelin on katkaissut yhteyden"

 msgid "Users"
 msgstr "Käyttäjät"
@@ -3743,11 +3732,9 @@
 msgid "execute"
 msgstr "suorita"

-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "Palvelin vaatii TSL/SSL-tuen kirjautumiseen. TLS/SSL-tukea ei löydy."
-
-#, fuzzy
+msgstr "Palvelin vaatii TSL/SSL-tuen, mutta TLS/SSL-tukea ei löydy."
+
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Salausta vaadittu, mutta TLS/SSL-tukea ei löydy."

@@ -3766,13 +3753,11 @@
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"

-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Todennus epäonnistui"
-
-#, fuzzy
+msgstr "SASL-todennus epäonnistui"
+
 msgid "Invalid response from server"
-msgstr "Kelvoton vastaus palvelimelta."
+msgstr "Kelvoton vastaus palvelimelta"

 msgid "Server does not use any supported authentication method"
 msgstr "Palvelin ei käytä mitään tuetuista tunnistautumismenetelmistä"
@@ -3783,9 +3768,9 @@
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"

-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL-virhe"
+msgstr "SASL-virhe: %s"

 msgid "The BOSH connection manager terminated your session."
 msgstr "BOSH-yhteyshallinta lopetti istunnon."
@@ -3799,9 +3784,9 @@
 msgid "Unable to establish a connection with the server"
 msgstr "Yhteyttä palvelimeen ei voi muodostaa"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "Yhteyttä palvelimeen ei voi muodostaa"
+msgstr "Yhteyttä palvelimeen ei voi muodostaa: %s"

 msgid "Unable to establish SSL connection"
 msgstr "SSL-yhteyden muodostaminen ei onnistu"
@@ -3885,7 +3870,6 @@
 msgid "%s ago"
 msgstr "%s sitten"

-#, fuzzy
 msgid "Logged Off"
 msgstr "Kirjautunut ulos"

@@ -4064,17 +4048,15 @@
 msgid "Roles:"
 msgstr "Roolit:"

-#, fuzzy
 msgid "Ping timed out"
 msgstr "Pingin aikakatkaisu"

-#, fuzzy
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
 "Vaihtoehtoisia XMPP-yhteystapoja ei löytynyt suoran yhdistämisen "
-"epäonnistumisen jälkeen.\n"
+"epäonnistumisen jälkeen."

 msgid "Invalid XMPP ID"
 msgstr "Epäkelpo XMPP-ID"
@@ -4654,17 +4636,16 @@
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"

-#, fuzzy
 msgid "No reason"
 msgstr "Syytä ei annettu"

-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "%s on poistanut sinut kanavalta: (%s)"
-
-#, fuzzy, c-format
+msgstr "Sinut on potkaistu kanavalta: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "%s potkaisi (%s)"
+msgstr "Potkaisi (%s)"

 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Kaistansisäisessä tavuvirtasiirrossa tapahtui virhe\n"
@@ -5000,6 +4981,26 @@
 msgstr "Pikaviestittömät yhteystiedot"

 #, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s lähetti animoidun hymiön. <a href='msn-wink://%s'>Napsauta tästä "
+"toistaaksesi sen</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s lähetti animoidun hymiön, mutta sitä ei voi tallentaa"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s lähetti äänipätkän. <a href='audio://%s'>Napsauta tässä toistaaksesi sen</"
+"a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s on lähettänyt äänipätkän, mutta sitä ei voi tallentaa"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr "%s on lähettänyt puhekeskustelukutsun, mitä ei vielä tueta."

@@ -5155,6 +5156,29 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto."

+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Tuttavaa %s ei voi lisätä koska käyttäjänimi on virheellinen. Käyttäjänimen "
+"tulee olla oikea sähköpostiosoite."
+
+msgid "Unable to Add"
+msgstr "Lisääminen epäonnistui"
+
+msgid "Authorization Request Message:"
+msgstr "Valtuutuksen pyyntöviesti:"
+
+msgid "Please authorize me!"
+msgstr "Voisitko valtuuttaa minut?"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
+
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"

@@ -5353,6 +5377,7 @@
 msgid "Unable to add user"
 msgstr "Käyttäjää ei voi lisätä"

+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Tuntematon virhe (%d)"
@@ -5421,26 +5446,22 @@
 "Yhteysvirhe palvelimelta %s:\n"
 "%s"

-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Palvelin ei tue yhteyskäytäntöä."
-
-#, fuzzy
+msgstr "Palvelin ei tue tämän ohjelman yhteyskäytäntöä."
+
 msgid "Error parsing HTTP"
-msgstr "Virhe jäsennettäessä HTTP:tä."
-
-#, fuzzy
+msgstr "Virhe jäsennettäessä HTTP:tä"
+
 msgid "You have signed on from another location"
-msgstr "Olet kirjautunut sisään toisesta paikasta."
+msgstr "Olet kirjautunut sisään toisesta paikasta"

 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-palvelimet ovat väliaikaisesti tavoittamattomissa. Odota ja yritä "
 "uudelleen."

-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
+msgstr "MSN-palvelimet ajetaan alas väliaikaisesti"

 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5767,15 +5788,14 @@
 msgid "Client Version"
 msgstr "Asiakasohjelman versio"

-#, fuzzy
 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
-"Mene osoitteeseen http://editprofile.myspace.com/index.cfm?"
-"fuseaction=profile.username ja valitse käyttäjänimesi. Kirjaudu sitten "
-"uudestaan."
+"Virhe asetettaessa käyttäjänimeä. Yritä uudelleen tai mene osoitteeseen "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"valitaksesi käyttäjänimen."

 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Käyttäjänimi saatavilla"
@@ -6035,9 +6055,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "Tuntematon virhe: 0x%X"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Ei voi kirjautua"
+msgstr "Kirjautuminen ei onnistu: %s"

 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6214,9 +6234,8 @@
 msgid "Error requesting "
 msgstr "Virhe pyydettäessä "

-#, fuzzy
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr "AOL ei salli näyttönimen todentamista tämän sivuston kautta."
+msgstr "AOL ei salli näyttönimen todentamista tätä kautta"

 msgid "Could not join chat room"
 msgstr "Keskusteluhuoneeseen ei voi liittyä"
@@ -6224,9 +6243,8 @@
 msgid "Invalid chat room name"
 msgstr "Epäkelpo keskusteluhuoneen nimi"

-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja."
+msgstr "Palvelimeen yhdistettäessä vastaanotettiin virheellisiä tietoja"

 #. *< type
 #. *< ui_requirement
@@ -6273,9 +6291,8 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "Vastaanotettiin virheellisiä tietoja luotaessa yhteyttä käyttäjään."

-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
-msgstr "Yhteyttä käyttäjän kanssa ei voi muodostaa."
+msgstr "Yhteyttä etäkäyttäjän kanssa ei voi muodostaa."

 msgid "Direct IM established"
 msgstr "Suora pikaviestiyhteys muodostettu"
@@ -6476,15 +6493,13 @@
 msgid "Buddy Comment"
 msgstr "Tuttavakommentti"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Ei saatu yhteyttä todentamispalvelimeen:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Ei saatu yhteyttä todentamispalvelimeen: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
+msgstr "BOS-palvelimeen ei kyetty muodostamaan yhteyttä: %s"

 msgid "Username sent"
 msgstr "Käyttäjänimi lähetetty"
@@ -6496,16 +6511,16 @@
 msgid "Finalizing connection"
 msgstr "Viimeistellään yhteyttä"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to 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 ""
-"Kirjautuminen epäonnistui: käyttäjänä %s ei voi kirjautua koska käyttäjänimi "
-"on virheellinen. Käyttäjänimen tulee olla oikea sähköpostiosoite, tai alkaa "
-"kirjaimella ja sisältää vain kirjaimia, numeroita ja välilyöntejä, tai "
-"sisältää vain numeroita."
+"Kirjautuminen epäonnistui käyttäjänä %s, koska käyttäjänimi on virheellinen. "
+"Käyttäjänimen tulee olla oikea sähköpostiosoite, tai alkaa kirjaimella ja "
+"sisältää vain kirjaimia, numeroita ja välilyöntejä, tai sisältää vain "
+"numeroita."

 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6528,14 +6543,14 @@
 msgstr "Käyttäjänimeä ei ole"

 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
+msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty"

 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."

+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä osoitteessa %s"
@@ -6548,9 +6563,8 @@
 "Olet ottanut ja katkaissut yhteyden liian tiheästi. Odota jonkin aikaa ja "
 "yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä pidempään."

-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "Syötetty SecurID-avain on virheellinen."
+msgstr "Syötetty SecurID-avain on virheellinen"

 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
@@ -6558,12 +6572,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Syötä 6 numeroinen luku digitaaliselta näytöltä."

-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
 msgid "Password sent"
 msgstr "Salasana lähetetty"

@@ -6573,12 +6581,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttaviini?"

-msgid "Authorization Request Message:"
-msgstr "Valtuutuksen pyyntöviesti:"
-
-msgid "Please authorize me!"
-msgstr "Voisitko valtuuttaa minut?"
-
 msgid "No reason given."
 msgstr "Syytä ei annettu."

@@ -6900,7 +6902,7 @@
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to 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, "
@@ -6910,9 +6912,6 @@
 "tulee olla oikea sähköpostiosoite, tai alkaa kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä, tai sisältää vain numeroita."

-msgid "Unable to Add"
-msgstr "Lisääminen epäonnistui"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Tuttavien noutaminen ei onnistunut"

@@ -6927,18 +6926,18 @@
 msgid "Orphans"
 msgstr "Orvot"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"Tuttavaa %s ei voi lisätä koska tuttaviasi on liian monta. Ole hyvä ja "
-"poista joku ja yritä uudelleen."
+"Tuttavaa %s ei voi lisätä koska tuttavia on liian monta. Ole hyvä ja poista "
+"joku ja yritä uudelleen."

 msgid "(no name)"
 msgstr "(nimetön)"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Tuttavaa %s ei voi lisätä tuntemattomasta syystä."

@@ -7710,7 +7709,6 @@
 msgid "Update interval (seconds)"
 msgstr "Päivitysten aikaväli (sekunneissa)"

-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "Palvelinvastauksen salausta ei voi purkaa"

@@ -7778,9 +7776,8 @@
 msgid "Requesting token"
 msgstr "Pyydetään polettia"

-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "Ei kyetty selvittämään palvelimen nimeä."
+msgstr "Ei kyetty selvittämään palvelimen nimeä"

 msgid "Invalid server or port"
 msgstr "Epäkelpo palvelin tai portti"
@@ -7833,7 +7830,6 @@
 msgid "QQ Qun Command"
 msgstr "QQ-Qun-komento"

-#, fuzzy
 msgid "Unable to decrypt login reply"
 msgstr "Kirjautumisvastauksen salausta ei voi purkaa"

@@ -8814,7 +8810,6 @@
 msgid "Disconnected by server"
 msgstr "Palvelin katkaisi yhteyden"

-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"

@@ -8830,7 +8825,6 @@
 msgid "Performing key exchange"
 msgstr "Suoritetaan avaintenvaihto"

-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "SILC-avainparia ei voi ladata"

@@ -8838,14 +8832,12 @@
 msgid "Connecting to SILC Server"
 msgstr "Yhdistetään SILC-palvelimelle"

-#, fuzzy
 msgid "Unable to not load SILC key pair"
-msgstr "SILC-avainparia ei voi ladata"
+msgstr "SILC-avainparin lataamatta jättäminen ei onnistu"

 msgid "Out of memory"
 msgstr "Muisti loppu"

-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "SILC-yhteyskäytäntöä ei voi alustaa"

@@ -9138,9 +9130,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Luodaan SILC-avainpari..."

-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "SILC-avainparia ei voi luoda\n"
+msgstr "SILC-avainparia ei voi luoda"

 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9279,27 +9270,24 @@
 msgid "Failure: Authentication failed"
 msgstr "Virhe: Todennus epäonnistui"

-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "SILC-asiakasyhteyttä ei voi alustaa"

 msgid "John Noname"
 msgstr "Pertti Perusnimi"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "SILC-avainparia ei voi ladata: %s"

 msgid "Unable to create connection"
 msgstr "Yhteyden luominen epäonnistui"

-#, fuzzy
 msgid "Unknown server response"
-msgstr "Tuntematon palvelinvastaus."
-
-#, fuzzy
+msgstr "Tuntematon palvelinvastaus"
+
 msgid "Unable to create listen socket"
-msgstr "Pistokkeen luonti epäonnistui"
+msgstr "Kuuntelupistokkeen luonti epäonnistui"

 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-käyttäjänimissä ei tule olla välilyöntejä tai @-merkkejä"
@@ -9362,9 +9350,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Yahoo-yhteyskäytäntöliitännäinen"
+msgstr "Yahoo!-yhteyskäytäntöliitännäinen"

 msgid "Pager server"
 msgstr "Hakulaitepalvelin"
@@ -9393,9 +9380,8 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"

-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo ID..."
+msgstr "Yahoo JAPAN ID..."

 #. *< type
 #. *< ui_requirement
@@ -9407,9 +9393,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo-yhteyskäytäntöliitännäinen"
+msgstr "Yahoo! JAPAN -yhteyskäytäntöliitännäinen"

 msgid "Your SMS was not delivered"
 msgstr "Tekstiviestiä (SMS) ei välitetty"
@@ -9442,22 +9427,20 @@
 msgstr "Vastaanotettiin virheellisiä tietoja"

 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Käyttäjätili lukittu: liian monta epäonnistuttu kirjautumisyritystä.\n"
-"Yahoo!-WWW-sivustolle kirjautuminen saatta korjata tämän."
+"Käyttäjätili lukittu: liian monta epäonnistuttu kirjautumisyritystä. Yahoo!-"
+"WWW-sivustolle kirjautuminen saatta korjata tämän."

 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Käyttäjätili lukittu: tuntematon syy.\n"
-"Yahoo!-WWW-sivustolle kirjautuminen saatta korjata tämän."
+"Käyttäjätili lukittu: tuntematon syy. Yahoo!-WWW-sivustolle kirjautuminen "
+"saatta korjata tämän."

 #. username or password missing
 msgid "Username or password missing"
@@ -9497,12 +9480,11 @@
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Tuttavaa %s ei voi lisätä ryhmään %s palvelimen tuttavissa, tilillä %s."

-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "Tuttavaa ei voi lisätä palvelimen tuttaviin"

@@ -9510,19 +9492,16 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"

-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Odottamaton HTTP-vastaus palvelimelta."
-
-#, fuzzy, c-format
+msgstr "Odottamaton HTTP-vastaus palvelimelta"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Yhteys palvelimeen %s katkesi:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Yhteys palvelimeen %s katkesi: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "Yhteyttä palvelimeen ei voi muodostaa"
+msgstr "Yhteyttä palvelimeen %s ei voi muodostaa: %s"

 msgid "Not at Home"
 msgstr "Poissa kotoa"
@@ -9730,7 +9709,6 @@
 msgid "User Rooms"
 msgstr "Käyttäjän huoneet"

-#, fuzzy
 msgid "Connection problem with the YCHT server"
 msgstr "Yhteysvirhe YCHT-palvelimen kanssa"

@@ -9860,17 +9838,17 @@
 msgid "Exposure"
 msgstr "Altistus"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Vastausta HTTP-välipalvelimelta ei voi jäsentää: %s\n"
+msgstr "Vastausta HTTP-välipalvelimelta ei voi jäsentää: %s"

 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-välipalvelimen yhteysvirhe %d"

-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "Pääsy evätty: HTTP-välipalvelin estää portin %d tunneloinnin."
+msgstr "Pääsy evätty: HTTP-välipalvelin estää portin %d tunneloinnin"

 #, c-format
 msgid "Error resolving %s"
@@ -10164,7 +10142,7 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Käytä tätä tuttavakuvaketta tälle käyttäjät_ilille:"

-msgid "_Advanced"
+msgid "Ad_vanced"
 msgstr "_Lisäasetukset"

 msgid "Use GNOME Proxy Settings"
@@ -10227,8 +10205,8 @@
 msgid "Create _this new account on the server"
 msgstr "Luo _tämä uusi käyttäjätili palvelimelle"

-msgid "_Proxy"
-msgstr "_Välipalvelin"
+msgid "P_roxy"
+msgstr "Vä_lipalvelin"

 msgid "Enabled"
 msgstr "Käytössä"
@@ -10321,11 +10299,9 @@
 msgid "View _Log"
 msgstr "Näytä _loki"

-#, fuzzy
 msgid "Hide When Offline"
 msgstr "Piilota kun poissa linjoilta"

-#, fuzzy
 msgid "Show When Offline"
 msgstr "Näytä kun poissa linjoilta"

@@ -10872,7 +10848,6 @@
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"

-#, fuzzy
 msgid "Last Said"
 msgstr "Viimeksi sanottu"

@@ -12426,9 +12401,8 @@
 msgid "On unread messages"
 msgstr "Kun lukemattomia viestejä"

-#, fuzzy
 msgid "Conversation Window"
-msgstr "Pikaviesti-ikkunat"
+msgstr "Keskusteluikkuna"

 msgid "_Hide new IM conversations:"
 msgstr "_Piilota uudet pikaviestikeskustelut:"
@@ -13067,9 +13041,21 @@
 msgid "_Copy Email Address"
 msgstr "_Kopioi sähköpostiosoite"

+msgid "_Open File"
+msgstr "_Avaa tiedosto..."
+
+msgid "Open _Containing Directory"
+msgstr "Avaa kansio joka _sisältää tämän"
+
 msgid "Save File"
 msgstr "Tallenna tiedosto"

+msgid "_Play Sound"
+msgstr "_Toista ääni"
+
+msgid "_Save File"
+msgstr "_Tallenna tiedosto"
+
 msgid "Select color"
 msgstr "Valitse väri"

@@ -14224,6 +14210,9 @@
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."

+#~ msgid "_Proxy"
+#~ msgstr "_Välipalvelin"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "Pistoketta ei voi avata"
--- a/po/fr.po	Sun Jul 19 08:09:24 2009 +0000
+++ b/po/fr.po	Sun Jul 19 08:17:45 2009 +0000
@@ -21,8 +21,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-02-23 01:25+0100\n"
+"POT-Creation-Date: 2009-07-15 09:51+0200\n"
+"PO-Revision-Date: 2009-07-16 13:07+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -884,12 +884,11 @@
 msgid "System Log"
 msgstr "Archives des messages système"

-#, fuzzy
 msgid "Calling ... "
-msgstr "Calcul en cours"
+msgstr "Appel... "

 msgid "Hangup"
-msgstr ""
+msgstr "Raccrocher"

 #. Number of actions
 msgid "Accept"
@@ -899,25 +898,24 @@
 msgstr "Refuser"

 msgid "Call in progress."
-msgstr ""
+msgstr "Appel en cours."

 msgid "The call has been terminated."
-msgstr ""
+msgstr "L'appel s'est terminé."

 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s veut engager une session audio."

 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s essaie d'engager une session audio de type non supportée."
+
 msgid "You have rejected the call."
-msgstr "Vous avez quitté le salon %s%s"
+msgstr "Vous avez refusé l'appel."

 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call : appel audio."

 msgid "Emails"
 msgstr "Courriers électroniques"
@@ -1573,22 +1571,25 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Récupération TinyURL..."

 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "Création de TinyURL seulement pour les liens de cette taille mini"

 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "Préfixe d'adresse TinyURL (ou autre)"
+
 msgid "TinyURL"
-msgstr "URL musicale"
+msgstr "TinyURL"

 msgid "TinyURL plugin"
-msgstr ""
+msgstr "Plugin TinyURL"

 msgid "When receiving a message with URL(s), TinyURL for easier copying"
 msgstr ""
+"À la réception d'un message avec un ou plusieurs liens hypertextes, utilise "
+"TinyURL pour les copier plus facilement."

 msgid "accounts"
 msgstr "Comptes"
@@ -1793,7 +1794,6 @@
 msgstr "+++ %s a quitté"

 #. Unknown error
-#. Unknown error!
 msgid "Unknown error"
 msgstr "Erreur inconnue"

@@ -1840,9 +1840,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s a quitté le salon (%s)"

-#, fuzzy
 msgid "Invite to chat"
-msgstr "Inviter à une conférence"
+msgstr "Inviter à une discussion"

 #. Put our happy label in it.
 msgid ""
@@ -1985,6 +1984,10 @@
 msgstr "Démarrage du transfert de %s depuis %s."

 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Transfert du fichier <A HREF=\"file://%s\">%s</A> terminé"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transfert du fichier « %s » terminé"

@@ -2200,9 +2203,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Réponse automatique> : %s\n"

-#, fuzzy
 msgid "Error creating conference."
-msgstr "Erreur à l'ouverture de la connexion"
+msgstr "Erreur à la création de la conférence."

 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2611,7 +2613,6 @@
 "d'archives."

 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2621,7 +2622,7 @@
 msgstr ""
 "Quand les archives sont consultés, ce plugin ajoute les archives d'autres "
 "clients de messagerie instantanée. Cela inclut actuellement Adium, MSN "
-"Messenger et Trillian.\n"
+"Messenger, aMSN et Trillian.\n"
 "\n"
 "ATTENTION : ce plugin est encore en phase de développement précoce et peut "
 "planter fréquemment. Utilisez le à vos risques et périls !"
@@ -2671,12 +2672,11 @@
 "Enregistre les messages envoyés à un utilisateur déconnecté en tant "
 "qu'alerte."

-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Les messages seront enregistrés en tant qu'alerte. Vous pouvez modifier ou "
+"Les messages seront enregistrés en tant qu'alertes. Vous pouvez modifier ou "
 "supprimer l'alerte dans la fenêtre « Alerte »."

 #, c-format
@@ -2705,9 +2705,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "Ne jamais demander. Toujours créer une alerte."

-#, fuzzy
 msgid "One Time Password"
-msgstr "Saisissez le mot de passe"
+msgstr "Mot de passe jetable"

 #. *< type
 #. *< ui_requirement
@@ -2716,13 +2715,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Support de mot de passe à usage unique"

 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "S'assure que les mots de passe ne peuvent être utilisés qu'une fois."

 #. *  description
 msgid ""
@@ -2730,6 +2729,10 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Permet de s'assurer pour certains comptes que les mot de passe n'est pas "
+"sauvegardé et qu'il n'est utilisé que pour une seule connexion validée.\n"
+"NB : le mot de passe ne doit pas déjà être sauvegardé pour que cela "
+"fonctionne."

 #. *< type
 #. *< ui_requirement
@@ -2883,10 +2886,10 @@
 msgstr "Notification quand"

 msgid "Buddy Goes _Away"
-msgstr "L'utilisateur s'absente"
+msgstr "L'utilisateur s'_absente"

 msgid "Buddy Goes _Idle"
-msgstr "L'utilisateur passe inactif"
+msgstr "L'utilisateur passe _inactif"

 msgid "Buddy _Signs On/Off"
 msgstr "_Connexion/déconnexion d'un contact"
@@ -2925,18 +2928,15 @@
 "utiliser les plugins TCL, veuillez installer ActiveTCL depuis http://www."
 "activestate.com\n"

-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"Le kit Apple Bonjour pour Windows n'a pas été trouvé. Veuillez consulter la "
-"FAQ disponible sur : http://d.pidgin.im/wiki/BonjourWindows pour plus "
-"d'informations."
-
-#, fuzzy
+"Impossible de trouver le kit Apple Bonjour pour Windows. Veuillez consulter "
+"http://d.pidgin.im/wiki/BonjourWindows pour plus d'informations."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "Impossible d'attendre des connexions rentrantes de messages.\n"
+msgstr "Impossible d'attendre des connexions rentrantes de messages"

 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2990,21 +2990,17 @@
 msgstr ""
 "Impossible d'envoyer le message, la conversation n'a pas pu être commencée."

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"Impossible de créer le socket :\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Impossible de créer le socket : %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Impossible d'affecter un port à la connexion."
-
-#, fuzzy, c-format
+msgstr "Impossible d'affecter un port à la connexion : %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"Impossible de créer le socket :\n"
-"%s"
+msgstr "Impossible de se mettre en écoute sur la connexion : %s"

 msgid "Error communicating with local mDNSResponder."
 msgstr "Erreur de communication avec le mDNSResponder local."
@@ -3051,17 +3047,14 @@
 msgid "Load buddylist from file..."
 msgstr "Charger la liste de contacts depuis un fichier..."

-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Renseignez les rubriques d'inscription."
-
-#, fuzzy
+msgstr "Vous devez renseignez toutes les rubriques d'inscription"
+
 msgid "Passwords do not match"
-msgstr "Les mots de passe diffèrent."
-
-#, fuzzy
+msgstr "Les mots de passe diffèrent"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Une erreur est survenue. Impossible d'inscrire un nouveau compte.\n"
+msgstr "Une erreur est survenue. Impossible d'inscrire un nouveau compte."

 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nouveau compte Gadu-Gadu créé."
@@ -3076,11 +3069,10 @@
 msgstr "Mot de passe (confirmation)"

 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Saisissez le texte captcha"
+
 msgid "Captcha"
-msgstr "Image captcha"
+msgstr "Captcha"

 msgid "Register New Gadu-Gadu Account"
 msgstr "Créer un nouveau compte Gadu-Gadu"
@@ -3220,9 +3212,9 @@
 msgid "Chat _name:"
 msgstr "_Nom de la discussion :"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Impossible de se connecter au serveur"
+msgstr "Impossible de résoudre le nom internet « %s » : %s"

 #. 1. connect to server
 #. connect to the server
@@ -3235,9 +3227,8 @@
 msgid "This chat name is already in use"
 msgstr "Ce nom de discussion est déjà utilisé."

-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Vous n'êtes pas connecté au serveur."
+msgstr "Vous n'êtes pas connecté au serveur"

 msgid "Find buddies..."
 msgstr "Trouver des contacts..."
@@ -3278,9 +3269,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Utilisateur Gadu-Gadu"

-#, fuzzy
 msgid "GG server"
-msgstr "Récupération du serveur"
+msgstr "Serveur GG"

 #, c-format
 msgid "Unknown command: %s"
@@ -3296,7 +3286,6 @@
 msgid "File Transfer Failed"
 msgstr "Échec du transfert de fichier."

-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "Impossible d'ouvrir un port en écoute."

@@ -3320,11 +3309,9 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"Connexion perdue avec le serveur :\n"
-"%s"
+msgstr "Connexion perdue avec le serveur : %s"

 msgid "View MOTD"
 msgstr "Voir le message du jour"
@@ -3335,9 +3322,8 @@
 msgid "_Password:"
 msgstr "Mot de _passe :"

-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Les pseudonymes IRC ne doivent pas avoir d'espace"
+msgstr "Le pseudonyme et le serveur IRC ne doivent pas avoir d'espace"

 msgid "SSL support unavailable"
 msgstr "Support SSL non disponible"
@@ -3346,11 +3332,11 @@
 msgstr "Impossible de se connecter"

 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Impossible de se connecter à %s."
-
-#, fuzzy, c-format
+msgstr "Impossible de se connecter : %s"
+
+#, c-format
 msgid "Server closed the connection"
 msgstr "Le serveur a fermé la connexion."

@@ -3536,19 +3522,18 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "Ce nom de discussion est déjà utilisé."
-
-#, fuzzy
+msgstr "Le pseudonyme « %s » est déjà utilisé."
+
 msgid "Nickname in use"
-msgstr "Pseudonyme"
+msgstr "Pseudonyme utilisé"

 msgid "Cannot change nick"
-msgstr "Impossible de changer de surnom"
+msgstr "Impossible de changer de pseudonyme"

 msgid "Could not change nick"
-msgstr "Impossible de changer de surnom"
+msgstr "Impossible de changer de pseudonyme"

 #, c-format
 msgid "You have parted the channel%s%s"
@@ -3786,13 +3771,11 @@
 msgid "execute"
 msgstr "execute"

-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
 "TLS/SSL est nécessaire pour la connexion au serveur. Aucun support de TLS/"
 "SSL n'a pu être trouvé."

-#, fuzzy
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Vous demandez un chiffrement mais aucun support de TLS/SSL n'a pu être "
@@ -3814,11 +3797,9 @@
 msgid "Plaintext Authentication"
 msgstr "Authentification en texte non chiffré"

-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Échec de l'authentification"
-
-#, fuzzy
+msgstr "Échec de l'authentification SASL"
+
 msgid "Invalid response from server"
 msgstr "Réponse non valide du serveur"

@@ -3832,36 +3813,28 @@
 msgid "Invalid challenge from server"
 msgstr "Demande d'accès non valide du serveur"

-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "Erreur SASL"
+msgstr "Erreur SASL : %s"

 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "Le gestionnaire de connexion BOSH a interrompu votre session."
+
 msgid "No session ID given"
-msgstr "Pas de raison donnée"
-
-#, fuzzy
+msgstr "Pas d'ID de session"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Version non supportée"
-
-#, fuzzy
+msgstr "Version non supportée du protocole BOSH"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"Impossible de se connecter au serveur :\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Impossible de se connecter au serveur"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Impossible de se connecter au serveur :\n"
-"%s"
-
-#, fuzzy
+msgstr "Impossible de se connecter au serveur : %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Impossible de créer une connexion."
+msgstr "Impossible de créer une connexion SSL"

 msgid "Full Name"
 msgstr "Nom complet"
@@ -3929,9 +3902,8 @@
 msgid "Operating System"
 msgstr "Système d'exploitation"

-#, fuzzy
 msgid "Local Time"
-msgstr "Fichier local :"
+msgstr "Heure locale"

 msgid "Priority"
 msgstr "Priorité"
@@ -3941,11 +3913,10 @@

 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "il y a %s"
+
 msgid "Logged Off"
-msgstr "Connecté"
+msgstr "Deconnecté"

 msgid "Middle Name"
 msgstr "Deuxième prénom"
@@ -3987,9 +3958,9 @@
 msgid "Log Out"
 msgstr "Déconnexion"

-# Repris du fr.po de gabber
+# Pour avoir le même texte que « Free for Chat »
 msgid "Chatty"
-msgstr "Bavard"
+msgstr "Libre pour discuter"

 msgid "Extended Away"
 msgstr "Longue absence"
@@ -4116,19 +4087,15 @@
 msgid "Find Rooms"
 msgstr "Chercher un salon de discussions"

-#, fuzzy
 msgid "Affiliations:"
-msgstr "Alias :"
-
-#, fuzzy
+msgstr "Affiliations :"
+
 msgid "No users found"
-msgstr "Aucun utilisateur correspondant trouvé."
-
-#, fuzzy
+msgstr "Aucun utilisateur trouvé."
+
 msgid "Roles:"
-msgstr "Rôle"
-
-#, fuzzy
+msgstr "Rôles :"
+
 msgid "Ping timed out"
 msgstr "Pas de réponse au ping"

@@ -4136,6 +4103,8 @@
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
+"Impossible de trouver une autre méthode de connexion XMPP après l'échec de "
+"connexion directe."

 msgid "Invalid XMPP ID"
 msgstr "Identifiant XMPP non valide."
@@ -4143,9 +4112,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Identifiant XMPP non valide. Le domaine doit être saisi."

-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "Impossible de se connecter au serveur."
+msgstr "URL BOSH mal formée"

 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4217,9 +4185,8 @@
 msgid "Change Registration"
 msgstr "Changer l'enregistrement"

-#, fuzzy
 msgid "Malformed BOSH Connect Server"
-msgstr "Impossible de se connecter au serveur."
+msgstr "Serveur de connexion BOSH non valide"

 msgid "Error unregistering account"
 msgstr "Erreur à la désinscription du compte"
@@ -4506,19 +4473,21 @@
 msgid "Unable to ping user %s"
 msgstr "Impossible d'envoyer un ping à l'utilisateur %s"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Impossible de buzzer, rien n'est connu sur l'utilisateur %s."

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr "Impossible de buzzer, l'utilisateur %s est peut-être déconnecté."

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "Impossible de buzzer, l'utilisateur %s l'interdit."
+msgstr ""
+"Impossible de buzzer, l'utilisateur %s l'interdit ou n'est pas capable de le "
+"recevoir."

 #, c-format
 msgid "Buzzing %s..."
@@ -4533,38 +4502,38 @@
 msgid "%s has buzzed you!"
 msgstr "%s vient de vous buzzer !"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Impossible d'envoyer le fichier à %s, JID non valide"
-
-#, fuzzy, c-format
+msgstr "Impossible d'engager une session média avec %s : JID non valide"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Impossible d'envoyer le fichier à %s, l'utilisateur n'est pas en ligne"
-
-#, fuzzy, c-format
+msgstr ""
+"Impossible d'engager une session média avec %s : l'utilisateur n'est pas en "
+"ligne"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
-"Impossible d'envoyer le fichier à %s, pas d'inscription à la présence de "
-"l'utilisateur"
-
-#, fuzzy
+"Impossible d'engager une session média avec %s : pas d'inscription à la "
+"présence de l'utilisateur"
+
 msgid "Media Initiation Failed"
-msgstr "Erreur d'enregistrement"
-
-#, fuzzy, c-format
+msgstr "Échec de la session média"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
-"Veuillez sélectionner parmi les ressources de %s, à laquelle vous voulez "
-"envoyer un fichier"
+"Veuillez choisir parmi les ressources de %s, avec laquelle vous voulez "
+"engager une session média"

 msgid "Select a Resource"
 msgstr "Choisissez une ressource"

-#, fuzzy
 msgid "Initiate Media"
-msgstr "Lancer une _discussion"
+msgstr "Session média"

 msgid "config:  Configure a chat room."
 msgstr "config : Configurer un salon de discussions"
@@ -4584,21 +4553,21 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;utilisateur&gt; [salon] : Bannir un utilisateur d'un salon"

-#, fuzzy
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;utilisateur&gt; &lt;owner|admin|member|outcast|none&gt; : "
-"Change l'affiliation d'un utilisateur dans le salon."
-
-#, fuzzy
+"affiliate &lt;owner|admin|member|outcast|none&gt; [pseudo1] [pseudo2] ... : "
+"Récupère les utilisateurs avec une certaine affiliation ou change "
+"l'affiliation d'utilisateurs dans le salon."
+
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;utilisateur&gt; &lt;moderator|participant|visitor|none&gt; : "
-"Assigne à un utilisateur un rôle dans le salon."
+"role &lt;moderator|participant|visitor|none&gt; [pseudo1] [pseudo2] ... : "
+"Récupère les utilisateurs avec un certain rôle ou change le rôle "
+"d'utilisateurs dans le salon."

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
@@ -4661,7 +4630,7 @@
 msgstr "Serveur mandataire de transfert de fichiers"

 msgid "BOSH URL"
-msgstr ""
+msgstr "URL BOSH"

 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4725,32 +4694,28 @@
 msgid "_Accept Defaults"
 msgstr "_Accepter les paramètres par défaut"

-#, fuzzy
 msgid "No reason"
-msgstr "Pas de raison donnée"
-
-#, fuzzy, c-format
+msgstr "Pas de raison"
+
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Vous avez été expulsé par %s (%s)"
-
-#, fuzzy, c-format
+msgstr "Vous avez été expulsé : (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Expulsé par %s (%s)"
-
-#, fuzzy
+msgstr "Expulsé (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Erreur lors de l'ouverture du fichier."
-
-#, fuzzy
+msgstr "Erreur lors du transfert dans le flux de données in-band.\n"
+
 msgid "Transfer was closed."
-msgstr "Échec du transfert de fichier."
-
-#, fuzzy
+msgstr "Le transfert a été interrompu."
+
 msgid "Failed to open the file"
-msgstr "Impossible d'ouvrir le fichier « %s » : %s"
+msgstr "Impossible d'ouvrir le fichier"

 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Impossible d'ouvrir le flux de données in-band"

 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -5077,10 +5042,30 @@
 msgid "Non-IM Contacts"
 msgstr "Contacts non instantanés"

-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s a envoyé un clin d'œil. <a href='msn-wink://%s'>Cliquez ici pour le jouer."
+"</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s a envoyé un clin d'œil, mais il n'a pas pu être sauvé."
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s a envoyé un clip audio. <a href='audio://%s'>Cliquez ici pour le jouer.</"
+"a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s a envoyé un clip audio, mais il n'a pas pu être sauvé."
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s vous a envoyé une invitation webcam, ce qui n'est pas encore supporté."
+"%s vous a envoyé une invitation voix, ce qui n'est pas encore supporté."

 msgid "Nudge"
 msgstr "Nudge"
@@ -5236,6 +5221,29 @@
 "Le support de SSL est nécessaire pour MSN. Veuillez installer une "
 "bibliothèque SSL pour l'application."

+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Impossible d'ajouter le contact %s car son nom d'utilisateur est non valide. "
+"Les noms des contacts doivent être une adresse électronique valide."
+
+msgid "Unable to Add"
+msgstr "Impossible d'ajouter"
+
+msgid "Authorization Request Message:"
+msgstr "Message pour la demande d'autorisation :"
+
+msgid "Please authorize me!"
+msgstr "Autorise moi, s'il te plaît !"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
+
 msgid "Error retrieving profile"
 msgstr "Erreur à la récupération du profil."

@@ -5427,13 +5435,14 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s vient de vous envoyer un « Nudge. »"

-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Erreur inconnue (%d)"
+msgstr "Erreur inconnue (%d) : %s"

 msgid "Unable to add user"
 msgstr "Impossible d'ajouter un utilisateur"

+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Erreur inconnue (%d)"
@@ -5504,24 +5513,20 @@
 "Erreur de connexion du serveur %s :\n"
 "%s"

-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Notre protocole n'est pas supportés par le serveur."
-
-#, fuzzy
+msgstr "Notre protocole n'est pas supporté par le serveur."
+
 msgid "Error parsing HTTP"
 msgstr "Erreur à l'analyse du HTTP"

-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "Vous venez de vous connecter depuis un autre endroit."
+msgstr "Vous vous êtes connecté depuis un autre endroit."

 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Les serveurs MSN ne sont pas disponibles pour l'instant. Veuillez attendre "
 "un peu puis réessayer."

-#, fuzzy
 msgid "The MSN servers are going down temporarily"
 msgstr "Les serveurs MSN sont coupés temporairement."

@@ -5553,10 +5558,9 @@
 msgid "Retrieving buddy list"
 msgstr "Récupération de la liste de contacts"

-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
-"%s vous a envoyé une invitation webcam, ce qui n'est pas encore supporté."
+msgstr "%s demande à voir votre webcam, ce qui n'est pas encore supporté."

 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -5756,16 +5760,16 @@
 msgid "Protocol error, code %d: %s"
 msgstr "Erreur de protocole, code %d : %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s, votre mot de passe fait %d caractères, ce qui est supérieur à la "
-"longueur maximale de %d attendue par MySpaceIM. Veuillez raccourcir votre "
-"mot de passe à http://profileedit.myspace.com/index.cfm?"
-"fuseaction=accountSettings.changePassword puis réessayer."
+"%s, votre mot de passe fait %zu caractères, ce qui est supérieur à la "
+"longueur maximale de %d. Veuillez raccourcir votre mot de passe à http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"puis réessayer."

 msgid "Incorrect username or password"
 msgstr "Nom d'utilisateur ou mot de passe incorrect"
@@ -5864,6 +5868,9 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"Une erreur est survenue en essayant de changer le nom d'utilisateur. "
+"Veuillez réessayer ou aller sur http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username pour changer de nom d'utilisateur."

 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nom d'utilisateur disponible"
@@ -6123,9 +6130,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "Erreur inconnue :0x%X"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Impossible d'envoyer un ping à l'utilisateur %s"
+msgstr "Impossible de s'authentifier : %s"

 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6259,7 +6266,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s est déconnecté et n'a pas reçu le message que vous venez d'envoyer."

-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6289,9 +6295,8 @@
 msgid "Server port"
 msgstr "Port du serveur"

-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "Réception d'un message HTTP non attendu du serveur."
+msgstr "Réception d'un message non attendu de "

 #. username connecting too frequently
 msgid ""
@@ -6302,12 +6307,12 @@
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."

-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Erreur à la résolution du nom %s."
+msgstr "Erreur à la demande de "

 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL n'autorise pas votre nom d'utilisateur pour authentification ici."

 msgid "Could not join chat room"
 msgstr "Impossible de rejoindre le salon de discussions"
@@ -6315,9 +6320,8 @@
 msgid "Invalid chat room name"
 msgstr "Nom de salon non valide"

-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "Données non valides reçues sur la connexion du serveur."
+msgstr "Données non valides reçues à la connexion sur le serveur."

 #. *< type
 #. *< ui_requirement
@@ -6364,7 +6368,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "Données non valides reçues sur la connexion avec l'interlocuteur."

-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "Impossible de se connecter à l'interlocuteur."

@@ -6567,15 +6570,13 @@
 msgid "Buddy Comment"
 msgstr "Commentaire"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Impossible de se connecter au serveur d'authentification :\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Impossible de se connecter au serveur d'authentification : %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Impossible de se connecter au serveur"
+msgstr "Impossible de se connecter au serveur BOS : %s"

 msgid "Username sent"
 msgstr "Nom d'utilisateur envoyé"
@@ -6587,16 +6588,16 @@
 msgid "Finalizing connection"
 msgstr "Finalisation de la connexion"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to 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 ""
-"Impossible de se connecter : le nom d'utilisateur %s est non valide. Les "
-"noms doivent soit être une adresse électronique valide, soit commencer par "
-"une lettre et contenir uniquement des lettres, des chiffres et des espaces, "
-"soit contenir uniquement des chiffres."
+"Impossible de se connecter en tant que %s, ce nom n'est pas valide. Les noms "
+"doivent soit être une adresse électronique valide, soit commencer par une "
+"lettre et contenir uniquement des lettres, des chiffres et des espaces, soit "
+"contenir uniquement des chiffres."

 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6616,12 +6617,10 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
 msgstr "Cet utilisateur n'existe pas"

 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
 msgstr "Votre compte est actuellement suspendu."

@@ -6629,6 +6628,7 @@
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Le service est temporairement indisponible."

+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
@@ -6636,16 +6636,14 @@
 "à jour sur %s."

 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"Vous vous êtes connecté/déconnecté trop rapidement. Attendez 10 minutes et "
+"Vous vous reconnectez trop rapidement. Attendez quelques minutes et "
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."

-#, fuzzy
 msgid "The SecurID key entered is invalid"
 msgstr "La clé SecurID saisie est non valide."

@@ -6655,12 +6653,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Saisissez les 6 chiffres de l'affichage numérique."

-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
 msgid "Password sent"
 msgstr "Mot de passe envoyé"

@@ -6670,12 +6662,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorise moi pour que je t'ajoute à ma liste de contacts."

-msgid "Authorization Request Message:"
-msgstr "Message pour la demande d'autorisation :"
-
-msgid "Please authorize me!"
-msgstr "Autorise moi, s'il te plaît !"
-
 msgid "No reason given."
 msgstr "Pas de raison"

@@ -7011,7 +6997,7 @@
 msgid "Away message too long."
 msgstr "Message d'absence trop long"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to 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, "
@@ -7022,9 +7008,6 @@
 "soit commencer par une lettre et contenir uniquement des lettres, des "
 "chiffres et des espaces, soit contenir uniquement des chiffres."

-msgid "Unable to Add"
-msgstr "Impossible d'ajouter"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Impossible de récupérer la liste de contacts"

@@ -7039,7 +7022,7 @@
 msgid "Orphans"
 msgstr "Orphelins"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
@@ -7050,7 +7033,7 @@
 msgid "(no name)"
 msgstr "(pas de nom)"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Impossible d'ajouter le contact %s pour une raison inconnue."

@@ -7215,9 +7198,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Chercher d'après les informations..."

-#, fuzzy
 msgid "Use clientLogin"
-msgstr "Utilisateur non connecté"
+msgstr "Utiliser clientLogin"

 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7415,30 +7397,26 @@
 msgstr "Commentaire"

 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Icône du contact"
+msgstr "Mémo du contact"

 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "Vous pouvez changer son mémo à votre convenance"
+
 msgid "_Modify"
-msgstr "Modifier"
-
-#, fuzzy
+msgstr "_Modifier"
+
 msgid "Memo Modify"
-msgstr "Modifier"
-
-#, fuzzy
+msgstr "Changer mémo"
+
 msgid "Server says:"
-msgstr "Serveur occupé"
+msgstr "Message du serveur :"

 msgid "Your request was accepted."
-msgstr ""
+msgstr "Votre requête a été acceptée."

 msgid "Your request was rejected."
-msgstr ""
+msgstr "Votre requête a été rejetée."

 #, c-format
 msgid "%u requires verification"
@@ -7748,18 +7726,17 @@
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Remerciements :</b><br>\n"

-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b>Auteur original :</b><br>\n"
+msgstr "<p><b>Testeurs scrupuleux :</b><br>\n"

 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "et d'autres, faites-nous le savoir... merci !"

 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr "<p><i>et tous les personnes dans les coulisses...</i><br>\n"
+msgstr "<p><i>et toutes les personnes dans les coulisses...</i><br>\n"

 msgid "<i>Feel free to join us!</i> :)"
-msgstr "<i>N'hésitez pas à mous rejoindre !</i> :)"
+msgstr "<i>N'hésitez pas à nous rejoindre !</i> :)"

 #, c-format
 msgid "About OpenQ %s"
@@ -7780,9 +7757,8 @@
 msgid "About OpenQ"
 msgstr "À propos de OpenQ"

-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "Modifier l'adresse"
+msgstr "Changer le mémo de l'utilisateur"

 #. *< type
 #. *< ui_requirement
@@ -7830,7 +7806,6 @@
 msgid "Update interval (seconds)"
 msgstr "Délai de mise à jour (en secondes)"

-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "Impossible de déchiffrer la réponse du serveur"

@@ -7898,9 +7873,8 @@
 msgid "Requesting token"
 msgstr "Requête d'un token"

-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "Impossible de se connecter au serveur"
+msgstr "Impossible de résoudre l'adresse internet."

 msgid "Invalid server or port"
 msgstr "Serveur ou port non valide"
@@ -7953,7 +7927,6 @@
 msgid "QQ Qun Command"
 msgstr "Commande Qun QQ"

-#, fuzzy
 msgid "Unable to decrypt login reply"
 msgstr "Impossible de déchiffrer la réponse de connexion"

@@ -8935,7 +8908,6 @@
 msgid "Disconnected by server"
 msgstr "Déconnexion par le serveur"

-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "Erreur à la connexion au serveur SILC"

@@ -8951,7 +8923,6 @@
 msgid "Performing key exchange"
 msgstr "Échange de clé en cours"

-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Impossible de charger la paire de clés SILC"

@@ -8959,16 +8930,14 @@
 msgid "Connecting to SILC Server"
 msgstr "Connexion au serveur SILC"

-#, fuzzy
 msgid "Unable to not load SILC key pair"
-msgstr "Impossible de charger la paire de clés SILC"
+msgstr "Impossible de ne pas charger la paire de clés SILC"

 msgid "Out of memory"
 msgstr "Pas assez de mémoire"

-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "Impossible d'initialiser le protocole SILC."
+msgstr "Impossible d'initialiser le protocole SILC"

 msgid "Error loading SILC key pair"
 msgstr "Erreur de chargement de la paire de clés SILC"
@@ -9267,9 +9236,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Création de la paire de clés SILC..."

-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Impossible de créer la paire de clés SILC\n"
+msgstr "Impossible de créer la paire de clés SILC"

 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9411,27 +9379,24 @@
 msgid "Failure: Authentication failed"
 msgstr "Échec de l'authentification"

-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "Impossible d'initialiser la connexion client SILC"

 msgid "John Noname"
 msgstr "Anne Onyme"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Impossible de charger la paire de clés SILC : %s"

 msgid "Unable to create connection"
 msgstr "Impossible de créer une connexion."

-#, fuzzy
 msgid "Unknown server response"
-msgstr "Réponse du serveur inconnue."
-
-#, fuzzy
+msgstr "Réponse du serveur inconnue"
+
 msgid "Unable to create listen socket"
-msgstr "Impossible de créer le socket."
+msgstr "Impossible de se mettre en écoute sur la connexion"

 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9495,7 +9460,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo"

@@ -9526,9 +9490,8 @@
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"

-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "ID Yahoo..."
+msgstr "ID Yahoo Japon..."

 #. *< type
 #. *< ui_requirement
@@ -9540,12 +9503,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Plugin pour le protocole Yahoo"
+msgstr "Plugin pour le protocole Yahoo Japon"

 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Votre SMS n'a pas été transmis"

 msgid "Your Yahoo! message did not get sent."
 msgstr "Votre message Yahoo! n'a pas été envoyé"
@@ -9572,32 +9534,28 @@
 msgstr "Ajout du contact refusé"

 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "Données non valides reçues sur la connexion du serveur."
+msgstr "Données reçues non valides"

 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
-"problème."
+"Compte bloqué : trop de mauvais mots de passe. Se connecter sur le site web "
+"Yahoo! peut corriger le problème."

 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
-"problème."
+"Compte bloqué : raison inconnue. Se connecter sur le site web Yahoo! peut "
+"corriger le problème."

 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Nom d'utilisateur ou mot de passe incorrect"
+msgstr "Nom d'utilisateur ou mot de passe manquant"

 #, c-format
 msgid ""
@@ -9634,35 +9592,29 @@
 "Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
 "problème."

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossible d'ajouter le contact %s au groupe %s sur la liste du serveur pour "
 "le compte %s."

-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "Impossible d'ajouter le contact sur la liste du serveur."
+msgstr "Impossible d'ajouter le contact sur la liste du serveur"

 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audible %s/%s/%s.swf ] %s"

-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Réception d'un message HTTP non attendu du serveur."
-
-#, fuzzy, c-format
+msgstr "Réception d'un message HTTP non attendu du serveur"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Connexion perdue avec %s :\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Connexion perdue avec %s : %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"Impossible de se connecter au serveur :\n"
-"%s"
+msgstr "Impossible de se connecter à %s : %s"

 msgid "Not at Home"
 msgstr "Pas à la maison"
@@ -9710,7 +9662,7 @@
 msgstr "Commencer à griffonner"

 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Choisissez l'ID que vous voulez activer"

 msgid "Join whom in chat?"
 msgstr "Qui rejoindre dans une discussion ?"
@@ -9872,7 +9824,6 @@
 msgid "User Rooms"
 msgstr "Salon de discussions utilisateur"

-#, fuzzy
 msgid "Connection problem with the YCHT server"
 msgstr "Problème de connexion avec le serveur YCHT"

@@ -10006,19 +9957,19 @@
 msgid "Exposure"
 msgstr "Exposition"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Impossible de reconnaître la réponse du serveur mandataire HTTP : %s\n"
+msgstr "Impossible de reconnaître la réponse du serveur mandataire HTTP : %s"

 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erreur de connexion au serveur mandataire HTTP %d."

-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Accès interdit : le serveur mandataire n'autorise pas le passage par le port "
-"%d."
+"%d"

 #, c-format
 msgid "Error resolving %s"
@@ -10262,7 +10213,7 @@
 msgid "Error Reading %s"
 msgstr "Erreur à la lecture de « %s »."

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
@@ -10312,7 +10263,7 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Utiliser cette _icône pour ce compte :"

-msgid "_Advanced"
+msgid "Ad_vanced"
 msgstr "_Avancé"

 msgid "Use GNOME Proxy Settings"
@@ -10375,9 +10326,8 @@
 msgid "Create _this new account on the server"
 msgstr "Créer ce _nouveau compte sur le serveur"

-#, fuzzy
-msgid "_Proxy"
-msgstr "Serveur mandataire"
+msgid "P_roxy"
+msgstr "Serveur _mandataire"

 msgid "Enabled"
 msgstr "Activé"
@@ -10412,8 +10362,8 @@
 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] ""
-msgstr[1] ""
+msgstr[0] "Vous avez %d contact nommé %s. Voulez-vous le fusionner ?"
+msgstr[1] "Vous avez %d contacts nommé %s. Voulez-vous les fusionner ?"

 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10428,9 +10378,8 @@
 msgid "Please update the necessary fields."
 msgstr "Veuillez mettre à jour les rubriques nécessaires."

-#, fuzzy
 msgid "A_ccount"
-msgstr "_Compte :"
+msgstr "_Compte"

 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10457,16 +10406,14 @@
 msgid "I_M"
 msgstr "_Message"

-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Ajouter une discussion"
+msgstr "Appel _audio"

 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Appel audio/_vidéo"
+
 msgid "_Video Call"
-msgstr "Visioconférence"
+msgstr "Appel _vidéo"

 msgid "_Send File..."
 msgstr "Envoyer un _fichier..."
@@ -10477,11 +10424,9 @@
 msgid "View _Log"
 msgstr "_Voir les archives"

-#, fuzzy
 msgid "Hide When Offline"
 msgstr "Cacher si déconnecté"

-#, fuzzy
 msgid "Show When Offline"
 msgstr "Afficher si déconnecté"

@@ -10607,9 +10552,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/Outils/_Certificats"

-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Outils/Frim_ousses"
+msgstr "/Outils/Frimo_usses personnalisée"

 msgid "/Tools/Plu_gins"
 msgstr "/Outils/Plu_gins"
@@ -10738,7 +10682,7 @@
 msgstr "Par état"

 msgid "By recent log activity"
-msgstr ""
+msgstr "Par discussions récentes"

 #, c-format
 msgid "%s disconnected"
@@ -10755,7 +10699,7 @@
 msgstr "Réactiver"

 msgid "SSL FAQs"
-msgstr ""
+msgstr "FAQs SSL"

 msgid "Welcome back!"
 msgstr "Content de vous revoir !"
@@ -10890,107 +10834,95 @@
 msgstr "Couleur de fond"

 msgid "The background color for the buddy list"
-msgstr ""
-
-#, fuzzy
+msgstr "La couleur de fond pour la liste de contacts"
+
 msgid "Layout"
-msgstr "Lao"
+msgstr "Arrangement"

 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "L'arrangement des icônes, noms et états dans la liste"

 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Couleur de fond"
+msgstr "Couleur de fond déplié"

 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "La couleur de fond pour un groupe de contacts déplié"
+
 msgid "Expanded Text"
-msgstr "_Etendre"
+msgstr "Texte déplié"

 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "L'information textuelle pour un groupe de contacts déplié"
+
 msgid "Collapsed Background Color"
-msgstr "Changer la couleur du fond"
+msgstr "Couleur de fond replié"

 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "La couleur de fond pour un groupe de contacts replié"
+
 msgid "Collapsed Text"
-msgstr "Re_plier"
+msgstr "Texte replié"

 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "L'information textuelle pour un groupe de contacts replié"

 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Changer la couleur du fond"
+msgstr "Couleur du fond des contacts et salons"

 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "La couleur de fond pour un contact ou un salon de discussions"
+
 msgid "Contact Text"
-msgstr "Raccourci"
+msgstr "Texte des contacts"

 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "L'information textuelle pour un contact déplié"
+
 msgid "On-line Text"
-msgstr "En ligne"
+msgstr "Texte des contacts connectés"

 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "L'information textuelle pour un contact connecté"
+
 msgid "Away Text"
-msgstr "Absent"
+msgstr "Texte des contacts absents"

 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "L'information textuelle pour un contact absent"
+
 msgid "Off-line Text"
-msgstr "Déconnecté"
+msgstr "Texte des contacts déconnectés"

 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "L'information textuelle pour un contact déconnecté"
+
 msgid "Idle Text"
-msgstr "Texte d'humeur"
+msgstr "Texte des contacts inactifs"

 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "L'information textuelle pour un contact inactif"
+
 msgid "Message Text"
-msgstr "Envoi d'un message"
+msgstr "Texte des messages non-lus"

 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "L'information textuelle pour les messages non-lus d'un contact"

 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Texte des messages avec pseudo"

 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
 msgstr ""
-
-#, fuzzy
+"L'information textuelle pour les messages dans lesquels apparaissent votre "
+"pseudo"
+
 msgid "The text information for a buddy's status"
-msgstr "Changer les informations pour %s"
-
-#, fuzzy
+msgstr "L'information textuelle pour l'état des contacts"
+
 msgid "Type the host name for this certificate."
 msgstr "Saisissez le nom d'hôte correspondant à ce certificat."

@@ -11040,7 +10972,6 @@
 msgid "Get Away Message"
 msgstr "Récupérer le message d'absence"

-#, fuzzy
 msgid "Last Said"
 msgstr "Dernières paroles"

@@ -11087,21 +11018,17 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversation/_Effacer la conversation"

-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Conversation/_Plus"
-
-#, fuzzy
+msgstr "/Conversation/Mé_dia"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Conversation/_Plus"
-
-#, fuzzy
+msgstr "/Conversation/Média/Appel _audio"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Conversation/_Plus"
-
-#, fuzzy
+msgstr "/Conversation/Média/Appel _vidéo"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Conversation/_Voir les archives"
+msgstr "/Conversation/Média/A_ppel audio\\/vidéo"

 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversation/Envoyer un _fichier..."
@@ -11175,17 +11102,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Conversation/Voir les archives"

-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Conversation/Plus"
-
-#, fuzzy
+msgstr "/Conversation/Média/Appel audio"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Conversation/Voir les archives"
-
-#, fuzzy
+msgstr "/Conversation/Média/Appel vidéo"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Conversation/Plus"
+msgstr "/Conversation/Média/Appel audio\\/vidéo"

 msgid "/Conversation/Send File..."
 msgstr "/Conversation/Envoyer un fichier..."
@@ -11372,7 +11296,7 @@
 msgstr ""

 msgid "voice and video"
-msgstr ""
+msgstr "voix et vidéo"

 msgid "support"
 msgstr "support"
@@ -11498,9 +11422,8 @@
 msgid "Hungarian"
 msgstr "Hongrois"

-#, fuzzy
 msgid "Armenian"
-msgstr "Roumain"
+msgstr "Arménien"

 msgid "Indonesian"
 msgstr "Indonésien"
@@ -11517,9 +11440,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Traducteurs géorgiens d'Ubuntu"

-#, fuzzy
 msgid "Khmer"
-msgstr "Autre"
+msgstr "Khmer"

 msgid "Kannada"
 msgstr "Kannara"
@@ -11600,7 +11522,7 @@
 msgstr "Suédois"

 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"

 msgid "Tamil"
 msgstr "Tamoul"
@@ -11937,7 +11859,6 @@
 msgid "Hyperlink visited color"
 msgstr "Couleur des liens visités"

-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Couleur pour afficher les liens hypertextes une fois visités (ou activés)."
@@ -11974,23 +11895,20 @@
 msgstr "Couleur pour afficher le nom pour les messages d'action."

 msgid "Action Message Name Color for Whispered Message"
-msgstr "Nom de la couleur des messages chuchotés."
-
-#, fuzzy
+msgstr "Nom de la couleur des messages d'action chuchotés."
+
 msgid "Color to draw the name of a whispered action message."
-msgstr "Couleur pour afficher le nom pour les messages d'action."
+msgstr "Couleur pour afficher le nom pour les messages d'actions chuchotés."

 msgid "Whisper Message Name Color"
-msgstr "Nom de la couleur pour les messages envoyés"
-
-#, fuzzy
+msgstr "Nom de la couleur des messages chuchotés."
+
 msgid "Color to draw the name of a whispered message."
-msgstr "Couleur pour afficher le nom pour les messages d'action."
+msgstr "Couleur pour afficher le nom pour les messages chuchotés."

 msgid "Typing notification color"
 msgstr "Couleur de la notification de saisie"

-#, fuzzy
 msgid "The color to use for the typing notification"
 msgstr ""
 "Couleur pour afficher que quelqu'un est en train de vous écrire un message"
@@ -12246,7 +12164,7 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. « %s -h » pour plus d'informations.\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12264,11 +12182,12 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"Usage : %s [option] ...\n"
+"Usage : %s [option]...\n"
 "\n"
 "  -c, --config=DOS    lit les fichiers de configuration depuis le dossier "
 "DOS\n"
 "  -d, --debug         affiche les messages de debug sur la sortie standard\n"
+"  -f, --force-online  force online, quelque soit l'état du réseau\n"
 "  -h, --help          affiche ce texte d'aide\n"
 "  -m, --multiple      ne vérifie pas la présence d'une seule instance du "
 "programme\n"
@@ -12280,7 +12199,7 @@
 "  --display=DISPLAY   affichage X à utiliser\n"
 "  -v, --version       affiche le numéro de la version actuelle\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12302,6 +12221,7 @@
 "  -c, --config=REP    lit les fichiers de configuration depuis le dossier "
 "REP\n"
 "  -d, --debug         affiche les messages de debug sur la sortie standard\n"
+"  -f, --force-online  force online, quelque soit l'état du réseau\n"
 "  -h, --help          affiche ce texte d'aide\n"
 "  -m, --multiple      ne vérifie pas la présence d'une seule instance du "
 "programme\n"
@@ -12351,22 +12271,21 @@
 msgstr "Arrêt à cause d'un autre client libpurple existant.\n"

 msgid "/_Media"
-msgstr ""
+msgstr "/_Média"

 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/Média/_Raccrocher"
+
 msgid "Calling..."
-msgstr "Calcul en cours"
+msgstr "Appel..."

 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s veut engager une session audio/vidéo."

 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s veut engager une session vidéo."

 #, c-format
 msgid "%s has %d new message."
@@ -12397,9 +12316,8 @@
 "Un navigateur « Manuel » a été choisi choisi mais la ligne de commande est "
 "vide."

-#, fuzzy
 msgid "No message"
-msgstr "Message inconnu"
+msgstr "Pas de message"

 msgid "Open All Messages"
 msgstr "Ouvrir tous les messages"
@@ -12407,16 +12325,14 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Vous avez du courrier !</span>"

-#, fuzzy
 msgid "New Pounces"
-msgstr "Nouvelle alerte"
+msgstr "Nouvelles alertes"

 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "Fermer"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Vous avez du courrier !</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Vous avez des alertes !</span>"

 msgid "The following plugins will be unloaded."
 msgstr "Les plugins suivants vont être déchargés."
@@ -12466,7 +12382,6 @@
 msgid "Select a file"
 msgstr "Choisissez un fichier"

-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "Modifier une alerte"

@@ -12543,61 +12458,58 @@
 msgid "Pounce Target"
 msgstr "Cible de l'alerte"

-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
 msgstr "Commence à écrire"

-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
 msgstr "Pause pendant la saisie"

-#, fuzzy, c-format
+#, c-format
 msgid "Signed on"
 msgstr "Se connecte"

-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s n'est plus inactif (%s)"
-
-#, fuzzy, c-format
+msgstr "N'est plus inactif"
+
+#, c-format
 msgid "Returned from being away"
 msgstr "Revient d'absence"

-#, fuzzy, c-format
+#, c-format
 msgid "Stopped typing"
 msgstr "S'arrête d'écrire"

-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
 msgstr "Se déconnecte"

-#, fuzzy, c-format
+#, c-format
 msgid "Became idle"
 msgstr "Devient inactif"

-#, fuzzy, c-format
+#, c-format
 msgid "Went away"
-msgstr "Lorsque absent"
-
-#, fuzzy, c-format
+msgstr "Devient absent"
+
+#, c-format
 msgid "Sent a message"
-msgstr "Envoyer un message"
-
-#, fuzzy, c-format
+msgstr "Envoi un message"
+
+#, c-format
 msgid "Unknown.... Please report this!"
 msgstr "Événement d'alerte inconnu. Veuillez reporter cette erreur."

-#, fuzzy
 msgid "Theme failed to unpack."
 msgstr "Le thème de frimousses n'a pas pu être déballé."

-#, fuzzy
 msgid "Theme failed to load."
-msgstr "Le thème de frimousses n'a pas pu être déballé."
-
-#, fuzzy
+msgstr "Le thème de frimousses n'a pas pu être chargé."
+
 msgid "Theme failed to copy."
-msgstr "Le thème de frimousses n'a pas pu être déballé."
+msgstr "Le thème de frimousses n'a pas pu être copié."

 msgid "Install Theme"
 msgstr "Installer un thème"
@@ -12620,9 +12532,8 @@
 msgstr "Fermer les conversations avec la touche _Echap"

 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Liste de contacts"
+msgstr "Thème de liste de contacts"

 #. System Tray
 msgid "System Tray Icon"
@@ -12634,9 +12545,8 @@
 msgid "On unread messages"
 msgstr "Quand des messages sont non lus"

-#, fuzzy
 msgid "Conversation Window"
-msgstr "Fenêtres de conversation"
+msgstr "Fenêtre de conversation"

 msgid "_Hide new IM conversations:"
 msgstr "_Cacher les nouvelles conversations :"
@@ -12739,9 +12649,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemple : stunserver.org</span>"

-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Détection auto de l'adresse IP"
+msgstr "_Détection auto de l'adresse IP : %s"

 msgid "Public _IP:"
 msgstr "Adresse _IP publique :"
@@ -12763,7 +12673,7 @@

 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Serveur relai (TURN)"

 msgid "Proxy Server &amp; Browser"
 msgstr "Serveur mandataire &amp; navigateur"
@@ -13110,11 +13020,11 @@
 msgid "Status for %s"
 msgstr "État pour %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"Une frimousse spécialisée pour ce raccourci existe déjà. Veuillez choisir un "
+"Une frimousse personnalisée pour « %s » existe déjà. Veuillez choisir un "
 "autre raccourci."

 msgid "Custom Smiley"
@@ -13129,28 +13039,24 @@
 msgid "Add Smiley"
 msgstr "Ajouter la frimousse"

-#, fuzzy
 msgid "_Image:"
-msgstr "_Image"
+msgstr "_Image :"

 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Raccourci"
+msgstr "Texte de _raccourci :"

 msgid "Smiley"
 msgstr "Frimousse"

-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Raccourci"
+msgstr "Texte de raccourci"

 msgid "Custom Smiley Manager"
 msgstr "Gestionnaire de frimousses personnalisée"

-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Choisir contact"
+msgstr "Choisir l'icône de contact"

 msgid "Click to change your buddyicon for this account."
 msgstr "Cliquer pour changer votre icône pour ce compte."
@@ -13234,9 +13140,8 @@
 #. * 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 "Impossible d'envoyer ce lien."
-
-#, fuzzy
+msgstr "Impossible d'envoyer ce lien"
+
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13277,9 +13182,8 @@
 "Impossible de charger l'image « %s » : la raison est inconnue, le fichier est "
 "peut-être endommagé."

-#, fuzzy
 msgid "_Open Link"
-msgstr "_Ouvrir les liens :"
+msgstr "_Ouvrir le lien"

 msgid "_Copy Link Location"
 msgstr "_Copier l'adresse du lien"
@@ -13287,9 +13191,21 @@
 msgid "_Copy Email Address"
 msgstr "_Copier l'adresse électronique"

+msgid "_Open File"
+msgstr "Ouvrir le _fichier"
+
+msgid "Open _Containing Directory"
+msgstr "Ouvrir le _dossier du fichier"
+
 msgid "Save File"
 msgstr "Sauver le fichier"

+msgid "_Play Sound"
+msgstr "_Jouer le son"
+
+msgid "_Save File"
+msgstr "_Sauver le fichier"
+
 msgid "Select color"
 msgstr "Choisir la couleur"

@@ -13377,77 +13293,65 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Affiche des statistiques sur la disponibilité de vos contacts"

-#, fuzzy
 msgid "Server name request"
-msgstr "Hôte du serveur"
-
-#, fuzzy
+msgstr "Demande du nom du serveur"
+
 msgid "Enter an XMPP Server"
-msgstr "Rejoindre un serveur de conférences"
-
-#, fuzzy
+msgstr "Saisissez l'adresse d'un serveur XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Choisissez un serveur de conférences"
-
-#, fuzzy
+msgstr "Choisissez un serveur XMPP à consulter"
+
 msgid "Find Services"
-msgstr "Services en ligne"
-
-#, fuzzy
+msgstr "Trouver des services"
+
 msgid "Add to Buddy List"
-msgstr "Envoyer sa liste de contacts"
-
-#, fuzzy
+msgstr "Ajouter à la liste de contacts"
+
 msgid "Gateway"
-msgstr "S'absente"
-
-#, fuzzy
+msgstr "Portail"
+
 msgid "Directory"
-msgstr "Dossier des archives"
-
-#, fuzzy
+msgstr "Annuaire"
+
 msgid "PubSub Collection"
-msgstr "Choix des sons"
-
-#, fuzzy
+msgstr "Ensemble PubSub"
+
 msgid "PubSub Leaf"
-msgstr "Service PubSub"
-
-#, fuzzy
+msgstr "Feuillet PubSub"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Description"
+msgstr ""
+"\n"
+"<b>Description :</b> "

 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Informations du service de découverte"
-
-#, fuzzy
+msgstr "Découverte de services"
+
 msgid "_Browse"
-msgstr "_Navigateur :"
-
-#, fuzzy
+msgstr "_Parcourir"
+
 msgid "Server does not exist"
-msgstr "Cet utilisateur n'existe pas"
-
-#, fuzzy
+msgstr "Le serveur n'existe pas"
+
 msgid "Server does not support service discovery"
-msgstr "Le serveur ne supporte pas le blocage"
-
-#, fuzzy
+msgstr "Le serveur ne supporte pas la découverte de services"
+
 msgid "XMPP Service Discovery"
-msgstr "Informations du service de découverte"
+msgstr "Découverte de services XMPP"

 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Permet la visualisation et l'enregistrement de services."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."
+msgstr ""
+"Ce plugin est utile pour s'abonner avec d'anciens transports ou d'autres "
+"services XMPP."

 msgid "Buddy is idle"
 msgstr "L'utilisateur est inactif"
@@ -13854,7 +13758,6 @@
 msgstr "Plugin de messagerie musicale pour la composition collaborative."

 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -13978,7 +13881,6 @@
 msgid "Highlighted Message Name Color"
 msgstr "Nom de la couleur des messages en surbrillance"

-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "Couleur de la notification de saisie"

@@ -14011,23 +13913,20 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Raccourci du thème GTK+"

-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Activer la notification de saise"
-
-#, fuzzy
+msgstr "Désactiver le texte de notification de saisie"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Contrôle Pidgin du thème GTK+"
-
-#, fuzzy
+msgstr "Contrôle des paramètres du thème GTK+"
+
 msgid "Colors"
-msgstr "Fermer"
+msgstr "Couleurs"

 msgid "Fonts"
 msgstr "Polices"

 msgid "Miscellaneous"
-msgstr ""
+msgstr "Divers"

 msgid "Gtkrc File Tools"
 msgstr "Outils du fichier Gtkrc"
@@ -14112,7 +14011,6 @@
 msgstr "Bouton Envoyer dans la fenêtre de conversation."

 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14171,94 +14069,78 @@
 "Remplace le texte dans les messages envoyés grâce à des règles de "
 "substitution."

-#, fuzzy
 msgid "Just logged in"
-msgstr "Non connecté"
-
-#, fuzzy
+msgstr "Vient de se connecter"
+
 msgid "Just logged out"
-msgstr "Non connecté"
+msgstr "Vient de se déconnecter"

 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Icône pour le contact/\n"
+"Icône pour une personne inconnue"
+
 msgid "Icon for Chat"
-msgstr "Rejoindre une discussion"
-
-#, fuzzy
+msgstr "Icône pour un salon de discussions"
+
 msgid "Ignored"
-msgstr "Ignorer"
-
-#, fuzzy
+msgstr "Ignoré"
+
 msgid "Founder"
-msgstr "Très fort"
-
-#, fuzzy
+msgstr "Fondateur"
+
 msgid "Operator"
-msgstr "Opéra"
+msgstr "Opérateur"

 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Demi-opérateur"
+
 msgid "Authorization dialog"
-msgstr "Autorisation donnée"
-
-#, fuzzy
+msgstr "Boite de message pour autorisation"
+
 msgid "Error dialog"
-msgstr "Erreur "
-
-#, fuzzy
+msgstr "Boite de message pour erreur"
+
 msgid "Information dialog"
-msgstr "Informations"
+msgstr "Boite de message pour informations"

 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Boite de message pour courrier"
+
 msgid "Question dialog"
-msgstr "Boite de message pour requête"
-
-#, fuzzy
+msgstr "Boite de message pour demande"
+
 msgid "Warning dialog"
-msgstr "Niveau d'avertissement"
+msgstr "Boite de message pour avertissement"

 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Quel genre de boite de message est-ce là ?"
+
 msgid "Status Icons"
-msgstr "État pour %s"
-
-#, fuzzy
+msgstr "Icônes d'état"
+
 msgid "Chatroom Emblems"
-msgstr "Langue du salon de discussions"
-
-#, fuzzy
+msgstr "Emblêmes de salon de discussions"
+
 msgid "Dialog Icons"
-msgstr "Changer l'icône"
-
-#, fuzzy
+msgstr "Icônes des boites de message"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Contrôle Pidgin du thème GTK+"
-
-#, fuzzy
+msgstr "Éditeur de thème d'icônes Pidgin"
+
 msgid "Contact"
-msgstr "Infos du contact"
-
-#, fuzzy
+msgstr "Contact"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Liste de contacts"
-
-#, fuzzy
+msgstr "Éditeur de thème de liste de contacts Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Liste de contacts"
+msgstr "Permet de modifier le thème de la liste de contacts"

 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Permet de modifier le thème des icônes"

 #. *< type
 #. *< ui_requirement
@@ -14267,16 +14149,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Contrôle Pidgin du thème GTK+"
+msgstr "Éditeur de thème Pidgin"

 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Contrôle Pidgin du thème GTK+"
+msgstr "Permet de modifier le thème de Pidgin"

 #. *< type
 #. *< ui_requirement
@@ -14445,7 +14325,6 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Options spécifiques à Pidgin Windows"

-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
@@ -14526,9 +14405,6 @@
 #~ msgid "Last Activity"
 #~ msgstr "Dernière activité"

-#~ msgid "Service Discovery Info"
-#~ msgstr "Informations du service de découverte"
-
 #~ msgid "Service Discovery Items"
 #~ msgstr "Items du service de découverte"

@@ -14547,9 +14423,6 @@
 #~ msgid "Ad-Hoc Commands"
 #~ msgstr "Commandes ad-hoc"

-#~ msgid "PubSub Service"
-#~ msgstr "Service PubSub"
-
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "Flux de données SOCKS5"

@@ -14676,9 +14549,6 @@
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "Support SSL non installé"

-#~ msgid "Incorrect password."
-#~ msgstr "Mot de passe incorrect."
-
 #~ msgid ""
 #~ "Could not connect to BOS server:\n"
 #~ "%s"
@@ -14686,17 +14556,20 @@
 #~ "Impossible de se connecter au serveur BOS :\n"
 #~ "%s"

+#~ msgid "Invalid username."
+#~ msgstr "Nom d'utilisateur non valide."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Mot de passe incorrect."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Impossible de se connecter."
+
 #~ msgid "You may be disconnected shortly.  Check %s for updates."
 #~ msgstr ""
 #~ "Vous risquez être déconnecté sous peu. Consultez %s pour plus "
 #~ "d'informations."

-#~ msgid "Could Not Connect"
-#~ msgstr "Impossible de se connecter."
-
-#~ msgid "Invalid username."
-#~ msgstr "Nom d'utilisateur non valide."
-
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "Impossible de déchiffrer la réponse du serveur"

@@ -14727,12 +14600,14 @@
 #~ msgid "Could not create listen socket"
 #~ msgstr "Impossible de créer le socket d'écoute."

-#~ msgid "Could not resolve hostname"
-#~ msgstr "Impossible de résoudre le nom de l'hôte."
-
-#, fuzzy
 #~ msgid "Incorrect Password"
-#~ msgstr "Mot de passe incorrect."
+#~ msgstr "Mot de passe incorrect"
+
+#~ msgid "Account locked: Too many failed login attempts"
+#~ msgstr "Compte bloqué : trop de mauvais mots de passe"
+
+#~ msgid "Account locked: See the debug log"
+#~ msgstr "Compte bloqué : regarder le journal de debug"

 #~ msgid ""
 #~ "Could not establish a connection with %s:\n"
@@ -14741,6 +14616,9 @@
 #~ "Impossible de se connecter avec %s :\n"
 #~ "%s"

+#~ msgid "Activate which ID?"
+#~ msgstr "Activer quelle identité ?"
+
 #~ msgid "Yahoo Japan"
 #~ msgstr "Yahoo Japon"

@@ -14760,13 +14638,15 @@
 #~ msgid "Could not resolve host name"
 #~ msgstr "Impossible de résoudre le nom de l'hôte."

-#, fuzzy
 #~ msgid ""
 #~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
 #~ "was found."
 #~ msgstr ""
-#~ "TLS/SSL est nécessaire pour la connexion au serveur. Aucun support de TLS/"
-#~ "SSL n'a pu être trouvé."
+#~ "Impossible de se connecter à %s : TLS/SSL est nécessaire mais aucun "
+#~ "support n'est disponible."
+
+#~ msgid "_Proxy"
+#~ msgstr "Serveur _mandataire"

 #~ msgid "Conversation Window Hiding"
 #~ msgstr "Quand la fenêtre de conversation est cachée"
@@ -14780,9 +14660,6 @@
 #~ msgid "Please select an image for the smiley."
 #~ msgstr "Veuillez choisir une image pour cette frimousse."

-#~ msgid "Activate which ID?"
-#~ msgstr "Activer quelle identité ?"
-
 #~ msgid "Cursor Color"
 #~ msgstr "Couleur du curseur"
--- a/po/gl.po	Sun Jul 19 08:09:24 2009 +0000
+++ b/po/gl.po	Sun Jul 19 08:17:45 2009 +0000
@@ -1,22 +1,23 @@
-# translation of gl.po to Galego
+# translation of gl.po to Galician
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2008.
+# Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2008,2009
+# Antón Méixome <meixome@mancomun.org>, 2009.
 # Previously translators:
 # Mar Castro <mmcastro@cesga.es> 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2008-12-15 13:44+0100\n"
-"Last-Translator: Frco. Javier Rial Rodríguez <fjrial@cesga.es>\n"
-"Language-Team: Galego <g11n@mancomun.org>\n"
+"POT-Creation-Date: 2009-07-18 01:43-0700\n"
+"PO-Revision-Date: 2009-07-15 15:15+0200\n"
+"Last-Translator: Antón Méixome <meixome@mancomun.org>\n"
+"Language-Team: Galician <g11n@mancomun.org>\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"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"

 #. Translators may want to transliterate the name.
@@ -28,7 +29,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Tente `%s -h' para máis información.\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -43,7 +44,7 @@
 "Uso: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    usar DIR para ficheiros de configuración\n"
-"  -d, --debug         imprimir mensaxes de depuración en stdout\n"
+"  -d, --debug         imprimir mensaxes de depuración en stderr\n"
 "  -h, --help          mostrar esta axuda e saír\n"
 "  -n, --nologin       non iniciar a sesión automaticamente\n"
 "  -v, --version       mostrar a versión actual e saír\n"
@@ -555,24 +556,23 @@
 "novamente."

 msgid "No such command."
-msgstr "Non existe o comando."
+msgstr "Non existe a orde."

 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Erro de sintaxe: escribiu un número incorrecto de argumentos para ese "
-"comando."
+"Erro de sintaxe: escribiu un número incorrecto de argumentos para esa orde."

 msgid "Your command failed for an unknown reason."
-msgstr "O seu comando fallou por motivos descoñecidos."
+msgstr "A súa orde fallou por motivos descoñecidos."

 msgid "That command only works in chats, not IMs."
-msgstr "Ese comando só funciona en conversas, non en MIs."
+msgstr "Esa orde só funciona en conversas, non nas MI."

 msgid "That command only works in IMs, not chats."
-msgstr "Ese comando só funciona en MIs, non en conversas."
+msgstr "Esa orde só funciona nas MI, non en conversas."

 msgid "That command doesn't work on this protocol."
-msgstr "Ese comando non funciona neste protocolo."
+msgstr "Esa orde non funciona neste protocolo."

 msgid "Message was not sent, because you are not signed on."
 msgstr "Non se enviou a mensaxe porque non está conectado."
@@ -638,41 +638,41 @@
 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"
+msgstr[1] "Lista de %d usuarios:\n"

 msgid "Supported debug options are:  version"
-msgstr "As opcións de depuración soportadas son:  version"
+msgstr "As opcións de depuración compatíbeis son:  version"

 msgid "No such command (in this context)."
-msgstr "Non existe o comando (neste contexto)."
+msgstr "Non existe a orde (neste contexto)."

 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Use \"/help &lt;comando&gt;\" para obter axuda sobre un comando específico.\n"
-"Os seguintes comandos están dispoñíbeis neste contexto:\n"
+"Use \"/help &lt;orde&gt;\" para obter axuda sobre unha orde específica.\n"
+"As seguintes ordes están dispoñíbeis neste contexto:\n"

 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
 msgstr ""
-"%s non é unha clase válida de mensaxe. Consulte o ficheiro '/help msgcolor' "
-"para ver as mensaxes de clase válidas."
+"%s non é unha clase válida de mensaxe. Consulte '/help msgcolor' para ver as "
+"mensaxes de clase válidas."

 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr ""
-"%s non é unha cor válida. Consulte o ficheiro '/help msgcolor' para ver as "
-"cores válidas."
+"%s non é unha cor válida. Consulte '/help msgcolor' para ver as cores "
+"válidas."

 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
 "say &lt;mensaxe&gt;:  Envía unha mensaxe normalmente, como se non estivese "
-"utilizando un comando."
+"utilizando unha orde."

 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
@@ -690,7 +690,7 @@
 msgstr "clear: Limpa o historial da conversa."

 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;comando&gt;:  Axuda sobre un comando específico."
+msgstr "help &lt;orde&gt;:  Axuda sobre unha orde específica."

 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Mostra a lista de usuarios na sala de conversa."
@@ -741,7 +741,7 @@
 msgstr "Limpar"

 msgid "Filter:"
-msgstr "Filtro: "
+msgstr "Filtro:"

 msgid "Pause"
 msgstr "Deter"
@@ -750,7 +750,7 @@
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
 msgstr[0] "Transferencias de ficheiros - %d%% de %d ficheiro"
-msgstr[1] "Transferencias de ficheiros - %d%% de %d ficheiro"
+msgstr[1] "Transferencias de ficheiros - %d%% de %d ficheiros"

 #. Create the window.
 msgid "File Transfers"
@@ -871,12 +871,11 @@
 msgid "System Log"
 msgstr "Rexistro do sistema"

-#, fuzzy
 msgid "Calling ... "
-msgstr "Calculando..."
+msgstr "Chamando... "

 msgid "Hangup"
-msgstr ""
+msgstr "Colgar"

 #. Number of actions
 msgid "Accept"
@@ -886,31 +885,32 @@
 msgstr "Rexeitar"

 msgid "Call in progress."
-msgstr ""
+msgstr "Chamada en curso."

 msgid "The call has been terminated."
-msgstr ""
+msgstr "A chamada terminou."

 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s quere comezar unha sesión de audio contigo."

 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
-
-#, fuzzy
+"%s está intentando comezar un tipo de sesión multimedia non compatíbel "
+"contigo."
+
 msgid "You have rejected the call."
-msgstr "Vostede saíu da canle %s%s"
+msgstr "Vostede rexeitou a chamada."

 msgid "call: Make an audio call."
-msgstr ""
+msgstr "chamada: Facer unha chamada de audio."

 msgid "Emails"
 msgstr "Correos electrónicos"

 msgid "You have mail!"
-msgstr "Ten un correo!"
+msgstr "Ten correo!"

 msgid "Sender"
 msgstr "Remitente"
@@ -922,7 +922,7 @@
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) ten %d mensaxe nova."
-msgstr[1] "%s (%s) ten %d mensaxe nova."
+msgstr[1] "%s (%s) ten %d mensaxes novas."

 msgid "New Mail"
 msgstr "Correo novo"
@@ -1021,7 +1021,7 @@
 msgstr "Editar aviso de contacto"

 msgid "Pounce Who"
-msgstr "Avisar a quen?"
+msgstr "Avisar a quen"

 #. Account:
 msgid "Account:"
@@ -1078,7 +1078,7 @@
 msgstr "Enviar unha mensaxe"

 msgid "Execute a command"
-msgstr "Executar un comando"
+msgstr "Executar unha orde"

 msgid "Play a sound"
 msgstr "Reproducir un son"
@@ -1279,7 +1279,7 @@
 msgstr "Ton de aviso da consola"

 msgid "Command"
-msgstr "Comando"
+msgstr "Orde"

 msgid "No Sound"
 msgstr "Sen son"
@@ -1295,7 +1295,7 @@
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Comandos de son\n"
+"Ordes de son\n"
 "(%s para nome de ficheiro)"

 #. Sound options
@@ -1418,8 +1418,8 @@

 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
-"Este complemento non se pode cargar porque non se construíu con soporte de "
-"X11."
+"Este complemento non se pode cargar porque non se construíu con "
+"compatibilidade de X11."

 msgid "GntClipboard"
 msgstr "GntClipboard"
@@ -1560,22 +1560,24 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Obtendo TinyURL..."

 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "Só crear TinyURL para enderezos deste tamaño ou superior"

 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "TinyURL (ou outro) prefixo de enderezo"
+
 msgid "TinyURL"
-msgstr "URL da canción"
+msgstr "TinyURL"

 msgid "TinyURL plugin"
-msgstr ""
+msgstr "Plugin TinyURL"

 msgid "When receiving a message with URL(s), TinyURL for easier copying"
 msgstr ""
+"Ao recibir unha mensaxe con URL, utilizar o TinyURL para o copiado rápido"

 msgid "accounts"
 msgstr "contas"
@@ -1781,7 +1783,6 @@
 msgstr "+++ %s desconectouse"

 #. Unknown error
-#. Unknown error!
 msgid "Unknown error"
 msgstr "Erro descoñecido"

@@ -1828,9 +1829,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s saíu da sala (%s)."

-#, fuzzy
 msgid "Invite to chat"
-msgstr "Convidar a unha conferencia"
+msgstr "Convidar a unha conversa"

 #. Put our happy label in it.
 msgid ""
@@ -1973,6 +1973,10 @@
 msgstr "Iniciando transferencia de %s desde %s"

 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Transferencia do ficheiro <A HREF=\"file://%s\">%s</A> completada"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Terminou a transferencia do ficheiro %s"

@@ -2003,31 +2007,31 @@
 msgstr "A transferencia de ficheiros desde %s fallou."

 msgid "Run the command in a terminal"
-msgstr "Executar o comando nun terminal"
+msgstr "Executar a orde nun terminal"

 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"aim\", se está activado."
+msgstr "A orde usada para manipular os URL \"aim\", se está activado."

 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"gg\",  se está activado."
+msgstr "A orde usada para manipular os URL \"gg\",  se está activado."

 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"icq\",  se está activado."
+msgstr "A orde usada para manipular os URL \"icq\",  se está activado."

 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"irc\",  se está activado."
+msgstr "A orde usada para manipular os URL \"irc\",  se está activado."

 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"msnim\", se está activado."
+msgstr "A orde usada para manipular os URL \"msnim\", se está activado."

 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"sip\", se está activado."
+msgstr "A orde usada para manipular os URL \"sip\", se está activado."

 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"xmpp\", se está activado."
+msgstr "A orde usada para manipular os URL \"xmpp\", se está activado."

 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "O comando usado para manipular os URL \"ymsgr\",  se está activado."
+msgstr "A orde usada para manipular os URL \"ymsgr\",  se está activado."

 msgid "The handler for \"aim\" URLs"
 msgstr "O manipulador dos URL \"aim\""
@@ -2057,88 +2061,88 @@
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"aim\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"aim\"."

 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"gg\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"gg\"."

 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"icq\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"icq\"."

 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"irc\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"irc\"."

 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"msnim\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"msnim\"."

 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"sip\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"sip\"."

 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"xmpp\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"xmpp\"."

 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
-"os URL \"ymsgr\"."
+"É verdadeiro se a orde especificada na chave \"command\" debe manipular os "
+"URL \"ymsgr\"."

 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"É verdadeiro se o comando usado para manipular este tipo de URL debe ser "
+"É verdadeiro se a orde usada para manipular este tipo de URL debe ser "
 "executado nun terminal."

 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"aim\""
+msgstr "Indica se a orde especificada debe manipular os URL \"aim\""

 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"gg\""
+msgstr "Indica se a orde especificada debe manipular os URL \"gg\""

 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"icq\""
+msgstr "Indica se a orde especificada debe manipular os URL \"icq\""

 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"irc\""
+msgstr "Indica se a orde especificada debe manipular os URL \"irc\""

 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"msnim\""
+msgstr "Indica se a orde especificada debe manipular os URL \"msnim\""

 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"sip\""
+msgstr "Indica se a orde especificada debe manipular os URL \"sip\""

 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"xmpp\""
+msgstr "Indica se a orde especificada debe manipular os URL \"xmpp\""

 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "Indica se o comando especificado debe manipular os URL \"ymsgr\""
+msgstr "Indica se a orde especificada debe manipular os URL \"ymsgr\""

 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
@@ -2188,9 +2192,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOMÁTICA>: %s\n"

-#, fuzzy
 msgid "Error creating conference."
-msgstr "Erro ao crear a conexión"
+msgstr "Erro ao crear a conversa."

 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2377,7 +2380,7 @@
 #. *  summary
 #. *  description
 msgid "Allows control by entering commands in a file."
-msgstr "Permite controlar o programa introducindo comandos nun ficheiro."
+msgstr "Permite controlar o programa introducindo ordes nun ficheiro."

 msgid "Minutes"
 msgstr "Minutos"
@@ -2424,15 +2427,15 @@
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "Probar o soporte do complemento IPC como un cliente."
+msgstr "Probar a compatibilidade do complemento IPC como un cliente."

 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Probar o soporte do complemento IPC como un cliente. Isto localiza o "
-"complemento de servidor e chama aos comandos rexistrados."
+"Probar a compatibilidade do complemento IPC como un cliente. Isto localiza o "
+"complemento de servidor e chama as ordes rexistradas."

 #. *< type
 #. *< ui_requirement
@@ -2447,13 +2450,13 @@
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "Probar o soporte do complemento IPC como un servidor."
+msgstr "Probar a compatibilidade do complemento IPC como un servidor."

 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"Probar o soporte do complemento IPC como un servidor. Isto rexistra os "
-"comandos IPC."
+"Probar a compatibilidade do complemento IPC como un servidor. Isto rexistra "
+"as ordes IPC."

 msgid "Join/Part Hiding Configuration"
 msgstr "Configuración da ocultación de Unirse/Deixar"
@@ -2598,7 +2601,6 @@
 msgstr "Inclúe outros rexistros de clientes de MI no visualizador de rexistro."

 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2656,13 +2658,12 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Gardar como avisos as mensaxes enviadas a un usuario desconectado."

-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "O resto das mensaxes gardaranse como avisos. Pode editar/eliminar os avisos "
-"na xanela de diálogo 'Avisos de amigo'."
+"no cadro de diálogo 'Avisos de amigo'."

 #, c-format
 msgid ""
@@ -2691,9 +2692,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "Non preguntar. Gardar sempre nun aviso."

-#, fuzzy
 msgid "One Time Password"
-msgstr "Introducir o contrasinal"
+msgstr "Contrasinal de un só uso"

 #. *< type
 #. *< ui_requirement
@@ -2702,13 +2702,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Compatibilidade con contrasinal de un só uso"

 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Obriga a que os contrasinais só teñan un uso."

 #. *  description
 msgid ""
@@ -2716,6 +2716,9 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Permítelle obrigar respecto dunha conta que os contrasinais que non sexan "
+"gardados só sexan usados nunha única conexión correcta.\n"
+"Nota. O contrasinal da conta non debe ser gardado para que isto funcione."

 #. *< type
 #. *< ui_requirement
@@ -2730,7 +2733,7 @@
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "Proporciona o soporte para cargar complementos en perl."
+msgstr "Proporciona a compatibilidade para cargar complementos en perl."

 msgid "Psychic Mode"
 msgstr "Modo psíquico"
@@ -2811,7 +2814,7 @@
 #. *  summary
 #. *  description
 msgid "Provides SSL support through GNUTLS."
-msgstr "Proporciona soporte SSL a través de GNUTLS."
+msgstr "Proporciona a compatibilidade SSL a través de GNUTLS."

 #. *< type
 #. *< ui_requirement
@@ -2827,7 +2830,7 @@
 #. *  summary
 #. *  description
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "Proporciona soporte SSL a través do NSS de Mozilla."
+msgstr "Proporciona compatibilidade SSL a través do NSS de Mozilla."

 #. *< type
 #. *< ui_requirement
@@ -2843,7 +2846,7 @@
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Proporciona un wrapper para as bibliotecas de soporte de SSL."
+msgstr "Proporciona un wrapper para as bibliotecas de compatibilidade con SSL."

 #, c-format
 msgid "%s is no longer away."
@@ -2901,7 +2904,7 @@
 msgstr "Cargador de complementos Tcl"

 msgid "Provides support for loading Tcl plugins"
-msgstr "Proporciona o soporte para cargar complementos Tcl"
+msgstr "Proporciona a compatabilidade para cargar complementos Tcl"

 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
@@ -2911,18 +2914,16 @@
 "complementos de TCL, precisa instalar ActiveTCL desde o enderezo http://www."
 "activestate.com\n"

-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"Non se encontrou o toolkit Apple Bonjour for Windows, vexa a sección de "
+"Non se encontrou o toolkit Apple Bonjour para Windows, vexa a sección de "
 "preguntas máis frecuentes (FAQ) en: http://d.pidgin.im/BonjourWindows para "
 "máis información."

-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "Non é posíbel escoitar as conexións entrantes de MI\n"
+msgstr "Non é posíbel escoitar as conexións entrantes de MI"

 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2962,9 +2963,8 @@
 msgstr "Persoa Purple"

 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Localidade"
+msgstr "Porto local"

 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2976,24 +2976,20 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Non é posíbel enviar a mensaxe; non se puido iniciar a conversa."

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"Non se puido crear un conectador:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Non se puido crear un conectador: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Non se puido vincular o conectador ao porto"
-
-#, fuzzy, c-format
+msgstr "Non se puido vincular o conectador ao porto: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"Non se puido crear un conectador:\n"
-"%s"
+msgstr "Non foi posíbel escoitar no conectador: %s"

 msgid "Error communicating with local mDNSResponder."
-msgstr "Erro ao comunicar co mDNSResponder local"
+msgstr "Erro ao comunicar co mDNSResponder local."

 msgid "Invalid proxy settings"
 msgstr "A configuración do proxy non é válida"
@@ -3040,17 +3036,14 @@
 msgid "Load buddylist from file..."
 msgstr "Cargar a lista de contactos desde un ficheiro..."

-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Encher os campos de rexistro."
-
-#, fuzzy
+msgstr "Encher en todos os campos de rexistro"
+
 msgid "Passwords do not match"
-msgstr "Os contrasinais non coinciden."
-
-#, fuzzy
+msgstr "Os contrasinais non coinciden"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Non se puido rexistrar a nova conta. Produciuse un erro.\n"
+msgstr "Non se puido rexistrar a nova conta. Produciuse un erro."

 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova conta rexistrada de Gadu-Gadu"
@@ -3065,11 +3058,10 @@
 msgstr "Contrasinal (de novo)"

 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Introduza o texto CAPTCHA"
+
 msgid "Captcha"
-msgstr "Imaxe captcha"
+msgstr "Imaxe CAPTCHA"

 msgid "Register New Gadu-Gadu Account"
 msgstr "Rexistrar unha conta nova de Gadu-Gadu"
@@ -3090,7 +3082,7 @@
 msgstr "Home ou muller"

 msgid "Male"
-msgstr "Male"
+msgstr "Home"

 msgid "Female"
 msgstr "Muller"
@@ -3208,9 +3200,9 @@
 msgid "Chat _name:"
 msgstr "_Nome da conversa:"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Non se puido conectar ao servidor."
+msgstr "Non se puido conectar ao servidor '%s': %s"

 #. 1. connect to server
 #. connect to the server
@@ -3223,9 +3215,8 @@
 msgid "This chat name is already in use"
 msgstr "O nome desta conversa xa está en uso"

-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Non está conectado ao servidor."
+msgstr "Non está conectado ao servidor"

 msgid "Find buddies..."
 msgstr "Buscar contactos..."
@@ -3266,13 +3257,12 @@
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"

-#, fuzzy
 msgid "GG server"
-msgstr "A obter o servidor"
+msgstr "Servidor GC"

 #, c-format
 msgid "Unknown command: %s"
-msgstr "Comando descoñecido: %s"
+msgstr "Orde descoñecida: %s"

 #, c-format
 msgid "current topic is: %s"
@@ -3284,7 +3274,6 @@
 msgid "File Transfer Failed"
 msgstr "Fallou a transferencia do ficheiro"

-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "Non se puido abrir un porto de escoita."

@@ -3308,11 +3297,9 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"Perdeuse a conexión co servidor:\n"
-"%s"
+msgstr "Perdeuse a conexión co servidor: %s"

 msgid "View MOTD"
 msgstr "Ver MOTD"
@@ -3323,24 +3310,23 @@
 msgid "_Password:"
 msgstr "_Contrasinal:"

-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Os alias de IRC non poden conter espazos en branco"
+msgstr "Os alias de IRC e servidor non poden conter espazos en branco"

 msgid "SSL support unavailable"
-msgstr "O soporte de SSL non está dispoñíbel"
+msgstr "A compatibilidade con SSL non está dispoñíbel"

 msgid "Unable to connect"
 msgstr "Non é posíbel conectar"

 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Non se puido conectar a %s"
-
-#, fuzzy, c-format
+msgstr "Non se puido conectar: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "O servidor pechou a conexión."
+msgstr "O servidor cerrou a conexión"

 msgid "Users"
 msgstr "Usuarios"
@@ -3524,13 +3510,12 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "O nome desta conversa xa está en uso"
-
-#, fuzzy
+msgstr "O alcume  \"%s\" xa está en uso."
+
 msgid "Nickname in use"
-msgstr "Alcume"
+msgstr "Alcume en uso"

 msgid "Cannot change nick"
 msgstr "Non se pode cambiar o alias"
@@ -3577,7 +3562,7 @@
 msgstr "ctcp <nick> <msg>: envía unha mensaxe ctcp ao alias."

 msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: Enviar un comando ao chanserv"
+msgstr "chanserv: Enviar unha orde ao chanserv"

 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
@@ -3633,7 +3618,7 @@
 msgstr "me &lt;acción para realizar&gt;:  Realizar unha acción."

 msgid "memoserv: Send a command to memoserv"
-msgstr "memoserv: Enviar un comando ao memoserv"
+msgstr "memoserv: Enviar unha orde ao memoserv"

 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
@@ -3656,7 +3641,7 @@
 msgstr "nick &lt;novo alias&gt;:  Cambia o seu alias."

 msgid "nickserv: Send a command to nickserv"
-msgstr "nickserv: Enviar un comando ao nickserv"
+msgstr "nickserv: Enviar unha orde ao nickserv"

 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "notice &lt;target&lt;:  Enviar un aviso a un usuario ou canle."
@@ -3676,7 +3661,7 @@
 "utilizalo."

 msgid "operserv: Send a command to operserv"
-msgstr "operserv: Enviar un comando ao operserv"
+msgstr "operserv: Enviar unha orde ao operserv"

 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
@@ -3701,10 +3686,10 @@

 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
-"quit [mensaxe]:  Desconéctase do servidor actual cunha mensaxe opcional"
+"quit [mensaxe]:  Desconéctase do servidor actual cunha mensaxe opcional."

 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Enviar un comando en bruto ao servidor."
+msgstr "quote [...]:  Enviar unha orde en bruto ao servidor."

 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
@@ -3764,22 +3749,17 @@
 msgstr "Erro descoñecido"

 msgid "Ad-Hoc Command Failed"
-msgstr "Fallou o comando Ad-Hoc"
+msgstr "Fallou a orde Ad-Hoc"

 msgid "execute"
 msgstr "executar"

-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte "
-"TLS/SSL."
-
-#, fuzzy
+msgstr "O servidor require TLS/SSL mais non está dispoñíbel."
+
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
-"O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte "
-"TLS/SSL."
+"Solicitou o cifrado mais non está dispoñíbel a capacidade para TLS/SSL."

 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
@@ -3796,13 +3776,11 @@
 msgid "Plaintext Authentication"
 msgstr "Autenticación con texto plano"

-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Fallou a autenticación"
-
-#, fuzzy
+msgstr "Fallou a autenticación SASL"
+
 msgid "Invalid response from server"
-msgstr "Resposta non válida do servidor."
+msgstr "A resposta do servidor non é válida"

 msgid "Server does not use any supported authentication method"
 msgstr "O servidor non usa ningún método de autenticación coñecido"
@@ -3812,41 +3790,33 @@
 "Vostede solicitou a codificación, mais non está dispoñíbel neste servidor."

 msgid "Invalid challenge from server"
-msgstr "O desafío do servidor non é válido."
-
-#, fuzzy, c-format
+msgstr "O desafío do servidor non é válido"
+
+#, c-format
 msgid "SASL error: %s"
-msgstr "Erro de SASL"
+msgstr "Erro de SASL: %s"

 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "O xestor de conexión BOSH terminou a súa sesión."
+
 msgid "No session ID given"
-msgstr "Non se deu ningunha razón"
-
-#, fuzzy
+msgstr "Non se proporcionou ningún ID de sesión"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Versión non soportada"
-
-#, fuzzy
+msgstr "A versión do protocolo BOSH non é compatíbel"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"Non se puido establecer unha conexión co servidor:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Non se puido estabelecer unha conexión co servidor"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Non se puido establecer unha conexión co servidor:\n"
-"%s"
-
-#, fuzzy
+msgstr "Non se puido establecer unha conexión co servidor: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Non é posíbel comezar a conexión"
+msgstr "Non é posíbel comezar a conexión SSL"

 msgid "Full Name"
-msgstr "Nome completo:"
+msgstr "Nome completo"

 msgid "Family Name"
 msgstr "Apelidos"
@@ -3911,9 +3881,8 @@
 msgid "Operating System"
 msgstr "Sistema operativo"

-#, fuzzy
 msgid "Local Time"
-msgstr "Ficheiro local:"
+msgstr "Hora local"

 msgid "Priority"
 msgstr "Prioridade"
@@ -3923,11 +3892,10 @@

 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "Hai %s "
+
 msgid "Logged Off"
-msgstr "Con sesión iniciada"
+msgstr "Sesión cerrada"

 msgid "Middle Name"
 msgstr "Segundo nome"
@@ -4096,19 +4064,15 @@
 msgid "Find Rooms"
 msgstr "Buscar salas"

-#, fuzzy
 msgid "Affiliations:"
-msgstr "Alias:"
-
-#, fuzzy
+msgstr "Afiliacións:"
+
 msgid "No users found"
-msgstr "Non se encontrou usuarios coincidentes"
-
-#, fuzzy
+msgstr "Non se encontrou usuarios"
+
 msgid "Roles:"
-msgstr "Papel"
-
-#, fuzzy
+msgstr "Roles:"
+
 msgid "Ping timed out"
 msgstr "Excedeuse o tempo de espera do ping"

@@ -4116,6 +4080,8 @@
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
+"Non foi posíbel encontrar métodos de conexión XMPP alternativos despois de "
+"que fallase a conexión directa."

 msgid "Invalid XMPP ID"
 msgstr "ID de XMPP non válido"
@@ -4123,9 +4089,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID de XMPP non válido. Débese definir o dominio."

-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "Fallou ao conectar ao servidor."
+msgstr "O enderezo URL BOSH está malformado"

 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4196,10 +4161,6 @@
 msgid "Change Registration"
 msgstr "Modificar rexistro"

-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "Fallou ao conectar ao servidor."
-
 msgid "Error unregistering account"
 msgstr "Erro ao cancelar o rexistro de conta"

@@ -4219,7 +4180,7 @@
 msgstr "Reinicializando  o fluxo"

 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "O servidor non admite o bloqueo"

 msgid "Not Authorized"
 msgstr "Non autorizado"
@@ -4443,13 +4404,13 @@
 msgstr "Condición non definida"

 msgid "Unsupported Encoding"
-msgstr "Codificación non soportada"
+msgstr "Codificación incompatíbel"

 msgid "Unsupported Stanza Type"
-msgstr "Tipo de parágrafo non soportado"
+msgstr "Tipo de parágrafo non compatíbel"

 msgid "Unsupported Version"
-msgstr "Versión non soportada"
+msgstr "Versión non compatíbel"

 msgid "XML Not Well Formed"
 msgstr "XML incorrectamente formado"
@@ -4485,22 +4446,21 @@
 msgid "Unable to ping user %s"
 msgstr "Non é posíbel facer ping ao usuario %s"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr ""
-"Non é posíbel enviar un zunido porque non se coñece nada do usuario %s."
-
-#, fuzzy, c-format
+msgstr "Non é posíbel enviar un zunido porque non se coñece nada de %s."
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr ""
-"Non é posíbel enviar un zunido porque pode que o usuario %s estea "
-"desconectado."
-
-#, fuzzy, c-format
+msgstr "Non é posíbel enviar un zunido porque %s pode que estea desconectado."
+
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "Non é posíbel enviar un zunido porque o usuario %s non o soporta."
+msgstr ""
+"Non é posíbel enviar un zunido porque %s non o admite ou non quere recibir  "
+"zunidos agora."

 #, c-format
 msgid "Buzzing %s..."
@@ -4515,35 +4475,33 @@
 msgid "%s has buzzed you!"
 msgstr "%s envioulle un zunido!"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Non se puido enviar o ficheiro a %s, JID non válido"
-
-#, fuzzy, c-format
+msgstr "Non se puido iniciar o medio con %s: o JID non é correcto"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Non se puido enviar o ficheiro a %s, o usuario non está conectado"
-
-#, fuzzy, c-format
+msgstr "Non se puido iniciar o medio con  %s: o usuario non está conectado"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
-"Non se puido enviar o ficheiro a %s, non está subscrito á presenza do usuario"
-
-#, fuzzy
+"Non se puido iniciar o medio con %s: non está subscrito á presenza do usuario"
+
 msgid "Media Initiation Failed"
-msgstr "Fallou o rexistro"
-
-#, fuzzy, c-format
+msgstr "Fallou o iniciación do medio"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "Seleccione o recurso de %s ao que quere enviar o ficheiro"
+msgstr "Seleccione o recurso de %s co que quere iniciar unha sesión no medio."

 msgid "Select a Resource"
 msgstr "Seleccione un recurso"

-#, fuzzy
 msgid "Initiate Media"
-msgstr "Iniciar a _conversa"
+msgstr "Iniciar o medio"

 msgid "config:  Configure a chat room."
 msgstr "config: Configurar unha sala de conversa."
@@ -4563,21 +4521,21 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [sala]: Excluír un usuario da sala."

-#, fuzzy
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: Definir a "
-"afiliación dun usuario coa sala."
-
-#, fuzzy
+"affiliado &lt;usuario&gt; &lt;propietario|admin|membro|outcast|ningún&gt; "
+"[nick1] [nick2] ...: Obter os usuarios cunha afiliación ou conxunto de "
+"afiliación de usuarios coa sala."
+
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir o "
-"papel dun usuario na sala."
+"rol &lt;usuario&gt; &lt;moderador|participante|visitante|ningún&gt;:  "
+"[nick1] [nick2] ...: Obter os usuarios cun rol ou conxunto de roles de "
+"usuario coa sala."

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaxe]: Convidar un usuario á sala."
@@ -4641,7 +4599,7 @@
 msgstr "Proxies de transferencia de ficheiros"

 msgid "BOSH URL"
-msgstr ""
+msgstr "URL BOSH"

 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4705,38 +4663,34 @@
 msgid "_Accept Defaults"
 msgstr "_Aceptar os valores predeterminados"

-#, fuzzy
 msgid "No reason"
 msgstr "Non se deu ningunha razón"

-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Foi expulsado por %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Vostede foi expulsado: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Expulsado por %s (%s)"
-
-#, fuzzy
+msgstr "Expulsado (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Produciuse un erro ao abrir o ficheiro."
-
-#, fuzzy
+msgstr "Produciuse un erro na transferencia do fluxo de bytes in-band\n"
+
 msgid "Transfer was closed."
-msgstr "Fallou a transferencia do ficheiro"
-
-#, fuzzy
+msgstr "A transferencia foi cerrada."
+
 msgid "Failed to open the file"
-msgstr "Fallo ao abrir o ficheiro '%s': %s"
+msgstr "Fallou ao abrir o ficheiro"

 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Produciuse un erro no fluxo de bytes in-band"

 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
-"Non se puido enviar o ficheiro a %s, o usuario non soporta a transferencia "
-"de ficheiros"
+"Non se puido enviar o ficheiro a %s, o usuario non admite a transferencia de "
+"ficheiros"

 msgid "File Send Failed"
 msgstr "Fallou o envío do ficheiro"
@@ -4935,7 +4889,7 @@

 #, c-format
 msgid "Command disabled"
-msgstr "Comando desactivado"
+msgstr "Orde desactivada"

 #, c-format
 msgid "File operation error"
@@ -5027,7 +4981,7 @@

 #, c-format
 msgid "Kids Passport without parental consent"
-msgstr "Pasaporte de menores sen consentimento paterno"
+msgstr "Pasaporte de menores sen consentemento paterno"

 #, c-format
 msgid "Passport account not yet verified"
@@ -5054,9 +5008,29 @@
 msgid "Non-IM Contacts"
 msgstr "Contactos non MI"

-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s envía unha chiscadela. <a href='msn-wink://%s'>Prema aquí para "
+"reproducila</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s enviou unha chiscadel mais pode que non se garde"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s enviou un clip de voz. <a href='audio://%s'>Prema aquí para reproducilo</"
+"a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s enviou clip de voz mais pode que non se garde"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s enviou unconvite de cámara web, mais aínda non está soportada."
+msgstr "%s enviou un convite de chat de voz mais isto aínda non é posíbel."

 msgid "Nudge"
 msgstr "Chamar a atención"
@@ -5175,9 +5149,8 @@
 msgid "Game Title"
 msgstr "Título do xogo"

-#, fuzzy
 msgid "Office Title"
-msgstr "Título"
+msgstr "Título de oficina"

 msgid "Set Friendly Name..."
 msgstr "Establecer o nome do contacto..."
@@ -5211,7 +5184,31 @@

 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"Necesítase o soporte SSL para o MSN. Instale unha biblioteca SSL soportada."
+"Necesítase a compatibilidade con SSL para o MSN. Instale unha biblioteca SSL "
+"compatíbel."
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Non se puido engadir o contacto %s porque o nome de usuario non é válido. Os "
+"nomes de usuario deben ser enderezos de correo electrónico válidos."
+
+msgid "Unable to Add"
+msgstr "Non se puido engadir"
+
+msgid "Authorization Request Message:"
+msgstr "Mensaxe de solicitude de autorización:"
+
+msgid "Please authorize me!"
+msgstr "Por favor, autoríceme!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Aceptar"

 msgid "Error retrieving profile"
 msgstr "Erro ao obter o perfil"
@@ -5405,13 +5402,14 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s acáballe de dar un cobadazo!"

-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Erro descoñecido (%d)"
+msgstr "Erro descoñecido (%d): %s"

 msgid "Unable to add user"
 msgstr "Non é posíbel engadir o usuario"

+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Erro descoñecido (%d)"
@@ -5445,9 +5443,9 @@
 "Despois de que rematen as tarefas de mantemento poderá conectarse con éxito "
 "de novo."
 msgstr[1] ""
-"O servidor de MSN desconectarase para as tarefas de mantemento en %d minuto. "
-"Desconectaráselle automaticamente nese momento. Remate calquera conversa "
-"activa.\n"
+"O servidor de MSN desconectarase para as tarefas de mantemento en %d "
+"minutos. Desconectaráselle automaticamente nese momento. Remate calquera "
+"conversa activa.\n"
 "\n"
 "Despois de que rematen as tarefas de mantemento poderá conectarse con éxito "
 "de novo."
@@ -5484,26 +5482,22 @@
 "Erro de conexión do servidor %s :\n"
 "%s"

-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "O servidor non soporta o noso protocolo."
-
-#, fuzzy
+msgstr "O servidor non é compatíbel co noso protocolo"
+
 msgid "Error parsing HTTP"
-msgstr "Erro na análise HTTP."
-
-#, fuzzy
+msgstr "Erro no procesamento de HTTP"
+
 msgid "You have signed on from another location"
-msgstr "Conectouse desde outra localización."
+msgstr "Conectouse desde outra localización"

 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Os servidores MSN non están dispoñíbeis temporalmente. Agarde e volva "
 "tentalo máis tarde."

-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "Os servidores MSN van sufrir un apagado temporal."
+msgstr "Os servidores MSN van sufrir un apagado temporal"

 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5533,13 +5527,13 @@
 msgid "Retrieving buddy list"
 msgstr "Recuperando a lista de contactos"

-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s enviou unconvite de cámara web, mais aínda non está soportada."
+msgstr "%s enviou unconvite de cámara web mais aínda isto aínda non é posíbel."

 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s enviou unconvite de cámara web, mais aínda non está soportada."
+msgstr "%s enviou unconvite de cámara web, mais aínda non está dispoñíbel."

 msgid "Away From Computer"
 msgstr "Ausente do computador"
@@ -5724,7 +5718,7 @@
 "Engadiuse ou actualizouse %d contacto desde o servidor (incluídos os "
 "contactos que xa estaban na lista do lado do servidor)"
 msgstr[1] ""
-"Engadiuse ou actualizouse %d contacto desde o servidor (incluídos os "
+"Engadíronse ou actualizáronse %d contactos desde o servidor (incluídos os "
 "contactos que xa estaban na lista do lado do servidor)"

 msgid "Add contacts from server"
@@ -5734,16 +5728,15 @@
 msgid "Protocol error, code %d: %s"
 msgstr "Erro de protocolo, código %d: %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s O seu contrasinal ten %d caracteres, maior do que a lonxitude máxima de %"
-"d para o MySpaceIM. Faga a súa conta máis curta en http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword e ténteo de "
-"novo."
+"%s O seu contrasinal ten %zu caracteres, maior do que a lonxitude máxima de %"
+"d.Acúrte o seu contrasinal en http://profileedit.myspace.com/index.cfm?"
+"fuseaction=accountSettings.changePassword e ténteo de novo."

 msgid "Incorrect username or password"
 msgstr "O nome de conta ou contrasinal non é correcto"
@@ -5758,19 +5751,19 @@
 msgstr "Fallou ao engadir un contacto"

 msgid "'addbuddy' command failed."
-msgstr "O comando 'addbuddy' fallou."
+msgstr "A orde 'addbuddy' fallou."

 msgid "persist command failed"
-msgstr "O comando 'persist' fallou"
+msgstr "A orde 'persist' fallou"

 msgid "Failed to remove buddy"
 msgstr "Fallou ao eliminar o contacto"

 msgid "'delbuddy' command failed"
-msgstr "O comando 'delbuddy' fallou."
+msgstr "A orde 'delbuddy' fallou"

 msgid "blocklist command failed"
-msgstr "O comando 'blocklist' fallou"
+msgstr "A orde 'blocklist' fallou"

 msgid "Missing Cipher"
 msgstr "Falta o cifrado"
@@ -5782,8 +5775,8 @@
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
-" Actualice a unha versión do libpurple con soporte de RC4 (>= 2.0.1). Non se "
-"cargará o complemento MySpaceIM."
+" Actualice a unha versión do libpurple con compatibilidade de RC4 (>= "
+"2.0.1). Non se cargará o complemento MySpaceIM."

 msgid "Add friends from MySpace.com"
 msgstr "Engadir amigos desde MySpace.com"
@@ -5843,6 +5836,9 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"Produciuse un erro mentres se estabelecía o nome de usuario/a. Probe outra "
+"vez, ou visite http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username para estabelecer o seu nome de usuario/a."

 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - O nome de usuario está dispoñíbel"
@@ -5958,7 +5954,7 @@

 #, c-format
 msgid "Goosing %s..."
-msgstr "Beliscando a %s"
+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
@@ -6028,7 +6024,7 @@
 msgstr "Xa existe un cartafol con ese nome"

 msgid "Not supported"
-msgstr "Non soportado"
+msgstr "Non compatíbel"

 msgid "Password has expired"
 msgstr "O contrasinal expirou"
@@ -6102,9 +6098,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "Erro descoñecido: 0x%X"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Non é posíbel facer ping ao usuario %s"
+msgstr "Non é posíbel abrir sesión: %s"

 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6241,12 +6237,11 @@
 "Non parece que %s estea conectado e non recibiu a mensaxe que lle acaba de "
 "enviar."

-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
 msgstr ""
-"Non se puido contactar co servidor. Indique o enderezo do servidor co que "
+"Non se puido conectar co servidor. Indique o enderezo do servidor co que "
 "desexa conectar."

 msgid "This conference has been closed. No more messages can be sent."
@@ -6271,9 +6266,8 @@
 msgid "Server port"
 msgstr "Porto do servidor"

-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "Recibiuse unha resposta HTTP inesperada do servidor."
+msgstr "Recibiuse unha resposta inesperada de "

 #. username connecting too frequently
 msgid ""
@@ -6281,14 +6275,14 @@
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
-"de novo. Se segue a intentalo pode que precise agardar aínda máis tempo."
-
-#, fuzzy, c-format
+"de novo. Se segue a intentalo vai precisar agardar cada vez máis tempo."
+
+#, c-format
 msgid "Error requesting "
-msgstr "Erro ao resolver %s"
+msgstr "Erro ao consultar"

 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL non lle permite usar o nome de pantalla para autenticarse aquí"

 msgid "Could not join chat room"
 msgstr "Non se puido unir á sala de conversa"
@@ -6296,9 +6290,8 @@
 msgid "Invalid chat room name"
 msgstr "Nome de sala de conversa non válido"

-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "Recibíronse datos non válidos na conexión co servidor."
+msgstr "Recibíronse datos incorrectos na conexión co servidor"

 #. *< type
 #. *< ui_requirement
@@ -6345,7 +6338,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "Recibíronse datos non válidos na conexión co usuario remoto."

-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "Non se puido establecer unha conexión co usuario remoto."

@@ -6387,10 +6379,10 @@
 msgstr "SNAC obsoleto"

 msgid "Not supported by host"
-msgstr "Non soportado polo host"
+msgstr "Non compatíbel co host"

 msgid "Not supported by client"
-msgstr "Non soportado polo cliente"
+msgstr "Non compatíbel co cliente"

 msgid "Refused by client"
 msgstr "Rexeitado polo cliente"
@@ -6445,7 +6437,7 @@
 msgstr ""
 "(Houbo un erro ao recibir a mensaxe. O contacto co que está falando está a "
 "empregar unha codificación diferente da esperada. Se sabe cal está "
-"empregando pode especificalo nas opcións avanzadas de conta para AIM/ICQ)."
+"empregando pode especificalo nas opcións avanzadas de conta para AIM/ICQ)"

 #, c-format
 msgid ""
@@ -6453,8 +6445,8 @@
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
 "(Produciuse un erro ao recibir esta mensaxe. Pode deberse a que vostede e "
-"mais %s teñen seleccionadaunha codificación diferente ou que %s ten un "
-"cliente con erros)."
+"mais %s teñen seleccionada unha codificación diferente ou que %s ten un "
+"cliente con erros)"

 #. Label
 msgid "Buddy Icon"
@@ -6491,7 +6483,7 @@
 msgstr "Nihilista"

 msgid "ICQ Server Relay"
-msgstr "ICQ Server Relay"
+msgstr "Reenvío de servidor ICQ"

 msgid "Old ICQ UTF8"
 msgstr "Antigo ICQ UTF8"
@@ -6547,15 +6539,13 @@
 msgid "Buddy Comment"
 msgstr "Comentario de contacto"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Non se puido conectar ao servidor de autenticación:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Non se puido conectar ao servidor de autenticación: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Non se puido conectar ao servidor."
+msgstr "Non se puido conectar co servidor: %s"

 msgid "Username sent"
 msgstr "Enviouse o nome de usuario"
@@ -6567,18 +6557,18 @@
 msgid "Finalizing connection"
 msgstr "Rematando a conexión"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to 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 ""
-"Non se puido iniciar a sesión: Non se iniciou a sesión como %s porque o nome "
-"de usuario non é válido.  Os nomes de usuario teñen que ser unha dirección "
-"de correo electrónico válida ou comezar cunha letra e conter só letras, "
-"números e espazos, ou conter só números."
-
-#, fuzzy, c-format
+"Non se puido acceder como %s porque o nome de usuario non é válido. Os nomes "
+"de usuario teñen que ser unha dirección de correo electrónico válida ou "
+"comezar cunha letra e conter só letras, números e espazos, ou conter só "
+"números."
+
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizacións."

@@ -6594,36 +6584,33 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "O usuario non existe"
+msgstr "O nome de usuario non existe"

 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "A conta está actualmente deshabilitada."
+msgstr "A súa conta está actualmente deshabilitada"

 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "O servizo de mensaxería instantánea AOL non está dispoñíbel temporalmente."

+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "A versión do cliente que usa é demasiado antiga. Actualízea en %s"

 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
-"de novo. Se segue a intentalo pode que precise agardar aínda máis tempo."
-
-#, fuzzy
+"de novo. Se segue a intentalo precisará agardar cada vez máis tempo."
+
 msgid "The SecurID key entered is invalid"
-msgstr "A chave SecurID que se introduciu non é válida."
+msgstr "A chave SecurID que se introduciu non é válida"

 msgid "Enter SecurID"
 msgstr "Introduza o SecurID"
@@ -6631,12 +6618,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduza o díxito de seis números que aparece na pantalla."

-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_Aceptar"
-
 msgid "Password sent"
 msgstr "Contrasinal enviado"

@@ -6646,12 +6627,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autoríceme para que poida engadilo á miña lista de contactos."

-msgid "Authorization Request Message:"
-msgstr "Mensaxe de solicitude de autorización:"
-
-msgid "Please authorize me!"
-msgstr "Por favor, autoríceme!"
-
 msgid "No reason given."
 msgstr "Non se indicou unha razón."

@@ -6731,21 +6706,21 @@
 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] "Perdeuse %hu mensaxe de %s porque non era válida."
-msgstr[1] "Perdeuse %hu mensaxe de %s porque non era válida."
+msgstr[1] "Perdéronse %hu mensaxes de %s porque non eran válidas."

 #, 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] "Perdeuse %hu mensaxe de %s porque era demasiado longa."
-msgstr[1] "Perdeuse %hu mensaxe de %s porque era demasiado longa."
+msgstr[1] "Perdéronse %hu mensaxes de %s porque eran demasiado longas."

 #, 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] "Perdeu %hu mensaxe de %s porque se excedeu o límite de taxa."
-msgstr[1] "Perdeu %hu mensaxe de %s porque se excedeu o límite de taxa."
+msgstr[0] "Perdeuse %hu mensaxe de %s porque se excedeu o límite de taxa."
+msgstr[1] "Perdéronse %hu mensaxes de %s porque se excedeu o límite de taxa."

 #, c-format
 msgid ""
@@ -6753,24 +6728,26 @@
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] ""
-"Perdeuse %hu mensaxe de %s porque o seu nivel de aviso é demasiado alto."
+"Perdeuse %hu mensaxe de %s porque ten un nivel de aviso demasiado alto."
 msgstr[1] ""
-"Perdeuse %hu mensaxe de %s porque o seu nivel de aviso é demasiado alto."
+"Perdéronse %hu mensaxes de %s porque teñen un nivel de aviso demasiado alto."

 #, c-format
 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] ""
-"Perdeuse %hu mensaxe de %s porque o seu nivel de aviso é demasiado alto."
+"Perdeuse %hu mensaxe de %s porque vostede ten un nivel de aviso demasiado "
+"alto."
 msgstr[1] ""
-"Perdeuse %hu mensaxe de %s porque o seu nivel de aviso é demasiado alto."
+"Perdéronse %hu mensaxes de %s porque vostede ten un nivel de aviso demasiado "
+"alto."

 #, 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] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
-msgstr[1] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
+msgstr[1] "Perdéronse %hu mensaxes de %s por motivos descoñecidos."

 #. Data is assumed to be the destination bn
 #, c-format
@@ -6855,7 +6832,7 @@
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] "O seguinte nome de usuario está asociado a %s"
-msgstr[1] "O seguinte nome de usuario está asociado a %s"
+msgstr[1] "Os seguintes nomes de usuarios están asociados a %s"

 #, c-format
 msgid "No results found for email address %s"
@@ -6957,7 +6934,7 @@
 "Excedeuse a lonxitude máxima de %d byte do perfil de usuario.  Eliminouse o "
 "excedente."
 msgstr[1] ""
-"Excedeuse a lonxitude máxima de %d byte do perfil de usuario.  Eliminouse o "
+"Excedeuse a lonxitude máxima de %d bytes do perfil de usuario.  Eliminouse o "
 "excedente."

 msgid "Profile too long."
@@ -6974,13 +6951,13 @@
 "Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse "
 "o excedente."
 msgstr[1] ""
-"Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse "
+"Excedeuse a lonxitude máxima de %d bytes da mensaxe de ausencia.  Eliminouse "
 "o excedente."

 msgid "Away message too long."
 msgstr "A mensaxe de ausencia é demasiado longa."

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to 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, "
@@ -6991,9 +6968,6 @@
 "comezar cunha letra e conter só letras, números e espazos, ou só conter "
 "números."

-msgid "Unable to Add"
-msgstr "Non se puido engadir"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Non se puido obter a lista de contactos"

@@ -7008,7 +6982,7 @@
 msgid "Orphans"
 msgstr "Orfos"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
@@ -7019,7 +6993,7 @@
 msgid "(no name)"
 msgstr "(sen nome)"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Non se puido engadir o contacto %s por unha razón descoñecida."

@@ -7183,9 +7157,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Localizar un contacto pola súa información"

-#, fuzzy
 msgid "Use clientLogin"
-msgstr "O usuario non está conectado"
+msgstr "Usar login de cliente"

 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7298,7 +7271,7 @@
 msgstr "Outros"

 msgid "Visible"
-msgstr "Visible"
+msgstr "Visíbel"

 msgid "Friend Only"
 msgstr "Só amigos"
@@ -7333,13 +7306,11 @@
 msgid "City/Area"
 msgstr "Cidade/Área"

-#, fuzzy
 msgid "Publish Mobile"
-msgstr "Móbil persoal"
-
-#, fuzzy
+msgstr "Publicar móbil"
+
 msgid "Publish Contact"
-msgstr "Contacto público"
+msgstr "Publicar o contacto"

 msgid "College"
 msgstr "Escola"
@@ -7374,7 +7345,6 @@
 msgid "Update"
 msgstr "Actualizar"

-#, fuzzy
 msgid "Could not change buddy information."
 msgstr "Non se puido cambiar a información do contacto."

@@ -7385,38 +7355,33 @@
 msgstr "Nota"

 #. callback
-#, fuzzy
 msgid "Buddy Memo"
 msgstr "Icona de contacto"

 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "Cambiar o recordatorio del/dela segundo o seu gusto"
+
 msgid "_Modify"
-msgstr "Modificar"
-
-#, fuzzy
+msgstr "_Modificar"
+
 msgid "Memo Modify"
-msgstr "Modificar"
-
-#, fuzzy
+msgstr "Modificar o recordatorio"
+
 msgid "Server says:"
-msgstr "Servidor ocupado"
+msgstr "O servidor di:"

 msgid "Your request was accepted."
-msgstr ""
+msgstr "A súa consulta foi aceptada."

 msgid "Your request was rejected."
-msgstr ""
+msgstr "A súa cosulta foi rexeitada."

 #, c-format
 msgid "%u requires verification"
 msgstr "%u require verificación"

-#, fuzzy
 msgid "Add buddy question"
-msgstr "Pregunta engadir contacto"
+msgstr "Engadir pregunta de contacto"

 msgid "Enter answer here"
 msgstr "Introduza a resposta aquí"
@@ -7424,9 +7389,8 @@
 msgid "Send"
 msgstr "Enviar"

-#, fuzzy
 msgid "Invalid answer."
-msgstr "Resposta non válida."
+msgstr "A resposta non é válida."

 msgid "Authorization denied message:"
 msgstr "Mensaxe de autorización rexeitada:"
@@ -7438,9 +7402,8 @@
 msgid "%u needs authorization"
 msgstr "%u necesita autorización"

-#, fuzzy
 msgid "Add buddy authorize"
-msgstr "Autorizar engadir contacto"
+msgstr "Autorizar a adición do contacto"

 msgid "Enter request here"
 msgstr "Introducir a solicitude aquí"
@@ -7532,9 +7495,8 @@
 msgid "Category"
 msgstr "Categoría"

-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "O Qun non permite unirse a outros"
+msgstr "O Qun non permite a outros unirse"

 msgid "Join QQ Qun"
 msgstr "Unirse a QQ Qun"
@@ -7549,7 +7511,7 @@
 msgid "Successfully joined Qun"
 msgstr "Uniuse a Qun con éxito"

-#, fuzzy, c-format
+#, c-format
 msgid "Qun %u denied from joining"
 msgstr "%u Qun denegada desde a unión"

@@ -7585,7 +7547,7 @@
 msgstr "Creou con éxito un Qun "

 msgid "Would you like to set up detailed information now?"
-msgstr "Quere configurar agora a información ampliada"
+msgstr "Quere configurar agora a información detallada?"

 msgid "Setup"
 msgstr "Configuración"
@@ -7598,13 +7560,13 @@
 msgid "%u request to join Qun %u"
 msgstr "%u solicitou unirse a Qun %u"

-#, fuzzy, c-format
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Fallou ao unirse a Qun %u, xestionado por admin %u"
-
-#, fuzzy, c-format
+msgstr "Fallou ao unirse Qun %u, xestionado polo admin %u"
+
+#, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr "<b>A unión a Qun %u é aprobada polo administrador %u para %s</b>"
+msgstr "<b>A unión Qun %u é aprobada polo administrador %u para %s</b>"

 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -7640,7 +7602,7 @@
 msgstr "Zona"

 msgid "Flag"
-msgstr "Flag"
+msgstr "Bandeira"

 msgid "Ver"
 msgstr "Ver"
@@ -7667,7 +7629,7 @@
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>Servidor</b>: %s<br>\n"

-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
 msgstr "<b>Etiqueta do cliente</b>: %s<br>\n"

@@ -7722,12 +7684,11 @@
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Recoñecemento</b>:<br>\n"

-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b>Autor orixinal</b>:<br>\n"
+msgstr "<p><b>Probadores escrupulosos</b>:<br>\n"

 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "e máis, fágamo saber, por favor... grazas!)"

 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>E ao resto da xente que está por detrás...</i><br>\n"
@@ -7754,9 +7715,8 @@
 msgid "About OpenQ"
 msgstr "Sobre OpenQ"

-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "Modificar enderezo"
+msgstr "Modificar o recordatorio do contact"

 #. *< type
 #. *< ui_requirement
@@ -7796,16 +7756,14 @@
 msgstr "Amosar as noticias do servidor"

 msgid "Show chat room when msg comes"
-msgstr ""
-
-#, fuzzy
+msgstr "Mostrar a sala de conversa cando chega a mensaxe"
+
 msgid "Keep alive interval (seconds)"
 msgstr "Intervalo de keep alive (segundos)"

 msgid "Update interval (seconds)"
 msgstr "Intervalo de actualización (segundos)"

-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "Non se pode descifrar a resposta do servidor"

@@ -7846,9 +7804,8 @@
 msgid "Enter code"
 msgstr "Introducir código"

-#, fuzzy
 msgid "QQ Captcha Verification"
-msgstr "Verificación de captcha QQ"
+msgstr "Verificación de CAPTCHA QQ"

 msgid "Enter the text from the image"
 msgstr "Introduza o texto da imaxe"
@@ -7874,9 +7831,8 @@
 msgid "Requesting token"
 msgstr "Solicitando token"

-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "Non se puido conectar ao servidor."
+msgstr "Non se puido conectar ao servidor"

 msgid "Invalid server or port"
 msgstr "O servidor ou o porto non son válidos"
@@ -7918,7 +7874,7 @@
 msgid "Unknown SERVER CMD"
 msgstr "SERVER CMD descoñecido"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
@@ -7927,17 +7883,14 @@
 "sala %u, resposta 0x%02X"

 msgid "QQ Qun Command"
-msgstr "Comando QQ Qun"
-
-#, fuzzy
+msgstr "Orde QQ Qun"
+
 msgid "Unable to decrypt login reply"
 msgstr "Non puido descifrar a resposta do inicio de sesión"

-#, fuzzy
 msgid "Unknown LOGIN CMD"
 msgstr "LOGIN CMD descoñecido"

-#, fuzzy
 msgid "Unknown CLIENT CMD"
 msgstr "CLIENT CMD descoñecido"

@@ -8377,7 +8330,7 @@
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 "Non pode recibir notificacións do contacto hasta que importe a súa chave "
-"pública. Pode empregar o comando \"Obter chave pública\" para obtela."
+"pública. Pode empregar a orde \"Obter chave pública\" para obtela."

 #. Open file selector to select the public key.
 msgid "Open..."
@@ -8650,13 +8603,13 @@
 msgstr "Non se pode unir a un grupo privado"

 msgid "Call Command"
-msgstr "Chamar ao comando"
+msgstr "Chamar a orde"

 msgid "Cannot call command"
-msgstr "Non se pode chamar ao comando"
+msgstr "Non se pode chamar a orde"

 msgid "Unknown command"
-msgstr "Comando descoñecido"
+msgstr "Orde descoñecida"

 msgid "Secure File Transfer"
 msgstr "Transferencia segura de ficheiros"
@@ -8912,12 +8865,11 @@
 msgstr "_Ver..."

 msgid "Unsupported public key type"
-msgstr "Tipo de chave pública non soportada"
+msgstr "Tipo de chave pública non compatíbel"

 msgid "Disconnected by server"
 msgstr "Desconectado polo servidor"

-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "Produciuse un erro durante a conexión ao servidor SILC"

@@ -8933,7 +8885,6 @@
 msgid "Performing key exchange"
 msgstr "Efectuando o intercambio de chaves"

-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Non se puido cargar o par de chaves SILC"

@@ -8941,14 +8892,12 @@
 msgid "Connecting to SILC Server"
 msgstr "Conectando co servidor SILC"

-#, fuzzy
 msgid "Unable to not load SILC key pair"
 msgstr "Non se puido cargar o par de chaves SILC"

 msgid "Out of memory"
 msgstr "Sen memoria"

-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "Non se puido inicializar o protocolo SILC"

@@ -9085,7 +9034,7 @@

 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Comando descoñecido: %s, (pode ser un erro do cliente)"
+msgstr "Orde descoñecida: %s, (pode ser un erro do cliente)"

 msgid "part [channel]:  Leave the chat"
 msgstr "part [canle]:  Abandonar a conversa"
@@ -9126,7 +9075,7 @@
 msgstr "quit [mensaxe]:  Desconecta do servidor, cunha mensaxe opcional"

 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;comando&gt;:  Executar un comando calquera do cliente silc"
+msgstr "call &lt;orde&gt;:  Executar unha orde calquera do cliente silc"

 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;alias&gt; [-pubkey|&lt;razón&gt;]:  Matar un alias"
@@ -9248,9 +9197,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Creando o par de chaves SILC..."

-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Non se pode crear o par de chaves SILC\n"
+msgstr "Non se pode crear o par de chaves SILC"

 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9353,27 +9301,28 @@

 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Fallo: O servidor remoto non soporta/confía na súa chave pública"
+msgstr "Fallo: O servidor remoto non confía/admite a súa chave pública"

 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "Fallo: O servidor remoto non soporta o grupo de KE proposto"
+msgstr "Fallo: O servidor remoto non admite o grupo de KE proposto"

 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "Fallo: O servidor remoto non soporta o sistema de cifrado proposto"
+msgstr ""
+"Fallo: O servidor remoto non é compatíbel co sistema de cifrado proposto"

 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Fallo: O servidor remoto non soporta os PKCS proposto"
+msgstr "Fallo: O servidor remoto non é compatíbel o PKCS proposto"

 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "Fallo: O servidor remoto non soporta a función de hash proposta"
+msgstr "Fallo: O servidor remoto non é compatíbel coa función de hash proposta"

 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Fallo: O servidor remoto non soporta o HMAC proposto"
+msgstr "Fallo: O servidor remoto non é compatíbel co HMAC proposto"

 #, c-format
 msgid "Failure: Incorrect signature"
@@ -9387,35 +9336,31 @@
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Fallou a autenticación"

-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "Non se puido inicializar a conexión do cliente SILC"

 msgid "John Noname"
 msgstr "Nome Apelidos"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Non se puido cargar o par de chaves SILC: %s"

 msgid "Unable to create connection"
 msgstr "Non é posíbel crear a conexión"

-#, fuzzy
 msgid "Unknown server response"
-msgstr "Resposta do servidor descoñecida."
-
-#, fuzzy
+msgstr "Resposta do servidor descoñecida"
+
 msgid "Unable to create listen socket"
-msgstr "Non é posíbel crear o conectador"
+msgstr "Non é posíbel crear conectador de escoita"

 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 "Os nomes de usuario SIP non poden conter espazos en branco nin o símbolo @"

-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "Amosar o aviso do servidor"
+msgstr "A conexión SIP ao servidor non foi especificada"

 #. *< type
 #. *< ui_requirement
@@ -9472,7 +9417,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"

@@ -9503,9 +9447,8 @@
 msgid "Yahoo Chat port"
 msgstr "Porto de conversa de Yahoo"

-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "ID de Yahoo..."
+msgstr "ID de Yahoo JAPAN..."

 #. *< type
 #. *< ui_requirement
@@ -9517,12 +9460,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Complemento de protocolo Yahoo"
+msgstr "Complemento de protocolo Yahoo! JAPAN"

 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "O seu SMS non foi entregado"

 msgid "Your Yahoo! message did not get sent."
 msgstr "A súa mensaxe Yahoo! non se enviou."
@@ -9549,32 +9491,28 @@
 msgstr "Rexeitouse engadir o contacto"

 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "Recibíronse datos non válidos na conexión co servidor."
+msgstr "Recibíronse datos incorrectos"

 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Erro descoñecido número %d. Se inicia sesión no sitio web de Yahoo! é "
-"posíbel que isto se arranxe."
+"Conta bloqueada: Demasiados intentos fallos. Se inicia sesión no sitio web "
+"de Yahoo! é posíbel que isto se arranxe."

 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Erro descoñecido número %d. Se inicia sesión no sitio web de Yahoo! é "
-"posíbel que isto se arranxe."
+"Conta bloqueada: Razón descoñecida. Se inicia sesión no sitio web de Yahoo! "
+"é posíbel que isto se arranxe."

 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "O nome de conta ou contrasinal non é correcto"
+msgstr "O nome de conta ou contrasinal non se encontran"

 #, c-format
 msgid ""
@@ -9601,7 +9539,7 @@
 msgstr "Quere ignorar o contacto?"

 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "A súa conta está bloqueada. Inicie unha sesión no sitio web de Yahoo!."
+msgstr "A súa conta está bloqueada. Inicie unha sesión no sitio web de Yahoo!"

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -9609,35 +9547,29 @@
 "Erro descoñecido número %d. Se inicia sesión no sitio web de Yahoo! é "
 "posíbel que isto se arranxe."

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Non se puido engadir o contacto %s ao grupo %s á lista no servidor para a "
+"Non se puido engadir o contacto %s ao grupo %s para a lista de servidor na "
 "conta %s."

-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "Non se puido engadir o contacto á lista do servidor"
+msgstr "Non se puido engadir o contacto na lista do servidor"

 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audíbel %s/%s/%s.swf ] %s"

-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Recibiuse unha resposta HTTP inesperada do servidor."
-
-#, fuzzy, c-format
+msgstr "Recibiuse unha resposta HTTP inesperada do servidor"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Perdeuse a conexión con %s:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Perdeuse a conexión con %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"Non se puido establecer unha conexión co servidor:\n"
-"%s"
+msgstr "Non se puido establecer unha conexión con %s: %s"

 msgid "Not at Home"
 msgstr "Fóra da casa"
@@ -9685,7 +9617,7 @@
 msgstr "Comezar o Doodle"

 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Seleccionar o ID que queres activar"

 msgid "Join whom in chat?"
 msgstr "A quen quere unir á conversa?"
@@ -9842,9 +9774,8 @@
 msgid "User Rooms"
 msgstr "Salas de usuarios"

-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Produciuse un problema ao conectarse co servidor YCHT."
+msgstr "Produciuse un problema ao conectarse co servidor YCHT"

 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9959,7 +9890,7 @@
 msgstr "Usar tzc"

 msgid "tzc command"
-msgstr "Comando tzc"
+msgstr "Orde tzc"

 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
@@ -9979,18 +9910,17 @@
 msgid "Exposure"
 msgstr "Exposición"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Non é posíbel analizar a resposta desde o proxy HTTP: %s\n"
+msgstr "Non é posíbel analizar a resposta desde o proxy HTTP: %s"

 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Erro de conexión no proxy HTTP %d"

-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr ""
-"Acceso denegado: o servidor de proxy HTTP prohibe o túnel polo porto %d."
+msgstr "Acceso denegado: o servidor proxy HTTP prohibe o túnel polo porto %d"

 #, c-format
 msgid "Error resolving %s"
@@ -10133,37 +10063,37 @@
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
-msgstr[1] "%d segundo"
+msgstr[1] "%d segundos"

 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
-msgstr[1] "%d día"
+msgstr[1] "%d días"

 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
-msgstr[1] "%s, %d hora"
+msgstr[1] "%s, %d horas"

 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
-msgstr[1] "%d hora"
+msgstr[1] "%d horas"

 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
-msgstr[1] "%s, %d minuto"
+msgstr[1] "%s, %d minutos"

 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
-msgstr[1] "%d minuto"
+msgstr[1] "%d minutos"

 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -10234,12 +10164,12 @@
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"Encontrouse un erro ao ler o seu %s. Non se cargaron e o ficheiro antigo "
+"Encontrouse un erro lendo o seu %s. Non se cargou o ficheiro e o antigo "
 "renomeouse como %s~."

 msgid "Internet Messenger"
@@ -10284,7 +10214,7 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Usar esta icona de contacto para esta conta:"

-msgid "_Advanced"
+msgid "Ad_vanced"
 msgstr "_Avanzado"

 msgid "Use GNOME Proxy Settings"
@@ -10347,8 +10277,7 @@
 msgid "Create _this new account on the server"
 msgstr "Crear es_ta conta nova no servidor"

-#, fuzzy
-msgid "_Proxy"
+msgid "P_roxy"
 msgstr "Proxy"

 msgid "Enabled"
@@ -10384,7 +10313,7 @@
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "Ten %d contacto chamado %s. Quere combinalos?"
-msgstr[1] "Ten %d contacto chamado %s. Quere combinalos?"
+msgstr[1] "Ten %d contactos chamados %s. Quere combinalos?"

 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10399,7 +10328,6 @@
 msgid "Please update the necessary fields."
 msgstr "Actualice os campos necesarios."

-#, fuzzy
 msgid "A_ccount"
 msgstr "Conta"

@@ -10427,16 +10355,14 @@
 msgid "I_M"
 msgstr "M_I"

-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Engadir conversa"
+msgstr "Ch_amada de audio"

 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Audio/_Videochamada"
+
 msgid "_Video Call"
-msgstr "Videoconferencia"
+msgstr "_Videoconferencia"

 msgid "_Send File..."
 msgstr "E_nviar ficheiro..."
@@ -10447,11 +10373,9 @@
 msgid "View _Log"
 msgstr "Ver _rexistro"

-#, fuzzy
 msgid "Hide When Offline"
 msgstr "Ocultar cando se está desconectado"

-#, fuzzy
 msgid "Show When Offline"
 msgstr "Mostrar cando se está desconectado"

@@ -10579,9 +10503,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/Ferramentas/_Certificados"

-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Ferramentas/E_moticona"
+msgstr "/Ferramentas/E_moticonas personalizadas"

 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/C_omplementos"
@@ -10701,7 +10624,7 @@
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d mensaxe sen ler de %s\n"
-msgstr[1] "%d mensaxe sen ler de %s\n"
+msgstr[1] "%d mensaxes sen ler de %s\n"

 msgid "Manually"
 msgstr "Manualmente"
@@ -10710,7 +10633,7 @@
 msgstr "Por estado"

 msgid "By recent log activity"
-msgstr ""
+msgstr "Por actividade rexistrada recente"

 #, c-format
 msgid "%s disconnected"
@@ -10727,7 +10650,7 @@
 msgstr "Activar de novo"

 msgid "SSL FAQs"
-msgstr ""
+msgstr "FAQ SSL"

 msgid "Welcome back!"
 msgstr "Benvida/o de novo!"
@@ -10739,7 +10662,7 @@
 msgstr[0] ""
 "%d conta foi desactivada porque se conectou desde outra localización:"
 msgstr[1] ""
-"%d conta foi desactivada porque se conectou desde outra localización:"
+"%d contas foron desactivadas porque se conectou desde outra localización:"

 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuario:</b>"
@@ -10800,7 +10723,7 @@
 msgstr "Engadir o contacto ao _grupo:"

 msgid "This protocol does not support chat rooms."
-msgstr "Este protocolo non soporta as salas de conversa."
+msgstr "Este protocolo non é compatíbel coas salas de conversa."

 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
@@ -10825,9 +10748,8 @@
 msgid "Auto_join when account becomes online."
 msgstr "_Unirse automatiamente cando unha conta se volve activa."

-#, fuzzy
 msgid "_Remain in chat after window is closed."
-msgstr "_Permanecer na xanela de "
+msgstr "_Permanecer no chat tras cerrar a xanela."

 msgid "Please enter the name of the group to be added."
 msgstr "Introduza o nome do grupo que quere engadir."
@@ -10861,116 +10783,104 @@
 msgstr "Cor do fondo"

 msgid "The background color for the buddy list"
-msgstr ""
-
-#, fuzzy
+msgstr "A cor de fondo para a lista de contactos"
+
 msgid "Layout"
-msgstr "Lao"
+msgstr "Disposición"

 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "A disposición das iconas, nome e estado da lista blist"

 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Cor do fondo"
+msgstr "Cor do fondo expandida"

 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "A cor de fondo dun grupo expandido"
+
 msgid "Expanded Text"
-msgstr "_Expandir"
+msgstr "Texto _expandido"

 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "A información textual para cando se expande un grupo"
+
 msgid "Collapsed Background Color"
-msgstr "Seleccionar a cor do fondo"
+msgstr "Cor do fondo colapsada"

 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "A cor de fondo dun grupo colapsado"
+
 msgid "Collapsed Text"
-msgstr "_Contraer"
+msgstr "_Contraer o texto"

 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "A inforamción textual para cando un grupo se colapsa"

 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Seleccionar a cor do fondo"
+msgstr "Cor de fondo para Contacto/Chat"

 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "A cor de fondo dun contacto ou chat"
+
 msgid "Contact Text"
-msgstr "Atallo"
+msgstr "Texto do contacto"

 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "A información textual para cando un contacto se expande"
+
 msgid "On-line Text"
-msgstr "Conectado"
+msgstr "Texto para conectado"

 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "A información textual para cando un contacto está en liña"
+
 msgid "Away Text"
-msgstr "Ausente"
+msgstr "Texto de despedida"

 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "A información textual para cando un contacto se foi"
+
 msgid "Off-line Text"
-msgstr "Desconectado"
+msgstr "Texto para Desconectado"

 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "A información textual para cando un contacto está desconectado"
+
 msgid "Idle Text"
-msgstr "Texto de estado de ánimo"
+msgstr "Texto para Inactivo"

 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "A información textual para cando un contacto está inactivo"
+
 msgid "Message Text"
-msgstr "Mensaxe enviada"
+msgstr "Texto de mensaxe"

 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "A información textual para cando un contacto ten unha mensaxe sen ler"

 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Texto da mensaxe (Alcume referido)"

 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
 msgstr ""
-
-#, fuzzy
+"A información textual para cando un chat ten unha mensaxe sen ler que "
+"menciona o seu alcume"
+
 msgid "The text information for a buddy's status"
-msgstr "Modificar a información de usuario para %s"
-
-#, fuzzy
+msgstr "Información textual para o estado do contacto"
+
 msgid "Type the host name for this certificate."
-msgstr "Escriba o nome do host para o que é este certificado."
+msgstr "Escriba o nome do host deste certificado."

 #. Widget creation function
 msgid "SSL Servers"
 msgstr "Servidores SSL"

 msgid "Unknown command."
-msgstr "Comando descoñecido."
+msgstr "Orde descoñecida."

 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese contacto non utiliza o mesmo protocolo que esta conversa."
@@ -11011,9 +10921,8 @@
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"

-#, fuzzy
 msgid "Last Said"
-msgstr "Dito a última vez"
+msgstr "O último que se dixo"

 msgid "Unable to save icon file to disk."
 msgstr "Non se puido gardar o ficheiro de iconas no disco."
@@ -11058,21 +10967,17 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpar _historial"

-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Conversa/Má_is"
-
-#, fuzzy
+msgstr "/Conversa/M_edia"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Conversa/Má_is"
-
-#, fuzzy
+msgstr "/Conversa/Media/Chamada de _audio"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Conversa/Má_is"
-
-#, fuzzy
+msgstr "/Conversa/Media/_Videochamada"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Conversa/Ver _rexistro"
+msgstr "/Conversa/Media/Audio\\/Video _Chamada"

 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar ficheiro..."
@@ -11146,17 +11051,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver o rexistro"

-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Conversa/Máis"
-
-#, fuzzy
+msgstr "/Conversa/Media/Audiochamada"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Conversa/Ver o rexistro"
-
-#, fuzzy
+msgstr "/Conversation/Media/Videochamada"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Conversa/Máis"
+msgstr "/Conversation/Media/Audio\\/Videochamada"

 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar o ficheiro..."
@@ -11229,7 +11131,7 @@
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoa na sala"
-msgstr[1] "%d persoa na sala"
+msgstr[1] "%d persoas na sala"

 msgid "Typing"
 msgstr "Escribindo"
@@ -11330,7 +11232,6 @@
 msgid "Fatal Error"
 msgstr "Erro moi grave"

-#, fuzzy
 msgid "bug master"
 msgstr "bug master"

@@ -11342,14 +11243,13 @@
 msgstr "Ka-Hing Cheung"

 msgid "voice and video"
-msgstr ""
+msgstr "voz e vídeo"

 msgid "support"
-msgstr "soporte"
-
-#, fuzzy
+msgstr "compatibilide"
+
 msgid "webmaster"
-msgstr "webmaster"
+msgstr "webmáster"

 msgid "Senior Contributor/QA"
 msgstr "Contribuínte sénior/QA"
@@ -11368,7 +11268,7 @@
 msgstr "hacker e deseñador de controladores [vagabundo preguizoso]"

 msgid "support/QA"
-msgstr "soporte/QA"
+msgstr "compatibilidade/QA"

 msgid "XMPP"
 msgstr "XMPP"
@@ -11469,9 +11369,8 @@
 msgid "Hungarian"
 msgstr "Húngaro"

-#, fuzzy
 msgid "Armenian"
-msgstr "Romanés"
+msgstr "Armenio"

 msgid "Indonesian"
 msgstr "Indonesio"
@@ -11488,9 +11387,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Tradutores xeorxianos de Ubuntu"

-#, fuzzy
 msgid "Khmer"
-msgstr "Outros"
+msgstr "Khemer"

 msgid "Kannada"
 msgstr "Kannada"
@@ -11513,7 +11411,6 @@
 msgid "Macedonian"
 msgstr "Macedonio"

-#, fuzzy
 msgid "Mongolian"
 msgstr "Macedonio"

@@ -11533,7 +11430,7 @@
 msgstr "Occitano"

 msgid "Punjabi"
-msgstr "Punjabi"
+msgstr "Punjabí"

 msgid "Polish"
 msgstr "Polaco"
@@ -11572,7 +11469,7 @@
 msgstr "Sueco"

 msgid "Swahili"
-msgstr ""
+msgstr "Suahili"

 msgid "Tamil"
 msgstr "Tamil"
@@ -11638,19 +11535,23 @@
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"

 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 msgstr ""
-
-#, fuzzy, c-format
+"<FONT SIZE=\"4\">Axuda vía correo:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin en irc.freenode.net<BR><BR>"

-#, fuzzy, c-format
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin en irc.freenode.net<BR><BR>"

@@ -11724,7 +11625,7 @@
 "Está a punto de eliminar o contacto que contén a %s e %d contacto máis da "
 "lista de contactos. Quere continuar?"
 msgstr[1] ""
-"Está a punto de eliminar o contacto que contén a %s e %d contacto máis da "
+"Está a punto de eliminar o contacto que contén a %s e %d contactos máis da "
 "lista de contactos. Quere continuar?"

 msgid "Remove Contact"
@@ -11835,8 +11736,7 @@
 msgstr "<b>Enviando como:</b>"

 msgid "There is no application configured to open this type of file."
-msgstr ""
-"Non se configurou ningunha aplicación para abrir este tipo de ficheiro."
+msgstr "Non se configurou ningún aplicativo para abrir este tipo de ficheiro."

 msgid "An error occurred while opening the file."
 msgstr "Produciuse un erro ao abrir o ficheiro."
@@ -11904,10 +11804,9 @@
 msgid "Hyperlink visited color"
 msgstr "Cor da ligazón visitada"

-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
-"A cor para debuxar as ligazóns despois de que se visiten (ou se activen)"
+"A cor para debuxar as ligazóns despois de que se visiten (ou se activen)."

 msgid "Hyperlink prelight color"
 msgstr "Cor de ligazón iluminada previamente"
@@ -11943,23 +11842,20 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Cor do nome para a mensaxe de acción dunha mensaxe privada"

-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
 msgstr "A cor para debuxar o nome dunha mensaxe de acción."

 msgid "Whisper Message Name Color"
 msgstr "Cor do nome para as mensaxes privadas"

-#, fuzzy
 msgid "Color to draw the name of a whispered message."
 msgstr "A cor para debuxar o nome dunha mensaxe de acción."

 msgid "Typing notification color"
 msgstr "Eliminación da notificación de escritura"

-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "A cor que se usará para o tipo de letra da notificación de escritura"
+msgstr "A cor que se usará para a notificación de escritura"

 msgid "Typing notification font"
 msgstr "Cor da notificación de escritura"
@@ -12212,7 +12108,7 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Probe `%s -h' para máis información.\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12234,17 +12130,19 @@
 "\n"
 "  -c, --config=DIR    use DIR para ficheiros de configuración\n"
 "  -d, --debug         imprime as mensaxes de depuración á saída estándar\n"
+"  -f, --force-online  forzar en liña, coidando o status da rede\n"
 "  -h, --help          mostra esta axuda e sae\n"
 "  -m, --multiple      non se asegurar de que hai só unha instancia\n"
 "  -n, --nologin       non iniciar a sesión de forma automática\n"
-"  -l, --login[=NOME]  iniciar a sesión de forma automática (o argumento "
-"opcional NOME especifica\n"
-"                      a(s) conta(s) que hai que empregar separadas por "
-"comas.\n"
+"  -l, --login[=NOME]  activar a conta(s) específica(s) (o argumento "
+"opcional\n"
+"                         NOME especifica a(s) contas que hai que empregar "
+"separadas por comas.\n"
+"  --display=DISPLAY   X mostra para usa\n"
 "                      Sen isto só se activará a primeira conta).\n"
 "  -v, --version       mostra a versión actual e sae\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12265,6 +12163,7 @@
 "\n"
 "  -c, --config=DIR    use DIR para ficheiros de configuración\n"
 "  -d, --debug         imprime as mensaxes de depuración á saída estándar\n"
+"  -f, --force-online  forzar en liña, coidando o status da rede\n"
 "  -h, --help          mostra esta axuda e sae\n"
 "  -m, --multiple      non asegurarse de que hai só unha instancia\n"
 "  -n, --nologin       non conectarse de forma automática\n"
@@ -12308,41 +12207,40 @@

 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "Saíndo porque xa está executándose outro cliente libpurple.\n"

 msgid "/_Media"
-msgstr ""
+msgstr "/_Media"

 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/Media/_Colgar"
+
 msgid "Calling..."
-msgstr "Calculando..."
+msgstr "Chamando..."

 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s desexa comezar unha sesión de audio/video contigo."

 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s desexa comezar unha sesión de video con vostede."

 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ten %d mensaxe nova."
-msgstr[1] "%s ten %d mensaxe nova."
+msgstr[1] "%s ten %d mensaxes novas."

 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>Ten %d correo electrónico novo.</b>"
-msgstr[1] "<b>Ten %d correo electrónico novo.</b>"
+msgstr[1] "<b>Ten %d correos electrónicos novos.</b>"

 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "O comando do navegador \"%s\" non é válido."
+msgstr "A orde do navegador \"%s\" non é válido."

 msgid "Unable to open URL"
 msgstr "Non se puido abrir o URL"
@@ -12354,12 +12252,11 @@
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"Elixiuse o navegador 'Manual', mais non se definiu ningún comando para "
-"executalo."
-
-#, fuzzy
+"Elixiuse o navegador 'Manual', mais non se definiu ningunha orde para "
+"executala."
+
 msgid "No message"
-msgstr "Mensaxe descoñecida"
+msgstr "Sen mensaxe"

 msgid "Open All Messages"
 msgstr "Abrir todas as mensaxes"
@@ -12367,16 +12264,15 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"

-#, fuzzy
 msgid "New Pounces"
-msgstr "Novo aviso de contacto"
+msgstr "Novo aviso do seu contacto"

 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "Desbotar"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">Acaba de recibir un aviso!</span>"

 msgid "The following plugins will be unloaded."
 msgstr "Desactivaranse os seguintes complementos."
@@ -12426,9 +12322,8 @@
 msgid "Select a file"
 msgstr "Seleccione un ficheiro"

-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "Editar aviso de contacto"
+msgstr "Editar o aviso do seu contacto"

 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
@@ -12480,7 +12375,7 @@
 msgstr "Enviar unha _mensaxe"

 msgid "E_xecute a command"
-msgstr "E_xecutar un comando"
+msgstr "E_xecutar unha orde"

 msgid "P_lay a sound"
 msgstr "Re_producir un son"
@@ -12503,61 +12398,58 @@
 msgid "Pounce Target"
 msgstr "Sobre quen avisar"

-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
-msgstr "Comeza a escribir"
-
-#, fuzzy, c-format
+msgstr "Comezou a escribir"
+
+#, c-format
 msgid "Paused while typing"
-msgstr "Fai unha pausa ao escribir"
-
-#, fuzzy, c-format
+msgstr "Fixo unha pausa mentres escribía"
+
+#, c-format
 msgid "Signed on"
-msgstr "Se conecta"
-
-#, fuzzy, c-format
+msgstr "Conéctase"
+
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s volveu da inactividade (%s)"
-
-#, fuzzy, c-format
+msgstr "Volveu da inactividade"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "Deixa de estar ausente"
-
-#, fuzzy, c-format
+msgstr "Volveu da ausencia"
+
+#, c-format
 msgid "Stopped typing"
 msgstr "Deixou de escribir"

-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
-msgstr "Se desconecta"
-
-#, fuzzy, c-format
+msgstr "Desconectouse"
+
+#, c-format
 msgid "Became idle"
-msgstr "Se volve inactivo"
-
-#, fuzzy, c-format
+msgstr "Volveuse inactivo"
+
+#, c-format
 msgid "Went away"
-msgstr "Cando estea ausente"
-
-#, fuzzy, c-format
+msgstr "Cando non estea"
+
+#, c-format
 msgid "Sent a message"
 msgstr "Enviar unha mensaxe"

-#, fuzzy, c-format
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "Evento de aviso descoñecido. Informe disto!"
-
-#, fuzzy
+msgstr "Descoñecido... Por favor informe disto!"
+
 msgid "Theme failed to unpack."
-msgstr "Fallou o desempaquetado do tema de emoticonas."
-
-#, fuzzy
+msgstr "Fallou o desempaquetado do tema."
+
 msgid "Theme failed to load."
-msgstr "Fallou o desempaquetado do tema de emoticonas."
-
-#, fuzzy
+msgstr "Fallou a carga do tema."
+
 msgid "Theme failed to copy."
-msgstr "Fallou o desempaquetado do tema de emoticonas."
+msgstr "Fallou a copia do tema."

 msgid "Install Theme"
 msgstr "Instalar tema"
@@ -12579,9 +12471,8 @@
 msgstr "Pechar as c_onversas coa tecla Esc"

 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Lista de contactos"
+msgstr "Tema da lista de contactos"

 #. System Tray
 msgid "System Tray Icon"
@@ -12593,9 +12484,8 @@
 msgid "On unread messages"
 msgstr "Se hai mensaxes sen ler"

-#, fuzzy
 msgid "Conversation Window"
-msgstr "Ventás de conversa de MI"
+msgstr "Xanela de conversa"

 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar as novas conversas de MI:"
@@ -12687,7 +12577,7 @@
 "that support formatting."
 msgstr ""
 "Isto é unha mostra de como aparecerá a súa mensaxe saínte cando use "
-"protocolos que soportan o formatado."
+"protocolos que son compatíbeis co formatado."

 msgid "Cannot start proxy configuration program."
 msgstr "Non se pode iniciar o programa de configuración do proxy."
@@ -12698,9 +12588,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"

-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "Detectar _automaticamente o enderezo IP"
+msgstr "Usar o enderezo IP detectado _automaticamente: %s"

 msgid "Public _IP:"
 msgstr "_IP público:"
@@ -12722,7 +12612,7 @@

 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Servidor de reenvío (TURN)"

 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy &amp; Navegador"
@@ -12754,7 +12644,7 @@

 #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
 msgid "Use remote DNS with SOCKS4 proxies"
-msgstr ""
+msgstr "Usar DNS remoto con proxies SOCKS4"

 msgid "_User:"
 msgstr "_Usuario:"
@@ -13070,12 +12960,11 @@
 msgid "Status for %s"
 msgstr "Estado para %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"Xa existe unha emoticona personalizada para o atallo seleccionado. "
-"Especifique un atallo diferente."
+"Xa existe unha emoticona personalizada para '%s'. Use un atallo diferente."

 msgid "Custom Smiley"
 msgstr "Emoticona personalizada"
@@ -13089,28 +12978,24 @@
 msgid "Add Smiley"
 msgstr "Engadir emoticona"

-#, fuzzy
 msgid "_Image:"
-msgstr "_Imaxe"
+msgstr "_Imaxe:"

 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Atallo"
+msgstr "Te_xto de atallo:"

 msgid "Smiley"
 msgstr "Emoticona"

-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Atallo"
+msgstr "Texto de atallo"

 msgid "Custom Smiley Manager"
 msgstr "Xestor de emoticonas personalizadas"

-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Seleccionar contacto"
+msgstr "Seleccionar icona de contacto"

 msgid "Click to change your buddyicon for this account."
 msgstr "Prema para cambiar a súa icona de contacto para esta conta."
@@ -13196,13 +13081,12 @@
 msgid "Cannot send launcher"
 msgstr "Non se pode enviar o iniciador"

-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
 "Arrastrou un iniciador do escritorio. O máis probábel é que queira enviar o "
-"contido ao que apunta o propio iniciador."
+"destinodeste iniciador en lugar de enviar este mesmo iniciador."

 #, c-format
 msgid ""
@@ -13236,9 +13120,8 @@
 "Fallo ao cargar a imaxe '%s': causa descoñecida, probablemente o ficheiro "
 "está corrompido"

-#, fuzzy
 msgid "_Open Link"
-msgstr "_Abrir ligazón en:"
+msgstr "_Abrir ligazón"

 msgid "_Copy Link Location"
 msgstr "_Copiar localización da ligazón"
@@ -13246,9 +13129,21 @@
 msgid "_Copy Email Address"
 msgstr "_Copiar enderezo de correo"

+msgid "_Open File"
+msgstr "_Abrir ficheiro"
+
+msgid "Open _Containing Directory"
+msgstr "Abrir o cartafol que os _contén"
+
 msgid "Save File"
 msgstr "Gardar o ficheiro"

+msgid "_Play Sound"
+msgstr "Re_producir un son"
+
+msgid "_Save File"
+msgstr "_Gardar o ficheiro"
+
 msgid "Select color"
 msgstr "Seleccione a cor"

@@ -13337,77 +13232,65 @@
 msgstr ""
 "Mostra información estatística sobre a dispoñibilidade dos seus contactos"

-#, fuzzy
 msgid "Server name request"
-msgstr "Enderezo do servidor"
-
-#, fuzzy
+msgstr "Consulta do nome do servidor"
+
 msgid "Enter an XMPP Server"
-msgstr "Introduza un servidor de conferencias"
-
-#, fuzzy
+msgstr "Introduza un servidor de XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Seleccione un servidor de conferencias ao que consultar"
-
-#, fuzzy
+msgstr "Seleccione un servidor de XMPP ao que consultar"
+
 msgid "Find Services"
-msgstr "Servizos en liña"
-
-#, fuzzy
+msgstr "Encontrar servizos"
+
 msgid "Add to Buddy List"
-msgstr "Enviar lista de contactos"
-
-#, fuzzy
+msgstr "Engadir á lista de contactos"
+
 msgid "Gateway"
-msgstr "Está ausente"
-
-#, fuzzy
+msgstr "Pasarela"
+
 msgid "Directory"
-msgstr "Directorio de rexistro"
-
-#, fuzzy
+msgstr "Directorio"
+
 msgid "PubSub Collection"
-msgstr "Selección de son"
-
-#, fuzzy
+msgstr "Selección de PubSub"
+
 msgid "PubSub Leaf"
-msgstr "Servizo PubSub"
-
-#, fuzzy
+msgstr "Folla PubSub"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Descrición"
+msgstr ""
+"\n"
+"<b>Descrición:</b> "

 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
 msgstr "Información de descubrimento de servizo"

-#, fuzzy
 msgid "_Browse"
-msgstr "_Navegador:"
-
-#, fuzzy
+msgstr "_Navegador"
+
 msgid "Server does not exist"
 msgstr "O usuario non existe"

-#, fuzzy
 msgid "Server does not support service discovery"
 msgstr "O servidor non usa ningún método de autenticación coñecido"

-#, fuzzy
 msgid "XMPP Service Discovery"
-msgstr "Información de descubrimento de servizo"
+msgstr "Información de descubrimento de servizo XMPP"

 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Permitir a navegación e o rexistro de servizos."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "Este complemento é útil para depurar servidores XMPP ou clientes."
+msgstr ""
+"Este complemento é útil para rexistar transportes con herdanza ou outros "
+"servizos sobre XMPP."

 msgid "Buddy is idle"
 msgstr "O contacto está inactivo"
@@ -13568,7 +13451,7 @@
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
-msgstr "Proporciona soporte para os xestos co rato"
+msgstr "Proporciona compatibilidade para os xestos co rato"

 #. *  description
 msgid ""
@@ -13578,8 +13461,8 @@
 " • 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 ""
-"Permite o soporte de xestos co rato nas xanelas de conversa. Arrastre co "
-"botón central do rato para realizar certas accións:\n"
+"Permite dispoñibilidade de xestos co rato nas xanelas de conversa. Arrastre "
+"co botón central do rato para realizar certas accións:\n"
 " &bull; Abaixo e despois á dereita para pechar unha conversa.\n"
 " &bull; Arriba e despois á esquerda para mudar á conversa anterior.\n"
 " &bull; Arriba e despois á dereita para mudar á seguinte conversa."
@@ -13770,7 +13653,7 @@
 msgstr "Mensaxería musical"

 msgid "There was a conflict in running the command:"
-msgstr "Produciuse un conflito ao executar o comando:"
+msgstr "Produciuse un conflito ao executar a orde:"

 msgid "Error Running Editor"
 msgstr "Erro ao executar o editor"
@@ -13800,13 +13683,12 @@
 msgstr "Complemento de mensaxería musical para a composición colaborativa."

 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
 msgstr ""
 "O complemento de mensaxería musical permíte que distintos usuarios traballen "
-"de forma simultánea nunha peza de música editando unha partitura común en "
+"de forma simultánea nunha peza músical editando unha partitura común en "
 "tempo real."

 #. ---------- "Notify For" ----------
@@ -13925,7 +13807,6 @@
 msgid "Highlighted Message Name Color"
 msgstr "Cor do nome para a mensaxe realzada"

-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "Eliminación da notificación de escritura"

@@ -13958,23 +13839,20 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atallo de texto GTK+"

-#, fuzzy
 msgid "Disable Typing Notification Text"
 msgstr "Activar a notificación de escritura"

-#, fuzzy
 msgid "GTK+ Theme Control Settings"
-msgstr "Control de temas GTK+ de Pidgin"
-
-#, fuzzy
+msgstr "Configuración de temas GTK+"
+
 msgid "Colors"
-msgstr "Pechar"
+msgstr "Cores"

 msgid "Fonts"
 msgstr "Tipos de letra"

 msgid "Miscellaneous"
-msgstr ""
+msgstr "Misceláneo"

 msgid "Gtkrc File Tools"
 msgstr "Ferramentas de ficheiros Gtkrc"
@@ -14059,7 +13937,6 @@
 msgstr "O botón para enviar a xanela de conversa."

 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14120,94 +13997,78 @@
 "Substitúe o texto das mensaxes saíntes segundo as regras definidas polo "
 "usuario."

-#, fuzzy
 msgid "Just logged in"
-msgstr "Non iniciou a sesión"
-
-#, fuzzy
+msgstr "Acaba de iniciar a sesión"
+
 msgid "Just logged out"
-msgstr "Non iniciou a sesión"
+msgstr "Acaba de rematar a sesión"

 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Icona do contacto/\n"
+"Icona de persoa descoñecida"
+
 msgid "Icon for Chat"
-msgstr "Unirse a unha conversa"
-
-#, fuzzy
+msgstr "Icona para chat"
+
 msgid "Ignored"
-msgstr "Ignorar"
-
-#, fuzzy
+msgstr "Ignorado"
+
 msgid "Founder"
-msgstr "Máis ruidoso"
-
-#, fuzzy
+msgstr "Fundador"
+
 msgid "Operator"
-msgstr "Opera"
+msgstr "Operador"

 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Semioperador"
+
 msgid "Authorization dialog"
-msgstr "Autorización concedida"
-
-#, fuzzy
+msgstr "Diálogo de autorización"
+
 msgid "Error dialog"
-msgstr "Erro "
-
-#, fuzzy
+msgstr "Diálogo de erro "
+
 msgid "Information dialog"
-msgstr "Información"
+msgstr "Diálogo de información"

 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Diálogo de correo"
+
 msgid "Question dialog"
 msgstr "Diálogo de solicitude"

-#, fuzzy
 msgid "Warning dialog"
-msgstr "Nivel de aviso"
+msgstr "Diálogo de aviso"

 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Que clase de diálogo é este?"
+
 msgid "Status Icons"
-msgstr "Estado para %s"
-
-#, fuzzy
+msgstr "Iconas de estado"
+
 msgid "Chatroom Emblems"
-msgstr "Localización da sala de conversa"
-
-#, fuzzy
+msgstr "Emblemas da sala de conversa"
+
 msgid "Dialog Icons"
-msgstr "Cambiar icona"
-
-#, fuzzy
+msgstr "Iconas de diálogo"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Control de temas GTK+ de Pidgin"
-
-#, fuzzy
+msgstr "Editor de iconas de tema de Pidgin"
+
 msgid "Contact"
-msgstr "Información do contacto"
-
-#, fuzzy
+msgstr "Contacto"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Lista de contactos"
-
-#, fuzzy
+msgstr "Editor de tema lista de contactos"
+
 msgid "Edit Buddylist Theme"
-msgstr "Lista de contactos"
+msgstr "Editar o tema da lista de contactos"

 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Editar tema da icona"

 #. *< type
 #. *< ui_requirement
@@ -14216,16 +14077,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Control de temas GTK+ de Pidgin"
+msgstr "Editor do tema de Pidgin"

 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Control de temas GTK+ de Pidgin"
+msgstr "Editor do tema de Pidgin."

 #. *< type
 #. *< ui_requirement
@@ -14368,7 +14227,7 @@
 "* Nota: este complemento require Win2000 ou outro máis novo."

 msgid "GTK+ Runtime Version"
-msgstr "GTK+ Runtime Version"
+msgstr "Versión de GTK+ Runtime"

 #. Autostart
 msgid "Startup"
@@ -14395,11 +14254,10 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opcións específicas do Pidgin no Windows."

-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Proporciona opcións específicas para o Pidgin no Windows, como a ancoraxe da "
+"Proporciona opcións específicas para o Pidgin en Windows, como a ancoraxe da "
 "xanela de contactos."

 msgid "<font color='#777777'>Logged out.</font>"
@@ -14439,516 +14297,5 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento é útil para depurar servidores XMPP ou clientes."

-#~ msgid "Cannot open socket"
-#~ msgstr "Non se pode abrir o conectador"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Non se puido escoitar o conectador"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Non é posíbel ler o conectador"
-
-#~ msgid "Connection failed."
-#~ msgstr "Fallou a conexión."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "O servidor desconectouse"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Non se puido crear o conectador "
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Non se puido conectar ao servidor"
-
-#~ msgid "Read error"
-#~ msgstr "Erro de lectura"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Non se puido establecer unha conexión co servidor:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "Erro de escritura"
-
-#~ msgid "Last Activity"
-#~ msgstr "Última actividade"
-
-#~ msgid "Service Discovery Info"
-#~ msgstr "Información de descubrimento de servizo"
-
-#~ msgid "Service Discovery Items"
-#~ msgstr "Elementos de descubrimento de servizo"
-
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Envío de parágrafos ampliado"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "Conversa multiusuario"
-
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "Información de presencia ampliada de conversa multiusuario"
-
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "Fluxos de bytes In-Band"
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Comandos Ad-Hoc"
-
-#~ msgid "PubSub Service"
-#~ msgstr "Servizo PubSub"
-
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "Fluxos de bytes SOCKS5"
-
-#~ msgid "Out of Band Data"
-#~ msgstr "Datos fóra de banda"
-
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#~ msgid "In-Band Registration"
-#~ msgstr "Rexistro In-Band"
-
-#~ msgid "User Location"
-#~ msgstr "Localización do usuario"
-
-#~ msgid "User Avatar"
-#~ msgstr "Avatar de usuario"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "Notificacións de estado da conversa"
-
-#~ msgid "Software Version"
-#~ msgstr "Versión de software"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "Inicio de fluxo"
-
-#~ msgid "User Mood"
-#~ msgstr "Estado de ánimo do usuario"
-
-#~ msgid "User Activity"
-#~ msgstr "Actividade do usuario"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "Capacidades da entidade"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "Negociacións de sesión codificada"
-
-#~ msgid "User Tune"
-#~ msgstr "Música do usuario"
-
-#~ msgid "Roster Item Exchange"
-#~ msgstr "Intercambio de elementos da lista"
-
-#~ msgid "Reachability Address"
-#~ msgstr "Enderezo de contacto"
-
-#~ msgid "User Profile"
-#~ msgstr "Perfil de usuario"
-
-#~ msgid "Jingle"
-#~ msgstr "Jingle"
-
-#~ msgid "Jingle Audio"
-#~ msgstr "Jingle Audio"
-
-#~ msgid "User Nickname"
-#~ msgstr "Alias do usuario"
-
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "Jingle ICE UDP"
-
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "Jingle ICE TCP"
-
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "Jingle UDP en bruto"
-
-#~ msgid "Jingle Video"
-#~ msgstr "Jingle Video"
-
-#~ msgid "Jingle DTMF"
-#~ msgstr "Jingle DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "Recibos de mensaxe"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "Publicación da chave pública"
-
-#~ msgid "User Chatting"
-#~ msgstr "O usuario está conversando"
-
-#~ msgid "User Browsing"
-#~ msgstr "O usuario está navegando"
-
-#~ msgid "User Gaming"
-#~ msgstr "O usuario está xogando"
-
-#~ msgid "User Viewing"
-#~ msgstr "O usuario está observando"
-
-#~ msgid "Stanza Encryption"
-#~ msgstr "Cifrado de parágrafo"
-
-#~ msgid "Entity Time"
-#~ msgstr "Hora da entidade"
-
-#~ msgid "Delayed Delivery"
-#~ msgstr "Envío atrasado"
-
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "Collaborative Data Objects"
-
-#~ msgid "File Repository and Sharing"
-#~ msgstr "Repositorio de ficheiros e compartidos"
-
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "Descubrimento de servizo STUN para o Jingle"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "Negociación simplificada de sesión cifrada"
-
-#~ msgid "Hop Check"
-#~ msgstr "Verificación de saltos"
-
-#~ msgid "Read Error"
-#~ msgstr "Erro de lectura"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Fallou ao conectar ao servidor."
-
-#~ msgid "Read buffer full (2)"
-#~ msgstr "O búfer de lectura está cheo (2)"
-
-#~ msgid "Unparseable message"
-#~ msgstr "A mensaxe non é analizábel"
-
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Non se puido conectar ao servidor: %s (%d)"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Fallou o inicio de sesión (%s)."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr ""
-#~ "Foi desconectado porque se conectou desde outra estación de traballo."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Erro. O soporte SSL non está instalado."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Contrasinal incorrecto."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Non se puido conectar ao servidor BOS:\n"
-#~ "%s"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizacións."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Non se puido conectar"
-
-#~ msgid "Invalid username."
-#~ msgstr "Nome de usuario non válido."
-
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Non se puido descrifrar a resposta do servidor"
-
-#~ msgid "Connection lost"
-#~ msgstr "Conexión perdida"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Non se puido resolver o host"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Conexión pechada (escribindo)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Conexión reiniciada"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Erro ao ler do conectador: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Non é posíbel conectarse ao host"
-
-#~ msgid "Could not write"
-#~ msgstr "Non se puido escribir"
-
-#~ msgid "Could not connect"
-#~ msgstr "Non se puido conectar"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Non se puido crear o conectador para escoitar"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Non se puido resolver o nome do host"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "Contrasinal incorrecto"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Non se puido establecer unha conexión con %s:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Xapón"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Servidor de buscapersoas xaponés"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Servidor de transferencia de ficheiros xaponés"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Perdeuse a conexión co servidor\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Non se puido resolver o nome do host"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "O servidor require TLS/SSL para iniciar a sesión. Non se dispón de "
-#~ "soporte TLS/SSL."
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Ocultar a xanela de conversa"
-
-#~ msgid "More Data needed"
-#~ msgstr "Precísanse máis datos"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Proporcione un atallo para asociar á emoticona."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Escolla unha imaxe para a emoticona."
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Que ID quere activar?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "Cor do cursor"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Cor secundaria do cursor"
-
-#~ msgid "Interface colors"
-#~ msgstr "Cores da interface"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Tamaño dos widget"
-
-#~ msgid "Invite message"
-#~ msgstr "Mensaxe de convite"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Introduza o nome do usuario que desexa convidar,\n"
-#~ "xunto cunha mensaxe de convite opcional."
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Non é posíbel obter a axenda de enderezos do MSN"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "Talvez sexa desconectado en breve. Pode querer usar TOC até que se "
-#~ "resolva isto. Comprobe %s para as actualizacións."
-
-#~ msgid "Looking up %s"
-#~ msgstr "Buscando %s"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Fallou a conexión a %s"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Conectado: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Non se puido escribir o ficheiro %s."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Non se puido ler o ficheiro %s."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "A mensaxe é demasiado longa; borrouse os últimos %s bytes."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s non está conectado agora."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Non se permiten avisos de %s."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr ""
-#~ "Descartouse a mensaxe; vostede está a exceder o límite de velocidade do "
-#~ "servidor."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "Non está dispoñíbel a conversa en %s."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "Está a enviar mensaxes demasiado rápido a %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "Perdeu unha MI de %s porque era demasiado grande."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "Perdeu unha MI de %s porque se mandou demasiado rápido."
-
-#~ msgid "Failure."
-#~ msgstr "Fallo."
-
-#~ msgid "Too many matches."
-#~ msgstr "Demasiados resultados."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "Necesítanse máis cualificadores."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Servizo de directorio non dispoñíbel temporalmente."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "Busca de enderezos de correo electrónico restrinxida."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Palabra chave ignorada."
-
-#~ msgid "No keywords."
-#~ msgstr "Sen palabras chave."
-
-#~ msgid "User has no directory information."
-#~ msgstr "O usuario non ten información de directorio."
-
-#~ msgid "Country not supported."
-#~ msgstr "País non soportado."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Fallo descoñecido: %s."
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "O nome de usuario ou contrasinal non é correcto."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "O servizo non está dispoñíbel temporalmente."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "O seu nivel de advertencias é actualmente demasiado alto para iniciar a "
-#~ "sesión."
-
-#~ 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 ""
-#~ "Conectouse e desconectouse con demasida frecuencia. Agarde dez minutos e "
-#~ "inténteo de novo. Se segue intentándoo, poida que precise agardar aínda "
-#~ "máis tempo."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Ocorreu un erro descoñecido ao conectarse: %s."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Ocorreu un erro (%d) descoñecido. Información: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Nome de grupo non válido"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Conexión pechada"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "Agardando resposta..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "O TOC rematou a pausa. Xa pode volver a enviar mensaxes."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "O contrasinal modificouse con éxito"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Obter a información do directorio"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Establecer a información do directorio"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Non se puido abrir %s para escritura!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Fallou a transferencia do ficheiro; posibelmente foi cancelado polo outro "
-#~ "extremo."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Non se puido conectar para realizar a transferencia."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr ""
-#~ "Non se puido escribir a cabeceira do ficheiro. O ficheiro non se "
-#~ "transferirá."
-
-#~ msgid "Save As..."
-#~ msgstr "Gardar como..."
-
-#~ 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 a %s que acepte %d ficheiro: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s solicita a %s que acepte %d ficheiro: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s solicita que lles envíe un ficheiro"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "Complemento de protocolo TOC"
-
-#~ msgid "%s Options"
-#~ msgstr "Opcións de %s"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Opcións do proxy"
-
-#~ msgid "By log size"
-#~ msgstr "Por tamaño de rexistro"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Abrir ligazón no navegador"
-
-#~ msgid "ST_UN server:"
-#~ msgstr "Servidor ST_UN:"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "_Imaxe de emoticona"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "A_tallo de emoticona"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "Facer escintilar a _xanela cando se reciben mensaxes de conversas"
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "A conexión BOSH ao servidor está malformada"
--- a/po/pa.po	Sun Jul 19 08:09:24 2009 +0000
+++ b/po/pa.po	Sun Jul 19 08:17:45 2009 +0000
@@ -8,17 +8,17 @@
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-02-26 22:23+0530\n"
-"Last-Translator: Amanpreet Singh Alam <aalam@users.sf.net>\n"
-"Language-Team: Punjabi <punjabi-users@lists.sf.net>\n"
+"POT-Creation-Date: 2009-07-18 22:44-0700\n"
+"PO-Revision-Date: 2009-07-19 07:35+0530\n"
+"Last-Translator: A S Alam <aalam@users.sf.net>\n"
+"Language-Team: Punjabi/Panjabi <punjabi-users@lists.sf.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"
 "\n"
 "\n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Lokalize 0.3\n"

 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -850,12 +850,11 @@
 msgid "System Log"
 msgstr "ਸਿਸਟਮ ਲਾਗ"

-#, fuzzy
 msgid "Calling ... "
-msgstr "ਗਿਣਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
+msgstr "ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ ... "

 msgid "Hangup"
-msgstr ""
+msgstr "ਹੈਂਡ ਅੱਪ"

 #. Number of actions
 msgid "Accept"
@@ -865,25 +864,24 @@
 msgstr "ਰੱਦ ਕਰੋ"

 msgid "Call in progress."
-msgstr ""
+msgstr "ਕਾਲ ਜਾਰੀ ਹੈ।"

 msgid "The call has been terminated."
-msgstr ""
+msgstr "ਕਾਲ ਖਤਮ ਕੀਤੀ ਗਈ ਹੈ।"

 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਆਡੀਓ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ।"

 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਗ਼ੈਰ-ਸਹਾਇਕ ਮੀਡਿਆ ਸ਼ੈਸ਼ਨ ਟਾਈਪ ਸ਼ੁਰੂ ਕਰਨ ਦੀ ਕੋਸ਼ਿਸ਼ ਕਰ ਰਿਹਾ/ਰਹੀ ਹੈ।"
+
 msgid "You have rejected the call."
-msgstr "ਤੁਸੀਂ %s%s ਚੈਨਲ ਛੱਡਿਆ"
+msgstr "ਤੁਸੀਂ ਕਾਲ ਰੱਦ ਕਰ ਦਿੱਤੀ ਹੈ।"

 msgid "call: Make an audio call."
-msgstr ""
+msgstr "ਕਾਲ: ਆਡੀਓ ਕਾਲ ਕਰੋ।"

 msgid "Emails"
 msgstr "ਈ-ਮੇਲ"
@@ -1534,22 +1532,23 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"TinyURL ਲਿਆ ਜਾ ਰਿਹਾ ਹੈ..."

 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "ਕੇਵਲ ਤਾਂ ਹੀ TinyURL ਬਣਾਓ, ਜਦੋਂ ਇਸ ਦੀ ਲੰਬਾਈ ਵੱਧ ਹੋਵੇ"

 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "TinyURL (ਜਾਂ ਹੋਰ) ਐਡਰੈੱਸ ਪ੍ਰੀਫਿਕਸ"
+
 msgid "TinyURL"
-msgstr "ਟਿਊਨ URL"
+msgstr "ਟਿਨੀURL"

 msgid "TinyURL plugin"
-msgstr ""
+msgstr "ਟਿਨੀURL ਪਲੱਗਇਨ"

 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "ਜਦੋਂ ਸੁਨੇਹੇ ਵਿੱਚ URL ਮਿਲੇ ਤਾਂ ਸੌਖੀ ਤਰ੍ਹਾਂ ਕਾਪੀ ਕਰਨ ਵਾਸਤੇ TinyURL ਬਣਾਓ"

 msgid "accounts"
 msgstr "ਅਕਾਊਂਟ"
@@ -1750,7 +1749,6 @@
 msgstr "+++ %s ਬੰਦ ਕਰ ਗਿਆ/ਗਈ"

 #. Unknown error
-#. Unknown error!
 msgid "Unknown error"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ"

@@ -1797,9 +1795,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s ਨੇ ਰੂਮ (%s) ਛੱਡਿਆ ਹੈ।"

-#, fuzzy
 msgid "Invite to chat"
-msgstr "ਕਾਨਫਰੰਸ ਲਈ ਸੱਦਾ"
+msgstr "ਗੱਲਬਾਤ ਲਈ ਸੱਦਾ ਦਿਓ"

 #. Put our happy label in it.
 msgid ""
@@ -1937,6 +1934,11 @@
 msgid "Starting transfer of %s from %s"
 msgstr "%2$s ਤੋਂ %1$s ਦੀ ਟਰਾਂਸਫਰ ਸ਼ੁਰੂ ਹੋ ਗਈ ਹੈ"

+# , c-format
+#, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "ਫਾਇਲ <A HREF=\"file://%s\">%s</A> ਦੀ ਟਰਾਂਸਫਰ ਪੂਰੀ ਹੋਈ"
+
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "ਫਾਇਲ %s ਦਾ ਟਰਾਂਸਫਰ ਮੁਕੰਮਲ ਹੋਇਆ"
@@ -2132,9 +2134,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"

-#, fuzzy
 msgid "Error creating conference."
-msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
+msgstr "ਕਨਫਰੰਸ ਬਣਾਉਣ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"

 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2528,7 +2529,6 @@
 msgstr "ਲਾਗ ਦਰਸ਼ਕ ਵਿੱਚ ਹੋਰ IM ਕਲਾਇਟ ਲਾਗ ਸ਼ਾਮਲ"

 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2539,7 +2539,8 @@
 "ਜਦੋਂ ਲਾਗ ਵੇਖਣਾ ਹੋਵੇ ਤਾਂ ਇਹ ਪਲੱਗਇਨ ਹੋਰ IM ਕਲਾਇਟ ਤੋਂ ਲਾਗ ਸ਼ਾਮਲ ਕੀਤਾ ਜਾਵੇਗਾ। ਇਸ ਸਮੇਂ, ਇਸ ਵਿੱਚ "
 "Adium, MSN ਮੈਸੰਜ਼ਰ, ਅਤੇ ਟਰਿੱਲਿਅਨ ਸ਼ਾਮਲ ਹਨ।\n"
 "\n"
-"ਚੇਤਾਵਨੀ: ਇਹ ਪਲੱਗਇਨ ਹਾਲੇ ਐਲਫ਼ਾ ਕੋਡ ਵਿੱਚ ਹੈ ਅਤੇ ਕਰੈਸ਼ ਹੋ ਸਕਦੀ ਹੈ। ਇਸ ਨੂੰ ਆਪਣੇ ਖਤਰੇ ਉੱਤੇ ਵਰਤੋਂ ਜੀ!"
+"ਚੇਤਾਵਨੀ: ਇਹ ਪਲੱਗਇਨ ਹਾਲੇ ਐਲਫ਼ਾ ਕੋਡ ਵਿੱਚ ਹੈ ਅਤੇ ਕਰੈਸ਼ ਹੋ ਸਕਦੀ ਹੈ। ਇਸ ਨੂੰ ਆਪਣੀ ਜਿੰਮੇਵਾਰੀ ਉੱਤੇ ਵਰਤੋਂ "
+"ਜੀ!"

 msgid "Mono Plugin Loader"
 msgstr "ਮੋਨੋ ਪਲੱਗਇਨ ਲੋਡਰ"
@@ -2583,11 +2584,11 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "ਇੱਕ ਆਫਲਾਈਨ ਯੂਜ਼ਰ ਨੂੰ ਭੇਜੇ ਸੁਨੇਹੇ ਪਉਨਸ ਵਾਂਗ ਸੰਭਾਲੋ।"

-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
-msgstr "ਬਾਕੀ ਸੁਨੇਹੇ ਪਉਨਸ ਵਾਂਗ ਸੰਭਾਲੋ। ਤੁਸੀਂ `ਬੱਡੀ ਪਉਨਸ' ਡਾਈਲਾਗ ਤੋਂ ਪਉਨਸ ਨੂੰ ਸੋਧ/ਹਟਾ ਸਕਦੇ ਹੋ।"
+msgstr ""
+"ਬਾਕੀ ਸੁਨੇਹੇ ਪਉਨਸ ਵਾਂਗ ਸੰਭਾਲੇ ਜਾਣਗੇ। ਤੁਸੀਂ `ਬੱਡੀ ਪਉਨਸ' ਡਾਈਲਾਗ ਤੋਂ ਪਉਨਸ ਨੂੰ ਸੋਧ/ਹਟਾ ਸਕਦੇ ਹੋ।"

 #, c-format
 msgid ""
@@ -2615,9 +2616,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "ਪੁੱਛੋ ਨਾ। ਹਮੇਸ਼ਾਂ ਪਉਨਸ ਵਿੱਚ ਸੰਭਾਲੋ।"

-#, fuzzy
 msgid "One Time Password"
-msgstr "ਪਾਸਵਰਡ ਦਿਓ"
+msgstr "ਇੱਕ ਵਾਰ ਪਾਸਵਰਡ"

 #. *< type
 #. *< ui_requirement
@@ -2626,13 +2626,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "ਇੱਕ ਵਾਰ ਪਾਸਵਰਡ ਸਹਿਯੋਗ"

 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "ਮਜ਼ਬੂਰ ਕਰਦਾ ਹੈ ਕਿ ਪਾਸਵਰਡ ਕੇਵਲ ਇੱਕ ਹੀ ਵਾਰ ਵਰਤੇ ਜਾਣ।"

 #. *  description
 msgid ""
@@ -2640,6 +2640,9 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"ਤੁਹਾਨੂੰ ਹਰੇਕ-ਅਕਾਊਂਟ ਉੱਤੇ ਮਜ਼ਬੂਰ ਕਰਨ ਲਈ ਸਹਾਇਕ ਹੈ, ਜੋ ਕਿ ਇੱਕ ਵਾਰ ਸਫ਼ਲ ਕੁਨੈਕਸ਼ਨ ਵਰਤਣ ਦੌਰਾਨ "
+"ਪਾਸਵਰਡ ਨੂੰ ਸੰਭਾਲਣ ਲਈ ਹੈ।\n"
+"ਨੋਟ: ਅਕਾਊਂਟ ਪਾਸਵਰਡ ਇਸ ਦੇ ਕੰਮ ਕਰਨ ਲਈ ਸੰਭਾਲਣਾ ਨਹੀਂ ਚਾਹੀਦਾ ਹੈ।"

 #. *< type
 #. *< ui_requirement
@@ -2831,17 +2834,15 @@
 "ActiveTCL ਇੰਸਟਾਲੇਸ਼ਨ ਖੋਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਜੇ ਤੁਸੀਂ TCL ਪਲੱਗਇਨ ਵਰਤਣੀਆਂ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ http://"
 "www.activestate.com ਤੋਂ ActiveTCL ਇੰਸਟਾਲ ਕਰੋ।\n"

-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"Windows ਟੂਲਕਿੱਟ ਲਈ ਐਪਸ ਬੋਨਜੋਉਰ ਨਹੀਂ ਲੱਭਿਆ ਸਵਾਲ-ਜਵਾਬ ਵੇਖੋ: ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ http://d."
+"ਐਪਲ ਦਾ \"Windows ਲਈ ਬੋਨਜੋਉਰ\" ਟੂਲਕਿੱਟ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ, ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਲਈ http://d."
 "pidgin.im/BonjourWindows ਵੇਖੋ।"

-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "ਆ ਰਹੇ IM ਕੁਨੈਕਸ਼ਨ ਸੁਣਨ ਤੋਂ ਅਸਮੱਰਥ ਹੈ\n"
+msgstr "ਆ ਰਹੇ IM ਕੁਨੈਕਸ਼ਨ ਸੁਣਨ ਤੋਂ ਅਸਮੱਰਥ ਹੈ"

 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2892,21 +2893,20 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "ਸੁਨੇਹਾ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਗੱਲਬਾਤ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s"
+
+# , c-format
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "ਸਾਕਟ ਪੋਰਟ ਨਾਲ ਜੋੜੀ ਨਹੀਂ ਜਾ ਸਕੀ"
-
-#, fuzzy, c-format
+msgstr "ਸਾਕਟ ਪੋਰਟ ਨਾਲ ਜੋੜੀ ਨਹੀਂ ਜਾ ਸਕੀ: %s"
+
+# , c-format
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ:\n"
-"%s"
+msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ: %s"

 msgid "Error communicating with local mDNSResponder."
 msgstr "mDNSResponder ਨਾਲ ਸੰਚਾਰ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"
@@ -2954,17 +2954,14 @@
 msgid "Load buddylist from file..."
 msgstr "ਫਾਇਲ ਤੋਂ ਬੱਡੀ ਲਿਸਟ ਲੋਡ ਕਰੋ..."

-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "ਰਜਿਸਟਰੇਸ਼ਨ ਖੇਤਰ ਭਰੋ।"
-
-#, fuzzy
+msgstr "ਤੁਹਾਨੂੰ ਰਜਿਸਟਰੇਸ਼ਨ ਖੇਤਰ ਭਰਨੇ ਹੋਣਗੇ।"
+
 msgid "Passwords do not match"
 msgstr "ਪਾਸਵਰਡ ਮਿਲਦਾ ਨਹੀਂ ਹੈ।"

-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ। ਗਲਤੀ ਆਈ ਹੈ।\n"
+msgstr "ਨਵਾਂ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਅਣਜਾਣੀ ਗਲਤੀ ਆਈ ਹੈ।"

 msgid "New Gadu-Gadu Account Registered"
 msgstr "ਨਵਾਂ ਗਡੂ-ਗਡੂ ਅਕਾਊਂਟ ਰਜਿਸਟਰ ਕੀਤਾ ਗਿਆ"
@@ -2979,11 +2976,10 @@
 msgstr "ਪਾਸਵਰਡ (ਮੁੜ)"

 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "ਕੈਪਟਚਾ ਟੈਕਸਟ ਦਿਓ"
+
 msgid "Captcha"
-msgstr "ਕੈਪਟਚਾ ਚਿੱਤਰ"
+msgstr "ਕੈਪਟਚਾ"

 msgid "Register New Gadu-Gadu Account"
 msgstr "ਨਵਾਂ ਗਡੂ-ਗਡੂ ਅਕਾਊਟ ਰਜਿਸਟਰ ਕਰੋ"
@@ -3122,14 +3118,15 @@
 msgid "Chat _name:"
 msgstr "ਗੱਲ ਨਾਂ(_n):"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
+msgstr "ਹੋਸਟ ਨਾਂ '%s' ਹੱਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"

 #. 1. connect to server
 #. connect to the server
 msgid "Connecting"
-msgstr "ਜੁੜ ਰਿਹਾ ਹੈ"
+msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"

 msgid "Chat error"
 msgstr "ਗੱਲ ਗਲਤੀ"
@@ -3137,9 +3134,8 @@
 msgid "This chat name is already in use"
 msgstr "ਇਹ ਗੱਲ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ 'ਚ ਹੈ"

-#, fuzzy
 msgid "Not connected to the server"
-msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਿਆ ਨਹੀਂ ਹੈ।"
+msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਹੈ"

 msgid "Find buddies..."
 msgstr "ਬੱਡੀ ਖੋਜ..."
@@ -3180,9 +3176,8 @@
 msgid "Gadu-Gadu User"
 msgstr "ਗਡੂ-ਗਡੂ ਯੂਜ਼ਰ"

-#, fuzzy
 msgid "GG server"
-msgstr "ਸਰਵਰ ਜਾਣਕਾਰੀ ਲਈ ਜਾ ਰਹੀ ਹੈ"
+msgstr "GG ਸਰਵਰ"

 #, c-format
 msgid "Unknown command: %s"
@@ -3198,9 +3193,8 @@
 msgid "File Transfer Failed"
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਫੇਲ੍ਹ"

-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "ਇੱਕ ਸੁਣਨ ਪੋਰਟ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
+msgstr "ਇੱਕ ਸੁਣਨ ਪੋਰਟ ਖੋਲ੍ਹਣ ਲਈ ਅਸਮਰੱਥ।"

 msgid "Error displaying MOTD"
 msgstr "MOTD ਵੇਖਾਉਣ ਦੌਰਾਨ ਗਲਤੀ"
@@ -3222,11 +3216,9 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਆਖਰੀ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ:\n"
-"%s"
+msgstr "ਸਰਵਰ ਨਾਲ ਆਖਰੀ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ: %s"

 msgid "View MOTD"
 msgstr "MOTD ਵੇਖੋ"
@@ -3237,9 +3229,8 @@
 msgid "_Password:"
 msgstr "ਪਾਸਵਰਡ(_P):"

-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC ਨਾਂਵਾਂ 'ਚ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"
+msgstr "IRC ਨਾਂਵਾਂ ਅਤੇ ਸਰਵਰ ਲਈ ਖਾਲੀ ਥਾਂ ਨਹੀਂ ਹੋ ਸਕਦੀ ਹੈ"

 msgid "SSL support unavailable"
 msgstr "SSL ਸਹਿਯੋਗ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ"
@@ -3248,11 +3239,12 @@
 msgstr "ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"

 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "%s ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਮਰੱਥ"
-
-#, fuzzy, c-format
+msgstr "%s ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+# , c-format
+#, c-format
 msgid "Server closed the connection"
 msgstr "ਸਰਵਰ ਕੁਨੈਕਸ਼ਨ ਬੰਦ ਕੀਤਾ ਗਿਆ ਹੈ।"

@@ -3434,19 +3426,18 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "ਇਹ ਗੱਲ ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ 'ਚ ਹੈ"
-
-#, fuzzy
+msgstr "\"%s\" ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਵਰਤੋਂ 'ਚ ਹੈ|"
+
 msgid "Nickname in use"
-msgstr "ਆਮ ਨਾਂ"
+msgstr "ਵਰਤੋਂ ਵਿੱਚ ਆਮ ਨਾਂ"

 msgid "Cannot change nick"
-msgstr "ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਹੋ ਸਕਦਾ"
+msgstr "ਨਾਂ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"

 msgid "Could not change nick"
-msgstr "ਨਾਂ ਤਬਦੀਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+msgstr "ਨਾਂ ਬਦਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"

 #, c-format
 msgid "You have parted the channel%s%s"
@@ -3677,11 +3668,9 @@
 msgid "execute"
 msgstr "ਚਲਾਓ"

-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "ਲਾਗਇਨ ਲਈ ਸਰਵਰ ਨੂੰ TLS/SSL ਲੋੜੀਦਾ ਹੈ। ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਹੈ।"
-
-#, fuzzy
+msgstr "ਸਰਵਰ ਨੂੰ TLS/SSL ਲੋੜੀਦਾ ਹੈ। ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਲੱਭਿਆ ਹੈ।"
+
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "ਤੁਹਾਨੂੰ ਇੰਕ੍ਰਿਪਸ਼ਨ ਦੀ ਲੋੜ ਹੈ, ਪਰ ਕੋਈ TLS/SSL ਸਹਿਯੋਗ ਨਹੀਂ ਲੱਭਿਆ।"

@@ -3699,13 +3688,11 @@
 msgid "Plaintext Authentication"
 msgstr "ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਕਿਤਾ"

-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਅਸਫਲ"
-
-#, fuzzy
+msgstr "SASL ਪ੍ਰਮਾਣਿਕਤਾ ਅਸਫਲ"
+
 msgid "Invalid response from server"
-msgstr "ਸਰਵਰ ਵਲੋਂ ਗਲਤ ਜਵਾਬ ਹੈ।"
+msgstr "ਸਰਵਰ ਵਲੋਂ ਗਲਤ ਜਵਾਬ ਹੈ"

 msgid "Server does not use any supported authentication method"
 msgstr "ਸਰਵਰ ਕਿਸੇ ਸਹਿਯੋਗੀ ਪਰਮਾਣਕਿਤਾ ਢੰਗ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
@@ -3716,36 +3703,30 @@
 msgid "Invalid challenge from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਗਲਤ ਚੈਲੰਜ਼"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL ਗਲਤੀ"
+msgstr "SASL ਗਲਤੀ: %s"

 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "BOSH ਕੁਨੈਕਸ਼ਨ ਮੈਨੇਜਰ ਨੇ ਤੁਹਾਡਾ ਸ਼ੈਸ਼ਨ ਖਤਮ ਕੀਤਾ।"
+
 msgid "No session ID given"
-msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"
-
-#, fuzzy
+msgstr "ਕੋਈ ਸ਼ੈਸ਼ਨ ID ਨਹੀਂ ਦਿੱਤਾ"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "ਨਾਸਹਾਇਕ ਵਰਜਨ"
-
-#, fuzzy
+msgstr "BOSH ਪਰੋਟੋਕਾਲ ਦਾ ਗ਼ੈਰ-ਸਹਾਇਕ ਵਰਜਨ"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ"
+
+# , c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
-"%s"
-
-#, fuzzy
+msgstr "ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਲਈ ਅਸਫ਼ਲ।"
+msgstr "SSL ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ"

 msgid "Full Name"
 msgstr "ਪੂਰਾ ਨਾਂ"
@@ -3811,9 +3792,8 @@
 msgid "Operating System"
 msgstr "ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ"

-#, fuzzy
 msgid "Local Time"
-msgstr "ਲੋਕਲ ਫਾਇਲ:"
+msgstr "ਲੋਕਲ ਟਾਈਮ"

 msgid "Priority"
 msgstr "ਤਰਜੀਹ"
@@ -3823,11 +3803,10 @@

 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s ਪਹਿਲਾਂ"
+
 msgid "Logged Off"
-msgstr "ਲਾਗਇਨ ਹੈ"
+msgstr "ਲਾਗ ਆਫ਼ ਕੀਤਾ"

 msgid "Middle Name"
 msgstr "ਮੱਧ ਨਾਂ"
@@ -3995,26 +3974,22 @@
 msgid "Find Rooms"
 msgstr "ਰੂਮ ਖੋਜ"

-#, fuzzy
 msgid "Affiliations:"
-msgstr "ਏਲੀਆਸ:"
-
-#, fuzzy
+msgstr "ਸਬੰਧ:"
+
 msgid "No users found"
-msgstr "ਕੋਈ ਮਿਲਦਾ ਯੂਜ਼ਰ ਨਹੀਂ ਮਿਲਿਆ"
-
-#, fuzzy
+msgstr "ਯੂਜ਼ਰ ਨਹੀਂ ਲੱਭੇ"
+
 msgid "Roles:"
-msgstr "ਕੰਮ"
-
-#, fuzzy
+msgstr "ਰੋਲ:"
+
 msgid "Ping timed out"
 msgstr "ਪਿੰਗ ਟਾਈਮ-ਆਉਟ"

 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
-msgstr ""
+msgstr "ਸਿੱਧਾ ਕੁਨਕੈਟ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੋਣ ਤੋਂ ਬਾਅਦ ਬਦਲਵਾਂ XMPP ਕੁਨੈਕਸ਼ਨ ਢੰਗ ਲੱਭਣ ਲਈ ਅਸਮਰੱਥ ਹੈ।"

 msgid "Invalid XMPP ID"
 msgstr "ਗਲਤ XMPP ID"
@@ -4022,9 +3997,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ਗਲਤ XMPP ID ਹੈ। ਡੋਮੇਨ ਸੈੱਟ ਕਰਨੀ ਲਾਜ਼ਮੀ ਹੈ।"

-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਦੌਰਨ ਗਲਤੀ"
+msgstr "ਨਿਕਾਰਾ BOSH URL"

 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4051,7 +4025,7 @@
 msgstr "ਅਣ-ਰਜਿਸਟਰੇਸ਼ਨ ਫੇਲ੍ਹ"

 msgid "State"
-msgstr "ਸਥਿਤੀ"
+msgstr "ਹਾਲਤ"

 msgid "Postal code"
 msgstr "ਡਾਕ-ਕੋਡ"
@@ -4092,10 +4066,6 @@
 msgid "Change Registration"
 msgstr "ਰਜਿਸਟਰੇਸ਼ਨ ਬਦਲੋ"

-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਦੌਰਨ ਗਲਤੀ"
-
 msgid "Error unregistering account"
 msgstr "ਅਕਾਊਂਟ ਅਣ-ਰਜਿਸਟਰੇਸ਼ਨ ਗਲਤੀ"

@@ -4381,19 +4351,22 @@
 msgid "Unable to ping user %s"
 msgstr "ਯੂਜ਼ਰ %s ਪਿੰਗ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ %s ਬਾਰੇ ਕੁਝ ਵੀ ਪਤਾ ਨਹੀਂ ਹੈ।"
-
-#, fuzzy, c-format
+msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ %s ਬਾਰੇ ਕੁਝ ਵੀ ਪਤਾ ਨਹੀਂ ਹੈ।"
+
+# , c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ %s ਸ਼ਾਇਦ ਆਫ਼ਲਾਈਨ ਹੈ।"
-
-#, fuzzy, c-format
+msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ %s ਸ਼ਾਇਦ ਆਫ਼ਲਾਈਨ ਹੈ।"
+
+# , c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ %s ਇਸ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+msgstr "ਬੱਜ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਕਿਉਂਕਿ %s ਇਸ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ ਜਾਂ ਬੱਜ਼ ਲੈਣੇ ਨਹੀਂ ਚਾਹੁੰਦਾ ਹੈ।"

 #, c-format
 msgid "Buzzing %s..."
@@ -4408,35 +4381,36 @@
 msgid "%s has buzzed you!"
 msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਬੱਜ਼ ਭੇਜਿਆ ਹੈ!"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "%s ਨੂੰ ਫਾਇਲ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ, ਗਲਤ JID"
-
-#, fuzzy, c-format
-msgid "Unable to initiate media with %s: user is not online"
-msgstr "%s ਨੂੰ ਫਾਇਲ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ, ਯੂਜ਼ਰ ਆਨਲਾਈਨ ਨਹੀਂ ਹੈ"
-
-#, fuzzy, c-format
-msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "%s ਨੂੰ ਫਾਇਲ ਭੇਜਣ ਲਈ ਅਸਮਰੱਥ ਹੈ, ਯੂਜ਼ਰ ਮੌਜੂਦਗੀ ਲਈ ਮੈਂਬਰ ਨਹੀਂ"
-
-#, fuzzy
-msgid "Media Initiation Failed"
-msgstr "ਰਜਿਸਟਰੇਸ਼ਨ ਅਸਫਲ"
+msgstr "%s ਨੂੰ ਮੀਡਿਆ ਸ਼ੁਰੂ ਕਰਨ ਵਾਸਤੇ ਅਸਮਰੱਥ: ਗਲਤ JID"

 # , c-format
-#, fuzzy, c-format
+#, c-format
+msgid "Unable to initiate media with %s: user is not online"
+msgstr "%s ਲਈ ਮੀਡਿਆ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: ਯੂਜ਼ਰ ਆਨਲਾਈਨ ਨਹੀਂ ਹੈ"
+
+# , c-format
+#, c-format
+msgid "Unable to initiate media with %s: not subscribed to user presence"
+msgstr "%s ਨੂੰ ਮੀਡਿਆ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ ਹੈ: ਯੂਜ਼ਰ ਮੌਜੂਦਗੀ ਲਈ ਮੈਂਬਰ ਨਹੀਂ"
+
+msgid "Media Initiation Failed"
+msgstr "ਮੀਡਿਆ ਸ਼ੁਰੂਆਤ ਫੇਲ੍ਹ ਹੈ"
+
+# , c-format, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "ਚੁਣੋ ਕਿ ਕਿਹੜੇ %s ਦੇ ਸਰੋਤ ਤੁਸੀਂ ਇੱਕ ਫਾਇਲ ਤੋਂ ਤੁਸੀਂ ਭੇਜਣੇ ਚਾਹੁੰਦੇ ਹੋ"
+msgstr "%s ਦੇ ਸਰੋਤ ਚੁਣੋ, ਜੋ ਕਿ ਤੁਸੀਂ ਮੀਡਿਆ ਸ਼ੈਸ਼ਨ ਨਾਲ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ।"

 msgid "Select a Resource"
 msgstr "ਇੱਕ ਸਰੋਤ ਚੁਣੋ"

-#, fuzzy
 msgid "Initiate Media"
-msgstr "ਗੱਲਬਾਤ ਚਾਲੂ(_C)"
+msgstr "ਮੀਡਿਆ ਸ਼ੁਰੂ"

 msgid "config:  Configure a chat room."
 msgstr "config:  Configure a chat room."
@@ -4456,21 +4430,19 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;user&gt; [reason]:  Ban a user from the room."

-#, fuzzy
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: ਰੂਮ ਨਾਲ ਯੂਜ਼ਰ "
-"ਦਾ ਸਬੰਧ ਸੈੱਟ ਕਰੋ"
-
-#, fuzzy
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: ਯੂਜ਼ਰਾਂ "
+"ਦਾ ਸਬੰਧ ਲਵੋ ਜਾਂ ਰੂਮ ਨਾਲ ਯੂਜ਼ਰ ਦਾ ਸਬੰਧ ਸੈੱਟ ਕਰੋ।"
+
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: ਰੂਮ ਵਿੱਚ ਯੂਜ਼ਰ ਦਾ "
-"ਰੋਲ ਸੈੱਟ ਕਰੋ।"
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: ਯੂਜ਼ਰਾਂ ਦਾ "
+"ਰੋਲ ਲਵੋ ਜਾਂ ਯੂਜ਼ਰਾਂ ਦਾ ਰੂਮ ਨਾਲ ਰੋਲ ਸੈੱਟ ਕਰੋ।"

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;user&gt; [room]:  ਯੂਜ਼ਰ ਨੂੰ ਰੂਮ 'ਚ ਸੱਦੋ।"
@@ -4531,7 +4503,7 @@
 msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਪਰਾਕਸੀ"

 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"

 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4595,32 +4567,30 @@
 msgid "_Accept Defaults"
 msgstr "ਮੂਲ ਮਨਜ਼ੂਰ ਕਰੋ(_A)"

-#, fuzzy
 msgid "No reason"
-msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"
-
-#, fuzzy, c-format
+msgstr "ਕਾਰਨ ਨਹੀਂ"
+
+# , c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "ਤੁਹਾਨੂੰ %s ਨੇ ਠੁੱਡਾ ਮਾਰਿਆ: (%s)"
-
-#, fuzzy, c-format
+msgstr "ਤੁਹਾਨੂੰ ਠੁੱਡਾ ਮਾਰਿਆ: (%s)"
+
+# , c-format
+#, c-format
 msgid "Kicked (%s)"
-msgstr "%s (%s) ਨੇ ਸੁੱਟਿਆ"
-
-#, fuzzy
+msgstr "ਠੁੱਡਾ ਮਾਰਿਆ (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "ਫਾਇਲ ਖੋਲਣ ਲਈ ਗਲਤੀ ਆਈ ਹੈ।"
-
-#, fuzzy
+msgstr "ਇਨ-ਬੈਂਡ ਬਾਈਟ-ਸਟਰੀਮ ਟਰਾਂਸਫਰ ਉੱਤੇ ਗਲਤੀ ਆਈ ਹੈ।\n"
+
 msgid "Transfer was closed."
-msgstr "ਫਾਇਲ ਟਰਾਂਸਫਰ ਫੇਲ੍ਹ"
-
-#, fuzzy
+msgstr "ਟਰਾਂਸਫਰ ਬੰਦ ਹੋ ਗਈ।"
+
 msgid "Failed to open the file"
-msgstr "ਫਾਇਲ '%s' ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ: %s"
+msgstr "ਫਾਇਲ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ"

 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "ਇਨ-ਬੈਂਡ ਬਾਈਟਸਿਸਟਮ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ"

 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4941,9 +4911,27 @@
 msgid "Non-IM Contacts"
 msgstr "ਗ਼ੈਰ-IM ਸੰਪਰਕ"

-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s ਨੇ ਸੈਨਤ ਭੇਜੀ ਹੈ। <a href='msn-wink://%s'>ਇਹ ਚਲਾਉਣ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ।</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s ਨੇ ਸੈਨਤ ਭੇਜੀ, ਪਰ ਇਸ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s ਨੇ ਵੀਡਿਓ ਕਲਿੱਪ ਭੇਜੀ। <a href='audio://%s'>ਚਲਾਉਣ ਲਈ ਕਲਿੱਕ ਕਰੋ</a>"
+
+# , c-format
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s ਨੇ ਵੀਡਿਓ ਕਲਿੱਪ ਭੇਜੀ, ਪਰ ਸੰਭਾਲੀ ਨਹੀਂ ਜਾ ਸਕੀ।"
+
+# , c-format
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s ਨੇ ਇੱਕ ਵੈੱਬ-ਕੈਮ ਸੱਦਾ ਭੇਜਿਆ ਹੈ, ਜੋ ਕਿ ਹਾਲੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
+msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਆਵਾਜ਼ ਗੱਲਬਾਤ ਲਈ ਸੱਦਿਆ, ਜੋ ਹਾਲੇ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"

 msgid "Nudge"
 msgstr "ਸੈਨਤ"
@@ -4988,7 +4976,7 @@
 "ਫੋਨਾਂ ਉੱਤੇ ਭੇਜਣ ਦੇਣਾ ਚਾਹੁੰਦੇ ਹੋ?"

 msgid "Allow"
-msgstr "ਸਵੀਕਾਰ"
+msgstr "ਮਨਜ਼ੂਰ"

 msgid "Disallow"
 msgstr "ਪਾਬੰਦੀ"
@@ -5095,6 +5083,30 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL ਸਹਿਯੋਗ MSN ਲਈ ਲੋੜੀਦਾ ਹੈ। ਇੱਕ ਸਹਾਇਕ SSL ਲਾਇਬਰੇਰੀ ਇੰਸਟਾਲ ਕਰੋ ਜੀ।"

+# , c-format
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"ਬੱਡੀ %s ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ। ਯੂਜ਼ਰ-ਨਾਂ ਇੱਕ ਵੈਧ। ਈਮੇਲ ਐਡਰੈੱਸ "
+"ਚਾਹੀਦਾ ਹੈ।"
+
+msgid "Unable to Add"
+msgstr "ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+
+msgid "Authorization Request Message:"
+msgstr "ਪ੍ਰਮਾਣਿਤ ਬੇਨਤੀ ਸੁਨੇਹਾ:"
+
+msgid "Please authorize me!"
+msgstr "ਮੈਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰੋ ਜੀ!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "ਠੀਕ ਹੈ(_O)"
+
 msgid "Error retrieving profile"
 msgstr "ਪ੍ਰੋਫਾਇਲ ਪ੍ਰਾਪਤ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"

@@ -5226,7 +5238,7 @@
 msgstr "ਪਸੰਦ ਚੀਜ਼ਾਂ"

 msgid "Last Updated"
-msgstr "ਆਖਰੀ ਨਵੀਨੀਕਰਨ"
+msgstr "ਆਖਰੀ ਅੱਪਡੇਟ"

 msgid "Homepage"
 msgstr "ਮੁੱਖ ਸਫਾ"
@@ -5284,13 +5296,15 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s ਨੇ ਤੁਹਾਨੂੰ ਸੈਨਲ (ਨੱਜ) ਮਾਰੀ ਹੈ!"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "ਅਣਜਾਣੀ ਗਲਤੀ (%d)"
+msgstr "ਅਣਜਾਣੀ ਗਲਤੀ (%d): %s"

 msgid "Unable to add user"
 msgstr "ਯੂਜ਼ਰ ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"

+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "ਅਣਜਾਣੀ ਗਲਤੀ (%d)"
@@ -5347,7 +5361,7 @@
 msgstr "ਲਿਖਣ ਗਲਤੀ"

 msgid "Reading error"
-msgstr "ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ"
+msgstr "ਪੜ੍ਹਨ ਦੌਰਾਨ ਗਲਤੀ"

 #, c-format
 msgid ""
@@ -5357,22 +5371,18 @@
 "ਸਰਵਰ (%s) ਵਲੋਂ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ:\n"
 "%s"

-#, fuzzy
 msgid "Our protocol is not supported by the server"
 msgstr "ਸਾਡੇ ਪ੍ਰੋਟੋਕਾਲ ਲਈ ਸਰਵਰ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"

-#, fuzzy
 msgid "Error parsing HTTP"
 msgstr "HTTP ਪਾਰਸ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਹੈ।"

-#, fuzzy
 msgid "You have signed on from another location"
 msgstr "ਤੁਸੀਂ ਕਿਸੇ ਹੋਰ ਥਾਂ ਤੋਂ ਲਾਗਇਨ ਹੋਏ"

 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "MSN ਸਰਵਰ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ। ਉਡੀਕ ਕਰਨ ਉਪਰੰਤ ਕੋਸ਼ਿਸ ਕਰੋ ਜੀ।"

-#, fuzzy
 msgid "The MSN servers are going down temporarily"
 msgstr "MSN ਸਰਵਰ ਆਰਜ਼ੀ ਤੌਰ ਤੇ ਬੰਦ ਹੋ ਰਿਹਾ ਹੈ।"

@@ -5402,9 +5412,10 @@
 msgid "Retrieving buddy list"
 msgstr "ਬੱਡੀ ਲਿਸਟ ਪ੍ਰਾਪਤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s ਨੇ ਇੱਕ ਵੈੱਬ-ਕੈਮ ਸੱਦਾ ਭੇਜਿਆ ਹੈ, ਜੋ ਕਿ ਹਾਲੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"
+msgstr "%s ਨੇ ਵੈੱਬ-ਕੈਮ ਵੇਖਣ ਲਈ ਮੰਗ ਕੀਤੀ ਹੈ, ਜੋ ਕਿ ਇਹ ਮੰਗ ਹਾਲੇ ਸਹਿਯੋਗੀ ਨਹੀਂ ਹੈ।"

 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -5597,14 +5608,15 @@
 msgid "Protocol error, code %d: %s"
 msgstr "ਪਰੋਟੋਕਾਲ ਗਲਤੀ, ਕੋਡ %d: %s"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s ਤੁਹਾਡਾ ਪਾਸਵਰਡ %d ਅੱਖਰਾਂ ਦਾ ਹੈ, ਜੋ ਕਿ MySpaceIM ਲਈ %d ਦੀ ਲੰਬਾਈ ਤੋਂ ਵੱਧ ਗਿਆ ਹੈ। ਆਪਣਾ "
-"ਪਾਸਵਰਡ http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
+"%s ਤੁਹਾਡਾ ਪਾਸਵਰਡ %zu ਅੱਖਰਾਂ ਦਾ ਹੈ, ਜੋ ਕਿ %d ਦੀ ਲੰਬਾਈ ਤੋਂ ਵੱਧ ਗਿਆ ਹੈ। ਆਪਣਾ ਪਾਸਵਰਡ "
+"http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
 "changePassword ਉੱਤੇ ਛੋਟਾ ਕਰਕੇ ਮੁੜ-ਟਰਾਈ ਕਰੋ ਜੀ।"

 msgid "Incorrect username or password"
@@ -5704,6 +5716,8 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"ਯੂਜ਼ਰ ਨਾਂ ਸੈੱਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ ਆਈ ਹੈ। ਮੁੜ-ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜਾਂ http://editprofile.myspace.com/"
+"index.cfm?fuseaction=profile.username ਨੂੰ ਆਪਣਾ ਯੂਜ਼ਰ ਨਾਂ ਸੈੱਟ ਕਰਨ ਲਈ ਵਰਤੋਂ।"

 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - ਯੂਜ਼ਰ ਨਾਂ ਉਪਲੱਬਧ ਹੈ"
@@ -5959,9 +5973,10 @@
 msgid "Unknown error: 0x%X"
 msgstr "ਅਣਜਾਣ ਗਲਤੀ: 0x%X"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "ਯੂਜ਼ਰ %s ਪਿੰਗ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
+msgstr "ਲਾਗਇਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"

 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6091,11 +6106,12 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ਮੌਜੂਦ ਨਹੀਂ (ਆਫਲਾਇਨ) ਹੈ ਅਤੇ ਤੁਹਾਡੇ ਰਾਹੀਂ ਭੇਜੇ ਸੁਨੇਹੇ ਪ੍ਰਾਪਤ ਨਹੀਂ ਕਰ ਸਕੇਗਾ।"

-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
-msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ। ਜੁੜਨ ਵਾਲੇ ਸਰਵਰ ਦਾ ਐਡਰੈੱਸ ਦਿਓ ਜੀ।"
+msgstr ""
+"ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਹੋਣ ਲਈ ਅਸਮਰੱਥ ਹੈ। ਸਰਵਰ ਦਾ ਐਡਰੈੱਸ ਦਿਓ ਜੀ, ਜਿਸ ਨਾਲ ਤੁਸੀਂ ਕੁਨੈਕਟ ਕਰਨਾ ਚਾਹੁੰਦੇ "
+"ਹੋ।"

 msgid "This conference has been closed. No more messages can be sent."
 msgstr "ਇਹ ਕਾਨਫਰੰਸ ਬੰਦ ਕਰ ਦਿੱਤੀ ਗਈ ਹੈ। ਕੋਈ ਹੋਰ ਸੁਨੇਹਾ ਨਹੀਂ ਭੇਜਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
@@ -6119,9 +6135,8 @@
 msgid "Server port"
 msgstr "ਸਰਵਰ ਪੋਰਟ"

-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "ਸਰਵਰ ਤੋਂ ਅਚਾਨਕ HTTP ਜਵਾਬ ਮਿਲਿਆ ਹੈ।"
+msgstr "ਇਸ ਤੋਂ ਅਣਜਾਣ ਜਵਾਬ ਮਿਲਿਆ"

 #. username connecting too frequently
 msgid ""
@@ -6131,12 +6146,13 @@
 "ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਬੜੀ ਛੇਤੀ ਨਾਲ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਿਹਾ ਹੈ। 10 ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ "
 "ਤੁਸੀਂ ਕੋਸ਼ਿਸ ਜਾਰੀ ਰੱਖੀ ਤਾਂ ਤੁਹਾਨੂੰ ਹੋਰ ਵੀ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Error requesting "
-msgstr "%s ਹੱਲ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
+msgstr "ਮੰਗ ਦੌਰਾਨ ਗਲਤੀ "

 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL ਤੁਹਾਡੇ ਸਕਰੀਨ ਨਾਂ ਨੂੰ ਇੱਥੇ ਪਰਮਾਣਿਤ ਕਰਨ ਨਹੀਂ ਦਿੰਦਾ ਹੈ।"

 msgid "Could not join chat room"
 msgstr "ਚੈਟ ਰੂਮ ਵਿੱਚ ਦਾਖਲ ਨਹੀਂ ਹੋਇਆ ਜਾ ਸਕਿਆ"
@@ -6144,7 +6160,6 @@
 msgid "Invalid chat room name"
 msgstr "ਗਲਤ ਚੈਟ ਰੂਮ ਨਾਂ"

-#, fuzzy
 msgid "Received invalid data on connection with server"
 msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਹੈ।"

@@ -6193,9 +6208,8 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਹੈ।"

-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
-msgstr "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਨਹੀਂ ਬਣਾਇਆ ਜਾ ਸਕਿਆ ਹੈ।"
+msgstr "ਰਿਮੋਟ ਯੂਜ਼ਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ"

 msgid "Direct IM established"
 msgstr "ਸਿੱਧਾ IM ਬਣਾਇਆ ਗਿਆ।"
@@ -6393,15 +6407,15 @@
 msgid "Buddy Comment"
 msgstr "ਸੁਨੇਹੀ ਟਿੱਪਣੀ"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"ਪਰਮਾਣਕਿਤਾ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "ਪਰਮਾਣਕਿਤਾ ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
+
+# , c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
+msgstr "BOS ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"

 msgid "Username sent"
 msgstr "ਯੂਜ਼ਰ ਨਾਂ ਭੇਜਿਆ"
@@ -6413,15 +6427,16 @@
 msgid "Finalizing connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਤਿਆਰ"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "Unable to 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 ""
-"ਲਾਗਇਨ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s ਵਾਂਗ ਲਾਗਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ। ਯੂਜ਼ਰ "
-"ਨਾਂ ਇੱਕ ਵੈਧ ਈਮੇਲ ਐਡਰੈੱਸ ਚਾਹੀਦਾ ਹੈ, ਜਾਂ ਇੱਕ ਅੱਖਰ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਕੇਵਲ ਅੱਖਰ, "
-"ਨੰਬਰ, ਖਾਲੀ ਥਾਂ ਜਾਂ ਕੁਝ ਨੰਬਰ ਹੀ ਹੋ ਸਕਦੇ ਹਨ।"
+"%s ਵਾਂਗ ਲਾਗਇਨ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ, ਕਿਉਂਕਿ ਯੂਜ਼ਰ-ਨਾਂ ਗਲਤ ਹੈ। ਯੂਜ਼ਰ ਨਾਂ ਇੱਕ ਵੈਧ ਈਮੇਲ ਐਡਰੈੱਸ "
+"ਚਾਹੀਦਾ ਹੈ, ਜਾਂ ਇੱਕ ਅੱਖਰ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਕੇਵਲ ਅੱਖਰ, ਨੰਬਰ, ਖਾਲੀ ਥਾਂ ਜਾਂ ਕੁਝ "
+"ਨੰਬਰ ਹੀ ਹੋ ਸਕਦੇ ਹਨ।"

 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6439,12 +6454,10 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "ਯੂਜ਼ਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+msgstr "ਯੂਜ਼ਰ-ਨਾਂ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"

 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
 msgstr "ਤੁਹਾਡਾ ਅਕਾਊਂਟ ਇਸ ਸਮੇਂ ਮੁਅੱਤਲ ਕੀਤਾ ਗਿਆ ਹੈ।"

@@ -6452,20 +6465,19 @@
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL Instant Messenger ਸਰਵਿਸ ਆਰਜ਼ੀ ਤੌਰ ਉੱਤੇ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।"

+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "ਤੁਹਾਡੇ ਰਾਹੀਂ ਵਰਤੇ ਜਾਣ ਵਾਲੇ ਕਲਾਇਟ ਦਾ ਵਰਜਨ ਬਹੁਤ ਪੁਰਾਣਾ ਹੈ। %s ਤੋਂ ਨਵਾਂ ਲਵੋ ਜੀ।"

 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਬੜੀ ਛੇਤੀ ਨਾਲ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਿਹਾ ਹੈ। 10 ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ "
+"ਤੁਹਾਡਾ ਕੁਨੈਕਸ਼ਨ ਬੜੀ ਛੇਤੀ ਨਾਲ ਜੁੜ ਅਤੇ ਟੁੱਟ ਰਿਹਾ ਹੈ। ਇੱਕ ਮਿੰਟ ਲਈ ਉਡੀਕ ਕਰਕੇ ਮੁੜ ਕੋਸ਼ਿਸ ਕਰੋ। ਜੇਕਰ "
 "ਤੁਸੀਂ ਕੋਸ਼ਿਸ ਜਾਰੀ ਰੱਖੀ ਤਾਂ ਤੁਹਾਨੂੰ ਹੋਰ ਵੀ ਉਡੀਕ ਕਰਨੀ ਪਵੇਗੀ।"

-#, fuzzy
 msgid "The SecurID key entered is invalid"
 msgstr "ਦਿੱਤੀ SecurID ਕੁੰਜੀ ਗਲਤ ਹੈ।"

@@ -6475,12 +6487,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "ਡਿਜ਼ੀਟਲ ਦਿੱਖ ਲਈ 6 ਡਿਜ਼ੀਟਲ ਅੰਕ ਦਿਓ"

-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "ਠੀਕ ਹੈ(_O)"
-
 msgid "Password sent"
 msgstr "ਪਾਸਵਰਡ ਭੇਜਿਆ"

@@ -6490,12 +6496,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "ਮੈਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰੋ ਜੀ ਤਾਂ ਕਿ ਮੈਂ ਤੁਹਾਨੂੰ ਆਪਣੀ ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰ ਸਕਾਂ।"

-msgid "Authorization Request Message:"
-msgstr "ਪ੍ਰਮਾਣਿਤ ਬੇਨਤੀ ਸੁਨੇਹਾ:"
-
-msgid "Please authorize me!"
-msgstr "ਮੈਨੂੰ ਪ੍ਰਮਾਣਿਤ ਕਰੋ ਜੀ!"
-
 msgid "No reason given."
 msgstr "ਕੋਈ ਕਾਰਨ ਨਹੀਂ ਦਿੱਤਾ ਹੈ।"

@@ -6802,7 +6802,8 @@
 msgid "Away message too long."
 msgstr "ਦੂਰ ਸੁਨੇਹਾ ਬਹੁਤ ਲੰਮਾ ਹੈ।"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "Unable to 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, "
@@ -6812,9 +6813,6 @@
 "ਚਾਹੀਦਾ ਹੈ, ਜਾਂ ਇੱਕ ਅੱਖਰ ਨਾਲ ਸ਼ੁਰੂ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ, ਜਿਸ ਵਿੱਚ ਕੇਵਲ ਅੱਖਰ, ਨੰਬਰ, ਖਾਲੀ ਥਾਂ ਜਾਂ ਕੁਝ "
 "ਨੰਬਰ ਹੀ ਹੋ ਸਕਦੇ ਹਨ।"

-msgid "Unable to Add"
-msgstr "ਸ਼ਾਮਲ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "ਬੱਡੀ ਲਿਸਟ ਲੈਣ ਲਈ ਅਸਮਰੱਥ"

@@ -6828,7 +6826,8 @@
 msgid "Orphans"
 msgstr "ਅਰਫਨ"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
@@ -6839,7 +6838,8 @@
 msgid "(no name)"
 msgstr "(ਨਾਂ ਨਹੀਂ)"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "ਅਣਜਾਣੇ ਕਾਰਨ ਕਰਨੇ ਬੱਡੀ %s ਨੂੰ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ।"

@@ -6998,9 +6998,8 @@
 msgid "Search for Buddy by Information"
 msgstr "ਜਾਣਕਾਰੀ ਰਾਹੀਂ ਬੱਡੀ ਖੋਜ"

-#, fuzzy
 msgid "Use clientLogin"
-msgstr "ਯੂਜ਼ਰ ਲਾਗਇਨ ਨਹੀਂ ਹੈ"
+msgstr "ਕਲਾਇਟਲਾਗਇਨ ਵਰਤੋਂ"

 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7196,30 +7195,26 @@
 msgstr "ਨੋਟ"

 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "ਬੱਡੀ ਆਈਕਾਨ"
+msgstr "ਬੱਡੀ ਮੀਮੋ"

 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "ਉਸ ਲਈ ਮੀਮੋ ਬਦਲੋ ਜਿਵੇਂ ਤੁਸੀਂ ਚਾਹੋ"
+
 msgid "_Modify"
-msgstr "ਸੋਧ"
-
-#, fuzzy
+msgstr "ਸੋਧ(_M)"
+
 msgid "Memo Modify"
-msgstr "ਸੋਧ"
-
-#, fuzzy
+msgstr "ਮੀਮੋ ਸੋਧ"
+
 msgid "Server says:"
-msgstr "ਸਰਵਰ ਰੁੱਝਿਆ ਹੈ"
+msgstr "ਸਰਵਰ ਨੇ ਕਿਹਾ:"

 msgid "Your request was accepted."
-msgstr ""
+msgstr "ਤੁਹਾਡੀ ਮੰਗ ਮੰਨੀ ਗਈ।"

 msgid "Your request was rejected."
-msgstr ""
+msgstr "ਤੁਹਾਡੀ ਮੰਗ ਰੱਦ ਕੀਤੀ ਗਈ।"

 #, c-format
 msgid "%u requires verification"
@@ -7529,12 +7524,11 @@
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>ਰਸੀਦ</b>:<br>\n"

-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b>ਅਸਲੀ ਲੇਖਕ</b>:<br>\n"
+msgstr "<p><b>ਖਾਸ ਟੈਸਟਰ</b>:<br>\n"

 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "ਅਤੇ ਹੋਰ ਬਹੁਤ, ਬੱਸ ਮੈਨੂੰ ਦੱਸ ਦਿਓ... ਧੰਨਵਾਦ ਸਹਿਤ!))"

 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>ਅਤੇ ਸਾਰੇ ਮੁੰਡੇ ਪਿਛਲੇ ਕਮਰੇ ਵਿੱਚ ਹਨ...</i><br>\n"
@@ -7561,9 +7555,8 @@
 msgid "About OpenQ"
 msgstr "OpenQ ਬਾਰੇ"

-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "ਐਡਰੈੱਸ ਸੋਧ"
+msgstr "ਬੱਡੀ ਮੀਮੋ ਸੋਧ"

 #. *< type
 #. *< ui_requirement
@@ -7611,9 +7604,8 @@
 msgid "Update interval (seconds)"
 msgstr "ਅੱਪਡੇਟ ਅੰਤਰਾਲ (ਸਕਿੰਟ)"

-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "ਸਰਵਰ ਜਵਾਬ ਡਿਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+msgstr "ਸਰਵਰ ਜਵਾਬ ਨੂੰ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"

 #, c-format
 msgid "Failed requesting token, 0x%02X"
@@ -7679,9 +7671,8 @@
 msgid "Requesting token"
 msgstr "ਟੋਕਨ ਲਈ ਮੰਗ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"

-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਅਸਫਲ ਹੈ।"
+msgstr "ਹੋਸਟ-ਨਾਂ ਹੱਲ਼ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"

 msgid "Invalid server or port"
 msgstr "ਗਲਤ ਸਰਵਰ ਜਾਂ ਪੋਰਟ"
@@ -7734,9 +7725,8 @@
 msgid "QQ Qun Command"
 msgstr "QQ ਕਿਉਨ ਕਮਾਂਡ"

-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "ਲਾਗਇਨ ਜਵਾਬ ਡਿਕ੍ਰਿਪਟ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+msgstr "ਲਾਗਇਨ ਜਵਾਬ ਨੂੰ ਡਿਕ੍ਰਿਪਟ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"

 msgid "Unknown LOGIN CMD"
 msgstr "ਅਣਜਾਣ ਲਾਗਇਨ CMD"
@@ -8699,9 +8689,8 @@
 msgid "Disconnected by server"
 msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਖਤਮ"

-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "SILC ਸਰਵਰ ਨਾਲ ਜੁੜਨ ਲਈ ਸਮੱਸਿਆ ਹੈ"
+msgstr "SILC ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਟ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"

 msgid "Key Exchange failed"
 msgstr "ਕੁੰਜੀ ਤਬਾਦਲਾ ਅਸਫਲ"
@@ -8713,24 +8702,21 @@
 msgid "Performing key exchange"
 msgstr "ਕੁੰਜੀ ਤਬਾਦਲਾ ਜਾਰੀ"

-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"

 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "SILC ਸਰਵਰ ਨਾਲ ਜੁੜ ਰਿਹਾ ਹੈ"

-#, fuzzy
 msgid "Unable to not load SILC key pair"
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"
+msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"

 msgid "Out of memory"
 msgstr "ਮੈਮੋਰੀ ਤੋਂ ਬਾਹਰ"

-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "SILC ਪਰੋਟੋਕਾਲ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ"
+msgstr "SILC ਪਰੋਟੋਕਾਲ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"

 msgid "Error loading SILC key pair"
 msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
@@ -9019,9 +9005,8 @@
 msgid "Creating SILC key pair..."
 msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ..."

-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ\n"
+msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ"

 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9157,27 +9142,25 @@
 msgid "Failure: Authentication failed"
 msgstr "ਅਸਫ਼ਲ: ਪ੍ਰਮਾਣਕਿਤਾ ਅਸਫ਼ਲ"

-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "SILC ਕਲਾਇਟ ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"
+msgstr "SILC ਕਲਾਇਟ ਕੁਨੈਕਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਅਸਮਰੱਥ"

 msgid "John Noname"
 msgstr "ਜਾਨ ਬਿਨ-ਨਾਂ"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ: %s"
+msgstr "SILC ਕੁੰਜੀ ਜੋੜਾ ਲੋਡ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"

 msgid "Unable to create connection"
 msgstr "ਕੁਨੈਕਸ਼ਨ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ।"

-#, fuzzy
 msgid "Unknown server response"
-msgstr "ਅਣਜਾਣ ਸਰਵਰ ਜਵਾਬ ਹੈ।"
-
-#, fuzzy
+msgstr "ਅਣਜਾਣ ਸਰਵਰ ਜਵਾਬ"
+
 msgid "Unable to create listen socket"
-msgstr "ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਫਲ"
+msgstr "ਲਿਸਟ ਸਾਕਟ ਬਣਾਉਣ ਲਈ ਅਸਫਲ"

 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP ਸਕਰੀਨ ਨਾਂ ਵਿੱਚ ਖਾਲੀ ਥਾਂ ਜਾਂ @ ਨਿਸ਼ਾਨ ਨਹੀਂ ਹੋ ਸਕਦਾ ਹੈ"
@@ -9240,9 +9223,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Yahoo ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
+msgstr "Yahoo! ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"

 msgid "Pager server"
 msgstr "ਪੇਜ਼ਰ ਸਰਵਰ"
@@ -9271,9 +9253,8 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo ਚੈਟ ਪੋਰਟ"

-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo ID..."
+msgstr "Yahoo ਜਾਪਾਨ ID..."

 #. *< type
 #. *< ui_requirement
@@ -9285,12 +9266,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"
+msgstr "Yahoo! ਜਾਪਾਨ ਪਰੋਟੋਕਾਲ ਪਲੱਗਇਨ"

 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "ਤੁਹਾਡਾ SMS ਨਹੀਂ ਭੇਜਿਆ ਗਿਆ"

 msgid "Your Yahoo! message did not get sent."
 msgstr "ਤੁਹਾਡਾ Yahoo! ਸੁਨੇਹਾ ਭੇਜਿਆ ਨਹੀਂ ਗਿਆ ਹੈ।"
@@ -9315,30 +9295,27 @@
 msgstr "ਬੱਡੀ ਸ਼ਾਮਿਲ ਕਰਨਾ ਠੁਕਰਾਇਆ"

 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ ਹੈ।"
+msgstr "ਗਲਤ ਡਾਟਾ ਮਿਲਿਆ"

 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"ਅਣਜਾਣੀ ਗਲਤੀ ਨੰਬਰ %d ਹੈ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
+"ਅਕਾਊਂਟ ਲਾਕ ਹੋਇਆ: ਬਹੁਤ ਸਾਰੀਆਂ ਲਾਗਇਨ ਕੋਸ਼ਿਸ਼ ਕਰਕੇ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ "
+"ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"

 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"ਅਣਜਾਣੀ ਗਲਤੀ ਨੰਬਰ %d ਹੈ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"
+"ਅਕਾਊਂਟ ਲਾਕ ਹੋਇਆ: ਅਣਜਾਣ ਕਾਰਨ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"

 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "ਗਲਤ ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ ਜਾਂ ਪਾਸਵਰਡ ਮੌਜੂਦ ਨਹੀਂ"

 #, c-format
 msgid ""
@@ -9371,12 +9348,12 @@
 msgstr ""
 "ਅਣਜਾਣੀ ਗਲਤੀ ਨੰਬਰ %d ਹੈ। Yahoo! ਵੈਬਸਾਇਟ ਉੱਤੇ ਲਾਗਇਨ ਕਰਨ ਨਾਲ ਸਮੱਸਿਆ ਹੱਲ ਹੋ ਸਕਦੀ ਹੈ।"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "ਸੁਨੇਹੀ %s ਨੂੰ ਗਰੁੱਪ %s ਵਿੱਚ ਸਰਵਰ ਲਿਸਟ ਉੱਤੇ ਅਕਾਊਂਟ %s ਲਈ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ ਹੈ।"

-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "ਸਰਵਰ ਲਿਸਟ ਵਿੱਚ ਬੱਡੀ ਸ਼ਾਮਿਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ"

@@ -9384,21 +9361,18 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ ਸੁਣਨਯੋਗ %s/%s/%s.swf ] %s"

-#, fuzzy
 msgid "Received unexpected HTTP response from server"
 msgstr "ਸਰਵਰ ਤੋਂ ਅਚਾਨਕ HTTP ਜਵਾਬ ਮਿਲਿਆ ਹੈ।"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਟੁੱਟ ਗਿਆ ਹੈ:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "%s ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਟੁੱਟ ਗਿਆ ਹੈ: %s"
+
+# , c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"ਸਰਵਰ ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ:\n"
-"%s"
+msgstr "%s ਨਾਲ ਇੱਕ ਕੁਨੈਕਸ਼ਨ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ: %s"

 msgid "Not at Home"
 msgstr "ਘਰੇ ਨਹੀਂ"
@@ -9446,7 +9420,7 @@
 msgstr "ਘੁੱਗੂ ਘਾਂਘੜੇ (ਡੂਡਲ) ਸਟਾਰਟ"

 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "ID ਚੁਣੋ, ਜੋ ਤੁਸੀਂ ਸਰਗਰਮ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ"

 msgid "Join whom in chat?"
 msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਕਿਸ ਨਾਲ ਜੁਆਇੰਨ?"
@@ -9601,7 +9575,6 @@
 msgid "User Rooms"
 msgstr "ਯੂਜਰ ਰੂਮ"

-#, fuzzy
 msgid "Connection problem with the YCHT server"
 msgstr "YCHT ਸਰਵਰ ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਸਮੱਸਿਆ ਹੈ।"

@@ -9727,15 +9700,17 @@
 msgid "Exposure"
 msgstr "Exposure"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "HTTP ਪਰਾਕਸੀ ਤੋਂ ਜਵਾਬ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s\n"
+msgstr "HTTP ਪਰਾਕਸੀ ਤੋਂ ਜਵਾਬ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਮਰੱਥ: %s"

 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP ਪਰਾਕਸੀ ਕੁਨੈਕਸ਼ਨ ਗਲਤੀ %d"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "ਪਹੁੰਚ ਪਾਬੰਦੀ ਹੈ: HTTP ਪਰਾਕਸੀ ਸਰਵਰ ਨੇ ਪੋਰਟ %d ਟਨਲਿੰਗ ਓਹਲੇ ਰੱਖੀ ਹੈ।"

@@ -9981,7 +9956,8 @@
 msgid "Error Reading %s"
 msgstr "%s ਪੜਨ ਦੌਰਾਨ ਗਲਤੀ"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
@@ -10031,8 +10007,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "ਇਹ ਅਕਾਊਂਟ ਲਈ ਇਹ ਬੱਡੀ ਆਈਕਾਨ ਵਰਤੋਂ(_i):"

-msgid "_Advanced"
-msgstr "ਤਕਨੀਕੀ(_A)"
+msgid "Ad_vanced"
+msgstr "ਤਕਨੀਕੀ(_v)"

 msgid "Use GNOME Proxy Settings"
 msgstr "ਗਨੋਮ ਪਰਾਕਸੀ ਸੈਟਿੰਗ ਵਰਤੋਂ"
@@ -10094,9 +10070,8 @@
 msgid "Create _this new account on the server"
 msgstr "ਸਰਵਰ ਉੱਤੇ ਇਹ ਨਵਾਂ ਅਕਾਊਂਟ ਬਣਾਓ(_t)"

-#, fuzzy
-msgid "_Proxy"
-msgstr "ਪਰਾਕਸੀ"
+msgid "P_roxy"
+msgstr "ਪਰਾਕਸੀ(_r)"

 msgid "Enabled"
 msgstr "ਯੋਗ ਕੀਤਾ"
@@ -10144,9 +10119,8 @@
 msgid "Please update the necessary fields."
 msgstr "ਲੋੜੀਦੇ ਖੇਤਰ ਅੱਪਡੇਟ ਕਰੋ ਜੀ।"

-#, fuzzy
 msgid "A_ccount"
-msgstr "ਅਕਾਊਂਟ"
+msgstr "ਅਕਾਊਂਟ(_c)"

 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10171,16 +10145,14 @@
 msgid "I_M"
 msgstr "I_M"

-#, fuzzy
 msgid "_Audio Call"
-msgstr "ਗੱਲਬਾਤ ਸ਼ਾਮਲ(_A)"
+msgstr "ਆਡੀਓ ਕਾਲ(_A)"

 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "ਆਡੀਓ/ਵੀਡਿਓ ਕਾਲ(_V)"
+
 msgid "_Video Call"
-msgstr "ਵੀਡਿਓ ਗੱਲਬਾਤ"
+msgstr "ਵੀਡਿਓ ਕਾਲ(_V)"

 msgid "_Send File..."
 msgstr "ਫਾਇਲ ਭੇਜੋ(_S)..."
@@ -10191,13 +10163,11 @@
 msgid "View _Log"
 msgstr "ਲਾਗ ਵੇਖੋ(_L)"

-#, fuzzy
 msgid "Hide When Offline"
-msgstr "ਜਦੋਂ ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਓਹਲੇ"
-
-#, fuzzy
+msgstr "ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਓਹਲੇ"
+
 msgid "Show When Offline"
-msgstr "ਜਦੋਂ ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਵੇਖੋ"
+msgstr "ਆਫਲਾਇਨ ਹੋਵੇ ਤਾਂ ਵੇਖੋ"

 msgid "_Alias..."
 msgstr "ਏਲੀਆਸ(_A)..."
@@ -10321,9 +10291,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/ਟੂਲ/ਸਰਟੀਫਿਕੇਟ(_C)"

-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/ਟੂਲ/ਸਮਾਈਲੀ(_y)"
+msgstr "/ਟੂਲ/ਕਸਟਮ ਸਮਾਈਲੀ(_y)"

 msgid "/Tools/Plu_gins"
 msgstr "/ਟੂਲ/ਪਲੱਗਇਨ(_G)"
@@ -10452,7 +10421,7 @@
 msgstr "ਅਕਾਰ"

 msgid "By recent log activity"
-msgstr ""
+msgstr "ਤਾਜ਼ਾ ਲਾਗ ਸਰਗਰਮੀ ਰਾਹੀਂ"

 #, c-format
 msgid "%s disconnected"
@@ -10469,7 +10438,7 @@
 msgstr "ਮੁੜ-ਚਾਲੂ"

 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL ਸਵਾਲ-ਜਵਾਬ"

 msgid "Welcome back!"
 msgstr "ਫੇਰ ਜੀ ਆਇਆਂ ਨੂੰ!"
@@ -10596,107 +10565,93 @@
 msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ"

 msgid "The background color for the buddy list"
-msgstr ""
-
-#, fuzzy
+msgstr "ਬੱਡੀ ਲਿਸਟ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
 msgid "Layout"
-msgstr "ਲਾਓ"
+msgstr "ਲੇਆਉਟ"

 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "ਬੱਡੀਲਿਸਟ ਲਈ ਆਈਕਾਨ, ਨਾਂ ਅਤੇ ਹਾਲਤ ਦਾ ਲੇਆਉਟ"

 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+msgstr "ਫੈਲਾਉਣ ਸਮੇਂ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"

 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "ਫੈਲੇ ਗਰੁੱਪ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
 msgid "Expanded Text"
-msgstr "ਫੈਲਾਓ(_E)"
+msgstr "ਫੈਲਾਉਣ ਟੈਕਸਟ"

 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "ਜਦੋਂ ਗਰੁੱਪ ਫੈਲਿਆ ਹੋਵੇ ਲਈ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
 msgid "Collapsed Background Color"
-msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ ਚੁਣੋ"
+msgstr "ਸਮੇਟਣ ਸਮੇਂ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"

 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "ਸਮੇਟੇ ਗਰੁੱਪ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
 msgid "Collapsed Text"
-msgstr "ਸਮੇਟੋ(_C)"
+msgstr "ਸਮੇਟਣ ਟੈਕਸਟ"

 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "ਜਦੋਂ ਗਰੁੱਪ ਸਮੇਟਿਆ ਹੋਵੇ ਤਾਂ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"

 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "ਬੈਕਗਰਾਊਂਡ ਰੰਗ ਚੁਣੋ"
+msgstr "ਸੰਪਰਕ/ਗੱਲਬਾਤ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"

 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "ਸੰਪਰਕ ਜਾਂ ਗੱਲਬਾਤ ਲਈ ਬੈਕਗਰਾਊਂਡ ਰੰਗ"
+
 msgid "Contact Text"
-msgstr "ਸ਼ਾਰਟਕੱਟ"
+msgstr "ਸੰਪਰਕ ਟੈਕਸਟ"

 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "ਜਦੋਂ ਸੰਪਰਕ ਫੈਲਿਆ ਹੋਵੇ ਤਾਂ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
 msgid "On-line Text"
-msgstr "ਆਨਲਾਈਨ"
+msgstr "ਆਨਲਾਈਨ ਟੈਕਸਟ"

 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "ਜਦੋਂ ਬੱਡੀ ਆਨਲਾਈਨ ਹੋਵੇ ਤਾਂ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
 msgid "Away Text"
-msgstr "ਦੂਰ"
+msgstr "ਦੂਰ ਟੈਕਸਟ"

 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "ਜਦੋਂ ਬੱਡੀ ਦੂਰ ਹੋਵੇ ਤਾਂ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
 msgid "Off-line Text"
-msgstr "ਆਫਲਾਈਨ"
+msgstr "ਆਫਲਾਈਨ ਟੈਕਸਟ"

 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "ਜਦੋਂ ਬੱਡੀ ਆਫਲਾਈਨ ਹੋਵੇ ਲਈ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
 msgid "Idle Text"
-msgstr "ਮੂਡ ਟੈਕਸਟ"
+msgstr "ਵੇਹਲਾ/ਵੇਹਲੀ ਟੈਕਸਟ"

 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "ਜਦੋਂ ਬੱਡੀ ਵੇਹਲਾ ਹੋਵੇ ਤਾਂ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
 msgid "Message Text"
-msgstr "ਸੁਨੇਹਾ ਭੇਜਿਆ"
+msgstr "ਸੁਨੇਹਾ ਟੈਕਸਟ"

 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "ਜਦੋਂ ਬੱਡੀ ਦੇ ਨਾ-ਪੜ੍ਹਿਆ ਸੁਨੇਹਾ ਹੋਵੇ ਲਈ ਟੈਕਸਟ ਜਾਣਕਾਰੀ "

 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "ਸੁਨੇਹਾ (ਨਾਂ ਕਿਹਾ) ਟੈਕਸਟ"

 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
-
-#, fuzzy
+msgstr "ਟੈਕਸਟ ਜਾਣਕਾਰੀ, ਜਦੋਂ ਕਿ ਗੱਲਬਾਤ ਵਿੱਚ ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਹੋਣ, ਜਿੰਨ੍ਹਾਂ ਵਿੱਚ ਤੁਹਾਡਾ ਨਾਂ ਹੋਵੇ"
+
 msgid "The text information for a buddy's status"
-msgstr "%s ਲਈ ਯੂਜ਼ਰ ਸੁਨੇਹਾ ਤਬਦੀਲ"
-
-#, fuzzy
+msgstr "ਬੱਡੀ ਦੀ ਹਾਲਤ ਬਾਰੇ ਟੈਕਸਟ ਜਾਣਕਾਰੀ"
+
 msgid "Type the host name for this certificate."
 msgstr "ਇਹ ਸਰਟੀਫਿਕੇਟ ਲਈ ਹੋਸਟ ਨਾਂ ਦਿਓ"

@@ -10745,7 +10700,6 @@
 msgid "Get Away Message"
 msgstr "ਦੂਰ ਸੁਨੇਹਾ ਲਵੋ"

-#, fuzzy
 msgid "Last Said"
 msgstr "ਆਖਰੀ ਵਾਰ ਕਿਹਾ"

@@ -10792,21 +10746,17 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/ਗੱਲਬਾਤ/ਸਕਰੋਲ-ਬੈਕ ਸਾਫ਼ ਕਰੋ(_r)"

-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/ਗੱਲਬਾਤ/ਹੋਰ(_o)"
-
-#, fuzzy
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ(_e)"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/ਗੱਲਬਾਤ/ਹੋਰ(_o)"
-
-#, fuzzy
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ ਕਾਲ(_A)"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/ਗੱਲਬਾਤ/ਹੋਰ(_o)"
-
-#, fuzzy
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਵੀਡਿਓ ਕਾਲ(_V)"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/ਗੱਲਬਾਤ/ਲਾਗ ਵੇਖੋ(_L)"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ\\/ਵੀਡਿਓ ਕਾਲ(_C)"

 msgid "/Conversation/Se_nd File..."
 msgstr "/ਗੱਲਬਾਤ/ਫਾਇਲ ਭੇਜੋ(_n)..."
@@ -10880,17 +10830,14 @@
 msgid "/Conversation/View Log"
 msgstr "/ਗੱਲਬਾਤ/ਲਾਗ ਵੇਖੋ"

-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/ਗੱਲਬਾਤ/ਹੋਰ"
-
-#, fuzzy
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ ਕਾਲ"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/ਗੱਲਬਾਤ/ਲਾਗ ਵੇਖੋ"
-
-#, fuzzy
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਵੀਡਿਓ ਕਾਲ"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/ਗੱਲਬਾਤ/ਹੋਰ"
+msgstr "/ਗੱਲਬਾਤ/ਮੀਡਿਆ/ਆਡੀਓ\\/ਵੀਡਿਓ ਕਾਲ"

 msgid "/Conversation/Send File..."
 msgstr "/ਗੱਲਬਾਤ/ਫਾਇਲ ਭੇਜੋ..."
@@ -11075,7 +11022,7 @@
 msgstr "ਕਾ-ਹਿੰਗ ਚੀਉਂਗ"

 msgid "voice and video"
-msgstr ""
+msgstr "ਆਵਾਜ਼ ਅਤੇ ਵੀਡਿਓ"

 msgid "support"
 msgstr "ਸਹਿਯੋਗ"
@@ -11201,9 +11148,8 @@
 msgid "Hungarian"
 msgstr "ਹੰਗਰੀਆਈ"

-#, fuzzy
 msgid "Armenian"
-msgstr "ਰੋਮਾਨੀਆਈ"
+msgstr "ਅਰਮੀਨੀਆਈ"

 msgid "Indonesian"
 msgstr "ਇੰਡੋਨੇਸ਼ੀਆਈ"
@@ -11220,9 +11166,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "ਉਬਤੂੰ ਜਾਰਜੀਆਈ ਅਨੁਵਾਦਕ"

-#, fuzzy
 msgid "Khmer"
-msgstr "ਹੋਰ"
+msgstr "ਖਮੀਰ"

 msgid "Kannada"
 msgstr "ਕੰਨੜ"
@@ -11303,7 +11248,7 @@
 msgstr "ਸਵੀਡਸ਼"

 msgid "Swahili"
-msgstr ""
+msgstr "ਸਵਾਹੀਲੀ"

 msgid "Tamil"
 msgstr "ਤਾਮਿਲ"
@@ -11613,7 +11558,7 @@
 msgstr "ਮੁੜ-ਪ੍ਰਾਪਤ(_R)"

 msgid "Paste as Plain _Text"
-msgstr "ਸਧਾਰਨ ਪਾਠ ਵਾਂਗ ਚੇਪੋ(_T)"
+msgstr "ਪਲੇਨ ਟੈਕਸਟ ਵਾਂਗ ਚੇਪੋ(_T)"

 msgid "_Reset formatting"
 msgstr "ਫਾਰਮੈਟਿੰਗ ਮੁੜ-ਸੈੱਟ ਕਰੋ(_R)"
@@ -11630,7 +11575,6 @@
 msgid "Hyperlink visited color"
 msgstr "ਖੋਲ੍ਹੋ ਹਾਈਪਰਲਿੰਕ ਰੰਗ"

-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "ਹਾਈਪਰਲਿੰਕ ਖੋਲ੍ਹਣ ਤੋਂ ਬਾਅਦ ਵਰਤਣ ਲਈ ਰੰਗ (ਜਾਂ ਐਕਟੀਵੇਟ ਹੋਣ ਤੋਂ ਬਾਅਦ)"

@@ -11667,23 +11611,20 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr "ਘੁਸਰ-ਮੁਸਰ ਸੁਨੇਹੇ ਲਈ ਐਕਟਿਵ ਸੁਨੇਹਾ ਨਾਂ ਰੰਗ"

-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "ਇੱਕ ਕਾਰਵਾਈ ਸੁਨੇਹੇ ਲਈ ਨਾਂ ਲਿਖਣ ਲਈ ਰੰਗ ਹੈ।"
+msgstr "ਘੁਸਰ-ਮੁਸਰ ਕਾਰਵਾਈ ਸੁਨੇਹੇ ਲਈ ਨਾਂ ਲਿਖਣ ਲਈ ਰੰਗ ਹੈ।"

 msgid "Whisper Message Name Color"
 msgstr "ਘੁਸਰ-ਮੁਸਰ ਸੁਨੇਹਾ ਨਾਂ ਰੰਗ"

-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "ਇੱਕ ਕਾਰਵਾਈ ਸੁਨੇਹੇ ਲਈ ਨਾਂ ਲਿਖਣ ਲਈ ਰੰਗ ਹੈ।"
+msgstr "ਘੁਸਰ-ਮੁਸਰ ਸੁਨੇਹੇ ਲਈ ਨਾਂ ਲਿਖਣ ਲਈ ਰੰਗ ਹੈ।"

 msgid "Typing notification color"
 msgstr "ਟਾਈਪ ਕਰਨ ਸੂਚਨਾ ਰੰਗ"

-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "ਟਾਈਪ ਕਰਨ ਸੂਚਨਾ ਲਈ ਫੋਂਟ ਵਾਸਤੇ ਵਰਤਣ ਲਈ ਰੰਗ"
+msgstr "ਨੋਟੀਫਿਕੇਸ਼ਨ ਲਿਖਣ ਲਈ ਫੋਂਟ ਵਾਸਤੇ ਵਰਤਣ ਲਈ ਰੰਗ"

 msgid "Typing notification font"
 msgstr "ਟਾਈਪ ਕਰਨ ਸੂਚਨਾ ਫੋਂਟ"
@@ -11927,7 +11868,8 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s। ਹੋਰ ਜਾਣਕਾਰੀ ਲਈ `%s -h' ਵੇਖੋ।\n"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -11949,6 +11891,7 @@
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -11958,7 +11901,8 @@
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -11975,10 +11919,11 @@
 "  -v, --version       display the current version and exit\n"
 msgstr ""
 "%s %s\n"
-"ਵਰਤੋਂ: %s [OPTION]...\n"
+"Usage: %s [OPTION]...\n"
 "\n"
 "  -c, --config=DIR    use DIR for config files\n"
 "  -d, --debug         print debugging messages to stdout\n"
+"  -f, --force-online  force online, regardless of network status\n"
 "  -h, --help          display this help and exit\n"
 "  -m, --multiple      do not ensure single instance\n"
 "  -n, --nologin       don't automatically login\n"
@@ -12025,22 +11970,21 @@
 msgstr "ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਕਿਉਂਕਿ ਇੱਕ ਹੋਰ libpurple ਕਲਾਇਟ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ।\n"

 msgid "/_Media"
-msgstr ""
+msgstr "/ਮੀਡਿਆ(_M)"

 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/ਮੀਡਿਆ/ਹੈਂਗਅੱਪ(_H)"
+
 msgid "Calling..."
-msgstr "ਗਿਣਤੀ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
+msgstr "ਕਾਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."

 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਆਡੀਓ/ਵੀਡਿਓ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ।"

 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s ਤੁਹਾਡੇ ਨਾਲ ਵੀਡਿਓ ਸ਼ੈਸ਼ਨ ਸ਼ੁਰੂ ਕਰਨਾ ਚਾਹੁੰਦਾ/ਚਾਹੁੰਦੀ ਹੈ।"

 #, c-format
 msgid "%s has %d new message."
@@ -12069,9 +12013,8 @@
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "'ਦਸਤੀ' ਝਲਕਾਰਾ ਕਮਾਂਡ ਚੁਣੀ ਗਈ ਹੈ, ਪਰ ਕੋਈ ਕਮਾਂਡ ਨਹੀਂ ਦਿੱਤੀ ਗਈ ਹੈ।"

-#, fuzzy
 msgid "No message"
-msgstr "ਅਣਜਾਣ ਸੁਨੇਹਾ"
+msgstr "ਸੁਨੇਹਾ ਨਹੀਂ"

 msgid "Open All Messages"
 msgstr "ਸਭ ਸੁਨੇਹੇ ਖੋਲ੍ਹੋ"
@@ -12079,16 +12022,14 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">ਤੁਹਾਨੂੰ ਚਿੱਠੀ ਆਈ ਹੈ!</span>"

-#, fuzzy
 msgid "New Pounces"
-msgstr "ਨਵਾਂ ਪਉਨਸ ਬੱਡੀ"
+msgstr "ਨਵਾਂ ਪਉਨਸ"

 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "ਅਣਡਿੱਠਾ"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">ਤੁਹਾਨੂੰ ਚਿੱਠੀ ਆਈ ਹੈ!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">ਤੁਹਾਨੂੰ ਪਉਨਸ ਕੀਤਾ ਗਿਆ!</span>"

 msgid "The following plugins will be unloaded."
 msgstr "ਹੇਠ ਦਿੱਤੀਆਂ ਪਲੱਗਇਨਾਂ ਨੂੰ ਅਣ-ਲੋਡ ਕੀਤਾ ਜਾਵੇਗਾ।"
@@ -12137,7 +12078,6 @@
 msgid "Select a file"
 msgstr "ਇੱਕ ਫਾਇਲ ਚੁਣੋ"

-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "ਬੱਡੀ ਪਉਨਸ ਸੋਧ"

@@ -12214,61 +12154,69 @@
 msgid "Pounce Target"
 msgstr "ਪਉਨਸ ਟਾਰਗੇਟ"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Started typing"
-msgstr "ਲਿਖਣਾ ਸ਼ੁਰੂ ਕਰੇ"
-
-#, fuzzy, c-format
+msgstr "ਲਿਖਣਾ ਸ਼ੁਰੂ ਕੀਤਾ"
+
+# , c-format
+#, c-format
 msgid "Paused while typing"
 msgstr "ਲਿਖਣ ਦੌਰਾਨ ਵਿਰਾਮ"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Signed on"
-msgstr "ਸਾਇਨ ਆਨ"
-
-#, fuzzy, c-format
+msgstr "ਸਾਇਨ ਆਨ ਕੀਤਾ"
+
+# , c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s ਵੇਹਲਾ (%s) ਤੋਂ ਵਾਪਸ ਆਇਆ ਹੈ"
-
-#, fuzzy, c-format
+msgstr "ਵੇਹਲੇ ਤੋਂ ਵਾਪਸ ਆਇਆ/ਆਈ"
+
+# , c-format
+#, c-format
 msgid "Returned from being away"
-msgstr "ਦੂਰੋਂ ਵਾਪਸ ਆਏ"
-
-#, fuzzy, c-format
+msgstr "ਦੂਰੋਂ ਵਾਪਸ"
+
+# , c-format
+#, c-format
 msgid "Stopped typing"
-msgstr "ਲਿਖਣ ਤੋਂ ਰੁਕਿਆ/ਰੁਕੀ"
-
-#, fuzzy, c-format
+msgstr "ਲਿਖਦਾ/ਲਿਖਦੀ ਰੁਕੀ"
+
+# , c-format
+#, c-format
 msgid "Signed off"
 msgstr "ਸਾਇਨ ਆਫ਼"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Became idle"
-msgstr "ਵੇਹਲੇ ਬਣੇ"
-
-#, fuzzy, c-format
+msgstr "ਵੇਹਲੇ ਬਣੋ"
+
+# , c-format
+#, c-format
 msgid "Went away"
-msgstr "ਜਦੋਂ ਦੂਰ"
-
-#, fuzzy, c-format
+msgstr "ਦੂਰ ਗਿਆ/ਗਈ"
+
+# , c-format
+#, c-format
 msgid "Sent a message"
-msgstr "ਇੱਕ ਸੁਨੇਹਾ ਭੇਜੋ"
-
-#, fuzzy, c-format
+msgstr "ਸੁਨੇਹਾ ਭੇਜੋ"
+
+# , c-format
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "ਅਣਜਾਣ ਪਉਨਸ ਘਟਨਾ ਹੈ। ਸੂਚਨਾ ਦਿਓ ਜੀ!"
-
-#, fuzzy
+msgstr "ਅਣਜਾਣ... ਇਸ ਬਾਰੇ ਰਿਪੋਰਟ ਕਰੋ ਜੀ!"
+
 msgid "Theme failed to unpack."
-msgstr "ਸਮਾਇਲੀ ਥੀਮ ਅਣ-ਪੈਕ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
-
-#, fuzzy
+msgstr "ਥੀਮ ਖੋਲ੍ਹਣ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
 msgid "Theme failed to load."
-msgstr "ਸਮਾਇਲੀ ਥੀਮ ਅਣ-ਪੈਕ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
-
-#, fuzzy
+msgstr "ਥੀਮ ਲੋਡ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+
 msgid "Theme failed to copy."
-msgstr "ਸਮਾਇਲੀ ਥੀਮ ਅਣ-ਪੈਕ ਕਰਨ ਲਈ ਫੇਲ੍ਹ ਹੈ।"
+msgstr "ਥੀਮ ਕਾਪੀ ਕਰਨ ਲਈ ਫੇਲ੍ਹ"

 msgid "Install Theme"
 msgstr "ਥੀਮ ਇੰਸਟਾਲ ਕਰੋ"
@@ -12290,9 +12238,8 @@
 msgstr "ਈਸਕੇਸ (Esc) ਸਵਿੱਚ ਨਾਲ ਗੱਲਾਬਾਤਾਂ ਬੰਦ ਕਰੋ(_o)"

 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "ਬੱਡੀ ਲਿਸਟ"
+msgstr "ਬੱਡੀ ਲਿਸਟ ਥੀਮ"

 #. System Tray
 msgid "System Tray Icon"
@@ -12304,9 +12251,8 @@
 msgid "On unread messages"
 msgstr "ਨਾ-ਪੜ੍ਹੇ ਸੁਨੇਹੇ ਉੱਤੇ"

-#, fuzzy
 msgid "Conversation Window"
-msgstr "IM ਗੱਲਬਾਤ ਵਿੰਡੋ"
+msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ"

 msgid "_Hide new IM conversations:"
 msgstr "ਨਵੀਆਂ IM ਗੱਲਬਾਤਾਂ ਓਹਲੇ(_H):"
@@ -12409,9 +12355,10 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">ਜਿਵੇਂ: stunserver.org</span>"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "ਆਟੋ-ਖੋਜਿਆ IP ਐਡਰੈੱਸ(_A)"
+msgstr "ਆਟੋ-ਖੋਜਿਆ IP ਐਡਰੈੱਸ ਵਰਤੋਂ(_A): %s"

 msgid "Public _IP:"
 msgstr "ਪਬਲਿਕ _IP:"
@@ -12433,7 +12380,7 @@

 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "ਰੀਲੇਅ ਸਰਵਰ (TURN)"

 msgid "Proxy Server &amp; Browser"
 msgstr "ਪਰਾਕਸੀ ਸਰਵਰ &amp; ਬਰਾਊਜ਼ਰ"
@@ -12778,10 +12725,11 @@
 msgid "Status for %s"
 msgstr "%s ਲਈ ਹਾਲਤ"

-#, fuzzy, c-format
+# , c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr "ਚੁਣੇ ਸ਼ਾਰਟਕੱਟ ਲਈ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਕਸਟਮ ਸਮਾਈਲੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰੇ ਸ਼ਾਰਟਕੱਟ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
+msgstr "'%s' ਲਈ ਪਹਿਲਾਂ ਹੀ ਇੱਕ ਕਸਟਮ ਸਮਾਈਲੀ ਮੌਜੂਦ ਹੈ। ਵੱਖਰੇ ਸ਼ਾਰਟਕੱਟ ਨਾਲ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"

 msgid "Custom Smiley"
 msgstr "ਪਸੰਦੀਦਾ ਸਮਾਈਲੀ"
@@ -12795,28 +12743,24 @@
 msgid "Add Smiley"
 msgstr "ਸਮਾਈਲੀ ਸ਼ਾਮਲ"

-#, fuzzy
 msgid "_Image:"
-msgstr "ਚਿੱਤਰ(_I)"
+msgstr "ਚਿੱਤਰ(_I):"

 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "ਸ਼ਾਰਟਕੱਟ"
+msgstr "ਸ਼ਾਰਟਕੱਟ ਟੈਕਸਟ(_h):"

 msgid "Smiley"
 msgstr "ਸਮਾਈਲੀ"

-#, fuzzy
 msgid "Shortcut Text"
-msgstr "ਸ਼ਾਰਟਕੱਟ"
+msgstr "ਸ਼ਾਰਟਕੱਟ ਟੈਕਸਟ"

 msgid "Custom Smiley Manager"
 msgstr "ਪਸੰਦੀਦਾ ਸਮਾਈਲੀ ਮੈਨੇਜਰ"

-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "ਬੱਡੀ ਚੁਣੋ"
+msgstr "ਬੱਡੀ ਆਈਕਾਨ ਚੁਣੋ"

 msgid "Click to change your buddyicon for this account."
 msgstr "ਇਸ ਅਕਾਊਂਟ ਲਈ ਆਪਣਾ ਬੱਡੀ-ਆਈਕਾਨ ਬਦਲਣ ਲਈ ਕਲਿੱਕ ਕਰੋ।"
@@ -12899,7 +12843,6 @@
 msgid "Cannot send launcher"
 msgstr "ਲਾਂਚਰ ਭੇਜਿਆ ਨਹੀਂ ਜਾ ਸਕਦਾ"

-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -12937,9 +12880,8 @@
 msgstr ""
 "ਚਿੱਤਰ '%s' ਲੋਡ ਕਰਨ ਵਿੱਚ ਅਸਫਲ: ਕਾਰਨ ਜਾਣਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਸੰਭਵ ਤੌਰ ਤੇ ਫਾਇਲ ਨਿਕਾਰਾ ਹੈ"

-#, fuzzy
 msgid "_Open Link"
-msgstr "ਸਬੰਧ ਖੋਲੋ(_O):"
+msgstr "ਲਿੰਕ ਖੋਲ੍ਹੋ(_O)"

 msgid "_Copy Link Location"
 msgstr "ਸੰਬੰਧ ਸਥਿਤੀ ਦੀ ਨਕਲ(_C)"
@@ -12947,9 +12889,21 @@
 msgid "_Copy Email Address"
 msgstr "ਈਮੇਲ ਐਡਰੈੱਸ ਨਕਲ(_C)"

+msgid "_Open File"
+msgstr "ਫਾਇਲ ਖੋਲ੍ਹੋ(_O)"
+
+msgid "Open _Containing Directory"
+msgstr "ਲਾਗ ਰੱਖਣ ਵਾਲੀ ਡਾਇਰੈਕਟਰੀ ਖੋਲ੍ਹੋ(_C)"
+
 msgid "Save File"
 msgstr "ਫਾਇਲ ਸੰਭਾਲੋ"

+msgid "_Play Sound"
+msgstr "ਸਾਊਂਡ ਚਲਾਓ(_P)"
+
+msgid "_Save File"
+msgstr "ਫਾਇਲ ਸੰਭਾਲੋ(_S)"
+
 msgid "Select color"
 msgstr "ਰੰਗ ਚੁਣੋ"

@@ -13037,77 +12991,63 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "ਆਪਣੀ ਬੱਡੀ ਦੀ ਉਪਲੱਬਧਤਾ ਲਈ ਅੰਕੜੇ ਵੇਖੋ।"

-#, fuzzy
 msgid "Server name request"
-msgstr "ਸਰਵਰ ਐਡਰੈੱਸ"
-
-#, fuzzy
+msgstr "ਸਰਵਰ ਨਾਂ ਮੰਗ"
+
 msgid "Enter an XMPP Server"
-msgstr "ਇੱਕ ਕਾਨਫਰੰਸ ਸਰਵਰ 'ਚ ਦਾਖਲ ਹੋਵੇ"
-
-#, fuzzy
+msgstr "XMPP ਸਰਵਰ ਦਿਓ"
+
 msgid "Select an XMPP server to query"
-msgstr "ਕਿਊਰੀ ਲਈ ਇੱਕ ਕਾਨਫਰੰਸ ਸਰਵਰ ਚੁਣੋ"
-
-#, fuzzy
+msgstr "ਕਿਊਰੀ ਲਈ XMPP ਸਰਵਰ ਚੁਣੋ"
+
 msgid "Find Services"
-msgstr "ਆਨਲਾਈਨ ਸਰਵਿਸਾਂ"
-
-#, fuzzy
+msgstr "ਸਰਵਿਸਾਂ ਲੱਭੋ"
+
 msgid "Add to Buddy List"
-msgstr "ਬੱਡੀ ਲਿਸਟ ਭੇਜੋ"
-
-#, fuzzy
+msgstr "ਬੱਡੀ ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਲ"
+
 msgid "Gateway"
-msgstr "ਦੂਰ ਗਏ"
-
-#, fuzzy
+msgstr "ਗੇਟਵੇ"
+
 msgid "Directory"
-msgstr "ਲਾਗ ਡਾਇਰੈਕਟਰੀ"
-
-#, fuzzy
+msgstr "ਡਾਇਰੈਕਟਰੀ"
+
 msgid "PubSub Collection"
-msgstr "ਆਵਾਜ਼ ਚੋਣ"
-
-#, fuzzy
+msgstr "PubSub ਭੰਡਾਰ"
+
 msgid "PubSub Leaf"
-msgstr "PubSub ਸਰਵਿਸ"
-
-#, fuzzy
+msgstr "PubSub ਭਾਗ"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "ਵੇਰਵਾ"
+msgstr ""
+"\n"
+"<b>ਵੇਰਵਾ:</b> "

 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "ਸਰਵਿਸ ਡਾਇਰੈਕਟਰੀ ਜਾਣਕਾਰੀ"
-
-#, fuzzy
+msgstr "ਸਰਵਿਸ ਖੋਜ"
+
 msgid "_Browse"
-msgstr "ਝਲਕਾਰਾ(_B):"
-
-#, fuzzy
+msgstr "ਬਰਾਊਜ਼ਰ(_B)"
+
 msgid "Server does not exist"
-msgstr "ਯੂਜ਼ਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
-
-#, fuzzy
+msgstr "ਸਰਵਰ ਮੌਜੂਦ ਨਹੀਂ ਹੈ"
+
 msgid "Server does not support service discovery"
-msgstr "ਸਰਵਰ ਪਾਬੰਦੀ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ"
-
-#, fuzzy
+msgstr "ਸਰਵਰ ਸਰਵਿਸ ਖੋਜ ਲਈ ਸਹਾਇਕ ਨਹੀਂ"
+
 msgid "XMPP Service Discovery"
-msgstr "ਸਰਵਿਸ ਡਾਇਰੈਕਟਰੀ ਜਾਣਕਾਰੀ"
+msgstr "XMPP ਸਰਵਿਸ ਖੋਜ"

 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "ਬਰਾਊਜ਼ਿੰਗ ਅਤੇ ਰਜਿਟਰ ਕਰਨ ਲਈ ਸਰਵਿਸਾਂ ਲਈ ਮਨਜ਼ੂਰ।"
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ ਡੀਬੱਗ ਲਈ ਫਾਇਦੇਮੰਦ ਹੈ।"
+msgstr "ਇਹ ਪਲੱਗਇਨ ਪੁਰਾਤਨ ਟਰਾਂਸਪੋਰਟ ਜਾਂ XMPP ਸਰਵਿਸ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਫਾਇਦੇਮੰਦ ਹੈ।"

 msgid "Buddy is idle"
 msgstr "ਬੱਡੀ ਵੇਹਲਾ ਹੈ"
@@ -13484,7 +13424,6 @@
 msgstr "ਸਾਂਝੀ ਕੰਪੋਜ਼ੀਸ਼ਨ ਵਾਸਤੇ ਸੰਗੀਤ ਸੁਨੇਹਾ ਪਲੱਗਇਨ ਹੈ।"

 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -13608,9 +13547,8 @@
 msgid "Highlighted Message Name Color"
 msgstr "ਹਾਈਲਾਈਟ ਕੀਤਾ ਸੁਨੇਹਾ ਨਾਂ ਰੰਗ"

-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "ਟਾਈਪ ਕਰਨ ਸੂਚਨਾ ਰੰਗ"
+msgstr "ਲਿਖਣ ਨੋਟੀਫਿਕੇਸ਼ਨ ਰੰਗ"

 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView ਹਰੀਜ਼ਟਲ ਵੱਖਰੇਵਾ"
@@ -13641,23 +13579,20 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ ਪਾਠ ਸ਼ਾਰਟਕੱਟ ਥੀਮ"

-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "ਟਾਈਪ ਕਰਨ ਦੀ ਸੂਚਨਾ ਚਾਲੂ"
-
-#, fuzzy
+msgstr "ਲਿਖਣ ਨੋਟੀਫਿਕੇਸ਼ਨ ਟੈਕਸਟ ਆਯੋਗ"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "ਪਿਡਗਿਨ GTK+ ਸਰੂਪ ਕੰਟਰੋਲ"
-
-#, fuzzy
+msgstr "GTK+ ਥੀਮ ਕੰਟਰੋਲ ਸੈਟਿੰਗ"
+
 msgid "Colors"
-msgstr "ਬੰਦ ਕਰੋ"
+msgstr "ਰੰਗ"

 msgid "Fonts"
 msgstr "ਫੋਂਟ"

 msgid "Miscellaneous"
-msgstr ""
+msgstr "ਫੁਟਕਲ"

 msgid "Gtkrc File Tools"
 msgstr "Gtkrc ਫਾਇਲ ਟੂਲ"
@@ -13739,7 +13674,6 @@
 msgstr "ਗੱਲਬਾਤ ਵਿੰਡੋ ਭੇਜੋ ਬਟਨ ਹੈ।"

 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -13795,94 +13729,78 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "ਯੂਜ਼ਰ ਰਾਹੀਂ ਪ੍ਰਭਾਸ਼ਿਤ ਨਿਯਮਾਂ ਮੁਤਾਬਕ ਭੇਜੇ ਜਾਣ ਵਾਲੇ ਸੁਨੇਹੇ ਤਬਦੀਲ ਕਰੋ।"

-#, fuzzy
 msgid "Just logged in"
-msgstr "ਲਾਗਇਨ ਨਹੀਂ ਹੈ"
-
-#, fuzzy
+msgstr "ਹਾਲ ਲਾਗਇਨ ਹੀ ਕੀਤਾ ਹੈ"
+
 msgid "Just logged out"
-msgstr "ਲਾਗਇਨ ਨਹੀਂ ਹੈ"
+msgstr "ਹੁਣੇ ਲਾਗ ਆਉਟ ਕੀਤਾ"

 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"ਸੰਪਰਕ ਲਈ ਆਈਕਾਨ/\n"
+"ਅਣਜਾਣ ਵਿਅਕਤੀ ਲਈ ਆਈਕਾਨ"
+
 msgid "Icon for Chat"
-msgstr "ਗੱਲਬਾਤ ਵਿੱਚ ਸ਼ਾਮਿਲ"
-
-#, fuzzy
+msgstr "ਗੱਲਬਾਤ ਲਈ ਆਈਕਾਨ"
+
 msgid "Ignored"
 msgstr "ਅਣਡਿੱਠਾ"

-#, fuzzy
 msgid "Founder"
-msgstr "ਹੋਰ ਉੱਚੀ"
-
-#, fuzzy
+msgstr "ਖੋਜੀ"
+
 msgid "Operator"
-msgstr "Opera"
+msgstr "ਓਪਰੇਟਰ"

 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "ਅੱਧਾ ਓਪਰੇਟਰ"
+
 msgid "Authorization dialog"
-msgstr "ਪ੍ਰਮਾਣਿਕਤਾ ਦਿੱਤੀ"
-
-#, fuzzy
+msgstr "ਪਰਮਾਣਕਿਤਾ ਡਾਈਲਾਗ"
+
 msgid "Error dialog"
-msgstr "ਗਲਤੀ "
-
-#, fuzzy
+msgstr "ਗਲਤੀ ਡਾਈਲਾਗ"
+
 msgid "Information dialog"
-msgstr "ਜਾਣਕਾਰੀ"
+msgstr "ਜਾਣਕਾਰੀ ਡਾਈਲਾਗ"

 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "ਮੇਲ ਡਾਈਲਾਗ"
+
 msgid "Question dialog"
-msgstr "ਮੰਗ ਡਾਈਲਾਗ"
-
-#, fuzzy
+msgstr "ਸਵਾਲ ਡਾਈਲਾਗ"
+
 msgid "Warning dialog"
-msgstr "ਚੇਤਾਵਨੀ ਪੱਧਰ"
+msgstr "ਚੇਤਾਵਨੀ ਡਾਈਲਾਗ"

 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "ਇਹ ਡਾਈਲਾਗ ਕਿਸ ਕਿਸਮ ਦਾ ਹੈ?"
+
 msgid "Status Icons"
-msgstr "%s ਲਈ ਹਾਲਤ"
-
-#, fuzzy
+msgstr "ਹਾਲਤ ਆਈਕਾਨ"
+
 msgid "Chatroom Emblems"
-msgstr "ਚੈਟ ਰੂਮ ਭਾਸ਼ਾ"
-
-#, fuzzy
+msgstr "ਗੱਲਬਾਤ-ਰੂਮ ਨਿਸ਼ਾਨ"
+
 msgid "Dialog Icons"
-msgstr "ਆਈਕਾਨ ਬਦਲੋ"
-
-#, fuzzy
+msgstr "ਡਾਈਲਾਗ ਆਈਕਾਨ"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "ਪਿਡਗਿਨ GTK+ ਸਰੂਪ ਕੰਟਰੋਲ"
-
-#, fuzzy
+msgstr "ਪਿਡਗਿਨ ਆਈਕਾਨ ਥੀਮ ਐਡੀਟਰ"
+
 msgid "Contact"
-msgstr "ਸੰਪਰਕ ਜਾਣਕਾਰੀ"
-
-#, fuzzy
+msgstr "ਸੰਪਰਕ"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "ਬੱਡੀ ਲਿਸਟ"
-
-#, fuzzy
+msgstr "ਪਿਡਗਿਨ ਬੱਡੀਲਿਸਟ ਥੀਮ ਐਡੀਟਰ"
+
 msgid "Edit Buddylist Theme"
-msgstr "ਬੱਡੀ ਲਿਸਟ"
+msgstr "ਬੱਡੀ-ਲਿਸਟ ਥੀਮ ਸੋਧ"

 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "ਆਈਕਾਨ ਥੀਮ ਸੋਧ"

 #. *< type
 #. *< ui_requirement
@@ -13891,16 +13809,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "ਪਿਡਗਿਨ GTK+ ਸਰੂਪ ਕੰਟਰੋਲ"
+msgstr "ਪਲੱਗਇਨ ਥੀਮ ਐਡੀਟਰ"

 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "ਪਿਡਗਿਨ GTK+ ਸਰੂਪ ਕੰਟਰੋਲ"
+msgstr "ਪਿਡਗਿਨ ਥੀਮ ਐਡੀਟਰ।"

 #. *< type
 #. *< ui_requirement
@@ -14066,10 +13982,9 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "ਵਿੰਡੋ ਲਈ ਪਿਡਗਿਨ ਖਾਸ ਚੋਣਾਂ"

-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr "ਵਿੰਡੋ ਲਈ ਪਿਡਗਿਨ ਲਈ ਖਾਸ ਚੋਣ ਹੈ, ਜਿਵੇਂ ਕਿ ਬੱਡੀ ਲਿਸਟ ਡੌਕਿੰਗ।"
+msgstr "ਵਿੰਡੋਜ਼ ਲਈ ਪਿਡਗਿਨ ਲਈ ਖਾਸ ਚੋਣ ਦਿੰਦਾ ਹੈ, ਜਿਵੇਂ ਕਿ ਬੱਡੀ ਲਿਸਟ ਡੌਕਿੰਗ।"

 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>ਲਾਗਆਉਟ।</font>"
@@ -14108,6 +14023,13 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "ਇਹ ਪਲੱਗਇਨ XMPP ਸਰਵਰ ਜਾਂ ਕਲਾਇਟ ਡੀਬੱਗ ਲਈ ਫਾਇਦੇਮੰਦ ਹੈ।"

+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "ਨਿਕਾਰਾ ਹੋਇਆ BOSH ਕੁਨੈਕਟ ਸਰਵਰ"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "ਪਰਾਕਸੀ"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "ਸਾਕਟ ਖੋਲ੍ਹੀ ਨਹੀਂ ਜਾ ਸਕਦੀ ਹੈ"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/ca-certs/Equifax_Secure_Global_eBusiness_CA-1.pem	Sun Jul 19 08:17:45 2009 +0000
@@ -0,0 +1,16 @@
+-----BEGIN CERTIFICATE-----
+MIICkDCCAfmgAwIBAgIBATANBgkqhkiG9w0BAQQFADBaMQswCQYDVQQGEwJVUzEc
+MBoGA1UEChMTRXF1aWZheCBTZWN1cmUgSW5jLjEtMCsGA1UEAxMkRXF1aWZheCBT
+ZWN1cmUgR2xvYmFsIGVCdXNpbmVzcyBDQS0xMB4XDTk5MDYyMTA0MDAwMFoXDTIw
+MDYyMTA0MDAwMFowWjELMAkGA1UEBhMCVVMxHDAaBgNVBAoTE0VxdWlmYXggU2Vj
+dXJlIEluYy4xLTArBgNVBAMTJEVxdWlmYXggU2VjdXJlIEdsb2JhbCBlQnVzaW5l
+c3MgQ0EtMTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuucXkAJlsTRVPEnC
+UdXfp9E3j9HngXNBUmCbnaEXJnitx7HoJpQytd4zjTov2/KaelpzmKNc6fuKcxtc
+58O/gGzNqfTWK8D3+ZmqY6KxRwIP1ORROhI8bIpaVIRw28HFkM9yRcuoWcDNM50/
+o5brhTMhHD4ePmBudpxnhcXIw2ECAwEAAaNmMGQwEQYJYIZIAYb4QgEBBAQDAgAH
+MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUvqigdHJQa0S3ySPY+6j/s1dr
+aGwwHQYDVR0OBBYEFL6ooHRyUGtEt8kj2Puo/7NXa2hsMA0GCSqGSIb3DQEBBAUA
+A4GBADDiAVGqx+pf2rnQZQ8w1j7aDRRJbpGTJxQx78T3LUX47Me/okENI7SS+RkA
+Z70Br83gcfxaz2TE4JaY0KNA4gGK7ycH8WUBikQtBmV1UsCGECAhX2xrD2yuCRyv
+8qIYNMR1pHMc8Y3c7635s3a0kr/clRAevsvIO1qEYBlWlKlV
+-----END CERTIFICATE-----
--- a/share/ca-certs/Makefile.am	Sun Jul 19 08:09:24 2009 +0000
+++ b/share/ca-certs/Makefile.am	Sun Jul 19 08:17:45 2009 +0000
@@ -3,17 +3,20 @@
 		CAcert_Root.pem \
 		CAcert_Class3.pem \
 		Equifax_Secure_CA.pem \
+		Equifax_Secure_Global_eBusiness_CA-1.pem \
 		GTE_CyberTrust_Global_Root.pem \
 		StartCom_Certification_Authority.pem \
 		StartCom_Free_SSL_CA.pem \
 		Verisign_RSA_Secure_Server_CA.pem \
 		Verisign_Class3_Primary_CA.pem \
-		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
+		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem \
+		VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem

 EXTRA_CERTS = \
 		AOL_Member_CA.pem \
 		Microsoft_Internet_Authority.pem \
 		Microsoft_Secure_Server_Authority.pem \
+		VeriSign_Class3_Extended_Validation_CA.pem \
 		VeriSign_International_Server_Class_3_CA.pem
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/ca-certs/VeriSign_Class3_Extended_Validation_CA.pem	Sun Jul 19 08:17:45 2009 +0000
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIF5DCCBMygAwIBAgIQW3dZxheE4V7HJ8AylSkoazANBgkqhkiG9w0BAQUFADCB
+yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
+ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
+aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMTYxMTA3MjM1OTU5WjCBujEL
+MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
+ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQg
+aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykwNjE0MDIGA1UEAxMrVmVy
+aVNpZ24gQ2xhc3MgMyBFeHRlbmRlZCBWYWxpZGF0aW9uIFNTTCBDQTCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAJjboFXrnP0XeeOabhQdsVuYI4cWbod2
+nLU4O7WgerQHYwkZ5iqISKnnnbYwWgiXDOyq5BZpcmIjmvt6VCiYxQwtt9citsj5
+OBfH3doxRpqUFI6e7nigtyLUSVSXTeV0W5K87Gws3+fBthsaVWtmCAN/Ra+aM/EQ
+wGyZSpIkMQht3QI+YXZ4eLbtfjeubPOJ4bfh3BXMt1afgKCxBX9ONxX/ty8ejwY4
+P1C3aSijtWZfNhpSSENmUt+ikk/TGGC+4+peGXEFv54cbGhyJW+ze3PJbb0S/5tB
+Ml706H7FC6NMZNFOvCYIZfsZl1h44TO/7Wg+sSdFb8Di7Jdp91zT91ECAwEAAaOC
+AdIwggHOMB0GA1UdDgQWBBT8ilC6nrklWntVhU+VAGOP6VhrQzASBgNVHRMBAf8E
+CDAGAQH/AgEAMD0GA1UdIAQ2MDQwMgYEVR0gADAqMCgGCCsGAQUFBwIBFhxodHRw
+czovL3d3dy52ZXJpc2lnbi5jb20vY3BzMD0GA1UdHwQ2MDQwMqAwoC6GLGh0dHA6
+Ly9FVlNlY3VyZS1jcmwudmVyaXNpZ24uY29tL3BjYTMtZzUuY3JsMA4GA1UdDwEB
+/wQEAwIBBjARBglghkgBhvhCAQEEBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZ
+MFcwVRYJaW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7
+GS4wJRYjaHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwKQYDVR0R
+BCIwIKQeMBwxGjAYBgNVBAMTEUNsYXNzM0NBMjA0OC0xLTQ3MD0GCCsGAQUFBwEB
+BDEwLzAtBggrBgEFBQcwAYYhaHR0cDovL0VWU2VjdXJlLW9jc3AudmVyaXNpZ24u
+Y29tMB8GA1UdIwQYMBaAFH/TZafC3ey78DAJ80M5+gKvMzEzMA0GCSqGSIb3DQEB
+BQUAA4IBAQCWovp/5j3t1CvOtxU/wHIDX4u6FpAl98KD2Md1NGNoElMMU4l7yVYJ
+p8M2RE4O0GJis4b66KGbNGeNUyIXPv2s7mcuQ+JdfzOE8qJwwG6Cl8A0/SXGI3/t
+5rDFV0OEst4t8dD2SB8UcVeyrDHhlyQjyRNddOVG7wl8nuGZMQoIeRuPcZ8XZsg4
+z+6Ml7YGuXNG5NOUweVgtSV1LdlpMezNlsOjdv3odESsErlNv1HoudRETifLriDR
+fip8tmNHnna6l9AW5wtsbfdDbzMLKTB3+p359U64drPNGLT5IO892+bKrZvQTtKH
+qQ2mRHNQ3XBb7a1+Srwi1agm5MKFIA3Z
+-----END CERTIFICATE-----
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5_2.pem	Sun Jul 19 08:17:45 2009 +0000
@@ -0,0 +1,29 @@
+-----BEGIN CERTIFICATE-----
+MIIE3TCCBEagAwIBAgIQWPOeXAErGUchqY7k7uD4vzANBgkqhkiG9w0BAQUFADBf
+MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsT
+LkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
+HhcNMDYxMTA4MDAwMDAwWhcNMjExMTA3MjM1OTU5WjCByjELMAkGA1UEBhMCVVMx
+FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
+dCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2lnbiwgSW5jLiAtIEZv
+ciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2lnbiBDbGFzcyAz
+IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzUwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1nmAMqudLO07cfLw8
+RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbext0uz/o9+B1fs70Pb
+ZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIzSdhDY2pSS9KP6HBR
+TdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQGBO+QueQA5N06tRn/
+Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+rCpSx4/VBEnkjWNH
+iDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/NIeWiu5T6CUVAgMB
+AAGjggGoMIIBpDAPBgNVHRMBAf8EBTADAQH/MDEGA1UdHwQqMCgwJqAkoCKGIGh0
+dHA6Ly9jcmwudmVyaXNpZ24uY29tL3BjYTMuY3JsMA4GA1UdDwEB/wQEAwIBBjBt
+BggrBgEFBQcBDARhMF+hXaBbMFkwVzBVFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
+BBSP5dMahqyNjmvDz4Bq1EgYLHsZLjAlFiNodHRwOi8vbG9nby52ZXJpc2lnbi5j
+b20vdnNsb2dvLmdpZjA9BgNVHSAENjA0MDIGBFUdIAAwKjAoBggrBgEFBQcCARYc
+aHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL2NwczAdBgNVHQ4EFgQUf9Nlp8Ld7Lvw
+MAnzQzn6Aq8zMTMwgYAGA1UdIwR5MHehY6RhMF8xCzAJBgNVBAYTAlVTMRcwFQYD
+VQQKEw5WZXJpU2lnbiwgSW5jLjE3MDUGA1UECxMuQ2xhc3MgMyBQdWJsaWMgUHJp
+bWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eYIQcLrkHRDZKTS2OMp7A8y6vzAN
+BgkqhkiG9w0BAQUFAAOBgQCfFUleaybO7pjnTaWSP3Vq8DML+gncKJKrjWoxQdlH
+MUdGCaE5BT5mZRmLMr9hLBzVagNvRNw7r+8bk1jWvc7Q7baJd1EVWTIoxXqJjNo+
+bVx1rIbUx579OD6Wc0CHNGqETjGo0qK5PE4G3cuyfK7h1Z8edOUk8M/km+wl6s3s
+9g==
+-----END CERTIFICATE-----