changeset 28332:35f3a79045a6

propagate from branch 'im.pidgin.pidgin' (head f2a545adb2d67a5ba3dce2abedf68c392cc815e1) to branch 'im.pidgin.cpw.darkrain42.2.6.1' (head 3100186c018974c8e9a25d886213b3317320c5c7)
author Paul Aurich <paul@darkrain42.org>
date Wed, 05 Aug 2009 01:34:35 +0000
parents 0af4b1fb0566 (current diff) 94d7701a242e (diff)
children ee7fc9aec326
files ChangeLog libpurple/certificate.c libpurple/protocols/yahoo/libymsg.c
diffstat 18 files changed, 2442 insertions(+), 3012 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Aug 03 00:46:28 2009 +0000
+++ b/ChangeLog	Wed Aug 05 01:34:35 2009 +0000
@@ -179,6 +179,9 @@
 	  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.
+	* Fix a crash when closing the New Mail dialog if an account with new
+	  mail was previously disconnected while the dialog was open.
+	* Fix incorrect unread message counts for the new mail notifications.
 
 	Finch:
 	* The hardware cursor is updated correctly. This will be useful
--- a/doc/Makefile.am	Mon Aug 03 00:46:28 2009 +0000
+++ b/doc/Makefile.am	Wed Aug 05 01:34:35 2009 +0000
@@ -32,6 +32,7 @@
 	gtkimhtml-signals.dox \
 	gtkrc-2.0 \
 	imgstore-signals.dox \
+	jabber-signals.dox \
 	log-signals.dox \
 	notify-signals.dox \
 	pidgin.1.in \
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/jabber-signals.dox	Wed Aug 05 01:34:35 2009 +0000
@@ -0,0 +1,125 @@
+/** @page jabber-signals Jabber Signals
+
+ @signals
+  @signal jabber-receiving-iq
+  @signal jabber-receiving-message
+  @signal jabber-receiving-presence
+  @signal jabber-watched-iq
+  @signal jabber-register-namespace-watcher
+  @signal jabber-unregister-namespace-watcher
+  @signal jabber-sending-xmlnode
+ @endsignals
+
+ <hr>
+
+ @signaldef jabber-receiving-iq
+  @signalproto
+gboolean (*iq_received)(PurpleConnection *gc, const char *type, const char *id,
+                     const char *from, xmlnode *iq);
+  @endsignalproto
+  @signaldesc
+   Emitted when an XMPP IQ stanza is received. Allows a plugin to process IQ
+   stanzas.
+  @param gc        The connection on which the stanza is received
+  @param type      The IQ type ('get', 'set', 'result', or 'error')
+  @param id        The ID attribute from the stanza. MUST NOT be NULL.
+  @param from      The originator of the stanza. MAY BE NULL if the stanza
+                   originated from the user's server.
+  @param iq        The full stanza received.
+  @return TRUE if the plugin processed this stanza and *nobody else* should
+          process it. FALSE otherwise.
+ @endsignaldef
+
+ @signaldef jabber-receiving-message
+  @signalproto
+gboolean (*message_received)(PurpleConnection *gc, const char *type,
+                              const char *id, const char *from, const char *to,
+                              xmlnode *message);
+  @endsignalproto
+  @signaldesc
+   Emitted when an XMPP message stanza is received. Allows a plugin to
+   process message stanzas.
+  @param gc        The connection on which the stanza is received
+  @param type      The message type (see rfc3921 or rfc3921bis)
+  @param id        The ID attribute from the stanza. MAY BE NULL.
+  @param from      The originator of the stanza. MAY BE NULL if the stanza
+                   originated from the user's server.
+  @param to        The destination of the stanza. This is probably either the
+                   full JID of the receiver or the receiver's bare JID.
+  @param message   The full stanza received.
+  @return TRUE if the plugin processed this stanza and *nobody else* should
+          process it. FALSE otherwise.
+ @endsignaldef
+
+ @signaldef jabber-receiving-presence
+  @signalproto
+gboolean (*presence_received)(PurpleConnection *gc, const char *type,
+                               const char *from, xmlnode *presence);
+  @endsignalproto
+  @signaldesc
+   Emitted when an XMPP presence stanza is received. Allows a plugin to process
+   presence stanzas.
+  @param gc        The connection on which the stanza is received
+  @param type      The presence type (see rfc3921 or rfc3921bis). NULL indicates
+                   this is an "available" (i.e. online) presence.
+  @param from      The originator of the stanza. MAY BE NULL if the stanza
+                   originated from the user's server.
+  @param presence  The full stanza received.
+  @return TRUE if the plugin processed this stanza and *nobody else* should
+          process it. FALSE otherwise.
+ @endsignaldef
+
+ @signaldef jabber-watched-iq
+  @signalproto
+gboolean (*watched_iq)(PurpleConnection *pc, const char *type, const char *id,
+                       const char *from, xmlnode *child);
+  @endsignalproto
+  @signaldesc
+   Emitted when an IQ with a watched (child, namespace) pair is received.  See
+   jabber-register-namespace-watcher and jabber-unregister-namespace-watcher.
+  @param gc        The connection on which the stanza is received
+  @param type      The IQ type ('get', 'set', 'result', or 'error')
+  @param id        The ID attribute from the stanza. MUST NOT be NULL.
+  @param from      The originator of the stanza. MAY BE NULL if the stanza
+                   originated from the user's server.
+  @param child     The child node with namespace.
+  @return TRUE if the plugin processed this stanza and *nobody else* should
+          process it. FALSE otherwise.
+ @endsignaldef
+
+ @signaldef jabber-sending-xmlnode
+  @signalproto
+void (sending_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+  @endsignalproto
+  @signaldesc
+   Emit this signal (@c purple_signal_emit) to send a stanza. It is preferred
+   to use this instead of prpl_info->send_raw.
+   @param gc      The connectoin on which to send the stanza.
+   @param stanza  The stanza to send. If stanza is not NULL after being sent,
+                  the emitter should free it.
+ @endsignaldef
+
+ @signaldef jabber-register-namespace-watcher
+  @signalproto
+void (register_namespace_watcher)(const char *node, const char *namespace);
+  @endsignalproto
+  @signaldesc
+   Emit this signal to register your desire to have specific IQ stanzas to be
+   emitted via the jabber-watched-iq signal when received.
+  @param node      The IQ child name to longer watch.
+  @param namespace The IQ child namespace to longer watch.
+ @endsignaldef
+
+ @signaldef jabber-unregister-namespace-watcher
+  @signalproto
+void (unregister_namespace_watcher)(const char *node, const char *namespace);
+  @endsignalproto
+  @signaldesc
+   Emit this signal to unregister your desire to have specific IQ stanzas to be
+   emitted via the jabber-watched-iq signal when received.
+  @param node      The IQ child name to no longer watch.
+  @param namespace The IQ child namespace to no longer watch.
+ @endsignaldef
+
+*/
+// vim: syntax=c.doxygen tw=75 et
--- a/finch/gntblist.c	Mon Aug 03 00:46:28 2009 +0000
+++ b/finch/gntblist.c	Wed Aug 05 01:34:35 2009 +0000
@@ -589,6 +589,16 @@
 		ggblist->manager = &default_manager;
 }
 
+static void destroy_list(PurpleBuddyList *list)
+{
+	if (ggblist == NULL)
+		return;
+
+	gnt_widget_destroy(ggblist->window);
+	g_free(ggblist);
+	ggblist = NULL;
+}
+
 static gboolean
 remove_new_empty_group(gpointer data)
 {
@@ -849,7 +859,7 @@
 	blist_show,
 	node_update,
 	node_remove,
-	NULL,
+	destroy_list,
 	NULL,
 	finch_request_add_buddy,
 	finch_request_add_chat,
@@ -3184,12 +3194,6 @@
 
 void finch_blist_uninit()
 {
-	if (ggblist == NULL)
-		return;
-
-	gnt_widget_destroy(ggblist->window);
-	g_free(ggblist);
-	ggblist = NULL;
 }
 
 gboolean finch_blist_get_position(int *x, int *y)
--- a/libpurple/certificate.c	Mon Aug 03 00:46:28 2009 +0000
+++ b/libpurple/certificate.c	Wed Aug 05 01:34:35 2009 +0000
@@ -386,7 +386,6 @@
 
 	scheme = crt->scheme;
 
-	/* TODO: Instead of failing, maybe use get_subject_name and strcmp? */
 	g_return_val_if_fail(scheme->check_subject_name, FALSE);
 
 	return (scheme->check_subject_name)(crt, name);
--- a/libpurple/connection.c	Mon Aug 03 00:46:28 2009 +0000
+++ b/libpurple/connection.c	Wed Aug 05 01:34:35 2009 +0000
@@ -578,6 +578,9 @@
 
 	gc->wants_to_die = purple_connection_error_is_fatal (reason);
 
+	purple_debug_info("connection", "Connection error on %p (reason: %u description: %s)\n",
+	                  gc, reason, description);
+
 	ops = purple_connections_get_ui_ops();
 
 	if (ops != NULL)
--- a/libpurple/protocols/msn/slp.c	Mon Aug 03 00:46:28 2009 +0000
+++ b/libpurple/protocols/msn/slp.c	Wed Aug 05 01:34:35 2009 +0000
@@ -341,7 +341,7 @@
 			bin = (char *)purple_base64_decode(context, &bin_len);
 			file_size = GUINT32_FROM_LE(*(gsize *)(bin + 8));
 
-			file_name = g_convert(bin + 20, -1, "UTF-8", "UTF-16LE",
+			file_name = g_convert(bin + 20, MAX_FILE_NAME_LEN, "UTF-8", "UTF-16LE",
 			                      NULL, NULL, NULL);
 
 			g_free(bin);
--- a/libpurple/protocols/msn/slpcall.c	Mon Aug 03 00:46:28 2009 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Wed Aug 05 01:34:35 2009 +0000
@@ -209,7 +209,7 @@
 			gsize bytes_read, bytes_written;
 
 			body_str = g_convert((const gchar *)body, body_len / 2,
-			                     "UTF-8", "UTF16-LE",
+			                     "UTF-8", "UTF-16LE",
 			                     &bytes_read, &bytes_written, &error);
 			body_len -= bytes_read + 2;
 			body += bytes_read + 2;
--- a/libpurple/protocols/yahoo/libymsg.c	Mon Aug 03 00:46:28 2009 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Wed Aug 05 01:34:35 2009 +0000
@@ -478,7 +478,7 @@
 	PurpleAccount *account = purple_connection_get_account(gc);
 	YahooData *yd = gc->proto_data;
 	GHashTable *ht;
-	char *norm_bud = NULL;
+	char *norm_bud;
 	char *temp = NULL;
 	YahooFriend *f = NULL; /* It's your friends. They're going to want you to share your StarBursts. */
 	                       /* But what if you had no friends? */
@@ -487,7 +487,6 @@
 	int protocol = 0;
 	int stealth = 0;
 
-
 	ht = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, (GDestroyNotify) g_slist_free);
 
 	while (l) {
@@ -546,9 +545,11 @@
 					purple_privacy_deny_add(account, norm_bud, 1);
 				}
 
+				g_free(norm_bud);
+
 				protocol = 0;
 				stealth = 0;
-				norm_bud = NULL;
+				g_free(temp);
 				temp = NULL;
 			}
 			break;
@@ -559,6 +560,7 @@
 			yd->current_list15_grp = yahoo_string_decode(gc, pair->value, FALSE);
 			break;
 		case 7: /* buddy's s/n */
+			g_free(temp);
 			temp = g_strdup(purple_normalize(account, pair->value));
 			break;
 		case 241: /* another protocol user */
@@ -594,7 +596,6 @@
 	yahoo_set_status(account, purple_account_get_active_status(account));
 
 	g_hash_table_destroy(ht);
-	g_free(norm_bud);
 	g_free(temp);
 }
 
@@ -2588,8 +2589,7 @@
 	PurpleAccount *account;
 	YahooData *yd;
 
-	if(!(p2p_data = data))
-		return ;
+	p2p_data = data;
 	yd = p2p_data->gc->proto_data;
 
 	if(error_message != NULL) {
--- a/libpurple/protocols/yahoo/util.c	Mon Aug 03 00:46:28 2009 +0000
+++ b/libpurple/protocols/yahoo/util.c	Wed Aug 05 01:34:35 2009 +0000
@@ -184,148 +184,165 @@
 }
 
 /*
+ * The values in this hash table should probably be lowercase, since that's
+ * what xhtml expects.  Also because yahoo_codes_to_html() does
+ * case-sensitive comparisons.
+ *
  * I found these on some website but i don't know that they actually
  * work (or are supposed to work). I didn't implement them yet.
  *
-     * [0;30m ---black
-     * [1;37m ---white
-     * [0;37m ---tan
-     * [0;38m ---light black
-     * [1;39m ---dark blue
-     * [0;32m ---green
-     * [0;33m ---yellow
-     * [0;35m ---pink
-     * [1;35m ---purple
-     * [1;30m ---light blue
-     * [0;31m ---red
-     * [0;34m ---blue
-     * [0;36m ---aqua
-         * (shift+comma)lyellow(shift+period) ---light yellow
-     * (shift+comma)lgreen(shift+period) ---light green
-[2;30m <--white out
-*/
+ * [0;30m ---black
+ * [1;37m ---white
+ * [0;37m ---tan
+ * [0;38m ---light black
+ * [1;39m ---dark blue
+ * [0;32m ---green
+ * [0;33m ---yellow
+ * [0;35m ---pink
+ * [1;35m ---purple
+ * [1;30m ---light blue
+ * [0;31m ---red
+ * [0;34m ---blue
+ * [0;36m ---aqua
+ * (shift+comma)lyellow(shift+period) ---light yellow
+ * (shift+comma)lgreen(shift+period) ---light green
+ * [2;30m <--white out
+ */
 
-static GHashTable *ht = NULL;
+static GHashTable *esc_codes_ht = NULL;
+static GHashTable *tags_ht = NULL;
 
 void yahoo_init_colorht()
 {
-	if (ht != NULL)
+	if (esc_codes_ht != NULL)
 		/* Hash table has already been initialized */
 		return;
 
-	ht = g_hash_table_new(g_str_hash, g_str_equal);
+	/* Key is the escape code string.  Value is the HTML that should be
+	 * inserted in place of the escape code. */
+	esc_codes_ht = g_hash_table_new(g_str_hash, g_str_equal);
+
+	/* Key is the name of the HTML tag, for example "font" or "/font"
+	 * value is the HTML that should be inserted in place of the old tag */
+	tags_ht = g_hash_table_new(g_str_hash, g_str_equal);
+
 	/* the numbers in comments are what gyach uses, but i think they're incorrect */
 #ifdef USE_CSS_FORMATTING
-	g_hash_table_insert(ht, "30", "<span style=\"color: #000000\">"); /* black */
-	g_hash_table_insert(ht, "31", "<span style=\"color: #0000FF\">"); /* blue */
-	g_hash_table_insert(ht, "32", "<span style=\"color: #008080\">"); /* cyan */      /* 00b2b2 */
-	g_hash_table_insert(ht, "33", "<span style=\"color: #808080\">"); /* gray */      /* 808080 */
-	g_hash_table_insert(ht, "34", "<span style=\"color: #008000\">"); /* green */     /* 00c200 */
-	g_hash_table_insert(ht, "35", "<span style=\"color: #FF0080\">"); /* pink */      /* ffafaf */
-	g_hash_table_insert(ht, "36", "<span style=\"color: #800080\">"); /* purple */    /* b200b2 */
-	g_hash_table_insert(ht, "37", "<span style=\"color: #FF8000\">"); /* orange */    /* ffff00 */
-	g_hash_table_insert(ht, "38", "<span style=\"color: #FF0000\">"); /* red */
-	g_hash_table_insert(ht, "39", "<span style=\"color: #808000\">"); /* olive */     /* 546b50 */
+	g_hash_table_insert(esc_codes_ht, "30", "<span style=\"color: #000000\">"); /* black */
+	g_hash_table_insert(esc_codes_ht, "31", "<span style=\"color: #0000FF\">"); /* blue */
+	g_hash_table_insert(esc_codes_ht, "32", "<span style=\"color: #008080\">"); /* cyan */      /* 00b2b2 */
+	g_hash_table_insert(esc_codes_ht, "33", "<span style=\"color: #808080\">"); /* gray */      /* 808080 */
+	g_hash_table_insert(esc_codes_ht, "34", "<span style=\"color: #008000\">"); /* green */     /* 00c200 */
+	g_hash_table_insert(esc_codes_ht, "35", "<span style=\"color: #FF0080\">"); /* pink */      /* ffafaf */
+	g_hash_table_insert(esc_codes_ht, "36", "<span style=\"color: #800080\">"); /* purple */    /* b200b2 */
+	g_hash_table_insert(esc_codes_ht, "37", "<span style=\"color: #FF8000\">"); /* orange */    /* ffff00 */
+	g_hash_table_insert(esc_codes_ht, "38", "<span style=\"color: #FF0000\">"); /* red */
+	g_hash_table_insert(esc_codes_ht, "39", "<span style=\"color: #808000\">"); /* olive */     /* 546b50 */
 #else
-	g_hash_table_insert(ht, "30", "<font color=\"#000000\">"); /* black */
-	g_hash_table_insert(ht, "31", "<font color=\"#0000FF\">"); /* blue */
-	g_hash_table_insert(ht, "32", "<font color=\"#008080\">"); /* cyan */      /* 00b2b2 */
-	g_hash_table_insert(ht, "33", "<font color=\"#808080\">"); /* gray */      /* 808080 */
-	g_hash_table_insert(ht, "34", "<font color=\"#008000\">"); /* green */     /* 00c200 */
-	g_hash_table_insert(ht, "35", "<font color=\"#FF0080\">"); /* pink */      /* ffafaf */
-	g_hash_table_insert(ht, "36", "<font color=\"#800080\">"); /* purple */    /* b200b2 */
-	g_hash_table_insert(ht, "37", "<font color=\"#FF8000\">"); /* orange */    /* ffff00 */
-	g_hash_table_insert(ht, "38", "<font color=\"#FF0000\">"); /* red */
-	g_hash_table_insert(ht, "39", "<font color=\"#808000\">"); /* olive */     /* 546b50 */
+	g_hash_table_insert(esc_codes_ht, "30", "<font color=\"#000000\">"); /* black */
+	g_hash_table_insert(esc_codes_ht, "31", "<font color=\"#0000FF\">"); /* blue */
+	g_hash_table_insert(esc_codes_ht, "32", "<font color=\"#008080\">"); /* cyan */      /* 00b2b2 */
+	g_hash_table_insert(esc_codes_ht, "33", "<font color=\"#808080\">"); /* gray */      /* 808080 */
+	g_hash_table_insert(esc_codes_ht, "34", "<font color=\"#008000\">"); /* green */     /* 00c200 */
+	g_hash_table_insert(esc_codes_ht, "35", "<font color=\"#FF0080\">"); /* pink */      /* ffafaf */
+	g_hash_table_insert(esc_codes_ht, "36", "<font color=\"#800080\">"); /* purple */    /* b200b2 */
+	g_hash_table_insert(esc_codes_ht, "37", "<font color=\"#FF8000\">"); /* orange */    /* ffff00 */
+	g_hash_table_insert(esc_codes_ht, "38", "<font color=\"#FF0000\">"); /* red */
+	g_hash_table_insert(esc_codes_ht, "39", "<font color=\"#808000\">"); /* olive */     /* 546b50 */
 #endif /* !USE_CSS_FORMATTING */
 
-	g_hash_table_insert(ht,  "1",  "<b>");
-	g_hash_table_insert(ht, "x1", "</b>");
-	g_hash_table_insert(ht,  "2",  "<i>");
-	g_hash_table_insert(ht, "x2", "</i>");
-	g_hash_table_insert(ht,  "4",  "<u>");
-	g_hash_table_insert(ht, "x4", "</u>");
+	g_hash_table_insert(esc_codes_ht,  "1",  "<b>");
+	g_hash_table_insert(esc_codes_ht, "x1", "</b>");
+	g_hash_table_insert(esc_codes_ht,  "2",  "<i>");
+	g_hash_table_insert(esc_codes_ht, "x2", "</i>");
+	g_hash_table_insert(esc_codes_ht,  "4",  "<u>");
+	g_hash_table_insert(esc_codes_ht, "x4", "</u>");
 
 	/* these just tell us the text they surround is supposed
 	 * to be a link. purple figures that out on its own so we
 	 * just ignore it.
 	 */
-	g_hash_table_insert(ht, "l", ""); /* link start */
-	g_hash_table_insert(ht, "xl", ""); /* link end */
+	g_hash_table_insert(esc_codes_ht, "l", ""); /* link start */
+	g_hash_table_insert(esc_codes_ht, "xl", ""); /* link end */
 
 #ifdef USE_CSS_FORMATTING
-	g_hash_table_insert(ht, "<black>",  "<span style=\"color: #000000\">");
-	g_hash_table_insert(ht, "<blue>",   "<span style=\"color: #0000FF\">");
-	g_hash_table_insert(ht, "<cyan>",   "<span style=\"color: #008284\">");
-	g_hash_table_insert(ht, "<gray>",   "<span style=\"color: #848284\">");
-	g_hash_table_insert(ht, "<green>",  "<span style=\"color: #008200\">");
-	g_hash_table_insert(ht, "<pink>",   "<span style=\"color: #FF0084\">");
-	g_hash_table_insert(ht, "<purple>", "<span style=\"color: #840084\">");
-	g_hash_table_insert(ht, "<orange>", "<span style=\"color: #FF8000\">");
-	g_hash_table_insert(ht, "<red>",    "<span style=\"color: #FF0000\">");
-	g_hash_table_insert(ht, "<yellow>", "<span style=\"color: #848200\">");
+	g_hash_table_insert(tags_ht, "black",  "<span style=\"color: #000000\">");
+	g_hash_table_insert(tags_ht, "blue",   "<span style=\"color: #0000FF\">");
+	g_hash_table_insert(tags_ht, "cyan",   "<span style=\"color: #008284\">");
+	g_hash_table_insert(tags_ht, "gray",   "<span style=\"color: #848284\">");
+	g_hash_table_insert(tags_ht, "green",  "<span style=\"color: #008200\">");
+	g_hash_table_insert(tags_ht, "pink",   "<span style=\"color: #FF0084\">");
+	g_hash_table_insert(tags_ht, "purple", "<span style=\"color: #840084\">");
+	g_hash_table_insert(tags_ht, "orange", "<span style=\"color: #FF8000\">");
+	g_hash_table_insert(tags_ht, "red",    "<span style=\"color: #FF0000\">");
+	g_hash_table_insert(tags_ht, "yellow", "<span style=\"color: #848200\">");
 
-	g_hash_table_insert(ht, "</black>",  "</span>");
-	g_hash_table_insert(ht, "</blue>",   "</span>");
-	g_hash_table_insert(ht, "</cyan>",   "</span>");
-	g_hash_table_insert(ht, "</gray>",   "</span>");
-	g_hash_table_insert(ht, "</green>",  "</span>");
-	g_hash_table_insert(ht, "</pink>",   "</span>");
-	g_hash_table_insert(ht, "</purple>", "</span>");
-	g_hash_table_insert(ht, "</orange>", "</span>");
-	g_hash_table_insert(ht, "</red>",    "</span>");
-	g_hash_table_insert(ht, "</yellow>", "</span>");
+	g_hash_table_insert(tags_ht, "/black",  "</span>");
+	g_hash_table_insert(tags_ht, "/blue",   "</span>");
+	g_hash_table_insert(tags_ht, "/cyan",   "</span>");
+	g_hash_table_insert(tags_ht, "/gray",   "</span>");
+	g_hash_table_insert(tags_ht, "/green",  "</span>");
+	g_hash_table_insert(tags_ht, "/pink",   "</span>");
+	g_hash_table_insert(tags_ht, "/purple", "</span>");
+	g_hash_table_insert(tags_ht, "/orange", "</span>");
+	g_hash_table_insert(tags_ht, "/red",    "</span>");
+	g_hash_table_insert(tags_ht, "/yellow", "</span>");
 #else
-	g_hash_table_insert(ht, "<black>",  "<font color=\"#000000\">");
-	g_hash_table_insert(ht, "<blue>",   "<font color=\"#0000FF\">");
-	g_hash_table_insert(ht, "<cyan>",   "<font color=\"#008284\">");
-	g_hash_table_insert(ht, "<gray>",   "<font color=\"#848284\">");
-	g_hash_table_insert(ht, "<green>",  "<font color=\"#008200\">");
-	g_hash_table_insert(ht, "<pink>",   "<font color=\"#FF0084\">");
-	g_hash_table_insert(ht, "<purple>", "<font color=\"#840084\">");
-	g_hash_table_insert(ht, "<orange>", "<font color=\"#FF8000\">");
-	g_hash_table_insert(ht, "<red>",    "<font color=\"#FF0000\">");
-	g_hash_table_insert(ht, "<yellow>", "<font color=\"#848200\">");
+	g_hash_table_insert(tags_ht, "black",  "<font color=\"#000000\">");
+	g_hash_table_insert(tags_ht, "blue",   "<font color=\"#0000FF\">");
+	g_hash_table_insert(tags_ht, "cyan",   "<font color=\"#008284\">");
+	g_hash_table_insert(tags_ht, "gray",   "<font color=\"#848284\">");
+	g_hash_table_insert(tags_ht, "green",  "<font color=\"#008200\">");
+	g_hash_table_insert(tags_ht, "pink",   "<font color=\"#FF0084\">");
+	g_hash_table_insert(tags_ht, "purple", "<font color=\"#840084\">");
+	g_hash_table_insert(tags_ht, "orange", "<font color=\"#FF8000\">");
+	g_hash_table_insert(tags_ht, "red",    "<font color=\"#FF0000\">");
+	g_hash_table_insert(tags_ht, "yellow", "<font color=\"#848200\">");
 
-	g_hash_table_insert(ht, "</black>",  "</font>");
-	g_hash_table_insert(ht, "</blue>",   "</font>");
-	g_hash_table_insert(ht, "</cyan>",   "</font>");
-	g_hash_table_insert(ht, "</gray>",   "</font>");
-	g_hash_table_insert(ht, "</green>",  "</font>");
-	g_hash_table_insert(ht, "</pink>",   "</font>");
-	g_hash_table_insert(ht, "</purple>", "</font>");
-	g_hash_table_insert(ht, "</orange>", "</font>");
-	g_hash_table_insert(ht, "</red>",    "</font>");
-	g_hash_table_insert(ht, "</yellow>", "</font>");
+	g_hash_table_insert(tags_ht, "/black",  "</font>");
+	g_hash_table_insert(tags_ht, "/blue",   "</font>");
+	g_hash_table_insert(tags_ht, "/cyan",   "</font>");
+	g_hash_table_insert(tags_ht, "/gray",   "</font>");
+	g_hash_table_insert(tags_ht, "/green",  "</font>");
+	g_hash_table_insert(tags_ht, "/pink",   "</font>");
+	g_hash_table_insert(tags_ht, "/purple", "</font>");
+	g_hash_table_insert(tags_ht, "/orange", "</font>");
+	g_hash_table_insert(tags_ht, "/red",    "</font>");
+	g_hash_table_insert(tags_ht, "/yellow", "</font>");
 #endif /* !USE_CSS_FORMATTING */
 
-	/* remove these once we have proper support for <FADE> and <ALT> */
-	g_hash_table_insert(ht, "</fade>", "");
-	g_hash_table_insert(ht, "</alt>", "");
+	/* We don't support these tags, so discard them */
+	g_hash_table_insert(tags_ht, "alt", "");
+	g_hash_table_insert(tags_ht, "fade", "");
+	g_hash_table_insert(tags_ht, "snd", "");
+	g_hash_table_insert(tags_ht, "/alt", "");
+	g_hash_table_insert(tags_ht, "/fade", "");
 
-	/* these are the normal html yahoo sends (besides <font>).
-	 * anything else will get turned into &lt;tag&gt;, so if I forgot
-	 * about something, please add it. Why Yahoo! has to send unescaped
-	 * <'s and >'s that aren't supposed to be html is beyond me.
-	 */
-	g_hash_table_insert(ht, "<b>", "<b>");
-	g_hash_table_insert(ht, "<i>", "<i>");
-	g_hash_table_insert(ht, "<u>", "<u>");
+	/* Official clients don't seem to send b, i or u tags.  They use
+	 * the escape codes listed above.  Official clients definitely send
+	 * font tags, though.  I wonder if we can remove the opening and
+	 * closing b, i and u tags from here? */
+	g_hash_table_insert(tags_ht, "b", "<b>");
+	g_hash_table_insert(tags_ht, "i", "<i>");
+	g_hash_table_insert(tags_ht, "u", "<u>");
+	g_hash_table_insert(tags_ht, "font", "<font>");
 
-	g_hash_table_insert(ht, "</b>", "</b>");
-	g_hash_table_insert(ht, "</i>", "</i>");
-	g_hash_table_insert(ht, "</u>", "</u>");
-	g_hash_table_insert(ht, "</font>", "</font>");
+	g_hash_table_insert(tags_ht, "/b", "</b>");
+	g_hash_table_insert(tags_ht, "/i", "</i>");
+	g_hash_table_insert(tags_ht, "/u", "</u>");
+	g_hash_table_insert(tags_ht, "/font", "</font>");
 }
 
 void yahoo_dest_colorht()
 {
-	if (ht == NULL)
+	if (esc_codes_ht == NULL)
 		/* Hash table has already been destroyed */
 		return;
 
-	g_hash_table_destroy(ht);
-	ht = NULL;
+	g_hash_table_destroy(esc_codes_ht);
+	esc_codes_ht = NULL;
+	g_hash_table_destroy(tags_ht);
+	tags_ht = NULL;
 }
 
 #ifndef USE_CSS_FORMATTING
@@ -347,60 +364,161 @@
 }
 #endif /* !USE_CSS_FORMATTING */
 
-/*
- * The Yahoo font size value is given in pt, even thougth the HTML
- * standard for <font size="x"> treats the size as a number on a
- * scale between 1 and 7.  Let's get rid of this shoddyness and
- * convert it to CSS.
- */
-static void _font_tags_fix_size(const char *tag, GString *dest)
+static void append_attrs_datalist_foreach_cb(GQuark key_id, gpointer data, gpointer user_data)
 {
-	char *x, *end;
-	int size;
+	const char *key;
+	const char *value;
+	xmlnode *cur;
+
+	key = g_quark_to_string(key_id);
+	value = data;
+	cur = user_data;
+
+	xmlnode_set_attrib(cur, key, value);
+}
 
-	if (((x = strstr(tag, "size"))) && ((x = strchr(x, '=')))) {
-		while (*x && !g_ascii_isdigit(*x))
-			x++;
-		if (*x) {
-#ifndef USE_CSS_FORMATTING
-			int htmlsize;
-#endif /* !USE_CSS_FORMATTING */
-
-			size = strtol(x, &end, 10);
+/**
+ * @param cur A pointer to the position in the XML tree that we're
+ *        currently building.  This will be modified when opening a tag
+ *        or closing an existing tag.
+ */
+static void yahoo_codes_to_html_add_tag(xmlnode **cur, const char *tag, gboolean is_closing_tag, const gchar *tag_name, gboolean is_font_tag)
+{
+	if (is_closing_tag) {
+		xmlnode *tmp;
+		GSList *dangling_tags = NULL;
 
-#ifdef USE_CSS_FORMATTING
-			g_string_append_len(dest, tag, x - tag - 7);
-			g_string_append(dest, end + 1);
-			g_string_append_printf(dest, "<span style=\"font-size: %dpt\">", size);
-#else
-			htmlsize = point_to_html(size);
-			g_string_append_len(dest, tag, x - tag);
-			g_string_append_printf(dest, "%d", htmlsize);
-			g_string_append_printf(dest, "\" absz=\"%d", size);
-			g_string_append(dest, end);
-#endif /* !USE_CSS_FORMATTING */
-		} else {
-			g_string_append(dest, tag);
+		/* Move up the DOM until we find the opening tag */
+		for (tmp = *cur; tmp != NULL; tmp = xmlnode_get_parent(tmp)) {
+			/* Add one to tag_name when doing this comparison because it starts with a / */
+			if (g_str_equal(tmp->name, tag_name + 1))
+				/* Found */
+				break;
+			dangling_tags = g_slist_prepend(dangling_tags, tmp);
+		}
+		if (tmp == NULL) {
+			/* This is a closing tag with no opening tag.  Useless. */
+			purple_debug_error("yahoo", "Ignoring unmatched tag %s", tag);
+			g_slist_free(dangling_tags);
 			return;
 		}
+
+		/* Move our current position up, now that we've closed a tag */
+		*cur = xmlnode_get_parent(tmp);
+
+		/* Re-open any tags that were nested below the tag we just closed */
+		while (dangling_tags != NULL) {
+			tmp = dangling_tags->data;
+			dangling_tags = g_slist_delete_link(dangling_tags, dangling_tags);
+
+			/* Create a copy of this tag+attributes (but not child tags or
+			 * data) at our new location */
+			*cur = xmlnode_new_child(*cur, tmp->name);
+			for (tmp = tmp->child; tmp != NULL; tmp = tmp->next)
+				if (tmp->type == XMLNODE_TYPE_ATTRIB)
+					xmlnode_set_attrib_full(*cur, tmp->name,
+							tmp->xmlns, tmp->prefix, tmp->data);
+		}
 	} else {
-		g_string_append(dest, tag);
-		return;
+		const char *start;
+		const char *end;
+		GData *attributes;
+		char *fontsize = NULL;
+
+		purple_markup_find_tag(tag_name, tag, &start, &end, &attributes);
+		*cur = xmlnode_new_child(*cur, tag_name);
+
+		if (is_font_tag) {
+			/* Special case for the font size attribute */
+			fontsize = g_strdup(g_datalist_get_data(&attributes, "size"));
+			if (fontsize != NULL)
+				g_datalist_remove_data(&attributes, "size");
+		}
+
+		/* Add all font tag attributes */
+		g_datalist_foreach(&attributes, append_attrs_datalist_foreach_cb, *cur);
+		g_datalist_clear(&attributes);
+
+		if (fontsize != NULL) {
+#ifdef USE_CSS_FORMATTING
+			/*
+			 * The Yahoo font size value is given in pt, even though the HTML
+			 * standard for <font size="x"> treats the size as a number on a
+			 * scale between 1 and 7.  So we insert the font size as a CSS
+			 * style on a span tag.
+			 */
+			gchar *tmp = g_strdup_printf("font-size: %spt", fontsize);
+			*cur = xmlnode_new_child(*cur, "span");
+			xmlnode_set_attrib(*cur, "style", tmp);
+			g_free(tmp);
+#else
+			/*
+			 * The Yahoo font size value is given in pt, even though the HTML
+			 * standard for <font size="x"> treats the size as a number on a
+			 * scale between 1 and 7.  So we convert it to an appropriate
+			 * value.  This loses precision, which is why CSS formatting is
+			 * preferred.  The "absz" attribute remains here for backward
+			 * compatibility with UIs that might use it, but it is totally
+			 * not standard at all.
+			 */
+			int size, htmlsize;
+			gchar tmp[11];
+			size = strtol(fontsize, NULL, 10);
+			htmlsize = point_to_html(size);
+			sprintf(tmp, "%u", htmlsize);
+			xmlnode_set_attrib(*cur, "size", tmp);
+			xmlnode_set_attrib(*cur, "absz", fontsize);
+#endif /* !USE_CSS_FORMATTING */
+			g_free(fontsize);
+		}
 	}
 }
 
+/**
+ * Similar to purple_markup_get_tag_name(), but works with closing tags.
+ *
+ * @return The lowercase name of the tag.  If this is a closing tag then
+ *         this value starts with a forward slash.  The caller must free
+ *         this string with g_free.
+ */
+static gchar *yahoo_markup_get_tag_name(const char *tag, gboolean *is_closing_tag)
+{
+	size_t len;
+
+	*is_closing_tag = (tag[1] == '/');
+	if (*is_closing_tag)
+		len = strcspn(tag + 1, "> ");
+	else
+		len = strcspn(tag + 1, "> /");
+
+	return g_utf8_strdown(tag + 1, len);
+}
+
+/*
+ * Yahoo! messages generally aren't well-formed.  Their markup is
+ * more of a flow from start to finish rather than a hierarchy from
+ * outer to inner.  They tend to open tags and close them only when
+ * necessary.
+ *
+ * Example: <font size="8">size 8 <font size="16">size 16 <font size="8">size 8 again
+ *
+ * But we want to send well-formed HTML to the core, so we step through
+ * the input string and build an xmlnode tree containing sanitized HTML.
+ */
 char *yahoo_codes_to_html(const char *x)
 {
 	size_t x_len;
-	GString *s;
+	xmlnode *html, *cur;
+	GString *cdata = g_string_new(NULL);
 	int i, j;
-	gchar *tmp;
 	gboolean no_more_gt_brackets = FALSE;
 	const char *match;
+	gchar *xmlstr1, *xmlstr2;
 
 	x_len = strlen(x);
-	s = g_string_sized_new(x_len);
+	html = xmlnode_new("html");
 
+	cur = html;
 	for (i = 0; i < x_len; i++) {
 		if ((x[i] == 0x1b) && (x[i+1] == '[')) {
 			/* This escape sequence signifies the beginning of some
@@ -408,90 +526,139 @@
 			j = i + 1;
 
 			while (j++ < x_len) {
+				gchar *code;
+
 				if (x[j] != 'm')
+					/* Keep looking for the end of this sequence */
 					continue;
-				else {
-					/* We've reached the end of the formatting code, yay */
-					tmp = g_strndup(x + i + 2, j - i - 2);
-					if (tmp[0] == '#')
+
+				/* We've reached the end of the formatting sequence, yay */
+
+				/* Append any character data that belongs in the current node */
+				if (cdata->len > 0) {
+					xmlnode_insert_data(cur, cdata->str, cdata->len);
+					g_string_truncate(cdata, 0);
+				}
+
+				code = g_strndup(x + i + 2, j - i - 2);
+				if (code[0] == '#') {
 #ifdef USE_CSS_FORMATTING
-						g_string_append_printf(s, "<span style=\"color: %s\">", tmp);
+					gchar *tmp = g_strdup_printf("color: %s", code);
+					cur = xmlnode_new_child(cur, "span");
+					xmlnode_set_attrib(cur, "style", tmp);
+					g_free(tmp);
 #else
-						g_string_append_printf(s, "<font color=\"%s\">", tmp);
+					cur = xmlnode_new_child(cur, "font");
+					xmlnode_set_attrib(cur, "color", code);
 #endif /* !USE_CSS_FORMATTING */
-					else if ((match = g_hash_table_lookup(ht, tmp)))
-						g_string_append(s, match);
-					else {
-						purple_debug_error("yahoo",
-							"Unknown ansi code 'ESC[%sm'.\n", tmp);
-						g_free(tmp);
-						break;
-					}
+
+				} else if ((match = g_hash_table_lookup(esc_codes_ht, code))) {
+					gboolean is_closing_tag;
+					gchar *tag_name;
+
+					tag_name = yahoo_markup_get_tag_name(match, &is_closing_tag);
+					yahoo_codes_to_html_add_tag(&cur, match, is_closing_tag, tag_name, FALSE);
+					g_free(tag_name);
 
-					i = j;
-					g_free(tmp);
-					break;
+				} else {
+					purple_debug_error("yahoo",
+						"Ignoring unknown ansi code 'ESC[%sm'.\n", code);
 				}
+
+				g_free(code);
+				i = j;
+				break;
 			}
 
-		} else if (!no_more_gt_brackets && (x[i] == '<')) {
+		} else if (x[i] == '<' && !no_more_gt_brackets) {
 			/* The start of an HTML tag */
 			j = i;
 
 			while (j++ < x_len) {
-				if (x[j] != '>')
-					if (j == x_len) {
-						g_string_append(s, "&lt;");
-						no_more_gt_brackets = TRUE;
-					}
-					else
-						continue;
-				else {
-					tmp = g_strndup(x + i, j - i + 1);
-					g_ascii_strdown(tmp, -1);
+				gchar *tag;
+				gboolean is_closing_tag;
+				gchar *tag_name;
 
-					if ((match = g_hash_table_lookup(ht, tmp)))
-						g_string_append(s, match);
-					else if (!strncmp(tmp, "<fade ", 6) ||
-						!strncmp(tmp, "<alt ", 5) ||
-						!strncmp(tmp, "<snd ", 5)) {
-
-						/* remove this if gtkimhtml ever supports any of these */
-						i = j;
-						g_free(tmp);
-						break;
+				if (x[j] != '>') {
+					if (x[j] == '"') {
+						/* We're inside a quoted attribute value. Skip to the end */
+						j++;
+						while (j != x_len && x[j] != '"')
+							j++;
+					} else if (x[j] == '\'') {
+						/* We're inside a quoted attribute value. Skip to the end */
+						j++;
+						while (j != x_len && x[j] != '\'')
+							j++;
+					}
+					if (j != x_len)
+						/* Keep looking for the end of this tag */
+						continue;
 
-					} else if (!strncmp(tmp, "<font ", 6)) {
-						_font_tags_fix_size(tmp, s);
-					} else {
-						g_string_append(s, "&lt;");
-						g_free(tmp);
-						break;
-					}
+					/* This < has no corresponding > */
+					g_string_append_c(cdata, x[i]);
+					no_more_gt_brackets = TRUE;
+					break;
+				}
 
-					i = j;
-					g_free(tmp);
+				tag = g_strndup(x + i, j - i + 1);
+				tag_name = yahoo_markup_get_tag_name(tag, &is_closing_tag);
+
+				match = g_hash_table_lookup(tags_ht, tag_name);
+				if (match == NULL) {
+					/* Unknown tag.  The user probably typed a less-than sign */
+					g_string_append_c(cdata, x[i]);
+					no_more_gt_brackets = TRUE;
+					g_free(tag);
+					g_free(tag_name);
 					break;
 				}
 
+				/* Some tags are in the hash table only because we
+				 * want to ignore them */
+				if (match[0] != '\0') {
+					/* Append any character data that belongs in the current node */
+					if (cdata->len > 0) {
+						xmlnode_insert_data(cur, cdata->str, cdata->len);
+						g_string_truncate(cdata, 0);
+					}
+					if (g_str_equal(tag_name, "font"))
+						/* Font tags are a special case.  We don't
+						 * necessarily want to replace the whole thing--
+						 * we just want to fix the size attribute. */
+						yahoo_codes_to_html_add_tag(&cur, tag, is_closing_tag, tag_name, TRUE);
+					else
+						yahoo_codes_to_html_add_tag(&cur, match, is_closing_tag, tag_name, FALSE);
+				}
+
+				i = j;
+				g_free(tag);
+				g_free(tag_name);
+				break;
 			}
 
 		} else {
-			if (x[i] == '<')
-				g_string_append(s, "&lt;");
-			else if (x[i] == '>')
-				g_string_append(s, "&gt;");
-			else if (x[i] == '&')
-				g_string_append(s, "&amp;");
-			else if (x[i] == '"')
-				g_string_append(s, "&quot;");
-			else
-				g_string_append_c(s, x[i]);
+			g_string_append_c(cdata, x[i]);
 		}
 	}
 
-	purple_debug_misc("yahoo", "yahoo_codes_to_html:  Returning string: '%s'.\n", s->str);
-	return g_string_free(s, FALSE);
+	/* Append any remaining character data */
+	if (cdata->len > 0)
+		xmlnode_insert_data(cur, cdata->str, cdata->len);
+	g_string_free(cdata, TRUE);
+
+	/* Serialize our HTML */
+	xmlstr1 = xmlnode_to_str(html, NULL);
+	xmlnode_free(html);
+
+	/* Strip off the outter HTML node */
+	/* This probably isn't necessary, especially if we made the outter HTML
+	 * node an empty span.  But the HTML is simpler this way. */
+	xmlstr2 = g_strndup(xmlstr1 + 6, strlen(xmlstr1) - 13);
+	g_free(xmlstr1);
+
+	purple_debug_misc("yahoo", "yahoo_codes_to_html:  Returning string: '%s'.\n", xmlstr2);
+	return xmlstr2;
 }
 
 /* borrowed from gtkimhtml */
@@ -499,8 +666,16 @@
 #define POINT_SIZE(x) (_point_sizes [MIN ((x > 0 ? x : 1), MAX_FONT_SIZE) - 1])
 static const gint _point_sizes [] = { 8, 10, 12, 14, 20, 30, 40 };
 
-enum fatype { size, color, face, junk };
-typedef struct {
+enum fatype
+{
+	FATYPE_SIZE,
+	FATYPE_COLOR,
+	FATYPE_FACE,
+	FATYPE_JUNK
+};
+
+typedef struct
+{
 	enum fatype type;
 	union {
 		int size;
@@ -512,28 +687,26 @@
 
 static void fontattr_free(fontattr *f)
 {
-	if (f->type == color)
+	if (f->type == FATYPE_COLOR)
 		g_free(f->u.color);
-	else if (f->type == face)
+	else if (f->type == FATYPE_FACE)
 		g_free(f->u.face);
 	g_free(f);
 }
 
-static void yahoo_htc_queue_cleanup(GQueue *q)
+static void yahoo_htc_list_cleanup(GSList *l)
 {
-	char *tmp;
-
-	while ((tmp = g_queue_pop_tail(q)))
-		g_free(tmp);
-	g_queue_free(q);
+	while (l != NULL) {
+		g_free(l->data);
+		l = g_slist_delete_link(l, l);
+	}
 }
 
 static void _parse_font_tag(const char *src, GString *dest, int *i, int *j,
-				int len, GQueue *colors, GQueue *tags, GQueue *ftattr)
+				int len, GSList **colors, GSList **tags, GQueue *ftattr)
 {
-
 	int m, n, vstart;
-	gboolean quote = 0, done = 0;
+	gboolean quote = FALSE, done = FALSE;
 
 	m = *j;
 
@@ -558,7 +731,7 @@
 
 				if (src[n] == '"') {
 					if (!quote) {
-						quote = 1;
+						quote = TRUE;
 						vstart = n;
 						continue;
 					} else {
@@ -567,14 +740,14 @@
 				}
 
 				if (!quote && ((src[n] == ' ') || (src[n] == '>')))
-					done = 1;
+					done = TRUE;
 
 				if (done) {
 					if (!g_ascii_strncasecmp(&src[*j+1], "FACE", m - *j - 1)) {
 						fontattr *f;
 
 						f = g_new(fontattr, 1);
-						f->type = face;
+						f->type = FATYPE_FACE;
 						f->u.face = g_strndup(&src[vstart+1], n-vstart-1);
 						if (!ftattr)
 							ftattr = g_queue_new();
@@ -585,7 +758,7 @@
 						fontattr *f;
 
 						f = g_new(fontattr, 1);
-						f->type = size;
+						f->type = FATYPE_SIZE;
 						f->u.size = POINT_SIZE(strtol(&src[vstart+1], NULL, 10));
 						if (!ftattr)
 							ftattr = g_queue_new();
@@ -596,7 +769,7 @@
 						fontattr *f;
 
 						f = g_new(fontattr, 1);
-						f->type = color;
+						f->type = FATYPE_COLOR;
 						f->u.color = g_strndup(&src[vstart+1], n-vstart-1);
 						if (!ftattr)
 							ftattr = g_queue_new();
@@ -607,7 +780,7 @@
 						fontattr *f;
 
 						f = g_new(fontattr, 1);
-						f->type = junk;
+						f->type = FATYPE_JUNK;
 						f->u.junk = g_strndup(&src[*j+1], n-*j);
 						if (!ftattr)
 							ftattr = g_queue_new();
@@ -624,56 +797,52 @@
 			*j = m;
 
 		if (src[m] == '>') {
-			gboolean needendtag = 0;
+			gboolean needendtag = FALSE;
 			fontattr *f;
 			GString *tmp = g_string_new(NULL);
-			char *colorstr;
 
 			if (!g_queue_is_empty(ftattr)) {
 				while ((f = g_queue_pop_tail(ftattr))) {
 					switch (f->type) {
-					case size:
+					case FATYPE_SIZE:
 						if (!needendtag) {
-							needendtag = 1;
+							needendtag = TRUE;
 							g_string_append(dest, "<font ");
 						}
 
 						g_string_append_printf(dest, "size=\"%d\" ", f->u.size);
-						fontattr_free(f);
 						break;
-					case face:
+					case FATYPE_FACE:
 						if (!needendtag) {
-							needendtag = 1;
+							needendtag = TRUE;
 							g_string_append(dest, "<font ");
 						}
 
 						g_string_append_printf(dest, "face=\"%s\" ", f->u.face);
-						fontattr_free(f);
 						break;
-					case junk:
+					case FATYPE_JUNK:
 						if (!needendtag) {
-							needendtag = 1;
+							needendtag = TRUE;
 							g_string_append(dest, "<font ");
 						}
 
 						g_string_append(dest, f->u.junk);
-						fontattr_free(f);
 						break;
 
-					case color:
+					case FATYPE_COLOR:
 						if (needendtag) {
 							g_string_append(tmp, "</font>");
 							dest->str[dest->len-1] = '>';
-							needendtag = 0;
+							needendtag = TRUE;
 						}
 
-						colorstr = g_queue_peek_tail(colors);
-						g_string_append(tmp, colorstr ? colorstr : "\033[#000000m");
+						g_string_append(tmp, *colors ? (*colors)->data : "\033[#000000m");
 						g_string_append_printf(dest, "\033[%sm", f->u.color);
-						g_queue_push_tail(colors, g_strdup_printf("\033[%sm", f->u.color));
-						fontattr_free(f);
+						*colors = g_slist_prepend(*colors,
+								g_strdup_printf("\033[%sm", f->u.color));
 						break;
 					}
+					fontattr_free(f);
 				}
 
 				g_queue_free(ftattr);
@@ -681,10 +850,10 @@
 
 				if (needendtag) {
 					dest->str[dest->len-1] = '>';
-					g_queue_push_tail(tags, g_strdup("</font>"));
+					*tags = g_slist_prepend(*tags, g_strdup("</font>"));
 					g_string_free(tmp, TRUE);
 				} else {
-					g_queue_push_tail(tags, tmp->str);
+					*tags = g_slist_prepend(*tags, tmp->str);
 					g_string_free(tmp, FALSE);
 				}
 			}
@@ -693,12 +862,12 @@
 			break;
 		}
 	}
-
 }
 
 char *yahoo_html_to_codes(const char *src)
 {
-	GQueue *colors, *tags;
+	GSList *colors = NULL;
+	GSList *tags = NULL;
 	size_t src_len;
 	int i, j;
 	GString *dest;
@@ -706,14 +875,12 @@
 	GQueue *ftattr = NULL;
 	gboolean no_more_specials = FALSE;
 
-	colors = g_queue_new();
-	tags = g_queue_new();
 	src_len = strlen(src);
 	dest = g_string_sized_new(src_len);
 
 	for (i = 0; i < src_len; i++) {
 
-		if (!no_more_specials && src[i] == '<') {
+		if (src[i] == '<' && !no_more_specials) {
 			j = i;
 
 			while (1) {
@@ -807,7 +974,7 @@
 							}
 						}
 					} else { /* yay we have a font tag */
-						_parse_font_tag(src, dest, &i, &j, src_len, colors, tags, ftattr);
+						_parse_font_tag(src, dest, &i, &j, src_len, &colors, &tags, ftattr);
 					}
 
 					break;
@@ -841,16 +1008,18 @@
 							/* mmm, </body> tags. *BURP* */
 						} else if (!g_ascii_strncasecmp(&src[i+1], "/SPAN", sublen)) {
 							/* </span> tags. dangerously close to </spam> */
-						} else if (!g_ascii_strncasecmp(&src[i+1], "/FONT", sublen) && g_queue_peek_tail(tags)) {
-							char *etag, *cl;
+						} else if (!g_ascii_strncasecmp(&src[i+1], "/FONT", sublen) && tags != NULL) {
+							char *etag;
 
-							etag = g_queue_pop_tail(tags);
+							etag = tags->data;
+							tags = g_slist_delete_link(tags, tags);
 							if (etag) {
 								g_string_append(dest, etag);
 								if (!strcmp(etag, "</font>")) {
-									cl = g_queue_pop_tail(colors);
-									if (cl)
-										g_free(cl);
+									if (colors != NULL) {
+										g_free(colors->data);
+										colors = g_slist_delete_link(colors, colors);
+									}
 								}
 								g_free(etag);
 							}
@@ -868,24 +1037,17 @@
 			}
 
 		} else {
-			if (((src_len - i) >= 4) && !strncmp(&src[i], "&lt;", 4)) {
-				g_string_append_c(dest, '<');
-				i += 3;
-			} else if (((src_len - i) >= 4) && !strncmp(&src[i], "&gt;", 4)) {
-				g_string_append_c(dest, '>');
-				i += 3;
-			} else if (((src_len - i) >= 5) && !strncmp(&src[i], "&amp;", 5)) {
-				g_string_append_c(dest, '&');
-				i += 4;
-			} else if (((src_len - i) >= 6) && !strncmp(&src[i], "&quot;", 6)) {
-				g_string_append_c(dest, '"');
-				i += 5;
-			} else if (((src_len - i) >= 6) && !strncmp(&src[i], "&apos;", 6)) {
-				g_string_append_c(dest, '\'');
-				i += 5;
-			} else {
+			const char *entity;
+			int length;
+
+			entity = purple_markup_unescape_entity(src + i, &length);
+			if (entity != NULL) {
+				/* src[i] is the start of an HTML entity */
+				g_string_append(dest, entity);
+				i += length - 1;
+			} else
+				/* src[i] is a normal character */
 				g_string_append_c(dest, src[i]);
-			}
 		}
 	}
 
@@ -893,8 +1055,8 @@
 	purple_debug_misc("yahoo", "yahoo_html_to_codes:  Returning string: '%s'.\n", esc);
 	g_free(esc);
 
-	yahoo_htc_queue_cleanup(colors);
-	yahoo_htc_queue_cleanup(tags);
+	yahoo_htc_list_cleanup(colors);
+	yahoo_htc_list_cleanup(tags);
 
 	return g_string_free(dest, FALSE);
 }
--- a/libpurple/tests/test_yahoo_util.c	Mon Aug 03 00:46:28 2009 +0000
+++ b/libpurple/tests/test_yahoo_util.c	Wed Aug 05 01:34:35 2009 +0000
@@ -17,49 +17,81 @@
 {
 	assert_string_equal_free("plain",
 			yahoo_codes_to_html("plain"));
+	assert_string_equal_free("unknown  ansi code",
+			yahoo_codes_to_html("unknown \x1B[12345m ansi code"));
+	assert_string_equal_free("plain &lt;peanut&gt;",
+			yahoo_codes_to_html("plain <peanut>"));
+	assert_string_equal_free("plain &lt;peanut",
+			yahoo_codes_to_html("plain <peanut"));
+	assert_string_equal_free("plain&gt; peanut",
+			yahoo_codes_to_html("plain> peanut"));
 
 	/* bold/italic/underline */
-	assert_string_equal_free("<b>bold",
+	assert_string_equal_free("<b>bold</b>",
 			yahoo_codes_to_html("\x1B[1mbold"));
-	assert_string_equal_free("<i>italic",
+	assert_string_equal_free("<i>italic</i>",
 			yahoo_codes_to_html("\x1B[2mitalic"));
-	assert_string_equal_free("<u>underline",
+	assert_string_equal_free("<u>underline</u>",
 			yahoo_codes_to_html("\x1B[4munderline"));
-	assert_string_equal_free("<b>bold</b> <i>italic</i> <u>underline",
+	assert_string_equal_free("no markup",
+			yahoo_codes_to_html("no\x1B[x4m markup"));
+	assert_string_equal_free("<b>bold</b> <i>italic</i> <u>underline</u>",
 			yahoo_codes_to_html("\x1B[1mbold\x1B[x1m \x1B[2mitalic\x1B[x2m \x1B[4munderline"));
+	assert_string_equal_free("<b>bold <i>bolditalic</i></b><i> italic</i>",
+			yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic\x1B[x1m italic"));
+	assert_string_equal_free("<b>bold <i>bolditalic</i></b><i> <u>italicunderline</u></i>",
+			yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic\x1B[x1m \x1B[4mitalicunderline"));
+	assert_string_equal_free("<b>bold <i>bolditalic <u>bolditalicunderline</u></i><u> boldunderline</u></b>",
+			yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic \x1B[4mbolditalicunderline\x1B[x2m boldunderline"));
+	assert_string_equal_free("<b>bold <i>bolditalic <u>bolditalicunderline</u></i></b><i><u> italicunderline</u></i>",
+			yahoo_codes_to_html("\x1B[1mbold \x1B[2mbolditalic \x1B[4mbolditalicunderline\x1B[x1m italicunderline"));
 
 #ifdef USE_CSS_FORMATTING
 	/* font color */
-	assert_string_equal_free("<span style=\"color: #0000FF\">blue",
+	assert_string_equal_free("<span style='color: #0000FF'>blue</span>",
 			yahoo_codes_to_html("\x1B[31mblue"));
-	assert_string_equal_free("<span style=\"color: #70ea15\">custom color",
+	assert_string_equal_free("<span style='color: #70ea15'>custom color</span>",
 			yahoo_codes_to_html("\x1B[#70ea15mcustom color"));
 
+	/* font face */
+	assert_string_equal_free("<font face='Georgia'>test</font>",
+			yahoo_codes_to_html("<font face='Georgia'>test</font>"));
+
 	/* font size */
-	assert_string_equal_free("<font><span style=\"font-size: 15pt\">test",
-			yahoo_codes_to_html("<font size=\"15\">test"));
-	assert_string_equal_free("<font><span style=\"font-size: 32pt\">size 32",
-			yahoo_codes_to_html("<font size=\"32\">size 32"));
+	assert_string_equal_free("<font><span style='font-size: 15pt'>test</span></font>",
+			yahoo_codes_to_html("<font size='15'>test"));
+	assert_string_equal_free("<font><span style='font-size: 32pt'>size 32</span></font>",
+			yahoo_codes_to_html("<font size='32'>size 32"));
 
 	/* combinations */
-	assert_string_equal_free("<span style=\"color: #FF0080\"><font><span style=\"font-size: 15pt\">test",
-			yahoo_codes_to_html("\x1B[35m<font size=\"15\">test"));
+	assert_string_equal_free("<font face='Georgia'><span style='font-size: 32pt'>test</span></font>",
+			yahoo_codes_to_html("<font face='Georgia' size='32'>test"));
+	assert_string_equal_free("<span style='color: #FF0080'><font><span style='font-size: 15pt'>test</span></font></span>",
+			yahoo_codes_to_html("\x1B[35m<font size='15'>test"));
 #else
 	/* font color */
-	assert_string_equal_free("<font color=\"#0000FF\">blue",
+	assert_string_equal_free("<font color='#0000FF'>blue</font>",
 			yahoo_codes_to_html("\x1B[31mblue"));
-	assert_string_equal_free("<font color=\"#70ea15\">custom color",
+	assert_string_equal_free("<font color='#70ea15'>custom color</font>",
 			yahoo_codes_to_html("\x1B[#70ea15mcustom color"));
+	assert_string_equal_free("test",
+			yahoo_codes_to_html("<ALT #ff0000,#00ff00,#0000ff>test</ALT>"));
+
+	/* font face */
+	assert_string_equal_free("<font face='Georgia'>test</font>",
+			yahoo_codes_to_html("<font face='Georgia'>test"));
 
 	/* font size */
-	assert_string_equal_free("<font size=\"4\" absz=\"15\">test",
-			yahoo_codes_to_html("<font size=\"15\">test"));
-	assert_string_equal_free("<font size=\"6\" absz=\"32\">size 32",
-			yahoo_codes_to_html("<font size=\"32\">size 32"));
+	assert_string_equal_free("<font size='4' absz='15'>test</font>",
+			yahoo_codes_to_html("<font size='15'>test"));
+	assert_string_equal_free("<font size='6' absz='32'>size 32</font>",
+			yahoo_codes_to_html("<font size='32'>size 32"));
 
 	/* combinations */
-	assert_string_equal_free("<font color=\"#FF0080\"><font size=\"4\" absz=\"15\">test",
-			yahoo_codes_to_html("\x1B[35m<font size=\"15\">test"));
+	assert_string_equal_free("<font face='Georgia' size='6' absz='32'>test</font>",
+			yahoo_codes_to_html("<font face='Georgia' size='32'>test"));
+	assert_string_equal_free("<font color='#FF0080'><font size='4' absz='15'>test</font></font>",
+			yahoo_codes_to_html("\x1B[35m<font size='15'>test"));
 #endif /* !USE_CSS_FORMATTING */
 }
 END_TEST
--- a/libpurple/xmlnode.h	Mon Aug 03 00:46:28 2009 +0000
+++ b/libpurple/xmlnode.h	Wed Aug 05 01:34:35 2009 +0000
@@ -53,10 +53,10 @@
 	XMLNodeType type;		/**< The type of the node. */
 	char *data;			/**< The data for the node. */
 	size_t data_sz;			/**< The size of the data. */
-	struct _xmlnode *parent;	/**< The parent node or @c NULL.*/
-	struct _xmlnode *child;		/**< The child node or @c NULL.*/
-	struct _xmlnode *lastchild;	/**< The last child node or @c NULL.*/
-	struct _xmlnode *next;		/**< The next node or @c NULL. */
+	xmlnode *parent;            /**< The parent node or @c NULL.*/
+	xmlnode *child;             /**< The child node or @c NULL.*/
+	xmlnode *lastchild;         /**< The last child node or @c NULL.*/
+	xmlnode *next;              /**< The next node or @c NULL. */
 	char *prefix;               /**< The namespace prefix if any. */
 	GHashTable *namespace_map;  /**< The namespace map. */
 };
--- a/pidgin/gtkstatusbox.c	Mon Aug 03 00:46:28 2009 +0000
+++ b/pidgin/gtkstatusbox.c	Wed Aug 05 01:34:35 2009 +0000
@@ -466,7 +466,7 @@
 		const char *filename = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon");
 		PurpleStoredImage *img = NULL;
 
-		if (filename != NULL)
+		if (filename && *filename)
 			img = purple_imgstore_new_from_file(filename);
 
 		pidgin_status_box_set_buddy_icon(status_box, img);
--- a/po/ChangeLog	Mon Aug 03 00:46:28 2009 +0000
+++ b/po/ChangeLog	Wed Aug 05 01:34:35 2009 +0000
@@ -3,6 +3,8 @@
 version 2.6.0
 	* Afrikaans translation updated (Friedel Wolff)
 	* Armenian translation added (David Avsharyan)
+	* Basque translation updated under new translator (Mikel Pascual
+	  Aldabaldetreku)
 	* Bengali translation updated (Samia Niamatullah)
 	* Catalan translation updated (Josep Puigdemont)
 	* Chinese (Simplified) translation updated under new
@@ -10,8 +12,6 @@
 	* Czech translation updated (David Vachulka)
 	* Dutch translation updated (Daniël Heres)
 	* English (British) translation updated (Luke Ross)
-	* Euskera (Basque) translation updated under new translator
-	  (Mikel Pascual Aldabaldetreku)
 	* Finnish translation updated (Timo Jyrinki)
 	* French translation updated (Éric Boumaour)
 	* Galician translation updated (Frco. Javier Rial Rodríguez)
@@ -27,6 +27,7 @@
 	* Russian translation updated (Антон Самохвалов)
 	* Slovak translation updated (loptosko)
 	* Slovenian translation updated (Martin Srebotnjak)
+	* Spanish translation updated (Javier Fernández-Sanguino)
 	* Swahili translation added (Paul Msegeya)
 	* Swedish translation updated (Peter Hjalmarsson)
 
--- a/po/es.po	Mon Aug 03 00:46:28 2009 +0000
+++ b/po/es.po	Wed Aug 05 01:34:35 2009 +0000
@@ -6,7 +6,7 @@
 # Copyright (c) December 2003, Francisco Javier F. Serrador
 #               <franciscojavier.fernandez.serrador@hispalinux.es>, 2003.
 # Copyright (C) June 2002, April 2003, January 2004, March 2004, September 2004,
-# 	      January 2005, 2006-2008
+# 	      January 2005, 2006-2008, July 2009
 # 		Javier Fernández-Sanguino Peña  <jfs@debian.org>
 #
 # Agradecemos la ayuda de revisión realizada por:
@@ -52,14 +52,15 @@
 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-01-05 00:05+0100\n"
+"POT-Creation-Date: 2009-07-22 09:57-0400\n"
+"PO-Revision-Date: 2009-08-05 01:47+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-POFile-SpellExtra: gt cian PUFs gg SIP changePassword\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -70,7 +71,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Intente `%s -h' para más información.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -84,10 +85,8 @@
 "%s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
-"configuración\n"
-"  -d, --debug          imprimir mensajes de depuración en la salida "
-"estándar\n"
+"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de configuración\n"
+"  -d, --debug          imprimir mensajes de depuración en la salida estándar de error\n"
 "  -h, --help           mostrar este mensaje y salir\n"
 "  -n, --nologin        no conectarse de forma automática\n"
 "  -v, --version        mostrar la versión actual y salir\n"
@@ -921,12 +920,11 @@
 msgid "System Log"
 msgstr "Registro del Sistema"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "Calculando..."
+msgstr "Llamando..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "Colgar"
 
 #. Number of actions
 msgid "Accept"
@@ -936,25 +934,24 @@
 msgstr "Rechazar"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "Llamada en curso."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "La llamada se ha cancelado."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s desea empezar una sesión de audio contigo."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s está intentando empezar una sesión con vd. con un tipo de medio no soportado."
+
 msgid "You have rejected the call."
-msgstr "Ha abandonado el canal %s%s"
+msgstr "Ha rechazado la llamada."
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "llamar: Hacer una llamada de audio."
 
 msgid "Emails"
 msgstr "Correos"
@@ -1612,22 +1609,23 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Obteniendo TinyURL..."
 
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "Sólo crear urls de TinyURL cuando sean de esta longitudo o superior"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "Prefijo de dirección de TinyURL (u otro)"
+
 msgid "TinyURL"
-msgstr "URL de música"
+msgstr "TiniyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "Complemento TinyURL"
 
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "Cuando se reciba un mensaje con URL(s) utilizar TinyURL para facilitar su copia"
 
 msgid "accounts"
 msgstr "cuentas"
@@ -1744,6 +1742,7 @@
 "El certificado presentado por «%s» es autofirmado. No puede comprobarse de "
 "forma automática."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "La cadena de certificados presentada por %s no es válida."
@@ -1753,6 +1752,7 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
+#. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Error de certificado SSL"
 
@@ -1835,7 +1835,6 @@
 msgstr "+++ %s se ha desconectado"
 
 #. Unknown error
-#. Unknown error!
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -1882,9 +1881,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s ha salido de la sala (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "Invitar a conferencia"
+msgstr "Invitar a un chat"
 
 #. Put our happy label in it.
 msgid ""
@@ -2027,6 +2025,10 @@
 msgstr "Comienza la transferencia de %s de %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Se ha completado la transferencia de <A HREF=\"file://%s\">%s</A>"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Se ha completado la transferencia de %s"
 
@@ -2241,9 +2243,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPUESTA AUTOMÁTICA>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "Error al crear la conexión"
+msgstr "Error al crear la conferencia."
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2654,7 +2655,6 @@
 msgstr "Incluir otros registros de clientes de MI en el visor de registro."
 
 #. * 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"
@@ -2662,12 +2662,9 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Cuando consulte los registros este complemento incluirá registros de otros "
-"clientes de IM. Actualmente, esto incluye a Adium, MSN Messenger y "
-"Trillian.\n"
-"\n"
-"AVISO: Este complemento aún es código en «alpha» y puede bloquearse con "
-"frecuencia. ¡Uselo bajo su propia responsabilidad!"
+"Cuando consulte los registros este complemento incluirá registros de otros clientes de IM. Actualmente, esto incluye a Adium, MSN Messenger, aMSN y Trillian.\n"
+"\n"
+"AVISO: Este complemento aún es código en estado «alpha» y puede bloquearse con frecuencia. ¡Uselo bajo su propia responsabilidad!"
 
 msgid "Mono Plugin Loader"
 msgstr "Cargador de complementos Mono"
@@ -2713,13 +2710,10 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Guardar los mensajes enviados como un aviso."
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
-msgstr ""
-"El resto de los mensajes se guardarán como un aviso. Puede editar y eliminar "
-"los avisos en el diálogo «Aviso de amigo»."
+msgstr "El resto de los mensajes se guardarán como avisos. Puede editar y eliminar los avisos en el diálogo «Aviso de amigo»."
 
 #, c-format
 msgid ""
@@ -2747,9 +2741,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "No preguntar. Siempre guardar como un aviso."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "Introduzca la contraseña"
+msgstr "Contraseña de un solo uso"
 
 #. *< type
 #. *< ui_requirement
@@ -2758,13 +2751,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Soporte de contraseñas de un solo uso"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Obligar a que las contraseñas sólo se utilicen una vez."
 
 #. *  description
 msgid ""
@@ -2772,6 +2765,8 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Permite obligar, en cada cuenta de forma independiente, que sólo se utilicen una vez las contraseñas no guardadas usadas en una conexión con éxito.\n"
+"Nota: Para que ésto funcione no debe guardarse la contraseña de la cuenta."
 
 #. *< type
 #. *< ui_requirement
@@ -2967,18 +2962,13 @@
 "No se pudo detectar la instalación de ActiveTCL. Debe instalar ActiveTCL de "
 "http://www.activestate.com si desea utilizar los complementos TCL\n"
 
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
-msgstr ""
-"No se encontró el conjunto de herramientas Apple Bonjour para Windows. Para "
-"más información consulte las preguntas frecuentas (FAQ) en http://d.pidgin."
-"im/wiki/BonjourWindows."
-
-#, fuzzy
+msgstr "No se encontró el conjunto de herramientas Apple «Bonjour para Windows». Para más información consulte en http://d.pidgin.im/wiki/BonjourWindows."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "No se pudieron escuchar las conexiones MI entrantes\n"
+msgstr "No se pudieron escuchar las conexiones MI entrantes"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3018,9 +3008,8 @@
 msgstr "Persona morada"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Localidad"
+msgstr "Puerto local"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -3032,21 +3021,17 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "No se pudo enviar el mensaje, no se pudo iniciar la conversación."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"No se pudo crear el socket:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "No se pudo crear el socket: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "No se pudo vincular el socket al puerto"
-
-#, fuzzy, c-format
+msgstr "No se pudo vincular el socket al puerto: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"No se pudo crear el socket:\n"
-"%s"
+msgstr "No se pudo escuchar el socket: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Error comunicándose con el servicio «mDNSResponder» local."
@@ -3096,17 +3081,14 @@
 msgid "Load buddylist from file..."
 msgstr "Cargar la lista de amigos desde archivo..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Rellene los campos de registro."
-
-#, fuzzy
+msgstr "Debe rellenar todos los campos de registro."
+
 msgid "Passwords do not match"
-msgstr "Las contraseñas no coinciden."
-
-#, fuzzy
+msgstr "Las contraseñas no coinciden"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "No se pudo registrar la cuenta nueva. Se produjo un error.\n"
+msgstr "No se pudo registrar la nueva cuenta. Se produjo un error desconocido."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Se ha registrado una nueva cuenta Gadu-Gadu"
@@ -3121,11 +3103,10 @@
 msgstr "Contraseña (de nuevo)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Introducir texto del captcha"
+
 msgid "Captcha"
-msgstr "Guardar imagen"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrando cuenta nueva de Gadu-Gadu"
@@ -3264,9 +3245,9 @@
 msgid "Chat _name:"
 msgstr "_Nombre de chat:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "No se pudo resolver el nombre del servidor."
+msgstr "No se pudo resolver el nombre del servidor '%s': %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3279,9 +3260,8 @@
 msgid "This chat name is already in use"
 msgstr "Ya existe un chat con ese nombre"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "No está conectado al servidor."
+msgstr "No está conectado al servidor"
 
 msgid "Find buddies..."
 msgstr "Encontrar amigos... "
@@ -3322,9 +3302,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Obteniendo el servidor"
+msgstr "Servidor GG"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3340,9 +3319,8 @@
 msgid "File Transfer Failed"
 msgstr "Falló la transferencia de archivos"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "No se pudo abrir un puerto de escucha."
+msgstr "No se pudo abrir un puerto para la escucha."
 
 msgid "Error displaying MOTD"
 msgstr "Error al mostrar el MOTD"
@@ -3364,11 +3342,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 ""
-"Se perdió la conexión con el servidor:\n"
-"%s"
+msgstr "Se perdió la conexión con el servidor: %s"
 
 msgid "View MOTD"
 msgstr "Ver MOTD"
@@ -3379,9 +3355,8 @@
 msgid "_Password:"
 msgstr "Contra_seña:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Los apodos de IRC no pueden tener espacios en blanco"
+msgstr "Los apodos y servidores de IRC no pueden tener espacios en blanco"
 
 msgid "SSL support unavailable"
 msgstr "Soporte SSL no disponible"
@@ -3390,13 +3365,13 @@
 msgstr "No se pudo conectar"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "No se pudo conectar a %s"
-
-#, fuzzy, c-format
+msgstr "No se pudo conectar: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "El servidor ha cerrado la conexión."
+msgstr "El servidor ha cerrado la conexión"
 
 msgid "Users"
 msgstr "Usuarios"
@@ -3567,9 +3542,7 @@
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
-msgstr ""
-"El servidor rechazó el nombre que escogió para su cuenta. Es posible que "
-"incluya caracteres inválidos."
+msgstr "El servidor rechazó el apodo que escogió para su cuenta. Es posible que incluya caracteres inválidos."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
@@ -3581,13 +3554,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 "Ya existe un chat con ese nombre"
-
-#, fuzzy
+msgstr "Ya se está utilizando el apodo \"%s\"."
+
 msgid "Nickname in use"
-msgstr "Apodo: %s\n"
+msgstr "Apodo en uso"
 
 msgid "Cannot change nick"
 msgstr "No se puede cambiar el alias"
@@ -3829,12 +3801,9 @@
 msgid "execute"
 msgstr "ejecutar"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"El servidor requiere SSL para conectarse. No se dispone de soporte TLS/SSL."
-
-#, fuzzy
+msgstr "El servidor requiere TLS/SSL, pero no se ha encontrado soporte para TLS/SSL."
+
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Vd. solicita cifrado, pero no se dispone de soporte TLS/SSL."
 
@@ -3852,13 +3821,11 @@
 msgid "Plaintext Authentication"
 msgstr "Autenticación en claro"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Falló la autenticación"
-
-#, fuzzy
+msgstr "Falló la autenticación SASL"
+
 msgid "Invalid response from server"
-msgstr "Respuesta inválida del servidor."
+msgstr "Respuesta inválida del servidor"
 
 msgid "Server does not use any supported authentication method"
 msgstr "El servidor no usa un método de autenticación conocido"
@@ -3869,36 +3836,28 @@
 msgid "Invalid challenge from server"
 msgstr "Desafío inválido del servidor"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "Error de SASL"
+msgstr "Error de SASL: %s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "El gestor de conexiones BOSH terminó su sesión."
+
 msgid "No session ID given"
-msgstr "No se indicó una razón"
-
-#, fuzzy
+msgstr "No se ha obtenido un ID de sesión"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Versión no soportada"
-
-#, fuzzy
+msgstr "Versión del protocolo BOSH no soportada"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"No se pudo establecer una conexión con el servidor:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "No se pudo establecer una conexión con el servidor"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"No se pudo establecer una conexión con el servidor:\n"
-"%s"
-
-#, fuzzy
+msgstr "No se pudo establecer una conexión con el servidor: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "No se pudo inicializar la conexión"
+msgstr "No se pudo establecer una conexión SSL"
 
 msgid "Full Name"
 msgstr "Nombre completo"
@@ -3966,9 +3925,8 @@
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "Archivo local:"
+msgstr "Hora local:"
 
 msgid "Priority"
 msgstr "Prioridad"
@@ -3978,11 +3936,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "hace %s"
+
 msgid "Logged Off"
-msgstr "Conectado"
+msgstr "Desconectado"
 
 msgid "Middle Name"
 msgstr "Nombre medio"
@@ -4152,26 +4109,22 @@
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Apodo:"
-
-#, fuzzy
+msgstr "Afiliaciones:"
+
 msgid "No users found"
-msgstr "No se encontraron usuarios que coincidan"
-
-#, fuzzy
+msgstr "No se encontraron usuarios"
+
 msgid "Roles:"
-msgstr "Rol"
-
-#, fuzzy
+msgstr "Roles:"
+
 msgid "Ping timed out"
-msgstr "Tiempo de expiración del ping"
+msgstr "Expiró el «ping»"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
-msgstr ""
+msgstr "No se pudo encontrar un método de conexión XMPP alternativo después de intentar conectar directamente sin éxito."
 
 msgid "Invalid XMPP ID"
 msgstr "XMPP ID no válido"
@@ -4179,9 +4132,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID inválido. Debe establecerse el dominio."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "No se pudo conectar al servidor."
+msgstr "URL BOSH malformada"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4253,10 +4205,6 @@
 msgid "Change Registration"
 msgstr "Cambiar registro"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "No se pudo conectar al servidor."
-
 msgid "Error unregistering account"
 msgstr "Error al deregistrar la cuenta"
 
@@ -4542,21 +4490,19 @@
 msgid "Unable to ping user %s"
 msgstr "No puede hacer un ping al usuario %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "No se pudo dar el codazo porque no se sabe nada del usuario %s."
-
-#, fuzzy, c-format
+msgstr "No se pudo dar el codazo, porque no se sabe nada de %s."
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr ""
-"No se pudo dar el codazo porque puede que el usuario %s esté desconectado."
-
-#, fuzzy, c-format
+msgstr "No se pudo dar el codazo, puede que %s esté desconectado."
+
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr ""
-"No se pudo dar un codazo porque el usuario %s no tiene soporte para ello."
+msgstr "No se pudo dar un codazo, puede que %s no tenga soporte para ello o no desea recibir codazos ahora."
 
 #, c-format
 msgid "Buzzing %s..."
@@ -4571,36 +4517,32 @@
 msgid "%s has buzzed you!"
 msgstr "¡%s le ha dado un codazo!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "No se pudo enviar el archivo a %s, JID inválido"
-
-#, fuzzy, c-format
+msgstr "No se pudo enviar el medio a %s: JID inválido"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "No se pudo enviar el archivo a %s, el usuario no está conectado"
-
-#, fuzzy, c-format
+msgstr "No se pudo enviar el medio a %s: el usuario no está conectado"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr ""
-"No se pudo enviar el archivo a %s, no está suscrito a la presencia del "
-"usuario"
-
-#, fuzzy
+msgstr "No se pudo enviar el medio a %s: no está suscrito a la presencia del usuario"
+
 msgid "Media Initiation Failed"
-msgstr "Falló el registro"
-
-#, fuzzy, c-format
+msgstr "Falló la inicialización del medio"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "Elija el recurso de %s al que quiera enviar un archivo"
+msgstr "Elija el recurso de %s con el que quiere comenzar un intercambio de medio"
 
 msgid "Select a Resource"
 msgstr "Seleccione un recurso"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "Iniciar _chat"
+msgstr "Iniciar medio"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
@@ -4620,21 +4562,15 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;usuario&gt; [razón]:  Echar a un usuario de la sala."
 
-#, 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 "
-"la afiliación de un usuario a la sala."
-
-#, fuzzy
+msgstr "affiliate &lt;owner|admin|member|outcast|none&gt; [alias1] [alias2] ...: Obtener los usuarios con una afiliación o fijar la afiliación de un usuario a la 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 ""
-"rol &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir el "
-"rol de un usuario en la sala."
+msgstr "role &lt;moderator|participant|visitor|none&gt; [alias1] [alias2] ...: Obtener los usuarios con un rol o definir el rol de un usuario en la sala."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuario&gt; [mensaje]:  Invitar a un usuario a la sala."
@@ -4676,10 +4612,10 @@
 msgstr "Dominio"
 
 msgid "Require SSL/TLS"
-msgstr "Requiere SSL/TLS"
+msgstr "Requerir cifrado SSL/TLS"
 
 msgid "Force old (port 5223) SSL"
-msgstr "Forzar SSL antiguo (puerto 5323)"
+msgstr "Forzar el uso de cifrado SSL antiguo (puerto 5223)"
 
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permitir autenticación en claro sobre canales no cifrados"
@@ -4697,7 +4633,7 @@
 msgstr "Pasarelas de transferencia de archivos"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "URL BOSH"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4761,32 +4697,28 @@
 msgid "_Accept Defaults"
 msgstr "_Aceptar valores por omisión"
 
-#, fuzzy
 msgid "No reason"
-msgstr "No se indicó una razón"
-
-#, fuzzy, c-format
+msgstr "No hay razón"
+
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Ha sido expulsado por %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Ha sido 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 "Se produjo un error al abrir el archivo."
-
-#, fuzzy
+msgstr "Se produjo un error en la transferencia de flujos de bytes en banda\n"
+
 msgid "Transfer was closed."
-msgstr "Falló la transferencia de archivos"
-
-#, fuzzy
+msgstr "Se cerró la transferencia."
+
 msgid "Failed to open the file"
-msgstr "No se pudo abrir el archivo «%s»: %s"
+msgstr "No se pudo abrir el archivo"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Fallo al abrir un flujo de bytes en banda"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -5115,11 +5047,25 @@
 msgid "Non-IM Contacts"
 msgstr "Contacto no MI"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s le envío un guiño. <a href='msn-wink://%s'>Pulse aquí para reproducirlo</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s le envío un guiño, pero no pudo salvarse"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s le envío un mensaje de voz. <a href='audio://%s'>Pulse aquí para escucharlo</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s le ha enviado un mensaje de voz, pero no pudo salvarse"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr ""
-"%s le ha enviado una invitación para utilizar la webcam, algo aún no "
-"soportado."
+msgstr "%s le ha enviado una invitación de chat de voz, pero no está aún no soportado."
 
 msgid "Nudge"
 msgstr "Codazo"
@@ -5275,6 +5221,27 @@
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada."
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr "No se pudo añadir al amigo %s porque el nombre de usuario no es válido. Los nombres de usuario deben ser direcciones de correo válidas."
+
+msgid "Unable to Add"
+msgstr "No se pudo añadir"
+
+msgid "Authorization Request Message:"
+msgstr "Mensaje de solicitud 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 "Error al obtener el perfil"
 
@@ -5469,13 +5436,14 @@
 msgid "%s just sent you a Nudge!"
 msgstr "¡%s le acaba de dar un codazo!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Error desconocido (%d)"
+msgstr "Error desconocido (%d): %s"
 
 msgid "Unable to add user"
 msgstr "No puede añadir al usuario"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Error desconocido (%d)"
@@ -5549,26 +5517,22 @@
 "Error de conexión del servidor %s:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "El servidor no soporta nuestro protocolo."
-
-#, fuzzy
+msgstr "El servidor no soporta nuestro protocolo"
+
 msgid "Error parsing HTTP"
-msgstr "Error en el análisis HTTP."
-
-#, fuzzy
+msgstr "Error en el análisis HTTP"
+
 msgid "You have signed on from another location"
-msgstr "Ha conectado desde otra ubicación."
+msgstr "Se ha conectado desde otra ubicación"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "Los servidores de MSN van a sufrir un apagado temporal."
+msgstr "Los servidores de MSN van a sufrir un apagado temporal"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5598,11 +5562,9 @@
 msgid "Retrieving buddy list"
 msgstr "Recuperando lista de amigos"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
-"%s le ha enviado una invitación para utilizar la webcam, algo aún no "
-"soportado."
+msgstr "%s le ha enviado una invitación para utilizar la webcam, algo aún no soportado"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -5801,16 +5763,12 @@
 msgid "Protocol error, code %d: %s"
 msgstr "Error de prótocolo, 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, su contraseña es de %d caracteres, esto es más de la longitud máxima "
-"esperada (%d) para MySpaceIM. Reduzca el tamaño de su contraseña en «http://"
-"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword» "
-"e inténtelo de nuevo."
+msgstr "%s, su contraseña es de %zu caracteres, esto es más de la longitud máxima esperada (%d). Reduzca el tamaño de su contraseña en «http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword» e inténtelo de nuevo."
 
 msgid "Incorrect username or password"
 msgstr "Nombre de usuario o contraseña incorrecta"
@@ -5906,15 +5864,11 @@
 msgid "Client Version"
 msgstr "Versión del cliente"
 
-#, 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 ""
-"Por favor, vaya a http://editprofile.myspace.com/index.cfm?"
-"fuseaction=profile.username, escoja un nombre de usuario e intente "
-"conectarse de nuevo."
+msgstr "Se produjo un error al intentar fijar el nombre de usuario. Inténtelo de nuevo o vaya a «http://editprofile.myspace.com/index.cfm?fuseaction=profile.username» para fijar su nombre de usuario."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nombre de usuario disponible"
@@ -6174,9 +6128,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "Error desconocido: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "No pudo conectarse"
+msgstr "No pudo conectarse: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6311,13 +6265,10 @@
 "No parece que %s esté conectado y no ha recibido el mensaje que acaba de "
 "enviar."
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
-msgstr ""
-"No se pudo contactar con el servidor. Por favor, indique la dirección del "
-"servidor con el que desea conectarse."
+msgstr "No se pudo conectar con el servidor. Por favor, indique la dirección del servidor con el que desea conectarse."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Se ha cerrado esta conferencia. No se pueden enviar más mensajes."
@@ -6341,9 +6292,8 @@
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba."
+msgstr "Se recibió una respuesta que no se esperaba de "
 
 #. username connecting too frequently
 msgid ""
@@ -6354,12 +6304,12 @@
 "inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
 "tiempo."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Error al solicitar un testigo de conexión"
+msgstr "Error al solicitar "
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL no permite que su nombre de usuario se autentique aquí"
 
 msgid "Could not join chat room"
 msgstr "No se pudo conectar a la sala de chat"
@@ -6367,9 +6317,8 @@
 msgid "Invalid chat room name"
 msgstr "Nombre de sala de chat inválida"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "Se recibieron datos inválidos al conectarse al servidor."
+msgstr "Se recibieron datos inválidos al conectarse al servidor"
 
 #. *< type
 #. *< ui_requirement
@@ -6416,7 +6365,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "Se recibieron datos inválidos en la conexión con el usuario remoto."
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "No se pudo establecer una conexión con el usuario remoto."
 
@@ -6581,7 +6529,7 @@
 msgstr "Seguridad activada"
 
 msgid "Video Chat"
-msgstr "Video chat"
+msgstr "Vídeo chat"
 
 msgid "iChat AV"
 msgstr "iChat AV"
@@ -6619,15 +6567,13 @@
 msgid "Buddy Comment"
 msgstr "Comentario de amigo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"No se pudo conectar al servidor de autenticación:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "No se pudo conectar al servidor de autenticación: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "No se pudo conectar al servidor."
+msgstr "No se pudo conectar al servidor BOS: %s"
 
 msgid "Username sent"
 msgstr "Nombre de usuario enviado"
@@ -6639,20 +6585,16 @@
 msgid "Finalizing connection"
 msgstr "Terminando la 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 ""
-"Incapaz de registrarse: No pudo conectarse como %s porque el nombre de "
-"usuario no es válido. Los nombres de usuario deben ser direcciones de correo "
-"válidas, o empezar con una letra y sólo pueden contener letras, números y "
-"espacios, o contener sólo números."
-
-#, fuzzy, c-format
+msgstr "Incapaz de registrarse como %s porque el nombre de usuario no es válido. Los nombres de usuario deben ser direcciones de correo válidas, o empezar con una letra y sólo pueden contener letras, números y espacios, o contener sólo números."
+
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Quizá sea desconectado en breve.  Compruebe %s para novedades."
+msgstr "Quizá sea desconectado en breve.  Si sucede esto, consulte %s para ver las actualizaciones disponibles."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "No se pudo obtener un «hash» de conexión a AIM válido."
@@ -6666,20 +6608,19 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "El usuario no existe"
+msgstr "El nombre de usuario no existe"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Su cuenta está deshabilitada actualmente."
+msgstr "Su cuenta está deshabilitada actualmente"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
@@ -6687,18 +6628,13 @@
 "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 ""
-"Se ha conectado y desconectado demasiadas veces. Espere diez minutos e "
-"inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
-"tiempo."
-
-#, fuzzy
+msgstr "Se ha conectado y desconectado demasiadas veces. Espere un minuto e inténtelo de nuevo. Si sigue intentándolo ahora, necesitará esperar incluso más tiempo."
+
 msgid "The SecurID key entered is invalid"
-msgstr "La clave SecurID que se ha introducido no es válida."
+msgstr "La clave SecurID introducida no es válida"
 
 msgid "Enter SecurID"
 msgstr "Introduzca SecurID"
@@ -6706,12 +6642,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduzca el dígito de seis números que aparece en la pantalla."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_Aceptar"
-
 msgid "Password sent"
 msgstr "Contraseña enviada"
 
@@ -6721,12 +6651,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Por favor, autoríceme para que pueda añadirle a mi lista de amigos."
 
-msgid "Authorization Request Message:"
-msgstr "Mensaje de solicitud de autorización:"
-
-msgid "Please authorize me!"
-msgstr "¡Por favor, autoríceme!"
-
 msgid "No reason given."
 msgstr "No se indicó una razón."
 
@@ -7056,7 +6980,7 @@
 msgid "Away message too long."
 msgstr "Mensaje de ausencia demasiado largo"
 
-#, 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, "
@@ -7066,9 +6990,6 @@
 "nombres de usuario deben ser direcciones de correo válidas o empezar con una "
 "letra y contener sólo letras, números y espacios, o contener sólo números."
 
-msgid "Unable to Add"
-msgstr "No se pudo añadir"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "No se ha podido obtener la lista de amigos"
 
@@ -7083,18 +7004,16 @@
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#, 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 ""
-"No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
-"lista de amigos. Por favor, elimine uno y vuelva a probar."
+msgstr "No se ha podido añadir al amigo %s porque hay demasiados contactos en su lista de amigos. Elimine uno y vuelva a probar."
 
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "No se pudo añadir al amigo %s por motivos desconocidos."
 
@@ -7259,9 +7178,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "El usuario no está conectado"
+msgstr "Utilizar «clientLogin»"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7461,30 +7379,26 @@
 msgstr "Nota"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Icono de amigo"
+msgstr "Memo de amigo"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "Cambiar su memo como desee"
+
 msgid "_Modify"
-msgstr "Modificar"
-
-#, fuzzy
+msgstr "_Modificar"
+
 msgid "Memo Modify"
-msgstr "Modificar"
-
-#, fuzzy
+msgstr "Modificar Memo"
+
 msgid "Server says:"
-msgstr "Servidor ocupado"
+msgstr "El servidor dice:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "Su solicitud fué aceptada."
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "Su solicitud fué rechazada."
 
 #, c-format
 msgid "%u requires verification"
@@ -7795,12 +7709,11 @@
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Agradecimientos</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b>Autor original</b>:<br>\n"
+msgstr "<p><b>Probadores escrupulosos</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "y más, por favor, háganoslo saber.. ¡gracias!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Y, todos los chicos entre bastidores...</i><br>\n"
@@ -7827,9 +7740,8 @@
 msgid "About OpenQ"
 msgstr "Acerca de OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "Modiciar el domicilio"
+msgstr "Modiciar memo de amigo"
 
 #. *< type
 #. *< ui_requirement
@@ -7869,7 +7781,7 @@
 msgstr "Mostrar noticas del servidor"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "Mostrar la sala de chat cuando venga un mensaje"
 
 msgid "Keep alive interval (seconds)"
 msgstr "Intervalo de comprobación de conexión (segundos)"
@@ -7877,7 +7789,6 @@
 msgid "Update interval (seconds)"
 msgstr "Intervalo de actualización (segundos)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "No se pudo descifrar la respuesta del servidor"
 
@@ -7913,7 +7824,7 @@
 msgstr "¡Falló la autenticación del «captcha»!"
 
 msgid "Captcha Image"
-msgstr "Guardar imagen"
+msgstr "Imagen captcha"
 
 msgid "Enter code"
 msgstr "Introduzca el código"
@@ -7945,9 +7856,8 @@
 msgid "Requesting token"
 msgstr "Solicitando testingo"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "No se pudo resolver el nombre del servidor."
+msgstr "No se pudo resolver el nombre del sistema"
 
 msgid "Invalid server or port"
 msgstr "Puerto o servidor no válido"
@@ -7965,7 +7875,7 @@
 "%s\n"
 "%s"
 msgstr ""
-"Noticas del servidor:\n"
+"Noticias del servidor:\n"
 "%s\n"
 "%s\n"
 "%s"
@@ -8000,9 +7910,8 @@
 msgid "QQ Qun Command"
 msgstr "Orden QQ Qun"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "No se pudo descifrar la respuesta al intento de registro"
+msgstr "No se pudo descifrar la respuesta a la solicitud conexión"
 
 msgid "Unknown LOGIN CMD"
 msgstr "LOGIN CMD desconocido"
@@ -8993,9 +8902,8 @@
 msgid "Disconnected by server"
 msgstr "Desconectado por el servidor"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "Se produjo un error durante la conexión al servidor SILC"
+msgstr "Error al conectarse al servidor SILC"
 
 msgid "Key Exchange failed"
 msgstr "Falló el intercambio de claves"
@@ -9009,22 +8917,16 @@
 msgid "Performing key exchange"
 msgstr "Realizando intercambio de claves"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "No se pudo cargar la clave pública SILC"
+msgstr "No se pudo cargar el par de claves SILC"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Conectando con el servidor SILC"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "No se pudo cargar la clave pública SILC"
-
 msgid "Out of memory"
 msgstr "Sin memoria"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "No se pudo inicializar el protocolo SILC"
 
@@ -9059,7 +8961,7 @@
 msgstr "MMS"
 
 msgid "Video conferencing"
-msgstr "Video conferencia"
+msgstr "Vídeo-conferencia"
 
 msgid "Your Current Status"
 msgstr "Su estado actual"
@@ -9325,9 +9227,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Creando el par de claves SILC..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "No se pudo crear el par de claves SILC\n"
+msgstr "No se pudo crear el par de claves SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9393,7 +9294,7 @@
 msgstr "Enviar"
 
 msgid "Video Conferencing"
-msgstr "Video conferencia"
+msgstr "Vídeo-conferencia"
 
 msgid "Computer"
 msgstr "Ordenador"
@@ -9467,27 +9368,24 @@
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Falló la autenticación"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "No se pudo inicializar al conexión del cliente SILC"
+msgstr "No se pudo inicializar la conexión del cliente SILC"
 
 msgid "John Noname"
 msgstr "Pepe sin nombre"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "No se pudo cargar la clave pública SILC: %s"
+msgstr "No se pudo cargar el par de claves SILC: %s"
 
 msgid "Unable to create connection"
 msgstr "No se pudo crear la conexión"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Respuesta desconocida del servidor."
-
-#, fuzzy
+msgstr "Respuesta desconocida del servidor"
+
 msgid "Unable to create listen socket"
-msgstr "No se pudo crear el socket"
+msgstr "No se pudo crear el puerto para escuchar peticiones"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
@@ -9551,9 +9449,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Complemento de protocolo Yahoo"
+msgstr "Complemento de protocolo Yahoo!"
 
 msgid "Pager server"
 msgstr "Servidor buscapersonas"
@@ -9582,9 +9479,8 @@
 msgid "Yahoo Chat port"
 msgstr "Puerto de chat de Yahoo"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "ID de Yahoo..."
+msgstr "ID de Yahoo Japón..."
 
 #. *< type
 #. *< ui_requirement
@@ -9596,12 +9492,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Complemento de protocolo Yahoo"
+msgstr "Complemento de protocolo Yahoo! Japón"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Se ha enviado su SMS"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Su mensaje Yahoo! no se envió."
@@ -9628,32 +9523,24 @@
 msgstr "Se rechazó la adición del amigo"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "Se recibieron datos inválidos al conectarse al servidor."
+msgstr "Recibidos datos inválidos"
 
 #. 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 ""
-"Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
-"posible que ésto se arregle."
+msgstr "Cuenta bloqueada: demasiados intentos de conexión fallidos. Si se conecta al servidor de web de Yahoo! es posible que ésto se arregle."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr ""
-"Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
-"posible que ésto se arregle."
+msgstr "Cuenta bloqueada: error desconocido. Si se conecta al servidor de web de Yahoo! es posible que ésto se arregle."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Nombre de usuario o contraseña incorrecta"
+msgstr "Falta el nombre de usuario o contraseña "
 
 #, c-format
 msgid ""
@@ -9689,35 +9576,29 @@
 "Error desconocido número %d. Si se conecta al servidor de web de Yahoo! es "
 "posible que ésto se arregle."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "No se pudo añadir al amigo %s al grupo %s de la lista en el servidor para la "
 "cuenta %s."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "No se pudo añadir el amigo a la lista del servidor"
+msgstr "No se pudo añadir al amigo a la lista del servidor"
 
 #, 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 "Se recibió una respuesta HTTP del servidor que no se esperaba."
-
-#, fuzzy, c-format
+msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Se perdió la conexión con %s:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Se perdió la conexión con %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"No se pudo establecer una conexión con el servidor:\n"
-"%s"
+msgstr "No se pudo establecer una conexión con %s: %s"
 
 msgid "Not at Home"
 msgstr "Fuera de casa"
@@ -9765,7 +9646,7 @@
 msgstr "Comenzar una sesión de Doodle"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Seleccione el ID que quiere activar"
 
 msgid "Join whom in chat?"
 msgstr "¿Con quién quiere juntarse en un chat?"
@@ -9866,11 +9747,8 @@
 msgstr "El perfil del usuario está vacío."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s ha declinado su invitación de conferencia en la sala «%s» por «%s»."
-
-msgid "Invitation Rejected"
-msgstr "Invitación rechazada"
+msgid "%s has declined to join."
+msgstr "%s ha rechazado unirse."
 
 msgid "Failed to join chat"
 msgstr "No se pudo unir al chat"
@@ -9923,9 +9801,8 @@
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Se produjo un problema al conectarse con el servidor YCHT."
+msgstr "Problema de conexión con el servidor YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10053,18 +9930,17 @@
 msgid "Exposure"
 msgstr "Exposición"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s\n"
+msgstr "No se pudo interpretar la respuesta del proxy HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Error de conexión en el proxy HTTP %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr ""
-"Acceso denegado: el servidor proxy HTTP no permite túneles en el puerto %d."
+msgstr "Acceso denegado: el servidor proxy HTTP no permite túneles en el puerto %d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10309,7 +10185,7 @@
 msgid "Error Reading %s"
 msgstr "Error al leer %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~."
@@ -10359,8 +10235,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizar este _icono de amigo para esta cuenta:"
 
-msgid "_Advanced"
-msgstr "_Avanzadas"
+msgid "Ad_vanced"
+msgstr "A_vanzadas"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Usar configuración del proxy de GNOME"
@@ -10422,9 +10298,8 @@
 msgid "Create _this new account on the server"
 msgstr "Crear es_ta nueva cuenta en el servidor"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "Proxy"
+msgid "P_roxy"
+msgstr "Pasa_rela"
 
 msgid "Enabled"
 msgstr "Habilitado"
@@ -10473,9 +10348,8 @@
 msgid "Please update the necessary fields."
 msgstr "Por favor, actualice los campos necesarios."
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "_Cuenta:"
+msgstr "_Cuenta"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10500,16 +10374,14 @@
 msgid "I_M"
 msgstr "_MI"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "Terminar llamada"
+msgstr "Llamada _audio"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Audio/_Vídeollamada"
+
 msgid "_Video Call"
-msgstr "Video chat"
+msgstr "_Vídeollamada"
 
 msgid "_Send File..."
 msgstr "_Enviar archivo..."
@@ -10520,11 +10392,9 @@
 msgid "View _Log"
 msgstr "Ver _registro"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "Ocultar cuando se esté desconectado"
-
-#, fuzzy
+msgstr "Ocultar cuando se está desconectado"
+
 msgid "Show When Offline"
 msgstr "Mostrar cuando se esté desconectado"
 
@@ -10650,9 +10520,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/Herramientas/_Certificados"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Herramientas/_Emoticonos"
+msgstr "/Herramientas/Emot_iconos personalizados"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Herramientas/Com_plementos"
@@ -10781,7 +10650,7 @@
 msgstr "Por estado"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "Por actividad de registro reciente"
 
 #, c-format
 msgid "%s disconnected"
@@ -10798,7 +10667,7 @@
 msgstr "Reactivar"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "PUFs de SSL"
 
 msgid "Welcome back!"
 msgstr "¡Bienvenido!"
@@ -10930,119 +10799,96 @@
 msgid "Background Color"
 msgstr "Color del fondo"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "Se ha añadido este grupo a su lista de amigos."
-
-#, fuzzy
+msgstr "Color de fondo para la lista de amigos"
+
 msgid "Layout"
-msgstr "Laosiano"
+msgstr "Distribución"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "La distribución de iconos, nombres y estados en la blist"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Color del fondo"
-
-#, fuzzy
+msgstr "Color del fondo expandido"
+
 msgid "The background color of an expanded group"
-msgstr "Nombre del color de fondo"
-
-#, fuzzy
+msgstr "Color de fondo para un grupo expandido"
+
 msgid "Expanded Text"
-msgstr "_Expandir"
+msgstr "_Expandir texto"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "La información de texto para un grupo cuando se expande"
+
 msgid "Collapsed Background Color"
-msgstr "Seleccionar el color de fondo"
-
-#, fuzzy
+msgstr "Color de fondo contraído"
+
 msgid "The background color of a collapsed group"
-msgstr "Color de fondo como un GdkColor"
-
-#, fuzzy
+msgstr "El color de fondo de un grupo contraído"
+
 msgid "Collapsed Text"
-msgstr "_Contraer"
+msgstr "Texto contraido"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "La información de texto para cuando un grupo se contrae"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Seleccionar el color de fondo"
-
-#, fuzzy
+msgstr "Color de fondo para contactos/chat"
+
 msgid "The background color of a contact or chat"
-msgstr "Color de fondo como un GdkColor"
-
-#, fuzzy
+msgstr "El color de fondo de un contacto o chat"
+
 msgid "Contact Text"
-msgstr "Atajo de teclado"
+msgstr "Texto de contacto"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "La información de texto cuando se expande un contacto"
+
 msgid "On-line Text"
-msgstr "Conectado"
-
-#, fuzzy
+msgstr "Texto conectado"
+
 msgid "The text information for when a buddy is online"
-msgstr "Obtener información sobre el amigo seleccionado"
-
-#, fuzzy
+msgstr "La información en texto cuando un amigo está en línea"
+
 msgid "Away Text"
-msgstr "Ausente"
-
-#, fuzzy
+msgstr "Texto de ausencia"
+
 msgid "The text information for when a buddy is away"
-msgstr "Obtener información sobre el amigo seleccionado"
-
-#, fuzzy
+msgstr "La información de texto cuando un amigo está austen"
+
 msgid "Off-line Text"
-msgstr "Desconectado"
-
-#, fuzzy
+msgstr "Texto desconectado"
+
 msgid "The text information for when a buddy is off-line"
-msgstr "Obtener información sobre el amigo seleccionado"
-
-#, fuzzy
+msgstr "La información de texto cuando un amigo está desconectado"
+
 msgid "Idle Text"
-msgstr "Inactivo "
-
-#, fuzzy
+msgstr "Texto de inactividad"
+
 msgid "The text information for when a buddy is idle"
-msgstr "Obtener información sobre el amigo seleccionado"
+msgstr "La información de texto cuando un amigo está inactivo"
 
 msgid "Message Text"
 msgstr "Texto de los mensajes"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
-
-#, fuzzy
+msgstr "La información de texto cuando un amigo tiene mensajes sin leer"
+
 msgid "Message (Nick Said) Text"
-msgstr "Texto de los mensajes"
+msgstr "Texto de nensaje («apodo dijo»)"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
-
-#, fuzzy
+msgstr "La información de texto cuando un chat tiene mensajes sin leer que mencionan su apodo"
+
 msgid "The text information for a buddy's status"
-msgstr "Cambiar la información del usuario %s"
-
-#, fuzzy
+msgstr "La información de texto para el estado de los amigos"
+
 msgid "Type the host name for this certificate."
-msgstr ""
-"Especifique el nombre de sistema para el que se utilizará este certificado."
+msgstr "Especifique el nombre de sistema para este certificado."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11090,7 +10936,6 @@
 msgid "Get Away Message"
 msgstr "Mensaje de ausencia"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "Dicho la última vez"
 
@@ -11137,27 +10982,23 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversación/Limpia_r deslizable"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Conversación/_Más"
-
-#, fuzzy
+msgstr "/Conversación/_Medio"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Conversación/_Más"
-
-#, fuzzy
+msgstr "/Conversación/Medio/_Audiollamada"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Conversación/_Más"
-
-#, fuzzy
+msgstr "/Conversación/Medio/_Vídeollamada"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Conversación/Ver _historial"
+msgstr "/Conversación/Medio/_Llamada audio\\/vídeo"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/Conversación/_Enviar archivo..."
+msgstr "/Conversación/E_nviar archivo..."
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Conversación/Añadir _aviso de amigo..."
+msgstr "/Conversación/Añadir a_viso de amigo..."
 
 msgid "/Conversation/_Get Info"
 msgstr "/Conversación/_Obtener información"
@@ -11166,7 +11007,7 @@
 msgstr "/Conversación/In_vitar..."
 
 msgid "/Conversation/M_ore"
-msgstr "/Conversación/_Más"
+msgstr "/Conversación/Má_s"
 
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversación/A_podo..."
@@ -11225,17 +11066,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Conversación/Ver registro"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Conversación/Más"
-
-#, fuzzy
+msgstr "/Conversación/Medio/Audiollamada"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Conversación/Ver registro"
-
-#, fuzzy
+msgstr "/Conversación/Medio/Vídeollamada"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Conversación/Más"
+msgstr "/Conversación/Llamada audio\\/vídeo"
 
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."
@@ -11420,7 +11258,7 @@
 msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "voz y vídeo"
 
 msgid "support"
 msgstr "soporte"
@@ -11547,9 +11385,8 @@
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Rumano"
+msgstr "Armenio"
 
 msgid "Indonesian"
 msgstr "Indonesio"
@@ -11566,9 +11403,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Traductores al georgiano de Ubuntu"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "Otro"
+msgstr "Khmer"
 
 msgid "Kannada"
 msgstr "Kannada"
@@ -11591,9 +11427,8 @@
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "Macedonio"
+msgstr "Mongol"
 
 msgid "Bokmål Norwegian"
 msgstr "Noruego Bokmål"
@@ -11650,7 +11485,7 @@
 msgstr "Sueco"
 
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
 msgid "Tamil"
 msgstr "Tamil"
@@ -11717,22 +11552,22 @@
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
-msgstr ""
+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
+msgstr "<FONT SIZE=\"4\">Ayuda por 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> canal #pidgin en irc.freenode.net<BR><BR>"
-
-#, fuzzy, c-format
+msgstr "<FONT SIZE=\"4\">Canal de IRC:</FONT> #pidgin en 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> canal #pidgin en irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
@@ -11878,7 +11713,7 @@
 msgstr "Mensajes _no leídos"
 
 msgid "New _Message..."
-msgstr "Mensaje nuevo..."
+msgstr "_Mensaje nuevo..."
 
 msgid "_Accounts"
 msgstr "Cuent_as"
@@ -11983,7 +11818,6 @@
 msgid "Hyperlink visited color"
 msgstr "Color de hiperenlace visitado"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr ""
 "Color para dibujar hiperenlaces cuando ya han sido visitados (o activados)."
@@ -12023,23 +11857,20 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Nombre de color de mensajes de accción para mensajes susurrados"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "Color con el que dibujar el nombre de un mensaje de acción."
+msgstr "Color con el que dibujar el nombre de un mensaje de acción susurrado."
 
 msgid "Whisper Message Name Color"
 msgstr "Susurrar nombre de color de mensajes"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "Color con el que dibujar el nombre de un mensaje de acción."
+msgstr "Color con el que dibujar el nombre de un mensaje susurrado."
 
 msgid "Typing notification color"
 msgstr "Color de notificación de tecleo"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "Color a utilizar para la tipografía de notificación de tecleo"
+msgstr "Color a utilizar para la notificación de tecleo"
 
 msgid "Typing notification font"
 msgstr "Tipografía de notificación de tecleo"
@@ -12198,7 +12029,7 @@
 msgstr "Insertar emoticono"
 
 msgid "<b>_Bold</b>"
-msgstr "<b> Negrita</b>"
+msgstr "<b>_Negrita</b>"
 
 msgid "<i>_Italic</i>"
 msgstr "<i>_Cursiva</i>"
@@ -12294,7 +12125,7 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Intente `%s -h' para más información.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12314,21 +12145,18 @@
 "%s %s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
-"configuración\n"
-"  -d, --debug          imprimir mensajes de depuración en la salida "
-"estándar\n"
-"  -h, --help           mostrar este mensaje y salir\n"
+"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de configuración\n"
+"  -d, --debug          imprimir mensajes de depuración en la salida estándar\n"
+"  -h, --help           mostrar esta ayuda y salir\n"
 "  -m, --multiple       no asegurarse de que hay sólo una instancia\n"
 "  -n, --nologin        no conectarse de forma automática\n"
-"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opcional "
-"NOMBRE\n"
+"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opcional NOMBRE\n"
 "                       indica la(s) cuenta(s) a usar, separadas por comas.\n"
 "                       Si no se indica se activará sólo la primera cuenta).\n"
 "  --display=DISPLAY    pantalla X que se debe utilizar\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12347,15 +12175,12 @@
 "%s %s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
-"configuración\n"
-"  -d, --debug          imprimir mensajes de depuración en la salida "
-"estándar\n"
-"  -h, --help           mostrar este mensaje y salir\n"
+"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de configuración\n"
+"  -d, --debug          imprimir mensajes de depuración en la salida estándar\n"
+"  -h, --help           mostrar esta ayuda y salir\n"
 "  -m, --multiple       no asegurarse de que hay sólo una instancia\n"
 "  -n, --nologin        no conectarse de forma automática\n"
-"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opcional "
-"NOMBRE\n"
+"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opcional NOMBRE\n"
 "                       indica la(s) cuenta(s) a usar, separadas por comas.\n"
 "                       Si no se indica se activará sólo la primera cuenta).\n"
 "  --display=DISPLAY    pantalla X que se debe utilizar\n"
@@ -12396,25 +12221,24 @@
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "Saliendo porque está ejecutándose otro cliente de libpurple.\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/_Media"
 
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/Media/_Colgar"
+
 msgid "Calling..."
-msgstr "Calculando..."
+msgstr "Llamando..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s desea iniciar una sesión de audio/vídeo con vd."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s desea comenzor una sesión de vídeo con vd."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12445,9 +12269,8 @@
 "Se ha definido un navegador «Manual», pero no se ha definido ningún comando "
 "para ejecutarlo."
 
-#, fuzzy
 msgid "No message"
-msgstr "(1 mensaje)"
+msgstr "No hay mensajes"
 
 msgid "Open All Messages"
 msgstr "Abrir todos los mensajes"
@@ -12455,16 +12278,14 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "Nuevo aviso de amigo"
+msgstr "Nuevos avisos"
 
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "Descartar"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene correo!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">¡Tiene un aviso!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Se van a desactivar los siguientes complementos."
@@ -12514,9 +12335,8 @@
 msgid "Select a file"
 msgstr "Seleccione un archivo"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "Editar aviso de amigo"
+msgstr "Modificar aviso de amigo"
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
@@ -12593,61 +12413,58 @@
 msgid "Pounce Target"
 msgstr "Objetivo a avisar"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
-msgstr "Empieza a escribir"
-
-#, fuzzy, c-format
+msgstr "Empezó a escribir"
+
+#, c-format
 msgid "Paused while typing"
-msgstr "Hace una pausa mientras escribe"
-
-#, fuzzy, c-format
+msgstr "Pausa mientras escribe"
+
+#, c-format
 msgid "Signed on"
 msgstr "Se conecta"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "Dejar de estar i_nactivo"
-
-#, fuzzy, c-format
+msgstr "Deje de estar inactivo"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "Deja de estar ausente"
-
-#, fuzzy, c-format
+msgstr "Deje de estar ausente"
+
+#, c-format
 msgid "Stopped typing"
-msgstr "Deja de escribi_r"
-
-#, fuzzy, c-format
+msgstr "Deje de escribir"
+
+#, c-format
 msgid "Signed off"
-msgstr "Se desconecta"
-
-#, fuzzy, c-format
+msgstr "Se desconecte"
+
+#, c-format
 msgid "Became idle"
-msgstr "Está inactivo"
-
-#, fuzzy, c-format
+msgstr "Pase a estar inactivo"
+
+#, c-format
 msgid "Went away"
-msgstr "Cuando estoy fuera"
-
-#, fuzzy, c-format
+msgstr "Se va"
+
+#, c-format
 msgid "Sent a message"
-msgstr "Enviar un mensaje"
-
-#, fuzzy, c-format
+msgstr "Envía un mensaje"
+
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "Evento de aviso desconocido. ¡Por favor, informe de esto! "
-
-#, fuzzy
+msgstr "Desconocido..... ¡Por favor, informe de esto! "
+
 msgid "Theme failed to unpack."
-msgstr "Falló el desempaque de tema de emoticonos"
-
-#, fuzzy
+msgstr "No se pudo desempaquetar el tema."
+
 msgid "Theme failed to load."
-msgstr "Falló el desempaque de tema de emoticonos"
-
-#, fuzzy
+msgstr "No se pudo cargar el tema."
+
 msgid "Theme failed to copy."
-msgstr "Falló el desempaque de tema de emoticonos"
+msgstr "No se pudo copiar el tema."
 
 msgid "Install Theme"
 msgstr "Instalar tema"
@@ -12669,9 +12486,8 @@
 msgstr "C_errrar las conversaciones con la tecla Esc"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Lista de amigos"
+msgstr "Tema de la lista de amigos"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12683,9 +12499,8 @@
 msgid "On unread messages"
 msgstr "Si hay mensajes sin leer"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "Ventanas de conversación de MI"
+msgstr "Ventana de conversación"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar nuevas conversaciones MI:"
@@ -12767,7 +12582,7 @@
 msgstr "Utilizar la tipografía del _tema"
 
 msgid "Conversation _font:"
-msgstr "Tipografía para las conversaciones:"
+msgstr "Tipogra_fía para las conversaciones:"
 
 msgid "Default Formatting"
 msgstr "Formato por omisión"
@@ -12788,9 +12603,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Ejemplo: stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Auto detectar la dirección IP"
+msgstr "Utilizar la dirección IP detectada _automáticamente: %s"
 
 msgid "Public _IP:"
 msgstr "_IP pública:"
@@ -12812,7 +12627,7 @@
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Servidor de reenvío (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "Servidor proxy y navegador"
@@ -12844,7 +12659,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 "Utilizar un DNS remoto con pasarelas SOCKS4"
 
 msgid "_User:"
 msgstr "_Usuario:"
@@ -13160,12 +12975,10 @@
 msgid "Status for %s"
 msgstr "Estado de %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr ""
-"Ya existe un emoticono a medida para el atajo de teclado seleccionado. "
-"Especifique un atajo distinto."
+msgstr "Ya existe un emoticono a medida para '%s'. Especifique un atajo distinto."
 
 # No estoy muy seguro de usar emoticono, quizás «smiley» sería más apropiado
 msgid "Custom Smiley"
@@ -13181,28 +12994,24 @@
 msgid "Add Smiley"
 msgstr "Añadir emoticono"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "_Imagen"
+msgstr "_Imagen:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Atajo de teclado"
+msgstr "Ata_jo de teclado"
 
 msgid "Smiley"
 msgstr "Emoticono"
 
-#, fuzzy
 msgid "Shortcut Text"
 msgstr "Atajo de teclado"
 
 msgid "Custom Smiley Manager"
 msgstr "Gestor de emoticonos a medida"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Seleccionar amigo"
+msgstr "Seleccionar icono de amigo"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "Pulse para cambiar el icono de amigo para esta cuenta."
@@ -13288,7 +13097,6 @@
 msgid "Cannot send launcher"
 msgstr "No se puede enviar un lanzador"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13329,9 +13137,8 @@
 "Se produjo un fallo al cargar la imagen «%s»: razón desconocida, posiblemente "
 "se trata de un archivo de imagen dañado"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "_Abrir enlace en:"
+msgstr "_Abrir enlace"
 
 msgid "_Copy Link Location"
 msgstr "_Copiar destino del enlace"
@@ -13339,9 +13146,21 @@
 msgid "_Copy Email Address"
 msgstr "_Copiar dirección de correo electrónico"
 
+msgid "_Open File"
+msgstr "_Abrir archivo"
+
+msgid "Open _Containing Directory"
+msgstr "Abrir _contenido del directorio "
+
 msgid "Save File"
 msgstr "Guardar archivo"
 
+msgid "_Play Sound"
+msgstr "Re_producir un sonido"
+
+msgid "_Save File"
+msgstr "_Guardar archivo"
+
 msgid "Select color"
 msgstr "Seleccionar el color"
 
@@ -13429,78 +13248,61 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Muestra información estadística de la disponibilidad de sus amigos"
 
-#, fuzzy
 msgid "Server name request"
-msgstr "Dirección del servidor"
-
-#, fuzzy
+msgstr "Solicitud de nombre de servidor"
+
 msgid "Enter an XMPP Server"
-msgstr "Introducir un servidor de conferencias"
-
-#, fuzzy
+msgstr "Introducir un servidor XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Selecciona un servidor de conferencias al que consultar"
-
-#, fuzzy
+msgstr "Seleccione un servidor XMPP al que consultar"
+
 msgid "Find Services"
-msgstr "Servicios en línea"
-
-#, fuzzy
+msgstr "Encontrar servicios"
+
 msgid "Add to Buddy List"
-msgstr "Enviar lista de amigos"
-
-#, fuzzy
+msgstr "Añadir a la lista de amigos"
+
 msgid "Gateway"
-msgstr "Se ausenta"
-
-#, fuzzy
+msgstr "Pasarela"
+
 msgid "Directory"
-msgstr "Directorio de registro"
-
-#, fuzzy
+msgstr "Directorio"
+
 msgid "PubSub Collection"
-msgstr "Completado con el tabulador"
-
-#, fuzzy
+msgstr "Collección PubSub"
+
 msgid "PubSub Leaf"
-msgstr "Servicio PubSub"
-
-#, fuzzy
+msgstr "Rama PubSub"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Descripción:</b> Terrorífica"
+msgstr "\n<b>Descripción:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Información de descubrimiento de servicio"
+msgstr "Descubrimiento de servicios"
 
 msgid "_Browse"
 msgstr "_Navegador"
 
-#, fuzzy
 msgid "Server does not exist"
-msgstr "El usuario no existe"
-
-#, fuzzy
+msgstr "El servidor no existe"
+
 msgid "Server does not support service discovery"
-msgstr "El servidor no soporta bloqueos"
-
-#, fuzzy
+msgstr "El servidor no ofrece soporte para el descubrimiento de servicios"
+
 msgid "XMPP Service Discovery"
-msgstr "Información de descubrimiento de servicio"
+msgstr "Descubrimiento de servicios XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Permite buscar y registrar servicios."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
+msgstr "Este complemento es útil para registrarse con transportes antiguos o con otros servicios XMPP."
 
 msgid "Buddy is idle"
 msgstr "El amigo está inactivo"
@@ -13903,14 +13705,10 @@
 msgstr "Complemento de mensajería musical para 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 ""
-"El complemento de mensajería musical permite trabajar a distintos usuarios "
-"de forma simultánea en una pieza de música editando una partitura común en "
-"tiempo real."
+msgstr "El complemento de mensajería musical permite que distintos usuarios trabajen de forma simultánea en una pieza de música al permitir editar una partitura común en tiempo real."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -14030,7 +13828,6 @@
 msgid "Highlighted Message Name Color"
 msgstr "Color para mensajes resaltados por nombre"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "Color de notificación de tecleo"
 
@@ -14063,24 +13860,20 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atajos de teclado GTK+"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Activar la notificación de tecleo"
-
-#, fuzzy
+msgstr "Desactivar el texto de la notificación de tecleo"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Control de tema GTK+ de Pidgin"
-
-#, fuzzy
+msgstr "Configuración del tema GTK+"
+
 msgid "Colors"
-msgstr "Color"
+msgstr "Colores"
 
 msgid "Fonts"
 msgstr "Tipografía"
 
-#, fuzzy
 msgid "Miscellaneous"
-msgstr "Error misceláneo"
+msgstr "Miscelánea"
 
 msgid "Gtkrc File Tools"
 msgstr "Herramientas de ficheros Gtkrc"
@@ -14167,7 +13960,6 @@
 msgstr "Botón «enviar» de la ventana de conversación."
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14228,95 +14020,78 @@
 "Reemplaza el texto de los mensajes salientes según las reglas definidas por "
 "el usuario."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "No ha iniciado sesión"
-
-#, fuzzy
+msgstr "Acaba de conectarse"
+
 msgid "Just logged out"
-msgstr "%s se ha desconectado."
+msgstr "Se acaba de desconectar"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Icono para contactos/\n"
+"Icono para personas desconocidas"
+
 msgid "Icon for Chat"
-msgstr "Unirse a un chat"
-
-#, fuzzy
+msgstr "Icono para el chat"
+
 msgid "Ignored"
-msgstr "Ignorar"
-
-#, fuzzy
+msgstr "Ignorado"
+
 msgid "Founder"
-msgstr "Más ruidoso"
-
-#, fuzzy
+msgstr "Fundador"
+
 msgid "Operator"
-msgstr "Operador IRC"
-
-#, fuzzy
+msgstr "Operador"
+
 msgid "Half Operator"
-msgstr "Operador IRC"
-
-#, fuzzy
+msgstr "Semi-Operador"
+
 msgid "Authorization dialog"
-msgstr "Autorización otorgada"
-
-#, fuzzy
+msgstr "Diálogo de autorización"
+
 msgid "Error dialog"
-msgstr "Error "
-
-#, fuzzy
+msgstr "Diálogo de error "
+
 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 solicitud"
-
-#, fuzzy
+msgstr "Diálogo de pregunta"
+
 msgid "Warning dialog"
-msgstr "Niveles de aviso"
+msgstr "Diálogo de aviso"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "¿Qué tipo de diálogo es éste?"
+
 msgid "Status Icons"
-msgstr "Estado de %s"
-
-#, fuzzy
+msgstr "Iconos de estado"
+
 msgid "Chatroom Emblems"
-msgstr "Localización de la sala de chat"
-
-#, fuzzy
+msgstr "Emblemas de la sala de chat"
+
 msgid "Dialog Icons"
-msgstr "Cambiar icono"
-
-#, fuzzy
+msgstr "Iconos de dialogo"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Control de tema GTK+ de Pidgin"
-
-#, fuzzy
+msgstr "Editor de temas de iconos de Pidgin"
+
 msgid "Contact"
-msgstr "Información del contacto"
-
-#, fuzzy
+msgstr "Contacto"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Pidgin - Lista de amigos"
-
-#, fuzzy
+msgstr "Editor de temas de la lista de amigos de Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Lista de amigos"
+msgstr "Editar el tema de la lista de amigos"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Editar el tema de iconos"
 
 #. *< type
 #. *< ui_requirement
@@ -14325,16 +14100,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Control de tema GTK+ de Pidgin"
+msgstr "Editor de temas de Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Control de tema GTK+ de Pidgin"
+msgstr "Editor de temas de Pidgin"
 
 #. *< type
 #. *< ui_requirement
@@ -14506,12 +14279,9 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opciones específicas de %s para Windows."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr ""
-"Contiene las opciones específicas al Pidgin de Windows como el apilado de la "
-"lista de amigos."
+msgstr "Contiene las opciones específicas a Pidgin para Windows, como por ejemplo el apilado de la lista de amigos."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Desconectado.</font>"
@@ -14550,6 +14320,26 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
+#, fuzzy
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "No se pudo conectar al servidor."
+
+#, fuzzy
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "No se pudo cargar la clave pública SILC"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s ha declinado su invitación de conferencia en la sala «%s» por «%s»."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Invitación rechazada"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "Proxy"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "No se pudo abrir el socket"
 
--- a/po/eu.po	Mon Aug 03 00:46:28 2009 +0000
+++ b/po/eu.po	Wed Aug 05 01:34:35 2009 +0000
@@ -8,7 +8,7 @@
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-08-02 17:40-0700\n"
-"PO-Revision-Date: 2009-08-02 23:05+0200\n"
+"PO-Revision-Date: 2009-08-04 21:14+0200\n"
 "Last-Translator: Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>\n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1416,9 +1416,8 @@
 msgid "GntClipboard"
 msgstr ""
 
-#, fuzzy
 msgid "Clipboard plugin"
-msgstr "Memoriatik deskargatu Plugin-ak"
+msgstr ""
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
@@ -1667,16 +1666,18 @@
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "SSL-Zertifikatu Egiaztapena"
 
 msgid "_View Certificate..."
-msgstr ""
+msgstr "Zertifikatua _Ikusi..."
 
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
 "could mean that you are not connecting to the service you believe you are."
 msgstr ""
+"\"%s\"(e)k aurkeztutako zertifikatuak \"%s\"(r)ena dela dio.  Agian ez zara "
+"zuk uste duzun zerbitzarira konektatzen ari."
 
 #. Had no CA pool, so couldn't verify the chain *and*
 #. * the subject name isn't valid.
@@ -1690,13 +1691,11 @@
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
 #. TODO: Probably wrong.
-#, fuzzy
 msgid "SSL Certificate Error"
-msgstr "Idazketa-errorea "
-
-#, fuzzy
+msgstr "SSL-Zertifikatu Errorea"
+
 msgid "Invalid certificate chain"
-msgstr "Baimen-mekanismoa ez da baliozkoa"
+msgstr "Zertifikatu-kate baliogabea"
 
 #. The subject name is correct, but we weren't able to verify the
 #. * chain because there was no pool of root CAs found. Prompt the user
@@ -1707,6 +1706,8 @@
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"Ez daukazu erro-zertifikatu datubaserik, beraz, ezin da zertifikatua "
+"egiaztatu."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
@@ -1715,16 +1716,18 @@
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
+"Auto-sinatua da \"%s\"(e)k aurkeztutako zertifikatua. Ezin da automatikoki "
+"egiaztatua izan."
 
 #. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "Baliogabea da %s(r)entzako aurkeztutako zertifikatu-katea."
 
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
+msgstr "Pidgin-ek ez du ezagutzen hau eskaini duela dioen erro-zertifikatua."
 
 #, c-format
 msgid ""
@@ -1732,9 +1735,11 @@
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
 msgstr ""
+"%s(e)k aurkeztutako zertifikatu-kateak ez dauka berak dioen Zertifikatu "
+"Autoritatearen baliozko sinadura digitalik."
 
 msgid "Invalid certificate authority signature"
-msgstr ""
+msgstr "Zertifikatu-autoritate sinadura baliogabea"
 
 #. Make messages
 #, c-format
@@ -1754,16 +1759,14 @@
 "Iraungitze-data: %s\n"
 
 #. TODO: Find what the handle ought to be
-#, fuzzy
 msgid "Certificate Information"
-msgstr "Zerbitzariaren informazioa"
+msgstr "Zertifikatu-Informazioa"
 
 msgid "Registration Error"
 msgstr "Erregistratze-Errorea"
 
-#, fuzzy
 msgid "Unregistration Error"
-msgstr "Erregistratze-errorea"
+msgstr "Deserregistratze-Errorea"
 
 #, c-format
 msgid "+++ %s signed on"
@@ -2198,10 +2201,11 @@
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI bertsio okerra %d.%d.x (%d.%d.x behar)"
 
-#, fuzzy
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr "Plugin-ak ez ditu beharrezko funtzioen inplementazioak"
+msgstr ""
+"Plugin-ak ez ditu beharrezko funtzioak inplementatzen (list_icon, login eta "
+"close)"
 
 #, c-format
 msgid ""
@@ -2211,21 +2215,19 @@
 "Ezin beharrezko %s plugina aurkitu. Plugin hori instalatu eta berriro saiatu "
 "zaitez."
 
-#, fuzzy
 msgid "Unable to load the plugin"
-msgstr "Pidgin-ek ezin du plugin-a kargatu."
+msgstr "Ezin plugina kargatu"
 
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Ezin beharrezko %s plugina kargatu."
 
-#, fuzzy
 msgid "Unable to load your plugin."
-msgstr "Pidgin-ek ezin du plugin-a kargatu."
-
-#, fuzzy, c-format
+msgstr "Ezin zure plugina kargatu."
+
+#, c-format
 msgid "%s requires %s, but it failed to unload."
-msgstr "Menpekotasuna duen plugin-a %s kargatzean huts egin du."
+msgstr "%s(e)k %s behar du, baina ezin izan da deskargatu."
 
 msgid "Autoaccept"
 msgstr "Auto-onartu"
@@ -2633,28 +2635,31 @@
 "solasaldietako mezuak."
 
 msgid "Offline Message Emulation"
-msgstr ""
+msgstr "Offline-Mezu Emulazioa"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+msgstr "Alerta modura gorde offline erabiltzaileei bidalitako mezuak."
 
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
+"Alerta modura gordeko dira gainontzeko mezuak. 'Lagun-Alerta' elkarrizketan "
+"editatu/kendu ditzakezu."
 
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
-
-#, fuzzy
+"\"%s\" offline dago. Alerta modura gorde nahi dituzu gainontzeko mezuak, "
+"automatikoki bidaltzeko \"%s\" konektatu bezain laster?"
+
 msgid "Offline Message"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Offline-Mezua"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr ""
+msgstr "'Lagun-Alerta' elkarrizketan editatu/kendu dezakezu alerta"
 
 msgid "Yes"
 msgstr "Bai"
@@ -2663,14 +2668,13 @@
 msgstr "Ez"
 
 msgid "Save offline messages in pounce"
-msgstr ""
+msgstr "Alerta modura gorde offline-mezuak"
 
 msgid "Do not ask. Always save in pounce."
-msgstr ""
-
-#, fuzzy
+msgstr "Ez galdetu. Beti gorde alerta modura."
+
 msgid "One Time Password"
-msgstr "Sartu Pasahitza"
+msgstr "Erabilera Bakarreko Pasahitza"
 
 #. *< type
 #. *< ui_requirement
@@ -2679,13 +2683,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Erabilera Bakarreko Pasahitzentzako Euskarria"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Pasahitzak behin bakarrik erabiltzera behartu."
 
 #. *  description
 msgid ""
@@ -2693,6 +2697,9 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Honi esker, konexio bakoitzean pasahitza idatzi behar izatera behar dezakezu "
+"kontu bakoitzaren arabera.\n"
+"Oharra: Honek funtziona dezan, ezin da kontuaren pasahitza gorde."
 
 #. *< type
 #. *< ui_requirement
@@ -2715,13 +2722,12 @@
 msgid "Psychic mode for incoming conversation"
 msgstr "Datozen solasaldietarako modu psikikoa"
 
-#, fuzzy
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
-"Solasaldi lehioa azaltzen da beste erabiltzaile batek  mezua zeuri bidaltzen "
-"hasten denean. Honek funtzionatzen du AIM,ICQ,Jabber,Sametime eta Yahoo!"
+"Solasaldi-leihoa agertarazten du beste erabiltzaileek zure idaztean.  AIM, "
+"ICQ, XMPP, Sametime eta Yahoo!-rekin funtzionatzen du."
 
 # , fuzzy
 msgid "You feel a disturbance in the force..."
@@ -2736,9 +2742,8 @@
 msgid "Display notification message in conversations"
 msgstr "Azaldu notifikazio mezua solasaldian"
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "Eskutatutako solasaldietan"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -2884,15 +2889,18 @@
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
+"Ezin ActiveTCL instalazioa aurkitu. TCL pluginak erabili nahi badituzu, "
+"ActiveTCL instalatu ezazu hemendik: http://www.activestate.com\n"
 
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-
-#, fuzzy
+"Ezin Apple-ren \"Bonjour for Windows\" tresnak aurkitu, http://d.pidgin.im/"
+"BonjourWindows ikus ezazu informazio gehiago eskuratzeko."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "Datozen BM konexio berriak entzutea ezinezkoa gertatu da\n"
+msgstr "Ezin sarrerako IM konexioak entzun"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3932,14 +3940,14 @@
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-
-#, fuzzy
+"Kontaktu bat aurkitu, irizpideak sartuz eremuetan. Oharra: Eremu guztietan "
+"erabili ditzakezu komodinak (%)"
+
 msgid "Directory Query Failed"
-msgstr "Zuzeneko konexioak huts egin du"
-
-#, fuzzy
+msgstr "Direktorio-Galdekatze Errorea"
+
 msgid "Could not query the directory server."
-msgstr "Ezin izan da fitxategi-transferentzia hasi"
+msgstr "Ezin direktorio-zerbitzaria galdekatu."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
@@ -3947,11 +3955,8 @@
 msgid "Server Instructions: %s"
 msgstr "Zerbitzari-Aginduak: %s"
 
-#, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr ""
-"Bete ezazu bat edo eremu gehiago edozein Jabber erabiltzaileren "
-"topaketarako. "
+msgstr "Eremu bat edo gehiago bete ezazu XMPP erabiltzaileak bilatzeko."
 
 msgid "Email Address"
 msgstr "Helbide Elektronikoa"
@@ -4047,9 +4052,8 @@
 msgid "Roles:"
 msgstr "Funtzioak:"
 
-#, fuzzy
 msgid "Ping timed out"
-msgstr "Testu arrunta"
+msgstr ""
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
@@ -4081,17 +4085,15 @@
 msgid "Registration Failed"
 msgstr "Errorea Erregistratzean"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Registration from %s successfully removed"
-msgstr "%s@%s ondo erregistratu da"
-
-#, fuzzy
+msgstr "Arrakastaz kendu da %s(e)ko erregistroa"
+
 msgid "Unregistration Successful"
-msgstr "Ondo erregistratu da"
-
-#, fuzzy
+msgstr "Deserregistratze Arrakastatsua"
+
 msgid "Unregistration Failed"
-msgstr "Erregistratzeak huts egin du"
+msgstr "Deserregistratze Errorea"
 
 msgid "State"
 msgstr "Estatua"
@@ -4108,9 +4110,8 @@
 msgid "Already Registered"
 msgstr "Dagoeneko Erregistratuta"
 
-#, fuzzy
 msgid "Unregister"
-msgstr "Erregistratu"
+msgstr "Deserregistratu"
 
 msgid ""
 "Please fill out the information below to change your account registration."
@@ -4771,9 +4772,9 @@
 msgid "User does not exist"
 msgstr "Erabiltzailea ez da existitzen"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Fully qualified domain name missing"
-msgstr "Domeinu-izen osoa falta da"
+msgstr "Baliozko domeinu-izena falta"
 
 #, c-format
 msgid "Already logged in"
@@ -4839,9 +4840,9 @@
 msgid "Switchboard failed"
 msgstr "Switchboard errorea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Notify transfer failed"
-msgstr "Jakinarazpen-transferentziak huts egin du"
+msgstr "Transferentzi-jakinarazpen errorea"
 
 #, c-format
 msgid "Required fields missing"
@@ -5057,12 +5058,12 @@
 msgid "Disallow"
 msgstr "Ez onartu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
-msgstr "Lagunaren iruzkinak %s(r)entzako"
+msgstr "%s(e)rako Testu Blokeatua"
 
 msgid "No text is blocked for this account."
-msgstr ""
+msgstr "Ez da testurik blokeatu kontu honetarako."
 
 #, c-format
 msgid ""
@@ -5412,7 +5413,17 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
+"Mantenimendurako itxiko da MSN-zerbitzaria minutu %d barru. Automatikoki "
+"deskonektatuko zara une horretan.  Martxan dituzun solasaldiak amaitu "
+"itzazu..\n"
+"\n"
+"Mantenimendua amaitu bezain laster konektatu ahalko zara berriro."
 msgstr[1] ""
+"Mantenimendurako itxiko da MSN-zerbitzaria %d minutu barru. Automatikoki "
+"deskonektatuko zara une horretan.  Martxan dituzun solasaldiak amaitu "
+"itzazu..\n"
+"\n"
+"Mantenimendua amaitu bezain laster konektatu ahalko zara berriro."
 
 msgid ""
 "Message was not sent because the system is unavailable. This normally "
@@ -5617,17 +5628,14 @@
 msgid "No such user: %s"
 msgstr "Halako erabiltzailerik ez: %s"
 
-#, fuzzy
 msgid "User lookup"
-msgstr "Erabiltzaile-gelak"
-
-#, fuzzy
+msgstr ""
+
 msgid "Reading challenge"
-msgstr "Irakurketa-errorea"
-
-#, fuzzy
+msgstr "Erronka irakurtzen"
+
 msgid "Unexpected challenge length from server"
-msgstr "Erronka baliogabea zerbitzaritik"
+msgstr "Espero ez zen erronka-luzera zerbitzaritik"
 
 msgid "Logging in"
 msgstr "Konektatzen"
@@ -5833,54 +5841,53 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Elektrikara"
+
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k elektrikara eman dizu!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%s elektrikaratzen..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Kolpekatu"
+
+#, c-format
 msgid "%s has whacked you!"
-msgstr "Erabiltzaileak blokeatu egin zaitu."
+msgstr "%s(e)k kolpekatu zaitu!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "%s kolpekatzen..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
-msgstr "Gaia"
-
-#, fuzzy, c-format
+msgstr "Erre"
+
+#, c-format
 msgid "%s has torched you!"
-msgstr "Erabiltzaileak blokeatu egin zaitu."
+msgstr "%s(e)k erre zaitu!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "%s erretzen..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Muxukatu"
+
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k muxukatu zaitu!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s muxukatzen..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
@@ -5907,17 +5914,16 @@
 msgstr "%s zaplaztatzen..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Joan egin da"
-
-#, fuzzy, c-format
+msgstr "Atximurkatu"
+
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s joan egin da."
-
-#, fuzzy, c-format
+msgstr "%s(e)k atximurkatu zaitu!"
+
+#, c-format
 msgid "Goosing %s..."
-msgstr "%s bilatzen"
+msgstr "%s atximurkatzen..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
@@ -5937,15 +5943,15 @@
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
 msgid "Punk"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Adarra jo"
+
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k adarra jo dizu!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "%s(r)i adarra jotzen..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -5955,15 +5961,15 @@
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Aho-puzkerra egin"
+
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k aho-puzkerra egin dizu!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "%s(r)i aho-puzkerra egiten..."
 
 msgid "Required parameters not passed in"
 msgstr "Ez dira beharrezko parametroak jaso"
@@ -6238,7 +6244,7 @@
 msgstr "Errorea eskaeran."
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL-k ez du zure pantaila-izena hemen autentifikatzea onartzen"
 
 msgid "Could not join chat room"
 msgstr "Ezin gelara batu"
@@ -6246,9 +6252,8 @@
 msgid "Invalid chat room name"
 msgstr "Gela-izen baliogabea"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "Ezin da zerbitzariarekiko SSL konexiorik ezarri."
+msgstr "Datu baliogabeak jaso dira zerbotzariarekin konektatzean"
 
 #. *< type
 #. *< ui_requirement
@@ -6514,30 +6519,28 @@
 msgid "Finalizing connection"
 msgstr "Konexioa amaitzen"
 
-#, 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 ""
-"Ezin da sartu: Ezin izan da saioa hasi %s gisa, pantaila-izena ez delako "
-"baliozkoa. Pantaila-izenek letra batekin hasi behar dute, eta letrak, "
-"zenbakiak eta zuriuneak bakarrik eduki, edo bestela zenbakiak bakarrik eduki "
-"behar dituzte."
-
-#, fuzzy, c-format
+"Ezin %s bezala konektatu, erabiltzaile-izena ez delako baliozkoa.  "
+"Erabiltzaile-izenek baliozko helbide elektroniko izan behar dute, edo letra "
+"batekin hasi eta letrak, zenbakiak eta zuriuneak bakarrik eduki, edo bestela "
+"zenbakiak bakarrik."
+
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
-"Laster deskonektatuta greatzeko arriskua duzu. TOC erabil dezakezu arazoa "
-"konpondu arte. Bilatu eguneratzeak %s gunean."
-
-#, fuzzy
+"Laster deskonektatuko zaituzte agian.  Hala bada, eguneraketak bilatu "
+"itzazu: %s"
+
 msgid "Unable to get a valid AIM login hash."
-msgstr "Pidgin-ek ezin du lortu AIM saio-hasierako hash baliozkorik."
-
-#, fuzzy
+msgstr "Ezin baliozko AIM-konexio hash-a eskuratu."
+
 msgid "Unable to get a valid login hash."
-msgstr "Pidgin-ek ezin du lortu saio-hasierako hash baliozkorik."
+msgstr "Ezin baliozko konexio-hash-a eskuratu."
 
 msgid "Received authorization"
 msgstr "Baimena jaso da"
@@ -6545,14 +6548,13 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "Erabiltzailea ez dago"
+msgstr "Erabiltzaile-izena ez da existitzen"
 
 #. Suspended account
 #, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Zure kontua esekita dago une honetan."
+msgstr "Zure kontua suspendituta dago"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
@@ -6564,18 +6566,15 @@
 msgstr "Zure bezero-bertsioa zaharregia da. %s gunean berritu dezakezu"
 
 #. 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 ""
-"Maizegi konektatzen eta deskonektatzen aritu zara. Itxaron hamar minutu, eta "
-"saiatu berriro. Saiatzen jarraituz gero, agian gehiago ere itxaron beharko "
-"duzu."
-
-#, fuzzy
+"Maizegi konektatu/deskonektatu zara. Minutu bat itxaron ezazu berriro saiatu "
+"aurretik. Saiatzen jarraituz gero, agian gehiago itxaron beharko duzu."
+
 msgid "The SecurID key entered is invalid"
-msgstr "Sartu duzun SecurID gakoa ez da baliozkoa"
+msgstr "Baliogabea da sartutako SecurID-gakoa"
 
 msgid "Enter SecurID"
 msgstr "SecurID-a Sartu"
@@ -6667,27 +6666,25 @@
 msgid "_Decline"
 msgstr "_Ukatu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] ""
-"Mezu %hu galdu duzu (%s(e)k bidalia), zure abisu-maila altuegia delako."
-msgstr[1] ""
-"%hu mezu galdu dituzu (%s(e)k bidaliak), zure abisu-maila altuegia delako."
-
-#, fuzzy, c-format
+msgstr[0] "Mezu %hu galdu duzu (%s(r)enak), baliogabea zelako."
+msgstr[1] "%hu mezu galdu dituzu (%s(r)enak), baliogabeak zirelako."
+
+#, 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] "%s erabiltzailearen BM bat ez zaizu heldu, handiegia delako."
-msgstr[1] "%s erabiltzailearen BM bat ez zaizu heldu, handiegia delako."
-
-#, fuzzy, c-format
+msgstr[0] "Mezu %hu galdu duzu (%s(r)ena), luzeegia zelako."
+msgstr[1] "%hu mezu galdu dituzu (%s(r)enak), luzeegiak zirelako."
+
+#, 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] "Mezu %hu galdu duzu, %s(r)en abisu-maila altuegia delako."
-msgstr[1] "%hu mezu galdu dituzu, %s(r)en abisu-maila altuegia delako."
+msgstr[0] "Mezu %hu galdu duzu (%s(r)ena), tasa-muga gainditu delako."
+msgstr[1] "%hu mezu galdu dituzu (%s(r)enak), tasa-muga gainditu delako."
 
 #, c-format
 msgid ""
@@ -6706,13 +6703,11 @@
 msgstr[1] ""
 "%hu mezu galdu dituzu (%s(e)k bidaliak), zure abisu-maila altuegia delako."
 
-#, fuzzy, c-format
+#, 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] ""
-"Mezu %hu galdu duzu (%s(e)k bidalia), zure abisu-maila altuegia delako."
-msgstr[1] ""
-"%hu mezu galdu dituzu (%s(e)k bidaliak), zure abisu-maila altuegia delako."
+msgstr[0] "Mezu %hu galdu duzu (%s(r)ena), arrazoi ezezagun baten erruz."
+msgstr[1] "%hu mezu galdu dituzu (%s(r)enak), arrazoi ezezagun baten erruz."
 
 #. Data is assumed to be the destination bn
 #, c-format
@@ -7257,9 +7252,8 @@
 msgid "Phone Number"
 msgstr "Telefono Zenbakia"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Baimena eman"
+msgstr ""
 
 msgid "Cellphone Number"
 msgstr "Mugikoe Telefono"
@@ -7319,9 +7313,8 @@
 msgstr "Oharra"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Lagunaren ikonoa"
+msgstr ""
 
 msgid "Change his/her memo as you like"
 msgstr ""
@@ -7329,9 +7322,8 @@
 msgid "_Modify"
 msgstr "_Modifikatu"
 
-#, fuzzy
 msgid "Memo Modify"
-msgstr "_Aldatu"
+msgstr ""
 
 msgid "Server says:"
 msgstr "Zerbitzariak dio:"
@@ -7556,13 +7548,12 @@
 msgid " TCP"
 msgstr "TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Mugikorra"
+msgstr " Mugikorretik"
 
 #, fuzzy
 msgid " BindMobile"
-msgstr "Mugikorra"
+msgstr " MugikorraLotu"
 
 msgid " Video"
 msgstr " Bideoa"
@@ -7684,9 +7675,8 @@
 msgid "About OpenQ"
 msgstr "OpenQ-ri Buruz"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "Etxeko helbidea"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -7728,9 +7718,8 @@
 msgid "Show chat room when msg comes"
 msgstr "Solasaldi-gela erakutsi mezua jasotzean"
 
-#, fuzzy
 msgid "Keep alive interval (seconds)"
-msgstr "Irakurketa-errorea"
+msgstr ""
 
 msgid "Update interval (seconds)"
 msgstr "Eguneratze-tartea (segundoak)"
@@ -9691,9 +9680,9 @@
 msgid "The user's profile is empty."
 msgstr "Erabiltzaile-profila hutsik dago."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s konektatu da."
+msgstr "%s ez da batu nahi."
 
 msgid "Failed to join chat"
 msgstr "Ezin berriketara batu"
@@ -10029,38 +10018,38 @@
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Segundo %d"
+msgstr[1] "%d segundo"
 
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Egun %d"
+msgstr[1] "%d egun"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%s, %d ordu"
+msgstr[1] "%s, %d ordu"
 
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
-
-#, fuzzy, c-format
+msgstr[0] "Ordu %d"
+msgstr[1] "%d ordu"
+
+#, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "minutu"
-msgstr[1] "minutu"
-
-#, fuzzy, c-format
+msgstr[0] "%s, %d minutu"
+msgstr[1] "%s, %d minutu"
+
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "minutu"
-msgstr[1] "minutu"
+msgstr[0] "minutu %d"
+msgstr[1] "%d minutu"
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -10233,7 +10222,7 @@
 msgstr "Ezin kontu berria gorde"
 
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "Jadanik badago zehaztutako irizpideak betetzen dituen kontu bat."
 
 msgid "Add Account"
 msgstr "Kontua Gehitu"
@@ -10265,6 +10254,15 @@
 "You can come back to this window to add, edit, or remove accounts from "
 "<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
+"<span size='larger' weight='bold'>Ongietorri %s(e)ra!</span>\n"
+"\n"
+"Ez duzu IM-konturik konfiguratu. %s(r)ekin konektatzen hasteko,azpialdeko "
+"<b>Gehitu...</b> botoia sakatu eta zure lehen kontua konfiguratu ezazu. %s "
+"IM-kontu ugarira konektatzea nahi baduzu, <b>Gehitu...</b> sakatu ezazu "
+"berriro, kontu gehiago gehitzeko.\n"
+"\n"
+"Lagun-Zerrenda leihoko <b>Kontuak->Kontuak Kudeatu</b> sakatu ezazu leiho "
+"honetara itzuli eta kontuak gehitu, editatu edo kentzeko"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -10498,13 +10496,13 @@
 msgid "<b>Account:</b> %s"
 msgstr "<b>Kontua:</b> %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>Okupanteak:</b> %d"
+"<b>Partaideak:</b> %d"
 
 #, c-format
 msgid ""
@@ -10574,11 +10572,11 @@
 msgid "/Tools/Room List"
 msgstr "/Tresnak/Gela-Zerrenda"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "Irakurri gabeko mezuetan"
-msgstr[1] "Irakurri gabeko mezuetan"
+msgstr[0] "Mezu %d irakurri gabe (%s(r)ena)\n"
+msgstr[1] "%d mezu irakurri gabe (%s(r)enak)\n"
 
 msgid "Manually"
 msgstr "Eskuz"
@@ -11075,11 +11073,11 @@
 msgid "0 people in room"
 msgstr "0 pertsona gelan"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "0 pertsona gelan"
-msgstr[1] "0 pertsona gelan"
+msgstr[0] "Pertsona %d gelan"
+msgstr[1] "%d pertsona gelan"
 
 msgid "Typing"
 msgstr "Idazten"
@@ -11229,7 +11227,7 @@
 msgstr "garatzaile-burua"
 
 msgid "Afrikaans"
-msgstr ""
+msgstr "Afrikaans"
 
 msgid "Arabic"
 msgstr "Arabiera"
@@ -11244,14 +11242,13 @@
 msgstr "Bengalera"
 
 msgid "Bosnian"
-msgstr "Bosniarra"
+msgstr "Bosniera"
 
 msgid "Catalan"
-msgstr "Katalana"
-
-#, fuzzy
+msgstr "Katalan"
+
 msgid "Valencian-Catalan"
-msgstr "Balentziera"
+msgstr "Valentziera"
 
 msgid "Czech"
 msgstr "Txekiera"
@@ -11266,7 +11263,7 @@
 msgstr ""
 
 msgid "Greek"
-msgstr "Grekera"
+msgstr "Greziera"
 
 msgid "Australian English"
 msgstr "Ingelesa (Australia)"
@@ -11283,9 +11280,8 @@
 msgid "Spanish"
 msgstr "Gaztelania"
 
-#, fuzzy
 msgid "Estonian"
-msgstr "Bosniarra"
+msgstr "Estoniera"
 
 msgid "Euskera(Basque)"
 msgstr "Euskara"
@@ -11299,35 +11295,32 @@
 msgid "French"
 msgstr "Frantsesa"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Turkiera "
+msgstr "Gaelera"
 
 msgid "Galician"
 msgstr "Galiziera"
 
 msgid "Gujarati"
-msgstr ""
+msgstr "Gujaratera"
 
 msgid "Gujarati Language Team"
-msgstr ""
+msgstr "Gujaratera Itzulpen-Taldea"
 
 msgid "Hebrew"
 msgstr "Hebreera"
 
 msgid "Hindi"
-msgstr "Hindia"
+msgstr "Hindi"
 
 msgid "Hungarian"
 msgstr "Hungariera"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Errumaniera"
-
-#, fuzzy
+msgstr "Armeniera"
+
 msgid "Indonesian"
-msgstr "Mazedoniera"
+msgstr "Indonesiera"
 
 msgid "Italian"
 msgstr "Italiera"
@@ -11338,20 +11331,17 @@
 msgid "Georgian"
 msgstr "Georgiera"
 
-#, fuzzy
 msgid "Ubuntu Georgian Translators"
-msgstr "Itzultzaileak"
-
-#, fuzzy
+msgstr "Ubuntuko Georgiera Itzultzaileak"
+
 msgid "Khmer"
-msgstr "Opera"
-
-#, fuzzy
+msgstr "Khmerera"
+
 msgid "Kannada"
-msgstr "Debekatuta"
+msgstr "Kannadera"
 
 msgid "Kannada Translation team"
-msgstr ""
+msgstr "Kannadera Itzulpen-taldea"
 
 msgid "Korean"
 msgstr "Koreera"
@@ -11359,8 +11349,9 @@
 msgid "Kurdish"
 msgstr "Kurduera"
 
+#, fuzzy
 msgid "Lao"
-msgstr ""
+msgstr "Laoera"
 
 msgid "Lithuanian"
 msgstr "Lituaniera"
@@ -11368,31 +11359,28 @@
 msgid "Macedonian"
 msgstr "Mazedoniera"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "Mazedoniera"
-
-#, fuzzy
+msgstr "Mongoliaera"
+
 msgid "Bokmål Norwegian"
-msgstr "Norvegiera"
-
-#, fuzzy
+msgstr "Bokmål Norvegiera"
+
 msgid "Nepali"
-msgstr "bengalera"
+msgstr "Nepalera"
 
 #, fuzzy
 msgid "Dutch, Flemish"
-msgstr "Nederlandera; flandesera"
+msgstr "Nederlandera, Flandesera"
 
 #, fuzzy
 msgid "Norwegian Nynorsk"
-msgstr "Norvegiera"
+msgstr "Norvegiar Nynorsk"
 
 msgid "Occitan"
-msgstr ""
+msgstr "Okzitaniera"
 
 msgid "Punjabi"
-msgstr ""
+msgstr "Punjabera"
 
 msgid "Polish"
 msgstr "Poloniera"
@@ -11403,9 +11391,8 @@
 msgid "Portuguese-Brazil"
 msgstr "Portugesa-Brasil"
 
-#, fuzzy
 msgid "Pashto"
-msgstr "Argazkia"
+msgstr "Pashtoera"
 
 msgid "Romanian"
 msgstr "Errumaniera"
@@ -11426,29 +11413,28 @@
 msgstr "Serbiera"
 
 msgid "Sinhala"
-msgstr ""
+msgstr "Zingaliera"
 
 msgid "Swedish"
 msgstr "Suediera"
 
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
 msgid "Tamil"
-msgstr "Tamil"
+msgstr "Tamilera"
 
 msgid "Telugu"
-msgstr "Telugu"
-
-#, fuzzy
+msgstr "Teluguera"
+
 msgid "Thai"
-msgstr "Tamil"
+msgstr "Thaiera"
 
 msgid "Turkish"
 msgstr "Turkiera"
 
 msgid "Urdu"
-msgstr ""
+msgstr "Urdu"
 
 msgid "Vietnamese"
 msgstr "Vietnamera"
@@ -11466,7 +11452,7 @@
 msgstr "Txinera Tradizionala"
 
 msgid "Amharic"
-msgstr "Amharic"
+msgstr "Amharera"
 
 #, c-format
 msgid "About %s"
@@ -11763,9 +11749,8 @@
 "Bisitatutako (edo aktibatutako) hiperestekak marrazteko erabiliko den "
 "kolorea."
 
-#, fuzzy
 msgid "Hyperlink prelight color"
-msgstr "Hiperestekaren kolorea"
+msgstr ""
 
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Hiperestekek xagua gainean dutenean marrazteko kolorea."
@@ -12068,7 +12053,7 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. `%s -h' erabili ezazu informazio gehiago eskuratzeko.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12085,17 +12070,20 @@
 "  --display=DISPLAY   X display to use\n"
 "  -v, --version       display the current version and exit\n"
 msgstr ""
-"Pidgin %s\n"
-"Erabiltzeko era: %s [Aukerak]...\n"
-"\n"
-"  -c, --config=DIR    erabili DIR konfigurazio fitxategientzat\n"
-"  -d, --debug         idatzi \"debugging\"mezuak stdout -en\n"
-"  -h, --help          Erakutsi laguntza eta irten\n"
-"  -n, --nologin       Automatikoki ez konexio hasi\n"
-"  -l, --login[=IZENA]  Automatikoki konexioa hasi (IZENA aukerazko argumentu "
-"espesifikazioa\n"
-"                      kontua(k) erabiltzeko, koma batez bereiztu)\n"
-"  -v, --version       Erakutsi egungo bertsioa eta irten\n"
+"%s %s\n"
+"Erabilera: %s [AUKERA]...\n"
+"\n"
+"  -c, --config=DIR    DIR erabili konfigurazio-fitxategietarako\n"
+"  -d, --debug         'stdout'-en inprimatu arazte-mezuak\n"
+"  -f, --force-online  konektatzera beharko, sare-egoera kontutan hartu gabe\n"
+"  -h, --help          laguntza hau bistaratu eta irten\n"
+"  -m, --multiple      ez istantzia bakarra egotera behartu\n"
+"  -n, --nologin       ez automatikoki konektatu\n"
+"  -l, --login[=IZENA]  kontu zehaztza(k) gaitu (opzionalki NAME\n"
+"                      erabili zein kontu erabili zehazteko,komaz bereiztuz.\n"
+"                      Hau gabe, lehenengo kontua bakarrik gaituko da).\n"
+"  --display=DISPLAY   zein X-pantaila erabili\n"
+"  -v, --version       bertsio-zenbakia erakutsi eta irten\n"
 
 #, c-format
 msgid ""
@@ -12170,11 +12158,11 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s(e)k bideo-sesio bat hasiarazi nahi du zurekin."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s (%s), mezu berri %d."
-msgstr[1] "%s (%s), %d mezu berri."
+msgstr[0] "%s(e)k mezu berri %d dauka."
+msgstr[1] "%s(e)k %d mezu berri dauzka."
 
 #, c-format
 msgid "<b>%d new email.</b>"
@@ -13073,9 +13061,8 @@
 msgid "_Open File"
 msgstr "Fitxategia _Ireki"
 
-#, fuzzy
 msgid "Open _Containing Directory"
-msgstr "Bilatu direktorioa"
+msgstr ""
 
 msgid "Save File"
 msgstr "Fitxategia Gorde"
@@ -13123,7 +13110,7 @@
 msgstr "Pidgin smiley-ak"
 
 msgid "Penguin Pimps"
-msgstr ""
+msgstr "Pinguino Proxenetak"
 
 msgid "Selecting this disables graphical emoticons."
 msgstr "Hau hautatzean, emotikono grafikoak ezgaituko dira."
@@ -13137,9 +13124,8 @@
 msgid "Smaller versions of the default smilies"
 msgstr "Smily-en bertsio txikiagoak"
 
-#, fuzzy
 msgid "Response Probability:"
-msgstr "Erantzunak galdu dira"
+msgstr "Erantzun-Probabilitatea:"
 
 msgid "Statistics Configuration"
 msgstr "Estatistika-Konfigurazioa"
@@ -13194,9 +13180,8 @@
 msgid "Add to Buddy List"
 msgstr "Lagun-Zerrendara Gehitu"
 
-#, fuzzy
 msgid "Gateway"
-msgstr "Joanda egoera joan"
+msgstr "Pasabidea"
 
 msgid "Directory"
 msgstr "Direktorioa"
@@ -13403,7 +13388,6 @@
 msgstr "Sagu-keinuak jasaten ditu"
 
 #. *  description
-#, fuzzy
 msgid ""
 "Allows support for mouse gestures in conversation windows. Drag the middle "
 "mouse button to perform certain actions:\n"
@@ -13411,12 +13395,12 @@
 " • 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 ""
-"Sagu-mugimenduak erabiltzeko aukera ematen du solasaldi-leihoetan.\n"
-"Arrastatu saguaren erdiko botoia hainbat eragiketa egiteko:\n"
-"\n"
-"Arrastatu beherantz eta eskuinerantz solasaldiak ixteko.\n"
-"Arrastatu gorantz eta ezkerrerantz aurreko solasaldira joateko.\n"
-"Arrastatu gorantz eta eskuinerantz hurrengo solasaldira joateko."
+"Solasaldi-leihoetan sagu-mugimenduak erabiltzeko aukera ematen du .Saguaren "
+"erdiko botoia arrastatu ezazu hainbat ekintza burutzeko:\n"
+"\n"
+" • Behera eta eskuinera arrastatu ezazu solasaldia isteko.\n"
+" • Gora eta ezkerrera arrastatu ezazu aurreko solasaldira joateko.\n"
+" • Gora eta eskuinera arrastatu ezazu hurrengo solasaldira joateko."
 
 msgid "Instant Messaging"
 msgstr "Istanteko Mezularitza"
--- a/po/nn.po	Mon Aug 03 00:46:28 2009 +0000
+++ b/po/nn.po	Wed Aug 05 01:34:35 2009 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-12 20:58-0700\n"
-"PO-Revision-Date: 2009-05-31 13:58+0100\n"
+"POT-Creation-Date: 2009-08-02 23:34-0700\n"
+"PO-Revision-Date: 2009-08-01 13:29+0100\n"
 "Last-Translator: Yngve Spjeld Landro <nynorsk@landro.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -1666,6 +1666,44 @@
 msgid "_View Certificate..."
 msgstr "Vis _sertifikat…"
 
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Sertifikatet som \"%s\" presenterte seier at det er frå \"%s\" i staden for. "
+"Dette kan bety at du ikkje koplar deg til den tenesta du trur du gjer."
+
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "SSL sertifikatfeil"
+
+msgid "Invalid certificate chain"
+msgstr "Ugyldig sertifikatkjede"
+
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Du har ingen database over rotsertifikat. Dermed kan ikkje dette "
+"sertifikatet validerast."
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1676,29 +1714,11 @@
 "Sertifikatet som \"%s\" presenterte, er sjølvsignert. Det kan ikkje "
 "kontrollerast automatisk."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Den presenterte sertifikatkjeda til %s er ikkje gyldig."
 
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-msgid "SSL Certificate Error"
-msgstr "SSL sertifikatfeil"
-
-msgid "Invalid certificate chain"
-msgstr "Ugyldig sertifikatkjede"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Du har ingen database over rotsertifikat. Dermed kan ikkje dette "
-"sertifikatet validerast."
-
 # ?
 #. vrq will be completed by user_auth
 msgid ""
@@ -1717,18 +1737,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "Ugyldig sertifikatautoritetssignatur"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Sertifikatet som \"%s\" presenterte seier at det er frå \"%s\" i staden for. "
-"Dette kan bety at du ikkje koplar deg til den tenesta du trur du gjer."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1765,7 +1773,7 @@
 msgstr "+++ %s logga av"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "Ukjend feil"
 
@@ -1954,9 +1962,9 @@
 msgid "Starting transfer of %s from %s"
 msgstr "Startar overføring av %s frå %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "Overføringa av fila %s er ferdig"
+msgstr "Overføringa av fila <a href=\"file://%s\">%s</a> er ferdig"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -2171,9 +2179,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "Tilkoplingsfeil"
+msgstr "Klarte ikkje å laga konferansen"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2572,7 +2579,6 @@
 msgstr "Tek med loggar frå andre lynmeldingsklientar i loggvisaren."
 
 #. * 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"
@@ -2581,7 +2587,7 @@
 "at your own risk!"
 msgstr ""
 "Når ein les loggar, vil dette programtillegget ta med loggar frå andre "
-"klientar. For tida gjeld dette Adium, MSN Messenger og Trillian.\n"
+"klientar. For tida gjeld dette Adium, MSN Messenger, aMSN og Trillian.\n"
 "\n"
 "ÅTVARING: Dette tillegget er framleis ei alfa-utgåve og vil kanskje krasja "
 "ofte. Bruk det på eigen risiko!"
@@ -2629,13 +2635,13 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Lagra meldingar som er sende til ein fråkopla brukar som varsel."
 
-#, fuzzy
+# `? '?
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Resten av meldingane vil bli lagra som eit varsel. Du kan endra/sletta "
-"varselet frå vennevarsel-vindauget."
+"Resten av meldingane vil bli lagra som varsel. Du kan endra/sletta varselet "
+"frå `vennevarsel'-vindauget."
 
 #, c-format
 msgid ""
@@ -2883,17 +2889,15 @@
 "Klarer ikkje å sjå at ActiveTCL er installert. Om du ønskjer å nytta TCL-"
 "tillegg må du installera ActiveTCL frå 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 ""
-"Fann ikkje verktøysamlinga til Apple Bonjour for Windows. Du finn fleire "
-"opplysningar på adressa http://d.pidgin.im/BonjourWindows."
-
-#, fuzzy
+"Fann ikkje verktøysamlinga til Apple sin  \"Bonjour for Windows\". Du finn "
+"fleire opplysningar på adressa http://d.pidgin.im/BonjourWindows."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "Klarer ikkje å lytta etter innkomande meldingstilkoplingar\n"
+msgstr "Klarer ikkje å lytta etter innkomande meldingstilkoplingar"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2944,21 +2948,17 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Klarte ikkje å senda meldinga. Samtala kunne ikkje startast."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"Klarte ikkje å laga endepunkt:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Klarte ikkje å laga endepunktet:%s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Klarte ikkje å binda endepunktet til port"
-
-#, fuzzy, c-format
+msgstr "Klarte ikkje å knyta endepunktet til porten: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"Klarte ikkje å laga endepunkt:\n"
-"%s"
+msgstr "Klarte ikkje å lytta på endepunktet: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Feil i sambandet med lokal mDNSResponder."
@@ -3006,17 +3006,14 @@
 msgid "Load buddylist from file..."
 msgstr "Hent vennelista frå fil…"
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Fyll ut registreringsfelta."
-
-#, fuzzy
+msgstr "Du må fylla ut alle registreringsfelta"
+
 msgid "Passwords do not match"
-msgstr "Passorda samsvarer ikkje."
-
-#, fuzzy
+msgstr "Passorda samsvarer ikkje"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Klarer ikkje å registrera ny konto. Det oppstod ein feil.\n"
+msgstr "Klarer ikkje å registrera ein ny konto. Det oppstod ein ukjend feil."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Ein ny Gadu-gadu-konto er registrert"
@@ -3030,10 +3027,10 @@
 msgid "Password (again)"
 msgstr "Passord (om att)"
 
+# ?! ;-)
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Skriv teksten til tastetestbiletet"
+
 msgid "Captcha"
 msgstr "Tastetestbilete"
 
@@ -3174,9 +3171,9 @@
 msgid "Chat _name:"
 msgstr "Prate_namn:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Klarte ikkje å kopla til %s: %s"
+msgstr "Klarer ikkje å finna tenarnamnet '%s': %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3189,9 +3186,8 @@
 msgid "This chat name is already in use"
 msgstr "Prateromsnamnet er allereie i bruk"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Ikkje tilkopla tenaren."
+msgstr "Ikkje tilkopla tenaren"
 
 msgid "Find buddies..."
 msgstr "Søk etter venner…"
@@ -3232,9 +3228,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-brukar"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Hentar tenar"
+msgstr "GG-tenar"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3250,7 +3245,6 @@
 msgid "File Transfer Failed"
 msgstr "Filoverføringa feila"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "Klarte ikkje å opna ein lytteport."
 
@@ -3274,11 +3268,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 ""
-"Mista sambandet med tenaren:\n"
-"%s"
+msgstr "Mista sambandet med tenaren: %s"
 
 msgid "View MOTD"
 msgstr "Vis \"Dagens melding\""
@@ -3299,13 +3291,13 @@
 msgstr "Klarte ikkje å kopla til"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Klarte ikkje å kopla til %s"
-
-#, fuzzy, c-format
+msgstr "Klarer ikkje å kopla til: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "Tenaren lukka tilkoplinga."
+msgstr "Tenaren lukka tilkoplinga"
 
 msgid "Users"
 msgstr "Brukarar"
@@ -3733,13 +3725,11 @@
 msgid "execute"
 msgstr "utfør"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "Tenaren krev TLS/SSL for pålogging. Fann inga TLS/SSL-støtte."
-
-#, fuzzy
+msgstr "Tenaren krev TLS/SSL, men fann inga TLS/SSL-støtte."
+
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Du krev kryptering, men TLS/SSL-støtte blei ikkje funne."
+msgstr "Du krev kryptering, men fann inga TLS/SSL-støtte."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Tenaren krev autentisering i klartekst over eit ukryptert samband"
@@ -3755,13 +3745,11 @@
 msgid "Plaintext Authentication"
 msgstr "Autentisering i klartekst"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Autentiseringa feila"
-
-#, fuzzy
+msgstr "SASL-autentiseringa feila"
+
 msgid "Invalid response from server"
-msgstr "Ugyldig svar frå tenaren."
+msgstr "Ugyldig svar frå tenaren"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Tenaren nyttar ikkje ein autentiseringsmetode som er støtta "
@@ -3772,9 +3760,9 @@
 msgid "Invalid challenge from server"
 msgstr "Ugyldig utfordring frå tenaren"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL-feil"
+msgstr "SASL-feil: %s"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr "Styringstenaren til BOSH avslutta økta di."
@@ -3788,9 +3776,9 @@
 msgid "Unable to establish a connection with the server"
 msgstr "Klarte ikkje å kopla til tenaren"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "Klarte ikkje å kopla til tenaren"
+msgstr "Klarte ikkje å kopla til tenaren: %s"
 
 msgid "Unable to establish SSL connection"
 msgstr "Klarte ikkje å setja i gang SSL-sambandet"
@@ -3810,6 +3798,11 @@
 msgid "Street Address"
 msgstr "Gateadresse"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Tilleggsadressefelt"
 
@@ -3874,7 +3867,6 @@
 msgid "%s ago"
 msgstr "%s sidan"
 
-#, fuzzy
 msgid "Logged Off"
 msgstr "Avlogga"
 
@@ -3899,14 +3891,12 @@
 msgid "Temporarily Hide From"
 msgstr "Mellombels vekke frå"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Avbryt nærværsvarsling"
 
 msgid "(Re-)Request authorization"
 msgstr "Send godkjenningsførespurnaden (ein gong til)"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4054,17 +4044,15 @@
 msgid "Roles:"
 msgstr "Roller:"
 
-#, fuzzy
 msgid "Ping timed out"
 msgstr "Tidsavbrot ping"
 
-#, fuzzy
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
 "Klarte ikkje å finna alternative XMPP-tilkoplingar etter mislykka forsøk på "
-"å kopla til direkte.\n"
+"å kopla til direkte."
 
 msgid "Invalid XMPP ID"
 msgstr "Ugyldig XMPP-id"
@@ -4072,9 +4060,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ulovleg XMPP-id. Domene må vera vald."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "BOSH-tilkoplingstenaren er ikkje velforma"
+msgstr "BOSH-adressa er ikkje velforma"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4142,9 +4129,6 @@
 msgid "Change Registration"
 msgstr "Endra registreringa"
 
-msgid "Malformed BOSH Connect Server"
-msgstr "BOSH-tilkoplingstenaren er ikkje velforma"
-
 msgid "Error unregistering account"
 msgstr "Feil ved avregistreringa av kontoen"
 
@@ -4579,7 +4563,7 @@
 msgstr "Mellomlager filoverføringar"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH-adresse"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4643,19 +4627,17 @@
 msgid "_Accept Defaults"
 msgstr "_Godta standardinnstillingane"
 
-#, fuzzy
 msgid "No reason"
-msgstr "Gav ingen årsak"
-
-#, fuzzy, c-format
+msgstr "Ingen årsak"
+
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Du er blitt sparka ut av %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Du er blitt sparka ut av: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Sparka ut av %s (%s)"
-
-#, fuzzy
+msgstr "Sparka ut (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
 msgstr "Overføringa av samtidsdatastraumen feila\n"
 
@@ -4991,23 +4973,26 @@
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
 msgstr ""
+"%s sende deg ein blunk. <a href='msn-wink://%s'>Klikk her for å spela han "
+"av</a>"
 
 #, c-format
 msgid "%s sent a wink, but it could not be saved"
-msgstr ""
+msgstr "%s sende deg ein blunk, men han blei ikkje lagra"
 
 #, c-format
 msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
 msgstr ""
+"%s sende eit taleklipp. <a href='audio://%s'>Klikk her for å spela det av</a>"
 
 #, c-format
 msgid "%s sent a voice clip, but it could not be saved"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%s sende deg eit lydklipp, men det kunne ikkje lagrast"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje "
+"%s har sendt deg ein lydpratinvitasjon. Denne funksjonen er enno ikkje "
 "støtta."
 
 msgid "Nudge"
@@ -5160,18 +5145,29 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN krev bruk av SSL. Last ned eit støtta SSL-bibliotek. "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address."
 msgstr ""
-"Klarte ikkje å leggja til vennen %s fordi brukarnamnet ikkje er gyldig. "
-"Brukarnamn må vera ei gyldig e-postadresse, eller begynna med ein bokstav og "
-"berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
+"Klarte ikkje å leggja til vennen %s fordi brukarnamnet er ugyldig. "
+"Brukarnamn må vera ei gyldig e-postadresse."
 
 msgid "Unable to Add"
 msgstr "Klarer ikkje å leggja til"
 
+msgid "Authorization Request Message:"
+msgstr "Godtakingførespurnad:"
+
+msgid "Please authorize me!"
+msgstr "Gjer vel og godta meg."
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
+
 msgid "Error retrieving profile"
 msgstr "Klarte ikkje å henta profilen"
 
@@ -5370,6 +5366,7 @@
 msgid "Unable to add user"
 msgstr "Klarte ikkje å leggja til brukar"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "ukjend feil (%d)"
@@ -5437,25 +5434,21 @@
 "Tilkoplingsfeil frå %s-tenaren:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Protokollen vår er ikkje støtta av tenaren."
-
-#, fuzzy
+msgstr "Protokollen vår er ikkje støtta av tenaren"
+
 msgid "Error parsing HTTP"
-msgstr "Feil i HTTP-tolkinga."
-
-#, fuzzy
+msgstr "Feil i HTTP-tolkinga"
+
 msgid "You have signed on from another location"
-msgstr "Du har logga på frå ein annan stad."
+msgstr "Du har logga på frå ein annan stad"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-tenarane er mellombels utilgjengelege. Vent ei stund og prøv igjen."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN-tenarane vil vera mellombels nede."
+msgstr "MSN-tenarane vil vera mellombels nede"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5484,11 +5477,11 @@
 msgid "Retrieving buddy list"
 msgstr "Hentar vennelista"
 
-#, fuzzy, c-format
+# dårleg formulering?
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
-"%s har sendt deg ein nettkamerainvitasjon. Denne funksjonen er enno ikkje "
-"støtta."
+"%s spør om å få sjå nettkameraet ditt. Denne funksjonen er enno ikkje støtta."
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -5684,15 +5677,15 @@
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfeil, kode %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 Passordet ditt er på %d teikn. MySpaceIM godtek berre %d teikn. Gjer "
-"passordet ditt kortare på nettsida http://profileedit.myspace.com/index.cfm?"
-"fuseaction=accountSettings.changePassword og prøv på nytt."
+"%s Passordet ditt er på %zu teikn, som er lengre enn største lengda som er %"
+"d. Gjer passordet ditt kortare på nettsida http://profileedit.myspace.com/"
+"index.cfm?fuseaction=accountSettings.changePassword og prøv på nytt."
 
 msgid "Incorrect username or password"
 msgstr "Feil brukarnamn eller passord"
@@ -5791,6 +5784,9 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"Det oppstod ein feil då brukarnamnet skulle lagrast. Prøv igjen, eller besøk "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username for å "
+"lagra brukarnamnet ditt."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - brukarnamnet er tilgjengeleg"
@@ -6047,9 +6043,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "Ukjend feil: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Klarer ikkje å pinga brukaren %s"
+msgstr "Klarer ikkje å logga på: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6179,7 +6175,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s verkar vera fråkopla. Brukaren fekk ikkje meldinga du nett sendte."
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6209,9 +6204,8 @@
 msgid "Server port"
 msgstr "Tenarport"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "Fekk uventa HTTP-svar frå tenar."
+msgstr "Fekk uventa svar frå "
 
 #. username connecting too frequently
 msgid ""
@@ -6221,12 +6215,12 @@
 "Du har kopla til og blitt fråkopla for ofte. Vent i ti minutt og prøv igjen. "
 "Held du fram med å prøva, vil du måtta venta endå lenger."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Klarte ikkje å slå opp %s"
+msgstr "Klarte ikkje å spørja"
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL tillèt ikkje at brukarnamnet ditt kan autentiserast her"
 
 msgid "Could not join chat room"
 msgstr "Klarte ikkje å bli med i praterommet"
@@ -6234,9 +6228,8 @@
 msgid "Invalid chat room name"
 msgstr "Ugyldig prateromsnamn"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "Det kom ugyldige data frå sambandet med tenaren."
+msgstr "Det kom ugyldige data frå sambandet med tenaren"
 
 #. *< type
 #. *< ui_requirement
@@ -6283,7 +6276,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "Det kom ugyldige data ved tilkoplinga til fjerntenaren."
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "Klarer ikkje å laga til eit samband med fjernbrukaren."
 
@@ -6483,15 +6475,13 @@
 msgid "Buddy Comment"
 msgstr "Vennenotat"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Klarte ikkje å kopla opp mot autentiseringstenaren:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Klarte ikkje å kopla opp mot autentiseringstenaren: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Klarer ikkje å kopla til tenaren."
+msgstr "Klarer ikkje å kopla til mot BOS-tenaren: %s"
 
 msgid "Username sent"
 msgstr "Finch"
@@ -6503,16 +6493,15 @@
 msgid "Finalizing connection"
 msgstr "Fullfører tilkoplinga"
 
-#, 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 ""
-"Får ikkje til å logga på: klarer ikkje å logga på som %s fordi brukarnamnet "
-"er ugyldig. Brukarnamn må vera ei gyldig e-postadresse, eller begynna med "
-"ein bokstav og berre innehalda bokstavar. tal og mellomrom, eller berre "
-"innehalda tal."
+"Får ikkje til å logga på som %s fordi brukarnamnet er ugyldig. Brukarnamn må "
+"vera ei gyldig e-postadresse, eller begynna med ein bokstav og berre "
+"innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6535,9 +6524,8 @@
 msgstr "Brukarnamnet finst ikkje"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Kontoen din er for tida sperra for bruk."
+msgstr "Kontoen din er for tida sperra for bruk"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
@@ -6549,17 +6537,15 @@
 msgstr "Klientutgåva du bruker er for gammal. Oppgrader på %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 ""
-"Du har kopla til og blitt fråkopla for ofte. Vent i ti minutt og prøv igjen. "
+"Du har kopla til og blitt fråkopla for ofte. Vent ei stund og prøv igjen. "
 "Held du fram med å prøva, vil du måtta venta endå lenger."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "Den innskrivne SecurID-nøkkelen er ugyldig."
+msgstr "Den innskrivne SecurID-nøkkelen er ugyldig"
 
 msgid "Enter SecurID"
 msgstr "Skriv inn SecurID"
@@ -6567,12 +6553,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Før opp dei seks tala frå den digitale teiknruta."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
 msgid "Password sent"
 msgstr "Passordet er sendt"
 
@@ -6582,12 +6562,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Om du godtek meg, kan eg leggja deg til i vennelista mi."
 
-msgid "Authorization Request Message:"
-msgstr "Godtakingførespurnad:"
-
-msgid "Please authorize me!"
-msgstr "Gjer vel og godta meg."
-
 msgid "No reason given."
 msgstr "Ingen årsak oppgjeven."
 
@@ -6914,13 +6888,13 @@
 msgid "Away message too long."
 msgstr "Fråværsmeldinga er for lang."
 
-#, 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, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Klarte ikkje å leggja til vennen %s fordi brukarnamnet ikkje er gyldig. "
+"Klarte ikkje å leggja til vennen %s fordi brukarnamnet er ugyldig. "
 "Brukarnamn må vera ei gyldig e-postadresse, eller begynna med ein bokstav og "
 "berre innehalda bokstavar. tal og mellomrom, eller berre innehalda tal."
 
@@ -6937,7 +6911,7 @@
 msgid "Orphans"
 msgstr "Foreldrelause"
 
-#, 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."
@@ -6948,9 +6922,9 @@
 msgid "(no name)"
 msgstr "(ikkje noko namn)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "Klarte ikkje av ukjend årsak å leggja til vennen %s."
+msgstr "Klarte ikkje av uviss årsak å leggja til vennen %s."
 
 #, c-format
 msgid ""
@@ -7111,9 +7085,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Søk etter venn utfrå opplysningar"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "Brukaren er ikkje innlogga"
+msgstr "Bruk klientpålogging"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7722,7 +7695,6 @@
 msgid "Update interval (seconds)"
 msgstr "Oppdateringsintervall (sekund)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "Klarer ikkje å dekryptera tenarsvaret"
 
@@ -7790,9 +7762,8 @@
 msgid "Requesting token"
 msgstr "Spør etter symbol"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "Vertsnamnoppslaget feila"
+msgstr "Klarer ikkje å finna tenarnamnet"
 
 msgid "Invalid server or port"
 msgstr "Ugyldig tenar eller port"
@@ -7847,7 +7818,6 @@
 msgid "QQ Qun Command"
 msgstr "QQ-gruppekommando"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
 msgstr "Klarte ikkje å dekryptera påloggingssvaret"
 
@@ -8827,9 +8797,8 @@
 msgid "Disconnected by server"
 msgstr "Fråkopla av tenaren"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "Feil under tilkopling mot SILC-tenaren"
+msgstr "Feil under tilkoplinga mot SILC-tenaren"
 
 msgid "Key Exchange failed"
 msgstr "Nøkkelutvekslinga feila"
@@ -8843,27 +8812,21 @@
 msgid "Performing key exchange"
 msgstr "Utfører nøkkelutveksling"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "Klarte ikkje å lasta SILC nøkkelpar"
+msgstr "Klarte ikkje å lasta SILC-nøkkelparet"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "Koplar til SILC-tenar"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "Klarte ikkje å lasta SILC nøkkelpar"
-
 msgid "Out of memory"
 msgstr "Ikkje nok minne"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
-msgstr "Klarer ikkje å kjøra SILC-protokollen"
+msgstr "Klarer ikkje å starta SILC-protokollen"
 
 msgid "Error loading SILC key pair"
-msgstr "Feil under lasting av SILC nøkkelpar"
+msgstr "Feil under lastinga av SILC-nøkkelparet"
 
 #, c-format
 msgid "Download %s: %s"
@@ -8935,7 +8898,7 @@
 msgstr "Det er inga \"Dagens melding\" knytt til dette sambandet"
 
 msgid "Create New SILC Key Pair"
-msgstr "Lag nytt SILC nøkkelpar"
+msgstr "Lag nytt SILC-nøkkelpar"
 
 msgid "Passphrases do not match"
 msgstr "Tilgangsfrasene samsvarer ikkje"
@@ -8965,7 +8928,7 @@
 msgstr "Sjå \"Dagens melding\""
 
 msgid "Create SILC Key Pair..."
-msgstr "Lag SILC nøkkelpar…"
+msgstr "Lag SILC-nøkkelpar…"
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
@@ -9157,11 +9120,10 @@
 msgstr "Skriv under digitalt og stadfest alle meldingar"
 
 msgid "Creating SILC key pair..."
-msgstr "Lagar SILC nøkkelpar…"
-
-#, fuzzy
+msgstr "Lagar SILC-nøkkelpar…"
+
 msgid "Unable to create SILC key pair"
-msgstr "Klarer ikkje å laga SILC nøkkelpar\n"
+msgstr "Klarer ikkje å laga SILC-nøkkelparet"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9305,27 +9267,24 @@
 msgid "Failure: Authentication failed"
 msgstr "Feil: autentiseringa feila"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Klarer ikkje å oppretta eit SILC klientsamband"
+msgstr "Klarer ikkje å starta eit SILC-klientsamband"
 
 msgid "John Noname"
 msgstr "Utan namn"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "Klarte ikkje å lasta SILC nøkkelparet: %s"
+msgstr "Klarer ikkje å lasta SILC-nøkkelparet: %s"
 
 msgid "Unable to create connection"
 msgstr "Klarte ikkje å oppretta samband"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Ukjent tenarsvar."
-
-#, fuzzy
+msgstr "Ukjent tenarsvar"
+
 msgid "Unable to create listen socket"
-msgstr "Klarte ikkje å laga endepunkt"
+msgstr "Klarte ikkje å laga lytteendepunktet"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-brukarnamn kan ikkje innehalda mellomrom eller @-teikn"
@@ -9388,7 +9347,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo-protokolltillegg"
 
@@ -9419,9 +9377,8 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo prateport"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo-ID …"
+msgstr "Yahoo JAPAN-id…"
 
 #. *< type
 #. *< ui_requirement
@@ -9433,9 +9390,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo-protokolltillegg"
+msgstr "Yahoo JAPAN-protokolltillegg"
 
 msgid "Your SMS was not delivered"
 msgstr "ra"
@@ -9469,22 +9425,20 @@
 msgstr "Det kom ugyldige data"
 
 #. 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 ""
-"Ukjent feilnummer %d. Du kan kanskje løysa problemet ved å nytta Yahoo! sin "
-"nettstad for å logga deg på."
+"Kontoen er låst grunna for mange forsøk på å logga på. Du kan kanskje løysa "
+"problemet ved å logga deg på Yahoo! sin nettstad."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Ukjent feilnummer %d. Du kan kanskje løysa problemet ved å nytta Yahoo! sin "
-"nettstad for å logga deg på."
+"Kontoen er låst av ukjent grunn. Du kan kanskje løysa problemet ved å logga "
+"deg på Yahoo! sin nettstad."
 
 #. username or password missing
 msgid "Username or password missing"
@@ -9523,12 +9477,11 @@
 "Ukjent feilnummer %d. Du kan kanskje løysa problemet ved å nytta Yahoo! sin "
 "nettstad for å logga deg på."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Klarte ikkje å leggja til vennen %s i gruppa %s i tenarlista til kontoen %s."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "Klarte ikkje å leggja til vennen i tenarlista"
 
@@ -9536,19 +9489,16 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hørleg %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Fekk uventa HTTP-svar frå tenar."
-
-#, fuzzy, c-format
+msgstr "Fekk uventa HTTP-svar frå tenaren"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Mista sambandet med %s:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Mista sambandet med %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "Klarte ikkje å kopla til tenaren"
+msgstr "Klarte ikkje å kopla til %s: %s"
 
 msgid "Not at Home"
 msgstr "Ikkje heime"
@@ -9596,7 +9546,7 @@
 msgstr "Laga krusedullar"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Vel ID-en du vil ta i bruk"
 
 msgid "Join whom in chat?"
 msgstr "Bli med kven i praterommet?"
@@ -9696,12 +9646,8 @@
 msgstr "Brukarprofilen er tom."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s har avvist konferanseinvitasjonen din til rommet \"%s\" grunna \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Invitasjonen avvist"
+msgid "%s has declined to join."
+msgstr "%s har avslått å bli med."
 
 msgid "Failed to join chat"
 msgstr "Klarte ikkje å bli med i praterommet"
@@ -9753,9 +9699,8 @@
 msgid "User Rooms"
 msgstr "Brukarrom"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Tilkoplingsproblem med YCHT-tenaren."
+msgstr "Tilkoplingsproblem med YCHT-tenaren"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9885,15 +9830,15 @@
 msgid "Exposure"
 msgstr "Framvising"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Klarer ikkje å tolka svaret frå HTTP-mellomtenaren: %s\n"
+msgstr "Klarer ikkje å tolka svaret frå HTTP-mellomtenaren: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Feil i ambandet mot HTTP-mellomtenaren: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "Tilgang avvist: HTTP-mellomtenaren tillèt ikkje tunnel over port %d."
 
@@ -10189,7 +10134,6 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Bruk dette venne-_ikonet for denne kontoen:"
 
-#, fuzzy
 msgid "Ad_vanced"
 msgstr "A_vansert"
 
@@ -10253,9 +10197,8 @@
 msgid "Create _this new account on the server"
 msgstr "Opprett denne _nye kontoen på tenaren"
 
-#, fuzzy
 msgid "P_roxy"
-msgstr "Mellomlager"
+msgstr "_Mellomlager"
 
 msgid "Enabled"
 msgstr "I bruk"
@@ -10350,11 +10293,9 @@
 msgid "View _Log"
 msgstr "Vis l_ogg"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "Skjul  når du er fråkopla"
-
-#, fuzzy
+msgstr "Skjul når du er fråkopla"
+
 msgid "Show When Offline"
 msgstr "Vis når du er fråkopla"
 
@@ -10756,109 +10697,98 @@
 msgstr "Bakgrunnsfarge"
 
 msgid "The background color for the buddy list"
-msgstr ""
-
-#, fuzzy
+msgstr "Bakgrunnsfargen til vennelista"
+
 msgid "Layout"
-msgstr "Lao"
-
+msgstr "Utforming"
+
+# blist = vennelista?
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "Utforminga av ikona, namna og statusen til vennelista"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Bakgrunnsfarge"
+msgstr "Utvida bakgrunnsfarge"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "Bakgrunnsfargen til utvida grupper"
+
 msgid "Expanded Text"
-msgstr "_Utvid"
+msgstr "Utvida tekst"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Tekstopplysningar når ei gruppe blir utvida"
+
 msgid "Collapsed Background Color"
-msgstr "Vel bakgrunnsfarge"
+msgstr "Samanslått bakgrunnsfarge"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "Bakgrunnsfargen til ei samanslått gruppe"
+
 msgid "Collapsed Text"
-msgstr "_Slå saman"
+msgstr "Samanslått tekst"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Tekstopplysningar når ei gruppe blir samanslått"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Vel bakgrunnsfarge"
+msgstr "Bakgrunnsfarge kontakt/prat"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "Bakgrunnsfargen til ein kontakt eller prat"
+
 msgid "Contact Text"
-msgstr "Snarvegstekst"
+msgstr "Kontakttekst"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Tekstopplysningar når ein kontakt blir utvida"
+
 msgid "On-line Text"
-msgstr "Tilkopla"
+msgstr "Tilkopla-tekst"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "Tekstopplysningar når ein venn er tilkopla"
+
 msgid "Away Text"
-msgstr "Vekke"
+msgstr "Vekke-tekst"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "Tekstopplysningar når ein venn er vekke"
+
 msgid "Off-line Text"
-msgstr "Fråkopla"
+msgstr "Fråkopla-tekst"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "Tekstopplysningar når ein venn er fråkopla"
+
 msgid "Idle Text"
-msgstr "Sinnsstemningstekst"
+msgstr "Uverksam-tekst"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "Tekstopplysningar når ein venn er uverksam"
+
 msgid "Message Text"
-msgstr "Melding sendt"
+msgstr "Meldingstekst"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "Tekstopplysningar når ein venn har ei ulesen melding"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Meldingstekst (kallenamnet sa)"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
 msgstr ""
-
-#, fuzzy
+"Tekstopplysningar når eit rom har ei ulesen melding som nemner kallenamnet "
+"ditt"
+
 msgid "The text information for a buddy's status"
-msgstr "Endra brukaropplysningane til %s"
-
-#, fuzzy
+msgstr "Tekstopplysningar om vennestatusen"
+
 msgid "Type the host name for this certificate."
-msgstr "Skriv inn vertsnamnet dette sertifikatet er til."
+msgstr "Skriv inn vertsnamnet til dette sertifikatet."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -10906,7 +10836,6 @@
 msgid "Get Away Message"
 msgstr "Hent fråværsmelding"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "Sist sagt"
 
@@ -11765,14 +11694,6 @@
 msgid "File transfer _details"
 msgstr "Filoverføringsdetaljar"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Pause"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Hald fram"
-
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
 
@@ -11791,7 +11712,6 @@
 msgid "Hyperlink visited color"
 msgstr "Farge på besøkte lenkjer"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "Lenkjefarge etter at lenkja er besøkt (eller teken i bruk)."
 
@@ -11829,23 +11749,20 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Handlingsmeldingsfarge for kviskra melding"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "Farge for å teikna namnet til ei handlingsmelding."
+msgstr "Farge for å teikna namnet til ei kviskrehandlingsmelding."
 
 msgid "Whisper Message Name Color"
 msgstr "Fargenamn kviskremelding"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "Farge for å teikna namnet til ei handlingsmelding."
+msgstr "Farge for å teikna namnet til ei kviskra melding."
 
 msgid "Typing notification color"
 msgstr "Skrivevarselfarge"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "Skrifttypefarge som skal nyttast ved skrivevarsel"
+msgstr "Farge som skal nyttast ved skrivevarsel"
 
 msgid "Typing notification font"
 msgstr "Skrifttype skrivevarsel"
@@ -11957,7 +11874,7 @@
 msgstr "_Smilefjesbehandling"
 
 msgid "This theme has no available smileys."
-msgstr "Temaet har ingen tilgjengelege smilefjes."
+msgstr "Denne drakta inneheld ingen tilgjengelege smilefjes."
 
 msgid "_Font"
 msgstr "Skriftt_ype"
@@ -12429,27 +12346,24 @@
 msgid "Unknown.... Please report this!"
 msgstr "Ukjend… . Rapporter feilen."
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "Feil under utpakkinga av smilefjestemaet."
-
-#, fuzzy
+msgstr "Klarte ikkje å pakka ut drakta. "
+
 msgid "Theme failed to load."
-msgstr "Feil under utpakkinga av smilefjestemaet."
-
-#, fuzzy
+msgstr "Klarte ikkje å lasta drakta."
+
 msgid "Theme failed to copy."
-msgstr "Feil under utpakkinga av smilefjestemaet."
+msgstr "Klarte ikkje å kopiera drakta."
 
 msgid "Install Theme"
-msgstr "Installer tema"
+msgstr "Installer drakta"
 
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
-"Vel smilefjestema frå lista nedanfor. Du kan installera nye tema ved å dra "
-"og sleppa dei ned i temalista."
+"Vel smilefjesdrakt frå lista nedanfor. Du kan installera nye drakter ved å "
+"dra og sleppa dei ned i draktlista."
 
 msgid "Icon"
 msgstr "Ikon"
@@ -12475,12 +12389,11 @@
 msgid "On unread messages"
 msgstr "Ved ulesne meldingar"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "Samtalevindauge for lynmeldingar"
+msgstr "Samtalevindauge"
 
 msgid "_Hide new IM conversations:"
-msgstr "_Skjul  nye lynmeldingssamtaler:"
+msgstr "_Skjul nye lynmeldingssamtaler:"
 
 msgid "When away"
 msgstr "Når vekke"
@@ -12553,10 +12466,10 @@
 msgstr "Skrifttype"
 
 msgid "Use document font from _theme"
-msgstr "Bruk dokumentskrifttype frå _tema"
+msgstr "Bruk dokumentskrifttype frå _drakta"
 
 msgid "Use font from _theme"
-msgstr "Bruk skrifttype frå _tema"
+msgstr "Bruk skrifttype frå _drakta"
 
 msgid "Conversation _font:"
 msgstr "Samtaleskrift:"
@@ -12580,9 +12493,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Døme: stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "Finn IP-adressa _automatisk"
+msgstr "Bruk _automatisk funnen IP-adresse: %s"
 
 msgid "Public _IP:"
 msgstr "Offentleg _IP:"
@@ -12819,7 +12732,7 @@
 msgstr "Grensesnitt"
 
 msgid "Smiley Themes"
-msgstr "Smilefjestema"
+msgstr "Smilefjesdrakt"
 
 msgid "Browser"
 msgstr "Nettlesar"
@@ -13069,7 +12982,6 @@
 msgid "Cannot send launcher"
 msgstr "Klarer ikkje å senda lastaren"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13117,24 +13029,20 @@
 msgid "_Copy Email Address"
 msgstr "_Kopier e-postadressa"
 
-#, fuzzy
 msgid "_Open File"
-msgstr "Opna fil…"
-
-#, fuzzy
+msgstr "_Opna fil"
+
 msgid "Open _Containing Directory"
-msgstr "Loggkatalog"
+msgstr "Opna _innhaldskatalogen"
 
 msgid "Save File"
 msgstr "Lagra fil"
 
-#, fuzzy
 msgid "_Play Sound"
-msgstr "Spel ein lyd"
-
-#, fuzzy
+msgstr "_Spel lyden"
+
 msgid "_Save File"
-msgstr "Lagra fil"
+msgstr "_Lagra fila"
 
 msgid "Select color"
 msgstr "Vel farge"
@@ -13160,6 +13068,9 @@
 msgid "_Open Mail"
 msgstr "_Opna e-post"
 
+msgid "_Pause"
+msgstr "_Pause"
+
 msgid "_Edit"
 msgstr "_Endra"
 
@@ -13223,78 +13134,66 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Syner statistikkopplysningar om vennen din sitt tilgjenge"
 
-#, fuzzy
 msgid "Server name request"
-msgstr "Tenaradresse"
-
-#, fuzzy
+msgstr "Tenarnamnførespurnad"
+
 msgid "Enter an XMPP Server"
-msgstr "Før opp ein konferansetenar"
-
-#, fuzzy
+msgstr "Før opp ein XMPP-tenar"
+
 msgid "Select an XMPP server to query"
-msgstr "Vel ein konferansetenar å spørja"
-
-#, fuzzy
+msgstr "Vel ein XMPP-tenar å spørja"
+
 msgid "Find Services"
-msgstr "Nettenester"
-
-#, fuzzy
+msgstr "Finn tenester"
+
 msgid "Add to Buddy List"
-msgstr "Send vennelista"
-
-#, fuzzy
+msgstr "Legg til vennelista"
+
+# Kanttenar?
 msgid "Gateway"
-msgstr "Går vekk"
-
-#, fuzzy
+msgstr "Sambandstenar"
+
 msgid "Directory"
-msgstr "Loggkatalog"
-
-#, fuzzy
+msgstr "Katalog"
+
 msgid "PubSub Collection"
-msgstr "Lydval"
-
-#, fuzzy
+msgstr "PubSub-samling"
+
 msgid "PubSub Leaf"
 msgstr "PubSub-teneste"
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Skildring"
+msgstr ""
+"\n"
+"<b>Skildring:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Tenesteoppdagingsinfo"
-
-#, fuzzy
+msgstr "Tenesteoppdaging"
+
 msgid "_Browse"
-msgstr "_Nettlesar:"
-
-#, fuzzy
+msgstr "_Bla:"
+
 msgid "Server does not exist"
-msgstr "Brukaren finst ikkje"
-
-#, fuzzy
+msgstr "Tenaren finst ikkje"
+
 msgid "Server does not support service discovery"
-msgstr "Tenaren støttar ikkje blokkering"
-
-#, fuzzy
+msgstr "Tenaren støttar ikkje tenesteoppdaging"
+
 msgid "XMPP Service Discovery"
-msgstr "Tenesteoppdagingsinfo"
+msgstr "XMPP-tenesteoppdaging"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Tillat tenesteblaing og -registrering."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
-"Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
+"Dette programtillegget er nyttig ved registrering av eldre transportmetodar "
+"eller andre XMPP-tenester."
 
 msgid "Buddy is idle"
 msgstr "Vennen er uverksam"
@@ -13681,7 +13580,6 @@
 msgstr "Musikkmeldingstillegg for samkomponering."
 
 #. *  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."
@@ -13791,9 +13689,9 @@
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"Det her er verkeleg eit kjekt programtillegg som gjer eit utal ting:\n"
-"- Det seier i frå om kven som skreiv programmet når du loggar på\n"
-"- det snur all innkommande tekst til å bli baklengs\n"
+"Dette er verkeleg eit tøft programtillegg som gjer mange ting:\n"
+"- det seier i frå om kven som skreiv programmet når du loggar på\n"
+"- det snur all innkomande tekst til å bli baklengs\n"
 "- det sender ei melding til personar i vennelista di når dei loggar på"
 
 msgid "Hyperlink Color"
@@ -13805,7 +13703,6 @@
 msgid "Highlighted Message Name Color"
 msgstr "Framheva melding"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "Skrivevarselfarge"
 
@@ -13837,25 +13734,22 @@
 msgstr "GTK+ grensesnittskrift"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ snarvegstema tekst"
-
-#, fuzzy
+msgstr "Snarvegsdrakt GTK+-tekst"
+
 msgid "Disable Typing Notification Text"
-msgstr "Slå på skrivevarsel"
-
-#, fuzzy
+msgstr "Slå av skrivevarsel"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Pidgin GTK+ temabehandling"
-
-#, fuzzy
+msgstr "Kontrollinnstillingar GTK+-drakt"
+
 msgid "Colors"
-msgstr "Lukk"
+msgstr "Fargar"
 
 msgid "Fonts"
 msgstr "Skrifttypar"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diverse"
 
 msgid "Gtkrc File Tools"
 msgstr "Filverktøy Gtkrc"
@@ -13868,7 +13762,7 @@
 msgstr "Les gtkrc-filene på nytt"
 
 msgid "Pidgin GTK+ Theme Control"
-msgstr "Pidgin GTK+ temabehandling"
+msgstr "Pidgin GTK+-draktbehandling"
 
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Gjev tilgang til ofte brukte gtkrc-innstillingar."
@@ -13939,7 +13833,6 @@
 msgstr "Send-knapp samtalevindauge."
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -13997,95 +13890,82 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Erstattar tekst i utgåande meldingar etter dine reglar."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "Ikkje innlogga"
-
-#, fuzzy
+msgstr "Nettopp innlogga"
+
 msgid "Just logged out"
-msgstr "Ikkje innlogga"
+msgstr "Nettopp avlogga"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Ikon for kontakt/\n"
+"ikon for ukjend person"
+
 msgid "Icon for Chat"
-msgstr "Bli med i eit praterom"
-
-#, fuzzy
+msgstr "Prateromikon"
+
 msgid "Ignored"
-msgstr "Blokker"
-
-#, fuzzy
+msgstr "Ignorert"
+
 msgid "Founder"
-msgstr "Høgare"
-
-#, fuzzy
+msgstr "Grunnleggjar"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "Operatør"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Halv-operatør"
+
 msgid "Authorization dialog"
-msgstr "Godkjent"
-
-#, fuzzy
+msgstr "Godkjenningsvindauge"
+
 msgid "Error dialog"
-msgstr "Feil"
-
-#, fuzzy
+msgstr "Feilvindauge"
+
 msgid "Information dialog"
-msgstr "Opplysningar"
+msgstr "Opplysningsvindauge"
 
 msgid "Mail dialog"
-msgstr ""
+msgstr "E-postvindauge"
 
 # Vindauge eller meldingsvindauge?
-#, fuzzy
 msgid "Question dialog"
-msgstr "Førespurnadsvindauge"
-
-#, fuzzy
+msgstr "Spørjevindauge"
+
 msgid "Warning dialog"
-msgstr "Åtvaringsnivå"
+msgstr "Åtvaringsvindauge"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Kva for vindauge er dette?"
+
 msgid "Status Icons"
-msgstr "Status for %s"
-
-#, fuzzy
+msgstr "Statusikon"
+
 msgid "Chatroom Emblems"
-msgstr "Pratero_mslokalitet"
-
-#, fuzzy
+msgstr "Prateroms_emblem"
+
 msgid "Dialog Icons"
-msgstr "Endra ikon"
-
-#, fuzzy
+msgstr "Vindaugeikon"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ temabehandling"
-
-#, fuzzy
+msgstr "Pidgin GTK+-draktbehandlar"
+
 msgid "Contact"
-msgstr "Kontaktinfo"
-
-#, fuzzy
+msgstr "Kontakt"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Vennelistedrakt"
-
-#, fuzzy
+msgstr "Pidgin vennelistedraktbehandlar"
+
 msgid "Edit Buddylist Theme"
-msgstr "Vennelistedrakt"
+msgstr "Endra vennelistedrakta"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Endra ikondrakta"
 
 #. *< type
 #. *< ui_requirement
@@ -14094,16 +13974,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ temabehandling"
+msgstr "Pidgin draktbehandlar"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ temabehandling"
+msgstr "Pidgin draktbehandlar."
 
 #. *< type
 #. *< ui_requirement
@@ -14274,11 +14152,10 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Innstillingar som berre gjeld Pidgin under Windows."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Tilbyr val som berre gjeld Pidgin under Windows, som til dømes festing av "
+"Tilbyr val som berre gjeld Pidgin under Windows, slik som festing av "
 "vennelista."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14319,6 +14196,26 @@
 msgstr ""
 "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
 
+#~ msgid "_Resume"
+#~ msgstr "_Hald fram"
+
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "BOSH-tilkoplingstenaren er ikkje velforma"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Klarte ikkje å lasta SILC-nøkkelparet"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s har avvist konferanseinvitasjonen din til rommet \"%s\" grunna \"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Invitasjonen avvist"
+
+#~ msgid "_Proxy"
+#~ msgstr "_Mellomlager"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "Klarte ikkje å opna endepunkt"
 
@@ -14356,6 +14253,9 @@
 #~ msgid "Last Activity"
 #~ msgstr "Siste aktivitet"
 
+#~ msgid "Service Discovery Info"
+#~ msgstr "Tenesteoppdagingsinfo"
+
 #~ msgid "Service Discovery Items"
 #~ msgstr "Tenesteoppdagingselement"
 
@@ -14374,6 +14274,9 @@
 #~ msgid "Ad-Hoc Commands"
 #~ msgstr "Ad hoc-kommandoar"
 
+#~ msgid "PubSub Service"
+#~ msgstr "PubSub-teneste"
+
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "SOCKS5 bytesamband"
 
@@ -14382,506 +14285,3 @@
 
 #~ msgid "XHTML-IM"
 #~ msgstr "XHTML-IM"
-
-# må setjast om seinare
-#~ msgid "In-Band Registration"
-#~ msgstr "Samtidsegistrering"
-
-#~ msgid "User Location"
-#~ msgstr "Brukarstad"
-
-#~ msgid "User Avatar"
-#~ msgstr "Brukaravatar"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "Pratetilstandsvarsel"
-
-#~ msgid "Software Version"
-#~ msgstr "Programvareutgåve"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "Straumoppstart"
-
-#~ msgid "User Mood"
-#~ msgstr "Brukarsinnsstemning"
-
-#~ msgid "User Activity"
-#~ msgstr "Brukaraktivitet"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "Entitetseigenskapar"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "Krypterte øktforhandlingar"
-
-#~ msgid "User Tune"
-#~ msgstr "Brukarlåt"
-
-#~ msgid "Roster Item Exchange"
-#~ msgstr "Listeelement-utveksling"
-
-# Gjer betre
-#~ msgid "Reachability Address"
-#~ msgstr "Adresse ein kan nåast på"
-
-#~ msgid "User Profile"
-#~ msgstr "Brukarprofil"
-
-#~ msgid "Jingle"
-#~ msgstr "Jingle"
-
-#~ msgid "Jingle Audio"
-#~ msgstr "Jingle-lyd"
-
-#~ msgid "User Nickname"
-#~ msgstr "Brukarkallenamn"
-
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "Jingle ICE UDP"
-
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "Jingle ICE TCP"
-
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "Jingle rein UDP"
-
-#~ msgid "Jingle Video"
-#~ msgstr "Jingle Video"
-
-#~ msgid "Jingle DTMF"
-#~ msgstr "Jingle DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "Meldingskvitteringar"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "Offentleg nøkkel-publisering"
-
-#~ msgid "User Chatting"
-#~ msgstr "Brukar pratar"
-
-#~ msgid "User Browsing"
-#~ msgstr "Brukar er på Internett"
-
-#~ msgid "User Gaming"
-#~ msgstr "Brukar speler"
-
-#~ msgid "User Viewing"
-#~ msgstr "Brukar ser på"
-
-#~ msgid "Stanza Encryption"
-#~ msgstr "Blokkryptering"
-
-#~ msgid "Entity Time"
-#~ msgstr "Entitetstid"
-
-#~ msgid "Delayed Delivery"
-#~ msgstr "Forseinka levering"
-
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "Samarbeidsdataobjekt"
-
-#~ msgid "File Repository and Sharing"
-#~ msgstr "Fillager og -deling"
-
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "STUN-tenesteoppdaging for Jingle"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "Forenkla  Encrypted Session Negotiation"
-
-#~ msgid "Hop Check"
-#~ msgstr "Hoppkontroll"
-
-#~ msgid "Read Error"
-#~ msgstr "Lesefeil"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Klarte ikkje å kopla til tenaren."
-
-#~ msgid "Read buffer full (2)"
-#~ msgstr "Fullt lesemellomlager (2)"
-
-#~ msgid "Unparseable message"
-#~ msgstr "Meldinga kan ikkje tolkast"
-
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Klarte ikkje å kopla til verten: %s (%d)"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Pålogginga feila (%s)."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "Du er blitt logga ut fordi du logga deg på frå ei anna maskin."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Feil. SSL-støtte er ikkje installert."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Klarte ikkje å kopla til BOS-tenaren:\n"
-#~ "%s"
-
-#~ msgid "Invalid username."
-#~ msgstr "Ugyldig rukarnamn."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Feil passord."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Klarte ikkje å kopla til"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "Du kan bli fråkopla snart. Sjå etter oppdateringar på %s."
-
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Klarte ikkje å dekryptera tenarsvaret"
-
-#~ msgid "Connection lost"
-#~ msgstr "Tapt tilkopling"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Vertsoppslaget feila"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Tilkoplinga er lukka (skrivande)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Tilkoplinga tilbakestilt"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Feil under lesing frå endepunkt: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Klarer ikkje å kopla til tenaren"
-
-#~ msgid "Could not write"
-#~ msgstr "Klarte ikkje å lagra"
-
-#~ msgid "Could not connect"
-#~ msgstr "Klarte ikkje å kopla til"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Klarte ikkje å laga lytte-endepunkt"
-
-#~ msgid "Incorrect Password"
-#~ msgstr "Feil passord"
-
-#~ msgid "Account locked: Too many failed login attempts"
-#~ msgstr "Kontoen er låst: for mange feil påloggingar"
-
-#~ msgid "Account locked: See the debug log"
-#~ msgstr "Kontoen er låst: sjå feilsøkingsloggen"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Klaret ikkje å få til samband med %s:\n"
-#~ "%s"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Kva ID skal takast i bruk?"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Søkjetenestetenar (_Japan)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Filoverføringstenar (Japa_n)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Mista sambandet med tenar\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Klarte ikkje å slå opp vertsnamnet"
-
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Klarte ikkje å kopla til %s: tenaren krev TLS/SSL, men fann inga TLS-/SSL-"
-#~ "støtte."
-
-#~ msgid "_Proxy"
-#~ msgstr "_Mellomlager"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Skjul samtalevindauget"
-
-#~ msgid "More Data needed"
-#~ msgstr "Treng fleire opplysningar"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Før opp ein snarveg knytt til smilefjeset."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Vel eit bilete til smilefjeset."
-
-#~ msgid "Cursor Color"
-#~ msgstr "Peikarfarge"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Sekundær peikarfarge"
-
-#~ msgid "Interface colors"
-#~ msgstr "Grensesnittfargar"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Grafiske element-storleikar"
-
-#~ msgid "Invite message"
-#~ msgstr "Invitasjonsmelding"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Skriv inn namnet på brukaren du ønskjer å invitera.\n"
-#~ "Du kan velja om du vil ha med ei invitasjonsmelding."
-
-#~ msgid "Looking up %s"
-#~ msgstr "Slår opp %s"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Tilkoplinga mot %s feila"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Pålogging: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Klarer ikkje å lagra fila %s."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Klarer ikkje å lesa fila %s."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "Meldinga er for lang - dei siste %s bytane er klipte vekk."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s er ikkje pålogga no."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Det er ikkje tillate å åtvara mot %s."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr "Ei melding er blitt vraka - du går ut over tenaren si fartsgrense."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "Prat i %s er ikkje tilgjengeleg."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "Du sender meldingane for fort til %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "%s sendte deg ei melding som ikkje kom fram: ho var for stor."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "%s sendte deg ei melding som ikkje kom fram: ho var sendt for fort."
-
-#~ msgid "Failure."
-#~ msgstr "Svikt."
-
-#~ msgid "Too many matches."
-#~ msgstr "For mange treff."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "Treng fleire parametrar."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Katalogtenesta er mellombels utilgjengeleg."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "E-postoppslag er avgrensa."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Nøkkelord er ignorert."
-
-#~ msgid "No keywords."
-#~ msgstr "Ingen nøkkelord."
-
-#~ msgid "User has no directory information."
-#~ msgstr "Brukaren har ingen katalogopplysningar."
-
-#~ msgid "Country not supported."
-#~ msgstr "Land er ikkje støtta."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Ukjent svikt: %s."
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "Feil brukarnamn eller passord."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "Tenesta er mellombels utilgjengeleg."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr "Åtvaringsnivået ditt er for tida for høgt til at du kan logga på."
-
-#~ 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 ""
-#~ "Du har kopla til og frå for ofte i løpet av kort tid. Vent i ti minutt og "
-#~ "prøv igjen. Held du fram med å prøva, vil du måtta venta endå lenger."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Det oppstod ein ukjent påloggingsfeil: %s."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Det oppstod ein ukjent feil, %d. Info: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Ugyldig gruppenamn"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Sambandet er lukka"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "Ventar på svar…"
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC er attende frå pausen sin. Du kan no senda meldingar igjen."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Passordet er endra"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Hent kataloginformasjon"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Vel kataloginformasjon"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Fekk ikkje opna %s for skriving"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr "Filoverføringa feila. Truleg avbroten av den andre parten."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Fekk ikkje kopla til for overføring."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr "Klarte ikkje å skriva filhovudet. Fila vil ikkje bli overført."
-
-#~ msgid "Save As..."
-#~ msgstr "Lagra som…"
-
-#~ 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 spør %s om å godta %d fil: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s spør %s om å godta %d filer: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s spør deg om å senda dei ei fil"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "TOC-protokolltillegg"
-
-#~ msgid "%s Options"
-#~ msgstr "%s-val"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Mellomtenarval"
-
-#~ msgid "ST_UN server:"
-#~ msgstr "ST_UN-tenar:"
-
-#~ msgid "By log size"
-#~ msgstr "Etter loggstorleiken"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Opna lenkja i nettlesar"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "Smilefjesbilete"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "_Smilefjessnarveg"
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Klarer ikkje å hente MSN-adresseboka"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "La vindauget _blinka når det kjem nye meldingar"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "Du kan bli frå kopla snart. Du vil kanskje nytta TOC fram til dette blir "
-#~ "ordna. Sjå på %s etter oppdateringar."
-
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] ""
-#~ "Mista sambandet til tenaren (ingen data er mottekne på %d sekund)"
-#~ msgstr[1] ""
-#~ "Mista sambandet til tenaren (ingen data er mottekne på %d sekund)"
-
-#~ msgid "%d needs Q&A"
-#~ msgstr "%d treng SOS (Q&A)"
-
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Legg til vennespørsmål og -svar"
-
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Klarer ikkje å dekryptera tenarsvaret"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Feil på vedlikehaldssambandet"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "Tapt samband med tenaren:\n"
-#~ "%d, %s"
-
-#~ msgid "Connecting server ..."
-#~ msgstr "Koplar til tenaren…"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Klarte ikkje å senda lynmeldinga."
-
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Er ikkje med i rommet \"%s\"\n"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Brukaropplysningar om %s er ikkje tilgjengelege"
-
-#~ msgid "Can not get face number in file name (%s)"
-#~ msgstr "Klarer ikkje å henta andletsnummeret frå filnamnet (%s)"
-
-#~ msgid "Failed change icon"
-#~ msgstr "Klarte ikkje å endra ikonet"
-
-#~ msgid "Not support Redirect_EX now"
-#~ msgstr "Støttar ikkje Redirect_EX no"
-
-#~ msgid "Error password"
-#~ msgstr "Passordfeil"
-
-#~ msgid "Need active"
-#~ msgstr "Treng å vera i bruk"
-
-#~ msgid "Please fill code according to image"
-#~ msgstr "Skriv inn koden slik som på biletet"
-
-#~ msgid "invalid user name"
-#~ msgstr "Ugyldig brukarnamn"
-
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Klarte ikkje å kopla opp alle tenarane"
--- a/po/sl.po	Mon Aug 03 00:46:28 2009 +0000
+++ b/po/sl.po	Wed Aug 05 01:34:35 2009 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-05-02 16:54+0100\n"
+"POT-Creation-Date: 2009-08-03 10:04-0700\n"
+"PO-Revision-Date: 2009-07-30 12:54+0100\n"
 "Last-Translator: Martin Srebotnjak  <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
 "MIME-Version: 1.0\n"
@@ -1685,6 +1685,44 @@
 msgid "_View Certificate..."
 msgstr "_Pokaži digitalno potrdilo ..."
 
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Predstavljeno digitalno potrdilo \"%s\" priča, da dejansko pripada \"%s\".  "
+"To pomeni, da se ne povezujete s storitvijo, kot ste mislili."
+
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "Napaka digitalnega potrdila SSL"
+
+msgid "Invalid certificate chain"
+msgstr "Neveljavna veriga digitalnih potrdil"
+
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega "
+"potrdila ni mogoče preveriti."
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1695,29 +1733,11 @@
 "Predstavljeno digitalno potrdilo \"%s\" je samo-podpisano. Samodejno ga ni "
 "mogoče preveriti."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Ponujena veriga digitalnih potrdil za %s ni veljavna."
 
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-msgid "SSL Certificate Error"
-msgstr "Napaka digitalnega potrdila SSL"
-
-msgid "Invalid certificate chain"
-msgstr "Neveljavna veriga digitalnih potrdil"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Nimate zbirke podatkov korenskih digitalnih potrdil, zato tega digitalnega "
-"potrdila ni mogoče preveriti."
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1737,18 +1757,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "Neveljaven podpis izdajatelja digitalnega potrdila"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Predstavljeno digitalno potrdilo \"%s\" priča, da dejansko pripada \"%s\".  "
-"To pomeni, da se ne povezujete s storitvijo, kot ste mislili."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1785,7 +1793,7 @@
 msgstr "+++ %s se je odjavil(a)"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
@@ -1974,6 +1982,10 @@
 msgstr "Začetek prenosa %s od %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Prenos datoteke <A HREF=\"file://%s\">%s</A> je dokončan"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Prenos datoteke %s je dokončan."
 
@@ -2185,9 +2197,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "Napaka pri ustvarjanju povezave"
+msgstr "Napaka pri ustvarjanju konference."
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2611,7 +2622,6 @@
 "dnevnika."
 
 #. * 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"
@@ -2620,7 +2630,8 @@
 "at your own risk!"
 msgstr ""
 "Pri ogledovanju dnevnikov bo ta vtičnik vključil dnevnike drugih odjemalcev "
-"neposrednih sporočil. To trenutno obsega Adium, MSN Messenger in Trillian.\n"
+"neposrednih sporočil. To trenutno obsega Adium, MSN Messenger, aMSN in "
+"Trillian.\n"
 "\n"
 "OPOZORILO: Ta vtičnik je še vedno v fazi alfa in se lahko pogosto sesuje. "
 "Uporaba na lastno odgovornost!"
@@ -2668,12 +2679,11 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Shrani sporočila, poslana neprijavljenemu uporabniku, kot opozorilo."
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Preostanek sporočila bo shranjen kot opozorilo. Opozorilo lahko uredite/"
+"Preostanek sporočil bo shranjen kot opozorila. Opozorilo lahko uredite/"
 "izbrišete s pogovornim oknom `Opozorilo prijatelja'."
 
 #, c-format
@@ -2921,18 +2931,16 @@
 "Namestitve ActiveTCL ni mogoče najti. Če želite uporabljati vtičnike TCL, "
 "namestite ActiveTCL z naslova 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 ""
-"Paketa orodij Apple Bonjour za Windows ni mogoče najti, oglejte si pogosto "
-"zastavljena vprašanja na naslovu: http://d.pidgin.im/BonjourWindows za več "
-"podrobnosti."
-
-#, fuzzy
+"Paketa orodij podjetja Apple \"Bonjour for Windows\" ni mogoče najti, "
+"oglejte si zapis na naslovu http://d.pidgin.im/BonjourWindows - kjer najdete "
+"več podrobnosti."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "Dohodnim povezavam IM ni mogoče prisluhniti\n"
+msgstr "Dohodnim povezavam IM ni mogoče prisluhniti"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2985,21 +2993,17 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Sporočila ni mogoče poslati, pogovora ni mogoče začeti."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"Ni mogoče ustvariti vtičnice:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Vtičnice ni mogoče ustvariti: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Povezava vtičnice z vrati ni uspela"
-
-#, fuzzy, c-format
+msgstr "Vtičnice z vrati ni mogoče povezati: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"Ni mogoče ustvariti vtičnice:\n"
-"%s"
+msgstr "Na vtičnici ni mogoče prisluhniti: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Napaka pri komunikaciji s krajevnim mDNSReponderjem."
@@ -3048,17 +3052,15 @@
 msgid "Load buddylist from file..."
 msgstr "Uvozi seznam prijateljev iz datoteke ..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Izpolnite polja za registracijo."
-
-#, fuzzy
+msgstr "Izpolniti morate vsa polja za registracijo"
+
 msgid "Passwords do not match"
-msgstr "Gesli se ne ujemata."
-
-#, fuzzy
+msgstr "Gesli se ne ujemata"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Novega računa ni bilo mogoče registrirati. Prišlo je do napake.\n"
+msgstr ""
+"Novega računa ni bilo mogoče registrirati. Prišlo je do neznane napake."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nov račun Gadu-Gadu je registriran"
@@ -3073,9 +3075,8 @@
 msgstr "Novo geslo (ponovno)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Vnesite besedilo za sliko z besedilom"
+
 msgid "Captcha"
 msgstr "Slika z napisom"
 
@@ -3216,9 +3217,9 @@
 msgid "Chat _name:"
 msgstr "_Ime za klepet:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Ni se bilo mogoče povezati na strežnik."
+msgstr "Imena strežnika '%s' ni mogoče razločiti: %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3231,9 +3232,8 @@
 msgid "This chat name is already in use"
 msgstr "Ime za pomenek že obstaja"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "S strežnikom niste povezani."
+msgstr "S strežnikom niste povezani"
 
 msgid "Find buddies..."
 msgstr "Poišči prijatelje ..."
@@ -3274,9 +3274,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Uporabnik Gadu-Gadu"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Pridobivanje strežnika"
+msgstr "Strežnik GG"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3292,7 +3291,6 @@
 msgid "File Transfer Failed"
 msgstr "Prenos datoteke ni uspel"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "Vrat za poslušanje ni mogoče odpreti."
 
@@ -3316,11 +3314,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 ""
-"Izgubljena povezava s strežnikom:\n"
-"%s"
+msgstr "Izgubljena povezava s strežnikom: %s"
 
 msgid "View MOTD"
 msgstr "Ogled MOTD"
@@ -3331,9 +3327,8 @@
 msgid "_Password:"
 msgstr "_Geslo:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC vzdevki ne smejo vsebovati presledka"
+msgstr "IRC vzdevek in strežnik ne smejo vsebovati presledka"
 
 msgid "SSL support unavailable"
 msgstr "Podpora SSL ni na voljo"
@@ -3342,13 +3337,13 @@
 msgstr "Ni se mogoče povezati"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Ni se mogoče povezati z %s."
-
-#, fuzzy, c-format
+msgstr "Ni se mogoče povezati: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "Strežnik je zaprl povezavo."
+msgstr "Strežnik je zaprl povezavo"
 
 msgid "Users"
 msgstr "Uporabniki"
@@ -3777,12 +3772,11 @@
 msgid "execute"
 msgstr "izvedi"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"Strežnik zahteva TLS/SSL za prijavo. Podpore za TLS/SSL ni mogoče najti."
-
-#, fuzzy
+"Strežnik zahteva TLS/SSL za prijavo, vendar odpore za TLS/SSL ni mogoče "
+"najti."
+
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Vi zahtevate šifriranje, podpore za TLS/SSL pa ni mogoče najti."
 
@@ -3801,13 +3795,11 @@
 msgid "Plaintext Authentication"
 msgstr "Overovitev z navadnim besedilom"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Overovitev ni uspela"
-
-#, fuzzy
+msgstr "Overovitev SASL ni uspela"
+
 msgid "Invalid response from server"
-msgstr "Neveljaven odgovor strežnika."
+msgstr "Neveljaven odgovor strežnika"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Strežnik ne uporablja nobene podprte metode overovitve"
@@ -3818,9 +3810,9 @@
 msgid "Invalid challenge from server"
 msgstr "Neveljaven poziv strežnika"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "Napaka SASL"
+msgstr "Napaka SASL: %s"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr "Upravitelj povezave BOSH je zaključil vašo sejo."
@@ -3834,9 +3826,9 @@
 msgid "Unable to establish a connection with the server"
 msgstr "Povezave s strežnikom ni mogoče vzpostaviti"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr "Povezave s strežnikom ni mogoče vzpostaviti"
+msgstr "Povezave s strežnikom ni mogoče vzpostaviti: %s"
 
 msgid "Unable to establish SSL connection"
 msgstr "Povezave SSL ni mogoče vzpostaviti"
@@ -3856,6 +3848,11 @@
 msgid "Street Address"
 msgstr "Naslov"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Naslov (dodatno)"
 
@@ -3916,11 +3913,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "pred %s"
+
 msgid "Logged Off"
-msgstr "Prijavljeni"
+msgstr "Se je odjavil"
 
 msgid "Middle Name"
 msgstr "Drugo ime"
@@ -3943,14 +3939,12 @@
 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Prekliči obvestilo o prisotnosti"
 
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4088,29 +4082,24 @@
 msgid "Find Rooms"
 msgstr "Najdi sobe"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Psevdonim:"
-
-#, fuzzy
+msgstr "Navezave:"
+
 msgid "No users found"
 msgstr "Ni najdenih uporabnikov"
 
-#, fuzzy
 msgid "Roles:"
-msgstr "Funkcija"
-
-#, fuzzy
+msgstr "Vloge:"
+
 msgid "Ping timed out"
 msgstr "Časovna prekoračitev pinga"
 
-#, fuzzy
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
 "Po neuspehu neposredne povezave ni bilo mogoče najti drugih povezovalnih "
-"metod XMPP.\n"
+"metod XMPP."
 
 msgid "Invalid XMPP ID"
 msgstr "Neveljaven ID za XMPP"
@@ -4118,9 +4107,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Neveljaven ID za XMPP. Domena mora biti določena."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "Nepravilno oblikovan povezovalni strežnik BOSH"
+msgstr "Nepravilno oblikovan URL BOSH"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4189,9 +4177,6 @@
 msgid "Change Registration"
 msgstr "Spremeni registracijo"
 
-msgid "Malformed BOSH Connect Server"
-msgstr "Nepravilno oblikovan povezovalni strežnik BOSH"
-
 msgid "Error unregistering account"
 msgstr "Napaka pri odregistraciji računa"
 
@@ -4553,24 +4538,22 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;uporabnik&gt; [razlog]:  Prepovej uporabnika v sobi."
 
-#, 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;uporabnik&gt; &lt;lastnik|skrbnik|član|izločenec|nihče&gt;: "
-"Nastavitev uporabnikovega statusa v sobi."
-
-#, fuzzy
+"affiliate &lt;owner|admin|member|outcast|none&gt; [vzdevek1] [vzdevek2] ...: "
+"Pridobi navezavo uporabnikov ali nastavi navezavo uporabnikov na sobo."
+
 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;uporabnik&gt; &lt;moderator|participant|visitor|none&gt;: "
-"Nastavitev uporabnikove vloge v sobi."
+"role &lt;moderator|participant|visitor|none&gt; [vzdevek1] [vzdevek2] ...: "
+"Pridobi uporabnike z vlogo ali nastavi vlogo uporabnikov v sobi."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;uporabnik&gt; [soba]:  Povabite uporabnika v sobo."
+msgstr "invite &lt;uporabnik&gt; [sporočilo]:  Povabite uporabnika v sobo."
 
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr "join: &lt;soba&gt; [geslo]:  Pridruži se pomenku na tem strežniku."
@@ -4629,7 +4612,7 @@
 msgstr "Posredovalni strežniki za prenos datotek"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "URL BOSH"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4693,21 +4676,19 @@
 msgid "_Accept Defaults"
 msgstr "_Sprejmi privzeto"
 
-#, fuzzy
 msgid "No reason"
-msgstr "Ni podanega razloga"
-
-#, fuzzy, c-format
+msgstr "Ni razloga"
+
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Brcnil vas je %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Brcnjeni ste bili: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Brcnil vas je %s (%s)"
-
-#, fuzzy
+msgstr "Brcnjeni (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "V notranje pasovnem zlogovnem pretoku je prišlo do napake\n"
+msgstr "Pri prenosu v znotraj pasovnem zlogovnem pretoku je prišlo do napake\n"
 
 msgid "Transfer was closed."
 msgstr "Prenos je bil zaprt."
@@ -5040,9 +5021,29 @@
 msgid "Non-IM Contacts"
 msgstr "Stiki, s katerimi ne klepetate"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s vam je poslal mežik. <a href='msn-wink://%s'>Kliknite tukaj za "
+"predvajanje</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s vam je poslal mežik, ki pa ga ni mogoče shraniti."
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s vam je poslal zvočni posnetek. <a href='audio://%s'>Kliknite tukaj za "
+"predvajanje</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s vam je poslal glasovni posnetek, ki pa ga ni mogoče shraniti."
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s vam je poslal povabilo s spletno kamero, kar še ni podprto."
+msgstr "%s vam je poslal glasovno povabilo h klepetu, kar še ni podprto."
 
 msgid "Nudge"
 msgstr "Pomežikni"
@@ -5195,6 +5196,29 @@
 msgstr ""
 "Za MSN potrebujete podporo SSL, zato morate namestiti podprto knjižnico SSL."
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Ni mogoče dodati prijatelja %s, ker uporabniško ime ni veljavno. Imena so "
+"lahko le veljavni e-poštni naslovi."
+
+msgid "Unable to Add"
+msgstr "Nemogoče dodati"
+
+msgid "Authorization Request Message:"
+msgstr "Sporočilo o zahtevi po pooblastilu:"
+
+msgid "Please authorize me!"
+msgstr "Prosim za pooblastilo!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "V _redu"
+
 msgid "Error retrieving profile"
 msgstr "Napaka pri pridobivanju profila"
 
@@ -5393,13 +5417,14 @@
 msgid "%s just sent you a Nudge!"
 msgstr "Uporabnik %s vam je ravnokar pomežiknil!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Neznana napaka (%d)"
+msgstr "Neznana napaka (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Ni mogoče dodati uporabnika"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Neznana napaka (%d)"
@@ -5476,25 +5501,21 @@
 "Napaka povezave s strežnika %s:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Strežnik ne podpira tega protokola."
-
-#, fuzzy
+msgstr "Strežnik ne podpira našega protokola"
+
 msgid "Error parsing HTTP"
-msgstr "Napaka pri parsanju HTTP."
-
-#, fuzzy
+msgstr "Napaka pri razčlenjevanju HTTP"
+
 msgid "You have signed on from another location"
-msgstr "Prijavili ste se z druge lokacije."
+msgstr "Prijavili ste se z drugega mesta"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Strežniki MSN so trenutno nedostopni. Prosimo počakajte in poskusite znova."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "Strežniki MSN se bodo začasno zaustavili."
+msgstr "Strežniki MSN se bodo začasno zaustavili"
 
 #  Data is assumed to be the destination sn
 #, c-format
@@ -5525,9 +5546,9 @@
 msgid "Retrieving buddy list"
 msgstr "Prejemanje seznama prijateljev"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s vam je poslal povabilo s spletno kamero, kar še ni podprto."
+msgstr "%s želi gledati vašo spletno kamero, kar še ni podprto."
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -5728,14 +5749,14 @@
 msgid "Protocol error, code %d: %s"
 msgstr "Napaka protokola, koda %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 Vaše geslo ima %d znakov, več kot je dovoljenih %d znakov za MySpaceIM. "
-"Skrajšajte svoje geslo na naslovu http://profileedit.myspace.com/index.cfm?"
+"%s Vaše geslo ima %zu znakov, več kot je dovoljenih %d znakov. Skrajšajte "
+"svoje geslo na naslovu http://profileedit.myspace.com/index.cfm?"
 "fuseaction=accountSettings.changePassword in poskusite znova."
 
 msgid "Incorrect username or password"
@@ -5831,14 +5852,14 @@
 msgid "Client Version"
 msgstr "Različica odjemalca"
 
-#, 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 ""
-"Obiščite http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username in izberite uporabniško ime ter se znova poskusite prijaviti."
+"Pri nastavljanju uporabniškega imena je prišlo do napake. Poskusite znova "
+"ali obiščite http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username in nastavite svoje uporabniško ime."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Uporabniško ime je na voljo"
@@ -6096,9 +6117,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "Neznana napaka: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Prijava ni uspela"
+msgstr "Prijava ni uspela: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6229,7 +6250,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s ni na zvezi in ni sprejel sporočila, ki ste ga pravkar poslali."
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6259,9 +6279,8 @@
 msgid "Server port"
 msgstr "Vrata strežnika"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "Prejet neveljaven odgovor HTTP strežnika."
+msgstr "Prejet neveljaven odgovor - "
 
 #. username connecting too frequently
 msgid ""
@@ -6271,12 +6290,14 @@
 "Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in "
 "poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Napaka pri zahtevanju prijavnega žetona"
+msgstr "Napaka pri zahtevanju - "
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
+"AOL ne dovoljuje, da bi se vaše pojavno ime overjalo prek tega spletnega "
+"mesta"
 
 msgid "Could not join chat room"
 msgstr "Pogovorni sobi se ni mogoče pridružiti"
@@ -6284,9 +6305,8 @@
 msgid "Invalid chat room name"
 msgstr "Neveljavno ime sobe"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "Na povezavi s strežnikom prejeti neveljavni podatki."
+msgstr "Na povezavi s strežnikom prejeti neveljavni podatki"
 
 #. *< type
 #. *< ui_requirement
@@ -6333,7 +6353,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "Pri povezavi z oddaljenim uporabnikom prejeti neveljavni podatki."
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "Povezave z oddaljenim uporabnikom ni mogoče vzpostaviti."
 
@@ -6535,15 +6554,13 @@
 msgid "Buddy Comment"
 msgstr "Komentar prijatelja"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Povezava z overovitvenim strežnikom ni uspela:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Povezava z overovitvenim strežnikom ni uspela: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Povezava s strežnikom OIM ni uspela."
+msgstr "Povezava s strežnikom BOS ni uspela: %s"
 
 msgid "Username sent"
 msgstr "Uporabniško ime poslano"
@@ -6555,7 +6572,7 @@
 msgid "Finalizing connection"
 msgstr "Dokončujem povezavo"
 
-#, 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, "
@@ -6584,19 +6601,18 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "Uporabnik ne obstaja"
+msgstr "Uporabniško ime ne obstaja"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Vaš račun je trenutno zamrznjen."
+msgstr "Vaš račun je trenutno zamrznjen"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Storitev AOL neposrednih sporočil je trenuno nedosegljiva."
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
@@ -6604,17 +6620,15 @@
 "pri %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 ""
-"Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in "
-"poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."
-
-#, fuzzy
+"Povezava ste prevečkrat vzpostavili in prekinili. Počakajte minutko in "
+"poskusite znova. Če ne počakate sedaj, boste čakali še dlje."
+
 msgid "The SecurID key entered is invalid"
-msgstr "Vnešeni ključ SecurID ni veljaven."
+msgstr "Vnešeni ključ SecurID ni veljaven"
 
 msgid "Enter SecurID"
 msgstr "Vnesite SecurID"
@@ -6622,12 +6636,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Vnesite število s 6 ciframi iz digitalnega prikazovalnika."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "V _redu"
-
 msgid "Password sent"
 msgstr "Geslo poslano"
 
@@ -6637,12 +6645,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Prosim za pooblastilo, da vas smem dodati na svoj seznam prijateljev."
 
-msgid "Authorization Request Message:"
-msgstr "Sporočilo o zahtevi po pooblastilu:"
-
-msgid "Please authorize me!"
-msgstr "Prosim za pooblastilo!"
-
 msgid "No reason given."
 msgstr "Ni podanega razloga."
 
@@ -7001,18 +7003,16 @@
 msgid "Away message too long."
 msgstr "Spo_ročilo o odsotnosti:"
 
-#, 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, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
 "Ni mogoče dodati prijatelja %s, ker uporabniško ime ni veljavno. Imena so "
-"lahko veljavni e-poštni naslovi, se morajo začeti s črko, vsebujejo lahko le "
-"črke, številke in presledke, lahko pa so tudi sestavljena iz samih števil."
-
-msgid "Unable to Add"
-msgstr "Nemogoče dodati"
+"lahko veljavni e-poštni naslovi ali pa se morajo začeti s črko, vsebujejo "
+"lahko le črke, številke in presledke, lahko pa so tudi sestavljena iz samih "
+"števil."
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "Seznama prijateljev ni bilo mogoče pridobiti"
@@ -7028,18 +7028,18 @@
 msgid "Orphans"
 msgstr "Sirote"
 
-#, 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 ""
 "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč "
-"prijateljev. Prosim odstranite enega in poskusite ponovno."
+"prijateljev. Prosimo, odstranite enega in poskusite ponovno."
 
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Iz neznanega razloga prijatelja %s ni mogoče dodati."
 
@@ -7202,9 +7202,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "Uporabnik ni prijavljen"
+msgstr "Uporabi prijavo clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7811,7 +7810,6 @@
 msgid "Update interval (seconds)"
 msgstr "Interval posodabljanja (s)"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "Odgovora strežnika ni mogoče dešifrirati"
 
@@ -7879,9 +7877,8 @@
 msgid "Requesting token"
 msgstr "Zahtevanje žetona"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "Ni se bilo mogoče povezati na strežnik."
+msgstr "Imena strežnika ni mogoče razločiti"
 
 msgid "Invalid server or port"
 msgstr "Neveljaven strežnik ali vrata"
@@ -7934,7 +7931,6 @@
 msgid "QQ Qun Command"
 msgstr "Ukaz QQ Qun"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
 msgstr "Odgovora na prijavo ni mogoče dešifrirati"
 
@@ -8910,7 +8906,6 @@
 msgid "Disconnected by server"
 msgstr "Strežnik je prekinil povezavo"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "Napaka pri povezovanju s strežnikom SILC"
 
@@ -8926,7 +8921,6 @@
 msgid "Performing key exchange"
 msgstr "Izvajanje izmenjave ključev"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Para ključev SILC ni mogoče naložiti"
 
@@ -8934,14 +8928,9 @@
 msgid "Connecting to SILC Server"
 msgstr "Povezovanjes strežnikom SILC"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "Para ključev SILC ni mogoče naložiti"
-
 msgid "Out of memory"
 msgstr "Zmanjkalo je pomnilnika"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "Protokola SILC ni mogoče inicializirati"
 
@@ -9239,9 +9228,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Ustvarjanje para ključev SILC ..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Ustvarjanje para ključev SILC ni mogoče\n"
+msgstr "Para ključev SILC ni mogoče ustvariti"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9377,27 +9365,24 @@
 msgid "Failure: Authentication failed"
 msgstr "Napaka: Overovitev ni uspela"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Ni moč začeti povezave odjemalca SILC"
+msgstr "Povezave odjemalca SILC ni mogoče inicializirati"
 
 msgid "John Noname"
 msgstr "Janez Neimenovani"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "Ni mogoče naložiti para ključev SILC: %s"
+msgstr "Para ključev SILC ni mogoče naložiti: %s"
 
 msgid "Unable to create connection"
 msgstr "Ni bilo mogoče ustvariti povezave"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Neznan odgovor strežnika."
-
-#, fuzzy
+msgstr "Neznan odgovor strežnika"
+
 msgid "Unable to create listen socket"
-msgstr "Ni mogoče ustvariti vtičnice"
+msgstr "Ni mogoče ustvariti vtičnice za poslušanje"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Uporabniška imena SIP ne smejo vsebovati presledka ali simbola @"
@@ -9460,9 +9445,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Vtičnik za protokol Yahoo"
+msgstr "Vtičnik za protokol Yahoo!"
 
 msgid "Pager server"
 msgstr "Strežnik pozivnika"
@@ -9491,9 +9475,8 @@
 msgid "Yahoo Chat port"
 msgstr "Vrata klepeta Yahoo"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo-ID ..."
+msgstr "ID za Yahoo JAPAN ..."
 
 #. *< type
 #. *< ui_requirement
@@ -9505,9 +9488,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Vtičnik za protokol Yahoo"
+msgstr "Vtičnik za protokol Yahoo! JAPAN"
 
 msgid "Your SMS was not delivered"
 msgstr "Vaš SMS ni bil dostavljen"
@@ -9536,32 +9518,28 @@
 msgstr "Dodajanje prijatelja zavrnjeno"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "Na povezavi s strežnikom prejeti neveljavni podatki."
+msgstr "Prejeti neveljavni podatki"
 
 #. 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 ""
-"Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
-"odpravi."
+"Račun zaklenjen: Preveč neuspelih poskusov prijave.  Prijavljanje v spletno "
+"stran Yahoo! lahko to odpravi."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
-"odpravi."
+"Račun zaklenjen: Razlog ni znan.  Prijavljanje v spletno stran Yahoo! lahko "
+"to odpravi."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Neveljavno uporabniško ime ali geslo"
+msgstr "Manjka uporabniško ime ali geslo"
 
 #, c-format
 msgid ""
@@ -9595,13 +9573,12 @@
 "Neznana številka napake %d. Prijavljanje v spletno stran Yahoo! lahko to "
 "odpravi."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Ni mogoče dodati prijatelja %s v skupino %s na seznamu strežnikov za račun %"
+"Prijatelja %s ni mogoče dodati v skupino %s na seznamu strežnikov za račun %"
 "s."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
 
@@ -9609,19 +9586,16 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Slišni %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Prejet neveljaven odgovor HTTP strežnika."
-
-#, fuzzy, c-format
+msgstr "Prejet neveljaven odgovor HTTP s strežnika"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Izgubljena povezava s strežnikom %s:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Izgubljena povezava s strežnikom %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr "Povezave s strežnikom ni mogoče vzpostaviti"
+msgstr "Povezave s strežnikom %s ni mogoče vzpostaviti: %s"
 
 msgid "Not at Home"
 msgstr "Nisem doma"
@@ -9669,7 +9643,7 @@
 msgstr "Začni Doodlati"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Izberite ID, ki ga želite aktivirati"
 
 msgid "Join whom in chat?"
 msgstr "Komu se želite pridružiti v pomenku?"
@@ -9769,11 +9743,8 @@
 msgstr "Uporabnikov profil je prazen."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Povabilo zavrnjeno"
+msgid "%s has declined to join."
+msgstr "%s se ne želi pridružiti."
 
 msgid "Failed to join chat"
 msgstr "Pomenku se ni mogoče pridružiti"
@@ -9825,9 +9796,8 @@
 msgid "User Rooms"
 msgstr "Sobe uporabnikov"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Težava s povezavo s strežnikom YCHT."
+msgstr "Težava s povezavo s strežnikom YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -9963,19 +9933,19 @@
 msgstr "Izpostavljanje"
 
 #  Data is assumed to be the destination sn
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Ni moč razčleniti odziva posredovalnega strežnika HTTP: %s\n"
+msgstr "Ni moč razčleniti odziva posredovalnega strežnika HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Napaka pri povezavi na posredovalni strežnik HTTP %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Dostop zavrnjen: posredovalni strežnik HTTP ne dovoljuje preusmerjanja vrat %"
-"d."
+"d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10281,8 +10251,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Za ta račun uporabi to _ikono prijatelja:"
 
-msgid "_Advanced"
-msgstr "N_apredno"
+msgid "Ad_vanced"
+msgstr "Nap_redno"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Uporabi nastavitve posredovalnih strežnikov GNOME"
@@ -10344,8 +10314,8 @@
 msgid "Create _this new account on the server"
 msgstr "_Ustvari ta nov račun na strežniku"
 
-msgid "_Proxy"
-msgstr "_Posredovalni strežnik"
+msgid "P_roxy"
+msgstr "Posre_dovalni strežnik"
 
 msgid "Enabled"
 msgstr "Omogočen"
@@ -10396,9 +10366,8 @@
 msgid "Please update the necessary fields."
 msgstr "Prosimo, posodobite potrebna polja."
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "Ra_čun:"
+msgstr "Ra_čun"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10441,11 +10410,9 @@
 msgid "View _Log"
 msgstr "Pokaži _dnevnik"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "Skrij, če nepovezan"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "Pokaži, če nepovezan"
 
@@ -10855,111 +10822,98 @@
 msgid "Background Color"
 msgstr "Barva ozadja"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "Skupina je bila dodana na vaš seznam prijateljev."
-
-#, fuzzy
+msgstr "Barva ozadja seznama prijateljev"
+
 msgid "Layout"
-msgstr "laoško"
+msgstr "Postavitev"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "Postavitev ikon, imen in stanj na seznamu prijateljev"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Barva ozadja"
+msgstr "Barva razširjenega ozadja"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "Barva ozadja razpostrte skupine"
+
 msgid "Expanded Text"
-msgstr "_Razširi"
+msgstr "Razširjeno besedilo"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Besedilna informacija, ko je skupina razpostrta"
+
 msgid "Collapsed Background Color"
-msgstr "Nastavi barvo ozadja"
+msgstr "Barva strnjenega ozadja"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "Barva ozadja strnjene skupine"
+
 msgid "Collapsed Text"
-msgstr "_Strni"
+msgstr "Strnjeno besedilo"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Besedilna informacija, ko je skupina strnjena"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Nastavi barvo ozadja"
+msgstr "Barva ozadja stika/klepeta"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "Barva ozadja stika ali klepeta"
+
 msgid "Contact Text"
-msgstr "Besedilo za bližnjico"
+msgstr "Besedilo za stik"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Besedilna informacija, ko je stik razpostrt"
+
 msgid "On-line Text"
-msgstr "Prisoten"
+msgstr "Besedilo ob prisotnosti"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "Besedilna informacija, ko je prijatelj povezan"
+
 msgid "Away Text"
-msgstr "Odsoten"
+msgstr "Besedilo ob odsotnosti"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "Besedilna informacija, ko je prijatelj nepovezan"
+
 msgid "Off-line Text"
-msgstr "Brez povezave"
+msgstr "Besedilo ob nepovezanosti"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "Besedilna informacija, ko je prijatelj nepovezan"
+
 msgid "Idle Text"
-msgstr "Besedilo razpoloženja"
+msgstr "Besedilo ob nedejavnosti"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "Besedilna informacija, ko je prijatelj nedejaven"
+
 msgid "Message Text"
-msgstr "Sporočilo poslano"
+msgstr "Besedilo sporočila"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "Besedilna informacija, ko ima prijatelj neprebrano sporočilo"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Besedilo sporočila (je rekel vzdevek)"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
 msgstr ""
-
-#, fuzzy
+"Besedilna informacija, ko je v pomenku neprebrano sporočilo, ki omenja vaš "
+"vzdevek"
+
 msgid "The text information for a buddy's status"
-msgstr "Spremeni podatke za uporabika %s"
-
-#, fuzzy
+msgstr "Besedilni podatki o stanju uporabika"
+
 msgid "Type the host name for this certificate."
-msgstr "Vnesite ime gostitelja, kateremu je namenjeno to digitalno potrdilo."
+msgstr "Vnesite ime gostitelja za to digitalno potrdilo."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11007,7 +10961,6 @@
 msgid "Get Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "Nazadnje rečeno"
 
@@ -11458,9 +11411,8 @@
 msgid "Hungarian"
 msgstr "madžarsko"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "romunsko"
+msgstr "armensko"
 
 msgid "Indonesian"
 msgstr "indonezijsko"
@@ -11559,7 +11511,7 @@
 msgstr "švedsko"
 
 msgid "Swahili"
-msgstr ""
+msgstr "svahili"
 
 msgid "Tamil"
 msgstr "tamilsko"
@@ -11871,14 +11823,6 @@
 msgid "File transfer _details"
 msgstr "Po_drobnosti o prenosu"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Premor"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Nadaljuj"
-
 msgid "Paste as Plain _Text"
 msgstr "Prilepi kot navadno be_sedilo"
 
@@ -11897,9 +11841,8 @@
 msgid "Hyperlink visited color"
 msgstr "Barva obiskane povezave"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Barva za izpis hiperpovezav, ki ste jih že obiskali (ali aktivirali)."
+msgstr "Barva za izpis hiperpovezav, ko ste jih že obiskali (ali aktivirali)."
 
 msgid "Hyperlink prelight color"
 msgstr "Barva presvetljene povezave"
@@ -11935,21 +11878,18 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Ime barve sporočila dejanja za šepetano sporočilo"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "Barva izrisa imena na sporočilo dejanja."
+msgstr "Barva izrisa imena za šepetano sporočilo dejanja."
 
 msgid "Whisper Message Name Color"
 msgstr "Barva imena šepetanega sporočila"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "Barva izrisa imena na sporočilo dejanja."
+msgstr "Barva izrisa imena za šepetano sporočilo."
 
 msgid "Typing notification color"
 msgstr "Barva obvestila o tipkanju"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
 msgstr "Barva pisave za obvestilo o tipkanju"
 
@@ -12537,17 +12477,14 @@
 msgid "Unknown.... Please report this!"
 msgstr "Neznano ... Poročajte o tem!"
 
-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "Teme smejčkov ni mogoče razpakirati."
-
-#, fuzzy
+msgstr "Teme ni mogoče razpakirati."
+
 msgid "Theme failed to load."
-msgstr "Teme smejčkov ni mogoče razpakirati."
-
-#, fuzzy
+msgstr "Tema se ni naložila."
+
 msgid "Theme failed to copy."
-msgstr "Teme smejčkov ni mogoče razpakirati."
+msgstr "Teme ni mogoče kopirati."
 
 msgid "Install Theme"
 msgstr "Namesti temo"
@@ -12582,9 +12519,8 @@
 msgid "On unread messages"
 msgstr "ob neprebranih sporočilih"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "Pogovorna okna"
+msgstr "Okno pogovora"
 
 msgid "_Hide new IM conversations:"
 msgstr "Skrij nove po_govore IM:"
@@ -12687,9 +12623,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Primer: stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Samozaznaj naslov IP"
+msgstr "Uporabi _samozaznani naslov IP: %s"
 
 msgid "Public _IP:"
 msgstr "Javni _IP:"
@@ -13091,9 +13027,8 @@
 msgid "Custom Smiley Manager"
 msgstr "Upravitelj smejčkov po meri"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Izberi prijatelja"
+msgstr "Izberite ikono prijatelja"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "Kliknite, če želite za ta račun spremeniti ikono prijatelja."
@@ -13177,7 +13112,6 @@
 msgid "Cannot send launcher"
 msgstr "Ni mogoče poslati zaganjalnika"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13225,9 +13159,21 @@
 msgid "_Copy Email Address"
 msgstr "_Kopiraj naslov e-pošte"
 
+msgid "_Open File"
+msgstr "_Odpri datoteko"
+
+msgid "Open _Containing Directory"
+msgstr "Odpri v_sebujočo mapo"
+
 msgid "Save File"
 msgstr "Shrani datoteko"
 
+msgid "_Play Sound"
+msgstr "_Predvajaj zvok"
+
+msgid "_Save File"
+msgstr "_Shrani datoteko"
+
 msgid "Select color"
 msgstr "Izberite barvo"
 
@@ -13252,6 +13198,9 @@
 msgid "_Open Mail"
 msgstr "_Odpri pošto"
 
+msgid "_Pause"
+msgstr "_Premor"
+
 msgid "_Edit"
 msgstr "_Uredi"
 
@@ -13315,78 +13264,65 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Prikaže statistične podatke o dostopnosti vašega prijatelja"
 
-#, fuzzy
 msgid "Server name request"
-msgstr "Naslov strežnika"
-
-#, fuzzy
+msgstr "Zahteva po imenu strežnika"
+
 msgid "Enter an XMPP Server"
-msgstr "Vnesite konferenčni strežnik"
-
-#, fuzzy
+msgstr "Vnesite strežnik XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Izberite konferenčni strežnik za pogovor"
-
-#, fuzzy
+msgstr "Izberite strežnik XMPP za poizvedbo"
+
 msgid "Find Services"
-msgstr "Storitve na zvezi"
-
-#, fuzzy
+msgstr "Najdi storitve"
+
 msgid "Add to Buddy List"
-msgstr "Pošlji seznam prijateljev"
-
-#, fuzzy
+msgstr "Dodaj na seznam prijateljev"
+
 msgid "Gateway"
-msgstr "postane odsoten"
-
-#, fuzzy
+msgstr "Prehod"
+
 msgid "Directory"
-msgstr "Mapa dnevnika"
-
-#, fuzzy
+msgstr "Imenik"
+
 msgid "PubSub Collection"
-msgstr "Izbira zvoka"
-
-#, fuzzy
+msgstr "Zbirka PubSub"
+
 msgid "PubSub Leaf"
-msgstr "Storitev PubSub"
-
-#, fuzzy
+msgstr "List PubSub"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Opis"
+msgstr ""
+"\n"
+"<b>Opis:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Podatki iskanja storitev"
-
-#, fuzzy
+msgstr "Odkrivanje storitev"
+
 msgid "_Browse"
-msgstr "_Brskalnik:"
-
-#, fuzzy
+msgstr "Pre_brskaj"
+
 msgid "Server does not exist"
-msgstr "Uporabnik ne obstaja"
-
-#, fuzzy
+msgstr "Strežnik ne obstaja"
+
 msgid "Server does not support service discovery"
-msgstr "Strežnik ne podpira blokiranja"
-
-#, fuzzy
+msgstr "Strežnik ne podpira odkrivanja storitev"
+
 msgid "XMPP Service Discovery"
-msgstr "Podatki iskanja storitev"
+msgstr "Odkrivanje storitev XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Dovoljuje brskanje in registracijo storitev."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
-"Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
+"Ta vtičnik je uporaben za registriranje z opuščenimi prenosi ali drugimi "
+"storitvami XMPP."
 
 msgid "Buddy is idle"
 msgstr "Prijatelj je nedejaven"
@@ -13775,12 +13711,11 @@
 msgstr "Vtičnik za glasbeno sporočanje - za skupinsko skladanje."
 
 #. *  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 ""
-"Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanju "
+"Vtičnik za glasbeno sporočanje omogoča več uporabnikom hkratno sodelovanje "
 "pri glasbenem ustvarjanju kompozicije v resničnem času."
 
 #. ---------- "Notify For" ----------
@@ -13907,7 +13842,6 @@
 msgid "Highlighted Message Name Color"
 msgstr "Ime barve poudarjenih sporočil"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "Barva obvestila o tipkanju"
 
@@ -13940,23 +13874,20 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema bližnjic besedila GTK+"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Omogoči obveščanje o tipkanju"
-
-#, fuzzy
+msgstr "Onemogoči obveščanje o tipkanju"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Nadzor teme Pidgin GTK+ v Pidginu"
-
-#, fuzzy
+msgstr "Nadzorne nastavitve teme GTK+"
+
 msgid "Colors"
-msgstr "Zapri"
+msgstr "Barve"
 
 msgid "Fonts"
 msgstr "Pisave"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Razno"
 
 msgid "Gtkrc File Tools"
 msgstr "Datotečna orodja Gtkrc"
@@ -14041,13 +13972,12 @@
 msgstr "Gumb Pošlji okna pogovora"
 
 #. *< 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 ""
 "Doda gumb Pošlji v vnosno območje pogovornega okna. Namenjeno za primere, ko "
-"fizična tipkovnica ni prisotna."
+"tipkovnica ni fizično prisotna."
 
 msgid "Duplicate Correction"
 msgstr "Popravek dvojnikov"
@@ -14100,94 +14030,81 @@
 msgstr ""
 "Zamenja besedilo v odhodnih sporočilih po uporabniško določenih pravilih."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "Neprijavljen"
-
-#, fuzzy
+msgstr "Ravnokar prijavljen"
+
 msgid "Just logged out"
-msgstr "Neprijavljen"
+msgstr "Ravnokar odjavljen"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Ikona stika/\n"
+"Ikona neznane osebe"
+
 msgid "Icon for Chat"
-msgstr "Pridruži se pomenku"
-
-#, fuzzy
+msgstr "Ikona pomenka"
+
 msgid "Ignored"
-msgstr "Prezri"
-
-#, fuzzy
+msgstr "Prezrt"
+
 msgid "Founder"
-msgstr "glasneje"
-
-#, fuzzy
+msgstr "Ustanovitelj"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "Operater"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Pol-operater"
+
 msgid "Authorization dialog"
-msgstr "Pooblastilo odobreno"
-
-#, fuzzy
+msgstr "Pogovorno okno overjanja"
+
 msgid "Error dialog"
-msgstr "Napaka"
-
-#, fuzzy
+msgstr "Pogovorno okno napake"
+
 msgid "Information dialog"
-msgstr "Podatki"
+msgstr "Informativno pogovorno okno"
 
 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Poštno pogovorno okno"
+
 msgid "Question dialog"
-msgstr "Pogovorno okno zahteve"
-
-#, fuzzy
+msgstr "Vprašalno pogovorno okno"
+
 msgid "Warning dialog"
-msgstr "Stopnja opozoril"
+msgstr "Opozorilno pogovorno okno"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Kakšne vrste pogovorno okno je to?"
+
 msgid "Status Icons"
-msgstr "Stanje za %s"
-
-#, fuzzy
+msgstr "Ikone stanja"
+
 msgid "Chatroom Emblems"
-msgstr "Razpored tipk sobe pomenkov"
-
-#, fuzzy
+msgstr "Emblemi sobe pomenkov"
+
 msgid "Dialog Icons"
-msgstr "Spremeni ikono"
-
-#, fuzzy
+msgstr "Ikone pogovora"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Nadzor teme Pidgin GTK+ v Pidginu"
-
-#, fuzzy
+msgstr "Urejevalnik tem ikon Pidgin"
+
 msgid "Contact"
-msgstr "Podatki o stiku"
-
-#, fuzzy
+msgstr "Stik"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Tema seznama prijateljev"
-
-#, fuzzy
+msgstr "Urejevalnik tem seznama prijateljev Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Tema seznama prijateljev"
+msgstr "Uredi temo seznama prijateljev"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Uredi temo ikon"
 
 #. *< type
 #. *< ui_requirement
@@ -14196,16 +14113,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Nadzor teme Pidgin GTK+ v Pidginu"
+msgstr "Urejevalnik tem Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Nadzor teme Pidgin GTK+ v Pidginu"
+msgstr "Urejevalnik tem Pidgin."
 
 #. *< type
 #. *< ui_requirement
@@ -14374,11 +14289,10 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Nastavitve, specifične za %s v okolju Windows."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Ponuja nastavitve, specifične za %s v okolju Windows, kot je sidranje "
+"Ponuja nastavitve, specifične za Pidgin v okolju Windows, kot je sidranje "
 "seznama prijateljev."
 
 msgid "<font color='#777777'>Logged out.</font>"
@@ -14419,6 +14333,22 @@
 msgstr ""
 "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
 
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "Nepravilno oblikovan povezovalni strežnik BOSH"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Para ključev SILC ni mogoče naložiti"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s je zavrnil vaše povabilo za pogovor v sobi \"%s\", ker \"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Povabilo zavrnjeno"
+
+#~ msgid "_Resume"
+#~ msgstr "_Nadaljuj"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "Vtičnice ni mogoče odpreti"
 
@@ -14453,12 +14383,132 @@
 #~ msgid "Write error"
 #~ msgstr "Napaka pri pisanju"
 
+#~ msgid "Read Error"
+#~ msgstr "Napaka pri branju"
+
+#~ msgid "Failed to connect to server."
+#~ msgstr "Povezava na strežnik neuspešna."
+
+#~ msgid "Read buffer full (2)"
+#~ msgstr "Bralni predpomnilnik je poln (2)"
+
+#~ msgid "Unparseable message"
+#~ msgstr "Sporočila ni mogoče razčleniti"
+
+#~ msgid "Couldn't connect to host: %s (%d)"
+#~ msgstr "Povezava z gostiteljem ni uspela: %s (%d)"
+
+#~ msgid "Login failed (%s)."
+#~ msgstr "Prijava spodletela (%s)."
+
+#~ msgid "Unable to connect to server."
+#~ msgstr "Ni se bilo mogoče povezati na strežnik."
+
+#~ msgid ""
+#~ "You have been logged out because you logged in at another workstation."
+#~ msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
+
+#~ msgid "Error. SSL support is not installed."
+#~ msgstr "Napaka. Podpora SSL ni nameščena."
+
+#~ msgid "Incorrect password."
+#~ msgstr "Neveljavno geslo."
+
+#~ msgid ""
+#~ "Could not connect to BOS server:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Povezava na strežnik BOS ni uspela:\n"
+#~ "%s"
+
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr ""
+#~ "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
+
+#~ msgid "Could Not Connect"
+#~ msgstr "Povezava ni uspela"
+
+#~ msgid "Could not decrypt server reply"
+#~ msgstr "Odgovora strežnika ni mogoče dešifrirati"
+
+#~ msgid "Invalid username."
+#~ msgstr "Neveljavno uporabniško ime."
+
+#~ msgid "Connection lost"
+#~ msgstr "Povezava izgubljena"
+
+#~ msgid "Couldn't resolve host"
+#~ msgstr "Gostitelja ni mogoče razbrati"
+
+#~ msgid "Connection closed (writing)"
+#~ msgstr "Povezava zaprta (pisanje)"
+
+#~ msgid "Connection reset"
+#~ msgstr "Povezava ponovno nastavljena"
+
+#~ msgid "Error reading from socket: %s"
+#~ msgstr "Napaka pri branju iz vtičnice: %s"
+
+#~ msgid "Unable to connect to host"
+#~ msgstr "Ni se bilo mogoče povezati na strežnik."
+
+#~ msgid "Could not write"
+#~ msgstr "Ni mogoče pisati"
+
+#~ msgid "Could not connect"
+#~ msgstr "Povezava ni uspela"
+
+#~ msgid "Could not create listen socket"
+#~ msgstr "Vtičnice ni bilo mogoče ustvariti"
+
+#~ msgid "Could not resolve hostname"
+#~ msgstr "Imena strežnika ni mogoče razločiti"
+
+#~ msgid "Incorrect Password"
+#~ msgstr "Nepravilno geslo"
+
+#~ msgid ""
+#~ "Could not establish a connection with %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Povezave s strežnikom %s ni mogoče vzpostaviti:\n"
+#~ "%s"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japonska"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "Japonski strežnik pozivnika"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "Japonski strežnik prenosa datotek"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Izgubljena povezava s strežnikom\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "Imena strežnika ni možno razločiti"
+
+#~ msgid ""
+#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
+#~ "was found."
+#~ msgstr ""
+#~ "Povezava z %s ni uspela: strežnik zahteva TLS/SSL za prijavo, vendar "
+#~ "podpore za TLS/SSL ni mogoče najti."
+
+#~ msgid "_Proxy"
+#~ msgstr "_Posredovalni strežnik"
+
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "Skrivanje okna pogovora"
+
 #~ msgid "Last Activity"
 #~ msgstr "Zadnja dejavnost"
 
-#~ msgid "Service Discovery Info"
-#~ msgstr "Podatki iskanja storitev"
-
 #~ msgid "Service Discovery Items"
 #~ msgstr "Elementi razpoznave storitev"
 
@@ -14477,9 +14527,6 @@
 #~ msgid "Ad-Hoc Commands"
 #~ msgstr "Improvizirani ukazi"
 
-#~ msgid "PubSub Service"
-#~ msgstr "Storitev PubSub"
-
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "Bajtni tokovi SOCKS5"
 
@@ -14597,127 +14644,6 @@
 #~ msgid "Hop Check"
 #~ msgstr "Preveri hop"
 
-#~ msgid "Read Error"
-#~ msgstr "Napaka pri branju"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Povezava na strežnik neuspešna."
-
-#~ msgid "Read buffer full (2)"
-#~ msgstr "Bralni predpomnilnik je poln (2)"
-
-#~ msgid "Unparseable message"
-#~ msgstr "Sporočila ni mogoče razčleniti"
-
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Povezava z gostiteljem ni uspela: %s (%d)"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Prijava spodletela (%s)."
-
-#~ msgid "Unable to connect to server."
-#~ msgstr "Ni se bilo mogoče povezati na strežnik."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "Ker ste se prijavili na drugi delovni postaji, ste bili odjavljeni."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Napaka. Podpora SSL ni nameščena."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Neveljavno geslo."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Povezava na strežnik BOS ni uspela:\n"
-#~ "%s"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "Morda bo povezava v kratkem prekinjena. Preverite %s za posodobitve."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Povezava ni uspela"
-
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Odgovora strežnika ni mogoče dešifrirati"
-
-#~ msgid "Invalid username."
-#~ msgstr "Neveljavno uporabniško ime."
-
-#~ msgid "Connection lost"
-#~ msgstr "Povezava izgubljena"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Gostitelja ni mogoče razbrati"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Povezava zaprta (pisanje)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Povezava ponovno nastavljena"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Napaka pri branju iz vtičnice: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Ni se bilo mogoče povezati na strežnik."
-
-#~ msgid "Could not write"
-#~ msgstr "Ni mogoče pisati"
-
-#~ msgid "Could not connect"
-#~ msgstr "Povezava ni uspela"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Vtičnice ni bilo mogoče ustvariti"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Imena strežnika ni mogoče razločiti"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "Neveljavno geslo"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Povezave s strežnikom %s ni mogoče vzpostaviti:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japonska"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Japonski strežnik pozivnika"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Japonski strežnik prenosa datotek"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Izgubljena povezava s strežnikom\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Imena strežnika ni možno razločiti"
-
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Povezava z %s ni uspela: strežnik zahteva TLS/SSL za prijavo, vendar "
-#~ "podpore za TLS/SSL ni mogoče najti."
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Skrivanje okna pogovora"
-
 #~ msgid "Activate which ID?"
 #~ msgstr "Kateri ID naj bo aktiviran?"