changeset 32564:c410e48a31c6

propagate from branch 'im.pidgin.pidgin' (head e61443cb17f6d03c10dddfe54c499d057a9ca362) to branch 'im.pidgin.soc.2009.webkitmessageview' (head 5d598fb51bc6da01a4b505635fd46a356f8aa97c)
author tdrhq@soc.pidgin.im
date Thu, 13 Aug 2009 19:56:23 +0000
parents c0cc4d60ac5c (current diff) 5f49b2dd8f9b (diff)
children 53735be6950a
files pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkthemes.c
diffstat 95 files changed, 12384 insertions(+), 15389 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Aug 12 02:24:41 2009 +0000
+++ b/ChangeLog	Thu Aug 13 19:56:23 2009 +0000
@@ -43,6 +43,12 @@
 	  against the GNU IDN library.
 	* Install scalable versions of the main Pidgin icon, the protocol icons,
 	  the dialog icons, and the Buddy List emblems.
+	* Build properly on Hurd.  (Marc Dequènes)
+	* Various memory leaks fixed as reported by Josh Mueller.
+	* Properly handle an IRC buddy appearing in multiple groups.
+	* Escape HTML entities in usernames when written with the HTML logger.
+	* Do not display MySpace status changes as incoming IMs.  (Mark Doliner and
+	  Justin Williams)
 
 	AIM and ICQ:
 	* Preliminary support for a new authentication scheme called
@@ -113,6 +119,8 @@
 	* When the GNU IDN library (libidn) is available, it is used for
 	  normalization of Jabber IDs.  When unavailable, internal routines are
 	  used (as in previous versions).
+	* Topics that contain '<' followed by a non-whitespace character can now
+	  be set properly.
 
 	Yahoo!/Yahoo! JAPAN:
 	* P2P file transfers.  (Sulabh Mahajan)
@@ -173,6 +181,12 @@
 	  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.
+	* Do not lose unread messages with a hidden conversation window when
+	  new IM conversations are hidden and "Close IMs immediately when the tab
+	  is closed" is unset.
 
 	Finch:
 	* The hardware cursor is updated correctly. This will be useful
--- a/ChangeLog.API	Wed Aug 12 02:24:41 2009 +0000
+++ b/ChangeLog.API	Thu Aug 13 19:56:23 2009 +0000
@@ -18,6 +18,9 @@
 		* Three Blist UI ops used to overload libpurple's built-in saving
 		  of the buddy list to blist.xml. If a UI implements these, it probably
 		  wants to add the buddies itself and not call purple_blist_load.
+		* Three File Transfer UI ops used to overload libpurple's use of fread
+		  and fwrite for saving a file locally. These allow a UI to stream a
+		  file through a socket without buffering the file on the local disk.
 		* Jabber plugin signals (see jabber-signals.dox)
 		* purple_account_remove_setting
 		* purple_buddy_destroy
@@ -65,6 +68,8 @@
 		* purple_strequal
 		* purple_utf8_strip_unprintables
 		* purple_util_fetch_url_request_len_with_account
+		* purple_xfer_prpl_ready
+		* purple_xfer_ui_ready
 		* xmlnode_from_file
 		* xmlnode_get_parent
 		* xmlnode_set_attrib_full
@@ -95,6 +100,10 @@
 		* status is set before emitting signals in purple_xfer_set_status.
 		* Creating multiple distinct chats with the same name (i.e. "MSN Chat")
 		  is deprecated and will be removed in libpurple 3.0.0.
+		* purple_xfer_start now accepts -1 as the fd parameter if the protocol
+		  plugin will administer the transfer itself. 0 is still accepted for
+		  backward compatibility since older versions of libpurple will not
+		  accept -1.
 
 		Deprecated:
 		* buddy-added and buddy-removed blist signals
--- a/ChangeLog.win32	Wed Aug 12 02:24:41 2009 +0000
+++ b/ChangeLog.win32	Thu Aug 13 19:56:23 2009 +0000
@@ -1,4 +1,5 @@
 version 2.6.0 (??/??/2009):
+	* Added XMPP URI support.
 
 version 2.5.8 (06/27/2009):
 	* No changes
--- a/doc/Makefile.am	Wed Aug 12 02:24:41 2009 +0000
+++ b/doc/Makefile.am	Thu Aug 13 19:56:23 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 \
--- a/doc/funniest_home_convos.txt	Wed Aug 12 02:24:41 2009 +0000
+++ b/doc/funniest_home_convos.txt	Thu Aug 13 19:56:23 2009 +0000
@@ -572,3 +572,42 @@
 15:46 <khc> well, there was a Grand Smiley Theme Database
 15:47 <SimGuy> the GSTD sounds like a bad acronym
 15:47 <khc> I realized after typing that
+
+--
+
+(01:51:38 AM) user entered the room.
+(01:52:46 AM) user: .addKeyActionListener(new KeyActionListener() onKeyPress() {if (event.geyKeyPresss().equals(Key.UP_ARROW) { inputbox.text = history.pop() }}}}}}});
+(01:52:51 AM) user: THERE, FOR **** SAKE
+(01:52:53 AM) user: its 2009
+(01:53:06 AM) user: oh wait. ctrl up works
+(01:53:07 AM) user: lol
+(01:53:11 AM) user: yey me
+(01:53:16 AM) user left the room.
+(01:55:31 AM) darkrain42: Wow.
+(01:58:15 AM) QuLogic: I think he failed to realize we'd have to re-write pidgin in java to do that
+(01:59:44 AM) khc: history.pop() is clearly wrong too
+
+--
+
+Some time later:
+(02:41:55 AM) user entered the room.
+(02:42:24 AM) user: didn't I read some idiot post, about 2 years ago, before pidgin was renamed / forked, over one dev refusing to make minimize on close?
+(02:43:12 AM) QuLogic: I see you've learned to at least ask a question before jumping to random conclusions
+(02:44:01 AM) user: QuLogic: :-))))))))))))))))))))))
+(02:44:12 AM) user: hey, I submitted a code patch!
+(02:44:36 AM) user: now, anyway, what happened? why did I get the buddy list (empty) stealing focus, and why did it exit on close?
+(02:44:40 AM) QuLogic: it's not really a patch if it's in the wrong language
+(02:44:42 AM) user: I've had this argument before, in 2006
+(02:44:55 AM) user: QuLogic: simple, rewrite the rest ;-)
+(02:44:58 AM) khc: pidgin never steals focus
+(02:45:10 AM) khc: if it exit on close, it's because you didn't turn on the systray icon
+(02:47:17 AM) user: khc - and that isn't default... why? anyway. I recall something on the matter, and I think this was the project (pre-fork?) or is this the unforked, renamed? I forget.
+(02:47:42 AM) user: Whoever it was arguing about it (and font sizes I believe) was an idiot... not one of you I suppose, just making idle chit chat.
+(02:47:43 AM) user: thanks
+(02:47:48 AM) darkrain42: It is on by default. Some distros change that.
+(02:48:00 AM) darkrain42: And I don't even know what you're arguing about at this point.
+(02:48:11 AM) user: ... /leave - That command doesn't work on this protocol... /leave #pidgin ...That comm..... :-(((
+(02:48:18 AM) user: darkrain42: now arguing, just remembering something
+(02:48:27 AM) user left the room.
+(02:49:04 AM) darkrain42: Wow. (again)
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/doc/jabber-signals.dox	Thu Aug 13 19:56:23 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/gntaccount.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/finch/gntaccount.c	Thu Aug 13 19:56:23 2009 +0000
@@ -489,6 +489,7 @@
 	GntWidget *combo, *button, *entry;
 	GList *list, *iter;
 	AccountEditDialog *dialog;
+	PurplePlugin *plugin;
 
 	if (account)
 	{
@@ -532,9 +533,10 @@
 				((PurplePlugin*)iter->data)->info->name);
 	}
 
-	if (account)
-		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo),
-				purple_plugins_find_with_id(purple_account_get_protocol_id(account)));
+	plugin = purple_plugins_find_with_id(purple_account_get_protocol_id(account));
+
+	if (account && plugin)
+		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), plugin);
 	else
 		gnt_combo_box_set_selected(GNT_COMBO_BOX(combo), list->data);
 
--- a/finch/gntblist.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/finch/gntblist.c	Thu Aug 13 19:56:23 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/finch/gntmedia.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/finch/gntmedia.c	Thu Aug 13 19:56:23 2009 +0000
@@ -417,11 +417,7 @@
 create_default_audio_src(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
-	GstElement *bin, *src, *volume;
-	GstPad *pad, *ghost;
-	double input_volume = purple_prefs_get_int(
-			"/finch/media/audio/volume/input")/10.0;
-
+	GstElement *src;
 	src = gst_element_factory_make("gconfaudiosrc", NULL);
 	if (src == NULL)
 		src = gst_element_factory_make("autoaudiosrc", NULL);
@@ -436,28 +432,15 @@
 				"element for the default audio source.\n");
 		return NULL;
 	}
-
-	bin = gst_bin_new("finchdefaultaudiosrc");
-	volume = gst_element_factory_make("volume", "purpleaudioinputvolume");
-	g_object_set(volume, "volume", input_volume, NULL);
-	gst_bin_add_many(GST_BIN(bin), src, volume, NULL);
-	gst_element_link(src, volume);
-	pad = gst_element_get_pad(volume, "src");
-	ghost = gst_ghost_pad_new("ghostsrc", pad);
-	gst_element_add_pad(bin, ghost);
-
-	return bin;
+	gst_element_set_name(src, "finchdefaultaudiosrc");
+	return src;
 }
 
 static GstElement *
 create_default_audio_sink(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
-	GstElement *bin, *sink, *volume, *queue;
-	GstPad *pad, *ghost;
-	double output_volume = purple_prefs_get_int(
-			"/finch/media/audio/volume/output")/10.0;
-
+	GstElement *sink;
 	sink = gst_element_factory_make("gconfaudiosink", NULL);
 	if (sink == NULL)
 		sink = gst_element_factory_make("autoaudiosink",NULL);
@@ -466,19 +449,7 @@
 				"element for the default audio sink.\n");
 		return NULL;
 	}
-
-	bin = gst_bin_new("finchdefaultaudiosink");
-	volume = gst_element_factory_make("volume", "purpleaudiooutputvolume");
-	g_object_set(volume, "volume", output_volume, NULL);
-	queue = gst_element_factory_make("queue", NULL);
-	gst_bin_add_many(GST_BIN(bin), sink, volume, queue, NULL);
-	gst_element_link(volume, sink);
-	gst_element_link(queue, volume);
-	pad = gst_element_get_pad(queue, "sink");
-	ghost = gst_ghost_pad_new("ghostsink", pad);
-	gst_element_add_pad(bin, ghost);
-
-	return bin;
+	return sink;
 }
 #endif  /* USE_VV */
 
@@ -516,12 +487,6 @@
 	purple_debug_info("gntmedia", "Registering media element types\n");
 	purple_media_manager_set_active_element(manager, default_audio_src);
 	purple_media_manager_set_active_element(manager, default_audio_sink);
-
-	purple_prefs_add_none("/finch/media");
-	purple_prefs_add_none("/finch/media/audio");
-	purple_prefs_add_none("/finch/media/audio/volume");
-	purple_prefs_add_int("/finch/media/audio/volume/input", 10);
-	purple_prefs_add_int("/finch/media/audio/volume/output", 10);
 #endif
 }
 
--- a/libpurple/certificate.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/certificate.c	Thu Aug 13 19:56:23 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);
@@ -1375,7 +1374,7 @@
 		return;
 	} /* if (name mismatch) */
 
-	if (had_ca_pool) {
+	if (!had_ca_pool) {
 		/* 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.
--- a/libpurple/cipher.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/cipher.c	Thu Aug 13 19:56:23 2009 +0000
@@ -2727,8 +2727,6 @@
 
 		cipher = PURPLE_CIPHER(l->data);
 		purple_ciphers_unregister_cipher(cipher);
-
-		ciphers = g_list_remove(ciphers, cipher);
 	}
 
 	g_list_free(ciphers);
--- a/libpurple/connection.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/connection.c	Thu Aug 13 19:56:23 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/desktopitem.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/desktopitem.c	Thu Aug 13 19:56:23 2009 +0000
@@ -831,11 +831,10 @@
 static char *
 try_english_key (PurpleDesktopItem *item, const char *key)
 {
-	char *str;
+	char *str = NULL;
 	char *locales[] = { "en_US", "en_GB", "en_AU", "en", NULL };
 	int i;
 
-	str = NULL;
 	for (i = 0; locales[i] != NULL && str == NULL; i++) {
 		str = g_strdup (lookup_locale (item, key, locales[i]));
 	}
--- a/libpurple/ft.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/ft.c	Thu Aug 13 19:56:23 2009 +0000
@@ -40,8 +40,35 @@
 static PurpleXferUiOps *xfer_ui_ops = NULL;
 static GList *xfers;
 
+/*
+ * A hack to store more data since we can't extend the size of PurpleXfer
+ * easily.
+ */
+static GHashTable *xfers_data = NULL;
+
+typedef struct _PurpleXferPrivData {
+	/*
+	 * Used to moderate the file transfer when either the read/write ui_ops are
+	 * set or fd is not set. In those cases, the UI/prpl call the respective
+	 * function, which is somewhat akin to a fd watch being triggered.
+	 */
+	enum {
+		PURPLE_XFER_READY_NONE = 0x0,
+		PURPLE_XFER_READY_UI   = 0x1,
+		PURPLE_XFER_READY_PRPL = 0x2,
+	} ready;
+} PurpleXferPrivData;
+
 static int purple_xfer_choose_file(PurpleXfer *xfer);
 
+static void
+purple_xfer_priv_data_destroy(gpointer data)
+{
+	PurpleXferPrivData *priv = data;
+
+	g_free(priv);
+}
+
 GList *
 purple_xfers_get_all()
 {
@@ -53,6 +80,7 @@
 {
 	PurpleXfer *xfer;
 	PurpleXferUiOps *ui_ops;
+	PurpleXferPrivData *priv;
 
 	g_return_val_if_fail(type    != PURPLE_XFER_UNKNOWN, NULL);
 	g_return_val_if_fail(account != NULL,              NULL);
@@ -70,6 +98,11 @@
 	xfer->current_buffer_size = FT_INITIAL_BUFFER_SIZE;
 	xfer->fd = -1;
 
+	priv = g_new0(PurpleXferPrivData, 1);
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	g_hash_table_insert(xfers_data, xfer, priv);
+
 	ui_ops = purple_xfer_get_ui_ops(xfer);
 
 	if (ui_ops != NULL && ui_ops->new_xfer != NULL)
@@ -102,9 +135,11 @@
 	g_free(xfer->remote_ip);
 	g_free(xfer->local_filename);
 
+	g_hash_table_remove(xfers_data, xfer);
+
 	PURPLE_DBUS_UNREGISTER_POINTER(xfer);
+	xfers = g_list_remove(xfers, xfer);
 	g_free(xfer);
-	xfers = g_list_remove(xfers, xfer);
 }
 
 void
@@ -482,13 +517,16 @@
 	if (type == PURPLE_XFER_SEND) {
 		/* Sending a file */
 		/* Check the filename. */
+		PurpleXferUiOps *ui_ops;
+		ui_ops = purple_xfer_get_ui_ops(xfer);
+
 #ifdef _WIN32
 		if (g_strrstr(filename, "../") || g_strrstr(filename, "..\\"))
 #else
 		if (g_strrstr(filename, "../"))
 #endif
 		{
-			char *utf8 = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+			utf8 = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
 
 			msg = g_strdup_printf(_("%s is not a valid filename.\n"), utf8);
 			purple_xfer_error(type, account, xfer->who, msg);
@@ -499,15 +537,20 @@
 			return;
 		}
 
-		if (g_stat(filename, &st) == -1) {
-			purple_xfer_show_file_error(xfer, filename);
-			purple_xfer_unref(xfer);
-			return;
+		if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+			if (g_stat(filename, &st) == -1) {
+				purple_xfer_show_file_error(xfer, filename);
+				purple_xfer_unref(xfer);
+				return;
+			}
+
+			purple_xfer_set_local_filename(xfer, filename);
+			purple_xfer_set_size(xfer, st.st_size);
+		} else {
+			utf8 = g_strdup(filename);
+			purple_xfer_set_local_filename(xfer, filename);
 		}
 
-		purple_xfer_set_local_filename(xfer, filename);
-		purple_xfer_set_size(xfer, st.st_size);
-
 		base = g_path_get_basename(filename);
 		utf8 = g_filename_to_utf8(base, -1, NULL, NULL, NULL);
 		g_free(base);
@@ -516,7 +559,6 @@
 		msg = g_strdup_printf(_("Offering to send %s to %s"),
 				utf8, buddy ? purple_buddy_get_alias(buddy) : xfer->who);
 		g_free(utf8);
-
 		purple_xfer_conversation_write(xfer, msg, FALSE);
 		g_free(msg);
 	}
@@ -884,9 +926,6 @@
 
 	if (xfer->ops.read != NULL)	{
 		r = (xfer->ops.read)(buffer, xfer);
-		if ((purple_xfer_get_size(xfer) > 0) &&
-			((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
-			purple_xfer_set_completed(xfer, TRUE);
 	}
 	else {
 		*buffer = g_malloc0(s);
@@ -896,9 +935,6 @@
 			r = 0;
 		else if (r < 0)
 			r = -1;
-		else if ((purple_xfer_get_size(xfer) > 0) &&
-			((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
-			purple_xfer_set_completed(xfer, TRUE);
 		else if (r == 0)
 			r = -1;
 	}
@@ -939,29 +975,39 @@
 }
 
 static void
-transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
+do_transfer(PurpleXfer *xfer)
 {
 	PurpleXferUiOps *ui_ops;
-	PurpleXfer *xfer = (PurpleXfer *)data;
 	guchar *buffer = NULL;
 	gssize r = 0;
 
-	if (condition & PURPLE_INPUT_READ) {
+	ui_ops = purple_xfer_get_ui_ops(xfer);
+
+	if (xfer->type == PURPLE_XFER_RECEIVE) {
 		r = purple_xfer_read(xfer, &buffer);
 		if (r > 0) {
-			const size_t wc = fwrite(buffer, 1, r, xfer->dest_fp);
+			size_t wc;
+			if (ui_ops && ui_ops->ui_write)
+				wc = ui_ops->ui_write(xfer, buffer, r);
+			else
+				wc = fwrite(buffer, 1, r, xfer->dest_fp);
+
 			if (wc != r) {
 				purple_debug_error("filetransfer", "Unable to write whole buffer.\n");
 				purple_xfer_cancel_local(xfer);
+				g_free(buffer);
 				return;
 			}
+
+			if ((purple_xfer_get_size(xfer) > 0) &&
+				((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
+				purple_xfer_set_completed(xfer, TRUE);
 		} else if(r < 0) {
 			purple_xfer_cancel_remote(xfer);
+			g_free(buffer);
 			return;
 		}
-	}
-
-	if (condition & PURPLE_INPUT_WRITE) {
+	} else if (xfer->type == PURPLE_XFER_SEND) {
 		size_t result;
 		size_t s = MIN(purple_xfer_get_bytes_remaining(xfer), xfer->current_buffer_size);
 
@@ -975,26 +1021,53 @@
 			return;
 		}
 
-		buffer = g_malloc0(s);
+		if (ui_ops && ui_ops->ui_read) {
+			gssize tmp = ui_ops->ui_read(xfer, &buffer, s);
+			if (tmp == 0) {
+				/*
+				 * UI isn't ready to send data. It will call
+				 * purple_xfer_ui_ready when ready, which sets back up this
+				 * watcher.
+				 */
+				if (xfer->watcher != 0) {
+					purple_timeout_remove(xfer->watcher);
+					xfer->watcher = 0;
+				}
 
-		result = fread(buffer, 1, s, xfer->dest_fp);
-		if (result != s) {
-			purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
-			purple_xfer_cancel_remote(xfer);
-			g_free(buffer);
-			return;
+				return;
+			} else if (tmp < 0) {
+				purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
+				purple_xfer_cancel_local(xfer);
+				return;
+			}
+
+			result = tmp;
+		} else {
+			buffer = g_malloc0(s);
+			result = fread(buffer, 1, s, xfer->dest_fp);
+			if (result != s) {
+				purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
+				purple_xfer_cancel_local(xfer);
+				g_free(buffer);
+				return;
+			}
 		}
 
 		/* Write as much as we're allowed to. */
-		r = purple_xfer_write(xfer, buffer, s);
+		r = purple_xfer_write(xfer, buffer, result);
 
 		if (r == -1) {
 			purple_xfer_cancel_remote(xfer);
 			g_free(buffer);
 			return;
-		} else if (r < s) {
-			/* We have to seek back in the file now. */
-			fseek(xfer->dest_fp, r - s, SEEK_CUR);
+		} else if (r < result) {
+			if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+				/* We have to seek back in the file now. */
+				fseek(xfer->dest_fp, r - s, SEEK_CUR);
+			}
+			else {
+				ui_ops->data_not_sent(xfer, buffer + r, result - r);
+			}
 		} else {
 			/*
 			 * We managed to write the entire buffer.  This means our
@@ -1016,8 +1089,6 @@
 
 		g_free(buffer);
 
-		ui_ops = purple_xfer_get_ui_ops(xfer);
-
 		if (ui_ops != NULL && ui_ops->update_progress != NULL)
 			ui_ops->update_progress(xfer,
 				purple_xfer_get_progress(xfer));
@@ -1028,22 +1099,45 @@
 }
 
 static void
+transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
+{
+	PurpleXfer *xfer = data;
+
+	if (xfer->dest_fp == NULL) {
+		/* The UI is moderating its side manually */
+		PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
+		if (0 == (priv->ready & PURPLE_XFER_READY_UI)) {
+			priv->ready |= PURPLE_XFER_READY_PRPL;
+
+			purple_input_remove(xfer->watcher);
+			xfer->watcher = 0;
+			return;
+		}
+	}
+
+	do_transfer(xfer);
+}
+
+static void
 begin_transfer(PurpleXfer *xfer, PurpleInputCondition cond)
 {
 	PurpleXferType type = purple_xfer_get_type(xfer);
+	PurpleXferUiOps *ui_ops = purple_xfer_get_ui_ops(xfer);
 
-	xfer->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer),
-						  type == PURPLE_XFER_RECEIVE ? "wb" : "rb");
+	if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+		xfer->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer),
+		                        type == PURPLE_XFER_RECEIVE ? "wb" : "rb");
 
-	if (xfer->dest_fp == NULL) {
-		purple_xfer_show_file_error(xfer, purple_xfer_get_local_filename(xfer));
-		purple_xfer_cancel_local(xfer);
-		return;
+		if (xfer->dest_fp == NULL) {
+			purple_xfer_show_file_error(xfer, purple_xfer_get_local_filename(xfer));
+			purple_xfer_cancel_local(xfer);
+			return;
+		}
+
+		fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET);
 	}
 
-	fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET);
-
-	if (xfer->fd)
+	if (xfer->fd != -1)
 		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
 
 	xfer->start_time = time(NULL);
@@ -1068,6 +1162,54 @@
 }
 
 void
+purple_xfer_ui_ready(PurpleXfer *xfer)
+{
+	PurpleInputCondition cond;
+	PurpleXferType type;
+	PurpleXferPrivData *priv;
+
+	g_return_if_fail(xfer != NULL);
+
+	priv = g_hash_table_lookup(xfers_data, xfer);
+	priv->ready |= PURPLE_XFER_READY_UI;
+
+	if (0 == (priv->ready & PURPLE_XFER_READY_PRPL))
+		return;
+
+	type = purple_xfer_get_type(xfer);
+	if (type == PURPLE_XFER_SEND)
+		cond = PURPLE_INPUT_WRITE;
+	else /* if (type == PURPLE_XFER_RECEIVE) */
+		cond = PURPLE_INPUT_READ;
+
+	if (xfer->watcher == 0 && xfer->fd != -1)
+		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
+
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	do_transfer(xfer);
+}
+
+void
+purple_xfer_prpl_ready(PurpleXfer *xfer)
+{
+	PurpleXferPrivData *priv;
+
+	g_return_if_fail(xfer != NULL);
+
+	priv = g_hash_table_lookup(xfers_data, xfer);
+	priv->ready |= PURPLE_XFER_READY_PRPL;
+
+	/* I don't think fwrite/fread are ever *not* ready */
+	if (xfer->dest_fp == NULL && 0 == (priv->ready & PURPLE_XFER_READY_UI))
+		return;
+
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	do_transfer(xfer);
+}
+
+void
 purple_xfer_start(PurpleXfer *xfer, int fd, const char *ip,
 				unsigned int port)
 {
@@ -1081,6 +1223,13 @@
 
 	purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_STARTED);
 
+	/*
+	 * FIXME 3.0.0 -- there's too much broken code depending on fd == 0
+	 * meaning "don't use a real fd"
+	 */
+	if (fd == 0)
+		fd = -1;
+
 	if (type == PURPLE_XFER_RECEIVE) {
 		cond = PURPLE_INPUT_READ;
 
@@ -1127,7 +1276,7 @@
 		xfer->watcher = 0;
 	}
 
-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);
 
 	if (xfer->dest_fp != NULL) {
@@ -1190,7 +1339,7 @@
 		xfer->watcher = 0;
 	}
 
-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);
 
 	if (xfer->dest_fp != NULL) {
@@ -1255,7 +1404,7 @@
 		xfer->watcher = 0;
 	}
 
-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);
 
 	if (xfer->dest_fp != NULL) {
@@ -1325,6 +1474,9 @@
 purple_xfers_init(void) {
 	void *handle = purple_xfers_get_handle();
 
+	xfers_data = g_hash_table_new_full(g_direct_hash, g_direct_equal,
+	                                   NULL, purple_xfer_priv_data_destroy);
+
 	/* register signals */
 	purple_signal_register(handle, "file-recv-accept",
 	                     purple_marshal_VOID__POINTER, NULL, 1,
@@ -1371,6 +1523,9 @@
 
 	purple_signals_disconnect_by_handle(handle);
 	purple_signals_unregister_by_instance(handle);
+
+	g_hash_table_destroy(xfers_data);
+	xfers_data = NULL;
 }
 
 void
--- a/libpurple/ft.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/ft.h	Thu Aug 13 19:56:23 2009 +0000
@@ -77,10 +77,50 @@
 	void (*cancel_local)(PurpleXfer *xfer);
 	void (*cancel_remote)(PurpleXfer *xfer);
 
+	/**
+	 * UI op to write data received from the prpl. The UI must deal with the
+	 * entire buffer and return size, or it is treated as an error.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  The buffer to write
+	 * @param size    The size of the buffer
+	 *
+	 * @return size if the write was successful, or a value between 0 and
+	 *         size on error.
+	 * @since 2.6.0
+	 */
+	gssize (*ui_write)(PurpleXfer *xfer, const guchar *buffer, gssize size);
+
+	/**
+	 * UI op to read data to send to the prpl for a file transfer.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  A pointer to a buffer. The UI must allocate this buffer.
+	 *                libpurple will free the data.
+	 * @param size    The maximum amount of data to put in the buffer.
+	 *
+	 * @returns The amount of data in the buffer, 0 if nothing is available,
+	 *          and a negative value if an error occurred and the transfer
+	 *          should be cancelled (libpurple will cancel).
+	 * @since 2.6.0
+	 */
+	gssize (*ui_read)(PurpleXfer *xfer, guchar **buffer, gssize size);
+
+	/**
+	 * Op to notify the UI that not all the data read in was written. The UI
+	 * should re-enqueue this data and return it the next time read is called.
+	 *
+	 * This MUST be implemented if read and write are implemented.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  A pointer to the beginning of the unwritten data.
+	 * @param size    The amount of unwritten data.
+	 *
+	 * @since 2.6.0
+	 */
+	void (*data_not_sent)(PurpleXfer *xfer, const guchar *buffer, gsize size);
+
 	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
 } PurpleXferUiOps;
 
 /**
@@ -132,7 +172,6 @@
 		gssize (*read)(guchar **buffer, PurpleXfer *xfer);
 		gssize (*write)(const guchar *buffer, size_t size, PurpleXfer *xfer);
 		void (*ack)(PurpleXfer *xfer, const guchar *buffer, size_t size);
-
 	} ops;
 
 	PurpleXferUiOps *ui_ops;            /**< UI-specific operations. */
@@ -548,6 +587,12 @@
  * file receive transfer. On send, @a fd must be specified, and
  * @a ip and @a port are ignored.
  *
+ * Prior to libpurple 2.6.0, passing '0' to @a fd was special-cased to
+ * allow the protocol plugin to facilitate the file transfer itself. As of
+ * 2.6.0, this is supported (for backward compatibility), but will be
+ * removed in libpurple 3.0.0. If a prpl detects that the running libpurple
+ * is running 2.6.0 or higher, it should use the invalid fd '-1'.
+ *
  * @param xfer The file transfer.
  * @param fd   The file descriptor for the socket.
  * @param ip   The IP address to connect to.
@@ -617,6 +662,28 @@
  */
 void purple_xfer_conversation_write(PurpleXfer *xfer, char *message, gboolean is_error);
 
+/**
+ * Allows the UI to signal it's ready to send/receive data (depending on
+ * the direction of the file transfer. Used when the UI is providing
+ * read/write/data_not_sent UI ops.
+ *
+ * @param xfer The file transfer which is ready.
+ *
+ * @since 2.6.0
+ */
+void purple_xfer_ui_ready(PurpleXfer *xfer);
+
+/**
+ * Allows the prpl to signal it's readh to send/receive data (depending on
+ * the direction of the file transfer. Used when the prpl provides read/write
+ * ops and cannot/does not provide a raw fd to the core.
+ *
+ * @param xfer The file transfer which is ready.
+ *
+ * @since 2.6.0
+ */
+void purple_xfer_prpl_ready(PurpleXfer *xfer);
+
 /*@}*/
 
 /**************************************************************************/
--- a/libpurple/log.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/log.c	Thu Aug 13 19:56:23 2009 +0000
@@ -1375,6 +1375,7 @@
 	char *image_corrected_msg;
 	char *date;
 	char *header;
+	char *escaped_from;
 	PurplePlugin *plugin = purple_find_prpl(purple_account_get_protocol_id(log->account));
 	PurpleLogCommonLoggerData *data = log->logger_data;
 	gsize written = 0;
@@ -1413,6 +1414,8 @@
 	if(!data->file)
 		return 0;
 
+	escaped_from = g_markup_escape_text(from, -1);
+
 	image_corrected_msg = convert_image_tags(log, message);
 	purple_markup_html_to_xhtml(image_corrected_msg, &msg_fixed, NULL);
 
@@ -1434,34 +1437,35 @@
 			written += fprintf(data->file, "<font color=\"#FF0000\"><font size=\"2\">(%s)</font><b> %s</b></font><br/>\n", date, msg_fixed);
 		else if (type & PURPLE_MESSAGE_WHISPER)
 			written += fprintf(data->file, "<font color=\"#6C2585\"><font size=\"2\">(%s)</font><b> %s:</b></font> %s<br/>\n",
-					date, from, msg_fixed);
+					date, escaped_from, msg_fixed);
 		else if (type & PURPLE_MESSAGE_AUTO_RESP) {
 			if (type & PURPLE_MESSAGE_SEND)
-				written += fprintf(data->file, _("<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
+				written += fprintf(data->file, _("<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, escaped_from, msg_fixed);
 			else if (type & PURPLE_MESSAGE_RECV)
-				written += fprintf(data->file, _("<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, from, msg_fixed);
+				written += fprintf(data->file, _("<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"), date, escaped_from, msg_fixed);
 		} else if (type & PURPLE_MESSAGE_RECV) {
 			if(purple_message_meify(msg_fixed, -1))
 				written += fprintf(data->file, "<font color=\"#062585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 			else
 				written += fprintf(data->file, "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 		} else if (type & PURPLE_MESSAGE_SEND) {
 			if(purple_message_meify(msg_fixed, -1))
 				written += fprintf(data->file, "<font color=\"#062585\"><font size=\"2\">(%s)</font> <b>***%s</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 			else
 				written += fprintf(data->file, "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s:</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 		} else {
 			purple_debug_error("log", "Unhandled message type.\n");
 			written += fprintf(data->file, "<font size=\"2\">(%s)</font><b> %s:</b></font> %s<br/>\n",
-						date, from, msg_fixed);
+						date, escaped_from, msg_fixed);
 		}
 	}
 	g_free(date);
 	g_free(msg_fixed);
+	g_free(escaped_from);
 	fflush(data->file);
 
 	return written;
--- a/libpurple/marshallers.list	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/marshallers.list	Thu Aug 13 19:56:23 2009 +0000
@@ -1,5 +1,6 @@
 VOID:POINTER,POINTER,OBJECT
 BOOLEAN:OBJECT,POINTER,STRING
 VOID:STRING,STRING
+VOID:STRING,STRING,DOUBLE
 VOID:ENUM,STRING,STRING
 VOID:ENUM,STRING,STRING,BOOLEAN
--- a/libpurple/media.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/media.c	Thu Aug 13 19:56:23 2009 +0000
@@ -94,6 +94,8 @@
 	FsStream *stream;
 	GstElement *src;
 	GstElement *tee;
+	GstElement *volume;
+	GstElement *level;
 
 	GList *local_candidates;
 	GList *remote_candidates;
@@ -157,9 +159,9 @@
 
 enum {
 	S_ERROR,
-	ACCEPTED,
 	CANDIDATES_PREPARED,
 	CODECS_CHANGED,
+	LEVEL,
 	NEW_CANDIDATE,
 	STATE_CHANGED,
 	STREAM_INFO,
@@ -272,6 +274,10 @@
 					"PURPLE_MEDIA_INFO_MUTE", "mute" },
 			{ PURPLE_MEDIA_INFO_UNMUTE,
 					"PURPLE_MEDIA_INFO_UNMUTE", "unmute" },
+			{ PURPLE_MEDIA_INFO_PAUSE,
+					"PURPLE_MEDIA_INFO_PAUSE", "pause" },
+			{ PURPLE_MEDIA_INFO_UNPAUSE,
+					"PURPLE_MEDIA_INFO_UNPAUSE", "unpause" },
 			{ PURPLE_MEDIA_INFO_HOLD,
 					"PURPLE_MEDIA_INFO_HOLD", "hold" },
 			{ PURPLE_MEDIA_INFO_UNHOLD,
@@ -332,10 +338,6 @@
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 g_cclosure_marshal_VOID__STRING,
 					 G_TYPE_NONE, 1, G_TYPE_STRING);
-	purple_media_signals[ACCEPTED] = g_signal_new("accepted", G_TYPE_FROM_CLASS(klass),
-					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
-					 purple_smarshal_VOID__STRING_STRING,
-					 G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 	purple_media_signals[CANDIDATES_PREPARED] = g_signal_new("candidates-prepared", G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 purple_smarshal_VOID__STRING_STRING,
@@ -345,6 +347,11 @@
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 g_cclosure_marshal_VOID__STRING,
 					 G_TYPE_NONE, 1, G_TYPE_STRING);
+	purple_media_signals[LEVEL] = g_signal_new("level", G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
+					 purple_smarshal_VOID__STRING_STRING_DOUBLE,
+					 G_TYPE_NONE, 3, G_TYPE_STRING,
+					 G_TYPE_STRING, G_TYPE_DOUBLE);
 	purple_media_signals[NEW_CANDIDATE] = g_signal_new("new-candidate", G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST, 0, NULL, NULL,
 					 purple_smarshal_VOID__POINTER_POINTER_OBJECT,
@@ -1899,11 +1906,31 @@
 		gst_element_add_pad(session->media->priv->confbin, ghost);
 	}
 
+	gst_element_set_state(session->tee, GST_STATE_PLAYING);
 	gst_element_link(session->src, session->media->priv->confbin);
-	gst_element_set_state(session->tee, GST_STATE_PLAYING);
 
 	g_object_get(session->session, "sink-pad", &sinkpad, NULL);
-	srcpad = gst_element_get_request_pad(session->tee, "src%d");
+	if (session->type & PURPLE_MEDIA_SEND_AUDIO) {
+		gchar *name = g_strdup_printf("volume_%s", session->id);
+		GstElement *level;
+		GstElement *volume = gst_element_factory_make("volume", name);
+		double input_volume = purple_prefs_get_int(
+				"/purple/media/audio/volume/input")/10.0;
+		g_free(name);
+		name = g_strdup_printf("sendlevel_%s", session->id);
+		level = gst_element_factory_make("level", name);
+		g_free(name);
+		gst_bin_add(GST_BIN(session->media->priv->confbin), volume);
+		gst_bin_add(GST_BIN(session->media->priv->confbin), level);
+		gst_element_set_state(level, GST_STATE_PLAYING);
+		gst_element_set_state(volume, GST_STATE_PLAYING);
+		gst_element_link(volume, level);
+		gst_element_link(session->tee, volume);
+		srcpad = gst_element_get_static_pad(level, "src");
+		g_object_set(volume, "volume", input_volume, NULL);
+	} else {
+		srcpad = gst_element_get_request_pad(session->tee, "src%d");
+	}
 	purple_debug_info("media", "connecting pad: %s\n", 
 			  gst_pad_link(srcpad, sinkpad) == GST_PAD_LINK_OK
 			  ? "success" : "failure");
@@ -1960,6 +1987,55 @@
 {
 	switch(GST_MESSAGE_TYPE(msg)) {
 		case GST_MESSAGE_ELEMENT: {
+			if (g_signal_has_handler_pending(media,
+					purple_media_signals[LEVEL], 0, FALSE)
+					&& gst_structure_has_name(
+					gst_message_get_structure(msg), "level")) {
+				GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(msg));
+				gchar *name;
+				gchar *participant = NULL;
+				PurpleMediaSession *session = NULL;
+				gdouble rms_db;
+				gdouble percent;
+				const GValue *list;
+				const GValue *value;
+
+				if (!PURPLE_IS_MEDIA(media) ||
+						GST_ELEMENT_PARENT(src) !=
+						media->priv->confbin)
+					break;
+
+				name = gst_element_get_name(src);
+				if (!strncmp(name, "sendlevel_", 10)) {
+					session = purple_media_get_session(
+							media, name+10);
+				} else {
+					GList *iter = media->priv->streams;
+					for (; iter; iter = g_list_next(iter)) {
+						PurpleMediaStream *stream = iter->data;
+						if (stream->level == src) {
+							session = stream->session;
+							participant = stream->participant;
+							break;
+						}
+					}
+				}
+				g_free(name);
+				if (!session)
+					break;
+
+				list = gst_structure_get_value(
+						gst_message_get_structure(msg), "rms");
+				value = gst_value_list_get_value(list, 0);
+				rms_db = g_value_get_double(value);
+				percent = pow(10, rms_db / 20) * 5;
+				if(percent > 1.0)
+					percent = 1.0;
+
+				g_signal_emit(media, purple_media_signals[LEVEL],
+						0, session->id, participant, percent);
+				break;
+			}
 			if (!FS_IS_CONFERENCE(GST_MESSAGE_SRC(msg)) ||
 					!PURPLE_IS_MEDIA(media) ||
 					media->priv->conference !=
@@ -2155,9 +2231,6 @@
 					stream->session->type), NULL);
 			stream->accepted = TRUE;
 		}
-
-		g_signal_emit(media, purple_media_signals[ACCEPTED],
-				0, NULL, NULL);
 	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_MUTE ||
 			type == PURPLE_MEDIA_INFO_UNMUTE)) {
 		GList *sessions;
@@ -2180,12 +2253,30 @@
 				sessions, sessions)) {
 			PurpleMediaSession *session = sessions->data;
 			if (session->type & PURPLE_MEDIA_SEND_AUDIO) {
+				gchar *name = g_strdup_printf("volume_%s",
+						session->id);
 				GstElement *volume = gst_bin_get_by_name(
-						GST_BIN(session->src),
-						"purpleaudioinputvolume");
+						GST_BIN(session->media->
+						priv->confbin), name);
+				g_free(name);
 				g_object_set(volume, "mute", active, NULL);
 			}
 		}
+	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_PAUSE ||
+			type == PURPLE_MEDIA_INFO_UNPAUSE)) {
+		gboolean active = (type == PURPLE_MEDIA_INFO_PAUSE);
+		GList *streams = purple_media_get_streams(media,
+				session_id, participant);
+		for (; streams; streams = g_list_delete_link(streams, streams)) {
+			PurpleMediaStream *stream = streams->data;
+			if (stream->session->type & PURPLE_MEDIA_SEND_VIDEO) {
+				g_object_set(stream->stream, "direction",
+						purple_media_to_fs_stream_direction(
+						stream->session->type & ((active) ?
+						~PURPLE_MEDIA_SEND_VIDEO :
+						PURPLE_MEDIA_VIDEO)), NULL);
+			}
+		}
 	}
 
 	g_signal_emit(media, purple_media_signals[STREAM_INFO],
@@ -2346,11 +2437,21 @@
 		GstElement *sink = NULL;
 
 		if (codec->media_type == FS_MEDIA_TYPE_AUDIO) {
+			GstElement *queue = NULL;
+			double output_volume = purple_prefs_get_int(
+					"/purple/media/audio/volume/output")/10.0;
 			/*
 			 * Should this instead be:
 			 *  audioconvert ! audioresample ! liveadder !
 			 *   audioresample ! audioconvert ! realsink
 			 */
+			queue = gst_element_factory_make("queue", NULL);
+			stream->volume = gst_element_factory_make(
+					"volume", NULL);
+			g_object_set(stream->volume, "volume",
+					output_volume, NULL);
+			stream->level = gst_element_factory_make(
+					"level", NULL);
 			stream->src = gst_element_factory_make(
 					"liveadder", NULL);
 			sink = purple_media_manager_get_element(priv->manager,
@@ -2358,19 +2459,32 @@
 					stream->session->media,
 					stream->session->id,
 					stream->participant);
+			gst_bin_add(GST_BIN(priv->confbin), queue);
+			gst_bin_add(GST_BIN(priv->confbin), stream->volume);
+			gst_bin_add(GST_BIN(priv->confbin), stream->level);
+			gst_bin_add(GST_BIN(priv->confbin), sink);
+			gst_element_set_state(sink, GST_STATE_PLAYING);
+			gst_element_set_state(stream->level, GST_STATE_PLAYING);
+			gst_element_set_state(stream->volume, GST_STATE_PLAYING);
+			gst_element_set_state(queue, GST_STATE_PLAYING);
+			gst_element_link(stream->level, sink);
+			gst_element_link(stream->volume, stream->level);
+			gst_element_link(queue, stream->volume);
+			sink = queue;
 		} else if (codec->media_type == FS_MEDIA_TYPE_VIDEO) {
 			stream->src = gst_element_factory_make(
 					"fsfunnel", NULL);
 			sink = gst_element_factory_make(
 					"fakesink", NULL);
 			g_object_set(G_OBJECT(sink), "async", FALSE, NULL);
+			gst_bin_add(GST_BIN(priv->confbin), sink);
+			gst_element_set_state(sink, GST_STATE_PLAYING);
 		}
 		stream->tee = gst_element_factory_make("tee", NULL);
 		gst_bin_add_many(GST_BIN(priv->confbin),
-				stream->src, stream->tee, sink, NULL);
-		gst_element_sync_state_with_parent(sink);
-		gst_element_sync_state_with_parent(stream->tee);
-		gst_element_sync_state_with_parent(stream->src);
+				stream->src, stream->tee, NULL);
+		gst_element_set_state(stream->tee, GST_STATE_PLAYING);
+		gst_element_set_state(stream->src, GST_STATE_PLAYING);
 		gst_element_link_many(stream->src, stream->tee, sink, NULL);
 	}
 
@@ -2504,26 +2618,27 @@
 				0, PURPLE_MEDIA_STATE_NEW,
 				session->id, NULL);
 
-		session_type = purple_media_from_fs(media_type,
-				FS_DIRECTION_SEND);
-		src = purple_media_manager_get_element(
-				media->priv->manager, session_type,
-				media, session->id, who);
-		if (!GST_IS_ELEMENT(src)) {
-			purple_debug_error("media",
-					"Error creating src for session %s\n",
-					session->id);
-			purple_media_end(media, session->id, NULL);
-			return FALSE;
+		if (type_direction & FS_DIRECTION_SEND) {
+			session_type = purple_media_from_fs(media_type,
+					FS_DIRECTION_SEND);
+			src = purple_media_manager_get_element(
+					media->priv->manager, session_type,
+					media, session->id, who);
+			if (!GST_IS_ELEMENT(src)) {
+				purple_debug_error("media",
+						"Error creating src for session %s\n",
+						session->id);
+				purple_media_end(media, session->id, NULL);
+				return FALSE;
+			}
+
+			purple_media_set_src(media, session->id, src);
+			gst_element_set_state(session->src, GST_STATE_PLAYING);
+			purple_media_manager_create_output_window(
+					media->priv->manager,
+					session->media,
+					session->id, NULL);
 		}
-
-		purple_media_set_src(media, session->id, src);
-		gst_element_set_state(session->src, GST_STATE_PLAYING);
-
-		purple_media_manager_create_output_window(
-				media->priv->manager,
-				session->media,
-				session->id, NULL);
 	}
 
 	if (!(participant = purple_media_add_participant(media, who))) {
@@ -2889,14 +3004,23 @@
 
 		if (session == NULL)
 			return FALSE;
-
-		g_object_get(session->session, "codecs-ready", &ret, NULL);
+		if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
+				PURPLE_MEDIA_SEND_VIDEO))
+			g_object_get(session->session,
+					"codecs-ready", &ret, NULL);
+		else
+			ret = TRUE;
 	} else {
 		GList *values = g_hash_table_get_values(media->priv->sessions);
 		for (; values; values = g_list_delete_link(values, values)) {
 			PurpleMediaSession *session = values->data;
-			g_object_get(session->session,
-					"codecs-ready", &ret, NULL);
+			if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
+					PURPLE_MEDIA_SEND_VIDEO))
+				g_object_get(session->session,
+						"codecs-ready", &ret, NULL);
+			else
+				ret = TRUE;
+
 			if (ret == FALSE)
 				break;
 		}
@@ -2983,6 +3107,8 @@
 
 	g_return_if_fail(PURPLE_IS_MEDIA(media));
 
+	purple_prefs_set_int("/purple/media/audio/volume/input", level);
+
 	if (session_id == NULL)
 		sessions = g_hash_table_get_values(media->priv->sessions);
 	else
@@ -2993,10 +3119,13 @@
 		PurpleMediaSession *session = sessions->data;
 
 		if (session->type & PURPLE_MEDIA_SEND_AUDIO) {
+			gchar *name = g_strdup_printf("volume_%s",
+					session->id);
 			GstElement *volume = gst_bin_get_by_name(
-					GST_BIN(session->src),
-					"purpleaudioinputvolume");
-			g_object_set(volume, "volume", level, NULL);
+					GST_BIN(session->media->priv->confbin),
+					name);
+			g_free(name);
+			g_object_set(volume, "volume", level/10.0, NULL);
 		}
 	}
 #endif
@@ -3011,34 +3140,17 @@
 
 	g_return_if_fail(PURPLE_IS_MEDIA(media));
 
+	purple_prefs_set_int("/purple/media/audio/volume/output", level);
+
 	streams = purple_media_get_streams(media,
 			session_id, participant);
 
 	for (; streams; streams = g_list_delete_link(streams, streams)) {
 		PurpleMediaStream *stream = streams->data;
 
-		if (stream->session->type & PURPLE_MEDIA_RECV_AUDIO) {
-			GstElement *tee = stream->tee;
-			GstIterator *iter = gst_element_iterate_src_pads(tee);
-			GstPad *sinkpad;
-			while (gst_iterator_next(iter, (gpointer)&sinkpad)
-					 == GST_ITERATOR_OK) {
-				GstPad *peer = gst_pad_get_peer(sinkpad);
-				GstElement *volume;
-
-				if (peer == NULL) {
-					gst_object_unref(sinkpad);
-					continue;
-				}
-					
-				volume = gst_bin_get_by_name(GST_BIN(
-						GST_OBJECT_PARENT(peer)),
-						"purpleaudiooutputvolume");
-				g_object_set(volume, "volume", level, NULL);
-				gst_object_unref(peer);
-				gst_object_unref(sinkpad);
-			}
-			gst_iterator_free(iter);
+		if (stream->session->type & PURPLE_MEDIA_RECV_AUDIO
+				&& GST_IS_ELEMENT(stream->volume)) {
+			g_object_set(stream->volume, "volume", level/10.0, NULL);
 		}
 	}
 #endif
--- a/libpurple/media.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/media.h	Thu Aug 13 19:56:23 2009 +0000
@@ -103,6 +103,8 @@
 	PURPLE_MEDIA_INFO_REJECT,
 	PURPLE_MEDIA_INFO_MUTE,
 	PURPLE_MEDIA_INFO_UNMUTE,
+	PURPLE_MEDIA_INFO_PAUSE,
+	PURPLE_MEDIA_INFO_UNPAUSE,
 	PURPLE_MEDIA_INFO_HOLD,
 	PURPLE_MEDIA_INFO_UNHOLD,
 } PurpleMediaInfoType;
--- a/libpurple/mediamanager.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/mediamanager.c	Thu Aug 13 19:56:23 2009 +0000
@@ -39,6 +39,7 @@
 #ifdef USE_VV
 
 #include <gst/farsight/fs-conference-iface.h>
+#include <gst/farsight/fs-element-added-notifier.h>
 #include <gst/interfaces/xoverlay.h>
 
 /** @copydoc _PurpleMediaManagerPrivate */
@@ -156,6 +157,12 @@
 	media->priv = PURPLE_MEDIA_MANAGER_GET_PRIVATE(media);
 	media->priv->medias = NULL;
 	media->priv->next_output_window_id = 1;
+
+	purple_prefs_add_none("/purple/media");
+	purple_prefs_add_none("/purple/media/audio");
+	purple_prefs_add_none("/purple/media/audio/volume");
+	purple_prefs_add_int("/purple/media/audio/volume/input", 10);
+	purple_prefs_add_int("/purple/media/audio/volume/output", 10);
 }
 
 static void
@@ -229,6 +236,10 @@
 	g_return_val_if_fail(PURPLE_IS_MEDIA_MANAGER(manager), NULL);
 
 	if (manager->priv->pipeline == NULL) {
+		FsElementAddedNotifier *notifier;
+		gchar *filename;
+		GError *err = NULL;
+		GKeyFile *keyfile;
 		GstBus *bus;
 		manager->priv->pipeline = gst_pipeline_new(NULL);
 
@@ -241,6 +252,38 @@
 				gst_bus_sync_signal_handler, NULL);
 		gst_object_unref(bus);
 
+		filename = g_build_filename(purple_user_dir(),
+				"fs-element.conf", NULL);
+		keyfile = g_key_file_new();
+		if (!g_key_file_load_from_file(keyfile, filename,
+				G_KEY_FILE_NONE, &err)) {
+			if (err->code == 4)
+				purple_debug_info("mediamanager",
+						"Couldn't read "
+						"fs-element.conf: %s\n",
+						err->message);
+			else
+				purple_debug_error("mediamanager",
+						"Error reading "
+						"fs-element.conf: %s\n",
+						err->message);
+			g_error_free(err);
+		}
+		g_free(filename);
+
+		/* Hack to make alsasrc stop messing up audio timestamps */
+		if (!g_key_file_has_key(keyfile,
+				"alsasrc", "slave-method", NULL)) {
+			g_key_file_set_integer(keyfile,
+					"alsasrc", "slave-method", 2);
+		}
+
+		notifier = fs_element_added_notifier_new();
+		fs_element_added_notifier_add(notifier,
+				GST_BIN(manager->priv->pipeline));
+		fs_element_added_notifier_set_properties_from_keyfile(
+				notifier, keyfile);
+
 		gst_element_set_state(manager->priv->pipeline,
 				GST_STATE_PLAYING);
 	}
@@ -356,15 +399,19 @@
 	GstElement *parent = GST_ELEMENT_PARENT(pad);
 	GstIterator *iter;
 	GstPad *remaining_pad;
+	GstIteratorResult result;
 
 	gst_element_release_request_pad(GST_ELEMENT_PARENT(pad), pad);
-	iter = gst_element_iterate_pads(parent);
+	iter = gst_element_iterate_src_pads(parent);
 
-	if (gst_iterator_next(iter, (gpointer)&remaining_pad)
-			== GST_ITERATOR_DONE) {
+	result = gst_iterator_next(iter, (gpointer)&remaining_pad);
+
+	if (result == GST_ITERATOR_DONE) {
 		gst_element_set_locked_state(parent, TRUE);
 		gst_element_set_state(parent, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(parent)), parent);
+	} else if (result == GST_ITERATOR_OK) {
+		gst_object_unref(remaining_pad);
 	}
 
 	gst_iterator_free(iter);
@@ -426,7 +473,6 @@
 			gst_element_link(tee, fakesink);
 
 			ret = bin;
-			gst_element_set_locked_state(ret, TRUE);
 			gst_object_ref(ret);
 			gst_bin_add(GST_BIN(purple_media_manager_get_pipeline(
 					manager)), ret);
@@ -667,7 +713,7 @@
 				(participant == ow->participant)) &&
 				!strcmp(session_id, ow->session_id)) {
 			GstBus *bus;
-			GstElement *queue;
+			GstElement *queue, *colorspace;
 			GstElement *tee = purple_media_get_tee(media,
 					session_id, participant);
 
@@ -676,6 +722,8 @@
 
 			queue = gst_element_factory_make(
 					"queue", NULL);
+			colorspace = gst_element_factory_make(
+					"ffmpegcolorspace", NULL);
 			ow->sink = purple_media_manager_get_element(
 					manager, PURPLE_MEDIA_RECV_VIDEO,
 					ow->media, ow->session_id,
@@ -696,7 +744,7 @@
 			}
 
 			gst_bin_add_many(GST_BIN(GST_ELEMENT_PARENT(tee)),
-					queue, ow->sink, NULL);
+					queue, colorspace, ow->sink, NULL);
 
 			bus = gst_pipeline_get_bus(GST_PIPELINE(
 					manager->priv->pipeline));
@@ -704,9 +752,11 @@
 					G_CALLBACK(window_id_cb), ow);
 			gst_object_unref(bus);
 
-			gst_element_sync_state_with_parent(ow->sink);
-			gst_element_link(queue, ow->sink);
-			gst_element_sync_state_with_parent(queue);
+			gst_element_set_state(ow->sink, GST_STATE_PLAYING);
+			gst_element_set_state(colorspace, GST_STATE_PLAYING);
+			gst_element_set_state(queue, GST_STATE_PLAYING);
+			gst_element_link(colorspace, ow->sink);
+			gst_element_link(queue, colorspace);
 			gst_element_link(tee, queue);
 		}
 	}
@@ -775,8 +825,14 @@
 		GstPad *pad = gst_element_get_static_pad(
 				output_window->sink, "sink");
 		GstPad *peer = gst_pad_get_peer(pad);
-		GstElement *queue = GST_ELEMENT_PARENT(peer);
+		GstElement *colorspace = GST_ELEMENT_PARENT(peer), *queue;
 		gst_object_unref(pad);
+		gst_object_unref(peer);
+		pad = gst_element_get_static_pad(colorspace, "sink");
+		peer = gst_pad_get_peer(pad);
+		queue = GST_ELEMENT_PARENT(peer);
+		gst_object_unref(pad);
+		gst_object_unref(peer);
 		pad = gst_element_get_static_pad(queue, "sink");
 		peer = gst_pad_get_peer(pad);
 		gst_object_unref(pad);
@@ -785,6 +841,9 @@
 		gst_element_set_locked_state(queue, TRUE);
 		gst_element_set_state(queue, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue);
+		gst_element_set_locked_state(colorspace, TRUE);
+		gst_element_set_state(colorspace, GST_STATE_NULL);
+		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(colorspace)), colorspace);
 		gst_element_set_locked_state(output_window->sink, TRUE);
 		gst_element_set_state(output_window->sink, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(output_window->sink)),
--- a/libpurple/pounce.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/pounce.c	Thu Aug 13 19:56:23 2009 +0000
@@ -1157,4 +1157,7 @@
 	}
 
 	purple_signals_disconnect_by_handle(purple_pounces_get_handle());
+
+	g_hash_table_destroy(pounce_handlers);
+	pounce_handlers = NULL;
 }
--- a/libpurple/prefs.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/prefs.c	Thu Aug 13 19:56:23 2009 +0000
@@ -1450,6 +1450,8 @@
 		sync_prefs();
 	}
 
+	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
+
 	prefs_loaded = FALSE;
 	purple_prefs_destroy();
 	g_hash_table_destroy(prefs_hash);
--- a/libpurple/protocols/bonjour/mdns_avahi.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/bonjour/mdns_avahi.c	Thu Aug 13 19:56:23 2009 +0000
@@ -200,8 +200,8 @@
 			}
 
 			if (!bonjour_buddy_check(bb)) {
+				b_impl->resolvers = g_slist_remove(b_impl->resolvers, rd);
 				_cleanup_resolver_data(rd);
-				b_impl->resolvers = g_slist_remove(b_impl->resolvers, rd);
 				/* If this was the last resolver, remove the buddy */
 				if (b_impl->resolvers == NULL) {
 					if (pb != NULL)
--- a/libpurple/protocols/gg/lib/libgadu.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/gg/lib/libgadu.c	Thu Aug 13 19:56:23 2009 +0000
@@ -790,6 +790,7 @@
 		gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() body recv(%d,%p,%d) = %d\n", sess->fd, buf + sizeof(h) + offset, size, ret);
 		if (!ret) {
 			gg_debug(GG_DEBUG_MISC, "// gg_recv_packet() body recv() failed: connection broken\n");
+			free(buf);
 			errno = ECONNRESET;
 			return NULL;
 		}
--- a/libpurple/protocols/irc/irc.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/irc/irc.c	Thu Aug 13 19:56:23 2009 +0000
@@ -569,9 +569,20 @@
 static void irc_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
 	struct irc_conn *irc = (struct irc_conn *)gc->proto_data;
-	struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
-	ib->name = g_strdup(purple_buddy_get_name(buddy));
-	g_hash_table_replace(irc->buddies, ib->name, ib);
+	struct irc_buddy *ib;
+	const char *bname = purple_buddy_get_name(buddy);
+
+	ib = g_hash_table_lookup(irc->buddies, bname);
+	if (ib != NULL) {
+		ib->ref++;
+		purple_prpl_got_user_status(irc->account, bname,
+				ib->online ? "available" : "offline", NULL);
+	} else {
+		ib = g_new0(struct irc_buddy, 1);
+		ib->name = g_strdup(bname);
+		ib->ref = 1;
+		g_hash_table_replace(irc->buddies, ib->name, ib);
+	}
 
 	/* if the timer isn't set, this is during signon, so we don't want to flood
 	 * ourself off with ISON's, so we don't, but after that we want to know when
@@ -583,7 +594,12 @@
 static void irc_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
 	struct irc_conn *irc = (struct irc_conn *)gc->proto_data;
-	g_hash_table_remove(irc->buddies, purple_buddy_get_name(buddy));
+	struct irc_buddy *ib;
+
+	ib = g_hash_table_lookup(irc->buddies, purple_buddy_get_name(buddy));
+	if (ib && --ib->ref == 0) {
+		g_hash_table_remove(irc->buddies, purple_buddy_get_name(buddy));
+	}
 }
 
 static void read_input(struct irc_conn *irc, int len)
--- a/libpurple/protocols/irc/irc.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/irc/irc.h	Thu Aug 13 19:56:23 2009 +0000
@@ -97,6 +97,7 @@
 	char *name;
 	gboolean online;
 	gboolean flag;
+	int ref;
 };
 
 typedef int (*IRCCmdCallback) (struct irc_conn *irc, const char *cmd, const char *target, const char **args);
--- a/libpurple/protocols/irc/msgs.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/irc/msgs.c	Thu Aug 13 19:56:23 2009 +0000
@@ -103,7 +103,8 @@
 		PurpleBuddy *b = buddies->data;
 		struct irc_buddy *ib = g_new0(struct irc_buddy, 1);
 		ib->name = g_strdup(purple_buddy_get_name(b));
-		g_hash_table_insert(irc->buddies, ib->name, ib);
+		ib->ref = 1;
+		g_hash_table_replace(irc->buddies, ib->name, ib);
 	}
 
 	irc_blist_timeout(irc);
--- a/libpurple/protocols/jabber/bosh.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/bosh.c	Thu Aug 13 19:56:23 2009 +0000
@@ -29,8 +29,12 @@
 
 #include "bosh.h"
 
-#define MAX_HTTP_CONNECTIONS      2
+/* The number of HTTP connections to use. This MUST be at least 2. */
+#define NUM_HTTP_CONNECTIONS      2
+/* How many failed connection attempts before it becomes a fatal error */
 #define MAX_FAILED_CONNECTIONS    3
+/* How long in seconds to queue up outgoing messages */
+#define BUFFER_SEND_IN_SECS       1
 
 typedef struct _PurpleHTTPConnection PurpleHTTPConnection;
 
@@ -40,55 +44,63 @@
 static char *bosh_useragent = NULL;
 
 typedef enum {
+	PACKET_NORMAL,
 	PACKET_TERMINATE,
-	PACKET_STREAM_RESTART,
-	PACKET_NORMAL,
+	PACKET_FLUSH,
 } PurpleBOSHPacketType;
 
 struct _PurpleBOSHConnection {
 	JabberStream *js;
+	PurpleHTTPConnection *connections[NUM_HTTP_CONNECTIONS];
+
+	PurpleCircBuffer *pending;
+	PurpleBOSHConnectionConnectFunction connect_cb;
+	PurpleBOSHConnectionReceiveFunction receive_cb;
+
+	/* Must be big enough to hold 2^53 - 1 */
+	char *sid;
+	guint64 rid;
+
+	/* decoded URL */
+	char *host;
+	char *path;
+	guint16 port;
+
 	gboolean pipelining;
-	PurpleHTTPConnection *connections[MAX_HTTP_CONNECTIONS];
-	unsigned short failed_connections;
+	gboolean ssl;
+	gboolean needs_restart;
 
 	enum {
 		BOSH_CONN_OFFLINE,
 		BOSH_CONN_BOOTING,
 		BOSH_CONN_ONLINE
 	} state;
-	gboolean ssl;
-	gboolean needs_restart;
+	guint8 failed_connections;
 
-	/* decoded URL */
-	char *host;
-	int port;
-	char *path;
-
-	/* Must be big enough to hold 2^53 - 1 */
-	guint64 rid;
-	char *sid;
-
-	unsigned int inactivity_timer;
 	int max_inactivity;
 	int wait;
 
-	PurpleCircBuffer *pending;
 	int max_requests;
 	int requests;
 
-	PurpleBOSHConnectionConnectFunction connect_cb;
-	PurpleBOSHConnectionReceiveFunction receive_cb;
+	guint inactivity_timer;
+	guint send_timer;
 };
 
 struct _PurpleHTTPConnection {
 	PurpleBOSHConnection *bosh;
 	PurpleSslConnection *psc;
+
+	PurpleCircBuffer *write_buf;
+	GString *read_buf;
+
+	gsize handled_len;
+	gsize body_len;
+
 	int fd;
 	guint readh;
 	guint writeh;
 
-	PurpleCircBuffer *write_buffer;
-
 	enum {
 		HTTP_CONN_OFFLINE,
 		HTTP_CONN_CONNECTING,
@@ -96,16 +108,14 @@
 	} state;
 	int requests; /* number of outstanding HTTP requests */
 
-	GString *buf;
 	gboolean headers_done;
-	gsize handled_len;
-	gsize body_len;
 
 };
 
 static void http_connection_connect(PurpleHTTPConnection *conn);
 static void http_connection_send_request(PurpleHTTPConnection *conn,
                                          const GString *req);
+static gboolean send_timer_cb(gpointer data);
 
 void jabber_bosh_init(void)
 {
@@ -140,7 +150,7 @@
 	conn->fd = -1;
 	conn->state = HTTP_CONN_OFFLINE;
 
-	conn->write_buffer = purple_circ_buffer_new(0 /* default grow size */);
+	conn->write_buf = purple_circ_buffer_new(0 /* default grow size */);
 
 	return conn;
 }
@@ -148,11 +158,11 @@
 static void
 jabber_bosh_http_connection_destroy(PurpleHTTPConnection *conn)
 {
-	if (conn->buf)
-		g_string_free(conn->buf, TRUE);
+	if (conn->read_buf)
+		g_string_free(conn->read_buf, TRUE);
 
-	if (conn->write_buffer)
-		purple_circ_buffer_destroy(conn->write_buffer);
+	if (conn->write_buf)
+		purple_circ_buffer_destroy(conn->write_buf);
 	if (conn->readh)
 		purple_input_remove(conn->readh);
 	if (conn->writeh)
@@ -227,12 +237,14 @@
 	g_free(conn->host);
 	g_free(conn->path);
 
+	if (conn->send_timer)
+		purple_timeout_remove(conn->send_timer);
 	if (conn->inactivity_timer)
 		purple_timeout_remove(conn->inactivity_timer);
 
 	purple_circ_buffer_destroy(conn->pending);
 
-	for (i = 0; i < MAX_HTTP_CONNECTIONS; ++i) {
+	for (i = 0; i < NUM_HTTP_CONNECTIONS; ++i) {
 		if (conn->connections[i])
 			jabber_bosh_http_connection_destroy(conn->connections[i]);
 	}
@@ -250,6 +262,19 @@
 {
 	int i;
 
+	if (purple_debug_is_verbose()) {
+		for (i = 0; i < NUM_HTTP_CONNECTIONS; ++i) {
+			PurpleHTTPConnection *httpconn = conn->connections[i];
+			if (httpconn == NULL)
+				purple_debug_misc("jabber", "BOSH %p->connections[%d] = (nil)\n",
+				                  conn, i);
+			else
+				purple_debug_misc("jabber", "BOSH %p->connections[%d] = %p, state = %d"
+				                  ", requests = %d\n", conn, i, httpconn,
+				                  httpconn->state, httpconn->requests);
+		}
+	}
+
 	/* Easy solution: Does everyone involved support pipelining? Hooray! Just use
 	 * one TCP connection! */
 	if (conn->pipelining)
@@ -257,7 +282,7 @@
 				conn->connections[0] : NULL;
 
 	/* First loop, look for a connection that's ready */
-	for (i = 0; i < MAX_HTTP_CONNECTIONS; ++i) {
+	for (i = 0; i < NUM_HTTP_CONNECTIONS; ++i) {
 		if (conn->connections[i] &&
 				conn->connections[i]->state == HTTP_CONN_CONNECTED &&
 				conn->connections[i]->requests == 0)
@@ -265,14 +290,14 @@
 	}
 
 	/* Second loop, is something currently connecting? If so, just queue up. */
-	for (i = 0; i < MAX_HTTP_CONNECTIONS; ++i) {
+	for (i = 0; i < NUM_HTTP_CONNECTIONS; ++i) {
 		if (conn->connections[i] &&
 				conn->connections[i]->state == HTTP_CONN_CONNECTING)
 			return NULL;
 	}
 
 	/* Third loop, look for one that's NULL and create a new connection */
-	for (i = 0; i < MAX_HTTP_CONNECTIONS; ++i) {
+	for (i = 0; i < NUM_HTTP_CONNECTIONS; ++i) {
 		if (!conn->connections[i]) {
 			purple_debug_info("jabber", "bosh: Creating and connecting new httpconn\n");
 			conn->connections[i] = jabber_bosh_http_connection_init(conn);
@@ -282,6 +307,8 @@
 		}
 	}
 
+	purple_debug_warning("jabber", "Could not find a HTTP connection!\n");
+
 	/* None available. */
 	return NULL;
 }
@@ -293,9 +320,29 @@
 	PurpleHTTPConnection *chosen;
 	GString *packet = NULL;
 
+	if (type != PACKET_FLUSH && type != PACKET_TERMINATE) {
+		/*
+		 * Unless this is a flush (or session terminate, which needs to be
+		 * sent immediately), queue up the data and start a timer to flush
+		 * the buffer.
+		 */
+		if (data) {
+			int len = data ? strlen(data) : 0;
+			purple_circ_buffer_append(conn->pending, data, len);
+		}
+
+		if (purple_debug_is_verbose())
+			purple_debug_misc("jabber", "bosh: %p has %" G_GSIZE_FORMAT " bytes in "
+			                  "the buffer.\n", conn, conn->pending->bufused);
+		if (conn->send_timer == 0)
+			conn->send_timer = purple_timeout_add_seconds(BUFFER_SEND_IN_SECS,
+					send_timer_cb, conn);
+		return;
+	}
+
 	chosen = find_available_http_connection(conn);
 
-	if (type != PACKET_NORMAL && !chosen) {
+	if (!chosen) {
 		/*
 		 * For non-ordinary traffic, we can't 'buffer' it, so use the
 		 * first connection.
@@ -303,25 +350,16 @@
 		chosen = conn->connections[0];
 
 		if (chosen->state != HTTP_CONN_CONNECTED) {
-			purple_debug_info("jabber", "Unable to find a ready BOSH "
+			purple_debug_warning("jabber", "Unable to find a ready BOSH "
 					"connection. Ignoring send of type 0x%02x.\n", type);
 			return;
 		}
 	}
 
-	if (type == PACKET_NORMAL && (!chosen ||
-	        (conn->max_requests > 0 && conn->requests == conn->max_requests))) {
-		/*
-		 * For normal data, send up to max_requests requests at a time or there is no
-		 * connection ready (likely, we're currently opening a second connection and
-		 * will send these packets when connected).
-		 */
-		if (data) {
-			int len = data ? strlen(data) : 0;
-			purple_circ_buffer_append(conn->pending, data, len);
-		}
-
-		return;
+	/* We're flushing the send buffer, so remove the send timer */
+	if (conn->send_timer != 0) {
+		purple_timeout_remove(conn->send_timer);
+		conn->send_timer = 0;
 	}
 
 	packet = g_string_new(NULL);
@@ -337,7 +375,7 @@
 	                conn->sid,
 	                conn->js->user->domain);
 
-	if (type == PACKET_STREAM_RESTART) {
+	if (conn->needs_restart) {
 		packet = g_string_append(packet, " xmpp:restart='true'/>");
 		/* TODO: Do we need to wait for a response? */
 		conn->needs_restart = FALSE;
@@ -369,7 +407,7 @@
 static void jabber_bosh_connection_stream_restart(PurpleBOSHConnection *conn)
 {
 	conn->needs_restart = TRUE;
-	jabber_bosh_connection_send(conn, PACKET_STREAM_RESTART, NULL);
+	jabber_bosh_connection_send(conn, PACKET_NORMAL, NULL);
 }
 
 static gboolean jabber_bosh_connection_error_check(PurpleBOSHConnection *conn, xmlnode *node) {
@@ -388,12 +426,46 @@
 }
 
 static gboolean
+send_timer_cb(gpointer data)
+{
+	PurpleBOSHConnection *bosh;
+
+	bosh = data;
+	bosh->send_timer = 0;
+
+	jabber_bosh_connection_send(bosh, PACKET_FLUSH, NULL);
+
+	return FALSE;
+}
+
+static gboolean
 bosh_inactivity_cb(gpointer data)
 {
 	PurpleBOSHConnection *bosh = data;
+	bosh->inactivity_timer = 0;
 
-	jabber_bosh_connection_send(bosh, PACKET_NORMAL, NULL);
-	return TRUE;
+	if (bosh->send_timer != 0)
+		purple_timeout_remove(bosh->send_timer);
+
+	/* clears bosh->send_timer */
+	send_timer_cb(bosh);
+
+	return FALSE;
+}
+
+static void
+restart_inactivity_timer(PurpleBOSHConnection *conn)
+{
+	if (conn->inactivity_timer != 0) {
+		purple_timeout_remove(conn->inactivity_timer);
+		conn->inactivity_timer = 0;
+	}
+
+	if (conn->max_inactivity != 0) {
+		conn->inactivity_timer =
+			purple_timeout_add_seconds(conn->max_inactivity - 5 /* rounding */,
+			                           bosh_inactivity_cb, conn);
+	}
 }
 
 static void jabber_bosh_connection_received(PurpleBOSHConnection *conn, xmlnode *node) {
@@ -490,18 +562,18 @@
 
 	if (inactivity) {
 		conn->max_inactivity = atoi(inactivity);
-		if (conn->max_inactivity <= 2) {
+		if (conn->max_inactivity <= 5) {
 			purple_debug_warning("jabber", "Ignoring bogusly small inactivity: %s\n",
 			                     inactivity);
 			conn->max_inactivity = 0;
 		} else {
 			/* TODO: Integrate this with jabber.c keepalive checks... */
+			/* TODO: Can this check fail? It shouldn't */
 			if (conn->inactivity_timer == 0) {
-				purple_debug_misc("jabber", "Starting BOSH inactivity timer for %d secs (compensating for rounding)\n",
+				purple_debug_misc("jabber", "Starting BOSH inactivity timer "
+						"for %d secs (compensating for rounding)\n",
 						conn->max_inactivity - 5);
-				conn->inactivity_timer = purple_timeout_add_seconds(
-						conn->max_inactivity - 5 /* rounding */,
-						bosh_inactivity_cb, conn);
+				restart_inactivity_timer(conn);
 			}
 		}
 	}
@@ -512,7 +584,6 @@
 	/* FIXME: Depending on receiving features might break with some hosts */
 	packet = xmlnode_get_child(node, "features");
 	conn->state = BOSH_CONN_ONLINE;
-	conn->js->use_bosh = TRUE;
 	conn->receive_cb = auth_response_cb;
 	jabber_stream_features_parse(conn->js, packet);
 }
@@ -578,10 +649,14 @@
 {
 	/* Indicate we're ready and reset some variables */
 	conn->state = HTTP_CONN_CONNECTED;
+	if (conn->requests != 0)
+		purple_debug_error("jabber", "bosh: httpconn %p has %d requests, != 0\n",
+		                   conn, conn->requests);
+
 	conn->requests = 0;
-	if (conn->buf) {
-		g_string_free(conn->buf, TRUE);
-		conn->buf = NULL;
+	if (conn->read_buf) {
+		g_string_free(conn->read_buf, TRUE);
+		conn->read_buf = NULL;
 	}
 	conn->headers_done = FALSE;
 	conn->handled_len = conn->body_len = 0;
@@ -592,22 +667,12 @@
 		purple_debug_info("jabber", "BOSH session already exists. Trying to reuse it.\n");
 		if (conn->bosh->requests == 0 || conn->bosh->pending->bufused > 0) {
 			/* Send the pending data */
-			jabber_bosh_connection_send(conn->bosh, PACKET_NORMAL, NULL);
+			jabber_bosh_connection_send(conn->bosh, PACKET_FLUSH, NULL);
 		}
-#if 0
-		conn->bosh->receive_cb = jabber_bosh_connection_received;
-		if (conn->bosh->connect_cb)
-			conn->bosh->connect_cb(conn->bosh);
-#endif
 	} else
 		jabber_bosh_connection_boot(conn->bosh);
 }
 
-void jabber_bosh_connection_refresh(PurpleBOSHConnection *conn)
-{
-	jabber_bosh_connection_send(conn, PACKET_NORMAL, NULL);
-}
-
 static void http_connection_disconnected(PurpleHTTPConnection *conn)
 {
 	/*
@@ -633,9 +698,21 @@
 		conn->writeh = 0;
 	}
 
-	if (conn->bosh->pipelining)
+	if (conn->requests > 0 && conn->read_buf->len == 0) {
+		purple_debug_error("jabber", "bosh: Adjusting BOSHconn requests (%d) to %d\n",
+		                   conn->bosh->requests, conn->bosh->requests - conn->requests);
+		conn->bosh->requests -= conn->requests;
+		conn->requests = 0;
+	}
+
+	if (conn->bosh->pipelining) {
 		/* Hmmmm, fall back to multiple connections */
 		conn->bosh->pipelining = FALSE;
+		if (conn->bosh->connections[1] == NULL) {
+			conn->bosh->connections[1] = jabber_bosh_http_connection_init(conn->bosh);
+			http_connection_connect(conn->bosh->connections[1]);
+		}
+	}
 
 	if (++conn->bosh->failed_connections == MAX_FAILED_CONNECTIONS) {
 		purple_connection_error_reason(conn->bosh->js->gc,
@@ -661,7 +738,7 @@
 {
 	const char *cursor;
 
-	cursor = conn->buf->str + conn->handled_len;
+	cursor = conn->read_buf->str + conn->handled_len;
 
 	if (!conn->headers_done) {
 		const char *content_length = purple_strcasestr(cursor, "\r\nContent-Length");
@@ -690,26 +767,26 @@
 
 		if (end_of_headers) {
 			conn->headers_done = TRUE;
-			conn->handled_len = end_of_headers - conn->buf->str + 4;
+			conn->handled_len = end_of_headers - conn->read_buf->str + 4;
 			cursor = end_of_headers + 4;
 		} else {
-			conn->handled_len = conn->buf->len;
+			conn->handled_len = conn->read_buf->len;
 			return;
 		}
 	}
 
 	/* Have we handled everything in the buffer? */
-	if (conn->handled_len >= conn->buf->len)
+	if (conn->handled_len >= conn->read_buf->len)
 		return;
 
 	/* Have we read all that the Content-Length promised us? */
-	if (conn->buf->len - conn->handled_len < conn->body_len)
+	if (conn->read_buf->len - conn->handled_len < conn->body_len)
 		return;
 
 	--conn->requests;
 	--conn->bosh->requests;
 
-	http_received_cb(conn->buf->str + conn->handled_len, conn->body_len,
+	http_received_cb(conn->read_buf->str + conn->handled_len, conn->body_len,
 	                 conn->bosh);
 
 	if (conn->bosh->state == BOSH_CONN_ONLINE &&
@@ -718,8 +795,8 @@
 		jabber_bosh_connection_send(conn->bosh, PACKET_NORMAL, NULL);
 	}
 
-	g_string_free(conn->buf, TRUE);
-	conn->buf = NULL;
+	g_string_free(conn->read_buf, TRUE);
+	conn->read_buf = NULL;
 	conn->headers_done = FALSE;
 	conn->handled_len = conn->body_len = 0;
 }
@@ -734,8 +811,8 @@
 	char buffer[1025];
 	int cnt, count = 0;
 
-	if (!conn->buf)
-		conn->buf = g_string_new(NULL);
+	if (!conn->read_buf)
+		conn->read_buf = g_string_new(NULL);
 
 	do {
 		if (conn->psc)
@@ -745,7 +822,7 @@
 
 		if (cnt > 0) {
 			count += cnt;
-			g_string_append_len(conn->buf, buffer, cnt);
+			g_string_append_len(conn->read_buf, buffer, cnt);
 		}
 	} while (cnt > 0);
 
@@ -765,7 +842,7 @@
 		/* Process what we do have */
 	}
 
-	if (conn->buf->len > 0)
+	if (conn->read_buf->len > 0)
 		jabber_bosh_http_connection_process(conn);
 }
 
@@ -879,7 +956,7 @@
 {
 	PurpleHTTPConnection *conn = data;
 	int ret;
-	int writelen = purple_circ_buffer_get_max_read(conn->write_buffer);
+	int writelen = purple_circ_buffer_get_max_read(conn->write_buf);
 
 	if (writelen == 0) {
 		purple_input_remove(conn->writeh);
@@ -887,7 +964,7 @@
 		return;
 	}
 
-	ret = http_connection_do_send(conn, conn->write_buffer->outptr, writelen);
+	ret = http_connection_do_send(conn, conn->write_buf->outptr, writelen);
 
 	if (ret < 0 && errno == EAGAIN)
 		return;
@@ -906,7 +983,7 @@
 		return;
 	}
 
-	purple_circ_buffer_mark_read(conn->write_buffer, ret);
+	purple_circ_buffer_mark_read(conn->write_buf, ret);
 }
 
 static void
@@ -916,6 +993,9 @@
 	int ret;
 	size_t len;
 
+	/* Sending something to the server, restart the inactivity timer */
+	restart_inactivity_timer(conn->bosh);
+
 	data = g_strdup_printf("POST %s HTTP/1.1\r\n"
 	                       "Host: %s\r\n"
 	                       "User-Agent: %s\r\n"
@@ -930,6 +1010,10 @@
 	++conn->requests;
 	++conn->bosh->requests;
 
+	if (purple_debug_is_unsafe() && purple_debug_is_verbose())
+		/* Will contain passwords for SASL PLAIN and is verbose */
+		purple_debug_misc("jabber", "BOSH: Sending %s\n", data);
+
 	if (conn->writeh == 0)
 		ret = http_connection_do_send(conn, data, len);
 	else {
@@ -956,7 +1040,7 @@
 		if (conn->writeh == 0)
 			conn->writeh = purple_input_add(conn->psc ? conn->psc->fd : conn->fd,
 					PURPLE_INPUT_WRITE, http_connection_send_cb, conn);
-		purple_circ_buffer_append(conn->write_buffer, data + ret, len - ret);
+		purple_circ_buffer_append(conn->write_buf, data + ret, len - ret);
 	}
 }
 
--- a/libpurple/protocols/jabber/bosh.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/bosh.h	Thu Aug 13 19:56:23 2009 +0000
@@ -37,5 +37,4 @@
 void jabber_bosh_connection_connect(PurpleBOSHConnection *conn);
 void jabber_bosh_connection_close(PurpleBOSHConnection *conn);
 void jabber_bosh_connection_send_raw(PurpleBOSHConnection *conn, const char *data);
-void jabber_bosh_connection_refresh(PurpleBOSHConnection *conn);
 #endif /* PURPLE_JABBER_BOSH_H_ */
--- a/libpurple/protocols/jabber/buddy.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Thu Aug 13 19:56:23 2009 +0000
@@ -463,6 +463,11 @@
 	if(!js->vcard_fetched)
 		return;
 
+	if (js->vcard_timer) {
+		purple_timeout_remove(js->vcard_timer);
+		js->vcard_timer = 0;
+	}
+
 	g_free(js->avatar_hash);
 	js->avatar_hash = NULL;
 
@@ -508,6 +513,7 @@
 
 		xmlnode_insert_data(binval, enc, -1);
 		g_free(enc);
+		purple_imgstore_unref(img);
 	} else if (vc_node) {
 		xmlnode *photo;
 		/* TODO: Remove all PHOTO children? (see above note) */
@@ -854,12 +860,26 @@
 	}
 }
 
+static gboolean
+set_own_vcard_cb(gpointer data)
+{
+	JabberStream *js = data;
+	PurpleAccount *account = purple_connection_get_account(js->gc);
+
+	js->vcard_timer = 0;
+
+	jabber_set_info(js->gc, purple_account_get_user_info(account));
+
+	return FALSE;
+}
+
 static void jabber_vcard_save_mine(JabberStream *js, const char *from,
                                    JabberIqType type, const char *id,
                                    xmlnode *packet, gpointer data)
 {
 	xmlnode *vcard, *photo, *binval;
 	char *txt, *vcard_hash = NULL;
+	PurpleAccount *account;
 
 	if (type == JABBER_IQ_ERROR) {
 		xmlnode *error;
@@ -870,12 +890,13 @@
 			return;
 	}
 
+	account = purple_connection_get_account(js->gc);
+
 	if((vcard = xmlnode_get_child(packet, "vCard")) ||
 			(vcard = xmlnode_get_child_with_namespace(packet, "query", "vcard-temp")))
 	{
 		txt = xmlnode_to_str(vcard, NULL);
-		purple_account_set_user_info(purple_connection_get_account(js->gc), txt);
-
+		purple_account_set_user_info(account, txt);
 		g_free(txt);
 	} else {
 		/* if we have no vCard, then lets not overwrite what we might have locally */
@@ -898,8 +919,17 @@
 
 	/* Republish our vcard if the photo is different than the server's */
 	if (!purple_strequal(vcard_hash, js->initial_avatar_hash)) {
-		PurpleAccount *account = purple_connection_get_account(js->gc);
-		jabber_set_info(js->gc, purple_account_get_user_info(account));
+		/*
+		 * Google Talk has developed the behavior that it will not accept
+		 * a vcard set in the first 10 seconds (or so) of the connection;
+		 * it returns an error (namespaces trimmed):
+		 * <error code="500" type="wait"><internal-server-error/></error>.
+		 */
+		if (js->googletalk)
+			js->vcard_timer = purple_timeout_add_seconds(10, set_own_vcard_cb,
+			                                             js);
+		else
+			jabber_set_info(js->gc, purple_account_get_user_info(account));
 	} else if (js->initial_avatar_hash) {
 		/* Our photo is in the vcard, so advertise vcard-temp updates */
 		js->avatar_hash = g_strdup(js->initial_avatar_hash);
@@ -1164,6 +1194,22 @@
 	g_free(jbri);
 }
 
+static guint jbir_hash(gconstpointer v)
+{
+	if (v)
+		return g_str_hash(v);
+	else
+		return 0;
+}
+
+static gboolean jbir_equal(gconstpointer v1, gconstpointer v2)
+{
+	const gchar *resource_1 = v1;
+	const gchar *resource_2 = v2;
+
+	return purple_strequal(resource_1, resource_2);
+}
+
 static void jabber_version_parse(JabberStream *js, const char *from,
                                  JabberIqType type, const char *id,
                                  xmlnode *packet, gpointer data)
@@ -1435,9 +1481,7 @@
 	char *full_jid = NULL;
 	const char *to;
 
-	g_return_if_fail(jbr->name != NULL);
-
-	if (is_bare_jid) {
+	if (is_bare_jid && jbr->name) {
 		full_jid = g_strdup_printf("%s/%s", jid, jbr->name);
 		to = full_jid;
 	} else
@@ -1506,7 +1550,7 @@
 	jbi->jid = g_strdup(jid);
 	jbi->js = js;
 	jbi->jb = jb;
-	jbi->resources = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, jabber_buddy_info_resource_free);
+	jbi->resources = g_hash_table_new_full(jbir_hash, jbir_equal, g_free, jabber_buddy_info_resource_free);
 	jbi->user_info = purple_notify_user_info_new();
 
 	iq = jabber_iq_new(js, JABBER_IQ_GET);
@@ -1736,9 +1780,7 @@
 	if(!jb)
 		return m;
 
-	/* XXX: fix the NOT ME below */
-
-	if(js->protocol_version == JABBER_PROTO_0_9 /* && NOT ME */) {
+	if (js->protocol_version == JABBER_PROTO_0_9 && jb != js->user_jb) {
 		if(jb->invisible & JABBER_INVIS_BUDDY) {
 			act = purple_menu_action_new(_("Un-hide From"),
 			                           PURPLE_CALLBACK(jabber_buddy_make_visible),
@@ -1751,7 +1793,7 @@
 		m = g_list_append(m, act);
 	}
 
-	if(jb->subscription & JABBER_SUB_FROM /* && NOT ME */) {
+	if(jb->subscription & JABBER_SUB_FROM && jb != js->user_jb) {
 		act = purple_menu_action_new(_("Cancel Presence Notification"),
 		                           PURPLE_CALLBACK(jabber_buddy_cancel_presence_notification),
 		                           NULL, NULL);
@@ -1764,7 +1806,7 @@
 		                           NULL, NULL);
 		m = g_list_append(m, act);
 
-	} else /* if(NOT ME) */{
+	} else if (jb != js->user_jb) {
 
 		/* shouldn't this just happen automatically when the buddy is
 		   removed? */
--- a/libpurple/protocols/jabber/buddy.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.h	Thu Aug 13 19:56:23 2009 +0000
@@ -33,10 +33,12 @@
 	JABBER_BUDDY_STATE_DND
 } JabberBuddyState;
 
+typedef struct _JabberBuddy JabberBuddy;
+
 #include "jabber.h"
 #include "caps.h"
 
-typedef struct _JabberBuddy {
+struct _JabberBuddy {
 	GList *resources;
 	char *error_msg;
 	enum {
@@ -52,7 +54,7 @@
 		JABBER_SUB_BOTH    = (JABBER_SUB_TO | JABBER_SUB_FROM),
 		JABBER_SUB_REMOVE  = 1 << 4
 	} subscription;
-} JabberBuddy;
+};
 
 typedef struct _JabberAdHocCommands {
 	char *jid;
--- a/libpurple/protocols/jabber/chat.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/chat.c	Thu Aug 13 19:56:23 2009 +0000
@@ -605,7 +605,7 @@
 	jm->to = g_strdup_printf("%s@%s", chat->room, chat->server);
 
 	if (topic && *topic)
-		jm->subject = purple_markup_strip_html(topic);
+		jm->subject = g_strdup(topic);
 	else
 		jm->subject = g_strdup("");
 
@@ -750,6 +750,7 @@
 
 	if(!server || !*server) {
 		purple_notify_error(js->gc, _("Invalid Server"), _("Invalid Server"), NULL);
+		purple_roomlist_set_in_progress(js->roomlist, FALSE);
 		return;
 	}
 
--- a/libpurple/protocols/jabber/disco.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/disco.c	Thu Aug 13 19:56:23 2009 +0000
@@ -85,11 +85,11 @@
 
 	/* TODO: When we support zeroconf proxies, fix this to handle them */
 	if (!(sh->jid && sh->host && sh->port > 0)) {
+		js->bs_proxies = g_list_remove(js->bs_proxies, sh);
 		g_free(sh->jid);
 		g_free(sh->host);
 		g_free(sh->zeroconf);
 		g_free(sh);
-		js->bs_proxies = g_list_remove(js->bs_proxies, sh);
 	}
 }
 
@@ -98,10 +98,6 @@
                              JabberIqType type, const char *id,
                              xmlnode *in_query)
 {
-
-	if(!from)
-		return;
-
 	if(type == JABBER_IQ_GET) {
 		xmlnode *query, *identity, *feature;
 		JabberIq *iq;
@@ -116,7 +112,8 @@
 
 		jabber_iq_set_id(iq, id);
 
-		xmlnode_set_attrib(iq->node, "to", from);
+		if (from)
+			xmlnode_set_attrib(iq->node, "to", from);
 		query = xmlnode_get_child(iq->node, "query");
 
 		if(node)
@@ -208,7 +205,8 @@
 		xmlnode_set_namespace(bad_request, "urn:ietf:params:xml:ns:xmpp-stanzas");
 
 		jabber_iq_set_id(iq, id);
-		xmlnode_set_attrib(iq->node, "to", from);
+		if (from)
+			xmlnode_set_attrib(iq->node, "to", from);
 
 		jabber_iq_send(iq);
 	}
--- a/libpurple/protocols/jabber/google.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Thu Aug 13 19:56:23 2009 +0000
@@ -430,7 +430,7 @@
 	return (session->media != NULL) ? TRUE : FALSE;
 }
 
-static void
+static gboolean
 google_session_handle_initiate(JabberStream *js, GoogleSession *session, xmlnode *sess, const char *iq_id)
 {
 	JabberIq *result;
@@ -443,7 +443,7 @@
 
 	if (session->state != UNINIT) {
 		purple_debug_error("jabber", "Received initiate for active session.\n");
-		return;
+		return FALSE;
 	}
 
 	desc_element = xmlnode_get_child(sess, "description");
@@ -456,7 +456,7 @@
 	else {
 		purple_debug_error("jabber", "Received initiate with "
 				"invalid namespace %s.\n", xmlns);
-		return;
+		return FALSE;
 	}
 
 	session->media = purple_media_manager_create_media(
@@ -480,7 +480,7 @@
 				PURPLE_MEDIA_INFO_HANGUP, NULL, NULL, TRUE);
 		google_session_send_terminate(session);
 		g_free(params);
-		return;
+		return FALSE;
 	}
 
 	g_free(params);
@@ -551,6 +551,8 @@
 	jabber_iq_set_id(result, iq_id);
 	xmlnode_set_attrib(result->node, "to", session->remote_jid);
 	jabber_iq_send(result);
+
+	return TRUE;
 }
 
 static void
@@ -776,7 +778,8 @@
 	session->js = js;
 	session->remote_jid = g_strdup(session->id.initiator);
 
-	google_session_parse_iq(js, session, session_node, iq_id);
+	if (!google_session_handle_initiate(js, session, session_node, iq_id))
+		google_session_destroy(session);
 }
 #endif /* USE_VV */
 
--- a/libpurple/protocols/jabber/iq.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/iq.c	Thu Aug 13 19:56:23 2009 +0000
@@ -282,11 +282,6 @@
 	id = xmlnode_get_attrib(packet, "id");
 	iq_type = xmlnode_get_attrib(packet, "type");
 
-	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
-			"jabber-receiving-iq", js->gc, iq_type, id, from, packet));
-	if (signal_return)
-		return;
-
 	/*
 	 * child will be either the first tag child or NULL if there is no child.
 	 * Historically, we used just the 'query' subchild, but newer XEPs use
@@ -345,6 +340,11 @@
 		return;
 	}
 
+	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
+			"jabber-receiving-iq", js->gc, iq_type, id, from, packet));
+	if (signal_return)
+		return;
+
 	/* First, lets see if a special callback got registered */
 	if(type == JABBER_IQ_RESULT || type == JABBER_IQ_ERROR) {
 		if((jcd = g_hash_table_lookup(js->iq_callbacks, id))) {
--- a/libpurple/protocols/jabber/jabber.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Thu Aug 13 19:56:23 2009 +0000
@@ -132,15 +132,19 @@
 		xmlnode *jid;
 		char *full_jid;
 		if((jid = xmlnode_get_child(bind, "jid")) && (full_jid = xmlnode_get_data(jid))) {
-			JabberBuddy *my_jb = NULL;
 			jabber_id_free(js->user);
-			if(!(js->user = jabber_id_new(full_jid))) {
+
+			js->user = jabber_id_new(full_jid);
+			if (js->user == NULL) {
 				purple_connection_error_reason(js->gc,
 					PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 					_("Invalid response from server"));
+				g_free(full_jid);
+				return;
 			}
-			if((my_jb = jabber_buddy_find(js, full_jid, TRUE)))
-				my_jb->subscription |= JABBER_SUB_BOTH;
+
+			js->user_jb = jabber_buddy_find(js, full_jid, TRUE);
+			js->user_jb->subscription |= JABBER_SUB_BOTH;
 
 			purple_connection_set_display_name(js->gc, full_jid);
 
@@ -441,7 +445,7 @@
 	if (len == -1)
 		len = strlen(data);
 
-	if (js->use_bosh)
+	if (js->bosh)
 		jabber_bosh_connection_send_raw(js->bosh, data);
 	else
 		do_jabber_send_raw(js, data, len);
@@ -465,7 +469,7 @@
 		return;
 
 	js = purple_connection_get_protocol_data(pc);
-	if (js->use_bosh)
+	if (js->bosh)
 		if (g_str_equal((*packet)->name, "message") ||
 				g_str_equal((*packet)->name, "iq") ||
 				g_str_equal((*packet)->name, "presence"))
@@ -632,7 +636,6 @@
 		if (!strcmp(token[0], "_xmpp-client-xbosh")) {
 			purple_debug_info("jabber","Found alternative connection method using %s at %s.\n", token[0], token[1]);
 			js->bosh = jabber_bosh_connection_init(js, token[1]);
-			js->use_bosh = TRUE;
 			g_strfreev(token);
 			break;
 		}
@@ -776,7 +779,6 @@
 {
 	PurpleConnection *gc = purple_account_get_connection(account);
 	JabberStream *js;
-	JabberBuddy *my_jb;
 	PurplePresence *presence;
 	gchar *user;
 	gchar *slash;
@@ -811,9 +813,9 @@
 	js->buddies = g_hash_table_new_full(g_str_hash, g_str_equal,
 			g_free, (GDestroyNotify)jabber_buddy_free);
 
-	my_jb = jabber_buddy_find(js, user, TRUE);
+	js->user_jb = jabber_buddy_find(js, user, TRUE);
 	g_free(user);
-	if (!my_jb) {
+	if (!js->user_jb) {
 		/* This basically *can't* fail, but for good measure... */
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_INVALID_SETTINGS,
@@ -822,7 +824,7 @@
 		g_return_val_if_reached(NULL);
 	}
 
-	my_jb->subscription |= JABBER_SUB_BOTH;
+	js->user_jb->subscription |= JABBER_SUB_BOTH;
 
 	js->iq_callbacks = g_hash_table_new_full(g_str_hash, g_str_equal,
 			g_free, g_free);
@@ -865,7 +867,6 @@
 	 * attached to that choice, though.
 	 */
 	if (*bosh_url) {
-		js->use_bosh = TRUE;
 		js->bosh = jabber_bosh_connection_init(js, bosh_url);
 		if (js->bosh)
 			jabber_bosh_connection_connect(js->bosh);
@@ -1445,7 +1446,7 @@
 	 * on some SSL backends.
 	 */
 	if (!gc->disconnect_timeout) {
-		if (js->use_bosh)
+		if (js->bosh)
 			jabber_bosh_connection_close(js->bosh);
 		else if ((js->gsc && js->gsc->fd > 0) || js->fd > 0)
 			jabber_send_raw(js, "</stream:stream>", -1);
@@ -1542,6 +1543,9 @@
 	g_free(js->old_track);
 	g_free(js->expected_rspauth);
 
+	if (js->vcard_timer != 0)
+		purple_timeout_remove(js->vcard_timer);
+
 	if (js->keepalive_timeout != 0)
 		purple_timeout_remove(js->keepalive_timeout);
 
@@ -3467,6 +3471,8 @@
 #ifdef USE_VV
 	jabber_add_feature("http://www.google.com/xmpp/protocol/session", jabber_audio_enabled);
 	jabber_add_feature("http://www.google.com/xmpp/protocol/voice/v1", jabber_audio_enabled);
+	jabber_add_feature("http://www.google.com/xmpp/protocol/video/v1", jabber_video_enabled);
+	jabber_add_feature("http://www.google.com/xmpp/protocol/camera/v1", jabber_video_enabled);
 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled);
 	jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled);
 	jabber_add_feature(JINGLE_TRANSPORT_ICEUDP, 0);
--- a/libpurple/protocols/jabber/jabber.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Thu Aug 13 19:56:23 2009 +0000
@@ -164,6 +164,8 @@
 	time_t old_idle;
 
 	JabberID *user;
+	JabberBuddy *user_jb;
+
 	PurpleConnection *gc;
 	PurpleSslConnection *gsc;
 
@@ -214,6 +216,8 @@
 	void *unregistration_user_data;
 
 	gboolean vcard_fetched;
+	/* Timer at login to push updated avatar */
+	guint vcard_timer;
 
 	/* Entity Capabilities hash */
 	char *caps_hash;
@@ -251,7 +255,6 @@
 	guint max_srv_rec_idx;
 
 	/* BOSH stuff */
-	gboolean use_bosh;
 	PurpleBOSHConnection *bosh;
 
 	/**
--- a/libpurple/protocols/jabber/jingle/rtp.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.c	Thu Aug 13 19:56:23 2009 +0000
@@ -355,14 +355,6 @@
 static void jingle_rtp_ready(JingleSession *session);
 
 static void
-jingle_rtp_accepted_cb(PurpleMedia *media, gchar *sid, gchar *name,
-		JingleSession *session)
-{
-	purple_debug_info("jingle-rtp", "jingle_rtp_accepted_cb\n");
-	jingle_rtp_ready(session);
-}
-
-static void
 jingle_rtp_candidates_prepared_cb(PurpleMedia *media,
 		gchar *sid, gchar *name, JingleSession *session)
 {
@@ -480,6 +472,9 @@
 		jabber_iq_send(jingle_session_terminate_packet(
 				session, "decline"));
 		g_object_unref(session);
+	} else if (type == PURPLE_MEDIA_INFO_ACCEPT &&
+			jingle_session_is_initiator(session) == FALSE) {
+		jingle_rtp_ready(session);
 	}
 }
 
@@ -504,8 +499,6 @@
 		}
 
 		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
-				G_CALLBACK(jingle_rtp_accepted_cb), session);
-		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
 				G_CALLBACK(jingle_rtp_candidates_prepared_cb),
 				session);
 		g_signal_handlers_disconnect_by_func(G_OBJECT(media),
@@ -539,9 +532,6 @@
 	purple_media_set_prpl_data(media, session);
 
 	/* connect callbacks */
-	if (jingle_session_is_initiator(session) == FALSE)
-		g_signal_connect(G_OBJECT(media), "accepted",
-				G_CALLBACK(jingle_rtp_accepted_cb), session);
 	g_signal_connect(G_OBJECT(media), "candidates-prepared",
 				 G_CALLBACK(jingle_rtp_candidates_prepared_cb), session);
 	g_signal_connect(G_OBJECT(media), "codecs-changed",
@@ -599,8 +589,8 @@
 	if (!strcmp(senders, "both"))
 		type = is_audio == TRUE ? PURPLE_MEDIA_AUDIO
 				: PURPLE_MEDIA_VIDEO;
-	else if (!strcmp(senders, "initiator")
-			&& jingle_session_is_initiator(session))
+	else if ((strcmp(senders, "initiator") == 0) ==
+			jingle_session_is_initiator(session))
 		type = is_audio == TRUE ? PURPLE_MEDIA_SEND_AUDIO
 				: PURPLE_MEDIA_SEND_VIDEO;
 	else
--- a/libpurple/protocols/jabber/libxmpp.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Thu Aug 13 19:56:23 2009 +0000
@@ -28,6 +28,7 @@
 #include "internal.h"
 
 #include "accountopt.h"
+#include "core.h"
 #include "debug.h"
 #include "version.h"
 
@@ -47,6 +48,8 @@
 #include "data.h"
 #include "ibb.h"
 
+static PurplePlugin *my_protocol = NULL;
+
 static PurplePluginProtocolInfo prpl_info =
 {
 	OPT_PROTO_CHAT_TOPIC | OPT_PROTO_UNIQUE_CHATNAME | OPT_PROTO_MAIL_CHECK |
@@ -266,6 +269,70 @@
 	NULL
 };
 
+static PurpleAccount *find_acct(const char *prpl, const char *acct_id)
+{
+	PurpleAccount *acct = NULL;
+
+	/* If we have a specific acct, use it */
+	if (acct_id) {
+		acct = purple_accounts_find(acct_id, prpl);
+		if (acct && !purple_account_is_connected(acct))
+			acct = NULL;
+	} else { /* Otherwise find an active account for the protocol */
+		GList *l = purple_accounts_get_all();
+		while (l) {
+			if (!strcmp(prpl, purple_account_get_protocol_id(l->data))
+					&& purple_account_is_connected(l->data)) {
+				acct = l->data;
+				break;
+			}
+			l = l->next;
+		}
+	}
+
+	return acct;
+}
+
+static gboolean xmpp_uri_handler(const char *proto, const char *user, GHashTable *params)
+{
+	char *acct_id = g_hash_table_lookup(params, "account");
+	PurpleAccount *acct;
+
+	if (g_ascii_strcasecmp(proto, "xmpp"))
+		return FALSE;
+
+	acct = find_acct(purple_plugin_get_id(my_protocol), acct_id);
+
+	if (!acct)
+		return FALSE;
+
+	/* xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message */
+	if (g_hash_table_lookup_extended(params, "message", NULL, NULL)) {
+		char *body = g_hash_table_lookup(params, "body");
+		if (user && *user) {
+			PurpleConversation *conv =
+					purple_conversation_new(PURPLE_CONV_TYPE_IM, acct, user);
+			purple_conversation_present(conv);
+			if (body && *body)
+				purple_conv_send_confirm(conv, body);
+		}
+	} else if (g_hash_table_lookup_extended(params, "roster", NULL, NULL)) {
+		char *name = g_hash_table_lookup(params, "name");
+		if (user && *user)
+			purple_blist_request_add_buddy(acct, user, NULL, name);
+	} else if (g_hash_table_lookup_extended(params, "join", NULL, NULL)) {
+		PurpleConnection *gc = purple_account_get_connection(acct);
+		if (user && *user) {
+			GHashTable *params = jabber_chat_info_defaults(gc, user);
+			jabber_chat_join(gc, params);
+		}
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+
 static void
 init_plugin(PurplePlugin *plugin)
 {
@@ -331,6 +398,7 @@
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 		option);
 
+	my_protocol = plugin;
 	jabber_init_plugin(plugin);
 
 	purple_prefs_remove("/plugins/prpl/jabber");
@@ -366,6 +434,9 @@
 
 	jabber_ibb_init();
 	jabber_si_init();
+
+	purple_signal_connect(purple_get_core(), "uri-handler", plugin,
+		PURPLE_CALLBACK(xmpp_uri_handler), NULL);
 }
 
 
--- a/libpurple/protocols/jabber/presence.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/presence.c	Thu Aug 13 19:56:23 2009 +0000
@@ -698,6 +698,7 @@
 			const char *real_jid = NULL;
 			const char *affiliation = NULL;
 			const char *role = NULL;
+			gboolean is_our_resource = FALSE; /* Is the presence about us? */
 
 			/*
 			 * XEP-0045 mandates the presence to include a resource (which is
@@ -718,10 +719,15 @@
 				xmlnode *status_node;
 				xmlnode *item_node;
 
-				status_node = xmlnode_get_child(x, "status");
-				if (status_node) {
+				for (status_node = xmlnode_get_child(x, "status"); status_node;
+						status_node = xmlnode_get_next_twin(status_node)) {
 					const char *code = xmlnode_get_attrib(status_node, "code");
-					if (purple_strequal(code, "201")) {
+					if (!code)
+						continue;
+
+					if (g_str_equal(code, "110")) {
+						is_our_resource = TRUE;
+					} else if (g_str_equal(code, "201")) {
 						if ((chat = jabber_chat_find(js, jid->node, jid->domain))) {
 							chat->config_dialog_type = PURPLE_REQUEST_ACTION;
 							chat->config_dialog_handle =
@@ -737,7 +743,7 @@
 										_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
 										_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
 						}
-					} else if (purple_strequal(code, "210")) {
+					} else if (g_str_equal(code, "210")) {
 						/* server rewrote room-nick */
 						if((chat = jabber_chat_find(js, jid->node, jid->domain))) {
 							g_free(chat->handle);
@@ -814,7 +820,6 @@
 					"http://jabber.org/protocol/muc#user");
 			if (chat->muc && x) {
 				const char *nick;
-				const char *code = NULL;
 				const char *item_jid = NULL;
 				const char *to;
 				xmlnode *stat;
@@ -824,13 +829,16 @@
 				if (item)
 					item_jid = xmlnode_get_attrib(item, "jid");
 
-				stat = xmlnode_get_child(x, "status");
+				for (stat = xmlnode_get_child(x, "status"); stat;
+						stat = xmlnode_get_next_twin(stat)) {
+					const char *code = xmlnode_get_attrib(stat, "code");
 
-				if (stat)
-					code = xmlnode_get_attrib(stat, "code");
+					if (!code)
+						continue;
 
-				if (code) {
-					if(!strcmp(code, "301")) {
+					if (g_str_equal(code, "110")) {
+						is_our_resource = TRUE;
+					} else if(!strcmp(code, "301")) {
 						/* XXX: we got banned */
 					} else if(!strcmp(code, "303") && item &&
 							(nick = xmlnode_get_attrib(item, "nick"))) {
@@ -839,10 +847,11 @@
 							g_free(chat->handle);
 							chat->handle = g_strdup(nick);
 						}
+
+						/* TODO: This should probably be moved out of the loop */
 						purple_conv_chat_rename_user(PURPLE_CONV_CHAT(chat->conv), jid->resource, nick);
 						jabber_chat_remove_handle(chat, jid->resource);
-						/* TODO: Enable this when this is in a for-loop...
-						break; */
+						continue;
 					} else if(!strcmp(code, "307")) {
 						/* Someone was kicked from the room */
 						xmlnode *reason = NULL, *actor = NULL;
--- a/libpurple/protocols/jabber/roster.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/roster.c	Thu Aug 13 19:56:23 2009 +0000
@@ -66,7 +66,7 @@
 }
 
 static void add_purple_buddy_to_groups(JabberStream *js, const char *jid,
-		const char *alias, GSList *groups, const char *own_jid)
+		const char *alias, GSList *groups)
 {
 	GSList *buddies, *l;
 	GSList *pool = NULL;
@@ -162,12 +162,6 @@
 		purple_blist_add_buddy(b, NULL, g, NULL);
 		purple_blist_alias_buddy(b, alias);
 
-		/* If we just learned about ourself, then fake our status,
-		 * because we won't be receiving a normal presence message
-		 * about ourself. */
-		if(!strcmp(purple_buddy_get_name(b), own_jid))
-			jabber_presence_fake_to_self(js, NULL);
-
 		g_free(groups->data);
 		groups = g_slist_delete_link(groups, groups);
 	}
@@ -187,7 +181,6 @@
                          JabberIqType type, const char *id, xmlnode *query)
 {
 	xmlnode *item, *group;
-	gchar *own_jid;
 
 	if (!jabber_is_own_account(js, from)) {
 		purple_debug_warning("jabber", "Received bogon roster push from %s\n",
@@ -197,8 +190,6 @@
 
 	js->currently_parsing_roster_push = TRUE;
 
-	own_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
-
 	for(item = xmlnode_get_child(query, "item"); item; item = xmlnode_get_next_twin(item))
 	{
 		const char *jid, *name, *subscription, *ask;
@@ -216,11 +207,7 @@
 			continue;
 
 		if(subscription) {
-			gboolean me = FALSE;
-
-			me = g_str_equal(own_jid, jabber_normalize(js->gc->account, jid));
-
-			if(me)
+			if (jb == js->user_jb)
 				jb->subscription = JABBER_SUB_BOTH;
 			else if(!strcmp(subscription, "none"))
 				jb->subscription = JABBER_SUB_NONE;
@@ -260,11 +247,12 @@
 				groups = g_slist_prepend(groups, group_name);
 			}
 
-			add_purple_buddy_to_groups(js, jid, name, groups, own_jid);
+			add_purple_buddy_to_groups(js, jid, name, groups);
+			if (jb == js->user_jb)
+				jabber_presence_fake_to_self(js, NULL);
 		}
 	}
 
-	g_free(own_jid);
 	js->currently_parsing_roster_push = FALSE;
 
 	/* if we're just now parsing the roster for the first time,
@@ -348,7 +336,6 @@
 	char *who;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
-	char *own_jid;
 	const char *name;
 
 	/* If we haven't received the roster yet, ignore any adds */
@@ -366,8 +353,7 @@
 
 	jabber_roster_update(js, who, NULL);
 
-	own_jid = g_strdup_printf("%s@%s", js->user->node, js->user->domain);
-	if (g_str_equal(who, own_jid)) {
+	if (jb == js->user_jb) {
 		jabber_presence_fake_to_self(js, NULL);
 	} else if(!jb || !(jb->subscription & JABBER_SUB_TO)) {
 		jabber_presence_subscription_set(js, who, "subscribe");
@@ -377,7 +363,6 @@
 				"priority", jbr->priority, jbr->status ? "message" : NULL, jbr->status, NULL);
 	}
 
-	g_free(own_jid);
 	g_free(who);
 }
 
--- a/libpurple/protocols/jabber/si.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/si.c	Thu Aug 13 19:56:23 2009 +0000
@@ -67,7 +67,7 @@
 
 	JabberIBBSession *ibb_session;
 	guint ibb_timeout_handle;
-	FILE *fp;
+	PurpleCircBuffer *ibb_buffer;
 } JabberSIXfer;
 
 /* some forward declarations */
@@ -1012,18 +1012,8 @@
 	if (size <= purple_xfer_get_bytes_remaining(xfer)) {
 		purple_debug_info("jabber", "about to write %" G_GSIZE_FORMAT " bytes from IBB stream\n",
 			size);
-		if(!fwrite(data, size, 1, jsx->fp)) {
-			purple_debug_error("jabber", "error writing to file\n");
-			purple_xfer_cancel_remote(xfer);
-			return;
-		}
-		purple_xfer_set_bytes_sent(xfer, purple_xfer_get_bytes_sent(xfer) + size);
-		purple_xfer_update_progress(xfer);
-
-		if (purple_xfer_get_bytes_remaining(xfer) == 0) {
-			purple_xfer_set_completed(xfer, TRUE);
-			purple_xfer_end(xfer);
-		}
+		purple_circ_buffer_append(jsx->ibb_buffer, data, size);
+		purple_xfer_prpl_ready(xfer);
 	} else {
 		/* trying to write past size of file transfers negotiated size,
 		  reject transfer to protect against malicious behaviour */
@@ -1034,6 +1024,25 @@
 
 }
 
+static gssize
+jabber_si_xfer_ibb_read(guchar **out_buffer, PurpleXfer *xfer)
+{
+	JabberSIXfer *jsx = xfer->data;
+	guchar *buffer;
+	gsize size;
+	gsize tmp;
+
+	size = jsx->ibb_buffer->bufused;
+	*out_buffer = buffer = g_malloc(size);
+	while ((tmp = purple_circ_buffer_get_max_read(jsx->ibb_buffer))) {
+		memcpy(buffer, jsx->ibb_buffer->outptr, tmp);
+		buffer += tmp;
+		purple_circ_buffer_mark_read(jsx->ibb_buffer, tmp);
+	}
+
+	return size;
+}
+
 static gboolean
 jabber_si_xfer_ibb_open_cb(JabberStream *js, const char *who, const char *id,
                            xmlnode *open)
@@ -1044,21 +1053,10 @@
 		JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 		JabberIBBSession *sess =
 			jabber_ibb_session_create_from_xmlnode(js, who, id, open, xfer);
-		const char *filename;
 
 		jabber_si_bytestreams_ibb_timeout_remove(jsx);
 
 		if (sess) {
-			/* open the file to write to */
-			filename = purple_xfer_get_local_filename(xfer);
-			jsx->fp = g_fopen(filename, "wb");
-			if (jsx->fp == NULL) {
-				purple_debug_error("jabber", "failed to open file %s for writing: %s\n",
-					filename, g_strerror(errno));
-				purple_xfer_cancel_remote(xfer);
-				return FALSE;
-			}
-
 			/* setup callbacks here...*/
 			jabber_ibb_session_set_data_received_callback(sess,
 				jabber_si_xfer_ibb_recv_data_cb);
@@ -1068,9 +1066,14 @@
 				jabber_si_xfer_ibb_error_cb);
 
 			jsx->ibb_session = sess;
+			jsx->ibb_buffer =
+				purple_circ_buffer_new(jabber_ibb_session_get_block_size(sess));
+
+			/* set up read function */
+			purple_xfer_set_read_fnc(xfer, jabber_si_xfer_ibb_read);
 
 			/* start the transfer */
-			purple_xfer_start(xfer, 0, NULL, 0);
+			purple_xfer_start(xfer, -1, NULL, 0);
 			return TRUE;
 		} else {
 			/* failed to create IBB session */
@@ -1086,32 +1089,17 @@
 	}
 }
 
-static void
-jabber_si_xfer_ibb_send_data(JabberIBBSession *sess)
+static gssize
+jabber_si_xfer_ibb_write(const guchar *buffer, size_t len, PurpleXfer *xfer)
 {
-	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
 	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
-	gsize remaining = purple_xfer_get_bytes_remaining(xfer);
-	gsize packet_size = remaining < jabber_ibb_session_get_block_size(sess) ?
-		remaining : jabber_ibb_session_get_block_size(sess);
-	gpointer data = g_malloc(packet_size);
-	int res;
+	JabberIBBSession *sess = jsx->ibb_session;
+	gsize packet_size = len < jabber_ibb_session_get_block_size(sess) ?
+		len : jabber_ibb_session_get_block_size(sess);
 
-	purple_debug_info("jabber", "IBB: about to read %" G_GSIZE_FORMAT " bytes from file %p\n",
-		packet_size, jsx->fp);
-	res = fread(data, packet_size, 1, jsx->fp);
+	jabber_ibb_session_send_data(sess, buffer, packet_size);
 
-	if (res == 1) {
-		jabber_ibb_session_send_data(sess, data, packet_size);
-		purple_xfer_set_bytes_sent(xfer,
-			purple_xfer_get_bytes_sent(xfer) + packet_size);
-		purple_xfer_update_progress(xfer);
-	} else {
-		purple_debug_error("jabber",
-			"jabber_si_xfer_ibb_send_data: error reading from file\n");
-		purple_xfer_cancel_local(xfer);
-	}
-	g_free(data);
+	return packet_size;
 }
 
 static void
@@ -1127,7 +1115,7 @@
 		purple_xfer_end(xfer);
 	} else {
 		/* send more... */
-		jabber_si_xfer_ibb_send_data(sess);
+		purple_xfer_prpl_ready(xfer);
 	}
 }
 
@@ -1135,28 +1123,13 @@
 jabber_si_xfer_ibb_opened_cb(JabberIBBSession *sess)
 {
 	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
-	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 	JabberStream *js = jabber_ibb_session_get_js(sess);
 	PurpleConnection *gc = js->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);
 
 	if (jabber_ibb_session_get_state(sess) == JABBER_IBB_SESSION_OPENED) {
-		const char *filename = purple_xfer_get_local_filename(xfer);
-		jsx->fp = g_fopen(filename, "rb");
-		if (jsx->fp == NULL) {
-			purple_debug_error("jabber", "Failed to open file %s for reading: %s\n",
-				filename, g_strerror(errno));
-			purple_xfer_error(purple_xfer_get_type(xfer), account,
-				jabber_ibb_session_get_who(sess),
-				_("Failed to open the file"));
-			purple_xfer_cancel_local(xfer);
-			return;
-		}
-
-		purple_xfer_start(xfer, 0, NULL, 0);
-		purple_xfer_set_bytes_sent(xfer, 0);
-		purple_xfer_update_progress(xfer);
-		jabber_si_xfer_ibb_send_data(sess);
+		purple_xfer_start(xfer, -1, NULL, 0);
+		purple_xfer_prpl_ready(xfer);
 	} else {
 		/* error */
 		purple_xfer_error(purple_xfer_get_type(xfer), account,
@@ -1171,8 +1144,6 @@
 {
 	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 
-	purple_xfer_ref(xfer);
-
 	jsx->ibb_session = jabber_ibb_session_create(js, jsx->stream_id,
 		purple_xfer_get_remote_user(xfer), xfer);
 
@@ -1187,6 +1158,11 @@
 		jabber_ibb_session_set_error_callback(jsx->ibb_session,
 			jabber_si_xfer_ibb_error_cb);
 
+		purple_xfer_set_write_fnc(xfer, jabber_si_xfer_ibb_write);
+
+		jsx->ibb_buffer =
+			purple_circ_buffer_new(jabber_ibb_session_get_block_size(jsx->ibb_session));
+
 		/* open the IBB session */
 		jabber_ibb_session_open(jsx->ibb_session);
 
@@ -1342,20 +1318,18 @@
 			jabber_ibb_session_destroy(jsx->ibb_session);
 		}
 
-		if (jsx->fp) {
-			purple_debug_info("jabber",
-				"jabber_si_xfer_free: closing file for IBB transfer\n");
-			fclose(jsx->fp);
+		if (jsx->ibb_buffer) {
+			purple_circ_buffer_destroy(jsx->ibb_buffer);
 		}
 
+		purple_debug_info("jabber", "jabber_si_xfer_free(): freeing jsx %p\n", jsx);
+
 		g_free(jsx->stream_id);
 		g_free(jsx->iq_id);
 		/* XXX: free other stuff */
 		g_free(jsx->rxqueue);
 		g_free(jsx);
 		xfer->data = NULL;
-
-		purple_debug_info("jabber", "jabber_si_xfer_free(): freeing jsx %p\n", jsx);
 	}
 }
 
@@ -1631,7 +1605,6 @@
 		jsx->local_streamhost_fd = -1;
 
 		jsx->ibb_session = NULL;
-		jsx->fp = NULL;
 
 		purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init);
 		purple_xfer_set_cancel_send_fnc(xfer, jabber_si_xfer_cancel_send);
--- a/libpurple/protocols/jabber/useravatar.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/jabber/useravatar.c	Thu Aug 13 19:56:23 2009 +0000
@@ -219,16 +219,18 @@
 	const char *server_hash = NULL;
 
 	if (items && (item = xmlnode_get_child(items, "item")) &&
-	     (metadata = xmlnode_get_child(item, "metadata")) &&
-	     (info = xmlnode_get_child(metadata, "info"))) {
+			(metadata = xmlnode_get_child(item, "metadata")) &&
+			(info = xmlnode_get_child(metadata, "info"))) {
 		server_hash = xmlnode_get_attrib(info, "id");
 	}
 
-	if (items && !metadata)
-		return;
-
-	/* Publish ours if it's different than the server's */
-	if (!purple_strequal(server_hash, js->initial_avatar_hash)) {
+	/*
+	 * If we have an avatar and the server returned an error/malformed data,
+	 * push our avatar. If the server avatar doesn't match the local one, push
+	 * our avatar.
+	 */
+	if (((!items || !metadata) && js->initial_avatar_hash) ||
+			!purple_strequal(server_hash, js->initial_avatar_hash)) {
 		PurpleStoredImage *img = purple_buddy_icons_find_account_icon(account);
 		jabber_avatar_set(js, img);
 		purple_imgstore_unref(img);
--- a/libpurple/protocols/msn/cmdproc.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/cmdproc.c	Thu Aug 13 19:56:23 2009 +0000
@@ -333,60 +333,38 @@
 			trans->timer = 0;
 		}
 
-	if (g_ascii_isdigit(cmd->command[0]))
+	if (g_ascii_isdigit(cmd->command[0]) && trans != NULL)
 	{
-		if (trans != NULL)
-		{
-			MsnErrorCb error_cb = NULL;
-			int error;
+		MsnErrorCb error_cb;
+		int error;
 
-			error = atoi(cmd->command);
-
-			if (trans->error_cb != NULL)
-				error_cb = trans->error_cb;
-
-			if (error_cb == NULL && cmdproc->cbs_table->errors != NULL)
-				error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command);
+		error = atoi(cmd->command);
 
-			if (error_cb != NULL)
-			{
-				error_cb(cmdproc, trans, error);
-			}
-			else
-			{
-#if 1
-				msn_error_handle(cmdproc->session, error);
-#else
-				purple_debug_warning("msn", "Unhandled error '%s'\n",
-								   cmd->command);
-#endif
-			}
+		error_cb = trans->error_cb;
+		if (error_cb == NULL)
+			error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command);
 
-			return;
-		}
+		if (error_cb != NULL)
+			error_cb(cmdproc, trans, error);
+		else
+			msn_error_handle(cmdproc->session, error);
+
+		return;
 	}
 
-	if (cmdproc->cbs_table->async != NULL)
-		cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command);
+	cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command);
 
-	if (cb == NULL && trans != NULL)
-	{
-		if (trans->callbacks != NULL)
-			cb = g_hash_table_lookup(trans->callbacks, cmd->command);
-	}
+	if (cb == NULL && trans != NULL && trans->callbacks != NULL)
+		cb = g_hash_table_lookup(trans->callbacks, cmd->command);
 
-	if (cb == NULL && cmdproc->cbs_table->fallback != NULL)
+	if (cb == NULL)
 		cb = g_hash_table_lookup(cmdproc->cbs_table->fallback, cmd->command);
 
 	if (cb != NULL)
-	{
 		cb(cmdproc, cmd);
-	}
 	else
-	{
 		purple_debug_warning("msn", "Unhandled command '%s'\n",
 						   cmd->command);
-	}
 
 	if (trans != NULL && trans->pendent_cmd != NULL)
 		msn_transaction_unqueue_cmd(trans, cmdproc);
--- a/libpurple/protocols/msn/contact.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/contact.c	Thu Aug 13 19:56:23 2009 +0000
@@ -351,14 +351,24 @@
 msn_parse_each_member(MsnSession *session, xmlnode *member, const char *node,
 	MsnListId list)
 {
-	char *passport = xmlnode_get_data(xmlnode_get_child(member, node));
-	char *type = xmlnode_get_data(xmlnode_get_child(member, "Type"));
-	char *member_id = xmlnode_get_data(xmlnode_get_child(member, "MembershipId"));
-	MsnUser *user = msn_userlist_find_add_user(session->userlist, passport, NULL);
+	char *passport;
+	char *type;
+	char *member_id;
+	MsnUser *user;
 	xmlnode *annotation;
 	guint nid = MSN_NETWORK_UNKNOWN;
 	char *invite = NULL;
 
+	passport = xmlnode_get_data(xmlnode_get_child(member, node));
+	if (!purple_email_is_valid(passport)) {
+		g_free(passport);
+		return;
+	}
+
+	type = xmlnode_get_data(xmlnode_get_child(member, "Type"));
+	member_id = xmlnode_get_data(xmlnode_get_child(member, "MembershipId"));
+	user = msn_userlist_find_add_user(session->userlist, passport, NULL);
+
 	for (annotation = xmlnode_get_child(member, "Annotations/Annotation");
 	     annotation;
 	     annotation = xmlnode_get_next_twin(annotation)) {
@@ -746,6 +756,9 @@
 		if (passport == NULL)
 			continue;
 
+		if (!purple_email_is_valid(passport))
+			continue;
+
 		if ((displayName = xmlnode_get_child(contactInfo, "displayName")))
 			Name = xmlnode_get_data(displayName);
 		else
--- a/libpurple/protocols/msn/directconn.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/directconn.c	Thu Aug 13 19:56:23 2009 +0000
@@ -247,14 +247,6 @@
 }
 
 static void
-msn_directconn_process_msg(MsnDirectConn *directconn, MsnMessage *msg)
-{
-	purple_debug_info("msn", "directconn: process_msg\n");
-
-	msn_slplink_process_msg(directconn->slplink, msg);
-}
-
-static void
 read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnDirectConn* directconn;
@@ -267,6 +259,19 @@
 	directconn = data;
 
 	/* Let's read the length of the data. */
+#error This code is broken.  See the note below.
+	/*
+	 * TODO: This has problems!  First of all, sizeof(body_len) will be
+	 *       different on 32bit systems and on 64bit systems (4 bytes
+	 *       vs. 8 bytes).
+	 *       Secondly, we're reading from a TCP stream.  There is no
+	 *       guarantee that we have received the number of bytes we're
+	 *       trying to read.  We need to read into a buffer.  If read
+	 *       returns <0 then we need to check errno.  If errno is EAGAIN
+	 *       then don't destroy anything, just exit and wait for more
+	 *       data.  See every other function in libpurple that does this
+	 *       correctly for an example.
+	 */
 	len = read(directconn->fd, &body_len, sizeof(body_len));
 
 	if (len <= 0)
@@ -337,7 +342,8 @@
 		msg = msn_message_new_msnslp();
 		msn_message_parse_slp_body(msg, body, body_len);
 
-		msn_directconn_process_msg(directconn, msg);
+		purple_debug_info("msn", "directconn: process_msg\n");
+		msn_slplink_process_msg(directconn->slplink, msg);
 	}
 	else
 	{
@@ -351,6 +357,8 @@
 
 		msn_directconn_destroy(directconn);
 	}
+
+	g_free(body);
 }
 
 static void
--- a/libpurple/protocols/msn/msg.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/msg.c	Thu Aug 13 19:56:23 2009 +0000
@@ -1102,6 +1102,7 @@
 {
 	GHashTable *body;
 	const gchar *guid;
+	gboolean accepted = FALSE;
 
 	g_return_if_fail(cmdproc != NULL);
 	g_return_if_fail(msg != NULL);
@@ -1129,6 +1130,9 @@
 		} else
 			purple_debug_warning("msn", "Invite msg missing "
 					"Application-GUID.\n");
+
+		accepted = TRUE;
+
 	} else if (!strcmp(guid, "{02D3C01F-BF30-4825-A83A-DE7AF41648AA}")) {
 		purple_debug_info("msn", "Computer call\n");
 
@@ -1154,9 +1158,35 @@
 				g_free(buf);
 			}
 		}
-	} else
-		purple_debug_warning("msn",
-				"Unhandled invite msg with GUID %s.\n", guid);
+	} else {
+		const gchar *application = g_hash_table_lookup(body, "Application-Name");
+		purple_debug_warning("msn", "Unhandled invite msg with GUID %s: %s.\n",
+		                     guid, application ? application : "(null)");
+	}
+
+	if (!accepted) {
+		const gchar *cookie = g_hash_table_lookup(body, "Invitation-Cookie");
+		if (cookie) {
+			MsnSwitchBoard *swboard = cmdproc->data;
+			char *text;
+			MsnMessage *cancel;
+
+			cancel = msn_message_new(MSN_MSG_TEXT);
+			msn_message_set_content_type(cancel, "text/x-msmsgsinvite");
+			msn_message_set_charset(cancel, "UTF-8");
+			msn_message_set_flag(cancel, 'U');
+
+			text = g_strdup_printf("Invitation-Command: CANCEL\r\n"
+			                       "Invitation-Cookie: %s\r\n"
+			                       "Cancel-Code: REJECT_NOT_INSTALLED\r\n",
+			                       cookie);
+			msn_message_set_bin_data(cancel, text, strlen(text));
+			g_free(text);
+
+			msn_switchboard_send_msg(swboard, cancel, TRUE);
+			msn_message_destroy(cancel);
+		}
+	}
 
 	g_hash_table_destroy(body);
 }
--- a/libpurple/protocols/msn/session.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/session.h	Thu Aug 13 19:56:23 2009 +0000
@@ -35,7 +35,6 @@
 #include "switchboard.h"
 #include "group.h"
 
-#include "cmdproc.h"
 #include "nexus.h"
 #include "httpconn.h"
 #include "oim.h"
--- a/libpurple/protocols/msn/slp.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/slp.c	Thu Aug 13 19:56:23 2009 +0000
@@ -244,6 +244,8 @@
 got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 			   const char *euf_guid, const char *context)
 {
+	gboolean accepted = FALSE;
+
 	if (!strcmp(euf_guid, MSN_OBJ_GUID))
 	{
 		/* Emoticon or UserDisplay */
@@ -314,7 +316,10 @@
 		msn_slpmsg_set_image(slpmsg, img);
 		msn_slplink_queue_slpmsg(slplink, slpmsg);
 		purple_imgstore_unref(img);
+
+		accepted = TRUE;
 	}
+
 	else if (!strcmp(euf_guid, MSN_FT_GUID))
 	{
 		/* File Transfer */
@@ -341,7 +346,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);
@@ -360,6 +365,9 @@
 
 			purple_xfer_request(xfer);
 		}
+
+		accepted = TRUE;
+
 	} else if (!strcmp(euf_guid, MSN_CAM_REQUEST_GUID)) {
 		purple_debug_info("msn", "Cam request.\n");
 		if (slpcall && slpcall->slplink &&
@@ -382,6 +390,7 @@
 				g_free(buf);
 			}
 		}
+
 	} else if (!strcmp(euf_guid, MSN_CAM_GUID)) {
 		purple_debug_info("msn", "Cam invite.\n");
 		if (slpcall && slpcall->slplink &&
@@ -404,8 +413,16 @@
 				g_free(buf);
 			}
 		}
+
 	} else
 		purple_debug_warning("msn", "SLP SessionReq with unknown EUF-GUID: %s\n", euf_guid);
+
+	if (!accepted) {
+		char *content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+		                                slpcall->session_id);
+		send_decline(slpcall, branch, "application/x-msnmsgr-sessionreqbody", content);
+		g_free(content);
+	}
 }
 
 void
--- a/libpurple/protocols/msn/slpcall.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/slpcall.c	Thu Aug 13 19:56:23 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/msn/slplink.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Thu Aug 13 19:56:23 2009 +0000
@@ -456,7 +456,7 @@
 	slpmsg->info = "SLP FILE";
 
 	xfer = (PurpleXfer *)slpcall->xfer;
-	purple_xfer_start(slpcall->xfer, 0, NULL, 0);
+	purple_xfer_start(slpcall->xfer, -1, NULL, 0);
 	slpmsg->fp = xfer->dest_fp;
 	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
 		slpmsg->size = st.st_size;
@@ -502,7 +502,6 @@
 		g_return_if_reached();
 	}
 
-	slpmsg = NULL;
 	data = msn_message_get_bin_data(msg, &len);
 
 	/*
@@ -537,7 +536,7 @@
 					if (xfer != NULL)
 					{
 						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	0, NULL, 0);
+						purple_xfer_start(xfer,	-1, NULL, 0);
 
 						if (xfer->data == NULL) {
 							purple_xfer_unref(xfer);
@@ -566,13 +565,12 @@
 	else
 	{
 		slpmsg = msn_slplink_message_find(slplink, msg->msnslp_header.session_id, msg->msnslp_header.id);
-	}
-
-	if (slpmsg == NULL)
-	{
-		/* Probably the transfer was canceled */
-		purple_debug_error("msn", "Couldn't find slpmsg\n");
-		return;
+		if (slpmsg == NULL)
+		{
+			/* Probably the transfer was canceled */
+			purple_debug_error("msn", "Couldn't find slpmsg\n");
+			return;
+		}
 	}
 
 	if (slpmsg->fp)
--- a/libpurple/protocols/msn/slpmsg.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/slpmsg.h	Thu Aug 13 19:56:23 2009 +0000
@@ -50,10 +50,8 @@
 	long ack_id;
 	long ack_sub_id;
 	long long ack_size;
-	long app_id;
 
 	gboolean sip; /**< A flag that states if this is a SIP slp message. */
-	int ref_count; /**< The reference count. */
 	long flags;
 
 	FILE *fp;
--- a/libpurple/protocols/msn/sync.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/sync.h	Thu Aug 13 19:56:23 2009 +0000
@@ -34,6 +34,11 @@
 {
 	MsnSession *session;
 	MsnTable *cbs_table;
+
+	/*
+	 * TODO: What is the intended purpose of old_cbs_table?  Nothing
+	 *       sets it and it is only read in two places.
+	 */
 	MsnTable *old_cbs_table;
 
 	int num_users;
--- a/libpurple/protocols/msn/userlist.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msn/userlist.h	Thu Aug 13 19:56:23 2009 +0000
@@ -26,7 +26,6 @@
 
 typedef struct _MsnUserList MsnUserList;
 
-#include "cmdproc.h"
 #include "user.h"
 #include "group.h"
 
--- a/libpurple/protocols/msnp9/directconn.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msnp9/directconn.c	Thu Aug 13 19:56:23 2009 +0000
@@ -355,6 +355,8 @@
 
 		msn_directconn_destroy(directconn);
 	}
+
+	g_free(body);
 }
 
 static void
--- a/libpurple/protocols/msnp9/slplink.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/msnp9/slplink.c	Thu Aug 13 19:56:23 2009 +0000
@@ -496,7 +496,7 @@
 	slpmsg->info = "SLP FILE";
 #endif
 	xfer = (PurpleXfer *)slpcall->xfer;
-	purple_xfer_start(slpcall->xfer, 0, NULL, 0);
+	purple_xfer_start(slpcall->xfer, -1, NULL, 0);
 	slpmsg->fp = xfer->dest_fp;
 	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
 		slpmsg->size = st.st_size;
@@ -561,7 +561,7 @@
 					if (xfer != NULL)
 					{
 						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	0, NULL, 0);
+						purple_xfer_start(xfer,	-1, NULL, 0);
 
 						if (xfer->data == NULL) {
 							purple_xfer_unref(xfer);
--- a/libpurple/protocols/myspace/myspace.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Thu Aug 13 19:56:23 2009 +0000
@@ -1341,6 +1341,27 @@
 	return ret;
 }
 #endif
+/**
+ * Process incoming status mood messages.
+ *
+ * @param session
+ * @param msg Status mood update message. Caller frees.
+ *
+ * @return TRUE if successful.
+ */
+static gboolean
+msim_incoming_status_mood(MsimSession *session, MsimMessage *msg) {
+	/* TODO: I dont know too much about this yet,
+	 * so until I see how the official client handles
+	 * this and decide if libpurple should as well,
+	 * well just say we used it
+	 */
+	gchar *ss;
+	ss = msim_msg_get_string(msg, "msg");
+	purple_debug_info("msim", "Incoming Status Message: %s", ss ? ss : "(NULL)");
+	g_free(ss);
+	return TRUE;
+}
 
 /**
  * Process incoming status messages.
@@ -1692,11 +1713,19 @@
 			return msim_incoming_media(session, msg);
 		case MSIM_BM_UNOFFICIAL_CLIENT:
 			return msim_incoming_unofficial_client(session, msg);
+		case MSIM_BM_STATUS_MOOD:
+			return msim_incoming_status_mood(session, msg);
 		default:
-			/* Not really an IM, but show it for informational
-			 * purposes during development. */
-			/* TODO: This is probably wrong */
-			return msim_incoming_action_or_im(session, msg);
+			/*
+			 * Unknown message type!  We used to call
+			 *   msim_incoming_action_or_im(session, msg);
+			 * for these, but that doesn't help anything, and it means
+			 * we'll show broken gibberish if MySpace starts sending us
+			 * other message types.
+			 */
+			purple_debug_warning("myspace", "Received unknown imcoming "
+					"message, bm=%u\n", bm);
+			return TRUE;
 	}
 }
 
--- a/libpurple/protocols/myspace/myspace.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Thu Aug 13 19:56:23 2009 +0000
@@ -132,6 +132,7 @@
 #define MSIM_BM_ACTION_OR_IM_INSTANT    121
 #define MSIM_BM_MEDIA                   122
 #define MSIM_BM_PROFILE                 124
+#define MSIM_BM_STATUS_MOOD             126
 #define MSIM_BM_UNOFFICIAL_CLIENT       200
 
 /* Authentication algorithm for login2 */
--- a/libpurple/protocols/oscar/family_icq.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/oscar/family_icq.c	Thu Aug 13 19:56:23 2009 +0000
@@ -735,14 +735,6 @@
 
 				info = g_new0(struct aim_icq_info, 1);
 
-				if (info == NULL)
-				{
-					g_free(uin);
-					g_free(status_note_title);
-
-					break;
-				}
-
 				bslen = 13 + strlen(uin) + 30 + 6 + 4 + 55 + 85 + 4;
 				byte_stream_new(&bs, 4 + bslen);
 
--- a/libpurple/protocols/yahoo/libymsg.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Thu Aug 13 19:56:23 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);
 }
 
@@ -970,7 +971,7 @@
 
 	/* disconnect the peer if connected through p2p and sends wrong value for session id */
 	if( (pkt_type == YAHOO_PKT_TYPE_P2P) && (val_11 != yd->session_id) ) {
-		purple_debug_warning("yahoo","p2p: %s sent us message with wrong session id. Disconnecting p2p connection to peer\n", im->from);
+		purple_debug_warning("yahoo","p2p: %s sent us message with wrong session id. Disconnecting p2p connection to peer\n", im ? im->from : "(im was null)");
 		/* remove from p2p connection lists, also calls yahoo_p2p_disconnect_destroy_data */
 		g_hash_table_remove(yd->peers, im->from);
 		return;
@@ -1830,6 +1831,7 @@
 			g_free(error_reason);
 			g_free(auth_data->seed);
 			g_free(auth_data);
+			g_free(token);
 		}
 		else {
 			/* OK to login, correct information provided */
@@ -2082,6 +2084,12 @@
 		msg = g_strdup(_("Your account is locked, please log in to the Yahoo! website."));
 		reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED;
 		break;
+	case 52:
+		/* See #9660. As much as we know, reconnecting shouldn't hurt */
+		purple_debug_info("yahoo", "Got error 52, Set to autoreconnect\n");
+		msg = g_strdup_printf(_("Unknown error"));
+		reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
+		break;
 	case 1013:
 		msg = g_strdup(_("Invalid username"));
 		reason = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
@@ -2578,8 +2586,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	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/yahoo/util.c	Thu Aug 13 19:56:23 2009 +0000
@@ -184,113 +184,168 @@
 }
 
 /*
+ * 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 */
-	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 */
+#ifdef USE_CSS_FORMATTING
+	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(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 */
 
-	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\">");
+#ifdef USE_CSS_FORMATTING
+	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(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\">");
 
-	/* remove these once we have proper support for <FADE> and <ALT> */
-	g_hash_table_insert(ht, "</fade>", "");
-	g_hash_table_insert(ht, "</alt>", "");
+	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 */
 
-	/* 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>");
+	/* 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", "");
 
-	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>");
+	/* 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(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
 static int point_to_html(int x)
 {
 	if (x < 9)
@@ -307,47 +362,163 @@
 		return 6;
 	return 7;
 }
+#endif /* !USE_CSS_FORMATTING */
 
-/* The Yahoo size tag is actually an absz tag; convert it to an HTML size, and include both tags */
-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) {
-			int htmlsize;
+/**
+ * @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;
 
-			size = strtol(x, &end, 10);
-			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);
-		} 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
@@ -355,86 +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] == '#')
-						g_string_append_printf(s, "<span style=\"color: %s\">", tmp);
-					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;
-					}
+
+				/* 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);
+				}
 
-					i = j;
+				code = g_strndup(x + i + 2, j - i - 2);
+				if (code[0] == '#') {
+#ifdef USE_CSS_FORMATTING
+					gchar *tmp = g_strdup_printf("color: %s", code);
+					cur = xmlnode_new_child(cur, "span");
+					xmlnode_set_attrib(cur, "style", tmp);
 					g_free(tmp);
-					break;
+#else
+					cur = xmlnode_new_child(cur, "font");
+					xmlnode_set_attrib(cur, "color", code);
+#endif /* !USE_CSS_FORMATTING */
+
+				} 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);
+
+				} 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 */
@@ -442,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;
@@ -455,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;
 
@@ -501,7 +731,7 @@
 
 				if (src[n] == '"') {
 					if (!quote) {
-						quote = 1;
+						quote = TRUE;
 						vstart = n;
 						continue;
 					} else {
@@ -510,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();
@@ -528,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();
@@ -539,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();
@@ -550,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();
@@ -567,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);
@@ -624,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);
 				}
 			}
@@ -636,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;
@@ -649,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) {
@@ -700,6 +924,8 @@
 					} else if (!g_ascii_strncasecmp(&src[i+1], "A HREF=\"", j - i - 1)) {
 						j += 7;
 						g_string_append(dest, "\033[lm");
+						if (purple_str_has_prefix(src + j, "mailto:"))
+							j += sizeof("mailto:") - 1;
 						while (1) {
 							g_string_append_c(dest, src[j]);
 							if (++j >= src_len) {
@@ -748,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;
@@ -782,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);
 							}
@@ -809,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]);
-			}
 		}
 	}
 
@@ -834,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/protocols/yahoo/yahoo_filexfer.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c	Thu Aug 13 19:56:23 2009 +0000
@@ -884,46 +884,48 @@
 
 	/* Build the file transfer handle. */
 	xfer = purple_xfer_new(gc->account, PURPLE_XFER_RECEIVE, from);
-	if (xfer)
-	{
-		xfer->data = xfer_data;
+	if (xfer == NULL) {
+		g_free(xfer_data);
+		g_return_if_reached();
+	}
+
+	xfer->data = xfer_data;
 
-		/* Set the info about the incoming file. */
-		if (filename) {
-			char *utf8_filename = yahoo_string_decode(gc, filename, TRUE);
+	/* Set the info about the incoming file. */
+	if (filename) {
+		char *utf8_filename = yahoo_string_decode(gc, filename, TRUE);
+		purple_xfer_set_filename(xfer, utf8_filename);
+		g_free(utf8_filename);
+	} else {
+		gchar *start, *end;
+		start = g_strrstr(xfer_data->path, "/");
+		if (start)
+			start++;
+		end = g_strrstr(xfer_data->path, "?");
+		if (start && *start && end) {
+			char *utf8_filename;
+			filename = g_strndup(start, end - start);
+			utf8_filename = yahoo_string_decode(gc, filename, TRUE);
+			g_free(filename);
 			purple_xfer_set_filename(xfer, utf8_filename);
 			g_free(utf8_filename);
-		} else {
-			gchar *start, *end;
-			start = g_strrstr(xfer_data->path, "/");
-			if (start)
-				start++;
-			end = g_strrstr(xfer_data->path, "?");
-			if (start && *start && end) {
-				char *utf8_filename;
-				filename = g_strndup(start, end - start);
-				utf8_filename = yahoo_string_decode(gc, filename, TRUE);
-				g_free(filename);
-				purple_xfer_set_filename(xfer, utf8_filename);
-				g_free(utf8_filename);
-				filename = NULL;
-			}
+			filename = NULL;
 		}
+	}
 
-		purple_xfer_set_size(xfer, filesize);
+	purple_xfer_set_size(xfer, filesize);
 
-		/* Setup our I/O op functions */
-		purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init);
-		purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
-		purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
-		purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
-		purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
-		purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
-		purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
+	/* Setup our I/O op functions */
+	purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init);
+	purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
+	purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
+	purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
+	purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
+	purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
+	purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
 
-		/* Now perform the request */
-		purple_xfer_request(xfer);
-	}
+	/* Now perform the request */
+	purple_xfer_request(xfer);
 }
 
 PurpleXfer *yahoo_new_xfer(PurpleConnection *gc, const char *who)
@@ -938,19 +940,22 @@
 
 	/* Build the file transfer handle. */
 	xfer = purple_xfer_new(gc->account, PURPLE_XFER_SEND, who);
-	if (xfer)
+	if (xfer == NULL)
 	{
-		xfer->data = xfer_data;
+		g_free(xfer_data);
+		g_return_val_if_reached(NULL);
+	}
+
+	xfer->data = xfer_data;
 
-		/* Setup our I/O op functions */
-		purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init);
-		purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
-		purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
-		purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
-		purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
-		purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
-		purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
-	}
+	/* Setup our I/O op functions */
+	purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init);
+	purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
+	purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
+	purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
+	purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
+	purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
+	purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
 
 	return xfer;
 }
@@ -1588,6 +1593,7 @@
 	char *service = NULL;
 	char *filename = NULL;
 	char *xfer_peer_idstring = NULL;
+	char *utf8_filename;
 	unsigned long filesize = 0L;
 	GSList *l;
 	GSList *filename_list = NULL;
@@ -1714,42 +1720,44 @@
 
 	/* Build the file transfer handle. */
 	xfer = purple_xfer_new(gc->account, PURPLE_XFER_RECEIVE, from);
+	if (xfer == NULL)
+	{
+		g_free(xfer_data);
+		g_return_if_reached();
+	}
+
 	xfer->message = NULL;
 
-	if (xfer)
-	{
-		/* Set the info about the incoming file. */
-		char *utf8_filename = yahoo_string_decode(gc, filename, TRUE);
-		purple_xfer_set_filename(xfer, utf8_filename);
-		g_free(utf8_filename);
-		purple_xfer_set_size(xfer, filesize);
+	/* Set the info about the incoming file. */
+	utf8_filename = yahoo_string_decode(gc, filename, TRUE);
+	purple_xfer_set_filename(xfer, utf8_filename);
+	g_free(utf8_filename);
+	purple_xfer_set_size(xfer, filesize);
 
-		xfer->data = xfer_data;
-
+	xfer->data = xfer_data;
 
-		/* Setup our I/O op functions */
-		purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init_15);
-		purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
-		purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
-		purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
-		purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
-		purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
-		purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
-		purple_xfer_set_request_denied_fnc(xfer,yahoo_xfer_cancel_recv);
+	/* Setup our I/O op functions */
+	purple_xfer_set_init_fnc(xfer,        yahoo_xfer_init_15);
+	purple_xfer_set_start_fnc(xfer,       yahoo_xfer_start);
+	purple_xfer_set_end_fnc(xfer,         yahoo_xfer_end);
+	purple_xfer_set_cancel_send_fnc(xfer, yahoo_xfer_cancel_send);
+	purple_xfer_set_cancel_recv_fnc(xfer, yahoo_xfer_cancel_recv);
+	purple_xfer_set_read_fnc(xfer,        yahoo_xfer_read);
+	purple_xfer_set_write_fnc(xfer,       yahoo_xfer_write);
+	purple_xfer_set_request_denied_fnc(xfer,yahoo_xfer_cancel_recv);
 
-		g_hash_table_insert(yd->xfer_peer_idstring_map,
-							xfer_data->xfer_peer_idstring,
-							xfer);
+	g_hash_table_insert(yd->xfer_peer_idstring_map,
+						xfer_data->xfer_peer_idstring,
+						xfer);
 
-		if(nooffiles > 1) {
-			gchar* message;
-			message = g_strdup_printf(_("%s is trying to send you a group of %d files.\n"), xfer->who, nooffiles);
-			purple_xfer_conversation_write(xfer, message, FALSE);
-			g_free(message);
-		}
-		/* Now perform the request */
-		purple_xfer_request(xfer);
+	if(nooffiles > 1) {
+		gchar* message;
+		message = g_strdup_printf(_("%s is trying to send you a group of %d files.\n"), xfer->who, nooffiles);
+		purple_xfer_conversation_write(xfer, message, FALSE);
+		g_free(message);
 	}
+	/* Now perform the request */
+	purple_xfer_request(xfer);
 }
 
 void yahoo_process_filetrans_info_15(PurpleConnection *gc, struct yahoo_packet *pkt)
--- a/libpurple/protocols/yahoo/yahoo_packet.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/yahoo/yahoo_packet.c	Thu Aug 13 19:56:23 2009 +0000
@@ -397,7 +397,7 @@
 		struct yahoo_pair *pair = pkt->hash->data;
 		g_free(pair->value);
 		g_free(pair);
-		pkt->hash = g_slist_remove(pkt->hash, pair);
+		pkt->hash = g_slist_delete_link(pkt->hash, pkt->hash);
 	}
 	g_free(pkt);
 }
--- a/libpurple/protocols/zephyr/internal.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/protocols/zephyr/internal.h	Thu Aug 13 19:56:23 2009 +0000
@@ -23,6 +23,12 @@
 
 #define ETIMEDOUT WSAETIMEDOUT
 #define EADDRINUSE WSAEADDRINUSE
+#else /* !WIN32 */
+
+#ifndef MAXHOSTNAMELEN
+#define MAXHOSTNAMELEN 4096
+#endif
+
 #endif
 
 #ifdef ZEPHYR_USES_HESIOD
--- a/libpurple/proxy.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/proxy.c	Thu Aug 13 19:56:23 2009 +0000
@@ -2531,4 +2531,9 @@
 		purple_proxy_connect_data_disconnect(handles->data, NULL);
 		purple_proxy_connect_data_destroy(handles->data);
 	}
+
+	purple_prefs_disconnect_by_handle(purple_proxy_get_handle());
+
+	purple_proxy_info_destroy(global_proxy_info);
+	global_proxy_info = NULL;
 }
--- a/libpurple/purple.h.in	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/purple.h.in	Thu Aug 13 19:56:23 2009 +0000
@@ -65,11 +65,13 @@
 #include <idle.h>
 #include <imgstore.h>
 #include <log.h>
+#include <media.h>
+#include <mediamanager.h>
 #include <mime.h>
 #include <nat-pmp.h>
 #include <network.h>
+#include <notify.h>
 #include <ntlm.h>
-#include <notify.h>
 #include <plugin.h>
 #include <pluginpref.h>
 #include <pounce.h>
@@ -82,16 +84,22 @@
 #include <savedstatuses.h>
 #include <server.h>
 #include <signals.h>
+#include <smiley.h>
+#include <sound.h>
+#include <sound-theme.h>
+#include <sound-theme-loader.h>
+#include <sslconn.h>
 #include <status.h>
 #include <stringref.h>
 #include <stun.h>
-#include <sound.h>
-#include <sslconn.h>
+#include <theme.h>
+#include <theme-loader.h>
+#include <theme-manager.h>
 #include <upnp.h>
 #include <util.h>
 #include <value.h>
 #include <version.h>
+#include <whiteboard.h>
 #include <xmlnode.h>
-#include <whiteboard.h>
 
 #endif
--- a/libpurple/savedstatuses.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/savedstatuses.c	Thu Aug 13 19:56:23 2009 +0000
@@ -1235,6 +1235,8 @@
 void
 purple_savedstatuses_uninit(void)
 {
+	gpointer handle = purple_savedstatuses_get_handle();
+
 	remove_old_transient_statuses();
 
 	if (save_timer != 0)
@@ -1253,6 +1255,7 @@
 	g_hash_table_destroy(creation_times);
 	creation_times = NULL;
 
-	purple_signals_unregister_by_instance(purple_savedstatuses_get_handle());
+	purple_signals_unregister_by_instance(handle);
+	purple_signals_disconnect_by_handle(handle);
 }
 
--- a/libpurple/signals.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/signals.c	Thu Aug 13 19:56:23 2009 +0000
@@ -363,8 +363,8 @@
 		{
 			g_free(handler_data);
 
-			signal_data->handlers = g_list_remove(signal_data->handlers,
-												  handler_data);
+			signal_data->handlers = g_list_delete_link(signal_data->handlers,
+												       l);
 			signal_data->handler_count--;
 
 			found = TRUE;
@@ -398,8 +398,8 @@
 			g_free(handler_data);
 
 			signal_data->handler_count--;
-			signal_data->handlers = g_list_remove(signal_data->handlers,
-												  handler_data);
+			signal_data->handlers = g_list_delete_link(signal_data->handlers,
+			                                           l);
 		}
 	}
 }
--- a/libpurple/status.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/status.c	Thu Aug 13 19:56:23 2009 +0000
@@ -1660,7 +1660,7 @@
 void
 purple_status_init(void)
 {
-	void *handle = purple_status_get_handle;
+	void *handle = purple_status_get_handle();
 
 	purple_prefs_add_none("/purple/status");
 	purple_prefs_add_none("/purple/status/scores");
@@ -1714,4 +1714,5 @@
 void
 purple_status_uninit(void)
 {
+	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
 }
--- a/libpurple/tests/test_yahoo_util.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/tests/test_yahoo_util.c	Thu Aug 13 19:56:23 2009 +0000
@@ -15,27 +15,84 @@
 
 START_TEST(test_codes_to_html)
 {
-	assert_string_equal_free("plain", yahoo_codes_to_html("plain"));
+	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</span>",
+			yahoo_codes_to_html("\x1B[31mblue"));
+	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 color and size */
-	assert_string_equal_free("<span style=\"color: #0000FF\">blue",
+	/* font size */
+	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("<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</font>",
 			yahoo_codes_to_html("\x1B[31mblue"));
-	assert_string_equal_free("<span style=\"color: #70ea15\">test",
-			yahoo_codes_to_html("\x1B[#70ea15mtest"));
-	assert_string_equal_free("<font size=\"4\" absz=\"15\">test",
-			yahoo_codes_to_html("<font size=\"15\">test"));
-	assert_string_equal_free("<span style=\"color: #FF0080\"><font size=\"4\" absz=\"15\">test",
-			yahoo_codes_to_html("\x1B[35m<font size=\"15\">test"));
+	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</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 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/util.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/util.c	Thu Aug 13 19:56:23 2009 +0000
@@ -3519,6 +3519,7 @@
 void purple_got_protocol_handler_uri(const char *uri)
 {
 	char proto[11];
+	char delimiter;
 	const char *tmp, *param_string;
 	char *cmd;
 	GHashTable *params = NULL;
@@ -3534,7 +3535,13 @@
 	proto[len] = '\0';
 
 	tmp++;
-	purple_debug_info("util", "Processing message '%s' for protocol '%s'.\n", tmp, proto);
+
+	if (g_str_equal(proto, "xmpp"))
+		delimiter = ';';
+	else
+		delimiter = '&';
+
+	purple_debug_info("util", "Processing message '%s' for protocol '%s' using delimiter '%c'.\n", tmp, proto, delimiter);
 
 	if ((param_string = strchr(tmp, '?'))) {
 		const char *keyend = NULL, *pairstart;
@@ -3547,7 +3554,7 @@
 		pairstart = tmp = param_string;
 
 		while (*tmp || *pairstart) {
-			if (*tmp == '&' || !(*tmp)) {
+			if (*tmp == delimiter || !(*tmp)) {
 				/* If there is no explicit value */
 				if (keyend == NULL)
 					keyend = tmp;
--- a/libpurple/xmlnode.h	Wed Aug 12 02:24:41 2009 +0000
+++ b/libpurple/xmlnode.h	Thu Aug 13 19:56:23 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.spec.in	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin.spec.in	Thu Aug 13 19:56:23 2009 +0000
@@ -251,6 +251,7 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';'
--- a/pidgin/gtkblist.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/gtkblist.c	Thu Aug 13 19:56:23 2009 +0000
@@ -3560,7 +3560,7 @@
 			}
 
 			g_free(pce);
-			cur = g_list_remove(cur, pce);
+			cur = g_list_delete_link(cur, cur);
 		}
 	}
 	else if (PURPLE_BLIST_NODE_IS_CONTACT(node) || PURPLE_BLIST_NODE_IS_BUDDY(node))
--- a/pidgin/gtkconv.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/gtkconv.c	Thu Aug 13 19:56:23 2009 +0000
@@ -3284,6 +3284,62 @@
 }
 
 static void
+regenerate_media_items(PidginWindow *win)
+{
+#ifdef USE_VV
+	PurpleAccount *account;
+	PurpleConversation *conv;
+
+	conv = pidgin_conv_window_get_active_conversation(win);
+
+	if (conv == NULL) {
+		purple_debug_error("gtkconv", "couldn't get active conversation"
+				" when regenerating media items\n");
+		return;
+	}
+
+	account = purple_conversation_get_account(conv);
+
+	if (account == NULL) {
+		purple_debug_error("gtkconv", "couldn't get account when"
+				" regenerating media items\n");
+		return;
+	}
+
+	/*
+	 * Check if account support voice and/or calls, and
+	 * if the current buddy	supports it.
+	 */
+	if (account != NULL && purple_conversation_get_type(conv)
+			== PURPLE_CONV_TYPE_IM) {
+		PurpleMediaCaps caps =
+				purple_prpl_get_media_caps(account,
+				purple_conversation_get_name(conv));
+
+		gtk_widget_set_sensitive(win->audio_call,
+				caps & PURPLE_MEDIA_CAPS_AUDIO
+				? TRUE : FALSE);
+		gtk_widget_set_sensitive(win->video_call,
+				caps & PURPLE_MEDIA_CAPS_VIDEO
+				? TRUE : FALSE);
+		gtk_widget_set_sensitive(win->audio_video_call, 
+				caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO
+				? TRUE : FALSE);
+	} else if (purple_conversation_get_type(conv)
+			== PURPLE_CONV_TYPE_CHAT) {
+		/* for now, don't care about chats... */
+		gtk_widget_set_sensitive(win->audio_call, FALSE);
+		gtk_widget_set_sensitive(win->video_call, FALSE);
+		gtk_widget_set_sensitive(win->audio_video_call, FALSE);
+	} else {
+		gtk_widget_set_sensitive(win->audio_call, FALSE);
+		gtk_widget_set_sensitive(win->video_call, FALSE);
+		gtk_widget_set_sensitive(win->audio_video_call, FALSE);
+	}							
+#endif
+}
+
+static void
 regenerate_options_items(PidginWindow *win)
 {
 	GtkWidget *menu;
@@ -3368,6 +3424,7 @@
 static void menubar_activated(GtkWidget *item, gpointer data)
 {
 	PidginWindow *win = data;
+	regenerate_media_items(win);
 	regenerate_options_items(win);
 	regenerate_plugins_items(win);
 
@@ -4216,7 +4273,11 @@
 		return;
 	}
 
-	gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), current_topic);
+	if (current_topic)
+		gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), current_topic);
+	else
+		gtk_entry_set_text(GTK_ENTRY(gtkchat->topic_text), "");
+
 	prpl_info->set_chat_topic(gc, purple_conv_chat_get_id(PURPLE_CONV_CHAT(conv)),
 			new_topic);
 
@@ -5248,6 +5309,7 @@
 {
 	PurpleConversationUiOps *ui_ops = pidgin_conversations_get_conv_ui_ops();
 	gboolean hide = FALSE;
+	guint timer;
 
 	/* create hidden conv if hide_new pref is always */
 	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0)
@@ -5271,6 +5333,13 @@
 		purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
 		ui_ops->create_conversation = pidgin_conv_new;
 	}
+
+	/* Somebody wants to keep this conversation around, so don't time it out */
+	timer = GPOINTER_TO_INT(purple_conversation_get_data(conv, "close-timer"));
+	if (timer) {
+		purple_timeout_remove(timer);
+		purple_conversation_set_data(conv, "close-timer", GINT_TO_POINTER(0));
+	}
 }
 
 static void
@@ -6121,36 +6190,6 @@
 			buttons |= GTK_IMHTML_CUSTOM_SMILEY;
 		else
 			buttons &= ~GTK_IMHTML_CUSTOM_SMILEY;
-
-#ifdef USE_VV
-		/* check if account support voice calls, and if the current buddy
-			supports it */
-		if (account != NULL && purple_conversation_get_type(conv)
-					== PURPLE_CONV_TYPE_IM) {
-			PurpleMediaCaps caps =
-					purple_prpl_get_media_caps(account,
-					purple_conversation_get_name(conv));
-
-			gtk_widget_set_sensitive(win->audio_call,
-					caps & PURPLE_MEDIA_CAPS_AUDIO
-					? TRUE : FALSE);
-			gtk_widget_set_sensitive(win->video_call,
-					caps & PURPLE_MEDIA_CAPS_VIDEO
-					? TRUE : FALSE);
-			gtk_widget_set_sensitive(win->audio_video_call, 
-					caps & PURPLE_MEDIA_CAPS_AUDIO_VIDEO
-					? TRUE : FALSE);
-		} else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
-			/* for now, don't care about chats... */
-			gtk_widget_set_sensitive(win->audio_call, FALSE);
-			gtk_widget_set_sensitive(win->video_call, FALSE);
-			gtk_widget_set_sensitive(win->audio_video_call, FALSE);
-		} else {
-			gtk_widget_set_sensitive(win->audio_call, FALSE);
-			gtk_widget_set_sensitive(win->video_call, FALSE);
-			gtk_widget_set_sensitive(win->audio_video_call, FALSE);
-		}							
-#endif
 		
 		gtk_imhtml_set_format_functions(GTK_IMHTML(gtkconv->entry), buttons);
 		if (account != NULL)
--- a/pidgin/gtkdialogs.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/gtkdialogs.c	Thu Aug 13 19:56:23 2009 +0000
@@ -171,8 +171,9 @@
 	{N_("Esperanto"),           "eo", "Stéphane Fillod", "fillods@users.sourceforge.net"},
 	{N_("Spanish"),             "es", "Javier Fernández-Sanguino Peña", "jfs@debian.org"},
 	{N_("Estonian"),            "et", "Ivar Smolin", "okul@linux.ee"},
+	{N_("Euskera(Basque)"),     "eu", "Mikel Pascual Aldabaldetreku", "mikel.paskual@gmail.com"},
+	{N_("Euskera(Basque)"),     "eu", "Iñaki Larrañaga Murgoitio", "dooteo@zundan.com"},
 	{N_("Euskera(Basque)"),     "eu", "Hizkuntza Politikarako Sailburuordetza", "hizkpol@ej-gv.es"},
-	{N_("Euskera(Basque)"),     "eu", "Iñaki Larrañaga Murgoitio", "dooteo@zundan.com"},
 	{N_("Persian"),             "fa", "Elnaz Sarbar", "elnaz@farsiweb.info"},
 	{N_("Persian"),             "fa", "Meelad Zakaria", "meelad@farsiweb.info"},
 	{N_("Persian"),             "fa", "Roozbeh Pournader ", "roozbeh@farsiweb.info"},
@@ -214,6 +215,7 @@
 	{N_("Portuguese-Brazil"),   "pt_BR", "Rodrigo Luiz Marques Flores", "rodrigomarquesflores@gmail.com"},
 	{N_("Pashto"),              "ps", "Kashif Masood", "masudmails@yahoo.com"},
 	{N_("Romanian"),            "ro", "Mişu Moldovan", "dumol@gnome.ro"},
+	{N_("Romanian"),            "ro", "Andrei Popescu", "andreimpopescu@gmail.com"},
 	{N_("Russian"),             "ru", "Антон Самохвалов", "samant.ua@mail.ru"},
 	{N_("Slovak"),              "sk", "Jozef Káčer", "quickparser@gmail.com"},
 	{N_("Slovak"),              "sk", "loptosko", "loptosko@gmail.com"},
--- a/pidgin/gtkimhtml.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/gtkimhtml.c	Thu Aug 13 19:56:23 2009 +0000
@@ -2953,7 +2953,7 @@
 							font->size = oldfont->size;
 						else
 							font->size = 3;
-						if ((imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK)))
+						if ((imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK)) && (font->size != 3 || (oldfont && oldfont->size == 3)))
 							gtk_imhtml_font_set_size(imhtml, font->size);
 						g_free(size);
 						fonts = g_slist_prepend (fonts, font);
@@ -5838,9 +5838,9 @@
 		if (activate) {
 			return FALSE;
 		}
+		klass->protocols = g_list_remove(klass->protocols, proto);
 		g_free(proto->name);
 		g_free(proto);
-		klass->protocols = g_list_remove(klass->protocols, proto);
 		return TRUE;
 	} else if (!activate) {
 		return FALSE;
--- a/pidgin/gtkmedia.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/gtkmedia.c	Thu Aug 13 19:56:23 2009 +0000
@@ -82,14 +82,14 @@
 {
 	PurpleMedia *media;
 	gchar *screenname;
-	GstElement *send_level;
-	GstElement *recv_level;
+	gulong level_handler_id;
 
 	GtkItemFactory *item_factory;
 	GtkWidget *menubar;
 	GtkWidget *statusbar;
 
 	GtkWidget *mute;
+	GtkWidget *pause;
 
 	GtkWidget *send_progress;
 	GtkWidget *recv_progress;
@@ -99,6 +99,7 @@
 	GtkWidget *display;
 	GtkWidget *send_widget;
 	GtkWidget *recv_widget;
+	GtkWidget *button_widget;
 	GtkWidget *local_video;
 	GtkWidget *remote_video;
 
@@ -129,9 +130,7 @@
 enum {
 	PROP_0,
 	PROP_MEDIA,
-	PROP_SCREENNAME,
-	PROP_SEND_LEVEL,
-	PROP_RECV_LEVEL
+	PROP_SCREENNAME
 };
 
 static GType
@@ -182,18 +181,6 @@
 			"The screenname of the user this session is with.",
 			NULL,
 			G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE));
-	g_object_class_install_property(gobject_class, PROP_SEND_LEVEL,
-			g_param_spec_object("send-level",
-			"Send level",
-			"The GstElement of this media's send 'level'",
-			GST_TYPE_ELEMENT,
-			G_PARAM_READWRITE));
-	g_object_class_install_property(gobject_class, PROP_RECV_LEVEL,
-			g_param_spec_object("recv-level",
-			"Receive level",
-			"The GstElement of this media's recv 'level'",
-			GST_TYPE_ELEMENT,
-			G_PARAM_READWRITE));
 
 	g_type_class_add_private(klass, sizeof(PidginMediaPrivate));
 }
@@ -207,6 +194,15 @@
 			NULL, NULL, TRUE);
 }
 
+static void
+pidgin_media_pause_toggled(GtkToggleButton *toggle, PidginMedia *media)
+{
+	purple_media_stream_info(media->priv->media,
+			gtk_toggle_button_get_active(toggle) ?
+			PURPLE_MEDIA_INFO_PAUSE : PURPLE_MEDIA_INFO_UNPAUSE,
+			NULL, NULL, TRUE);
+}
+
 static gboolean
 pidgin_media_delete_event_cb(GtkWidget *widget,
 		GdkEvent *event, PidginMedia *media)
@@ -338,45 +334,16 @@
 			G_CALLBACK(pidgin_media_delete_event_cb), media);
 }
 
-static gboolean
-level_message_cb(GstBus *bus, GstMessage *message, PidginMedia *gtkmedia)
+static void
+level_message_cb(PurpleMedia *media, gchar *session_id, gchar *participant,
+		double level, PidginMedia *gtkmedia)
 {
-	gdouble rms_db;
-	gdouble percent;
-	const GValue *list;
-	const GValue *value;
-
-	GstElement *src = GST_ELEMENT(GST_MESSAGE_SRC(message));
 	GtkWidget *progress;
-
-	if (message->type != GST_MESSAGE_ELEMENT)
-		return TRUE;
-
-	if (!gst_structure_has_name(
-			gst_message_get_structure(message), "level"))
-		return TRUE;
-
-	if (src == gtkmedia->priv->send_level)
+	if (participant == NULL)
 		progress = gtkmedia->priv->send_progress;
-	else if (src == gtkmedia->priv->recv_level)
+	else
 		progress = gtkmedia->priv->recv_progress;
-	else
-		return TRUE;
-
-	list = gst_structure_get_value(
-			gst_message_get_structure(message), "rms");
-
-	/* Only bother with the first channel. */
-	value = gst_value_list_get_value(list, 0);
-	rms_db = g_value_get_double(value);
-
-	percent = pow(10, rms_db / 20) * 5;
-
-	if(percent > 1.0)
-		percent = 1.0;
-
-	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress), percent);
-	return TRUE;
+	gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR(progress), level);
 }
 
 
@@ -412,16 +379,6 @@
 		gtkmedia->priv->item_factory = NULL;
 	}
 
-	if (gtkmedia->priv->send_level) {
-		gst_object_unref(gtkmedia->priv->send_level);
-		gtkmedia->priv->send_level = NULL;
-	}
-
-	if (gtkmedia->priv->recv_level) {
-		gst_object_unref(gtkmedia->priv->recv_level);
-		gtkmedia->priv->recv_level = NULL;
-	}
-
 	G_OBJECT_CLASS(parent_class)->dispose(media);
 }
 
@@ -501,17 +458,6 @@
 }
 
 static void
-pidgin_media_accepted_cb(PurpleMedia *media, const gchar *session_id,
-		const gchar *participant, PidginMedia *gtkmedia)
-{
-	pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED);
-	pidgin_media_emit_message(gtkmedia, _("Call in progress."));
-	gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
-			0, _("Call in progress."));
-	gtk_widget_show(GTK_WIDGET(gtkmedia));
-}
-
-static void
 pidgin_media_accept_cb(PurpleMedia *media, int index)
 {
 	purple_media_stream_info(media, PURPLE_MEDIA_INFO_ACCEPT,
@@ -554,7 +500,7 @@
 
 	gtkmedia->priv->request_type = PURPLE_MEDIA_NONE;
 
-	purple_request_accept_cancel(gtkmedia, "Media invitation",
+	purple_request_accept_cancel(gtkmedia, _("Incoming Call"),
 			message, NULL, PURPLE_DEFAULT_ACTION_NONE,
 			(void*)account, gtkmedia->priv->screenname, NULL,
 			gtkmedia->priv->media,
@@ -576,8 +522,7 @@
 {
 	double val = (double)gtk_range_get_value(GTK_RANGE(range));
 #endif
-	purple_prefs_set_int("/pidgin/media/audio/volume/input", val);
-	purple_media_set_input_volume(media, NULL, val / 10.0);
+	purple_media_set_input_volume(media, NULL, val);
 }
 
 static void
@@ -591,8 +536,7 @@
 {
 	double val = (double)gtk_range_get_value(GTK_RANGE(range));
 #endif
-	purple_prefs_set_int("/pidgin/media/audio/volume/output", val);
-	purple_media_set_output_volume(media, NULL, NULL, val / 10.0);
+	purple_media_set_output_volume(media, NULL, NULL, val);
 }
 
 static GtkWidget *
@@ -604,10 +548,10 @@
 
 	if (type & PURPLE_MEDIA_SEND_AUDIO) {
 		value = purple_prefs_get_int(
-			"/pidgin/media/audio/volume/input");
+			"/purple/media/audio/volume/input");
 	} else if (type & PURPLE_MEDIA_RECV_AUDIO) {
 		value = purple_prefs_get_int(
-			"/pidgin/media/audio/volume/output");
+			"/purple/media/audio/volume/output");
 	} else
 		g_return_val_if_reached(NULL);
 
@@ -662,9 +606,7 @@
 static void
 pidgin_media_ready_cb(PurpleMedia *media, PidginMedia *gtkmedia, const gchar *sid)
 {
-	PurpleMediaManager *manager = purple_media_get_manager(media);
-	GstElement *pipeline = purple_media_manager_get_pipeline(manager);
-	GtkWidget *send_widget = NULL, *recv_widget = NULL;
+	GtkWidget *send_widget = NULL, *recv_widget = NULL, *button_widget = NULL;
 	PurpleMediaSessionType type =
 			purple_media_get_session_type(media, sid);
 
@@ -683,9 +625,15 @@
 		send_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 		gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
 				send_widget, TRUE, TRUE, 0);
+		button_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+		gtk_box_pack_end(GTK_BOX(send_widget), button_widget,
+				FALSE, FALSE, 0);
+		gtk_widget_show(GTK_WIDGET(button_widget));
 		gtk_widget_show(send_widget);
-	} else
+	} else {
 		send_widget = gtkmedia->priv->send_widget;
+		button_widget = gtkmedia->priv->button_widget;
+	}
 
 	if (type & PURPLE_MEDIA_RECV_VIDEO) {
 		PidginMediaRealizeData *data;
@@ -738,6 +686,15 @@
 		gtk_widget_show(local_video);
 		gtk_widget_show(aspect);
 
+		gtkmedia->priv->pause =
+				gtk_toggle_button_new_with_mnemonic(_("_Pause"));
+		g_signal_connect(gtkmedia->priv->pause, "toggled",
+				G_CALLBACK(pidgin_media_pause_toggled),
+				gtkmedia);
+		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->pause,
+				FALSE, FALSE, 0);
+		gtk_widget_show(gtkmedia->priv->pause);
+
 		gtkmedia->priv->local_video = local_video;
 	}
 
@@ -747,44 +704,34 @@
 				PURPLE_MEDIA_RECV_AUDIO), FALSE, FALSE, 0);
 	}
 	if (type & PURPLE_MEDIA_SEND_AUDIO) {
-		GstElement *media_src;
-		GtkWidget *hbox;
-
-		hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-		gtk_box_pack_end(GTK_BOX(send_widget), hbox, FALSE, FALSE, 0);
 		gtkmedia->priv->mute =
 				gtk_toggle_button_new_with_mnemonic("_Mute");
 		g_signal_connect(gtkmedia->priv->mute, "toggled",
 				G_CALLBACK(pidgin_media_mute_toggled),
 				gtkmedia);
-		gtk_box_pack_end(GTK_BOX(hbox), gtkmedia->priv->mute,
+		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->mute,
 				FALSE, FALSE, 0);
 		gtk_widget_show(gtkmedia->priv->mute);
-		gtk_widget_show(GTK_WIDGET(hbox));
-
-		media_src = purple_media_get_src(media, sid);
-		gtkmedia->priv->send_level = gst_bin_get_by_name(
-				GST_BIN(media_src), "sendlevel");
 
 		gtk_box_pack_end(GTK_BOX(send_widget),
 				pidgin_media_add_audio_widget(gtkmedia,
 				PURPLE_MEDIA_SEND_AUDIO), FALSE, FALSE, 0);
-
-		gtk_widget_show(gtkmedia->priv->mute);
 	}
 
 
-	if (type & PURPLE_MEDIA_AUDIO) {
-		GstBus *bus = gst_pipeline_get_bus(GST_PIPELINE(pipeline));
-		g_signal_connect(G_OBJECT(bus), "message::element",
-				G_CALLBACK(level_message_cb), gtkmedia);
-		gst_object_unref(bus);
+	if (type & PURPLE_MEDIA_AUDIO &&
+			gtkmedia->priv->level_handler_id == 0) {
+		gtkmedia->priv->level_handler_id = g_signal_connect(
+				media, "level", G_CALLBACK(level_message_cb),
+				gtkmedia);
 	}
 
 	if (send_widget != NULL)
 		gtkmedia->priv->send_widget = send_widget;
 	if (recv_widget != NULL)
 		gtkmedia->priv->recv_widget = recv_widget;
+	if (button_widget != NULL)
+		gtkmedia->priv->button_widget = button_widget;
 
 	if (purple_media_is_initiator(media, sid, NULL) == FALSE) {
 		if (gtkmedia->priv->timeout_id != 0)
@@ -813,25 +760,6 @@
 	} else if (state == PURPLE_MEDIA_STATE_NEW &&
 			sid != NULL && name != NULL) {
 		pidgin_media_ready_cb(media, gtkmedia, sid);
-	} else if (state == PURPLE_MEDIA_STATE_CONNECTED &&
-			purple_media_get_session_type(media, sid) &
-			PURPLE_MEDIA_RECV_AUDIO) {
-		GstElement *tee = purple_media_get_tee(media, sid, name);
-		GstIterator *iter = gst_element_iterate_src_pads(tee);
-		GstPad *sinkpad;
-		if (gst_iterator_next(iter, (gpointer)&sinkpad)
-				 == GST_ITERATOR_OK) {
-			GstPad *peer = gst_pad_get_peer(sinkpad);
-			if (peer != NULL) {
-				gtkmedia->priv->recv_level =
-						gst_bin_get_by_name(
-						GST_BIN(GST_OBJECT_PARENT(
-						peer)), "recvlevel");
-				gst_object_unref(peer);
-			}
-			gst_object_unref(sinkpad);
-		}
-		gst_iterator_free(iter);
 	}
 }
 
@@ -843,6 +771,12 @@
 	if (type == PURPLE_MEDIA_INFO_REJECT) {
 		pidgin_media_emit_message(gtkmedia,
 				_("You have rejected the call."));
+	} else if (type == PURPLE_MEDIA_INFO_ACCEPT) {
+		pidgin_media_set_state(gtkmedia, PIDGIN_MEDIA_ACCEPTED);
+		pidgin_media_emit_message(gtkmedia, _("Call in progress."));
+		gtk_statusbar_push(GTK_STATUSBAR(gtkmedia->priv->statusbar),
+				0, _("Call in progress."));
+		gtk_widget_show(GTK_WIDGET(gtkmedia));
 	}
 }
 
@@ -869,8 +803,6 @@
 
 			g_signal_connect(G_OBJECT(media->priv->media), "error",
 				G_CALLBACK(pidgin_media_error_cb), media);
-			g_signal_connect(G_OBJECT(media->priv->media), "accepted",
-				G_CALLBACK(pidgin_media_accepted_cb), media);
 			g_signal_connect(G_OBJECT(media->priv->media), "state-changed",
 				G_CALLBACK(pidgin_media_state_changed_cb), media);
 			g_signal_connect(G_OBJECT(media->priv->media), "stream-info",
@@ -882,18 +814,6 @@
 				g_free(media->priv->screenname);
 			media->priv->screenname = g_value_dup_string(value);
 			break;
-		case PROP_SEND_LEVEL:
-			if (media->priv->send_level)
-				gst_object_unref(media->priv->send_level);
-			media->priv->send_level = g_value_get_object(value);
-			g_object_ref(media->priv->send_level);
-			break;
-		case PROP_RECV_LEVEL:
-			if (media->priv->recv_level)
-				gst_object_unref(media->priv->recv_level);
-			media->priv->recv_level = g_value_get_object(value);
-			g_object_ref(media->priv->recv_level);
-			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 			break;
@@ -915,12 +835,6 @@
 		case PROP_SCREENNAME:
 			g_value_set_string(value, media->priv->screenname);
 			break;
-		case PROP_SEND_LEVEL:
-			g_value_set_object(value, media->priv->send_level);
-			break;
-		case PROP_RECV_LEVEL:
-			g_value_set_object(value, media->priv->recv_level);
-			break;
 		default:
 			G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
 			break;
@@ -968,6 +882,14 @@
 	GstPad *ghost;
 	GstCaps *caps;
 
+#ifdef _WIN32
+	/* autovideosrc doesn't pick ksvideosrc for some reason */
+	src = gst_element_factory_make("ksvideosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("dshowvideosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("autovideosrc", NULL);
+#else
 	src = gst_element_factory_make("gconfvideosrc", NULL);
 	if (src == NULL)
 		src = gst_element_factory_make("autovideosrc", NULL);
@@ -975,10 +897,7 @@
 		src = gst_element_factory_make("v4l2src", NULL);
 	if (src == NULL)
 		src = gst_element_factory_make("v4lsrc", NULL);
-	if (src == NULL)
-		src = gst_element_factory_make("ksvideosrc", NULL);
-	if (src == NULL)
-		src = gst_element_factory_make("dshowvideosrc", NULL);
+#endif
 	if (src == NULL) {
 		purple_debug_error("gtkmedia", "Unable to find a suitable "
 				"element for the default video source.\n");
@@ -1023,11 +942,7 @@
 create_default_audio_src(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
-	GstElement *bin, *src, *volume, *level;
-	GstPad *pad, *ghost;
-	double input_volume = purple_prefs_get_int(
-			"/pidgin/media/audio/volume/input")/10.0;
-
+	GstElement *src;
 	src = gst_element_factory_make("gconfaudiosrc", NULL);
 	if (src == NULL)
 		src = gst_element_factory_make("autoaudiosrc", NULL);
@@ -1042,31 +957,15 @@
 				"element for the default audio source.\n");
 		return NULL;
 	}
-
-	bin = gst_bin_new("pidgindefaultaudiosrc");
-	volume = gst_element_factory_make("volume", "purpleaudioinputvolume");
-	g_object_set(volume, "volume", input_volume, NULL);
-	level = gst_element_factory_make("level", "sendlevel");
-	gst_bin_add_many(GST_BIN(bin), src, volume, level, NULL);
-	gst_element_link(src, volume);
-	gst_element_link(volume, level);
-	pad = gst_element_get_pad(level, "src");
-	ghost = gst_ghost_pad_new("ghostsrc", pad);
-	gst_element_add_pad(bin, ghost);
-	g_object_set(G_OBJECT(level), "message", TRUE, NULL);
-
-	return bin;
+	gst_element_set_name(src, "pidgindefaultaudiosrc");
+	return src;
 }
 
 static GstElement *
 create_default_audio_sink(PurpleMedia *media,
 		const gchar *session_id, const gchar *participant)
 {
-	GstElement *bin, *sink, *volume, *level, *queue;
-	GstPad *pad, *ghost;
-	double output_volume = purple_prefs_get_int(
-			"/pidgin/media/audio/volume/output")/10.0;
-
+	GstElement *sink;
 	sink = gst_element_factory_make("gconfaudiosink", NULL);
 	if (sink == NULL)
 		sink = gst_element_factory_make("autoaudiosink",NULL);
@@ -1075,22 +974,7 @@
 				"element for the default audio sink.\n");
 		return NULL;
 	}
-
-	bin = gst_bin_new("pidginrecvaudiobin");
-	volume = gst_element_factory_make("volume", "purpleaudiooutputvolume");
-	g_object_set(volume, "volume", output_volume, NULL);
-	level = gst_element_factory_make("level", "recvlevel");
-	queue = gst_element_factory_make("queue", NULL);
-	gst_bin_add_many(GST_BIN(bin), sink, volume, level, queue, NULL);
-	gst_element_link(level, sink);
-	gst_element_link(volume, level);
-	gst_element_link(queue, volume);
-	pad = gst_element_get_pad(queue, "sink");
-	ghost = gst_ghost_pad_new("ghostsink", pad);
-	gst_element_add_pad(bin, ghost);
-	g_object_set(G_OBJECT(level), "message", TRUE, NULL);
-
-	return bin;
+	return sink;
 }
 #endif  /* USE_VV */
 
@@ -1149,12 +1033,6 @@
 	purple_media_manager_set_active_element(manager, default_video_sink);
 	purple_media_manager_set_active_element(manager, default_audio_src);
 	purple_media_manager_set_active_element(manager, default_audio_sink);
-
-	purple_prefs_add_none("/pidgin/media");
-	purple_prefs_add_none("/pidgin/media/audio");
-	purple_prefs_add_none("/pidgin/media/audio/volume");
-	purple_prefs_add_int("/pidgin/media/audio/volume/input", 10);
-	purple_prefs_add_int("/pidgin/media/audio/volume/output", 10);
 #endif
 }
 
--- a/pidgin/gtkprefs.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/gtkprefs.c	Thu Aug 13 19:56:23 2009 +0000
@@ -698,7 +698,8 @@
 		g_free(original_name);
 		g_free(info);
 		return;
-	} else g_free(info);
+	} else
+		g_free(info);
 
 	is_archive = !g_ascii_strcasecmp(tail, ".gz") || !g_ascii_strcasecmp(tail, ".tgz");
 
@@ -1032,8 +1033,6 @@
 	info->original_name = NULL;
 
 	theme_install_theme(theme_file_name, info);
-
-	g_free(info);
 }
 
 static void
--- a/pidgin/gtkstatusbox.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/gtkstatusbox.c	Thu Aug 13 19:56:23 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/pidgin/gtkthemes.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/gtkthemes.c	Thu Aug 13 19:56:23 2009 +0000
@@ -183,7 +183,7 @@
 			}
 			g_free(uio->smile);
 			g_free(uio);
-			wer->smileys = g_slist_remove(wer->smileys, uio);
+			wer->smileys = g_slist_delete_link(wer->smileys, wer->smileys);
 		}
 		theme->list = wer->next;
 		g_free(wer->sml);
@@ -229,7 +229,6 @@
 	struct smiley_list *list = NULL;
 	GSList *lst = smiley_themes;
 	char *dirname;
-	gboolean new_theme = FALSE;
 
 	if (!f)
 		return;
@@ -243,16 +242,18 @@
 		lst = lst->next;
 	}
 
-	if (!theme) {
-		new_theme = TRUE;
-		theme = g_new0(struct smiley_theme, 1);
-		theme->path = g_strdup(file);
-	} else if (theme == current_smiley_theme) {
+	if (theme != NULL && theme == current_smiley_theme) {
 		/* Don't reload the theme if it is already loaded */
 		fclose(f);
 		return;
 	}
 
+	if (theme == NULL) {
+		theme = g_new0(struct smiley_theme, 1);
+		theme->path = g_strdup(file);
+		smiley_themes = g_slist_prepend(smiley_themes, theme);
+	}
+
 	dirname = g_path_get_dirname(file);
 
 	while (!feof(f)) {
@@ -344,14 +345,11 @@
 	if (!theme->name || !theme->desc || !theme->author) {
 		purple_debug_error("gtkthemes", "Invalid file format, not loading smiley theme from '%s'\n", file);
 
+		smiley_themes = g_slist_remove(smiley_themes, theme);
 		pidgin_themes_destroy_smiley_theme(theme);
 		return;
 	}
 
-	if (new_theme) {
-		smiley_themes = g_slist_prepend(smiley_themes, theme);
-	}
-
 	if (load) {
 		GList *cnv;
 
--- a/pidgin/gtkwhiteboard.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/gtkwhiteboard.c	Thu Aug 13 19:56:23 2009 +0000
@@ -273,6 +273,7 @@
 static void pidgin_whiteboard_destroy(PurpleWhiteboard *wb)
 {
 	PidginWhiteboard *gtkwb;
+	GtkWidget *colour_dialog;
 
 	g_return_if_fail(wb != NULL);
 	gtkwb = wb->ui_data;
@@ -287,6 +288,12 @@
 		gtkwb->pixmap = NULL;
 	}
 
+	colour_dialog = g_object_get_data(G_OBJECT(gtkwb->window), "colour-dialog");
+	if (colour_dialog) {
+		gtk_widget_destroy(colour_dialog);
+		g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", NULL);
+	}
+
 	if(gtkwb->window)
 	{
 		gtk_widget_destroy(gtkwb->window);
@@ -804,7 +811,7 @@
 	{
 		gtk_widget_destroy(dialog);
 
-		purple_debug_info("gtkwhiteboard", "File not Saved... Canceled\n");
+		purple_debug_info("gtkwhiteboard", "File not Saved... Cancelled\n");
 	}
 }
 
@@ -848,9 +855,11 @@
 	purple_whiteboard_send_brush(wb, old_size, new_color);
 }
 
-static void color_selection_dialog_destroy(GtkWidget *w, GtkWidget *destroy)
+static void color_selection_dialog_destroy(GtkWidget *w, PidginWhiteboard *gtkwb)
 {
-	gtk_widget_destroy(destroy);
+	GtkWidget *dialog = g_object_get_data(G_OBJECT(gtkwb->window), "colour-dialog");
+	gtk_widget_destroy(dialog);
+	g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", NULL);
 }
 
 static void color_select_dialog(GtkWidget *widget, PidginWhiteboard *gtkwb)
@@ -859,6 +868,7 @@
 	GtkColorSelectionDialog *dialog;
 
 	dialog = (GtkColorSelectionDialog *)gtk_color_selection_dialog_new(_("Select color"));
+	g_object_set_data(G_OBJECT(gtkwb->window), "colour-dialog", dialog);
 
 	g_signal_connect(G_OBJECT(dialog->colorsel), "color-changed",
 					G_CALLBACK(change_color_cb), gtkwb);
@@ -867,7 +877,7 @@
 	gtk_widget_destroy(dialog->help_button);
 
 	g_signal_connect(G_OBJECT(dialog->ok_button), "clicked",
-					G_CALLBACK(color_selection_dialog_destroy), dialog);
+					G_CALLBACK(color_selection_dialog_destroy), gtkwb);
 
 	gtk_color_selection_set_has_palette(GTK_COLOR_SELECTION(dialog->colorsel), TRUE);
 
--- a/pidgin/plugins/crazychat/glm.c	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/plugins/crazychat/glm.c	Thu Aug 13 19:56:23 2009 +0000
@@ -543,6 +543,8 @@
     fprintf(file, "Ns %f\n", material->shininess / 128.0 * 1000.0);
     fprintf(file, "\n");
   }
+
+  fclose(file);
 }
 
 
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Thu Aug 13 19:56:23 2009 +0000
@@ -567,6 +567,7 @@
   !insertmacro URI_SECTION "msnim"
   !insertmacro URI_SECTION "myim"
   !insertmacro URI_SECTION "ymsgr"
+  !insertmacro URI_SECTION "xmpp"
 SectionGroupEnd
 
 ;--------------------------------
@@ -708,6 +709,8 @@
     Call un.UnregisterURIHandler
     Push "ymsgr"
     Call un.UnregisterURIHandler
+    Push "xmpp"
+    Call un.UnregisterURIHandler
 
     Delete "$INSTDIR\ca-certs\America_Online_Root_Certification_Authority_1.pem"
     Delete "$INSTDIR\ca-certs\AOL_Member_CA.pem"
--- a/pidgin/win32/nsis/translations/italian.nsh	Wed Aug 12 02:24:41 2009 +0000
+++ b/pidgin/win32/nsis/translations/italian.nsh	Thu Aug 13 19:56:23 2009 +0000
@@ -1,36 +1,82 @@
 ;;
-;;  italian.nsh
+;;  english.nsh
 ;;
-;;  Italian language strings for the Windows Pidgin NSIS installer.
+;;  Default language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
-;;  Author: Claudio Satriano <satriano@na.infn.it>, 2003.
-;;  Version 2
+;;  Author: Claudio Satriano <satriano@na.infn.it>, 2003-2009.
+;;  Version 3
 ;;
 
-; Startup GTK+ check
-!define GTK_INSTALLER_NEEDED			"L'ambiente di runtime GTK+ non  presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_MIN_VERSION} o maggiore"
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Il programma di installazione è già in esecuzione"
+!define PIDGIN_IS_RUNNING			"È attualmente in esecuzione un'istanza di Pidgin. Esci da Pidgin e riprova."
+!define GTK_INSTALLER_NEEDED			"L'ambiente di runtime GTK+ non è presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_MIN_VERSION} o maggiore"
 
 ; License Page
 !define PIDGIN_LICENSE_BUTTON			"Avanti >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name)  distribuito sotto licenza GPL. La licenza  mostrata qui solamente a scopo informativo. $_CLICK" 
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) è distribuito sotto la GNU General Public License (GPL). La licenza è mostrata qui solamente a scopo informativo. $_CLICK"
 
 ; Components Page
 !define PIDGIN_SECTION_TITLE			"Pidgin - Client per Messaggi Immediati (richiesto)"
-!define GTK_SECTION_TITLE			"Ambiente di Runtime GTK+ (richiesto)"
+!define GTK_SECTION_TITLE			"Ambiente di Runtime GTK+ (richiesto se non presente)"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Collegamenti"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Avvio"
 !define PIDGIN_SECTION_DESCRIPTION		"File principali di Pidgin e dll"
 !define GTK_SECTION_DESCRIPTION		"Un toolkit multipiattaforma per interfacce grafiche, usato da Pidgin"
 
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Collegamenti per avviare Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Crea un collegamento a Pidgin sul desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Crea una voce per Pidgin nel Menu Avvio"
+
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			" stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento."
+!define GTK_UPGRADE_PROMPT			"È stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento."
+!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me non è incompatible con GTK+ 2.8.0 o successivo. GTK+ ${GTK_INSTALL_VERSION} non sarà installato.$\rSe non hai GTK+ ${GTK_MIN_VERSION} o successivo già installato sul tuo computer, questa installazione sarà interrotta."
 
 ; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin per Windows"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin"
+
+; Pidgin Section Prompts and Texts
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Impossibile rimuovere la versione di Pidgin attualmente presente sul tuo computer. La nuova versione sarà installata senza rimuovere la versione precedente."
 
 ; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Errore di installazione di GTK+."
-!define GTK_BAD_INSTALL_PATH			"Il percorso scelto non pu essere raggiunto o creato."
+!define GTK_INSTALL_ERROR			"Error nell'installazione del runtime GTK+."
+!define GTK_BAD_INSTALL_PATH			"Il percorso scelto non può essere raggiunto o creato."
+
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"Gestori degli URI"
 
 ; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1         "Il programma di rimozione non  in grado di trovare le voci di registro per Pidgin.$\rProbabilmente un altro utente ha installato questa applicazione."
-!define un.PIDGIN_UNINSTALL_ERROR_2         "Non hai il permesso per rimuovere questa applicazione."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Il programma di rimozione non è in grado di trovare le voci di registro per Pidgin.$\rProbabilmente questa applicazione è stata installata da un altro utente."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Non hai il permesso per rimuovere questa applicazione."
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Supporto per il correttore ortografico"
+!define PIDGIN_SPELLCHECK_ERROR		"Errore nell'installazione del correttore ortografico"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Errore nell'installazione del dizionario per il correttore ortografico"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Supporto per il correttore ortografico.  (È richiesta una connessione a internet per l'installazione)"
+!define ASPELL_INSTALL_FAILED			"Installazione fallita"
+!define PIDGIN_SPELLCHECK_BRETON		"Bretone"
+!define PIDGIN_SPELLCHECK_CATALAN		"Catalano"
+!define PIDGIN_SPELLCHECK_CZECH		"Ceco"
+!define PIDGIN_SPELLCHECK_WELSH		"Gallese"
+!define PIDGIN_SPELLCHECK_DANISH		"Danese"
+!define PIDGIN_SPELLCHECK_GERMAN		"Tedesco"
+!define PIDGIN_SPELLCHECK_GREEK		"Greco"
+!define PIDGIN_SPELLCHECK_ENGLISH		"Inglese"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH		"Spagnolo"
+!define PIDGIN_SPELLCHECK_FAROESE		"Faroese"
+!define PIDGIN_SPELLCHECK_FRENCH		"Francese"
+!define PIDGIN_SPELLCHECK_ITALIAN		"Italiano"
+!define PIDGIN_SPELLCHECK_DUTCH		"Olandese"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norvegese"
+!define PIDGIN_SPELLCHECK_POLISH		"Polacco"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portoghese"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Rumeno"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"Russo"
+!define PIDGIN_SPELLCHECK_SLOVAK		"Slovacco"
+!define PIDGIN_SPELLCHECK_SWEDISH		"Svedese"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ucraino"
+
--- a/po/ChangeLog	Wed Aug 12 02:24:41 2009 +0000
+++ b/po/ChangeLog	Thu Aug 13 19:56:23 2009 +0000
@@ -3,9 +3,14 @@
 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 translator (Aron Xu)
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
+	* Chinese (Simplified) translation updated under new
+	  translator (Aron Xu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Czech translation updated (David Vachulka)
 	* Dutch translation updated (Daniël Heres)
 	* English (British) translation updated (Luke Ross)
@@ -15,15 +20,19 @@
 	* German translation updated (Jochen Kemnade and Björn Voigt)
 	* Greek translation updated (Bouklis Panos)
 	* Hebrew translation updated (Shalom Craimer)
+	* Italian translation updated (Claudio Satriano)
 	* Khmer translation added (Khoem Sokhem)
 	* Lao translation updated (Anousak Souphavah)
 	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
 	* Portuguese (Brazilian) translation updated (Rodrigo Luiz
 	  Marques Flores)
 	* Punjabi translation updated (Amanpreet Singh Alam)
+	* Romanian translation updated (Mişu Moldovan and new translator Andrei
+	  Popescu)
 	* 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	Wed Aug 12 02:24:41 2009 +0000
+++ b/po/es.po	Thu Aug 13 19:56:23 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	Wed Aug 12 02:24:41 2009 +0000
+++ b/po/eu.po	Thu Aug 13 19:56:23 2009 +0000
@@ -2,32 +2,31 @@
 # Iñaki Larrañaga Murgoitio <dooteo@zundan.com>, 2006.
 # tamax, 2006.
 #
+# Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>, correct and translate more than 85%, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2006-05-25 23:48+0200\n"
-"Last-Translator: tamax\n"
+"POT-Creation-Date: 2009-08-02 17:40-0700\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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms: Plural-Forms: Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Finch"
-msgstr "Frantsesa"
-
-#, fuzzy, c-format
+msgstr "Finch"
+
+#, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "Pidgin %s. Informazio gehiago nahi baduzu, idatzi `%s -h'.\n"
-
-#, fuzzy, c-format
+msgstr "%s. Informazio gehiago nahi baduzu, idatzi `%s -h'.\n"
+
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -38,17 +37,14 @@
 "  -n, --nologin       don't automatically login\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\n"
+"Erabiltera: %s [AUKERA]...\n"
+"\n"
+"  -c, --config=DIR    DIR erabili konfigurazio-fitxategientzat\n"
+"  -d, --debug         arazte-mezuak idatzi stderr-en\n"
+"  -h, --help          laguntza hau erakutsi eta irten\n"
+"  -n, --nologin       ez automatikoki konektatu\n"
+"  -v, --version       egungo bertsioa erakutsi eta irten\n"
 
 #, c-format
 msgid ""
@@ -56,53 +52,52 @@
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
+"%s(e)k erroreak aurkitu ditu zure ezarpenak %s(e)tik %s(e)ra migratzean. "
+"Eskuz burutu ezazu migrazioa. Errore honen berri eman ezazu hemen: http://"
+"developer.pidgin.im"
 
 msgid "Error"
 msgstr "Errorea"
 
-#, fuzzy
 msgid "Account was not added"
-msgstr "Kontua desgaitu egin da"
+msgstr "Ez da kontua gehitu"
 
 msgid "Username of an account must be non-empty."
-msgstr ""
+msgstr "Kontuaren erabiltzaile-izena ezin da hutsik egon."
 
 msgid "New mail notifications"
 msgstr "Mezu berrien jakinarazpenak"
 
 msgid "Remember password"
-msgstr "Gogoratu pasahitza"
+msgstr "Pasahitza gogoratu"
 
 msgid "There are no protocol plugins installed."
-msgstr ""
+msgstr "Ez dago protokolo-pluginik instalatuta."
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr ""
+msgstr "(Ziurrenik 'make install' egitea ahaztu duzu.)"
 
 msgid "Modify Account"
-msgstr "Aldatu kontua"
-
-#, fuzzy
+msgstr "Kontua Aldatu"
+
 msgid "New Account"
-msgstr "Kontua"
+msgstr "Kontu Berria"
 
 msgid "Protocol:"
 msgstr "Protokoloa:"
 
-#, fuzzy
 msgid "Username:"
-msgstr "_Erabiltzaile-izena:"
+msgstr "Erabiltzaile-Izena:"
 
 msgid "Password:"
 msgstr "Pasahitza:"
 
 msgid "Alias:"
-msgstr "Aliasa:"
+msgstr "Ezizena:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
-msgstr "Zerbitzaritik deskonektatuta zaude."
+msgstr "Zerbitzarian sortu kontu hau"
 
 #. Cancel button
 #. Cancel
@@ -118,9 +113,8 @@
 msgid "Are you sure you want to delete %s?"
 msgstr "Ziur zaude %s ezabatu nahi duzula?"
 
-#, fuzzy
 msgid "Delete Account"
-msgstr "Ahalbidetu Kontua"
+msgstr "Kontua Ezabatu"
 
 #. Delete button
 msgid "Delete"
@@ -129,36 +123,33 @@
 msgid "Accounts"
 msgstr "Kontuak"
 
-#, fuzzy
 msgid "You can enable/disable accounts from the following list."
-msgstr "Lagun hauen baimenaren zain zaude"
+msgstr "Kontuak gaitu/ezgaitu ditzakezu ondorengo zerrendan."
 
 #. Add button
 msgid "Add"
 msgstr "Gehitu"
 
 #. Modify button
-#, fuzzy
 msgid "Modify"
-msgstr "_Aldatu"
+msgstr "Aldatu"
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s  %s lagun egin du  %s%s"
+msgstr "%s%s%s%s(e)k bere lagnu egin du%s %s%s"
 
 msgid "Add buddy to your list?"
-msgstr "Laguna zerrendan gehitu nahi duzu?"
-
-#, fuzzy, c-format
+msgstr "Zure zerrendara gehitu laguna?"
+
+#, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s erabiltzaileak %s gehitu nahi du bere lagunen zerrendan %s%s."
-
-#, fuzzy
+msgstr "%s%s%s%s(e)k bere lagun-zerrendara gehitu nahi du %s %s%s."
+
 msgid "Authorize buddy?"
-msgstr "Baimena eman"
+msgstr "Laguna baimendu?"
 
 msgid "Authorize"
-msgstr "Baimena eman"
+msgstr "Baimendu"
 
 msgid "Deny"
 msgstr "Ukatu"
@@ -168,61 +159,56 @@
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-
-#, fuzzy, c-format
+"Online: %d\n"
+"Guztira: %d"
+
+#, c-format
 msgid "Account: %s (%s)"
-msgstr "%s: %s (%s)"
-
-#, fuzzy, c-format
+msgstr "Kontua: %s (%s)"
+
+#, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"<b>Azken aldiz ikusia:</b> duela %s"
-
-#, fuzzy
+"Azkenekoz ikusia: duela %s"
+
 msgid "Default"
-msgstr "Gnome-ren lehenetsia "
-
-#, fuzzy
+msgstr "Lehenetsia"
+
 msgid "You must provide a username for the buddy."
-msgstr "Idatzi gehitu nahi duzun taldearen izena."
+msgstr "Lagunarentzako erabiltzaile-izen bat eman behar duzu."
 
 msgid "You must provide a group."
-msgstr ""
-
-#, fuzzy
+msgstr "Talde bat eman behar duzu."
+
 msgid "You must select an account."
-msgstr "Goitizena zehaztu behar duzu"
+msgstr "Kontu bat hautatu behar duzu."
 
 msgid "The selected account is not online."
-msgstr ""
-
-#, fuzzy
+msgstr "Hautatutako kontua ez dago online."
+
 msgid "Error adding buddy"
-msgstr "Errorea %s irakurtzean"
+msgstr "Errorea laguna gehitzean"
 
 msgid "Username"
 msgstr "Erabiltzaile-izena"
 
-#, fuzzy
 msgid "Alias (optional)"
-msgstr "Mezu (Aukerazkoa):"
-
-#, fuzzy
+msgstr "Ezizena (opzionala)"
+
 msgid "Add in group"
-msgstr "Gehitu taldea"
+msgstr "Taldera gehitu"
 
 msgid "Account"
 msgstr "Kontua"
 
 msgid "Add Buddy"
-msgstr "Gehitu laguna"
-
-#, fuzzy
+msgstr "Laguna Gehitu"
+
 msgid "Please enter buddy information."
-msgstr "Adierazi lagun bat alerta emateko."
+msgstr "Lagunaren informazioa sartu ezazu."
 
 msgid "Chats"
 msgstr "Berriketak"
@@ -234,121 +220,106 @@
 msgid "Alias"
 msgstr "Ezizena"
 
-#, fuzzy
 msgid "Group"
-msgstr "Taldea:"
-
-#, fuzzy
+msgstr "Taldea"
+
 msgid "Auto-join"
-msgstr "_Automatikoki sartu"
+msgstr "Automatikoki batu"
 
 msgid "Add Chat"
-msgstr "Gehitu berriketa"
+msgstr "Berriketa Gehitu"
 
 msgid "You can edit more information from the context menu later."
 msgstr ""
-
-#, fuzzy
+"Informazio gehiago editatu ahalko duzu geroago kontestu-menua erabiliz."
+
 msgid "Error adding group"
-msgstr "Errorea %s irakurtzean"
-
-#, fuzzy
+msgstr "Errorea taldea gehitzean"
+
 msgid "You must give a name for the group to add."
-msgstr "Idatzi gehitu nahi duzun taldearen izena."
+msgstr "Izen bat eman behar duzu gehituko duzun talderako."
 
 msgid "Add Group"
-msgstr "Gehitu taldea"
-
-#, fuzzy
+msgstr "Taldea Gehitu"
+
 msgid "Enter the name of the group"
-msgstr "Idatzi gehitu nahi duzun taldearen izena."
-
-#, fuzzy
+msgstr "Taldearen izena sartu"
+
 msgid "Edit Chat"
-msgstr "Gehitu berriketa"
+msgstr "Berriketa Editatu"
 
 msgid "Please Update the necessary fields."
-msgstr ""
+msgstr "Beharrezko eremuak Eguneratu."
 
 msgid "Edit"
-msgstr ""
-
-#, fuzzy
+msgstr "Editatu"
+
 msgid "Edit Settings"
-msgstr "Erabili ingurune-ezarpenak"
-
-#, fuzzy
+msgstr "Ezarpenak Editatu"
+
 msgid "Information"
-msgstr "Laneko datuak"
-
-#, fuzzy
+msgstr "Informazioa"
+
 msgid "Retrieving..."
-msgstr "Erabiltzailea idazten ari da..."
+msgstr "Eskuratzen..."
 
 msgid "Get Info"
-msgstr "Hartu informazioa"
-
-#, fuzzy
+msgstr "Informazioa Eskuratu"
+
 msgid "Add Buddy Pounce"
-msgstr "Gehitu lagun-_alerta"
+msgstr "Lagun-Alerta Gehitu"
 
 msgid "Send File"
-msgstr "Bidali fitxategia"
+msgstr "Fitxategia Bidali"
 
 msgid "Blocked"
 msgstr "Blokeatuta"
 
-#, fuzzy
 msgid "Show when offline"
-msgstr "Ez da onartzen lineaz kanpo"
-
-#, fuzzy, c-format
+msgstr "Offline egotean erakutsi"
+
+#, c-format
 msgid "Please enter the new name for %s"
-msgstr "Idatzi pasahitz berria"
-
-#, fuzzy
+msgstr "%s(r)en izen berria sartu"
+
 msgid "Rename"
-msgstr "_Izena aldatu"
-
-#, fuzzy
+msgstr "Berrizendatu"
+
 msgid "Set Alias"
-msgstr "Ezizena"
+msgstr "Ezizena Ezarri"
 
 msgid "Enter empty string to reset the name."
-msgstr ""
+msgstr "Kate hutsa sartu ezazu izena berrezartzeko."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr ""
+msgstr "Kontaktu hau kentzean, kontaktuko lagun guztiak ere kenduko dira."
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Talde hau kentzean, taldeko lagun guztiak ere kenduko dira."
+
+#, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "Ziur zaude %s ezabatu nahi duzula?"
+msgstr "Ziur zaude %s kendu nahi duzula?"
 
 #. XXX: anything to do with the returned ui-handle?
-#, fuzzy
 msgid "Confirm Remove"
-msgstr "Isteko konfirmazioa"
+msgstr "Kentzea Konfirmatu"
 
 msgid "Remove"
 msgstr "Kendu"
 
 #. Buddy List
 msgid "Buddy List"
-msgstr "Lagunen zerrenda"
-
-#, fuzzy
+msgstr "Lagunen Zerrenda"
+
 msgid "Place tagged"
-msgstr "Bizilekua"
+msgstr "Lekua etiketatua"
 
 msgid "Toggle Tag"
-msgstr ""
-
-#, fuzzy
+msgstr "Etiketa Konmutatu"
+
 msgid "View Log"
-msgstr "Ikusi _egunkaria"
+msgstr "Txostena Ikusi"
 
 #. General
 msgid "Nickname"
@@ -357,36 +328,35 @@
 #. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
-msgstr "Ez-aktibo"
-
-#, fuzzy
+msgstr "Inaktibo"
+
 msgid "On Mobile"
-msgstr "Mugikorra"
+msgstr "Mugikorrean"
 
 msgid "New..."
 msgstr "Berria..."
 
 msgid "Saved..."
-msgstr "Gordeta..."
+msgstr "Gordetakoa..."
 
 msgid "Plugins"
-msgstr "Plugin-ak"
-
-#, fuzzy
+msgstr "Pluginak"
+
 msgid "Block/Unblock"
-msgstr "Blokeoa kendu"
+msgstr "Blokeatu/Desblokeatu"
 
 msgid "Block"
 msgstr "Blokeatu"
 
 msgid "Unblock"
-msgstr "Blokeoa kendu"
-
-#, fuzzy
+msgstr "Desblokeatu"
+
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "Idatzi BM bidali nahi diozun pertsonaren pantaila-izena edo ezizena."
+msgstr ""
+"Blokeatu/Desblokeatu nahi duzun pertsonaren erabiltzaile-izena edo ezizena "
+"sartu ezazu."
 
 #. Not multiline
 #. Not masked?
@@ -395,139 +365,127 @@
 msgstr "Ados"
 
 msgid "New Instant Message"
-msgstr "Berehalako mezu berria"
-
-#, fuzzy
+msgstr "Istanteko Mezu Berria"
+
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "Idatzi BM bidali nahi diozun pertsonaren pantaila-izena edo ezizena."
-
-#, fuzzy
+msgstr ""
+"IMa bidali nahi diozun pertsonaren erabiltzaile-izena edo ezizena sartu "
+"ezazu."
+
 msgid "Channel"
-msgstr "_Kanala:"
+msgstr "Kanala"
 
 msgid "Join a Chat"
-msgstr "Sartu berriketa batean"
-
-#, fuzzy
+msgstr "Berriketa batera Batu"
+
 msgid "Please enter the name of the chat you want to join."
-msgstr "Sartu txertatu nahi duzun estekaren URL helbidea."
-
-#, fuzzy
+msgstr "Batu nahi zaren berriketaren izena sartu ezazu."
+
 msgid "Join"
-msgstr "_Sartu"
-
-#, fuzzy
+msgstr "Batu"
+
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"Idatzi egunkaria ikusi nahi duzun pertsonaren pantaila-izena edo ezizena."
+"Ikusi nahi duzun txostena dagokion pertsonaren erabiltzaile-izena edo "
+"ezizena sartu ezazu."
 
 #. Create the "Options" frame.
 msgid "Options"
 msgstr "Aukerak"
 
-#, fuzzy
 msgid "Send IM..."
-msgstr "Gordeta..."
-
-#, fuzzy
+msgstr "IMa Bidali..."
+
 msgid "Block/Unblock..."
-msgstr "Blokeoa kendu"
-
-#, fuzzy
+msgstr "Blokeatu/Desblokeatu..."
+
 msgid "Join Chat..."
-msgstr "Sartu berriketa batean"
-
-#, fuzzy
+msgstr "Berriketara Batu..."
+
 msgid "View Log..."
-msgstr "Ikusi _egunkaria"
-
-#, fuzzy
+msgstr "Txostena Ikusi..."
+
 msgid "View All Logs"
-msgstr "Ikusi _egunkaria"
+msgstr "Txosten Guztiak Ikusi"
 
 msgid "Show"
-msgstr ""
-
-#, fuzzy
+msgstr "Erakutsi"
+
 msgid "Empty groups"
-msgstr "Taldearen arabera"
-
-#, fuzzy
+msgstr "Talde hutsak"
+
 msgid "Offline buddies"
-msgstr "Bilatu lagunak"
-
-#, fuzzy
+msgstr "Offline lagunak"
+
 msgid "Sort"
-msgstr "Ataka"
-
-#, fuzzy
+msgstr "Antolatu"
+
 msgid "By Status"
-msgstr "Egoeraren arabera"
+msgstr "Egoeraren Arabera"
 
 msgid "Alphabetically"
 msgstr "Alfabetikoki "
 
-#, fuzzy
 msgid "By Log Size"
-msgstr "Egunkari-tamainaren arabera"
-
-#, fuzzy
+msgstr "Txosten-Tamainaren Arabera"
+
 msgid "Buddy"
-msgstr "_Laguna:"
+msgstr "Laguna"
 
 msgid "Chat"
 msgstr "Berriketa"
 
-#, fuzzy
 msgid "Grouping"
-msgstr "Taldea:"
-
-#, fuzzy
+msgstr "Taldekatzea"
+
 msgid "Certificate Import"
-msgstr "Konektatzeko atak"
+msgstr "Zertifikatua Inportatu"
 
 msgid "Specify a hostname"
-msgstr ""
+msgstr "Ostalari-izena zehaztu"
 
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "Zertifikatu hau dagokion ostalariaren izena idatzi ezazu."
 
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"Ezin %s fitxategia inportatu.\n"
+"Irakurgarria dela eta PEM formatua duela egiaztatu ezazu.\n"
 
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "Zertifikatu Inportazio Errorea"
 
 msgid "X.509 certificate import failed"
-msgstr ""
-
-#, fuzzy
+msgstr "Errorea X.509 zertifikatua inportatzean"
+
 msgid "Select a PEM certificate"
-msgstr "Hautatu fitxategia"
+msgstr "PEM zertifikatua hautatu"
 
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"Ezin %s fitxategira esportatu.\n"
+"Helburu-bidean idazteko baimena duzula egiaztatu ezazu.\n"
 
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "Zertifikatu Esportatze Errorea"
 
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "Errorea X.509 zertifikatua esportatzean"
 
 msgid "PEM X.509 Certificate Export"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "PEM X.509 Zertifikatu Esportazioa"
+
+#, c-format
 msgid "Certificate for %s"
-msgstr "Egoera : %s rako."
+msgstr "%s(e)rako zertifikatua"
 
 #, c-format
 msgid ""
@@ -536,23 +494,27 @@
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Izen arrunta: %s\n"
+"\n"
+"SHA1 hatz-marka:\n"
+"%s"
 
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "SSL Ostalari-Zertifikatua"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Benetan ezabatu %s(e)rako zertifikatua?"
 
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "Zertifikatu-ezabatzea konfirmatu"
 
 msgid "Certificate Manager"
-msgstr ""
+msgstr "Zertifikatu-Kudeatzailea"
 
 #. Creating the user splits
 msgid "Hostname"
-msgstr "Ostalari-Izena"
+msgstr "Ostalaria"
 
 msgid "Info"
 msgstr "Informazioa"
@@ -561,193 +523,190 @@
 msgid "Close"
 msgstr "Itxi"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s)"
-msgstr "%s: %s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s (%s)"
+
+#, c-format
 msgid "%s disconnected."
-msgstr "%s Deskonektatuta."
-
-#, fuzzy, c-format
+msgstr "%s deskonektatuta."
+
+#, c-format
 msgid ""
 "%s\n"
 "\n"
 "Finch will not attempt to reconnect the account until you correct the error "
 "and re-enable the account."
 msgstr ""
-"%s deskonektatua izan da errorea baten ondorioz: %s\n"
-" Pidgin ez da saiatuko kontua berriz konektatzen errorea konpondu  eta "
-"kontua ahalbidetu arte."
+"%s\n"
+"\n"
+"Finch ez da kontuarekin berriz konektatzen saiatuko zuk errorea konpondu  "
+"eta kontua bergaitu arte."
 
 msgid "Re-enable Account"
-msgstr "Ber ahalbidetu kontua"
+msgstr "Kontua Bergaitu"
 
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
+"Kontua deskonektatu egin da eta jadanik ez zaude berriketa honetan. "
+"Automatikoki batuko zara berriketara, kontua berkonektatu bezain laster."
 
 msgid "No such command."
-msgstr "Komando hori ez dago."
+msgstr "Halako agindurik ez."
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Sintaxi errorea: argumentu kopuru okerra idatzi duzu komando horrentzako."
+"Sintaxi-errorea: Argumentu-kopuru okerra idatzi duzu agindu horrentzako."
 
 msgid "Your command failed for an unknown reason."
-msgstr "Komandoak huts egin du arrazoi ezezagunen batengatik."
+msgstr "Zure aginduak huts egin du arrazoi ezezagunen batengatik."
 
 msgid "That command only works in chats, not IMs."
-msgstr "Komando horrek Berriketan bakarrik funtzionatzen du, ez IMen "
+msgstr "Agindu horrek berriketetan bakarrik funtzionatzen du, ez IMetan."
 
 msgid "That command only works in IMs, not chats."
-msgstr "Komando horrek IMen bakarrik funtzionatzen du, ez Berriketan "
+msgstr "Agindu horrek IMetan bakarrik funtzionatzen du, ez berriketetan."
 
 msgid "That command doesn't work on this protocol."
-msgstr "Komando horrek ez du protokolo honekin lanik egiten"
-
-#, fuzzy
+msgstr "Agindu horrek ez du protokolo honekin funtzionatzen."
+
 msgid "Message was not sent, because you are not signed on."
-msgstr "Mezua ezin izan da bidali azkarregi bidaltzen ari garelako:"
-
-#, fuzzy, c-format
+msgstr "Ez da mezua bidali, ez zaudelako konektatuta."
+
+#, c-format
 msgid "%s (%s -- %s)"
-msgstr "%s: %s (%s)"
+msgstr "%s.(%s -- %s)"
 
 #, c-format
 msgid "%s [%s]"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%s [%s]"
+
+#, c-format
 msgid ""
 "\n"
 "%s is typing..."
-msgstr "Erabiltzailea idazten ari da..."
-
-#, fuzzy
+msgstr ""
+"\n"
+"Idazten ari da %s..."
+
 msgid "You have left this chat."
-msgstr "Berriketan ari zara"
+msgstr "Berriketa hau utzi duzu."
 
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
-"Egunkaria martxan jarri da. Solasaldi honetako etorkizuneko mezuak egunkaria "
-"gordeko dira."
+"Martxan jarri da txostena. Txostenean gordeko dira solasaldi honetako mezu "
+"guztiak."
 
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-"Egunkaria gelditua. Solasaldi honetako mezuak etorkizunean ez dira "
-"egunkarian gordeko."
-
-#, fuzzy
+"Geldiarazi egin da txostena. Ez da txostenean gordeko solasaldi honetako "
+"mezu gehiago."
+
 msgid "Send To"
-msgstr "_Bidali honi:"
-
-#, fuzzy
+msgstr "Hona Bidali"
+
 msgid "Conversation"
-msgstr "Solasaldiak"
-
-#, fuzzy
+msgstr "Solasaldia"
+
 msgid "Clear Scrollback"
-msgstr "/Solasaldia/Garb_itu Scrollback"
-
-#, fuzzy
+msgstr "Solasaldia Garbitu"
+
 msgid "Show Timestamps"
-msgstr "Ordu-zigiluak"
-
-#, fuzzy
+msgstr "Ordu-Markak Erakutsi"
+
 msgid "Add Buddy Pounce..."
-msgstr "Gehitu lagun-_alerta"
-
-#, fuzzy
+msgstr "Lagun-Alerta Gehitu..."
+
 msgid "Invite..."
-msgstr "Gonbidatu"
-
-#, fuzzy
+msgstr "Gonbidatu..."
+
 msgid "Enable Logging"
-msgstr "/Aukerak/Gaitu egunkaria"
-
-#, fuzzy
+msgstr "Txostena Gaitu"
+
 msgid "Enable Sounds"
-msgstr "/Aukerak/Gaitu soinuak"
-
-#, fuzzy
+msgstr "/Soinuak Gaitu"
+
 msgid "<AUTO-REPLY> "
-msgstr "(%s) %s <ERANTZUN AUTOMATIKOA>: %s\n"
+msgstr "<ERANTZUN AUTOMATIKOA>"
 
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Erabiltzaile %d(e)ko zerrenda:\n"
+msgstr[1] "%d erabiltzaileko zerrenda:\n"
 
 msgid "Supported debug options are:  version"
-msgstr "Onartutako arazketa aukerak: bertsioa"
+msgstr "Onartutako arazketa-aukerak:  version"
 
 msgid "No such command (in this context)."
-msgstr "Komando hori ez dago (testuinguru honetan)"
+msgstr "Halako agindurik ez dago (testuinguru honetan)."
 
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Erabili \"/help &lt;komandoa&gt;\" komando zehatz baten laguntza ikusteko.\n"
-"Testuinguru honetan honako komandoak daude eskuragarri:\n"
+"\"/help &lt;agindua&gt;\" erabili ezazu agindu zehatz baten laguntza "
+"ikusteko.\n"
+"Agindu hauek erabil ditzakezu testuinguru honetan:\n"
 
 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
 msgstr ""
+"%s ez da baliozko mezu-klasea. '/help msgcolor' ikusi ezazu baliozko mezu-"
+"klaseen bila."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr ""
+"%s ez da baliozko kolorea. '/help msgcolor' ikusi ezazu baliozko koloreen "
+"bila."
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;mezua&gt;:  bidali mezua modu normalean, komandorik erabiliko ez "
-"bazenu bezala."
+"say &lt;mezua&gt;:  Mezu bat bidali, agindurik erabiliko ez bazenu bezala."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
-"me &lt;ekintza&gt;:  bidali IRC estiloko ekintza lagun bati edo berriketara."
+"me &lt;ekintza&gt;:  IRC estiloko ekintza bidali lagun bati edo berriketara."
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr ""
-"debug &lt;aukera&gt;: bidali hainbat arazketako informazio uneko solasaldira."
+msgstr "debug &lt;aukera&gt;: Hainbat arazketa-informazio bidali solasaldira."
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "garbitu: Garbitu sosaldiaren scrollback"
+msgstr "clear: Solasaldia garbitu."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;komandoa&gt;: komando zehatz bati dagokion laguntza."
+msgstr "help &lt;agindua&gt;: Agindu zehatz bati dagokion laguntza."
 
 msgid "users:  Show the list of users in the chat."
-msgstr ""
+msgstr "users:  Berriketan dauden erabiltzaileen zerrenda bistaratu."
 
 msgid "plugins: Show the plugins window."
-msgstr ""
+msgstr "plugins: Plugin-Leihoa bistaratu."
 
 msgid "buddylist: Show the buddylist."
-msgstr ""
+msgstr "buddylist: Lagun-zerrenda bistaratu."
 
 msgid "accounts: Show the accounts window."
-msgstr ""
+msgstr "accounts: Kontu-leihoa bistaratu."
 
 msgid "debugwin: Show the debug window."
-msgstr ""
+msgstr "debugwin: Arazketa-leihoa bistaratu."
 
 msgid "prefs: Show the preference window."
-msgstr ""
+msgstr "prefs: Hobespen-leihoa bistaratu."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr ""
+msgstr "statuses: Gordetako egoeren leihoa bistaratu."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -756,12 +715,17 @@
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
+"msgcolor &lt;klasea&gt; &lt;aurrealdea&gt; &lt;atzealdea&gt;: Solasaldi-"
+"leihoko mezu-klase ezberdinen koloreak ezarri.<br>    &lt;klasea&gt;: "
+"receive, send, highlight, action, timestamp<br>    &lt;aurrealdea/"
+"atzealdea&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>ADIBIDEA:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
-msgstr "Ezin da fitxategia ireki."
+msgstr "Ezin fitxategia ireki."
 
 msgid "Debug Window"
-msgstr "Arazketa-leihoa"
+msgstr "Arazketa-Leihoa"
 
 #. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
 #. * it's necessary to make the width of the debug window resizable ... like I said,
@@ -770,25 +734,24 @@
 msgid "Clear"
 msgstr "Garbitu"
 
-#, fuzzy
 msgid "Filter:"
-msgstr "Iragazgailua"
+msgstr "Iragazkia:"
 
 msgid "Pause"
 msgstr "Pausarazi"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
-msgstr[0] "Fitxategi transferentzia hona %s huts egin du."
-msgstr[1] "Fitxategi transferentzia hona %s huts egin du."
+msgstr[0] "Fitxategi-Transferentziak - %d%%, fitxategi %detik"
+msgstr[1] "Fitxategi-Transferentziak - %d%%, %d fitxategitatik"
 
 #. Create the window.
 msgid "File Transfers"
-msgstr "Fitxategi-transferentziak"
+msgstr "Fitxategi-Transferentziak"
 
 msgid "Progress"
-msgstr "Aurrerabidea"
+msgstr "Progresua"
 
 msgid "Filename"
 msgstr "Fitxategi-izena"
@@ -796,31 +759,27 @@
 msgid "Size"
 msgstr "Tamaina"
 
-#, fuzzy
 msgid "Speed"
-msgstr "Abiadura:"
+msgstr "Abiadura"
 
 msgid "Remaining"
-msgstr "Falta:"
+msgstr "Faltan"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 msgid "Status"
 msgstr "Egoera"
 
-#, fuzzy
 msgid "Close this window when all transfers finish"
-msgstr "Lehio hau itxi transferentzia guztiak amaitu direnean"
-
-#, fuzzy
+msgstr "Leiho hau itxi transferentzia guztiak amaitzean"
+
 msgid "Clear finished transfers"
-msgstr "_Garbitu amaitutako transferentziak "
-
-#, fuzzy
+msgstr "Amaitutako transferentziak garbitu"
+
 msgid "Stop"
-msgstr "Hiptop"
+msgstr "Gelditu"
 
 msgid "Waiting for transfer to begin"
-msgstr "Transferentziaren zain hasteko"
+msgstr "Transferentzia hasteko zain"
 
 msgid "Canceled"
 msgstr "Bertan behera utzi da"
@@ -828,40 +787,36 @@
 msgid "Failed"
 msgstr "Huts egin du"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KB/s"
-
-#, fuzzy
+msgstr "%.2f KiB/s"
+
 msgid "Sent"
-msgstr "_Ezarri"
-
-#, fuzzy
+msgstr "Bidalita"
+
 msgid "Received"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Jasota"
 
 msgid "Finished"
 msgstr "Amaituta"
 
 #, c-format
 msgid "The file was saved as %s."
-msgstr ""
-
-#, fuzzy
+msgstr "%s bezala gorde da fitxategia."
+
 msgid "Sending"
-msgstr "_Bidali"
-
-#, fuzzy
+msgstr "Bidaltzen"
+
 msgid "Receiving"
-msgstr "Falta:"
-
-#, fuzzy, c-format
+msgstr "Jasotzen"
+
+#, c-format
 msgid "Conversation in %s on %s"
-msgstr "Solasaldiak %s(r)ekin "
-
-#, fuzzy, c-format
+msgstr "Solasaldia %s(en), %s(e)n"
+
+#, c-format
 msgid "Conversation with %s on %s"
-msgstr "Solasaldiak %s(r)ekin"
+msgstr "Solasaldiak %s(r)ekin, %s(e)n"
 
 msgid "%B %Y"
 msgstr "%B %Y"
@@ -870,141 +825,130 @@
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
-"Gertaeren sistemak bakarrik egunkarian gordeko du \" Log all status changes "
-"to system log\" ezarpena ahalbidetuab badago."
+"Sistemaren gertaerak txostenean gordetzeko, \"Egoera-aldaketa guztiak gorde "
+"sistemaren txostenean\" gaituta egon behar da."
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
-"Beheralako mezuak egunkarian gordeko dira bakarrik  \"Log all instant "
-"messages\"  ezarpena ahalbidetua badago."
+"Istanteko mezuak txostenean gordetzeko, \"Istanteko mezu guztiak gorde "
+"txostenean\" gaituta egon behar da."
 
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Berriketak egunkarian gordeko dira bakarrik  \"Log all chats\"  ezarpena "
-"ahalbidetua badago."
+"Berriketak txostenean gordetzeko, \"Berriketa guztiak gorde txostenean\" "
+"gaituta egon behar da."
 
 msgid "No logs were found"
-msgstr "Ez da egunkaririk topatu"
+msgstr "Ez da txostenik aurkitu"
 
 msgid "Total log size:"
-msgstr "Egunkari-tamaina totala:"
+msgstr "Txosten-tamaina totala:"
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "Korritu/Bilatu:"
 
 #, c-format
 msgid "Conversations in %s"
-msgstr "Solasaldiak %s(r)ekin "
+msgstr "Solasaldiak %s(e)n"
 
 #, c-format
 msgid "Conversations with %s"
 msgstr "Solasaldiak %s(r)ekin"
 
-#, fuzzy
 msgid "All Conversations"
-msgstr "Solasaldiak"
+msgstr "Solasaldi Guztiak"
 
 msgid "System Log"
-msgstr "Sistemaren egunkaria"
-
-#, fuzzy
+msgstr "Sistemaren Txostena"
+
 msgid "Calling ... "
-msgstr "Kalkulatzen..."
+msgstr "Deitzen ... "
 
 msgid "Hangup"
-msgstr ""
+msgstr "Eskegi"
 
 #. Number of actions
-#, fuzzy
 msgid "Accept"
-msgstr "_Onartu"
-
-#, fuzzy
+msgstr "Onartu"
+
 msgid "Reject"
-msgstr "Berrezarri"
+msgstr "Ezetsi"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "Deia burutzen."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "Deia amaitu da."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s(e)k audio-sesio bat hasiarazi nahi du zurekin."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s zurekin media ezezaguneko sesio bat hasiarazi nahian dabil."
+
 msgid "You have rejected the call."
-msgstr "%s%s kanaletik irten zara"
+msgstr "Deia ezetsi duzu."
 
 msgid "call: Make an audio call."
-msgstr ""
-
-#, fuzzy
+msgstr "call: Audio-dei bat burutu."
+
 msgid "Emails"
-msgstr "Helbide elektronikoa"
+msgstr "E-postak"
 
 msgid "You have mail!"
-msgstr ""
-
-#, fuzzy
+msgstr "Posta daukazu!"
+
 msgid "Sender"
-msgstr "Sexua"
+msgstr "Igorlea"
 
 msgid "Subject"
 msgstr "Gaia"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s erabiltzaileak mezu berri %d du."
-msgstr[1] "%s erabiltzaileak %d mezu berri ditu."
+msgstr[0] "%s (%s), mezu berri %d."
+msgstr[1] "%s (%s), %d mezu berri."
 
 msgid "New Mail"
-msgstr "Post _berria"
+msgstr "Posta Berria"
 
 #, c-format
 msgid "Info for %s"
 msgstr "%s(r)en inf."
 
 msgid "Buddy Information"
-msgstr "Lagunaren datuak"
-
-#, fuzzy
+msgstr "Lagunaren Informazioa"
+
 msgid "Continue"
-msgstr "Konektatu"
+msgstr "Jarraitu"
 
 msgid "IM"
-msgstr "BM"
+msgstr "IM"
 
 msgid "Invite"
 msgstr "Gonbidatu"
 
-#, fuzzy
 msgid "(none)"
-msgstr "(ez dago izenik)"
-
-#, fuzzy
+msgstr "(batere ez)"
+
 msgid "URI"
-msgstr "UINa"
+msgstr "URI"
 
 msgid "ERROR"
-msgstr ""
-
-#, fuzzy
+msgstr "ERROREA"
+
 msgid "loading plugin failed"
-msgstr "Ping-ek huts egin du"
+msgstr "ezin plugina kargatu"
 
 msgid "unloading plugin failed"
-msgstr ""
+msgstr "ezin plugina deskargatu"
 
 #, c-format
 msgid ""
@@ -1015,38 +959,41 @@
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
+"Izena: %s\n"
+"Bertsioa: %s\n"
+"Azalpena: %s\n"
+"Egilea: %s\n"
+"Webgunea: %s\n"
+"Fitxategi-izena: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr ""
+msgstr "Plugina kargatu egin behar da konfiguratu ahal izan aurretik."
 
 msgid "No configuration options for this plugin."
-msgstr ""
-
-#, fuzzy
+msgstr "Konfigurazio-aukerarik ez plugin honentzat."
+
 msgid "Error loading plugin"
-msgstr "Pidgin-ek errore bat aurkitu du plugin -a kargatzean"
+msgstr "Errorea plugina kargatzean"
 
 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "Hautatutako fitxategia ez da baliozko plugina."
 
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
-
-#, fuzzy
+"Arazketa-leihoa ireki eta berriro saiatu zaitez errore-mezu zehatza ikusteko."
+
 msgid "Select plugin to install"
-msgstr "Hautatu fitxategia"
-
-#, fuzzy
+msgstr "Instalatuko den plugina hautatu"
+
 msgid "You can (un)load plugins from the following list."
-msgstr "Lagun hauen baimenaren zain zaude"
+msgstr "Zerrenda honetako pluginak kargatu/deskargatu ditzakezu."
 
 msgid "Install Plugin..."
-msgstr ""
-
-#, fuzzy
+msgstr "Plugina Instalatu..."
+
 msgid "Configure Plugin"
-msgstr "Pl_uing-a konfiguratu"
+msgstr "Plugina Konfiguratu"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1057,130 +1004,108 @@
 msgstr "Hobespenak"
 
 msgid "Please enter a buddy to pounce."
-msgstr "Adierazi lagun bat alerta emateko."
+msgstr "Alertarako lagun bat hautatu ezazu."
 
 msgid "New Buddy Pounce"
-msgstr "Lagun-alerta berria"
+msgstr "Lagun-Alerta Berria"
 
 msgid "Edit Buddy Pounce"
-msgstr "Editatu lagun-alerta"
-
-#, fuzzy
+msgstr "Lagun-Alerta Editatu"
+
 msgid "Pounce Who"
-msgstr "Alerta nori"
+msgstr "Alerta Nori"
 
 #. Account:
 msgid "Account:"
 msgstr "Kontua:"
 
-#, fuzzy
 msgid "Buddy name:"
-msgstr "_Lagunaren izena:"
+msgstr "Lagunaren izena:"
 
 #. Create the "Pounce When Buddy..." frame.
-#, fuzzy
 msgid "Pounce When Buddy..."
-msgstr "Alerta noiz"
-
-#, fuzzy
+msgstr "Alerta Eman Laguna..."
+
 msgid "Signs on"
-msgstr "_Konektatzean "
-
-#, fuzzy
+msgstr "Konektatzean "
+
 msgid "Signs off"
-msgstr "_Deskonektzean "
-
-#, fuzzy
+msgstr "Deskonektzean "
+
 msgid "Goes away"
-msgstr "Joanda egoera joan"
-
-#, fuzzy
+msgstr "Kanpora joatean"
+
 msgid "Returns from away"
-msgstr "J_oanda egoeratik itzuli"
-
-#, fuzzy
+msgstr "Itzultzean"
+
 msgid "Becomes idle"
-msgstr "Bihurtu ez-aktibo"
-
-#, fuzzy
+msgstr "Inaktibo geratzean"
+
 msgid "Is no longer idle"
-msgstr "Ez da luzeagoz ez-aktibo egongo"
-
-#, fuzzy
+msgstr "Aktibatzean"
+
 msgid "Starts typing"
-msgstr "_Idazten hastean"
-
-#, fuzzy
+msgstr "Idazten hastean"
+
 msgid "Pauses while typing"
-msgstr "Erabiltzailea idazten ari da..."
-
-#, fuzzy
+msgstr "Idazteari uztean"
+
 msgid "Stops typing"
-msgstr "_Idazteari gelditu"
-
-#, fuzzy
+msgstr "Idazteari uztean"
+
 msgid "Sends a message"
-msgstr "Bidali _mezua"
+msgstr "Mezua bidaltzean"
 
 #. Create the "Action" frame.
 msgid "Action"
-msgstr "Akzioa"
-
-#, fuzzy
+msgstr "Ekintza"
+
 msgid "Open an IM window"
-msgstr "_Ireki BM leiho bat "
-
-#, fuzzy
+msgstr "IM leiho bat ireki"
+
 msgid "Pop up a notification"
-msgstr "_Ireki jakinarazpen-leihoa "
-
-#, fuzzy
+msgstr "Jakinarazpen-leihoa ireki"
+
 msgid "Send a message"
-msgstr "Bidali _mezua"
-
-#, fuzzy
+msgstr "Mezua bidali"
+
 msgid "Execute a command"
-msgstr "_Exekutatu komando bat"
-
-#, fuzzy
+msgstr "Agindua exekutatu"
+
 msgid "Play a sound"
-msgstr "_Jo soinu bat"
+msgstr "Soinua erreproduzitu"
 
 # , fuzzy
-#, fuzzy
 msgid "Pounce only when my status is not Available"
-msgstr "P_ounce bakarrik nire egoera eskuragarri ez nagoenean"
-
-#, fuzzy
+msgstr "Nire egoera 'Eskuragaitz' denean bakarrik eman alertak."
+
 msgid "Recurring"
-msgstr "Errepikatzean"
-
-#, fuzzy
+msgstr "Errepikakorra"
+
 msgid "Cannot create pounce"
-msgstr "Ezin da goitizena aldatu"
+msgstr "Ezin alerta sortu"
 
 msgid "You do not have any accounts."
-msgstr ""
+msgstr "Ez daukazu konturik"
 
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "Kontu bat sortu behar duzu alertak sortu ahal izan aurretik."
 
 # , fuzzy
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
-
-#, fuzzy
+msgstr "Ziur al zaude %s-rako %s-ren alerta ezabatu nahi duzula?"
+
 msgid "Buddy Pounces"
-msgstr "Lagun-alerta berria"
+msgstr "Lagun-Alertak"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s idazten hasi zaizu (%s)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s idazten hasi zaizu (%s)"
+msgstr "%s gelditu egin da zuri idatzi bitartean (%s)"
 
 #, c-format
 msgid "%s has signed on (%s)"
@@ -1212,14 +1137,13 @@
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s bidali mezu bat bidali dizu  (%s)"
+msgstr "%s(e)k mezu bat bidali dizu (%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "Alerta emateko gertaera ezezaguna. Eman honen berri!"
-
-#, fuzzy
+msgstr "Alerta-gertaera ezezaguna. Eman honen berri!"
+
 msgid "Based on keyboard use"
-msgstr "Teklatu edo saguaren erabilpenean oinarrituta"
+msgstr "Teklatuaren erabilpenean oinarrituta"
 
 msgid "From last sent message"
 msgstr "Bidalitako azkeneko mezutik"
@@ -1227,87 +1151,72 @@
 msgid "Never"
 msgstr "Inoiz ez"
 
-#, fuzzy
 msgid "Show Idle Time"
-msgstr "/Lagunak/Erakutsi ez-aktibo Denbora"
-
-#, fuzzy
+msgstr "Inaktibotasun-Denbora Erakutsi"
+
 msgid "Show Offline Buddies"
-msgstr "/Lagunak/Erakutsi Lineaz kanpoko lagunak"
-
-#, fuzzy
+msgstr "Offline Lagunak Erakutsi"
+
 msgid "Notify buddies when you are typing"
-msgstr "Jakinarazi _lagunei idazten ari zatzaizkienean"
-
-#, fuzzy
+msgstr "Idazten ari zarela jakinarazi lagunei"
+
 msgid "Log format"
-msgstr "_Egunkari-formatua: "
+msgstr "Txosten-formatua"
 
 msgid "Log IMs"
-msgstr ""
-
-#, fuzzy
+msgstr "Txostenean gorde IMak"
+
 msgid "Log chats"
-msgstr "Erreg_istratu egunkarian berriketa guztiak"
-
-#, fuzzy
+msgstr "Txostenean gorde solasaldiak"
+
 msgid "Log status change events"
-msgstr "Egunkarian gorde _egoera aldaketa guztiak egunkari sistema bidez"
-
-#, fuzzy
+msgstr "Txostenean gorde egoera-aldaketak"
+
 msgid "Report Idle time"
-msgstr "Ezagutarazi _inaktibotasun-denborak"
-
-#, fuzzy
+msgstr "Inaktibotasun-Denboraren Berri Eman"
+
 msgid "Change status when idle"
-msgstr "Egoera aldatu _ez-aktibo dagoenean"
-
-#, fuzzy
+msgstr "Egoera aldatu inaktibo egotean"
+
 msgid "Minutes before changing status"
-msgstr "_Egoera aldatu aurreko minutuak:"
-
-#, fuzzy
+msgstr "Egoera aldatu aurreko minutuak"
+
 msgid "Change status to"
-msgstr "_Egoera  aldatu hona:"
+msgstr "Egoera honetara aldatu"
 
 msgid "Conversations"
 msgstr "Solasaldiak"
 
 msgid "Logging"
-msgstr "Egunkaria"
-
-#, fuzzy
+msgstr "Txostenak"
+
 msgid "You must fill all the required fields."
-msgstr "Bete harpidetzarako eremuak"
-
-#, fuzzy
+msgstr "Beharrezko eremu guztiak bete behar dituzu."
+
 msgid "The required fields are underlined."
-msgstr "Behar den %s plugin-a ezin da kargatu."
-
-#, fuzzy
+msgstr "Beharrezko eremuak azpimarratuta daude."
+
 msgid "Not implemented yet."
-msgstr "Eginbidea ez da inplementatu"
+msgstr "Inplementatu gabe oraindik."
 
 msgid "Save File..."
-msgstr "Gorde fitxategia..."
+msgstr "Fitxategia Gorde..."
 
 msgid "Open File..."
-msgstr "Ireki fitxategia..."
-
-#, fuzzy
+msgstr "Fitxategia Ireki..."
+
 msgid "Choose Location..."
-msgstr "Kokalekua"
+msgstr "Kokalekua Hautatu..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr ""
-
-#, fuzzy
+msgstr "'Entrar' sakatu ezazu kategoria honetako gela gehiago aurkitzeko."
+
 msgid "Get"
-msgstr "_Ezarri"
+msgstr "Eskuratu"
 
 #. Create the window.
 msgid "Room List"
-msgstr "Gelen zerrenda"
+msgstr "Gela-Zerrenda"
 
 msgid "Buddy logs in"
 msgstr "Laguna konektatu da"
@@ -1325,10 +1234,10 @@
 msgstr "Mezua bidali da"
 
 msgid "Person enters chat"
-msgstr "Pertsona bat sartu da berriketan"
+msgstr "Pertsona bat berriketan sartu da"
 
 msgid "Person leaves chat"
-msgstr "Pertsona bat irten da berriketatik"
+msgstr "Pertsona bat berriketatik irten da"
 
 msgid "You talk in chat"
 msgstr "Berriketan ari zara"
@@ -1336,95 +1245,81 @@
 msgid "Others talk in chat"
 msgstr "Beste batzuk berriketan ari dira"
 
-#, fuzzy
 msgid "Someone says your username in chat"
-msgstr "Norbaitek zure pantaila-izena esan du berriketan"
-
-#, fuzzy
+msgstr "Norbaitek zure erabiltzaile-izena dio solasaldian"
+
 msgid "GStreamer Failure"
-msgstr "Gorde fitxategia"
-
-#, fuzzy
+msgstr "GStreamer Errorea"
+
 msgid "GStreamer failed to initialize."
-msgstr "desenpetatzerakoan huts egin du."
+msgstr "Ezin GStreamer hasiarazi."
 
 msgid "(default)"
-msgstr ""
-
-#, fuzzy
+msgstr "(lehenetsia)"
+
 msgid "Select Sound File ..."
-msgstr "Hautatu karpeta..."
-
-#, fuzzy
+msgstr "Soinu-Fitxategia Hautatu..."
+
 msgid "Sound Preferences"
-msgstr "Hobespenak"
-
-#, fuzzy
+msgstr "Soinu-Hobespenak"
+
 msgid "Profiles"
-msgstr "MSN profila"
+msgstr "Profilak"
 
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#, fuzzy
 msgid "Console Beep"
-msgstr "Kontsolaren soinu-seinalea"
+msgstr "Kontsolaren Soinua"
 
 msgid "Command"
-msgstr "Komandoa"
-
-#, fuzzy
+msgstr "Agindua"
+
 msgid "No Sound"
-msgstr "Soinurik ez"
+msgstr "Soinurik Ez"
 
 msgid "Sound Method"
-msgstr "Soinu-metodoa"
-
-#, fuzzy
+msgstr "Soinu-Metodoa"
+
 msgid "Method: "
-msgstr "_Metodoa:"
-
-#, fuzzy, c-format
+msgstr "Metodoa:"
+
+#, c-format
 msgid ""
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Soinuaren k_omandoa:\n"
+"Soinu-Agindua:\n"
 "(%s fitxategi-izena)"
 
 #. Sound options
 msgid "Sound Options"
-msgstr "Soinu-aukerak"
-
-#, fuzzy
+msgstr "Soinu-Aukerak"
+
 msgid "Sounds when conversation has focus"
-msgstr "_Solasaldiak fokua duenean"
+msgstr "Solasaldiak fokua dueneko soinuak"
 
 msgid "Always"
 msgstr "Beti"
 
-#, fuzzy
 msgid "Only when available"
-msgstr "Ez erabilgarri"
-
-#, fuzzy
+msgstr "Eskuragarri egotean bakarrik"
+
 msgid "Only when not available"
-msgstr "Ez dago erabilgarri"
-
-#, fuzzy
+msgstr "Eskuragaitz egotean bakarrik"
+
 msgid "Volume(0-100):"
-msgstr "Bolumena:"
+msgstr "Bolumena(0-100):"
 
 #. Sound events
 msgid "Sound Events"
-msgstr "Soinu-gertaerak"
+msgstr "Soinu-Gertaerak"
 
 msgid "Event"
 msgstr "Gertaera"
 
-#, fuzzy
 msgid "File"
-msgstr "Iragazgailua"
+msgstr "Fitxategia"
 
 msgid "Test"
 msgstr "Probatu"
@@ -1433,21 +1328,20 @@
 msgstr "Berrezarri"
 
 msgid "Choose..."
-msgstr "Aukeratu..."
-
-#, fuzzy, c-format
+msgstr "Hautatu..."
+
+#, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Ziur zaude %s ezabatu nahi duzula?"
-
-#, fuzzy
+msgstr "Ziur zaude \"%s\" ezabatu nahi duzula?"
+
 msgid "Delete Status"
-msgstr "Egoera linean"
+msgstr "Egoera Ezabatu"
 
 msgid "Saved Statuses"
-msgstr "Gorde egoerak"
+msgstr "Egoera Gordeak"
 
 msgid "Title"
-msgstr "Lanpostua"
+msgstr "Titulua"
 
 msgid "Type"
 msgstr "Mota "
@@ -1464,142 +1358,125 @@
 msgstr "Mezua"
 
 #. Use
-#, fuzzy
 msgid "Use"
-msgstr "_Erabili"
-
-#, fuzzy
+msgstr "Erabili"
+
 msgid "Invalid title"
-msgstr "authzid baliogabea"
+msgstr "Titulu baliogabea"
 
 msgid "Please enter a non-empty title for the status."
-msgstr ""
-
-#, fuzzy
+msgstr "Zerbait idatzi ezazu egoeraren titulurako."
+
 msgid "Duplicate title"
-msgstr "Bikoiztutako zuzenketa"
-
-#, fuzzy
+msgstr "Bikoiztutako titulua"
+
 msgid "Please enter a different title for the status."
-msgstr "Erabili egoera _ezbedinak kontu batzuentzat"
-
-#, fuzzy
+msgstr "Titulu ezberdin bat idatz ezazu egoerarako."
+
 msgid "Substatus"
-msgstr "Egoera"
+msgstr "Azpiegoera"
 
 msgid "Status:"
 msgstr "Egoera:"
 
-#, fuzzy
 msgid "Message:"
-msgstr "_Mezua:"
-
-#, fuzzy
+msgstr "Mezua:"
+
 msgid "Edit Status"
-msgstr "Egoera zibila"
-
-#, fuzzy
+msgstr "Egoera Editatu"
+
 msgid "Use different status for following accounts"
-msgstr "Erabili egoera _ezbedinak kontu batzuentzat"
+msgstr "Egoera ezberdina erabili kontu hauentzako"
 
 #. Save & Use
-#, fuzzy
 msgid "Save & Use"
-msgstr "G_orde eta erabili"
+msgstr "Gorde eta erabili"
 
 msgid "Certificates"
-msgstr ""
+msgstr "Zertifikatuak"
 
 msgid "Sounds"
 msgstr "Soinuak"
 
-#, fuzzy
 msgid "Statuses"
-msgstr "Egoera"
-
-#, fuzzy
+msgstr "Egoerak"
+
 msgid "Error loading the plugin."
-msgstr "Pidgin-ek errore bat aurkitu du plugin -a kargatzean"
-
-#, fuzzy
+msgstr "Errorea plugina kargatzean."
+
 msgid "Couldn't find X display"
-msgstr "Ezin da fitxategia ireki."
-
-#, fuzzy
+msgstr "Ezin X pantaila aurkitu"
+
 msgid "Couldn't find window"
-msgstr "Ezin da fitxategia ireki."
+msgstr "Ezin leihoa aurkitu"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "Ezin da plugin hau kargatu, ez zelako X11 jasateko eraiki."
 
 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 "
 "X, if possible."
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s just signed on"
-msgstr "%s konektatu da bertan."
-
-#, fuzzy, c-format
+msgstr "%s konektatu da"
+
+#, c-format
 msgid "%s just signed off"
-msgstr "%s deskonektatu da ."
-
-#, fuzzy, c-format
+msgstr "%s deskonektatu da"
+
+#, c-format
 msgid "%s sent you a message"
-msgstr "%s bidali mezu bat bidali dizu  (%s)"
+msgstr "%s(e)k mezu bat bidali dizu"
 
 #, c-format
 msgid "%s said your nick in %s"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%s(e)k zure ezizena esan du %s(e)n"
+
+#, c-format
 msgid "%s sent a message in %s"
-msgstr "%s bidali mezu bat bidali dizu  (%s)"
-
-#, fuzzy
+msgstr "%s(e)k mezu bat bidali du %s(e)n"
+
 msgid "Buddy signs on/off"
-msgstr "Laguna _konektatu/deskonektatu"
+msgstr "Laguna konektatu/deskonektatu da"
 
 msgid "You receive an IM"
-msgstr ""
-
-#, fuzzy
+msgstr "IM bat jasotzen duzunean"
+
 msgid "Someone speaks in a chat"
-msgstr "Norbaitek zure pantaila-izena esan du berriketan"
-
-#, fuzzy
+msgstr "Norbaitek solasaldi batean hitz egiten duenean"
+
 msgid "Someone says your name in a chat"
-msgstr "Norbaitek zure pantaila-izena esan du berriketan"
+msgstr "Norbaitek zure erabiltzaile-izena dionean solasaldian"
 
 msgid "Notify with a toaster when"
-msgstr ""
+msgstr "'Toaster' batekin jakinarazi"
 
 msgid "Beep too!"
-msgstr ""
+msgstr "Soinua ere egin!"
 
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "URGENT bezala markatu terminalaren leihoa"
 
 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"
 
 msgid "Toaster plugin"
-msgstr ""
+msgstr "'Toaster' plugina"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>Solasaldia honekin  %s  hemen %s:</b><br>"
+msgstr "<b>%s(r)ekin solasaldia, %s(e)n:</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr "Historia Plugin-a logeatzea eskatzen du"
+msgstr "Historia Pluginak Txostena behar du"
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1607,14 +1484,13 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"Logeatzea aktibatu daiteke Erabilpenal -> Ezarpenak -> Logeoa. \n"
-"\n"
-"Log-ak ahalbidetu berehalako mezu eta/edo txat-entzat; historia aktibatuko "
-"da elkarrizketa solasaldi antzekoentzat."
-
-#, fuzzy
+"Txostenak gaitzeko: Tresnak-> Hobespenak -> Txostenak. \n"
+"\n"
+"Istanteko mezularitzarako edo berriketetarako txostenak gaituz gero, "
+"solasaldi-mota berdinetarako ere gaituko da."
+
 msgid "GntHistory"
-msgstr "Historia"
+msgstr "GntHistoria"
 
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Azkenaldiko solasaldiak erakusten ditu solasaldi berrietan."
@@ -1623,107 +1499,103 @@
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"Solasaldi berri bat irekitzean, plugin honek azken solasaldia uneko "
-"solasaldian sartuko du."
+"Solasaldi berri bat irekitzean, plugin honek azken solasaldia sartuko du "
+"solasaldi berrian."
 
 msgid "Online"
-msgstr "Linean"
+msgstr "Konektatuta"
 
 msgid "Offline"
-msgstr "Lineaz kanpo"
-
-#, fuzzy
+msgstr "Deskonektatuta"
+
 msgid "Online Buddies"
-msgstr "Bilatu lagunak"
-
-#, fuzzy
+msgstr "Online Lagunak"
+
 msgid "Offline Buddies"
-msgstr "Bilatu lagunak"
-
-#, fuzzy
+msgstr "Offline Lagunak"
+
 msgid "Online/Offline"
-msgstr "Noiztik linean"
+msgstr "Online/Offline"
 
 msgid "Meebo"
-msgstr ""
-
-#, fuzzy
+msgstr "Meebo"
+
 msgid "No Grouping"
-msgstr "Soinurik ez"
+msgstr "Taldekatzerik Ez"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "Azpitalde Habikatua"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
-
-#, fuzzy
+msgstr "Azpitalde Habikatuak (experimentala)"
+
 msgid "Provides alternate buddylist grouping options."
-msgstr "Evolution-ekin integrazioa ahalbidetzen du."
+msgstr "Lagun-zerrenda taldekatzeko beste aukera batzuk eskaintzen ditu."
 
 msgid "Lastlog"
-msgstr ""
+msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr ""
+msgstr "lastlog: Kate bat bilatzen du txostenean."
 
 msgid "GntLastlog"
-msgstr ""
+msgstr "GntLastlog"
 
 msgid "Lastlog plugin."
-msgstr ""
+msgstr "Lastlog plugina"
 
 #, c-format
 msgid ""
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"TinyURLa eskuratzen..."
 
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "Luzera hau edo gehiago url-entzat bakarrik sortu TinyURLak"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "TinyURL (edo antzekoak) helbide-aurrizkia"
+
 msgid "TinyURL"
-msgstr "URLa"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "TinyURL plugina"
 
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "URLa(k) dituen mezu bat jasotzean, TinyURL erabili errazago kopiatzeko"
 
 msgid "accounts"
-msgstr "Kontuak "
+msgstr "kontuak "
 
 msgid "Password is required to sign on."
-msgstr "Pasahitza beharrezkoa konektatzeko"
+msgstr "Pasahitza beharrezkoa konektatzeko."
 
 #, c-format
 msgid "Enter password for %s (%s)"
-msgstr "Idatzi %s(r)en (%s) pasahitza"
+msgstr "%s(r)en (%s) pasahitza idatzi"
 
 msgid "Enter Password"
-msgstr "Sartu Pasahitza"
+msgstr "Pasahitza Sartu"
 
 msgid "Save password"
-msgstr "Pasahitz gorde"
+msgstr "Pasahitza Gorde"
 
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "%s - protokoloaren plugin-a falta da"
+msgstr "%s(r)entzako protokolo-plugina falta da"
 
 msgid "Connection Error"
-msgstr "Konexio-errorea"
+msgstr "Konexio-Errorea"
 
 msgid "New passwords do not match."
 msgstr "Pasahitz berriak ez datoz bat."
 
 msgid "Fill out all fields completely."
-msgstr "Bete guztiz eremu guztiak."
+msgstr "Eremu guztiak osorik bete."
 
 msgid "Original password"
 msgstr "Pasahitz zaharra"
@@ -1736,17 +1608,17 @@
 
 #, c-format
 msgid "Change password for %s"
-msgstr "Aldatu %s erabiltzailearen pasahitza"
+msgstr "%s(r)en pasahitza aldatu"
 
 msgid "Please enter your current password and your new password."
-msgstr "Idatzi orain arteko pasahitza eta pasahitz berria."
+msgstr "Oraingo pasahitza eta pasahitz berria idatzi itzazu."
 
 #, c-format
 msgid "Change user information for %s"
-msgstr "Aldatu %s erabiltzailearen datuak"
+msgstr "%s erabiltzailearen datuak aldatu"
 
 msgid "Set User Info"
-msgstr "Ezarri erabiltzailearen datuak"
+msgstr "Erabiltzailearen Datuak Ezarri"
 
 msgid "Unknown"
 msgstr "Ezezaguna"
@@ -1755,30 +1627,32 @@
 msgstr "Lagunak"
 
 msgid "buddy list"
-msgstr "Lagunen zerrenda "
+msgstr "lagun-zerrenda"
 
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(EZ DATOR BAT)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s(e)k zertifikatu hau aurkeztu du oraingoan behintzat erabiltzeko:"
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Izen arrunta: %s %s\n"
+"Hatz-marka (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Erabilera bakarreko Zertifikatuaren Egiaztapena"
 
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "Zertifikatu-Autoritateak"
 
 #. Scheme name
 #. Pool name
@@ -1786,16 +1660,54 @@
 msgstr ""
 
 #. Make messages
-#, fuzzy, c-format
+#, c-format
 msgid "Accept certificate for %s?"
-msgstr "Berriketarako gonbita onartu nahi duzu?"
+msgstr "%s(e)rako zertifikatua onartu?"
 
 #. 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.
+#. * 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-Zertifikatu Errorea"
+
+msgid "Invalid certificate chain"
+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
+#. * 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 ""
+"Ez daukazu erro-zertifikatu datubaserik, beraz, ezin da zertifikatua "
+"egiaztatu."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
@@ -1804,34 +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 ""
-
-#. 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
-#, fuzzy
-msgid "SSL Certificate Error"
-msgstr "Idazketa-errorea "
-
-#, fuzzy
-msgid "Invalid certificate chain"
-msgstr "Baimen-mekanismoa ez da baliozkoa"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-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 ""
@@ -1839,19 +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 ""
-
-#. 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 ""
+msgstr "Zertifikatu-autoritate sinadura baliogabea"
 
 #. Make messages
 #, c-format
@@ -1863,52 +1751,54 @@
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Izen arrunta: %s\n"
+"\n"
+"Hatz-marka (SHA1): %s\n"
+"\n"
+"Aktibazio-data: %s\n"
+"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
+msgstr "Erregistratze-Errorea"
+
 msgid "Unregistration Error"
-msgstr "Erregistratze-errorea"
+msgstr "Deserregistratze-Errorea"
 
 #, c-format
 msgid "+++ %s signed on"
-msgstr "+++%s sartu da"
+msgstr "+++ %s sartu da"
 
 #, c-format
 msgid "+++ %s signed off"
-msgstr "+++%s irten egin da"
+msgstr "+++ %s irten egin da"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
 msgid "Unable to send message: The message is too large."
-msgstr "Ezin da mezua bidali: mezua handiegia da."
+msgstr "Ezin mezua bidali: Mezua luzeegia da."
 
 #, c-format
 msgid "Unable to send message to %s."
-msgstr "Ezin zaio mezua bidali %s(r)i."
+msgstr "Ezin mezua bidali %s(r)i."
 
 msgid "The message is too large."
 msgstr "Mezua luzeegia da."
 
 msgid "Unable to send message."
-msgstr "Ezin da mezua bidali."
-
-#, fuzzy
+msgstr "Ezin mezua bidali."
+
 msgid "Send Message"
-msgstr "Bidali _mezua"
-
-#, fuzzy
+msgstr "Mezua Bidali"
+
 msgid "_Send Message"
-msgstr "Bidali _mezua"
+msgstr "Mezua _Bidali"
 
 #, c-format
 msgid "%s entered the room."
@@ -1934,75 +1824,71 @@
 msgid "%s left the room (%s)."
 msgstr "%s gelatik irten da (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "Konferentziara gonbidatu"
+msgstr "Solasaldira gonbidatu"
 
 #. Put our happy label in it.
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
-"Idatzi gonbidatu nahi duzun erabiltzailearen izena, gonbit-mezu batekin nahi "
-"baduzu."
-
-#, fuzzy, c-format
+"Gonbidatu nahi duzun erabiltzailearen izena idatzi ezazu, gonbidapen-mezu "
+"batekin (nahi baduzu)."
+
+#, c-format
 msgid "Failed to get connection: %s"
-msgstr "Ezin da konexio sortu."
-
-#, fuzzy, c-format
+msgstr "Ezin konexioa lortu: %s"
+
+#, c-format
 msgid "Failed to get name: %s"
-msgstr "Huts egin du irudia gordetzean: %s\n"
-
-#, fuzzy, c-format
+msgstr "Ezin izena eskuratu: %s"
+
+#, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Huts egin du irudia gordetzean: %s\n"
+msgstr "Ezin zerbitzari-izena eskuratu: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "Purple-ren D-BUS zerbitzaria ez dago martxan. Arrazoia:"
 
 msgid "No name"
-msgstr "Ez dago izenik"
-
-#, fuzzy
+msgstr "Izenik ez"
+
 msgid "Unable to create new resolver process\n"
-msgstr "Ezin da socket-a sortu"
-
-#, fuzzy
+msgstr "Ezin prozesu konpontzaile berria sortu\n"
+
 msgid "Unable to send request to resolver process\n"
-msgstr "Ezin zaio mezua bidali %s(r)i."
-
-#, fuzzy, c-format
+msgstr "Ezin eskaera bidali prozesu konpontzaileari\n"
+
+#, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Errorea %s irakurtzean: \n"
-"%s\n"
-
-#, fuzzy, c-format
+"Errorea %s konpontzean:\n"
+"%s"
+
+#, c-format
 msgid "Error resolving %s: %d"
-msgstr ""
-"Errorea %s irakurtzean: \n"
-"%s\n"
-
-#, fuzzy, c-format
+msgstr "Errorea %s konpontzean: %d"
+
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "Errorea socket-etik irakurtzean:%s."
+msgstr ""
+"Errorea prozesu konpontzailetik irakurtzean:\n"
+"%s"
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Gure eskaera erantzun gabe amaitu da prozesu konpontzailea"
+
+#, c-format
 msgid "Thread creation failure: %s"
-msgstr "Autentifikazioak huts egin du"
-
-#, fuzzy
+msgstr "Hari-sorrera errorea: %s"
+
 msgid "Unknown reason"
-msgstr "Arrazoi ezezaguna."
+msgstr "Arrazoi ezezaguna"
 
 #, c-format
 msgid ""
@@ -2010,7 +1896,7 @@
 "%s.\n"
 msgstr ""
 "Errorea %s irakurtzean: \n"
-"%s\n"
+"%s.\n"
 
 #, c-format
 msgid ""
@@ -2018,18 +1904,18 @@
 "%s.\n"
 msgstr ""
 "Errorea %s idaztean: \n"
-"%s\n"
+"%s.\n"
 
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
-"Errorea %s sarbidetzean:\n"
-"%s\n"
+"Errorea %s(e)ra sartzean:\n"
+"%s.\n"
 
 msgid "Directory is not writable."
-msgstr ""
+msgstr "Direktorioa ez da idazgarria."
 
 msgid "Cannot send a file of 0 bytes."
 msgstr "Ezin da 0 byteko fitxategirik bidali."
@@ -2051,7 +1937,7 @@
 
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "%s(r)en fitxategi-transferentzia onartu nahi duzu?"
+msgstr "%s(r)en fitxategi-transferentzia onartu?"
 
 #, c-format
 msgid ""
@@ -2065,7 +1951,7 @@
 
 #, c-format
 msgid "%s is offering to send file %s"
-msgstr "%s  fitxategia bidaltzeko %s(r)i eskaria egiten"
+msgstr "%s(e)k fitxategia eskaintzen dizu: %s"
 
 #, c-format
 msgid "%s is not a valid filename.\n"
@@ -2073,18 +1959,22 @@
 
 #, c-format
 msgid "Offering to send %s to %s"
-msgstr "%s bidaltzeko %s(r)i eskaria egiten"
+msgstr "%s bidaltzeko eskaintza egiten %s(r)i"
 
 #, c-format
 msgid "Starting transfer of %s from %s"
-msgstr "Transferentzia hasten hemendik %s hona %s"
+msgstr "%s transferitzen hasten %s-tik"
+
+#, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "<A HREF=\"file://%s\">%s</A> fitxategiaren transferetzia burututa"
 
 #, c-format
 msgid "Transfer of file %s complete"
-msgstr "%s fitxategiaren transferentzia osatu da"
+msgstr "%s fitxategiaren transferentzia burututa"
 
 msgid "File transfer complete"
-msgstr "Fitxategi-transferentzien osatuta"
+msgstr "Fitxategi-transferentzia burututa"
 
 #, c-format
 msgid "You canceled the transfer of %s"
@@ -2095,143 +1985,161 @@
 
 #, c-format
 msgid "%s canceled the transfer of %s"
-msgstr "%s(e)k %s(r)en transferentzia bertan behera utzi du"
+msgstr "%s(e)k bertan behera utzi du transferentzia: %s"
 
 #, c-format
 msgid "%s canceled the file transfer"
-msgstr "%s(e)k fitxategi-transferentzi bertan behera utzi du."
+msgstr "%s(e)k bertan behera utzi du fitxategi-transferentzia"
 
 #, c-format
 msgid "File transfer to %s failed."
-msgstr "Fitxategi transferentzia hona %s huts egin du."
+msgstr "Errorea fitxategia hona bidaltzean: %s"
 
 #, c-format
 msgid "File transfer from %s failed."
-msgstr "Fitxategi transferentzia hemendik %s huts egin du."
+msgstr "Errorea fitxategia hemendik jasotzean: %s"
 
 msgid "Run the command in a terminal"
-msgstr ""
+msgstr "Terminalean exekutatu agindua"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr ""
+msgstr "\"aim\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr ""
+msgstr "\"gg\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr ""
+msgstr "\"icq\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr ""
+msgstr "\"irc\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr ""
+msgstr "\"msnim\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr ""
+msgstr "\"sip\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr ""
+msgstr "\"xmpp\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr ""
+msgstr "\"ymsgr\" URLak kudeatzeko erabilitako agindua, gaituz gero."
 
 msgid "The handler for \"aim\" URLs"
-msgstr ""
+msgstr "\"aim\" URLen kudeatzailea"
 
 msgid "The handler for \"gg\" URLs"
-msgstr ""
+msgstr "\"gg\" URLen kudeatzailea"
 
 msgid "The handler for \"icq\" URLs"
-msgstr ""
+msgstr "\"icq\" URLen kudeatzailea"
 
 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "\"irc\" URLen kudeatzailea"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "\"msnim\" URLen kudeatzailea"
 
 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "\"sip\" URLen kudeatzailea"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "\"xmpp\" URLen kudeatzailea"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "\"ymsgr\" URLen kudeatzailea"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"aim\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"gg\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"icq\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"irc\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"msnim\" URLak kudeatu "
+"beharko balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"sip\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"xmpp\" URLak kudeatu beharko "
+"balitu"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
+"Egia, \"agindua\" gakoan zehaztutako aginduak \"ymsgr\" URLak kudeatu "
+"beharko balitu"
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
+"Egia, URL-mota hau kudeatzeko erabilitako agindua terminalean exekutatu "
+"beharko balitz"
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"aim\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"gg\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"icq\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"irc\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"msnim\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"sip\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"xmpp\" URLak kudeatu beharko lituzkeen"
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr ""
+msgstr "Ea zehaztutako aginduak \"ymsgr\" URLak kudeatu beharko lituzkeen"
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
-"<b><font color=\"red\">Egunkariak ez du irakurtzeko funtziorik</font></b>"
+"<b><font color=\"red\">Txostenak ez dauka irakurtzeko funtziorik</font></b>"
 
 msgid "HTML"
 msgstr "HTML"
@@ -2240,10 +2148,10 @@
 msgstr "Testu arrunta"
 
 msgid "Old flat format"
-msgstr ""
+msgstr "Formatu lau zaharra"
 
 msgid "Logging of this conversation failed."
-msgstr "Solsaldi hau egunkaria gordetzean huts egin du."
+msgstr "Errorea solasaldi hau txostenean sartzean."
 
 msgid "XML"
 msgstr "XML"
@@ -2261,139 +2169,134 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 msgstr ""
-"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;ERANTZUN "
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;ERANTZUN "
 "AUTOMATIKOA&gt;:</b></font> %s<br/>\n"
 
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Ezin da aurkitu egunkarirako bidea!</b></font>"
+msgstr "<font color=\"red\"><b>Ezin txostenerako bidea aurkitu!</b></font>"
 
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>Ezin izan da irakurri fitxategia: %s</b></font>"
+msgstr "<font color=\"red\"><b>Ezin fitxategia irakurri: %s</b></font>"
 
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <ERANTZUN AUTOMATIKOA>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "Errorea konexioa sortzean"
+msgstr "Errorea konferentzia sortzean."
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr ""
+msgstr "%s darabilzu, baina plugin honek %s behar du."
 
 msgid "This plugin has not defined an ID."
-msgstr ""
-
-#, c-format
+msgstr "Plugin honek ez du IDrik zehaztu."
+
+#, fuzzy, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Plugin magikoa gaizki elkartua %d (%d beharrezkoa) "
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "ABI bertsio gaizki elkartua %d.%d.x (%d.%d.x beharrezkoa)"
-
-#, fuzzy
+msgstr "ABI bertsio okerra %d.%d.x (%d.%d.x behar)"
+
 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 ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"Behar den %s plugin-a ez da aurkitu. Instalatu plugin hori, eta saiatu "
-"berriro."
-
-#, fuzzy
+"Ezin beharrezko %s plugina aurkitu. Plugin hori instalatu eta berriro saiatu "
+"zaitez."
+
 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 "Behar den %s plugin-a ezin da kargatu."
-
-#, fuzzy
+msgstr "Ezin beharrezko %s plugina kargatu."
+
 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."
-
-#, fuzzy
+msgstr "%s(e)k %s behar du, baina ezin izan da deskargatu."
+
 msgid "Autoaccept"
-msgstr "_Onartu"
-
-#, fuzzy
+msgstr "Auto-onartu"
+
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "%s(r)en fitxategi-transferentzia onartu nahi duzu?"
-
-#, fuzzy, c-format
+msgstr "Hautatutako erabiltzaileen fitxategi-transferentziak auto-onartu."
+
+#, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "%s(r)en fitxategi-transferentzia onartu nahi duzu?"
+msgstr "\"%s\"(e)ri \"%s\"(e)tik auto-onartutako transferentzia burutu da."
 
 msgid "Autoaccept complete"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Auto-onartzea burututa"
+
+#, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "%s(r)en fitxategi-transferentzia onartu nahi duzu?"
+msgstr "%s(e)tik fitxategi-transferentzia jasotzean"
 
 msgid "Set Autoaccept Setting"
-msgstr ""
-
-#, fuzzy
+msgstr "Auto-onartze Ezarpena Ezarri"
+
 msgid "_Save"
-msgstr "Gorde"
+msgstr "_Gorde"
 
 msgid "_Cancel"
 msgstr "_Utzi"
 
 msgid "Ask"
-msgstr ""
-
-#, fuzzy
+msgstr "Galdetu"
+
 msgid "Auto Accept"
-msgstr "_Onartu"
-
-#, fuzzy
+msgstr "Auto-Onartu"
+
 msgid "Auto Reject"
-msgstr "Gonbita ezetsi da"
-
-#, fuzzy
+msgstr "Auto-Ezetsi"
+
 msgid "Autoaccept File Transfers..."
-msgstr "Fitxategi-transferentziak"
+msgstr "Fitxategi-Transferentziak Auto-Onartu..."
 
 #. XXX: Is there a better way than this? There really should be.
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
-
-#, fuzzy
+"Fitxategiak non gordeko diren\n"
+"(Bide oso bat eman ezazu)"
+
 msgid "Automatically reject from users not in buddy list"
-msgstr "Llagunen zerrendako erabiltzaileak  ahalbidetu bakarrik"
+msgstr "Automatikoki ezetsi lagun-zerrendan ez dauden erabiltzaileak"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-
-#, fuzzy
+"Leihotxo batekin jakinarazi fitxategi-transferentzia auto-onartu bat "
+"burutzean\n"
+"(igorlearekin solasaldirik ez badago bakarrik)"
+
 msgid "Create a new directory for each user"
-msgstr "Aukeratu erabiltzaile direktorioa bilaketarako"
+msgstr "Direktorio berria sortu erabiltzaile bakoitzarentzat"
 
 msgid "Notes"
-msgstr "Oharra "
+msgstr "Oharrak"
 
 msgid "Enter your notes below..."
-msgstr ""
+msgstr "Azpian sartu itzazu zure oharrak..."
 
 msgid "Edit Notes..."
-msgstr ""
+msgstr "Oharrak Editatu..."
 
 #. *< major version
 #. *< minor version
@@ -2403,18 +2306,17 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Buddy Notes"
-msgstr "Lagun-alerta berria"
+msgstr "Lagun-Oharrak"
 
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr ""
+msgstr "Lagun zehatzen inguruko oharrak gorde."
 
 #. *< summary
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
+msgstr "Lagunen inguruko oharrak gorde ahal izateko lagun-zerrendan."
 
 #. *< type
 #. *< ui_requirement
@@ -2422,16 +2324,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Cipher Test"
-msgstr "Zifra"
+msgstr "Zifratu-Proba"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "libpurple-rekin datozen zifratuak probatzen ditu."
 
 #. *< type
 #. *< ui_requirement
@@ -2439,9 +2340,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "DBus Example"
-msgstr "DBus Plugin adibidea"
+msgstr "DBus Adibidea"
 
 #. *< name
 #. *< version
@@ -2456,18 +2356,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "File Control"
-msgstr "Pidgin fitxategien kontrola"
+msgstr "Fitxategi-Kontrola"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Allows control by entering commands in a file."
-msgstr ""
-"Aukera ematen dizu Pidgin kontrolatzeko fitxategi batean komandoak sartuz."
+msgstr "Fitxategi batean sartutako aginduen bidezko kontrola ahalbidetzen du."
 
 msgid "Minutes"
 msgstr "Minutu"
@@ -2475,31 +2372,31 @@
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
 msgid "I'dle Mak'er"
-msgstr "Inaktibo-bihurtzailea"
+msgstr "In'aktibo Mark'a"
 
 msgid "Set Account Idle Time"
-msgstr "Ezarri kontuaren inaktibotasun-denbora"
+msgstr "Kontuaren Inaktibotasun-Denbora Ezarri"
 
 msgid "_Set"
 msgstr "_Ezarri"
 
 msgid "None of your accounts are idle."
-msgstr "Zure kontuetako kideetatik ez dago bat erez ez-aktibo egoeran."
+msgstr "Zure konturik ez dago inaktibo."
 
 msgid "Unset Account Idle Time"
-msgstr "Kendu kontuaren ez-aktibo-denbora"
+msgstr "Kontuaren Inaktibotasun-Denbora Kendu"
 
 msgid "_Unset"
-msgstr "_Ezarpena kendu"
+msgstr "_Kendu"
 
 msgid "Set Idle Time for All Accounts"
-msgstr "Ezarri ez-aktibo denbora kontu guztientzat"
+msgstr "Kontu Guztientzako Inaktibotasun-Denbora Ezarri"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Kendu ez-aktibo denbora kontu guztientzat"
+msgstr "Kontu Guztientzako Inaktibotasun-Denbora Kendu"
 
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Ez-aktibo-denbora kopurua eskuz konfiguratzeko aukera ematen du"
+msgstr "Inaktibo egon zaren denbora eskuz ezartzeko aukera ematen dizu"
 
 #. *< type
 #. *< ui_requirement
@@ -2514,15 +2411,15 @@
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "Bezero gisa IPC euskarria probatzeko plugin-a."
+msgstr "Bezero gisa IPC euskarria probatzeko plugina."
 
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Bezero gisa IPC euskarria probatzeko plugin-a. Zerbitzariaren plugin-a "
-"aurkitzen du, eta erregistratutako komandoei deitzen die."
+"Bezero gisa IPC euskarria probatzeko plugina. Zerbitzariaren plugina "
+"aurkitzen du eta erregistratutako aginduei deitzen die."
 
 #. *< type
 #. *< ui_requirement
@@ -2537,26 +2434,25 @@
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "Zerbitzari gisa IPC euskarria probatzeko plugin-a."
+msgstr "Zerbitzari gisa IPC euskarria probatzeko plugina."
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"Zerbitzari gisa IPC euskarria probatzeko plugin-a. IPC komandoak "
+"Zerbitzari gisa IPC euskarria probatzeko plugina. IPC aginduak "
 "erregistratzen ditu."
 
-#, fuzzy
 msgid "Join/Part Hiding Configuration"
-msgstr "Evolution integratzeko konfigurazioa"
+msgstr "Batu/Irten Ezkutatzearen Konfigurazioa"
 
 msgid "Minimum Room Size"
-msgstr ""
+msgstr "Gela-Tamaina Minimoa"
 
 msgid "User Inactivity Timeout (in minutes)"
-msgstr ""
+msgstr "Erabiltzaile Inaktibitate Denbora-muga (minututan)"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "Lagunei aplikatu ezkutatze arauak"
 
 #. *< type
 #. *< ui_requirement
@@ -2565,119 +2461,111 @@
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr ""
+msgstr "Batu/Irten Ezkutatzea"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Hides extraneous join/part messages."
-msgstr ""
+msgstr "Alferrikako batu/irten mezuak ezkutatzen ditu."
 
 #. *  description
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
+"Plugin honek batu/irten mezuak ezkutatzen ditu gela handietan, solasaldian "
+"aktiboki diharduten erabiltzaileenak izan ezik."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
 msgid "(UTC)"
-msgstr ""
-
-#, fuzzy
+msgstr "(UTC)"
+
 msgid "User is offline."
-msgstr "Erabiltzailea lineaz kanpo dago"
-
-#, fuzzy
+msgstr "Erabiltzailea offline dago."
+
 msgid "Auto-response sent:"
-msgstr "Erantzunak galdu dira"
+msgstr "Auto-erantzun bidalia:"
 
 #, c-format
 msgid "%s has signed off."
-msgstr "%s deskonektatu da ."
+msgstr "%s deskonektatu da."
 
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "Agian ezin izan da mezu bat edo gehiago entregatu."
 
 msgid "You were disconnected from the server."
-msgstr "Zerbitzaritik deskonektatuta zaude."
+msgstr "Zerbitzaritik deskonektatu zara."
 
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr ""
-
-#, fuzzy
+msgstr "Deskonektatuta zaude. Konektatu arte ez duzu mezurik jasoko."
+
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr ""
-"Litekeena da mezua bidali ez izatea erabiltzailea lineaz kanpo dagoelako:"
-
-#, fuzzy
+msgstr "Ezin mezua bidali, luzera maximoa gainditu delako."
+
 msgid "Message could not be sent."
-msgstr "Yahoo! mezua ez da bidali."
+msgstr "Ezin mezua bidali."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Adium"
-msgstr ""
+msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#, fuzzy
 msgid "Fire"
-msgstr "Firefox"
+msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#, fuzzy
 msgid "Messenger Plus!"
-msgstr "Honen mezua: %s"
+msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#, fuzzy
 msgid "MSN Messenger"
-msgstr "Interneteko mezularitza"
+msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Trillian"
-msgstr ""
+msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "aMSN"
-msgstr ""
+msgstr "aMSN"
 
 #. Add general preferences.
-#, fuzzy
 msgid "General Log Reading Configuration"
-msgstr "Musika-mezuen konfigurazioa"
+msgstr "Txosten-Irakurketa Konfigurazio Orokorra"
 
 msgid "Fast size calculations"
-msgstr ""
+msgstr "Tamaina-kalkulu azkarra"
 
 msgid "Use name heuristics"
-msgstr ""
+msgstr "Izen-heuristikak erabili"
 
 #. Add Log Directory preferences.
-#, fuzzy
 msgid "Log Directory"
-msgstr "Bilatu direktorioa"
+msgstr "Txosten-Direktorioa"
 
 #. *< type
 #. *< ui_requirement
@@ -2685,15 +2573,14 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Log Reader"
-msgstr "Log ikuskatzailea"
+msgstr "Txosten-Irakurlea"
 
 #. *< name
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr ""
+msgstr "Beste IM-bezeroen txostenak gehitzen ditu txosten-irakurlera."
 
 #. * description
 msgid ""
@@ -2703,19 +2590,24 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
+"Txostenak ikustean, plugin honek beste IM-bezeroetako txostenak gehituko "
+"ditu. Oraintxe, Adium, MSN Messenger, aMSN, eta Trillian hartzen ditu "
+"kontutan.\n"
+"\n"
+"OHARRA: Plugin honen kodea alfa egoeran dago oraindik eta maiz kraskatu "
+"daiteke. Erabakia zeure kontu!"
 
 msgid "Mono Plugin Loader"
-msgstr "Mono Plugin kargatzailea"
+msgstr "Mono Plugin-Kargatzailea"
 
 msgid "Loads .NET plugins with Mono."
-msgstr "Kargatuta. NET plugin-ak Mono-rekin."
+msgstr "Mono darabil .NET pluginak kargatzeko."
 
 msgid "Add new line in IMs"
-msgstr ""
-
-#, fuzzy
+msgstr "Lerro berria gehitu IMetan"
+
 msgid "Add new line in Chats"
-msgstr "Ezizena berriketarako"
+msgstr "Lerro berria gehitu Solasaldietan"
 
 #. *< magic
 #. *< major version
@@ -2726,45 +2618,48 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "New Line"
-msgstr "Leiho berria"
+msgstr "Lerro Berria"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Prepends a newline to displayed message."
-msgstr "Ezin da mezua bidali."
+msgstr "Lerro berria gehitzen dio bistaratutako mezuari."
 
 #. *< summary
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
+"Lerro berria gehitzen die mezuei, erabiltzaile-izenaren azpian ikusteko "
+"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"
@@ -2773,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
@@ -2789,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 ""
@@ -2803,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
@@ -2811,44 +2708,42 @@
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "Perl plugin-aren kargatzailea"
+msgstr "Perl Plugin-Kargatzailea"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "Perl plugin-ak kargatzeko erabiltzen da."
+msgstr "Perl pluginak kargatzeko erabiltzen da."
 
 msgid "Psychic Mode"
-msgstr "Modu psikikoa "
+msgstr "Modu Psikikoa"
 
 msgid "Psychic mode for incoming conversation"
-msgstr "Modu psikikoa datorren elkarrizketerako "
-
-#, fuzzy
+msgstr "Datozen solasaldietarako modu psikikoa"
+
 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..."
-msgstr "Ikanbila sentitu duzu indarrean"
+msgstr "Perturbazio bat sentitzen duzu indarrean..."
 
 msgid "Only enable for users on the buddy list"
-msgstr "Llagunen zerrendako erabiltzaileak  ahalbidetu bakarrik"
+msgstr "Lagun-zerrendako erabiltzaileentzako bakarrik gaitu"
 
 msgid "Disable when away"
-msgstr "·zgaitu kanpora joatean"
+msgstr "Ezgaitu kanpora joatean"
 
 msgid "Display notification message in conversations"
 msgstr "Azaldu notifikazio mezua solasaldian"
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "Eskutatutako solasaldietan"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -2857,14 +2752,14 @@
 #. *< priority
 #. *< id
 msgid "Signals Test"
-msgstr "Seinaleen proba"
+msgstr "Seinale-Proba"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all signals are working properly."
-msgstr "Seinale guztiak ondo dauden ikusteko proba."
+msgstr "Seinale guztiak ondo dabiltzan frogatzeko proba."
 
 #. *< type
 #. *< ui_requirement
@@ -2873,18 +2768,18 @@
 #. *< priority
 #. *< id
 msgid "Simple Plugin"
-msgstr "Plugin soila"
+msgstr "Plugin Sinplea"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Tests to see that most things are working."
-msgstr "Gauza gehienak ondo dabiltzan begiratzen du."
+msgstr "Gauza gehienak ondo dabiltzan frogatzeko proba."
 
 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 Zertifikatuak"
 
 #. *< type
 #. *< ui_requirement
@@ -2900,7 +2795,7 @@
 #. *  summary
 #. *  description
 msgid "Provides SSL support through GNUTLS."
-msgstr "SSL euskarria ematen du GNUTLSekin."
+msgstr "GNUTLS darabil SSL euskarria eskaintzeko."
 
 #. *< type
 #. *< ui_requirement
@@ -2916,7 +2811,7 @@
 #. *  summary
 #. *  description
 msgid "Provides SSL support through Mozilla NSS."
-msgstr "SSL euskarria ematen du Mozilla NSSrekin."
+msgstr "Mozilla NSS darabil SSL euskarria eskaintzeko."
 
 #. *< type
 #. *< ui_requirement
@@ -2932,15 +2827,15 @@
 #. *  summary
 #. *  description
 msgid "Provides a wrapper around SSL support libraries."
-msgstr "Bilduki bat ematen du SSL euskarriko liburutegiak biltzeko."
+msgstr "SSL euskarri-liburutegien bidezko biltzailea eskaintzen du."
 
 #, c-format
 msgid "%s is no longer away."
-msgstr "%s itzuli egin da."
+msgstr "%s itzuli da."
 
 #, c-format
 msgid "%s has gone away."
-msgstr "%s joan egin da."
+msgstr "%s joan da."
 
 #, c-format
 msgid "%s has become idle."
@@ -2948,23 +2843,23 @@
 
 #, c-format
 msgid "%s is no longer idle."
-msgstr "%s aktibo jarri da berriro."
+msgstr "%s aktibo da berriro."
 
 #, c-format
 msgid "%s has signed on."
-msgstr "%s konektatu da bertan."
+msgstr "%s konektatu da."
 
 msgid "Notify When"
-msgstr "Noiz jakinarazi"
+msgstr "Jakinarazi"
 
 msgid "Buddy Goes _Away"
-msgstr "Laguna _kanpoan dagoenean"
+msgstr "Laguna _Kanpora Joatean"
 
 msgid "Buddy Goes _Idle"
-msgstr "Laguna _inaktibo dagoenean"
+msgstr "Laguna _Inaktibo Geratzean"
 
 msgid "Buddy _Signs On/Off"
-msgstr "Laguna _konektatu/deskonektatu"
+msgstr "Laguna Konektatzean/_Deskonektatzean"
 
 #. *< type
 #. *< ui_requirement
@@ -2973,7 +2868,7 @@
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "Lagunen egoeraren jakinarazpena"
+msgstr "Lagunen Egoeraren Jakinarazpena"
 
 #. *< name
 #. *< version
@@ -2982,35 +2877,34 @@
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
-msgstr ""
-"Lagunak alde egin duen edo itzuli den, edo inaktibo edo aktibo dagoen "
-"jakinarazten du solasaldi-leihoan."
+msgstr "Laguna joan dela edo itzuli dela jakinarazten du, solasaldi-leihoan."
 
 msgid "Tcl Plugin Loader"
-msgstr "Tcl plugin-aren kargatzailea"
+msgstr "Tcl Plugin-Kargatzailea"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "Tcl plugin-ak kargatzeko aukera ematen du"
+msgstr "Tcl pluginak kargatzeko erabiltzen da."
 
 msgid ""
 "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?"
-msgstr ""
-"Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
-"dago ?"
+msgstr "Ezin konexioa ezarri mDNS-zerbitzari lokalarekin. Martxan al dago ?"
 
 msgid "First name"
 msgstr "Izena"
@@ -3019,15 +2913,13 @@
 msgstr "Deitura"
 
 msgid "Email"
-msgstr "Helb. el."
-
-#, fuzzy
+msgstr "E-posta"
+
 msgid "AIM Account"
-msgstr "Gehitu kontua"
-
-#, fuzzy
+msgstr "AIM Kontua"
+
 msgid "XMPP Account"
-msgstr "Kontua"
+msgstr "XMPP Kontua"
 
 #. *< type
 #. *< ui_requirement
@@ -3040,105 +2932,98 @@
 #. *  summary
 #. *  description
 msgid "Bonjour Protocol Plugin"
-msgstr "Bonjour protokoloaren plugin-a"
-
-#, fuzzy
+msgstr "Bonjour Protokolo-Plugina"
+
 msgid "Purple Person"
-msgstr "Pertsona berria"
+msgstr "Purple Pertsona"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Herria"
+msgstr "Ataka Lokala"
 
 msgid "Bonjour"
 msgstr "Bonjour"
 
 #, c-format
 msgid "%s has closed the conversation."
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
+msgstr "%s(e)k solasaldia itxi du. "
 
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Ezin da mezua bidali, solasaldia ezin izango da hasi."
-
-#, fuzzy, c-format
+msgstr "Ezin mezua bidali; ezin izan da solasaldia hasi."
+
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr "Ezin da socket-a sortu"
-
-#, fuzzy, c-format
+msgstr "Ezin socket-a sortu: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Ezin izan da socket -a ataka lotu"
-
-#, fuzzy, c-format
+msgstr "Ezin socket-a atakara lotu: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr "Ezin da socket-a sortu"
-
-#, fuzzy
+msgstr "Ezin socket-ean entzun: %s"
+
 msgid "Error communicating with local mDNSResponder."
-msgstr "Errorea zerbitzariarekin komunikatzean"
+msgstr "Errorea mDNSResponder lokalarekin komunikatzean."
 
 msgid "Invalid proxy settings"
-msgstr "Proxy-ezarpenak ez dira baliozkoak"
+msgstr "Proxy-ezarpen baliogabeak"
 
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"Zehaztutako proxy-motarentzat emandako ostalari-izena edo ataka-zenbakia ez "
-"dira baliozkoak."
+"Zehaztutako proxy-motarentzat, baliogabeak dira emandako ostalari-izena edo "
+"ataka-zenbakia."
 
 msgid "Token Error"
-msgstr "Testigu errorea"
-
-#, fuzzy
+msgstr "Testigu-Errorea"
+
 msgid "Unable to fetch the token.\n"
-msgstr "Ezinezkoa lekukoa ekartzea. \n"
+msgstr "Ezin testigua eskuratu.\n"
 
 msgid "Save Buddylist..."
-msgstr "Gorde lagunen zerrenda"
+msgstr "Lagun-Zerrenda Gorde..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "Zure lagunen-zerrenda hutsik dago, ez da ezer erez idatzi fitxategian."
+msgstr "Hutsik dago zure lagun-zerrenda, ez da ezer idatzi fitxategian."
 
 msgid "Buddylist saved successfully!"
-msgstr "Lagunen-zerrenda arraskataz gordea !"
-
-#, fuzzy, c-format
+msgstr "Arrakastaz gorde da lagun-zerrenda!"
+
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "Ezin izan da kargatu lagunen zerrenda"
+msgstr "Ezin %s(r)entzako lagun-zerrenda idatzi %s(e)n"
 
 msgid "Couldn't load buddylist"
-msgstr "Ezin izan da kargatu lagunen zerrenda"
+msgstr "Ezin lagun-zerrenda kargatu"
 
 msgid "Load Buddylist..."
-msgstr "Kargatu lagunen-zerrenda..."
+msgstr "Lagun-Zerrenda Kargatu..."
 
 msgid "Buddylist loaded successfully!"
-msgstr "Lagunen-zerrenda arrakastaz kargatua izan da !"
+msgstr "Arrakastaz kargatu da lagun-zerrenda!"
 
 msgid "Save buddylist..."
-msgstr "Gorde lagunen-zerrenda..."
+msgstr "Lagun-zerrenda gorde..."
 
 msgid "Load buddylist from file..."
-msgstr "Kargatu lagunen-zerrenda fitxategi batetik..."
-
-#, fuzzy
+msgstr "Fitxategitik kargatu lagun-zerrenda..."
+
 msgid "You must fill in all registration fields"
-msgstr "Bete harpidetzarako eremuak"
-
-#, fuzzy
+msgstr "Erregistro-eremu guztiak bete behar dituzu"
+
 msgid "Passwords do not match"
-msgstr "Pasahitz-ak ez datoz bat."
-
-#, fuzzy
+msgstr "Pasahitzak ez datoz bat"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Ezin izan da kontu berria erregistratu. Errorea gertatu da.\n"
+msgstr "Ezin kontu berria erregistratu. Errore ezezaguna gertatu da."
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr "Gadu-Gadu Kontu berria  erregistratua"
+msgstr "Gadu-Gadu Kontu Berria Erregistratua"
 
 msgid "Registration completed successfully!"
-msgstr "Erregistroa arrakastan betea izan da !"
+msgstr "Arrakastaz burutu da erregistroa!"
 
 msgid "Password"
 msgstr "Pasahitza"
@@ -3147,29 +3032,28 @@
 msgstr "Pasahitza (berriro)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Captcha testua sartu"
+
 msgid "Captcha"
-msgstr "Gorde irudia"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "Erregistratu Gadu-Gadu kontu berria"
+msgstr "Gadu-Gadu Kontu Berria Erregistratu"
 
 msgid "Please, fill in the following fields"
-msgstr "Mesedez, bete itzazu ondorengo eremuak"
+msgstr "Ondorengo eremuak bete itzazu"
 
 msgid "City"
 msgstr "Herria"
 
 msgid "Year of birth"
-msgstr "Jaiotze urtea"
+msgstr "Jaiotze-urtea"
 
 msgid "Gender"
 msgstr "Sexua"
 
 msgid "Male or female"
-msgstr "Gizonezko edo Emakumezkoa"
+msgstr "Gizonezko edo emakumezkoa"
 
 msgid "Male"
 msgstr "Gizonezkoa"
@@ -3178,60 +3062,59 @@
 msgstr "Emakumezkoa"
 
 msgid "Only online"
-msgstr "Linean bakarrik"
+msgstr "Online bakarrik"
 
 msgid "Find buddies"
-msgstr "Bilatu lagunak"
+msgstr "Lagunak bilatu"
 
 msgid "Please, enter your search criteria below"
-msgstr "Mesedez, sartu ezazu zure bilaketaren irizpideak behekaldean"
+msgstr "Azpian sar itzazu zure bilaketaren irizpideak"
 
 msgid "Fill in the fields."
-msgstr "Bete eremuak"
+msgstr "Eremuak bete itzazu."
 
 msgid "Your current password is different from the one that you specified."
-msgstr "Zure egungo pasahitza ezberdina da zuk adierazi dezunaren aldean. "
-
-#, fuzzy
+msgstr "Zure pasahitza ez da zehaztu duzuna."
+
 msgid "Unable to change password. Error occurred.\n"
-msgstr "Ezin da aldatu pasahitza. Akats gertatu da.\n"
+msgstr "Ezin pasahitza aldatu. Errorea gertatu da.\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Pasahitza aldatu Gadu-Gadu kontuarentzat"
+msgstr "Gadu-Gadu kontuaren pasahitza aldatu"
 
 msgid "Password was changed successfully!"
-msgstr "Pasahitza arrakastaz aldatua izan da !"
+msgstr "Arrakastaz aldatu da pasahitza!"
 
 msgid "Current password"
-msgstr "Egungo pasahitza"
+msgstr "Oraingo pasahitza"
 
 msgid "Password (retype)"
-msgstr "Pasahitza (beridatzi)"
+msgstr "Pasahitza (berriro)"
 
 # , fuzzy
 msgid "Enter current token"
-msgstr "Sartu momentuko lekukoa"
+msgstr "Oraingo lekukoa sartu"
 
 # , fuzzy
 msgid "Current token"
-msgstr "Momentuko lekukoa"
+msgstr "Oraingo lekukoa"
 
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Idatzi egungo pasahitza eta pasahitz berria UIN -rentzako."
+msgstr "Zure UIN-arentzako oraingo pasahitza eta pasahitz berria sar itzazu:"
 
 msgid "Change Gadu-Gadu Password"
-msgstr "Aldatu Gadu-Gadu -ren pasahitza"
+msgstr "Gadu-Gadu Pasahitza Aldatu"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Aukeratu berriketak lagun batentzat:%s "
+msgstr "Lagunarentzako berriketa bat hautatu: %s "
 
 msgid "Add to chat..."
-msgstr "Gehitu berriketara ..."
+msgstr "Berriketara gehitu..."
 
 #. Global
 msgid "Available"
-msgstr "Erabilgarri"
+msgstr "Eskuragarri"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
@@ -3243,61 +3126,59 @@
 msgstr "UINa"
 
 msgid "First Name"
-msgstr "Izena"
+msgstr "Lehen Abizena"
 
 msgid "Birth Year"
 msgstr "Jaiotza-urtea"
 
 msgid "Unable to display the search results."
-msgstr "Ezin izan da aurkitutakoaren emaitza azaldu."
+msgstr "Ezin bilaketaren emaitzak erakutsi."
 
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Direktorio Publikoa"
 
 msgid "Search results"
-msgstr "Bilaketaren emaitza "
+msgstr "Bilaketaren emaitzak"
 
 msgid "No matching users found"
-msgstr "Ez dira erabiltzailerik aurkitu"
+msgstr "Ez da erabiltzailerik aurkitu"
 
 msgid "There are no users matching your search criteria."
-msgstr ""
-"Bilaketa egitean zure irizpideak erabiliz ez dira erabiltzailerik topatu."
-
-#, fuzzy
+msgstr "Ez dago zure irizpideak betetzen dituen erabiltzailerik."
+
 msgid "Unable to read from socket"
-msgstr "Ezin da socket-a irakurri"
+msgstr "Ezin socket-etik irakurri"
 
 msgid "Buddy list downloaded"
-msgstr "Laguna-zerrenda deskargatuta"
+msgstr "Lagun-zerrenda deskargatuta"
 
 msgid "Your buddy list was downloaded from the server."
-msgstr "Zure lagunen-zerrenda deskargatuta izan da zerbitzaritik."
+msgstr "Zerbitzaritik deskargatu da zure lagun-zerrenda."
 
 msgid "Buddy list uploaded"
-msgstr "Lagunen-zerrenda igota"
+msgstr "Lagun-zerrenda igota"
 
 msgid "Your buddy list was stored on the server."
-msgstr "Zure lagunen-zerrenda zerbitzaria gordea izan da."
+msgstr "Zerbitzarian gorde da zure lagun-zerrenda."
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
 msgid "Connected"
-msgstr "Konektatua"
+msgstr "Konektatuta"
 
 msgid "Connection failed"
-msgstr "Konexioak huts egin du"
+msgstr "Errorea Konexioan"
 
 msgid "Add to chat"
-msgstr "Gehitu berriketa-ra"
+msgstr "Berriketara gehitu"
 
 msgid "Chat _name:"
-msgstr "Berreketan _Deitura:"
-
-#, fuzzy, c-format
+msgstr "Berriketaren _izena:"
+
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Ezin da zerbitzariarekin konektatu."
+msgstr "Ezin '%s' ostalari-izena ebaztu: %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3308,11 +3189,10 @@
 msgstr "Berriketa-errorea"
 
 msgid "This chat name is already in use"
-msgstr "Berriketa honen izena dagoeneko erabiltzen ari da"
-
-#, fuzzy
+msgstr "Jada erabilpean dago berriketa-izen hori"
+
 msgid "Not connected to the server"
-msgstr "Zerbitzaritik deskonektatuta zaude."
+msgstr "Zerbitzaritik deskonektatuta zaude"
 
 msgid "Find buddies..."
 msgstr "Lagunak bilatu..."
@@ -3321,16 +3201,16 @@
 msgstr "Pasahitza aldatu..."
 
 msgid "Upload buddylist to Server"
-msgstr "Igo lagunen-zerrenda zerbitzarira"
+msgstr "Lagun-Zerrenda Zerbitzarira igo"
 
 msgid "Download buddylist from Server"
-msgstr "Deskargatu lagunen-zerrenda zerbitzaritik"
+msgstr "Lagun-Zerrenda Zerbitzaritik deskargatu"
 
 msgid "Delete buddylist from Server"
-msgstr "Ezabatu lagunen-zerrenda zerbitzaritik "
+msgstr "Lagun-Zerrenda Zerbitzaritik ezabatu"
 
 msgid "Save buddylist to file..."
-msgstr "Gorde lagunen-zerrenda fitxategi baten..."
+msgstr "Lagun-Zerrenda fitxategian gorde..."
 
 #. magic
 #. major_version
@@ -3344,45 +3224,43 @@
 #. name
 #. version
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu protokoloaren plugin-a"
+msgstr "Gadu-Gadu Protokolo-Plugina"
 
 #. summary
 msgid "Polish popular IM"
 msgstr "Poloniar IM ospetsua"
 
 msgid "Gadu-Gadu User"
-msgstr "Gadu-Gadu erabiltzailea"
-
-#, fuzzy
+msgstr "Gadu-Gadu Erabiltzailea"
+
 msgid "GG server"
-msgstr "Ezarri erabiltzailearen datuak..."
+msgstr "GG-zerbitzaria"
 
 #, c-format
 msgid "Unknown command: %s"
-msgstr "Komando ezezaguna: %s"
+msgstr "Agindu ezezaguna: %s"
 
 #, c-format
 msgid "current topic is: %s"
-msgstr "uneko gaia: %s"
+msgstr "oraingo gaia: %s"
 
 msgid "No topic is set"
 msgstr "Ez da gairik ezarri"
 
 msgid "File Transfer Failed"
-msgstr "Fitxategi-transferentzia huts egin du"
-
-#, fuzzy
+msgstr "Errorea Fitxategi-Transferentzian"
+
 msgid "Unable to open a listening port."
-msgstr "Pidgin-ek ezin izan du ireki entzuteko ataka bat."
+msgstr "Ezin entzuteko ataka ireki."
 
 msgid "Error displaying MOTD"
-msgstr "Errorea MOTD bistaratzean"
+msgstr "Errorea MOTD erakustean"
 
 msgid "No MOTD available"
-msgstr "Ez dago MOTD erabilgarririk"
+msgstr "MOTD erabilgarririk ez"
 
 msgid "There is no MOTD associated with this connection."
-msgstr "Ez dago konexio honekin asoziatutako MOTDrik."
+msgstr "Ez dago konexio honekin asoziaturiko MOTDrik."
 
 #, c-format
 msgid "MOTD for %s"
@@ -3395,12 +3273,12 @@
 #.
 #. 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 "Zerbitzaritik deskonektatuta zaude."
+msgstr "Zerbitzaritik deskonektatuta: %s"
 
 msgid "View MOTD"
-msgstr "Ikusi MOTD"
+msgstr "MOTD Ikusi"
 
 msgid "_Channel:"
 msgstr "_Kanala:"
@@ -3408,24 +3286,23 @@
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC goitizenek ezin dute zuriunerik eduki"
+msgstr "IRC-ezizenek eta zerbitzariek ezin dute zuriunerik eduki"
 
 msgid "SSL support unavailable"
-msgstr "SSL euskarria ez dago erabilgarri"
+msgstr "SSL euskarririk ez erabilgarri"
 
 msgid "Unable to connect"
-msgstr "Ezin da konektatu"
+msgstr "Ezin konektatu"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Ezin da ostalariarekin konektatu"
-
-#, fuzzy, c-format
+msgstr "Ezin konektatu: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
+msgstr "Zerbitzariak amaituarazi du konexioa"
 
 msgid "Users"
 msgstr "Erabiltzaileak"
@@ -3442,11 +3319,11 @@
 #. *< name
 #. *< version
 msgid "IRC Protocol Plugin"
-msgstr "IRC protokoloaren plugin-a"
+msgstr "IRC Protokolo-Plugina"
 
 #. *  summary
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "Problema gutxien ematen duen IRC protokoloa"
+msgstr "Arazo gutxien ematen dituen IRC Protokolo-Plugina"
 
 #. host to connect to
 msgid "Server"
@@ -3460,7 +3337,7 @@
 msgstr "Kodeketak"
 
 msgid "Auto-detect incoming UTF-8"
-msgstr ""
+msgstr "Sarrerako UTF-8a autodetektatu"
 
 msgid "Real name"
 msgstr "Benetako izena"
@@ -3470,63 +3347,60 @@
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
 msgid "Use SSL"
-msgstr "Erabili SSL"
+msgstr "SSL Erabili"
 
 msgid "Bad mode"
 msgstr "Modu okerra"
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%s(e)n %s(e)k betos, duela %s ezarria"
+
+#, c-format
 msgid "Ban on %s"
-msgstr "%s - ezin da sartu:"
-
-#, fuzzy
+msgstr "%s(e)n betoa"
+
 msgid "End of ban list"
-msgstr "Ez dago zerrendan"
+msgstr "Beto-zerrendaren bukaera"
 
 #, c-format
 msgid "You are banned from %s."
-msgstr "%s(e)n debekua ezarri dizute."
+msgstr "Betatuta zaude %s(e)n."
 
 msgid "Banned"
-msgstr "Debekatuta"
+msgstr "Betatuta"
 
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "Ezin da %s bota: botatakoen zerrenda beteta dago"
+msgstr "Ezin %s betatu: beteta dago betatu-zerrenda"
 
 msgid " <i>(ircop)</i>"
-msgstr " <i>(identifikatuta)</i>"
+msgstr " <i>(ircop)</i>"
 
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifikatuta)</i>"
 
 msgid "Nick"
-msgstr "Goitizena"
+msgstr "Ezizena"
 
 msgid "Currently on"
-msgstr "Orain konektatuta"
-
-#, fuzzy
+msgstr "Orain hemen: "
+
 msgid "Idle for"
-msgstr "Ez-aktibo"
+msgstr "Inaktibo duela"
 
 msgid "Online since"
-msgstr "Noiztik linean"
-
-#, fuzzy
+msgstr "Noiztik online:"
+
 msgid "<b>Defining adjective:</b>"
-msgstr "<br><b>Definitzeko adejktiboa:</b> Zoragarria<br>"
+msgstr "<b>Definitzeko adjektiboa:</b>"
 
 msgid "Glorious"
-msgstr ""
+msgstr "Harrigarria"
 
 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s(e)k gaia aldatu du: %s"
+msgstr "%s(e)k gai berria ezarri du: %s"
 
 #, c-format
 msgid "%s has cleared the topic."
@@ -3534,48 +3408,47 @@
 
 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "%s(r)en gaia: %s"
+msgstr "%s(e)ko gaia: %s"
 
 #, c-format
 msgid "Unknown message '%s'"
-msgstr "Errore ezezaguna: '%s'"
+msgstr "Mezu ezezaguna: '%s'"
 
 msgid "Unknown message"
 msgstr "Mezu ezezaguna"
 
-#, fuzzy
 msgid "The IRC server received a message it did not understand."
-msgstr "Pidgin-ek IRC zerbitzariak ulertu ez duen mezu bat bidali du."
+msgstr "Ulertu ez duen mezu bat jaso du IRC-zerbitzariak."
 
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Eraibltzaileak %s(e)n: %s"
 
 msgid "Time Response"
-msgstr "Orduaren erantzuna"
+msgstr "Erantzun-Denbora"
 
 msgid "The IRC server's local time is:"
-msgstr "IRC zerbitzariaren ordu lokala: "
+msgstr "IRC zerbitzariaren ordu lokala:"
 
 msgid "No such channel"
-msgstr "Kanal hori ez dago"
+msgstr "Halako kanalik ez"
 
 #. does this happen?
 msgid "no such channel"
-msgstr "kanal hori ez dago"
+msgstr "halako kanalik ez"
 
 msgid "User is not logged in"
 msgstr "Erabiltzailea ez dago konektatuta"
 
 msgid "No such nick or channel"
-msgstr "Goitizen edo kanal hori ez dago"
+msgstr "Halako ezizen edo kanalik ez"
 
 msgid "Could not send"
-msgstr "Ezin izan da bidali"
+msgstr "Ezin bidali"
 
 #, c-format
 msgid "Joining %s requires an invitation."
-msgstr "%s berriketan sartzeko gonbita behar da."
+msgstr "Gonbidapena behar duzu %s(e)n sartzeko."
 
 msgid "Invitation only"
 msgstr "Gonbidatuak bakarrik"
@@ -3587,257 +3460,255 @@
 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "Honek kanporatu zaitu: %s (%s)"
+msgstr "%s(e)k kanporatua (%s)"
 
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modua (%s %s) - %s"
 
 msgid "Invalid nickname"
-msgstr "Erabiltzaile-izena ez da baliozkoa"
+msgstr "Ezizen baliogabea"
 
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"Zerbitzariak hautatu duzun goitizena gaitzetsi du. Baliteke karaktere "
+"Zerbitzariak ez du onartu zuk hautatutako ezizena. Baliteke karaktere "
 "baliogabeak edukitzea."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"Zerbitzariak hautatu dituzun kontu-izenak ezetsi ditu. Baliteke karaktere "
+"Zerbitzariak ez du onartu zuk hautatutako kontu-izena. Baliteke karaktere "
 "baliogabeak edukitzea."
 
 #. 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 "Berriketa honen izena dagoeneko erabiltzen ari da"
-
-#, fuzzy
+msgstr "Erabilpean dago jadanik \"%s\" ezizena."
+
 msgid "Nickname in use"
-msgstr "Goitizena"
+msgstr "Ezizena erabilpean"
 
 msgid "Cannot change nick"
-msgstr "Ezin da goitizena aldatu"
+msgstr "Ezin ezizena aldatu"
 
 msgid "Could not change nick"
-msgstr "Ezin izan da goitizena aldatu"
+msgstr "Ezin izan da ezizena aldatu"
 
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "%s%s kanaletik irten zara"
 
 msgid "Error: invalid PONG from server"
-msgstr "Errorea: zerbitzariko PONG baliogabea"
+msgstr "Errorea: PONG baliogabea zerbitzaritik"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING erantzuna -- Atzerapena: %lu segundo"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "Erregistratu egin behar da"
+msgstr "Ezin %s(e)ra sartu: Erregistroa beharrezkoa da."
 
 msgid "Cannot join channel"
-msgstr "Ezin da sartu kanalean"
+msgstr "Ezin kanalean sartu"
 
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Ezizena edo kanala ez dago erabilgarri denbora baterako."
+msgstr "Ezizena edo kanala ez dago eskuragarri oraintxe."
 
 #, c-format
 msgid "Wallops from %s"
-msgstr "Egurra %s(e)k"
+msgstr "%s(r)en astinduak"
 
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;landuko den ekintza&gt;:  ekintza bat lantzen du."
+msgstr "action &lt;burutuko den ekintza&gt;:  Wkintza bat burutu."
 
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [mezua]:  ezarri kanpoan zaudeneko mezua, edo ez erabili mezurik "
-"kanpotik etortzen zarenean."
+"away [mezua]:  Kanpoan zaudeneko mezua ezarri, edo mezurik ez ezazu jarri "
+"kanpotik itzultzeko."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <ezizena> <mezua>: ctcp mezua bidali ezizenari."
 
 msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: Bidali komandoa chanserv-i"
+msgstr "chanserv: Chanserv-ri agindu bat bidali"
 
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &lt;goitizen1&gt; [goitizen2] ...: kendu kanaleko operadore egoera  "
-"norbaiti. Kanaleko operadorea izan behar duzu hau egiteko."
+"deop &lt;ezizena1&gt; [ezizena2] ...: Kanal-operadore egoera kendu norbaiti. "
+"Kanal-operadorea izan behar duzu hau egiteko."
 
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;goitizen1&gt; [goitizen2] ...:  isildu arazi norbait, kanala "
-"moderatuta egonez gero (+m) hitzegiteko aukera sahitezteko. Kanaleko "
+"devoice &lt;ezizena1&gt; [ezizena2] ...:  Kanal-ahotsa kendu norbaiti; "
+"kanala moderatuta egonez gero (+m), hitzegiteko ahalmena kentzeko. Kanaleko "
 "operadorea izan behar duzu hau egiteko."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;goitizena&gt; [gela]:  gonbidatu norbait zehaztutako gelara,  edo "
-"uneko  kanalera, konektatzeko."
+"invite &lt;ezizena&gt; [gela]:  Zehaztutako gelara edo uneko gelara "
+"gonbidatu norbait."
 
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;gela1&gt;[,gela2][,...] [gako1[,gako2][,...]]:  sartu kanal batean edo "
-"gehiagotan,aukeran kanal bakoitzeko gakoa eskainiz (behar izanez gero)."
+"j &lt;gela1&gt;[,gela2][,...] [gakoa1[,gakoa2][,...]]:  Kanal bat edo "
+"gehiagotan sartu, kanal bakoitzeko gakoa zehaztuz (beharrezkoa bada)."
 
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;gela1&gt;[,gela2][,...] [gako1[,gako2][,...]]:  sartu kanal batean "
-"edo gehiagotan,aukeran kanal bakoitzeko gakoa eskainiz (behar izanez gero)."
+"join &lt;gela1&gt;[,gela2][,...] [gakoa1[,gakoa2][,...]]:  Kanal bat edo "
+"gehiagotan sartu, kanal bakoitzeko gakoa zehaztuz (beharrezkoa bada)."
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;goitizena&gt; [mezua]: kendu (bota) norbait kanaletik . Kanaleko "
-"operadorea izan behar duzu hau egiteko."
+"kick &lt;ezizena&gt; [mezua]: Norbait kanaletik kanporatu. Kanal-operadorea "
+"izan behar duzu hau egiteko."
 
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list:  bistaratu sareko berriketa-gelen zerrenda. <i>Abisua, zerbitzari "
-"batzuk deskonektatu zaitzake hau eginez gero.</i>"
+"list:  Sareko berriketa-gelen zerrenda bistaratu. <i>Abisua, zerbitzari "
+"batzuek deskonektatu egingo zaituzte hau eginez gero.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
-msgstr "me &lt;ekintza&gt;:  landu ekintza bat."
+msgstr "me &lt;ekintza&gt;:  Ekintza bat burutu."
 
 msgid "memoserv: Send a command to memoserv"
-msgstr "memoserv: Bidali komandoa memoserv-i"
+msgstr "memoserv: Memoserv-ri agindu bat bidali"
 
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;goitizena|kanala&gt;:  jarri edo kendu "
-"kanalaren edo erabiltzaile-moduaren ezarpena"
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;ezizena|kanala&gt;:  Kanal-modu edo "
+"erabiltzaile-modu bat ezarri/kendu."
 
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"msg &lt;goitizena&gt; &lt;mezua&gt;:  bidali mezu pribatua erabiltzaileari "
-"(kanalari bidali beharrean)."
+"msg &lt;ezizena&gt; &lt;mezua&gt;:  Erabiltzaile bati mezu pribatu bat "
+"bidali (kanalera bidali ordez)."
 
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "names [kanala]:  zerrendatu kanalean dauden uneko erabiltzaileak."
+msgstr "names [kanala]:  Kanal bateko erabiltzaileak zerrendatu."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;goitizen berria&gt;:  aldatu zure goitizena"
+msgstr "nick &lt;ezizen berria&gt;:  Zure ezizena aldatu."
 
 msgid "nickserv: Send a command to nickserv"
-msgstr "nickserv: Bidali komandoa nickserv-i"
-
-#, fuzzy
+msgstr "nickserv: Nickserv-ri agindu bat bidali"
+
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr ""
-"me &lt;ekintza&gt;:  bidali IRC estiloko ekintza lagun bati edo berriketara."
+msgstr "notice &lt;helburua&lt;:  Oharra bidali erabiltzaileari edo kanalera."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;goitizen1&gt; [goitizen2] ...:  eman kanalaren operadore baimenak "
-"norbaiti. Kanaleko operadorea izan behar duzu hau egiteko."
+"op &lt;ezizena1&gt; [ezizena2] ...:  Kanal-operadore baimenak eman norbaiti. "
+"Kanal-operadorea izan behar duzu hau egiteko."
 
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &lt;mezua&gt;:  hau zer den ez badakizu, litekeena da ez erabiltzea."
+"operwall &lt;mezua&gt;:  Hau zer den ez badakizu, segurasko ezin duzu "
+"erabili."
 
 msgid "operserv: Send a command to operserv"
-msgstr "operserv: Bidali komandoa operserv-i"
+msgstr "operserv: Operserv-ri agindu bat bidali"
 
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"part [gela] [mezua]:  irten uneko kanaletik, edo zehaztutako kanaletik, "
-"aukerazko mezu batekin."
+"part [gela] [mezua]:  Zauden kanaletik edo zehaztutako kanaletik irten, mezu "
+"bat utziz (nahi izanez gero)."
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [goitizena]:  erabiltzaile batek duen atzerapena galdetzen du (edo "
-"zerbitzariarena erabiltzailerik ez bada zehazten)."
+"ping [ezizena]:  Erabiltzaile batek duen atzerapena galdetu (edo "
+"zerbitzariak duena, erabiltzailerik ez bada zehazten)."
 
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"query &lt;goitizena&gt; &lt;mezua&gt;:  bidali mezu pribatu bat erabiltzaile "
-"bati (kanalera bidali beharrean)."
+"query &lt;ezizena&gt; &lt;mezua&gt;:  Erabiltzaile bati mezu pribatu bat "
+"bidali (kanalera bidali ordez)."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [mezua]:  deskonektatu zerbitzaritik, aukerazko mezu batekin."
+msgstr ""
+"quit [mezua]:  Zerbitzaritik deskonektatu, mezu bat utziz (nahi izanez gero)."
 
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  bidali komando gordina zerbitzariari"
+msgstr "quote [...]:  Zerbitzarira agindu gordina bidali."
 
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-"remove &lt;goitizena&gt; [mezua]:  kendu norbait gelatik. Kanaleko "
-"operadorea izan behar duzu hau egiteko."
+"remove &lt;ezizena&gt; [mezua]:  Norbait gelatik kanporatu. Kanal-operadorea "
+"izan behar duzu hau egiteko."
 
 msgid "time: Displays the current local time at the IRC server."
-msgstr "time: erakutsi IRC zerbitzariko uneko ordu lokala."
+msgstr "time: IRC zerbitzariaren ordu lokala bistaratu."
 
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [gai berria]:  ikusi edo aldatu kanalaren gaia."
+msgstr "topic [gai berria]:  Kanalaren gaia ikusi edo editatu."
 
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  jarri edo kendu erabiltzaile-moduaren "
-"ezarpena"
+msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Erabiltzaile-modua ezarri/kendu."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr ""
+msgstr "version [ezizena]: CTCP VERSION eskaera bidali erabiltzaileari"
 
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;goitizen1&gt; [goitizen2] ...:  eman kanalean hitzegiteko baimenak "
-"norbaiti. Kanaleko operadorea izan behar duzu hau egiteko."
+"voice &lt;ezizena1&gt; [ezizena2] ...:  Kanal-ahots baimenak eman norbaiti. "
+"Kanal-operadorea izan behar duzu hau egiteko."
 
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
-"wallops &lt;mezua&gt;:  hau zer den ez badakizu litekeena da ez erabiltzea."
+"wallops &lt;mezua&gt;:  Hau zer den ez badakizu, segurasko ezin duzu erabili."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
-"whois [zerbitzaria] &lt;goitizena&gt;:  hartu erabiltzaile baten informazioa."
-
-#, fuzzy
+"whois [zerbitzaria] &lt;ezizena&gt;:  Erabiltzaile baten inguruko "
+"informazioa eskuratu."
+
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
-"whois [zerbitzaria] &lt;goitizena&gt;:  hartu erabiltzaile baten informazioa."
+"whowas &lt;ezizena&gt;: Deskonektatu den erabiltzaile baten inguruko "
+"informazioa eskuratu."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -3853,92 +3724,76 @@
 msgstr "Deskonektatuta."
 
 msgid "Unknown Error"
-msgstr "Errore ezezaguna"
-
-#, fuzzy
+msgstr "Errore Ezezaguna"
+
 msgid "Ad-Hoc Command Failed"
-msgstr "Komandoa desgaitu da"
-
-#, fuzzy
+msgstr "Errorea Ad-Hoc Aginduan"
+
 msgid "execute"
-msgstr "Ez zen espero"
-
-#, fuzzy
+msgstr "exekutatu"
+
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"Zerbitzariak TLS/SSL behar du konektatzeko. Ez da TLS/SSL euskarririk aurkitu"
-
-#, fuzzy
+"Zerbitzariak TLS/SSL behar du, baina ez da TLS/SSL euskarririk aurkitu."
+
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr ""
-"Zerbitzariak TLS/SSL behar du konektatzeko. Ez da TLS/SSL euskarririk aurkitu"
+msgstr "Enkripzioa behar duzu, baina ez da TLS/SSL euskarririk aurkitu."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"Zerbitzariak testu arruntaren autentifikazioa behar du enkriptatu gabeko "
-"korrontean"
-
-#, fuzzy, c-format
+"Zerbitzariak testu-arrunt autentifikazioa behar du, enkriptatu gabeko jarioan"
+
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"Zerbitzariak testu arruntaren autentifikazioa behar du enkriptatu gabeko "
-"korrontean. Onartu nahi duzu, eta autentifikazioarekin jarraitu?"
+"%s(e)k testu-arrunt autentifikazioa behar du, enkriptatu gabeko jarioan.   "
+"Hau baimendu eta autentifikazioarekin jarraitu?"
 
 msgid "Plaintext Authentication"
-msgstr "Testu arruntaren autentifikazioa"
-
-#, fuzzy
+msgstr "Testu-arrunt Autentifikazioa"
+
 msgid "SASL authentication failed"
-msgstr "Huts egin du autentifikatzean."
-
-#, fuzzy
+msgstr "Errorea SASL autentifikazioan"
+
 msgid "Invalid response from server"
-msgstr "Erantzun baliogabea zerbitzaritik."
+msgstr "Erantzun baliogabea zerbitzaritik"
 
 msgid "Server does not use any supported authentication method"
-msgstr "Zerbitzariak ez du erabiltzen autentifikazio-metodo onarturik"
+msgstr "Zerbitzariak ez du jasandako autentifikazio-metodorik erabiltzen"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "Enkripzioa behar duzu, baina zerbitzari honetan ezin da erabili."
 
 msgid "Invalid challenge from server"
 msgstr "Erronka baliogabea zerbitzaritik"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL error"
+msgstr "SASL errorea: %s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "Zure sesioa amaituarazi du BOSH konexioa-kudeatzaileak."
+
 msgid "No session ID given"
-msgstr "Ez da arrazoirik eman."
-
-#, fuzzy
+msgstr "Ez da sesio-IDrik eman"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Bertsioa ez da onartzen"
-
-#, fuzzy
+msgstr "BOSH protokolo-bertsio ez jasana"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
-"dago ?"
-
-#, fuzzy, c-format
+msgstr "Ezin konexioa ezarri zerbitzariarekin"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
-"dago ?"
-
-#, fuzzy
+msgstr "Ezin konexioa ezarri zerbitzariarekin: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Ezin da konexio sortu."
+msgstr "Ezin SSL-konexioa ezarri"
 
 msgid "Full Name"
-msgstr "Izen-deiturak"
+msgstr "Izen Osoa"
 
 msgid "Family Name"
 msgstr "Deitura"
@@ -3950,10 +3805,15 @@
 msgstr "URLa"
 
 msgid "Street Address"
-msgstr "Kale-helbidea"
-
+msgstr "Kale-Helbidea"
+
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
-msgstr "Helbidearen jarraipena"
+msgstr "Helbidearen Jarraipena"
 
 msgid "Locality"
 msgstr "Herria"
@@ -3962,7 +3822,7 @@
 msgstr "Eskualdea"
 
 msgid "Postal Code"
-msgstr "Posta-kodea"
+msgstr "Posta-Kodea"
 
 msgid "Country"
 msgstr "Estatua"
@@ -3973,10 +3833,10 @@
 msgstr "Telefonoa"
 
 msgid "Organization Name"
-msgstr "Erakundearen izena"
+msgstr "Erakundearen Izena"
 
 msgid "Organization Unit"
-msgstr "Saila"
+msgstr "Erakundeko Saila"
 
 msgid "Role"
 msgstr "Funtzioa"
@@ -3987,27 +3847,24 @@
 msgid "Description"
 msgstr "Azalpena"
 
-#, fuzzy
 msgid "Edit XMPP vCard"
-msgstr "Editatu Jabber vCard-a"
+msgstr "XMPP vCard-a Editatu"
 
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
-"Beheko elementu guztiak aukerakoak dira. Eman informazioa zuk nahi duzun "
-"moduan."
-
-#, fuzzy
+"Opzionalak dira beheko elementu guztiak. Zuk nahi duzun informazioa bakarrik "
+"eman dezakezu."
+
 msgid "Client"
-msgstr "Herria"
+msgstr "Bezeroa"
 
 msgid "Operating System"
-msgstr ""
-
-#, fuzzy
+msgstr "Sistema Eragilea"
+
 msgid "Local Time"
-msgstr "Fitxagei lokala:"
+msgstr "Ordu Lokala"
 
 msgid "Priority"
 msgstr "Lehentasuna"
@@ -4017,20 +3874,19 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "duela %s"
+
 msgid "Logged Off"
-msgstr "Konektatuta dago lehendik"
+msgstr "Deskonektatuta"
 
 msgid "Middle Name"
-msgstr "Bigarren izena"
+msgstr "Bigarren Izena"
 
 msgid "Address"
 msgstr "Helbidea"
 
 msgid "P.O. Box"
-msgstr "Posta-kutxa"
+msgstr "Posta-Kutxa"
 
 msgid "Photo"
 msgstr "Argazkia"
@@ -4039,40 +3895,36 @@
 msgstr "Logotipoa"
 
 msgid "Un-hide From"
-msgstr "Desezkutatu honengandik"
+msgstr "Honengandik Ez Ezkutatu"
 
 msgid "Temporarily Hide From"
-msgstr "Ezkutatu aldi baterako honengandik"
-
-#. && NOT ME
+msgstr "Honengandik Ezkutatu Oraingoz"
+
 msgid "Cancel Presence Notification"
-msgstr "Ezeztatu presentzia-jakinarazpena"
+msgstr "Presentzia-Jakinarazpena Ezeztatu"
 
 msgid "(Re-)Request authorization"
-msgstr "Eskatu baimena (berriro)"
-
-#. if(NOT ME)
+msgstr "Baimena (berriro) Eskatu"
+
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
 msgstr "Harpidetza kendu"
 
-#, fuzzy
 msgid "Log In"
-msgstr "Egunkaria"
-
-#, fuzzy
+msgstr "Konektatu"
+
 msgid "Log Out"
-msgstr "Saioa hasteko aukerak"
+msgstr "Deskonektatu"
 
 msgid "Chatty"
 msgstr "Berritsu"
 
 msgid "Extended Away"
-msgstr "Kanpoan luzarorako"
+msgstr "Kanpoan Luzarorako"
 
 msgid "Do Not Disturb"
-msgstr "Ez molestatu"
+msgstr "Ez Molestatu"
 
 msgid "JID"
 msgstr "JID"
@@ -4081,56 +3933,52 @@
 msgstr "Deitura"
 
 msgid "The following are the results of your search"
-msgstr "Zure bilaketaren ondoriozko emaitzak hauek dira"
+msgstr "Hauek dira zure bilaketaren emaitzak"
 
 #. current comment from Jabber User Directory users.jabber.org
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-
-#, 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[])
 #, c-format
 msgid "Server Instructions: %s"
-msgstr "Zerbitzariaren aginduak:%s"
-
-#, fuzzy
+msgstr "Zerbitzari-Aginduak: %s"
+
 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"
-
-#, fuzzy
+msgstr "Helbide Elektronikoa"
+
 msgid "Search for XMPP users"
-msgstr "Erabiltzailea bilatu"
+msgstr "XMPP-erabiltzaileak bilatu"
 
 #. "Search"
 msgid "Search"
 msgstr "Bilatu"
 
 msgid "Invalid Directory"
-msgstr "Direktorio baliogabea"
+msgstr "Direktorio Baliogabea"
 
 msgid "Enter a User Directory"
-msgstr "Sartu erabiltzailearen direktorioa"
+msgstr "Erabiltzaile-Direktorioa Sartu"
 
 msgid "Select a user directory to search"
-msgstr "Aukeratu erabiltzaile direktorioa bilaketarako"
+msgstr "Bilaketarako erabiltzaile-direktorio bat hautatu"
 
 msgid "Search Directory"
-msgstr "Bilatu direktorioa"
+msgstr "Direktorioan Bilatu"
 
 msgid "_Room:"
 msgstr "_Gela:"
@@ -4139,37 +3987,37 @@
 msgstr "_Zerbitzaria:"
 
 msgid "_Handle:"
-msgstr "_Heldulekua:"
+msgstr "_Kudeatzailea:"
 
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ez da baliozko gela-izena."
 
 msgid "Invalid Room Name"
-msgstr "Gela-izen baliogabea"
+msgstr "Gela-Izen Baliogabea"
 
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ez da baliozko zerbitzari-izena."
 
 msgid "Invalid Server Name"
-msgstr "Zerbitzari-izena ez da baliozkoa"
+msgstr "Zerbitzari-Izen Baliogabea"
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s ez da baliozko gela-heldulekua."
+msgstr "%s ez da baliozko gela-kudeatzailea"
 
 msgid "Invalid Room Handle"
-msgstr "Gela-heldulekua ez da baliozkoa"
+msgstr "Gela-Kudeatzaile Baliogabea"
 
 msgid "Configuration error"
 msgstr "Konfigurazio-errorea"
 
 msgid "Unable to configure"
-msgstr "Ezin da konfiguratu"
+msgstr "Ezin konfiguratu"
 
 msgid "Room Configuration Error"
-msgstr "Errorea gela konfiguratzean"
+msgstr "Gela-Konfigurazio Errorea"
 
 msgid "This room is not capable of being configured"
 msgstr "Gela hau ezin da konfiguratu"
@@ -4178,83 +4026,77 @@
 msgstr "Erregistratze-errorea"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "Ezin da goitizena aldatu MUC ez diren berriketa-geletan"
+msgstr "Ezin da ezizena aldatu MUC ez diren berriketa-geletan"
 
 msgid "Error retrieving room list"
-msgstr "Errorea gela-zerrenda eskuratzean "
+msgstr "Errorea gela-zerrenda eskuratzean"
 
 msgid "Invalid Server"
-msgstr "Zerbitzaria ez da baliozkoa"
+msgstr "Zerbitzaria Baliogabea"
 
 msgid "Enter a Conference Server"
-msgstr "Sartu konferentzia-zerbitzari bat"
+msgstr "Konferentzia-Zerbitzari bat Sartu"
 
 msgid "Select a conference server to query"
-msgstr "Hautatu konferentzia-zerbitzari bat kontsulta egiteko"
+msgstr "Konferentzia-zerbitzari bat hautatu kontsultarako"
 
 msgid "Find Rooms"
-msgstr "Bilatu gelak"
-
-#, fuzzy
+msgstr "Gelak Bilatu"
+
 msgid "Affiliations:"
-msgstr "Aliasa:"
-
-#, fuzzy
+msgstr "Afiliazioak:"
+
 msgid "No users found"
-msgstr "Ez dira erabiltzailerik aurkitu"
-
-#, fuzzy
+msgstr "Ez da erabiltzailerik aurkitu"
+
 msgid "Roles:"
-msgstr "Funtzioa"
-
-#, fuzzy
+msgstr "Funtzioak:"
+
 msgid "Ping timed out"
-msgstr "Testu arrunta"
+msgstr ""
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
-
-#, fuzzy
+"Zuzeneko konexioak huts egin ondoren ezin izan da beste XMPP konexio-"
+"metodorik aurkitu."
+
 msgid "Invalid XMPP ID"
-msgstr "IDa ez da baliozkoa"
+msgstr "XMPP-ID baliogabea"
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr ""
-
-#, fuzzy
+msgstr "XMPP-ID baliogabea. Domeinua ezarri behar da."
+
 msgid "Malformed BOSH URL"
-msgstr "Huts egin du zerbitzariarekin konektatzean."
+msgstr "BOSH URL baliogabea"
 
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "%s@%s ondo erregistratu da"
-
-#, fuzzy, c-format
+msgstr "Arrakastaz erregistratu da %s@%s"
+
+#, c-format
 msgid "Registration to %s successful"
-msgstr "%s@%s ondo erregistratu da"
+msgstr "%s erregistro arrakastatsua"
 
 msgid "Registration Successful"
-msgstr "Ondo erregistratu da"
+msgstr "Erregistratze Arrakastatsua"
 
 msgid "Registration Failed"
-msgstr "Erregistratzeak huts egin du"
-
-#, fuzzy, c-format
+msgstr "Errorea Erregistratzean"
+
+#, 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 "Herrialdea"
+msgstr "Estatua"
 
 msgid "Postal code"
 msgstr "Posta-kodea "
@@ -4266,80 +4108,70 @@
 msgstr "Data"
 
 msgid "Already Registered"
-msgstr "Erregistratuta dago"
-
-#, fuzzy
+msgstr "Dagoeneko Erregistratuta"
+
 msgid "Unregister"
-msgstr "Erregistratu"
-
-#, fuzzy
+msgstr "Deserregistratu"
+
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Eman datuak behean, zure kontu berria erregistratzeko."
+msgstr "Zure kontuaren datuak aldatzeko, bete itzazu beheko datuak."
 
 msgid "Please fill out the information below to register your new account."
-msgstr "Eman datuak behean, zure kontu berria erregistratzeko."
-
-#, fuzzy
+msgstr "Zure kontu berria erregistratzeko, bete itzazu beheko datuak."
+
 msgid "Register New XMPP Account"
-msgstr "Erregistratu Jabber kontu berria"
+msgstr "XMPP Kontu Berria Erregistratu"
 
 msgid "Register"
 msgstr "Erregistratu"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Change Account Registration at %s"
-msgstr "Aldatu %s erabiltzailearen datuak"
-
-#, fuzzy, c-format
+msgstr "%s Kontuaren Erregistroa Aldatu"
+
+#, c-format
 msgid "Register New Account at %s"
-msgstr "Erregistratu Jabber kontu berria"
-
-#, fuzzy
+msgstr "%s Kontu Berria Eregistratu"
+
 msgid "Change Registration"
-msgstr "Erregistratze-errorea"
-
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "Huts egin du zerbitzariarekin konektatzean."
-
-#, fuzzy
+msgstr "Erregistroa Aldatu"
+
 msgid "Error unregistering account"
-msgstr "Errorea kontuaren datuak aldatzean"
+msgstr "Errorea kontua erregistratzean"
 
 msgid "Account successfully unregistered"
-msgstr ""
+msgstr "Arrakastaz erregistratu da kontua"
 
 msgid "Initializing Stream"
-msgstr "Korrontea hasieratzen"
-
-#, fuzzy
+msgstr "Jarioa Hasiaratzen"
+
 msgid "Initializing SSL/TLS"
-msgstr "Korrontea hasieratzen"
+msgstr "SSL/TLS hasiarazten"
 
 msgid "Authenticating"
 msgstr "Autentifikatzen"
 
 msgid "Re-initializing Stream"
-msgstr "Korrontea berrasieratzen"
+msgstr "Jarioa Berrasiaratzen"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "Zerbitzariak ez ditu blokeoak jasaten"
 
 msgid "Not Authorized"
-msgstr "Baimenik ez"
+msgstr "Baimenik Ez"
 
 msgid "Mood"
 msgstr "Umorea"
 
 msgid "Now Listening"
-msgstr ""
+msgstr "Orain Entzuten"
 
 msgid "Both"
 msgstr "Biak"
 
 msgid "From (To pending)"
-msgstr "Nork (Nori jarri gabe)"
+msgstr "Nork (Nori erabakitzeke)"
 
 msgid "From"
 msgstr "Nork"
@@ -4348,138 +4180,132 @@
 msgstr "Nori"
 
 msgid "None (To pending)"
-msgstr "Ez (Nori jarri gabe)"
+msgstr "Ez (Nori erabakitzeke)"
 
 msgid "None"
-msgstr "Bat ere ez"
+msgstr "Batere ez"
 
 msgid "Subscription"
 msgstr "Harpidetza"
 
-#, fuzzy
 msgid "Mood Text"
-msgstr "Umorea"
-
-#, fuzzy
+msgstr "Umore-Testua"
+
 msgid "Allow Buzz"
-msgstr "Onartu"
+msgstr "Burrunbak Onartu"
 
 msgid "Tune Artist"
-msgstr ""
-
-#, fuzzy
+msgstr "Doinuaren Artista"
+
 msgid "Tune Title"
-msgstr "Lanpostua"
+msgstr "Doinuaren Titulua"
 
 msgid "Tune Album"
-msgstr ""
+msgstr "Doinuaren Albuma"
 
 msgid "Tune Genre"
-msgstr ""
-
-#, fuzzy
+msgstr "Doinuaren Generoa"
+
 msgid "Tune Comment"
-msgstr "Lagunen iruzkinak"
+msgstr "Doinuaren Iruzkina"
 
 msgid "Tune Track"
-msgstr ""
+msgstr "Donuaren Pista"
 
 msgid "Tune Time"
-msgstr ""
+msgstr "Doinuaren Denbora"
 
 msgid "Tune Year"
-msgstr ""
+msgstr "Doinuaren Urtea"
 
 msgid "Tune URL"
-msgstr ""
+msgstr "Doinuaren URLa"
 
 msgid "Password Changed"
-msgstr "Pasahitza aldatu da"
+msgstr "Pasahitza Aldatuta"
 
 msgid "Your password has been changed."
-msgstr "Zure pasahitza aldatu egin da."
+msgstr "Zure pasahitza aldatu da."
 
 msgid "Error changing password"
 msgstr "Errorea pasahitza aldatzean"
 
-#, fuzzy
 msgid "Change XMPP Password"
-msgstr "Aldatu pasahitza"
+msgstr "XMPP-Pasahitza Aldatu"
 
 msgid "Please enter your new password"
-msgstr "Idatzi pasahitz berria"
+msgstr "Idatzi ezazu pasahitz berria"
 
 msgid "Set User Info..."
-msgstr "Ezarri erabiltzailearen datuak..."
+msgstr "Erabiltzaile-Datuak Ezarri..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 msgid "Change Password..."
-msgstr "Aldatu pasahitza..."
+msgstr "Pasahitza Aldatu..."
 
 #. }
 msgid "Search for Users..."
-msgstr "Bilatu erabiltzaileak..."
+msgstr "Erabiltzaileak Bilatu..."
 
 msgid "Bad Request"
-msgstr "Eskaera okerra"
+msgstr "Eskaera Okerra"
 
 msgid "Conflict"
 msgstr "Gatazka"
 
 msgid "Feature Not Implemented"
-msgstr "Eginbidea ez da inplementatu"
+msgstr "Ezaugarria Ez da Inplementatu"
 
 msgid "Forbidden"
 msgstr "Debekatuta"
 
 msgid "Gone"
-msgstr "Joan egin da"
+msgstr "Kanpoan"
 
 msgid "Internal Server Error"
-msgstr "Zerbitzariaren barneko errorea"
+msgstr "Zerbitzariaren Barneko Errorea"
 
 msgid "Item Not Found"
-msgstr "Elementua ez da aurkitu"
-
-#, fuzzy
+msgstr "Ez da Elementua Aurkitu"
+
 msgid "Malformed XMPP ID"
-msgstr "Gaizki osatutako Jabber IDa"
+msgstr "XMPP-ID Baliogabea"
 
 msgid "Not Acceptable"
-msgstr "Ezin da onartu"
+msgstr "Ez Onargarria"
 
 msgid "Not Allowed"
-msgstr "Ez da onartzen"
+msgstr "Ez Onartua"
 
 msgid "Payment Required"
-msgstr "Ordaindu egin behar da"
+msgstr "Ordainketa Beharrezkoa"
 
 msgid "Recipient Unavailable"
-msgstr "Hartzailea ez dago erabilgarri"
+msgstr "Hartzailea Ez dago Eskuragarri"
 
 msgid "Registration Required"
-msgstr "Erregistratu egin behar da"
+msgstr "Erregistratzea Beharrezkoa"
 
 msgid "Remote Server Not Found"
-msgstr "Urruneko zerbitzaria ez da aurkitu"
+msgstr "Ez da Urruneko Zerbitzaria Aurkitu"
 
 msgid "Remote Server Timeout"
-msgstr "Urruneko zerbitzariaren denbora-muga"
+msgstr "Urruneko Zerbitzariaren Denbora-muga"
 
 msgid "Server Overloaded"
-msgstr "Zerbitzariak karga handiegia du"
+msgstr "Zerbitzariaren Gainkarga"
 
 msgid "Service Unavailable"
-msgstr "Zerbitzua ez dago erabilgarri"
+msgstr "Zerbitzu Erabilgaitza"
 
 msgid "Subscription Required"
-msgstr "Harpidetu egin behar da"
+msgstr "Harpidetza Beharrezkoa"
 
 msgid "Unexpected Request"
-msgstr "Ustekabeko eskaera"
+msgstr "Ustekabeko Eskaera"
 
 msgid "Authorization Aborted"
-msgstr "Baimena abortatu da"
+msgstr "Baimen Abortatua"
 
 msgid "Incorrect encoding in authorization"
 msgstr "Kodeketa okerra baimenean"
@@ -4488,237 +4314,228 @@
 msgstr "authzid baliogabea"
 
 msgid "Invalid Authorization Mechanism"
-msgstr "Baimen-mekanismoa ez da baliozkoa"
+msgstr "Baimen-Mekanismo Baliogabea"
 
 msgid "Authorization mechanism too weak"
-msgstr "Baimen-mekanismoa ahulegia da"
+msgstr "Baimen-mekanismo ahulegia"
 
 msgid "Temporary Authentication Failure"
-msgstr "Aldi baterako autentifikazioak huts egin du"
+msgstr "Aldiuneko Autentifikazio-Errorea"
 
 msgid "Authentication Failure"
-msgstr "Autentifikazioak huts egin du"
+msgstr "Autentifikazio-Errorea"
 
 msgid "Bad Format"
-msgstr "Okerreko formatua"
+msgstr "Formatu Baliogabea"
 
 msgid "Bad Namespace Prefix"
-msgstr "Izen-lekuaren aurrizki okerra"
+msgstr "Izen-Leku Aurrizki Baliogabea"
 
 msgid "Resource Conflict"
-msgstr "Baliabide-gatazka"
+msgstr "Baliabide-Gatazka"
 
 msgid "Connection Timeout"
-msgstr "Konexioaren denbora-muga"
+msgstr "Konexioaren Denbora-muga"
 
 msgid "Host Gone"
-msgstr "Ostalaria galdu da"
+msgstr "Ostalaria Galdu da"
 
 msgid "Host Unknown"
-msgstr "Ostalari ezezaguna"
+msgstr "Ostalari Ezezaguna"
 
 msgid "Improper Addressing"
-msgstr "Helbideratze desegokia"
+msgstr "Helbideratze Desegokia"
 
 msgid "Invalid ID"
-msgstr "IDa ez da baliozkoa"
+msgstr "ID Baliogabea"
 
 msgid "Invalid Namespace"
-msgstr "Izen-lekua ez da baliozkoa"
+msgstr "Izen-Leku Baliogabea"
 
 msgid "Invalid XML"
-msgstr "XML baliogabea"
+msgstr "XML Baliogabea"
 
 msgid "Non-matching Hosts"
-msgstr "Bat ez datozen ostalariak"
+msgstr "Ostalari Ezberdinak"
 
 msgid "Policy Violation"
-msgstr "Gidalerroen bortxaketa"
+msgstr "Politika-Bortxaketa"
 
 msgid "Remote Connection Failed"
-msgstr "Urruneko konexioak huts egin du"
+msgstr "Urruneko Konexioak Huts"
 
 msgid "Resource Constraint"
-msgstr "Baliabide-murriztapena"
+msgstr "Baliabide-Murrizketa"
 
 msgid "Restricted XML"
-msgstr "XML murriztua"
+msgstr "XML Murriztua"
 
 msgid "See Other Host"
-msgstr "Ikus beste ostalari batzuk"
+msgstr "Beste Ostalaria Ikusi"
 
 msgid "System Shutdown"
-msgstr "Sistema itzali da"
+msgstr "Sistema Itzalketa"
 
 msgid "Undefined Condition"
-msgstr "Definitu gabeko baldintza"
+msgstr "Definitu Gabeko Baldintza"
 
 msgid "Unsupported Encoding"
-msgstr "Kodeketa ez da onartzen"
+msgstr "Kodeketa Jasangabea"
 
 msgid "Unsupported Stanza Type"
-msgstr "Stanza mota ez da onartzen"
+msgstr "Stanza-Mota Jasangabea"
 
 msgid "Unsupported Version"
-msgstr "Bertsioa ez da onartzen"
+msgstr "Bertsio Jasangabea"
 
 msgid "XML Not Well Formed"
-msgstr "XML ez da ondo osatu"
+msgstr "XML Desitxuratua"
 
 msgid "Stream Error"
-msgstr "Korronte-errorea"
+msgstr "Jario-Errorea"
 
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "Ezin da %s erabiltzailea kanporatu"
+msgstr "Ezin %s erabiltzailea betatu"
 
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "kidetza ezezaguna:\" %s\""
+msgstr "Kidetza ezezaguna:\" %s\""
 
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Ezin da erabiltzailea %s kide bihurtu \"%s\""
+msgstr "Ezin da %s erabiltzailea kide bihurtu: \"%s\""
 
 #, c-format
 msgid "Unknown role: \"%s\""
-msgstr "Rol ezezaguna:\" %s\""
+msgstr "Rol ezezaguna: \" %s\""
 
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "%s erabiltzaileari ezin zaio %s rola ezarri"
+msgstr "Ezin \"%s\" rola ezarri erabiltzaileari: %s"
 
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "Ezin da %s erabiltzailea jaurti"
-
-#, fuzzy, c-format
+msgstr "Ezin %s erabiltzailea kanporatu"
+
+#, c-format
 msgid "Unable to ping user %s"
-msgstr "Ezin da %s erabiltzailea kanporatu"
-
-#, fuzzy, c-format
+msgstr "Ezin %s erabiltzaileari ping egin"
+
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "Ezin da soinua jo, aukeratutako fitxategia (%s) ez dagoelako."
-
-#, fuzzy, c-format
+msgstr "Ezin burrunba egin, ez dagoela %s(r)en inguruko ezer."
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "Ezin da soinua jo, aukeratutako fitxategia (%s) ez dagoelako."
-
-#, fuzzy, c-format
+msgstr "Ezin burrunba egin, %s deskonektatu egon daitekeelako."
+
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "Ezin da soinua jo, aukeratutako fitxategia (%s) ez dagoelako."
+msgstr ""
+"Ezin burrunba egin, %s(e)k ez duelako jasaten edo ez duelako burrunbarik "
+"jaso nahi orain."
 
 #, c-format
 msgid "Buzzing %s..."
-msgstr ""
+msgstr "%s(r)i burrunba egiten..."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#, fuzzy
 msgid "Buzz"
-msgstr "Buzz!!"
-
-#, fuzzy, c-format
+msgstr "Burrunba"
+
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "%s konektatu da bertan."
-
-#, fuzzy, c-format
+msgstr "%s(e)k burruba egin dizu!"
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Ezin zaio mezua bidali %s(r)i."
-
-#, fuzzy, c-format
+msgstr "Ezin multimedia hasiarazi %s(r)ekin: JID baliogabea"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr ""
-"Ezin zaio fitxategia bidali %s erabiltzaileari, ez duelako fitxategi-"
-"transferentziarik onartzen"
-
-#, fuzzy, c-format
+msgstr "Ezin multimedia hasiarazi %s(r)ekin: erabiltzailea ez dago konektatuta"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
-"Ezin zaio fitxategia bidali %s erabiltzaileari, ez duelako fitxategi-"
-"transferentziarik onartzen"
-
-#, fuzzy
+"Ezin multimedia hasiarazi %s(r)ekin: ez dago erabiltzaile-presentziara "
+"harpidetua"
+
 msgid "Media Initiation Failed"
-msgstr "Erregistratzeak huts egin du"
-
-#, fuzzy, c-format
+msgstr "Ezin Multimedia Hasiarazi"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
-"Idatzi informazioa ikusi nahi duzun pertsonaren pantaila-izena edo ezizena."
-
-#, fuzzy
+"Multimedia sesioa hasiarazteko erabiliko duzun %s(e)ko baliabidea hautatu "
+"ezazu."
+
 msgid "Select a Resource"
-msgstr "Hautatu fitxategia"
-
-#, fuzzy
+msgstr "Baliabide bat Hautatu"
+
 msgid "Initiate Media"
-msgstr "Hasi _berriketa"
+msgstr "Multimedia Hasiarazi"
 
 msgid "config:  Configure a chat room."
-msgstr "konfig.: konfiguratu berriketa-gela bat."
+msgstr "config: Berriketa-gela bat konfiguratu."
 
 msgid "configure:  Configure a chat room."
-msgstr "konfiguratu: konfiguratu berriketa-gela bat."
+msgstr "configure: Berriketa-gela bat konfiguratu."
 
 msgid "part [room]:  Leave the room."
-msgstr "part [gela]:  irten gelatik."
+msgstr "part [gela]:  Gelatik irten."
 
 msgid "register:  Register with a chat room."
-msgstr "register:  harpidetu berriketa-gela batean."
+msgstr "register:  Berriketa-gela batean erregistratu."
 
 msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [gai berria]:  ikusi edo aldatu gaia"
-
-#, fuzzy
+msgstr "topic [gai berria]:  Gaia ikusi edo aldatu."
+
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;erabiltzailea&gt; [gela]:  bota erabiltzailea gela batetik."
-
-#, fuzzy
+msgstr ""
+"ban &lt;erabiltzailea&gt; [arrazoia]:  Gela batetik betatu erabiltzailea."
+
 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 ""
-"Afiliatu &It; erabiltzaile&gt;&It;jabea| administratzailea|kidea| paria | "
-"ezer ez&gt;: Erabiltzailearen afiliazioa ezarri gelarekiko."
-
-#, fuzzy
+"affiliate &lt;owner|admin|member|outcast|none&gt; [ezizena1] [ezizena2] ...: "
+"Gela bateko erabiltzaileen afizialioak eskuratu edo ezarri."
+
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"Zeregin &It;erabiltzaile;&It;moderatzailea| partehartzailea | bisitari | "
-"ezer ez&gt;: Ezarri erabiltzailearen zeregina gelarekiko."
+"role &lt;moderator|participant|visitor|none&gt; [ezizena1] [ezizena2] ...: "
+"Gela batean rol bat duten erabiltzaileak eskuratu, edo rol bat ezarri."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr ""
-"gonbidatu &lt;erabiltzailea&gt; [mezua]:  gonbidatu erabiltzailea gelara."
-
-#, fuzzy
+msgstr "invite &lt;erabiltzailea&gt; [mezua]:  Erabiltzailea gelara gonbidatu."
+
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr ""
-"Lotu: &lt;gela&gt; [zerbitzaria]:  Lotu zerbitzari hontako berriketara."
-
-#, fuzzy
+msgstr "join: &lt;gela&gt; [pasahitza]:  Zerbitzariko solasaldi batera batu."
+
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "Jaurti &lt;erabiltzailea&gt; [gela]: Jaurti erabiltzailea gelatik."
+msgstr ""
+"kick &lt;erabiltzailea&gt; [arrazoia]:  Gelatik kanporatu erabiltzailea."
 
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"msg &lt;erabiltzailea&gt; &lt;mezua&gt;:  bidali mezu pribatua "
-"erabiltzaileari."
+"msg &lt;erabiltzailea&gt; &lt;mezua&gt;:  Mezu pribatu bat bidali beste "
+"erabiltzaile bati."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
-msgstr ""
-
-#, fuzzy
+msgstr "ping &lt;jid&gt;:\tErabiltzaile/osagai/zerbitzari bat ping egin."
+
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: eman abisu kontaktu bati bere harreta lortzeko"
+msgstr "buzz: Erabiltzaile bati burrunba egin bere arreta eskuratzeko"
 
 #. *< type
 #. *< ui_requirement
@@ -4730,50 +4547,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "XMPP Protocol Plugin"
-msgstr "MSN protokoloaren plugin-a"
+msgstr "XMPP Protokolo-Plugina"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#, fuzzy
 msgid "Domain"
-msgstr "Errumaniera"
-
-#, fuzzy
+msgstr "Domeinua"
+
 msgid "Require SSL/TLS"
-msgstr "TLS beharrezkoa da"
+msgstr "SSL/TLS Eskatu"
 
 msgid "Force old (port 5223) SSL"
-msgstr "Behartu SSL zaharra (atala 5223) SSL"
+msgstr "SSL zaharra (5223 ataka) behartu"
 
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "Onartu testu arruntaren autentifikazioa enkriptatu gabeko korronteetan"
+msgstr "Enkriptatu gabeko jarioen bidezko testu-arrunt autentifikazioa onartu"
 
 msgid "Connect port"
-msgstr "Konektatzeko atak"
+msgstr "Konexio-ataka"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 msgid "Connect server"
-msgstr "Konektatu zerbitzariarekin"
-
-#, fuzzy
+msgstr "Zerbitzarira konektatu"
+
 msgid "File transfer proxies"
-msgstr "Fitxategi-transferentzien ataka"
+msgstr "Fitxategi-transferentzien proxya"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URLa"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
-msgstr "Erakutsi _aurpegiera grafikoak "
-
-#, fuzzy, c-format
+msgstr "Smiley Pertsonalizatuak Erakutsi"
+
+#, c-format
 msgid "%s has left the conversation."
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
+msgstr "%s solasalditik irten da."
 
 #, c-format
 msgid "Message from %s"
@@ -4785,25 +4597,24 @@
 
 #, c-format
 msgid "The topic is: %s"
-msgstr "Uneko gaia: %s"
+msgstr "Oraingo gaia: %s"
 
 #, c-format
 msgid "Message delivery to %s failed: %s"
-msgstr "%s(r)i mezua bidaltzeak huts egin du: %s"
-
-#, fuzzy
+msgstr "Ezin mezua bidali %s(r)i: %s"
+
 msgid "XMPP Message Error"
-msgstr "Jabber mezuaren errorea"
-
-#, fuzzy, c-format
+msgstr "XMPP Mezu Errorea"
+
+#, c-format
 msgid "(Code %s)"
-msgstr " (%s kodea)"
+msgstr "(%s kodea)"
 
 msgid "XML Parse error"
-msgstr "XML analisi-errorea"
+msgstr "XML Analisi-errorea"
 
 msgid "Unknown Error in presence"
-msgstr "Presentzia-errore ezezaguna"
+msgstr "Errore Ezezaguna Presentzian"
 
 #, c-format
 msgid "Error joining chat %s"
@@ -4814,190 +4625,176 @@
 msgstr "Errorea %s berriketan"
 
 msgid "Create New Room"
-msgstr "Sortu gela berria"
+msgstr "Gela Berria Sortu"
 
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
-"Gela berri bat sortzera zoaz. Konfiguratu egin nahi duzu, ala ezarpen "
+"Gela berri bat sortuko duzu. Konfiguratu egin nahi duzu, ala ezarpen "
 "lehenetsiak onartu nahi dituzu?"
 
 msgid "_Configure Room"
 msgstr "Gela _Konfiguratu"
 
 msgid "_Accept Defaults"
-msgstr "Lehenetsiak _onartu"
-
-#, fuzzy
+msgstr "Lehenetsiak _Onartu"
+
 msgid "No reason"
-msgstr "Ez da arrazoirik eman."
-
-#, fuzzy, c-format
+msgstr "Arrazoirik ez"
+
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "%s erabiltzaileak kanporatu zaitu: (%s)"
-
-#, fuzzy, c-format
+msgstr "Kanporatua izan zara: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Honek kanporatu zaitu: %s (%s)"
-
-#, fuzzy
+msgstr "Kanporatua (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Errore bat gertatu da fitxategia irekitzean."
-
-#, fuzzy
+msgstr "Errorea banda barruko byte-jario transferentzian\n"
+
 msgid "Transfer was closed."
-msgstr "Fitxategi-transferentzia huts egin du"
-
-#, fuzzy
+msgstr "Transferentzia itxiarazi da."
+
 msgid "Failed to open the file"
-msgstr "Huts egin du irudia gordetzean: %s\n"
+msgstr "Ezin fitxategia ireki"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Ezin banda barneko byte-jarioa ireki"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
-"Ezin zaio fitxategia bidali %s erabiltzaileari, ez duelako fitxategi-"
+"Ezin fitxategia bidali %s erabiltzaileari, ez duelako fitxategi-"
 "transferentziarik onartzen"
 
 msgid "File Send Failed"
-msgstr "Huts egin du fitxategia bidaltzean"
-
-#, fuzzy, c-format
+msgstr "Errorea Fitxategia Bidaltzean"
+
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Ezin zaio mezua bidali %s(r)i."
-
-#, fuzzy, c-format
+msgstr "Ezin fitxategia bidali %s(r)i, JID baliogabea"
+
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr ""
-"Ezin zaio fitxategia bidali %s erabiltzaileari, ez duelako fitxategi-"
-"transferentziarik onartzen"
-
-#, fuzzy, c-format
+msgstr "Ezin fitxategia bidali %s(r)i, erabiltzailea ez dago konektatuta"
+
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
-"Ezin zaio fitxategia bidali %s erabiltzaileari, ez duelako fitxategi-"
-"transferentziarik onartzen"
-
-#, fuzzy, c-format
+"Ezin fitxategia bidali %s(r)i, ez dago erabiltzaile-presentziara harpidetuta"
+
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr ""
-"Idatzi informazioa ikusi nahi duzun pertsonaren pantaila-izena edo ezizena."
-
-#, fuzzy
+msgstr "Fitxategia %s(e)ko zein baliabidetara bidaliko duzun hautatu ezazu."
+
 msgid "Edit User Mood"
-msgstr "Erabiltzaile-moduak"
+msgstr "Erabiltzaile-Umorea Editatu"
 
 msgid "Please select your mood from the list."
-msgstr ""
-
-#, fuzzy
+msgstr "Zerrendako umore bat hautatu ezazu."
+
 msgid "Set"
-msgstr "_Ezarri"
-
-#, fuzzy
+msgstr "Ezarri"
+
 msgid "Set Mood..."
-msgstr "Hautatu karpeta..."
-
-#, fuzzy
+msgstr "Umorea Ezarri..."
+
 msgid "Set User Nickname"
-msgstr "Ezarri erabiltzailearen muga"
+msgstr "Erabiltzaile-Ezizena Ezarri"
 
 msgid "Please specify a new nickname for you."
-msgstr ""
+msgstr "Zure ezizen berria zehaztu ezazu."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
-
-#, fuzzy
+"Zure kontaktu-zerrendako edonork ikus dezake informazio hau, beraz, egokia "
+"hautatu ezazu."
+
 msgid "Set Nickname..."
-msgstr "Goitizena"
-
-#, fuzzy
+msgstr "Ezizena Ezarri..."
+
 msgid "Actions"
-msgstr "Akzioa"
-
-#, fuzzy
+msgstr "Ekintzak"
+
 msgid "Select an action"
-msgstr "Hautatu fitxategia"
+msgstr "Ekintza hautatu"
 
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
 #, c-format
 msgid "Unable to add \"%s\"."
-msgstr "Ezin da gehitu \"%s\"."
+msgstr "Ezin \"%s\" gehitu."
 
 msgid "Buddy Add error"
-msgstr ""
-
-#, fuzzy
+msgstr "Errorea laguna gehitzean"
+
 msgid "The username specified does not exist."
-msgstr "Zehastu duzun Pantaila-izena ez baliogarria."
+msgstr "Zehaztu duzun erabiltzaile-izena ez da existitzen."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Arazoa lagunen zerrenda %s(e)n (%s) sinkronizatzean"
+msgstr "Arazoa lagun-zerrenda sinkronizatzean: %s (%s)"
 
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
-"%s lokaleko zerrendan (\"%s\" taldean) dago, baina ez zerbitzariaren "
-"zerrendan. Lagun hau gehitzea nahi duzu?"
+"Zerrenda lokaleko \"%s\" taldean dago %s, baina ez zerbitzariko zerrendan. "
+"Lagun hau gehitzea nahi al duzu?"
 
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
-"%s lokaleko zerrendan dago, baina ez zerbitzariaren zerrendan. Lagun hau "
-"gehitzea nahi duzu?"
+"Zerrenda lokalean dago %s, baina ez zerbitzariko zerrendan. Lagun hau "
+"gehitzea nahi al duzu?"
 
 #, c-format
 msgid "Unable to parse message"
-msgstr "Ezin da mezua analizatu"
-
-#, fuzzy, c-format
+msgstr "Ezin mezua analizatu"
+
+#, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "Sintaxi-errorea (beharbada Pidgin errorea dago)"
+msgstr "Sintaxi-Errorea (beharbada bezeroaren akatsa)"
 
 #, c-format
 msgid "Invalid email address"
-msgstr "Helbide elektronikoa ez da zuzena"
+msgstr "Helbide-elektroniko baliogabea"
 
 #, c-format
 msgid "User does not exist"
-msgstr "Erabiltzailea ez dago"
-
-#, fuzzy, c-format
+msgstr "Erabiltzailea ez da existitzen"
+
+#, c-format
 msgid "Fully qualified domain name missing"
-msgstr "Domeinu-izen osoa falta da"
-
-#, fuzzy, c-format
+msgstr "Baliozko domeinu-izena falta"
+
+#, c-format
 msgid "Already logged in"
-msgstr "Konektatuta dago lehendik"
-
-#, fuzzy, c-format
+msgstr "Jadanik konektatuta"
+
+#, c-format
 msgid "Invalid username"
-msgstr "Erabiltzaile-izena ez da baliozkoa"
-
-#, fuzzy, c-format
+msgstr "Erabiltzaile-izen baliogabea"
+
+#, c-format
 msgid "Invalid friendly name"
-msgstr "Lagunarteko izena ez da baliozkoa"
-
-#, fuzzy, c-format
+msgstr "Lagunarteko izen baliogabea"
+
+#, c-format
 msgid "List full"
-msgstr "Zerrenda beteta dago"
+msgstr "Zerrenda osoa"
 
 #, c-format
 msgid "Already there"
-msgstr "Hor dago lehendik"
+msgstr "Hor dago jadanik"
 
 #, c-format
 msgid "Not on list"
@@ -5005,23 +4802,23 @@
 
 #, c-format
 msgid "User is offline"
-msgstr "Erabiltzailea lineaz kanpo dago"
+msgstr "Erabiltzailea offline dago"
 
 #, c-format
 msgid "Already in the mode"
-msgstr "Lehendik dago modu honetan"
+msgstr "Modu honetan jadanik"
 
 #, c-format
 msgid "Already in opposite list"
-msgstr "Lehendik dago aurkako zerrendan"
+msgstr "Aurkako zerrendan jadanik"
 
 #, c-format
 msgid "Too many groups"
-msgstr "Talde gehiegi daude"
+msgstr "Talde gehiegi"
 
 #, c-format
 msgid "Invalid group"
-msgstr "Taldea ez da baliozkoa"
+msgstr "Talde baliogabea"
 
 #, c-format
 msgid "User not in group"
@@ -5029,7 +4826,7 @@
 
 #, c-format
 msgid "Group name too long"
-msgstr "Talde-izena luzeegia da"
+msgstr "Talde-izen luzeegia"
 
 #, c-format
 msgid "Cannot remove group zero"
@@ -5037,47 +4834,47 @@
 
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "Existitzen ez den talde batera erabiltzailea atxikitzen"
+msgstr "Existitzen ez den talde batera erabiltzaile bat gehitzen saiatu zara"
 
 #, c-format
 msgid "Switchboard failed"
-msgstr "Switchboard hutsegitea"
-
-#, fuzzy, c-format
+msgstr "Switchboard errorea"
+
+#, c-format
 msgid "Notify transfer failed"
-msgstr "Jakinarazpen-transferentziak huts egin du"
+msgstr "Transferentzi-jakinarazpen errorea"
 
 #, c-format
 msgid "Required fields missing"
-msgstr "Behar diren eremu batzuk falta dira"
-
-#, c-format
+msgstr "Beharrezko eremu batzuk falta"
+
+#, fuzzy, c-format
 msgid "Too many hits to a FND"
 msgstr "Emaitza gehiegi FND baterako"
 
 #, c-format
 msgid "Not logged in"
-msgstr "Ez dago konektatuta"
-
-#, fuzzy, c-format
+msgstr "Ez konektatuta"
+
+#, c-format
 msgid "Service temporarily unavailable"
-msgstr "Zerbitzua ez dago erabilgarri une honetan"
+msgstr "Zerbitzua eskuragaitz dago une honetan"
 
 #, c-format
 msgid "Database server error"
-msgstr "Datu-basearen zerbitzariaren errorea"
+msgstr "Datu-basea zerbitzariaren errorea"
 
 #, c-format
 msgid "Command disabled"
-msgstr "Komandoa desgaitu da"
+msgstr "Agindua ezgaituta"
 
 #, c-format
 msgid "File operation error"
-msgstr "Errorea fitxategi-eragiketan"
+msgstr "Fitxategi-eragiketa errorea"
 
 #, c-format
 msgid "Memory allocation error"
-msgstr "Memoria-esleipeneko errorea"
+msgstr "Memoria-esleipen errorea"
 
 #, c-format
 msgid "Wrong CHL value sent to server"
@@ -5085,19 +4882,19 @@
 
 #, c-format
 msgid "Server busy"
-msgstr "Zerbitzaria okupatuta dago"
+msgstr "Zerbitzaria lanpetuta"
 
 #, c-format
 msgid "Server unavailable"
 msgstr "Zerbitzaria ez dago erabilgarri"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Peer notification server down"
-msgstr "Parekoaren jakinarazpen-zerbitzaria itxita"
+msgstr "Parekoen jakinarazpen-zerbitzaria itxita"
 
 #, c-format
 msgid "Database connect error"
-msgstr "Errorea datu-basearekin konektatzean"
+msgstr "Datu-base konexio errorea"
 
 #, c-format
 msgid "Server is going down (abandon ship)"
@@ -5113,11 +4910,11 @@
 
 #, c-format
 msgid "Unable to write"
-msgstr "Ezin da idatzi"
+msgstr "Ezin idatzi"
 
 #, c-format
 msgid "Session overload"
-msgstr "Saioak karga handiegia du"
+msgstr "Sesio gainkarga"
 
 #, c-format
 msgid "User is too active"
@@ -5125,7 +4922,7 @@
 
 #, c-format
 msgid "Too many sessions"
-msgstr "Saio gehiegi daude"
+msgstr "Sesio gehiegi"
 
 #, c-format
 msgid "Passport not verified"
@@ -5133,7 +4930,7 @@
 
 #, c-format
 msgid "Bad friend file"
-msgstr "Okerreko lagun-fitxategia"
+msgstr "Lagun-fitxategi baliogabea"
 
 #, c-format
 msgid "Not expected"
@@ -5141,19 +4938,19 @@
 
 #, c-format
 msgid "Friendly name changes too rapidly"
-msgstr "Lagunarteko izena bizkorregi aldatu da"
+msgstr "Lagunarteko izena bizkorregi aldatzen ari da"
 
 #, c-format
 msgid "Server too busy"
-msgstr "Zerbitzaria okupatuegi dago"
+msgstr "Zerbitzaria lanpetuegi"
 
 #, c-format
 msgid "Authentication failed"
-msgstr "Huts egin du autentifikatzean."
+msgstr "Ezin autentifikatu"
 
 #, c-format
 msgid "Not allowed when offline"
-msgstr "Ez da onartzen lineaz kanpo"
+msgstr "Ez da onartzen offline egotean"
 
 #, c-format
 msgid "Not accepting new users"
@@ -5161,82 +4958,99 @@
 
 #, c-format
 msgid "Kids Passport without parental consent"
-msgstr "Ume-pasaportea gurasoen baimenik gabe"
+msgstr "Gurasoen baimenik gabeko Kids Passport"
 
 #, c-format
 msgid "Passport account not yet verified"
-msgstr "Pasaporte-kontua ez da egiaztatu oraindik"
-
-#, fuzzy
+msgstr "Passport-kontua ez da egiaztatu oraindik"
+
 msgid "Passport account suspended"
-msgstr "Pasaporte-kontua ez da egiaztatu oraindik"
+msgstr "Passport-kontua suspendituta"
 
 #, c-format
 msgid "Bad ticket"
-msgstr "Okerreko tiketa"
+msgstr "Tiket baliogabea"
 
 #, c-format
 msgid "Unknown Error Code %d"
-msgstr "%d errore-kode ezezaguna"
+msgstr "Errore-Kode Ezezaguna: %d"
 
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN Errorea: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Kontaktu hobetsia"
-
-#, fuzzy
+msgstr "Beste Kontaktuak"
+
 msgid "Non-IM Contacts"
-msgstr "Kendu kontaktua"
+msgstr "Ez-IM Kontaktuak"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s(e)k keinu bat bidali dizu. <a href='audio://%s'>Klik egizu "
+"erreproduzitzeko</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s(e)k keinu bat bidali dizu, baina ezin izan da gorde"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s(e)k ahots-klip bat bidali dizu. <a href='audio://%s'>Klik egizu "
+"erreproduzitzeko</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s(e)k ahots-klip bat bidali dizu, baina ezin izan da gorde"
 
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
+"%s(e)k ahots-solasaldi batera gonbidatu zaitu, baina oraindik ez dago jasana."
 
 msgid "Nudge"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Ukondokada"
+
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k ukondokatu zaitu!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
-
-#, fuzzy
+msgstr "%s ukondokatzen..."
+
 msgid "Email Address..."
-msgstr "Helbide elektronikoa"
+msgstr "Helbide Elektronikoa..."
 
 msgid "Your new MSN friendly name is too long."
-msgstr "MSN lagunarteko izen berria luzeegia da."
+msgstr "MSN-lagunarteko izen berria luzeegia da."
 
 msgid "Set your friendly name."
-msgstr "Ezarri lagunarteko izena."
+msgstr "Zure lagunarteko izena ezarri."
 
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "Beste MSN lagunek izen horrekin ikusiko zaituzte."
+msgstr "MSNko lagunek izen honekin ikusiko zaituzte."
 
 msgid "Set your home phone number."
-msgstr "Idatzi zure etxeko telefonoa."
+msgstr "Zure etxeko telefonoa ezarri."
 
 msgid "Set your work phone number."
-msgstr "Idatzi zure laneko telefonoa."
+msgstr "Zure laneko telefonoa ezarri."
 
 msgid "Set your mobile phone number."
-msgstr "Idatzi zure telefono mugikorra."
+msgstr "Zure telefono mugikorra ezarri."
 
 msgid "Allow MSN Mobile pages?"
-msgstr "MSN Mobile-ren orriak onartu nahi dituzu?"
+msgstr "MSN Mobile orriak onartu?"
 
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
-"Onartu nahi duzu zure lagunen zerrendakoek zuri MSN Mobile-ren orriak "
-"bidaltzea, telefono mugikorrera edo beste gailu mugikorren batera?"
+"Zure lagun-zerrendako jendeak zure telefono mugikorrera edo gailu "
+"mogikorretara MSN Mobile orriak bidaltzea onartu nahi al duzu?"
 
 msgid "Allow"
 msgstr "Onartu"
@@ -5244,49 +5058,45 @@
 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 ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
-
-#, fuzzy
+msgstr "Expresio hauek blokeatzen ari dira gaur egun MSN-zerbitzariak:<br/>%s"
+
 msgid "This account does not have email enabled."
-msgstr "Hotmail kontu hau behar bada ez dago aktibatua."
+msgstr "Kontu honek ez dauka e-posta gaituta."
 
 msgid "Send a mobile message."
-msgstr "Bidali mezu bat mugikor batera."
+msgstr "Mugikor batera mezu bat bidali."
 
 msgid "Page"
 msgstr "Orria"
 
 msgid "Playing a game"
-msgstr ""
-
-#, fuzzy
+msgstr "Jolasten"
+
 msgid "Working"
-msgstr "Laneko IM"
-
+msgstr "Lanean"
+
+#, fuzzy
 msgid "Has you"
 msgstr "Atzeman zaitu"
 
-#, fuzzy
 msgid "Home Phone Number"
-msgstr "Ezarri etxeko telefonoa..."
-
-#, fuzzy
+msgstr "Etxeko Telefono Zenbakia"
+
 msgid "Work Phone Number"
-msgstr "Ezarri laneko telefonoa..."
-
-#, fuzzy
+msgstr "Laneko Telefono Zenbakia"
+
 msgid "Mobile Phone Number"
-msgstr "Ezarri telefono mugikorra..."
+msgstr "Telefono Zenbaki Mugikorra"
 
 msgid "Be Right Back"
 msgstr "Oraintxe nator"
@@ -5298,7 +5108,7 @@
 msgstr "Telefonoan "
 
 msgid "Out to Lunch"
-msgstr "Bazkaltzera joan naiz "
+msgstr "Bazkaltzen"
 
 #. primitive
 #. ID
@@ -5306,56 +5116,75 @@
 #. saveable
 #. should be user_settable some day
 #. independent
-#, fuzzy
 msgid "Artist"
-msgstr "Helbidea"
+msgstr "Artista"
 
 msgid "Album"
-msgstr ""
-
-#, fuzzy
+msgstr "Albuma"
+
 msgid "Game Title"
-msgstr "Lanpostua"
+msgstr "Jolasaren Titulua"
 
 #, fuzzy
 msgid "Office Title"
 msgstr "Lanpostua"
 
 msgid "Set Friendly Name..."
-msgstr "Ezarri lagunarteko izena..."
+msgstr "Lagunarteko Izena Ezarri..."
 
 msgid "Set Home Phone Number..."
-msgstr "Ezarri etxeko telefonoa..."
+msgstr "Etxeko Telefonoa Ezarri..."
 
 msgid "Set Work Phone Number..."
-msgstr "Ezarri laneko telefonoa..."
+msgstr "Laneko Telefonoa Ezarri..."
 
 msgid "Set Mobile Phone Number..."
-msgstr "Ezarri telefono mugikorra..."
+msgstr "Telefono Mugikorra ezarri..."
 
 msgid "Enable/Disable Mobile Devices..."
-msgstr "Gaitu/ez-gaitu gailu mugikorrak..."
+msgstr "Gailu Mugikorrak Gaitu/Ezgaitu..."
 
 msgid "Allow/Disallow Mobile Pages..."
-msgstr "Baimendu/Ukatu mugikorraren orriak..."
+msgstr "Mobile Pages Onartu/Ez-onartu..."
 
 msgid "View Blocked Text..."
-msgstr ""
+msgstr "Blokeatutako Testua Ikusi..."
 
 msgid "Open Hotmail Inbox"
-msgstr "Ireki Hotmail posta"
+msgstr "Hotmail Posta Ireki"
 
 msgid "Send to Mobile"
-msgstr "Bidali mugikorrera"
+msgstr "Mugikorrera Bidali"
 
 msgid "Initiate _Chat"
-msgstr "Hasi _berriketa"
-
-#, fuzzy
+msgstr "_Berriketa Hasiarazi"
+
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"SSL euskarria behar da MSNrako. Instalatu SSL liburutegi onartu bat. "
-"Informazio gehiago: http://Pidgin.sf.net/faq-ssl.php."
+"SSL euskarria behar da MSNrako. SSL-liburutegi onartu bat instalatu ezazu."
+
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Ezin %s laguna gehitu, erabiltzaile-izena ez delako baliozkoa. Erabiltzaile-"
+"izenek baliozko helbide elektroniko bat izan behar dute."
+
+msgid "Unable to Add"
+msgstr "Ezin Gehitu"
+
+msgid "Authorization Request Message:"
+msgstr "Baimena Eskatzeko Mezua:"
+
+msgid "Please authorize me!"
+msgstr "Emadaizu baimena!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Ados"
 
 msgid "Error retrieving profile"
 msgstr "Errorea profila eskuratzean"
@@ -5367,87 +5196,84 @@
 msgstr "Adina"
 
 msgid "Occupation"
-msgstr "Funtzioa"
+msgstr "Okupazioa"
 
 msgid "Location"
 msgstr "Kokalekua"
 
 msgid "Hobbies and Interests"
-msgstr "Zaletasunak eta interesak"
+msgstr "Zaletasunak eta Interesak"
 
 msgid "A Little About Me"
-msgstr "Zertxobait niri buruz"
+msgstr "Niri Buruzko Zertxobait"
 
 msgid "Social"
-msgstr ""
+msgstr "Soziala"
 
 msgid "Marital Status"
-msgstr "Egoera zibila"
+msgstr "Egoera Zibila"
 
 msgid "Interests"
 msgstr "Intereresak"
 
 msgid "Pets"
-msgstr "Azienda"
+msgstr "Maskotak"
 
 msgid "Hometown"
-msgstr "Jaiotze hiria"
+msgstr "Jaioterria"
 
 msgid "Places Lived"
-msgstr "Bizilekua"
+msgstr "Izandako Bizilekuak"
 
 # , fuzzy
 msgid "Fashion"
-msgstr "Fashion"
+msgstr "Moda"
 
 msgid "Humor"
-msgstr "humorea"
+msgstr "Humorea"
 
 msgid "Music"
 msgstr "Musika"
 
 msgid "Favorite Quote"
-msgstr "Aipamen gogokoena"
-
-#, fuzzy
+msgstr "Aipamen Gogokoena"
+
 msgid "Contact Info"
-msgstr "Kontuari buruzko informazioa"
-
-#, fuzzy
+msgstr "Kontua-Informazioa"
+
 msgid "Personal"
-msgstr "IM pertsonala"
+msgstr "Pertsonala"
 
 msgid "Significant Other"
-msgstr "Beste zentzu"
+msgstr "Beste Batzuk"
 
 msgid "Home Phone"
-msgstr "Etxeko telefonoa"
+msgstr "Etxeko Telefonoa"
 
 msgid "Home Phone 2"
-msgstr "Etxeko telefonoa 2"
+msgstr "Etxeko Telefonoa 2"
 
 msgid "Home Address"
-msgstr "Etxeko helbidea"
+msgstr "Etxeko Helbidea"
 
 msgid "Personal Mobile"
-msgstr "Zagapoto pertsonala"
+msgstr "Mugikor Pertsonala"
 
 msgid "Home Fax"
 msgstr "Etxeko Fax-a"
 
 msgid "Personal Email"
-msgstr "Norberaren posta elektronikoa"
+msgstr "E-posta Pertsonala"
 
 msgid "Personal IM"
-msgstr "IM pertsonala"
+msgstr "IM Pertsonala"
 
 msgid "Anniversary"
-msgstr "Urteurren"
+msgstr "Urtebetetzea"
 
 #. Business
-#, fuzzy
 msgid "Work"
-msgstr "Laneko IM"
+msgstr "Lana"
 
 msgid "Job Title"
 msgstr "Lanpostua"
@@ -5459,44 +5285,44 @@
 msgstr "Departamentua"
 
 msgid "Profession"
-msgstr "Ofizio"
+msgstr "Ofizioa"
 
 msgid "Work Phone"
 msgstr "Laneko Telefonoa"
 
 msgid "Work Phone 2"
-msgstr "Laneko telefonoa 2"
+msgstr "Laneko Telefonoa 2"
 
 msgid "Work Address"
-msgstr "Laneko helbidea"
+msgstr "Laneko Helbidea"
 
 msgid "Work Mobile"
-msgstr "Laneko segapotoa"
+msgstr "Laneko Mugikorra"
 
 # , fuzzy
 msgid "Work Pager"
-msgstr "Lan orrigilea"
+msgstr "Laneko Orria"
 
 msgid "Work Fax"
 msgstr "Laneko Fax-a"
 
 msgid "Work Email"
-msgstr "Laneko helbide elektronikoa"
+msgstr "Laneko E-posta"
 
 msgid "Work IM"
 msgstr "Laneko IM"
 
 msgid "Start Date"
-msgstr "Hasteko data "
+msgstr "Hasiera-Data "
 
 msgid "Favorite Things"
-msgstr "Gogoko gauzak"
+msgstr "Gogoko Gauzak"
 
 msgid "Last Updated"
-msgstr "Azken eguneratzea"
+msgstr "Azkenekoz Eguneratua"
 
 msgid "Homepage"
-msgstr "Etxeko orria"
+msgstr "Orri Nagusia"
 
 msgid "The user has not created a public profile."
 msgstr "Erabiltzaileak ez du profila publikorik sortu."
@@ -5506,21 +5332,18 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-"MSNek dio ezin izan duela erabiltzailearen profila aurkitu. Agian "
-"erabiltzailea ez da existitzen, edo exisititzen bada ez duela profila "
-"publikorik sortu."
-
-#, fuzzy
+"MSNek ezin izan du erabiltzailearen profila aurkitu. Agian erabiltzailea ez "
+"da existitzen, edo exisititzen da baina ez du profila publikorik sortu."
+
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Pidgin-ek ezin izan du erabiltzailearen profilean informaziorik aurkitu. "
-"Erabiltzailea ez dela existitzen dirudi."
-
-#, fuzzy
+"Ezin informaziorik aurkitu erabiltzailearen profilean. Erabiltzailea ez dela "
+"existitzen dirudi."
+
 msgid "View web profile"
-msgstr "Ez da onartzen lineaz kanpo"
+msgstr "Web profila ikusi"
 
 #. *< type
 #. *< ui_requirement
@@ -5531,53 +5354,48 @@
 #. *< name
 #. *< version
 #. *< summary
-#, fuzzy
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Novell GroupWise mezulariaren protokoloaren plugin-a"
+msgstr "Windows Live Messenger Protokolo-Plugina"
 
 msgid "Use HTTP Method"
-msgstr "Erabili HTTP metodoa"
-
-#, fuzzy
+msgstr "HTTP Metodoa Erabili"
+
 msgid "HTTP Method Server"
-msgstr "Zerbitzariaren IPC proba"
+msgstr "HTTP Metodo Zerbitzaria"
 
 msgid "Show custom smileys"
-msgstr "Erakutsi _aurpegiera grafikoak "
+msgstr "Smiley pertsonalak erakutsi"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr "Harreta ematen: harreta eman kontaktu bati atentzioa lortzeko"
-
-#, fuzzy
+msgstr "nudge: erabiltzaile bati ukondokada eman, bere harreta eskuratzeko"
+
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "Huts egin du era normalean autentifikatzean."
-
-#, fuzzy
+msgstr "Windows Live ID autentifikazioa: Ezin konektatu"
+
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Huts egin du era normalean autentifikatzean."
+msgstr "Windows Live ID autentifikazioa: Erantzun baliogabea"
 
 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s berriki harreta eskaera bidali dizute !"
-
-#, fuzzy, c-format
+msgstr "Ukondokada bidali dizu %s(e)k!"
+
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Errore ezezaguna"
+msgstr "Errore ezezaguna (%d): %s"
 
 msgid "Unable to add user"
-msgstr "Ezin da erabiltzailea gehitu"
-
-#, fuzzy, c-format
+msgstr "Ezin erabiltzailea gehitu"
+
+#. Unknown error!
+#, c-format
 msgid "Unknown error (%d)"
-msgstr "Errore ezezaguna"
-
-#, fuzzy
+msgstr "Errore ezezaguna (%d)"
+
 msgid "The following users are missing from your addressbook"
-msgstr "Zure bilaketaren ondoriozko emaitzak hauek dira"
-
-#, fuzzy
+msgstr "Erabiltzaile hauek ez daude zure helbide-liburuan"
+
 msgid "Mobile message was not sent because it was too long."
-msgstr "Mezua ezin izan da bidali azkarregi bidaltzen ari garelako:"
+msgstr "Ez da mugikor-mezua bidali, luzeegia delako."
 
 #, c-format
 msgid ""
@@ -5595,32 +5413,33 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"MSN zerbitzaria minutu %d barru itzaliko da, mantentze-lanak egiteko. "
-"Automatikoki deskonektatuko zaitu. Amaitu irekita dauden solasaldiak.\n"
-"\n"
-"Mantentze-lanak egindakoan, berriz ere sartu ahal izango zara."
+"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] ""
-"MSN zerbitzaria %d minutu barru itzaliko da, mantentze-lanak egiteko. "
-"Automatikoki deskonektatuko zaitu. Amaitu irekita dauden solasaldiak.\n"
-"\n"
-"Mantentze-lanak egindakoan, berriz ere sartu ahal izango zara."
+"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 "
 "happens when the user is blocked or does not exist."
 msgstr ""
-
-#, fuzzy
+"Ez da mezua bidali, sistema eskuragaitz dagoelako. Erabiltzailea blokeatuta "
+"dagoenean edo existitzen ez denean gertatu ohi da."
+
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "Mezua ezin izan da bidali azkarregi bidaltzen ari garelako:"
-
-#, fuzzy
+msgstr "Ez da mezua bidali, azkarregi bidaliak izaten ari direlako mezuak."
+
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "Mezua ezin izan da bidali errore ezezaguna gertatu delako:"
-
-#, fuzzy
+msgstr "Ez da mezua bidali, kodeketa-errore ezezaguna gertatu delako."
+
 msgid "Message was not sent because an unknown error occurred."
-msgstr "Mezua ezin izan da bidali errore ezezaguna gertatu delako:"
+msgstr "Ez da mezua bidali, errore ezezaguna gertatu delako."
 
 msgid "Writing error"
 msgstr "Idazketa-errorea"
@@ -5636,35 +5455,31 @@
 "Konexio-errorea %s zerbitzarian :\n"
 "%s "
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Zerbitzariak ez du protokoloa hau onartzen"
-
-#, fuzzy
+msgstr "Zerbitzariak ez du gura protokoloa onartzen"
+
 msgid "Error parsing HTTP"
-msgstr "Errorea HTTP analizatzean"
-
-#, fuzzy
+msgstr "HTTP-arazketa errorea"
+
 msgid "You have signed on from another location"
-msgstr "Beste kokaleku batetik hasi duzu saioa."
+msgstr "Beste nonbaitetik konektatu zara"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN zerbitzariak ez daude eskuragarri une honetan. Itxaron, eta saiatu "
 "berriro."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN zerbitzariak ixtera doaz aldi baterako."
+msgstr "MSN zerbitzariak aldi baterako deskonektatuko dira"
 
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "Ezin da autentifikatu: %s"
+msgstr "Ezin autentifikatu: %s"
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"MSN lagunen zerrenda ez dago erabilgarri une honetan. Itxaron, eta saiatu "
+"MSN lagun-zerrenda ez dago eskuragarri une honetan. Itxaron, eta saiatu "
 "berriro."
 
 msgid "Handshaking"
@@ -5674,79 +5489,76 @@
 msgstr "Transferitzen"
 
 msgid "Starting authentication"
-msgstr "Autentifikazioa haiseratzen"
+msgstr "Autentifikazioa hasieratzen"
 
 msgid "Getting cookie"
-msgstr "Cookie eskuratzen"
+msgstr "Cookie-a eskuratzen"
 
 msgid "Sending cookie"
-msgstr "Cookie bidaltzen"
+msgstr "Cookie-a bidaltzen"
 
 msgid "Retrieving buddy list"
-msgstr "Lagunen zerrenda eskuratzen"
+msgstr "Lagun-zerrenda eskuratzen"
 
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
+"%s(e)k zure web-kamera ikusi nahi du, baina halako eskaerak ez daude jasanak "
+"oraindik."
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s(e)k web-kamera gonbita bidali dizu, baina oraindik ez dago jasana."
 
 msgid "Away From Computer"
-msgstr "Ordenagailutik urrun"
+msgstr "Ordenagailutik Urrun"
 
 msgid "On The Phone"
 msgstr "Telefonoan"
 
 msgid "Out To Lunch"
-msgstr "Bazkaltzera joan naiz"
+msgstr "Bazkaltzen"
 
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "Litekeena da mezua bidali ez izatea konexioa iraungitu delako:"
+msgstr "Zuirrenik, denbora-muga agortu delako ezin izan da bidali mezua:"
 
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr ""
-"Litekeena da mezua bidali ez izatea, ez dago baimendua ikusezina den "
-"bitartean:"
+msgstr "Ezin mezua bidali, ezin duzulako mezurik bidali ikustezina zarenean:"
 
 msgid "Message could not be sent because the user is offline:"
-msgstr ""
-"Litekeena da mezua bidali ez izatea erabiltzailea lineaz kanpo dagoelako:"
+msgstr "Ezin mezua bidali, erabiltzailea ez dagoelako konektatuta:"
 
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "Litekeena da mezua bidali ez izatea konexio-errore bat gertatu delako:"
+msgstr "Ezin mezua bidali, konexio-errore baten erruz:"
 
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Mezua ezin izan da bidali azkarregi bidaltzen ari garelako:"
+msgstr "Ezin mezua bidali, azkarregi ari zarelako bidaltzen:"
 
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
+"Ezin mezua bidali, ezin izan dugulako sesio bat ezarri zerbitzariarekin. "
+"Zerbitzariaren arazoa dela dirudi. Minutu batzu pasa ondoren saiatu berriro:"
 
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
-msgstr ""
-"Litekeena da mezua bidali ez izatea 'switch'ean errorea gertatu delako:"
+msgstr "Ezin mezua bidali, switchboard-ean errore bat gertatu delako:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Mezua ezin izan da bidali errore ezezaguna gertatu delako:"
-
-#, fuzzy
+msgstr "Ezin mezua bidali, errore ezezagun baten erruz:"
+
 msgid "Delete Buddy from Address Book?"
-msgstr "Gehitu helbide-liburuan"
-
-#, fuzzy
+msgstr "Helbide-Liburutik Ezabatu Laguna?"
+
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Lagun hori zure lagunen zerrendan gehitu nahi duzu?"
-
-#, fuzzy
+msgstr "Zure helbide-liburutik ere ezabatu nahi al duzu lagun hau?"
+
 msgid "The username specified is invalid."
-msgstr "Zehastu duzun Pantaila-izena ez baliogarria."
+msgstr "Baliogabea da zehaztutako erabiltzaile-izena."
 
 msgid "This Hotmail account may not be active."
-msgstr "Hotmail kontu hau behar bada ez dago aktibatua."
+msgstr "Posible da Hotmail-kontu hau aktibatuta ez egotea."
 
 msgid "Profile URL"
 msgstr "Profilaren URLa"
@@ -5761,9 +5573,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "MSN Protocol Plugin"
-msgstr "AIM/ICQ protokoloaren plugin-a"
+msgstr "MSN Protokolo-Plugina"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5778,100 +5589,92 @@
 
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "Ezin da erabiltzailea gehitu: %s (%s)"
+msgstr "Ezin erabiltzailea gehitu: %s (%s)"
 
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "Ezin da erabiltzailea blokeatu: %s (%s)."
+msgstr "Ezin erabiltzailea blokeatu: %s (%s)."
 
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "Ezin da erabiltzailea baimendu: %s (%s)"
+msgstr "Ezin erabiltzailea baimendu: %s (%s)"
 
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr "%s ezin da gehitu lagunen zerrenda beteta daukazulako."
+msgstr "Ezin %s lagun-zerrendara gehitu, zerrenda beteta dagoelako."
 
 #, c-format
 msgid "%s is not a valid passport account."
-msgstr "%s ez da baliozko pasaporte-kontua."
+msgstr "%s ez da baliozko passport-kontua."
 
 msgid "Service Temporarily Unavailable."
-msgstr "Zerbitzua ez dago erabilgarri une honetan "
+msgstr "Zerbitzua Eskuragaitz Oraintxe."
 
 msgid "Unable to rename group"
-msgstr "Ezin da taldea izenez aldatu"
+msgstr "Ezin taldea berrizendatu"
 
 msgid "Unable to delete group"
-msgstr "Ezin da taldea ezabatu"
+msgstr "Ezin taldea ezabatu"
 
 #, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "%s gehitu zaitut bere lagunen-zerrendara."
+msgstr "%s(e)k bere lagun-zerrendara gehitu zaitu."
 
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "%s ezabatu zaitu bere lagunen-zerrendatik."
+msgstr "%s(e)k bere lagun-zerrendatik kendu zaitu."
 
 #, c-format
 msgid "No such user: %s"
-msgstr ""
-
-#, fuzzy
+msgstr "Halako erabiltzailerik ez: %s"
+
 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"
-
-#, fuzzy
+msgstr "Espero ez zen erronka-luzera zerbitzaritik"
+
 msgid "Logging in"
-msgstr "Egunkaria"
-
-#, fuzzy
+msgstr "Konektatzen"
+
 msgid "MySpaceIM - No Username Set"
-msgstr "Ez dago izenik"
+msgstr "MySpaceIM - Erabiltzaile-Izenik ez"
 
 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "MySpace erabiltzaile-izenik ez daukazula dirudi."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
-
-#, fuzzy
+msgstr "Bat ezarri nahi al duzu orain? (Oharra: HAU EZIN DA ALDATU!)"
+
 msgid "Lost connection with server"
-msgstr "Zerbitzaritik deskonektatuta zaude."
+msgstr "Zerbitzariko konexioa galdu da"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
 #. used
-#, fuzzy
 msgid "New mail messages"
-msgstr "Bidali _mezua"
+msgstr "Posta mezu berriak"
 
 msgid "New blog comments"
-msgstr ""
+msgstr "Blog iruzkin berriak"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "Profila iruzkin berriak"
 
 msgid "New friend requests!"
-msgstr ""
+msgstr "Lagun-eskaera berriak!"
 
 msgid "New picture comments"
-msgstr ""
+msgstr "Irudi iruzkin berriak"
 
 msgid "MySpace"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpace"
+
 msgid "IM Friends"
-msgstr "_BM leihoak"
+msgstr "IM Lagunak"
 
 #, c-format
 msgid ""
@@ -5881,15 +5684,18 @@
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
+"Lagun %d gehitu edo eguneratu da zerbitzaritik (lehendik zerbitzariko "
+"zerrendan zeudenak barne)"
 msgstr[1] ""
-
-#, fuzzy
+"%d lagun gehitu edo eguneratu dira zerbitzaritik (lehendik zerbitzariko "
+"zerrendan zeudenak barne)"
+
 msgid "Add contacts from server"
-msgstr "Erantzun baliogabea zerbitzaritik."
-
-#, fuzzy, c-format
+msgstr "Zerbitzariko kontaktuak gehitu"
+
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "Prozesua errorea kodea itzuli du %d"
+msgstr "Protokolo-errorea, %d kodea: %s"
 
 #, c-format
 msgid ""
@@ -5897,152 +5703,136 @@
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-
-#, fuzzy
+"%s Zure pasahitzak %zu karaktere ditu, hau da, %d(e)ko luzera maximoa baina "
+"gehiago.  Zure pasahitza moztu ezazu http://profileedit.myspace.com/index."
+"cfm?fuseaction=accountSettings.changePassword helbidea, eta berriro saiatu."
+
 msgid "Incorrect username or password"
-msgstr "Goitizen edo pasahitz okerra."
+msgstr "Erabiltzaile-izen edo pasahitz okerra"
 
 msgid "MySpaceIM Error"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM Errorea"
+
 msgid "Invalid input condition"
-msgstr "Konexioa amaitzen"
-
-#, fuzzy
+msgstr "Sarrera-kondizio baliogabea"
+
 msgid "Failed to add buddy"
-msgstr "Huts egin du berriketako lagunarekin elkartzean"
-
-#, fuzzy
+msgstr "Ezin laguna gehitu"
+
 msgid "'addbuddy' command failed."
-msgstr "Kargatu lagunen-zerrenda fitxategi batetik..."
-
-#, fuzzy
+msgstr "Errorea 'addbuddy' aginduan."
+
 msgid "persist command failed"
-msgstr "Switchboard hutsegitea"
-
-#, fuzzy
+msgstr "Errorea 'persist' aginduan"
+
 msgid "Failed to remove buddy"
-msgstr "Huts egin du berriketako lagunarekin elkartzean"
+msgstr "Ezin laguna kendu"
 
 msgid "'delbuddy' command failed"
-msgstr ""
-
-#, fuzzy
+msgstr "Errorea 'delbuddy' aginduan"
+
 msgid "blocklist command failed"
-msgstr "Switchboard hutsegitea"
-
-#, fuzzy
+msgstr "Errorea 'blocklist' aginduan"
+
 msgid "Missing Cipher"
-msgstr "Zifra"
+msgstr "Zifratua Falta"
 
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "Ezin RC4 zifratua aurkitu"
 
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
+"RC4 jasaten duen libpurple batera eguneratu zaitez (>= 2.0.1). Ez da "
+"MySpaceIM plugina kargatuko."
 
 msgid "Add friends from MySpace.com"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpace.com-eko lagunak gehitu"
+
 msgid "Importing friends failed"
-msgstr "Okerreko lagun-fitxategia"
+msgstr "Ezin lagunak inportatu"
 
 #. TODO: find out how
-#, fuzzy
 msgid "Find people..."
-msgstr "Lagunak bilatu..."
-
-#, fuzzy
+msgstr "Jendea bilatu..."
+
 msgid "Change IM name..."
-msgstr "Pasahitza aldatu..."
+msgstr "IM-izena aldatu..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim URL-kudeatzailea"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "Ez da myim URL honekin irekitzeko MySpaceIM kontu egokirik aurkitu."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "MySpaceIM kontu egokia gaitu ezazu eta berriro saiatu zaitez."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Pantaila-izena erakutsi egoera-testuan"
 
 msgid "Show headline in status text"
-msgstr ""
-
-#, fuzzy
+msgstr "Izenburua erakutsi egoera-testuan"
+
 msgid "Send emoticons"
-msgstr "Soinu-aukerak"
+msgstr "Emotikonoak bidali"
 
 msgid "Screen resolution (dots per inch)"
-msgstr ""
-
-#, fuzzy
+msgstr "Pantaila-bereizmena (hatzbeteko puntuko)"
+
 msgid "Base font size (points)"
-msgstr "Letra-tipo handiagoa"
-
-#, fuzzy
+msgstr "Oinarrizko letra-tamaina (puntuak)"
+
 msgid "User"
-msgstr "Erabiltzaileak"
-
-#, fuzzy
+msgstr "Erabiltzailea"
+
 msgid "Headline"
-msgstr "_Heldulekua:"
-
-#, fuzzy
+msgstr "Izenburua"
+
 msgid "Song"
-msgstr "Soinuak"
+msgstr "Abestia"
 
 msgid "Total Friends"
-msgstr ""
-
-#, fuzzy
+msgstr "Lagunak Guztira"
+
 msgid "Client Version"
-msgstr "Itxi solasaldia"
+msgstr "Bezero-Bertsioa"
 
 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 ""
-
-#, fuzzy
+"Errorea erabiltzaile-izena ezartzean.  Berriro saiatu zaitez edo http://"
+"editprofile.myspace.com/index.cfm?fuseaction=profile.username helbidean "
+"sartu zaitez zure erbiltzaile-izena ezartzeko."
+
 msgid "MySpaceIM - Username Available"
-msgstr "Zerbitzua ez dago erabilgarri"
+msgstr "MySpaceIM - Erabiltzaile-Izena Eskuragarri"
 
 # c-format
-#, fuzzy
 msgid "This username is available. Would you like to set it?"
-msgstr ""
-"\"Whiteboard\" -era   %s mezua bidalia izan da. \"Whiteboard\" -a irekitzea "
-"nahi al duzu ?"
+msgstr "Eskuragarri dago erabiltzaile-izen hau. Ikusi nahi al duzu?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "EZARRI ONDOREN, EZIN DA ALDATU!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM - Erabiltzaile-Izen bat Ezarri"
+
 msgid "This username is unavailable."
-msgstr "Gai honek ez du aurpegiera erabilgarririk"
-
-#, fuzzy
+msgstr "Erabiltzaile-izen hau ez dago eskuragarri."
+
 msgid "Please try another username:"
-msgstr "Idatzi pasahitz berria"
+msgstr "Beste erabiltzaile-izen batekin saiatu:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "Ez dago izenik"
+msgstr "Erabiltzaile-izenik ez"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "Erabiltzaile-izen bat sartu ezazu, eskuragarri dagoen egiaztatzeko:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -6051,120 +5841,117 @@
 #. * 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"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Besarkatu"
+
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k besarkatu zaitu!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "%s besarkatzen..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Eslovakiera"
-
-#, fuzzy, c-format
+msgstr "Zaplaztekoa"
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k zaplaztatu zaitu!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+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
 #. * something, often a victory, or to congratulate someone.
 msgid "High-five"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Bostekoa"
+
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s konektatu da bertan."
+msgstr "%s(e)k bostekoa eman dizu!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "%s(e)ri bostekoa ematen..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
 msgid "Punk"
-msgstr ""
-
-#, 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
@@ -6174,36 +5961,36 @@
 #. * 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 parametrorik jaso"
+msgstr "Ez dira beharrezko parametroak jaso"
 
 msgid "Unable to write to network"
-msgstr "Ezin da sarean idatzi"
+msgstr "Ezin sarera idatzi"
 
 msgid "Unable to read from network"
-msgstr "Ezin da saretik irakurri"
+msgstr "Ezin saretik irakurri"
 
 msgid "Error communicating with server"
 msgstr "Errorea zerbitzariarekin komunikatzean"
 
 msgid "Conference not found"
-msgstr "Ez da konferentziarik aurkitu"
+msgstr "Ez konferentzia aurkitu"
 
 msgid "Conference does not exist"
-msgstr "Konferentzia ez dago"
+msgstr "Konferentzia ez da existitzen"
 
 msgid "A folder with that name already exists"
-msgstr "Direktorio hori badago"
+msgstr "Jadanik badago izen horretako direktorio bat"
 
 msgid "Not supported"
 msgstr "Ez dago onartuta"
@@ -6211,27 +5998,26 @@
 msgid "Password has expired"
 msgstr "Pasahitza iraungitu da"
 
-#, fuzzy
 msgid "Incorrect password"
-msgstr "Okerreko pasahitza."
+msgstr "Pasahitz okerra"
 
 msgid "User not found"
-msgstr "Erabiltzailea ez da aurkitu"
+msgstr "Ez da erabiltzailea aurkitu"
 
 msgid "Account has been disabled"
-msgstr "Kontua desgaitu egin da"
+msgstr "Kontua ezgaitua izan da"
 
 msgid "The server could not access the directory"
-msgstr "Zerbitzaria ezin da direktoriora sarbidetu "
+msgstr "Zerbitzaria ezin izan da direktoriora sartu"
 
 msgid "Your system administrator has disabled this operation"
-msgstr "sistemako adminiztratzaileak eragiketa hau desgaitu du"
+msgstr "Sistema-adminiztratzaileak eragiketa hau ezgaitu du"
 
 msgid "The server is unavailable; try again later"
-msgstr "Zerbitzaria ez dago erabilgarri; saiatu berriro geroaro"
+msgstr "Zerbitzaria ez dago eskuragarri; saiatu berriro geroaro"
 
 msgid "Cannot add a contact to the same folder twice"
-msgstr "Ezin da kontaktu bat karpeta berdinean bi aldiz gehitu"
+msgstr "Ezin da kontaktu bat direktorio berdinera bi aldiz gehitu"
 
 msgid "Cannot add yourself"
 msgstr "Ezin duzu zure burua gehitu"
@@ -6239,133 +6025,127 @@
 msgid "Master archive is misconfigured"
 msgstr "Artxibo nagusia oker konfiguratuta dago"
 
-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
-msgstr "Ezin izan da idatzi duzun ostalariko erabiltzaile-izena ezagutu"
-
-#, fuzzy
+msgstr "Ezin da sartu duzun erabiltzaile-izenaren ostalaria identifikatu"
+
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr "Kontua desgaitu egin da pasahitz baliogabe gehiegi idatzi dituzulako"
+msgstr "Pahitz oker gehiegi sartu dituzu, beraz, zure kontua ezgaitu da"
 
 msgid "You cannot add the same person twice to a conversation"
-msgstr "Ezin duzu pertsona bera birritan gehitu solasaldi batean"
+msgstr "Ezin duzu pertsona bera bi aldiz gehitu solasaldi batera"
 
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "Baimendutako kontaktuen gehienezko kopurua gainditu duzu"
-
-#, fuzzy
+msgstr "Baimendutako gehieneko kontaktu-kopurua gainditu duzu"
+
 msgid "You have entered an incorrect username"
 msgstr "Erabiltzaile-izen baliogabea idatzi duzu"
 
 msgid "An error occurred while updating the directory"
-msgstr "Errore bat gertatu da direktorioa eguneratzean."
+msgstr "Errore bat gertatu da direktorioa eguneratzean"
 
 msgid "Incompatible protocol version"
-msgstr "Protokolo bertsio bateraezina"
+msgstr "Protokolo-bertsio bateraezina"
 
 msgid "The user has blocked you"
-msgstr "Erabiltzaileak blokeatu egin zaitu."
+msgstr "Erabiltzaileak blokeatu egin zaitu"
 
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"Probako bertsio honek ez du uzten hamar erabiltzaile baino gehiago une "
-"berean konektatzea"
+"Probako bertsio honekin ezin dira aldi berean 10 erabiltzaile baina gehiago "
+"konektatu"
 
 msgid "The user is either offline or you are blocked"
-msgstr "Erabiltzailea lineaz kanpo dago edo blokeatuta zaude"
+msgstr "Erabiltzailea offline dago edo blokeatuta zaude"
 
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Errore ezezaguna: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Ezin da %s erabiltzailea kanporatu"
+msgstr "Ezin konektatu: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr ""
-"Ezin da mezua bidali. Ezin izan dira erabiltzailearen xehetasunak lortu (%s)."
+msgstr "Ezin mezua bidali. Ezin erabiltzailearen xehetasunak lortu (%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Ezin da %s gehitu zure lagunen zerrendan (%s)."
+msgstr "Ezin %s gehitu zure lagun-zerrendara (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
 #, c-format
 msgid "Unable to send message (%s)."
-msgstr "Ezin da mezua bidali (%s)."
+msgstr "Ezin mezua bidali (%s)."
 
 #, c-format
 msgid "Unable to invite user (%s)."
-msgstr "Ezin da erabiltzaiea gonbidatu (%s)."
+msgstr "Ezin erabiltzaiea gonbidatu (%s)."
 
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
-msgstr ""
-"Ezin zaio mezua bidali %s erabiltzaileari. Ezin izan da konferentzia sortu (%"
-"s)."
+msgstr "Ezin mezua bidali %s(r)i. Ezin izan da konferentzia sortu (%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "Ezin da mezua bidali. Ezin izan da konferentzia sortu (%s)."
+msgstr "Ezin mezua bidali. Ezin izan da konferentzia sortu (%s)."
 
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"Ezin izan da %s erabiltzailea eraman zerbitzariaren aldeko zerrendako %s "
-"karpetara. Errorea karpeta sortzean (%s)."
+"Ezin %s erabiltzailea mugitu zerbitzariko zerrendako %s direktoriora. "
+"Errorea karpeta sortzean (%s)."
 
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"Ezin da %s gehitu zure lagunen zerrendan. Errorea zerbitzariaren aldeko "
-"zerrendan karpeta sortzean (%s)."
+"Ezin %s gehitu zure lagun-zerrendara. Errorea zerbitzariako zerrendan "
+"direktorioa sortzean (%s)."
 
 #, c-format
 msgid "Could not get details for user %s (%s)."
-msgstr "Ezin izan dira %s erabiltzailearen xehetasunak lortu (%s)."
+msgstr "Ezin %s erabiltzailearen xehetasunak lortu (%s)."
 
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr "Ezin da erabiltzailea gehitu zure pribatuen zerrendan (%s)."
+msgstr "Ezin erabiltzailea gehitu pribatu-zerrendara (%s)."
 
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "Ezin da %s gehitu zure ukatuen zerrendan (%s)."
+msgstr "Ezin %s gehitu ukatu-zerrendara (%s)."
 
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr "Ezin da %s gehitu zure baimenduen zerrendan (%s)."
+msgstr "Ezin %s gehitu baimendu-zerrendara (%s)."
 
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr "Ezin da %s kendu zure pribatuen zerrendan (%s)."
+msgstr "Ezin %s kendu pribatu-zerrendatik (%s)."
 
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr "Ezin da zerbitzariaren aldeko pribatutasunaren ezarpenak aldatu (%s)"
+msgstr "Ezin zerbitzariako pribatutasun-ezarpenak aldatu (%s)."
 
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr "Ezin da konferentzia sortu (%s)"
+msgstr "Ezin konferentzia sortu (%s)."
 
 msgid "Error communicating with server. Closing connection."
 msgstr "Errorea zerbitzariarekin komunikatzean. Konexioa ixten."
 
 msgid "Telephone Number"
-msgstr "Telefono zenbakia"
+msgstr "Telefono Zenbakia"
 
 msgid "Personal Title"
-msgstr "Titulu pertsonala"
+msgstr "Titulu Pertsonala"
 
 msgid "Mailstop"
 msgstr "Postontzia"
@@ -6384,7 +6164,7 @@
 
 #, c-format
 msgid "GroupWise Conference %d"
-msgstr "GroupWise konferentzia %d"
+msgstr "GroupWise Konferentzia %d"
 
 msgid "Authenticating..."
 msgstr "Autentifikatzen..."
@@ -6397,7 +6177,7 @@
 msgstr "%s erabiltzailea solasaldira gonbidatua izan da."
 
 msgid "Invitation to Conversation"
-msgstr "Solasaldirako gonbita"
+msgstr "Solasaldirako Gonbita"
 
 #, c-format
 msgid ""
@@ -6405,30 +6185,28 @@
 "\n"
 "Sent: %s"
 msgstr ""
-"Honen gonbita: %s\n"
+"%s(r)en gobita\n"
 "\n"
 "Bidalita: %s"
 
 msgid "Would you like to join the conversation?"
-msgstr "Solasaldian sartu nahi duzu?"
+msgstr "Solasaldira batu nahi duzu?"
 
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
-"Badirudi %s lineaz kanpo dagoela, eta ez duela jaso zuk bidali berri diozun "
-"mezua."
-
-#, fuzzy
+"Badirudi %s offline dagoela, eta ez duela jaso zuk bidali berri diozun mezua."
+
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
 msgstr ""
-"Ezin da zerbitzariarekin konektatu. Sartu konektatu beharreko zerbitzariaren "
-"helbidea."
+"Ezin zerbitzarira konektatu. Konektatu nahi duzun zerbitzariaren helbidea "
+"sartu ezazu."
 
 msgid "This conference has been closed. No more messages can be sent."
-msgstr "Konferentzia hau itxi egin da, eta ezin da mezu gehiago bidali."
+msgstr "Konferentzia hau itxi egin da. Ezin da mezu gehiago bidali."
 
 #. *< type
 #. *< ui_requirement
@@ -6441,7 +6219,7 @@
 #. *  summary
 #. *  description
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Novell GroupWise mezulariaren protokoloaren plugin-a"
+msgstr "Novell GroupWise Mezulari-Protokoloaren Plugin-a"
 
 msgid "Server address"
 msgstr "Zerbitzariaren helbidea"
@@ -6449,37 +6227,33 @@
 msgid "Server port"
 msgstr "Zerbitzariaren ataka"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "Erantzun baliogabea zerbitzaritik."
+msgstr "Espero ez zen erantzuna jaso da "
 
 #. username connecting too frequently
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"Maizegi konektatzen eta deskonektatzen aritu zara. Itxaron hamar minutu, eta "
-"saiatu berriro. Saiatzen jarraituz gero, agian gehiago ere itxaron beharko "
+"Maizegi konektatu eta deskonektatu zara. Hamar minutu itxaron itzazu berriro "
+"saiatu aurretik. Saiatzen jarraituz gero, agian gehiago ere itxaron beharko "
 "duzu."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Errorea konexioa sortzean"
+msgstr "Errorea eskaeran."
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
-
-#, fuzzy
+msgstr "AOL-k ez du zure pantaila-izena hemen autentifikatzea onartzen"
+
 msgid "Could not join chat room"
-msgstr "Ezin izan da konektatu"
-
-#, fuzzy
+msgstr "Ezin gelara batu"
+
 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
@@ -6491,12 +6265,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "AIM Protocol Plugin"
-msgstr "AIM/ICQ protokoloaren plugin-a"
+msgstr "AIM Protokolo-Plugina"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "ICQ UIN..."
 
 #. *< type
 #. *< ui_requirement
@@ -6508,47 +6281,44 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "ICQ Protocol Plugin"
-msgstr "IRC protokoloaren plugin-a"
+msgstr "ICQ Protokolo-Plugina"
 
 msgid "Encoding"
 msgstr "Kodeketa"
 
-#, fuzzy
 msgid "The remote user has closed the connection."
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
-
-#, fuzzy
+msgstr "Konexioa itxi du urruneko erabiltzaileak."
+
 msgid "The remote user has declined your request."
-msgstr "Erabiltzaileak blokeatu egin zaitu."
+msgstr "Zure eskaria ezetsi du urruneko erabiltzaileak."
 
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
-msgstr ""
+msgstr "Urruneko erabiltzailearekiko konexioa galduta:<br>%s"
 
 msgid "Received invalid data on connection with remote user."
-msgstr ""
-
-#, fuzzy
+msgstr "Datu baliogabeak jaso dira urruneko erabiltzailearekiko konexioan."
+
 msgid "Unable to establish a connection with the remote user."
-msgstr ""
-"Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
-"dago ?"
-
-#, fuzzy
+msgstr "Ezin konexioa ezarri urruneko erabiltzailearekin."
+
 msgid "Direct IM established"
-msgstr "%s(r)ekiko zuzeneko BMa ezarri da"
+msgstr "Zuzeneko IMa ezarrita"
 
 #, c-format
 msgid ""
 "%s tried to send you a %s file, but we only allow files up to %s over Direct "
 "IM.  Try using file transfer instead.\n"
 msgstr ""
+"%s(e)k %s fitxategia bidali nahi izan dizu, baina gehienez %s dauzkaten "
+"fitxategiak onartzen ditugu Zuzeneko IMaren bidez. Fitxategi-transferentzia "
+"erabili ezazu.\n"
 
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
+"%s fitxategiak %s dauzka, hau da, %s tamaina maximoa baina handiagoa da."
 
 msgid "Invalid error"
 msgstr "Errore baliogabea"
@@ -6563,7 +6333,7 @@
 msgstr "Bezeroarekiko tasa"
 
 msgid "Service unavailable"
-msgstr "Zerbitzua ez dago erabilgarri"
+msgstr "Zerbitzua eskuragaitz"
 
 msgid "Service not defined"
 msgstr "Zerbitzua ez dago zehaztuta"
@@ -6593,34 +6363,34 @@
 msgstr "SNAC karga hondatuta"
 
 msgid "Insufficient rights"
-msgstr "Ez duzu nahikoa eskubide"
+msgstr "Eskubide nahikorik ez"
 
 msgid "In local permit/deny"
-msgstr "Lokalean onartu/ukatu"
+msgstr "Lokalki onartu/ukatu"
 
 msgid "Warning level too high (sender)"
-msgstr ""
+msgstr "Abisu-maila  altuegia (igorlea)"
 
 msgid "Warning level too high (receiver)"
-msgstr ""
+msgstr "Abisu-maila altuegia (hartzailea)"
 
 msgid "User temporarily unavailable"
-msgstr "Erabiltzailea ez dago erabilgarri une honetan"
+msgstr "Erabiltzailea eskuragaitz aldi baterako"
 
 msgid "No match"
-msgstr "Ez dago bat datorrenik"
+msgstr "Kointzidentziarik ez"
 
 msgid "List overflow"
-msgstr "Zerrendak gainezka egin du"
+msgstr "Zerrendaren gainezkatzea"
 
 msgid "Request ambiguous"
-msgstr "Eskaera anbiguoa da"
+msgstr "Eskaera anbiguoa"
 
 msgid "Queue full"
-msgstr "Ilara beteta dago"
+msgstr "Ilara beteta"
 
 msgid "Not while on AOL"
-msgstr "Ez AOLn zauden bitartean"
+msgstr "Ez AOLn egon bitartean"
 
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
@@ -6628,27 +6398,30 @@
 "encoding he is using, you can specify it in the advanced account options for "
 "your AIM/ICQ account.)"
 msgstr ""
-
-#, fuzzy, c-format
+"(Errorea mezu hau jasotzean.  Agian, espero zena ez den beste kodeketa bat "
+"darabil zure lagunak.  Zein kodeketa darabilen badakizu, zure AIM/ICQ "
+"kontuaren aukera aurreratuetan zehaztu dezakezu.)"
+
+#, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(Errore bat gertatu da mezu hau jasotzean.  Baliteke hitzegiten ari zaren "
-"erabiltzaileak akasdun bezeroa edukitzea"
+"((Errorea mezu hau jasotzean.  Kodeketa ezberdinak hautatu dituzue zuk eta %s"
+"(e)k, edo %s(e)k bezero akatsduna dauka.)"
 
 #. Label
 msgid "Buddy Icon"
-msgstr "Lagunaren ikonoa"
+msgstr "Lagun-Ikonoa"
 
 msgid "Voice"
 msgstr "Ahotsa"
 
 msgid "AIM Direct IM"
-msgstr "AIM zuzeneko berehalako mezua"
+msgstr "AIM Direct IM"
 
 msgid "Get File"
-msgstr "Hartu fitxategia"
+msgstr "Fitxategia Hartu"
 
 msgid "Games"
 msgstr "Jokoak"
@@ -6657,13 +6430,13 @@
 msgstr "Osagarriak"
 
 msgid "Send Buddy List"
-msgstr "Bidali lagunen zerrenda"
+msgstr "Lagun-Zerrenda Bidali"
 
 msgid "ICQ Direct Connect"
-msgstr "ICQ zuzeneko konexioa"
+msgstr "ICQ Zuzeneko Konexioa"
 
 msgid "AP User"
-msgstr "AP erabiltzailea"
+msgstr "AP Erabiltzailea"
 
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
@@ -6672,13 +6445,13 @@
 msgstr "Nihilista"
 
 msgid "ICQ Server Relay"
-msgstr "ICQ zerbitzariaren errelea"
+msgstr "ICQ Server Relay"
 
 msgid "Old ICQ UTF8"
-msgstr "ICQ UTF8 zaharra"
+msgstr "ICQ UTF8 Zaharra"
 
 msgid "Trillian Encryption"
-msgstr "Trillian enkriptatzea"
+msgstr "Trillian Enkripzioa"
 
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
@@ -6687,29 +6460,28 @@
 msgstr "Hiptop"
 
 msgid "Security Enabled"
-msgstr "Segurtasuna gaituta"
+msgstr "Segurtasuna Gaituta"
 
 msgid "Video Chat"
-msgstr "Bideo-berriketa"
+msgstr "Bideo-Berriketa"
 
 msgid "iChat AV"
 msgstr "iChat AV"
 
 msgid "Live Video"
-msgstr "Zuzeneko bideoa"
+msgstr "Zuzeneko Bideoa"
 
 msgid "Camera"
 msgstr "Kamera"
 
-#, fuzzy
 msgid "Screen Sharing"
-msgstr "Pantaila-izena"
+msgstr "Pantaila-Partekatzea"
 
 msgid "Free For Chat"
-msgstr "Berriketarako libre"
+msgstr "Berriketarako Libre"
 
 msgid "Not Available"
-msgstr "Ez erabilgarri"
+msgstr "Eskuragaitz"
 
 msgid "Occupied"
 msgstr "Okupatuta"
@@ -6718,28 +6490,27 @@
 msgstr "Web-ean"
 
 msgid "Invisible"
-msgstr "Ikusezin"
+msgstr "Ikustezin"
 
 msgid "IP Address"
-msgstr "IP helbidea"
+msgstr "IP Helbidea"
 
 msgid "Warning Level"
-msgstr "Abisu-maila"
+msgstr "Abisu-Maila"
 
 msgid "Buddy Comment"
-msgstr "Lagunen iruzkinak"
-
-#, fuzzy, c-format
+msgstr "Lagun-Iruzkina"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr "Ezin izan da konektatu transferentzia egiteko."
-
-#, fuzzy, c-format
+msgstr "Ezin autentifikazio-zerbitzarira konektatu: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Ezin da zerbitzariarekin konektatu."
-
-#, fuzzy
+msgstr "Ezin BOS zerbitzarira konektatu: %s"
+
 msgid "Username sent"
-msgstr "Ez dago izenik"
+msgstr "Erabiltzaile-izena bidalia"
 
 msgid "Connection established, cookie sent"
 msgstr "Konexioa ezarri da, eta cookie-a bidali da"
@@ -6748,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"
@@ -6779,71 +6548,54 @@
 #. 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."
-msgstr "AOL berehalako mezularitza-zerbitzua ez dago erabilgarri une honetan."
-
+msgstr "AOL Istanteko Mezularitza zerbitzua eskuragaitz dago une honetan."
+
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Zuk daukazun bezero-bertsioa zaharregia da; bertsio-berritu %s gunean"
+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 "Sartu SecurID-a"
+msgstr "SecurID-a Sartu"
 
 msgid "Enter the 6 digit number from the digital display."
-msgstr "Sartu pantailan agertzsen den 6 digitodun zenbakia "
-
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#, fuzzy
-msgid "_OK"
-msgstr "Ados"
+msgstr "Pantaila digitaleko zenbakia (6 digito) sartu ezazu."
 
 msgid "Password sent"
 msgstr "Pasahitza bidali da"
 
-#, fuzzy
 msgid "Unable to initialize connection"
-msgstr "Ezin da konexio sortu."
+msgstr "Ezin konexioa hasiarazi"
 
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Emango didazu baimena nire lagunen zerrendan gehi zaitzadan?"
-
-msgid "Authorization Request Message:"
-msgstr "Baimena eskatzeko mezua:"
-
-msgid "Please authorize me!"
-msgstr "Emadazu baimena!"
+msgstr "Zu nire lagun-zerrendara gehitzeko baimena emaidazu, mesedez."
 
 msgid "No reason given."
 msgstr "Ez da arrazoirik eman."
 
 msgid "Authorization Denied Message:"
-msgstr "Baimena ezesteko mezua:"
+msgstr "Baimena Ezesteko Mezua:"
 
 #, c-format
 msgid ""
@@ -6851,7 +6603,7 @@
 "following reason:\n"
 "%s"
 msgstr ""
-"%u erabiltzaileak ukatu egin dizu bera zure lagunen zerrendan gehitzeko "
+"%u erabiltzaileak ukatu egin dizu bera zure lagun-zerrendara gehitzeko "
 "baimena. Arrazoia:\n"
 "%s"
 
@@ -6862,7 +6614,7 @@
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
-"%u erabiltzaileak baimena eman dizu bera zure lagunen zerrendan gehitzeko."
+"%u erabiltzaileak baimena eman dizu bera zure lagun-zerrendara gehitzeko."
 
 #, c-format
 msgid ""
@@ -6883,7 +6635,7 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"ICQ orri bat jaso duzu\n"
+"ICQ-orri bat jaso duzu\n"
 "\n"
 "Bidaltzailea: %s [%s]\n"
 "%s"
@@ -6896,17 +6648,17 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"%s erabiltzaileak ICQ mezu bat bidali dizu [%s]\n"
+"ICQ e-posta jaso duzu: %s [%s]\n"
 "\n"
 "Mezua:\n"
 "%s"
 
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "%u erabiltzaileak lagun bat bidali dizu: %s (%s)"
+msgstr "%u ICQ-erabiltzaileak lagun bat bidali dizu: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Lagun hori zure lagunen zerrendan gehitu nahi duzu?"
+msgstr "Lagun hori zure lagun-zerrendara gehitu nahi duzu?"
 
 msgid "_Add"
 msgstr "_Gehitu"
@@ -6917,62 +6669,50 @@
 #, 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] "%2$s erabiltzailearen mezu %1$hu ez zaizu heldu, baliogabea delako."
-msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, baliogabeak direlako."
+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] "%2$s erabiltzailearen mezu %1$hu ez zaizu heldu, handiegia delako."
-msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, handiegiak direlako."
+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] ""
-"%2$s erabiltzailearen mezu %1$hu ez zaizu heldu, abiadura-muga gainditu "
-"delako."
-msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, abiadura-muga gainditu "
-"delako."
-
-#, fuzzy, c-format
+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 ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] ""
-"%2$s erabiltzailearen mezu %1$hu ez zaizu heldu, bidaltzailea gaiztoegia "
-"delako."
-msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, bidaltzailea gaiztoegia "
-"delako."
-
-#, fuzzy, c-format
+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."
+
+#, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
 msgstr[0] ""
-"%2$s erabiltzailearen mezu %1$hu ez zaizu heldu, gaiztoegia zarelako."
+"Mezu %hu galdu duzu (%s(e)k bidalia), zure abisu-maila altuegia delako."
 msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu, gaiztoegia zarelako."
+"%hu mezu galdu dituzu (%s(e)k bidaliak), zure abisu-maila altuegia delako."
 
 #, 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] ""
-"%2$s erabiltzailearen mezu %1$hu ez zaizu heldu. Arrazoia ez da ezaguna."
-msgstr[1] ""
-"%2$s erabiltzailearen %1$hu mezu ez zaizkizu heldu. Arrazoia ez da ezaguna."
+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
 msgid "Unable to send message: %s"
-msgstr "Ezin da mezua bidali: %s"
+msgstr "Ezin mezua bidali: %s"
 
 msgid "Unknown reason."
 msgstr "Arrazoi ezezaguna."
@@ -6983,59 +6723,57 @@
 
 #, c-format
 msgid "User information not available: %s"
-msgstr "Erabiltzailearen datuak ez daude erabilgarri: %s"
+msgstr "Erabiltzaile-datuak ez daude eskuragarri: %s"
 
 msgid "Online Since"
-msgstr "Noiztik linean"
+msgstr "Noiztik Online"
 
 msgid "Member Since"
-msgstr "Noiztik kidea"
+msgstr "Noiztik Kidea"
 
 msgid "Capabilities"
 msgstr "Gaitasunak"
 
-#, fuzzy
 msgid "Profile"
-msgstr "MSN profila"
+msgstr "Profila"
 
 msgid "Your AIM connection may be lost."
-msgstr "Beharbada AIM konexioa galdu egingo zen."
+msgstr "Beharbada AIM konexioa galdu duzu."
 
 #. The conversion failed!
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
-"[Ezin da erabiltzaile honen mezu bat erakutsi, karaktere baliogabeak "
-"dituelako.]"
+"[Ezin erabiltzaile honen mezu bat erakutsi, karaktere baliogabeak dituelako.]"
 
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
-"Egiten saiatu zaren azken ekintza ezin izan da egin abiadura-muga gainditu "
-"duzulako. Itxaron 10 segundo, eta saiatu berriro."
+"Egiten saiatu zaren azken ekintza ezin izan da burutu, abiadura-muga "
+"gainditu duzulako. Itxaron 10 segundo, eta saiatu berriro."
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "%s berriketa-gelatik deskonektatu egin zaituzte."
 
 msgid "Mobile Phone"
-msgstr "Telefono mugikorra"
+msgstr "Telefono Mugikorra"
 
 msgid "Personal Web Page"
-msgstr "Web orri pertsonala"
+msgstr "Webgune Pertsonala"
 
 #. aim_userinfo_t
 #. strip_html_tags
 msgid "Additional Information"
-msgstr "Informazio osagarria"
+msgstr "Informazio Gehigarria"
 
 msgid "Zip Code"
-msgstr "Posta-kodea"
+msgstr "Posta-Kodea"
 
 msgid "Work Information"
-msgstr "Laneko datuak"
+msgstr "Laneko Datuak"
 
 msgid "Division"
 msgstr "Saila"
@@ -7044,107 +6782,106 @@
 msgstr "Kargua"
 
 msgid "Web Page"
-msgstr "Web orria"
+msgstr "Webgunea"
 
 msgid "Pop-Up Message"
-msgstr "Pop-up mezua"
-
-#, fuzzy, c-format
+msgstr "Pop-Up Mezua"
+
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "Ondoko pantaila-izenak %s erabiltzailearekin erlazionatuak daude"
-msgstr[1] "Ondoko pantaila-izenak %s erabiltzailearekin erlazionatuak daude"
+msgstr[0] "%s(r)ekin asoziatuta dago ondorengo erabiltzaile-izen hau"
+msgstr[1] "%s(r)ekin asoziatuta daude ondorengo erabiltzaile-izen hauek"
 
 #, c-format
 msgid "No results found for email address %s"
-msgstr "Emaitzarik ez %s helbide elektronikoarentzat "
+msgstr "Emaitzik ez %s e-postarentzat"
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "%s berrestea eskatzeko posta-mezu bat jaso beharko zenuke. "
+msgstr "%s berrestea eskatzen duen posta-mezu bat jaso beharko zenuke. "
 
 msgid "Account Confirmation Requested"
-msgstr "Kontuaren berrespena eskatu da"
-
-#, fuzzy, c-format
+msgstr "Kontuaren Berrespena Eskatuta"
+
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr ""
-"0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena "
-"eta jatorrizkoa bat ez datozelako."
-
-#, fuzzy, c-format
+"0x%04x errorea: Ezin da erabiltzaile-izena formateatu, eskatutako izena ez "
+"delako jatorrizkoaren berdina."
+
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
-"0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena "
-"Balio okerra du."
-
-#, fuzzy, c-format
+"0x%04x errorea: Ezin da erabiltzaile-izena formateatu, baliogabea delako."
+
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr ""
-"0x%04x errorea: ezin da formateatu pantaila-izena, eskatutako pantaila-izena "
+"0x%04x errorea: Ezin da erabiltzaile-izena formateatu, eskatutako izena "
 "luzeegia delako."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
 "request pending for this username."
 msgstr ""
-"0x%04x errorea: ezin da helbide elektronikoa aldatu,  lehendik "
-"badagoelakeskaera bat zain pantaila-izen honekin."
-
-#, fuzzy, c-format
+"0x%04x errorea: Ezin da helbide elektronikoa aldatu, jadanik badagoelako "
+"erabiltzaile-izen honentzako beste eskaera bat."
+
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
 msgstr ""
-"0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbideak "
-"pantaila-izen gehiegi dituelako erlazionatuak."
+"0x%04x errorea: Ezin da helbide elektronikoa aldatu, emandako helbideak "
+"erabiltzaile-izen gehiegi dituelako asoziatuta."
 
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
-"0x%04x errorea: ezin da helbide elektronikoa aldatu, emandako helbidea ez "
-"delako baliozkoa. "
+"0x%04x errorea: Ezin da helbide elektronikoa aldatu, emandako helbidea ez "
+"delako baliozkoa."
 
 #, c-format
 msgid "Error 0x%04x: Unknown error."
-msgstr "0x%04x errorea: errore ezezaguna."
+msgstr "0x%04x errorea: Errore ezezaguna."
 
 msgid "Error Changing Account Info"
-msgstr "Errorea kontuaren datuak aldatzean"
+msgstr "Errorea Kontuaren Datuak Aldatzean"
 
 #, c-format
 msgid "The email address for %s is %s"
-msgstr "%s erabiltzailearen helbide elektronikoa %s da "
+msgstr "%s erabiltzailearen helbide elektronikoa %s da"
 
 msgid "Account Info"
-msgstr "Kontuari buruzko informazioa"
+msgstr "Kontuaren Informazioa"
 
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Zure BM irudia ez da bidali. 'Zuzeneko Konexioa'  behar duzu BM irudiak "
+"Ez da zure IM Irudia bidali. Zuzeneko Konexioa behar duzu IM Irudiak "
 "bidaltzeko."
 
 msgid "Unable to set AIM profile."
-msgstr "Ezin da AIM profila ezarri."
+msgstr "Ezin AIM profila ezarri."
 
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"Beharbada zure profila ezartzea eskatuko zenuen saio-hasiera osatu aurretik. "
-"Profilak ezarri gabe jarraitzen du. Saiatu berriro, ondo konektatuta "
+"Beharbada, saio-hasiera osatu aurretik saiatu zara zure profila ezartzen. "
+"Profilak ezarri gabe jarraitzen du; saiatu berriro, erabat konektatuta "
 "zaudenean."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7152,16 +6889,13 @@
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"Profilaren gehienezko luzera (%d byte) gainditu da. Pidgin-ek trunkatu egin "
-"du."
-msgstr[1] ""
-"Profilaren gehienezko luzera (%d byte) gainditu da. Pidgin-ek trunkatu egin "
-"du."
+"Byte %d(e)ko profila-luzeera maximoa gainditu da.  Laburtua izan da."
+msgstr[1] "%d byteko profila-luzeera maximoa gainditu da.  Laburtua izan da."
 
 msgid "Profile too long."
-msgstr "Profila luzeegia da."
-
-#, fuzzy, c-format
+msgstr "Profila luzeegia."
+
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
@@ -7169,79 +6903,74 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"Kanpoan zaudeneko mezuaren gehienezko luzera (%d byte) gainditu da. Pidgin-"
-"ek trunkatu egin du."
+"Kanpoan zaudeneko mezuaren gehienezko luzera (%d byte) gainditu da. Laburtua "
+"izan da."
 msgstr[1] ""
-"Kanpoan zaudeneko mezuaren gehienezko luzera (%d byte) gainditu da. Pidgin-"
-"ek trunkatu egin du."
+"Kanpoan zaudeneko mezuaren gehienezko luzera (%d byte) gainditu da. Laburtua "
+"izan da."
 
 msgid "Away message too long."
-msgstr "Kanpoan zaudeneko mezua luzeegia da."
-
-#, fuzzy, c-format
+msgstr "Luzeegia da Kanpoan Zaudeneko Mezua."
+
+#, 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 ""
-"Ezin da %s laguna gehitu, pantaila-izena ez delako baliozkoa. Pantaila-"
-"izenek letra batekin hasi behar dute, eta letrak, zenbakiak eta zuriuneak "
-"bakarrik eduki, edo bestela zenbakiak bakarrik."
-
-#, fuzzy
-msgid "Unable to Add"
-msgstr "Ezin da gehitu"
-
-#, fuzzy
+"Ezin %s laguna gehitu, 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."
+
 msgid "Unable to Retrieve Buddy List"
-msgstr "Ezin da eskuratu lagunen zerrenda"
-
-#, fuzzy
+msgstr "Ezin Lagun-Zerrenda Eskuratu"
+
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
-"Pidgin-ek ezin izan du eskuratu zure lagunen zerrenda AIM zerbitzarietatik. "
-"Zure lagunen zerrenda ez da galdu, eta ordu batzuk barru erabilgarri egongo "
-"da seguru asko."
+"Oraintxe AIM-zerbitzariak ez dira zure lagun-zerrenda bidaltzeko gai.  Zure "
+"lagun-zerrenda ez da galdu, eta ziurrenik minutu batzutan izango duzu "
+"eskurragarri."
 
 msgid "Orphans"
 msgstr "Umezurtzak"
 
-#, 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 ""
-"Ezin izan da %s laguna gehitu, lagun gehiegi daudelako zure lagunen "
-"zerrendan. Kendu baten bat, eta saiatu berriro."
+"Ezin %s laguna gehitu, lagun gehiegi dauzkazulako zure lagun-zerrendan.  "
+"Batenbat kendu ezazu, eta berriro saiatu zaitez."
 
 msgid "(no name)"
-msgstr "(ez dago izenik)"
-
-#, fuzzy, c-format
+msgstr "(izenik ez)"
+
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "Komandoak huts egin du arrazoi ezezagunen batengatik."
-
-#, fuzzy, c-format
+msgstr "Ezin %s laguna gehitu, arrazoi ezezagun baten erruz."
+
+#, c-format
 msgid ""
 "The user %s has given you permission to add him or her to your buddy list.  "
 "Do you want to add this user?"
 msgstr ""
-"%s erabiltzaileak baimena eman dizu zure burua bere lagun-zerrendan "
-"gehitzeko. Zuk bera gehitu nahi duzu?"
+"%s erabiltzaileak baimena eman dizu bera zure lagun-zerrendara gehitzeko. "
+"Lagun hau gehitu nahi al duzu?"
 
 msgid "Authorization Given"
-msgstr "Baimena eman da"
+msgstr "Baimena Emana"
 
 #. Granted
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
-"%s erabiltzaileak baimena eman dizu bera zure lagun-zerrendan gehitzeko."
+"%s erabiltzaileak baimena eman dizu bera zure lagun-zerrendara gehitzeko."
 
 msgid "Authorization Granted"
-msgstr "Baimena eman da"
+msgstr "Baimena Emana"
 
 #. Denied
 #, c-format
@@ -7250,84 +6979,81 @@
 "following reason:\n"
 "%s"
 msgstr ""
-"%s erabiltzaileak ukatu dizu bera zure lagun-zerrendan gehitzeko eskaera. "
+"%s erabiltzaileak ukatu dizu bera zure lagun-zerrendara gehitzeko eskaera. "
 "Arrazoia:\n"
 "%s"
 
 msgid "Authorization Denied"
-msgstr "Baimena ukatu da"
+msgstr "Baimena Ukatuta"
 
 msgid "_Exchange:"
 msgstr "_Trukea:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Zure IM irudia ez da bidali. Ezin duzu IM irudirik bidali AIM berriketetan."
+"Ez da zure IM Irudia bidali. Ezin duzu IM Irudirik bidali AIM berriketetara."
 
 msgid "iTunes Music Store Link"
-msgstr ""
+msgstr "iTunes Musika-Denda Esteka"
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "Lagunaren iruzkinak %s(r)entzako"
+msgstr "Lagun-Iruzkina %s(r)entzako"
 
 msgid "Buddy Comment:"
-msgstr "Lagunaren iruzkina:"
+msgstr "Lagun-Iruzkina:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "%s(r)ekiko zuzeneko BMko konexio bat irekitzea hautatu duzu."
-
-#, fuzzy
+msgstr "%s(r)ekin zuzeneko IM-konexio bat irekitzea hautatu duzu."
+
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
-"Zure IP helbidea ikusiko denez, arriskutsua izan daiteke pribatutasunaren "
-"aldetik. Jarraitu nahi duzu?"
-
-#, fuzzy
+"Zure IP helbidea erakutsiko denez, segurtasun arazo bezala har liteke.  "
+"Jarraitu nahi duzu?"
+
 msgid "C_onnect"
-msgstr "Konektatu"
-
-#, fuzzy
+msgstr "_Konektatu"
+
 msgid "Get AIM Info"
-msgstr "Hartu informazioa"
+msgstr "AIM-Informazioa Eskuratu"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "Editatu lagunaren iruzkina"
+msgstr "Lagun-Iruzkina Editatu"
 
 msgid "Get Status Msg"
-msgstr "Hartu egoera-mezua"
+msgstr "Egoera-Mezua Eskuratu"
 
 msgid "Direct IM"
-msgstr "Zuzeneko BM"
+msgstr "Zuzeneko IM"
 
 msgid "Re-request Authorization"
-msgstr "Eskatu baimena berriro"
+msgstr "Baimena Berriro Eskatu"
 
 msgid "Require authorization"
-msgstr "Baimena beharrezkoa"
-
+msgstr "Baimena eskatu"
+
+#, fuzzy
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 "Web kontuan izan ( hau ahalbidetzen baduzu Zaborra jasotzea gerta daiteke) "
 
 msgid "ICQ Privacy Options"
-msgstr "ICQ pribatisasun ezarpenak"
+msgstr "ICQ Pribatutasun Ezarpenak"
 
 msgid "The new formatting is invalid."
 msgstr "Formatu berria ez da baliozkoa."
 
-#, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
-"Pantaila-izenen formatuan maiuskulak eta minuskulak eta zuriuneak bakarrik "
-"alda daitezke."
+"Erabiltzaile-izenak formateatzean maiuskula/minuskulak eta hutsuneak "
+"bakarrik aldatu ditzake."
 
 msgid "Change Address To:"
-msgstr "Aldatu helbidea eta jarri hau:"
+msgstr "Helbide Hau Ezarri:"
 
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ez zaude baimenaren zain</i>"
@@ -7339,85 +7065,80 @@
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Lagun hauei baimena berriro eskatzeko, egin klik eskuin-botoiarekin lagunen "
-"gainean, eta hautatu \"Eskatu baimena berriro.\""
+"Lagun hauei baimena berriro eskatzeko, eskuin-klik egizu lagunen gainean eta "
+"\"Baimena Berriro Eskatu\" hautatu ezazu."
 
 msgid "Find Buddy by Email"
-msgstr "Bilatu laguna helbide elektronikoaren arabera "
+msgstr "E-posta bidez Bilatu Laguna"
 
 msgid "Search for a buddy by email address"
-msgstr "Bilatu laguna helbide elektronikoaren arabera"
+msgstr "Helbide elektronikoaren bidez bilatu lagun bat"
 
 msgid "Type the email address of the buddy you are searching for."
-msgstr "Idatzi aurkitu nahi duzun lagunaren helbide elektronikoa."
-
-#, fuzzy
+msgstr "Bilatu nahi duzun lagunaren helbide elektronikoa idatz ezazu."
+
 msgid "_Search"
-msgstr "Bilatu"
-
-#, fuzzy
+msgstr "_Bilatu"
+
 msgid "Set User Info (web)..."
-msgstr "Ezarri erabiltzailearen datuak (URLa)..."
+msgstr "Erabiltzaile-Informazioa Ezarri (web)..."
 
 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "Aldatu pasahitza (URLa)"
-
-#, fuzzy
+msgstr "Pasahitza Aldatu (web)"
+
 msgid "Configure IM Forwarding (web)"
-msgstr "Konfiguratu BMen birbidalketa (URLa)"
+msgstr "IM-Birbidalketa Konfiguratu (URLa)"
 
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "Ezarri pribatitasun aukerak:"
+msgstr "Pribatutasun Aukerak Ezarri..."
 
 #. AIM actions
 msgid "Confirm Account"
-msgstr "Berretsi kontua"
-
-#, fuzzy
+msgstr "Kontua Berretsi"
+
 msgid "Display Currently Registered Email Address"
-msgstr "Bistaratu une honetan erregistratuta dagoen helbidea"
-
-#, fuzzy
+msgstr "Orain Erregistratuta Dagoen Helbidea Elektronikoa Erakutsi"
+
 msgid "Change Currently Registered Email Address..."
-msgstr "Aldatu une honetan erregistratuta dagoen helbidea..."
+msgstr "Orain Erregistratuta Dagoen Helbidea Elektronikoa Erakutsi..."
 
 msgid "Show Buddies Awaiting Authorization"
-msgstr "Bistaratu baimenaren zain dauden lagunak"
-
-#, fuzzy
+msgstr "Baimenaren Zain dauden Lagunak Bistaratu"
+
 msgid "Search for Buddy by Email Address..."
-msgstr "Bilatu laguna helbide elektronikoaren arabera... "
+msgstr "Helbide Elektronikoaren bidez Bilatu Laguna..."
 
 msgid "Search for Buddy by Information"
-msgstr "Bilatu laguna informazioaren arabera..."
-
-#, fuzzy
+msgstr "Informazioaren bidez Bilatu Laguna"
+
 msgid "Use clientLogin"
-msgstr "Erabiltzailea ez dago konektatuta"
+msgstr ""
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
+"AIM/ICQ proxy-zerbitzariak erabili beti\n"
+"fitxategi-transferentzi eta zuzeneko IMrako\n"
+"(geldoagoa da,baina ez du IP-helbidea erakusten)"
 
 msgid "Allow multiple simultaneous logins"
-msgstr ""
+msgstr "Aldi bereko konexio ugari onartu"
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "%s(r)i galdetzen gurekin %s(e)n konektatzeko: %hu BM Zuzenerako."
-
-#, fuzzy, c-format
+msgstr ""
+"%s(r)i galdetzen gurekin %s:%hu(e)n IM Zuzenerako koenktatzeko eskatzen."
+
+#, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "%s(e)ra (%s) konektatzen saiatzen: %hu BM Zuzenerako."
-
-#, fuzzy
+msgstr "%s(e)ra konektatzen saiatzen: %hu."
+
 msgid "Attempting to connect via proxy server."
-msgstr "Konexioa berbideratzen zailatzen..."
+msgstr "Proxy zerbitzari baten bidez konektatzen saiatzen."
 
 #, c-format
 msgid "%s has just asked to directly connect to %s"
@@ -7428,198 +7149,162 @@
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
-"Horrek bi ordenagailuak zuzenean konektatzea eskatzen du, eta beharrezkoa da "
-"BMen irudietarako. Zure IP helbidea ikusiko denez, arriskutsua izan daiteke "
-"pribatutasunaren aldetik."
+"Bi ordenagailuen arteko konexio zuzena behar du, eta beharrezkoa da IM "
+"Irudietarako. Zure IP helbidea erakutsiko denez, pribatutasun-arrisku bat "
+"suposa dezake."
 
 msgid "Aquarius"
-msgstr ""
-
-#, fuzzy
+msgstr "Akuario"
+
 msgid "Pisces"
-msgstr "Ahotsak"
-
-#, fuzzy
+msgstr "Piszis"
+
 msgid "Aries"
-msgstr "Helbidea"
-
-#, fuzzy
+msgstr "Aries"
+
 msgid "Taurus"
-msgstr "Turkiera"
-
-#, fuzzy
+msgstr "Tauro"
+
 msgid "Gemini"
-msgstr "Alemana"
-
-#, fuzzy
+msgstr "Geminis"
+
 msgid "Cancer"
-msgstr "Utzi"
+msgstr "Kantzer"
 
 msgid "Leo"
-msgstr ""
+msgstr "Leo"
 
 msgid "Virgo"
-msgstr ""
+msgstr "V‏irgo"
 
 msgid "Libra"
-msgstr ""
-
-#, fuzzy
+msgstr "Libra"
+
 msgid "Scorpio"
-msgstr "Harpidetza"
+msgstr "Eskorpio"
 
 msgid "Sagittarius"
-msgstr ""
+msgstr "Sagitario"
 
 msgid "Capricorn"
-msgstr ""
-
-#, fuzzy
+msgstr "Kaprikornio"
+
 msgid "Rat"
-msgstr "Formaturik gabe"
+msgstr "Sagua"
 
 msgid "Ox"
-msgstr ""
-
-#, fuzzy
+msgstr "Idia"
+
 msgid "Tiger"
-msgstr "Lanpostua"
+msgstr "Tigrea"
 
 msgid "Rabbit"
-msgstr ""
+msgstr "Untxia"
 
 msgid "Dragon"
-msgstr ""
-
-#, fuzzy
+msgstr "Herensugea"
+
 msgid "Snake"
-msgstr "Gorde"
-
-#, fuzzy
+msgstr "Sugea"
+
 msgid "Horse"
-msgstr "Ostalari-Izena"
+msgstr "Zaldia"
 
 msgid "Goat"
-msgstr ""
-
-#, fuzzy
+msgstr "Ahuntza"
+
 msgid "Monkey"
-msgstr "Bat ere ez"
-
-#, fuzzy
+msgstr "Tximinoa"
+
 msgid "Rooster"
-msgstr "Erregistratu"
+msgstr "Oilarra"
 
 msgid "Dog"
-msgstr ""
-
-#, fuzzy
+msgstr "Txakurra"
+
 msgid "Pig"
-msgstr "Ping"
-
-#, fuzzy
+msgstr "Txerria"
+
 msgid "Other"
-msgstr "Opera"
-
-#, fuzzy
+msgstr "Besteak"
+
 msgid "Visible"
-msgstr "Ikusezin"
+msgstr "Ikusgarri"
 
 msgid "Friend Only"
-msgstr ""
-
-#, fuzzy
+msgstr "Lagunak Bakarrik"
+
 msgid "Private"
-msgstr "Pribatutasuna"
+msgstr "Pribatua"
 
 msgid "QQ Number"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ Zenbakia"
+
 msgid "Country/Region"
-msgstr "Estatua"
+msgstr "Herrialdea/Zona"
 
 msgid "Province/State"
-msgstr ""
-
-#, fuzzy
+msgstr "Probintzia/Estatua"
+
 msgid "Zipcode"
 msgstr "Posta-kodea"
 
-#, fuzzy
 msgid "Phone Number"
-msgstr "Telefono zenbakia"
-
-#, fuzzy
+msgstr "Telefono Zenbakia"
+
 msgid "Authorize adding"
-msgstr "Baimena eman"
-
-#, fuzzy
+msgstr ""
+
 msgid "Cellphone Number"
-msgstr "Telefono zenbakia"
-
-#, fuzzy
+msgstr "Mugikoe Telefono"
+
 msgid "Personal Introduction"
-msgstr "Informazio pertsonala"
-
-#, fuzzy
+msgstr "Hitzaurre Pertsonala"
+
 msgid "City/Area"
-msgstr "Herria"
-
-#, fuzzy
+msgstr "Herria/Area"
+
 msgid "Publish Mobile"
-msgstr "Zagapoto pertsonala"
-
-#, fuzzy
+msgstr "Mugikorra Argitaratu"
+
 msgid "Publish Contact"
-msgstr "Ezizena kontaktuarentzat"
-
-#, fuzzy
+msgstr "Kontaktua Argitaratu"
+
 msgid "College"
-msgstr "_Tolestu"
-
-#, fuzzy
+msgstr "Eskola"
+
 msgid "Horoscope"
-msgstr "Ostalari-Izena"
+msgstr "Horoskopoa"
 
 msgid "Zodiac"
-msgstr ""
-
-#, fuzzy
+msgstr "Zodiakoa"
+
 msgid "Blood"
-msgstr "Blokeatuta"
-
-#, fuzzy
+msgstr "Odola"
+
 msgid "True"
-msgstr "Turkiera"
-
-#, fuzzy
+msgstr "Egia"
+
 msgid "False"
-msgstr "Huts egin du"
-
-#, fuzzy
+msgstr "Gezurra"
+
 msgid "Modify Contact"
-msgstr "Aldatu kontua"
-
-#, fuzzy
+msgstr "Kontaktua Aldatu"
+
 msgid "Modify Address"
-msgstr "Etxeko helbidea"
-
-#, fuzzy
+msgstr "Helbidea Aldatu"
+
 msgid "Modify Extended Information"
-msgstr "Lagunaren datuak"
-
-#, fuzzy
+msgstr "Informazio Gehigarria Aldatu"
+
 msgid "Modify Information"
-msgstr "Lagunaren datuak"
-
-#, fuzzy
+msgstr "Informazioa Aldatu"
+
 msgid "Update"
-msgstr "Azken eguneratzea "
-
-#, fuzzy
+msgstr "Eguneratu"
+
 msgid "Could not change buddy information."
-msgstr "Adierazi lagun bat alerta emateko."
+msgstr "Ezin lagunaren informazioa aldatu."
 
 msgid "Mobile"
 msgstr "Mugikorra"
@@ -7628,422 +7313,370 @@
 msgstr "Oharra"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Lagunaren ikonoa"
+msgstr ""
 
 msgid "Change his/her memo as you like"
 msgstr ""
 
-#, fuzzy
 msgid "_Modify"
-msgstr "_Aldatu"
-
-#, fuzzy
+msgstr "_Modifikatu"
+
 msgid "Memo Modify"
-msgstr "_Aldatu"
-
-#, fuzzy
+msgstr ""
+
 msgid "Server says:"
-msgstr "Zerbitzaria okupatuta dago"
+msgstr "Zerbitzariak dio:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "Zure eskaera onartu da."
 
 msgid "Your request was rejected."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Zure eskaera ezetsi da."
+
+#, c-format
 msgid "%u requires verification"
-msgstr "Baimena beharrezkoa"
-
-#, fuzzy
+msgstr "%u(e)k egiaztapena behar du"
+
 msgid "Add buddy question"
-msgstr "Laguna zerrendan gehitu nahi duzu?"
-
-#, fuzzy
+msgstr "Lagun-galdera gehitu"
+
 msgid "Enter answer here"
-msgstr "Sartu erabiltzailearen direktorioa"
-
-#, fuzzy
+msgstr "Hemen sartu erantzuna"
+
 msgid "Send"
-msgstr "_Bidali"
-
-#, fuzzy
+msgstr "Bidali"
+
 msgid "Invalid answer."
-msgstr "Pasahitz baliogabea"
-
-#, fuzzy
+msgstr "Erantzun baliogabea."
+
 msgid "Authorization denied message:"
-msgstr "Baimena ezesteko mezua:"
+msgstr "Autorizazioa ezesteko mezua:"
 
 msgid "Sorry, you're not my style."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Lastima, ez zara nire tipoa."
+
+#, c-format
 msgid "%u needs authorization"
-msgstr "Autentifikazioa haiseratzen"
-
-#, fuzzy
+msgstr "%u(e)k autorizazioa behar du"
+
 msgid "Add buddy authorize"
-msgstr "Laguna zerrendan gehitu nahi duzu?"
-
-#, fuzzy
+msgstr "Lagun-autorizazioa gehitu"
+
 msgid "Enter request here"
-msgstr "Sartu konferentzia-zerbitzari bat"
-
-#, fuzzy
+msgstr "Hemen sartu eskaera"
+
 msgid "Would you be my friend?"
-msgstr "Gainidatzi nahi duzu?"
-
-#, fuzzy
+msgstr "Nire laguna izan nahi al duzu?"
+
 msgid "QQ Buddy"
-msgstr "Gehitu laguna"
-
-#, fuzzy
+msgstr "QQ Laguna"
+
 msgid "Add buddy"
-msgstr "Gehitu laguna"
-
-#, fuzzy
+msgstr "Laguna gehitu"
+
 msgid "Invalid QQ Number"
-msgstr "Gela-izen baliogabea"
-
-#, fuzzy
+msgstr "QQ-Zenbaki Baliogabea"
+
 msgid "Failed sending authorize"
-msgstr "Emadazu baimena!"
-
-#, fuzzy, c-format
+msgstr "Ezin autorizazioa bidali"
+
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "Huts egin du berriketako lagunarekin elkartzean"
-
-#, fuzzy, c-format
+msgstr "Ezin %u laguna kendu"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s ezabatu zaitu bere lagunen-zerrendatik."
-
-#, fuzzy
+msgstr "Ezin ni kendu %d lagunaren zerrendatik."
+
 msgid "No reason given"
-msgstr "Ez da arrazoirik eman."
+msgstr "Arrazoirik ez"
 
 #. only need to get value
-#, fuzzy, c-format
+#, c-format
 msgid "You have been added by %s"
-msgstr "%s erabiltzaileak kanporatu zaitu: (%s)"
-
-#, fuzzy
+msgstr "%s erabiltzaileak gehitu zaitu"
+
 msgid "Would you like to add him?"
-msgstr "Gainidatzi nahi duzu?"
-
-#, fuzzy, c-format
+msgstr "Bera gehitu nahi al duzu?"
+
+#, c-format
 msgid "Rejected by %s"
-msgstr "Berrezarri"
-
-#, fuzzy, c-format
+msgstr "%s(e)k ezetsia"
+
+#, c-format
 msgid "Message: %s"
-msgstr "_Mezua:"
+msgstr "Mezua: %s"
 
 msgid "ID: "
-msgstr ""
-
-#, fuzzy
+msgstr "IDa:"
+
 msgid "Group ID"
-msgstr "Taldea:"
+msgstr "Talde IDa"
 
 msgid "QQ Qun"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ Qun"
+
 msgid "Please enter Qun number"
-msgstr "Idatzi pasahitz berria"
+msgstr "Qun zenbakia sartu"
 
 msgid "You can only search for permanent Qun\n"
-msgstr ""
-
-#, fuzzy
+msgstr "Qun iraunkorrak bakarrik bilatu ditzakezu\n"
+
 msgid "(Invalid UTF-8 string)"
-msgstr "Proxy-ezarpenak ez dira baliozkoak"
-
-#, fuzzy
+msgstr "(UTF-8 kate baliogabea)"
+
 msgid "Not member"
-msgstr "Noiztik kidea"
-
-#, fuzzy
+msgstr "Ez kidea"
+
 msgid "Member"
-msgstr "Noiztik kidea"
-
-#, fuzzy
+msgstr "Kidea"
+
 msgid "Requesting"
-msgstr "Eskaera Elkarrizketa"
+msgstr "Eskatzen"
 
 msgid "Admin"
-msgstr ""
-
-#, fuzzy
+msgstr "Administratzailea"
+
 msgid "Notice"
 msgstr "Oharra"
 
-#, fuzzy
 msgid "Detail"
-msgstr "Gnome-ren lehenetsia "
-
-#, fuzzy
+msgstr "Xehetasunak"
+
 msgid "Creator"
-msgstr "Sortu"
-
-#, fuzzy
+msgstr "Sortzailea"
+
 msgid "About me"
-msgstr "Pidgin-i buruz"
-
-#, fuzzy
+msgstr "Niri buruz"
+
 msgid "Category"
-msgstr "Berriketa-errorea"
-
-#, fuzzy
+msgstr "Kategoria"
+
 msgid "The Qun does not allow others to join"
-msgstr ""
-"Probako bertsio honek ez du uzten hamar erabiltzaile baino gehiago une "
-"berean konektatzea"
-
-#, fuzzy
+msgstr "Qun-ak ez du erabiltzaile gehiago batzea onartzen"
+
 msgid "Join QQ Qun"
-msgstr "Sartu berriketa batean"
+msgstr "QQ Qun-era Batu"
 
 msgid "Input request here"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Telefono zenbakia"
+msgstr "Arrakastaz batua %s Qun-era (%u)"
 
 msgid "Successfully joined Qun"
-msgstr ""
+msgstr "Arrakastaz batua Qun-era"
 
 #, c-format
 msgid "Qun %u denied from joining"
 msgstr ""
 
-#, fuzzy
 msgid "QQ Qun Operation"
-msgstr "Soinu-aukerak"
-
-#, fuzzy
+msgstr "QQ Qun Eragiketa"
+
 msgid "Failed:"
-msgstr "Huts egin du"
+msgstr "Errorea:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "Qun-era Batu, Erantzun Ezezaguna"
+
 msgid "Quit Qun"
-msgstr "Sartu berriketa batean"
+msgstr "Qun-etik Irten"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
+"Oharra, sortzailea bazara, \n"
+"eragiketa honek Qun hau ken dezake."
 
 msgid "Sorry, you are not our style"
-msgstr ""
-
-#, fuzzy
+msgstr "Lastima, ez zara nire tipoa"
+
 msgid "Successfully changed Qun members"
-msgstr "Telefono zenbakia"
-
-#, fuzzy
+msgstr "Arrakastaz aldatu dira Qun kideak"
+
 msgid "Successfully changed Qun information"
-msgstr "Kanalaren informazioa"
+msgstr "Arrakastaz aldatu da Qun informazioa"
 
 msgid "You have successfully created a Qun"
-msgstr ""
-
-#, fuzzy
+msgstr "Arrakastaz sortu duzu Qun bat"
+
 msgid "Would you like to set up detailed information now?"
-msgstr "Ikono hau lagunaren ikono bezela ezartzea gustatuko litzaizuke ?"
-
-#, fuzzy
+msgstr "Informazio xehea konfiguratu nahi al duzu orain?"
+
 msgid "Setup"
-msgstr "_Ezarri"
+msgstr "Konfiguratu"
 
 #, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr ""
+msgstr "%u(e)k %u Qun-era batu nahi du %s(e)rako"
 
 #, c-format
 msgid "%u request to join Qun %u"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%u(e)k %u Qun-era batu nahi du"
+
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Huts egin du berriketako lagunarekin elkartzean"
+msgstr "Ezin %u Qun-era batu (%u administratzaileak kudeatua)"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
-
-#, fuzzy, c-format
+"<b>%u Qun-era batu zaitezke (%u administratzaileak baimendua %s(e)rako)</b>"
+
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "Kendu laguna"
-
-#, fuzzy, c-format
+msgstr "<b>%u.laguna kenduta.</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Kendu laguna"
-
-#, fuzzy, c-format
+msgstr "<b>%u lagun berria batu da.</b>"
+
+#, c-format
 msgid "Unknown-%d"
-msgstr "Ezezaguna"
-
-#, fuzzy
+msgstr "Ezezaguna-%d"
+
 msgid "Level"
-msgstr "Inoiz ez"
+msgstr "Maila"
 
 msgid " VIP"
-msgstr ""
+msgstr "VIP"
 
 msgid " TCP"
-msgstr ""
-
-#, fuzzy
+msgstr "TCP"
+
 msgid " FromMobile"
-msgstr "Mugikorra"
+msgstr " Mugikorretik"
 
 #, fuzzy
 msgid " BindMobile"
-msgstr "Mugikorra"
-
-#, fuzzy
+msgstr " MugikorraLotu"
+
 msgid " Video"
-msgstr "Zuzeneko bideoa"
-
-#, fuzzy
+msgstr " Bideoa"
+
 msgid " Zone"
-msgstr "Bat ere ez"
+msgstr " Zona"
 
 msgid "Flag"
-msgstr ""
+msgstr "Bandera"
 
 msgid "Ver"
-msgstr ""
-
-#, fuzzy
+msgstr "Ber"
+
 msgid "Invalid name"
-msgstr "Erabiltzaile-izena ez da baliozkoa"
-
-#, fuzzy
+msgstr "Izen baliogabea"
+
 msgid "Select icon..."
-msgstr "Hautatu karpeta..."
-
-#, fuzzy, c-format
+msgstr "Ikonoa hautatu..."
+
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Konexio-ordua</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Lagun Konektatuak Guztira</b>: %d<br>\n"
+
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Azken Freskatzea</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>ID Erabiltzailea :</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Zerbitzaria</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Bezero-Etiketa</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
-msgstr "<b>Inaktibo:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Konexio-Modua</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>IP helbidea:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Nire Internet-IPa</b>: %s:%d<br>\n"
+
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Bidalita</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Birbidali</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>%s:</b> </b>%s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Galduta</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Jasota</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>Aliasa:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Jasotako Bikoiztua</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
-
-#, fuzzy, c-format
+msgstr "<b>Ordua</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>ID Erabiltzailea :</b> %s<br>"
-
-#, fuzzy
+msgstr "<b>IPa</b>: %s<br>\n"
+
 msgid "Login Information"
-msgstr "Arakatze informazioa"
-
-#, fuzzy
+msgstr "Konexio-Informazioa"
+
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr "<b>Kanpoko Erabiltzailea:</b><br>"
+msgstr "<p><b>Jatorrizko Egilea</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
-
-#, fuzzy
+msgstr "<p><b>Kode-Kontribuitzaileak</b>:<br>\n"
+
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>Erabiltzailea:</b> %s<br>"
-
-#, fuzzy
+msgstr "<p><b>Partxe-Idazle Maitagarriak</b>:<br>\n"
+
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
-
-#, fuzzy
+msgstr "<p><b>Eskerrak</b>:<br>\n"
+
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>Kanpoko Erabiltzailea:</b><br>"
+msgstr "<p><b>Frogatzaile Arduratsuak</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "eta gehiago, mesedez esaidazue.... esker mila!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>Eta, atzeko gelako mutiko guztiak...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<i>Zatoz gurekin!</i> :)"
+
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Pidgin-i buruz"
-
-#, fuzzy
+msgstr "OpenQ %s(e)ri Buruz"
+
 msgid "Change Icon"
-msgstr "Gorde ikonoa"
+msgstr "Ikonoa Aldatu"
 
 msgid "Change Password"
-msgstr "Aldatu pasahitza"
-
-#, fuzzy
+msgstr "Pasahitza Aldatu"
+
 msgid "Account Information"
-msgstr "Arakatze informazioa"
+msgstr "Kontuaren Informazioa"
 
 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ Qun guztiak eguneratu"
+
 msgid "About OpenQ"
-msgstr "Pidgin-i buruz"
-
-#, fuzzy
+msgstr "OpenQ-ri Buruz"
+
 msgid "Modify Buddy Memo"
-msgstr "Etxeko helbidea"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -8055,271 +7688,254 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
-msgstr "IRC protokoloaren plugin-a"
-
-#, fuzzy
+msgstr "QQ Protokolo-Plugina"
+
 msgid "Auto"
-msgstr "Baimena eman"
-
-#, fuzzy
+msgstr "Auto"
+
 msgid "Select Server"
-msgstr "Hautatu erabiltzaile "
+msgstr "Zerbitzaria Hautatu"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ2008"
+
 msgid "Connect by TCP"
-msgstr "Konektatzen"
-
-#, fuzzy
+msgstr "TCP bidez konektatu"
+
 msgid "Show server notice"
-msgstr "Zerbitzariaren ataka"
-
-#, fuzzy
+msgstr "Zerbitzari-oharra erakutsi"
+
 msgid "Show server news"
-msgstr "Zerbitzariaren helbidea"
+msgstr "Zerbitzari-albisteak erakutsi"
 
 msgid "Show chat room when msg comes"
-msgstr ""
-
-#, fuzzy
+msgstr "Solasaldi-gela erakutsi mezua jasotzean"
+
 msgid "Keep alive interval (seconds)"
-msgstr "Irakurketa-errorea"
-
-#, fuzzy
+msgstr ""
+
 msgid "Update interval (seconds)"
-msgstr "Irakurketa-errorea"
-
-#, fuzzy
+msgstr "Eguneratze-tartea (segundoak)"
+
 msgid "Unable to decrypt server reply"
-msgstr "Ezin da zerbitzariaren informazioa hartu"
+msgstr "Ezin zerbitzariaren erantzuna desenkriptatu"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Ezin testigua eskatu, 0x%02X"
+
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "authzid baliogabea"
+msgstr "Testigu-luzera baliogabea, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX ez dago jasana oraindik"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Erregistratu egin behar da"
+msgstr "Aktibazioa beharrezkoa"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
-
-#, fuzzy
+msgstr "Erantzun-kode ezezaguna konektatzean (0x%02X)"
+
 msgid "Requesting captcha"
-msgstr "Eskaera Elkarrizketa"
+msgstr "Captcha eskatzen"
 
 msgid "Checking captcha"
-msgstr ""
-
-#, fuzzy
+msgstr "Captcha egiaztatzen"
+
 msgid "Failed captcha verification"
-msgstr "Huts egin du Yahoo! autentifikazioak"
-
-#, fuzzy
+msgstr "Errorea captcha egiaztapenean"
+
 msgid "Captcha Image"
-msgstr "Gorde irudia"
-
-#, fuzzy
+msgstr "Captcha Irudia"
+
 msgid "Enter code"
-msgstr "Sartu Pasahitza"
+msgstr "Kodea sartu"
 
 msgid "QQ Captcha Verification"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ Captcha-Egiaztapena"
+
 msgid "Enter the text from the image"
-msgstr "Idatzi gehitu nahi duzun taldearen izena."
+msgstr "Irudiko testua sartu ezazu"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "Erantzun ezezaguna pasahitza egiaztatzean (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
-
-#, fuzzy
+"Erantzun-kode ezezaguna konektatzean (0x%02X)\n"
+"%s"
+
 msgid "Socket error"
-msgstr "Testigu errorea"
-
-#, fuzzy
+msgstr "Socket errorea"
+
 msgid "Getting server"
-msgstr "Ezarri erabiltzailearen datuak..."
-
-#, fuzzy
+msgstr "Zerbitzaria eskuratzen"
+
 msgid "Requesting token"
-msgstr "Eskaera ukatu da"
-
-#, fuzzy
+msgstr "Testigua eskatzen"
+
 msgid "Unable to resolve hostname"
-msgstr "Ezin da zerbitzariarekin konektatu."
-
-#, fuzzy
+msgstr "Ezin ostalari-izena ebaztu"
+
 msgid "Invalid server or port"
-msgstr "Erabiltzaile-izena edo pasahitza ez da baliozkoa."
-
-#, fuzzy
+msgstr "Zerbitzari edo ataka baliogabea"
+
 msgid "Connecting to server"
-msgstr "SILC zerbitzariarekin konektatzen"
-
-#, fuzzy
+msgstr "Zerbitzarira konektatzen"
+
 msgid "QQ Error"
-msgstr "Irakurketa-errorea"
-
-#, fuzzy, c-format
+msgstr "QQ Errorea"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "ICQ zerbitzariaren errelea"
-
-#, fuzzy, c-format
+msgstr ""
+"Zerbitzariko Albisteak\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
 msgid "%s:%s"
-msgstr "%s: %s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "Nork"
-
-#, fuzzy, c-format
+msgstr "%s(e)tik:"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Zerbitzariaren aginduak:%s"
-
-#, fuzzy
+msgstr ""
+"Zerbitzari-oharra %s(e)tik:\n"
+"%s"
+
 msgid "Unknown SERVER CMD"
-msgstr "Arrazoi ezezaguna."
+msgstr "SERVER CMD Ezezaguna"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
-
-#, fuzzy
+"%s(r)en errore-erantzuna (0x%02X)\n"
+"%u gela, 0x%02X erantzuna"
+
 msgid "QQ Qun Command"
-msgstr "Komandoa"
-
-#, fuzzy
+msgstr "QQ Qun Agindua"
+
 msgid "Unable to decrypt login reply"
-msgstr "Ezin da zerbitzariaren informazioa hartu"
-
-#, fuzzy
+msgstr "Ezin konexio-erantzuna desenkriptatu"
+
 msgid "Unknown LOGIN CMD"
-msgstr "Arrazoi ezezaguna."
-
-#, fuzzy
+msgstr "LOGIN CMD Ezezaguna"
+
 msgid "Unknown CLIENT CMD"
-msgstr "Arrazoi ezezaguna."
-
-#, fuzzy, c-format
+msgstr "CLIENT CMD Ezezaguna"
+
+#, c-format
 msgid "%d has declined the file %s"
-msgstr "%s(e)k gaia aldatu du: %s"
-
-#, fuzzy
+msgstr "%d(e)k ez du %s fitxategia onartu"
+
 msgid "File Send"
-msgstr "Huts egin du fitxategia bidaltzean"
-
-#, fuzzy, c-format
+msgstr "Fitxategi Bidalia"
+
+#, c-format
 msgid "%d canceled the transfer of %s"
-msgstr "%s(e)k %s(r)en transferentzia bertan behera utzi du"
+msgstr "%d(e)k bertan behera utzi du %s fitxategiaren transferentzia"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
-msgstr "<b>Taldearen titulua:</b> %s<br>"
-
-#, c-format
+msgstr "<b>Taldearen Titulua:</b> %s<br>"
+
+#, fuzzy, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>Talde ID oharra:</b> %s<br> "
+msgstr "<b>Ohar Talde IDa:</b> %s<br>"
 
 #, c-format
 msgid "Info for Group %s"
-msgstr "%s Taldearentzako informazioa"
-
+msgstr "%s Taldearen Informazioa"
+
+#, fuzzy
 msgid "Notes Address Book Information"
 msgstr "Helbide agenda-ren informazioa"
 
 msgid "Invite Group to Conference..."
-msgstr "Konferentziara  taldea gonbidatu"
-
+msgstr "Taldea Gonbidatu Konfrentziara..."
+
+#, fuzzy
 msgid "Get Notes Address Book Info"
 msgstr "Gehitu helbide-liburuan oharraren informazioa"
 
 msgid "Sending Handshake"
-msgstr "Bostekoa bidaltzen"
+msgstr "Handshake-a Bidaltzen"
 
 # , fuzzy
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Bosteko ezagupenaren zain"
+msgstr "Handshake-aren Ezagupenaren Zain"
 
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Bostekoa ezagutua, Konexio informazioa bidaltzen"
+msgstr "Handshake-a Ezagutua, Konektatzen"
 
 # , fuzzy
 msgid "Waiting for Login Acknowledgement"
-msgstr "Konexio ikuskapenaren zain"
+msgstr "Konexioaren Ezagupenaren Zain"
 
 msgid "Login Redirected"
-msgstr "Konexio berbideratua"
+msgstr "Konexio Berbideratua"
 
 msgid "Forcing Login"
-msgstr "Konektatzea behartzen"
+msgstr "Konexioa Behartzen"
 
 # ,fuzzy
 msgid "Login Acknowledged"
-msgstr "Konexio ikuskapena"
+msgstr "Konexioa Ezagutua"
 
 msgid "Starting Services"
-msgstr "Zerbitzuak hasten"
+msgstr "Zerbitzuak Hasiarazten"
 
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr ""
-"Sametime-eko administratzaileak hurrengo oharra argitaratu du zerbitzarian: %"
-"s"
+"Sametime-eko administratzaileak ohar hau argitaratu du zerbitzarian: %s"
 
 msgid "Sametime Administrator Announcement"
-msgstr "Sametime-eko administratzailearen oharra"
+msgstr "Sametime-eko Administratzailearen Oharra"
 
 #, c-format
 msgid "Announcement from %s"
-msgstr "Oharra  %s -tik"
+msgstr "%s(e)ko oharra"
 
 msgid "Conference Closed"
-msgstr "Konferentzia itxi da"
+msgstr "Konferentzia Itxita"
 
 msgid "Unable to send message: "
-msgstr "Ezin da mezua bidali: %s."
+msgstr "Ezin mezua bidali:"
 
 msgid "Place Closed"
-msgstr "Place itxita"
+msgstr "Lekua Itxita"
 
 msgid "Microphone"
 msgstr "Mikrofonoa"
@@ -8328,20 +7944,16 @@
 msgstr "Bozgorailuak"
 
 msgid "Video Camera"
-msgstr "Bideo-kamera"
+msgstr "Bideo-Kamera"
 
 msgid "File Transfer"
-msgstr "Fitxategi-transferentzia"
-
-#, fuzzy
+msgstr "Fitxategi-Transferentzia"
+
 msgid "Supports"
-msgstr "euskarria"
-
-#, fuzzy
+msgstr "Jasaten du"
+
 msgid "External User"
-msgstr ""
-"\n"
-"<b>Kanpoko erabiltzailea:</b>"
+msgstr "Kanpoko Erabiltzailea"
 
 msgid "Create conference with user"
 msgstr "Erabiltzailerarekin konferentzia sortu"
@@ -8351,20 +7963,19 @@
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"Gehitu ezazu topiko berria konferentziarako, eta mezua idatzi inbitazion "
-"moduan bidaltzeko %s"
+"Konferentzia berriarentzako gaia sar ezazu, eta %s(r)entzako gonbit-mezua"
 
 msgid "New Conference"
-msgstr "Konferentzia berria"
+msgstr "Konferentzia Berria"
 
 msgid "Create"
 msgstr "Sortu"
 
 msgid "Available Conferences"
-msgstr "Konferentzia erabilgarri"
+msgstr "Konferentzia Eskuragarriak"
 
 msgid "Create New Conference..."
-msgstr "Sortu konferentzia berria..."
+msgstr "Konferentzia Berria Sortu..."
 
 msgid "Invite user to a conference"
 msgstr "Erabiltzailea konferentziara gonbidatu"
@@ -8375,38 +7986,38 @@
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Beheko zerrendatik aukeratu konferentzia %s erabiltzaileari gonbitea "
-"bidaltzeko. Aukeratu \"Konferentzia berria sortu\" konferentzia berria sortu "
-"nahi baduzu aurreko erabiltzailea gonbidatzeko."
+"Azpiko zerrendako konferentzia bat hautatu ezazu, %s erabiltzailea bertara "
+"gonbidatzeko. \"Konferentzia Berria Sortu\" hautatu ezazu erabiltzailea "
+"konferentzia berri batera gonbidatzeko."
 
 msgid "Invite to Conference"
-msgstr "Konferentziara gonbidatu"
+msgstr "Konferentziara Gonbidatu"
 
 msgid "Invite to Conference..."
-msgstr "Konferentziara gonbidatu..."
+msgstr "Konferentziara Gonbidatu..."
 
 msgid "Send TEST Announcement"
-msgstr "Bidali FROGA oharra"
+msgstr "FROGA Oharra Bidali"
 
 msgid "Topic:"
 msgstr "Gaia:"
 
 msgid "No Sametime Community Server specified"
-msgstr "Ez dago Sametime komunitatearen espezifikaziorik zerbitzarian  "
+msgstr "Ez da Sametime Komunitate Zerbitzaririk zehaztu"
 
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Ez da inongo stalari edo IP helbide konfiguratu izan %s konturako. Sartu "
-"ezazu behean konexioa ezartzen jarraitzeko."
+"Ez ostalari edo IP helbiderik konfiguratu %s Meanwhile konturako. "
+"Konektatzeko, bat sartu ezazu azpian."
 
 msgid "Meanwhile Connection Setup"
-msgstr "Konexio ezarpena bitartean"
+msgstr "Meanwhile Konexio Konfigurazioa"
 
 msgid "No Sametime Community Server Specified"
-msgstr "Ez dago Sametime komunitatearen espezifikaziorik zerbitzarian "
+msgstr "Ez da Sametime Komunitate Zerbitzaririk Zehaztu"
 
 msgid "Connect"
 msgstr "Konektatu"
@@ -8415,41 +8026,40 @@
 msgid "Unknown (0x%04x)<br>"
 msgstr "Ezezaguna (0x%04x)<br>"
 
-#, fuzzy
 msgid "Last Known Client"
-msgstr "<b>Azkenengo bezero ezaguna:</b> "
+msgstr "Azkenengo Bezero Ezaguna"
 
 msgid "User Name"
 msgstr "Erabiltzaile-izena "
 
 msgid "Sametime ID"
-msgstr "Sametime ID"
+msgstr "Sametime IDa"
 
 msgid "An ambiguous user ID was entered"
-msgstr "ID erabiltzaile anbiguoa sartua izan da."
+msgstr "Erabiltzaile-ID anbiguoa sartu da"
 
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"%s identifikatzailea segurazki beste edozein erabiltzaileri erreferentzia "
-"egiten dio. Mesedez  ondorengo zerrendatik zuzeneko erabiltzailea hautatu "
-"zure lagun-zerrendara gehitzeko."
+"'%s' identifikatzaileak ondorengo erabiltzaileetako edozeinekin etor daiteke "
+"bat. Zure lagun-zerrendara gehitzeko, azpiko zerrendan hautatu ezazu "
+"erabiltzaile zuzena."
 
 msgid "Select User"
-msgstr "Hautatu erabiltzaile "
+msgstr "Erabiltzailea Hautatu"
 
 msgid "Unable to add user: user not found"
-msgstr "Ezin da erabiltzailea gehitu: erabiltzailea ez aurkitu"
+msgstr "Ezin erabiltzailea gehitu: ez da erabiltzailea aurkitu"
 
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"%s identifikatzailea ez dator bat Sametime-ko komunitateko inongo "
-"erabiltzailearekin. Sarrea hau zure lagunen-zerrendatik ezabatua izan da."
+"'%s' identifikatzailea ez dator bat zure Sametime komunitateko inongo "
+"erabiltzailerekin. Sarrera hau zure lagun-zerrendatik ezabatua izan da."
 
 #, c-format
 msgid ""
@@ -8460,13 +8070,13 @@
 "%s\n"
 
 msgid "Remotely Stored Buddy List"
-msgstr "Hurrunezko lagunen zerrenda bilketa"
+msgstr "Urrunean Gordetako Lagun-Zerrenda"
 
 msgid "Buddy List Storage Mode"
-msgstr "Lagunen zerrenda bilketa modua"
+msgstr "Lagun-Zerrenda Gordetzeko Modua"
 
 msgid "Local Buddy List Only"
-msgstr "Bertako lagunen zerrenda bakarrik"
+msgstr "Lagun-Zerrenda Lokala Bakarrik"
 
 #, fuzzy
 msgid "Merge List from Server"
@@ -8477,59 +8087,63 @@
 msgstr "Esportatu lagunen zerrenda zerbitzarira"
 
 msgid "Synchronize List with Server"
-msgstr "Zerbitzariarekin  zerrenda sinkronizatu"
+msgstr "Zerbitzariarekin Sinkronizatu Zerrenda"
 
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "Sametime-eko zerrenda inportatu kontu honetara %s"
+msgstr "%s Kontuaren Sametime-Zerrenda Inportatu"
 
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "Sametime-eko zerrenda esportatu kontu honetara %s"
+msgstr "%s Kontuaren Sametime-Zerrenda Esportatu"
 
 msgid "Unable to add group: group exists"
-msgstr "Ezin da taldea gehitu:dagoneneko badago."
+msgstr "Ezin taldea gehitu: jadanik badago"
 
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "%s izena duen taldea badago zure lagunen-zerrendan."
+msgstr "Jadanik badago '%s' izeneko talde bat zure lagun-zerrenda."
 
 msgid "Unable to add group"
-msgstr "Ezin da taldea gehitu"
+msgstr "Ezin taldea gehitu"
 
 msgid "Possible Matches"
-msgstr "Topaketa posibleak"
-
+msgstr "Kontzidentzia Posibleak"
+
+#, fuzzy
 msgid "Notes Address Book group results"
 msgstr "Helbideen agenda taldeen emaitzak "
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"%s Identifitikatzailea behar bada helbide-liburuaren oharreko taldeetara "
-"erreferentzia egiten ari da. Aukeratu ezazu talde egokia beheko zerrenda "
-"honetatik eta gehitu ezazu zure lagunen zerrenda."
-
+"'%s' identifikatzaileak ondorengo helbide-liburuaren oharreko taldeetako "
+"edozeinekin etor daiteke bat. Zure lagun-zerrendara gehitzeko, azpiko "
+"zerrendan hautatu ezazu talde  zuzena."
+
+#, fuzzy
 msgid "Select Notes Address Book"
 msgstr "Gehitu helbide-liburuan oharretan"
 
 msgid "Unable to add group: group not found"
-msgstr "Ezin da taldea gehitu:ez da taldea topatu"
+msgstr "Ezin taldea gehitu: ez da taldea aurkitu"
 
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"%s identifikatzailea ez du  inongo emaitzik aurkitu helbide agenda taldean, "
-"zure Sametime-eko komunitatean."
-
+"'%s' identifikatzailea ez dator bat zure Sametime komunitateko inongo "
+"helbide-liburuaren oharreko talderekin. "
+
+#, fuzzy
 msgid "Notes Address Book Group"
 msgstr "Helbide agenda taldea"
 
+#, fuzzy
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
@@ -8539,7 +8153,7 @@
 
 #, c-format
 msgid "Search results for '%s'"
-msgstr "Bilaketaren emaitza '%s'"
+msgstr "'%s' bilaketaren emaitzak"
 
 #, c-format
 msgid ""
@@ -8547,24 +8161,24 @@
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
-"%s Identifitikatzailea behar bada ondorengo erabiltzaileren bati "
-"erreferentzia egiten ari da. Erabiltzaileek zure lagunen-zerrendara gehitu "
-"ditzazkezu edo mezu bat bidali beheko ekintza botoiekin."
+"'%s' identifikatzaileak ondorengo erabiltzaileetako edozeinekin etor daiteke "
+"bat. Zure lagun-zerrendara gehitu ditzakezu edo mezuak bidal diezaiekezu "
+"azpiko botoiak erabiliz."
 
 msgid "Search Results"
-msgstr "Bilaketaren emaitza"
+msgstr "Bilaketaren Emaitzak"
 
 msgid "No matches"
-msgstr "Ez dago bat datorrenik "
+msgstr "Kointzidentziarik ez"
 
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"%s identifikatzailea ez dator bat inongo  zure Sametime komunitateko "
-"erabiltzaileekin."
+"'%s' identifikatzailea ez dator bat zure Sametime komunitateko inongo "
+"erabiltzailerekin. "
 
 msgid "No Matches"
-msgstr "Ez da ezer ez aurkitu"
+msgstr "Kointzidentziarik Ez"
 
 msgid "Search for a user"
 msgstr "Erabiltzailea bilatu"
@@ -8573,70 +8187,70 @@
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
-"Sartu ezazu izena edo ID partziala beheko gunean Sametime komunitateko "
-"erabiltzaileak topatzeko."
+"Zure Sametime komunitateko erabiltzaileen artean kointzidentziak bilatzeko, "
+"izen edo ID partziala sar ezazu azpiko eremuan."
 
 msgid "User Search"
-msgstr "Erabiltzaile bilaketa"
+msgstr "Erabiltzaile-Bilaketa"
 
 msgid "Import Sametime List..."
-msgstr "Inportatu Sametime zerrenda..."
+msgstr "Sametime-Zerrenda Inportatu..."
 
 msgid "Export Sametime List..."
-msgstr "Esportatu Sametime zerrenda..."
-
+msgstr "Sametime-Zerrenda Esportatu..."
+
+#, fuzzy
 msgid "Add Notes Address Book Group..."
-msgstr "Helbide agenda taldea  gehitu..."
+msgstr "Helbide agenda taldea gehitu..."
 
 msgid "User Search..."
-msgstr "Erabiltzaile Bilaketa..."
+msgstr "Erabiltzaile-Bilaketa..."
 
 msgid "Force login (ignore server redirects)"
-msgstr ""
-"Konexioa ezartzen behartu (entzungor egin zerbitzariaren norantza ber-"
-"adierazlei) "
+msgstr "Konexioa behartu (zerbitzari-berbideraketak ezikusi) "
 
 #. pretend to be Sametime Connect
 msgid "Hide client identity"
-msgstr "Eskutatu bezeroaren identidadea"
+msgstr "Bezeroaren identidadea ezkutatu"
 
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "%s erabiltzailea ez dago sarean"
 
 msgid "Key Agreement"
-msgstr "Gako-hitzarmena"
+msgstr "Gako-Hitzarmena"
 
 msgid "Cannot perform the key agreement"
-msgstr "Ezin da gako-hitzarmena landu"
+msgstr "Ezin gako-hitzarmena burutu"
 
 msgid "Error occurred during key agreement"
-msgstr "Errorea gertatu da gako-hitzarmenean"
+msgstr "Errorea gako-hitzarmen bitartean"
 
 msgid "Key Agreement failed"
-msgstr "Gako-hitzarmenak huts egin du"
+msgstr "Huts egin du Gako-Hitzarmenak"
 
 msgid "Timeout during key agreement"
-msgstr "Denbora iraungitu da gako-itzarmenean"
+msgstr "Denbora-muga iraungi da gako-itzarmen bitartean"
 
 msgid "Key agreement was aborted"
-msgstr "Gako-itzarmena abortatu egin da"
+msgstr "Gako-hitzarmena abortatu da"
 
 msgid "Key agreement is already started"
-msgstr "Gako-hitzarmena hasita dago"
+msgstr "Gako-hitzarmena hasi da jadanik"
 
 msgid "Key agreement cannot be started with yourself"
-msgstr "Ezin da norbere buruarekin gako-hitzarmenik hasi"
+msgstr "Ezin duzu zeure buruarekin hasi gako-hitzarmena"
 
 msgid "The remote user is not present in the network any more"
-msgstr "Urruneko erabiltzailea ez dago aktibo sarean"
+msgstr "Urruneko erabiltzailea ez dago sarean jadanik"
 
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
-"%s(e)tik gako-hitzarmen eskaera jaso da. Gako-hitzarmena lantzea nahi duzu?"
+"Gako-hitzarmen eskaera jaso da %s(en)gandik. Gako-hitzarmena burutu nahi "
+"duzu?"
 
 #, c-format
 msgid ""
@@ -8649,34 +8263,34 @@
 "Urruneko ataka: %d"
 
 msgid "Key Agreement Request"
-msgstr "Gako-hitzarmenaren eskaera"
+msgstr "Gako-Hitzarmen Eskaera"
 
 msgid "IM With Password"
-msgstr "IM pasahitzarekin"
+msgstr "Pasahitzdun IM"
 
 msgid "Cannot set IM key"
-msgstr "Ezin da IM gakoa ezarri"
+msgstr "Ezin IM gakoa ezarri"
 
 msgid "Set IM Password"
-msgstr "Ezarri IM pasahitza"
+msgstr "IM-pasahitza ezarri"
 
 msgid "Get Public Key"
-msgstr "Lortu gako publikoa"
+msgstr "Gako Publikoa Eskuratu"
 
 msgid "Cannot fetch the public key"
-msgstr "Ezin da gako publikoa eskuratu"
+msgstr "Ezin gako publikoa eskuratu"
 
 msgid "Show Public Key"
-msgstr "Erakutsi gako publikoa"
+msgstr "Gako Publikoa Erakutsi"
 
 msgid "Could not load public key"
-msgstr "Ezin izan da gako publikoa kargatu"
+msgstr "Ezin gako publikoa kargatu"
 
 msgid "User Information"
-msgstr "Erabiltzailearen inf."
+msgstr "Erabiltzaile-Informazioa"
 
 msgid "Cannot get user information"
-msgstr "Ezin da erabiltzailearen informazioa lortu"
+msgstr "Ezin erabiltzaile-informazioa eskuratu"
 
 #, c-format
 msgid "The %s buddy is not trusted"
@@ -8686,8 +8300,8 @@
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"Ezin duzu lagunaren jakinarazpenik jaso bere gako publikoa inportatu arte. "
-"'Lortu gako publikoa' eraibl dezakezu gako publikoa lortzeko."
+"Ezin duzu lagun-jakinarazpenik jaso bere gako publikoa inportatu arte. 'Gako "
+"Publikoa Eskuratu' agindua erabili dezakezu gako publikoa eskuratzeko."
 
 #. Open file selector to select the public key.
 msgid "Open..."
@@ -8701,28 +8315,29 @@
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
-"Laguna gehitzeko bere gako publikoa inprotatu behar duzu. Sakatu 'Inportatu' "
-"inportatzeko"
+"Laguna gehitzeko, bere gako publikoa inportatu behar duzu. 'Inportatu' "
+"sakatu ezazu gako publikoa inportatzeko."
 
 msgid "_Import..."
 msgstr "_Inportatu..."
 
 msgid "Select correct user"
-msgstr "Hautatu erabiltzaile zuzena"
+msgstr "Erabiltzaile zuzena hautatu"
 
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-"Erabiltzaile bat baino gehiagok gako publiko berdina dute. Hautatu "
-"erabiltzaile zuzena zerrendatik lagunen zerrendan gehitzeko."
+"Erabiltzaile bat baino gehiago aurkitu da gako publiko berdinarekin. Zure "
+"lagun-zerrendara gehitzeko, azpiko zerrendan hautatu ezazu erabiltzaile "
+"zuzena."
 
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
-"Erabiltzaile bat baino gehiagok izen berdina dute. Hautatu erabiltzaile "
-"zuzena zerrendatik lagunen zerrendan gehitzeko."
+"Erabiltzaile bat baino gehiago aurkitu da izen berdinarekin. Zure lagun-"
+"zerrendara gehitzeko, azpiko zerrendan hautatu ezazu erabiltzaile zuzena."
 
 msgid "Detached"
 msgstr "Inpartzial"
@@ -8731,7 +8346,7 @@
 msgstr "Ondoezik"
 
 msgid "Wake Me Up"
-msgstr "Esna nazazu"
+msgstr "Esna Nazazu"
 
 msgid "Hyper Active"
 msgstr "Hiperaktibo"
@@ -8752,7 +8367,7 @@
 msgstr "Jeloskor"
 
 msgid "Ashamed"
-msgstr "Lotsati"
+msgstr "Lotsatuta"
 
 msgid "Invincible"
 msgstr "Garaiezin"
@@ -8764,7 +8379,7 @@
 msgstr "Logurarekin"
 
 msgid "Bored"
-msgstr "Azpertuta"
+msgstr "Aspertuta"
 
 msgid "Excited"
 msgstr "Aztoratuta"
@@ -8776,10 +8391,10 @@
 msgstr "Erabiltzaile-moduak"
 
 msgid "Preferred Contact"
-msgstr "Kontaktu hobetsia"
+msgstr "Kontaktu Hobetsia"
 
 msgid "Preferred Language"
-msgstr "Hizkuntza hobetsia"
+msgstr "Hizkuntza Hobetsia"
 
 msgid "Device"
 msgstr "Gailua"
@@ -8788,54 +8403,54 @@
 msgstr "Ordu-zona"
 
 msgid "Geolocation"
-msgstr "Kokalekua"
+msgstr "Geokokapena"
 
 msgid "Reset IM Key"
-msgstr "Berrasieratu IM gakoa"
+msgstr "IM Gakoa Berrezarri"
 
 msgid "IM with Key Exchange"
-msgstr "IM gako-trukearekin"
+msgstr "Gako-Trukedun IMa"
 
 msgid "IM with Password"
-msgstr "IM pasahitzarekin"
+msgstr "Pasahitzdun IMa"
 
 msgid "Get Public Key..."
-msgstr "Lortu gako publikoa..."
+msgstr "Gako Publikoa Eskuratu..."
 
 msgid "Kill User"
-msgstr "Kanporatu erabiltzailea"
+msgstr "Erabiltzailea Hil"
 
 msgid "Draw On Whiteboard"
-msgstr "Marraztu Whiteboard -ean"
+msgstr "Arbelean Marraztu"
 
 msgid "_Passphrase:"
 msgstr "_Pasaesaldia:"
 
 #, c-format
 msgid "Channel %s does not exist in the network"
-msgstr "%s kanala ez dago sarean"
+msgstr "%s kanala ez da sarean existitzen"
 
 msgid "Channel Information"
-msgstr "Kanalaren informazioa"
+msgstr "Kanal-Informazioa"
 
 msgid "Cannot get channel information"
-msgstr "Ezin da kanalaren informazioa eskuratu"
+msgstr "Ezin kanal-informazioa eskuratu"
 
 #, c-format
 msgid "<b>Channel Name:</b> %s"
-msgstr "<b>Kanal-izena:</b> %s"
+msgstr "<b>Kanalaren Izena:</b> %s"
 
 #, c-format
 msgid "<br><b>User Count:</b> %d"
-msgstr "<br><b>Erabiltzaile-kontua:</b> %d"
+msgstr "<br><b>Erabiltzaile-Kontua:</b> %d"
 
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
-msgstr "<br><b>Kanalaren sortzailea:</b> %s"
+msgstr "<br><b>Kanalaren Sortzailea:</b> %s"
 
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>Kanalaren zifratua:</b> %s"
+msgstr "<br><b>Kanalaren Zifratua:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
 #, c-format
@@ -8844,32 +8459,32 @@
 
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
-msgstr "<br><b>Kanalaren gaia:</b><br>%s"
+msgstr "<br><b>Kanalaren Gaia:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
-msgstr "<br><b>Kanalaren moduak:</b> "
+msgstr "<br><b>Kanalaren Moduak:</b> "
 
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
-msgstr "<br><b>Sortzailearen hatz-marka:</b><br>%s"
+msgstr "<br><b>Sortzailearen Hatz-Marka:</b><br>%s"
 
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>Sortzailearen 'babble'-marka:</b><br>%s"
+msgstr "<br><b>Sortzailearen Babble-Marka:</b><br>%s"
 
 msgid "Add Channel Public Key"
-msgstr "Gehitu kanalaren gako publikoa"
+msgstr "Kanalaren Gako Publikoa Gehitu"
 
 #. Add new public key
 msgid "Open Public Key..."
-msgstr "Ireki gako publikoa..."
+msgstr "Gako Publikoa Ireki..."
 
 msgid "Channel Passphrase"
-msgstr "Kanalaren pasaesaldia"
+msgstr "Kanalaren Pasaesaldia"
 
 msgid "Channel Public Keys List"
-msgstr "Kanalaren gako publikoen zerrenda"
+msgstr "Kanalaren Gako Publikoen Zerrenda"
 
 #, c-format
 msgid ""
@@ -8879,148 +8494,144 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"Kanalaren autentifikazioa baimendu gabeko sarbideetatik kanala babesteko "
-"erabiltzen da. Autentifikazioa pasaesaldian eta sinadura digitaletan "
-"oinarritzen da. Pasaesaldia ezartzen bada konektatzeko eskatuko da. "
-"Kanalaren gako publikoak ezartzen badira gako publikoak zerrendatzen "
-"dituzten erabiltzaileek bakarrik izango dute baimena konektatzeko."
+"Kanalaren autentifikazioari esker, baimendu gabeko sarrerak ekiditen dira. "
+"Pasaesaldian eta sinadura digitaletan oinarritu daiteke atentifikazioa. "
+"Pasaesaldia ezartzen bada, konektatu aurretik eskatuko da. Kanalaren gako "
+"publikoak ezartzen badira, bere gako publikoa zerrendatua duten "
+"erabiltzaileek bakarrik konektatu ahalko dira."
 
 msgid "Channel Authentication"
-msgstr "Kanalaren autentifikazioa"
+msgstr "Kanalaren Autentifikazioa"
 
 msgid "Add / Remove"
 msgstr "Gehitu / Kendu"
 
 msgid "Group Name"
-msgstr "Taldearen izena"
+msgstr "Taldearen Izena"
 
 msgid "Passphrase"
 msgstr "Pasaesaldia"
 
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Idatzi %s kanaleko talde pribatuaren izena eta pasaesaldia."
+msgstr "%s kanaleko talde pribatuaren izena eta pasaesaldia idatzi itzazu."
 
 msgid "Add Channel Private Group"
-msgstr "Gehitu kanal pribatuaren taldea"
+msgstr "Kanaleko Talde Pribatua Gehitu"
 
 msgid "User Limit"
-msgstr "Erabiltzaile-muga"
+msgstr "Erabiltzaile-Muga"
 
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-"Ezarri erabiltzailearen muga kanalean. Ezarri zerora erabiltzailearen muga "
-"berrasieratzeko "
+"Erabiltzaile-muga ezarri kanalean. Zero ezarri ezazu erabiltzaile-muga "
+"kentzeko."
 
 msgid "Invite List"
-msgstr "Gonbidatuen zerrenda"
+msgstr "Gonbidatu-Zerrenda"
 
 msgid "Ban List"
-msgstr "Kanporatutakoen zerrenda"
+msgstr "Betatu-Zerrenda"
 
 msgid "Add Private Group"
-msgstr "Gehitu talde pribatua"
+msgstr "Talde Pribatua Gehitu"
 
 msgid "Reset Permanent"
-msgstr "Berrasieratu iraunkortasuna"
+msgstr "Iraunkortasuna Kendu"
 
 msgid "Set Permanent"
-msgstr "Ezarri iraunkortasuna"
+msgstr "Iraunkortasuna Ezarri"
 
 msgid "Set User Limit"
-msgstr "Ezarri erabiltzailearen muga"
+msgstr "Erabiltzaile-Muga Ezarri"
 
 msgid "Reset Topic Restriction"
-msgstr "Berreasieratu gai-murriztapena"
+msgstr "Gai-Murrizketa Kendu"
 
 msgid "Set Topic Restriction"
-msgstr "Ezarri gai-murriztapena"
+msgstr "Gai-Murrizketa Ezarri"
 
 msgid "Reset Private Channel"
-msgstr "Berrasieratu kanal pribatua"
+msgstr "Kanal Pribatua Kendu"
 
 msgid "Set Private Channel"
-msgstr "Ezarri kanal pribatua"
+msgstr "Kanal Pribatua Ezarri"
 
 msgid "Reset Secret Channel"
-msgstr "Berrasieratu kanal sekretua"
+msgstr "Kanal Sekretua Kendu"
 
 msgid "Set Secret Channel"
-msgstr "Ezarri kanal sekretua"
+msgstr "Kanal Sekretua Ezarri"
 
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
-msgstr ""
-"%s kanalera konektatu behar zara talde pribatu batera konektatu aurretik"
+msgstr "%s kanalera konektatu behar zara talde pribatura batu aurretik"
 
 msgid "Join Private Group"
-msgstr "Konektatu talde pribatura"
+msgstr "Talde Pribatura Batu"
 
 msgid "Cannot join private group"
-msgstr "Ezin da talde pribatura konektatu"
+msgstr "Ezin talde pribatura batu"
 
 msgid "Call Command"
-msgstr "Deitu Komandoa"
+msgstr "Agindua Deitu"
 
 msgid "Cannot call command"
-msgstr "Ezin da komandoari deitu"
+msgstr "Ezin agindua deitu"
 
 msgid "Unknown command"
-msgstr "Komando ezezaguna"
+msgstr "Agindu ezezaguna"
 
 msgid "Secure File Transfer"
-msgstr "Fitxategi-transferentzia segurua"
+msgstr "Fitxategi-Transferentzia Segurua"
 
 msgid "Error during file transfer"
-msgstr "Errorea fitxategia transferitzean"
-
-#, fuzzy
+msgstr "Errorea Fitxategi-Transferentzian"
+
 msgid "Remote disconnected"
-msgstr "%s Deskonektatuta."
+msgstr "Urrunekoa deskonektatua"
 
 msgid "Permission denied"
-msgstr "Baimena ukatua"
+msgstr "Baimena Ukatua"
 
 msgid "Key agreement failed"
 msgstr "Gako-hitzarmenak huts egin du"
 
-#, fuzzy
 msgid "Connection timed out"
-msgstr "Konexioaren denbora-muga"
-
-#, fuzzy
+msgstr "Konexioaren denbora-muga agortua"
+
 msgid "Creating connection failed"
-msgstr "Konexioak huts egin du"
+msgstr "Ezin konexioa sortu"
 
 msgid "File transfer session does not exist"
 msgstr "Ez dago fitxategi-transferentzia saiorik "
 
 msgid "No file transfer session active"
-msgstr "Fitxategi-transferentzi saioa ez dago aktibo"
+msgstr "Ez dago fitxategi-transferentzia aktiborik"
 
 msgid "File transfer already started"
-msgstr "fitxategi-transferentzia hasita dago"
+msgstr "Jadanik hasi da fitxategi-transferentzia"
 
 msgid "Could not perform key agreement for file transfer"
-msgstr "Ezin izan da gako-hitzarmena landu fitxategia transferitzeko"
+msgstr "Ezin gako-hitzarmena burutu fitxategi-transferentziarako"
 
 msgid "Could not start the file transfer"
-msgstr "Ezin izan da fitxategi-transferentzia hasi"
+msgstr "Ezin fitxategi-transferentzia hasi"
 
 msgid "Cannot send file"
-msgstr "Ezin da fitxategia bidali."
+msgstr "Ezin fitxategia bidali"
 
 msgid "Error occurred"
-msgstr ""
+msgstr "Errorea"
 
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%s(e)k <I>%s</I> gaia aldatu du: %s"
+msgstr "%s(e)k gaia aldatu du <I>%s</I>: %s"
 
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr "<I>%s</I>(e)k <I>%s</I> kanalaren moduak ezarri ditu: %s"
+msgstr "<I>%s</I>(e)k kanalaren moduak ezarri ditu <I>%s</I>: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
@@ -9028,35 +8639,35 @@
 
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr "<I>%s</I>(e)k <I>%s</I>(e)n moduak ezarri ditu: %s"
+msgstr "<I>%s</I>(e)k moduak ezarri ditu <I>%s</I>: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr "<I>%s</I>(e)k <I>%s</I>(e)n modu guztiak kendu ditu"
+msgstr "<I>%s</I>(e)k <I>%s</I>(e)ko modu guztiak kendu ditu"
 
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "<I>%s</I>(e)tik <I>%s</I> erabiltzaileak kanporatu zaitu: (%s)"
+msgstr "<I>%s</I>(e)tik kanporatu zaitu <I>%s</I> erabiltzaileak: %s"
 
 #, c-format
 msgid "You have been killed by %s (%s)"
-msgstr "%s erabiltzaileak kanporatu zaitu: (%s)"
+msgstr "%s erabiltzaileak hil zaitu: %s"
 
 #, c-format
 msgid "Killed by %s (%s)"
-msgstr "%s(e)k kanporatu zaitu: (%s)"
+msgstr "%s erabiltzaileak hila: %s"
 
 msgid "Server signoff"
 msgstr "Zerbitzariak deskonektatu zaitu"
 
 msgid "Personal Information"
-msgstr "Informazio pertsonala"
+msgstr "Informazio Pertsonala"
 
 msgid "Birth Day"
 msgstr "Urtebetetzea"
 
 msgid "Job Role"
-msgstr "Funtzioa"
+msgstr "Laneko Funtzioa"
 
 msgid "Organization"
 msgstr "Erakundea"
@@ -9065,67 +8676,66 @@
 msgstr "Saila"
 
 msgid "Join Chat"
-msgstr "Sartu berriketa batean"
+msgstr "Berriketara Batu"
 
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr "<I>%s</I> kanalaren sortailea zara."
+msgstr "<I>%s</I> kanalaren sortzailea zara"
 
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "<I>%s</I> kanalaren sortailea  <I>%s</I> da"
+msgstr "<I>%s</I> kanalaren sortzailea <I>%s</I> da"
 
 msgid "Real Name"
-msgstr "Benetako izena "
+msgstr "Benetako Izena "
 
 msgid "Status Text"
-msgstr "Egoera-testua"
+msgstr "Egoera-Testua"
 
 msgid "Public Key Fingerprint"
-msgstr "Gako pubilkoaren hatz-marka"
+msgstr "Gako Publikoaren Hatz-Marka"
 
 msgid "Public Key Babbleprint"
-msgstr "Gako publikoaren 'babble'-marka"
+msgstr "Gako Publikoaren 'Babble'-Marka"
 
 msgid "_More..."
 msgstr "_Gehiago..."
 
 msgid "Detach From Server"
-msgstr "Askatu zerbitzaritik"
+msgstr "Zerbitzaritik Askatu"
 
 msgid "Cannot detach"
-msgstr "Ezin da askatu"
+msgstr "Ezin askatu"
 
 msgid "Cannot set topic"
-msgstr "Ezin da gaia ezarri"
+msgstr "Ezin gaia ezarri"
 
 msgid "Failed to change nickname"
-msgstr "Huts egin du goitizena aldatzean"
+msgstr "Errorea ezizena aldatzean"
 
 msgid "Roomlist"
-msgstr "Gelen zerrenda"
+msgstr "Gela-Zerrenda"
 
 msgid "Cannot get room list"
-msgstr "Ezin da gela-zerrenda hartu."
-
-#, fuzzy
+msgstr "Ezin gela-zerrenda eskuratu"
+
 msgid "Network is empty"
-msgstr "Sareko estatistikak"
+msgstr "Sareko hutsik"
 
 msgid "No public key was received"
 msgstr "Ez da gako publikorik jaso"
 
 msgid "Server Information"
-msgstr "Zerbitzariaren informazioa"
+msgstr "Zerbitzari-Informazioa"
 
 msgid "Cannot get server information"
-msgstr "Ezin da zerbitzariaren informazioa hartu"
+msgstr "Ezin zerbitzari-informazioa eskuratu"
 
 msgid "Server Statistics"
-msgstr "Zerbitzariaren estatistikak"
+msgstr "Zerbitzari-Estatistikak"
 
 msgid "Cannot get server statistics"
-msgstr "Ez dago zerbitzarien estatistikarik hartu"
+msgstr "Ezin zerbitzari-estatistikarik eskuratu"
 
 #, c-format
 msgid ""
@@ -9145,15 +8755,15 @@
 "Total server operators: %d\n"
 "Total router operators: %d\n"
 msgstr ""
-"Zerbitzari lokaleko abioaren ordua: %s\n"
-"Zerbitzari lokaleko abio iraupena: %s\n"
-"Zerbitzari lokaleko bezeroak: %d\n"
-"Zerbitzari lokaleko kanalak: %d\n"
-"Zerbitzari lokaleko operadoreak: %d\n"
-"Bideratzaile lokaleko operadoreak: %d\n"
-"Gelaxka lokaleko bezeroak: %d\n"
-"Gelaxka lokaleko kanalak: %d\n"
-"Gelaxka lokaleko zerbitzariak: %d\n"
+"Zerbitzariaren abio-ordu lokala: %s\n"
+"Zerbitzariaren abio-iraupen lokala: %s\n"
+"Zerbitzariaren bezero loakalak: %d\n"
+"Zerbitzariaren kanal lokalak: %d\n"
+"Zerbitzariaren operadore lokalak: %d\n"
+"Bideratzaile-operadore lokalak: %d\n"
+"Gelaxka-bezero lokalak: %d\n"
+"Gelaxka-kanal lokalak: %d\n"
+"Gelaxka-zerbitzari lokalak: %d\n"
 "Guztira bezeroak: %d\n"
 "Guztira kanalak: %d\n"
 "Guztira zerbitzariak: %d\n"
@@ -9162,29 +8772,28 @@
 "Guztira bideratzaile-operadoreak: %d\n"
 
 msgid "Network Statistics"
-msgstr "Sareko estatistikak"
+msgstr "Sare-Estatistikak"
 
 msgid "Ping"
 msgstr "Ping"
 
 msgid "Ping failed"
-msgstr "Ping-ek huts egin du"
+msgstr "Ping-ak huts egin du"
 
 msgid "Ping reply received from server"
 msgstr "Ping erantzuna jaso da zerbitzaritik"
 
 msgid "Could not kill user"
-msgstr "Ezin izan da erabiltzailea kanporatu"
+msgstr "Ezin erabiltzailea hil"
 
 msgid "WATCH"
-msgstr ""
-
-#, fuzzy
+msgstr "ZELATATU"
+
 msgid "Cannot watch user"
-msgstr "Ezin duzu zure burua gehitu"
+msgstr "Ezin erabiltzailea zelatatu"
 
 msgid "Resuming session"
-msgstr "Saioa berriro hasten"
+msgstr "Sesioa berrabiarazten"
 
 msgid "Authenticating connection"
 msgstr "Konexioa autentifikatzen"
@@ -9200,12 +8809,12 @@
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
-"%s(r)en gako publikoa jaso da. Gako hau ez dator bat lokaleko kopiarekin. "
-"Hala ere gako publiko hau onartzea nahi duzu?"
+"%s(r)en gako publikoa jaso da. Gako hau ez dator bat zure kopia lokalarekin. "
+"Hala ere, gako publiko hau onartu nahi duzu?"
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr "%s(r)en gako publikoa jaso da. Gako publiko hau onartzea nahi duzu?"
+msgstr "%s(r)en gako publikoa jaso da. Gako publiko hau onartu nahi duzu?"
 
 #, c-format
 msgid ""
@@ -9220,62 +8829,54 @@
 "%s\n"
 
 msgid "Verify Public Key"
-msgstr "Egiaztatu gako publikoa"
+msgstr "Gako Publikoa Egiaztatu"
 
 msgid "_View..."
 msgstr "_Ikusi..."
 
 msgid "Unsupported public key type"
-msgstr "Gako publiko mota ez da onartzen"
+msgstr "Gako publiko mota ulergaitza"
 
 msgid "Disconnected by server"
-msgstr "Zerbitzariak deskonektatu zaitu "
-
-#, fuzzy
+msgstr "Zerbitzariak deskonektatua"
+
 msgid "Error connecting to SILC Server"
-msgstr "Errorea SILC zerbitzariarekin konektatzean"
+msgstr "Errorea SILC-Zerbitzarira konektatzean"
 
 msgid "Key Exchange failed"
-msgstr "Gako-trukatzeak huts egin du"
+msgstr "Huts egin du Gako-Trukeak"
 
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
-"Huts egin du askatutako saio berriro hastean. Konektatu berriro konexio "
+"Ezin askatutako sesioa berrabiarazi. Berkonektatu sakatu ezazu konexio "
 "berria sortzeko."
 
 msgid "Performing key exchange"
-msgstr "Gako-trukatzea lantzen"
-
-#, fuzzy
+msgstr "Gako-trukea burutzen"
+
 msgid "Unable to load SILC key pair"
-msgstr "Ezin da SILC gako-parea : %s kargatu."
+msgstr "Ezin SILC gako parea kargatu"
 
 #. Progress
 msgid "Connecting to SILC Server"
-msgstr "SILC zerbitzariarekin konektatzen"
-
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "Ezin da SILC gako-parea : %s kargatu."
+msgstr "SILC zerbitzarira konektatzen"
 
 msgid "Out of memory"
-msgstr "Memoriarik ez"
-
-#, fuzzy
+msgstr "Memoria agortuta"
+
 msgid "Unable to initialize SILC protocol"
-msgstr "Ezin izan da SILC protokoloa hasieratu"
-
-#, fuzzy
+msgstr "Ezin SILC protokoloa hasieratu"
+
 msgid "Error loading SILC key pair"
-msgstr "SILC gako bikotea sortzen..."
-
-#, fuzzy, c-format
+msgstr "Errorea SILC gako parea kargatzean"
+
+#, c-format
 msgid "Download %s: %s"
-msgstr "Eraibltzaileak %s(e)n: %s"
+msgstr "%s deskargatu: %s"
 
 msgid "Your Current Mood"
-msgstr "Uneko umorea"
+msgstr "Zure Umorea Orain"
 
 #, c-format
 msgid "Normal"
@@ -9289,7 +8890,7 @@
 "Your Preferred Contact Methods"
 msgstr ""
 "\n"
-"Kontaktu-metodo hobetsiak"
+"Zure Kontaktu-Metodo Hobetsiak"
 
 msgid "SMS"
 msgstr "SMS"
@@ -9298,27 +8899,27 @@
 msgstr "MMS"
 
 msgid "Video conferencing"
-msgstr "Bideo-konferentzia "
+msgstr "Bideo-Konferentzia "
 
 msgid "Your Current Status"
-msgstr "Uneko egoera"
+msgstr "Zure Egoera Orain"
 
 msgid "Online Services"
-msgstr "Zerbitzuak linean"
+msgstr "Online Zerbitzuak"
 
 msgid "Let others see what services you are using"
-msgstr "Utzi besteei erabiltzen ari zaren zerbitzuak ikusten"
+msgstr "Zein zerbitzu darabilzkizun erakutsi besteei"
 
 msgid "Let others see what computer you are using"
-msgstr "Utzi besteei erabiltzen ari zaren ordenagailua ikusten"
+msgstr "Zein ordenagailu darabilzun erakutsi besteei"
 
 msgid "Your VCard File"
-msgstr "VCard fitxategia"
-
-#, fuzzy
+msgstr "Zure VCard-Fitxategia"
+
 msgid "Timezone (UTC)"
-msgstr "Ordu-zona"
-
+msgstr "Ordu-zona (UTC)"
+
+#, fuzzy
 msgid "User Online Status Attributes"
 msgstr "Erabiltzailearen lineako egoeraren atributuak"
 
@@ -9327,193 +8928,189 @@
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
-"Utzi beste erabiltzaileei zure lineako egoeraren informazioa eta zure "
-"informazio pertsonala ikusten. Bete zuri buruzko informazioa, beste "
-"erabiltzaileek ikustea nahiko zenukeena."
+"Zure online-egoeraren informazioa eta zure informazio pertsonala erakutsi "
+"diezaiekezu besteei. Beste erabiltzaileek ikustea gustatuko litzaizukeen "
+"informazioa bete ezazu."
 
 msgid "Message of the Day"
-msgstr "Eguneko mezua"
+msgstr "Eguneko Mezua"
 
 msgid "No Message of the Day available"
-msgstr "Ez dago eguneko mezu erabilgarririk"
+msgstr "Ez dago Eguneko Mezurik eskuragarri"
 
 msgid "There is no Message of the Day associated with this connection"
-msgstr "Ez dago konexio honekin asoziatutako eguneko mezurik."
+msgstr "Ez dago konexio honekin asoziatutako Eguneko Mezurik."
 
 msgid "Create New SILC Key Pair"
-msgstr "SILC gako bikotea berria sortzen..."
-
-#, fuzzy
+msgstr "SILC Gako Bikotea Berria Sortu"
+
 msgid "Passphrases do not match"
-msgstr "Pasahitz berriak ez datoz bat."
-
-#, fuzzy
+msgstr "Pasaesaldiak ez datoz bat"
+
 msgid "Key Pair Generation failed"
-msgstr "Gako-hitzarmenak huts egin du"
+msgstr "Ezin Gako Parea Sortu"
 
 msgid "Key length"
-msgstr "Gakoa luzera"
+msgstr "Gako-luzera"
 
 msgid "Public key file"
-msgstr "Gako publikoaren fitxategia "
+msgstr "Gako publikoaren fitxategia"
 
 msgid "Private key file"
 msgstr "Gako pribatuaren fitxategia "
 
-#, fuzzy
 msgid "Passphrase (retype)"
-msgstr "Pasaesaldia behar da"
+msgstr "Pasaesaldia (berriro)"
 
 msgid "Generate Key Pair"
-msgstr "Gako bikote berria egin"
+msgstr "Gako-Bikotea Sortu"
 
 msgid "Online Status"
-msgstr "Egoera linean"
+msgstr "Online Egoera"
 
 msgid "View Message of the Day"
-msgstr "Ikusi eguneko mezua"
-
-#, fuzzy
+msgstr "Eguneko Mezua Ikusi"
+
 msgid "Create SILC Key Pair..."
-msgstr "SILC gako bikotea sortzen..."
+msgstr "SILC Gako Bikotea Sortu"
 
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "<I>%s</I> erabiltzailea ez dago sarean"
 
 msgid "Topic too long"
-msgstr "Gaia luzeegia da."
+msgstr "Gai luzeegia"
 
 msgid "You must specify a nick"
-msgstr "Goitizena zehaztu behar duzu"
+msgstr "Ezizen bat zehaztu behar duzu"
 
 #, c-format
 msgid "channel %s not found"
-msgstr "%s kanala ez da aurkitu"
+msgstr "ezin %s kanala aurkitu"
 
 #, c-format
 msgid "channel modes for %s: %s"
-msgstr "%s(r)en kanal moduak: %s"
+msgstr "%s kanalaren moduak: %s"
 
 #, c-format
 msgid "no channel modes are set on %s"
-msgstr "ez da %s(r)en kanal modurik ezarri"
+msgstr "ez da %s kanalaren modurik ezarri"
 
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Huts egin du %s(r)en moduak ezartzean"
-
-#, fuzzy, c-format
+msgstr "Ezin %s(r)en cmoduak ezarri"
+
+#, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Komando ezezaguna: %s (Pidgin-en akatsa izan daiteke)"
+msgstr "Agindu ezezaguna: %s (bezeroaren akatsa izan daiteke)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr "part [kanala]:  irten berriketatik"
+msgstr "part [kanala]:  Kanaletik irten"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [kanala]:  irten berriketatik"
+msgstr "leave [kanala]:  Kanaletik irten"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;gai berria&gt;]: ikusi edo aldatu gaia"
+msgstr "topic [&lt;gai berria&gt;]:  Gaia ikusi edo aldatu"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
-"join &lt;kanala&gt; [&lt;pasahitza&gt;]:  konektatu sare honetako kanal "
-"batera"
+"join &lt;kanala&gt; [&lt;pasahitza&gt;]:  Sare honetako kanal batera batu"
 
 msgid "list:  List channels on this network"
-msgstr "list: zerrendatu sare honetako kanalak"
+msgstr "list:  Sare honetako kanalak zerrendatu"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;goitizena&gt;: ikusi goitizenaren informazioa"
+msgstr "whois &lt;ezizena&gt;:  Ezizenaren informazioa ikusi"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
-"msg &lt;goitizena&gt; &lt;mezua&gt;: bidali mezu pribatua erabiltzaileari"
+"msg &lt;ezizena&gt; &lt;mezua&gt;:  Erabiltzaileari mezu pribatua bidali"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
-"query &lt;goitizena&gt; [&lt;mezua&gt;]: bidali mezu pribatua erabiltzaileari"
+"query &lt;ezizena&gt; [&lt;mezua&gt;]:  Erabiltzaileari mezu pribatua bidali"
 
 msgid "motd:  View the server's Message Of The Day"
-msgstr "motd:  ikusi zerbitzariaren eguneko mezua"
+msgstr "motd:  Zerbitzariaren Eguneko Mezua ikusi"
 
 msgid "detach:  Detach this session"
-msgstr "detach:  askatu saio honetatik"
+msgstr "detach:  Sesio hau askatu"
 
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [mezua]:  deskonektatu zerbitzaritik, aukerazko mezu batekin"
+msgstr ""
+"quit [mezua]:  Zerbitzaritik deskonektatu, mezu bat utziz (nahi izanez gero)"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;komandoa&gt;: deitu silc bezeroko edozein komandori"
+msgstr "call &lt;agindua&gt;:  Ezizein silc-bezero agindu deitu"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr "kill &lt;goitizena&gt; [-pubkey|&lt;arrazoia&gt;]: hil goitizena "
+msgstr "kill &lt;ezizena&gt; [-pubkey|&lt;arrazoia&gt;]: Ezizena hil"
 
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;goitizen-berria&gt;:  aldatu zure goitizena"
+msgstr "nick &lt;ezizen-berria&gt;:  Zure ezizena aldatu"
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;goitizena&gt;: ikusi goitizenaren informazioa"
+msgstr "whowas &lt;ezizena&gt;:  Ezizenaren informazioa ikusi"
 
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode &lt;kanala&gt; [+|-&lt;moduak&gt;] [argumentuak]:  aldatu edo bistarau "
-"kanalaren moduak"
+"cmode &lt;kanala&gt; [+|-&lt;moduak&gt;] [argumentuak]:  Kanalaren moduak "
+"ikusi edo aldatu"
 
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-"cumode &lt;kanala&gt; +|-&lt;moduak&gt; &lt;goitizena&gt;:  aldatu kanaleko "
-"goitizenaren moduak"
+"cumode &lt;kanala&gt; +|-&lt;moduak&gt; &lt;ezizena&gt;:  Kanaleko ezizenen "
+"moduak aldatu"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;erabiltzaile-moduak&gt;: ezarri zure sareko moduak"
+msgstr "umode &lt;erabiltzaile-moduak&gt;:  Sareko zure moduak ezarri"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
-"oper &lt;goitizena&gt; [-pubkey]: hartu zerbitzariko operadorearen eskubideak"
+"oper &lt;ezizena&gt; [-pubkey]: Zerbitzari-operadorearen eskubideak eskuratu"
 
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;kanala&gt; [-|+]&lt;goitizena&gt;:  gonbidatu goitizena edo "
-"gehitu/kendu kanaleko gonbidatuen zerrendatik "
+"invite &lt;kanala&gt; [-|+]&lt;ezizena&gt;:  Ezizena gonbidatu edo kanaleko "
+"gonbidatu-zerrendara gehitu/kendu"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
-"kick &lt;kanala&gt; &lt;goitizena&gt; [iruzkina]: bota bezeroa kanaletik"
+"kick &lt;kanala&gt; &lt;ezizena&gt; [iruzkina]:  Kanaletik bota bezeroa"
 
 msgid "info [server]:  View server administrative details"
-msgstr "info [server]:  ikusi zerbitzariko administrazioaren xehetasunak"
+msgstr "info [zerbitzaria]:  Zerbitzariaren administrazio-xehetasunak ikusi"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;kanala&gt; +|-&lt;goitizena&gt;]: kanporatu bezeroa kanaletik"
+msgstr "ban [&lt;kanala&gt; +|-&lt;ezizena&gt;]:  Kanaletik betatu bezeroa"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
-"getkey &lt;goitizena|zerbitzaria&gt;:  eskuratu bezeroaren edo "
-"zerbitzariaren gako publikoa"
+"getkey &lt;ezizena|zerbitzaria&gt;:  Bezeroaren edo zerbitzariaren gako "
+"publikoa eskuratu"
 
 msgid "stats:  View server and network statistics"
-msgstr "stats:  ikusi zerbitzariaren eta sarearen estatistikak"
+msgstr "stats:  Zerbitzariaren eta sarearen estatistikak ikusi"
 
 msgid "ping:  Send PING to the connected server"
-msgstr "ping:  bidali PING konektatutako zerbitzarira"
+msgstr "ping:  PING bat bidali konektatuta zauden zerbitzarira"
 
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;kanala&gt;:  zerrendatu kanaleko erabiltzaileak"
+msgstr "users &lt;kanala&gt;:  Kanaleko erabiltzaileak zerrendatu"
 
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
 msgstr ""
-"names [-count|-ops|-halfops|-voices|-normal] &lt;kanala(s)&gt;:  zerrendatu "
-"kanale(ta)ko erabiltzaile zehatzak"
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kanala(s)&gt;:  Kanale(ta)"
+"ko erabiltzaile zehatzak zerrendatu"
 
 #. *< type
 #. *< ui_requirement
@@ -9525,23 +9122,23 @@
 #. *< version
 #. *  summary
 msgid "SILC Protocol Plugin"
-msgstr "SILC protokoloaren plugin-a"
+msgstr "SILC Protokolo-Plugina"
 
 #. *  description
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "Interneteko Zuzeneko Konferentzia Segurua (SILC) protokoloa"
+msgstr "Interneteko Zuzeneko Konferentzia Segurua (SILC) Protokoloa"
 
 msgid "Network"
 msgstr "Sarea"
 
 msgid "Public Key file"
-msgstr "Gako publikoaren fitxategia"
+msgstr "Gako Publikoaren fitxategia"
 
 msgid "Private Key file"
-msgstr "Gako pribatuaren fitxategia"
+msgstr "Gako Pribatuaren fitxategia"
 
 msgid "Cipher"
-msgstr "Zifra"
+msgstr "Zifratua"
 
 msgid "HMAC"
 msgstr "HMAC "
@@ -9553,46 +9150,45 @@
 msgstr "Gako publikoaren autentifikazioa"
 
 msgid "Block IMs without Key Exchange"
-msgstr "Blokeatu IMak gako-trukatzerik gabe"
+msgstr "Gako-trukerik gabe IMak blokeatu"
 
 msgid "Block messages to whiteboard"
-msgstr "Mezuak blokeatu \"whiteboard\" -ean "
+msgstr "Arbelerako mezuak blokeatu"
 
 msgid "Automatically open whiteboard"
-msgstr "Automatikoki zabaldu whiteboard-a"
+msgstr "Automatikoki ireki arbela"
 
 msgid "Digitally sign and verify all messages"
-msgstr "Sinatu digitalki eta mezu guztiak ondo daudela zihurtatu"
+msgstr "Mezu guztiak digitalki sinatu eta egiaztatu"
 
 msgid "Creating SILC key pair..."
 msgstr "SILC gako bikotea sortzen..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "SILC gako bikotea sortzen..."
+msgstr "Ezin SILC gako bikotea sortu"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
 #, c-format
 msgid "Real Name: \t%s\n"
-msgstr "Benetako izena: \t%s\n"
+msgstr "Benetako Izena: \t%s\n"
 
 #, c-format
 msgid "User Name: \t%s\n"
-msgstr "Erabiltzaile-izena: \t%s\n"
+msgstr "Erabiltzaile-Izena: \t%s\n"
 
 #, c-format
 msgid "Email: \t\t%s\n"
-msgstr "Helbide elektronikoa.: \t\t%s\n"
+msgstr "E-posta: \t\t%s\n"
 
 #, c-format
 msgid "Host Name: \t%s\n"
-msgstr "Ostalari-izena: \t%s\n"
+msgstr "Ostalari-Izena: \t%s\n"
 
 #, c-format
 msgid "Organization: \t%s\n"
-msgstr "Erakundearen izena: \t%s\n"
+msgstr "Erakundea: \t%s\n"
 
 #, c-format
 msgid "Country: \t%s\n"
@@ -9604,11 +9200,11 @@
 
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "Gakoaren luzera: \t%d bit\n"
-
-#, fuzzy, c-format
+msgstr "Gako-luzera: \t%d bit\n"
+
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "Erakundearen izena: \t%s\n"
+msgstr "Bertsioa: \t%s\n"
 
 #, c-format
 msgid ""
@@ -9616,7 +9212,7 @@
 "%s\n"
 "\n"
 msgstr ""
-"Gako publikoaren hatz-marka:\n"
+"Gako Publikoaren Hatz-Marka:\n"
 "%s\n"
 "\n"
 
@@ -9625,17 +9221,18 @@
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"Gako publikoaren 'babble'-marka:\n"
+"Gako Publikoaren 'Babble'-Marka:\n"
 "%s"
 
 msgid "Public Key Information"
-msgstr "Gako publikoaren informazioa"
-
+msgstr "Gako Publikoaren Informazioa"
+
+#, fuzzy
 msgid "Paging"
-msgstr "Markatzea"
+msgstr "Orrikatzea"
 
 msgid "Video Conferencing"
-msgstr "Bideo-konferentzia"
+msgstr "Bideo-Konferentzia"
 
 msgid "Computer"
 msgstr "Ordenagailua"
@@ -9649,97 +9246,88 @@
 # c-format
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
-msgstr ""
-"\"Whiteboard\" -era   %s mezua bidalia izan da. \"Whiteboard\" -a irekitzea "
-"nahi al duzu ?"
+msgstr "%s(e)k mezua bidali du arbelera. Arbela ireki nahi al duzu?"
 
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
-" bidalitako mezua %s \"Whiteboard\"-ko  %s kanalera.\"Whiteboard\"-a "
-"irekitzea nahi al duzu ?"
+"%s(e)k mezua bidali du %s kanaleko arbelera. Arbela ireki nahi al duzu?"
 
 msgid "Whiteboard"
-msgstr "\"Whiteboard\" "
+msgstr "Arbela"
 
 msgid "No server statistics available"
-msgstr "Ez dago zerbitzariaren estatistika eskuragarri"
+msgstr "Zerbitzari-estatistikarik ez eskuragarri"
 
 msgid "Error during connecting to SILC Server"
-msgstr "Errorea SILC zerbitzariarekin konektatzean"
+msgstr "Errorea SILC Zerbitzariarekin konektatzean"
 
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Hutsegitea: bertsioa falta da. Eguneratu bezeroa"
+msgstr "Hutsegitea: Bertsio-errorea; zure bezeroa eguneratu ezazu"
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Hutsegitea: urrunekoak ez du zure gako publikoan fidatzen/onartzen"
+msgstr "Hutsegitea: Urrunekoak ez du zure gako publikoa onartzen/jasaten"
 
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "Hutsegitea: urrunekoak ez du eskainitako KE taldea onartzen"
+msgstr "Hutsegitea: Urrunekoak ez du proposatutako KE taldea jasaten"
 
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "hutsegitea: urrunekoak ez du eskainitako zifratua "
+msgstr "Hutsegitea: Urrunekoak ez du proposatutako zifratua jasaten"
 
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Hutsegitea: urrunekoak ez du eskainitako PKCS onartzen"
+msgstr "Hutsegitea: Urrunekoak ez du proposatutako PKCSa jasaten"
 
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "Hutsegitea: urrunekoak ez du eskainitako hash funtzioa onartzen"
+msgstr "Hutsegitea: Urrunekoak ez du proposatutako hash funtzioa jasaten"
 
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Hutsegitea: urrunekoak ez du eskainitako HMAC onartzen"
+msgstr "Hutsegitea: Urrunekoak ez du proposatutako HMACa jasaten"
 
 #, c-format
 msgid "Failure: Incorrect signature"
-msgstr "Hutsegitea: sinadura okerra"
+msgstr "Hutsegitea: Sinadura okerra"
 
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "Hutsegitea: cookie baliogabea"
+msgstr "Hutsegitea: Cookie baliogabea"
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "Hutsegitea: huts egin du autentifikatzean."
-
-#, fuzzy
+msgstr "Hutsegitea: Huts egin du autentifikazioak"
+
 msgid "Unable to initialize SILC Client connection"
-msgstr "Ezin izan da SILC bezeroaren konexioa hasieratu"
-
-#, fuzzy
+msgstr "Ezin SILC Bezeroaren konexioa hasieratu"
+
 msgid "John Noname"
-msgstr "Ez dago izenik"
-
-#, fuzzy, c-format
+msgstr "John Izengabe"
+
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "Ezin da SILC gako-parea : %s kargatu."
+msgstr "Ezin SILC gako parea kargatu: %s"
 
 msgid "Unable to create connection"
-msgstr "Ezin da konexio sortu."
-
-#, fuzzy
+msgstr "Ezin konexio sortu"
+
 msgid "Unknown server response"
-msgstr "Zerbitzari errore ezezaguna."
-
-#, fuzzy
+msgstr "Zerbitzari-erantzun ezezaguna"
+
 msgid "Unable to create listen socket"
-msgstr "Ezin da socket-a sortu"
-
-#, fuzzy
+msgstr "Ezin entzuteko socket-a sortu"
+
 msgid "SIP usernames may not contain whitespaces or @ symbols"
-msgstr "SIP goitizenek ezin dute zurigunerik izan edo @ ikurra"
-
-#, fuzzy
+msgstr "SIP ezizenek ezin dute zuriunerik edo @ ikurrik eduki"
+
 msgid "SIP connect server not specified"
-msgstr "Zerbitzariaren ataka"
+msgstr "SIP konexio-zerbitzaria zehaztu gabe"
 
 #. *< type
 #. *< ui_requirement
@@ -9750,44 +9338,41 @@
 #. *< name
 #. *< version
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE protokoloaren plugin-a"
+msgstr "SIP/SIMPLE Protokolo-Plugina"
 
 #. *  summary
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE protokoloaren plugin-a"
+msgstr "SIP/SIMPLE Protokolo-Plugina"
 
 msgid "Publish status (note: everyone may watch you)"
-msgstr "Egoera argitaratu (oharra:Jende guztiak ikusi zaitzake)"
+msgstr "Egoera argitaratu (oharra: edozeinek ikusi dezake)"
 
 msgid "Use UDP"
-msgstr "Erabilli UDP"
+msgstr "UDP erabili"
 
 msgid "Use proxy"
-msgstr "Erabili proxy-a"
+msgstr "Proxy bat erabili"
 
 msgid "Proxy"
 msgstr "Proxy-a"
 
-#, fuzzy
 msgid "Auth User"
-msgstr "AP erabiltzailea"
-
-#, fuzzy
+msgstr "Erabiltzaile Autorizazioa"
+
 msgid "Auth Domain"
-msgstr "Automatikoa"
+msgstr "Domeinu Autorizazioa"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;gela&gt;:  konektatu Yahoo sareko berriketa-gelara"
+msgstr "join &lt;gela&gt;:  Yahoo sareko berriketa-gela batera batu"
 
 msgid "list: List rooms on the Yahoo network"
-msgstr "zerrendatu: ZerrendatuYahoo sareko kanalak"
+msgstr "list: Yahoo sareko gelak zerrendatu"
 
 msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Request user to start a Doodle session"
-
-#, fuzzy
+msgstr "doodle: Doodle-sesio bat hasteko eskatu erabiltzaileari"
+
 msgid "Yahoo ID..."
-msgstr "Yahoo! IDa"
+msgstr "Yahoo IDa..."
 
 #. *< type
 #. *< ui_requirement
@@ -9799,43 +9384,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Yahoo protokoloaren plugin-a"
-
-#, fuzzy
+msgstr "Yahoo! Protokolo-Plugina"
+
 msgid "Pager server"
-msgstr "Proxy zerbitzaria"
+msgstr ""
 
 msgid "Pager port"
-msgstr "Bilagailuaren ataka"
-
-#, fuzzy
+msgstr ""
+
 msgid "File transfer server"
-msgstr "Fitxategi-transferentzien ostalaria"
+msgstr "Fitxategi-transferentzia zerbitzaria"
 
 msgid "File transfer port"
-msgstr "Fitxategi-transferentzien ataka"
+msgstr "Fitxategi-transferentzia ataka"
 
 msgid "Chat room locale"
-msgstr "Berriketarako gela gunea"
+msgstr "Solasaldi-gelaren lokalizazioa"
 
 msgid "Ignore conference and chatroom invitations"
-msgstr "Entzungor egin konferentzia eta berriketa-gela gonbidapenei"
+msgstr "Konferentzia eta berriketa-geletarako gonbidapenak ezikusi"
 
 msgid "Chat room list URL"
-msgstr "Berriketa-gelen zerrendaren URLa "
+msgstr "Berriketa-gelen zerrendaren URLa"
 
 msgid "Yahoo Chat server"
-msgstr ""
-
-#, fuzzy
+msgstr "Yahoo Solasaldi zerbitzaria"
+
 msgid "Yahoo Chat port"
-msgstr "Japoniako yahoo"
-
-#, fuzzy
+msgstr "Yahoo Solasaldi ataka"
+
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo! IDa"
+msgstr "Yahoo JAPAN IDa..."
 
 #. *< type
 #. *< ui_requirement
@@ -9847,15 +9427,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo protokoloaren plugin-a"
+msgstr "Yahoo! JAPAN Protokolo-Plugina"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Ez da zure SMSa bidali"
 
 msgid "Your Yahoo! message did not get sent."
-msgstr "Yahoo! mezua ez da bidali."
+msgstr "Ez da zure Yahoo!-mezua bidali."
 
 #, c-format
 msgid "Yahoo! system message for %s:"
@@ -9866,207 +9445,191 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s erabiltzaileak bera zure zerrendan gehitzeko eskaera ukatu du "
-"(atzeraeraginez). Arrazoia: %s."
+"%s(e)k ez dizu bera zure zerrendara gehitzen uzten (erretroaktiboki). "
+"Arrazoia: %s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr ""
-"%s erabiltzaileak bera zure zerrendan gehitzeko eskaera ukatu du "
-"(atzeraeraginez)."
+msgstr "%s(e)k ez dizu bera zure zerrendara gehitzen uzten (erretroaktiboki)."
 
 msgid "Add buddy rejected"
-msgstr "Laguna gehitzea ezetsita"
+msgstr "Lagun-gehitzea ezetsita"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "Ezin da zerbitzariarekiko SSL konexiorik ezarri."
+msgstr "Datu baliogabeak jaso dira"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"%d errore-zenbaki ezezaguna. Yahoo-ren web gunean konektatzeak arazoa konpon "
-"dezake."
+"Kontua blokeatuta: Konexio-saiakera gehiegi hutsegin dira.  Yahoo! webgunean "
+"konektatuz konpon liteke."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"%d errore-zenbaki ezezaguna. Yahoo-ren web gunean konektatzeak arazoa konpon "
-"dezake."
+"Kontua blokeatuta: Arrazoi ezezaguna.  Yahoo! webgunean konektatuz konpon "
+"liteke."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Goitizen edo pasahitz okerra."
-
-#, fuzzy, c-format
+msgstr "Erabiltzaile-izen edo pasahitza falta"
+
+#, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
 "Yahoo zerbitzariak autentifikatzeko metodo ezezagun bat erabiltzea eskatu "
-"du. Pidgin-en bertsio hau ez da gai izango Yahoo-n ondo sartzeko. "
-"Eguneratzeak lortzeko, begiratu %s gunean."
+"du.  Ziurrenik ezingo duzu Yahoo-ra konektatu.  %s(e)ra joan eguneraketa "
+"bila."
 
 msgid "Failed Yahoo! Authentication"
-msgstr "Huts egin du Yahoo! autentifikazioak"
+msgstr "Huts egin du Yahoo!-Autentifikazioak"
 
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-"%s erabiltzaileari ez ikusi egiten saiatu zara, baina zure lagunen zerrendan "
-"dago. \"Bai\" hautatuz gero, laguna kendu eta ez ikusi egingo zaio."
+"%s ezikusten saiatu zara, baina erabiltzailea zure lagun-zerrendan dago. "
+"\"Bai\" hautatuz gero, laguna kendu eta ezikusi egingo da."
 
 msgid "Ignore buddy?"
-msgstr "Lagunari ez ikusi egin nahi diozu?"
+msgstr "Laguna ezikusi?"
 
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Kontua blokeatuta dago, konektatu yahoo-ren web gunean."
+msgstr "Zure kontua blokeatuta dago; Yahoo! webgunean konektatu zaitez."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"%d errore-zenbaki ezezaguna. Yahoo-ren web gunean konektatzeak arazoa konpon "
-"dezake."
-
-#, fuzzy, c-format
+"%d errore-zenbaki ezezaguna. Yahoo-ren webgunean konektatzean arazoa konpon "
+"daiteke."
+
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Ezin izan da %s laguna %s taldean gehitu, %s kontuko zerbitzari-zerrendan."
-
-#, fuzzy
+msgstr "Ezin %s laguna %s taldera gehitu, %s kontuko zerbitzari-zerrendan."
+
 msgid "Unable to add buddy to server list"
-msgstr "Ezin izan da laguna zerbitzari-zerrendan gehitu"
+msgstr "Ezin laguna zerbitzari-zerrendara gehitu"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr "[ Entzungai %s/%s/%s.swf ] %s"
-
-#, fuzzy
+msgstr "[ Entzungarri %s/%s/%s.swf ] %s"
+
 msgid "Received unexpected HTTP response from server"
-msgstr "Erantzun baliogabea zerbitzaritik."
-
-#, fuzzy, c-format
+msgstr "Espero ez zen HTTP-erantzuna jaso da zerbitzaritik"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr "Solasaldiak %s(r)ekin"
-
-#, fuzzy, c-format
+msgstr "%s(r)ekiko konexioa galduta: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"Ezinezkoa izan da konexioa ezatzea mDNS zerbitzari lokalarekin , martxan al "
-"dago ?"
+msgstr "Ezin konexioa ezarri %s(r)ekin: %s"
 
 msgid "Not at Home"
-msgstr "Ez dago etxean "
+msgstr "Etxetik Kanpo"
 
 msgid "Not at Desk"
-msgstr "Ez dago bere mahaian "
+msgstr "Mahaitik Urrun"
 
 msgid "Not in Office"
-msgstr "Ez dago bulegoan "
+msgstr "Bulegotik Kanpo"
 
 msgid "On Vacation"
 msgstr "Oporretan"
 
 msgid "Stepped Out"
-msgstr "Irten egin da"
+msgstr "Kanpoan"
 
 msgid "Not on server list"
-msgstr "Ez dago zerbitzarien zerrendan"
+msgstr "Ez dago zerbitzari-zerrendan"
 
 msgid "Appear Online"
-msgstr "Agertu Linean"
-
-#, fuzzy
+msgstr "Online Agertu"
+
 msgid "Appear Permanently Offline"
-msgstr "Agertu Lineaz kanpo"
-
-#, fuzzy
+msgstr "Iraunkorki Agertu Offline"
+
 msgid "Presence"
-msgstr "Hobespenak"
+msgstr "Presentzia"
 
 msgid "Appear Offline"
-msgstr "Agertu Lineaz kanpo"
-
-#, fuzzy
+msgstr "Offline Agertu"
+
 msgid "Don't Appear Permanently Offline"
-msgstr "Agertu Lineaz kanpo"
+msgstr "Ez Iraunkorki Agertu Offline"
 
 msgid "Join in Chat"
-msgstr "Sartu berriketan"
+msgstr "Berriketara Batu"
 
 msgid "Initiate Conference"
-msgstr "Hasi konferentzia"
-
-#, fuzzy
+msgstr "Konferentzia Hasi"
+
 msgid "Presence Settings"
-msgstr "Erabili ingurune-ezarpenak"
+msgstr "Presentzia-Ezarpenak"
 
 msgid "Start Doodling"
-msgstr "Hasi \"Doodling\" "
+msgstr "Doodling Hasi"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Aktibatu nahi duzun IDa hautatu"
 
 msgid "Join whom in chat?"
-msgstr "Norekin elkartu nahi duzu berriketan?"
+msgstr "Norekin batu berriketan?"
 
 msgid "Activate ID..."
-msgstr "Aktibatu IDa..."
+msgstr "IDa Aktibatu..."
 
 msgid "Join User in Chat..."
-msgstr "Join User in Chat..."
-
-#, fuzzy
+msgstr "Erabiltzailearekin Batu Elkarrizketan..."
+
 msgid "Open Inbox"
-msgstr "Ireki Hotmail posta"
+msgstr "Postontzia Ireki"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr "Bidalia izan da \"Doodle\" eskaera "
+msgstr "Doodle-eskaera bidalita"
 
 msgid "Unable to connect."
-msgstr "Ezin da konektatu."
+msgstr "Ezin konektatu."
 
 msgid "Unable to establish file descriptor."
-msgstr "Fitxategi-deskriptorea ezin da ezarri."
-
-#, fuzzy, c-format
+msgstr "Ezin fitxategi-deskriptorea ezarri."
+
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s  fitxategia bidaltzeko %s(r)i eskaria egiten"
+msgstr "%s(e)k %d fitxategiko taldea bidali nahi dizu.\n"
 
 msgid "Write Error"
-msgstr "Idazketa-errorea "
+msgstr "Idazketa-Errorea "
 
 msgid "Yahoo! Japan Profile"
-msgstr "Japoniako yahoo-ren profila"
+msgstr "Japoniar Yahoo! Profila"
 
 msgid "Yahoo! Profile"
-msgstr "Yahoo-ren profila"
+msgstr "Yahoo! Profila"
 
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "Helduentzako edukia duten profilak ez dira onartzen orain"
-
-#, fuzzy
+msgstr "Helduentzako edukia duten profilak ez dira jasaten oraindik."
+
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Profila ikusi nahi baduzu, bisitatu esteka hori zure web arakatzailearekin"
+"Profila hau ikusi nahi baduzu, esteka honetara jo beharko duzu zure web-"
+"arakatzailearekin"
 
 msgid "Yahoo! ID"
 msgstr "Yahoo! IDa"
@@ -10075,60 +9638,54 @@
 msgstr "Zaletasunak"
 
 msgid "Latest News"
-msgstr "Azken berriak"
+msgstr "Azken Berriak"
 
 msgid "Home Page"
-msgstr "Etxeko orria"
+msgstr "Etxeko Orria"
 
 msgid "Cool Link 1"
-msgstr "Esteka bikaina 1"
+msgstr "Esteka Bikaina 1"
 
 msgid "Cool Link 2"
-msgstr "Esteka bikaina 2"
+msgstr "Esteka Bikaina 2"
 
 msgid "Cool Link 3"
-msgstr "Esteka bikaina 3"
+msgstr "Esteka Bikaina 3"
 
 msgid "Last Update"
-msgstr "Azken eguneratzea "
-
-#, fuzzy
+msgstr "Azken Eguneraketa"
+
 msgid ""
 "This profile is in a language or format that is not supported at this time."
 msgstr ""
-"Badirudi profila hau oraingoz onartzen ez den hizkuntza edo formatuan batean "
-"dagoela dirudi."
+"Profila hau oraingoz onartzen ez den hizkuntza edo formatu batean dago."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
-"Ezin izan da erabiltzailearen profila eskuratu. Zerbitzariaren arazo bat "
-"dela dirudi. Saiatu geroago"
+"Ezin erabiltzaile-profila eskuratu. Ziurrenik, zerbitzariaren aldiuneko "
+"arazo bat izango da. Saiatu zaitez geroago."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
-"Ezin izan da erabiltzailearen profila eskuratu. Litekeena da erabiltzailea "
-"ez existitzea; hala ere batzuetan Yahoo-k huts egiten du erabiltzaile baten "
-"profila bilatzean. Saiatu geroago erabiltzailea existitzen dela ziur bazaude."
+"Ezin erabiltzaile-profila eskuratu. Ziurrenik, erabiltzailea ez da "
+"existitzen; hala ere, batzuetan Yahoo!-k huts egiten du erabiltzaile baten "
+"profila bilatzean. Ziur badakizu erabiltzailea existitzen dela, saiatu "
+"zaitez berriro geroago."
 
 msgid "The user's profile is empty."
-msgstr "Erabiltzailearen profila hutsik dago."
-
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s erabiltzaileak uko egin dio \"%s\" konferentzia-gelarako egin diozun "
-"gonbitari. Arrazoia: \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Gonbita ezetsi da"
+msgstr "Erabiltzaile-profila hutsik dago."
+
+#, c-format
+msgid "%s has declined to join."
+msgstr "%s ez da batu nahi."
 
 msgid "Failed to join chat"
-msgstr "Huts egin du berriketan sartzean"
+msgstr "Ezin berriketara batu"
 
 #. -6
 msgid "Unknown room"
@@ -10140,139 +9697,136 @@
 
 #. -35
 msgid "Not available"
-msgstr "Ez dago erabilgarri"
+msgstr "Eskuragaitz"
 
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"Errore ezezaguna. Deskonektatzeko beharrean egongo zara eta 5 minutu itxoin "
-"berriketa-gela berriz konektatu baino lehen"
+"Errore ezezaguna. Agian, deskonektatu eta bost minutuz itxaron beharko duzu "
+"berriro gelara batu aurretik"
 
 #, c-format
 msgid "You are now chatting in %s."
-msgstr "Orain %s(e)n ari zara berriketan."
+msgstr "%s(e)n ari zara berriketan orain."
 
 msgid "Failed to join buddy in chat"
-msgstr "Huts egin du berriketako lagunarekin elkartzean"
+msgstr "Ezin lagunarekin batu berriketan"
 
 msgid "Maybe they're not in a chat?"
-msgstr "Beharbada ez zara berriketan egongo?"
+msgstr "Beharbada, ez daude berriketa batean?"
 
 msgid "Fetching the room list failed."
-msgstr "Huts egin du gela-zerrenda hartzean."
+msgstr "Errorea gela-zerrenda eskuratzean."
 
 msgid "Voices"
 msgstr "Ahotsak"
 
 msgid "Webcams"
-msgstr "Web kamerak"
+msgstr "Webkamerak"
 
 msgid "Connection problem"
 msgstr "Konexio-arazoa"
 
 msgid "Unable to fetch room list."
-msgstr "Ezin da gela-zerrenda hartu."
+msgstr "Ezin gela-zerrenda eskuratu."
 
 msgid "User Rooms"
-msgstr "Erabiltzaile-gelak"
-
-#, fuzzy
+msgstr "Erabiltzaile-Gelak"
+
 msgid "Connection problem with the YCHT server"
-msgstr "Konexio-arazoa YCHT zerbitzariarekin."
+msgstr "Konexio-arazoa YCHT zerbitzariarekin"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
-"(Errore bat gertatu da mezu hau bihurtzean.\t Aztertu 'Kodeketa' aukera "
-"Kontu-editorean)"
+"(Errorea gertatu da mezu hau bihurtzean.\t 'Kodeketa' aukera egiaztatu ezazu "
+"Kontu-Editorean)"
 
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
-msgstr "Ezin da bidali berriketara %s,%s,%s "
-
-#, fuzzy
+msgstr "Ezin berriketara bidali %s,%s,%s "
+
 msgid "Hidden or not logged-in"
-msgstr "<br>Ezkutuan edo konektatu gabe"
+msgstr "Ezkutatua edo konektatu gabe"
 
 #, c-format
 msgid "<br>At %s since %s"
-msgstr "<br>Non: %s; noiztik: %s"
+msgstr "<br>%s(e)n; %s(e)z geroztik"
 
 msgid "Anyone"
-msgstr "Edozein"
+msgstr "Edonor"
 
 msgid "_Class:"
 msgstr "_Klasea:"
 
 msgid "_Instance:"
-msgstr "_Instantzia:"
+msgstr "_Istantzia:"
 
 msgid "_Recipient:"
 msgstr "_Hartzailea:"
 
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
-msgstr "Huts egin du %s,%s,%s(e)ra harpidetzean"
+msgstr "Errorea %s,%s,%s(e)ra harpidetzean"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;goitizena&gt;: kokatu erabiltzailea"
+msgstr "zlocate &lt;ezizena&gt;: Erabiltzailea kokatu"
 
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;goitizena&gt;: kokatu erabiltzailea"
+msgstr "zl &lt;ezizena&gt;: Erabiltzailea kokatu"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"instance &lt;instantzia&gt;: ezarri klase honetan erabiliko den instantzia"
+"instance &lt;istantzia&gt;: Klase honetan erabiliko den istantzia ezarri"
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;instantzia&gt;: ezarri klase honetan erabiliko den instantzia"
+msgstr "inst &lt;istantzia&gt;: Klase honetan erabiliko den istantzia ezarri"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr ""
-"topikoa &lt;instantzia&gt;: ezarri klase honetan erabiliko den instantzia"
+msgstr "topic &lt;istantzia&gt;: Klase honetan erabiliko den istantzia ezarri"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
-"sub &lt;klasea&gt; &lt;instantzia&gt; &lt;ontzia&gt;: konektatu berriketa "
-"berrira"
+"sub &lt;klasea&gt; &lt;istantzia&gt; &lt;hartzailea&gt;: Berriketa berri "
+"batera batu"
 
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
-"zi &lt;instantzia&gt;: bidali mezua hona: &lt;mezua,<i>instantzia</i>,*&gt;"
+"zi &lt;istantzia&gt;: Mezua bidali hona: &lt;mezua,<i>istantzia</i>,*&gt;"
 
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-"zci &lt;klasea&gt; &lt;instantzia&gt;: bidali mezua hona: &lt;<i>klasea</i>,"
-"<i>instantzia</i>,*&gt;"
+"zci &lt;klasea&gt; &lt;istantzia&gt;: Mezua bidali hona: &lt;<i>klasea</i>,"
+"<i>istantzia</i>,*&gt;"
 
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zcir &lt;klasea&gt; &lt;instantzia&gt; &lt;ontzia&gt;: bidali mezua hona: "
-"&lt;<i>klasea</i>,<i>instantzia</i>,<i>ontzia</i>&gt;"
+"zcir &lt;klasea&gt; &lt;istantzia&gt; &lt;hartzailea&gt;: Mezua bidali hona: "
+"&lt;<i>klasea</i>,<i>istantzia</i>,<i>hartzailea</i>&gt;"
 
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zir &lt;instantzia&gt; &lt;ontzia&gt;: bidali mezua hona: &lt;MEZUA,"
-"<i>instantzia</i>,<i>ontzia</i>&gt;"
+"zir &lt;istantzia&gt; &lt;hartzailea&gt;: Mezua bidali hona: &lt;MEZUA,"
+"<i>istantzia</i>,<i>hartzailea</i>&gt;"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
-"zc &lt;klasea&gt;: bidali mezua hona: &lt;<i>klasea</i>,PERTSONALA,*&gt;"
+"zc &lt;klasea&gt;: Mezua bidali hona: &lt;<i>klasea</i>,PERTSONALA,*&gt;"
 
 msgid "Resubscribe"
-msgstr "Berriro harpidetu"
+msgstr "Berharpidetu"
 
 msgid "Retrieve subscriptions from server"
-msgstr "Eskuratu harpidetzak zerbitzaritik."
+msgstr "Harpidetzak eskuratu zerbitzaritik"
 
 #. *< type
 #. *< ui_requirement
@@ -10285,66 +9839,65 @@
 #. *  summary
 #. *  description
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr protokoloaren plugin-a"
+msgstr "Zephyr Protokolo-Plugina"
 
 msgid "Use tzc"
-msgstr "Erabili tzc"
+msgstr "tzc erabili"
 
 msgid "tzc command"
-msgstr "tzc komandoa"
+msgstr "tzc agindua"
 
 msgid "Export to .anyone"
-msgstr "Esportatu hona: .anyone"
+msgstr "Hona esportatu: .anyone"
 
 msgid "Export to .zephyr.subs"
-msgstr "Esportatu hona: .zephyr.subs"
+msgstr "Hona esportatu: .zephyr.subs"
 
 msgid "Import from .anyone"
-msgstr "Inportatu hemendik:edozein"
+msgstr "Hemendik inportatu: .anyone"
 
 msgid "Import from .zephyr.subs"
-msgstr "Inportatu hemendik: .zephyr.subs"
+msgstr "Hemendik inportatu: .zephyr.subs"
 
 msgid "Realm"
-msgstr "Realm"
+msgstr "Domeinua"
 
 msgid "Exposure"
-msgstr "Agerpena"
-
-#, fuzzy, c-format
+msgstr "Esposizioa"
+
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "%s erabiltzaileari ezin zaio %s rola ezarri"
-
-#, fuzzy, c-format
+msgstr "Ezin HTTP proxyaren erantzuna araztu: %s"
+
+#, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "Proxy konexioko %d errorea"
-
-#, fuzzy, c-format
+msgstr "HTTP proxy konexio-errorea: %d"
+
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "Sarbidea ukatuta: proxy zerbitzariak ez du tunelik onartzen %d atakan."
-
-#, fuzzy, c-format
+msgstr ""
+"Sarrera ukatua: HTTP proxy zerbitzariak ez du tunelik onartzen %d atakan"
+
+#, c-format
 msgid "Error resolving %s"
-msgstr "Errorea martxan jartzean %s"
+msgstr "Errorea %s ebaztean"
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "%s(r)ren arreta eskatzen..."
+
+#, c-format
 msgid "%s has requested your attention!"
-msgstr "%s(e)k zuri buruzko informazioa eskatu du"
+msgstr "%s(e)k zure arreta eskatu du!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#, fuzzy
 msgid "_Yes"
-msgstr "Bai"
-
-#, fuzzy
+msgstr "_Bai"
+
 msgid "_No"
-msgstr "Ez"
+msgstr "_Ez"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
@@ -10356,10 +9909,10 @@
 #. * The default message to use when the user becomes auto-away.
 #.
 msgid "I'm not here right now"
-msgstr "Une honetan ez nago hemen"
+msgstr "Oraintxe ez nago hemen"
 
 msgid "saved statuses"
-msgstr "Gorde egoerak"
+msgstr "egoera gordeak"
 
 #, c-format
 msgid "%s is now known as %s.\n"
@@ -10370,73 +9923,65 @@
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"'%s' erabiltzaileak %s gonbidatu du %s:\n"
-"%s berriketa-gelara"
+"%s(e)k %s gonbidatu du %s gelara:\n"
+"%s"
 
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "'%s' erabiltzaileak %s gonbidatu du %s berriketa-gelara\n"
+msgstr "%s(e)k %s gonbidatu du %s gelara\n"
 
 msgid "Accept chat invitation?"
-msgstr "Berriketarako gonbita onartu nahi duzu?"
+msgstr "Berriketarako gonbita onartu?"
 
 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "Ataka"
-
-#, fuzzy
+msgstr "Lasterbidea"
+
 msgid "The text-shortcut for the smiley"
-msgstr "GTK+ Testu ? gaia"
+msgstr "Smiley-aren testu-lasterbidea"
 
 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "Gorde irudia"
+msgstr "Irudi Gordea"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
-
-#, fuzzy
+msgstr "Irudi Gorde. (hala izan beharko da oraingoz)"
+
 msgid "SSL Connection Failed"
-msgstr "Konexioak huts egin du"
+msgstr "Errorea SSL Konexioan"
 
 msgid "SSL Handshake Failed"
-msgstr "SSL diosalak huts egin du"
-
-#, fuzzy
+msgstr "Errorea SSL Handshake-an"
+
 msgid "SSL peer presented an invalid certificate"
-msgstr "Erabiltzaile-izen baliogabea idatzi duzu"
-
-#, fuzzy
+msgstr "SSL parekoak zertifizatu balioganea aurkeztu du"
+
 msgid "Unknown SSL error"
-msgstr "Errore ezezaguna"
+msgstr "SSL errore ezezaguna"
 
 msgid "Unset"
 msgstr "Ezarri gabe"
 
-#, fuzzy
 msgid "Do not disturb"
 msgstr "Ez molestatu"
 
-#, fuzzy
 msgid "Extended away"
 msgstr "Kanpoan luzarorako"
 
 msgid "Listening to music"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Musika entzuten"
+
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s(e)k egoera aldatu du: %s -> %s"
-
-#, fuzzy, c-format
+msgstr "%s(e)k (%s) egoera aldatu du: %s -> %s"
+
+#, c-format
 msgid "%s (%s) is now %s"
-msgstr "%s orain %s da"
-
-#, fuzzy, c-format
+msgstr "%s (%s) orain %s da"
+
+#, c-format
 msgid "%s (%s) is no longer %s"
-msgstr "%s ez dago luzaroago %s"
+msgstr "%s (%s) jadanik ez dago %s"
 
 #, c-format
 msgid "%s became idle"
@@ -10473,31 +10018,31 @@
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "segundo %d"
+msgstr[0] "Segundo %d"
 msgstr[1] "%d segundo"
 
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "egun %d"
+msgstr[0] "Egun %d"
 msgstr[1] "%d egun"
 
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] "%s, ordu %d"
+msgstr[0] "%s, %d ordu"
 msgstr[1] "%s, %d ordu"
 
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "ordu %d"
+msgstr[0] "Ordu %d"
 msgstr[1] "%d ordu"
 
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "%s, minutu %d"
+msgstr[0] "%s, %d minutu"
 msgstr[1] "%s, %d minutu"
 
 #, c-format
@@ -10508,90 +10053,89 @@
 
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Ezin %s ireki: Gehietan berbideratua"
+
+#, c-format
 msgid "Unable to connect to %s"
-msgstr "Ezin da ostalariarekin konektatu"
-
-#, fuzzy, c-format
+msgstr "Ezin %s(e)ra konektatu"
+
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Errorea socket-etik irakurtzean:%s."
+msgstr "Errorea %s(e)tik irakurtzean: erantzun luzeegia (%d byteko muga)"
 
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
-
-#, fuzzy, c-format
+"Ezin %s(e)ko edukiak hartzeko memoria nahiko alokatu.  Maltzurkeri batenbat "
+"egiten saiatzen ariko da web-zerbitzaria."
+
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr "Errorea socket-etik irakurtzean:%s."
-
-#, fuzzy, c-format
+msgstr "Errorea %s(e)tik irakurtzean: %s"
+
+#, c-format
 msgid "Error writing to %s: %s"
-msgstr ""
-"Errorea %s idaztean: \n"
-"%s\n"
-
-#, fuzzy, c-format
+msgstr "Errorea %s(e)ra idaztean: %s"
+
+#, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "Ezin da ostalariarekin konektatu"
+msgstr "Ezin %s(e)ra konektatu: %s"
 
 #, c-format
 msgid " - %s"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr ".- %s"
+
+#, c-format
 msgid " (%s)"
-msgstr "%s: %s (%s)"
+msgstr " (%s)"
 
 #. 10053
 #, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr ""
+msgstr "Zure ordenagailuko beste software batek moztu du konexioa."
 
 #. 10054
-#, fuzzy, c-format
+#, c-format
 msgid "Remote host closed connection."
-msgstr "%s erabiltzaileak solasaldi-leihoa itxi du. "
+msgstr "Konexioa itxi du urruneko ostalariak."
 
 #. 10060
-#, fuzzy, c-format
+#, c-format
 msgid "Connection timed out."
-msgstr "Konexioaren denbora-muga"
+msgstr "Konexioaren denbora-muga agortua."
 
 #. 10061
-#, fuzzy, c-format
+#, c-format
 msgid "Connection refused."
-msgstr "Konexioa berabierazten "
+msgstr "Konexioa ezetsia "
 
 #. 10048
-#, fuzzy, c-format
+#, c-format
 msgid "Address already in use."
-msgstr "Berriketa honen izena dagoeneko erabiltzen ari da"
+msgstr "Erabilpean dago jadanik helbidea."
 
 #, c-format
 msgid "Error Reading %s"
-msgstr "Errorea %s irakurtzean"
-
-#, fuzzy, c-format
+msgstr "Errorea %s Irakurtzean"
+
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"Errore bat aurkitu da %s zerrenda analizatzean, eta ez da kargatu.Fitxategi "
-"zaharra %s~ izenarekin gorde da."
+"Errore bat aurkitu da zure %s irakurtzean.  Ez da fitxategia kargatu, eta "
+"fitxategi zaharra berrizendatu da: %s~."
 
 msgid "Internet Messenger"
-msgstr "Interneteko mezularitza"
-
-#, fuzzy
+msgstr "Internet-Mezularia"
+
 msgid "Pidgin Internet Messenger"
-msgstr "Interneteko mezularitza"
+msgstr "Pidgin Internet-Mezularia"
 
 msgid "Send instant messages over multiple protocols"
-msgstr "Bidali berehalako mezuak hainbat protokoloetan"
+msgstr "Istanteko mezuak bidali hainbat protokoloren bidez"
 
 msgid "Orientation"
 msgstr "Orientazioa"
@@ -10601,47 +10145,42 @@
 
 #. Build the login options frame.
 msgid "Login Options"
-msgstr "Saioa hasteko aukerak"
-
-#, fuzzy
+msgstr "Saioa Hasteko Aukerak"
+
 msgid "Pro_tocol:"
-msgstr "Protokoloa:"
+msgstr "Pro_tokoloa:"
 
 msgid "_Username:"
-msgstr "_Erabiltzaile-izena:"
-
-#, fuzzy
+msgstr "_Erabiltzaile-Izena:"
+
 msgid "Remember pass_word"
-msgstr "Gogoratu pasahitza"
+msgstr "Pasahitza _gogoratu"
 
 #. Build the user options frame.
 msgid "User Options"
-msgstr "Erabiltzailearen aukerak"
-
-#, fuzzy
+msgstr "Erabiltzaile-Aukerak"
+
 msgid "_Local alias:"
-msgstr "Fitxagei lokala:"
-
-#, fuzzy
+msgstr "Ezizen _lokala:"
+
 msgid "New _mail notifications"
-msgstr "Mezu berrien jakinarazpenak"
+msgstr "Mezu _berrien jakinarazpenak"
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr ""
-
-msgid "_Advanced"
-msgstr "_Aurreratua"
-
-#, fuzzy
+msgstr "Lagun-_ikono hau erabili kontu honentzako:"
+
+msgid "Ad_vanced"
+msgstr "A_urreratua"
+
 msgid "Use GNOME Proxy Settings"
-msgstr "Erabili proxy ezarpen orokorrak"
+msgstr "GNOMEren Proxy Ezarpenak Erabili"
 
 msgid "Use Global Proxy Settings"
-msgstr "Erabili proxy ezarpen orokorrak"
+msgstr "Proxy-Ezarpen Orokorrak Erabili"
 
 msgid "No Proxy"
-msgstr "Proxy-rik ez"
+msgstr "Proxy-rik Ez"
 
 msgid "HTTP"
 msgstr "HTTP"
@@ -10653,7 +10192,7 @@
 msgstr "SOCKS 5"
 
 msgid "Use Environmental Settings"
-msgstr "Erabili ingurune-ezarpenak"
+msgstr "Ingurune-Ezarpenak Erabili"
 
 #. This is an easter egg.
 #. It means one of two things, both intended as humourus:
@@ -10661,11 +10200,11 @@
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
 msgid "If you look real closely"
-msgstr "oso bertatik begiratzen baduzu"
+msgstr "Benetan gertutik begiratzen baduzu"
 
 #. This is an easter egg. See the comment on the previous line in the source.
 msgid "you can see the butterflies mating"
-msgstr "tximeletak elkarrenganatzen ikusiko dituzu"
+msgstr "tximeletak ernalarazten ikusi ditzakezu"
 
 msgid "Proxy _type:"
 msgstr "_Proxy-mota:"
@@ -10677,30 +10216,28 @@
 msgstr "_Ataka:"
 
 msgid "Pa_ssword:"
-msgstr "_Pasahitza:"
-
-#, fuzzy
+msgstr "Pa_sahitza:"
+
 msgid "Unable to save new account"
-msgstr "Ezin da konexio berria sortu."
+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 "Gehitu kontua"
+msgstr "Kontua Gehitu"
 
 msgid "_Basic"
-msgstr "_OInarrizkoa"
+msgstr "_Oinarrizkoa"
 
 msgid "Create _this new account on the server"
-msgstr ""
-
-#, fuzzy
-msgid "_Proxy"
-msgstr "Proxy-a"
+msgstr "Kontu berri hau sortu _zerbitzarian"
+
+msgid "P_roxy"
+msgstr "P_roxy-a"
 
 msgid "Enabled"
-msgstr "Ahalbidetua"
+msgstr "Gaituta"
 
 msgid "Protocol"
 msgstr "Protokoloa"
@@ -10717,81 +10254,84 @@
 "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?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Kontaktu %d daukazu %s izenarekin. Batu egin nahi al dituzu?"
+msgstr[1] "%d kontaktu dauzkazu %s izenarekin. Batu egin nahi al dituzu?"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
+"Kontaktu hauek batuz gero, sarrera bakarra erabiliko dute lagun-zerrendan "
+"eta solasaldi-leiho bakarra erabiliko dute. Berriro banandu nahi badituzu, "
+"kontestu-menuko 'Zabaldu' erabili ezazu."
 
 msgid "Please update the necessary fields."
-msgstr ""
-
-#, fuzzy
+msgstr "Beharrezko eremuak eguneratu."
+
 msgid "A_ccount"
-msgstr "Kontua:"
+msgstr "_Kontua"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Eman sartu nahi duzun berriketari buruzko informazioa.\n"
-
-#, fuzzy
+msgstr "Batu nahi duzun berriketaren inguruko informazio egokia eman ezazu.\n"
+
 msgid "Room _List"
-msgstr "Gelen zerrenda"
+msgstr "Gela-_Zerrenda"
 
 msgid "_Block"
-msgstr "Blokeatu "
-
-#, fuzzy
+msgstr "_Blokeatu"
+
 msgid "Un_block"
-msgstr "Blokeoa kendu"
+msgstr "_Desblokeatu"
 
 msgid "Move to"
-msgstr ""
+msgstr "Mugitu hona"
 
 msgid "Get _Info"
-msgstr "_Inf."
+msgstr "_Datuak Eskuratu"
 
 msgid "I_M"
-msgstr "_BM"
-
-#, fuzzy
+msgstr "I_M"
+
 msgid "_Audio Call"
-msgstr "_Gehitu berriketa"
+msgstr "_Audio-Deia"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Audio-/_Bideo-Deia"
+
 msgid "_Video Call"
-msgstr "Bideo-berriketa"
-
-#, fuzzy
+msgstr "_Bideo-Deia"
+
 msgid "_Send File..."
-msgstr "_Bidali fitxategia"
-
-#, fuzzy
+msgstr "_Fitxategia Bidali..."
+
 msgid "Add Buddy _Pounce..."
-msgstr "Gehitu lagun-_alerta"
+msgstr "Lagun-Alerta Gehitu..."
 
 msgid "View _Log"
-msgstr "Ikusi _egunkaria"
-
-#, fuzzy
+msgstr "_Txostena Ikusi"
+
 msgid "Hide When Offline"
-msgstr "Ez da onartzen lineaz kanpo"
-
-#, fuzzy
+msgstr "Ezkutatu Ofline Egotean"
+
 msgid "Show When Offline"
-msgstr "Ez da onartzen lineaz kanpo"
+msgstr "Erakutsi Offline Egotean"
 
 msgid "_Alias..."
 msgstr "_Ezizena..."
@@ -10799,42 +10339,36 @@
 msgid "_Remove"
 msgstr "_Kendu"
 
-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "Ezarri erabiltzailearen datuak..."
-
-#, fuzzy
+msgstr "Ikono Pertsonalizatua Ezarri"
+
 msgid "Remove Custom Icon"
-msgstr "Kendu kontaktua"
-
-#, fuzzy
+msgstr "Ikono Pertsonalizatua Kendu"
+
 msgid "Add _Buddy..."
-msgstr "Gehitu laguna"
-
-#, fuzzy
+msgstr "_Laguna Gehitu..."
+
 msgid "Add C_hat..."
-msgstr "Gehitu berriketa"
+msgstr "_Solasaldia Gehitu..."
 
 msgid "_Delete Group"
-msgstr "E_zabatu taldea"
+msgstr "Taldea _ezabatu"
 
 msgid "_Rename"
-msgstr "_Izena aldatu"
+msgstr "_Berrizendatu"
 
 #. join button
 msgid "_Join"
 msgstr "_Sartu"
 
 msgid "Auto-Join"
-msgstr "_Automatikoki sartu"
-
-#, fuzzy
+msgstr "Automatikoki Sartu"
+
 msgid "Persistent"
-msgstr "pertsiera"
-
-#, fuzzy
+msgstr "Iraunkorra"
+
 msgid "_Edit Settings..."
-msgstr "Erabili ingurune-ezarpenak"
+msgstr "_Ezarpenak Editatu..."
 
 msgid "_Collapse"
 msgstr "_Tolestu"
@@ -10843,97 +10377,86 @@
 msgstr "_Zabaldu"
 
 msgid "/Tools/Mute Sounds"
-msgstr "/Erabilpenak/Mutututako soinuak"
+msgstr "/Tresnak/Soinuak Mututu"
 
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
-msgstr "Kontu honetan ezin da lagun hori gehitu."
+msgstr "Ezin duzu lagun hori gehitu konektatuta zauden kontuetara."
 
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#, fuzzy
 msgid "Unknown node type"
-msgstr "%d errore-kode ezezaguna"
+msgstr "Nodo-mota ezezaguna"
 
 #. Buddies menu
 msgid "/_Buddies"
 msgstr "/_Lagunak"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/Lagunak/_Berehalako mezu berria..."
+msgstr "/Lagunak/_Istanteko Mezu Berria..."
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/Lagunak/_Sartu berriketa batean..."
+msgstr "/Lagunak/Berriketa batera _Batu..."
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/Lagunak/_Hartu erabiltzailearen datuak..."
+msgstr "/Lagunak/_Erabiltzaile-Datuak Eskuratu..."
 
 msgid "/Buddies/View User _Log..."
-msgstr "/Lagunak/Ikusi erabiltzailearen _egunkaria..."
-
-#, fuzzy
+msgstr "/Lagunak/Erabiltzaile-T_xostena Ikusi..."
+
 msgid "/Buddies/Sh_ow"
-msgstr "/_Lagunak"
-
-#, fuzzy
+msgstr "/Lagunak/E_rakutsi"
+
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Lagunak/Erakutsi _Lineaz kanpoko lagunak"
-
-#, fuzzy
+msgstr "/Lagunak/Erakutsi/O_ffline Lagunak"
+
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Lagunak/Erakutsi _talde hutsak"
-
-#, fuzzy
+msgstr "/Lagunak/Erakutsi/Talde _Hutsak"
+
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Lagunak/Erakutsi Lineaz  lagunen _ezaugarriak"
-
-#, fuzzy
+msgstr "/Lagunak/Erakutsi/Lagunen _Xehetasunak"
+
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Lagunak/Erakutsi ez-aktibo _Denborak"
-
-#, fuzzy
+msgstr "/Lagunak/Erakutsi/Inaktibotasun _Denborak"
+
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Lagunak/Erakutsi _talde hutsak"
+msgstr "/Lagunak/Erakutsi/_Protokolo Ikonoak"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Lagunak/Lagun_motak"
+msgstr "/Lagunak/Lagunak _Antolatu"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Lagunak/_Gehitu laguna..."
+msgstr "/Lagunak/Laguna _Gehitu..."
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/Lagunak/Gehitu _berriketa..."
+msgstr "/Lagunak/Be_rriketa Gehitu..."
 
 msgid "/Buddies/Add _Group..."
-msgstr "/Lagunak/Gehitu _taldea..."
+msgstr "/Lagunak/_Taldea Gehitu..."
 
 msgid "/Buddies/_Quit"
 msgstr "/Lagunak/_Irten"
 
 #. Accounts menu
 msgid "/_Accounts"
-msgstr "/K_ontua"
-
-#, fuzzy
+msgstr "/_Kontuak"
+
 msgid "/Accounts/Manage Accounts"
-msgstr "/Kontuak"
+msgstr "/Kontuak/Kontuak Kudeatu"
 
 #. Tools
 msgid "/_Tools"
 msgstr "/_Tresnak"
 
-#, fuzzy
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Tresnak/Gehitu lagun-_alerta"
-
-#, fuzzy
+msgstr "/Tresnak/Lagun-_Alertak"
+
 msgid "/Tools/_Certificates"
-msgstr "/Tresnak/_Hobespenak"
-
-#, fuzzy
+msgstr "/Tresnak/_Zertifikatuak"
+
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Tresnak/Pribatutasuna"
+msgstr "/Tresnak/_Smiley Pertsonalizatuak"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Tresnak/Plu_gin-ak"
@@ -10945,172 +10468,160 @@
 msgstr "/Tresnak/P_ribatutasuna"
 
 msgid "/Tools/_File Transfers"
-msgstr "/Tresnak/_Fitxategi-transferentziak"
+msgstr "/Tresnak/_Fitxategi-Transferentziak"
 
 msgid "/Tools/R_oom List"
-msgstr "/Tresnak/_Gelen zerrenda"
+msgstr "/Tresnak/_Gela-Zerrenda"
 
 msgid "/Tools/System _Log"
-msgstr "/Tresnak/_Ikusi sistemaren egunkaria "
+msgstr "/Tresnak/_Sistemaren Txostena"
 
 msgid "/Tools/Mute _Sounds"
-msgstr "/Tresnak/Mututu _soinuak"
+msgstr "/Tresnak/Soinuak _Mututu"
 
 #. Help
 msgid "/_Help"
-msgstr "/Lagu_ntza"
+msgstr "/_Laguntza"
 
 msgid "/Help/Online _Help"
-msgstr "/Laguntza/_Lineako laguntza..."
+msgstr "/Laguntza/_Online Laguntza"
 
 msgid "/Help/_Debug Window"
-msgstr "/Laguntza/_Arazketa-leihoa"
+msgstr "/Laguntza/_Arazketa-Leihoa"
 
 msgid "/Help/_About"
-msgstr "/Laguntza/H_oni buruz"
-
-#, fuzzy, c-format
+msgstr "/Laguntza/_Honi buruz"
+
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Kontua:</b> %s"
-
-#, fuzzy, c-format
+msgstr "<b>Kontua:</b> %s"
+
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>Kontua:</b> %s"
-
-#, fuzzy, c-format
+"<b>Partaideak:</b> %d"
+
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>%s:</b> %s"
-
-#, fuzzy
+"<b>Gaia:</b> %s"
+
 msgid "(no topic set)"
-msgstr "Ez da gairik ezarri"
-
-#, fuzzy
+msgstr "(gairik ez)"
+
 msgid "Buddy Alias"
-msgstr "Lagunen zerrenda"
-
-#, fuzzy
+msgstr "Lagunaren Ezizena"
+
 msgid "Logged In"
-msgstr "Konektatuta dago lehendik"
-
-#, fuzzy
+msgstr "Konektatuta"
+
 msgid "Last Seen"
-msgstr "Deitura"
+msgstr "Azkenekoz Ikusia"
 
 msgid "Spooky"
-msgstr ""
+msgstr "Beldurtia"
 
 msgid "Awesome"
-msgstr ""
+msgstr "Bikaina"
 
 msgid "Rockin'"
-msgstr ""
-
-#, fuzzy
+msgstr "Rock'n'Roll-eatzen"
+
 msgid "Total Buddies"
-msgstr "Lagunak"
-
-#, fuzzy, c-format
+msgstr "Lagunak Guztira"
+
+#, c-format
 msgid "Idle %dd %dh %02dm"
-msgstr "Ez-aktibo %dh%02dm "
+msgstr "Inaktibo %deg %dord %02dmin"
 
 #, c-format
 msgid "Idle %dh %02dm"
-msgstr "Ez-aktibo %dh%02dm "
+msgstr "Inaktibo %dord%02dmin"
 
 #, c-format
 msgid "Idle %dm"
-msgstr "Ez-aktibo %dm "
+msgstr "Inaktibo %dmin"
 
 msgid "/Buddies/New Instant Message..."
-msgstr "/Lagunak/Berehalako mezu berria..."
+msgstr "/Lagunak/Istanteko Mezu Berria..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/Lagunak/Sartu berriketa batean..."
+msgstr "/Lagunak/Berriketa batera Batu..."
 
 msgid "/Buddies/Get User Info..."
-msgstr "/Lagunak/Lortu erabiltzailearen datuak..."
+msgstr "/Lagunak/Erabiltzaile-Datuak Eskuratu..."
 
 msgid "/Buddies/Add Buddy..."
-msgstr "/Lagunak/Gehitu laguna..."
+msgstr "/Lagunak/Laguna Gehitu..."
 
 msgid "/Buddies/Add Chat..."
-msgstr "/Lagunak/Gehitu berriketa..."
+msgstr "/Lagunak/Berriketa Gehitu..."
 
 msgid "/Buddies/Add Group..."
-msgstr "/Lagunak/Gehitu taldea..."
+msgstr "/Lagunak/Taldea Gehitu..."
 
 msgid "/Tools/Privacy"
 msgstr "/Tresnak/Pribatutasuna"
 
 msgid "/Tools/Room List"
-msgstr "/Tresnak/Gelen zerrenda"
+msgstr "/Tresnak/Gela-Zerrenda"
 
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d irakurri gabeko mezua  %s bidalia \n"
-msgstr[1] "%d irakurri gabeko mezuak  %s bidalia \n"
+msgstr[0] "Mezu %d irakurri gabe (%s(r)ena)\n"
+msgstr[1] "%d mezu irakurri gabe (%s(r)enak)\n"
 
 msgid "Manually"
-msgstr "Eskuz "
+msgstr "Eskuz"
 
 msgid "By status"
 msgstr "Egoeraren arabera"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "Txosteneko azken aktibitatearen arabera"
 
 #, c-format
 msgid "%s disconnected"
-msgstr "%s Deskonektatuta."
-
-#, fuzzy, c-format
+msgstr "%s deskonektatuta"
+
+#, c-format
 msgid "%s disabled"
-msgstr "Komandoa desgaitu da"
-
-#, fuzzy
+msgstr "%s ezgaituta"
+
 msgid "Reconnect"
-msgstr "Konektatu"
-
-#, fuzzy
+msgstr "Berkonektatu"
+
 msgid "Re-enable"
-msgstr "Ber ahalbidetu kontua"
+msgstr "Bergaitu"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL Galderak"
 
 msgid "Welcome back!"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Ongietorri berriro!"
+
+#, c-format
 msgid "%d account was disabled because you signed on from another location:"
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "Beste kokaleku batetik hasi duzu saioa."
-msgstr[1] "Beste kokaleku batetik hasi duzu saioa."
-
-#, fuzzy
+msgstr[0] "Kontu %d ezgaitu da, beste nonbaitetik konektatu zarelako:"
+msgstr[1] "%d kontu ezgaitu dira, beste nonbaitetik konektatu zarelako:"
+
 msgid "<b>Username:</b>"
-msgstr "_Erabiltzaile-izena:"
-
-#, fuzzy
+msgstr "<b>Erabiltzaile-izena:</b>"
+
 msgid "<b>Password:</b>"
-msgstr "Pasahitza:"
-
-#, fuzzy
+msgstr "<b>Pasahitza:</b>"
+
 msgid "_Login"
-msgstr "Egunkaria"
+msgstr "_Konektatu"
 
 msgid "/Accounts"
 msgstr "/Kontuak"
@@ -11124,229 +10635,209 @@
 "b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
 "you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
+"<span weight='bold' size='larger'>Ongietorri %s(e)ra!</span>\n"
+"\n"
+"Ez daukazu konturik gaituta. <b>Kontuak->Kontuak Kudeatu</b> leihoan gaitu "
+"itzazu zure IM kontuak. Kontuak gaitu ondoren, konektatu, zure egoera ezarri "
+"eta zure lagunekin hitz egin ahalko duzu."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Lagunak/Erakutsi Lineaz kanpoko lagunak"
-
-#, fuzzy
+msgstr "/Lagunak/Erakutsi/Offline Lagunak"
+
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Lagunak/Erakutsi talde hutsak"
-
-#, fuzzy
+msgstr "/Lagunak/Erakutsi/Talde Hutsak"
+
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Lagunak/Erakutsi lagunaren ezaugarriak"
-
-#, fuzzy
+msgstr "/Lagunak/Erakutsi/Lagunaren Xehetasunak"
+
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Lagunak/Erakutsi ez-aktibo Denbora"
-
-#, fuzzy
+msgstr "/Lagunak/Erakutsi/Inaktibotasun Denborak"
+
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Lagunak/Erakutsi talde hutsak"
-
-#, fuzzy
+msgstr "/Lagunak/Erakutsi/Protokolo Ikonoak"
+
 msgid "Add a buddy.\n"
-msgstr "_Gehitu laguna"
-
-#, fuzzy
+msgstr "Laguna gehitu.\n"
+
 msgid "Buddy's _username:"
-msgstr "_Lagunaren izena:"
-
-#, fuzzy
+msgstr "Lagunaren e_rabiltzaile-izena:"
+
 msgid "(Optional) A_lias:"
-msgstr "Aukerako informazioa:"
-
-#, fuzzy
+msgstr "(Opzionala) E_zizena:"
+
 msgid "Add buddy to _group:"
-msgstr "Laguna zerrendan gehitu nahi duzu?"
+msgstr "_Talde batera gehitu laguna:"
 
 msgid "This protocol does not support chat rooms."
-msgstr "Protokolo honek ez ditu berriketa-gelak onartzen"
+msgstr "Protokolo honek ez ditu berriketa-gelak jasaten."
 
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "Une honetan ez daukazu berriketarako gaitasuna duen protokolorik."
+msgstr "Ezin berriketarik izan konektatuta zauden protokoloekin."
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
-"Sartu aliasa, eta lagunen zerrendan gehitu nahi duzun berriketari buruzko "
-"informazio guztia.\n"
-
-#, fuzzy
+"Zure lagun-zerrendara gehitu nahi duzun berriketaren inguruko informazio "
+"egokia eta ezizen bat sartu itzazu.\n"
+
 msgid "A_lias:"
-msgstr "Aliasa:"
+msgstr "E_zizena:"
 
 msgid "_Group:"
 msgstr "_Taldea:"
 
 msgid "Auto_join when account becomes online."
-msgstr ""
+msgstr "Auto-_batu kontua konektatzean."
 
 msgid "_Remain in chat after window is closed."
-msgstr ""
+msgstr "Solasaldian _jarraitu leihoa itxi ondoren."
 
 msgid "Please enter the name of the group to be added."
-msgstr "Idatzi gehitu nahi duzun taldearen izena."
+msgstr "Gehitu nahi duzun taldearen izena sartu ezazu."
 
 msgid "Enable Account"
-msgstr "Ahalbidetu Kontua"
+msgstr "Kontua Gaitu"
 
 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr ""
+msgstr "<PurpleMain>/Kontuak/Kontua Gaitu"
 
 msgid "<PurpleMain>/Accounts/"
-msgstr ""
+msgstr "<PurpleMain>/Kontuak/"
 
 msgid "_Edit Account"
 msgstr "Kontua _Editatu"
 
 msgid "No actions available"
-msgstr "Ekintza erabilgarririk ez"
+msgstr "Ekintzarik ez eskuragarri"
 
 msgid "_Disable"
-msgstr "_Ez-gaitu"
+msgstr "_Ezgaitu"
 
 msgid "/Tools"
 msgstr "/Tresnak"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/Lagunak/Lagun Motak"
+msgstr "/Lagunak/Lagunak Antolatu"
 
 #. Buddy List
-#, fuzzy
 msgid "Background Color"
-msgstr "Atzeko planoko kolorea"
-
-#, fuzzy
+msgstr "Atzealdeko Kolorea"
+
 msgid "The background color for the buddy list"
-msgstr "%s gehitu zaitut bere lagunen-zerrendara."
-
-#, fuzzy
+msgstr "Lagun-zerrendaren atzealdeko kolorea."
+
 msgid "Layout"
-msgstr "Saioa hasteko aukerak"
+msgstr "Diseinua"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "Lagun-zerrendako ikono, izena eta egoeren diseinua"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Atzeko planoko kolorea"
+msgstr "Atzealde Zabalduaren Kolorea"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "Talde zabalduaren atzealdearen kolorea"
+
 msgid "Expanded Text"
-msgstr "_Zabaldu"
+msgstr "Testu Zabaldua"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Talde zabalduaren testu-informazioa"
+
 msgid "Collapsed Background Color"
-msgstr "Hautatu atzeko planoaren kolorea"
+msgstr "Atzealde Tolestuaren Kolorea"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "Talde tolestuaren atzealdearen kolorea"
+
 msgid "Collapsed Text"
-msgstr "_Tolestu"
+msgstr "Testu Tolestua"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Talde tolestuaren testu-informazioa"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Hautatu atzeko planoaren kolorea"
+msgstr "Kontaktu/Solasaldien Atzealdearen Kolorea"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "Kontaktu edo solasaldien atzealdearen kolorea"
+
 msgid "Contact Text"
-msgstr "Ataka"
+msgstr "Kontaktu-Testua"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Kontaktua zabaltzen denerako testu-informazioa"
+
 msgid "On-line Text"
-msgstr "Linean"
+msgstr "Online-Testua"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "Lagun bat online dagoenerako testu-informazioa"
+
 msgid "Away Text"
-msgstr "Kanpoan"
+msgstr "Kanpoan-Testua"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "Lagun bat kanpoan dagoenerako testu-informazioa"
+
 msgid "Off-line Text"
-msgstr "Lineaz kanpo"
+msgstr "Offline-Testua"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "Lagun bat offline dagoenerako testu-informazioa"
+
 msgid "Idle Text"
-msgstr "Umorea"
+msgstr "inaktibo-Testua"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "Lagun bat inaktibo dagoenerako testu-informazioa"
+
 msgid "Message Text"
-msgstr "Mezua bidali da"
+msgstr "Mezu-Testua"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "Lagun batek irakurri gabeko mezu bat daukanerako testu-informazioa"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Mezu-Testua(Ezizena Aipatua)"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
 msgstr ""
-
-#, fuzzy
+"Solasaldi batean zure ezizena aipatzenduen irakurri gabeko mezu bat "
+"daukanerako testu-informazioa"
+
 msgid "The text information for a buddy's status"
-msgstr "Aldatu %s erabiltzailearen datuak"
+msgstr "Lagunaren egoerarako testu-informazioa"
 
 msgid "Type the host name for this certificate."
-msgstr ""
+msgstr "Zertifikatu honen ostalari-izena idatzi ezazu."
 
 #. Widget creation function
-#, fuzzy
 msgid "SSL Servers"
-msgstr "Zerbitzaria"
-
-#, fuzzy
+msgstr "SSL-Zerbitzariak"
+
 msgid "Unknown command."
-msgstr "Komando ezezaguna"
+msgstr "Agindu ezezaguna."
 
 msgid "That buddy is not on the same protocol as this chat."
-msgstr "Lagun hori ez dago berriketa honek darabilen protokoloarekin."
+msgstr "Lagun hori ez dago berriketa honen protokolo berdinean."
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
-msgstr "Ez duzu sinatu kontu batekin lagun hori gonbidatzeko."
+msgstr "Ez zaude lagun hori gonbidatu dezakeen inongo konturekin konektatuta."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "Gonbidatu laguna berriketa-gelara"
+msgstr "Laguna Gonbidatu Berriketa-Gelara"
 
 msgid "_Buddy:"
 msgstr "_Laguna:"
@@ -11359,7 +10850,7 @@
 msgstr "<h1>Solasaldia: %s</h1>\n"
 
 msgid "Save Conversation"
-msgstr "Gorde solasaldia"
+msgstr "Solasaldia Gorde"
 
 msgid "Find"
 msgstr "Bilatu"
@@ -11368,104 +10859,95 @@
 msgstr "Bila_tu:"
 
 msgid "Un-Ignore"
-msgstr "Desegin ez ikustea"
+msgstr "Ezikusia Desegin"
 
 msgid "Ignore"
-msgstr "Ez ikusi egin"
+msgstr "Ezikusi"
 
 msgid "Get Away Message"
-msgstr "Kanpoan nagoeneko mezua "
-
-#, fuzzy
+msgstr "Kanpoan Nagoeneko Mezua "
+
 msgid "Last Said"
-msgstr "Esandako azkena"
+msgstr "Esandako Azkena"
 
 msgid "Unable to save icon file to disk."
-msgstr "Ezin da gorde ikono-fitxategia diskoan."
+msgstr "Ezin ikono-fitxategia diskoan gorde."
 
 msgid "Save Icon"
-msgstr "Gorde ikonoa"
+msgstr "Ikonoa Gorde"
 
 msgid "Animate"
 msgstr "Animatu"
 
 msgid "Hide Icon"
-msgstr "Ezkutatu ikonoa"
+msgstr "Ikonoa Ezkutatu"
 
 msgid "Save Icon As..."
-msgstr "Gorde ikonoa honela..."
-
-#, fuzzy
+msgstr "Ikonoa Gorde Honela..."
+
 msgid "Set Custom Icon..."
-msgstr "Ezarri erabiltzailearen datuak..."
-
-#, fuzzy
+msgstr "Ikono Pertsonalizatu Ezarri..."
+
 msgid "Change Size"
-msgstr "Egoera aldatu"
+msgstr "Tamaina Aldatu"
 
 msgid "Show All"
-msgstr ""
+msgstr "Denak Erakutsi"
 
 #. Conversation menu
 msgid "/_Conversation"
 msgstr "/_Solasaldia"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/Solasaldia/_Berehalako mezu berria..."
+msgstr "/Solasaldia/Istanteko _Mezu Berria..."
 
 msgid "/Conversation/_Find..."
-msgstr "/Solasaldia/B_ilatu..."
+msgstr "/Solasaldia/_Bilatu..."
 
 msgid "/Conversation/View _Log"
-msgstr "/Solasaldia/Ikusi _egunkaria"
+msgstr "/Solasaldia/_Txostena Ikusi"
 
 msgid "/Conversation/_Save As..."
-msgstr "/Solasaldia/_Gorde honela..."
+msgstr "/Solasaldia/Gorde _Honela..."
 
 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Solasaldia/Garb_itu Scrollback"
-
-#, fuzzy
+msgstr "/Solasaldia/Garbit_u"
+
 msgid "/Conversation/M_edia"
-msgstr "/Solasaldia/It_xi"
-
-#, fuzzy
+msgstr "/Solasaldia/_Multimedia"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Solasaldia/It_xi"
-
-#, fuzzy
+msgstr "/Solasaldia/Multimedia/_Audio-Deia"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Solasaldia/It_xi"
-
-#, fuzzy
+msgstr "/Solasaldia/Multimedia/_Bideo-Deia"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Solasaldia/Ikusi _egunkaria"
+msgstr "/Conversation/Media/Audio\\/Bideo-_Deia"
 
 msgid "/Conversation/Se_nd File..."
-msgstr "/Solasaldia/B_idali fitxategia..."
+msgstr "/Solasaldia/_Fitxategia Bidali..."
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Solasaldia/Gehitu lagun-_alerta..."
+msgstr "/Solasaldia/Lagun-_Alerta Gehitu..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Solasaldia/_Hartu informazioa"
+msgstr "/Solasaldia/_Informazioa Eskuratu"
 
 msgid "/Conversation/In_vite..."
-msgstr "/Solasaldia/G_onbidatu..."
-
-#, fuzzy
+msgstr "/Solasaldia/_Gonbidatu..."
+
 msgid "/Conversation/M_ore"
-msgstr "/Solasaldia/It_xi"
+msgstr "/Solasaldia/_Gehiago"
 
 msgid "/Conversation/Al_ias..."
-msgstr "/Solasaldia/Ezize_na..."
+msgstr "/Solasaldia/E_zizena..."
 
 msgid "/Conversation/_Block..."
 msgstr "/Solasaldia/Blo_keatu..."
 
-#, fuzzy
 msgid "/Conversation/_Unblock..."
-msgstr "/Solasaldia/Blo_keatu..."
+msgstr "/Solasaldia/De_sblokeatu..."
 
 msgid "/Conversation/_Add..."
 msgstr "/Solasaldia/Gehi_tu..."
@@ -11474,10 +10956,10 @@
 msgstr "/Solasaldia/Ke_ndu..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Solasaldia/Txertat_u esteka..."
+msgstr "/Solasaldia/_Esteka Txertatu..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Solasaldia/Txe_rtatu irudia..."
+msgstr "/Solasaldia/Irudia Txe_rtatu..."
 
 msgid "/Conversation/_Close"
 msgstr "/Solasaldia/It_xi"
@@ -11487,70 +10969,63 @@
 msgstr "/_Aukerak"
 
 msgid "/Options/Enable _Logging"
-msgstr "/Aukerak/Gaitu _egunkaria"
+msgstr "/Aukerak/_Txostena Gaitu"
 
 msgid "/Options/Enable _Sounds"
-msgstr "/Aukerak/Gaitu _soinuak"
+msgstr "/Aukerak/_Soinuak Gaitu"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Aukerak/Erakutsi  tresna-barrarren  _formatua"
+msgstr "/Aukerak/_Formatu-Tresnak Erakutsi"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Aukerak/Erakutsi ord_u-zigiluak"
-
-#, fuzzy
+msgstr "/Aukerak/_Ordu-Markak Erakutsi"
+
 msgid "/Conversation/More"
-msgstr "/Solasaldia/It_xi"
-
-#, fuzzy
+msgstr "/Solasaldia/Gehiago"
+
 msgid "/Options"
-msgstr "/_Aukerak"
+msgstr "/Aukerak"
 
 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#, fuzzy
 msgid "/Conversation"
-msgstr "/_Solasaldia"
+msgstr "/Solasaldia"
 
 msgid "/Conversation/View Log"
-msgstr "/Solasaldia/Ikusi egunkaria"
-
-#, fuzzy
+msgstr "/Solasaldia/Txostena Ikusi"
+
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Solasaldia/It_xi"
-
-#, fuzzy
+msgstr "/Solasaldia/Multimedia/Audio-Deia"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Solasaldia/Ikusi egunkaria"
-
-#, fuzzy
+msgstr "/Solasaldia/Multimedia/Bideo-Deia"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Solasaldia/It_xi"
+msgstr "/Conversation/Media/Audio\\/Bideo-Deia"
 
 msgid "/Conversation/Send File..."
-msgstr "/Solasaldia/Bidali fitxategia..."
+msgstr "/Solasaldia/Fitxategia Bidali..."
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Solasaldia/Gehitu lagun-alerta..."
+msgstr "/Solasaldia/Lagun-Alerta Gehitu..."
 
 msgid "/Conversation/Get Info"
-msgstr "/Solasaldia/Hartu informazioa"
+msgstr "/Solasaldia/Informazioa Eskuratu"
 
 msgid "/Conversation/Invite..."
 msgstr "/Solasaldia/Gonbidatu..."
 
 msgid "/Conversation/Alias..."
-msgstr "/Solasaldia/Aliasa..."
+msgstr "/Solasaldia/Ezizena..."
 
 msgid "/Conversation/Block..."
 msgstr "/Solasaldia/Blokeatu..."
 
-#, fuzzy
 msgid "/Conversation/Unblock..."
-msgstr "/Solasaldia/Blokeatu..."
+msgstr "/Solasaldia/Desblokeatu..."
 
 msgid "/Conversation/Add..."
 msgstr "/Solasaldia/Gehitu..."
@@ -11559,36 +11034,37 @@
 msgstr "/Solasaldia/Kendu..."
 
 msgid "/Conversation/Insert Link..."
-msgstr "/Solasaldia/Txertatu esteka..."
+msgstr "/Solasaldia/Esteka Txertatu..."
 
 msgid "/Conversation/Insert Image..."
-msgstr "/Solasaldia/Txertatu irudia..."
+msgstr "/Solasaldia/Irudia Txertatu..."
 
 msgid "/Options/Enable Logging"
-msgstr "/Aukerak/Gaitu egunkaria"
+msgstr "/Aukerak/Txostena Gaitu"
 
 msgid "/Options/Enable Sounds"
-msgstr "/Aukerak/Gaitu soinuak"
+msgstr "/Aukerak/Soinuak Gaitu"
 
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Aukerak/Erakutsi  tresna-barrarren formatua"
+msgstr "/Aukerak/Formatu-Tresnak Erakutsi"
 
 msgid "/Options/Show Timestamps"
-msgstr "/Aukerak/Erakutsi ordu-zigiluak"
+msgstr "/Aukerak/Ordu-Markak Erakutsi"
 
 msgid "User is typing..."
-msgstr "Erabiltzailea idazten ari da..."
-
-#, fuzzy, c-format
+msgstr "Idazten ari da..."
+
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s(e)k zuri idazten amaitu du (%s)"
+msgstr ""
+"\n"
+"%s(e)k zuri idazten amaitu du"
 
 #. Build the Send To menu
-#, fuzzy
 msgid "S_end To"
-msgstr "_Bidali honi:"
+msgstr "Bidali _Honi"
 
 msgid "_Send"
 msgstr "_Bidali"
@@ -11600,55 +11076,53 @@
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "pertsona %d gelan"
+msgstr[0] "Pertsona %d gelan"
 msgstr[1] "%d pertsona gelan"
 
 msgid "Typing"
 msgstr "Idazten"
 
 msgid "Stopped Typing"
-msgstr "Gelditu idazteari"
+msgstr "Idazten Gelditu Da"
 
 msgid "Nick Said"
-msgstr "Goitizenak dio"
+msgstr "Ezizenak Dio"
 
 msgid "Unread Messages"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Irakurri Gabeko Mezuak"
 
 msgid "New Event"
-msgstr "Gertaera berria "
-
-#, fuzzy
+msgstr "Gertaera Berria "
+
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "garbitu: Garbitu sosaldiaren scrollback"
+msgstr "clear: Solasaldiak garbitu."
 
 msgid "Confirm close"
-msgstr "Isteko konfirmazioa"
+msgstr "Isteko Konfirmazioa"
 
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr ""
-"Irakurri gabeko mezuak dituzu. Zihur al zaude lehioa itxi nahi duzula ?"
+msgstr "Irakurri gabeko mezuak dituzu. Ziur al zaude leihoa itxi nahi duzula?"
 
 msgid "Close other tabs"
-msgstr "Itxi beste tapakia"
+msgstr "Beste fitxak itxi"
 
 msgid "Close all tabs"
-msgstr "Tapaki guztiak itxi"
+msgstr "Fitxa guztiak itxi"
 
 msgid "Detach this tab"
-msgstr "Banatu betilea"
+msgstr "Fitxa askatu"
 
 msgid "Close this tab"
-msgstr "Tapaki hau itxi"
+msgstr "Fitxa hau itxi"
 
 msgid "Close conversation"
-msgstr "Itxi solasaldia"
+msgstr "Solasaldia Itxi"
 
 msgid "Last created window"
 msgstr "Sortutako azken leihoa"
 
 msgid "Separate IM and Chat windows"
-msgstr "Bereiztu IM eta berriketa leihoak"
+msgstr "IM eta Berriketa-leihoak bereiztu"
 
 msgid "New window"
 msgstr "Leiho berria"
@@ -11660,98 +11134,91 @@
 msgstr "Kontuaren arabera"
 
 msgid "Save Debug Log"
-msgstr "Gorde arazketaren egunkaria"
+msgstr "Arazketa-Txostena Gorde"
 
 msgid "Invert"
 msgstr "Inbertitu"
 
 msgid "Highlight matches"
-msgstr "Aurkitutako azpimarratu"
+msgstr "Kointzidentziak nabarmendu"
 
 msgid "_Icon Only"
-msgstr ""
+msgstr "_Ikonoak Bakarrik"
 
 msgid "_Text Only"
-msgstr ""
+msgstr "_Testua Bakarrik"
 
 msgid "_Both Icon & Text"
-msgstr ""
+msgstr "Ikonoak _eta Testua"
 
 msgid "Filter"
-msgstr "Iragazgailua"
+msgstr "Iragazia"
 
 msgid "Right click for more options."
-msgstr "Eskubiko botoiaz klik egin  aukera gehiagorentzat"
+msgstr "Eskuin-klik egin aukera gehiagorako."
 
 msgid "Level "
-msgstr ""
+msgstr "Maila"
 
 msgid "Select the debug filter level."
-msgstr ""
-
-#, fuzzy
+msgstr "Arazte-iragazkiaren maila hautatu."
+
 msgid "All"
-msgstr "Onartu"
-
-#, fuzzy
+msgstr "Denak"
+
 msgid "Misc"
-msgstr "Musika"
-
-#, fuzzy
+msgstr "Ugari"
+
 msgid "Warning"
-msgstr "Abisu-maila"
-
-#, fuzzy
+msgstr "Abisua"
+
 msgid "Error "
 msgstr "Errorea"
 
-#, fuzzy
 msgid "Fatal Error"
-msgstr "Barne-errorea"
+msgstr "Errore Konponezina"
 
 msgid "bug master"
 msgstr ""
 
-#, fuzzy
 msgid "artist"
-msgstr "Helbidea"
+msgstr "artista"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "ahotsa eta bideoa"
 
 msgid "support"
 msgstr "euskarria"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "garatzailea eta web arduraduna"
+msgstr "webmaster-a"
 
 msgid "Senior Contributor/QA"
 msgstr ""
 
 msgid "win32 port"
-msgstr "win32 ataka"
+msgstr "win32 bertsioa"
 
 msgid "maintainer"
 msgstr "mantentzailea"
 
 msgid "libfaim maintainer"
-msgstr "libfaim mantentzaile"
+msgstr "libfaim mantentzailea"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#, fuzzy
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker eta zehaztutako kontrolatzailea [lazy bum]"
 
-#, fuzzy
 msgid "support/QA"
-msgstr "euskarria"
+msgstr "euskarria/Galderak"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "jatorrizko egilea"
@@ -11760,11 +11227,10 @@
 msgstr "garatzaile-burua"
 
 msgid "Afrikaans"
-msgstr ""
-
-#, fuzzy
+msgstr "Afrikaans"
+
 msgid "Arabic"
-msgstr "Amharic"
+msgstr "Arabiera"
 
 msgid "Belarusian Latin"
 msgstr ""
@@ -11773,17 +11239,16 @@
 msgstr "Bulgariera"
 
 msgid "Bengali"
-msgstr "bengalera"
+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"
@@ -11798,7 +11263,7 @@
 msgstr ""
 
 msgid "Greek"
-msgstr "Gerkera"
+msgstr "Greziera"
 
 msgid "Australian English"
 msgstr "Ingelesa (Australia)"
@@ -11807,23 +11272,22 @@
 msgstr "Ingelesa (Kanada)"
 
 msgid "British English"
-msgstr "Ingelesa (Britainia Handia)"
+msgstr "Ingelesa (Britainia)"
 
 msgid "Esperanto"
-msgstr ""
+msgstr "Esperanto"
 
 msgid "Spanish"
 msgstr "Gaztelania"
 
-#, fuzzy
 msgid "Estonian"
-msgstr "Bosniarra"
+msgstr "Estoniera"
 
 msgid "Euskera(Basque)"
-msgstr ""
+msgstr "Euskara"
 
 msgid "Persian"
-msgstr "pertsiera"
+msgstr "Pertsiera"
 
 msgid "Finnish"
 msgstr "Finlandiera"
@@ -11831,35 +11295,32 @@
 msgid "French"
 msgstr "Frantsesa"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Turkiera "
+msgstr "Gaelera"
 
 msgid "Galician"
-msgstr "Italiera "
+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"
@@ -11870,29 +11331,27 @@
 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"
 
 msgid "Kurdish"
-msgstr "Turkiera "
-
+msgstr "Kurduera"
+
+#, fuzzy
 msgid "Lao"
-msgstr ""
+msgstr "Laoera"
 
 msgid "Lithuanian"
 msgstr "Lituaniera"
@@ -11900,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"
@@ -11935,9 +11391,8 @@
 msgid "Portuguese-Brazil"
 msgstr "Portugesa-Brasil"
 
-#, fuzzy
 msgid "Pashto"
-msgstr "Argazkia"
+msgstr "Pashtoera"
 
 msgid "Romanian"
 msgstr "Errumaniera"
@@ -11951,61 +11406,59 @@
 msgid "Slovenian"
 msgstr "Esloveniera"
 
-#, fuzzy
 msgid "Albanian"
-msgstr "Errumaniera"
+msgstr "Albaniera"
 
 msgid "Serbian"
 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"
 
 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh eta Gnome-Vi taldea"
+msgstr "T.M.Thanh eta Gnome-Vi Taldea"
 
 msgid "Simplified Chinese"
-msgstr "Txinera soildua"
+msgstr "Txinera Sinplifikatua"
 
 msgid "Hong Kong Chinese"
-msgstr ""
+msgstr "Hong Kong-eko Txinera"
 
 msgid "Traditional Chinese"
-msgstr "Txinera tradizionala"
+msgstr "Txinera Tradizionala"
 
 msgid "Amharic"
-msgstr "Amharic"
-
-#, fuzzy, c-format
+msgstr "Amharera"
+
+#, c-format
 msgid "About %s"
-msgstr "Pidgin-i buruz"
-
-#, fuzzy, c-format
+msgstr "%s(r)i buruz"
+
+#, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
@@ -12017,97 +11470,101 @@
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
-"Pidgin berehalako mezuen bezero modularra da  AIM, MSN, Yahoo!, Jabber, ICQ, "
-"IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, eta Gadu-Gadu "
-"momentu berean erabiltzeko gaitasuna duena. GTK+ erabiliz idatzi izan da ."
-"<BR><BR> Programa hau aldatu eta ber-banatu dezakezu  GPL terminopean (2 "
-"bertsioa edo beranduagokoa). GPL -ren kopia COPYING izeneko fitxategi baten "
-"dago Pidgin distribuzioarekin batera. Pidgin \"copyright\"-a du bere "
-"laguntzaileen eskutik. Ikusi ezazy COPYRIGHT fitxategia laguntzaileen "
-"zerrenda osoa ikusteko. Ez dugu programa honen bermea zihurtatzen.<BR><BR>"
+"Libpurple-n oinarritutako mezularitza-bezero grafiko modularra da %s. AIM, "
+"MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
+"Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu eta QQ jasaten ditu. GTK+ "
+"darabil. <BR><BR>GPL (2garren bertsioa edo ondorengoak) lizentziaren "
+"araupean modifikatu eta distribuitu dezakezu programa hau.  GPLren kopia bat "
+"aurkituko duzu %s(r)ekin distribuitutako 'COPYING' fitxategian.  Bere "
+"kontribuitzaileen copyright-a dauka %s(e)k.  Ez dugu programa honekiko inono "
+"bermerik eskaintzen.<BR><BR>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">Galderak:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/"
+"FAQ\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 msgstr ""
-
-#, fuzzy, c-format
+"<FONT SIZE=\"4\">E-posta bidezko laguntza:</FONT> <A HREF=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin irc.freenode.net-en<BR><BR>"
-
-#, fuzzy, c-format
+msgstr ""
+"<FONT SIZE=\"4\">IRC Kanala:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #Pidgin irc.freenode.net-en<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
-msgstr "Egungo garatzailea"
+msgstr "Egungo Garatzaileak"
 
 msgid "Crazy Patch Writers"
-msgstr "Adabaki-idazle zoroak"
+msgstr "Partxe-Idazle Zoroak"
 
 msgid "Retired Developers"
-msgstr "Garatzaile erretiratuak"
-
-#, fuzzy
+msgstr "Garatzaile Erretiratuak"
+
 msgid "Retired Crazy Patch Writers"
-msgstr "Adabaki-idazle zoroak"
+msgstr "Erretiratutako Partxe-Idazle Zoroak"
 
 msgid "Current Translators"
-msgstr "Itzultzaileak"
+msgstr "Egungo Itzultzaileak"
 
 msgid "Past Translators"
-msgstr "Lehengo itzultzaileak"
+msgstr "Lehengo Itzultzaileak"
 
 msgid "Debugging Information"
-msgstr "Arakatze informazioa"
+msgstr "Arazte-Informazioa"
 
 msgid "_Name"
 msgstr "_Izena"
 
 msgid "_Account"
-msgstr "K_ontua"
+msgstr "_Kontua"
 
 msgid "Get User Info"
-msgstr "Hartu erabiltzailearen datuak"
-
-#, fuzzy
+msgstr "Erabiltzaile-Datuak Eskuratu"
+
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Idatzi informazioa ikusi nahi duzun pertsonaren pantaila-izena edo ezizena."
+"Zein pertsonaren informazioa ikusi nahi duzun zehaztu ezazu, erabiltzaile-"
+"izena edo ezizena idatziz."
 
 msgid "View User Log"
-msgstr "Ikusi erabiltzailearen egunkaria"
+msgstr "Erabiltzaile-Txostena Ikusi"
 
 msgid "Alias Contact"
-msgstr "Ezizena kontaktuarentzat"
+msgstr "Kontaktuaren Ezizena"
 
 msgid "Enter an alias for this contact."
-msgstr "Idatzi ezizen bat kontaktu honentzat."
+msgstr "Kontaktu honentzako ezizen bat idatzi ezazu."
 
 #, c-format
 msgid "Enter an alias for %s."
-msgstr "Idatzi ezizena bat %s(r)entzat."
+msgstr "%s(r)entzako ezizen bat idatzi."
 
 msgid "Alias Buddy"
-msgstr "Ezizena lagunarentzat"
+msgstr "Lagunaren Ezizena"
 
 msgid "Alias Chat"
-msgstr "Ezizena berriketarako"
+msgstr "Berriketaren Ezizena"
 
 msgid "Enter an alias for this chat."
-msgstr "Idatzi ezizen bat berriketa honetarako."
-
-#, fuzzy, c-format
+msgstr "Berriketa honentzako ezizen bat idatzi ezazu."
+
+#, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
@@ -12115,52 +11572,49 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"%s eta beste %d lagun dituen kontaktua lagunen zerrendatik kentzera zoaz. "
-"Jarraitu nahi duzu?"
+"%s eta beste lagun %d dituen kontaktu bat kenduko duzu zure lagun-"
+"zerrendatik. Jarraitu nahi al duzu?"
 msgstr[1] ""
-"%s eta beste %d lagun dituen kontaktua lagunen zerrendatik kentzera zoaz. "
-"Jarraitu nahi duzu?"
+"%s eta beste %d lagun dituen kontaktu bat kenduko duzu zure lagun-"
+"zerrendatik. Jarraitu nahi al duzu?"
 
 msgid "Remove Contact"
-msgstr "Kendu kontaktua"
+msgstr "Kontaktua Kendu"
 
 msgid "_Remove Contact"
-msgstr "_Kontaktua kendu"
-
-#, fuzzy, c-format
+msgstr "Kontaktua _Kendu"
+
+#, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr ""
-"%s taldea eta taldeko kide guztiak lagunen zerrendatik kentzera zoaz. "
-"Jarraitu nahi duzu?"
-
-#, fuzzy
+"%s izeneko taldea eta %s izeneko taldea batuko dituzu. Jarraitu nahi al duzu?"
+
 msgid "Merge Groups"
-msgstr "Kendu taldea"
-
-#, fuzzy
+msgstr "Taldeak Batu"
+
 msgid "_Merge Groups"
-msgstr "E_zabatu taldea"
+msgstr "Taldeak _Batu"
 
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"%s taldea eta taldeko kide guztiak lagunen zerrendatik kentzera zoaz. "
-"Jarraitu nahi duzu?"
+"%s taldea eta taldeko kide guztiak kenduko dituzu zure lagun-zerrendatik. "
+"Jarraitu nahi al duzu?"
 
 msgid "Remove Group"
-msgstr "Kendu taldea"
+msgstr "Taldea Kendu"
 
 msgid "_Remove Group"
-msgstr "_Kendu taldea"
+msgstr "Taldea _Kendu"
 
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "%s lagunen zerrendatik kentzera zoaz. Jarraitu nahi duzu?"
+msgstr "%s zure lagunen zerrendatik kentzera zoaz. Jarraitu nahi duzu?"
 
 msgid "Remove Buddy"
 msgstr "Kendu laguna"
@@ -12172,72 +11626,62 @@
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr "%s berriketa lagunen zerrendatik kentzera zoaz. Jarraitu nahi duzu?"
+msgstr ""
+"%s berriketa kenduko duzu zure lagun-zerrendatik. Jarraitu nahi al duzu?"
 
 msgid "Remove Chat"
-msgstr "Kendu berriketa"
+msgstr "Berriketa Kendu"
 
 msgid "_Remove Chat"
-msgstr "_Kendu berriketa"
+msgstr "Berriketa _Kendu"
 
 msgid "Right-click for more unread messages...\n"
-msgstr "Eskubiko botoiaz klik egin irakurri gabeko mezu gehiagorentzat...\n"
-
-#, fuzzy
+msgstr "Eskuin-klik egizu irakurri gabeko mezu gehiagorako...\n"
+
 msgid "_Change Status"
-msgstr "Egoera aldatu"
-
-#, fuzzy
+msgstr "Egoera _Aldatu"
+
 msgid "Show Buddy _List"
-msgstr "Lagunen zerrenda erakutsi"
-
-#, fuzzy
+msgstr "Lagun-_Zerrenda Erakutsi"
+
 msgid "_Unread Messages"
-msgstr "Irakurri gabeko mezuak"
-
-#, fuzzy
+msgstr "Irakurri _Gabeko Mezuak"
+
 msgid "New _Message..."
-msgstr "Mezu berria..."
-
-#, fuzzy
+msgstr "Mezu _Berria..."
+
 msgid "_Accounts"
-msgstr "/K_ontua"
-
-#, fuzzy
+msgstr "_Kontuak"
+
 msgid "Plu_gins"
-msgstr "Plugin-ak"
-
-#, fuzzy
+msgstr "_Plugin-ak"
+
 msgid "Pr_eferences"
-msgstr "Hobespenak"
-
-#, fuzzy
+msgstr "_Hobespenak"
+
 msgid "Mute _Sounds"
-msgstr "Mututu soinuak"
-
-#, fuzzy
+msgstr "Soinuak _Mututu"
+
 msgid "_Blink on New Message"
-msgstr "Mezu berria..."
-
-#, fuzzy
+msgstr "Mezu Berriekin Kliskatu"
+
 msgid "_Quit"
-msgstr "Irten"
-
-#, fuzzy
+msgstr "_Irten"
+
 msgid "Not started"
-msgstr "Ez dago onartuta"
+msgstr "Hasi gabe"
 
 msgid "<b>Receiving As:</b>"
-msgstr "<b>Honela jasotzen:</b>"
+msgstr "<b>Honela Jasotzen:</b>"
 
 msgid "<b>Receiving From:</b>"
-msgstr "<b>Honengandik jasotzen:</b>"
+msgstr "<b>Honengandik Jasotzen:</b>"
 
 msgid "<b>Sending To:</b>"
-msgstr "<b>Honi bidaltzen:</b>"
+msgstr "<b>Honi Bidaltzen:</b>"
 
 msgid "<b>Sending As:</b>"
-msgstr "<b>Honela bidaltzen:</b>"
+msgstr "<b>Honela Bidaltzen:</b>"
 
 msgid "There is no application configured to open this type of file."
 msgstr "Ez dago fitxategi-mota hori irekitzeko aplikaziorik konfiguratuta."
@@ -12247,142 +11691,129 @@
 
 #, c-format
 msgid "Error launching %s: %s"
-msgstr "Errorea <b>%s</b> abiaraztean: %s "
+msgstr "Errorea <b>%s</b> abiaraztean: %s"
 
 #, c-format
 msgid "Error running %s"
-msgstr "Errorea martxan jartzean %s"
+msgstr "Errorea %s exekutatzean"
 
 #, c-format
 msgid "Process returned error code %d"
-msgstr "Prozesua errorea kodea itzuli du %d"
+msgstr "Prozesuak errore-kodea itzuli du: %d"
 
 msgid "Filename:"
-msgstr "Fitxategi-izena:"
+msgstr "Fitxategi-Izena:"
 
 msgid "Local File:"
-msgstr "Fitxagei lokala:"
+msgstr "Fitxategi Lokala:"
 
 msgid "Speed:"
 msgstr "Abiadura:"
 
 msgid "Time Elapsed:"
-msgstr "Igarotako denbora:"
+msgstr "Denbora Igaroa:"
 
 msgid "Time Remaining:"
-msgstr "Geratzen den denbora:"
+msgstr "Denbora Faltan:"
 
 msgid "Close this window when all transfers _finish"
-msgstr "Lehio hau itxi transferentzia guztiak amaitu direnean"
+msgstr "Leihoa hau _itxi transferentzia guztiak amaitu direnean"
 
 msgid "C_lear finished transfers"
-msgstr "_Garbitu amaitutako transferentziak "
+msgstr "Amaitutako transferentziak _garbitu"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "Fitxategi transferentziaren _xehetasunak"
-
-#. Pause button
-msgid "_Pause"
-msgstr "_Pausarazi"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Berrekin"
+msgstr "Fitxategi-transferentziaren _xehetasunak"
 
 msgid "Paste as Plain _Text"
-msgstr "Itsatsi _testu gisa"
+msgstr "_Testu Arrunt bezela Itsatsi"
 
 msgid "_Reset formatting"
-msgstr "_Garbitu estiloa "
+msgstr "Formatua _garbitu"
 
 msgid "Disable _smileys in selected text"
-msgstr ""
+msgstr "_Smiley-ak ezgaitu hautatutako testuan"
 
 msgid "Hyperlink color"
-msgstr "Hiperestekaren kolorea"
+msgstr "Hiperesteka-kolorea"
 
 msgid "Color to draw hyperlinks."
-msgstr "Kolorea hiperestekak marrazteko"
-
-#, fuzzy
+msgstr "Hiperestekak marrazteko kolorea."
+
 msgid "Hyperlink visited color"
-msgstr "Hiperestekaren kolorea"
-
-#, fuzzy
+msgstr "Bisitatutako hiperesten kolorea"
+
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Kolorea hiperestekak marrazteko sagua gainetik pasatzean."
-
-#, fuzzy
+msgstr ""
+"Bisitatutako (edo aktibatutako) hiperestekak marrazteko erabiliko den "
+"kolorea."
+
 msgid "Hyperlink prelight color"
-msgstr "Hiperestekaren kolorea"
+msgstr ""
 
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Kolorea hiperestekak marrazteko sagua gainetik pasatzean."
-
-#, fuzzy
+msgstr "Hiperestekek xagua gainean dutenean marrazteko kolorea."
+
 msgid "Sent Message Name Color"
-msgstr "Ireki mezu guztiak"
+msgstr "Bidalitako Mezuen Izenaren Kolorea"
 
 msgid "Color to draw the name of a message you sent."
-msgstr ""
-
-#, fuzzy
+msgstr "Zuk bidalitako mezuen izena marrazteko erabiliko den kolorea."
+
 msgid "Received Message Name Color"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Jasotako Mezuen Izenaren Kolorea"
 
 msgid "Color to draw the name of a message you received."
-msgstr ""
+msgstr "Zuk jasotako mezuen izena marrazteko erabiliko den kolorea."
 
 msgid "\"Attention\" Name Color"
-msgstr ""
+msgstr "\"Aipamena\" Izenaren Kolorea"
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
+"Zuk jasotako eta zure izena aipatzen duten mezuen izena marrazteko erabiliko "
+"den kolorea."
 
 msgid "Action Message Name Color"
-msgstr ""
+msgstr "Ekintza-Mezuen Izenaren Kolorea"
 
 msgid "Color to draw the name of an action message."
-msgstr ""
+msgstr "Ekintza-mezuen izena marrazteko erabiliko den kolorea."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
+msgstr "Ekintza-Mezu Xuxurlatuen Izenaren Kolorea"
 
 msgid "Color to draw the name of a whispered action message."
-msgstr ""
+msgstr "Xuxurlatutako ekintza-mezuen izena marrazteko erabiliko den kolorea."
 
 msgid "Whisper Message Name Color"
-msgstr ""
+msgstr "Mezu Xuxurlatuen Izenaren Kolorea"
 
 msgid "Color to draw the name of a whispered message."
-msgstr ""
-
-#, fuzzy
+msgstr "Xuxurlatutako mezuen izena marrazteko erabiliko den kolorea."
+
 msgid "Typing notification color"
-msgstr "Kendu jakinarazpenak"
-
-#, fuzzy
+msgstr "Idazte-jakinarazpenaren kolorea"
+
 msgid "The color to use for the typing notification"
-msgstr "Mezu berrien jakinarazpenak"
-
-#, fuzzy
+msgstr "Idazte-jakinarazpenean erabiliko den kolorea."
+
 msgid "Typing notification font"
-msgstr "_Ireki jakinarazpen-leihoa "
+msgstr "Idazte-jakinarazpenaren letra-tipoa"
 
 msgid "The font to use for the typing notification"
-msgstr ""
-
-#, fuzzy
+msgstr "Idazte-jakinarazpenean erabiliko den letra-tipoa."
+
 msgid "Enable typing notification"
-msgstr "Mezu berrien jakinarazpenak"
+msgstr "Idazte-jakinarazpena gaitu"
 
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
 "Defaulting to PNG."
 msgstr ""
-"<span size='larger' weight='bold'>Fitxategi mota ezezaguna</span>\n"
+"<span size='larger' weight='bold'>Fitxategi-mota ezezaguna</span>\n"
 "\n"
 "Defektuz PNG ezarria."
 
@@ -12416,23 +11847,22 @@
 " %s"
 
 msgid "Save Image"
-msgstr "Gorde irudia"
+msgstr "Irudia Gorde"
 
 msgid "_Save Image..."
-msgstr "_Gorde irudia..."
-
-#, fuzzy
+msgstr "Irudia _Gorde..."
+
 msgid "_Add Custom Smiley..."
-msgstr "Erakutsi _aurpegiera grafikoak "
+msgstr "Smiley _Pertsonalizatua Gehitu..."
 
 msgid "Select Font"
-msgstr "Hautatu letra-tipoa"
+msgstr "Letra-Tipoa Hautatu"
 
 msgid "Select Text Color"
-msgstr "Hautatu testu-kolorea"
+msgstr "Testu-Kolorea Hautatu"
 
 msgid "Select Background Color"
-msgstr "Hautatu atzeko planoaren kolorea"
+msgstr "Atzealdeko Kolorea Hautatu"
 
 msgid "_URL"
 msgstr "_URLa"
@@ -12444,51 +11874,51 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"Sartu txertatu nahi duzun estekaren URL helbidea eta azalpena. Azalpena "
-"aukerakoa da."
+"Txertatu nahi duzun estekaren URLa eta azalpena sartu itzazu. Azalpena "
+"opzionala da."
 
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Sartu txertatu nahi duzun estekaren URL helbidea."
+msgstr "Txertatu nahi duzun estekaren URLa sartu ezazu."
 
 msgid "Insert Link"
-msgstr "Txertatu esteka"
+msgstr "Esteka Txertatu"
 
 msgid "_Insert"
 msgstr "_Txertatu"
 
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "Huts egin du irudia gordetzean: %s\n"
+msgstr "Ezin irudia gorde: %s\n"
 
 msgid "Insert Image"
-msgstr "Txertatu irudia"
+msgstr "Irudia Txertatu"
 
 #, c-format
 msgid ""
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
+"Smiley hau ezgaituta dago, smiley pertsonalizatu bat dagoelako lasterbide "
+"honentzat:\n"
+" %s"
 
 msgid "Smile!"
 msgstr "Irri egin!"
 
-#, fuzzy
 msgid "_Manage custom smileys"
-msgstr "Erakutsi _aurpegiera grafikoak "
+msgstr "Smiley pertsonalizatuak _kudeatu"
 
 msgid "This theme has no available smileys."
-msgstr "Gai honek ez du aurpegiera erabilgarririk"
-
-#, fuzzy
+msgstr "Gai honek ez du smiley-rik."
+
 msgid "_Font"
-msgstr "Letra-tipoak"
-
-#, fuzzy
+msgstr "_Letra-Tipoa"
+
 msgid "Group Items"
-msgstr "Taldearen izena"
+msgstr "Elementuak Taldekatu"
 
 msgid "Ungroup Items"
-msgstr ""
+msgstr "Elementuak Destaldekatu"
 
 msgid "Bold"
 msgstr "Lodia"
@@ -12500,146 +11930,130 @@
 msgstr "Azpimarratua"
 
 msgid "Strikethrough"
-msgstr ""
+msgstr "Zirriborratu"
 
 msgid "Increase Font Size"
-msgstr ""
+msgstr "Letra-Tamaina Handitu"
 
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "Letra-Tamaina Txikitu"
 
 msgid "Font Face"
-msgstr "Letra-tipoa"
-
-#, fuzzy
+msgstr "Letra-Tipoa"
+
 msgid "Foreground Color"
-msgstr "Aurreko planoko letraren kolorea"
-
-#, fuzzy
+msgstr "Aurrealdearen Kolorea"
+
 msgid "Reset Formatting"
-msgstr "Formateoa beregin"
-
-#, fuzzy
+msgstr "Formatoa Desegin"
+
 msgid "Insert IM Image"
-msgstr "Txertatu irudia"
-
-#, fuzzy
+msgstr "IM-Irudia Txertatu"
+
 msgid "Insert Smiley"
-msgstr "Txertatu aurpegiera"
-
-#, fuzzy
+msgstr "Smiley-a Txertatu"
+
 msgid "<b>_Bold</b>"
-msgstr "<b>%s:</b> "
-
-#, fuzzy
+msgstr "<b>_Lodia</b>"
+
 msgid "<i>_Italic</i>"
-msgstr " <i>(identifikatuta)</i>"
-
-#, fuzzy
+msgstr "<i>_Etzana</i>"
+
 msgid "<u>_Underline</u>"
-msgstr "Azpimarratua"
+msgstr "<u>_Azpimarratua</u>"
 
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr ""
-
-#, fuzzy
+msgstr "<span strikethrough='true'>Zirriborratua</span>"
+
 msgid "<span size='larger'>_Larger</span>"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Errorea irudia gordetzean</span>\n"
-"\n"
-"%s"
-
-#, fuzzy
+msgstr "<span size='larger'>_Handiagoa</span>"
+
 msgid "_Normal"
-msgstr "Normala"
+msgstr "_Normala"
 
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr ""
+msgstr "<span size='smaller'>_Txikiagoa</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#, fuzzy
 msgid "_Font face"
-msgstr "Letra-tipoa"
-
-#, fuzzy
+msgstr "_Letra-tipoa"
+
 msgid "Foreground _color"
-msgstr "Aurreko planoko letraren kolorea"
-
-#, fuzzy
+msgstr "A_urrealdearen kolorea"
+
 msgid "Bac_kground color"
-msgstr "Atzeko planoko kolorea"
-
-#, fuzzy
+msgstr "A_tzealdearen kolorea"
+
 msgid "_Image"
-msgstr "Gorde irudia"
-
-#, fuzzy
+msgstr "_Irudia"
+
 msgid "_Link"
-msgstr "_Sartu"
+msgstr "_Esteka"
 
 msgid "_Horizontal rule"
-msgstr ""
-
-#, fuzzy
+msgstr "Erregela _horizontala"
+
 msgid "_Smile!"
-msgstr "Irri egin!"
-
-#, fuzzy
+msgstr "_Irri egin!"
+
 msgid "Log Deletion Failed"
-msgstr "Konexioak huts egin du"
+msgstr "Errorea Txostena Ezabatzean"
 
 msgid "Check permissions and try again."
-msgstr ""
+msgstr "Baimenak egiaztatu eta berriro saiatu."
 
 # , fuzzy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
-msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
+msgstr ""
+"Ziur zaude %s(r)ekin %s(et)an hasitako solasaldiaren txostena betirako "
+"ezabatu nahi duzula?"
 
 # , fuzzy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
-msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
+msgstr ""
+"Ziur zaude %s(r)en %s(et)an hasitako solasaldiaren txostena betirako ezabatu "
+"nahi duzula?"
 
 # , fuzzy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
-msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
-
-#, fuzzy
+msgstr ""
+"Ziur zaude %s(et)an hasitako solasaldiaren txostena betirako ezabatu nahi "
+"duzula?"
+
 msgid "Delete Log?"
-msgstr "Ezabatu"
-
-#, fuzzy
+msgstr "Txostena Ezabatu?"
+
 msgid "Delete Log..."
-msgstr "Ezabatu"
+msgstr "Txostena Ezabatu..."
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Solasaldia %s  hemen %s</span>"
+msgstr "<span size='larger' weight='bold'>Solasaldia %s(e)n %s(r)ekin</span>"
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr ""
-"<span size='larger' weight='bold'>Solasaldia honekin %s hemen %s</span>"
+msgstr "<span size='larger' weight='bold'>Solasaldia %s(r)ekin %s(e)n</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Txosten-_direktorioa arakatu"
+
+#, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
-msgstr "Pidgin %s. Informazio gehiago nahi baduzu, idatzi `%s -h'.\n"
-
-#, fuzzy, c-format
+msgstr "%s %s. `%s -h' erabili ezazu informazio gehiago eskuratzeko.\n"
+
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12656,19 +12070,22 @@
 "  --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"
-
-#, fuzzy, c-format
+"%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 ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12684,17 +12101,20 @@
 "                      Without this only the first account will be enabled).\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"
+"Erabiltera: %s [AUKERA]...\n"
+"\n"
+"  -c, --config=DIR    DIR erbili konfigurazio-fitxategientzat\n"
+"  -d, --debug         'stdout'-en inprimatu arazte-mezuak\n"
+"  -f, --force-online  online egotera behartu, sare-egoera kontutan izan "
+"gabe\n"
+"  -h, --help          laguntza hau bistaratu eta irten\n"
+"  -m, --multiple      ez istantzia bakarra izatera 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"
+"  -v, --version       bertsio-zenbakia erakutsi eta irten\n"
 
 #, c-format
 msgid ""
@@ -12714,142 +12134,130 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#, fuzzy
 msgid "Pidgin"
-msgstr "Markatzea"
+msgstr "Pidgin"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "Ixten, beste libpurple-bezero bat martxan dagoelako jadanik.\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/_Multimedia"
 
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/Multimedia/E_skegi"
+
 msgid "Calling..."
-msgstr "Kalkulatzen..."
+msgstr "Deitzen..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s(e)k audio-/bideo-sesio bat hasiarazi nahi du zurekin."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s(e)k bideo-sesio bat hasiarazi nahi du zurekin."
 
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s erabiltzaileak mezu berri %d du."
-msgstr[1] "%s erabiltzaileak %d mezu berri ditu."
-
-#, fuzzy, c-format
+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>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>Plugin ezaugarriak</b>"
-msgstr[1] "<b>Plugin ezaugarriak</b>"
+msgstr[0] "<b>Posta berri %d.</b>"
+msgstr[1] "<b>%d posta berri.</b>"
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Arakatzailearen <b>\"%s\"</b> komandoa ez da baliozkoa."
+msgstr "Baliogabea da arakatzailearen <b>\"%s\"</b> agindua."
 
 msgid "Unable to open URL"
-msgstr "Ezin da URLa ireki"
+msgstr "Ezin URLa ireki"
 
 #, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "Errorea <b>\"%s\"</b> abiaraztean: %s"
+msgstr "Errorea \"%s\"abiaraztean: %s"
 
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
-"Arakatzailearen 'eskuzko' komandoa aukeratu da, baina ez da komandorik "
-"ezarri."
-
-#, fuzzy
+"Arakatzailearen 'Eskuz' komandoa aukeratu da, baina ez da komandorik ezarri."
+
 msgid "No message"
-msgstr "Mezu ezezaguna"
+msgstr "Mezurik ez"
 
 msgid "Open All Messages"
-msgstr "Ireki mezu guztiak"
+msgstr "Mezu Guztiak Ireki"
 
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Posta-mezua daukazu!</span>"
-
-#, fuzzy
+msgstr "<span weight=\"bold\" size=\"larger\">Posta daukazu!</span>"
+
 msgid "New Pounces"
-msgstr "Lagun-alerta berria"
+msgstr "Alerta Berriak"
 
 msgid "Dismiss"
-msgstr ""
+msgstr "Mespretxatu"
 
 #, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Posta-mezua daukazu!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Alerta daukazu!</span>"
 
 msgid "The following plugins will be unloaded."
-msgstr "Ondorengo plugin-ak  memoriatik deskargatuko  dira."
+msgstr "Plugin hauek memoriatik deskargatuko dira."
 
 msgid "Multiple plugins will be unloaded."
-msgstr "Plugin-ak anitz memoriatik deskargatuko dira."
+msgstr "Plugin ugari memoriatik deskargatuko dira."
 
 msgid "Unload Plugins"
-msgstr "Memoriatik deskargatu Plugin-ak"
-
-#, fuzzy
+msgstr "Pluginak Deskargatu"
+
 msgid "Could not unload plugin"
-msgstr "Ezin izan da gako publikoa kargatu"
+msgstr "Ezin plugina deskargatu"
 
 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
 msgstr ""
-
-#, fuzzy, c-format
+"Ezin izan da plugina deskargatu orain, baino hurrengo abioan ezgaituko da."
+
+#, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Eguneratzeko plugin-aren webgunea begiratu.</span>"
-
-#, fuzzy
+"<span foreground=\"red\" weight=\"bold\">Errorea: %s\n"
+"Pluginaren webgunera jo ezazu eguneraketa bila.</span>"
+
 msgid "Author"
-msgstr "Baimena eman"
-
-#, fuzzy
+msgstr "Egilea"
+
 msgid "<b>Written by:</b>"
-msgstr "<b>Honi bidaltzen:</b>"
-
-#, fuzzy
+msgstr "<b>Idazlea:</b>"
+
 msgid "<b>Web site:</b>"
-msgstr "<b>Honela bidaltzen:</b>"
-
-#, fuzzy
+msgstr "<b>Webgunea:</b>"
+
 msgid "<b>Filename:</b>"
-msgstr "_Erabiltzaile-izena:"
+msgstr "<b>Fitxategi-izena:</b>"
 
 msgid "Configure Pl_ugin"
-msgstr "Pl_uing-a konfiguratu"
+msgstr "Pl_uinga Konfiguratu"
 
 msgid "<b>Plugin Details</b>"
-msgstr "<b>Plugin ezaugarriak</b>"
+msgstr "<b>Plugin-Xehetasunak</b>"
 
 msgid "Select a file"
-msgstr "Hautatu fitxategia"
-
-#, fuzzy
+msgstr "Fitxategia Hautatu"
+
 msgid "Modify Buddy Pounce"
-msgstr "Editatu lagun-alerta"
+msgstr "Lagun-Alerta Modifikatu"
 
 #. Create the "Pounce on Whom" frame.
-#, fuzzy
 msgid "Pounce on Whom"
-msgstr "Alerta nori"
+msgstr "Norgatik egin Alerta"
 
 msgid "_Account:"
 msgstr "K_ontua:"
@@ -12864,46 +12272,46 @@
 msgstr "_Deskonektzean "
 
 msgid "Goes a_way"
-msgstr "Joanda egoera joan"
+msgstr "_Joatean"
 
 msgid "Ret_urns from away"
-msgstr "J_oanda egoeratik itzuli"
+msgstr "_Itzultzean"
 
 msgid "Becomes _idle"
-msgstr "Bihurtu ez-aktibo"
+msgstr "Ina_ktibo geratzean"
 
 msgid "Is no longer i_dle"
-msgstr "Ez da luzeagoz ez-aktibo egongo"
+msgstr "_Aktibatzean"
 
 msgid "Starts _typing"
-msgstr "_Idazten hastean"
+msgstr "Idazten _hastean"
 
 msgid "P_auses while typing"
-msgstr ""
+msgstr "Idazten _gelditzean"
 
 msgid "Stops t_yping"
-msgstr "_Idazteari gelditu"
+msgstr "Idazteari _uztean"
 
 msgid "Sends a _message"
-msgstr "Bidali _mezua"
+msgstr "_Mezua bidaltzean"
 
 msgid "Ope_n an IM window"
-msgstr "_Ireki BM leiho bat "
+msgstr "_IM leiho bat ireki"
 
 msgid "_Pop up a notification"
-msgstr "_Ireki jakinarazpen-leihoa "
+msgstr "_Jakinarazpen-leihoa ireki"
 
 msgid "Send a _message"
-msgstr "Bidali _mezua"
+msgstr "_Mezua bidali"
 
 msgid "E_xecute a command"
-msgstr "_Exekutatu komando bat"
+msgstr "Agindua _exekutatu"
 
 msgid "P_lay a sound"
-msgstr "_Jo soinu bat"
+msgstr "_Soinua erreproduzitu"
 
 msgid "Brows_e..."
-msgstr "_Arakatu... "
+msgstr "_Arakatu..."
 
 msgid "Br_owse..."
 msgstr "A_rakatu..."
@@ -12912,137 +12320,125 @@
 msgstr "_Aurrebista"
 
 # , fuzzy
-#, fuzzy
 msgid "P_ounce only when my status is not Available"
-msgstr "P_ounce bakarrik nire egoera eskuragarri ez nagoenean"
+msgstr "Nire egoera 'Eskuragaitz' denean bakarrik eman a_lerta"
 
 msgid "_Recurring"
-msgstr "_Errepikatzean"
-
-#, fuzzy
+msgstr "_Errepikakorra"
+
 msgid "Pounce Target"
-msgstr "Alerta noiz"
-
-#, fuzzy, c-format
+msgstr "Alertaren Helburua"
+
+#, c-format
 msgid "Started typing"
-msgstr "_Idazten hastean"
-
-#, fuzzy, c-format
+msgstr "Idazten hasi da"
+
+#, c-format
 msgid "Paused while typing"
-msgstr "Erabiltzailea idazten ari da..."
-
-#, fuzzy, c-format
+msgstr "Idazten gelditu da"
+
+#, c-format
 msgid "Signed on"
-msgstr "_Konektatzean "
-
-#, fuzzy, c-format
+msgstr "Konektatu da"
+
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s inaktibo egotetik itzuli da (%s)"
-
-#, fuzzy, c-format
+msgstr "Aktibatu da"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "J_oanda egoeratik itzuli"
-
-#, fuzzy, c-format
+msgstr "Itzuli da"
+
+#, c-format
 msgid "Stopped typing"
-msgstr "Gelditu idazteari"
-
-#, fuzzy, c-format
+msgstr "Idazteari utzi dio"
+
+#, c-format
 msgid "Signed off"
-msgstr "_Deskonektzean "
-
-#, fuzzy, c-format
+msgstr "Deskonektatu da"
+
+#, c-format
 msgid "Became idle"
-msgstr "Bihurtu ez-aktibo"
-
-#, fuzzy, c-format
+msgstr "Inaktibo geratu da"
+
+#, c-format
 msgid "Went away"
-msgstr "Kanpora joatean"
-
-#, fuzzy, c-format
+msgstr "Kanpora joan da"
+
+#, c-format
 msgid "Sent a message"
-msgstr "Bidali _mezua"
-
-#, fuzzy, c-format
+msgstr "Mezua bidali du"
+
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "Alerta emateko gertaera ezezaguna. Eman honen berri!"
-
-#, fuzzy
+msgstr "Ezezaguna... Eman honen berri!"
+
 msgid "Theme failed to unpack."
-msgstr "desenpetatzerakoan huts egin du."
-
-#, fuzzy
+msgstr "Ezin gaia erauzi."
+
 msgid "Theme failed to load."
-msgstr "desenpetatzerakoan huts egin du."
-
-#, fuzzy
+msgstr "Ezin gaia kargatu."
+
 msgid "Theme failed to copy."
-msgstr "desenpetatzerakoan huts egin du."
+msgstr "Ezin gaia kopiatu."
 
 msgid "Install Theme"
-msgstr ""
+msgstr "Gaia Instalatu"
 
 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 ""
-"Hautatu aurpegiera-gai bat beheko zerrendan. Gai berriak instalatzeko, "
-"arrastatu eta jaregin gaien zerrendan."
+"Erabili nahi duzun smiley-gaia hautatu ezazu azpiko zerrendan. Gai berriak "
+"instalatzeko, zerrendara arrastatu eta jaregin itzazu."
 
 msgid "Icon"
 msgstr "Ikonoa"
 
 msgid "Keyboard Shortcuts"
-msgstr ""
-
-#, fuzzy
+msgstr "Teklatu-Lasterbideak"
+
 msgid "Cl_ose conversations with the Escape key"
-msgstr "Solasaldiak %s(r)ekin"
+msgstr "Solasaldiak _itxi 'Escape' teklarekin"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Lagunen zerrenda"
+msgstr "Lagun-Zerrendaren Gaia"
 
 #. System Tray
 msgid "System Tray Icon"
-msgstr "Sistema-erretiluaren ikonoa"
-
-#, fuzzy
+msgstr "Sistema-Erretiluko Ikonoa"
+
 msgid "_Show system tray icon:"
-msgstr "Sistema-erretiluaren ikonoa"
-
-#, fuzzy
+msgstr "Erretiluko ikonoa _erakutsi:"
+
 msgid "On unread messages"
-msgstr "Irakurri gabeko mezuak"
-
-#, fuzzy
+msgstr "Irakurri gabeko mezuetan"
+
 msgid "Conversation Window"
-msgstr "IMko solasaldi-leihoak"
-
-#, fuzzy
+msgstr "Solasaldi-Leihoa"
+
 msgid "_Hide new IM conversations:"
-msgstr "_Eskutatu BM solasaldi berria"
+msgstr "IM-solasaldi berriak _ezkutatu:"
 
 msgid "When away"
 msgstr "Kanpora joatean"
 
-#, fuzzy
 msgid "Minimi_ze new conversation windows"
-msgstr "BMko solasaldi-leihoak"
+msgstr "Solasaldi-leiho berriak mi_nimizatu"
 
 #. All the tab options!
 msgid "Tabs"
-msgstr ""
+msgstr "Fitxak"
 
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Erakutsi _BMak eta berriketak fitxadun leihotan"
+msgstr "Fitxetan erakutsi _IMak eta berriketak"
 
 msgid "Show close b_utton on tabs"
-msgstr "Erakutsi _ixteko botoia fitxetan"
+msgstr "_Ixteko botoia erakutsi fitxetan"
 
 msgid "_Placement:"
-msgstr "_Kokalekua :"
+msgstr "_Kokalekua:"
 
 msgid "Top"
 msgstr "Goian"
@@ -13057,143 +12453,135 @@
 msgstr "Eskuinean"
 
 msgid "Left Vertical"
-msgstr "Ezker bertikala"
+msgstr "Ezker Bertikala"
 
 msgid "Right Vertical"
-msgstr "Eskubi bertikala "
+msgstr "Eskuin Bertikala "
 
 msgid "N_ew conversations:"
-msgstr "Solasaldia b_erria:"
+msgstr "Solasaldia b_erriak:"
 
 msgid "Show _formatting on incoming messages"
-msgstr "Erakutsi  datozen mezuen _formatua "
+msgstr "Iristen diren mezuen _formatua erakutsi"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr ""
-
-#, fuzzy
+msgstr "Fitxa itxi bezain laster itxi IMak"
+
 msgid "Show _detailed information"
-msgstr "Ezin da kanalaren informazioa eskuratu"
+msgstr "Informazio _xehetua erakutsi"
 
 msgid "Enable buddy ic_on animation"
-msgstr "_Gaitu lagunen ikonen animazioa"
+msgstr "Lagunen i_konoen animazioa gaitu"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "Jakinarazi _lagunei idazten ari zatzaizkienean"
+msgstr "_Idazten ari zarela jakinarazi lagunei"
 
 msgid "Highlight _misspelled words"
-msgstr "_Nabarmendu gaizki idatzitako hitzak "
+msgstr "Oker idatzitako hitzak _nabarmendu"
 
 msgid "Use smooth-scrolling"
-msgstr "Erabili mugimendu leuna norantza bertikalean"
-
-#, fuzzy
+msgstr "Korritze leuna erabili"
+
 msgid "F_lash window when IMs are received"
-msgstr "_Erakutsi leihoa keinuka mezuak jasotzean"
+msgstr "Leihoa_kliskatu IMak jasotzean"
 
 msgid "Minimum input area height in lines:"
-msgstr ""
-
-#, fuzzy
+msgstr "Sarrera-eremuaren altuera minimoa:"
+
 msgid "Font"
-msgstr "Letra-tipoak"
+msgstr "Letra-tipoa"
 
 msgid "Use document font from _theme"
-msgstr ""
+msgstr "Gaiaren _dokumentu-letra erabili"
 
 msgid "Use font from _theme"
-msgstr ""
-
-#, fuzzy
+msgstr "_Gaiaren letra-tipoa erabili"
+
 msgid "Conversation _font:"
-msgstr "Solasaldiako Sarrerak"
-
-#, fuzzy
+msgstr "Solasaldirako letra-_tipoa:"
+
 msgid "Default Formatting"
-msgstr "Formateoa beregin"
-
-#, fuzzy
+msgstr "Formato Lehenetsia"
+
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
-"Irteerako testudun mezuek edukiko duten itxura estiloa onartzen duten "
-"protokoloak erabiltzean. :)"
+"Honela ikusiko dira zuk bidalitako mezuak, formateatzea onartzen duten "
+"protokoloak erabiltzean."
 
 msgid "Cannot start proxy configuration program."
-msgstr ""
-
-#, fuzzy
+msgstr "Ezin proxy-konfigurazio programa hasiarazi."
+
 msgid "Cannot start browser configuration program."
-msgstr "Ezin da erabiltzailearen informazioa lortu"
+msgstr "Ezin nabigatzaile-konfigurazio programa hasiarazi."
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<span style=\"italic\">Adibidea: stunserver.org</span>"
+
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Automatikoki detektatu IP helbidea "
+msgstr "_Automatikoki detektatutako IP-helbidea erabili: %s"
 
 msgid "Public _IP:"
-msgstr "_IP publikoa:"
+msgstr "_IP Publikoa:"
 
 msgid "Ports"
 msgstr "Atakak"
 
 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "_Routerraren ataka-bideratze automatikoa gaitu"
 
 msgid "_Manually specify range of ports to listen on"
-msgstr "_Zehaztu eskuz entzuteko ataken barrutia"
+msgstr "_Eskuz zehaztu zein ataka-barruti entzun"
 
 msgid "_Start port:"
-msgstr "_Hasierako ataka: "
+msgstr "_Hasierako ataka:"
 
 msgid "_End port:"
-msgstr "_Amaierako ataka: "
+msgstr "_Amaierako ataka:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
-
-#, fuzzy
+msgstr "Relay Zerbitzaria (TURN)"
+
 msgid "Proxy Server &amp; Browser"
-msgstr "Proxy zerbitzaria"
+msgstr "Proxy Zerbitzaria &amp; Nabigatzailea"
 
 msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
+msgstr "<b>Ez da proxy-konfigurazio programa aurkitu.</b>"
 
 msgid "<b>Browser configuration program was not found.</b>"
-msgstr ""
+msgstr "<b>Ez da nabigatzaile-konfigurazio programa aurkitu.</b>"
 
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
-
-#, fuzzy
+"GNOME Hobespenetan konfiguratuak daude\n"
+"Proxy- eta Nabigatzaile-hobespenak"
+
 msgid "Configure _Proxy"
-msgstr "Gela _Konfiguratu"
-
-#, fuzzy
+msgstr "_Proxya Konfiguratu"
+
 msgid "Configure _Browser"
-msgstr "Gela _Konfiguratu"
+msgstr "_Nabigatzailea Konfiguratu"
 
 msgid "Proxy Server"
-msgstr "Proxy zerbitzaria"
+msgstr "Proxy Zerbitzaria"
 
 msgid "No proxy"
 msgstr "Proxy-rik ez"
 
 #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
 msgid "Use remote DNS with SOCKS4 proxies"
-msgstr ""
+msgstr "Urruneko DNSa erabili SOCKS4 proxy-ekin"
 
 msgid "_User:"
 msgstr "_Erabiltzailea:"
 
 msgid "Seamonkey"
-msgstr ""
+msgstr "Seamonkey"
 
 msgid "Opera"
 msgstr "Opera"
@@ -13207,12 +12595,11 @@
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#, fuzzy
 msgid "Desktop Default"
-msgstr "Lehenetsiak _onartu"
+msgstr "Mahaigainaren Lehenetsia"
 
 msgid "GNOME Default"
-msgstr "Gnome-ren lehenetsia "
+msgstr "Gnome-ren Lehenetsia"
 
 msgid "Galeon"
 msgstr "Galeon"
@@ -13230,22 +12617,22 @@
 msgstr "Eskuz"
 
 msgid "Browser Selection"
-msgstr "Arakatzailea hautatzea"
+msgstr "Nabigatzaile-Hautaketa"
 
 msgid "_Browser:"
-msgstr "_Arakatzailea:"
+msgstr "_Nabigatzailea:"
 
 msgid "_Open link in:"
-msgstr "_Ireki esteka:"
+msgstr "_Hemen ireki esteka:"
 
 msgid "Browser default"
-msgstr "Arakatzaile lehenetsian"
+msgstr "Arakatzailearen lehenetsian"
 
 msgid "Existing window"
-msgstr "Lehendik dagoen leihoan"
+msgstr "Lehengo leihoan"
 
 msgid "New tab"
-msgstr "Fitxa berrian"
+msgstr "Fitxa berria"
 
 #, c-format
 msgid ""
@@ -13256,49 +12643,49 @@
 "(%s - URL)"
 
 msgid "Log _format:"
-msgstr "_Egunkari-formatua: "
+msgstr "_Txosten-formatua:"
 
 msgid "Log all _instant messages"
-msgstr "Erregistratu _egunkarian berehalako mezu guztiak "
+msgstr "_Istanteko mezu guztiak gorde"
 
 msgid "Log all c_hats"
-msgstr "Erreg_istratu egunkarian berriketa guztiak"
+msgstr "_Berriketa guztiak gorde"
 
 msgid "Log all _status changes to system log"
-msgstr "Egunkarian gorde _egoera aldaketa guztiak egunkari sistema bidez"
+msgstr "_Egoera-aldaketa guztiak gorde"
 
 msgid "Sound Selection"
-msgstr "Soinua hautatzea"
-
-#, fuzzy, c-format
+msgstr "Soinu-Hautaketa"
+
+#, c-format
 msgid "Quietest"
-msgstr "Erreserbatua"
-
-#, fuzzy, c-format
+msgstr "Ixilena"
+
+#, c-format
 msgid "Quieter"
-msgstr "Irten"
+msgstr "Ixilagoa"
 
 #, c-format
 msgid "Quiet"
-msgstr "Irten "
+msgstr "Ixila"
 
 #, c-format
 msgid "Loud"
-msgstr "Altu esan "
-
-#, fuzzy, c-format
+msgstr "Ozena"
+
+#, c-format
 msgid "Louder"
-msgstr "ordu"
-
-#, fuzzy, c-format
+msgstr "Ozenagoa"
+
+#, c-format
 msgid "Loudest"
-msgstr "Soinuak"
+msgstr "Ozenena"
 
 msgid "_Method:"
 msgstr "_Metodoa:"
 
 msgid "Console beep"
-msgstr "Kontsolaren soinu-seinalea"
+msgstr "Kontsolaren soinua"
 
 msgid "No sounds"
 msgstr "Soinurik ez"
@@ -13308,100 +12695,91 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"Soinuaren k_omandoa:\n"
+"Soinu-_agindua:\n"
 "(%s fitxategi-izena)"
 
-#, fuzzy
 msgid "M_ute sounds"
-msgstr "Mututu soinuak"
+msgstr "Soinuak m_ututu"
 
 msgid "Sounds when conversation has _focus"
 msgstr "_Solasaldiak fokua duenean"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Ahalbidetu Kontua"
-
-#, fuzzy
+msgstr "Soinuak _gaitu:"
+
 msgid "V_olume:"
-msgstr "Bolumena:"
+msgstr "B_olumena:"
 
 msgid "Play"
 msgstr "Erreproduzitu"
 
-#, fuzzy
 msgid "_Browse..."
-msgstr "_Arakatu... "
-
-#, fuzzy
+msgstr "_Arakatu..."
+
 msgid "_Reset"
-msgstr "Berrezarri"
+msgstr "_Berrezarri"
 
 msgid "_Report idle time:"
-msgstr "Ezagutarazi _inaktibotasun-denborak"
+msgstr "_inaktibotasun-denbora:"
 
 msgid "Based on keyboard or mouse use"
 msgstr "Teklatu edo saguaren erabilpenean oinarrituta"
 
 msgid "_Auto-reply:"
-msgstr "_Erantzun _automatikoki"
+msgstr "_Auto-erantzuna:"
 
 msgid "When both away and idle"
-msgstr "Bai Kanpoan eta inaktibo dagoenean"
+msgstr "Kanpoan edo inaktibo egotean"
 
 #. Auto-away stuff
 msgid "Auto-away"
-msgstr "Kanpoan automatikoki ezartzea"
-
-#, fuzzy
+msgstr "Auto-atera"
+
 msgid "_Minutes before becoming idle:"
-msgstr "_Egoera aldatu aurreko minutuak:"
+msgstr "_Inaktibo geratu arteko minutuak:"
 
 msgid "Change status when _idle"
-msgstr "Egoera aldatu _ez-aktibo dagoenean"
+msgstr "Egoera aldatu _inaktibo egotean"
 
 msgid "Change _status to:"
-msgstr "_Egoera  aldatu hona:"
+msgstr "_Egoera honetara aldatu:"
 
 #. Signon status stuff
-#, fuzzy
 msgid "Status at Startup"
-msgstr "Hasierako egoera"
+msgstr "Abioko Egoera"
 
 msgid "Use status from last _exit at startup"
-msgstr "Erabili azkeneko irteteerako egoera hasieratzeko"
+msgstr "Azkeneko exekuzioko egoera erabili abiaraztean"
 
 msgid "Status to a_pply at startup:"
-msgstr "Haserako egoera ezartzeko:"
-
-#, fuzzy
+msgstr "Abioan e_zarriko den egoera:"
+
 msgid "Interface"
-msgstr "Koloreen Interfaze"
+msgstr "Interfazea"
 
 msgid "Smiley Themes"
-msgstr "Aurpegiera-gaiak"
+msgstr "Smiley-Gaiak"
 
 msgid "Browser"
 msgstr "Arakatzailea"
 
-#, fuzzy
 msgid "Status / Idle"
-msgstr "Kanpoan / Inaktibo"
+msgstr "Egoera / Inaktibo"
 
 msgid "Allow all users to contact me"
-msgstr "Onartu erabiltzaile guztiek nirekin kontaktatzea"
+msgstr "Erabiltzaile guztien deiak onartu"
 
 msgid "Allow only the users on my buddy list"
-msgstr "Onartu lagunen zerrendako erabiltzaileak bakarrik"
+msgstr "Nire lagun-zerrendako erabiltzaileak bakarrik onartu"
 
 msgid "Allow only the users below"
-msgstr "Onartu beheko erabiltzaileak bakarrik"
+msgstr "Azpiko erabiltzaileak bakarrik onartu"
 
 msgid "Block all users"
-msgstr "Blokeatu erabiltzaile guztiak"
+msgstr "Erabiltzaile guztiak blokeatu"
 
 msgid "Block only the users below"
-msgstr "Blokeatu beheko erabiltzaileak bakarrik"
+msgstr "Azpiko erabiltzaileak bakarrik blokeatu"
 
 msgid "Privacy"
 msgstr "Pribatutasuna"
@@ -13410,45 +12788,44 @@
 msgstr "Pribatutasun-ezarpenetako aldaketak berehala aplikatuko dira."
 
 msgid "Set privacy for:"
-msgstr "Ezarri pribatutasuna:"
+msgstr "Pribatutasuna ezarri:"
 
 #. Remove All button
-#, fuzzy
 msgid "Remove Al_l"
-msgstr "Kendu"
+msgstr "De_na Kendu"
 
 msgid "Permit User"
-msgstr "Onartu erabiltzailea"
+msgstr "Erabiltzailea Onartu"
 
 msgid "Type a user you permit to contact you."
-msgstr "Eman zurekin kontaktatzea onartzen duzun erabiltzailearen izena."
+msgstr "Zu deitzera baimentzen duzun erabiltzailearen izena."
 
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Eman zurekin kontaktatzea nahi duzun erabiltzailearen izena."
+msgstr "Zu deitzera baimendu nahi duzun erabiltzailearen izena idatzi ezazu."
 
 msgid "_Permit"
 msgstr "_Baimendu"
 
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "Onartzen duzu %s erabiltzaileak zurekin kontaktatzea?"
+msgstr "%s zu deitzera baimendu?"
 
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Ziur zaude nahi duzula %s erabiltzaileak zurekin kontaktatzea?"
+msgstr "Ziur zaude %s zu deitzera baimendu nahi duzula?"
 
 msgid "Block User"
-msgstr "Blokeatu erabiltzailea"
+msgstr "Erabiltzailea Blokeatu"
 
 msgid "Type a user to block."
-msgstr "Eman blokeatu nahi duzun erabiltzailearen izena."
+msgstr "Blokeatu nahi duzunaren izena idatzi."
 
 msgid "Please enter the name of the user you wish to block."
-msgstr "Eman blokeatu nahi duzun erabiltzailearen izena."
+msgstr "Blokeatu nahi duzun erabiltzailearen izena idatzi ezazu."
 
 #, c-format
 msgid "Block %s?"
-msgstr "%s blokeatu nahi duzu?"
+msgstr "%s blokeatu?"
 
 #, c-format
 msgid "Are you sure you want to block %s?"
@@ -13458,39 +12835,38 @@
 msgstr "Aplikatu"
 
 msgid "That file already exists"
-msgstr "Fitxategi hori badago"
+msgstr "Fitxategia existitzen da jadanik"
 
 msgid "Would you like to overwrite it?"
-msgstr "Gainidatzi nahi duzu?"
+msgstr "Gainidatzi nahi al duzu?"
 
 msgid "Overwrite"
-msgstr "Gainean idatzi"
+msgstr "Gainidatzi"
 
 msgid "Choose New Name"
-msgstr "Aukeratu izen berria"
+msgstr "Izen Berria Hautatu"
 
 msgid "Select Folder..."
-msgstr "Hautatu karpeta..."
+msgstr "Direktorioa Hautatu..."
 
 #. list button
 msgid "_Get List"
-msgstr "_Hartu zerrenda"
+msgstr "_Zerrenda Eskuratu"
 
 #. add button
 msgid "_Add Chat"
-msgstr "_Gehitu berriketa"
+msgstr "_Berriketa Gehitu"
 
 # , fuzzy
-#, fuzzy
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Zihur al zaude \"pounce\" -an %s %s-entzako ezabatu nahi duzu ?"
+msgstr "Ziur zaude egoera gordeak ezabatu nahi dituzula?"
 
 #. Use button
 msgid "_Use"
 msgstr "_Erabili"
 
 msgid "Title already in use.  You must choose a unique title."
-msgstr "Titulua erabilia dago. Berria aukeratu."
+msgstr "Titulua erabilpean dago jadanik. Beste bat hautatu ezazu."
 
 msgid "Different"
 msgstr "Ezberdina"
@@ -13503,141 +12879,129 @@
 
 #. Different status message expander
 msgid "Use a _different status for some accounts"
-msgstr "Erabili egoera _ezbedinak kontu batzuentzat"
+msgstr "Egoera _ezberdina erabili kontu batzuetarako"
 
 #. Save & Use button
 msgid "Sa_ve & Use"
-msgstr "G_orde eta erabili"
+msgstr "G_orde eta Erabili"
 
 #, c-format
 msgid "Status for %s"
-msgstr "Egoera : %s rako."
+msgstr "%s(e)rako egoera"
 
 #, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-
-#, fuzzy
+"Jadanik badago '%s'(r)entzako smiley pertsonalizatu bat.  Lasterbide "
+"ezberdin bat erabili ezazu."
+
 msgid "Custom Smiley"
-msgstr "Txertatu aurpegiera"
-
-#, fuzzy
+msgstr "Smiley Pertsonalizatua"
+
 msgid "Duplicate Shortcut"
-msgstr "Bikoiztutako zuzenketa"
-
-#, fuzzy
+msgstr "Lasterbide Bikoiztua"
+
 msgid "Edit Smiley"
-msgstr "Txertatu aurpegiera"
-
-#, fuzzy
+msgstr "Smiley-a Editatu"
+
 msgid "Add Smiley"
-msgstr "Irri egin!"
-
-#, fuzzy
+msgstr "Smiley-a Gehitu"
+
 msgid "_Image:"
-msgstr "Gorde irudia"
+msgstr "_Irudia:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Ataka"
-
-#, fuzzy
+msgstr "_Lasterbide-testua:"
+
 msgid "Smiley"
-msgstr "Irri egin!"
-
-#, fuzzy
+msgstr "Smiley-a"
+
 msgid "Shortcut Text"
-msgstr "Ataka"
+msgstr "Lasterbide-Testua"
 
 msgid "Custom Smiley Manager"
-msgstr ""
-
-#, fuzzy
+msgstr "Smiley Pertsonalizatuen Kudeatzailea"
+
 msgid "Select Buddy Icon"
-msgstr "Hautatu laguna"
+msgstr "Lagun-Ikonoa Hautatu"
 
 msgid "Click to change your buddyicon for this account."
-msgstr ""
+msgstr "Klik egizu kontu honentako zure lagun-ikonoa aldatzeko."
 
 msgid "Click to change your buddyicon for all accounts."
-msgstr ""
-
-#, fuzzy
+msgstr "Klik egizu kontu guztietako zure lagun-ikonoa aldatzeko."
+
 msgid "Waiting for network connection"
-msgstr "Transferentziaren zain hasteko"
-
-#, fuzzy
+msgstr "Sare-konexioaren zain"
+
 msgid "New status..."
-msgstr "Mezu berria..."
-
-#, fuzzy
+msgstr "Egoera berria..."
+
 msgid "Saved statuses..."
-msgstr "Gorde egoerak"
-
-#, fuzzy
+msgstr "Egoera gordeak..."
+
 msgid "Status Selector"
-msgstr "Egoera-testua"
+msgstr "Egoera-Hautatzailea"
 
 msgid "Google Talk"
-msgstr ""
+msgstr "Google Talk"
 
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "Kargatzerakoan ondorengo errorea gertatu da %s: %s"
+msgstr "Ondorengo errorea gertatu da %s kargatzean: %s"
 
 msgid "Failed to load image"
-msgstr "Huts egin du irudia kargatzerakoan"
+msgstr "Ezin irudia kargatu"
 
 #, c-format
 msgid "Cannot send folder %s."
-msgstr "Ezin da karpeta %s bidali."
-
-#, fuzzy, c-format
+msgstr "Ezin %s direktorioa bidali."
+
+#, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
-"Pidgin -ek ezin du karpeta bidali. Fitxategiak banan-bana bidali beharko "
+"%s(e)k ezin ditu direktorioak bidali. Fitxategiak banan-banan bidali beharko "
 "dituzu."
 
 msgid "You have dragged an image"
-msgstr "Herrestan eraman duzu irudia "
+msgstr "Irudi bat arrastatu duzu"
 
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-"Irudi hau fitxategi transferentzi bezela bidali dezakezu,  mezuan txertatu, "
-"edo lagunaren ikono bezela erabili erabiltzaile honentzako."
+"Fitxategi-transferentzia bezela bidali dezakezu irudi hau, mezuan txertatu "
+"dezakezu, edo erabiltzaile honen lagun-ikono bezela erabili dezakezu."
 
 msgid "Set as buddy icon"
-msgstr "Ezarri lagunaren ikonoa"
+msgstr "Lagun-ikono bezala ezarri"
 
 msgid "Send image file"
-msgstr "Bidali irudi fitxategia"
+msgstr "Irudi-fitxategia bidali"
 
 msgid "Insert in message"
-msgstr "Txertatu irudia mezuan"
+msgstr "Mezuan txertatu"
 
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Ikono hau lagunaren ikono bezela ezartzea gustatuko litzaizuke ?"
-
-#, fuzzy
+msgstr "Erabiltzaile honen lagun-ikono bezala ezarri nahi al duzu?"
+
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Irudi hau fitxategi transferentzi bezela bidali dezakezu,  mezuan txertatu, "
-"edo lagunaren ikono bezela erabili erabiltzaile honentzako."
+"Irudi hau fitxategi-transferentzia modura bidali dezakezu, edo erabiltzaile "
+"honen lagun-ikono bezala erabili."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Irudi hau  mezuan txertatu dezakezu , edo lagunaren ikono bezela erabili "
-"erabiltzaile honentzako."
+"Irudi hau mezu honetan txertatu dezakezu, edo erabiltzaile honen lagun-ikono "
+"bezela erabili dezakezu"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
@@ -13645,15 +13009,14 @@
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
 msgid "Cannot send launcher"
-msgstr "Ezinezkoa  jaurtitzailea  bidaltzea"
-
-#, fuzzy
+msgstr "Ezin jaurtitzailea bidali"
+
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
-"Mahaingain-eko jaurtigailua herrestan eraman duzu. Seguraski beste zeozer "
-"bidali nahiko zenuen. "
+"Mahaingaineko abiarazle bat arrastatu duzu. Ziurrenik, abiarazle honen "
+"helburua bidali nahi zenuen abiarazlearen ordez."
 
 #, c-format
 msgid ""
@@ -13668,113 +13031,119 @@
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
-
-#, fuzzy
+"'%s' fitxategia handiegia da %s(r)entzako.  Irudi txikiago batekin saiatu.\n"
+
 msgid "Icon Error"
-msgstr "Testigu errorea"
-
-#, fuzzy
+msgstr "Ikono-Errorea"
+
 msgid "Could not set icon"
-msgstr "Ezin izan da bidali"
-
-#, fuzzy, c-format
+msgstr "Ezin ikonoa ezarri"
+
+#, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Huts egin du irudia gordetzean: %s\n"
+msgstr "Ezin '%s' fitxategia ireki: %s"
 
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-
-#, fuzzy
+"Ezin '%s' irudia kargatu: zergatia ezezaguna da, ziurrenik irudi baliogabea"
+
 msgid "_Open Link"
-msgstr "_Ireki esteka:"
+msgstr "Esteka _Ireki"
 
 msgid "_Copy Link Location"
-msgstr "_Kopiatu estekaren helbidea"
+msgstr "Estekaren Helbidea _Kopiatu"
 
 msgid "_Copy Email Address"
-msgstr "_Kopiatu helbide elektronikoa"
+msgstr "Helbide Elektronikoa _Kopiatu"
+
+msgid "_Open File"
+msgstr "Fitxategia _Ireki"
+
+msgid "Open _Containing Directory"
+msgstr ""
 
 msgid "Save File"
-msgstr "Gorde fitxategia"
+msgstr "Fitxategia Gorde"
+
+msgid "_Play Sound"
+msgstr "_Soinua Erreproduzitu"
+
+msgid "_Save File"
+msgstr "Fitxategia _Gorde"
 
 msgid "Select color"
-msgstr "Hautatu kolorea"
+msgstr "Kolorea Hautatu"
 
 msgid "_Alias"
-msgstr "_Aliasa"
+msgstr "_Ezizena"
 
 msgid "Close _tabs"
-msgstr "_Tapakiak  itxi"
+msgstr "_Fitxak itxi"
 
 msgid "_Get Info"
-msgstr "Informazioa _Lortu"
+msgstr "Informazioa _Eskuratu"
 
 msgid "_Invite"
 msgstr "_Gonbidatu"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_Aldatu"
-
-#, fuzzy
+msgstr "_Modifikatu..."
+
 msgid "_Add..."
-msgstr "_Gehitu"
+msgstr "_Gehitu..."
 
 msgid "_Open Mail"
-msgstr "_Ireki posta"
+msgstr "_Posta Ireki"
+
+msgid "_Pause"
+msgstr "_Pausarazi"
 
 msgid "_Edit"
-msgstr ""
-
-#, fuzzy
+msgstr "_Editatu"
+
 msgid "Pidgin Tooltip"
-msgstr "Markatzea"
+msgstr "Pidgin Aholkua"
 
 msgid "Pidgin smileys"
-msgstr ""
+msgstr "Pidgin smiley-ak"
 
 msgid "Penguin Pimps"
-msgstr ""
+msgstr "Pinguino Proxenetak"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr ""
-
-#, fuzzy
+msgstr "Hau hautatzean, emotikono grafikoak ezgaituko dira."
+
 msgid "none"
-msgstr "Edozein"
-
-#, fuzzy
+msgstr "batere ez"
+
 msgid "Small"
-msgstr "Helb. el."
+msgstr "Txikia"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
-
-#, fuzzy
+msgstr "Smily-en bertsio txikiagoak"
+
 msgid "Response Probability:"
-msgstr "Erantzunak galdu dira"
-
-#, fuzzy
+msgstr "Erantzun-Probabilitatea:"
+
 msgid "Statistics Configuration"
-msgstr "Musika-mezuen konfigurazioa"
+msgstr "Estatistika-Konfigurazioa"
 
 #. msg_difference spinner
 msgid "Maximum response timeout:"
-msgstr ""
-
-#, fuzzy
+msgstr "Erantzunen denbora-muga:"
+
 msgid "minutes"
-msgstr "minutu."
+msgstr "minutu"
 
 #. last_seen spinner
 msgid "Maximum last-seen difference:"
-msgstr ""
+msgstr "'Azkenekoz ikusia' tarte maximoa:"
 
 #. threshold spinner
 msgid "Threshold:"
-msgstr ""
+msgstr "Muga:"
 
 #. *< type
 #. *< ui_requirement
@@ -13783,88 +13152,79 @@
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr ""
+msgstr "Kontaktu-Eskuragarritasun Aurreikuspena"
 
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr ""
+msgstr "Kontaktu-Eskuragarritasun Aurreikuspen plugina"
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""
-
-#, fuzzy
+"Zure lagunen eskuragarritasunaren inguruko informazio estatistikoa erakusten "
+"du"
+
 msgid "Server name request"
-msgstr "Zerbitzariaren helbidea"
-
-#, fuzzy
+msgstr "Zerbitzari-izen eskaera"
+
 msgid "Enter an XMPP Server"
-msgstr "Sartu konferentzia-zerbitzari bat"
-
-#, fuzzy
+msgstr "XMPP Zerbitzarira sartu"
+
 msgid "Select an XMPP server to query"
-msgstr "Hautatu konferentzia-zerbitzari bat kontsulta egiteko"
-
-#, fuzzy
+msgstr "Galdetzeko XMPP-zerbitzari bat hautatu"
+
 msgid "Find Services"
-msgstr "Zerbitzuak linean"
-
-#, fuzzy
+msgstr "Zerbitzuak Bilatu"
+
 msgid "Add to Buddy List"
-msgstr "Bidali lagunen zerrenda"
-
-#, fuzzy
+msgstr "Lagun-Zerrendara Gehitu"
+
 msgid "Gateway"
-msgstr "Joanda egoera joan"
-
-#, fuzzy
+msgstr "Pasabidea"
+
 msgid "Directory"
-msgstr "Bilatu direktorioa"
-
-#, fuzzy
+msgstr "Direktorioa"
+
 msgid "PubSub Collection"
-msgstr "Soinua hautatzea"
+msgstr "PubSub Kolekzioa"
 
 msgid "PubSub Leaf"
 msgstr ""
 
-#, fuzzy
 msgid ""
 "\n"
 "<b>Description:</b> "
 msgstr ""
 "\n"
-"<b>Azalpena:</b> Beldurgarria"
+"<b>Deskribapena:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Ezarri Dir informazioa"
-
-#, fuzzy
+msgstr "Zerbitzu-Atzematea"
+
 msgid "_Browse"
-msgstr "_Arakatzailea:"
-
-#, fuzzy
+msgstr "_Arakatu"
+
 msgid "Server does not exist"
-msgstr "Erabiltzailea ez dago"
-
-#, fuzzy
+msgstr "Zerbitzaria ez da existitzen"
+
 msgid "Server does not support service discovery"
-msgstr "Zerbitzariak ez du erabiltzen autentifikazio-metodo onarturik"
-
-#, fuzzy
+msgstr "Zerbitzariak ez du zerbitzu-atzematea onartzen"
+
 msgid "XMPP Service Discovery"
-msgstr "Ezarri Dir informazioa"
+msgstr "XMPP Zerbitzu Atzematea"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
+msgstr "Zerbitzuak arakatu eta erregistratzea ahalbidetzen du."
+
+#, fuzzy
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
+"Plugin hau trasnporte zahar eta beste XMPP-zerbitzu batzuk erregistratzeko "
+"erabilgarria da."
 
 msgid "Buddy is idle"
 msgstr "Laguna inaktibo dago"
@@ -13873,30 +13233,30 @@
 msgstr "Laguna kanpoan dago"
 
 msgid "Buddy is \"extended\" away"
-msgstr "Laguna \""
+msgstr "Laguna \"luzarorako\" dago kanpoan"
 
 #. Not used yet.
 msgid "Buddy is mobile"
-msgstr "Laguna mugikorra denean"
+msgstr "Laguna mugikorra DA"
 
 msgid "Buddy is offline"
-msgstr "Laguna lineaz kanpo dago"
+msgstr "Laguna offline dago"
 
 msgid "Point values to use when..."
-msgstr "Seinalatu zein balio erabili..."
+msgstr "Zein balio erabili..."
 
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
 msgstr ""
-"<i>Puntuazio altuena</i> duen laguna kontaktuetan lehentasuna edukiko duen "
-"laguna da.\n"
+"<i>Puntuazio altuena</i> duen laguna izango da kontakturako lehentasuna "
+"izango duena.\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr "Erabili azken laguna puntuazioa berdina denean"
+msgstr "Azken laguna erabili puntuazioa berdina denean"
 
 msgid "Point values to use for account..."
-msgstr "Seinalatu zein balio erabili konturako..."
+msgstr "Zein balio erabili konturako..."
 
 #. *< type
 #. *< ui_requirement
@@ -13905,7 +13265,7 @@
 #. *< priority
 #. *< id
 msgid "Contact Priority"
-msgstr "Kontaktu-lehentasuna"
+msgstr "Kontaktu-Lehentasuna"
 
 #. *< name
 #. *< version
@@ -13913,63 +13273,55 @@
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
-"Lagunen egoera bakoitzari asoziatutako balioak kudeatzeko aukera ematen du."
+"Lagun-egoera ezberdinekin asoziatutako balioak kudeatzeko aukera ematen du."
 
 #. *< description
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Aukera ematen du lagunen inaktibo/kanpoan/lineaz kanpo egoeren puntuazioaren "
-"balioak aldatzeko kontaktu-lehentasunen kalkuluetan."
-
-#, fuzzy
+"Kontaktu-lehentasun kalkuluetan lagunen inaktibo/kanpoan/offline "
+"egoeretarako erabiliko diren balioak aldatzeko aukera ematen du."
+
 msgid "Conversation Colors"
-msgstr "/Solasaldia/It_xi"
-
-#, fuzzy
+msgstr "Solasaldi-Koloreak"
+
 msgid "Customize colors in the conversation window"
-msgstr "BMko solasaldi-leihoak"
-
-#, fuzzy
+msgstr "Solasaldi-leihoko koloreak pertsonalizatu"
+
 msgid "Error Messages"
-msgstr "Irakurri gabeko mezuak"
-
-#, fuzzy
+msgstr "Errore.Mezuak"
+
 msgid "Highlighted Messages"
-msgstr "Aurkitutako azpimarratu"
-
-#, fuzzy
+msgstr "Mezu Nabarmenduak"
+
 msgid "System Messages"
-msgstr "Irakurri gabeko mezuak"
-
-#, fuzzy
+msgstr "Sistemaren Mezuak"
+
 msgid "Sent Messages"
-msgstr "Ireki mezu guztiak"
-
-#, fuzzy
+msgstr "Bidalitako Mezuak"
+
 msgid "Received Messages"
-msgstr "Irakurri gabeko mezuak"
+msgstr "Jasotako Mezuak"
 
 #, c-format
 msgid "Select Color for %s"
-msgstr "Hautatu testu-kolorea honentzako  %s"
+msgstr "%s(e)rako Kolorea Hautatu"
 
 msgid "Ignore incoming format"
-msgstr ""
-
-#, fuzzy
+msgstr "Jasotako formato ezikusi"
+
 msgid "Apply in Chats"
-msgstr "Ezizena berriketarako"
+msgstr "Solasaldietan Aplikatu"
 
 msgid "Apply in IMs"
-msgstr ""
+msgstr "IMetan Aplikatu"
 
 msgid "By conversation count"
 msgstr "Solasaldi kopuruaren arabera"
 
 msgid "Conversation Placement"
-msgstr "Solasaldiaren kokalekua"
+msgstr "Solasaldiaren Kokalekua"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
 msgid ""
@@ -13978,10 +13330,10 @@
 msgstr ""
 
 msgid "Number of conversations per window"
-msgstr "Solasaldi kopurua leihoko"
+msgstr "Leiho bakoitzeko solasaldi kopurua"
 
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Bereiztu IM eta berriketa leihoak zenbakien araberan kokatzean"
+msgstr "IM- eta berriketa-leihoak bereiztu zenbakien arabera kokatzean"
 
 #. *< type
 #. *< ui_requirement
@@ -13990,12 +13342,12 @@
 #. *< priority
 #. *< id
 msgid "ExtPlacement"
-msgstr "ExtPlacement "
+msgstr "ExtKokaleku"
 
 #. *< name
 #. *< version
 msgid "Extra conversation placement options."
-msgstr "Solasaldi-kokaleku gehigarrien  aukerak."
+msgstr "Solasaldi-kokaleku aukera extrak."
 
 #. *< summary
 #. *  description
@@ -14003,21 +13355,22 @@
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Murriztu solasaldi kopurua leihoko, IMk eta berriketak bereizteko aukerarekin"
+"Leiho bakoitzeko solasaldi kopurua murriztu, nahi izanez gero, IM eta "
+"berriketak bereizten"
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
-msgstr "Sagu-mugimenduen konfigurazioa"
+msgstr "Sagu-Mugimendu Konfigurazioa"
 
 msgid "Middle mouse button"
 msgstr "Saguaren erdiko botoia"
 
 msgid "Right mouse button"
-msgstr "Saguaren eskuineko botoia"
+msgstr "Saguaren eskuin-botoia"
 
 #. "Visual gesture display" checkbox
 msgid "_Visual gesture display"
-msgstr "_Mugimendu bisualen bistaratzea"
+msgstr "_Keinu-bistaratze bisuala"
 
 #. *< type
 #. *< ui_requirement
@@ -14026,16 +13379,15 @@
 #. *< priority
 #. *< id
 msgid "Mouse Gestures"
-msgstr "Sagu-mugimenduak"
+msgstr "Sagu-Keinuak"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Provides support for mouse gestures"
-msgstr "Sagu-mugimenduen euskarria ematen du"
+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"
@@ -14043,38 +13395,40 @@
 " • 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 "Berehalako mezularitza"
+msgstr "Istanteko Mezularitza"
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
-msgstr "Hautatu pertsona bat beheko helbide-liburuan, edo gehitu pertsona bat."
+msgstr ""
+"Zure helbide-liburuko pertsona bat hautatu ezazu azpian, edo berria gehitu "
+"ezazu."
 
 msgid "Group:"
 msgstr "Taldea:"
 
 #. "New Person" button
 msgid "New Person"
-msgstr "Pertsona berria"
+msgstr "Pertsona Berria"
 
 #. "Select Buddy" button
 msgid "Select Buddy"
-msgstr "Hautatu laguna"
+msgstr "Laguna Hautatu"
 
 #. Add the label.
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
-"Hautatu helbide-liburuko pertsona bat lagun hau gehitzeko, edo sortu "
-"pertsona bat."
+"Zure helbide-liburuko pertsona bat hautatu ezazu lagun hau bertara "
+"gehitzeko, edo pertsona berria sortu ezazu."
 
 #. Add the expander
 msgid "User _details"
@@ -14082,30 +13436,30 @@
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr "_Asoziatu laguna"
+msgstr "Laguna _Asoziatu"
 
 msgid "Unable to send email"
-msgstr "Ezin da posta-mezua bidali."
+msgstr "Ezin e-posta bidali."
 
 msgid "The evolution executable was not found in the PATH."
-msgstr "Evolution-en Exukatagarria ez da bere helbidean topatu. "
+msgstr "Ez da evolution-en exekutagarria aurkitu bere bidean."
 
 msgid "An email address was not found for this buddy."
-msgstr ""
+msgstr "Ez da helbide elektronikorik aurkitu lagun honentzat."
 
 msgid "Add to Address Book"
-msgstr "Gehitu helbide-liburuan"
+msgstr "Helbide-Liburura Gehitu"
 
 msgid "Send Email"
-msgstr "Posta bidali"
+msgstr "Posta Bidali"
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
-msgstr "Evolution integratzeko konfigurazioa"
+msgstr "Evolution-Integrazio Konfigurazioa"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Hautatu lagunak automatikoki gehitzeko kontu guztiak."
+msgstr "Lagunak auto-gehitu beharko liratekeen kontu guztiak hautatu itzazu."
 
 #. *< type
 #. *< ui_requirement
@@ -14114,28 +13468,27 @@
 #. *< priority
 #. *< id
 msgid "Evolution Integration"
-msgstr "Evolution integratzea"
+msgstr "Evolution Integrazioa"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides integration with Evolution."
-msgstr "Evolution-ekin integrazioa ahalbidetzen du."
+msgstr "Evolution-ekin integratzea ahalbidetzen du."
 
 msgid "Please enter the person's information below."
-msgstr "Idatzi behean pertsonari buruzko informazioa."
-
-#, fuzzy
+msgstr "Azpian idatzi ezazu pertsonaren inguruko informazioa."
+
 msgid "Please enter the buddy's username and account type below."
-msgstr "Idatzi lagunaren pantaila-izena eta kontu-mota behean."
+msgstr "Azpian idatzi itzazu lagunaren erabiltzaile-izena eta kontu-mota."
 
 msgid "Account type:"
 msgstr "Kontu-mota:"
 
 #. Optional Information section
 msgid "Optional information:"
-msgstr "Aukerako informazioa:"
+msgstr "Informazio opzionala:"
 
 msgid "First name:"
 msgstr "Izena:"
@@ -14144,7 +13497,7 @@
 msgstr "Deitura:"
 
 msgid "Email:"
-msgstr "Helbide elektronikoa:"
+msgstr "E-posta:"
 
 #. *< type
 #. *< ui_requirement
@@ -14153,22 +13506,22 @@
 #. *< priority
 #. *< id
 msgid "GTK Signals Test"
-msgstr "GTK seinaleen proba"
+msgstr "GTK Seinale Proba"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Test to see that all ui signals are working properly."
-msgstr "UIko seinale guztiak ondo dauden ikusteko proba."
-
-#, fuzzy, c-format
+msgstr "Interfazeko seinale guztiak ondo dabiltzala egiaztatzeko proba."
+
+#, c-format
 msgid ""
 "\n"
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>Lagun ezizena:</b> %s"
+"<b>Lagun-Oharra</b>: %s"
 
 msgid "History"
 msgstr "Historia"
@@ -14187,68 +13540,64 @@
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Kanpora zoazenean, lagunen zerrenda eta solasaldiak ikonotzen ditu."
+msgstr "Lagun-zerrenda eta solasaldiak ikonotzen ditu kanpora zoazenean."
 
 msgid "Mail Checker"
-msgstr "Mezu-begiralea"
+msgstr "Mezu-Begiralea"
 
 msgid "Checks for new local mail."
 msgstr "Mezu berririk dagoen begiratzen du."
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
-"Lagunen zerrendan koadro txiki bat gehitzen du, mezu berririk dagoen "
-"erakusteko."
-
-#, fuzzy
+"Mezu berririk baduzun erakusten dizun koadrotxo bat gehitzen dio lagun-"
+"zerrendari."
+
 msgid "Markerline"
-msgstr "Azpimarratua"
-
-#, fuzzy
+msgstr "Marka-marra"
+
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Azaldu notifikazio mezua solasaldian"
-
-#, fuzzy
+msgstr "Marka-marra bat marraztu solasaldiko mezu berriak ezberdintzeko."
+
 msgid "Jump to markerline"
-msgstr "Azpimarratua"
+msgstr "Marka-marrara saltatu"
 
 msgid "Draw Markerline in "
-msgstr ""
+msgstr "Marka-marra Marraztu "
 
 msgid "_IM windows"
-msgstr "_BM leihoak"
+msgstr "_IM-leihoetan"
 
 msgid "C_hat windows"
-msgstr "_Berriketa-leihoak"
+msgstr "_Berriketa-leihoetan"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
 msgstr ""
-"Musika mezu sesioa eskatua izan da. Mesedez MM ikonoan klik egin onartzeko ."
+"Musika-mezularitza sesioa eskatu dizute. Onartzeko, MM ikonoan egizu klik."
 
 msgid "Music messaging session confirmed."
-msgstr "Musika mezu sesioa konfirmatua."
+msgstr "Musika-mezularitza sesioa konfirmatua."
 
 msgid "Music Messaging"
-msgstr "Musika mezua"
+msgstr "Musika-Mezularitza"
 
 msgid "There was a conflict in running the command:"
-msgstr "Gatazka egon da komandoa exekutatzean:"
+msgstr "Gatazka egon da agindua exekutatzean:"
 
 msgid "Error Running Editor"
-msgstr "Errorea editorea martxan jartzean"
-
-#, fuzzy
+msgstr "Errorea Editorea Exekutzatzean"
+
 msgid "The following error has occurred:"
-msgstr "Ondorengo errorea izan da:"
+msgstr "Errore hau gertatu da:"
 
 #. Configuration frame
 msgid "Music Messaging Configuration"
-msgstr "Musika-mezuen konfigurazioa"
+msgstr "Musika-Mezularitza Konfigurazioa"
 
 msgid "Score Editor Path"
-msgstr "Emaitza editorearen helbidea"
+msgstr "Partitura-Editorearen Bidea"
 
 msgid "_Apply"
 msgstr "_Aplikatu"
@@ -14263,40 +13612,37 @@
 #. *< name
 #. *< version
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Musika mezuen Plugin-a kolaborazio bitarteko osaketarako."
+msgstr "Konposaketa kolaboratiborako Musika-Mezularitza Plugina."
 
 # , fuzzy
 #. *  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 ""
-"Musika mezuen plugin-a hainbat erabiltzaile momentu berean musika zati "
-"batean amankumeko \"score\"-a editatzen lan egiteko aukera eskeintzen du "
-"benetazko denboran."
+"Musika-Mezularitza Pluginari esker, erabiltzaile ugarik partitura berean "
+"aldi berean lan egin dezake."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
 msgstr "Jakinarazpenak"
 
-#, fuzzy
 msgid "\t_Only when someone says your username"
-msgstr "\t_Baten batek zure ezizena esaten duenean bakarrik"
+msgstr "\t_Norbaitek zure erabiltzaile-izena aipatzean"
 
 msgid "_Focused windows"
 msgstr "_Fokudun leihoak"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
-msgstr "Jakinarazteko metodoak"
+msgstr "Jakinarazpen Metodoak"
 
 msgid "Prepend _string into window title:"
-msgstr "_Erantsi katea aurretik leihoaren tituluan:"
+msgstr "_Katea txertatu leihoaren tituluaren aurretik:"
 
 #. Count method button
 msgid "Insert c_ount of new messages into window title"
-msgstr "_Txertatu mezu berrien kopurua leihoaren tituluan"
+msgstr "Mezu berrien _kopurua txertatu leihoaren tituluan"
 
 #. Count xprop method button
 #, fuzzy
@@ -14304,46 +13650,44 @@
 msgstr "_Txertatu mezu berrien kopurua leihoaren tituluan"
 
 #. Urgent method button
+#, fuzzy
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Ezarri \"_URGENT\" leiho-kudeatzailean"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "_Berriketa-leihoak"
+msgstr "Leihoa _kliskatu"
 
 #. Raise window method button
-#, fuzzy
 msgid "R_aise conversation window"
-msgstr "BMko solasaldi-leihoak"
+msgstr "Solasaldi-leihoa _igo"
 
 #. Present conversation method button
-#, fuzzy
 msgid "_Present conversation window"
-msgstr "BMko solasaldi-leihoak"
+msgstr "Solasaldi-leihoa _erakutsi"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
-msgstr "Kendu jakinarazpenak"
+msgstr "Jakinarazpenak Kentzeko"
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "_Kendu solasaldi-leihoak fokua hartzen duenean"
+msgstr "Solasaldi-leihoak _fokua hartzean kendu"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
-msgstr "K_endu solasaldi-leihoan klik egitean"
+msgstr "Solasaldi-leihoak _klik bat jasotzean kendu"
 
 #. Remove on type button
 msgid "Remove when _typing in conversation window"
-msgstr "Ke_ndu solasaldi-leihoan idaztean"
+msgstr "Solasaldi-leihoan _idaztean kendu"
 
 #. Remove on message send button
 msgid "Remove when a _message gets sent"
-msgstr "Kendu _mezu bat bidalitakoan"
+msgstr "Mezu bat _bidaltzean kendu"
 
 #. Remove on conversation switch button
 msgid "Remove on switch to conversation ta_b"
-msgstr "Ken_du solasaldi batetik bestera aldatzean"
+msgstr "Solasaldi-_fitxara _aldatzean kendu"
 
 #. *< type
 #. *< ui_requirement
@@ -14352,14 +13696,14 @@
 #. *< priority
 #. *< id
 msgid "Message Notification"
-msgstr "Mezu-jakinarazpena"
+msgstr "Mezu-Jakinarazpena"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Hainbat modu eskaintzen ditu mezu berriak daudela jakinarazteko."
+msgstr "Irakurri gabeko mezuetaz jakinarazteko modu ugari eskaintzen ditu."
 
 #. *< type
 #. *< ui_requirement
@@ -14367,9 +13711,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin-eko demostrazioaren plugin-a"
+msgstr "Pidgin Demostrazio-Plugina"
 
 #. *< name
 #. *< version
@@ -14390,115 +13733,105 @@
 "- Zure zerrendakoren batek saioa hasten duenean, mezua bidaltzen dio"
 
 msgid "Hyperlink Color"
-msgstr "Hiperestekaren kolorea "
-
-#, fuzzy
+msgstr "Hiperesteka-Kolorea "
+
 msgid "Visited Hyperlink Color"
-msgstr "Hiperestekaren kolorea "
-
-#, fuzzy
+msgstr "Bisitatutako Hiperesteken Kolorea "
+
 msgid "Highlighted Message Name Color"
-msgstr "Aurkitutako azpimarratu"
-
-#, fuzzy
+msgstr "Nabarmendutako Mezuen Izenaren Kolorea"
+
 msgid "Typing Notification Color"
-msgstr "Kendu jakinarazpenak"
+msgstr "idazte-Jakinarazpenen Kolorea"
 
 msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView banatzaile horizontala"
+msgstr "GtkTreeView Separazio Horizontala"
 
 msgid "Conversation Entry"
-msgstr "Solasaldiako Sarrerak"
+msgstr "Solasaldi-Sarrera"
 
 msgid "Request Dialog"
-msgstr "Eskaera Elkarrizketa"
+msgstr "Eskaera-Elkarrizketa"
 
 msgid "Notify Dialog"
-msgstr "Jakinarazpenak elkarrizketa"
+msgstr "Jakinarazpen-Elkarrizketa"
 
 msgid "Select Color"
-msgstr "Hautatu kolorea"
+msgstr "Kolorea Hautatu"
 
 #, c-format
 msgid "Select Interface Font"
-msgstr "Hautatu letra-tipoa "
+msgstr "Interfazearen Letra-Tipoa Hautatu"
 
 #, c-format
 msgid "Select Font for %s"
-msgstr "Hautatu letra-tipoa honentzako %s"
+msgstr "%s(r)rentzako Letra-Tipoa Hautatu"
 
 msgid "GTK+ Interface Font"
-msgstr "GTK+ Interfazearen letra-tipoa"
+msgstr "GTK+ Interfazearen Letra-Tipoa"
 
 msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ Testu ? gaia"
-
-#, fuzzy
+msgstr "GTK+ Laster-Tekla Gaia"
+
 msgid "Disable Typing Notification Text"
-msgstr "Mezu berrien jakinarazpenak"
-
-#, fuzzy
+msgstr "Idatze-Jakinarazpen Testua Ezgaitu"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Pidgin GTK+ Gaien kontrola"
-
-#, fuzzy
+msgstr "GTK+ Gaien Kontrol-Ezarpenak"
+
 msgid "Colors"
-msgstr "Itxi"
+msgstr "Koloreak"
 
 msgid "Fonts"
-msgstr "Letra-tipoak"
+msgstr "Letra-Tipoak"
 
 msgid "Miscellaneous"
-msgstr ""
-
-#, fuzzy
+msgstr "Ugari"
+
 msgid "Gtkrc File Tools"
-msgstr "Pidgin fitxategien kontrola"
+msgstr "Gtkrc Fitxategi-Tresnak"
 
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Ezapernak idatzi honentzako %s%sgtkrc-2.0"
+msgstr "Ezapernak hemen gorde: %s%sgtkrc-2.0"
 
 msgid "Re-read gtkrc files"
-msgstr "Berirakurri  gtkrc files"
-
-#, fuzzy
+msgstr "gtkrc ftxategiak berrirakurri"
+
 msgid "Pidgin GTK+ Theme Control"
-msgstr "Pidgin GTK+ Gaien kontrola"
+msgstr "Pidgin GTK+ Gaien Kontrola"
 
 msgid "Provides access to commonly used gtkrc settings."
-msgstr "gtkrc -ren ohizko ezarpenetara akzesua ahalbidetzen du."
+msgstr "Ohiko gtkrc-ezarpenetarako akzesua eskaintzen du."
 
 msgid "Raw"
-msgstr "Formaturik gabe"
+msgstr "Gordina"
 
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
-"Testuan oinarritutako protokoloetara formaturik gabeko sarrera bidaltzeko."
-
-#, fuzzy
+"Testuan oinarritutako protokoloetara sarrera gordina bidaltzea eskaintzen "
+"dizu."
+
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Testuan oinarritutako protokoloetara (Jabber, MSN, IRC, TOC) formaturik "
-"gabeko testua bidaltzeko. Sakatu 'Sartu' sarrera-koadroan, eta zaindu "
-"arazketa-leihoa."
+"Testuan oinarritutako protokoloetara sarrera gordina bidaltzea eskaintzen "
+"dizu (XMPP, MSN, IRC, TOC). Bidaltzeko, 'Entrar' sakatu ezazu sarrera-"
+"kutxan. Arazte-leihoa begiratu ezazu."
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "%s %s(e)ra eguneratu zaitezke gaur."
 
 msgid "New Version Available"
-msgstr "Bertsio berria erabilgarri dago"
-
-#, fuzzy
+msgstr "Bertsio Berria Eskuragarri"
+
 msgid "Later"
-msgstr "Data"
-
-#, fuzzy
+msgstr "Geroago"
+
 msgid "Download Now"
-msgstr "Eraibltzaileak %s(e)n: %s"
+msgstr "Orain Deskargatu"
 
 #. *< type
 #. *< ui_requirement
@@ -14507,21 +13840,21 @@
 #. *< priority
 #. *< id
 msgid "Release Notification"
-msgstr "Bertsioaren jakinarazpena"
+msgstr "Argitaratze-Jakinarazpena"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Checks periodically for new releases."
-msgstr "Aldiro-aldiro bertsio berririk dagoen begiratzen du."
+msgstr "Argitaratze berriak bilatzen ditu periodikoki."
 
 #. *  description
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"Aldiro-aldiro bertsio berririk dagoen begiratzen du, eta ChangeLog-en bidez "
-"horren berri ematen du."
+"Argitaratze berriak bilatzen ditu periodikoki, eta erabiltzaileari "
+"jakinarazten dio Aldaketa-Txostenarekin."
 
 #. *< major version
 #. *< minor version
@@ -14531,30 +13864,30 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Send Button"
-msgstr "_Bidali honi:"
+msgstr "Bidaltze-Botoia"
 
 #. *< name
 #. *< version
-#, fuzzy
 msgid "Conversation Window Send Button."
-msgstr "IMko solasaldi-leihoak"
+msgstr "Solasaldi-Leihoetako Bidaltze-Leihoa"
 
 #. *< summary
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
 msgstr ""
+"Bidaltze-Botoi bat gehitzen du solasaldi-leihora. Teklatu fisikorik ez "
+"dagoenerako pentsaua dago hau."
 
 msgid "Duplicate Correction"
-msgstr "Bikoiztutako zuzenketa"
+msgstr "Bikoiztutako Zuzenketa"
 
 msgid "The specified word already exists in the correction list."
-msgstr "Adierazitako hitza dagoeneko badago zuzendutako zerrendan."
+msgstr "Adierazitako hitza dagoeneko badago zuzenketa-zerrendan."
 
 msgid "Text Replacements"
-msgstr "Testu-ordezpenak"
+msgstr "Testu-Ordezpenak"
 
 msgid "You type"
 msgstr "Idazten duzu"
@@ -14566,10 +13899,10 @@
 msgstr "Hitz osoak bakarrik"
 
 msgid "Case sensitive"
-msgstr "Maiuskulak bereizi"
+msgstr "Maiuskulak/minuskulak ezberdindu"
 
 msgid "Add a new text replacement"
-msgstr "Gehitu testu-ordezpen berri bat"
+msgstr "Testu-ordezpen berria gehitu"
 
 msgid "You _type:"
 msgstr "_Idazten duzu:"
@@ -14580,113 +13913,101 @@
 # , fuzzy
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "Kasuarko topaketa zehatza (ez-gaitu kasu automatikorako)"
+msgstr ""
+"Formatu zehatza (maiuskula/minuskulak automatikoki kudeatzeko hau ezgaitu)"
 
 msgid "Only replace _whole words"
 msgstr "_Hitz osoak bakarrik ordezkatu"
 
 msgid "General Text Replacement Options"
-msgstr "Orokorrean Testu-ordezpenen aukerak"
+msgstr "Testu-Ordezpen Aukera Orokorrak"
 
 msgid "Enable replacement of last word on send"
-msgstr "Ahalbidetu ordezkapenak bidalitako azken hitzean"
+msgstr "Bidalitako azken hitzaren aldaketa gaitu"
 
 msgid "Text replacement"
 msgstr "Testu-ordezpena"
 
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
-"Mezuak bidaltzean testua ordezten du erabiltzaileak sortutako arauei "
-"jarraituz. "
-
-#, fuzzy
+"Bidalitako mezuetako testuak aldatzen ditu, erabiltzaileak zehaztutako arau "
+"batzuen arabera."
+
 msgid "Just logged in"
-msgstr "Ez dago konektatuta"
-
-#, fuzzy
+msgstr "Konektatu-berri da"
+
 msgid "Just logged out"
-msgstr "Ez dago konektatuta"
+msgstr "Deskonektatu-berri da"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Kontaktuarentzako Ikonoa/\n"
+"Pertsona Ezezagunarentzako Ikonoa"
+
 msgid "Icon for Chat"
-msgstr "Sartu berriketa batean"
-
-#, fuzzy
+msgstr "Solasaldirako Ikonoa"
+
 msgid "Ignored"
-msgstr "Ez ikusi egin"
-
-#, fuzzy
+msgstr "Ezikusia"
+
 msgid "Founder"
-msgstr "ordu"
-
-#, fuzzy
+msgstr "Sortzailea"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "Operadorea"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Erdi-Operadorea"
+
 msgid "Authorization dialog"
-msgstr "Baimena eman da"
-
-#, fuzzy
+msgstr "Autorizazio-elkarrizketa"
+
 msgid "Error dialog"
-msgstr "Errorea"
-
-#, fuzzy
+msgstr "Errore-elkarrizketa"
+
 msgid "Information dialog"
-msgstr "Laneko datuak"
+msgstr "informazio-elkarrizketa"
 
 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Posta-elkarrizketa"
+
 msgid "Question dialog"
-msgstr "Eskaera Elkarrizketa"
-
-#, fuzzy
+msgstr "Galdera-elkarrizketa"
+
 msgid "Warning dialog"
-msgstr "Abisu-maila"
+msgstr "Abisu-elkarrizketa"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Zein elkarrizketa-mota da hau?"
+
 msgid "Status Icons"
-msgstr "Egoera : %s rako."
-
-#, fuzzy
+msgstr "Egoera Ikonoak"
+
 msgid "Chatroom Emblems"
-msgstr "Berriketarako gela gunea"
-
-#, fuzzy
+msgstr "Solasaldien Ikurrak"
+
 msgid "Dialog Icons"
-msgstr "Gorde ikonoa"
-
-#, fuzzy
+msgstr "Elkarrizketa Ikonoak"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ Gaien kontrola"
-
-#, fuzzy
+msgstr "Pidgin Ikono-Gaien Editorea"
+
 msgid "Contact"
-msgstr "Kontuari buruzko informazioa"
-
-#, fuzzy
+msgstr "Kontaktua"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Lagunen zerrenda"
-
-#, fuzzy
+msgstr "Pidgin Lagun-Zerrenda Gaien Editorea"
+
 msgid "Edit Buddylist Theme"
-msgstr "Lagunen zerrenda"
+msgstr "Lagun-Zerrenda Editatu"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Ikono-Gaia Editatu"
 
 #. *< type
 #. *< ui_requirement
@@ -14695,16 +14016,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ Gaien kontrola"
+msgstr "Pidgin Gai-Editorea"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ Gaien kontrola"
+msgstr "Pidgin Gai-Editorea."
 
 #. *< type
 #. *< ui_requirement
@@ -14713,18 +14032,17 @@
 #. *< priority
 #. *< id
 msgid "Buddy Ticker"
-msgstr "Lagunen korritze-barra"
+msgstr "Lagun-Barra"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "Lagunen zerrendaren bertsio korrigarri horizontala."
-
-#, fuzzy
+msgstr "Lagun-zerrendaren bertsio korrigarri horizontala."
+
 msgid "Display Timestamps Every"
-msgstr "iChat ordu-zigilua"
+msgstr "Denbora-Markak Erakutsi"
 
 #. *< type
 #. *< ui_requirement
@@ -14733,42 +14051,39 @@
 #. *< priority
 #. *< id
 msgid "Timestamp"
-msgstr "Ordu-zigilua"
+msgstr "Ordu-marka"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Display iChat-style timestamps"
-msgstr "iChat ordu-zigilua"
+msgstr "iChat moduko ordu-markak erakutsi"
 
 #. *  description
-#, fuzzy
 msgid "Display iChat-style timestamps every N minutes."
-msgstr ""
-"iChat estiloko ordu-zigiluak gehitzen ditu solasaldietan, N minutuz behin."
+msgstr "iChat moduko ordu-markak erakutsi N minututo"
 
 msgid "Timestamp Format Options"
-msgstr "Timestamp-en formatu ezarpenak"
-
-#, fuzzy, c-format
+msgstr "Ordu-marka Formatu Aukerak"
+
+#, c-format
 msgid "_Force 24-hour time format"
-msgstr "_Behartu (Ohizko Pidgin) 24 orduko denbora formatua"
+msgstr "24 _orduko ordu-formatua behartu"
 
 msgid "Show dates in..."
-msgstr "Erakutsi datak hemen..."
+msgstr "Datak erakutsi..."
 
 msgid "Co_nversations:"
-msgstr "So_lasaldiak"
+msgstr "So_lasaldietan:"
 
 msgid "For delayed messages"
-msgstr "Berandu datozen mezuentzat"
+msgstr "Mezu atzeratuentzako"
 
 msgid "For delayed messages and in chats"
-msgstr "Atzeratutako mezuentzat eta berriketentzat"
+msgstr "Mezu atzeratuentzako eta berriketetarako"
 
 msgid "_Message Logs:"
-msgstr "_Mezuen egunkariak:"
+msgstr "_Mezu-Txostenak:"
 
 #. *< type
 #. *< ui_requirement
@@ -14777,50 +14092,50 @@
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr "Mezuen Timestamp formatuak"
+msgstr "Mezuen Ordu-Marka Formatuak"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Customizes the message timestamp formats."
-msgstr "Pertsonalizatu mezuen timestamp formatuak."
+msgstr "Mezuen ordu-marken formatu pertsonalizatzen du."
 
 #. *  description
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"Plugin honek erabiltzaileak elkarrizketak eta egunkari mezuen timestamp "
-"formatuak pertsonalizatzea ahalbidetzen du."
+"Plugin honi esker, erabiltzaileak elkarrizketen eta txosten-mezuen ordu-"
+"marken formatua pertsonalizatu dezake."
 
 msgid "Opacity:"
-msgstr "Opakutasuna:"
+msgstr "Opakotasuna:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
-msgstr "IMko solasaldi-leihoak"
+msgstr "IM Solasaldi-Leihoak"
 
 msgid "_IM window transparency"
-msgstr "_IMko leihoen gardentasuna"
+msgstr "_IM-leihoen gardentasuna"
 
 msgid "_Show slider bar in IM window"
-msgstr "_Erakutsi barra graduatzailea IMko leihoan"
+msgstr "_Barra graduatzailea erakutsi IM-leihoan"
 
 msgid "Remove IM window transparency on focus"
-msgstr "IMko leihoen gardentasuna ezabatu fokua duenean"
+msgstr "Fokua dutenean, IM-leihoen gardentasuna kendu"
 
 msgid "Always on top"
 msgstr "Beti goian"
 
 #. Buddy List trans options
 msgid "Buddy List Window"
-msgstr "Lagunen zerrendaren leihoa"
+msgstr "Lagun-Zerrenda Leihoa"
 
 msgid "_Buddy List window transparency"
-msgstr "_Lagunen zerrendaren leihoaren gardentasuna"
+msgstr "_Lagun-Zerrenda leihoaren gardentasuna"
 
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Ezabatu Lagunen zerrendaren leihoaren gardentasuna fokua duenean"
+msgstr "Fokua duenean, Lagun-zerrenda leihoaren gardentasuna kendu"
 
 #. *< type
 #. *< ui_requirement
@@ -14835,7 +14150,7 @@
 #. *< version
 #. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Lagunen zerrendako eta solasaldiko gardentasun aldakorra."
+msgstr "Lagun-zerrendako eta solasaldientzako Gardentasun Aldakorra."
 
 #. *  description
 msgid ""
@@ -14844,50 +14159,47 @@
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Solasaldi-leihoen eta lagunen zerrendan alfa gardentasuna ahalbidetzen du "
+"Solasaldi-leihoen eta lagun-zerrendaren alfa gardentasuna ahalbidetzen du "
 "plugin honek.\n"
 "\n"
-"* Oharra: Plugin honek Win2000 edo geroagoko bat behar du."
+"* Oharra: Plugin honek Win2000 edo berriago bat behar du."
 
 msgid "GTK+ Runtime Version"
-msgstr "GTK+ Exekuzio-denborako bertsioa"
+msgstr "GTK+ Exekuzio-Denborako Bertsioa"
 
 #. Autostart
 msgid "Startup"
 msgstr "Abioa"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Start %s on Windows startup"
-msgstr "_Abiarazi Pidgin Windows abiaraztean"
+msgstr "_Windows-ekin batera abiarazi %s"
 
 msgid "_Dockable Buddy List"
-msgstr "_Lagunen zerrenda atrakagarria"
+msgstr "_Lagun-zerrenda atrakagarria"
 
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
-msgstr "_Utzi lagunen zerrendaren leihoa goian:"
+msgstr "Lagun-Zerrenda leihoa gainean _mantendu:"
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "Bakarrik geldiunean"
-
-#, fuzzy
+msgstr "Atrakatua dagoenean bakarrik"
+
 msgid "Windows Pidgin Options"
-msgstr "Saioa hasteko aukerak"
-
-#, fuzzy
+msgstr "Windows Pidgin Aukerak"
+
 msgid "Options specific to Pidgin for Windows."
-msgstr "Windows Pidgin-i bakarrik dagozkion aukerak."
-
-#, fuzzy
+msgstr "Pidgin-en Windows-erako aukera bereziak."
+
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Pidgin Windows-en ezarpenak zehazteko aukera eskeintzen du, hala nola "
-"lagunen-zerrenda gelditzea eta elkarrizketa kinuak."
+"Pidgin-en Windows-erako aukera bereziak eskaintzen ditu (lagun-zerrenda "
+"atrakatzea, adibidez)."
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr ""
+msgstr "<font color='#777777'>Deskonektatua</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -14896,14 +14208,13 @@
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr ""
-
-#, fuzzy
+msgstr "XMPP Kontsola"
+
 msgid "Account: "
 msgstr "Kontua:"
 
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr ""
+msgstr "<font color='#777777'>XMPPra ez konektatua</font>"
 
 msgid "Insert an <iq/> stanza."
 msgstr ""
@@ -14923,7 +14234,29 @@
 
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr ""
+msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."
+
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "BOSH Konexio-Zerbitzari Baliogabea"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Ezin SILC gako parea ez kargatu"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s erabiltzaileak ez du onartu \"%s\" gelarako egin diozun gonbita. "
+#~ "Arrazoia: \"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Gonbita Ezetsia"
+
+#~ msgid "_Resume"
+#~ msgstr "_Berrekin"
+
+#, fuzzy
+#~ msgid "_Proxy"
+#~ msgstr "Proxy-a"
 
 #~ msgid "Cannot open socket"
 #~ msgstr "Ezin da socket-a ireki "
@@ -15310,9 +14643,6 @@
 #~ msgid "You are sending messages too fast to %s."
 #~ msgstr "Mezuak bizkorregi bidaltzen ari zara -> %s."
 
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "%s erabiltzailearen BM bat ez zaizu heldu, handiegia delako."
-
 #~ msgid "You missed an IM from %s because it was sent too fast."
 #~ msgstr ""
 #~ "%s erabiltzailearen BM bat ez zaizu heldu, bizkorregi bidali delako."
@@ -16201,149 +15531,3 @@
 
 #~ msgid "_Request Authorization"
 #~ msgstr "_Baimena eskatu"
-
-# c-format
-#~ msgid ""
-#~ "The user %u wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%u erabiltzaileak bere lagunen zerrendan gehitu nahi zaitu. Arrazoia:\n"
-#~ "%s"
-
-#~ msgid "Authorization Request"
-#~ msgstr "Baimen-eskaera"
-
-#~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
-#~ msgstr "<B>UINa:</B> %s<BR><B>Egoera:</B> %s<HR>%s"
-
-#~ msgid "SNAC threw error: %s\n"
-#~ msgstr "SNAC errorea: %s\n"
-
-#~ msgid "User information for %s unavailable:"
-#~ msgstr "%s erabiltzailearen datuak ez daude erabilgarri:"
-
-#~ msgid "Rate limiting error."
-#~ msgstr "Abiadura-mugaren errorea."
-
-#~ msgid "You have been signed off for an unknown reason."
-#~ msgstr "Deskonektatu egin zaituzte arrazoi ezezagunen batengatik."
-
-#~ msgid ""
-#~ "Your screen name is currently formatted as follows:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Zure pantaila-izenak formatu hau du orain:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "Could not add the buddy %s for an unknown reason.  The most common reason "
-#~ "for this is that you have the maximum number of allowed buddies in your "
-#~ "buddy list."
-#~ msgstr ""
-#~ "Ezin izan da %s laguna gehitu, arrazoi ezezagun bat dela-eta. Arrazoi "
-#~ "ohikoena lagunen zerrendan jende gehiegi izatea da."
-
-#~ msgid ""
-#~ "The user %s wants to add %s to their buddy list for the following "
-#~ "reason:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "%s erabiltzaileak bere lagunen zerrendan %s gehitu nahi du bere lagunen "
-#~ "zerrendan honako arrazoiagatik:\n"
-#~ " %s"
-
-#~ msgid "New screen name formatting:"
-#~ msgstr "Pantaila-izenaren formatu berria:"
-
-#~ msgid "Format Screen Name..."
-#~ msgstr "Formatua eman pantaila-izenari..."
-
-#~ msgid "Auth host"
-#~ msgstr "Baimen-ostalaria"
-
-#~ msgid "Auth port"
-#~ msgstr "Baimen-ataka"
-
-#~ msgid ""
-#~ "Use AIM/ICQ proxy server\n"
-#~ "(slower, but usually works)"
-#~ msgstr ""
-#~ "Erabili AIM/ICQ proxy zerbitzaria\n"
-#~ "(motelagoa, baina normalean funtzionatzen du)"
-
-#~ msgid ""
-#~ "\n"
-#~ "<b>Supports:</b> %s"
-#~ msgstr ""
-#~ "\n"
-#~ "<b>Bermatua:</b> %s"
-
-#~ msgid "<b>Full Name:</b> %s<br>"
-#~ msgstr "<b>Izen osoa:</b> %s<br>"
-
-#~ msgid "<b>Supports:</b> %s<br>"
-#~ msgstr "<b>Bermatua: </b>%s<br>"
-
-#~ msgid "<b>Status:</b> %s"
-#~ msgstr "<b>Egoera:</b> %s"
-
-#~ msgid "Reject watching by other users"
-#~ msgstr "Ezetsi beste erabiltzaileek begiratzea"
-
-#~ msgid "Block invites"
-#~ msgstr "Blokeatu gonbidatuak"
-
-#~ msgid "Reject online status attribute requests"
-#~ msgstr "Ezetsi lineako egoeraren atributuen eskaerak"
-
-#~ msgid "Wrong Password"
-#~ msgstr "Pasahitza okerra"
-
-#~ msgid "TOC has sent a PAUSE command."
-#~ msgstr "TOCek PAUSE komando bat bidali du."
-
-#~ msgid ""
-#~ "When this happens, TOC ignores any messages sent to it, and may kick you "
-#~ "off if you send a message. Pidgin will prevent anything from going "
-#~ "through. This is only temporary, please be patient."
-#~ msgstr ""
-#~ "Hori gertatzen denean, TOCek ez ikusi egiten die, bidalitako mezu guztiei "
-#~ "eta beharbada kanporatu egingo zaitu mezurik bidaliz gero. Pidgin-ek "
-#~ "bidali edo jasotzea eragotziko du. Aldi baterako bakarrik izango da, "
-#~ "itxaron."
-
-#~ msgid "Pidgin - Save As..."
-#~ msgstr "Pidgin - Gorde honela..."
-
-#~ msgid "TOC host"
-#~ msgstr "TOC ostalaria"
-
-#~ msgid "TOC port"
-#~ msgstr "TOC ataka"
-
-#~ msgid ""
-#~ "The normal authentication method has failed. This means either your "
-#~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
-#~ "Pidgin will now attempt to log in using Web Messenger authentication, "
-#~ "which will result in reduced functionality and features."
-#~ msgstr ""
-#~ "Autentifikazio metodo normalak huts egin du. Zure pasahitza okerra izan "
-#~ "daiteke, edo Yahoo-ren autentifikazio eskema aldatu egin da. Pidgin-ek "
-#~ "Web Messenger erabiliz konektatzen saiatuko da, funtzionalitate eta "
-#~ "ezaugarri murrituagoak dituelarik."
-
-#~ msgid "Unable to read"
-#~ msgstr "Ezin da irakurri"
-
-#~ msgid "Pager host"
-#~ msgstr "Bilagailuaren ostalaria"
-
-#~ msgid "YCHT host"
-#~ msgstr "YCHT ostalaria "
-
-#~ msgid "YCHT port"
-#~ msgstr "YCHT Ataka "
-
-#~ msgid "g003: Error opening connection.\n"
-#~ msgstr "Errorea konexioa irekitzean.\n"
--- a/po/it.po	Wed Aug 12 02:24:41 2009 +0000
+++ b/po/it.po	Thu Aug 13 19:56:23 2009 +0000
@@ -1,6 +1,6 @@
 # Pidgin Italian translation
 # Copyright (C) 2002, Salvatore di Maggio <titanicus@libero.it>
-# Copyright (C) 2003-2008, Claudio Satriano <satriano@na.infn.it>
+# Copyright (C) 2003-2009, Claudio Satriano <satriano@na.infn.it>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2008-08-26 14:12+0100\n"
+"POT-Creation-Date: 2009-08-05 09:08-0700\n"
+"PO-Revision-Date: 2009-08-05 14:56+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +26,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Prova con `%s -h' per maggiori informazioni.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -71,7 +71,6 @@
 msgid "Remember password"
 msgstr "Ricorda la password"
 
-#, fuzzy
 msgid "There are no protocol plugins installed."
 msgstr "Non c'è nessun plugin per i protocolli installato."
 
@@ -277,7 +276,7 @@
 msgstr "Bloccato"
 
 msgid "Show when offline"
-msgstr "Mostra quando non sei in linea"
+msgstr "Mostra quando non è in linea"
 
 #, c-format
 msgid "Please enter the new name for %s"
@@ -829,7 +828,7 @@
 msgstr "Conversazioni con %s su %s"
 
 msgid "%B %Y"
-msgstr ""
+msgstr "%B %Y"
 
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
@@ -875,12 +874,11 @@
 msgid "System Log"
 msgstr "Log di sistema"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "Calcolo in corso..."
+msgstr "Chiamata in corso..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "Riaggancia"
 
 #. Number of actions
 msgid "Accept"
@@ -890,25 +888,25 @@
 msgstr "Rifiuta"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "Chiamata in corso."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "La chiamata è stata terminata."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s desidera avviare una sessione audio con te."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr ""
-
-#, fuzzy
+"%s sta cercando di avviare una sessione multimediale non supportata con te."
+
 msgid "You have rejected the call."
-msgstr "Hai abbandonato il canale%s%s"
+msgstr "Hai rifiutato la chiamata."
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call: Fai una chiamata audio."
 
 msgid "Emails"
 msgstr "Email"
@@ -1427,16 +1425,17 @@
 "supporto X11."
 
 msgid "GntClipboard"
-msgstr ""
-
-#, fuzzy
+msgstr "Appunti gnt"
+
 msgid "Clipboard plugin"
-msgstr "Configura il plugin"
+msgstr "Plugin appunti"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"Quando il contenuto degli appunti gnt cambia, queso è reso disponibile a X, "
+"se possibile."
 
 #, c-format
 msgid "%s just signed on"
@@ -1470,9 +1469,8 @@
 msgid "Someone says your name in a chat"
 msgstr "Qualcuno pronuncia il tuo nome in una chat"
 
-#, fuzzy
 msgid "Notify with a toaster when"
-msgstr "Segnala ai contatti che stai scrivendo"
+msgstr "Notifica con un popup quando"
 
 msgid "Beep too!"
 msgstr "Emetti anche un bip!"
@@ -1483,9 +1481,8 @@
 msgid "GntGf"
 msgstr "GntGf"
 
-#, fuzzy
 msgid "Toaster plugin"
-msgstr "Configura il plugin"
+msgstr "Plugin popup"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
@@ -1506,9 +1503,8 @@
 "L'abilitazione del log per i messaggi immediati e/o per le chat attiverà lo "
 "storico per il corrispondente tipo di conversazione."
 
-#, fuzzy
 msgid "GntHistory"
-msgstr "Storico"
+msgstr "Storico gnt"
 
 msgid "Shows recently logged conversations in new conversations."
 msgstr ""
@@ -1544,10 +1540,10 @@
 msgstr "Nessun raggruppamento"
 
 msgid "Nested Subgroup"
-msgstr ""
+msgstr "Sottogruppo annidato"
 
 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "Raggruppamento annidato (sperimentale)"
 
 msgid "Provides alternate buddylist grouping options."
 msgstr ""
@@ -1560,9 +1556,8 @@
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: cerca una sottostringa nel registro della conversazione."
 
-#, fuzzy
 msgid "GntLastlog"
-msgstr "Storico"
+msgstr "Lastlog gnt"
 
 msgid "Lastlog plugin."
 msgstr "Plugin Lastlog"
@@ -1572,22 +1567,27 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Recupero del TinyURL in corso..."
 
 msgid "Only create TinyURL for urls of this length or greater"
 msgstr ""
+"Crea un TinyURL solamente per indirizzi di lunghezza maggiore o uguale alla "
+"seguente"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "Prefisso per gli indirizzi TinyURL (o altri)"
+
 msgid "TinyURL"
-msgstr "URL del brano"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "Plugin TinyURL"
 
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
 msgstr ""
+"Quando ricevi un messaggio con degli URL, trasformali in TinyURL per poterli "
+"copiare più facilmente"
 
 msgid "accounts"
 msgstr "account"
@@ -1693,6 +1693,45 @@
 msgid "_View Certificate..."
 msgstr "_Visualizza certificato..."
 
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Il certificato presentato da \"%s\" afferma invece di provenire da \"%s\". "
+"Questo può significare che non ti stai connettendo al servizio al quale "
+"credi."
+
+#. 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 "Errore certificato SSL"
+
+msgid "Invalid certificate chain"
+msgstr "Catena di certificati non valida"
+
+#. 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 ""
+"Non hai alcun database di certificati root. Pertanto, questo certificato non "
+"può essere validato."
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1703,29 +1742,11 @@
 "Il certificato presentato da \"%s\" è auto-firmato. Non può essere "
 "verificato automaticamente."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "La catena di certificati presentata per %s non è valida."
 
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-msgid "SSL Certificate Error"
-msgstr "Errore certificato SSL"
-
-msgid "Invalid certificate chain"
-msgstr "Catena di certificati non valida"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Non hai alcun database di certificati root. Pertanto, questo certificato non "
-"può essere validato."
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1745,19 +1766,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "Firma dell'autorità per i certificati non valida"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Il certificato presentato da \"%s\" afferma invece di provenire da \"%s\". "
-"Questo può significare che non ti stai connettendo al servizio al quale "
-"credi."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1794,7 +1802,7 @@
 msgstr "+++ %s si è disconnesso"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
 
@@ -1841,9 +1849,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s ha abbandonato la stanza (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "Invita in conferenza"
+msgstr "Invita in chat"
 
 #. Put our happy label in it.
 msgid ""
@@ -1866,9 +1873,7 @@
 msgstr "Impossibile ottenere il nome del server: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
-"Il server D-BUS di Purple non è in esecuzione per il motivo indicato di "
-"seguito"
+msgstr "Il server D-BUS di Purple non è in esecuzione per il seguente motivo"
 
 msgid "No name"
 msgstr "Nessun nome"
@@ -1902,6 +1907,8 @@
 #, c-format
 msgid "Resolver process exited without answering our request"
 msgstr ""
+"Il processo del resolver DNS è terminato senza fornire una risposta alla "
+"nostra richiesta"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -1987,6 +1994,10 @@
 msgstr "Inizio del trasferimento di %s da %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Trasferimento del file <A HREF=\"file://%s\">%s</A> completato"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Trasferimento del file %s completato"
 
@@ -2203,9 +2214,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RISPOSTA AUTOMATICA>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "Errore nella creazione della connessione"
+msgstr "Errore nella creazione della conferenza."
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2358,7 +2368,7 @@
 #. *  summary
 #. *  description
 msgid "Tests the ciphers that ship with libpurple."
-msgstr ""
+msgstr "Verifica le cifre fornite con libpurple."
 
 #. *< type
 #. *< ui_requirement
@@ -2478,7 +2488,7 @@
 msgstr "Tempo massimo di inattività per l'utente (in minuti)"
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "Applica le regole per nascondere i contatti"
 
 #. *< type
 #. *< ui_requirement
@@ -2614,7 +2624,6 @@
 msgstr "Consente di visualizzare i log di altri client MI."
 
 #. * 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"
@@ -2622,8 +2631,8 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Quando si visualizzano i log, questo plugin include i log da altri client "
-"MI. Al momento sono supportati Adium, MSN Messenger e Trillian.\n"
+"Quando si visualizzano i log, questo plugin includerà i log da altri client "
+"di MI. Al momento sono supportati Adium, MSN Messenger, aMSN e Trillian.\n"
 "\n"
 "ATTENZIONE: questo plugin è ancora in versione alfa e potrebbe andare in "
 "crash frequentemente. Utilizzalo a tuo rischio e pericolo!"
@@ -2672,12 +2681,11 @@
 msgstr ""
 "Salva i messaggi inviati ad un utente non in linea sotto forma di allarmi."
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Il resto del messaggio sarà salvato sotto forma di allarme. Puoi modificare/"
+"Il resto del messaggio sarà salvato sotto forma di allarmi. Puoi modificare/"
 "cancellare l'allarme dalla finestra 'Allarmi'."
 
 #, c-format
@@ -2707,9 +2715,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "Non chiedere. Salva sempre come allarme."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "Inserisci la password"
+msgstr "Password non riutilizzabile"
 
 #. *< type
 #. *< ui_requirement
@@ -2718,13 +2725,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Supporto per password non riutilizzabile"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Obbliga ad utilizzare le password una sola volta."
 
 #. *  description
 msgid ""
@@ -2732,6 +2739,9 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Consente di richiedere in maniera obbligatoria, per uno o più account, che "
+"le password non salvate siano usate soltanto per una sola connessione.\n"
+"Nota: è necessario che la password dell'account non sia salvata."
 
 #. *< type
 #. *< ui_requirement
@@ -2925,17 +2935,15 @@
 "Impossibile trovare un'installazione di ActiveTCL. Se vuoi usare i plugin "
 "TCL, installa ActiveTCL da 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 ""
-"Il toolkit Apple Bonjour per Windows non è stato trovato. Leggi le FAQ su: "
-"http://d.pidgin.im/BonjourWindows per maggiori informazioni."
-
-#, fuzzy
+"Il toolkit di Apple \"Bonjour per Windows\" non è stato trovato. Leggi le "
+"FAQ su: http://d.pidgin.im/BonjourWindows per maggiori informazioni."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "Impossibile mettersi in ascolto per le connessioni MI in entrata\n"
+msgstr "Impossibile mettersi in ascolto per le connessioni MI in entrata"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2975,9 +2983,8 @@
 msgstr "Persona Purple"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Località"
+msgstr "Porta locale"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2990,21 +2997,17 @@
 msgstr ""
 "Impossibile inviare il messaggio. La conversazione non può essere avviata."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"Impossibile creare il socket:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Impossibile creare il socket: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Impossibile associare il socket alla porta"
-
-#, fuzzy, c-format
+msgstr "Impossibile associare il socket alla porta: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"Impossibile creare il socket:\n"
-"%s"
+msgstr "Impossibile mettersi in ascolto sul socket: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Errore di comunicazione con il responder mDNS locale."
@@ -3051,17 +3054,14 @@
 msgid "Load buddylist from file..."
 msgstr "Importa la lista contatti da file..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Riempi i campi per la registrazione."
-
-#, fuzzy
+msgstr "Devi riempire tutti i campi per la registrazione"
+
 msgid "Passwords do not match"
-msgstr "Le password non coincidono."
-
-#, fuzzy
+msgstr "Le password non coincidono"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Impossibile registrare il nuovo account. Si è verificato un errore.\n"
+msgstr "Impossibile registrare il nuovo account. Si è verificato un errore."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nuovo account Gadu-Gadu registrato"
@@ -3076,11 +3076,10 @@
 msgstr "Password (di nuovo)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Inserire il testo captcha"
+
 msgid "Captcha"
-msgstr "Salva l'immagine"
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un nuovo account Gadu-Gadu"
@@ -3219,9 +3218,9 @@
 msgid "Chat _name:"
 msgstr "_Nome chat:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Impossibile connettersi al server."
+msgstr "Impossibile risolvere il nome host '%s': %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3234,9 +3233,8 @@
 msgid "This chat name is already in use"
 msgstr "Questo nome chat è già in uso"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Non connesso al server."
+msgstr "Non connesso al server"
 
 msgid "Find buddies..."
 msgstr "Cerca contatti..."
@@ -3277,9 +3275,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Utente Gadu-Gadu"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Imposta le informazioni utente..."
+msgstr "Server GG"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3295,7 +3292,6 @@
 msgid "File Transfer Failed"
 msgstr "Trasferimento file fallito"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "Impossibile aprire una porta in ascolto."
 
@@ -3319,11 +3315,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 ""
-"Connessione persa col server:\n"
-"%s"
+msgstr "Connessione persa col server: %s"
 
 msgid "View MOTD"
 msgstr "Leggi il MOTD"
@@ -3334,9 +3328,8 @@
 msgid "_Password:"
 msgstr "_Password:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "I nick IRC non devono contenere spazi bianchi"
+msgstr "Il nick IRC e il nome del server non devono contenere spazi bianchi"
 
 msgid "SSL support unavailable"
 msgstr "Supporto SSL non disponibile"
@@ -3345,13 +3338,13 @@
 msgstr "Impossibile connettersi"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Impossibile connettersi a %s"
-
-#, fuzzy, c-format
+msgstr "Impossibile connettersi: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "Il server ha chiuso la connessione."
+msgstr "Il server ha chiuso la connessione"
 
 msgid "Users"
 msgstr "Utenti"
@@ -3536,13 +3529,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 "Questo nome chat è già in uso"
-
-#, fuzzy
+msgstr "Il nickname \"%s\" è già in uso."
+
 msgid "Nickname in use"
-msgstr "Nickname"
+msgstr "Nickname già in uso"
 
 msgid "Cannot change nick"
 msgstr "Impossibile cambiare nick"
@@ -3639,8 +3631,9 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list: Mostra la lista delle chat room presenti sulla rete. <i>Attenzione. "
-"Alcuni server potrebbero disconnetterti dopo questo comando.</i>"
+"list: Mostra la lista delle stanze di discussione presenti sulla rete. "
+"<i>Attenzione. Alcuni server potrebbero disconnetterti dopo questo comando.</"
+"i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;azione da eseguire&gt;: Esegue un'azione."
@@ -3783,12 +3776,9 @@
 msgid "execute"
 msgstr "esegui"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr ""
-"Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
-
-#, fuzzy
+msgstr "Il server richiede TLS/SSL. Nessun supporto TLS/SSL trovato."
+
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
 "Hai bisogno della crittografia, ma non è presente nessun supporto TLS/SSL."
@@ -3809,13 +3799,11 @@
 msgid "Plaintext Authentication"
 msgstr "Autenticazione come testo semplice"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Autenticazione fallita"
-
-#, fuzzy
+msgstr "Autenticazione SASL fallita"
+
 msgid "Invalid response from server"
-msgstr "Risposta non valida da parte del server."
+msgstr "Risposta non valida da parte del server"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Il server non usa nessun metodo di autenticazione supportato"
@@ -3826,36 +3814,28 @@
 msgid "Invalid challenge from server"
 msgstr "Challenge non valido dal server"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "Errore SASL"
+msgstr "Errore SASL: %s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "Il gestore di connessione BOSH ha terminato la tua sessione."
+
 msgid "No session ID given"
-msgstr "Nessun motivo fornito."
-
-#, fuzzy
+msgstr "Nessun ID di sessione fornito"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Versione non supportata"
-
-#, fuzzy
+msgstr "Versione del protocollo BOSH non supportata"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"Impossibile stabilire una connessione con il server:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Impossibile stabilire una connessione con il server"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Impossibile stabilire una connessione con il server:\n"
-"%s"
-
-#, fuzzy
+msgstr "Impossibile stabilire una connessione con il server: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Impossibile inizializzare la connessione"
+msgstr "Impossibile stabilire una connessione SSL"
 
 msgid "Full Name"
 msgstr "Nome"
@@ -3872,6 +3852,11 @@
 msgid "Street Address"
 msgstr "Indirizzo"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Indirizzo esteso"
 
@@ -3923,9 +3908,8 @@
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "File locale:"
+msgstr "Ora locale"
 
 msgid "Priority"
 msgstr "Priorità"
@@ -3935,11 +3919,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s fa"
+
 msgid "Logged Off"
-msgstr "Connesso"
+msgstr "Si è disconnesso"
 
 msgid "Middle Name"
 msgstr "Secondo nome"
@@ -3962,14 +3945,12 @@
 msgid "Temporarily Hide From"
 msgstr "Nascondi temporaneamente \"Da\""
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Elimina la notifica di presenza"
 
 msgid "(Re-)Request authorization"
 msgstr "Richiedi nuovamente l'autorizzazione"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3982,10 +3963,10 @@
 msgstr "Disconnetti"
 
 msgid "Chatty"
-msgstr "È in chat"
+msgstr "In chat"
 
 msgid "Extended Away"
-msgstr "Ancora assente"
+msgstr "Assente per molto"
 
 msgid "Do Not Disturb"
 msgstr "Non disturbare"
@@ -4051,11 +4032,11 @@
 msgstr "_Server:"
 
 msgid "_Handle:"
-msgstr "_Handle:"
+msgstr "_Identificativo:"
 
 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s non è un nome della stanza valido"
+msgstr "%s non è un nome di stanza valido"
 
 msgid "Invalid Room Name"
 msgstr "Nome della stanza non valido"
@@ -4069,10 +4050,10 @@
 
 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s non è un gestore della stanza valido"
+msgstr "%s non è un identificativo di stanza valido"
 
 msgid "Invalid Room Handle"
-msgstr "Handle della stanza non valido"
+msgstr "Identificativo di stanza non valido"
 
 msgid "Configuration error"
 msgstr "Errore di configurazione"
@@ -4090,7 +4071,8 @@
 msgstr "Errore di registrazione"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "La modifica del nick non è supportata nelle chat room non MUC"
+msgstr ""
+"La modifica del nick non è supportata nelle stanze di discussione non MUC"
 
 msgid "Error retrieving room list"
 msgstr "Errore nella ricezione della lista delle stanze"
@@ -4107,26 +4089,24 @@
 msgid "Find Rooms"
 msgstr "Cerca stanze"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Alias:"
-
-#, fuzzy
+msgstr "Affiliazioni:"
+
 msgid "No users found"
-msgstr "Non è stato trovato nessun utente corrispondente"
-
-#, fuzzy
+msgstr "Nessun utente trovato"
+
 msgid "Roles:"
-msgstr "Ruolo"
-
-#, fuzzy
+msgstr "Ruoli:"
+
 msgid "Ping timed out"
-msgstr "Timeout per il ping"
+msgstr "Ping scaduto"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
+"Impossibile trovare metodi alternativi per la connessione XMPP, dal momento "
+"che la connessione diretta è fallita."
 
 msgid "Invalid XMPP ID"
 msgstr "ID XMMP non valido"
@@ -4134,9 +4114,8 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP invalido. Deve essere impostato il dominio."
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "Impossibile connettersi al server."
+msgstr "Formato URL BOSH non valido"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4204,10 +4183,6 @@
 msgid "Change Registration"
 msgstr "Modifica la registrazione"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "Impossibile connettersi al server."
-
 msgid "Error unregistering account"
 msgstr "Errore nella rimozione dell'account"
 
@@ -4227,7 +4202,7 @@
 msgstr "Reinizializzazione dello stream"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "Il server non supporta il blocco"
 
 msgid "Not Authorized"
 msgstr "Non autorizzato"
@@ -4242,16 +4217,16 @@
 msgstr "Entrambi"
 
 msgid "From (To pending)"
-msgstr "Da (In attesa di \"Per\")"
+msgstr "Da (In attesa di \"Verso\")"
 
 msgid "From"
 msgstr "Da"
 
 msgid "To"
-msgstr "Per"
+msgstr "Verso"
 
 msgid "None (To pending)"
-msgstr "Nessuna (In attesa di \"Per\")"
+msgstr "Nessuna (In attesa di \"Verso\")"
 
 msgid "None"
 msgstr "Nessuno"
@@ -4259,9 +4234,8 @@
 msgid "Subscription"
 msgstr "Sottoscrizione"
 
-#, fuzzy
 msgid "Mood Text"
-msgstr "Testo identificato"
+msgstr "Messaggio di umore"
 
 msgid "Allow Buzz"
 msgstr "Permetti i buzz"
@@ -4400,9 +4374,8 @@
 msgid "Bad Format"
 msgstr "Formato non valido"
 
-#, fuzzy
 msgid "Bad Namespace Prefix"
-msgstr "<Inode numero 1>"
+msgstr "Prefisso del namespace non corretto"
 
 msgid "Resource Conflict"
 msgstr "Conflitto di risorsa"
@@ -4495,21 +4468,23 @@
 msgid "Unable to ping user %s"
 msgstr "Impossibile fare ping sull'utente %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Impossibile richiamare %s con un buzz: non conosco nulla dell'utente."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "Impossibile richiamare %s con un buzz: l'utente potrebbe non essere in "
 "linea. "
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "Impossibile richiamare %s con un buzz: l'utente non lo supporta."
+msgstr ""
+"Impossibile richiamare %s con un buzz: l'utente non supporta questa "
+"caratteristica oppure non desidera ricevere buzz al momento."
 
 #, c-format
 msgid "Buzzing %s..."
@@ -4524,46 +4499,48 @@
 msgid "%s has buzzed you!"
 msgstr "%s ti ha richiamato con un buzz!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Impossibile inviare il file a %s. JID non valido"
-
-#, fuzzy, c-format
+msgstr "Impossibile avviare una sessione multimediale con %s: JID non valido"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
-
-#, fuzzy, c-format
+msgstr ""
+"Impossibile avviare una sessione multimediale con %s: l'utente non è in linea"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
-
-#, fuzzy
+msgstr ""
+"Impossibile avviare una sessione multimediale con %s: non sei iscritto alla "
+"presenza dell'utente"
+
 msgid "Media Initiation Failed"
-msgstr "Registrazione fallita"
-
-#, fuzzy, c-format
+msgstr "Avvio sessione multimediale fallito"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "Scegli a quale risorsa di %s vuoi inviare un file"
+msgstr ""
+"Scegli la risorsa per %s con la quale vuoi avviare una sessione multimediale"
 
 msgid "Select a Resource"
 msgstr "Scegli una risorsa"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "Inizia una _chat"
+msgstr "Avvia sessione multimediale"
 
 msgid "config:  Configure a chat room."
-msgstr "config: Configura una chat room."
+msgstr "config: Configura una stanza di discussione."
 
 msgid "configure:  Configure a chat room."
-msgstr "configure: Configura una chat room."
+msgstr "configure: Configura una stanza di discussione."
 
 msgid "part [room]:  Leave the room."
 msgstr "part [stanza]: Abbandona la stanza."
 
 msgid "register:  Register with a chat room."
-msgstr "register: Iscrizione ad una chat room."
+msgstr "register: Iscriviti ad una stanza di discussione."
 
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nuovo argomento]: Visualizza o modifica l'argomento."
@@ -4571,21 +4548,21 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;utente&gt; [motivo]: Allontana un utente dalla stanza."
 
-#, 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;utente&gt; &lt;owner|admin|member|outcast|none&gt;: Imposta "
-"un'affiliazione per l'utente nella stanza."
-
-#, fuzzy
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: "
+"Ottieni il nome degli utenti con una certa affiliazione oppure imposta "
+"l'affiliazione degli utenti con la stanza."
+
 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;utente&gt; &lt;moderator|participant|visitor|none&gt;: Imposta un "
-"ruolo per l'utente nella stanza."
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...:  "
+"Ottieni il nome degli utenti con un certo ruolo oppure imposta il ruolo "
+"degli utenti con la stanza."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;utente&gt; [messaggio]: Invita un utente nella stanza."
@@ -4649,11 +4626,10 @@
 msgstr "Server proxy per il trasferimento file"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "URL BOSH"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
-#, fuzzy
 msgid "Show Custom Smileys"
 msgstr "Mostra gli smiley personalizzati"
 
@@ -4714,32 +4690,29 @@
 msgid "_Accept Defaults"
 msgstr "_Accetta impostazioni predefinite"
 
-#, fuzzy
 msgid "No reason"
-msgstr "Nessun motivo fornito."
-
-#, fuzzy, c-format
+msgstr "Nessun motivo"
+
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Sei stato cacciato da %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Sei stato cacciato: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Cacciato da %s: (%s)"
-
-#, fuzzy
+msgstr "Cacciato (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "C'è stato un errore nell'apertura del file."
-
-#, fuzzy
+msgstr ""
+"Si è verificato un errore nel trasferimento del flusso di dati in-band\n"
+
 msgid "Transfer was closed."
-msgstr "Trasferimento file fallito"
-
-#, fuzzy
+msgstr "Il trasferimento è stato chiuso."
+
 msgid "Failed to open the file"
-msgstr "Impossibile aprire il file '%s': %s"
+msgstr "Impossibile aprire il file"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Impossibile aprire il flusso di byte in-band"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4757,9 +4730,10 @@
 msgid "Unable to send file to %s, user is not online"
 msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Impossibile inviare il file a %s. L'utente non è in linea"
+msgstr ""
+"Impossibile inviare il file a %s. Non iscritto alla presenza dell'utente"
 
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
@@ -4807,11 +4781,10 @@
 msgstr "Impossibile aggiungere \"%s\"."
 
 msgid "Buddy Add error"
-msgstr ""
-
-#, fuzzy
+msgstr "Errore nell'aggiungere il contatto"
+
 msgid "The username specified does not exist."
-msgstr "Il nome utente specificato non è valido."
+msgstr "Il nome utente specificato non esiste."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
@@ -4927,7 +4900,7 @@
 
 #, c-format
 msgid "Too many hits to a FND"
-msgstr ""
+msgstr "Troppe risposte ad un FND"
 
 #, c-format
 msgid "Not logged in"
@@ -5005,9 +4978,9 @@
 msgid "Passport not verified"
 msgstr "Profilo Passport non verificato"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Bad friend file"
-msgstr "Invia un file a %s"
+msgstr ""
 
 #, c-format
 msgid "Not expected"
@@ -5041,9 +5014,8 @@
 msgid "Passport account not yet verified"
 msgstr "Profilo Passport non ancora verificato"
 
-#, fuzzy
 msgid "Passport account suspended"
-msgstr "Profilo Passport non ancora verificato"
+msgstr "Account Passport sospeso"
 
 #, c-format
 msgid "Bad ticket"
@@ -5057,18 +5029,35 @@
 msgid "MSN Error: %s\n"
 msgstr "Errore di MSN: %s\n"
 
-#, fuzzy
 msgid "Other Contacts"
-msgstr "Contatti preferiti"
-
-#, fuzzy
+msgstr "Altri contatti"
+
 msgid "Non-IM Contacts"
-msgstr "Rimuovi lista"
-
-#, fuzzy, c-format
+msgstr "Contatti non-MI"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+"%s ha inviato un wink. <a href='msn-wink://%s'>Fai clic per riprodurlo</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s ha inviato un wink, ma non può essere salvato"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+"%s ha inviato un clip vocale. <a href='audio://%s'>Fai clic per riprodurlo</"
+"a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s ha inviato un clip vocale, ma non può essere salvato"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è "
+"%s ti ha inviato un invito alla chat vocale. Questa caratteristica non è "
 "ancora supportata."
 
 msgid "Nudge"
@@ -5143,11 +5132,10 @@
 msgstr "Page"
 
 msgid "Playing a game"
-msgstr ""
-
-#, fuzzy
+msgstr "Giocando"
+
 msgid "Working"
-msgstr "Lavoro"
+msgstr "Al lavoro"
 
 msgid "Has you"
 msgstr "Sei nella sua lista"
@@ -5185,13 +5173,11 @@
 msgid "Album"
 msgstr "Album"
 
-#, fuzzy
 msgid "Game Title"
-msgstr "Titolo del brano"
-
-#, fuzzy
+msgstr "Nome del gioco"
+
 msgid "Office Title"
-msgstr "Titolo del brano"
+msgstr "Nome del lavoro"
 
 msgid "Set Friendly Name..."
 msgstr "Imposta un alias..."
@@ -5227,6 +5213,29 @@
 msgstr ""
 "Il supporto SSL è necessario per MSN. Installare una libreria SSL supportata."
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Impossibile aggiungere il contatto %s poiché il nome utente non è valido. I "
+"nomi utente devono essere indirizzi email validi."
+
+msgid "Unable to Add"
+msgstr "Impossibile aggiungere"
+
+msgid "Authorization Request Message:"
+msgstr "Messaggio di richiesta di autorizzazione:"
+
+msgid "Please authorize me!"
+msgstr "Mi autorizzi, per favore?"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
+
 msgid "Error retrieving profile"
 msgstr "Errore nella ricezione del profilo"
 
@@ -5382,9 +5391,8 @@
 "Nessuna informazione trovata nel profilo dell'utente. Molto probabilmente "
 "l'utente non esiste."
 
-#, fuzzy
 msgid "View web profile"
-msgstr "Nascondi quando non sei in linea"
+msgstr "Mostra il profilo web"
 
 #. *< type
 #. *< ui_requirement
@@ -5420,20 +5428,20 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s ti ha appena inviato un trillo!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Errore sconosciuto (%d)"
+msgstr "Errore sconosciuto (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Impossibile aggiungere l'utente"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Errore sconosciuto (%d)"
 
-#, fuzzy
 msgid "The following users are missing from your addressbook"
-msgstr "Ecco i risultati della tua ricerca"
+msgstr "I seguenti utenti non sono presenti nella tua rubrica"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Il messaggio mobile non è stato inviato perché è troppo lungo."
@@ -5500,24 +5508,20 @@
 "Errore di connessione dal server %s:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "Il nostro protocollo non è supportato dal server."
-
-#, fuzzy
+msgstr "Il nostro protocollo non è supportato dal server"
+
 msgid "Error parsing HTTP"
-msgstr "Errore di parsing HTTP."
-
-#, fuzzy
+msgstr "Errore di parsing HTTP"
+
 msgid "You have signed on from another location"
-msgstr "Sei connesso da un'altra postazione."
+msgstr "Sei connesso da un'altra postazione"
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "I server MSN sono temporaneamente non disponibili. Riprova più tardi."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
-msgstr "I server MSN sono temporaneamente disattivi."
+msgstr "I server MSN sono temporaneamente disattivi"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5547,11 +5551,11 @@
 msgid "Retrieving buddy list"
 msgstr "Ricezione della lista contatti in corso"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
-"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è "
-"ancora supportata."
+"%s chiede di vedere il tuo video, ma questa caratteristica non è ancora "
+"supportata."
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -5604,13 +5608,11 @@
 "Il messaggio potrebbe non essere stato inviato a causa di un errore "
 "sconosciuto:"
 
-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "Aggiungi alla rubrica"
-
-#, fuzzy
+msgstr "Rimuovere il contatto dalla Rubrica?"
+
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Vuoi aggiungere questo contatto alla tua lista?"
+msgstr "Vuoi cancellare questo contatto anche dalla tua rubrica?"
 
 msgid "The username specified is invalid."
 msgstr "Il nome utente specificato non è valido."
@@ -5689,15 +5691,11 @@
 msgid "User lookup"
 msgstr "Ricerca utente"
 
-#, fuzzy
 msgid "Reading challenge"
 msgstr ""
-"Errore di lettura di %s: \n"
-"%s.\n"
-
-#, fuzzy
+
 msgid "Unexpected challenge length from server"
-msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
+msgstr ""
 
 msgid "Logging in"
 msgstr "Login in corso"
@@ -5711,11 +5709,8 @@
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr "Vuoi impostarne uno adesso? (Nota: NON PUO' ESSERE PIU' CAMBIATO!)"
 
-#, fuzzy
 msgid "Lost connection with server"
-msgstr ""
-"Connessione persa con il server\n"
-"%s"
+msgstr "Connessione persa con il server"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 #. khc: then use N_() in the array initializer and use _() when they are
@@ -5762,16 +5757,15 @@
 msgid "Protocol error, code %d: %s"
 msgstr "Errore di protocollo. Codice %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 La tua password è di %d caratteri, più grande della lunghezza massima "
-"attesa di %d per MySpaceIM. Accorcia la tua password, collegandoti su http://"
-"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
-"e riprova."
+"%s La tua password è di %zu caratteri, più grande della lunghezza massima "
+"attesa di %d. Accorcia la tua password, collegandoti su http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword e riprova."
 
 msgid "Incorrect username or password"
 msgstr "Password o nome utente non corretti"
@@ -5788,9 +5782,8 @@
 msgid "'addbuddy' command failed."
 msgstr "Comando 'addbuddy' fallito."
 
-#, fuzzy
 msgid "persist command failed"
-msgstr "Comando 'addbuddy' fallito."
+msgstr "Comando 'persist' fallito"
 
 msgid "Failed to remove buddy"
 msgstr "Impossibile rimuovere il contatto"
@@ -5840,9 +5833,8 @@
 msgid "Show display name in status text"
 msgstr "Mostra il nome utente nel messaggio di stato"
 
-#, fuzzy
 msgid "Show headline in status text"
-msgstr "Mostra il nome utente nel messaggio di stato"
+msgstr "Mostra l'intestazione nel messaggio di stato"
 
 msgid "Send emoticons"
 msgstr "Invia emoticon"
@@ -5856,9 +5848,8 @@
 msgid "User"
 msgstr "Utente"
 
-#, fuzzy
 msgid "Headline"
-msgstr "_Handle:"
+msgstr "Intestazione"
 
 msgid "Song"
 msgstr "Canzone"
@@ -5874,6 +5865,9 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"Si è verificato un errore nell'impostare il nome utente.  Riprova, o visita "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username per "
+"impostare il tuo nome utente."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Nome utente disponibile"
@@ -5907,55 +5901,53 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Fulmina"
+
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s ti ha aggiunto [%s]"
-
-#, fuzzy, c-format
+msgstr "%s ti ha fulminato!"
+
+#, c-format
 msgid "Zapping %s..."
-msgstr "Numero del pager"
+msgstr "Stai fulminando %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#, fuzzy
 msgid "Whack"
-msgstr "Avviso"
-
-#, fuzzy, c-format
+msgstr "Picchia"
+
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s ti ha aggiunto [%s]"
-
-#, fuzzy, c-format
+msgstr "%s ti ha picchiato!"
+
+#, c-format
 msgid "Whacking %s..."
-msgstr "Avviso"
+msgstr "Stai picchiando %s..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
-msgstr "Distaccato"
-
-#, fuzzy, c-format
+msgstr "Brucia"
+
+#, c-format
 msgid "%s has torched you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha bruciato!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Stai bruciando %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Bacia"
+
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha baciato!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "Stai baciando %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
@@ -5970,60 +5962,56 @@
 msgstr "Stai abbracciando %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Assonnato"
-
-#, fuzzy, c-format
+msgstr "Da' uno schiaffo"
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha dato uno schiaffo!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "Stai dando uno schiaffo a %s..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Gallo"
-
-#, fuzzy, c-format
+msgstr "Da' un pizzicotto"
+
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s ti ha aggiunto [%s]"
-
-#, fuzzy, c-format
+msgstr "%s ti ha dato un pizzicotto!"
+
+#, c-format
 msgid "Goosing %s..."
-msgstr "Ricerca di %s in corso"
+msgstr "Stai dando un pizzicotto a %s..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#, fuzzy
 msgid "High-five"
-msgstr "Priorità alta"
-
-#, fuzzy, c-format
+msgstr "Da' il cinque"
+
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s ti ha inviato un messaggio. (%s)"
-
-#, fuzzy, c-format
+msgstr "%s ti ha dato il cinque!"
+
+#, c-format
 msgid "High-fiving %s..."
-msgstr "Priorità alta"
+msgstr "Stai dando il cinque a %s..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#, fuzzy
 msgid "Punk"
-msgstr "Punk"
-
-#, fuzzy, c-format
+msgstr "Prendi in giro"
+
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s ti ha aggiunto [%s]"
-
-#, fuzzy, c-format
+msgstr "%s ti ha preso in giro!"
+
+#, c-format
 msgid "Punking %s..."
-msgstr "Ping"
+msgstr "Stai prendendo in giro %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6032,17 +6020,16 @@
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#, fuzzy
 msgid "Raspberry"
-msgstr "Trasferimento in corso"
-
-#, fuzzy, c-format
+msgstr "Fai un pernacchio"
+
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s ti ha aggiunto [%s]"
-
-#, fuzzy, c-format
+msgstr "%s ti ha fatto un pernacchio!"
+
+#, c-format
 msgid "Raspberrying %s..."
-msgstr "Trasferimento in corso"
+msgstr "Stai facendo un pernacchio a %s..."
 
 msgid "Required parameters not passed in"
 msgstr "Dei parametri richiesti non sono stati passati"
@@ -6141,9 +6128,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "Errore sconosciuto: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Impossibile effettuare il login"
+msgstr "Impossibile effettuare il login: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6280,13 +6267,12 @@
 "%s sembra essere non in linea e non ha ricevuto il messaggio che hai appena "
 "inviato."
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
 msgstr ""
 "Impossibile connettersi al server. Inserisci l'indirizzo del server al quale "
-"connettersi."
+"desideri collegarti."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
@@ -6312,9 +6298,8 @@
 msgid "Server port"
 msgstr "Porta del server"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
+msgstr "È stata ricevuta una risposta inattesa da parte di"
 
 #. username connecting too frequently
 msgid ""
@@ -6324,22 +6309,21 @@
 "Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
 "riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Errore nella risoluzione di %s"
+msgstr "Errore nella richiesta"
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL non autorizza il tuo nome utente ad autenticarsi qui"
 
 msgid "Could not join chat room"
-msgstr "Impossibile entrare nella chat room"
+msgstr "Impossibile entrare nella stanza di discussione"
 
 msgid "Invalid chat room name"
-msgstr "Nome della chat room non valido"
-
-#, fuzzy
+msgstr "Nome della stanza di discussione non valido"
+
 msgid "Received invalid data on connection with server"
-msgstr "Ricevuti dati non validi durante la connessione con il server."
+msgstr "Ricevuti dati non validi durante la connessione con il server"
 
 #. *< type
 #. *< ui_requirement
@@ -6355,7 +6339,7 @@
 msgstr "Plugin per il protocollo AIM"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "UIN ICQ..."
 
 #. *< type
 #. *< ui_requirement
@@ -6386,7 +6370,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "Ricevuti dati non validi durante la connessione con l'utente remoto."
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "Impossibile stabilire una connessione con l'utente remoto."
 
@@ -6445,16 +6428,14 @@
 msgid "Request denied"
 msgstr "Richiesta rifiutata"
 
-#, fuzzy
 msgid "Busted SNAC payload"
-msgstr "carico di %d byte sovradimensionato"
+msgstr "Carico SNAC non corretto"
 
 msgid "Insufficient rights"
 msgstr "Permessi insufficienti"
 
-#, fuzzy
 msgid "In local permit/deny"
-msgstr "Imposta bitrate massimo locale (in kbit/s)."
+msgstr "Nell'autorizzazione/divieto locale"
 
 msgid "Warning level too high (sender)"
 msgstr "Livello di allerta troppo alto (mittente)"
@@ -6591,15 +6572,13 @@
 msgid "Buddy Comment"
 msgstr "Commento per il contatto"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Impossibile connettersi al server di autenticazione:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Impossibile connettersi al server di autenticazione: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Impossibile connettersi al server."
+msgstr "Impossibile connettersi al server BOS: %s"
 
 msgid "Username sent"
 msgstr "Nome utente inviato"
@@ -6611,20 +6590,22 @@
 msgid "Finalizing connection"
 msgstr "Finalizzazione della connessione"
 
-#, 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 ""
-"Impossibile connettersi. Impossibile effettuare il login come %s poiché il "
-"nome utente non è valido. I nomi utente devono essere indirizzi email "
-"validi. In alternativa devono iniziare con una lettera e contenere solo "
-"lettere, numeri e spazi; oppure devono contenere solo numeri."
-
-#, fuzzy, c-format
+"Impossibile effettuare il login come %s poiché il nome utente non è valido. "
+"I nomi utente devono essere indirizzi email validi. In alternativa devono "
+"iniziare con una lettera e contenere solo lettere, numeri e spazi; oppure "
+"devono contenere solo numeri."
+
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
-msgstr "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
+msgstr ""
+"Potresti essere disconnesso a breve. In tal caso, controlla %s per "
+"aggiornamenti."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "Impossibile ottenere un hash di login valido per AIM."
@@ -6638,36 +6619,33 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "L'utente non esiste"
+msgstr "Il nome utente non esiste"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Il tuo account è attualmente sospeso."
+msgstr "Il tuo account è attualmente sospeso"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Il servizio AOL Instant Messenger è temporaneamente non disponibile."
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 "La versione del client che stai usando è troppo vecchia. Aggiornala su %s"
 
 #. 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 ""
-"Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
+"Ti sei connesso e disconnesso con troppa frequenza. Aspetta un minuto e "
 "riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "La chiave SecurID immessa non è valida."
+msgstr "La chiave SecurID immessa non è valida"
 
 msgid "Enter SecurID"
 msgstr "Immettere SecurID"
@@ -6675,12 +6653,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Immettere il numero di 6 cifre del display digitale."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
 msgid "Password sent"
 msgstr "Password inviata"
 
@@ -6690,12 +6662,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Autorizzami ad includerti nella mia lista contatti."
 
-msgid "Authorization Request Message:"
-msgstr "Messaggio di richiesta di autorizzazione:"
-
-msgid "Please authorize me!"
-msgstr "Mi autorizzi, per favore?"
-
 msgid "No reason given."
 msgstr "Nessun motivo fornito."
 
@@ -6872,7 +6838,7 @@
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Sei stato disconnesso dalla chat room %s."
+msgstr "Sei stato disconnesso dalla stanza di discussione %s."
 
 msgid "Mobile Phone"
 msgstr "Cellulare"
@@ -7031,7 +6997,7 @@
 msgid "Away message too long."
 msgstr "Messaggio di assenza troppo lungo."
 
-#, 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, "
@@ -7042,11 +7008,6 @@
 "lettera e contenere solo lettere, numeri e spazi; oppure devono contenere "
 "solo numeri."
 
-#, fuzzy
-msgid "Unable to Add"
-msgstr "Impossibile aggiungere"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "Impossibile ricevere la lista contatti"
 
@@ -7061,7 +7022,7 @@
 msgid "Orphans"
 msgstr "Orfani"
 
-#, 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."
@@ -7072,7 +7033,7 @@
 msgid "(no name)"
 msgstr "(nessun nome)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Impossibile aggiungere il contatto %s per un motivo sconosciuto."
 
@@ -7238,9 +7199,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Cerca un contatto per informazione"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "L'utente non è connesso"
+msgstr "Usa clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7319,9 +7279,8 @@
 msgid "Rat"
 msgstr "Topo"
 
-#, fuzzy
 msgid "Ox"
-msgstr "OK"
+msgstr "Bue"
 
 msgid "Tiger"
 msgstr "Tigre"
@@ -7356,16 +7315,14 @@
 msgid "Other"
 msgstr "Altro"
 
-#, fuzzy
 msgid "Visible"
-msgstr "Invisibile"
+msgstr "Visibile"
 
 msgid "Friend Only"
-msgstr ""
-
-#, fuzzy
+msgstr "Solo amici"
+
 msgid "Private"
-msgstr "Privacy"
+msgstr "Privato"
 
 msgid "QQ Number"
 msgstr "Numero QQ"
@@ -7382,9 +7339,8 @@
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Autorizzare l'utente?"
+msgstr "Autorizzare l'aggiunta"
 
 msgid "Cellphone Number"
 msgstr "Numero di cellulare"
@@ -7392,64 +7348,50 @@
 msgid "Personal Introduction"
 msgstr "Presentazione personale"
 
-#, fuzzy
 msgid "City/Area"
-msgstr "Città"
-
-#, fuzzy
+msgstr "Città/Area"
+
 msgid "Publish Mobile"
-msgstr "Cellulare personale"
-
-#, fuzzy
+msgstr "Pubblica il numero di cellulare"
+
 msgid "Publish Contact"
-msgstr "Imposta un alias per la lista"
+msgstr "Pubblica le informazioni sul contatto"
 
 msgid "College"
 msgstr "Scuola superiore"
 
-#, fuzzy
 msgid "Horoscope"
-msgstr "Simbolo zodiacale"
-
-#, fuzzy
+msgstr "Oroscopo"
+
 msgid "Zodiac"
-msgstr "Segno zodiacale"
-
-#, fuzzy
+msgstr "Zodiaco"
+
 msgid "Blood"
-msgstr "Bloccato"
-
-#, fuzzy
+msgstr "Gruppo sanguigno"
+
 msgid "True"
-msgstr "Toro"
-
-#, fuzzy
+msgstr "Vero"
+
 msgid "False"
-msgstr "Fallito"
-
-#, fuzzy
+msgstr "Falso"
+
 msgid "Modify Contact"
-msgstr "Modifica l'account"
-
-#, fuzzy
+msgstr "Modifica il contatto"
+
 msgid "Modify Address"
-msgstr "Indirizzo di casa"
-
-#, fuzzy
+msgstr "Modifica l'indirizzo"
+
 msgid "Modify Extended Information"
-msgstr "Modifica le mie informazioni"
-
-#, fuzzy
+msgstr "Modifica le informazioni estese"
+
 msgid "Modify Information"
-msgstr "Modifica le mie informazioni"
-
-#, fuzzy
+msgstr "Modifica le informazioni"
+
 msgid "Update"
-msgstr "Ultimo aggiornamento"
-
-#, fuzzy
+msgstr "Aggiorna"
+
 msgid "Could not change buddy information."
-msgstr "Inserisci le informazioni sul contatto."
+msgstr "Impossibile modificare le informazioni sul contatto."
 
 msgid "Mobile"
 msgstr "Cellulare"
@@ -7458,99 +7400,84 @@
 msgstr "Note"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Icona per il contatto"
+msgstr "Promemoria per il contatto"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "Modifica a piacimento il promemoria per il contatto"
+
 msgid "_Modify"
-msgstr "Modifica"
-
-#, fuzzy
+msgstr "_Modifica"
+
 msgid "Memo Modify"
-msgstr "Modifica"
-
-#, fuzzy
+msgstr "Modifica promemoria"
+
 msgid "Server says:"
-msgstr "Server occupato"
+msgstr "Il server dice:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "La tua richiesta è stata accettata."
 
 msgid "Your request was rejected."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "La tua richiesta è stata rifiutata."
+
+#, c-format
 msgid "%u requires verification"
-msgstr "Richiedi autorizzazione"
-
-#, fuzzy
+msgstr "%u necessita di verifica"
+
 msgid "Add buddy question"
-msgstr "Vuoi aggiungere il contatto alla tua lista?"
-
-#, fuzzy
+msgstr "Domanda per l'aggiunta del contatto"
+
 msgid "Enter answer here"
-msgstr "Inserisci la tua richiesta qui"
+msgstr "Inserisci qui la risposta"
 
 msgid "Send"
 msgstr "Invia"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Nome utente non valido."
+msgstr "Risposta non valida."
 
 msgid "Authorization denied message:"
 msgstr "Messaggio di autorizzazione rifiutata:"
 
-#, fuzzy
 msgid "Sorry, you're not my style."
-msgstr "Mi dispiace ma non sei il mio tipo..."
-
-#, fuzzy, c-format
+msgstr "Mi dispiace ma non sei il mio tipo."
+
+#, c-format
 msgid "%u needs authorization"
-msgstr "L'utente %d necessita di autenticazione"
-
-#, fuzzy
+msgstr "%u necessita di autorizzazione"
+
 msgid "Add buddy authorize"
-msgstr "Vuoi aggiungere il contatto alla tua lista?"
-
-#, fuzzy
+msgstr "Autorizzazione per l'aggiunta del contatto"
+
 msgid "Enter request here"
-msgstr "Inserisci la tua richiesta qui"
+msgstr "Inserisci la richiesta qui"
 
 msgid "Would you be my friend?"
 msgstr "Vuoi essere mio amico?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Contatto"
-
-#, fuzzy
+msgstr "Contatto QQ"
+
 msgid "Add buddy"
-msgstr "Aggiungi un contatto"
-
-#, fuzzy
+msgstr "Aggiungi contatto"
+
 msgid "Invalid QQ Number"
-msgstr "Volto QQ non valido"
-
-#, fuzzy
+msgstr "Numero QQ non valido"
+
 msgid "Failed sending authorize"
-msgstr "Mi autorizzi, per favore?"
-
-#, fuzzy, c-format
+msgstr "Invio dell'autorizzazione non riuscito"
+
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "Impossibile rimuovere il contatto"
-
-#, fuzzy, c-format
+msgstr "Rimozione del contatto %u non riuscita"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s ti ha rimosso dalla sua lista contatti."
-
-#, fuzzy
+msgstr "Impossibile rimuovere me stesso dalla lista contatti di %d"
+
 msgid "No reason given"
-msgstr "Nessun motivo fornito."
+msgstr "Nessun motivo fornito"
 
 #. only need to get value
 #, c-format
@@ -7560,9 +7487,9 @@
 msgid "Would you like to add him?"
 msgstr "Vuoi aggiungerlo?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Rifiuta"
+msgstr "Rifiutato da %s"
 
 #, c-format
 msgid "Message: %s"
@@ -7577,88 +7504,73 @@
 msgid "QQ Qun"
 msgstr "Qun QQ"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Inserire un nuovo nome per %s"
-
-#, fuzzy
+msgstr "Inserisci un numero Qun"
+
 msgid "You can only search for permanent Qun\n"
-msgstr "Puoi solamente cercare i gruppi QQ permanenti\n"
-
-#, fuzzy
+msgstr "Puoi solamente cercare Qun permanenti\n"
+
 msgid "(Invalid UTF-8 string)"
-msgstr "Impostazioni del proxy non valide"
-
-#, fuzzy
+msgstr "(Stringa UTF-8 non valida)"
+
 msgid "Not member"
-msgstr "Non sono un membro"
+msgstr "Non è membro"
 
 msgid "Member"
 msgstr "Membro"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Finestra di richiesta"
-
-#, fuzzy
+msgstr "Richiesta in corso"
+
 msgid "Admin"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "Amministratore"
+
 msgid "Notice"
-msgstr "Note"
-
-#, fuzzy
+msgstr "Avviso"
+
 msgid "Detail"
-msgstr "Predefinito"
+msgstr "Dettaglio"
 
 msgid "Creator"
 msgstr "Creatore"
 
-#, fuzzy
 msgid "About me"
-msgstr "Informazioni su %s"
-
-#, fuzzy
+msgstr "Informazioni su di me"
+
 msgid "Category"
-msgstr "Errore nella chat"
-
-#, fuzzy
+msgstr "Categoria"
+
 msgid "The Qun does not allow others to join"
-msgstr "Questo gruppo non consente ad altri di entrare"
-
-#, fuzzy
+msgstr "Il Qun non consente ad altri di entrare"
+
 msgid "Join QQ Qun"
-msgstr "Entra in chat"
+msgstr "Entra in un Qun QQ"
 
 msgid "Input request here"
 msgstr "Inserisci la tua richiesta qui"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Membro Qun modificato con successo"
-
-#, fuzzy
+msgstr "Ingresso nel Qun %s (%u) riuscito"
+
 msgid "Successfully joined Qun"
-msgstr "Membro Qun modificato con successo"
+msgstr "Ingresso nel Qun riuscito"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "L'ingresso nel Qun %u è stato rifiutato"
 
 msgid "QQ Qun Operation"
 msgstr "Operatore Qun QQ"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Fallito"
+msgstr "Fallito:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "Ingresso nel Qun, risposta sconosciuta"
+
 msgid "Quit Qun"
-msgstr "Qun QQ"
+msgstr "Abbandona il Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
@@ -7667,51 +7579,47 @@
 "Nota, se sei il creatore, \n"
 "questa operazione rimuoverà questo Qun."
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "Mi dispiace ma non sei il mio tipo..."
-
-#, fuzzy
+msgstr "Mi dispiace, ma non sei il nostro tipo"
+
 msgid "Successfully changed Qun members"
-msgstr "Membro Qun modificato con successo"
-
-#, fuzzy
+msgstr "Membri del Qun modificati con successo"
+
 msgid "Successfully changed Qun information"
-msgstr "Informazione Qun modificata con successo"
+msgstr "Informazione sul Qun modificata con successo"
 
 msgid "You have successfully created a Qun"
 msgstr "Qun creato con successo"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "Vuoi impostare i dettagli Qun adesso?"
+msgstr "Vuoi impostare le informazioni dettagliate adesso?"
 
 msgid "Setup"
 msgstr "Impostazione"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "L'utente %d ha chiesto di entrare nel gruppo %d"
-
-#, fuzzy, c-format
+msgstr "L'utente %u ha chiesto di entrare nel Qun %u per %s"
+
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "L'utente %d ha chiesto di entrare nel gruppo %d"
-
-#, fuzzy, c-format
+msgstr "L'utente %u ha chiesto di entrare nel Qun %u"
+
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Impossibile unirsi al contatto in chat"
+msgstr "Impossibile entrare nel Qun %u, gestito dall'admin %u"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<b>L'ingresso nel Qun %u è approvato dall'amministratore %u per %s</b>"
+
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "Rimuovi il contatto"
-
-#, fuzzy, c-format
+msgstr "<b>Il contatto %u è stato rimosso.</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Rimuovi il contatto"
+msgstr "<b>Il nuovo contatto %u è entrato.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7721,151 +7629,139 @@
 msgstr "Livello"
 
 msgid " VIP"
-msgstr ""
+msgstr " VIP"
 
 msgid " TCP"
-msgstr ""
-
-#, fuzzy
+msgstr " TCP"
+
 msgid " FromMobile"
-msgstr "Cellulare"
-
-#, fuzzy
+msgstr " FromMobile"
+
 msgid " BindMobile"
-msgstr "Cellulare"
-
-#, fuzzy
+msgstr " BindMobile"
+
 msgid " Video"
-msgstr "Video live"
-
-#, fuzzy
+msgstr "Video"
+
 msgid " Zone"
-msgstr "Nessuno"
+msgstr "Zona"
 
 msgid "Flag"
-msgstr ""
+msgstr "Flag"
 
 msgid "Ver"
-msgstr ""
+msgstr "Versione"
 
 msgid "Invalid name"
 msgstr "Nome non valido"
 
-#, fuzzy
 msgid "Select icon..."
-msgstr "Scegli cartella..."
-
-#, fuzzy, c-format
+msgstr "Scegli un'icona..."
+
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Orario di login</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Orario di login</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Attualmente online</b>: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Numero di contatti online</b>: %d<br>\n"
+
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Ultimo aggiornamento</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Server</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Orario di login</b>: %s<br>\n"
+msgstr "<b>Etichetta del client</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Modalità di connessione</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Modalità di connessione</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Il mio indirizzo IP</b>: %s:%d<br>\n"
+
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Inviato</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Invia nuovamente</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Perso</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Ricevuto</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
-msgstr "<b>Il mio IP pubblico</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Ricevuto duplicato</b>: %lu<br>\n"
+
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>Orario di login</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>Data e ora</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
 msgstr "Informazioni sul login"
 
 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>Autore originale</b>:<br>\n"
 
 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
-
-#, fuzzy
+msgstr "<p><b>Hanno contribuito al codice</b>:<br>\n"
+
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
-
-#, fuzzy
+msgstr "<p><b>Gli Amabili Scrittori Patch</b>:<br>\n"
+
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
-
-#, fuzzy
+msgstr "<p><b>Ringraziamento</b>:<br>\n"
+
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<b>Ultimo aggiornamento</b>: %s<br>\n"
+msgstr "<p><b>Tester scrupolosi</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "ed altri ancora, fatemi sapere... grazie!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
-msgstr ""
+msgstr "<p><i>E tutti i ragazzi del retrobottega...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<i>Unisciti a noi!</i> :)"
+
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Informazioni su %s"
-
-#, fuzzy
+msgstr "Informazioni su OpenQ %s"
+
 msgid "Change Icon"
-msgstr "Salva l'icona"
+msgstr "Cambia icona"
 
 msgid "Change Password"
 msgstr "Cambia password"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Informazioni sul login"
+msgstr "Informazioni sull'account"
 
 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "Aggiorna tutti i Qun di QQ"
+
 msgid "About OpenQ"
-msgstr "Informazioni su %s"
-
-#, fuzzy
+msgstr "Informazioni su OpenQ"
+
 msgid "Modify Buddy Memo"
-msgstr "Indirizzo di casa"
+msgstr "Modifica il promemoria per il contatto"
 
 #. *< type
 #. *< ui_requirement
@@ -7877,57 +7773,48 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "Plugin per il protocollo QQ"
 
-#, fuzzy
 msgid "Auto"
-msgstr "Autore"
-
-#, fuzzy
+msgstr "Automatico"
+
 msgid "Select Server"
-msgstr "Scegli l'utente"
+msgstr "Scegli un server"
 
 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"
 
 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"
 
 msgid "QQ2008"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ2008"
+
 msgid "Connect by TCP"
 msgstr "Connetti utilizzando TCP"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "Porta del server"
-
-#, fuzzy
+msgstr "Mostra gli avvisi dal server"
+
 msgid "Show server news"
-msgstr "Indirizzo del server"
+msgstr "Mostra le news del server"
 
 msgid "Show chat room when msg comes"
-msgstr ""
-
-#, fuzzy
+msgstr "Mostra la stanza di discussione all'arrivo di un messaggio"
+
 msgid "Keep alive interval (seconds)"
-msgstr "Errore nell'aggiunta del contatto"
-
-#, fuzzy
+msgstr "Intervallo di \"Keep alive\" (secondi)"
+
 msgid "Update interval (seconds)"
-msgstr "Intervallo(i) per l'aggiornamento"
-
-#, fuzzy
+msgstr "Intervallo di aggiornamento (secondi)"
+
 msgid "Unable to decrypt server reply"
-msgstr "Impossibile decrittare la risposta al login"
+msgstr "Impossibile decrittare la risposta del server"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Impossibile richiedere il token, 0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
@@ -7935,135 +7822,122 @@
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Il Redirect_EX non è attualmente supportato"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "Richiesta registrazione"
-
-#, fuzzy, c-format
+msgstr "Richiesta attivazione"
+
+#, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr "Token non valido nel codice di risposta, 0x%02X"
-
-#, fuzzy
+msgstr "Codice di risposta sconosciuto durante il login (0x%02X)"
+
 msgid "Requesting captcha"
-msgstr "Richiedi l'attenzione di %s..."
-
-#, fuzzy
+msgstr "Richiesta del codice captcha in corso"
+
 msgid "Checking captcha"
-msgstr "Richiedi l'attenzione di %s..."
-
-#, fuzzy
+msgstr "Verifica del codice captcha in corso"
+
 msgid "Failed captcha verification"
-msgstr "Autenticazione Yahoo! fallita"
-
-#, fuzzy
+msgstr "Verifica del codice captcha fallita"
+
 msgid "Captcha Image"
-msgstr "Salva l'immagine"
-
-#, fuzzy
+msgstr "Immagine Captcha"
+
 msgid "Enter code"
-msgstr "Inserisci la password"
-
-#, fuzzy
+msgstr "Inserisci il codice"
+
 msgid "QQ Captcha Verification"
-msgstr "Verifica certificato SSL"
-
-#, fuzzy
+msgstr "Verifica captcha di QQ"
+
 msgid "Enter the text from the image"
-msgstr "Inserisci il nome del gruppo"
-
-#, fuzzy, c-format
+msgstr "Inserisci il testo che appare nell'immagine"
+
+#, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr "Token non valido nel codice di risposta, 0x%02X"
-
-#, fuzzy, c-format
+msgstr "Risposta sconosciuta durante la verifica della password (0x%02X)"
+
+#, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
-msgstr "Token non valido nel codice di risposta, 0x%02X"
+msgstr ""
+"Codice di risposta sconosciuto durante il login (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
 msgstr "Errore socket"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "Imposta le informazioni utente..."
-
-#, fuzzy
+msgstr "Ricezione server in corso"
+
 msgid "Requesting token"
-msgstr "Richiesta rifiutata"
-
-#, fuzzy
+msgstr "Richiesta del token in corso"
+
 msgid "Unable to resolve hostname"
-msgstr "Impossibile connettersi al server."
-
-#, fuzzy
+msgstr "Impossibile risolvere il nome dell'host"
+
 msgid "Invalid server or port"
-msgstr "Errore non valido"
-
-#, fuzzy
+msgstr "Server o porta non validi"
+
 msgid "Connecting to server"
-msgstr "Connessione al server SILC in corso"
-
-#, fuzzy
+msgstr "Connessione al server in corso"
+
 msgid "QQ Error"
-msgstr "Errore QQid"
-
-#, fuzzy, c-format
+msgstr "Errore di QQ"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Server relay ICQ"
-
-#, fuzzy, c-format
+msgstr ""
+"News dal server:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
 msgid "%s:%s"
-msgstr "%s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s: %s"
+
+#, c-format
 msgid "From %s:"
-msgstr "Da"
-
-#, fuzzy, c-format
+msgstr "Da %s:"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Istruzioni per il server: %s"
-
-#, fuzzy
+msgstr ""
+"Avviso del server da %s: \n"
+"%s"
+
 msgid "Unknown SERVER CMD"
-msgstr "Motivo sconosciuto"
-
-#, fuzzy, c-format
+msgstr "Comando SERVER sconosciuto"
+
+#, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
-"Risposta %s(0x%02X )\n"
-"Inviato %s(0x%02X )\n"
-"Id della stanza %d, risposta [0x%02X]: \n"
-"%s"
-
-#, fuzzy
+"Risposta di errore di %s(0x%02X)\n"
+"Stanza %u, risposta 0x%02X"
+
 msgid "QQ Qun Command"
-msgstr "Comando"
-
-#, fuzzy
+msgstr "Comando Qun QQ"
+
 msgid "Unable to decrypt login reply"
 msgstr "Impossibile decrittare la risposta al login"
 
-#, fuzzy
 msgid "Unknown LOGIN CMD"
-msgstr "Motivo sconosciuto"
-
-#, fuzzy
+msgstr "Comando LOGIN sconosciuto"
+
 msgid "Unknown CLIENT CMD"
-msgstr "Motivo sconosciuto"
+msgstr "Comando CLIENT sconosciuto"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8775,9 +8649,8 @@
 msgid "Cannot join private group"
 msgstr "Impossibile entrare nel gruppo privato"
 
-#, fuzzy
 msgid "Call Command"
-msgstr "Impossibile richiamare il comando"
+msgstr "Comando per la chiamata"
 
 msgid "Cannot call command"
 msgstr "Impossibile richiamare il comando"
@@ -8989,11 +8862,10 @@
 msgstr "Impossibile uccidere (kill) l'utente"
 
 msgid "WATCH"
-msgstr ""
-
-#, fuzzy
+msgstr "GUARDA"
+
 msgid "Cannot watch user"
-msgstr "Impossibile ottenere le informazioni sull'utente"
+msgstr "Impossibile osservare l'utente"
 
 msgid "Resuming session"
 msgstr "Ripristino della sessione in corso"
@@ -9043,7 +8915,6 @@
 msgid "Disconnected by server"
 msgstr "Disconnesso dal server"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "Errore nella connessione al server SILC"
 
@@ -9059,7 +8930,6 @@
 msgid "Performing key exchange"
 msgstr "Scambio delle chiavi in corso"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Impossibile caricare la coppia di chiavi SILC"
 
@@ -9067,14 +8937,9 @@
 msgid "Connecting to SILC Server"
 msgstr "Connessione al server SILC in corso"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "Impossibile caricare la coppia di chiavi SILC"
-
 msgid "Out of memory"
 msgstr "Memoria esaurita"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "Impossibile inizializzare il protocollo SILC"
 
@@ -9355,7 +9220,7 @@
 msgstr "HMAC"
 
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Usa PFS (Perfect Forward Secrecy)"
 
 msgid "Public key authentication"
 msgstr "Autenticazione con chiave pubblica"
@@ -9375,9 +9240,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Creazione della coppia di chiavi SILC in corso..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Impossibile creare la coppia di chiavi SILC\n"
+msgstr "Impossibile creare la coppia di chiavi SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9517,35 +9381,30 @@
 msgid "Failure: Authentication failed"
 msgstr "Non riuscito: Autenticazione fallita"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "Impossibile inizializzare la connessione client SILC"
 
-#, fuzzy
 msgid "John Noname"
-msgstr "Nessun nome"
-
-#, fuzzy, c-format
+msgstr "Giovanni Senzanome"
+
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Impossibile caricare la coppia di chiavi SILC: %s"
 
 msgid "Unable to create connection"
 msgstr "Impossibile creare la connessione"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Risposta sconosciuta dal server."
-
-#, fuzzy
+msgstr "Risposta sconosciuta da parte del server"
+
 msgid "Unable to create listen socket"
-msgstr "Impossibile creare il socket"
+msgstr "Impossibile creare il socket in ascolto"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "I nomi utente SIP non devono contenere spazi bianchi o simboli @"
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "Porta del server"
+msgstr "Server di connessione SIP non specificato"
 
 #. *< type
 #. *< ui_requirement
@@ -9583,17 +9442,17 @@
 msgstr "Dominio Auth"
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;stanza&gt;: Entra in una chat room sul network Yahoo"
+msgstr ""
+"join &lt;stanza&gt;: Entra in una stanza di discussione sul network Yahoo"
 
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Elenca le stanze presenti sul network Yahoo"
 
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
-
-#, fuzzy
+msgstr "doodle: Richiedi all'utente di avviare una sessione di scarabocchi"
+
 msgid "Yahoo ID..."
-msgstr "ID Yahoo!"
+msgstr "ID Yahoo..."
 
 #. *< type
 #. *< ui_requirement
@@ -9605,9 +9464,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Plugin per il protocollo Yahoo"
+msgstr "Plugin per il protocollo Yahoo!"
 
 msgid "Pager server"
 msgstr "Sever pager"
@@ -9622,13 +9480,13 @@
 msgstr "Porta trasferimento file"
 
 msgid "Chat room locale"
-msgstr "Lingua della chat room"
+msgstr "Lingua della stanza di discussione"
 
 msgid "Ignore conference and chatroom invitations"
-msgstr "Ignora gli inviti a conferenze e a chat room"
+msgstr "Ignora gli inviti a conferenze e a stanze di discussione"
 
 msgid "Chat room list URL"
-msgstr "URL della lista delle chat room"
+msgstr "URL della lista delle stanze di discussione"
 
 msgid "Yahoo Chat server"
 msgstr "Server Yahoo Chat"
@@ -9636,9 +9494,8 @@
 msgid "Yahoo Chat port"
 msgstr "Porta Yahoo Chat"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "ID Yahoo!"
+msgstr "ID Yahoo Giappone..."
 
 #. *< type
 #. *< ui_requirement
@@ -9650,12 +9507,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Plugin per il protocollo Yahoo"
+msgstr "Plugin per il protocollo Yahoo! Giappone"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Il tuo SMS non è stato consegnato"
 
 msgid "Your Yahoo! message did not get sent."
 msgstr "Il tuo messaggio di Yahoo! non è stato inviato."
@@ -9682,32 +9538,28 @@
 msgstr "Aggiungi un contatto rifiutato"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "Ricevuti dati non validi durante la connessione con il server."
+msgstr "Ricevuti dati non validi"
 
 #. 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 ""
-"Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
-"effettuando il login sul sito web di Yahoo!."
+"Account bloccato: troppi tentativi di accesso falliti. Il problema potrebbe "
+"essere risolto effettuando l'accesso dal sito web di Yahoo!."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
-"effettuando il login sul sito web di Yahoo!."
+"Account bloccato: motivo sconosciuto. Il problema potrebbe essere risolto "
+"effettuando l'accesso dal sito web di Yahoo!."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Password o nome utente non corretti"
+msgstr "Non è stata specificata la password o il nome utente"
 
 #, c-format
 msgid ""
@@ -9744,35 +9596,29 @@
 "Codice di errore %d sconosciuto. Il problema potrebbe essere risolto "
 "effettuando il login sul sito web di Yahoo!."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Impossibile aggiungere il contatto %s al gruppo %s alla lista del server per "
 "l'account %s."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "Impossibile aggiungere il contatto alla lista del server"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr ""
-
-#, fuzzy
+msgstr "[ Audible %s/%s/%s.swf ] %s"
+
 msgid "Received unexpected HTTP response from server"
-msgstr "È stata ricevuta da parte del server una risposta HTTP inattesa."
-
-#, fuzzy, c-format
+msgstr "È stata ricevuta una risposta HTTP inattesa da parte del server"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Connessione persa con %s:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Connessione persa con %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"Impossibile stabilire una connessione con il server:\n"
-"%s"
+msgstr "Impossibile stabilire una connessione con %s: %s"
 
 msgid "Not at Home"
 msgstr "Non a casa"
@@ -9816,12 +9662,11 @@
 msgid "Presence Settings"
 msgstr "Impostazioni di presenza"
 
-#, fuzzy
 msgid "Start Doodling"
-msgstr "_Prima porta:"
+msgstr "Inizia a scarabocchiare"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Scegli l'ID che vuoi attivare"
 
 msgid "Join whom in chat?"
 msgstr "A chi vuoi unirti nella chat?"
@@ -9838,9 +9683,8 @@
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#, fuzzy
 msgid "Sent Doodle request."
-msgstr "Richiedi nuovamente l'autorizzazione"
+msgstr "Invia una richiesta per una sessione di scarabocchi"
 
 msgid "Unable to connect."
 msgstr "Impossibile connettersi."
@@ -9898,12 +9742,10 @@
 msgid "Last Update"
 msgstr "Ultimo aggiornamento"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
 msgstr ""
-"Spiacente, questo profilo sembra essere in un linguaggio non supportato al "
-"momento."
+"Questo profilo è in un linguaggio o in un formato non supportato al momento."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -9926,13 +9768,8 @@
 msgstr "Il profilo dell'utente è vuoto."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s ha rifiutato il tuo invito alla conferenza nella stanza \"%s\" per il "
-"seguente motivo \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Invito rifiutato"
+msgid "%s has declined to join."
+msgstr "%s ha rifiutato l'ingresso."
 
 msgid "Failed to join chat"
 msgstr "Impossibile entrare nella chat"
@@ -9954,7 +9791,7 @@
 "able to rejoin a chatroom"
 msgstr ""
 "Errore sconosciuto. Potrebbe essere necessario disconnettersi ed aspettare "
-"cinque minuti prima di poter entrare nuovamente nella chat room"
+"cinque minuti prima di poter entrare nuovamente in una stanza di discussione"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -9984,9 +9821,8 @@
 msgid "User Rooms"
 msgstr "Stanze utente"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Problema di connessione con il server YCHT."
+msgstr "Problema di connessione con il server YCHT"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10109,26 +9945,25 @@
 msgid "Import from .zephyr.subs"
 msgstr "Importa da .zephyr.subs"
 
-#, fuzzy
 msgid "Realm"
-msgstr "Vero nome"
+msgstr "Dominio"
 
 msgid "Exposure"
 msgstr "Esposizione"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Impossibile interpretare la risposta dal proxy HTTP: %s\n"
+msgstr "Impossibile interpretare la risposta dal proxy HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Errore di connessione al proxy HTTP: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
 "Accesso negato: il server proxy HTTP non permette il tunnelling sulla porta %"
-"d."
+"d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10175,12 +10010,12 @@
 "%s has invited %s to the chat room %s:\n"
 "%s"
 msgstr ""
-"%s ha invitato %s nella chat room: %s\n"
+"%s ha invitato %s nella stanza di discussione: %s\n"
 "%s"
 
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
-msgstr "%s ha invitato %s nella chat room: %s\n"
+msgstr "%s ha invitato %s nella stanza di discussione: %s\n"
 
 msgid "Accept chat invitation?"
 msgstr "Accetti l'invito alla chat?"
@@ -10197,7 +10032,7 @@
 msgstr "Immagine salvata"
 
 msgid "Stored Image. (that'll have to do for now)"
-msgstr ""
+msgstr "Immagine archiviata. (questo è sufficiente per ora)"
 
 msgid "SSL Connection Failed"
 msgstr "Connessione SSL fallita"
@@ -10218,7 +10053,7 @@
 msgstr "Non disturbare"
 
 msgid "Extended away"
-msgstr "Ancora assente"
+msgstr "Assente per molto"
 
 msgid "Listening to music"
 msgstr "Sta ascoltando musica"
@@ -10311,9 +10146,10 @@
 msgid "Unable to connect to %s"
 msgstr "Impossibile connettersi a %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Errore di lettura da %s: %s"
+msgstr ""
+"Errore di lettura da %s: risposta troppo lunga (il limite è di %d byte)"
 
 #, c-format
 msgid ""
@@ -10337,7 +10173,7 @@
 
 #, c-format
 msgid " - %s"
-msgstr ""
+msgstr "- %s"
 
 #, c-format
 msgid " (%s)"
@@ -10372,13 +10208,13 @@
 msgid "Error Reading %s"
 msgstr "Errore nella lettura di %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"Si è verificato un errore nella lettura dei tuoi %s. Non sono stati caricati "
-"e il vecchio file è stato rinominato in %s~."
+"Si è verificato un errore nella lettura del tuo %s. Il file non è stato "
+"caricato e il vecchio file è stato rinominato in %s~."
 
 msgid "Internet Messenger"
 msgstr "Internet Messenger"
@@ -10422,8 +10258,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizza per questo account la seguente _icona:"
 
-msgid "_Advanced"
-msgstr "_Avanzate"
+msgid "Ad_vanced"
+msgstr "A_vanzate"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "Utilizza le opzioni del proxy di GNOME"
@@ -10485,9 +10321,8 @@
 msgid "Create _this new account on the server"
 msgstr "Crea _questo nuovo account sul server"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "Proxy"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Abilitato"
@@ -10495,7 +10330,7 @@
 msgid "Protocol"
 msgstr "Protocollo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -10510,9 +10345,9 @@
 "<span size='larger' weight='bold'>Benvenuto in %s!</span>\n"
 "\n"
 "Non hai nessun account configurato. Per iniziare a connetterti con %s, premi "
-"il pulsante <b>Aggiungi</b> qui sotto e configura il tuo primo account. Se "
-"vuoi che %s si connetta a diversi account di messaggistica, premi nuovamente "
-"<b>Aggiungi</b> per configurarli tutti.\n"
+"il pulsante <b>Aggiungi...</b> qui sotto e configura il tuo primo account. "
+"Se vuoi che %s si connetta a diversi account di messaggistica, premi "
+"nuovamente <b>Aggiungi...</b> per configurarli tutti.\n"
 "\n"
 "Puoi tornare a questa finestra, per aggiungere, modificare o rimuovere un "
 "account, attraverso <b>Account->Gestisci account</b> nella finestra della "
@@ -10537,9 +10372,8 @@
 msgid "Please update the necessary fields."
 msgstr "Aggiorna i campi necessari."
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "Account"
+msgstr "A_ccount"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10565,16 +10399,14 @@
 msgid "I_M"
 msgstr "_MI"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Aggiungi una chat"
+msgstr "Chiamata _audio"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Chiamata audio/_video"
+
 msgid "_Video Call"
-msgstr "Video chat"
+msgstr "Chiamata _video"
 
 msgid "_Send File..."
 msgstr "_Invia file..."
@@ -10585,13 +10417,11 @@
 msgid "View _Log"
 msgstr "Mostra il _log"
 
-#, fuzzy
 msgid "Hide When Offline"
-msgstr "Nascondi quando non sei in linea"
-
-#, fuzzy
+msgstr "Nascondi quando non è in linea"
+
 msgid "Show When Offline"
-msgstr "Mostra quando non sei in linea"
+msgstr "Mostra quando non è in linea"
 
 msgid "_Alias..."
 msgstr "_Alias..."
@@ -10648,9 +10478,8 @@
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#, fuzzy
 msgid "Unknown node type"
-msgstr "tipo di compressione sconosciuto `%s'!"
+msgstr "Tipo di nodo sconosciuto"
 
 #. Buddies menu
 msgid "/_Buddies"
@@ -10718,9 +10547,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/Strumenti/_Certificati"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Strumenti/Smile_y"
+msgstr "/Strumenti/Smile_y personalizzati"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Strumenti/Plu_gin"
@@ -10849,7 +10677,7 @@
 msgstr "Per stato"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "Per discussioni recenti"
 
 #, c-format
 msgid "%s disconnected"
@@ -10866,7 +10694,7 @@
 msgstr "Riabilita"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "FAQ su SSL"
 
 msgid "Welcome back!"
 msgstr "Bentornato!"
@@ -10939,7 +10767,7 @@
 msgstr "Aggiungi un contatto al _gruppo:"
 
 msgid "This protocol does not support chat rooms."
-msgstr "Questo protocollo non supporta le chat room."
+msgstr "Questo protocollo non supporta le stanze di discussione."
 
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
@@ -10963,9 +10791,8 @@
 msgid "Auto_join when account becomes online."
 msgstr "Entra _automaticamente quando l'account si connette."
 
-#, fuzzy
 msgid "_Remain in chat after window is closed."
-msgstr "_Nascondi la chat quando la finestra è chiusa."
+msgstr "_Resta in chat alla chiusura della finestra."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Inserisci il nome del gruppo da aggiungere."
@@ -10998,109 +10825,96 @@
 msgid "Background Color"
 msgstr "Colore dello sfondo"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "Questo gruppo è stato aggiunto alla tua lista dei contatti."
-
-#, fuzzy
+msgstr "Il colore di sfondo per la lista contatti"
+
 msgid "Layout"
-msgstr "Lao"
+msgstr "Layout"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "Il layout di icone, nome e stato della lista contatti"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Colore dello sfondo"
+msgstr "Colore di sfondo per i gruppi massimizzati"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "Il colore di sfondo per un gruppo massimizzato"
+
 msgid "Expanded Text"
-msgstr "M_assimizza"
+msgstr "Testo per i gruppi massimizzati"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale per un gruppo massimizzato"
+
 msgid "Collapsed Background Color"
-msgstr "Scegli il colore dello sfondo"
+msgstr "Colore di sfondo per i gruppi minimizzati"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "Il colore di sfondo per un gruppo minimizzato"
+
 msgid "Collapsed Text"
-msgstr "_Minimizza"
+msgstr "Testo per i gruppi minimizzati"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "L'informazione testuale per un gruppo minimizzato"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Scegli il colore dello sfondo"
+msgstr "Colore di sfondo per contatti/chat"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "Il colore di sfondo per un contatto o una chat"
+
 msgid "Contact Text"
-msgstr "Scorciatoia"
+msgstr "Testo per i contatti"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale quando un contatto è massimizzato"
+
 msgid "On-line Text"
-msgstr "Online"
+msgstr "Testo per i contatti in linea"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale quando un contatto è in linea"
+
 msgid "Away Text"
-msgstr "Assente"
+msgstr "Testo per i contatti assenti"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale quando un contatto è assente"
+
 msgid "Off-line Text"
-msgstr "Non connesso"
+msgstr "Testo per i contatti non in linea"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale quando un contatto non è in linea"
+
 msgid "Idle Text"
-msgstr "Testo identificato"
+msgstr "Testo per i contatti inattivi"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "L'informazione testuale quando un contatto è inattivo"
+
 msgid "Message Text"
-msgstr "Messaggio inviato"
+msgstr "Testo per i messaggi non letti"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "L'informazione testuale quando un contatto ha un messaggio non letto"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Testo per i messaggi con nick"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
 msgstr ""
-
-#, fuzzy
+"L'informazione testuale quando una chat ha un messaggio non letto dove è "
+"citato il tuo nickname"
+
 msgid "The text information for a buddy's status"
-msgstr "Modifica le informazioni utente per %s"
-
-#, fuzzy
+msgstr "L'informazione testuale sullo stato di un contatto"
+
 msgid "Type the host name for this certificate."
 msgstr "Immetti il nome dell'host al quale è associato questo certificato."
 
@@ -11122,7 +10936,7 @@
 "contatto."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "Invita un contatto nella chat room"
+msgstr "Invita un contatto nella stanza di discussione"
 
 msgid "_Buddy:"
 msgstr "_Contatto:"
@@ -11152,9 +10966,8 @@
 msgid "Get Away Message"
 msgstr "Ottieni messaggio di assenza"
 
-#, fuzzy
 msgid "Last Said"
-msgstr "Ultimo messaggio"
+msgstr "Ultime parole"
 
 msgid "Unable to save icon file to disk."
 msgstr "Impossibile salvare il file dell'icona sul disco."
@@ -11199,21 +11012,17 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversazione/Rimuovi lo _storico"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Conversazione/_Altro"
-
-#, fuzzy
+msgstr "/Conversazione/M_edia"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Conversazione/_Altro"
-
-#, fuzzy
+msgstr "/Conversazione/Media/Chiamata _audio"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Conversazione/_Altro"
-
-#, fuzzy
+msgstr "/Conversazione/Media/Chiamata _video"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Conversazione/Mostra il _log"
+msgstr "/Conversazione/Media/_Chiamata audio\\/video"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversazione/_Invia file..."
@@ -11287,17 +11096,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Conversazione/Mostra il log"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Conversazione/Altro"
-
-#, fuzzy
+msgstr "/Conversazione/Media/Chiamata audio"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Conversazione/Mostra il log"
-
-#, fuzzy
+msgstr "/Conversazione/Media/Chiamata video"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Conversazione/Altro"
+msgstr "/Conversazione/Media/Chiamata audio\\/video"
 
 msgid "/Conversation/Send File..."
 msgstr "/Conversazione/Invia file..."
@@ -11378,9 +11184,8 @@
 msgid "Stopped Typing"
 msgstr "Ha smesso di scrivere"
 
-#, fuzzy
 msgid "Nick Said"
-msgstr "%s ha pronunciato il tuo nick in %s"
+msgstr "È stato pronunciato il tuo nickname"
 
 msgid "Unread Messages"
 msgstr "Messaggi non letti"
@@ -11473,25 +11278,23 @@
 msgstr "Errore fatale"
 
 msgid "bug master"
-msgstr ""
-
-#, fuzzy
+msgstr "signore dei bug"
+
 msgid "artist"
-msgstr "Artista"
+msgstr "artista"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "voce e video"
 
 msgid "support"
 msgstr "supporto"
 
-#, fuzzy
 msgid "webmaster"
-msgstr "sviluppatore e webmaster"
+msgstr "webmaster"
 
 msgid "Senior Contributor/QA"
 msgstr "Collaboratore senior/QA"
@@ -11513,7 +11316,7 @@
 msgstr "supporto/QA"
 
 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"
 
 msgid "original author"
 msgstr "autore originale"
@@ -11590,9 +11393,8 @@
 msgid "French"
 msgstr "Francese"
 
-#, fuzzy
 msgid "Irish"
-msgstr "Curdo"
+msgstr "Irlandese"
 
 msgid "Galician"
 msgstr "Galiziano"
@@ -11612,9 +11414,8 @@
 msgid "Hungarian"
 msgstr "Ungherese"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Rumeno"
+msgstr "Armeno"
 
 msgid "Indonesian"
 msgstr "Indonesiano"
@@ -11631,9 +11432,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Traduttori georgiani di Ubuntu"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "Altro"
+msgstr "Khmer"
 
 msgid "Kannada"
 msgstr "Kannada"
@@ -11656,9 +11456,8 @@
 msgid "Macedonian"
 msgstr "Macedone"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "Macedone"
+msgstr "Mongolo"
 
 msgid "Bokmål Norwegian"
 msgstr "Norvegese Bokmål"
@@ -11715,7 +11514,7 @@
 msgstr "Svedese"
 
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
 msgid "Tamil"
 msgstr "Tamil"
@@ -11781,21 +11580,26 @@
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 msgstr ""
-
-#, fuzzy, c-format
+"<FONT SIZE=\"4\">Help via email:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
-
-#, fuzzy, c-format
+msgstr ""
+"<FONT SIZE=\"4\">Canale IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin su irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">MUC XMPP:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Sviluppatori attuali"
@@ -11827,13 +11631,12 @@
 msgid "Get User Info"
 msgstr "Informazioni sull'utente"
 
-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Inserisci il nome utente o l'alias della persona della quale vuoi "
-"informazioni."
+"Inserisci il nome utente o l'alias della persona della quale desideri "
+"ricevere informazioni."
 
 msgid "View User Log"
 msgstr "Mostra il log dell'utente"
@@ -12022,14 +11825,6 @@
 msgid "File transfer _details"
 msgstr "_Dettagli trasferimento file"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Pausa"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Riprendi"
-
 msgid "Paste as Plain _Text"
 msgstr "Incolla come _testo semplice"
 
@@ -12040,43 +11835,37 @@
 msgstr "Disabilita gli _smileys nel testo selezionato"
 
 msgid "Hyperlink color"
-msgstr "Colore dei collegamenti"
+msgstr "Colore per i collegamenti"
 
 msgid "Color to draw hyperlinks."
-msgstr "Colore per disegnare i collegamenti."
-
-#, fuzzy
+msgstr "Colore per indicare i collegamenti."
+
 msgid "Hyperlink visited color"
-msgstr "Colore dei collegamenti"
-
-#, fuzzy
+msgstr "Colore per i collegamenti visitati"
+
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Colore per i collegamenti al passaggio del mouse."
-
-#, fuzzy
+msgstr "Colore per i collegamenti visitati (o attivi)."
+
 msgid "Hyperlink prelight color"
-msgstr "Inserire un codice colore"
+msgstr "Colore per i collegamenti al passaggio del mouse"
 
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Colore per i collegamenti al passaggio del mouse."
 
-#, fuzzy
 msgid "Sent Message Name Color"
-msgstr "%s ti ha inviato un messaggio. (%s)"
+msgstr "Colore per il nome dei messaggi inviati"
 
 msgid "Color to draw the name of a message you sent."
 msgstr "Colore per il nome in un messaggio che hai inviato."
 
-#, fuzzy
 msgid "Received Message Name Color"
-msgstr "Il messaggio ricevuto inizia la conversazione"
+msgstr "Colore per il nome dei messaggi ricevuti"
 
 msgid "Color to draw the name of a message you received."
 msgstr "Colore per il nome in un messaggio che hai ricevuto."
 
-#, fuzzy
 msgid "\"Attention\" Name Color"
-msgstr "Inserire un codice colore"
+msgstr ""
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
@@ -12092,24 +11881,20 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "Colore per il nome di un messaggio di azione."
-
-#, fuzzy
+msgstr ""
+
 msgid "Whisper Message Name Color"
-msgstr "%s ti ha inviato un messaggio. (%s)"
-
-#, fuzzy
+msgstr ""
+
 msgid "Color to draw the name of a whispered message."
-msgstr "Colore per il nome di un messaggio di azione."
+msgstr ""
 
 msgid "Typing notification color"
 msgstr "Colore per la notifica di scrittura"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "Il colore da usare per il carattere della notifica di scrittura"
+msgstr "Il colore da usare per la notifica di scrittura"
 
 msgid "Typing notification font"
 msgstr "Carattere per la notifica di scrittura"
@@ -12361,7 +12146,7 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Prova con `%s -h' per maggiori informazioni.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12383,6 +12168,8 @@
 "\n"
 "  -c, --config=DIR    usa DIR per i file di configurazione\n"
 "  -d, --debug         stampa messaggi di debug sullo standard output\n"
+"  -f, --force-online  forza la connessione, qualunque sia lo stato della "
+"rete\n"
 "  -h, --help          mostra questo aiuto ed esce\n"
 "  -m, --multiple      non assicurare una singola istanza\n"
 "  -n, --nologin       non effettuare il login\n"
@@ -12392,7 +12179,7 @@
 "  --display=DISPLAY   display X da utilizzare\n"
 "  -v, --version       mostra la versione attuale ed esce\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12413,6 +12200,8 @@
 "\n"
 "  -c, --config=DIR    usa DIR per i file di configurazione\n"
 "  -d, --debug         stampa messaggi di debug sullo standard output\n"
+"  -f, --force-online  forza la connessione, qualunque sia lo stato della "
+"rete\n"
 "  -h, --help          mostra questo aiuto ed esce\n"
 "  -m, --multiple      non assicurare una singola istanza\n"
 "  -n, --nologin       non effettuare il login\n"
@@ -12422,7 +12211,7 @@
 "  --display=DISPLAY   display X da utilizzare\n"
 "  -v, --version       mostra la versione attuale ed esce\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -12448,11 +12237,6 @@
 "al momento del crash ed allega il backtrace del file core.\n"
 "Se non sai come ottenere il backtrace, puoi trovare le istruzioni su\n"
 "%swiki/GetABacktrace\n"
-"\n"
-"Se hai bisogno di ulteriore assistenza, invia un messaggio\n"
-"a SeanEgn o a LSchiere (via AIM). Informazioni su come contattare\n"
-"Sean o Luke su altri protocolli sono disponibili su\n"
-"%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -12461,25 +12245,24 @@
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "Uscita in corso, poiché è in esecuzione un altro client libpurple.\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/_Media"
 
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/Media/_Riaggancia"
+
 msgid "Calling..."
-msgstr "Calcolo in corso..."
+msgstr "Chiamata in corso..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s vuole avviare una sessione audio/video con te."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s vuole avviare una sessione video con te."
 
 #, c-format
 msgid "%s has %d new message."
@@ -12510,9 +12293,8 @@
 "È stato scelto di impostare il browser manualmente, ma non è stato immesso "
 "nessun comando."
 
-#, fuzzy
 msgid "No message"
-msgstr "Messaggio sconosciuto"
+msgstr "Nessun messaggio"
 
 msgid "Open All Messages"
 msgstr "Apri tutti i messaggi"
@@ -12520,16 +12302,14 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>"
 
-#, fuzzy
 msgid "New Pounces"
-msgstr "Nuovo allarme"
+msgstr "Nuovi allarmi"
 
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "Chiudi"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Posta in arrivo!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Hai degli avvisi!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "I seguenti plugin saranno rimossi."
@@ -12579,7 +12359,6 @@
 msgid "Select a file"
 msgstr "Scegli un file"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "Modifica l'allarme"
 
@@ -12656,61 +12435,58 @@
 msgid "Pounce Target"
 msgstr "Contatto da controllare"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
-msgstr "Inizia a scrivere"
-
-#, fuzzy, c-format
+msgstr "Ha iniziato a scrivere"
+
+#, c-format
 msgid "Paused while typing"
-msgstr "Interrompe la scrittura"
-
-#, fuzzy, c-format
+msgstr "Si è fermato mentre scriveva"
+
+#, c-format
 msgid "Signed on"
-msgstr "Si connette"
-
-#, fuzzy, c-format
+msgstr "Si è connesso"
+
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s è tornato attivo (%s)"
-
-#, fuzzy, c-format
+msgstr "È tornato attivo"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "Ritorna dall'assenza"
-
-#, fuzzy, c-format
+msgstr "È tornato dall'assenza"
+
+#, c-format
 msgid "Stopped typing"
 msgstr "Ha smesso di scrivere"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
-msgstr "Si disconnette"
-
-#, fuzzy, c-format
+msgstr "Si è disconnesso"
+
+#, c-format
 msgid "Became idle"
-msgstr "Diventa inattivo"
-
-#, fuzzy, c-format
+msgstr "È diventato inattivo"
+
+#, c-format
 msgid "Went away"
-msgstr "Se assente"
-
-#, fuzzy, c-format
+msgstr "È andato via"
+
+#, c-format
 msgid "Sent a message"
-msgstr "Invia un messaggio"
-
-#, fuzzy, c-format
+msgstr "Ha inviato un messaggio"
+
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "Evento sconosciuto. Per piacere riporta questo errore!"
-
-#, fuzzy
+msgstr "Sconosciuto... Per piacere riporta questo errore!"
+
 msgid "Theme failed to unpack."
-msgstr "Impossibile spacchettare il tema degli smiley."
-
-#, fuzzy
+msgstr "Impossibile spacchettare il tema."
+
 msgid "Theme failed to load."
-msgstr "Impossibile spacchettare il tema degli smiley."
-
-#, fuzzy
+msgstr "Impossibile caricare il tema."
+
 msgid "Theme failed to copy."
-msgstr "Impossibile spacchettare il tema degli smiley."
+msgstr "Impossibile copiare il tema."
 
 msgid "Install Theme"
 msgstr "Installa tema"
@@ -12732,9 +12508,8 @@
 msgstr "Ch_iudi le conversazioni con il tasto Esc"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Lista contatti"
+msgstr "Tema per la lista contatti"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12746,9 +12521,8 @@
 msgid "On unread messages"
 msgstr "Se ci sono messaggi non letti"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "Finestre dei messaggi immediati"
+msgstr "Finestra di conversazione"
 
 msgid "_Hide new IM conversations:"
 msgstr "_Nascondi le nuove conversazioni:"
@@ -12797,7 +12571,7 @@
 msgstr "Mostra la _formattazione per i messaggi in entrata"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr "Chiudi istantaneamente i messaggi immediati alla chiusura della scheda"
+msgstr "Chiudi subito i messaggi immediati alla chiusura della scheda"
 
 msgid "Show _detailed information"
 msgstr "Mostra informazioni _dettagliate"
@@ -12851,9 +12625,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esempio: stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "Rileva _automaticamente l'indirizzo IP"
+msgstr "Usa l'indirizzo IP rilevato _automaticamente: %s"
 
 msgid "Public _IP:"
 msgstr "_IP pubblico:"
@@ -12876,7 +12650,7 @@
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Server di relay (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "Server proxy &amp; Browser"
@@ -12910,7 +12684,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 "Usa un DNS remoto con proxy SOCKS4"
 
 msgid "_User:"
 msgstr "_Utente:"
@@ -13033,7 +12807,6 @@
 "C_omando da eseguire:\n"
 "(%s per il nome del file)"
 
-#, fuzzy
 msgid "M_ute sounds"
 msgstr "Nessun _suono"
 
@@ -13041,13 +12814,11 @@
 msgstr ""
 "Riproduci i suoni quando la finestra di conversazione va in _primo piano"
 
-#, fuzzy
 msgid "_Enable sounds:"
-msgstr "Abilita i suoni:"
-
-#, fuzzy
+msgstr "_Abilita i suoni:"
+
 msgid "V_olume:"
-msgstr "Volume:"
+msgstr "V_olume:"
 
 msgid "Play"
 msgstr "Riproduci"
@@ -13227,12 +12998,12 @@
 msgid "Status for %s"
 msgstr "Stato per %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"Esiste già uno smiley personalizzato per la scorciatoia da tastiera "
-"selezionata. Specifica una scorciatoia differente."
+"Esiste già uno smiley personalizzato per '%s'. Specifica una scorciatoia "
+"differente."
 
 msgid "Custom Smiley"
 msgstr "Smiley personalizzato"
@@ -13246,36 +13017,30 @@
 msgid "Add Smiley"
 msgstr "Aggiungi uno smiley"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "_Immagine"
+msgstr "_Immagine:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Scorciatoia"
+msgstr "Testo della scorciatoia:"
 
 msgid "Smiley"
 msgstr "Smiley"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Scorciatoia"
+msgstr "Testo della scorciatoia"
 
 msgid "Custom Smiley Manager"
 msgstr "Gestione degli smiley personalizzati"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Seleziona il contatto"
-
-#, fuzzy
+msgstr "Seleziona l'icona per il contatto"
+
 msgid "Click to change your buddyicon for this account."
-msgstr "Utilizza per questo account la seguente _icona:"
-
-#, fuzzy
+msgstr "Fai clic per cambiare la tua icona per questo account."
+
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Utilizza per questo account la seguente _icona:"
+msgstr "Fai clic per cambiare la tua icona per tutti gli account."
 
 msgid "Waiting for network connection"
 msgstr "In attesa della connessione di rete"
@@ -13355,7 +13120,6 @@
 msgid "Cannot send launcher"
 msgstr "Impossibile inviare l'icona di avvio"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13395,9 +13159,8 @@
 "Impossibile caricare l'immagine '%s' per un motivo sconosciuto. "
 "Probabilmente il file dell'immagine è danneggiato."
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "_Apertura dei collegamenti:"
+msgstr "_Apri il collegamento"
 
 msgid "_Copy Link Location"
 msgstr "_Copia l'indirizzo del collegamento"
@@ -13405,9 +13168,21 @@
 msgid "_Copy Email Address"
 msgstr "_Copia l'indirizzo email"
 
+msgid "_Open File"
+msgstr "_Apri il file"
+
+msgid "Open _Containing Directory"
+msgstr "Apri la _cartella del file"
+
 msgid "Save File"
 msgstr "Salva il file"
 
+msgid "_Play Sound"
+msgstr "_Riproduci il suono"
+
+msgid "_Save File"
+msgstr "_Salva il file"
+
 msgid "Select color"
 msgstr "Scegli il colore"
 
@@ -13423,17 +13198,18 @@
 msgid "_Invite"
 msgstr "_Invita"
 
-#, fuzzy
 msgid "_Modify..."
-msgstr "_Modifica"
-
-#, fuzzy
+msgstr "_Modifica..."
+
 msgid "_Add..."
-msgstr "_Aggiungi"
+msgstr "_Aggiungi..."
 
 msgid "_Open Mail"
 msgstr "_Leggi la Posta"
 
+msgid "_Pause"
+msgstr "_Pausa"
+
 msgid "_Edit"
 msgstr "_Modifica"
 
@@ -13452,12 +13228,11 @@
 msgid "none"
 msgstr "nessuno"
 
-#, fuzzy
 msgid "Small"
-msgstr "Email"
+msgstr "Piccolo"
 
 msgid "Smaller versions of the default smilies"
-msgstr ""
+msgstr "Versione più piccola degli smiley predefiniti"
 
 msgid "Response Probability:"
 msgstr "Probabilità di risposta:"
@@ -13498,78 +13273,65 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Mostra informazioni statistiche sulla disponibilità dei tuoi contatti"
 
-#, fuzzy
 msgid "Server name request"
-msgstr "Indirizzo del server"
-
-#, fuzzy
+msgstr "Richiesta nome server"
+
 msgid "Enter an XMPP Server"
-msgstr "Inserisci il nome del server per le conferenze"
-
-#, fuzzy
+msgstr "Specifica un server XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Scegli un server per le conferenze al quale connettersi"
-
-#, fuzzy
+msgstr "Scegli un server XMPP da interrogare"
+
 msgid "Find Services"
-msgstr "Servizi on line"
-
-#, fuzzy
+msgstr "Cerca servizi"
+
 msgid "Add to Buddy List"
-msgstr "Invia la lista contatti"
-
-#, fuzzy
+msgstr "Aggiungi alla lista contatti"
+
 msgid "Gateway"
-msgstr "È assente"
-
-#, fuzzy
+msgstr "Gateway"
+
 msgid "Directory"
-msgstr "Percorso dei log"
-
-#, fuzzy
+msgstr "Directory"
+
 msgid "PubSub Collection"
-msgstr "Scegli un suono"
-
-#, fuzzy
+msgstr ""
+
 msgid "PubSub Leaf"
-msgstr "Servizio non disponibile"
-
-#, fuzzy
+msgstr ""
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Descrizione"
+msgstr ""
+"\n"
+"<b>Descrizione:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "/Conversazione/_Info"
-
-#, fuzzy
+msgstr "Scoperta servizi"
+
 msgid "_Browse"
-msgstr "_Browser:"
-
-#, fuzzy
+msgstr "_Sfoglia"
+
 msgid "Server does not exist"
-msgstr "L'utente non esiste"
-
-#, fuzzy
+msgstr "Il server non esiste"
+
 msgid "Server does not support service discovery"
-msgstr "Il server non usa nessun metodo di autenticazione supportato"
-
-#, fuzzy
+msgstr "Il server non supporta la scoperta dei servizi"
+
 msgid "XMPP Service Discovery"
-msgstr "/Conversazione/_Info"
+msgstr "Scoperta servizi XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Permette di sfogliare e registrare i servizi."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
-"Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
+"Questo plugin è utile per registrarsi a versioni precedenti del protocollo o "
+"ad altri servizi XMPP."
 
 msgid "Buddy is idle"
 msgstr "Il contatto è inattivo"
@@ -13578,7 +13340,7 @@
 msgstr "Il contatto è assente"
 
 msgid "Buddy is \"extended\" away"
-msgstr "Il contatto è ancora assente"
+msgstr "Il contatto è assente per molto"
 
 #. Not used yet.
 msgid "Buddy is mobile"
@@ -13972,7 +13734,6 @@
 msgstr "Messaggi musicali, per la composizione collaborativa."
 
 #. *  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."
@@ -14010,9 +13771,8 @@
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Invia il messaggio \"_URGENTE\" al window manager"
 
-#, fuzzy
 msgid "_Flash window"
-msgstr "Finestre delle _chat"
+msgstr "Fai _lampeggiare la finestra"
 
 #. Raise window method button
 msgid "R_aise conversation window"
@@ -14020,7 +13780,7 @@
 
 #. Present conversation method button
 msgid "_Present conversation window"
-msgstr "Finestra di conversazione _attuale"
+msgstr "Mostra la _finestra di conversazione"
 
 #. ---------- "Notification Removals" ----------
 msgid "Notification Removal"
@@ -14092,21 +13852,17 @@
 msgid "Hyperlink Color"
 msgstr "Colore per i collegamenti"
 
-#, fuzzy
 msgid "Visited Hyperlink Color"
-msgstr "Colore per i collegamenti"
-
-#, fuzzy
+msgstr "Colore per i collegamenti visitati"
+
 msgid "Highlighted Message Name Color"
-msgstr "Messaggi evidenziati"
-
-#, fuzzy
+msgstr "Colore per i messaggi evidenziati"
+
 msgid "Typing Notification Color"
 msgstr "Colore per la notifica di scrittura"
 
-#, fuzzy
 msgid "GtkTreeView Horizontal Separation"
-msgstr "Una versione a scorrimento orizzontale della lista contatti."
+msgstr "Separazione orizzontale per GtkTreeView"
 
 msgid "Conversation Entry"
 msgstr "Finestra di conversazione"
@@ -14131,27 +13887,23 @@
 msgid "GTK+ Interface Font"
 msgstr "Carattere per l'interfaccia GTK+"
 
-#, fuzzy
 msgid "GTK+ Text Shortcut Theme"
-msgstr "Controllo del tema GTK+"
-
-#, fuzzy
+msgstr "Scorciatoia per il nome del tema GTK+"
+
 msgid "Disable Typing Notification Text"
-msgstr "Abilita la notifica di scrittura"
-
-#, fuzzy
+msgstr "Disabilita il testo per la notifica di scrittura"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Controllo del tema GTK+ per Pidgin"
-
-#, fuzzy
+msgstr "Impostazioni per il controllo del tema GTK+"
+
 msgid "Colors"
-msgstr "Chiudi"
+msgstr "Colori"
 
 msgid "Fonts"
 msgstr "Caratteri"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Miscellanea"
 
 msgid "Gtkrc File Tools"
 msgstr "Strumenti per il file gtkrc"
@@ -14185,18 +13937,16 @@
 
 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "Puoi aggiornare a %s %s oggi."
 
 msgid "New Version Available"
 msgstr "Nuova versione disponibile"
 
-#, fuzzy
 msgid "Later"
-msgstr "Data"
-
-#, fuzzy
+msgstr "Più tardi"
+
 msgid "Download Now"
-msgstr "Scarica %s: %s"
+msgstr "Scarica adesso"
 
 #. *< type
 #. *< ui_requirement
@@ -14238,7 +13988,6 @@
 msgstr "Pulsante 'Invia' per la finestra di conversazione."
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14299,94 +14048,81 @@
 "Sostituisce il testo nei messaggi in uscita secondo delle regole definite "
 "dall'utente."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "Non connesso"
-
-#, fuzzy
+msgstr "Appena entrato"
+
 msgid "Just logged out"
-msgstr "Non connesso"
+msgstr "Appena uscito"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Icona per il contatto/\n"
+"Icona per persone sconosciute"
+
 msgid "Icon for Chat"
-msgstr "Entra in chat"
-
-#, fuzzy
+msgstr "Icona per la chat"
+
 msgid "Ignored"
-msgstr "Ignora"
-
-#, fuzzy
+msgstr "Ignorato"
+
 msgid "Founder"
-msgstr "Più alto"
-
-#, fuzzy
+msgstr "Fondatore"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "Operatore"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Mezzo operatore"
+
 msgid "Authorization dialog"
-msgstr "Autorizzazione concessa"
-
-#, fuzzy
+msgstr "Finestra di autorizzazione"
+
 msgid "Error dialog"
-msgstr "Errore"
-
-#, fuzzy
+msgstr "Finestra di errore"
+
 msgid "Information dialog"
-msgstr "Informazione"
+msgstr "Finestra di informazione"
 
 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Finestra della posta"
+
 msgid "Question dialog"
 msgstr "Finestra di richiesta"
 
-#, fuzzy
 msgid "Warning dialog"
-msgstr "Livello di richiamo"
+msgstr "Finestra di avviso"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Che tipo di finestra è questa?"
+
 msgid "Status Icons"
-msgstr "Stato per %s"
-
-#, fuzzy
+msgstr "Icone di stato"
+
 msgid "Chatroom Emblems"
-msgstr "Lingua della chat room"
-
-#, fuzzy
+msgstr "Emblemi per le stanze di discussione"
+
 msgid "Dialog Icons"
-msgstr "Salva l'icona"
-
-#, fuzzy
+msgstr "Icone delle finestre"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Controllo del tema GTK+ per Pidgin"
-
-#, fuzzy
+msgstr "Editor del tema delle icone di Pidgin"
+
 msgid "Contact"
-msgstr "Informazioni sul contatto"
-
-#, fuzzy
+msgstr "Contatto"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Lista contatti"
-
-#, fuzzy
+msgstr "Editor del tema della lista contatti di Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Lista contatti"
+msgstr "Modifica il tema della lista contatti"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Modifica il tema delle icone"
 
 #. *< type
 #. *< ui_requirement
@@ -14395,16 +14131,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Controllo del tema GTK+ per Pidgin"
+msgstr "Editor del tema di Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Controllo del tema GTK+ per Pidgin"
+msgstr "Editor del tema di Pidgin."
 
 #. *< type
 #. *< ui_requirement
@@ -14574,7 +14308,6 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opzioni specifiche di Pidgin per Windows."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
@@ -14612,847 +14345,12 @@
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr ""
+msgstr "Invia e riceve blocchi XMPP"
 
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
 
-#~ msgid "Cannot open socket"
-#~ msgstr "Impossibile aprire il socket"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Impossibile ascoltare sul socket"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Impossibile leggere il socket"
-
-#~ msgid "Connection failed."
-#~ msgstr "Connessione fallita."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "Il server ti ha disconnesso"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Impossibile creare il socket"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Impossibile connettersi all'host"
-
-#~ msgid "Read error"
-#~ msgstr "Errore di lettura"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossibile stabilire una connessione con il server:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "Errore di scrittura"
-
-#~ msgid "Last Activity"
-#~ msgstr "Ultima attività"
-
-#, fuzzy
-#~ msgid "Service Discovery Info"
-#~ msgstr "/Conversazione/_Info"
-
-#, fuzzy
-#~ msgid "Service Discovery Items"
-#~ msgstr "<b>Oggetti da sincronizzare</b>"
-
-#, fuzzy
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Tipo di stanza non supportato"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "Chat multi-utente"
-
-#, fuzzy
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "Non c'è nessuna informazione sull'utente nella directory."
-
-#, fuzzy
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "Email nella cartella:"
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Comandi ad-hoc"
-
-#, fuzzy
-#~ msgid "PubSub Service"
-#~ msgstr "Servizio non disponibile"
-
-#, fuzzy
-#~ msgid "Out of Band Data"
-#~ msgstr "Tempo limite esaurito per il socket dati"
-
-#, fuzzy
-#~ msgid "XHTML-IM"
-#~ msgstr "Finestre dei _messaggi immediati"
-
-#, fuzzy
-#~ msgid "In-Band Registration"
-#~ msgstr "Riempi i campi per la registrazione."
-
-#~ msgid "User Location"
-#~ msgstr "Posizione dell'utente"
-
-#~ msgid "User Avatar"
-#~ msgstr "Avatar dell'utente"
-
-#, fuzzy
-#~ msgid "Chat State Notifications"
-#~ msgstr "Notifica i nuovi messaggi di posta"
-
-#~ msgid "Software Version"
-#~ msgstr "Versione del software"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "Inizializzazione dello stream"
-
-#~ msgid "User Mood"
-#~ msgstr "Umore dell'utente"
-
-#~ msgid "User Activity"
-#~ msgstr "Attività dell'utente"
-
-#, fuzzy
-#~ msgid "Entity Capabilities"
-#~ msgstr "Capacità"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "Negoziazione della sessione crittografata"
-
-#~ msgid "User Tune"
-#~ msgstr "Brano ascoltato dall'utente"
-
-#~ msgid "Roster Item Exchange"
-#~ msgstr "Scambio degli elementi del roster"
-
-#, fuzzy
-#~ msgid "Reachability Address"
-#~ msgstr "Indirizzo notiziario:"
-
-#~ msgid "User Profile"
-#~ msgstr "Profilo dell'utente"
-
-#~ msgid "Jingle"
-#~ msgstr "Jingle"
-
-#~ msgid "Jingle Audio"
-#~ msgstr "Jingle audio"
-
-#~ msgid "User Nickname"
-#~ msgstr "Nickname dell'utente"
-
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "Jingle ICE UDP"
-
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "Jingle ICE TCP"
-
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "Jingle Raw UDP"
-
-#~ msgid "Jingle Video"
-#~ msgstr "Jingle video"
-
-#~ msgid "Jingle DTMF"
-#~ msgstr "Jingle DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "Ricevute per il messaggio"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "Pubblicazione della chiave pubblica"
-
-#~ msgid "User Chatting"
-#~ msgstr "Chat con l'utente"
-
-#, fuzzy
-#~ msgid "User Browsing"
-#~ msgstr "Per utente"
-
-#, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Per utente"
-
-#, fuzzy
-#~ msgid "User Viewing"
-#~ msgstr "Per utente"
-
-#, fuzzy
-#~ msgid "Stanza Encryption"
-#~ msgstr "Crittazione di trillian"
-
-#, fuzzy
-#~ msgid "Entity Time"
-#~ msgstr "Tempo di inattività"
-
-#, fuzzy
-#~ msgid "Delayed Delivery"
-#~ msgstr "Per i messaggi ritardati"
-
-#, fuzzy
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "Mostra oggetti in database"
-
-#, fuzzy
-#~ msgid "File Repository and Sharing"
-#~ msgstr "%s: nessuna entry per il file `%s' e per la entry del menu `%s'"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "Negoziazione di una sessione criptata semplificata"
-
-#, fuzzy
-#~ msgid "Hop Check"
-#~ msgstr "controllo annullato.\n"
-
-#~ msgid "Read Error"
-#~ msgstr "Errore di lettura"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Impossibile connettersi al server."
-
-#~ msgid "Read buffer full (2)"
-#~ msgstr "Buffer di lettura pieno (2)"
-
-#~ msgid "Unparseable message"
-#~ msgstr "Messaggio indecifrabile"
-
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Impossibile connettersi all'host: %s (%d)"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Login non riuscito (%s)."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "Sei stato disconnesso perché ti sei collegato da un'altra macchina."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Errore. Il supporto SSL non è installato."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Password non corretta."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossibile connettersi al server BOS:\n"
-#~ "%s"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "Potresti essere disconnesso a breve. Controlla %s per aggiornamenti."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Impossibile connettersi"
-
-#~ msgid "Invalid username."
-#~ msgstr "Nome utente non valido."
-
-#, fuzzy
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Impossibile decrittare la risposta al login"
-
-#~ msgid "Connection lost"
-#~ msgstr "Connessione persa"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Impossibile risolvere l'host"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Connessione chiusa (scrittura in corso)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Connessione reimpostata"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Errore di lettura dal socket: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Impossibile connettersi all'host"
-
-#~ msgid "Could not write"
-#~ msgstr "Impossibile scrivere"
-
-#~ msgid "Could not connect"
-#~ msgstr "Impossibile connettersi"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Impossibile creare il socket in ascolto"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Impossibile risolvere il nome dell'host"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "Password non corretta"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossibile stabilire una connessione con %s:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Giappone"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Server pager (Giappone)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Server per il trasferimento file (Giappone)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Connessione persa con il server\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Impossibile risolvere il nome dell'host"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Il server richiede TLS/SSL per il login. Nessun supporto TLS/SSL trovato."
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Finestre di conversazione nascoste"
-
-#~ msgid "More Data needed"
-#~ msgstr "C'è bisogno di più dati"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Scegli una scorciatoia da tastiera da associare con lo smiley."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Scegli un'immagine per lo smiley."
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Quale ID vuoi attivare?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "Colore del cursore"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Colore per il cursore secondario"
-
-#~ msgid "Interface colors"
-#~ msgstr "Colori dell'interfaccia"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Dimensioni dei widget"
-
-#~ msgid "Invite message"
-#~ msgstr "Messaggio di invito"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Inserisci il nome del contatto che vuoi invitare,\n"
-#~ "insieme a un messaggio di invito (opzionale)."
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Impossibile ottenere la rubrica MSN"
-
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] "Connessione al server persa (nessun dato ricevuto in %d secondo)"
-#~ msgstr[1] "Connessione al server persa (nessun dato ricevuto in %d secondi)"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "Verrai disconnesso a breve. Potresti voler utilizzare TOC finché non è "
-#~ "risolto il problema. Controlla %s per aggiornamenti."
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Aggiungi un contatto"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Impossibile decrittare la risposta al login"
-
-#, fuzzy
-#~ msgid "Keep alive error"
-#~ msgstr "Errore nell'aggiunta del contatto"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "Connessione persa col server:\n"
-#~ "%d, %s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Server di connessione"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Impossibile inviare il messaggio immediato"
-
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Non sei un membro del gruppo \"%s\"\n"
-
-#~ msgid "Looking up %s"
-#~ msgstr "Ricerca di %s in corso"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Connessione a %s fallita"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Connessione a: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Impossibile scrivere il file %s."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Impossibile leggere il file %s."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "Messaggio troppo lungo. Troncati gli ultimi %s byte."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s non è attualmente connesso."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Richiamo a %s non consentito."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr ""
-#~ "Un messaggio è stato rifiutato. Stai superando il limite di velocità del "
-#~ "server."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "La chat in %s non è disponibile."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "Stai inviando troppo velocemente messaggi a %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "Non hai ricevuto un messaggio da %s poiché era troppo grande."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr ""
-#~ "Non hai ricevuto un messaggio da %s poiché è stato spedito troppo "
-#~ "velocemente."
-
-#~ msgid "Failure."
-#~ msgstr "Fallimento."
-
-#~ msgid "Too many matches."
-#~ msgstr "Troppe corrispondenze."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "Servono più qualificatori."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Servizio di directory temporaneamente non disponibile."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "Ricerca email limitata."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Parola chiave ignorata."
-
-#~ msgid "No keywords."
-#~ msgstr "Nessuna parola chiave."
-
-#~ msgid "User has no directory information."
-#~ msgstr "Non c'è nessuna informazione sull'utente nella directory."
-
-#~ msgid "Country not supported."
-#~ msgstr "Paese non supportato."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Errore sconosciuto: %s."
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "Nome utente o password non corretti."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "Il servizio è temporaneamente non disponibile."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "Il tuo livello di richiamo è attualmente troppo alto per poterti "
-#~ "connettere."
-
-#~ msgid ""
-#~ "You have been connecting and disconnecting too frequently.  Wait ten "
-#~ "minutes and try again.  If you continue to try, you will need to wait "
-#~ "even longer."
-#~ msgstr ""
-#~ "Ti sei connesso e disconnesso troppo frequentemente. Attendi 10 minuti e "
-#~ "riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Si è verificato un errore sconosciuto di connessione: %s."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Si è verificato un errore sconosciuto, %d. Info: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Nome gruppo non valido"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Connessione chiusa"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "In attesa di risposta..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC è ritornato dalla pausa. Puoi nuovamente inviare messaggi."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Password modificata con successo"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Ottieni informazioni dalla Directory"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Imposta le informazioni sulla Directory"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Impossibile aprire %s in scrittura!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Trasferimento file fallito: probabilmente è stato annullato dall'altra "
-#~ "parte."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Impossibile connettersi per il trasferimento."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr "Impossibile scrivere l'header del file. Il file non verrà inviato."
-
-#~ msgid "Save As..."
-#~ msgstr "Salva con nome..."
-
-#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-#~ msgstr[0] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s chiede a %s di accettare %d file: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s chiede che tu gli invii un file"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "Plugin per il protocollo TOC"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Informazioni sull'utente %s non disponibili"
-
-#~ msgid "%s Options"
-#~ msgstr "Opzioni %s"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Opzioni del proxy"
-
-#~ msgid "By log size"
-#~ msgstr "Per dimensione del log"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Apri il collegamento nel browser"
-
-#~ msgid "ST_UN server:"
-#~ msgstr "Server ST_UN:"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "_Immagine per lo smiley"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "S_corciatoia per lo smiley"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "_Illumina la finestra quando arriva un messaggio di chat"
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "Esiste già una gruppo con questo nome."
-
-#~ msgid "Primary Information"
-#~ msgstr "Informazioni primarie"
-
-#~ msgid "Blood Type"
-#~ msgstr "Gruppo sanguigno"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Aggiorna le mie informazioni"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Velocità:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "I volti personalizzati non sono attualmente supportati. Scegli "
-#~ "un'immagine da %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Volto QQ non valido"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Hai rifiutato la richiesta di %d"
-
-#~ msgid "Reject request"
-#~ msgstr "Rifiuta la richiesta"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr ""
-#~ "Impossibile aggiungere il contatto attraverso la richiesta di "
-#~ "autorizzazione"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Impossibile caricare la lista contatti"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "Numero QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Descrizione del gruppo"
-
-#~ msgid "Auth"
-#~ msgstr "Autorizzazione"
-
-#~ msgid "Approve"
-#~ msgstr "Approva"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr ""
-#~ "La tua richiesta di entrare nel gruppo %d è stata rifiutata "
-#~ "dall'amministratore %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "Tu [%d] hai lasciato il gruppo \"%d\""
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Tu [%d] sei stato aggiunto al gruppo \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "Sono un membro"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Richiesta non valida"
-
-#~ msgid "I am the admin"
-#~ msgstr "Sono l'amministratore"
-
-#~ msgid "Unknown status"
-#~ msgstr "Stato sconosciuto"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Rimuovi il gruppo"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr ""
-#~ "Hai inserito un ID di gruppo al di fuori dell'intervallo accettabile"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Sei sicuro di voler abbandonare questo Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Vuoi approvare la richiesta?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Numero di telefono"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Informazioni sul canale"
-
-#~ msgid "System Message"
-#~ msgstr "Messaggio di sistema"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>Ultimo IP di login</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Ultimo orario di login</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Imposta le mie informazioni"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Abbandona questo Qun QQ"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Blocca questo utente"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "Token non valido nel codice di risposta, 0x%02X"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Errore nella modifica della password"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Impossibile connettersi al server"
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Connessione in corso al server %s, tentativi %d"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Vuoi approvare la richiesta?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Vuoi aggiungere questo contatto?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s ti [%s] ha aggiunto alla sua lista contatti"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Contatto"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s vuole aggiungerti [%s] come amico"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s non è nella tua lista contatti"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Vuoi aggiungerlo?"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Porta del server"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "La controparte si è disconnessa"
-
-#~ msgid "developer"
-#~ msgstr "sviluppatore"
-
-#~ msgid "XMPP developer"
-#~ msgstr "sviluppatore XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Artisti"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Stai utilizzando %s, versione %s. La versione corrente è la %s. Puoi "
-#~ "scaricarla da <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Elenco delle modifiche:</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "EOF durante la lettura dal processo del resolver"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Le tue informazioni sono state aggiornate"
-
-#~ msgid "Input your reason:"
-#~ msgstr "Inserisci la tua motivazione:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Contatto rimosso con successo"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "Hai rimosso con successo te stesso dalla lista del tuo amico"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "Hai aggiunto %d alla lista contatti"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "QQid non valido"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Inserisci un ID per il gruppo esterno"
-
-#~ msgid "Reason: %s"
-#~ msgstr "Motivo: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr ""
-#~ "La tua richiesta di entrare nel gruppo %d è stata approvata "
-#~ "dall'amministratore %d"
-
-#~ msgid "I am applying to join"
-#~ msgstr "Ho richiesto di entrare"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Hai abbandonato il gruppo con successo"
-
-#, fuzzy
-#~ msgid "QQ Group Auth"
-#~ msgstr "IMAP errore di autorizzazione"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "La tua richiesta di autorizzazione è stata accettata dal server QQ"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Inserisci la tua motivazione:"
-
-#, fuzzy
-#~ msgid " Space"
-#~ msgstr "MySpace"
-
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>Nome host reale</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Mostra le informazioni sul login"
-
-#~ msgid "resend interval(s)"
-#~ msgstr "Intervallo(i) per il reinvio"
-
-#~ msgid "hostname is NULL or port is 0"
-#~ msgstr "il nome host è NULL o la porta è 0"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Impossibile effettuare il login. Verifica il log di debug."
-
-#, fuzzy
-#~ msgid "Failed room reply"
-#~ msgstr "Impossibile rimuovere il contatto"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "L'utente %s ha rifiutato la tua richiesta"
-
-#~ msgid "User %s approved your request"
-#~ msgstr "L'utente %s ha accettato la tua richiesta"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Annuncio da: %s"
+#~ msgid ": %s"
+#~ msgstr ": %s"
--- a/po/nn.po	Wed Aug 12 02:24:41 2009 +0000
+++ b/po/nn.po	Thu Aug 13 19:56:23 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-09 19:06-0700\n"
+"PO-Revision-Date: 2009-08-09 02:41+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"
@@ -12215,6 +12132,9 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s ønskjer å starta ei biletøkt med deg."
 
+msgid "_Pause"
+msgstr "_Pause"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -12429,27 +12349,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 +12392,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 +12469,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 +12496,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:"
@@ -12760,7 +12676,7 @@
 "(%s for filnamn)"
 
 msgid "M_ute sounds"
-msgstr "&Demp lydar"
+msgstr "_Demp lydar"
 
 msgid "Sounds when conversation has _focus"
 msgstr "Lydar medan samtalevindauget har _fokus"
@@ -12775,7 +12691,7 @@
 msgstr "Spel"
 
 msgid "_Browse..."
-msgstr "Bla &gjennom…"
+msgstr "Bla _gjennom…"
 
 msgid "_Reset"
 msgstr "_Nullstill"
@@ -12819,7 +12735,7 @@
 msgstr "Grensesnitt"
 
 msgid "Smiley Themes"
-msgstr "Smilefjestema"
+msgstr "Smilefjesdrakt"
 
 msgid "Browser"
 msgstr "Nettlesar"
@@ -13069,7 +12985,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 +13032,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"
@@ -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/ro.po	Wed Aug 12 02:24:41 2009 +0000
+++ b/po/ro.po	Thu Aug 13 19:56:23 2009 +0000
@@ -1,14 +1,15 @@
 # Pidgin Romanian translation
 # This file is distributed under the same license as the Pidgin package.
-# Copyright (C) 2002-2008, Mișu Moldovan <dumol@gnome.ro>
+# 2002-2009, Mișu Moldovan <dumol@gnome.ro>
+# 2009, Andrei Popescu <andreimpopescu@gmail.com>
 # Contributions: 2007, Alexandru Szasz <alexxed@gmail.com>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin-2.5.3\n"
+"Project-Id-Version: pidgin-2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-01-07 00:42+0200\n"
+"POT-Creation-Date: 2009-08-08 09:57-0400\n"
+"PO-Revision-Date: 2009-08-13 01:42+0300\n"
 "Last-Translator: Mișu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +27,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Încercați „%s -h” pentru mai multe informații.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -871,12 +872,11 @@
 msgid "System Log"
 msgstr "Înregistrări de sistem"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "Se calculează..."
+msgstr "Se apelează..."
 
 msgid "Hangup"
-msgstr ""
+msgstr "Închide"
 
 #. Number of actions
 msgid "Accept"
@@ -886,25 +886,24 @@
 msgstr "Respingere"
 
 msgid "Call in progress."
-msgstr ""
+msgstr "Apel în curs."
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "Apelul a fost încheiat."
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s dorește să inițieze o sesiune audio."
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s încearcă să inițieze o sesiune media nesuportată."
+
 msgid "You have rejected the call."
-msgstr "Ați părăsit chat-ul%s%s"
+msgstr "Ați refuzat apelul"
 
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "apelează: inițiază un apel audio"
 
 msgid "Emails"
 msgstr "Mailuri"
@@ -1370,7 +1369,7 @@
 msgstr "Activare"
 
 msgid "Invalid title"
-msgstr "Titlu invalid"
+msgstr "Titlu nevalid"
 
 msgid "Please enter a non-empty title for the status."
 msgstr "Introduceți un titlu de cel puțin un caracter pentru status."
@@ -1474,7 +1473,7 @@
 msgstr "Fă și zgomot!"
 
 msgid "Set URGENT for the terminal window."
-msgstr "Schimbă starea fereastrei terminalului în URGENT"
+msgstr "Schimbă starea ferestrei terminalului în URGENT"
 
 msgid "GntGf"
 msgstr "GntGf"
@@ -1562,22 +1561,23 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Se creează un TinyURL..."
 
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "Creează TinyURL numai pentru URL-uri de această lungime sau mai mari"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "Prefixul adresei TinyURL (sau altceva)"
+
 msgid "TinyURL"
-msgstr "URL piesă curentă"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
+msgstr "Modul TinyURL"
 
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "Când primiți un mesaj cu URL-uri, folosiți TinyURL pentru copiere mai ușoară"
 
 msgid "accounts"
 msgstr "conturi"
@@ -1682,6 +1682,45 @@
 msgid "_View Certificate..."
 msgstr "_Vizualizare certificat..."
 
+#, 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 ""
+"Certificatul prezentat de „%s” pretinde însă că e de la „%s”. Aceast ar "
+"putea însemna că nu vă conectați la serviciul la care credeți că vă "
+"conectați."
+
+#. 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 "Eroare în certificatul SSL"
+
+msgid "Invalid certificate chain"
+msgstr "Lanț de certificare nevalid"
+
+#. 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 ""
+"Nu aveți o bază de date de certificate root, deci acest certificat nu poate "
+"fi validat."
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1692,29 +1731,11 @@
 "Certificatul prezentat de „%s” este semnat în nume propriu. Nu poate fi "
 "verificat automat."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Lanțul de certificare prezentat de %s nu este valid."
 
-#. 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 "Eroare în certificatul SSL"
-
-msgid "Invalid certificate chain"
-msgstr "Lanț de certificare invalid"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Nu aveți o bază de date de certificate root, deci acest certificat nu poate "
-"fi validat."
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1732,20 +1753,7 @@
 "la autoritatea de certificare cu care pretinde că a fost creat."
 
 msgid "Invalid certificate authority signature"
-msgstr "Semnătura invalidă de la autoritatea de certificare"
-
-#. 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 ""
-"Certificatul prezentat de „%s” pretinde însă că e de la „%s”. Aceast ar "
-"putea însemna că nu vă conectați la serviciul la care credeți că vă "
-"conectați."
+msgstr "Semnătură nevalidă de la autoritatea de certificare"
 
 #. Make messages
 #, c-format
@@ -1783,7 +1791,7 @@
 msgstr "+++ %s s-a deconectat"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "Eroare necunoscută"
 
@@ -1830,9 +1838,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s a ieșit din chat (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "Invită într-o conferință"
+msgstr "Invită într-un chat"
 
 #. Put our happy label in it.
 msgid ""
@@ -1973,6 +1980,10 @@
 msgstr "Se inițiază transferul fișierului %s de la %s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Transferul fișierului <A HREF=\"file://%s\">%s</A> s-a terminat"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transferul fișierului %s s-a terminat"
 
@@ -2195,9 +2206,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Răspuns-Automat>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "Eroare la stabilirea conexiunii"
+msgstr "Eroare la inițierea conferinței"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2518,8 +2528,8 @@
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"Sunteți momentan deconectat(ă). Nu veți mai primi mesaje până la următoarea "
-"autentificare."
+"Contul vă este momentan deconectat. Nu veți mai primi mesaje până la "
+"următoarea autentificare."
 
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Mesajul nu a putut fi trimis pentru că a depășit mărimea maximă."
@@ -2599,7 +2609,6 @@
 msgstr "Importă înregistrările altor clienți IM."
 
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2608,8 +2617,7 @@
 "at your own risk!"
 msgstr ""
 "La consultarea înregistrărilor, acest modul va include înregistrările din "
-"alți clienți IM precum: Adium, Fire, Messenger Plus!, MSN Messenger și "
-"Trillian.\n"
+"alți clienți IM precum: Adium, MSN Messenger, aMSN și Trillian.\n"
 "\n"
 "Atenție! Acest modul este în stadiu alpha și e instabil."
 
@@ -2656,13 +2664,12 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Salvează ca întâmpinare mesajele trimise unui utilizator deconectat."
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Restul de mesaje vor fi salvate ca întâmpinare. Puteți apoi edita sau șterge "
-"întâmpinarea din fereastra de editare a întâmpinărilor."
+"întâmpinarea din fereastra „Întâmpinări contacte”."
 
 #, c-format
 msgid ""
@@ -2692,9 +2699,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "Nu întreba. Salvează într-o întâmpinare întotdeauna."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "Introduceți parola"
+msgstr "Parolă de unică folosință"
 
 #. *< type
 #. *< ui_requirement
@@ -2703,13 +2709,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Suport pentru parole de unică folosință"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Impune ca parolele să fie folosite o singură dată"
 
 #. *  description
 msgid ""
@@ -2717,6 +2723,9 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Vă permite să impuneți pentru fiecare cont ca parolele ce nu sunt salvate "
+"să fie folosite pentru o singură conectare cu succes.\n"
+"Notă: Parola contului trebuie să nu fie salvată pentru a funcționa."
 
 #. *< type
 #. *< ui_requirement
@@ -2909,7 +2918,6 @@
 "Nu s-a detectat o instalare ActiveTCL. Dacă doriți să utilizați module TCL, "
 "instalați ActiveTCL de la http://www.activestate.com\n"
 
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
@@ -2917,10 +2925,8 @@
 "Nu s-a găsit Apple Bonjour pentru Windows, pentru detalii consultați: http://"
 "d.pidgin.im/BonjourWindows ."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr ""
-"Utilizarea interfaței de rețea pentru a detecta noi conexiuni IM a eșuat\n"
+msgstr "Nu se poate asculta pentru noi conexiuni IM"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2958,9 +2964,8 @@
 msgstr "Persoană Purple"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Localitate"
+msgstr "Port local"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2972,33 +2977,31 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nu s-a putut trimite mesajul, discuția nu a putut fi inițiată."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
 msgstr ""
-"Nu s-a putut crea un socket:\n"
-"%s"
-
-#, fuzzy, c-format
+"Nu s-a putut crea un socket: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Nu se poate face bind pentru socket pe port"
-
-#, fuzzy, c-format
+msgstr "Nu s-a putut lega socketul de port: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
 msgstr ""
-"Nu s-a putut crea un socket:\n"
-"%s"
+"Nu se poate asculta la socketul: %s"
 
 msgid "Error communicating with local mDNSResponder."
 msgstr "Eroare de comunicare locală cu mDNSResponder."
 
 msgid "Invalid proxy settings"
-msgstr "Opțiuni proxy invalide"
+msgstr "Opțiuni proxy greșite"
 
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"Numele serverului sau portul precizat pentru tipul proxy-ului sunt invalide."
+"Numele serverului sau portul precizat pentru tipul proxy-ului sunt greșite."
 
 msgid "Token Error"
 msgstr "Eroare verificare"
@@ -3034,17 +3037,14 @@
 msgid "Load buddylist from file..."
 msgstr "Încarcă lista de contacte din fișierul..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Completați câmpurile de înregistrare."
-
-#, fuzzy
+msgstr "Trebuie să completați toate câmpurile de înregistrare."
+
 msgid "Passwords do not match"
 msgstr "Parolele nu se potrivesc."
 
-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare.\n"
+msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare necunoscută."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Noul cont Gadu-Gadu a fost înregistrat"
@@ -3059,11 +3059,10 @@
 msgstr "Confirmare parolă"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Introduceți textul captcha"
+
 msgid "Captcha"
-msgstr "Salvează imaginea"
+msgstr "Imagine captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Înregistrare cont nou Gadu-Gadu"
@@ -3202,9 +3201,9 @@
 msgid "Chat _name:"
 msgstr "_Nume chat:"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Conectarea la server a eșuat."
+msgstr "Nu se poate rezolva numele calculatorului '%s': %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3217,7 +3216,6 @@
 msgid "This chat name is already in use"
 msgstr "Există deja un chat cu acest nume"
 
-#, fuzzy
 msgid "Not connected to the server"
 msgstr "Neconectat la server."
 
@@ -3260,9 +3258,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Utilizator Gadu-Gadu"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Introducere detalii..."
+msgstr "Server GG"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3278,9 +3275,8 @@
 msgid "File Transfer Failed"
 msgstr "Transferul fișierului a eșuat"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "Nu s-a putut deschide un port pentru a asculta."
+msgstr "Nu s-a putut deschide un port pentru ascultare."
 
 msgid "Error displaying MOTD"
 msgstr "Eroare la afișarea MOTD"
@@ -3302,11 +3298,10 @@
 #.
 #. 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 ""
-"S-a pierdut conexiunea cu serverul:\n"
-"%s"
+"S-a pierdut conexiunea cu serverul: %s"
 
 msgid "View MOTD"
 msgstr "Afișare MOTD"
@@ -3317,9 +3312,8 @@
 msgid "_Password:"
 msgstr "_Parolă:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Pseudonimele IRC nu pot conține spații"
+msgstr "Pseudonimele și serverele IRC nu pot conține spații"
 
 msgid "SSL support unavailable"
 msgstr "Suportul SSL nu este disponibil"
@@ -3328,11 +3322,11 @@
 msgstr "Conectare eșuată"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Conectarea la %s a eșuat"
-
-#, fuzzy, c-format
+msgstr "Conectarea a eșuat: %s"
+
+#, c-format
 msgid "Server closed the connection"
 msgstr "Serverul a închis conexiunea."
 
@@ -3499,32 +3493,31 @@
 msgstr "mod (%s %s) de către %s"
 
 msgid "Invalid nickname"
-msgstr "Pseudonim invalid"
+msgstr "Pseudonim greșit"
 
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "Pseudonimul ales a fost respins de către server. Probabil conține caractere "
-"invalide."
+"nevalide."
 
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "Numele de cont ales a fost respins de către server. Probabil conține "
-"caractere invalide."
+"caractere nevalide."
 
 #. 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 "Există deja un chat cu acest nume"
-
-#, fuzzy
+msgstr "Pseudonimul „%s” este deja utilizat."
+
 msgid "Nickname in use"
-msgstr "Pseudonim"
+msgstr "Pseudonim utilizat deja"
 
 msgid "Cannot change nick"
 msgstr "Nu se reușește schimbarea pseudonimului"
@@ -3537,7 +3530,7 @@
 msgstr "Ați părăsit chat-ul%s%s"
 
 msgid "Error: invalid PONG from server"
-msgstr "Eroare: PONG invalid de la server"
+msgstr "Eroare: PONG nevalid de la server"
 
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
@@ -3768,13 +3761,11 @@
 msgid "execute"
 msgstr "execută"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel de "
+"Serverul necesită TLS/SSL, dar nu s-a găsit nici un fel de "
 "suport TLS/SSL."
 
-#, fuzzy
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Ați cerut criptare, dar nu s-a găsit nici un fel de suport TLS/SSL."
 
@@ -3792,13 +3783,11 @@
 msgid "Plaintext Authentication"
 msgstr "Autentificare în clar (plaintext)"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Autentificare eșuată"
-
-#, fuzzy
+msgstr "Autentificare SASL eșuată"
+
 msgid "Invalid response from server"
-msgstr "Răspuns invalid de la server."
+msgstr "Răspuns nevalid de la server."
 
 msgid "Server does not use any supported authentication method"
 msgstr "Serverul nu utilizează o metodă cunoscută de autentificare"
@@ -3807,38 +3796,32 @@
 msgstr "Ați cerut criptare, dar serverul nu suportă criptare"
 
 msgid "Invalid challenge from server"
-msgstr "Cerere invalidă de la server"
-
-#, fuzzy, c-format
+msgstr "Cerere nevalidă de la server"
+
+#, c-format
 msgid "SASL error: %s"
-msgstr "Eroare SASL"
+msgstr "Eroare SASL: %s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "Managerul de conexiune BOSH a încheiat sesiunea."
+
 msgid "No session ID given"
-msgstr "Fără motiv."
-
-#, fuzzy
+msgstr "Nu s-a primit un identificator de sesiune"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Versiune nesuportată"
-
-#, fuzzy
+msgstr "Versiune nesuportată de protocol BOSH"
+
 msgid "Unable to establish a connection with the server"
 msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
-
-#, fuzzy, c-format
+"Nu s-a putut face o conexiune cu serverul"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
 msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
-
-#, fuzzy
+"Nu s-a putut face o conexiune cu serverul: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Nu se poate inițializa o nouă conexiune"
+msgstr "Nu se poate inițializa conexiunea SSL"
 
 msgid "Full Name"
 msgstr "Nume complet"
@@ -3855,6 +3838,11 @@
 msgid "Street Address"
 msgstr "Adresă locală"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Adresă completă"
 
@@ -3906,9 +3894,8 @@
 msgid "Operating System"
 msgstr "Sistem de operare"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "Fișier local:"
+msgstr "Ora locală"
 
 msgid "Priority"
 msgstr "Prioritate"
@@ -3918,11 +3905,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "acum %s"
+
 msgid "Logged Off"
-msgstr "Autentificat"
+msgstr "Deconectat"
 
 msgid "Middle Name"
 msgstr "Inițială"
@@ -3945,14 +3931,12 @@
 msgid "Temporarily Hide From"
 msgstr "Ascunde-mă temporar de"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Anulează notificarea prezenței"
 
 msgid "(Re-)Request authorization"
 msgstr "Solicit (din nou) autorizare"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4018,7 +4002,7 @@
 msgstr "Caută"
 
 msgid "Invalid Directory"
-msgstr "Director invalid"
+msgstr "Director nevalid"
 
 msgid "Enter a User Directory"
 msgstr "Introduceți un director cu utilizatori"
@@ -4043,21 +4027,21 @@
 msgstr "%s nu este un nume valid de chat"
 
 msgid "Invalid Room Name"
-msgstr "Nume invalid de chat"
+msgstr "Nume incorect de chat"
 
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s nu este un nume valid de server"
 
 msgid "Invalid Server Name"
-msgstr "Nume invalid de contact"
+msgstr "Nume incorect de contact"
 
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s nu este un nume valid de chat"
 
 msgid "Invalid Room Handle"
-msgstr "Titlu invalid de chat"
+msgstr "Titlu incorect de chat"
 
 msgid "Configuration error"
 msgstr "Eroare de configurare"
@@ -4081,7 +4065,7 @@
 msgstr "Eroare la obținerea listei camerelor de chat"
 
 msgid "Invalid Server"
-msgstr "Server invalid"
+msgstr "Server nevalid"
 
 msgid "Enter a Conference Server"
 msgstr "Conectare la un server de conferințe"
@@ -4092,36 +4076,32 @@
 msgid "Find Rooms"
 msgstr "Caută camere de chat"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Alias:"
-
-#, fuzzy
+msgstr "Afilieri:"
+
 msgid "No users found"
-msgstr "Nu s-au găsit utilizatori care să corespundă"
-
-#, fuzzy
+msgstr "Nu s-au găsit utilizatori"
+
 msgid "Roles:"
-msgstr "Funcție"
-
-#, fuzzy
+msgstr "Roluri:"
+
 msgid "Ping timed out"
-msgstr "Expirare ping"
+msgstr "Ping expirat"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
+"Nu s-au găsit metode XMPP alternative de conectare după eșuarea conexiunii directe."
 
 msgid "Invalid XMPP ID"
-msgstr "ID XMPP invalid"
+msgstr "ID XMPP nevalid"
 
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "ID XMPP invalid. Trebuie precizat domeniul."
-
-#, fuzzy
+msgstr "ID XMPP nevalid. Trebuie precizat domeniul."
+
 msgid "Malformed BOSH URL"
-msgstr "Conectarea la server a eșuat."
+msgstr "URL BOSH nevalid"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4190,10 +4170,6 @@
 msgid "Change Registration"
 msgstr "Modificare înregistrare"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "Conectarea la server a eșuat."
-
 msgid "Error unregistering account"
 msgstr "Eroare la ștergerea contului înregistrat"
 
@@ -4305,7 +4281,7 @@
 msgstr "Căutare utilizatori..."
 
 msgid "Bad Request"
-msgstr "Cerere invalidă"
+msgstr "Cerere nevalidă"
 
 msgid "Conflict"
 msgstr "Conflict"
@@ -4326,7 +4302,7 @@
 msgstr "Elementul nu a fost găsit"
 
 msgid "Malformed XMPP ID"
-msgstr "ID XMPP invalid"
+msgstr "ID XMPP nevalid"
 
 msgid "Not Acceptable"
 msgstr "Inacceptabil"
@@ -4368,10 +4344,10 @@
 msgstr "Codare incorectă la autorizare"
 
 msgid "Invalid authzid"
-msgstr "„Authzid” invalid"
+msgstr "„Authzid” nevalid"
 
 msgid "Invalid Authorization Mechanism"
-msgstr "Mecanism invalid de autorizare"
+msgstr "Mecanism nevalid de autorizare"
 
 msgid "Authorization mechanism too weak"
 msgstr "Mecanism de autorizare insuficient de sigur"
@@ -4395,25 +4371,25 @@
 msgstr "Conexiunea a expirat"
 
 msgid "Host Gone"
-msgstr "Gazda a dispărut"
+msgstr "Serverul nu mai e prezent"
 
 msgid "Host Unknown"
-msgstr "Gazdă necunoscută"
+msgstr "Server necunoscut"
 
 msgid "Improper Addressing"
 msgstr "Adresare neadecvată"
 
 msgid "Invalid ID"
-msgstr "Identitate invalidă"
+msgstr "Identitate nevalidă"
 
 msgid "Invalid Namespace"
-msgstr "„Namespace” invalid"
+msgstr "„Namespace” nevalid"
 
 msgid "Invalid XML"
-msgstr "XML invalid"
+msgstr "XML nevalid"
 
 msgid "Non-matching Hosts"
-msgstr "Gazdele nu se potrivesc"
+msgstr "Numele de server nu se potrivesc"
 
 msgid "Policy Violation"
 msgstr "Normele au fost încălcate"
@@ -4428,7 +4404,7 @@
 msgstr "XML restrictiv"
 
 msgid "See Other Host"
-msgstr "Verificați cealaltă gazdă"
+msgstr "Verificați celălalt nume de server"
 
 msgid "System Shutdown"
 msgstr "Închidere sistem"
@@ -4479,23 +4455,23 @@
 msgid "Unable to ping user %s"
 msgstr "Nu se poate da „ping” către utilizatorul %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
-"Nu se poate da „buzz” pentru că nu se știe nimic despre utilizatorul %s."
-
-#, fuzzy, c-format
+"Nu se poate da „buzz” pentru că nu se știe nimic despre %s."
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "Nu se poate da „buzz” pentru că utilizatorul %s ar putea fi deconectat."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
 msgstr ""
 "Nu se poate da „buzz” pentru că aplicația utilizatorului „%s” nu suportă "
-"acest lucru."
+"acest lucru sau nu dorește să primească „buzz” acum."
 
 #, c-format
 msgid "Buzzing %s..."
@@ -4510,35 +4486,33 @@
 msgid "%s has buzzed you!"
 msgstr "%s v-a dat „buzz”!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Nu se poate trimite fișierul către %s, JID invalid"
-
-#, fuzzy, c-format
+msgstr "Nu se poate iniția media cu %s, JID nevalid"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Nu se poate trimite fișierul către %s, contactul nu este conectat"
-
-#, fuzzy, c-format
+msgstr "Nu se poate iniția media cu %s, contactul nu este conectat"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "Nu se poate trimite fișierul către %s, nu e subscris pentru prezență"
-
-#, fuzzy
+msgstr "Nu se poate iniția media cu %s, nu e subscris pentru prezență"
+
 msgid "Media Initiation Failed"
-msgstr "Înregistrare eșuată"
-
-#, fuzzy, c-format
+msgstr "Inițializare media eșuată"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
-"Precizați cărei resurse a contactului %s doriți să-i trimiteți fișierul"
+"Precizați cu ce resursă a contactului %s ați dori să porniți o sesiune media."
 
 msgid "Select a Resource"
 msgstr "Selectați o resursă"
 
-#, fuzzy
 msgid "Initiate Media"
-msgstr "Inițiază o _discuție"
+msgstr "Inițiază media"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurați o cameră de chat."
@@ -4559,21 +4533,19 @@
 msgstr ""
 "ban &lt;nume utilizator&gt; [chat]:  Blocați accesul unui utilizator în chat."
 
-#, 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;nume ales&gt; &lt;deținător|administrator|membru|renegat|"
-"niciuna&gt;:  Setați afilierea unui utilizator față de camera de chat."
-
-#, fuzzy
+"affiliate &lt;deținător|administrator|membru|renegat|nimic&gt; [pseudonim1] [pseudonim2] ...:"
+" Aflați utilizatorii cu o afiliere sau setați afilierea utilizatorilor față de camera de chat."
+
 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;nume ales&gt; &lt;moderator|participant|vizitator|niciunul&gt;:  "
-"Setați rolul unui utilizator în camera de chat."
+"role &lt;moderator|participant|vizitator|nimic&gt; [pseudonim1] [pseudonim2] ...: "
+"Aflați utilizatorii cu un rol sau setați rolul utilizatorilor în camera de chat."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;nume ales&gt; [chat]:  Invitați un utilizator într-un chat."
@@ -4635,7 +4607,7 @@
 msgstr "Servere proxy pentru transfer de fișiere"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "URL BOSH"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4699,32 +4671,28 @@
 msgid "_Accept Defaults"
 msgstr "_Opțiuni implicite"
 
-#, fuzzy
 msgid "No reason"
 msgstr "Fără motiv."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Ați fost dat afară din %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Ați fost dat afară: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Respins de %s: (%s)"
-
-#, fuzzy
+msgstr "Dat afară (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "A apărut o eroare la deschiderea fișierului."
-
-#, fuzzy
+msgstr "A apărut o eroare la transferul de octeți în-bandă\n"
+
 msgid "Transfer was closed."
-msgstr "Transferul fișierului a eșuat"
-
-#, fuzzy
+msgstr "Transferul a fost închis"
+
 msgid "Failed to open the file"
-msgstr "Nu s-a putut deschide fișierul „%s”: %s"
+msgstr "Nu s-a putut deschide fișierul"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Nu s-a putut deschide fluxul de octeți în-bandă"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4736,7 +4704,7 @@
 
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Nu se poate trimite fișierul către %s, JID invalid"
+msgstr "Nu se poate trimite fișierul către %s, JID nevalid"
 
 #, c-format
 msgid "Unable to send file to %s, user is not online"
@@ -4828,7 +4796,7 @@
 
 #, c-format
 msgid "Invalid email address"
-msgstr "Adresă de mail invalidă"
+msgstr "Adresă de mail nevalidă"
 
 #, c-format
 msgid "User does not exist"
@@ -4844,11 +4812,11 @@
 
 #, c-format
 msgid "Invalid username"
-msgstr "Nume invalid de utilizator"
+msgstr "Nume nevalid de utilizator"
 
 #, c-format
 msgid "Invalid friendly name"
-msgstr "Pseudonimul propriu este invalid"
+msgstr "Pseudonimul propriu este nevalid"
 
 #, c-format
 msgid "List full"
@@ -4880,7 +4848,7 @@
 
 #, c-format
 msgid "Invalid group"
-msgstr "Grup invalid"
+msgstr "Grup nevalid"
 
 #, c-format
 msgid "User not in group"
@@ -4992,7 +4960,7 @@
 
 #, c-format
 msgid "Bad friend file"
-msgstr "Fișier invalid"
+msgstr "Fișier „friend” nevalid"
 
 #, c-format
 msgid "Not expected"
@@ -5047,11 +5015,26 @@
 msgid "Non-IM Contacts"
 msgstr "Contacte de alt tip"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s a trimis un wink. <a href='msn-wink://%s'>Apăsați aici pentru a-l reda</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s a trimis un wink, dar nu a putut fi salvat"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s a trimis un clip audio. <a href='audio://%s'>Apăsați aici pentru a-l reda</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s a trimis un clip audio, dar acesta nu a putut fi salvat"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s v-a trimis o invitație de a-i vedea webcam-ul, invitație ce nu este încă "
-"suportată"
+"%s v-a trimis o invitație de chat audio, pentru care nu există încă suport."
 
 msgid "Nudge"
 msgstr "Buzz"
@@ -5205,6 +5188,29 @@
 msgstr ""
 "Pentru MSN aveți nevoie de suport SSL. Instalați bibliotecile SSL necesare. "
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Nu se poate adăuga contactul %s deoarece numele de utilizator este nevalid. "
+"Un nume valid trebuie să fie o adresă de mail."
+
+msgid "Unable to Add"
+msgstr "Adăugare eșuată"
+
+msgid "Authorization Request Message:"
+msgstr "Mesaj cerere de autorizare:"
+
+msgid "Please authorize me!"
+msgstr "Am nevoie de autorizare..."
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
+
 msgid "Error retrieving profile"
 msgstr "Eroare la descărcarea profilului"
 
@@ -5391,19 +5397,20 @@
 msgstr "Autentificare Windows Live ID: Conectare eșuată"
 
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Autentificare Windows Live ID: Răspuns invalid"
+msgstr "Autentificare Windows Live ID: Răspuns nevalid"
 
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vă sâcâie cu un „nudge”!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Eroare necunoscută (%d)"
+msgstr "Eroare necunoscută (%d): %s"
 
 msgid "Unable to add user"
 msgstr "Nu se poate adăuga utilizatorul"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Eroare necunoscută (%d)"
@@ -5430,18 +5437,20 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"Serverul MSN va fi închis pentru întreținere într-un minut. Veți fi automat "
-"deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile începute.\n"
+"Serverul MSN va fi închis pentru întreținere într-un minut. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
+"începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
 msgstr[1] ""
-"Serverul MSN va fi închis pentru întreținere în %d minute. Veți fi automat "
-"deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile începute.\n"
+"Serverul MSN va fi închis pentru întreținere în %d minute. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
+"începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
 msgstr[2] ""
-"Serverul MSN va fi închis pentru întreținere în %d de minute. Veți fi "
-"automat deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile "
+"Serverul MSN va fi închis pentru întreținere în %d de minute. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
 "începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
@@ -5477,22 +5486,18 @@
 "Eroare de conectare de la serverul %s:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
 msgstr "Protocolul utilizat nu este suportat de către server."
 
-#, fuzzy
 msgid "Error parsing HTTP"
 msgstr "Eroare la prelucrarea datelor HTTP."
 
-#, fuzzy
 msgid "You have signed on from another location"
 msgstr "V-ați autentificat din altă parte."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Serverele MSN sunt temporar indisponibile. Reîncercați mai târziu."
 
-#, fuzzy
 msgid "The MSN servers are going down temporarily"
 msgstr "Serverele MSN vor fi oprite momentan."
 
@@ -5523,17 +5528,15 @@
 msgid "Retrieving buddy list"
 msgstr "Se descarcă lista de contacte"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
-"%s v-a trimis o invitație de a-i vedea webcam-ul, invitație ce nu este încă "
-"suportată"
+msgstr "%s v-a cerut o permisiune de acces la webcam, dar această cerere nu "
+"este încă suportată"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s v-a trimis o invitație de a-i vedea webcam-ul, invitație ce nu este încă "
-"suportată"
+msgstr "%s v-a trimis o invitație de acces la webcam, invitație ce nu este "
+"încă suportată"
 
 msgid "Away From Computer"
 msgstr "Absent din fața calculatorului"
@@ -5583,7 +5586,7 @@
 msgstr "Doriți să ștergeți acest contact din lista de contacte?"
 
 msgid "The username specified is invalid."
-msgstr "Numele de utilizator specificat este invalid."
+msgstr "Numele de utilizator specificat este nevalid."
 
 msgid "This Hotmail account may not be active."
 msgstr "Acest cont Hotmail s-ar putea să nu mai fie activ."
@@ -5702,7 +5705,6 @@
 msgid "MySpace"
 msgstr "MySpace"
 
-#, fuzzy
 msgid "IM Friends"
 msgstr "Prieteni IM"
 
@@ -5714,27 +5716,32 @@
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
+"Un contact a fost adăugat ori actualizat de pe server (incluzând contacte "
+"deja prezente în lista de pe server)"
 msgstr[1] ""
+"%d contacte au fost adăugat ori actualizat de pe server (incluzând contacte "
+"deja prezente în lista de pe server)"
 msgstr[2] ""
-
-#, fuzzy
+"%d de contacte au fost adăugat ori actualizat de pe server (incluzând "
+"contacte deja prezente în lista de pe server)"
+
 msgid "Add contacts from server"
-msgstr "Răspuns invalid de la server."
+msgstr "Adăugare contacte de pe server."
 
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Eroare de protocol, codul %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 Aveți o parolă de %d caractere, mai mare decât lungimea maximă de %d în "
-"MySpaceIM. E necesar să introduceți o parolă mai scurtă la http://"
+"%s Aveți o parolă de %zu caractere, mai mare decât lungimea maximă de %d. "
+"Puteți introduce o parolă mai scurtă la http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
-"și să încercați din onu."
+"și să încercați din nou."
 
 msgid "Incorrect username or password"
 msgstr "Nume de utilizator sau parolă incorecte."
@@ -5743,7 +5750,7 @@
 msgstr "Eroare MySpaceIM"
 
 msgid "Invalid input condition"
-msgstr "Condiție de intrare invalidă"
+msgstr "Condiție de intrare nevalidă"
 
 msgid "Failed to add buddy"
 msgstr "Adăugarea contactului a eșuat"
@@ -5777,38 +5784,35 @@
 "MySpaceIM nu va încărcat."
 
 msgid "Add friends from MySpace.com"
-msgstr ""
-
-#, fuzzy
+msgstr "Adăugați contacte de pe MySpace.com"
+
 msgid "Importing friends failed"
-msgstr "activarea modulului a eșuat"
+msgstr "Importarea contactelor a eșuat"
 
 #. TODO: find out how
-#, fuzzy
 msgid "Find people..."
-msgstr "Căutare contacte..."
-
-#, fuzzy
+msgstr "Căutare persoane..."
+
 msgid "Change IM name..."
-msgstr "Schimbare parolă..."
+msgstr "Schimbare nume IM..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "Gestionare URL myim"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "Nu s-a găsit un cont MySpaceIM pentru a deschide acest URL myim."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Activați contul MySpaceIM potrivit și încercați din nou."
 
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Arată numele afișat în textul statusului"
 
 msgid "Show headline in status text"
-msgstr ""
+msgstr "Arată titlul în textul statusului"
 
 msgid "Send emoticons"
-msgstr ""
+msgstr "Trimite iconițe simbolice"
 
 msgid "Screen resolution (dots per inch)"
 msgstr "Rezoluție ecran (dpi)"
@@ -5822,53 +5826,49 @@
 msgid "Headline"
 msgstr "Titlu"
 
-#, fuzzy
 msgid "Song"
-msgstr "Sunete"
+msgstr "Melodie"
 
 msgid "Total Friends"
-msgstr ""
-
-#, fuzzy
+msgstr "Prieteni la cataramă"
+
 msgid "Client Version"
-msgstr "Încheie discuția"
+msgstr "Versiune client"
 
 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 ""
-
-#, fuzzy
+"A apărut o eroare la inițializarea numelui de utilizator. Încercați din nou "
+"sau vizitați "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"pentru a alege un nume de utilizator."
+
 msgid "MySpaceIM - Username Available"
-msgstr "Serviciu indisponibil"
-
-#, fuzzy
+msgstr "MySpaceIM - nume disponibil"
+
 msgid "This username is available. Would you like to set it?"
-msgstr ""
-"%s a trimis un mesaj pentru „whiteboard”. Doriți să deschid un „whiteboard”?"
+msgstr "Acest nume de utilizator este disponibil. Doriți să-l folosiți?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "DUPĂ INIȚIALIZARE ACESTA NU POATE FI SCHIMBAT!"
 
 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM - Alegeți un nume de utilizator"
+
 msgid "This username is unavailable."
-msgstr "Această temă nu are iconițe disponibile."
-
-#, fuzzy
+msgstr "Acest nume de utilizator nu este disponibil."
+
 msgid "Please try another username:"
-msgstr "Introduceți noul nume pentru %s"
+msgstr "Încercați alt nume de utilizator:"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "Fără nume"
+msgstr "Nu s-a inițializat un nume de utilizator"
 
 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "Introduceți un nume de utilizator pentru a verifica disponibilitatea:"
 
 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -5877,106 +5877,103 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Trăsnește"
+
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a trăsnit!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%s este trăsnit..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Pocnește"
+
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a pocnit"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "%s este pocnit..."
 
 #. 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 "Topic"
-
-#, fuzzy, c-format
+msgstr "Arde"
+
+#, c-format
 msgid "%s has torched you!"
-msgstr "Utilizatorul v-a blocat"
+msgstr "%s v-a ars!"
 
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "%s este ars..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Țucă"
+
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a țucat."
 
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s este țucat"
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Îmbrățișează"
+
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a îmbrățișat."
 
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "%s este îmbrățișat..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Adormit"
-
-#, fuzzy, c-format
+msgstr "Plesnește"
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a plesnit!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "%s este plesnit..."
 
 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Dus"
-
-#, fuzzy, c-format
+msgstr "Pișcă de fund"
+
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s a intrat în absență."
-
-#, fuzzy, c-format
+msgstr "%s v-a pișcat de fund."
+
+#, c-format
 msgid "Goosing %s..."
-msgstr "Caut %s"
+msgstr "%s este pișcat de fund..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
 msgid "High-five"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Bate palma"
+
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a bătut palma!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "Ați bătut palma cu %s..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
@@ -6100,15 +6097,15 @@
 "autentificați în același timp"
 
 msgid "The user is either offline or you are blocked"
-msgstr "Utilizatorul este deconectat sau sunteți blocat(ă)"
+msgstr "Utilizatorul este deconectat sau v-a blocat"
 
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Eroare necunoscută: 0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Autentificare eșuată."
+msgstr "Autentificare eșuată: %s"
 
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6241,7 +6238,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s pare să fie deconectat și nu a primit mesajul ce i l-ați trimis."
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6271,9 +6267,8 @@
 msgid "Server port"
 msgstr "Port server"
 
-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "S-a primit un răspuns HTTP neașteptat de la server."
+msgstr "S-a primit un răspuns neașteptat de la "
 
 #. username connecting too frequently
 msgid ""
@@ -6283,22 +6278,21 @@
 "V-ați conectat și deconectat prea des. Așteptați zece minute și încercați "
 "din nou. Dacă continuați să încercați, va trebui să așteptați mai mult."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Eroare la cererea unui „token” de autentificare"
+msgstr "Eroare la cererea "
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL nu permite autentificarea acestui cont aici"
 
 msgid "Could not join chat room"
 msgstr "Nu s-a putut intra în camera de chat"
 
 msgid "Invalid chat room name"
-msgstr "Nume invalid de cameră de chat"
-
-#, fuzzy
+msgstr "Nume nevalid de cameră de chat"
+
 msgid "Received invalid data on connection with server"
-msgstr "S-au primit date invalide de la server."
+msgstr "S-au primit date nevalide la conectarea la server."
 
 #. *< type
 #. *< ui_requirement
@@ -6343,9 +6337,8 @@
 msgstr "S-a pierdut conexiunea cu utilizatorul la distanță:<br>%s"
 
 msgid "Received invalid data on connection with remote user."
-msgstr "S-au primit date invalide la conectarea la utilizatorul la distanță."
-
-#, fuzzy
+msgstr "S-au primit date nevalide la conectarea la utilizatorul la distanță."
+
 msgid "Unable to establish a connection with the remote user."
 msgstr "Nu s-a putut deschide o conexiune cu utilizatorul la distanță."
 
@@ -6366,10 +6359,10 @@
 msgstr "Fișierul %s are %s, care depășește mărimea maximă de %s."
 
 msgid "Invalid error"
-msgstr "Eroare invalidă"
+msgstr "Eroare nevalidă"
 
 msgid "Invalid SNAC"
-msgstr "SNAC invalid"
+msgstr "SNAC nevalid"
 
 msgid "Rate to host"
 msgstr "Limitare către server"
@@ -6405,7 +6398,7 @@
 msgstr "Cerere respinsă"
 
 msgid "Busted SNAC payload"
-msgstr "Încărcătură SNAC invalidă"
+msgstr "Încărcătură SNAC nevalidă"
 
 msgid "Insufficient rights"
 msgstr "Drepturi insuficiente"
@@ -6547,15 +6540,13 @@
 msgid "Buddy Comment"
 msgstr "Comentariu contact"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Conectarea pentru serverul de autentificare a eșuat:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Conectarea la serverul de autentificare a eșuat: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Conectarea la server a eșuat."
+msgstr "Conectarea la serverul BOS a eșuat: %s"
 
 msgid "Username sent"
 msgstr "S-a trimit numele de utilizator"
@@ -6567,16 +6558,16 @@
 msgid "Finalizing connection"
 msgstr "Finalizare conexiune"
 
-#, 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 ""
-"Eroare la autentificare: autentificarea pentru %s a eșuat deoarece numele de "
-"utilizator este invalid. Un nume valid trebuie să fie o adresă de mail "
-"validă sau să înceapă cu o literă și să conțină doar litere, numere și "
-"spații sau să conțină doar numere."
+"Autentificarea contului %s a eșuat deoarece numele de utilizator este "
+"greșit. Un nume valid trebuie să fie o adresă de mail corectă ori să "
+"înceapă cu o literă și să conțină doar litere, numere și spații sau să "
+"conțină doar numere."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6596,35 +6587,32 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
 msgstr "Utilizator inexistent"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Contul dumneavoastră este momentan suspendat."
+msgstr "Contul vă este momentan suspendat"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Serviciul de mesagerie instant AOL este temporar indisponibil."
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versiunea clientului folosit este prea veche. Actualizați-l la %s"
 
 #. 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 ""
-"V-ați conectat și deconectat prea des. Așteptați zece minute și încercați "
+"V-ați conectat și deconectat prea des. Așteptați un minut și încercați "
 "din nou. Dacă continuați să încercați, va trebui să așteptați mai mult."
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "Cheia SecurID introdusă este invalidă."
+msgstr "Cheia SecurID introdusă este nevalidă."
 
 msgid "Enter SecurID"
 msgstr "Introducere SecurID"
@@ -6632,12 +6620,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduceți numărul de șase cifre afișat digital."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
 msgid "Password sent"
 msgstr "Parola a fost trimisă"
 
@@ -6649,12 +6631,6 @@
 "Am nevoie de autorizarea ta pentru a te putea adăuga apoi în lista mea de "
 "contacte."
 
-msgid "Authorization Request Message:"
-msgstr "Mesaj cerere de autorizare:"
-
-msgid "Please authorize me!"
-msgstr "Am nevoie de autorizare..."
-
 msgid "No reason given."
 msgstr "Fără motiv."
 
@@ -6732,9 +6708,9 @@
 #, 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] "Ați pierdut %hu mesaj de la %s deoarece era invalid."
-msgstr[1] "Ați pierdut %hu mesaje de la %s deoarece erau invalide."
-msgstr[2] "Ați pierdut %hu de mesaje de la %s deoarece erau invalide."
+msgstr[0] "Ați pierdut %hu mesaj de la %s deoarece era nevalid."
+msgstr[1] "Ați pierdut %hu mesaje de la %s deoarece erau nevalide."
+msgstr[2] "Ați pierdut %hu de mesaje de la %s deoarece erau nevalide."
 
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
@@ -6826,7 +6802,7 @@
 "characters.]"
 msgstr ""
 "[Nu se poate afișa mesajul acestui utilizator deoarece conține caractere "
-"invalide]"
+"nevalide]"
 
 msgid ""
 "The last action you attempted could not be performed because you are over "
@@ -6837,7 +6813,7 @@
 
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Ați fost deconectat(ă) din camera de chat %s."
+msgstr "Contul v-a fost deconectat din camera de chat %s."
 
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
@@ -6898,7 +6874,7 @@
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate formata numele de utilizator pentru că este "
-"invalid."
+"nevalid."
 
 #, c-format
 msgid ""
@@ -6930,7 +6906,7 @@
 "invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
-"este invalidă."
+"este nevalidă."
 
 #, c-format
 msgid "Error 0x%04x: Unknown error."
@@ -6961,8 +6937,8 @@
 "fully connected."
 msgstr ""
 "Se pare că ați cerut să setați profilul înainte de a vă autentifica. "
-"Profilul vă va rămâne la fel. Încercați să-l setați din nou când veți fi "
-"conectat(ă) 100%."
+"Profilul vă va rămâne la fel. Încercați să-l setați din nou după o "
+"conectare pe deplin reușită."
 
 #, c-format
 msgid ""
@@ -6993,30 +6969,27 @@
 "truncated for you."
 msgstr[0] ""
 "Mesajul în absență depășește lungimea maximă de un octet. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 msgstr[1] ""
 "Mesajul în absență depășește lungimea maximă de %d octeți. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 msgstr[2] ""
 "Mesajul în absență depășește lungimea maximă de %d de octeți. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 
 msgid "Away message too long."
 msgstr "Mesaj în absență prea lung."
 
-#, 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 ""
-"Nu se poate adăuga contactul %s deoarece numele de utilizator este invalid. "
+"Nu se poate adăuga contactul %s deoarece numele de utilizator este nevalid. "
 "Un nume valid trebuie să fie o adresă de mail validă sau să înceapă cu o "
 "literă și să conțină doar litere, numere și spații sau doar numere."
 
-msgid "Unable to Add"
-msgstr "Adăugare eșuată"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Descărcarea listei de contacte a eșuat"
 
@@ -7030,7 +7003,7 @@
 msgid "Orphans"
 msgstr "Orfani"
 
-#, 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."
@@ -7041,7 +7014,7 @@
 msgid "(no name)"
 msgstr "(fără nume)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Din motive necunoscute nu s-a putut adăuga contactul %s."
 
@@ -7137,7 +7110,7 @@
 msgstr "Opțiuni de securitate ICQ"
 
 msgid "The new formatting is invalid."
-msgstr "Formatul nou este invalid."
+msgstr "Formatul nou este nevalid."
 
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
@@ -7205,9 +7178,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Căutare contact după detalii"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "Utilizator neconectat"
+msgstr "Utilizați clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7405,99 +7377,84 @@
 msgstr "Notă"
 
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Avatar"
+msgstr "Notiță pentru contact"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "Modificați notița sa după cum doriți"
+
 msgid "_Modify"
-msgstr "Modificare"
-
-#, fuzzy
+msgstr "_Modificare"
+
 msgid "Memo Modify"
-msgstr "Modificare"
-
-#, fuzzy
+msgstr "Modificare notiță"
+
 msgid "Server says:"
-msgstr "Server ocupat"
+msgstr "Serverul spune:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "Cererea v-a fost aprobată."
 
 msgid "Your request was rejected."
-msgstr ""
+msgstr "Cererea v-a fost respinsă."
 
 #, c-format
 msgid "%u requires verification"
 msgstr "%u solicită autorizare"
 
-#, fuzzy
 msgid "Add buddy question"
-msgstr "Doriți adăugarea utilizatorului în lista de contacte?"
-
-#, fuzzy
+msgstr "Întrebare la adăugarea contactului"
+
 msgid "Enter answer here"
-msgstr "Introduceți aici cererea"
+msgstr "Introduceți răspunsul aici"
 
 msgid "Send"
 msgstr "Trimite"
 
-#, fuzzy
 msgid "Invalid answer."
-msgstr "Nume invalid de utilizator"
+msgstr "Răspuns nevalid."
 
 msgid "Authorization denied message:"
 msgstr "Mesaj de autorizare refuzată:"
 
-#, fuzzy
 msgid "Sorry, you're not my style."
 msgstr "Scuze, nu ești genul meu..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "Utilizatorul %d are nevoie de autorizare"
-
-#, fuzzy
+msgstr "Utilizatorul %u necesită autorizare"
+
 msgid "Add buddy authorize"
-msgstr "Doriți adăugarea utilizatorului în lista de contacte?"
-
-#, fuzzy
+msgstr "Autorizare pentru adăugarea unui contact"
+
 msgid "Enter request here"
 msgstr "Introduceți aici cererea"
 
 msgid "Would you be my friend?"
 msgstr "Vrei să fim prieteni?"
 
-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Contact"
-
-#, fuzzy
+msgstr "Contact QQ"
+
 msgid "Add buddy"
 msgstr "Adaugă contact"
 
-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "Avatar QQ invalid"
-
-#, fuzzy
+msgstr "Număr QQ nevalid"
+
 msgid "Failed sending authorize"
-msgstr "Am nevoie de autorizare..."
-
-#, fuzzy, c-format
+msgstr "Trimiterea autorizației a eșuat"
+
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "Ștergerea contactului a eșuat"
-
-#, fuzzy, c-format
+msgstr "Ștergerea contactului %u a eșuat"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s v-a șters din lista sa de contacte."
-
-#, fuzzy
+msgstr "Contactul %d a încercat să vă șteargă din listă, dar a eșuat"
+
 msgid "No reason given"
-msgstr "Fără motiv."
+msgstr "Fără motiv"
 
 #. only need to get value
 #, c-format
@@ -7507,9 +7464,9 @@
 msgid "Would you like to add him?"
 msgstr "Doriți să îl adăugați?"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Respingere"
+msgstr "Respins de %s"
 
 #, c-format
 msgid "Message: %s"
@@ -7524,141 +7481,122 @@
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Introduceți noul nume pentru %s"
-
-#, fuzzy
+msgstr "Introduceți numărul Qun"
+
 msgid "You can only search for permanent Qun\n"
-msgstr "Puteți căuta doar grupuri QQ permanente\n"
-
-#, fuzzy
+msgstr "Puteți căuta doar după un Qun permanent\n"
+
 msgid "(Invalid UTF-8 string)"
-msgstr "Opțiuni proxy invalide"
-
-#, fuzzy
+msgstr "(șir UTF-8 nevalid)"
+
 msgid "Not member"
 msgstr "Nu sunt un membru"
 
 msgid "Member"
 msgstr "Membru"
 
-#, fuzzy
 msgid "Requesting"
-msgstr "Dialog cerere"
-
-#, fuzzy
+msgstr "Se cere"
+
 msgid "Admin"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "Admin"
+
 msgid "Notice"
-msgstr "Notă"
-
-#, fuzzy
+msgstr "Notificare"
+
 msgid "Detail"
-msgstr "Implicită"
+msgstr "Detaliu"
 
 msgid "Creator"
 msgstr "Inițiator"
 
-#, fuzzy
 msgid "About me"
-msgstr "Despre %s"
-
-#, fuzzy
+msgstr "Despre mine"
+
 msgid "Category"
-msgstr "Eroare de chat"
-
-#, fuzzy
+msgstr "Categorie"
+
 msgid "The Qun does not allow others to join"
-msgstr "Acest grup nu permite înscrierea altor contacte"
-
-#, fuzzy
+msgstr "Acest Qun nu permite intrarea altora"
+
 msgid "Join QQ Qun"
-msgstr "Intră într-un chat"
+msgstr "Intră în Qun QQ"
 
 msgid "Input request here"
 msgstr "Introduceți aici cererea"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Ați modificat cu succes membrul Qun"
-
-#, fuzzy
+msgstr "Ați intrat cu succes în Qun %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "Ați modificat cu succes membrul Qun"
+msgstr "Ați intrat cu succes în Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "Qun %u refuzat la intrare"
 
 msgid "QQ Qun Operation"
 msgstr "Operație QQ Qun"
 
-#, fuzzy
 msgid "Failed:"
-msgstr "Eșuat"
+msgstr "Eșuat:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "Răspuns necunoscut la intrarea în Qun"
+
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr "Ieșire din Qun"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-"Notați că, dacă dumneavoastră sunteți inițiatorul, \n"
+"Notați că, dacă sunteți inițiatorul, \n"
 "această acțiune va elimina acest Qun."
 
-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "Scuze, nu ești genul meu..."
-
-#, fuzzy
+msgstr "Scuze, nu ești genul nostru..."
+
 msgid "Successfully changed Qun members"
-msgstr "Ați modificat cu succes membrul Qun"
-
-#, fuzzy
+msgstr "Ați modificat cu succes membrii Qun"
+
 msgid "Successfully changed Qun information"
 msgstr "Ați modificat cu succes detaliile Qun"
 
 msgid "You have successfully created a Qun"
 msgstr "Ați creat cu succes un Qun"
 
-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "Doriți să setați detaliile Qun acum?"
+msgstr "Doriți să modificați informațiile detaliate acum?"
 
 msgid "Setup"
 msgstr "Opțiuni"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "Utilizatorul %d a cerut înscrierea în grupul %d"
-
-#, fuzzy, c-format
+msgstr "%u a cerut să intre în Qun %u pentru %s"
+
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "Utilizatorul %d a cerut înscrierea în grupul %d"
-
-#, fuzzy, c-format
+msgstr "Utilizatorul %u a cerut intrarea în grupul %u"
+
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Intrarea în chat alături de acest contact a eșuat"
+msgstr "Intrarea în Qun %u, operat de admin %u a eșuat"
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<b>Intrarea în Qun %u este aprobată de admin %u pentru %s</b>"
+
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "Ștergere contact"
-
-#, fuzzy, c-format
+msgstr "<b>Contactul %u a fost șters.</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Ștergere contact"
+msgstr "<b>Contactul nou %u a intrat.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -7673,30 +7611,26 @@
 msgid " TCP"
 msgstr " TCP"
 
-#, fuzzy
 msgid " FromMobile"
-msgstr "Mobil"
-
-#, fuzzy
+msgstr " DePeMobil"
+
 msgid " BindMobile"
-msgstr "Mobil"
-
-#, fuzzy
+msgstr " BindMobile"
+
 msgid " Video"
-msgstr "Video în direct"
-
-#, fuzzy
+msgstr " Video"
+
 msgid " Zone"
-msgstr "Fără"
+msgstr " Zone"
 
 msgid "Flag"
-msgstr ""
+msgstr "Fanion"
 
 msgid "Ver"
 msgstr "Ver"
 
 msgid "Invalid name"
-msgstr "Nume invalid"
+msgstr "Nume nevalid"
 
 msgid "Select icon..."
 msgstr "Alegeți o iconiță..."
@@ -7772,44 +7706,39 @@
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Mulțumiri</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b>Prim autor</b>:<br>\n"
+msgstr "<p><b>Testeri neobosiți</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "și alții, vă rugăm să ne spuneți... vă mulțumim!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Și pentru toți băieții din ultimele rânduri...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr "<i>Vă invităm să ni vă alăturați!</i> :)"
-
-#, fuzzy, c-format
+msgstr "<i>Vă invităm să vă alăturați nouă!</i> :)"
+
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Despre %s"
-
-#, fuzzy
+msgstr "Despre OpenQ %s"
+
 msgid "Change Icon"
-msgstr "Salvare avatar"
+msgstr "Schimbare iconiță"
 
 msgid "Change Password"
 msgstr "Schimbare parolă"
 
-#, fuzzy
 msgid "Account Information"
-msgstr "Informații de autentificare"
+msgstr "Informații despre cont"
 
 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "Actualizează toate Qun QQ"
+
 msgid "About OpenQ"
-msgstr "Despre %s"
-
-#, fuzzy
+msgstr "Despre OpenQ"
+
 msgid "Modify Buddy Memo"
-msgstr "Editare adresă"
+msgstr "Editare notiță contact"
 
 #. *< type
 #. *< ui_requirement
@@ -7821,17 +7750,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "Modul pentru protocolul QQ"
 
-#, fuzzy
 msgid "Auto"
-msgstr "Autor"
-
-#, fuzzy
+msgstr "Auto"
+
 msgid "Select Server"
-msgstr "Selectați utilizatorul"
+msgstr "Selectați serverul"
 
 msgid "QQ2005"
 msgstr "QQ2005"
@@ -7842,168 +7768,153 @@
 msgid "QQ2008"
 msgstr "QQ2008"
 
-#, fuzzy
 msgid "Connect by TCP"
 msgstr "Conectare folosind TCP"
 
-#, fuzzy
 msgid "Show server notice"
-msgstr "Port server"
-
-#, fuzzy
+msgstr "Afișare notificări server"
+
 msgid "Show server news"
-msgstr "Adresă server"
+msgstr "Afișare știri server"
 
 msgid "Show chat room when msg comes"
-msgstr ""
-
-#, fuzzy
+msgstr "Arată camera de chat când vine msg"
+
 msgid "Keep alive interval (seconds)"
-msgstr "Eroare „keep alive”"
-
-#, fuzzy
+msgstr "Interval „keep alive” (secunde)"
+
 msgid "Update interval (seconds)"
-msgstr "Eroare „keep alive”"
-
-#, fuzzy
+msgstr "Interval de actualizare (secunde)"
+
 msgid "Unable to decrypt server reply"
-msgstr "Nu s-au putut obține detalii despre server"
+msgstr "Nu s-a putut decripta răspunsul serverului"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Eșuarea la cererea jetonului, 0x%02X"
+
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Titlu invalid"
+msgstr "Lungime nevalidă de jeton, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX nu este suportat în prezent"
 
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "E nevoie de înregistrare"
+msgstr "Necesită activare"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
-
-#, fuzzy
+msgstr "Cod necunoscut de răspuns la autentificare (0x%02X)"
+
 msgid "Requesting captcha"
-msgstr "Se cere atenție din partea contactului %s..."
-
-#, fuzzy
+msgstr "Se cere imaginea captcha"
+
 msgid "Checking captcha"
-msgstr "Se cere atenție din partea contactului %s..."
-
-#, fuzzy
+msgstr "Se verifică imaginea captcha"
+
 msgid "Failed captcha verification"
-msgstr "Autentificarea Yahoo! a eșuat"
-
-#, fuzzy
+msgstr "Verificarea imaginii captcha a eșuat"
+
 msgid "Captcha Image"
-msgstr "Salvează imaginea"
-
-#, fuzzy
+msgstr "Imagine captcha"
+
 msgid "Enter code"
-msgstr "Introduceți parola"
-
-#, fuzzy
+msgstr "Introduceți codul"
+
 msgid "QQ Captcha Verification"
-msgstr "Verificare certificat SSL"
-
-#, fuzzy
+msgstr "Verificare captcha QQ"
+
 msgid "Enter the text from the image"
-msgstr "Introduceți numele grupului"
+msgstr "Introduceți textul din imagine"
 
 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "Răspuns necunoscut la verificarea parolei (0x%02X)"
 
 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"Cod necunoscut de răspuns la autentificare (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
 msgstr "Eroare de socket"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "Introducere detalii..."
-
-#, fuzzy
+msgstr "Se află serverul"
+
 msgid "Requesting token"
-msgstr "Cerere respinsă"
-
-#, fuzzy
+msgstr "Se cere jeton"
+
 msgid "Unable to resolve hostname"
-msgstr "Conectarea la server a eșuat."
-
-#, fuzzy
+msgstr "Nu se poate rezolva numele serverului"
+
 msgid "Invalid server or port"
-msgstr "Eroare invalidă"
-
-#, fuzzy
+msgstr "Server sau port nevalid"
+
 msgid "Connecting to server"
-msgstr "Conectare în progres la serverul SILC"
-
-#, fuzzy
+msgstr "Conectare la server"
+
 msgid "QQ Error"
-msgstr "Eroare QQid"
-
-#, fuzzy, c-format
+msgstr "Eroare QQ"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Schimb de server ICQ"
-
-#, fuzzy, c-format
+msgstr ""
+"Știri server:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
 msgid "%s:%s"
-msgstr "%s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "Expeditor"
-
-#, fuzzy, c-format
+msgstr "Expeditor %s:"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Instrucțiuni server: %s"
-
-#, fuzzy
+msgstr ""
+"Notificare server Expeditor %s: \n"
+"%s"
+
 msgid "Unknown SERVER CMD"
-msgstr "Motiv necunoscut"
+msgstr "SERVER CMD necunoscut"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
-
-#, fuzzy
+"Răspuns de eroare %s(0x%02X)\n"
+"Camera %u, răspuns 0x%02X"
+
 msgid "QQ Qun Command"
-msgstr "Comandă"
-
-#, fuzzy
+msgstr "Comandă QQ Qun"
+
 msgid "Unable to decrypt login reply"
-msgstr "Nu s-au putut obține detalii despre server"
-
-#, fuzzy
+msgstr "Nu s-a putut decripta răspunsul de autentificare"
+
 msgid "Unknown LOGIN CMD"
-msgstr "Motiv necunoscut"
-
-#, fuzzy
+msgstr "LOGIN CMD necunoscut"
+
 msgid "Unknown CLIENT CMD"
-msgstr "Motiv necunoscut"
+msgstr "CLIENT CMD necunoscut"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8979,9 +8890,8 @@
 msgid "Disconnected by server"
 msgstr "Deconectat de server"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "Eroare la conectarea la serverul SILC"
+msgstr "Eroare de conectare la serverul SILC"
 
 msgid "Key Exchange failed"
 msgstr "Schimbul de chei a eșuat"
@@ -8995,7 +8905,6 @@
 msgid "Performing key exchange"
 msgstr "Se efectuează schimbul de chei"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Nu s-a putut încărca perechea de chei SILC"
 
@@ -9003,14 +8912,9 @@
 msgid "Connecting to SILC Server"
 msgstr "Conectare în progres la serverul SILC"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "Nu s-a putut încărca perechea de chei SILC"
-
 msgid "Out of memory"
 msgstr "Nu mai există memorie disponibilă"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "Nu s-a putut inițializa protocolul SILC"
 
@@ -9312,9 +9216,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Creez perechea de chei SILC..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Nu s-a putut crea perechea de chei SILC\n"
+msgstr "Nu s-a putut crea perechea de chei SILC"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9450,33 +9353,30 @@
 
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "Eroare: Cookie invalid"
+msgstr "Eroare: Cookie nevalid"
 
 #, c-format
 msgid "Failure: Authentication failed"
 msgstr "Eroare: Autentificare eșuată"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Nu s-a putut inițializa conexiunea ca client SILC"
+msgstr "Nu s-a putut inițializa conexiunea client SILC"
 
 msgid "John Noname"
 msgstr "Ion Fărănume"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Nu s-a putut încărca perechea de chei SILC: %s"
 
 msgid "Unable to create connection"
 msgstr "Nu se poate crea o nouă conexiune"
 
-#, fuzzy
 msgid "Unknown server response"
 msgstr "Răspuns necunoscut de la server."
 
-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "Nu se poate crea un socket"
+msgstr "Nu se poate crea un socket de ascultare"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Numele de utilizatori SIP nu pot conține spații sau simbolul @"
@@ -9539,9 +9439,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Modul de protocol Yahoo"
+msgstr "Modul de protocol Yahoo!"
 
 msgid "Pager server"
 msgstr "Server pager"
@@ -9570,9 +9469,8 @@
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Identitate Yahoo..."
+msgstr "Identitate Yahoo Japonia..."
 
 #. *< type
 #. *< ui_requirement
@@ -9584,15 +9482,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Modul de protocol Yahoo"
+msgstr "Modul de protocol Yahoo! Japonia"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Mesajul SMS nu v-a fost trimis"
 
 msgid "Your Yahoo! message did not get sent."
-msgstr "Mesajul dumneavoastră Yahoo! nu a fost trimis."
+msgstr "Mesajul Yahoo! nu v-a fost trimis."
 
 #, c-format
 msgid "Yahoo! system message for %s:"
@@ -9616,32 +9513,28 @@
 msgstr "Adăugarea contactului a fost refuzată"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "S-au primit date invalide de la server."
+msgstr "S-au primit date nevalide"
 
 #. 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 ""
-"Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
-"rezolva această problemă."
+"Cont blocat: prea multe tentative eșuate de autentificare. Autentificarea "
+"în paginile web Yahoo! ar putea rezolva această problemă."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
-"rezolva această problemă."
+"Cont blocat: motiv necunoscut. Autentificarea în paginile web Yahoo! ar "
+"putea rezolva această problemă."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Nume de utilizator sau parolă incorecte."
+msgstr "Nume de utilizator sau parolă lipsă."
 
 #, c-format
 msgid ""
@@ -9665,24 +9558,21 @@
 "Alegeți „Da” pentru a-l șterge din listă și a-l ignora de acum înainte."
 
 msgid "Ignore buddy?"
-msgstr "Ignor contactul?"
+msgstr "Ignorați contactul?"
 
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Contul vă este blocat, autentificați-vă la www.yahoo.com !"
+msgstr "Contul vă este blocat, autentificați-vă în paginile web Yahoo!"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
-"rezolva această problemă."
-
-#, fuzzy, c-format
+msgstr "Eroare necunoscută cu numărul %d. Autentificarea în paginile web "
+"Yahoo! ar putea rezolva această problemă."
+
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server pentru "
-"contul %s."
-
-#, fuzzy
+msgstr "Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server "
+"pentru contul %s."
+
 msgid "Unable to add buddy to server list"
 msgstr "Contactul nu a putut fi adăugat în lista de pe server"
 
@@ -9690,21 +9580,18 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audibil %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
 msgstr "S-a primit un răspuns HTTP neașteptat de la server."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
 msgstr ""
-"S-a pierdut conexiunea cu %s:\n"
-"%s"
-
-#, fuzzy, c-format
+"S-a pierdut conexiunea cu %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
+"Nu s-a putut face o conexiune cu %s: %s"
 
 msgid "Not at Home"
 msgstr "Nu-s acasă"
@@ -9752,7 +9639,7 @@
 msgstr "Mâzgălituri"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Alegeți ID-ul ce doriți să-l activați"
 
 msgid "Join whom in chat?"
 msgstr "Cui doriți să vă alăturați în chat?"
@@ -9855,13 +9742,8 @@
 msgstr "Profilul utilizatorului este gol."
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s a declinat invitația la conferința din camera de chat „%s” din următorul "
-"motiv: „%s”."
-
-msgid "Invitation Rejected"
-msgstr "Invitație respinsă"
+msgid "%s has declined to join."
+msgstr "%s a refuzat să intre."
 
 msgid "Failed to join chat"
 msgstr "Intrarea în chat a eșuat"
@@ -9913,9 +9795,8 @@
 msgid "User Rooms"
 msgstr "Camere de chat utilizatori"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Probleme de conectare la serverul YCHT."
+msgstr "Probleme de conexiune cu serverul YCHT."
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10046,17 +9927,17 @@
 msgid "Exposure"
 msgstr "Expunere"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s\n"
+msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Eroare la conectarea la serverul proxy HTTP: %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "Acces interzis: serverul proxy nu permite tunelarea portului %d."
+msgstr "Acces interzis: serverul proxy HTTP interzice tunelarea portului %d."
 
 #, c-format
 msgid "Error resolving %s"
@@ -10134,7 +10015,7 @@
 msgstr "Conexiunea SSL a eșuat"
 
 msgid "SSL peer presented an invalid certificate"
-msgstr "Partenerul SSL a prezentat un certificat invalid"
+msgstr "Partenerul SSL a prezentat un certificat nevalid"
 
 msgid "Unknown SSL error"
 msgstr "Eroare SSL necunoscută"
@@ -10307,13 +10188,13 @@
 msgid "Error Reading %s"
 msgstr "Eroare la citirea %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"A apărut o eroare la citirea fișierului %s. Încărcarea datelor a eșuat și "
-"vechiul fișier a fost redenumit „%s~”."
+"A apărut o eroare la citirea %s. Fișierul nu a fost încărcat și "
+"vechiul fișier a fost redenumit în „%s~”."
 
 msgid "Internet Messenger"
 msgstr "Mesagerie instant"
@@ -10357,7 +10238,7 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizează această _iconiță pentru acest cont:"
 
-msgid "_Advanced"
+msgid "Ad_vanced"
 msgstr "_Avansat"
 
 msgid "Use GNOME Proxy Settings"
@@ -10420,9 +10301,8 @@
 msgid "Create _this new account on the server"
 msgstr "Creează acest _nou cont pe server"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "Proxy"
+msgid "P_roxy"
+msgstr "P_roxy"
 
 msgid "Enabled"
 msgstr "Activare"
@@ -10473,14 +10353,14 @@
 msgid "Please update the necessary fields."
 msgstr "Trebuie să actualizați câmpurile cerute."
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "Cont"
+msgstr "_Cont"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Introduceți detaliile chat-ului în care doriți să intrați.\n"
+msgstr ""
+"Introduceți informațiile despre chat-ul în care doriți să participați.\n"
 
 msgid "Room _List"
 msgstr "_Listă de camere"
@@ -10500,16 +10380,14 @@
 msgid "I_M"
 msgstr "_Mesaj"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Adaugă un chat"
+msgstr "_Apel audio"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Apel audio/_video"
+
 msgid "_Video Call"
-msgstr "Videochat"
+msgstr "Apel _video"
 
 msgid "_Send File..."
 msgstr "_Trimitere fișier..."
@@ -10520,11 +10398,9 @@
 msgid "View _Log"
 msgstr "Arată în_registrările"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "Ascunde la deconectare"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "Arată la deconectare"
 
@@ -10532,7 +10408,7 @@
 msgstr "_Alias..."
 
 msgid "_Remove"
-msgstr "Șter_ge"
+msgstr "Șt_erge"
 
 msgid "Set Custom Icon"
 msgstr "Iconiță personalizată..."
@@ -10547,7 +10423,7 @@
 msgstr "Adaugă un c_hat..."
 
 msgid "_Delete Group"
-msgstr "Șter_gere grup"
+msgstr "Șt_ergere grup"
 
 msgid "_Rename"
 msgstr "_Redenumire"
@@ -10577,7 +10453,7 @@
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
-"Nu sunteți autentificat(ă) cu nici un protocol prin care care să puteți "
+"Nu v-ați autentificat cu nici un protocol prin care care să puteți "
 "adăuga acel contact."
 
 #. I don't believe this can happen currently, I think
@@ -10652,7 +10528,6 @@
 msgid "/Tools/_Certificates"
 msgstr "/Unelte/_Certificate"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
 msgstr "/Unelte/_Iconițe simbolice"
 
@@ -10784,7 +10659,7 @@
 msgstr "După status"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "După înregistrările recente"
 
 #, c-format
 msgid "%s disconnected"
@@ -10801,7 +10676,7 @@
 msgstr "Reactivare"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "Întrebări frecvente SSL"
 
 msgid "Welcome back!"
 msgstr "Bine ați revenit!"
@@ -10882,8 +10757,7 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
-"Nu sunteți autentificat(ă) cu vreun protocol prin care să puteți iniția un "
-"chat."
+"Nu v-ați autentificat cu vreun protocol prin care să puteți iniția un chat."
 
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
@@ -10935,112 +10809,97 @@
 msgid "Background Color"
 msgstr "Culoare fundal"
 
-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "Acest grup a fost adăugat la lista dumneavoastră de contacte"
-
-#, fuzzy
+msgstr "Culoarea de fundal pentru lista de contacte"
+
 msgid "Layout"
-msgstr "Lao"
+msgstr "Dispunere"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "Dispunerea iconițelor, numelui și a statusului în lista de contacte"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Culoare fundal"
+msgstr "Culoare fundal la desfacere"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "Culoarea de fundal a unui grup desfăcut"
+
 msgid "Expanded Text"
-msgstr "Des_fă"
+msgstr "Text text la desfacere"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un grup desfăcut"
+
 msgid "Collapsed Background Color"
-msgstr "Selectați culoarea fundalului"
+msgstr "Culoare fundal la strângere"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "Culoarea de fundal a unui grup strâns"
+
 msgid "Collapsed Text"
-msgstr "_Strânge"
+msgstr "Text la strângere"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Informația text pentru un grup strâns"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Selectați culoarea fundalului"
+msgstr "Culoare fundal contact/chat"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "Culoarea de fundal a unui contact sau chat"
+
 msgid "Contact Text"
-msgstr "Combinație de semne"
+msgstr "Text contact"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact strâns"
+
 msgid "On-line Text"
-msgstr "Conectat"
+msgstr "Text on-line"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact conectat"
+
 msgid "Away Text"
-msgstr "Absent"
+msgstr "Text absent"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact absent"
+
 msgid "Off-line Text"
-msgstr "Deconectat"
+msgstr "Text deconectat"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact deconectat"
+
 msgid "Idle Text"
-msgstr "Text dispoziție"
+msgstr "Text inactiv"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact inactiv"
+
 msgid "Message Text"
-msgstr "Ați trimis un mesaj"
+msgstr "Text mesaj"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "Informația text pentru un contact cu un mesaj necitit"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Textul mesajului (utilizatorul a spus)"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un chat cu un mesaj necitit care vă "
+"menționează numele"
+
 msgid "The text information for a buddy's status"
-msgstr "Modificare detalii pentru %s"
-
-#, fuzzy
+msgstr "Informația text pentru starea unui contact"
+
 msgid "Type the host name for this certificate."
-msgstr ""
-"Introduceți numele calculatorului pentru care a fost eliberat certificatul"
+msgstr "Introduceți numele calculatorului pentru acest certificat."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -11055,7 +10914,7 @@
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
-"Nu sunteți autentificat(ă) cu nici un protocol prin care care să puteți "
+"Nu v-ați autentificat cu nici un protocol prin care care să puteți "
 "invita acel contact."
 
 msgid "Invite Buddy Into Chat Room"
@@ -11089,7 +10948,6 @@
 msgid "Get Away Message"
 msgstr "Obține mesajul în absență"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "Ultima replică"
 
@@ -11136,21 +10994,17 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Discuție/G_olește fereastra"
 
-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Discuție/Mai m_ult"
-
-#, fuzzy
+msgstr "/Discuție/Me_dia"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Discuție/Mai m_ult"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel _audio"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Discuție/Mai m_ult"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel _video"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Discuție/Arată în_registrările"
+msgstr "/Discuție/Media/Ap_el audio\\/video"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/Discuție/_Trimite un fișier..."
@@ -11159,7 +11013,7 @@
 msgstr "/Discuție/Adaugă î_ntâmpinare..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Discuție/D_etalii"
+msgstr "/Discuție/Detali_i"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Discuție/_Invită..."
@@ -11180,13 +11034,13 @@
 msgstr "/Discuție/A_daugă..."
 
 msgid "/Conversation/_Remove..."
-msgstr "/Discuție/Șter_ge..."
+msgstr "/Discuție/Șt_erge..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Discuție/Inserează o a_dresă..."
+msgstr "/Discuție/Inserea_ză o adresă..."
 
 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Discuție/Inserea_ză o imagine..."
+msgstr "/Discuție/Inserează o ima_gine..."
 
 msgid "/Conversation/_Close"
 msgstr "/Discuție/În_chide"
@@ -11224,17 +11078,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Discuție/Arată înregistrările"
 
-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Discuție/Mai mult"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel audio"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Discuție/Arată înregistrările"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel video"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Discuție/Mai mult"
+msgstr "/Discuție/Media/Apel audio\\/video"
 
 msgid "/Conversation/Send File..."
 msgstr "/Discuție/Trimite un fișier..."
@@ -11420,7 +11271,7 @@
 msgstr "Ka-Hing Cheung"
 
 msgid "voice and video"
-msgstr ""
+msgstr "voce și video"
 
 msgid "support"
 msgstr "suport"
@@ -11546,9 +11397,8 @@
 msgid "Hungarian"
 msgstr "Maghiară"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "Română"
+msgstr "Armeană"
 
 msgid "Indonesian"
 msgstr "Indoneziană"
@@ -11565,9 +11415,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Traducătorii Ubuntu din Georgia"
 
-#, fuzzy
 msgid "Khmer"
-msgstr "Altceva"
+msgstr "Khmeră"
 
 msgid "Kannada"
 msgstr "Kannada"
@@ -11590,9 +11439,8 @@
 msgid "Macedonian"
 msgstr "Macedoneană"
 
-#, fuzzy
 msgid "Mongolian"
-msgstr "Macedoneană"
+msgstr "Mongoleză"
 
 msgid "Bokmål Norwegian"
 msgstr "Norvegiană Bokmål"
@@ -11649,7 +11497,7 @@
 msgstr "Suedeză"
 
 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"
 
 msgid "Tamil"
 msgstr "Tamil"
@@ -11715,21 +11563,25 @@
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 
 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 msgstr ""
-
-#, fuzzy, c-format
+"<FONT SIZE=\"4\">Ajutor prin mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
-
-#, fuzzy, c-format
+msgstr "<FONT SIZE=\"4\">Canal IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
 
 msgid "Current Developers"
 msgstr "Programatori activi"
@@ -11811,7 +11663,7 @@
 msgstr "Ștergere contact"
 
 msgid "_Remove Contact"
-msgstr "Șter_gere contact"
+msgstr "Șt_ergere contact"
 
 #, c-format
 msgid ""
@@ -11839,7 +11691,7 @@
 msgstr "Ștergere grup"
 
 msgid "_Remove Group"
-msgstr "Șter_gere grup"
+msgstr "Șt_ergere grup"
 
 #, c-format
 msgid ""
@@ -11852,7 +11704,7 @@
 msgstr "Ștergere contact"
 
 msgid "_Remove Buddy"
-msgstr "Șter_ge contactul"
+msgstr "Șt_erge contactul"
 
 #, c-format
 msgid ""
@@ -11866,7 +11718,7 @@
 msgstr "Ștergere chat"
 
 msgid "_Remove Chat"
-msgstr "Șter_gere chat"
+msgstr "Șt_ergere chat"
 
 msgid "Right-click for more unread messages...\n"
 msgstr "Click dreapta pentru mai multe mesaje necitite...\n"
@@ -11953,19 +11805,11 @@
 msgstr "Închide fereastra la _terminarea tuturor transferurilor"
 
 msgid "C_lear finished transfers"
-msgstr "Șter_ge transferurile terminate"
+msgstr "Șt_erge transferurile terminate"
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "_Detaliile transferului de fișiere"
-
-#. Pause button
-msgid "_Pause"
-msgstr "_Pauză"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Reluare"
+msgstr "Detaliile trans_ferului de fișiere"
 
 msgid "Paste as Plain _Text"
 msgstr "Lipește ca text _simplu"
@@ -11985,9 +11829,8 @@
 msgid "Hyperlink visited color"
 msgstr "Culoare adresă web"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Culoare pentru afișarea adreselor web vizitate ori activate."
+msgstr "Culoare pentru afișarea adreselor web vizitate (ori activate)."
 
 msgid "Hyperlink prelight color"
 msgstr "Culoare evidențiere adresă"
@@ -12022,23 +11865,20 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Culoare pentru mesajele comenzi în mod discret"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
+msgstr "Culoare de utilizat pentru numele mesajelor discrete de acțiune."
 
 msgid "Whisper Message Name Color"
 msgstr "Culoare pentru mesajele discrete"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
+msgstr "Culoare de utilizat pentru numele mesajelor discrete."
 
 msgid "Typing notification color"
 msgstr "Culoarea mesajelor de notificare"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "Culoare de utilizat pentru mesajele de notificare"
+msgstr "Culoare de utilizat pentru notificarea tastării"
 
 msgid "Typing notification font"
 msgstr "Fontul mesajelor de notificare"
@@ -12291,7 +12131,7 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Încercați „%s -h” pentru mai multe informații.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12313,6 +12153,7 @@
 "\n"
 "  -c, --config=DIR    utilizează calea DIR pentru fișierele de configurare\n"
 "  -d, --debug         arată mesaje de depanare în ieșirea standard (stdout)\n"
+"  -f, --force-online  forțează conectarea în orice condiții\n"
 "  -h, --help          arată acest mesaj de ajutor\n"
 "  -m, --multiple      permite instanțe multiple\n"
 "  -n, --nologin       fără autentificare automată\n"
@@ -12322,7 +12163,7 @@
 "  --display=ECRAN     ecran X de utilizat\n"
 "  -v, --version       arată versiunea curentă\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12343,6 +12184,7 @@
 "\n"
 "  -c, --config=DIR    utilizează calea DIR pentru fișierele de configurare\n"
 "  -d, --debug         arată mesaje de depanare în ieșirea standard (stdout)\n"
+"  -f, --force-online  forțează conectarea în orice condiții\n"
 "  -h, --help          arată acest mesaj de ajutor\n"
 "  -m, --multiple      permite instanțe multiple\n"
 "  -n, --nologin       fără autentificare automată\n"
@@ -12387,25 +12229,27 @@
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "Se iese pentru că un alt client libpurple este deja pornit.\n"
 
 msgid "/_Media"
-msgstr ""
+msgstr "/_Media"
 
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/Media/Înc_hide"
+
 msgid "Calling..."
-msgstr "Se calculează..."
+msgstr "Se apelează..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s dorește să inițieze o sesiune audio/video."
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s dorește să inițieze o sesiune video."
+
+msgid "_Pause"
+msgstr "_Pauză"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12423,7 +12267,7 @@
 
 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Navigatorul „%s” este invalid."
+msgstr "Navigatorul „%s” este nevalid."
 
 msgid "Unable to open URL"
 msgstr "Nu se poate deschide acest URL"
@@ -12438,9 +12282,8 @@
 "Ați ales să precizați o comandă pentru deschiderea unui navigator, dar nu "
 "ați introdus-o în preferințe."
 
-#, fuzzy
 msgid "No message"
-msgstr "Mesaj necunoscut"
+msgstr "Nici un mesaj"
 
 msgid "Open All Messages"
 msgstr "Deschide toate mesajele"
@@ -12448,16 +12291,14 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Aveți mail nou!</span>"
 
-#, fuzzy
 msgid "New Pounces"
 msgstr "Întâmpinare nouă"
 
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "Închide"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Aveți mail nou!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Întâmpinare</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "Următoarele module vor fi dezactivate."
@@ -12507,7 +12348,6 @@
 msgid "Select a file"
 msgstr "Selectați un fișier"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "Editare întâmpinare"
 
@@ -12584,61 +12424,58 @@
 msgid "Pounce Target"
 msgstr "Țintă întâmpinare"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
-msgstr "Tastarea unui mesaj nou"
-
-#, fuzzy, c-format
+msgstr "A început să tasteze"
+
+#, c-format
 msgid "Paused while typing"
-msgstr "Pauză în timpul tastării"
-
-#, fuzzy, c-format
+msgstr "S-a oprit momentan din tastare"
+
+#, c-format
 msgid "Signed on"
-msgstr "Autentificare"
-
-#, fuzzy, c-format
+msgstr "S-a autentificat"
+
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s s-a întors din inactivitate (%s)"
-
-#, fuzzy, c-format
+msgstr "S-a întors din inactivitate"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "Întoarcerea din absență"
-
-#, fuzzy, c-format
+msgstr "S-a întors din absență"
+
+#, c-format
 msgid "Stopped typing"
-msgstr "M-am oprit din scris"
-
-#, fuzzy, c-format
+msgstr "S-a oprit din scris"
+
+#, c-format
 msgid "Signed off"
-msgstr "Deconectare"
-
-#, fuzzy, c-format
+msgstr "S-a deconectat"
+
+#, c-format
 msgid "Became idle"
-msgstr "Intrarea în inactivitate"
-
-#, fuzzy, c-format
+msgstr "A intrat în inactivitate"
+
+#, c-format
 msgid "Went away"
-msgstr "În absență"
-
-#, fuzzy, c-format
+msgstr "A devenit absent"
+
+#, c-format
 msgid "Sent a message"
-msgstr "Trimite un mesaj"
-
-#, fuzzy, c-format
+msgstr "A trimis un mesaj"
+
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "Eveniment necunoscut în întâmpinare. Raportați această eroare."
-
-#, fuzzy
+msgstr "Eveniment necunoscut... Vă rugăm să raportați acest lucru!"
+
 msgid "Theme failed to unpack."
-msgstr "Tema de iconițe simbolice nu a putut fi dezarhivată."
-
-#, fuzzy
+msgstr "Tema nu a putut fi despachetată."
+
 msgid "Theme failed to load."
-msgstr "Tema de iconițe simbolice nu a putut fi dezarhivată."
-
-#, fuzzy
+msgstr "Tema nu a putut fi încărcată."
+
 msgid "Theme failed to copy."
-msgstr "Tema de iconițe simbolice nu a putut fi dezarhivată."
+msgstr "Tema nu a putut fi copiată."
 
 msgid "Install Theme"
 msgstr "Instalare temă"
@@ -12661,9 +12498,8 @@
 msgstr "Închide _fereastra de discuții cu tasta Esc"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Listă de contacte"
+msgstr "Tema listei de contacte"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12675,9 +12511,8 @@
 msgid "On unread messages"
 msgstr "Pentru mesajele necitite"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "Ferestre de discuții"
+msgstr "Fereastra de discuții"
 
 msgid "_Hide new IM conversations:"
 msgstr "Ascunde discuțiile _noi:"
@@ -12780,9 +12615,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplu: stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Autodetectare adresă IP"
+msgstr "Utilizează adresa IP _autodetectată: %s"
 
 msgid "Public _IP:"
 msgstr "_IP public:"
@@ -12804,7 +12639,7 @@
 
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Server releu (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "Server proxy &amp; navigator"
@@ -12836,7 +12671,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 "Cereri DNS prin proxy-urile SOCKS4"
 
 msgid "_User:"
 msgstr "Utili_zator:"
@@ -13149,12 +12984,11 @@
 msgid "Status for %s"
 msgstr "Status pentru %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"O iconiță simbolică personalizată există deja pentru combinația de semne "
-"selectată. Alegeți o altă combinație de semne."
+"Există deja o iconiță simbolică pentru '%s'. Alegeți altă combinație de semne."
 
 msgid "Custom Smiley"
 msgstr "Iconiță simbolică personalizată"
@@ -13168,28 +13002,24 @@
 msgid "Add Smiley"
 msgstr "Adăugare iconiță simbolică"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "_Imagine"
+msgstr "_Imagine:"
 
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Combinație de semne"
+msgstr "_Textul combinației de semne"
 
 msgid "Smiley"
 msgstr "Iconiță simbolice"
 
-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Combinație de semne"
+msgstr "Textul combinației de semne"
 
 msgid "Custom Smiley Manager"
 msgstr "Administrator de iconițe personalizate"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Selectare contact"
+msgstr "Selectare iconiță contact"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "Clic aici pentru a vă schimba avatarul pentru acest cont."
@@ -13275,13 +13105,12 @@
 msgid "Cannot send launcher"
 msgstr "Lansatorul nu a putut fi trimis"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
 "Ați tras și plasat un lansator pentru desktop. Probabil doriți sa trimiteți "
-"nu lansatorul în sine, ci fișierul la care face referire."
+"fișierul la care face referire, nu lansatorul în sine."
 
 #, c-format
 msgid ""
@@ -13314,19 +13143,30 @@
 "Dintr-un motiv necunoscut nu s-a putut încărca imaginea „%s”, probabil este "
 "un fișier imagine corupt"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "_Deschide adresa:"
+msgstr "_Deschide linkul:"
 
 msgid "_Copy Link Location"
 msgstr "_Copiază adresa"
 
 msgid "_Copy Email Address"
-msgstr "C_opiază adresa de mail"
+msgstr "_Copiază adresa de mail"
+
+msgid "_Open File"
+msgstr "_Deschide fișierul..."
+
+msgid "Open _Containing Directory"
+msgstr "Deschide directorul ce _conține"
 
 msgid "Save File"
 msgstr "Salvare fișier"
 
+msgid "_Play Sound"
+msgstr "_Redare sunet"
+
+msgid "_Save File"
+msgstr "_Salvare fișier"
+
 msgid "Select color"
 msgstr "Selectare culoare"
 
@@ -13414,78 +13254,64 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Arată statistici despre disponibilitatea contactelor"
 
-#, fuzzy
 msgid "Server name request"
-msgstr "Adresă server"
-
-#, fuzzy
+msgstr "Cerere nume server"
+
 msgid "Enter an XMPP Server"
-msgstr "Conectare la un server de conferințe"
-
-#, fuzzy
+msgstr "Introduceți un server XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Selectați un server de conferințe pentru interogare"
-
-#, fuzzy
+msgstr "Selectați un server XMPP pentru interogare"
+
 msgid "Find Services"
-msgstr "Servicii de conectare"
-
-#, fuzzy
+msgstr "Căutare de servicii"
+
 msgid "Add to Buddy List"
-msgstr "Trimite lista de contacte"
-
-#, fuzzy
+msgstr "Adaugă la lista de contacte"
+
 msgid "Gateway"
-msgstr "Intrarea în absență"
-
-#, fuzzy
+msgstr "Gateway"
+
 msgid "Directory"
-msgstr "Director înregistrări"
-
-#, fuzzy
+msgstr "Director"
+
 msgid "PubSub Collection"
-msgstr "Selectați un sunet"
-
-#, fuzzy
+msgstr "Colecție PubSub"
+
 msgid "PubSub Leaf"
-msgstr "Serviciu PubSub"
-
-#, fuzzy
+msgstr "Frunză PubSub"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Descriere"
+msgstr ""
+"\n"
+"<b>Descriere:</b> "
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Detalii servicii descoperite"
-
-#, fuzzy
+msgstr "Descoperire de servicii"
+
 msgid "_Browse"
-msgstr "_Navigator:"
-
-#, fuzzy
+msgstr "_Navigare:"
+
 msgid "Server does not exist"
-msgstr "Utilizator inexistent"
-
-#, fuzzy
+msgstr "Server inexistent"
+
 msgid "Server does not support service discovery"
-msgstr "Serverul nu permite blocarea"
-
-#, fuzzy
+msgstr "Serverul nu permite descoperirea serviciilor"
+
 msgid "XMPP Service Discovery"
-msgstr "Detalii servicii descoperite"
+msgstr "Descoperire de servicii XMPP"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Permite navigarea și înregistrarea serviciilor"
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
-"Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."
+"Acest modul este util pentru înregistrarea cu transporturi învechite sau alte servicii XMPP."
 
 msgid "Buddy is idle"
 msgstr "Contactul este inactiv"
@@ -13877,23 +13703,22 @@
 msgstr "Mesaje muzicale pentru compoziții în colaborare."
 
 #. *  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 ""
-"Modulul de mesaje muzicale permite utilizatorilor să lucreze simultan la o "
+"Modulul de mesaje muzicale permite mai multor utilizatori să lucreze simultan la o "
 "piesă muzicală editând o partitură comună în timp real."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
-msgstr "Notifică în:"
+msgstr "Notifică pentru"
 
 msgid "\t_Only when someone says your username"
-msgstr "\tDoar când cineva _vă spune numele de utilizator într-un chat"
+msgstr "\tD_oar când cineva vă spune numele de utilizator"
 
 msgid "_Focused windows"
-msgstr "F_erestrele în prim plan"
+msgstr "_Ferestrele în prim plan"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
@@ -14001,9 +13826,8 @@
 msgid "Highlighted Message Name Color"
 msgstr "Numele culorii pentru evidențierea mesajelor"
 
-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "Culoarea mesajelor de notificare"
+msgstr "Culoarea mesajelor de notificare la tastare"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separare orizontală GtkTreeView"
@@ -14034,23 +13858,20 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Temă combinații de taste GTK+ Text"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Activează mesajele de notificare"
-
-#, fuzzy
+msgstr "Dezactivează textul notificării la tastare"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Control temă GTK+ Pidgin"
-
-#, fuzzy
+msgstr "Opțiuni de control a temei GTK+"
+
 msgid "Colors"
-msgstr "Închide"
+msgstr "Culori"
 
 msgid "Fonts"
 msgstr "Fonturi"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diverse"
 
 msgid "Gtkrc File Tools"
 msgstr "Unelte fișiere Gtkrc"
@@ -14135,11 +13956,10 @@
 msgstr "Buton de trimitere în fereastra de discuții"
 
 #. *< 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 "Adaugă un buton de trimitere a mesajului în fereastra de discuții."
+msgstr "Adaugă un buton de trimitere a mesajului în fereastra de discuții. A se folosi când nu există o tastatură fizică."
 
 msgid "Duplicate Correction"
 msgstr "Corecție duplicată"
@@ -14190,94 +14010,81 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Schimbă mesajele trimise după reguli predefinite de utilizator."
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "Neautentificat"
-
-#, fuzzy
+msgstr "Tocmai s-a autentificat"
+
 msgid "Just logged out"
-msgstr "Neautentificat"
+msgstr "Tocmai s-a deconectat"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Iconiță pentru contact/\n"
+"Iconiță pentru persoane necunoscute"
+
 msgid "Icon for Chat"
-msgstr "Intră într-un chat"
-
-#, fuzzy
+msgstr "Iconiță pentru chat"
+
 msgid "Ignored"
-msgstr "Ignoră"
-
-#, fuzzy
+msgstr "Ignorat"
+
 msgid "Founder"
-msgstr "Mai tare"
-
-#, fuzzy
+msgstr "Fondator"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "Operator"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Sub-operator"
+
 msgid "Authorization dialog"
-msgstr "Autorizare acordată"
-
-#, fuzzy
+msgstr "Dialog de autorizare"
+
 msgid "Error dialog"
-msgstr "Erori "
-
-#, fuzzy
+msgstr "Dialog de eroare"
+
 msgid "Information dialog"
-msgstr "Detalii"
+msgstr "Dialog de informare"
 
 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Dialog de mail"
+
 msgid "Question dialog"
-msgstr "Dialog cerere"
-
-#, fuzzy
+msgstr "Dialog de interogare"
+
 msgid "Warning dialog"
-msgstr "Nivel de avertizare"
+msgstr "Dialog de avertizare"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Ce fel de dialog este acesta?"
+
 msgid "Status Icons"
-msgstr "Status pentru %s"
-
-#, fuzzy
+msgstr "Iconițe de status"
+
 msgid "Chatroom Emblems"
-msgstr "Opțiuni locale chat"
-
-#, fuzzy
+msgstr "Embleme de camere de chat"
+
 msgid "Dialog Icons"
-msgstr "Salvare avatar"
-
-#, fuzzy
+msgstr "Iconițe de dialog"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Control temă GTK+ Pidgin"
-
-#, fuzzy
+msgstr "Editor de teme de iconițe Pidgin"
+
 msgid "Contact"
-msgstr "Detalii contact"
-
-#, fuzzy
+msgstr "Contact"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Listă de contacte"
-
-#, fuzzy
+msgstr "Editor de teme pentru lista de contacte Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Listă de contacte"
+msgstr "Editare temă listă de contacte"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Editare temă de iconițe"
 
 #. *< type
 #. *< ui_requirement
@@ -14286,16 +14093,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Control temă GTK+ Pidgin"
+msgstr "Editor de teme Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Control temă GTK+ Pidgin"
+msgstr "Editor de teme Pidgin."
 
 #. *< type
 #. *< ui_requirement
@@ -14464,12 +14269,11 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opțiuni Pidgin specifice Windows."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Permite alegerea unor opțiuni Pidgin pentru Windows, precum atașarea listei "
-"de contacte."
+"Permite alegerea unor opțiuni specifice Pidgin pentru Windows, precum "
+"atașarea listei de contacte."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Deconectat.</font>"
@@ -14509,842 +14313,3 @@
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."
 
-#~ msgid "Cannot open socket"
-#~ msgstr "Nu s-a putut deschide un socket"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Nu se poate asculta pe socket"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Nu se poate citi din socket"
-
-#~ msgid "Connection failed."
-#~ msgstr "Conexiunea a eșuat."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "Serverul s-a deconectat"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Nu s-a putut crea un socket"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Conectarea la server a eșuat"
-
-#~ msgid "Read error"
-#~ msgstr "Eroare la citire"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nu s-a putut face o conexiune cu serverul:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "Eroare la scriere"
-
-#~ msgid "Last Activity"
-#~ msgstr "Ultima activitate"
-
-#~ msgid "Service Discovery Info"
-#~ msgstr "Detalii servicii descoperite"
-
-#~ msgid "Service Discovery Items"
-#~ msgstr "Servicii descoperite"
-
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Adresare „stanza” extinsă"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "Chat cu mai mulți utilizatori"
-
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr ""
-#~ "Detalii suplimentare despre prezența într-un chat cu mai mulți "
-#~ "utilizatori."
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Comenzi ad-hoc"
-
-#~ msgid "PubSub Service"
-#~ msgstr "Serviciu PubSub"
-
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "Fluxuri de date SOCKS5"
-
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#, fuzzy
-#~ msgid "In-Band Registration"
-#~ msgstr "Eroare la înregistrare"
-
-#~ msgid "User Location"
-#~ msgstr "Loc utilizator"
-
-#~ msgid "User Avatar"
-#~ msgstr "Avatar utilizator"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "Notificări de stări pentru chat"
-
-#~ msgid "Software Version"
-#~ msgstr "Versiune de software"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "Inițializare flux de date"
-
-#~ msgid "User Mood"
-#~ msgstr "Dispoziția utilizatorului"
-
-#~ msgid "User Activity"
-#~ msgstr "Acitivatea utilizatorului"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "Facilitățile entității"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "Negocieri sesiuni criptate"
-
-#~ msgid "User Tune"
-#~ msgstr "Piesă utilizator"
-
-#, fuzzy
-#~ msgid "Roster Item Exchange"
-#~ msgstr "IM cu schimb de chei"
-
-#, fuzzy
-#~ msgid "Reachability Address"
-#~ msgstr "Adresă de mail"
-
-#~ msgid "User Profile"
-#~ msgstr "Profil utilizator"
-
-#, fuzzy
-#~ msgid "Jingle"
-#~ msgstr "Intră"
-
-#~ msgid "User Nickname"
-#~ msgstr "Pseudonim utilizator"
-
-#, fuzzy
-#~ msgid "Jingle Video"
-#~ msgstr "Video în direct"
-
-#~ msgid "Message Receipts"
-#~ msgstr "Confirmări mesaje"
-
-#, fuzzy
-#~ msgid "Public Key Publishing"
-#~ msgstr "Amprentă silabică cheie publică"
-
-#, fuzzy
-#~ msgid "User Chatting"
-#~ msgstr "Opțiuni personale"
-
-#, fuzzy
-#~ msgid "User Browsing"
-#~ msgstr "Moduri utilizator"
-
-#, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Nume utilizator"
-
-#, fuzzy
-#~ msgid "User Viewing"
-#~ msgstr "Limită utilizatori"
-
-#, fuzzy
-#~ msgid "Stanza Encryption"
-#~ msgstr "Criptare Trillian"
-
-#~ msgid "Delayed Delivery"
-#~ msgstr "Livrare întârziată"
-
-#~ msgid "File Repository and Sharing"
-#~ msgstr "Repozitorii de fișiere și partajare"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "Negociere sesiune de criptare simplificată"
-
-#~ msgid "Hop Check"
-#~ msgstr "Verificare hopuri"
-
-#~ msgid "Read Error"
-#~ msgstr "Eroare la citire"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Conectarea la server a eșuat."
-
-#~ msgid "Unparseable message"
-#~ msgstr "Nu se poate prelucra mesajul"
-
-#, fuzzy
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Conectarea la server a eșuat"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Autentificare eșuată (%s)."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr ""
-#~ "Ați fost deconectat(ă) pentru că v-ați autentificat de pe o altă stație."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Eroare: suportul SSL nu este instalat."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Parolă incorectă."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Conectarea la serverul BOS a eșuat:\n"
-#~ "%s"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "S-ar putea să fiți în scurt timp deconectat(ă). Vizitați %s pentru "
-#~ "actualizări."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Conectare eșuată"
-
-#~ msgid "Invalid username."
-#~ msgstr "Nume invalid de utilizator"
-
-#, fuzzy
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Nu s-au putut obține detalii despre server"
-
-#~ msgid "Connection lost"
-#~ msgstr "Conexiune pierdută"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Nu s-a putut rezolva numele calculatorului"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Conexiune terminată (la scriere)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Conexiune resetată"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Eroare la citirea din socket: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Conectarea la server a eșuat"
-
-#~ msgid "Could not write"
-#~ msgstr "Nu s-a putut scrie"
-
-#~ msgid "Could not connect"
-#~ msgstr "Conectare eșuată"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Nu s-a putut crea un socket de ascultare"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Nu s-a putut rezolva numele calculatorului"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "Parolă greșită"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nu s-a putut face o conexiune cu %s:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japonia"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Server pager Japonia"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Server transfer de fișiere Japonia"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "S-a pierdut conexiunea cu serverul\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Nu s-a putut rezolva numele serverului"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel "
-#~ "de suport TLS/SSL."
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Ascundere ferestre de discuții"
-
-#~ msgid "More Data needed"
-#~ msgstr "E nevoie de mai multe date"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Alegeți o combinație de semne de asociat acestei iconițe."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Selectați o imagine pentru această iconiță."
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Ce identitate doriți să activați?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "Culoare cursor"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Culoare cursor secundar"
-
-#~ msgid "Interface colors"
-#~ msgstr "Culori interfață"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Mărimi widget-uri"
-
-#~ msgid "Invite message"
-#~ msgstr "Mesaj de invitare"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Introduceți numele utilizatorului pe care doriți să-l invitați.\n"
-#~ "Puteți adăuga un mesaj de invitare opțional."
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Nu s-a putut descărca cartea de adrese MSN"
-
-#~ msgid "Looking up %s"
-#~ msgstr "Caut %s"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Conectarea la %s a eșuat"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Autentificare: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Nu se poate scrie fișierul %s."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Nu se poate citi fișierul %s."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "Mesaj prea lung, ultimii %s octeți au fost trunchiați."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s nu este autentificat momentan."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Atenționarea lui %s nu este permisă."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr ""
-#~ "Un mesaj s-a pierdut, ați depășit limita de viteză fixată de server."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "Chat-ul în %s nu este disponibil."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "Trimiteți mesajele prea rapid pentru %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "Ați pierdut un mesaj de la %s pentru că era prea mare."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "Ați pierdut un mesaj de la %s pentru că a fost trimis prea repede."
-
-#~ msgid "Failure."
-#~ msgstr "Eșec."
-
-#~ msgid "Too many matches."
-#~ msgstr "Prea multe potriviri."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "E nevoie de mai multe atribute."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Serviciul „Dir” este temporar indisponibil."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "Căutarea după adresa de mail este restricționată."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Cuvântul-cheie a fost ignorat."
-
-#~ msgid "No keywords."
-#~ msgstr "Fără cuvinte-cheie."
-
-#~ msgid "User has no directory information."
-#~ msgstr "Nu există informații detaliate în director."
-
-#~ msgid "Country not supported."
-#~ msgstr "Nu există suport de țară."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Eșec necunoscut: %s."
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "Nume de utilizator sau parolă incorecte."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "Serviciul este temporar indisponibil."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "Nivelul propriu de avertizare este prea ridicat pentru a vă putea "
-#~ "autentifica."
-
-#~ 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 ""
-#~ "V-ați conectat și deconectat de prea multe ori. Așteptați zece minute și "
-#~ "încercați din nou. Dacă veți continua să încercați, va trebui să "
-#~ "așteptați chiar mai mult."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Eroare necunoscută la autentificare: %s."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Eroare necunoscută: %d. Detalii: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Grup invalid"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Conectare terminată"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "Aștept răspunsul..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC a revenit din așteptare. Puteți trimite mesaje din nou."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Parola a fost schimbată cu succes"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Descărcare detalii „Dir”"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Introducere detalii „Dir”"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Nu s-a putut deschide %s pentru scriere!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Transferul fișierului a eșuat, celălalt utilizator probabil l-a anulat."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Conectarea pentru transfer a eșuat."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr ""
-#~ "Nu s-a putut scrie antetul fișierului. Fișierul nu va fi transferat."
-
-#~ msgid "Save As..."
-#~ msgstr "Salvare ca..."
-
-#~ 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 cere lui %s să accepte %d fișier: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s cere lui %s să accepte %d fișiere: %s (%.2f %s)%s%s"
-#~ msgstr[2] "%s cere lui %s să accepte %d de fișiere: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s vă cere să-i trimiteți un fișier"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "Modul de protocol TOC"
-
-#~ msgid "%s Options"
-#~ msgstr "Opțiuni %s"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Opțiuni proxy"
-
-#~ msgid "By log size"
-#~ msgstr "După mărimea înregistrărilor"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Deschide adresa în navigator"
-
-#~ msgid "ST_UN server:"
-#~ msgstr "Server ST_UN:"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "_Imagine iconiță simbolică"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "Combinație de _taste asociată"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "_Evidențiază fereastra la primirea de mesaje noi"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "S-ar putea să fiți rapid deconectat(ă). Poate doriți să încercați TOC "
-#~ "până ce se rezolvă această problemă. Vizitați %s pentru actualizări."
-
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de o secundă)"
-#~ msgstr[1] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de %d secunde)"
-#~ msgstr[2] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de %d de secunde)"
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Adaugă contact"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Nu s-au putut obține detalii despre server"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Eroare „keep alive”"
-
-#, fuzzy
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "S-a pierdut conexiunea cu serverul:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Server de conectare"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Nu s-a putut trimite mesajul."
-
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Ați fost adăugat cu identitatea %d în grupul „%d”"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Detaliile utilizatorului %s nu sunt disponibile"
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "Există deja un grup cu acest nume."
-
-#~ msgid "Primary Information"
-#~ msgstr "Informații de bază"
-
-#~ msgid "Blood Type"
-#~ msgstr "Grupă sanguină"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Actualizare detalii proprii"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Viteză:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "Alegerea unui avatar personalizat nu este suportată deocamdată. Alegeți o "
-#~ "imagine de la %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Avatar QQ invalid"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Ați respins cererea făcută de %d"
-
-#~ msgid "Reject request"
-#~ msgstr "Respinge cererea"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Adaugă contactul cu cereri eșuate de autorizare"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Nu s-a putut încărca lista de contacte"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "Număr QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Descriere grup"
-
-#~ msgid "Auth"
-#~ msgstr "Autorizare"
-
-#~ msgid "Approve"
-#~ msgstr "Aprobă"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "Cererea de a vă alătura grupului %d v-a fost respinsă de adminul %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "[%d] a părăsit grupul „%d”"
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Ați fost adăugat cu identitatea %d în grupul „%d”"
-
-#~ msgid "I am a member"
-#~ msgstr "Sunt un membru"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Cerere invalidă"
-
-#~ msgid "I am the admin"
-#~ msgstr "Sunt admin"
-
-#~ msgid "Unknown status"
-#~ msgstr "Status necunoscut"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Ștergere grup"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Ați introdus un ID de grup prea mic sau prea mare"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Sigur doriți să părăsiți acest Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Doriți să aprobați cererea?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Telefon"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Detalii chat"
-
-#~ msgid "System Message"
-#~ msgstr "Mesaj de sistem"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>IP-ul ultimei autentificări</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Ultima autentificare</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Introducere detalii proprii"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Ieșire din acest QQ Qun"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Blochează acest contact"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Eroare la schimbarea parolei"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Conectarea la server a eșuat."
-
-#, fuzzy
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr ""
-#~ "Eroare de conectare de la serverul %s:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Doriți să aprobați cererea?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Doriți să adăugați acest contact?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s v-a adăugat în lista sa de contacte cu identitatea %s"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Contact"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s dorește să vă adauge în listă cu identitatea %s"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s nu este în lista dumneavoastră de contacte"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Doriți să îl adăugați?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Port server"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Deconectat la distanță"
-
-#~ msgid "developer"
-#~ msgstr "programator"
-
-#~ msgid "XMPP developer"
-#~ msgstr "programator XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Designeri"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Versiunea utilizată este %s versiunea %s. Ultima versiune este %s. O "
-#~ "puteți obține de la <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Noutăți:</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "EOF la citirea de la procesul „resolver”"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Detaliile v-au fost actualizate"
-
-#~ msgid "Input your reason:"
-#~ msgstr "Precizați motivul:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Ați șters cu succes utilizatorul"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "V-ați șters cu succes din lista contactului"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "Ați adăugat contactul %d în lista de contacte"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "QQid invalid"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Introduceți ID-ul grupului extern"
-
-#~ msgid "Reason: %s"
-#~ msgstr "Motiv: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr "Cererea de a vă alătura grupului %d v-a fost aprobată de adminul %d"
-
-#~ msgid "I am applying to join"
-#~ msgstr "Solicit înscrierea"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Ați părăsit cu succes grupul"
-
-#~ msgid "QQ Group Auth"
-#~ msgstr "Autorizare grup QQ"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "Operațiunea de autorizare a fost acceptată de serverul QQ"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Precizați motivul:"
-
-#, fuzzy
-#~ msgid " Space"
-#~ msgstr "Salvează"
-
-#, fuzzy
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>IP server</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Arată informațiile de autentificare"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Autentificare eșuată. Verificați înregistrările de depanare"
-
-#, fuzzy
-#~ msgid "Failed room reply"
-#~ msgstr "Autentificare eșuată, nici un răspuns"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "%s v-a respins cererea"
-
-#~ msgid "User %s approved your request"
-#~ msgstr "%s v-a aprobat cererea"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Anunț de la: %s"
-
-#~ msgid "Error setting socket options"
-#~ msgstr "Eroare la introducerea opțiunilor socket-ului"
-
-#~ msgid ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-#~ msgstr ""
-#~ "Autentificare Windows Live ID: nu s-a găsit un „token” de autentificare "
-#~ "în răspunsul de la server"
-
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Autentificarea Windows Live ID a eșuat!"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "Prea periculos (expeditorul)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "Prea periculos (destinatarul)"
-
-#~ msgid "Available Message"
-#~ msgstr "Mesaj ce arată disponibilitatea"
-
-#~ msgid "Away Message"
-#~ msgstr "Mesaj în absență"
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr "<i>(se descarcă)</i>"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "Cod [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Eroare de operare asupra grupului"
-
-#~ msgid "TCP Address"
-#~ msgstr "Adresă TCP"
-
-#~ msgid "UDP Address"
-#~ msgstr "Adresă UDP"
--- a/po/ru.po	Wed Aug 12 02:24:41 2009 +0000
+++ b/po/ru.po	Thu Aug 13 19:56:23 2009 +0000
@@ -3,14 +3,14 @@
 # Sergey Volozhanin <svo@asplinux.ru>, 2001.
 # Alexandre Prokoudine <avp@altlinux.ru>, 2003, 2004.
 # Dmitry Beloglazov <dmaa@users.sf.net>, 2004-2008.
-# Антон Самохвалов <samant.ua@mail.ru>, 2008.
+# Антон Самохвалов <samant.ua@mail.ru>, 2008-2009.
 #
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-12 21:00-0700\n"
+"POT-Creation-Date: 2009-08-02 15:45-0700\n"
 "PO-Revision-Date: 2008-05-14 15:00+0400\n"
 "Last-Translator: Антон Самохвалов <samant.ua@mail.ru>\n"
 "Language-Team: \n"
@@ -29,7 +29,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Наберите `%s -h' для получения дополнительной информации.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -44,7 +44,7 @@
 "Использование: %s [КЛЮЧ]...\n"
 "\n"
 "  -c, --config=КАТ    использовать каталог КАТ для файлов конфигурации\n"
-"  -d, --debug         выводить отладочную информацию в stderr\n"
+"  -d, --debug         вывести отладочную информацию в stderr\n"
 "  -h, --help          показать эту справку и выйти\n"
 "  -n, --nologin       не входить автоматически\n"
 "  -v, --version       показать текущую версию и выйти\n"
@@ -99,7 +99,6 @@
 msgstr "Псевдоним:"
 
 #. Register checkbox
-#, fuzzy
 msgid "Create this account on the server"
 msgstr "Создать эту учётную запись на сервере"
 
@@ -412,9 +411,8 @@
 msgid "View Log..."
 msgstr "Просмотреть журнал..."
 
-#, fuzzy
 msgid "View All Logs"
-msgstr "Просмотреть все заметки журнала"
+msgstr "Просмотреть все журналы"
 
 msgid "Show"
 msgstr "Показывать"
@@ -469,9 +467,8 @@
 msgid "X.509 certificate import failed"
 msgstr "Внесение сертификата X.509 провалилось"
 
-#, fuzzy
 msgid "Select a PEM certificate"
-msgstr "Выбрать \"PEM\"-сертификат"
+msgstr "Выбрать PEM-сертификат"
 
 #, c-format
 msgid ""
@@ -580,7 +577,6 @@
 msgid "That command doesn't work on this protocol."
 msgstr "Эта команда не работает с этим протоколом."
 
-#, fuzzy
 msgid "Message was not sent, because you are not signed on."
 msgstr "Сообщение не было отправлено, потому что вы не подписались."
 
@@ -628,7 +624,6 @@
 msgid "Add Buddy Pounce..."
 msgstr "Добавить правило для собеседника..."
 
-#, fuzzy
 msgid "Invite..."
 msgstr "Пригласить..."
 
@@ -641,7 +636,7 @@
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
 msgstr[0] "Список %d пользователя:\n"
@@ -751,7 +746,7 @@
 msgid "Pause"
 msgstr "Пауза"
 
-#, fuzzy, c-format
+#, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
 msgstr[0] "Передача файлов - %d%% из %d файла"
@@ -871,16 +866,14 @@
 msgid "Conversations with %s"
 msgstr "Беседы с %s"
 
-#, fuzzy
 msgid "All Conversations"
 msgstr "Все беседы"
 
 msgid "System Log"
 msgstr "Системный журнал"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "Вызов..."
+msgstr "Идёт вызов ... "
 
 msgid "Hangup"
 msgstr "Приостановить разговор"
@@ -906,9 +899,8 @@
 msgid "%s is trying to start an unsupported media session type with you."
 msgstr "%s пытается начать с вами медиа сеанс неподдерживаемого типа."
 
-#, fuzzy
 msgid "You have rejected the call."
-msgstr "Вы покинули канал%s%s"
+msgstr "Вы отклонили звонок."
 
 msgid "call: Make an audio call."
 msgstr "звонок: Совершите звуковой звонок."
@@ -1104,10 +1096,10 @@
 msgid "You do not have any accounts."
 msgstr "У вас нет ни одной учётной записи."
 
-#, fuzzy
 msgid "You must create an account first before you can create a pounce."
 msgstr ""
-"Перед тем, как создавать правило, вы должны сперва создать учётную запись."
+"Вы должны сперва создать учётную запись, а потом уже сможете создавать "
+"правило."
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
@@ -1669,7 +1661,7 @@
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr "Разовая проверка сертификата"
+msgstr "Проверка одноразового сертификата"
 
 #. Scheme name
 #. Pool name
@@ -1693,6 +1685,44 @@
 msgid "_View Certificate..."
 msgstr "_Просмотреть сертификат..."
 
+#, 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\", а должен быть от \"%s\".Это может "
+"означать, что вы полключены не туда куда вы думаете."
+
+#. 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-сертификата"
+
+msgid "Invalid certificate chain"
+msgstr "Неверная цепочка сертификатов"
+
+#. 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 ""
+"У вас нет базы данных корневых сертификатов, так что этот сертификат не "
+"может быть проверен на целостность."
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1703,29 +1733,11 @@
 "Сертификат, представленный \"%s\", является самоподписанным. Он не может "
 "быть автоматически проверен."
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Цепочка сертификатов, представленная для %s, некорректна."
 
-#. 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-сертификата"
-
-msgid "Invalid certificate chain"
-msgstr "Неверная цепочка сертификатов"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"У вас нет базы данных корневых сертификатов, так что этот сертификат не "
-"может быть проверен на целостность."
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1745,18 +1757,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "Неверная авторская подпись сертификата"
 
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Этот сертификат представлен \"%s\", а должен быть от \"%s\".Это может "
-"означать, что вы полключены не туда куда вы думаете."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1793,7 +1793,7 @@
 msgstr "+++ %s вышел"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
@@ -1840,9 +1840,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s вышел из комнаты (%s)."
 
-#, fuzzy
 msgid "Invite to chat"
-msgstr "Пригласить в конференцию"
+msgstr "Пригласить к переписке"
 
 #. Put our happy label in it.
 msgid ""
@@ -1982,9 +1981,9 @@
 msgid "Starting transfer of %s from %s"
 msgstr "Запуск передачи %s от %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "Передача файла %s завершена"
+msgstr "Передача файла <A HREF=\"file://%s\">%s</A> завершена"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -2201,9 +2200,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#, fuzzy
 msgid "Error creating conference."
-msgstr "Ошибка создания соединения"
+msgstr "Ошибка создания конференции"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2220,11 +2218,11 @@
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Несоответствие версии ABI %d.%d.x (необходима %d.%d.x)"
 
-#, fuzzy
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
 msgstr ""
-"Модуль не реализует всех требуемых функций (список _иконок, вход и закрытие)"
+"Модуль не осуществляет всех требуемых функций (список_значков, вход и "
+"закрытие)"
 
 #, c-format
 msgid ""
@@ -2244,7 +2242,7 @@
 msgid "Unable to load your plugin."
 msgstr "Не удаётся загрузить ваш модуль."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s требует %s, но его не удалось выгрузить."
 
@@ -2307,9 +2305,8 @@
 "файлов\n"
 "(только при отсутствии беседы с отправителем)"
 
-#, fuzzy
 msgid "Create a new directory for each user"
-msgstr "Выберите каталог пользователей для поиска"
+msgstr "Создайте для каждого пользователя новую папку"
 
 msgid "Notes"
 msgstr "Заметки"
@@ -2611,7 +2608,6 @@
 "журналов."
 
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2619,7 +2615,7 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"При просмотре журналов этот модуль вставит журналы из других клиентов "
+"При просмотре журналов этот модуль внедрит журналы из других клиентов "
 "мгновенных сообщений. На текущий момент это включает Адиум, MSN Messenger, "
 "aMSN и Триллиан.\n"
 "\n"
@@ -2670,13 +2666,12 @@
 msgstr ""
 "Сохранить сообщения, отправленные пользователю \"не в сети\", как правило."
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"Остальные сообщения будут сохранены как правила. Вы можете их изменять или "
-"удалять в окне `Правила для собеседников'"
+"Остальные сообщения будут сохранены как правила. Вы можете их изменить или "
+"удалить в диалоговом окне `Правила для собеседников'"
 
 #, c-format
 msgid ""
@@ -2705,9 +2700,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "Не спрашивать. Всегда сохранять в правило."
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "Введите пароль"
+msgstr "Одноразовый пароль"
 
 #. *< type
 #. *< ui_requirement
@@ -2926,17 +2920,15 @@
 "Невозможно обнаружить установку ActiveTCL. Если вы хотите использвать модули "
 "TCL, установите ActiveTCL из http://www.activestate.com\n"
 
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"Набор инструментов Apple Bonjour для Windows не был найден, смотрите ЧаВо на:"
+"Не могу найти набор инструментов Apple \"Bonjour для Windows\", смотрите "
 "http://d.pidgin.im/BonjourWindows для дополнительной информации."
 
-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "Не удаётся прослушивать входящие соединения\n"
+msgstr "Не удаётся прослушивать входящие соединения мгновенных сообщений"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2975,9 +2967,8 @@
 msgstr "Персона Purple"
 
 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Населённый пункт"
+msgstr "Локальный порт"
 
 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2989,25 +2980,20 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Не удаётся отправить сообщение, не удалось начать беседу."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"Не удаётся создать сокет:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Не удаётся создать сокет: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Не удалось связать сокет с портом"
-
-#, fuzzy, c-format
+msgstr "Не удалось связать сокет с портом: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"Не удаётся создать сокет:\n"
-"%s"
-
-#, fuzzy
+msgstr "Не удаётся прослушивать сокет: %s"
+
 msgid "Error communicating with local mDNSResponder."
-msgstr "Ошибка связи с местным mDNSResponder."
+msgstr "Ошибка связи с местным mDNSResponder'ом."
 
 msgid "Invalid proxy settings"
 msgstr "Неверные настройки прокси"
@@ -3032,9 +3018,9 @@
 msgid "Buddylist saved successfully!"
 msgstr "Список собеседников сохранён успешно!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "Не удалось записать список собеседников для %s в %s"
+msgstr "Не могу записать список собеседников для %s в %s"
 
 msgid "Couldn't load buddylist"
 msgstr "Не удалось загрузить список собеседников"
@@ -3051,17 +3037,16 @@
 msgid "Load buddylist from file..."
 msgstr "Загрузить список собеседников из файла..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Заполните поля регистрационной формы."
-
-#, fuzzy
+msgstr "Вы должны заполнить все регистрационные поля"
+
 msgid "Passwords do not match"
-msgstr "Пароли не совпадают."
-
-#, fuzzy
+msgstr "Пароли не совпадают"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Не удаётся зарегистрировать новую учётную запись. Произошла ошибка.\n"
+msgstr ""
+"Не удаётся зарегистрировать новую учётную запись.  Произошла неизвестная "
+"ошибка."
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Новая учётная запись Gadu-Gadu зарегистрирована"
@@ -3076,11 +3061,10 @@
 msgstr "Пароль (ещё раз)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Введите анти-бот текст"
+
 msgid "Captcha"
-msgstr "Захватить изображение"
+msgstr "Анти-бот"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Зарегистрировать новую учётную запись Gadu-Gadu"
@@ -3221,7 +3205,7 @@
 
 #, fuzzy, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Не удаётся соединиться с сервером."
+msgstr "Не удаётся утвердить имя хоста '%s': %s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3234,9 +3218,8 @@
 msgid "This chat name is already in use"
 msgstr "Это имя чата уже используется"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "Нет соединения с сервером."
+msgstr "Не подсоединён к серверу"
 
 msgid "Find buddies..."
 msgstr "Найти собеседников..."
@@ -3277,9 +3260,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Пользователь Gadu-Gadu"
 
-#, fuzzy
 msgid "GG server"
-msgstr "Получение сервера"
+msgstr "GG сервер"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3295,9 +3277,8 @@
 msgid "File Transfer Failed"
 msgstr "Не удалось произвести передачу файлов"
 
-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "Не удалось открыть порт для прослушивания."
+msgstr "Не удалось открыть прослушиваемый порт."
 
 msgid "Error displaying MOTD"
 msgstr "Ошибка отображения MOTD"
@@ -3319,11 +3300,9 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"Соединение с сервером потеряно:\n"
-"%s"
+msgstr "Потеряно соединение с сервером: %s"
 
 msgid "View MOTD"
 msgstr "Просмотреть MOTD"
@@ -3345,13 +3324,13 @@
 msgstr "Не удаётся установить соединение"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Не удаётся соединиться с %s"
-
-#, fuzzy, c-format
+msgstr "Не удаётся соединиться с: %s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "Сервер разорвал соединение."
+msgstr "Сервер закрыл соединение"
 
 msgid "Users"
 msgstr "Пользователи"
@@ -3405,13 +3384,12 @@
 msgid "Ban on %s by %s, set %s ago"
 msgstr "Запрет для %s от %s, установлен %s назад"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Ban on %s"
-msgstr "Запрет для %s"
-
-#, fuzzy
+msgstr "Запрет на %s"
+
 msgid "End of ban list"
-msgstr "Конец списке запретов"
+msgstr "Конец списка запретов"
 
 #, c-format
 msgid "You are banned from %s."
@@ -3536,13 +3514,12 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "Это имя чата уже используется"
-
-#, fuzzy
+msgstr "Псевдоним \"%s\" уже используется."
+
 msgid "Nickname in use"
-msgstr "Псевдоним"
+msgstr "Псевдоним используется"
 
 msgid "Cannot change nick"
 msgstr "Не удаётся изменить псевдоним"
@@ -3673,9 +3650,8 @@
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Послать команду для nickserv"
 
-#, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "отметьте &lt;target&lt;:  Отправить заметку пользователю или каналу."
+msgstr "заметка &lt;target&lt;:  Отправить заметку пользователю или каналу."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3786,13 +3762,11 @@
 msgid "execute"
 msgstr "выполнить"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "Сервер требует TLS/SSL для входа. Поддержка TLS/SSL не найдена."
-
-#, fuzzy
+msgstr "Сервер требует TLS/SSL, но поддержка TLS/SSL не была найдена."
+
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "Вы потребовали шифрование, но поддержка TLS/SSL не найдена."
+msgstr "Вы требуете шифрования, но поддержка TLS/SSL не найдена."
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
@@ -3809,13 +3783,11 @@
 msgid "Plaintext Authentication"
 msgstr "Аутентификация простым текстом"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Аутентификация завершилась неудачно"
-
-#, fuzzy
+msgstr "Аутентификация SASL провалилась"
+
 msgid "Invalid response from server"
-msgstr "Неверный отклик от сервера."
+msgstr "Неверный отклик от сервера"
 
 msgid "Server does not use any supported authentication method"
 msgstr "Сервер не использует ни одного поддерживаемого метода аутентификации"
@@ -3826,36 +3798,28 @@
 msgid "Invalid challenge from server"
 msgstr "Неверный запрос с сервера"
 
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "Ошибка SASL"
+msgstr "Ошибка SASL: %s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "Управление соединениями BOSH прервало ваш сеанс."
+
 msgid "No session ID given"
-msgstr "Причина не указана"
-
-#, fuzzy
+msgstr "Не предоставлен ID сеанса"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Неподдерживаемая версия"
-
-#, fuzzy
+msgstr "Неподдерживаемая версия протокола BOSH"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"Не удалось установить соединение с сервером:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Не удалось установить соединение с сервером"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Не удалось установить соединение с сервером:\n"
-"%s"
-
-#, fuzzy
+msgstr "Не удалось установить соединение с сервером: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Не удаётся инициализировать соединение"
+msgstr "Не удаётся установить SSL соединение"
 
 msgid "Full Name"
 msgstr "Полное имя"
@@ -3872,6 +3836,11 @@
 msgid "Street Address"
 msgstr "Адрес"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Дополнительный адрес"
 
@@ -3922,9 +3891,8 @@
 msgid "Operating System"
 msgstr "Операционная система"
 
-#, fuzzy
 msgid "Local Time"
-msgstr "Локальный файл:"
+msgstr "Местное время"
 
 msgid "Priority"
 msgstr "Приоритет"
@@ -3936,9 +3904,8 @@
 msgid "%s ago"
 msgstr ""
 
-#, fuzzy
 msgid "Logged Off"
-msgstr "В сети"
+msgstr "Вышел из сети"
 
 msgid "Middle Name"
 msgstr "Отчество"
@@ -3961,14 +3928,12 @@
 msgid "Temporarily Hide From"
 msgstr "Временно скрыться от"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Отменить уведомление о присутствии"
 
 msgid "(Re-)Request authorization"
 msgstr "(Повторно) Запросить авторизацию"
 
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4108,17 +4073,14 @@
 msgid "Find Rooms"
 msgstr "Искать комнаты"
 
-#, fuzzy
 msgid "Affiliations:"
-msgstr "Псевдоним:"
-
-#, fuzzy
+msgstr "Членства:"
+
 msgid "No users found"
-msgstr "Пользователи не найдены"
-
-#, fuzzy
+msgstr "Пользователей не найдено"
+
 msgid "Roles:"
-msgstr "Должность"
+msgstr "Роли:"
 
 #, fuzzy
 msgid "Ping timed out"
@@ -4206,10 +4168,6 @@
 msgid "Change Registration"
 msgstr "Изменить регистрацию"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "Не удалось соединиться с сервером."
-
 msgid "Error unregistering account"
 msgstr "Ошибка отмены регистрации учётной записи"
 
@@ -5254,6 +5212,18 @@
 msgid "Unable to Add"
 msgstr "Не могу Добавить"
 
+msgid "Authorization Request Message:"
+msgstr "Сообщение запроса авторизации:"
+
+msgid "Please authorize me!"
+msgstr "Пожалуйста, авторизируйте меня!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
+
 msgid "Error retrieving profile"
 msgstr "Ошибка загрузки профиля"
 
@@ -5456,6 +5426,7 @@
 msgid "Unable to add user"
 msgstr "Не удаётся добавить пользователя"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Неизвестная ошибка (%d)"
@@ -6694,12 +6665,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Введите шестизначное число с цифрового экранчика."
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
 msgid "Password sent"
 msgstr "Пароль отправлен"
 
@@ -6711,12 +6676,6 @@
 "Пожалуйста, авторизируйте меня, чтобы я мог добавить вас в свой список "
 "приятелей."
 
-msgid "Authorization Request Message:"
-msgstr "Сообщение запроса авторизации:"
-
-msgid "Please authorize me!"
-msgstr "Пожалуйста, авторизируйте меня!"
-
 msgid "No reason given."
 msgstr "Причина не указана."
 
@@ -9089,10 +9048,6 @@
 msgid "Connecting to SILC Server"
 msgstr "Соединение с сервером SILC"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "Не удалось загрузить пару ключей SILC"
-
 msgid "Out of memory"
 msgstr "Недостаточно памяти"
 
@@ -9936,14 +9891,9 @@
 msgid "The user's profile is empty."
 msgstr "Профиль пользователя пуст."
 
-#, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s отклонил ваше приглашение к конференции в комнату \"%s\" потому что \"%s"
-"\"."
-
-msgid "Invitation Rejected"
-msgstr "Приглашение отвергнуто"
+#, fuzzy, c-format
+msgid "%s has declined to join."
+msgstr "%s в сети."
 
 msgid "Failed to join chat"
 msgstr "Не удалось присоединиться к чату"
@@ -12059,14 +12009,6 @@
 msgid "File transfer _details"
 msgstr "_Подробности о передаче файлов"
 
-#. Pause button
-msgid "_Pause"
-msgstr "_Пауза"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Возобновить"
-
 msgid "Paste as Plain _Text"
 msgstr "Вставить как простой _текст"
 
@@ -13488,6 +13430,9 @@
 msgid "_Open Mail"
 msgstr "Открыть _почту"
 
+msgid "_Pause"
+msgstr "_Пауза"
+
 #, fuzzy
 msgid "_Edit"
 msgstr "Р_едактировать"
@@ -14372,10 +14317,13 @@
 msgid "Founder"
 msgstr "Громко"
 
+#. A user in a chat room who has special privileges.
 #, fuzzy
 msgid "Operator"
 msgstr "Opera"
 
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr ""
 
@@ -14666,6 +14614,26 @@
 msgstr "Этот модуль полезен для отладки XMPP серверов или клиентов."
 
 #, fuzzy
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "Не удалось соединиться с сервером."
+
+#, fuzzy
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "Не удалось загрузить пару ключей SILC"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr ""
+#~ "%s отклонил ваше приглашение к конференции в комнату \"%s\" потому что \"%"
+#~ "s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Приглашение отвергнуто"
+
+#~ msgid "_Resume"
+#~ msgstr "_Возобновить"
+
+#, fuzzy
 #~ msgid "_Proxy"
 #~ msgstr "Прокси"
 
--- a/po/sl.po	Wed Aug 12 02:24:41 2009 +0000
+++ b/po/sl.po	Thu Aug 13 19:56:23 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?"
 
--- a/po/zh_HK.po	Wed Aug 12 02:24:41 2009 +0000
+++ b/po/zh_HK.po	Thu Aug 13 19:56:23 2009 +0000
@@ -1,11 +1,14 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.19 2008/08/24 21:23:04 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.20 2009/08/04 05:20:24 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2008, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2008, Ambrose C. Li <acli@ada.dhs.org>
+# Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li@gmail.com>
+#
+# PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
+# LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.562 2009/02/27 04:50:13 acli Exp $
+# $InternalId: zh_TW.po,v 1.594 2009/08/06 05:26:27 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -19,7 +22,7 @@
 #        screen name 和 user name 在意義上是沒有分別的!
 # 理據如下
 # (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
-# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the Pidgin-devel mailing list.  (I'm unhappy with the change.)
+# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
 # SILC問題:似乎臺灣和香港的「密碼學」術語相差甚遠,很頭痛 (^^;)
 # - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
@@ -49,10 +52,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.5\n"
+"Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-02-25 09:57-0500\n"
+"POT-Creation-Date: 2009-08-05 23:59-0700\n"
+"PO-Revision-Date: 2009-07-30 01:53-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
 "MIME-Version: 1.0\n"
@@ -637,11 +640,12 @@
 msgid "Message was not sent, because you are not signed on."
 msgstr "因為你並未登入,所以訊息無法送出:"
 
-# XXX 這是什麼?
+# NOTE 交談標題、使用者名稱、協定名稱
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
+# NOTE 交談標題、意義不明的單字元標
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
@@ -920,12 +924,12 @@
 msgid "System Log"
 msgstr "系統日誌"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "計算中..."
-
+msgstr "撥打中..."
+
+# NOTE 這是按鈕上的標籤
 msgid "Hangup"
-msgstr ""
+msgstr "掛斷"
 
 #. Number of actions
 msgid "Accept"
@@ -934,26 +938,28 @@
 msgid "Reject"
 msgstr "拒絕"
 
+#  XXX 暫譯 - acli 20090730
 msgid "Call in progress."
-msgstr ""
+msgstr "撥打中。"
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "通話已中斷。"
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
-
+msgstr "%s 希望與你進行語音通話。"
+
+# XXX 媒體? - acli 20090730
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s 嘗試與你以一種未獲支援的方式進行媒體通話。"
+
 msgid "You have rejected the call."
-msgstr "你離開了頻道%s%s"
-
+msgstr "你拒絕了通話。"
+
+# FIXME 暫譯,譯文有待改進 - acli 20090730
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call:語音通話。"
 
 msgid "Emails"
 msgstr "電子郵件"
@@ -1207,8 +1213,9 @@
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Never"
-msgstr "從不"
+msgstr "關閉此功能"
 
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
@@ -1232,7 +1239,7 @@
 msgstr "記錄所有的狀態改變"
 
 msgid "Report Idle time"
-msgstr "閒置時間基準(_R)"
+msgstr "閒置時間基準"
 
 msgid "Change status when idle"
 msgstr "閒置時更改狀態"
@@ -1303,7 +1310,7 @@
 msgstr "你在聊天室說話"
 
 msgid "Others talk in chat"
-msgstr "其他人進入聊天室"
+msgstr "其他人在聊天室說話"
 
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到你的帳號"
@@ -1361,8 +1368,9 @@
 
 # XXX: 務必 聽起來不太恰當。這裡是指 Enable Sound 的選項 - c9s, 08 Dec 27 12/27/2008
 # XXX 「務必」不只指 Enable Sound,也在其他地方用到,改譯「完全啟用」不行 - 20090226 acli
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Always"
-msgstr "務必"
+msgstr "啟動此功能"
 
 # NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
 msgid "Only when available"
@@ -1510,7 +1518,7 @@
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%s 在 %s 送出一個訊息給你。"
+msgstr "%s 在 %s 送出一個訊息給你"
 
 msgid "Buddy signs on/off"
 msgstr "好友登入/登出"
@@ -1620,22 +1628,27 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
-
+"\n"
+"取得 TinyURL 中..."
+
+# XXX 暫譯 - 20090729 acli
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
-
+msgstr "只在網址長度為這個數值或以上時才建立 TinyURL"
+
+# XXX 暫譯 - 20090729 acli
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "TinyURL(或同類型)網址前綴"
+
 msgid "TinyURL"
-msgstr "樂曲網址"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
-
+msgstr "TinyURL 模組"
+
+# NOTE 這個 copying 應係指人手抄寫,因為如果是在電腦上複製,無論網址長短,複製也應該不會有難易之分
+# XXX 暫譯 - 20090729 acli
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "當接收到含有網址的訊息時,使用 TinyURL 縮短網址,好方便抄寫"
 
 msgid "accounts"
 msgstr "帳號清單"
@@ -1692,9 +1705,9 @@
 
 # XXX 問題:
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
 # XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
 msgid "Unknown"
@@ -1751,6 +1764,44 @@
 msgid "_View Certificate..."
 msgstr "檢視證書(_V)"
 
+# FIXME 譯文不太通順 - acli 20070913
+#, 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」出示的證書聲稱它應該屬於「%s」,你目前可能的連線可能不是你心目中希望使"
+"用的服務。"
+
+#. 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 證書錯誤"
+
+msgid "Invalid certificate chain"
+msgstr "無效的證書鏈"
+
+#. 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 ""
+"無法核實這張證書,因為你沒有根證書機構證書 (root certificate) 的資料庫。"
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1759,28 +1810,11 @@
 "automatically checked."
 msgstr "「%s」出示的證書是自簽的,無法自動進行核實。"
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "「%s」出示的證書鍊是無效的。"
 
-#. 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 證書錯誤"
-
-msgid "Invalid certificate chain"
-msgstr "無效的證書鏈"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"無法核實這張證書,因為你沒有根證書機構證書 (root certificate) 的資料庫。"
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1798,19 +1832,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "證書機構的簽署是無效的"
 
-# FIXME 譯文不太通順 - acli 20070913
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"「%s」出示的證書聲稱它應該屬於「%s」,你目前可能的連線可能不是你心目中希望使"
-"用的服務。"
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1847,7 +1868,7 @@
 msgstr "+++ %s 登出"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -1894,10 +1915,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#, fuzzy
 msgid "Invite to chat"
-msgstr "邀請進入會議室"
+msgstr "邀請進入聊天室"
 
 #. Put our happy label in it.
 msgid ""
@@ -2040,6 +2059,10 @@
 msgstr "開始自 %2$s 傳送 %1$s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "檔案 <A HREF=\"file://%s\">%s</A> 傳送完畢"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
@@ -2236,9 +2259,9 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>:%s\n"
 
-#, fuzzy
+# FIXME 譯文有待改進 - acli 20090731
 msgid "Error creating conference."
-msgstr "連線開啟錯誤"
+msgstr "建立會議失敗。"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2663,7 +2686,6 @@
 
 # XXX 譯文有待改進(第二段) - 20061025
 #. * 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"
@@ -2672,7 +2694,7 @@
 "at your own risk!"
 msgstr ""
 "當瀏覽日誌時,這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 "
-"Adium、Fire、Messenger Plus!、MSN Messenger,以及 Trillian。\n"
+"Adium、Fire、Messenger Plus!、MSN Messenger、aMSN、以及 Trillian。\n"
 "\n"
 "注意:這個模組仍處於開發初期,因此可能經常當掉。如果使用,後果自負!"
 
@@ -2717,7 +2739,6 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "好友離線時,利用「好友狀態捕捉」功能儲存送出的訊息。"
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -2751,9 +2772,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問,務必使用「好友狀態捕捉」儲存離線訊息。"
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "輸入密碼"
+msgstr "一次性密碼"
 
 #. *< type
 #. *< ui_requirement
@@ -2762,13 +2782,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "一次性密碼支援"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "強制密碼只用一次"
 
 #. *  description
 msgid ""
@@ -2968,18 +2988,15 @@
 "找不到 ActiveTCL;如果打算使用 TCL 寫成的模組,請到 http://www.activestate."
 "com 下載及安裝 ActiveTCL。\n"
 
-# FIXME 沒有譯「toolkit」- 20071023 acli
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"找不到 Apple 的 Bonjour For Windows toolkit,詳情請到網址 http://d.pidgin.im/"
-"BonjourWindows 查閱 FAQ 部分。"
-
-#, fuzzy
+"找不到 Apple 的「Bonjour For Windows」工具,詳情請到網址 http://d.pidgin.im/"
+"BonjourWindows 查閱。"
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "無法接收連入的即時訊息連線\n"
+msgstr "無法監聽來訊的即時訊息連線"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3033,24 +3050,20 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息,交談無法開始。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"無法建立 Socket:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法建立 Socket:%s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "無法聯結 Socket 到通訊埠"
-
-#, fuzzy, c-format
+msgstr "無法連結 Socket 到通訊埠:%s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"無法建立 Socket:\n"
-"%s"
+msgstr "無法監聽 Socket:%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "和本地端的mDNSResponder溝通時發生錯誤"
+msgstr "和本地端的 mDNSResponder 溝通時發生錯誤"
 
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
@@ -3059,7 +3072,7 @@
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"對於你目前所設定的代理伺服器型態來說,你所指定的伺服器名稱及通訊埠是無效的"
+"對於你目前所設定的代理伺服器型態來說,你所指定的伺服器名稱或通訊埠是無效的。"
 
 msgid "Token Error"
 msgstr "符記錯誤"
@@ -3095,17 +3108,14 @@
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "填寫註冊資料欄位。"
-
-#, fuzzy
+msgstr "必需填妥所有註冊資料欄位"
+
 msgid "Passwords do not match"
-msgstr "新密碼並不相符。"
-
-#, fuzzy
+msgstr "兩個密碼並不相符"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "無法註冊新帳號。錯誤發生。\n"
+msgstr "無法註冊新帳號,錯誤原因不明。"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
@@ -3120,9 +3130,8 @@
 msgstr "舊密碼(再次確認)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "請輸入驗證圖片內的文字"
+
 msgid "Captcha"
 msgstr "驗證圖片"
 
@@ -3265,9 +3274,9 @@
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "無法連線到伺服器。"
+msgstr "無法解析主機名稱「%s」:%s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3280,9 +3289,8 @@
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "尚未連線到伺服器。"
+msgstr "尚未連線到伺服器"
 
 msgid "Find buddies..."
 msgstr "尋找好友..."
@@ -3323,9 +3331,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
-#, fuzzy
 msgid "GG server"
-msgstr "設定使用者資訊..."
+msgstr "Gadu-Gadu 伺服器"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3341,7 +3348,6 @@
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "無法開啟監聽埠。"
 
@@ -3365,11 +3371,9 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"與伺服器之間的連線突然中斷:\n"
-"%s"
+msgstr "與伺服器之間的連線突然中斷:%s"
 
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
@@ -3380,9 +3384,8 @@
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC 網名不可含有空白字符"
+msgstr "IRC 網名和伺服器名稱均不可含有空白字符"
 
 # XXX 暫譯
 msgid "SSL support unavailable"
@@ -3392,13 +3395,13 @@
 msgstr "無法連線"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "無法連線到「%s」"
-
-#, fuzzy, c-format
+msgstr "無法連線:%s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "伺服器關閉連線。"
+msgstr "伺服器關閉了連線"
 
 msgid "Users"
 msgstr "使用者"
@@ -3590,13 +3593,12 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "聊天室名稱正在使用中"
-
-#, fuzzy
+msgstr "網名「%s」已在使用中。"
+
 msgid "Nickname in use"
-msgstr "網名"
+msgstr "網名已在使用中"
 
 msgid "Cannot change nick"
 msgstr "無法更改網名"
@@ -3833,13 +3835,11 @@
 msgid "execute"
 msgstr "執行"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
-
-#, fuzzy
+msgstr "伺服器要求使用 TLS/SSL,但找不到 TLS/SSL 支援。"
+
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "你指定必須加密,但找不到 TLS/SSL 支援。"
+msgstr "你要求加密,但找不到 TLS/SSL 支援。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
@@ -3853,57 +3853,44 @@
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "認證失敗"
-
-#, fuzzy
+msgstr "SASL 認證失敗"
+
 msgid "Invalid response from server"
-msgstr "伺服器送來了無效的回應。"
+msgstr "伺服器送來了無效的回應"
 
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr "你指定必須加密,但這伺服器沒有加密功能。"
+msgstr "你要求加密,但這伺服器沒有加密功能。"
 
 # XXX 好像有些怪,譯文有待改進
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL 錯誤"
+msgstr "SASL 錯誤:%s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "BOSH 連線管理員中斷了你的工作階段。"
+
 msgid "No session ID given"
-msgstr "沒有給予原因"
-
-# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#, fuzzy
+msgstr "沒有給定工作階段代碼"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "不支援指定的 XMPP 版本"
-
-#, fuzzy
+msgstr "不支援的 BOSH 協定版本"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法與伺服器建立連線"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
-#, fuzzy
+msgstr "無法與伺服器建立連線:%s"
+
 msgid "Unable to establish SSL connection"
-msgstr "無法初始化連結"
+msgstr "無法建立 SSL 連線"
 
 msgid "Full Name"
 msgstr "全名"
@@ -3920,6 +3907,11 @@
 msgid "Street Address"
 msgstr "街道地址"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "地址(續)"
 
@@ -3972,9 +3964,8 @@
 
 # NOTE Debian 譯「local」為「本地端」
 # XXX
-#, fuzzy
 msgid "Local Time"
-msgstr "本地端檔案:"
+msgstr "本地端時間:"
 
 msgid "Priority"
 msgstr "優先次序"
@@ -3989,11 +3980,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s前"
+
 msgid "Logged Off"
-msgstr "已登入"
+msgstr "已登出"
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
@@ -4019,7 +4009,6 @@
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
@@ -4028,7 +4017,6 @@
 
 # NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4162,9 +4150,8 @@
 msgstr "讀取聊天室清單時發生錯誤"
 
 msgid "Invalid Server"
-msgstr "無效的伺服器名"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+msgstr "無效的伺服器名稱"
+
 # XXX
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
@@ -4175,26 +4162,23 @@
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
-#, fuzzy
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 msgid "Affiliations:"
-msgstr "別名:"
-
-#, fuzzy
+msgstr "從屬關係:"
+
 msgid "No users found"
-msgstr "找不到符合的使用者"
-
-#, fuzzy
+msgstr "找不到任何使用者"
+
 msgid "Roles:"
-msgstr "職責"
-
-#, fuzzy
+msgstr "身份:"
+
 msgid "Ping timed out"
 msgstr "Ping逾時"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
-msgstr ""
+msgstr "無法直接連線,但無法找到其他的 XMPP 連線方法。"
 
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
@@ -4202,9 +4186,9 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效,域名是必須設定的。"
 
-#, fuzzy
+# FIXME 譯文聽來好像有點怪 20070518 acli
 msgid "Malformed BOSH URL"
-msgstr "無法連線到伺服器。"
+msgstr "畸型的 BOSH 網址"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4272,10 +4256,6 @@
 msgid "Change Registration"
 msgstr "更改註冊資訊"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "無法連線到伺服器。"
-
 msgid "Error unregistering account"
 msgstr "移除帳號註冊錯誤"
 
@@ -4295,7 +4275,7 @@
 msgstr "串流重新初始中"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "伺服器不支援封鎖"
 
 msgid "Not Authorized"
 msgstr "未認證"
@@ -4612,16 +4592,16 @@
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#  XXX 暫譯「(會員)等級」 - ambrose 20070415
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "不明的等級:「%s」"
-
-#  XXX 暫譯 - ambrose 20070415
+msgstr "不明的從屬關係:「%s」"
+
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "無法將使用者 %s 的等級設定為「%s」"
+msgstr "無法將使用者 %s 與這聊天室的從屬關係設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
@@ -4642,19 +4622,20 @@
 msgid "Unable to ping user %s"
 msgstr "無法 Ping 使用者 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "無法「嗶」使用者 %s ,因為沒有有關對方的任何資料。"
-
-#, fuzzy, c-format
+msgstr "無法「嗶」%s ,因為沒有有關對方的任何資料。"
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "無法「嗶」使用者 %s ,因為對方目前可能離線。"
-
-#, fuzzy, c-format
+msgstr "無法「嗶」%s ,因為對方目前可能離線。"
+
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "無法「嗶」使用者 %s ,因為對方的用戶端不支援這個功能。"
+msgstr ""
+"無法「嗶」%s ,因為對方的用戶端不支援這個功能,或者目前關閉了這個功能。"
 
 # XXX 這是暫譯 - acli 20070913
 #, c-format
@@ -4670,38 +4651,38 @@
 msgid "%s has buzzed you!"
 msgstr "%s「嗶」了你一聲"
 
-#, fuzzy, c-format
+# XXX 媒體? - acli 20090730
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "無法送出訊息給 %s,因為這個 JID 是無效的"
-
-#, fuzzy, c-format
+msgstr "無法與 %s 進行媒體通話,因為這個 JID 是無效的"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "無法傳送檔案至 %s,因為對方目前沒有連線"
+msgstr "無法與 %s 進行媒體通話,因為對方目前沒有連線"
 
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
 #  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
 #  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "無法傳送檔案至 %s,因為未獲對方認證"
-
-#, fuzzy
+msgstr "無法與 %s 進行媒體通話,因為未獲對方認證"
+
 msgid "Media Initiation Failed"
-msgstr "註冊失敗"
-
-#  FIXME 這不通順 - acli 20070614
-#, fuzzy, c-format
+msgstr "媒體通話啟動失敗"
+
+#  FIXME 這不通順 - acli 20090730
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
+msgstr "請指定與 %s 的那一個 Resource 進行媒體通話。"
 
 msgid "Select a Resource"
 msgstr "選擇一個 Resource"
 
-#, fuzzy
+# XXX 暫譯 - acli 20090730
 msgid "Initiate Media"
-msgstr "開啟聊天室(_C)"
+msgstr "媒體通話"
 
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
@@ -4721,23 +4702,21 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [理由]:禁止某使用者進入聊天室"
 
-#  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#, fuzzy
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 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;使用者&gt; &lt;owner|admin|member|outcast|none&gt;: 設定使用者"
-"在這聊天室內的等級"
+"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt; [網名1] [網"
+"名2] ...: 取得與聊天室有從屬關係的使用者,或設定使用者與這聊天室內的從屬關係"
 
 #  NOTE 譯文改動 by ambrose
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
-"這聊天室內的身份。"
+"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt; [網名1] [網名"
+"2] ...: 取得在聊天室有身份的使用者,或設定使用者在這聊天室內的身份。"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]:邀請使用者進入聊天室"
@@ -4798,7 +4777,7 @@
 msgstr "檔案傳輸代理伺服器"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH 網址"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4860,32 +4839,29 @@
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#, fuzzy
 msgid "No reason"
 msgstr "沒有給予原因"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "你被 %s 踢出:(%s)"
-
-#, fuzzy, c-format
+msgstr "你已被踢出:(%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "被 %s 踢出 (%s)"
-
-#, fuzzy
+msgstr "已被踢出 (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "開啟檔案途中發生錯誤。"
-
-#, fuzzy
+msgstr "帶內位元組流傳輸途中發生錯誤\n"
+
+# XXX 還是直譯「被關閉」? 20090305 acli
 msgid "Transfer was closed."
-msgstr "檔案傳輸失敗"
-
-#, fuzzy
+msgstr "傳輸已被中止。"
+
 msgid "Failed to open the file"
-msgstr "無法開啟檔案「%s」:%s"
+msgstr "無法開啟檔案"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "無法開啟帶內位元組流"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -5228,9 +5204,25 @@
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s 對你眨眼,<a href='msn-wink://%s'>請點擊這裏播放這個動作</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s 對你眨眼,但無法給眨眼動作存檔"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s 送來了一段語音片段,<a href='audio://%s'>請點擊這裏播放</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s 送來了一段語音片段,但無法給語音片段存檔"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
+msgstr "%s 送來了一個語音聊天的邀請,但目前還沒有語音聊天的支援。"
 
 msgid "Nudge"
 msgstr "呼叫"
@@ -5387,6 +5379,27 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。"
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr "所以無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址。"
+
+msgid "Unable to Add"
+msgstr "無法加入"
+
+msgid "Authorization Request Message:"
+msgstr "認證要求訊息:"
+
+msgid "Please authorize me!"
+msgstr "請通過我的認證!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "確定(_O)"
+
 msgid "Error retrieving profile"
 msgstr "取得個人資料時發生錯誤"
 
@@ -5579,13 +5592,14 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s 在呼叫你!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "不明錯誤(代碼 %d)"
+msgstr "不明錯誤(代碼 %d):%s"
 
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "不明錯誤(代碼 %d)"
@@ -5657,25 +5671,21 @@
 "%s 伺服器傳來一個連線錯誤:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "這個伺服器不支援我們使用的通訊協定。"
-
-#, fuzzy
+msgstr "這個伺服器不支援我們使用的通訊協定"
+
 msgid "Error parsing HTTP"
-msgstr "解析 HTTP 途中發生錯誤。"
-
-#, fuzzy
+msgstr "解析 HTTP 途中發生錯誤"
+
 msgid "You have signed on from another location"
-msgstr "你由其他的地方登入。"
+msgstr "你由其他的地方登入"
 
 #  XXX
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "暫時無法使用 MSN 使服器,請過一會後重試。"
-
-#, fuzzy
+msgstr "暫時無法使用 MSN 伺服器,請過一會後重試。"
+
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN 伺服器將暫時關閉。"
+msgstr "MSN 伺服器將暫時關閉"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5704,13 +5714,15 @@
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#, fuzzy, c-format
+# FIXME 不知這是什麼意思 - acli 20090803
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
-
+msgstr "%s 要求看你的 webcam,但目前還沒有這個功能的支援。"
+
+# FIXME 不知這是什麼意思 - acli 20090803
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
+msgstr "%s 送來了一個 webcam 邀請,但目前還沒有這個功能的支援。"
 
 msgid "Away From Computer"
 msgstr "不在電腦前"
@@ -5908,15 +5920,15 @@
 msgstr "通訊協定錯誤,代碼 %d:%s"
 
 # NOTE 第一個 %s 是錯誤訊息
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s 你的密碼的長度為 %d 個字符,超出了估計中 MySpaceIM 所設 %d 字符的上限。請"
-"透過 http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword 選擇一個較短的密碼,然後重試。"
+"%s 你的密碼的長度為 %zu 個字符,超出了 %d 字符的上限。請透過 http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"選擇一個較短的密碼,然後重試。"
 
 msgid "Incorrect username or password"
 msgstr "錯誤的帳號或密碼"
@@ -6021,6 +6033,8 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"設定使用者名稱途中發生錯誤。請重試,或到網址 http://editprofile.myspace.com/"
+"index.cfm?fuseaction=profile.username  設定使用者名稱。"
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM:可取得此使用者名稱"
@@ -6285,9 +6299,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤:0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "無法 Ping 使用者 %s"
+msgstr "無法登入:%s"
 
 #  XXX 暫譯
 #, c-format
@@ -6418,7 +6432,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線,所以不會收到你剛才送出的訊息。"
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6446,10 +6459,9 @@
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
-# XXX 暫譯 - 20061025
-#, fuzzy
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
 msgid "Received unexpected response from "
-msgstr "伺服器發出了奇怪的 HTTP 回應。"
+msgstr "伺服器發出了奇怪的回應,伺服器位址 "
 
 #. username connecting too frequently
 msgid ""
@@ -6459,12 +6471,13 @@
 "你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線,"
 "那麼你的等待時間將會更加的延長。"
 
-#, fuzzy, c-format
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
 msgid "Error requesting "
-msgstr "解析 %s 途中發生了錯誤"
+msgstr "要求途中發生了錯誤,伺服器位址 "
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL 不允許你的帳號在這裏登入"
 
 msgid "Could not join chat room"
 msgstr "無法加入聊天室"
@@ -6472,9 +6485,8 @@
 msgid "Invalid chat room name"
 msgstr "聊天室名稱無效"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "連線至伺服器時收到無效的資料。"
+msgstr "連線至伺服器時收到無效的資料"
 
 #. *< type
 #. *< ui_requirement
@@ -6521,7 +6533,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
@@ -6581,7 +6592,7 @@
 msgid "Request denied"
 msgstr "要求被拒"
 
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#Pidgin提供
+# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
@@ -6740,17 +6751,15 @@
 msgstr "警告等級"
 
 msgid "Buddy Comment"
-msgstr "好友說明"
-
-#, fuzzy, c-format
+msgstr "好友備註"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"無法連線至認證伺服器:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法連線至認證伺服器:%s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "無法連線到伺服器。"
+msgstr "無法連線到 BOS 伺服器:%s"
 
 msgid "Username sent"
 msgstr "已送出使用者名稱"
@@ -6762,14 +6771,14 @@
 msgid "Finalizing connection"
 msgstr "完成連線中"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須為有效電郵地址;"
-"或者以英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
+"無法以 %s 身份登入,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以英文"
+"字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6787,14 +6796,13 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "使用者不存在"
-
+msgstr "使用者名稱不存在"
+
+# XXX「suspend」真是「停用」嗎?
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "你的帳號目前停用中。"
+msgstr "你的帳號目前停用中"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
@@ -6803,22 +6811,21 @@
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "你所使用的用戶端程式太過老舊。請到 %s 更新"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連線,"
+"你的連線/斷線動作太過頻繁。請等待一分鐘後再行重試。如果你依然繼續嘗試連線,"
 "那麼你的等待時間將會更加的延長。"
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "你所輸入的 SecurID 碼無效。"
+msgstr "你所輸入的 SecurID 碼無效"
 
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
@@ -6826,12 +6833,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "確定(_O)"
-
 msgid "Password sent"
 msgstr "成功送出密碼"
 
@@ -6841,12 +6842,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將你加入我的好友清單中。"
 
-msgid "Authorization Request Message:"
-msgstr "認證要求訊息:"
-
-msgid "Please authorize me!"
-msgstr "請通過我的認證!"
-
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
@@ -7149,17 +7144,14 @@
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"所以無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以"
-"英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
-
-msgid "Unable to Add"
-msgstr "無法加入"
+"無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以英文"
+"字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "無法取得好友清單"
@@ -7174,18 +7166,18 @@
 msgid "Orphans"
 msgstr "孤兒們"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"因為你的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
-"試。"
+"因為你的好友清單中有太多的好友,所以沒有辦法加入好友 %s。請移除其中一個,然後"
+"重試。"
 
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單,原因不明。"
 
@@ -7224,7 +7216,7 @@
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
-# NOTE: 這裡的字義係由 #Pidgin 的 MrHappy 及 deryni 提供的
+# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
@@ -7241,10 +7233,10 @@
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "%s 的好友說明"
+msgstr "%s 的好友備註"
 
 msgid "Buddy Comment:"
-msgstr "好友說明:"
+msgstr "好友備註:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7263,7 +7255,7 @@
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "編輯好友說明"
+msgstr "編輯好友備註"
 
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
@@ -7275,12 +7267,12 @@
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-# NOTE Require意為「需要」,不是「要求」
+# NOTE 在這裏「Require」是指別人如果要新增您為好友,得先向您發出驗證要求,再由您允許
 msgid "Require authorization"
-msgstr "需要認證"
+msgstr "必須驗證"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "允許其他使用者在網絡上查看你目前的狀態(會導致你收到垃圾訊息!)"
+msgstr "允許在網絡上檢視你目前的狀態(會導致你收到垃圾訊息!)"
 
 msgid "ICQ Privacy Options"
 msgstr "ICQ 私隱選頊"
@@ -7354,9 +7346,8 @@
 msgid "Search for Buddy by Information"
 msgstr "根據資訊尋找好友"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "使用者沒有登入"
+msgstr "使用 clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7492,9 +7483,8 @@
 msgid "Phone Number"
 msgstr "電話號碼"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "給予認證?"
+msgstr "允許新增你為好友"
 
 msgid "Cellphone Number"
 msgstr "流動電話號碼"
@@ -7558,40 +7548,37 @@
 msgid "Note"
 msgstr "備註"
 
+# NOTE 正式的QQ介面寫「备注」(備註)
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "修改地址"
+msgstr "好友備註"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "請隨意修改備註"
+
 msgid "_Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "修改(_M)"
+
 msgid "Memo Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "修改備註"
+
+# XXX 中文正常應該不會用「says」一類的擬人字眼? - acli 20090305
 msgid "Server says:"
-msgstr "伺服器忙碌"
+msgstr "伺服器回應:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "請求已獲接受。"
 
 msgid "Your request was rejected."
-msgstr ""
-
-# NOTE Require意為「需要」,不是「要求」
+msgstr "請求已被拒絶。"
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u 要求認證"
 
-#, fuzzy
+# XXX 暫譯 - acli 20090803
 msgid "Add buddy question"
-msgstr "將使用者加入你的好友清單?"
+msgstr "新增好友的認證問題"
 
 msgid "Enter answer here"
 msgstr "在此輸入答案"
@@ -7608,14 +7595,16 @@
 msgid "Sorry, you're not my style."
 msgstr "不好意思,你不是我的菜…"
 
+# NOTE 請看下面 =P
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u 需要授權"
-
-#, fuzzy
+msgstr "%u 需要認證"
+
+# NOTE 這是視窗標題,對應下面的「Enter request here」和「Would you be my friend?」
 msgid "Add buddy authorize"
-msgstr "將使用者加入你的好友清單?"
-
+msgstr "新增好友認證"
+
+# NOTE 其他協定譯「認證要求訊息:」
 msgid "Enter request here"
 msgstr "在此輸入要求"
 
@@ -7633,7 +7622,7 @@
 msgstr "無效的 QQ 號碼"
 
 msgid "Failed sending authorize"
-msgstr "送出授權失敗"
+msgstr "送出認證失敗"
 
 #, c-format
 msgid "Failed removing buddy %u"
@@ -7692,10 +7681,10 @@
 msgstr "用戶"
 
 msgid "Requesting"
-msgstr ""
+msgstr "請求中"
 
 msgid "Admin"
-msgstr ""
+msgstr "管理人"
 
 msgid "Notice"
 msgstr "通知"
@@ -7721,19 +7710,17 @@
 msgid "Input request here"
 msgstr "請輸入要求"
 
-#  NOTE QQ「member」應是「成員」
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "成功加入 Qun %s (%u)"
-
-#  NOTE QQ「member」應是「成員」
+msgstr "成功加入羣組 %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "成功加入 Qun"
+msgstr "成功加入羣組"
 
 # NOTE 這是 QQ_ROOM_JOIN_DENIED
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "加入 Qun %u 被拒絕"
+msgstr "加入羣組 %u 被拒絕"
 
 msgid "QQ Qun Operation"
 msgstr "QQ 羣組操作"
@@ -7742,15 +7729,15 @@
 msgstr "失敗:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr "加入 Qun,未知的回覆"
+msgstr "加入羣組途中收到未知的回覆"
 
 msgid "Quit Qun"
-msgstr "離開 Qun"
+msgstr "離開羣組"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
-msgstr "請注意,假如你是創立者,這最終會把這個羣 (Qun) 移除。"
+msgstr "請注意,假如你是創立者,這最終會把這個羣組 (Qun) 移除。"
 
 #  NOTE 這個「你」字沒有打錯,主要是法文及德文的譯者都採用「你」
 #  NOTE(法文「tu」、德文「du」)而不是「您」(「vous」、「Sie」),
@@ -7760,14 +7747,14 @@
 
 #  NOTE QQ「member」應是「成員」
 msgid "Successfully changed Qun members"
-msgstr "成功的更改了 Qun 成員"
+msgstr "成功的更改了羣組成員"
 
 # FIXME 暫譯 ambrose 20070415
 msgid "Successfully changed Qun information"
 msgstr "成功的更改了 Qun 資訊"
 
 msgid "You have successfully created a Qun"
-msgstr "成功建立了一個羣 (Qun)"
+msgstr "成功建立了一個羣組 (Qun)"
 
 msgid "Would you like to set up detailed information now?"
 msgstr "你現在要立即設定詳細資訊嗎?"
@@ -7775,9 +7762,10 @@
 msgid "Setup"
 msgstr "設定"
 
-#, fuzzy, c-format
+# NOTE %s 為「reason」
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "使用者 %d 要求加入羣組 %d"
+msgstr "使用者 %u 要求加入羣組 %u,理由為「%s」"
 
 #, c-format
 msgid "%u request to join Qun %u"
@@ -7785,11 +7773,12 @@
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr ""
-
+msgstr "加入羣組 %u 失敗,羣組管理員為 %u"
+
+# NOTE %s 為「reason」
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>管理員 %2$u 允許了你加入羣組 %1$u,理由為「%3$s」</b>"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
 #, c-format
@@ -7803,9 +7792,9 @@
 
 # XXX 問題:
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
 # XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
 #, c-format
@@ -7868,9 +7857,12 @@
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>伺服器位址</b>:%s<br>\n"
 
-#, fuzzy, c-format
+#  NOTE 直譯:「客戶端旗標」
+#  NOTE 根據原始碼,所謂 Client Tag 係指你的客戶端有什麼功能 (qq2007、QQ2008等等)
+#  NOTE 在OSCAR協定模組對應的欄位 (Capabilities) 譯「相容性」
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>登入時間:</b>%s<br>\n"
+msgstr "<b>兼容性:</b>%s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
@@ -7929,7 +7921,7 @@
 msgstr "<p><b>仔細的品管人員</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "如有遺漏務請通知……謝謝!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>還有所有幕後默默貢獻的無名英雄們…</i><br>\n"
@@ -7951,14 +7943,13 @@
 msgstr "帳號資訊"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "更新所有 QQ 羣"
 
 msgid "About OpenQ"
 msgstr "關於 OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "修改地址"
+msgstr "修改好友備註"
 
 #. *< type
 #. *< ui_requirement
@@ -8000,7 +7991,7 @@
 msgstr "顯示伺服器是日訊息"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "收到聊天室訊息時自動顯示聊天室"
 
 # XXX 20080810 acli - 譯文有待改進,原文也是
 msgid "Keep alive interval (seconds)"
@@ -8010,7 +8001,6 @@
 msgid "Update interval (seconds)"
 msgstr "每隔多少秒更新"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "無法解密伺服器回應"
 
@@ -8030,7 +8020,7 @@
 #. need activation
 #. need activation
 msgid "Activation required"
-msgstr "必須啟動帳號"
+msgstr "必須先啟動帳號"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
@@ -8048,9 +8038,11 @@
 msgid "Captcha Image"
 msgstr "驗證圖片"
 
+# NOTE 這裏的所謂「Enter code」係指輸入驗證圖片上所寫的文字
 msgid "Enter code"
-msgstr "輸入啟動碼"
-
+msgstr "輸入驗證文字"
+
+# NOTE 視窗標題
 msgid "QQ Captcha Verification"
 msgstr "QQ 圖示驗證"
 
@@ -8073,17 +8065,15 @@
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "設定使用者資訊..."
+msgstr "取得伺服器位址中"
 
 # XXX 這是看了原始碼後的結論(但可能會錯)- acli 20080930
 msgid "Requesting token"
 msgstr "請求符記中"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "無法連線到伺服器。"
+msgstr "無法解析主機名稱"
 
 msgid "Invalid server or port"
 msgstr "伺服器或通訊埠無效"
@@ -8138,15 +8128,14 @@
 msgid "QQ Qun Command"
 msgstr "QQ 羣組指令"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "無法解密伺服器回應"
+msgstr "無法解密登入回應"
 
 msgid "Unknown LOGIN CMD"
 msgstr "未知的登入指令"
 
 msgid "Unknown CLIENT CMD"
-msgstr "無知的用戶端指令"
+msgstr "不明的用戶端指令"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8272,7 +8261,6 @@
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
@@ -8285,12 +8273,11 @@
 "從下方的清單中選取一個會議室,同時發出邀請給使用者%s。如果你想開啟一個新的會"
 "議室,並且邀請這個使用者加入,你可以選擇「開啟新會議室」選項。"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
 msgid "Invite to Conference..."
-msgstr "邀請進入會議室"
+msgstr "邀請進入會議室..."
 
 #  XXX 要覆查 - 20061029
 msgid "Send TEST Announcement"
@@ -9131,7 +9118,6 @@
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
@@ -9145,22 +9131,16 @@
 msgid "Performing key exchange"
 msgstr "交換密碼匙中"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "無法讀取 SILC 配對密碼匙"
+msgstr "無法載入 SILC 配對密碼匙"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "無法讀取 SILC 配對密碼匙"
-
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
@@ -9461,9 +9441,8 @@
 msgid "Creating SILC key pair..."
 msgstr "產生 SILC 配對密碼匙中..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "無法產生 SILC 配對密碼匙\n"
+msgstr "無法產生 SILC 配對密碼匙"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9601,7 +9580,6 @@
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
@@ -9609,20 +9587,18 @@
 msgid "John Noname"
 msgstr "無名氏"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "無法讀取 SILC 配對密碼匙:%s"
+msgstr "無法載入 SILC 配對密碼匙:%s"
 
 msgid "Unable to create connection"
 msgstr "無法建立連結"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "不明的伺服器回應。"
-
-#, fuzzy
+msgstr "不明的伺服器回應"
+
 msgid "Unable to create listen socket"
-msgstr "無法建立 Socket"
+msgstr "無法建立監聽 Socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字符或「@」符號"
@@ -9685,7 +9661,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
@@ -9717,9 +9692,8 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo 帳號"
+msgstr "Yahoo JAPAN 帳號..."
 
 #. *< type
 #. *< ui_requirement
@@ -9731,12 +9705,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo 協定模組"
+msgstr "Yahoo JAPAN 協定模組"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "無法發送你的短訊"
 
 # NOTE 譯文更動 by Ambrose
 msgid "Your Yahoo! message did not get sent."
@@ -9763,28 +9736,24 @@
 msgstr "新增好友被拒"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "連線至伺服器時收到無效的資料。"
+msgstr "收到無效的資料"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
-msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
+msgstr "帳號已被封鎖:登入失敗次數太多。登入 Yahoo 網站或許可以解除封鎖。"
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
+msgstr "帳號已被封鎖:原因不明。登入 Yahoo 網站或許可以解除封鎖。"
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "錯誤的帳號或密碼"
+msgstr "未有輸入帳號或密碼"
 
 #, c-format
 msgid ""
@@ -9809,18 +9778,18 @@
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
+# NOTE「封鎖」好像比「暫時關閉」通順? - acli 20090730
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "你的帳戶目前被暫時關閉。請你登入 Yahoo! 網站。"
+msgstr "你的帳戶目前已被封鎖。請你登入 Yahoo! 網站。"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的羣組「%2$s」。"
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
@@ -9829,21 +9798,16 @@
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "伺服器發出了奇怪的 HTTP 回應。"
-
-#, fuzzy, c-format
+msgstr "伺服器發出了奇怪的 HTTP 回應"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"與 %s 之間的連線突然中斷:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "與 %s 之間的連線突然中斷:%s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
+msgstr "無法與 %s 建立連線:%s"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9885,7 +9849,7 @@
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
-# NOTE #Pidgin 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
+# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
@@ -9901,9 +9865,9 @@
 msgstr "開始 Doodle"
 
 msgid "Select the ID you want to activate"
-msgstr ""
-
-# NOTE #Pidgin 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
+msgstr "請輸入希望啟動的 ID"
+
+# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join whom in chat?"
 msgstr "加入誰的聊天室?"
@@ -9926,9 +9890,9 @@
 msgid "Unable to connect."
 msgstr "無法連線。"
 
-# TODO - 覆查譯文 - 20061028
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=descriptor&qrytype=en&x=0&y=0
 msgid "Unable to establish file descriptor."
-msgstr "無法建立檔案介紹。"
+msgstr "無法建立檔描述符。"
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
@@ -10000,11 +9964,8 @@
 msgstr "這個使用者的資訊是空白的。"
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
-
-msgid "Invitation Rejected"
-msgstr "邀請被婉拒了"
+msgid "%s has declined to join."
+msgstr "%s 婉拒了加入聊天室。"
 
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
@@ -10059,7 +10020,6 @@
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
@@ -10183,7 +10143,7 @@
 # NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Export to .anyone"
@@ -10195,7 +10155,7 @@
 # NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Import from .anyone"
@@ -10213,17 +10173,18 @@
 msgid "Exposure"
 msgstr "現身程度"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "無法解析 HTTP 代理伺服應的回應:%s\n"
+msgstr "無法解析 HTTP 代理伺服應的回應:%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
-#, fuzzy, c-format
+# NOTE 參閱 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=tunnel&qrytype=en&x=35&y=11
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "拒絕存取:HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
+msgstr "拒絕存取:HTTP 代理伺服器禁止使用通訊埠 %d 穿隧"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10468,12 +10429,15 @@
 msgid "Address already in use."
 msgstr "位址已在使用中"
 
+# NOTE 這個 %s 係指 filename
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
-# NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
-#, fuzzy, c-format
+# NOTE 第一個 %s 是 description,第二個 %s 是 filename_full
+# NOTE 上文有註釋「If we could not parse the file then show the user an error message」
+# NOTE 所以所謂「reading」其實係指「解析」而不是「讀入」
+#, 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~."
@@ -10525,8 +10489,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "使用下列好友圖示(_I):"
 
-msgid "_Advanced"
-msgstr "進階設定(_A)"
+msgid "Ad_vanced"
+msgstr "進階設定(_V)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
@@ -10590,9 +10554,8 @@
 msgid "Create _this new account on the server"
 msgstr "在伺服器上建立這個新帳號(_T)"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "代理伺服器"
+msgid "P_roxy"
+msgstr "代理伺服器(_R)"
 
 msgid "Enabled"
 msgstr "啟動"
@@ -10639,9 +10602,8 @@
 msgid "Please update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "帳號"
+msgstr "帳號(_C)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10666,17 +10628,14 @@
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "新增聊天室(_A)"
+msgstr "語音通話(_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-# XXX 暫譯
-#, fuzzy
+msgstr "語音/視像通話"
+
 msgid "_Video Call"
-msgstr "視像聊天"
+msgstr "視像通話(_V)"
 
 msgid "_Send File..."
 msgstr "傳送檔案(_S)..."
@@ -10687,11 +10646,9 @@
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "離線時隱藏"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "離線時顯示"
 
@@ -10823,9 +10780,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/工具/證書(_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/工具/表情(_Y)"
+msgstr "/工具/自定表情(_Y)"
 
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
@@ -10955,8 +10911,9 @@
 msgid "By status"
 msgstr "根據狀態"
 
+# XXX 暫譯 20090305 acli
 msgid "By recent log activity"
-msgstr ""
+msgstr "根據日誌更新時間"
 
 #, c-format
 msgid "%s disconnected"
@@ -10973,7 +10930,7 @@
 msgstr "重新啟動"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL 常見問題"
 
 msgid "Welcome back!"
 msgstr "歡迎歸來!"
@@ -11105,109 +11062,99 @@
 msgstr "背景顏色"
 
 msgid "The background color for the buddy list"
-msgstr ""
-
-#, fuzzy
+msgstr "好友清單的背景顏色"
+
 msgid "Layout"
-msgstr "寮國文"
+msgstr "佈局"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "好友清單內圖示、名稱和狀態的佈局"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "背景顏色"
+msgstr "展開的羣組的背景顏色"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "羣組展開時的羣組名稱的背景顏色"
+
+# NOTE 根據gtkblist-theme-loader的原始碼,這個「文字」選項應該係指PidginThemeFont(字體名稱、字體顏色兩項),下同
 msgid "Expanded Text"
-msgstr "展開(_E)"
+msgstr "展開的羣組的名稱"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "羣組展開時羣組名稱的字體及文字顏色"
+
 msgid "Collapsed Background Color"
-msgstr "設定背景顏色"
+msgstr "收起的羣組的背景顏色"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "羣組收起時羣組名稱的背景顏色"
+
 msgid "Collapsed Text"
-msgstr "收起(_C)"
+msgstr "收起的羣組的名稱"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "羣組收起時羣組名稱的字體及文字顏色"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "設定背景顏色"
+msgstr "好友/聊天室的背景顏色"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "好友或聊天室名稱的背景顏色"
+
 msgid "Contact Text"
-msgstr "捷徑"
-
+msgstr "整組好友的名稱"
+
+# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
+# NOTE 根據deryni的解釋,當contact收起時,我們見到的是priority buddy
+# NOTE 但當contact展開時,我們見到的是一個contact的名稱和包含在contact內的所有buddy
+# NOTE 照推理,所謂「text information for when a contact is expanded」應該是指contact的名稱
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "好友展開時整組好友的名稱的字體及文字顏色"
+
 msgid "On-line Text"
-msgstr "上線"
+msgstr "上線好友的名稱"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "好友上線時好友名稱的字體及文字顏色"
+
 msgid "Away Text"
-msgstr "離開"
+msgstr "離開好友的名稱"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "好友離開時好友名稱的字體及文字顏色"
+
 msgid "Off-line Text"
-msgstr "離線"
+msgstr "離線好友的名稱"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-# XXX 要覆查 - acli 20070914
-#, fuzzy
+msgstr "好友離線時好友名稱的字體及文字顏色"
+
 msgid "Idle Text"
-msgstr "情緒描述"
+msgstr "閒置好友的名稱"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "好友閒置時好友名稱的字體及文字顏色"
+
 msgid "Message Text"
-msgstr "訊息送出"
+msgstr "有未讀訊息的好友名稱"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "好友有未讀訊息時好友名稱的字體及文字顏色"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "提到你的網名的聊天室名稱"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
-
-#, fuzzy
+msgstr "聊天室中提到你的網名時聊天室名稱的字體及文字顏色"
+
 msgid "The text information for a buddy's status"
-msgstr "更改 %s 的個人資料"
+msgstr "好友狀態的字體及文字顏色"
 
 # XXX 譯文有待改進 - acli 20070913
-#, fuzzy
 msgid "Type the host name for this certificate."
 msgstr "請輸入這張證書所屬的主機名稱。"
 
@@ -11259,7 +11206,6 @@
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "上次提到"
 
@@ -11308,21 +11254,18 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#, fuzzy
+# XXX 媒體?  - acli 20090730
 msgid "/Conversation/M_edia"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體(_E)"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體/語音通話(_A)"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體/視像通話(_V)"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/交談/觀看歷史記錄(_L)"
+msgstr "/交談/媒體/語音/視像通話(_C)"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
@@ -11396,17 +11339,15 @@
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#, fuzzy
+# XXX 媒體? - acli 20090730
 msgid "/Conversation/Media/Audio Call"
-msgstr "/交談/更多"
-
-#, fuzzy
+msgstr "/交談/媒體/語音通話"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/交談/觀看歷史記錄"
-
-#, fuzzy
+msgstr "/交談/媒體/視像通話"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/交談/更多"
+msgstr "/交談/媒體/語音/視像通話"
 
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
@@ -11606,7 +11547,7 @@
 msgstr "張家興"
 
 msgid "voice and video"
-msgstr ""
+msgstr "語音及視像功能"
 
 msgid "support"
 msgstr "支援"
@@ -11744,9 +11685,8 @@
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "羅馬尼亞文"
+msgstr "亞美尼亞文"
 
 msgid "Indonesian"
 msgstr "印尼文"
@@ -11769,9 +11709,9 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有格魯吉亞文翻譯人員"
 
-#, fuzzy
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 msgid "Khmer"
-msgstr "其他"
+msgstr "高棉文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE 註:KDE 譯「坎納達」
@@ -11871,8 +11811,9 @@
 msgid "Swedish"
 msgstr "瑞典文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=swahili&qrytype=en&x=29&y=7
 msgid "Swahili"
-msgstr ""
+msgstr "斯瓦希里文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
@@ -11955,7 +11896,7 @@
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC 頻道</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
+"<FONT SIZE=\"4\">IRC 頻道:</FONT>irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
 #, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
@@ -11965,8 +11906,8 @@
 msgid "Current Developers"
 msgstr "現任開發者"
 
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on Pidgin ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 Pidgin 賣力」
+# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
+# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
 msgid "Crazy Patch Writers"
@@ -12199,14 +12140,6 @@
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
-#. Pause button
-msgid "_Pause"
-msgstr "暫停(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "恢復(_R)"
-
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
@@ -12226,7 +12159,6 @@
 msgid "Hyperlink visited color"
 msgstr "瀏覽過的連結顏色"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "當滑鼠經過瀏覽過(或已啟動)的連結時的連結顏色。"
 
@@ -12264,21 +12196,18 @@
 msgstr ""
 "收到的訊息是對方以「輕聲的說」這種動作發出的訊息時,用來顯示對方帳號的顏色"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "收到的訊息是代表對方發出的一個動作時,用來顯示對帳號的顏色。"
+msgstr "收到的訊息是代表對方「輕聲的說」時,用來顯示對帳號的顏色。"
 
 msgid "Whisper Message Name Color"
 msgstr "輕聲訊息帳號顏色"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "收到的訊息是代表對方發出的一個動作時,用來顯示對帳號的顏色。"
+msgstr "收到的訊息是輕聲訊息時,用來顯示對帳號的顏色。"
 
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
 msgstr "用來顯示輸入通知的顏色"
 
@@ -12292,7 +12221,7 @@
 msgid "Enable typing notification"
 msgstr "啟用輸入通知"
 
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12302,7 +12231,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12539,7 +12468,7 @@
 
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12561,6 +12490,7 @@
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網絡實際狀態,強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12571,7 +12501,7 @@
 
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12592,6 +12522,7 @@
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網絡實際狀態,強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12626,23 +12557,25 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
+# XXX 媒體? - acli 20090730
 msgid "/_Media"
-msgstr ""
-
+msgstr "/媒體(_M)"
+
+# XXX 暫譯 - acli 20090730
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/媒體/掛斷(_H)"
+
+# XXX 暫譯 - acli 20090730
 msgid "Calling..."
-msgstr "計算中..."
+msgstr "撥打中..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s 希望跟你進行語音/視像通話。"
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s 希望跟你進行視像通話。"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12671,9 +12604,8 @@
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "你選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#, fuzzy
 msgid "No message"
-msgstr "不明的訊息"
+msgstr "沒有訊息"
 
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
@@ -12681,16 +12613,18 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">你有郵件!</span>"
 
-#, fuzzy
+# XXX 這似乎是「好友狀態捕捉」發生時的通知視窗的視窗標題
+# XXX 暫譯,譯文有待改進 - acli 20090730
 msgid "New Pounces"
-msgstr "新增好友狀態捕捉"
-
+msgstr "新發生的好友狀態捕捉"
+
+# XXX 譯「確定」是否較正常? - acli 20090730
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "關閉"
+
+# XXX 暫譯,譯文有待改進 - acli 20090730
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">你有郵件!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">你捕捉到了好友狀態!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "以下的模組將會被卸載。"
@@ -12738,7 +12672,6 @@
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
@@ -12815,64 +12748,59 @@
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
 msgstr "開始輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
 msgstr "暫停輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed on"
 msgstr "登入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s 由閒置返回 (%s)"
-
-#, fuzzy, c-format
+msgstr "由閒置返回"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "返回"
-
-#, fuzzy, c-format
+msgstr "由離開返回"
+
+#, c-format
 msgid "Stopped typing"
 msgstr "停止輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
 msgstr "登出"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Became idle"
 msgstr "閒置"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Went away"
-msgstr "離開期間"
-
-#, fuzzy, c-format
+msgstr "離開"
+
+#, c-format
 msgid "Sent a message"
 msgstr "送出訊息"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "未知的捕捉事件。請匯報這個問題!"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "未知的捕捉事件……請匯報這個問題!"
+
+# XXX 要覆查 - 20090730
 msgid "Theme failed to unpack."
-msgstr "無法打開表情主題。"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "無法解開表情主題檔。"
+
 msgid "Theme failed to load."
-msgstr "無法打開表情主題。"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "無法載入表情主題。"
+
 msgid "Theme failed to copy."
-msgstr "無法打開表情主題。"
+msgstr "無法複製表情主題。"
 
 #  NOTE 直譯「安裝主題」好像很無棱兩可,加個「檔」字好像較好
 msgid "Install Theme"
@@ -12895,9 +12823,8 @@
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "好友清單"
+msgstr "好友清單主題"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12909,9 +12836,8 @@
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "即時訊息交談視窗"
+msgstr "交談視窗"
 
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H):"
@@ -13017,9 +12943,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "自動偵測 IP 位址(_A)"
+msgstr "使用自動偵測得來的 IP 位址(_A):%s"
 
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
@@ -13039,9 +12965,10 @@
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "中繼伺服器 (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "代理伺服器及瀏覽器"
@@ -13223,7 +13150,7 @@
 msgstr "以鍵盤及滑鼠的使用為基準"
 
 msgid "_Auto-reply:"
-msgstr "何時送出自動回應:"
+msgstr "何時送出自動回應(_A):"
 
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
@@ -13388,11 +13315,10 @@
 msgid "Status for %s"
 msgstr "狀態:%s"
 
-# XXX 20080810 acli - 暫譯
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr "指定的捷徑已有相關的自選表情,請指定另一個捷徑。"
+msgstr "「%s」已自選表情,請指定另一個捷徑。"
 
 msgid "Custom Smiley"
 msgstr "自選表情"
@@ -13406,28 +13332,26 @@
 msgid "Add Smiley"
 msgstr "新增表情"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "圖像(_I)"
-
+msgstr "圖像(_I):"
+
+# XXX 暫譯 - 20090305 acli
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "捷徑"
+msgstr "捷徑文字(_H):"
 
 msgid "Smiley"
 msgstr "表情"
 
-#, fuzzy
+# XXX 暫譯 - 20090305 acli
 msgid "Shortcut Text"
-msgstr "捷徑"
+msgstr "捷徑文字"
 
 msgid "Custom Smiley Manager"
 msgstr "自選表情管理"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "選擇好友"
+msgstr "選擇好友圖示"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "點選以更改這個帳號的圖示。"
@@ -13512,7 +13436,6 @@
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13547,9 +13470,8 @@
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "無法載入圖像「%s」,原因不明,大概是圖像檔已損壞"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "在瀏覽器中打開連結(_O):"
+msgstr "打開連結(_O)"
 
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
@@ -13557,9 +13479,21 @@
 msgid "_Copy Email Address"
 msgstr "複製電子郵件地址(_C)"
 
+msgid "_Open File"
+msgstr "開啟檔案(_O)"
+
+msgid "Open _Containing Directory"
+msgstr "開啟上層目錄(_C)"
+
 msgid "Save File"
 msgstr "儲存檔案"
 
+msgid "_Play Sound"
+msgstr "播放音效(_P)"
+
+msgid "_Save File"
+msgstr "儲存檔案(_S)"
+
 msgid "Select color"
 msgstr "選擇顏色"
 
@@ -13584,6 +13518,9 @@
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+msgid "_Pause"
+msgstr "暫停(_P)"
+
 # TODO 要覆查 - 20080826
 msgid "_Edit"
 msgstr "修改(_E)"
@@ -13655,80 +13592,73 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "顯示一些有關好友的在線狀態的統計"
 
-#, fuzzy
+#  NOTE 這是「Select an XMPP server to query」所在視窗的標題
 msgid "Server name request"
-msgstr "伺服器位址"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-# XXX
-#, fuzzy
+msgstr "要求伺服器名稱"
+
+#  XXX 這是半肓猜,看了原始碼也看不明,開發者又不答我的問題 - acli 20090803
 msgid "Enter an XMPP Server"
-msgstr "登入會議伺服器"
-
-#, fuzzy
+msgstr "請輸入 XMPP 伺服器名稱"
+
 msgid "Select an XMPP server to query"
-msgstr "選擇查詢的會議伺服器"
-
-#  XXX 暫譯
-#, fuzzy
+msgstr "選擇查詢的 XMPP 伺服器"
+
+#  NOTE 這是按鈕
+#  FIXME 譯文有待改進 - acli 20090730
 msgid "Find Services"
-msgstr "所用之網上服務"
-
-#, fuzzy
+msgstr "搜尋服務"
+
 msgid "Add to Buddy List"
-msgstr "送出好友清單"
-
-#, fuzzy
+msgstr "新增至好友清單"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
 msgid "Gateway"
-msgstr "離開"
-
-#, fuzzy
+msgstr "閘道器"
+
 msgid "Directory"
-msgstr "日誌目錄"
-
-#, fuzzy
+msgstr "目錄"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Collection"
-msgstr "選取音效"
-
-#, fuzzy
+msgstr "PubSub 集子節點"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Leaf"
-msgstr "PubSub 服務"
-
-#, fuzzy
+msgstr "PubSub 葉子節點"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "描述"
+msgstr ""
+"\n"
+"<b>描述:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "服務探尋資訊"
-
-#, fuzzy
+msgstr "服務探索"
+
 msgid "_Browse"
-msgstr "瀏覽器(_B):"
-
-#, fuzzy
+msgstr "瀏覽(_B)"
+
 msgid "Server does not exist"
-msgstr "使用者不存在"
-
-#, fuzzy
+msgstr "伺服器不存在"
+
 msgid "Server does not support service discovery"
-msgstr "伺服器並不提供任何一種被支援的認證方式"
-
-#, fuzzy
+msgstr "伺服器不支援服務探索"
+
 msgid "XMPP Service Discovery"
-msgstr "服務探尋資訊"
-
+msgstr "XMPP 服務探索"
+
+#  FIXME 譯文有待改進 - acli 20090730
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "讓你瀏覽和註冊服務。"
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
+msgstr "幫助在傳統的傳送協定或其他 XMPP 服務中註冊。"
 
 msgid "Buddy is idle"
 msgstr "好友閒置"
@@ -14137,7 +14067,6 @@
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -14267,7 +14196,6 @@
 msgid "Highlighted Message Name Color"
 msgstr "已標示訊息名稱顏"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "輸入通知顏色"
 
@@ -14302,23 +14230,20 @@
 msgstr ""
 
 # XXX 這是我譯的,但我認為這是很差的譯文,看了也不知是什麼 - acli 20080511
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "啟用輸入通知"
-
-#, fuzzy
+msgstr "停用輸入通知"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Pidgin GTK+ 佈景主題設定"
-
-#, fuzzy
+msgstr "GTK+ 佈景主題控制設定"
+
 msgid "Colors"
-msgstr "關閉"
+msgstr "顏色"
 
 msgid "Fonts"
 msgstr "字型"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "雜項"
 
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc檔專用工具"
@@ -14359,10 +14284,10 @@
 msgid "New Version Available"
 msgstr "有新版本"
 
+# NOTE 這個「Later」是指「稍後下載」(即說:我知道有新版本了,稍後我會下載,暫時別煩我)
 msgid "Later"
-msgstr "稍後"
-
-# NOTE: ui_name, ui_website - 這是「請從ui_website下載ui_name」的廣告訊息(quit message),ui_name通常就是「pidgin」
+msgstr "稍後下載"
+
 msgid "Download Now"
 msgstr "立即下載"
 
@@ -14406,7 +14331,6 @@
 
 # XXX 譯文有待改進 - acli 20080508
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14465,103 +14389,85 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根據使用者所定義的規則來取代送出訊息中的文字。"
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "尚未登入"
-
-#, fuzzy
+msgstr "剛巧登入"
+
 msgid "Just logged out"
-msgstr "尚未登入"
+msgstr "剛巧登出"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-# TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
-# NOTE 譯文更動 by Paladin
-#, fuzzy
+"代表好友的圖示/\n"
+"代表不明者的圖示"
+
 msgid "Icon for Chat"
-msgstr "加入聊天室"
-
-#  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
-#  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#, fuzzy
+msgstr "代表聊天室的圖示"
+
 msgid "Ignored"
-msgstr "忽略"
-
-#, fuzzy
+msgstr "已忽略"
+
+#  NOTE「Founder」這處係指聊天室的建立者
 msgid "Founder"
-msgstr "再大聲"
-
-#, fuzzy
+msgstr "建立者"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "管理員"
+
+#  NOTE 指聊天室內擁有部分管理員權限的人員,Konversation譯「助理」,Chatzilla譯「次管理員」
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-# NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#, fuzzy
+msgstr "助理"
+
 msgid "Authorization dialog"
-msgstr "給予認證"
-
-# TODO 要覆查 - 20061025
-#, fuzzy
+msgstr "認證視窗"
+
 msgid "Error dialog"
-msgstr "錯誤訊息"
-
-# XXX 20070518
-#, fuzzy
+msgstr "錯誤訊息視窗"
+
 msgid "Information dialog"
-msgstr "資訊"
+msgstr "資訊訊息視窗"
 
 msgid "Mail dialog"
-msgstr ""
-
-#  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20070415
-#, fuzzy
+msgstr "郵件視窗"
+
+#  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20090730
 msgid "Question dialog"
-msgstr "對話視窗 (Request Dialog)"
-
-#, fuzzy
+msgstr "提問視窗"
+
 msgid "Warning dialog"
-msgstr "警告等級"
+msgstr "警告訊息視窗"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "這是什麼類型的視窗?"
+
 msgid "Status Icons"
-msgstr "狀態:%s"
-
-#  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#, fuzzy
+msgstr "狀態圖示"
+
+# XXX 暫譯 - acli 20090730
 msgid "Chatroom Emblems"
-msgstr "聊天室區域 (Locale)"
-
-#, fuzzy
+msgstr "聊天室圖示"
+
 msgid "Dialog Icons"
-msgstr "更改圖示"
-
-#, fuzzy
+msgstr "視窗圖示"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ 佈景主題設定"
-
-#, fuzzy
+msgstr "Pidgin 圖示主題編輯器"
+
 msgid "Contact"
-msgstr "聯絡資訊"
-
-#, fuzzy
+msgstr "好友"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "好友清單"
-
-#, fuzzy
+msgstr "Pidgin 好友清單主題編輯器"
+
 msgid "Edit Buddylist Theme"
-msgstr "好友清單"
+msgstr "編輯好友清單主題"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "編輯圖示主題"
 
 #. *< type
 #. *< ui_requirement
@@ -14570,16 +14476,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ 佈景主題設定"
+msgstr "Pidgin 主題編輯器"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ 佈景主題設定"
+msgstr "Pidgin 主題編輯器。"
 
 #. *< type
 #. *< ui_requirement
@@ -14737,9 +14641,10 @@
 msgid "_Keep Buddy List window on top:"
 msgstr "好友清單視窗保持在桌面最上層(_K);"
 
+# NOTE 譯文改動 by Ambrose 20090806, see Always/Never
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "只在停駐時生效"
+msgstr "只在停駐時啟動"
 
 msgid "Windows Pidgin Options"
 msgstr "Windows 版 Pidgin 選項"
@@ -14747,7 +14652,6 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 的相關選項。"
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項,例如好友清單的停駐功能。"
@@ -14791,6 +14695,27 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "_Resume"
+#~ msgstr "恢復(_R)"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "無法讀取 SILC 密鑰對"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "邀請被婉拒了"
+
+#~ msgid "Invite message"
+#~ msgstr "邀請訊息"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "請輸入您想邀請的使用者名稱,以及選擇性填寫邀請的訊息。"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "無法開啟Socket"
 
@@ -14816,23 +14741,10 @@
 #~ msgid "Read error"
 #~ msgstr "讀取錯誤"
 
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法與伺服器建立連線:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "寫入錯誤"
-
 # NOTE 這是功能名稱(直譯)
 #~ msgid "Last Activity"
 #~ msgstr "最近活動"
 
-#~ msgid "Service Discovery Info"
-#~ msgstr "服務探尋資訊"
-
 #  FIXME acli 2070914
 #~ msgid "Service Discovery Items"
 #~ msgstr "服務探尋項目"
@@ -14856,9 +14768,6 @@
 #~ msgid "Ad-Hoc Commands"
 #~ msgstr "臨時指令"
 
-#~ msgid "PubSub Service"
-#~ msgstr "PubSub 服務"
-
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "SOCKS5 位元組串流"
 
@@ -14884,7 +14793,7 @@
 # NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
 #~ msgid "Software Version"
-#~ msgstr "軟件版本"
+#~ msgstr "軟體版本"
 
 #~ msgid "Stream Initiation"
 #~ msgstr "開始串流"
@@ -14930,7 +14839,7 @@
 #~ msgstr "Jingle 音訊"
 
 #~ msgid "User Nickname"
-#~ msgstr "使用者網名"
+#~ msgstr "使用者暱稱"
 
 #~ msgid "Jingle ICE UDP"
 #~ msgstr "Jingle ICE UDP"
@@ -14939,7 +14848,7 @@
 #~ msgstr "Jingle ICE TCP"
 
 #~ msgid "Jingle Video"
-#~ msgstr "Jingle 視像"
+#~ msgstr "Jingle 視訊"
 
 #~ msgid "Jingle DTMF"
 #~ msgstr "Jingle DTMF"
@@ -14948,7 +14857,7 @@
 #~ msgstr "收到的訊息"
 
 #~ msgid "Public Key Publishing"
-#~ msgstr "發佈公開密碼匙"
+#~ msgstr "發佈公鑰"
 
 # NOTE Jabber 新功能規格
 #~ msgid "User Browsing"
@@ -14971,6 +14880,9 @@
 #~ msgid "Hop Check"
 #~ msgstr "中繼段檢查"
 
+#~ msgid "Write error"
+#~ msgstr "寫入錯誤"
+
 #~ msgid "Read Error"
 #~ msgstr "讀取錯誤"
 
@@ -14992,14 +14904,11 @@
 # XXX 暫譯
 #~ msgid ""
 #~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "你已經被登出,因為你已在其他電腦上登入。"
+#~ msgstr "您已經被登出,因為您已在其他電腦上登入。"
 
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#~ msgid "Incorrect password."
-#~ msgstr "密碼錯誤。"
-
 #~ msgid ""
 #~ "Could not connect to BOS server:\n"
 #~ "%s"
@@ -15007,14 +14916,17 @@
 #~ "無法連線到 BOS 伺服器:\n"
 #~ "%s"
 
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "你可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
+#~ msgid "Invalid username."
+#~ msgstr "使用者名稱無效。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密碼錯誤。"
 
 #~ msgid "Could Not Connect"
 #~ msgstr "無法連線"
 
-#~ msgid "Invalid username."
-#~ msgstr "使用者名稱無效。"
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
 
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "無法解密伺服器回應"
@@ -15046,81 +14958,6 @@
 #~ msgid "Could not create listen socket"
 #~ msgstr "無法建立 Socket 監聽"
 
-#~ msgid "Could not resolve hostname"
-#~ msgstr "無法解析主機"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "密碼錯誤"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法與 %s 建立連線:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "傳呼伺服器(日本地區)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "檔案傳輸伺服器(日本地區)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "無法解析主機"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "隱藏即時訊息交談視窗"
-
-#~ msgid "More Data needed"
-#~ msgstr "需要進一步的資料"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "請給這個表情給定一個相關的捷徑。"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "請給這個表情選擇一個圖像。"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "啟用哪一個 ID?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "游標顏色"
-
-#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "第二游標顏色"
-
-#~ msgid "Interface colors"
-#~ msgstr "介面顏色"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget 大小"
-
-#~ msgid "Invite message"
-#~ msgstr "邀請訊息"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr "請輸入你想邀請的使用者名稱,以及選擇性填寫邀請的訊息。"
-
 #~ msgid "Looking up %s"
 #~ msgstr "找尋 %s 中"
 
@@ -15148,19 +14985,19 @@
 
 #~ msgid ""
 #~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr "訊息被丟棄,因為你達到了伺服器所限制的發送速度。"
+#~ msgstr "訊息被丟棄,因為您達到了伺服器所限制的發送速度。"
 
 #~ msgid "Chat in %s is not available."
 #~ msgstr "在 %s 不可以聊天。"
 
 #~ msgid "You are sending messages too fast to %s."
-#~ msgstr "你送訊息給 %s 的速度太快了。"
+#~ msgstr "您送訊息給 %s 的速度太快了。"
 
 #~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "你遺失了一個由 %s 送來的訊息,因為它太大了。"
+#~ msgstr "您遺失了一個由 %s 送來的訊息,因為它太大了。"
 
 #~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "你遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
+#~ msgstr "您遺失了一個由 %s 送來的訊息,因為它傳送的速度太快。"
 
 #~ msgid "Failure."
 #~ msgstr "失敗。"
@@ -15203,15 +15040,15 @@
 #~ msgstr "暫時無法使用該項服務。"
 
 #~ msgid "Your warning level is currently too high to log in."
-#~ msgstr "你目前登入系統的警告等級太高,以致無法登入。"
+#~ msgstr "您目前登入系統的警告等級太高,以致無法登入。"
 
 #~ 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 ""
-#~ "你的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果你依然繼續嘗試連"
-#~ "線,那麼你的等待時間將會更加的延長。"
+#~ "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+#~ "線,那麼您的等待時間將會更加的延長。"
 
 #~ msgid "An unknown signon error has occurred: %s."
 #~ msgstr "發生了一個未知的登入錯誤:%s。"
@@ -15220,7 +15057,7 @@
 #~ msgstr "一個未知的錯誤 %d 發生。資訊:%s"
 
 #~ msgid "Invalid Groupname"
-#~ msgstr "無效的羣組名稱"
+#~ msgstr "無效的群組名稱"
 
 #~ msgid "Connection Closed"
 #~ msgstr "連線關閉"
@@ -15229,16 +15066,16 @@
 #~ msgstr "等待回覆中..."
 
 #~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC 結束了暫停狀態。你現在可以繼續的傳送你的訊息。"
+#~ msgstr "TOC 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
 
 #~ msgid "Password Change Successful"
 #~ msgstr "密碼修改成功"
 
 #~ msgid "Get Dir Info"
-#~ msgstr "取得使用者個人資料"
+#~ msgstr "取得使用者個人資訊"
 
 #~ msgid "Set Dir Info"
-#~ msgstr "設定使用者個人資料"
+#~ msgstr "設定使用者個人資訊"
 
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "無法開啟 %s 以供寫入!"
@@ -15261,26 +15098,73 @@
 #~ msgstr[1] "%s 要求 %s 接收 %d 個檔案:%s (%.2f %s)%s%s"
 
 #~ msgid "%s requests you to send them a file"
-#~ msgstr "%s 要求你傳送檔案給他(她)。"
+#~ msgstr "%s 要求您傳送檔案給他(她)。"
 
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC 協定模組"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "啟用哪一個 ID?"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "傳呼伺服器(日本地區)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "檔案傳輸伺服器(日本地區)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "與伺服器之間的連線突然中斷\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "無法解析主機"
+
 #~ msgid "%s Options"
 #~ msgstr "%s 選項"
 
 #~ msgid "Proxy Options"
 #~ msgstr "代理伺服器選項"
 
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "隱藏即時訊息交談視窗"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN 伺服器(_U):"
+
+#~ msgid "More Data needed"
+#~ msgstr "需要進一步的資料"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "請給這個表情給定一個相關的捷徑。"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "請給這個表情選擇一個圖像。"
+
+#~ msgid "Cursor Color"
+#~ msgstr "游標顏色"
+
+#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "第二游標顏色"
+
+#~ msgid "Interface colors"
+#~ msgstr "介面顏色"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget 大小"
+
 #~ msgid "By log size"
-#~ msgstr "根據日誌大小"
+#~ msgstr "依照日誌大小"
 
 #~ msgid "_Open Link in Browser"
 #~ msgstr "在瀏覽器中打開連結(_O)"
 
-#~ msgid "ST_UN server:"
-#~ msgstr "STUN 伺服器(_U):"
-
 #~ msgid "Smiley _Image"
 #~ msgstr "表情圖像(_I)"
 
@@ -15306,14 +15190,6 @@
 #~ msgstr[0] "與伺服器失去連線(%d 秒內收不到任何資料)"
 #~ msgstr[1] "與伺服器失去連線(%d 秒內收不到任何資料)"
 
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "新增好友"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "登入回應解密失敗"
-
 #~ msgid "Keep alive error"
 #~ msgstr "Keep Alive錯誤"
 
@@ -15324,14 +15200,9 @@
 #~ "與伺服器之間的連線突然中斷:\n"
 #~ "%d, %s"
 
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "連結伺服器"
-
 #~ msgid "Failed to send IM."
 #~ msgstr "送出即時訊息失敗。"
 
-#, fuzzy
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "您並非群組「%s」的成員\n"
 
@@ -15493,10 +15364,6 @@
 #~ msgid "QQ Server Notice"
 #~ msgstr "QQ 伺服器通告"
 
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "遠端結束連線"
-
 #~ msgid "developer"
 #~ msgstr "開發者"
 
--- a/po/zh_TW.po	Wed Aug 12 02:24:41 2009 +0000
+++ b/po/zh_TW.po	Thu Aug 13 19:56:23 2009 +0000
@@ -1,9 +1,12 @@
 # Pidgin's Traditional Chinese translation
-# Copyright (C) 2002-2008, Paladin R. Liu <paladin@ms1.hinet.net>
-# Copyright (C) 2003-2008, Ambrose C. Li <acli@ada.dhs.org>
+# Copyright (C) 2002-2009, Paladin R. Liu <paladin@ms1.hinet.net>
+# Copyright (C) 2003-2009, Ambrose C. Li <ambrose.li@gmail.com>
+#
+# PLEASE DO NOT ATTEMPT TO UPDATE THIS FILE IF THERE ARE NO
+# LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.562 2009/02/27 04:50:13 acli Exp $
+# $InternalId: zh_TW.po,v 1.594 2009/08/06 05:26:27 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -17,7 +20,7 @@
 #        screen name 和 user name 在意義上是沒有分別的!
 # 理據如下
 # (01時52分58秒) wing: hmm. does "screen name" mean "user name" now, or has it actually always meant "user name"?
-# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the Pidgin-devel mailing list.  (I'm unhappy with the change.)
+# (02時09分45秒) KingAnt: wing: They're the same thing.  If you're unhappy with the change please email the gaim-devel mailing list.  (I'm unhappy with the change.)
 # ----------------------------------------------------------
 # SILC問題:似乎臺灣和香港的「密碼學」術語相差甚遠,很頭痛 (^^;)
 # - Key 暫譯「密鑰」,原因:「Key Exchange」既有譯文為「交換密鑰」
@@ -47,10 +50,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.5.5\n"
+"Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-02-25 09:57-0500\n"
+"POT-Creation-Date: 2009-08-05 23:59-0700\n"
+"PO-Revision-Date: 2009-07-30 01:53-0500\n"
 "Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
 "MIME-Version: 1.0\n"
@@ -635,11 +638,12 @@
 msgid "Message was not sent, because you are not signed on."
 msgstr "因為您並未登入,所以訊息無法送出:"
 
-# XXX 這是什麼?
+# NOTE 交談標題、使用者名稱、協定名稱
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
+# NOTE 交談標題、意義不明的單字元標
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
@@ -918,12 +922,12 @@
 msgid "System Log"
 msgstr "系統日誌"
 
-#, fuzzy
 msgid "Calling ... "
-msgstr "計算中..."
-
+msgstr "撥打中..."
+
+# NOTE 這是按鈕上的標籤
 msgid "Hangup"
-msgstr ""
+msgstr "掛斷"
 
 #. Number of actions
 msgid "Accept"
@@ -932,26 +936,28 @@
 msgid "Reject"
 msgstr "拒絕"
 
+#  XXX 暫譯 - acli 20090730
 msgid "Call in progress."
-msgstr ""
+msgstr "撥打中。"
 
 msgid "The call has been terminated."
-msgstr ""
+msgstr "通話已中斷。"
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
-
+msgstr "%s 希望與您進行語音通話。"
+
+# XXX 媒體? - acli 20090730
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s 嘗試與您以一種未獲支援的方式進行媒體通話。"
+
 msgid "You have rejected the call."
-msgstr "您離開了頻道%s%s"
-
+msgstr "您拒絕了通話。"
+
+# FIXME 暫譯,譯文有待改進 - acli 20090730
 msgid "call: Make an audio call."
-msgstr ""
+msgstr "call:語音通話。"
 
 msgid "Emails"
 msgstr "電子郵件"
@@ -1205,8 +1211,9 @@
 msgid "From last sent message"
 msgstr "從上次送出訊息時為基準"
 
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Never"
-msgstr "從不"
+msgstr "關閉此功能"
 
 msgid "Show Idle Time"
 msgstr "顯示閒置時間"
@@ -1230,7 +1237,7 @@
 msgstr "記錄所有的狀態改變"
 
 msgid "Report Idle time"
-msgstr "閒置時間基準(_R)"
+msgstr "閒置時間基準"
 
 msgid "Change status when idle"
 msgstr "閒置時更改狀態"
@@ -1301,7 +1308,7 @@
 msgstr "您在聊天室說話"
 
 msgid "Others talk in chat"
-msgstr "其他人進入聊天室"
+msgstr "其他人在聊天室說話"
 
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到您的帳號"
@@ -1359,8 +1366,9 @@
 
 # XXX: 務必 聽起來不太恰當。這裡是指 Enable Sound 的選項 - c9s, 08 Dec 27 12/27/2008
 # XXX 「務必」不只指 Enable Sound,也在其他地方用到,改譯「完全啟用」不行 - 20090226 acli
+# NOTE Using Paladin's wording from 2009/02/27 - acli 20090806
 msgid "Always"
-msgstr "務必"
+msgstr "啟動此功能"
 
 # NOTE 譯文改動 by c9s (http://developer.pidgin.im/ticket/7917) - 20090226 acli
 msgid "Only when available"
@@ -1508,7 +1516,7 @@
 
 #, c-format
 msgid "%s sent a message in %s"
-msgstr "%s 在 %s 送出一個訊息給您。"
+msgstr "%s 在 %s 送出一個訊息給您"
 
 msgid "Buddy signs on/off"
 msgstr "好友登入/登出"
@@ -1618,22 +1626,27 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
-
+"\n"
+"取得 TinyURL 中..."
+
+# XXX 暫譯 - 20090729 acli
 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
-
+msgstr "只在網址長度為這個數值或以上時才建立 TinyURL"
+
+# XXX 暫譯 - 20090729 acli
 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "TinyURL(或同類型)網址前綴"
+
 msgid "TinyURL"
-msgstr "樂曲網址"
+msgstr "TinyURL"
 
 msgid "TinyURL plugin"
-msgstr ""
-
+msgstr "TinyURL 模組"
+
+# NOTE 這個 copying 應係指人手抄寫,因為如果是在電腦上複製,無論網址長短,複製也應該不會有難易之分
+# XXX 暫譯 - 20090729 acli
 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "當接收到含有網址的訊息時,使用 TinyURL 縮短網址,好方便抄寫"
 
 msgid "accounts"
 msgstr "帳號清單"
@@ -1690,9 +1703,9 @@
 
 # XXX 問題:
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
 # XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
 msgid "Unknown"
@@ -1749,6 +1762,44 @@
 msgid "_View Certificate..."
 msgstr "檢視憑證(_V)"
 
+# FIXME 譯文不太通順 - acli 20070913
+#, 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」出示的憑證聲稱它應該屬於「%s」,您目前可能的連線可能不是您心目中希望使"
+"用的服務。"
+
+#. 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 憑證錯誤"
+
+msgid "Invalid certificate chain"
+msgstr "無效的憑證鏈"
+
+#. 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 ""
+"無法核實這張憑證,因為您沒有根憑證機構憑證 (root certificate) 的資料庫。"
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1757,28 +1808,11 @@
 "automatically checked."
 msgstr "「%s」出示的憑證是自簽的,無法自動進行核實。"
 
+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "「%s」出示的憑證鍊是無效的。"
 
-#. 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 憑證錯誤"
-
-msgid "Invalid certificate chain"
-msgstr "無效的憑證鏈"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"無法核實這張憑證,因為您沒有根憑證機構憑證 (root certificate) 的資料庫。"
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1796,19 +1830,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "憑證機構的簽章是無效的"
 
-# FIXME 譯文不太通順 - acli 20070913
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"「%s」出示的憑證聲稱它應該屬於「%s」,您目前可能的連線可能不是您心目中希望使"
-"用的服務。"
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1845,7 +1866,7 @@
 msgstr "+++ %s 登出"
 
 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "未知錯誤"
 
@@ -1892,10 +1913,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s 離開聊天室 (%s)。"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-#, fuzzy
 msgid "Invite to chat"
-msgstr "邀請進入會議室"
+msgstr "邀請進入聊天室"
 
 #. Put our happy label in it.
 msgid ""
@@ -2038,6 +2057,10 @@
 msgstr "開始自 %2$s 傳送 %1$s"
 
 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "檔案 <A HREF=\"file://%s\">%s</A> 傳送完畢"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "檔案 %s 傳送完畢"
 
@@ -2234,9 +2257,9 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自動回覆>:%s\n"
 
-#, fuzzy
+# FIXME 譯文有待改進 - acli 20090731
 msgid "Error creating conference."
-msgstr "連線開啟錯誤"
+msgstr "建立會議失敗。"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2661,7 +2684,6 @@
 
 # XXX 譯文有待改進(第二段) - 20061025
 #. * 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"
@@ -2670,7 +2692,7 @@
 "at your own risk!"
 msgstr ""
 "當瀏覽日誌時,這個模組會把其他即時訊息用戶端的日誌也包含進來。目前支援 "
-"Adium、Fire、Messenger Plus!、MSN Messenger,以及 Trillian。\n"
+"Adium、Fire、Messenger Plus!、MSN Messenger、aMSN、以及 Trillian。\n"
 "\n"
 "注意:這個模組仍處於開發初期,因此可能經常當掉。如果使用,後果自負!"
 
@@ -2715,7 +2737,6 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "好友離線時,利用「好友狀態捕捉」功能儲存送出的訊息。"
 
-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
@@ -2749,9 +2770,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "毋須提問,務必使用「好友狀態捕捉」儲存離線訊息。"
 
-#, fuzzy
 msgid "One Time Password"
-msgstr "輸入密碼"
+msgstr "一次性密碼"
 
 #. *< type
 #. *< ui_requirement
@@ -2760,13 +2780,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "一次性密碼支援"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "強制密碼只用一次"
 
 #. *  description
 msgid ""
@@ -2966,18 +2986,15 @@
 "找不到 ActiveTCL;如果打算使用 TCL 寫成的模組,請到 http://www.activestate."
 "com 下載及安裝 ActiveTCL。\n"
 
-# FIXME 沒有譯「toolkit」- 20071023 acli
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"找不到 Apple 的 Bonjour For Windows toolkit,詳情請到網址 http://d.pidgin.im/"
-"BonjourWindows 查閱 FAQ 部分。"
-
-#, fuzzy
+"找不到 Apple 的「Bonjour For Windows」工具,詳情請到網址 http://d.pidgin.im/"
+"BonjourWindows 查閱。"
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "無法接收連入的即時訊息連線\n"
+msgstr "無法監聽來訊的即時訊息連線"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3031,24 +3048,20 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "無法送出訊息,交談無法開始。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
-msgstr ""
-"無法建立 Socket:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法建立 Socket:%s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "無法聯結 Socket 到通訊埠"
-
-#, fuzzy, c-format
+msgstr "無法連結 Socket 到通訊埠:%s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
-msgstr ""
-"無法建立 Socket:\n"
-"%s"
+msgstr "無法監聽 Socket:%s"
 
 msgid "Error communicating with local mDNSResponder."
-msgstr "和本地端的mDNSResponder溝通時發生錯誤"
+msgstr "和本地端的 mDNSResponder 溝通時發生錯誤"
 
 msgid "Invalid proxy settings"
 msgstr "無效的代理伺服器設定"
@@ -3057,7 +3070,7 @@
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱及通訊埠是無效的"
+"對於您目前所設定的代理伺服器型態來說,您所給定的伺服器名稱或通訊埠是無效的。"
 
 msgid "Token Error"
 msgstr "符記錯誤"
@@ -3093,17 +3106,14 @@
 msgid "Load buddylist from file..."
 msgstr "自檔案讀取好友清單..."
 
-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "填寫註冊資料欄位。"
-
-#, fuzzy
+msgstr "必需填妥所有註冊資料欄位"
+
 msgid "Passwords do not match"
-msgstr "新密碼並不相符。"
-
-#, fuzzy
+msgstr "兩個密碼並不相符"
+
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "無法註冊新帳號。錯誤發生。\n"
+msgstr "無法註冊新帳號,錯誤原因不明。"
 
 msgid "New Gadu-Gadu Account Registered"
 msgstr "新的 Gadu-Gadu 帳號已註冊"
@@ -3118,9 +3128,8 @@
 msgstr "舊密碼(再次確認)"
 
 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "請輸入驗證圖片內的文字"
+
 msgid "Captcha"
 msgstr "驗證圖片"
 
@@ -3263,9 +3272,9 @@
 msgid "Chat _name:"
 msgstr "聊天室名稱(_N):"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "無法連線到伺服器。"
+msgstr "無法解析主機名稱「%s」:%s"
 
 #. 1. connect to server
 #. connect to the server
@@ -3278,9 +3287,8 @@
 msgid "This chat name is already in use"
 msgstr "聊天室名稱正在使用中"
 
-#, fuzzy
 msgid "Not connected to the server"
-msgstr "尚未連線到伺服器。"
+msgstr "尚未連線到伺服器"
 
 msgid "Find buddies..."
 msgstr "尋找好友..."
@@ -3321,9 +3329,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 使用者"
 
-#, fuzzy
 msgid "GG server"
-msgstr "設定使用者資訊..."
+msgstr "Gadu-Gadu 伺服器"
 
 #, c-format
 msgid "Unknown command: %s"
@@ -3339,7 +3346,6 @@
 msgid "File Transfer Failed"
 msgstr "檔案傳輸失敗"
 
-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "無法開啟監聽埠。"
 
@@ -3363,11 +3369,9 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
-msgstr ""
-"與伺服器之間的連線突然中斷:\n"
-"%s"
+msgstr "與伺服器之間的連線突然中斷:%s"
 
 msgid "View MOTD"
 msgstr "顯示是日訊息 (MOTD)"
@@ -3378,9 +3382,8 @@
 msgid "_Password:"
 msgstr "密碼(_P):"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC 暱稱不可含有空白字元"
+msgstr "IRC 暱稱和伺服器名稱均不可含有空白字元"
 
 # XXX 暫譯
 msgid "SSL support unavailable"
@@ -3390,13 +3393,13 @@
 msgstr "無法連線"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "無法連線到「%s」"
-
-#, fuzzy, c-format
+msgstr "無法連線:%s"
+
+#, c-format
 msgid "Server closed the connection"
-msgstr "伺服器關閉連線。"
+msgstr "伺服器關閉了連線"
 
 msgid "Users"
 msgstr "使用者"
@@ -3588,13 +3591,12 @@
 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "聊天室名稱正在使用中"
-
-#, fuzzy
+msgstr "暱稱「%s」已在使用中。"
+
 msgid "Nickname in use"
-msgstr "暱稱"
+msgstr "暱稱已在使用中"
 
 msgid "Cannot change nick"
 msgstr "無法更改暱稱"
@@ -3831,13 +3833,11 @@
 msgid "execute"
 msgstr "執行"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
-msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
-
-#, fuzzy
+msgstr "伺服器要求使用 TLS/SSL,但找不到 TLS/SSL 支援。"
+
 msgid "You require encryption, but no TLS/SSL support was found."
-msgstr "您指定必須加密,但找不到 TLS/SSL 支援。"
+msgstr "您要求加密,但找不到 TLS/SSL 支援。"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "伺服器需要經由未經加密的串流進行明文認證"
@@ -3851,57 +3851,44 @@
 msgid "Plaintext Authentication"
 msgstr "明文認證"
 
-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "認證失敗"
-
-#, fuzzy
+msgstr "SASL 認證失敗"
+
 msgid "Invalid response from server"
-msgstr "伺服器送來了無效的回應。"
+msgstr "伺服器送來了無效的回應"
 
 msgid "Server does not use any supported authentication method"
 msgstr "伺服器並不提供任何一種被支援的認證方式"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr "您指定必須加密,但這伺服器沒有加密功能。"
+msgstr "您要求加密,但這伺服器沒有加密功能。"
 
 # XXX 好像有些怪,譯文有待改進
 msgid "Invalid challenge from server"
 msgstr "伺服器送來了無效的驗證挑戰"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#, fuzzy, c-format
+#, c-format
 msgid "SASL error: %s"
-msgstr "SASL 錯誤"
+msgstr "SASL 錯誤:%s"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "BOSH 連線管理員中斷了您的工作階段。"
+
 msgid "No session ID given"
-msgstr "沒有給予原因"
-
-# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#, fuzzy
+msgstr "沒有給定工作階段代碼"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "不支援給定的 XMPP 版本"
-
-#, fuzzy
+msgstr "不支援的 BOSH 協定版本"
+
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法與伺服器建立連線"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
-
-#, fuzzy
+msgstr "無法與伺服器建立連線:%s"
+
 msgid "Unable to establish SSL connection"
-msgstr "無法初始化連結"
+msgstr "無法建立 SSL 連線"
 
 msgid "Full Name"
 msgstr "全名"
@@ -3918,6 +3905,11 @@
 msgid "Street Address"
 msgstr "街道地址"
 
+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "地址(續)"
 
@@ -3970,9 +3962,8 @@
 
 # NOTE Debian 譯「local」為「本地端」
 # XXX
-#, fuzzy
 msgid "Local Time"
-msgstr "本地端檔案:"
+msgstr "本地端時間:"
 
 msgid "Priority"
 msgstr "優先次序"
@@ -3987,11 +3978,10 @@
 
 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s前"
+
 msgid "Logged Off"
-msgstr "已登入"
+msgstr "已登出"
 
 # NOTE: 法、德文均譯「第二個名」,芬蘭文譯「其他名」,日文音譯了事
 # NOTE: 在網上幾間台灣大學寫「英文別名」,現套用,也跟芬蘭文PO檔處理手法相同
@@ -4017,7 +4007,6 @@
 msgid "Temporarily Hide From"
 msgstr "暫時隱身於"
 
-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "取消上線狀態通知"
 
@@ -4026,7 +4015,6 @@
 
 # NOTE Jabber協定的「Subscribe」一詞乃「加入好友名單」的意思
 # NOTE 見 http://www.jabber.org/user/userguide.html
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4160,9 +4148,8 @@
 msgstr "讀取聊天室清單時發生錯誤"
 
 msgid "Invalid Server"
-msgstr "無效的伺服器名"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
+msgstr "無效的伺服器名稱"
+
 # XXX
 msgid "Enter a Conference Server"
 msgstr "登入會議伺服器"
@@ -4173,26 +4160,23 @@
 msgid "Find Rooms"
 msgstr "尋找聊天室"
 
-#, fuzzy
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 msgid "Affiliations:"
-msgstr "別名:"
-
-#, fuzzy
+msgstr "從屬關係:"
+
 msgid "No users found"
-msgstr "找不到符合的使用者"
-
-#, fuzzy
+msgstr "找不到任何使用者"
+
 msgid "Roles:"
-msgstr "職責"
-
-#, fuzzy
+msgstr "身份:"
+
 msgid "Ping timed out"
 msgstr "Ping逾時"
 
 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
-msgstr ""
+msgstr "無法直接連線,但無法找到其他的 XMPP 連線方法。"
 
 msgid "Invalid XMPP ID"
 msgstr "XMPP 帳號無效"
@@ -4200,9 +4184,9 @@
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP 帳號無效,域名是必須設定的。"
 
-#, fuzzy
+# FIXME 譯文聽來好像有點怪 20070518 acli
 msgid "Malformed BOSH URL"
-msgstr "無法連線到伺服器。"
+msgstr "畸型的 BOSH 網址"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4270,10 +4254,6 @@
 msgid "Change Registration"
 msgstr "變更註冊資訊"
 
-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "無法連線到伺服器。"
-
 msgid "Error unregistering account"
 msgstr "移除帳號註冊錯誤"
 
@@ -4293,7 +4273,7 @@
 msgstr "串流重新初始中"
 
 msgid "Server doesn't support blocking"
-msgstr ""
+msgstr "伺服器不支援封鎖"
 
 msgid "Not Authorized"
 msgstr "未認證"
@@ -4610,16 +4590,16 @@
 msgid "Unable to ban user %s"
 msgstr "無法禁止使用者 %s"
 
-#  XXX 暫譯「(會員)等級」 - ambrose 20070415
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #  NOTE: Unknown affiliation 指 owner、admin、member、outcast、none 五種以外的其他不明數值
 #, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "不明的等級:「%s」"
-
-#  XXX 暫譯 - ambrose 20070415
+msgstr "不明的從屬關係:「%s」"
+
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "無法將使用者 %s 的等級設定為「%s」"
+msgstr "無法將使用者 %s 與這聊天室的從屬關係設定為「%s」"
 
 #  XXX 暫譯 - ambrose 20070415
 #  NOTE: Unknown role 指 moderator、participant、visitor、none 四種以外的其他不明數值
@@ -4640,19 +4620,20 @@
 msgid "Unable to ping user %s"
 msgstr "無法 Ping 使用者 %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "無法「嗶」使用者 %s ,因為沒有有關對方的任何資料。"
-
-#, fuzzy, c-format
+msgstr "無法「嗶」%s ,因為沒有有關對方的任何資料。"
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "無法「嗶」使用者 %s ,因為對方目前可能離線。"
-
-#, fuzzy, c-format
+msgstr "無法「嗶」%s ,因為對方目前可能離線。"
+
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "無法「嗶」使用者 %s ,因為對方的用戶端不支援這個功能。"
+msgstr ""
+"無法「嗶」%s ,因為對方的用戶端不支援這個功能,或者目前關閉了這個功能。"
 
 # XXX 這是暫譯 - acli 20070913
 #, c-format
@@ -4668,38 +4649,38 @@
 msgid "%s has buzzed you!"
 msgstr "%s「嗶」了您一聲"
 
-#, fuzzy, c-format
+# XXX 媒體? - acli 20090730
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "無法送出訊息給 %s,因為這個 JID 是無效的"
-
-#, fuzzy, c-format
+msgstr "無法與 %s 進行媒體通話,因為這個 JID 是無效的"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "無法傳送檔案至 %s,因為對方目前沒有連線"
+msgstr "無法與 %s 進行媒體通話,因為對方目前沒有連線"
 
 #  NOTE「not subscribed to user presence」是指沒有「SUB_TO」的 subscription
 #  FIXME 這很明顯是有問題的譯文,但這是這個 PO 檔現有的譯法(見「To」條);
 #  FIXME 如果這個要改,其他有關 presence 的譯文也要一齊改才行。-acli 20070614
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "無法傳送檔案至 %s,因為未獲對方認證"
-
-#, fuzzy
+msgstr "無法與 %s 進行媒體通話,因為未獲對方認證"
+
 msgid "Media Initiation Failed"
-msgstr "註冊失敗"
-
-#  FIXME 這不通順 - acli 20070614
-#, fuzzy, c-format
+msgstr "媒體通話啟動失敗"
+
+#  FIXME 這不通順 - acli 20090730
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "請指定檔案應該傳送至 %s 的那一個 Resource"
+msgstr "請指定與 %s 的那一個 Resource 進行媒體通話。"
 
 msgid "Select a Resource"
 msgstr "選擇一個 Resource"
 
-#, fuzzy
+# XXX 暫譯 - acli 20090730
 msgid "Initiate Media"
-msgstr "開啟聊天室(_C)"
+msgstr "媒體通話"
 
 msgid "config:  Configure a chat room."
 msgstr "config:設定一個聊天室"
@@ -4719,23 +4700,21 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;使用者&gt; [理由]:禁止某使用者進入聊天室"
 
-#  XXX 暫譯「(會員)等級」 - ambrose 20070415
-#, fuzzy
+#  NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0045&variant=zh-hant
 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;使用者&gt; &lt;owner|admin|member|outcast|none&gt;: 設定使用者"
-"在這聊天室內的等級"
+"affiliate &lt;使用者&gt; &lt;owner|admin|member|outcast|none&gt; [暱稱1] [暱"
+"稱2] ...: 取得與聊天室有從屬關係的使用者,或設定使用者與這聊天室內的從屬關係"
 
 #  NOTE 譯文改動 by ambrose
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt;: 設定使用者在"
-"這聊天室內的身份。"
+"role &lt;使用者&gt; &lt;moderator|participant|visitor|none&gt; [暱稱1] [暱稱"
+"2] ...: 取得在聊天室有身份的使用者,或設定使用者在這聊天室內的身份。"
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;使用者&gt; [訊息]:邀請使用者進入聊天室"
@@ -4796,7 +4775,7 @@
 msgstr "檔案傳輸代理伺服器"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH 網址"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4858,32 +4837,29 @@
 msgid "_Accept Defaults"
 msgstr "使用預設值(_A)"
 
-#, fuzzy
 msgid "No reason"
 msgstr "沒有給予原因"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "您被 %s 踢出:(%s)"
-
-#, fuzzy, c-format
+msgstr "您已被踢出:(%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "被 %s 踢出 (%s)"
-
-#, fuzzy
+msgstr "已被踢出 (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "開啟檔案途中發生錯誤。"
-
-#, fuzzy
+msgstr "帶內位元組流傳輸途中發生錯誤\n"
+
+# XXX 還是直譯「被關閉」? 20090305 acli
 msgid "Transfer was closed."
-msgstr "檔案傳輸失敗"
-
-#, fuzzy
+msgstr "傳輸已被中止。"
+
 msgid "Failed to open the file"
-msgstr "無法開啟檔案「%s」:%s"
+msgstr "無法開啟檔案"
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "無法開啟帶內位元組流"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -5226,9 +5202,25 @@
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
 
-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s 對您眨眼,<a href='msn-wink://%s'>請點擊這裏播放這個動作</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s 對您眨眼,但無法給眨眼動作存檔"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s 送來了一段語音片段,<a href='audio://%s'>請點擊這裏播放</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s 送來了一段語音片段,但無法給語音片段存檔"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
+msgstr "%s 送來了一個語音聊天的邀請,但目前還沒有語音聊天的支援。"
 
 msgid "Nudge"
 msgstr "呼叫"
@@ -5385,6 +5377,27 @@
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN 需要 SSL 程式庫的支援,請安裝一個受支援的 SSL 程式庫。"
 
+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr "所以無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址。"
+
+msgid "Unable to Add"
+msgstr "無法加入"
+
+msgid "Authorization Request Message:"
+msgstr "認證要求訊息:"
+
+msgid "Please authorize me!"
+msgstr "請通過我的認證!"
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "確定(_O)"
+
 msgid "Error retrieving profile"
 msgstr "取得個人資訊時發生錯誤"
 
@@ -5577,13 +5590,14 @@
 msgid "%s just sent you a Nudge!"
 msgstr "%s 在呼叫您!"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "不明錯誤(代碼 %d)"
+msgstr "不明錯誤(代碼 %d):%s"
 
 msgid "Unable to add user"
 msgstr "無法新增使用者"
 
+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "不明錯誤(代碼 %d)"
@@ -5655,25 +5669,21 @@
 "%s 伺服器傳來一個連線錯誤:\n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
-msgstr "這個伺服器不支援我們使用的通訊協定。"
-
-#, fuzzy
+msgstr "這個伺服器不支援我們使用的通訊協定"
+
 msgid "Error parsing HTTP"
-msgstr "解析 HTTP 途中發生錯誤。"
-
-#, fuzzy
+msgstr "解析 HTTP 途中發生錯誤"
+
 msgid "You have signed on from another location"
-msgstr "您由其他的地方登入。"
+msgstr "您由其他的地方登入"
 
 #  XXX
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
-msgstr "暫時無法使用 MSN 使服器,請過一會後重試。"
-
-#, fuzzy
+msgstr "暫時無法使用 MSN 伺服器,請過一會後重試。"
+
 msgid "The MSN servers are going down temporarily"
-msgstr "MSN 伺服器將暫時關閉。"
+msgstr "MSN 伺服器將暫時關閉"
 
 #, c-format
 msgid "Unable to authenticate: %s"
@@ -5702,13 +5712,15 @@
 msgid "Retrieving buddy list"
 msgstr "讀取好友清單中"
 
-#, fuzzy, c-format
+# FIXME 不知這是什麼意思 - acli 20090803
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
-
+msgstr "%s 要求看您的 webcam,但目前還沒有這個功能的支援。"
+
+# FIXME 不知這是什麼意思 - acli 20090803
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s 送來了一個視像聊天的邀請,但目前還沒有視像聊天的支援。"
+msgstr "%s 送來了一個 webcam 邀請,但目前還沒有這個功能的支援。"
 
 msgid "Away From Computer"
 msgstr "不在電腦前"
@@ -5906,15 +5918,15 @@
 msgstr "通訊協定錯誤,代碼 %d:%s"
 
 # NOTE 第一個 %s 是錯誤訊息
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s 您的密碼的長度為 %d 個字元,超出了估計中 MySpaceIM 所設 %d 字元的上限。請"
-"透過 http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
-"changePassword 選擇一個較短的密碼,然後重試。"
+"%s 您的密碼的長度為 %zu 個字元,超出了 %d 字元的上限。請透過 http://"
+"profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
+"選擇一個較短的密碼,然後重試。"
 
 msgid "Incorrect username or password"
 msgstr "錯誤的帳號或密碼"
@@ -6019,6 +6031,8 @@
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"設定使用者名稱途中發生錯誤。請重試,或到網址 http://editprofile.myspace.com/"
+"index.cfm?fuseaction=profile.username  設定使用者名稱。"
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM:可取得此使用者名稱"
@@ -6283,9 +6297,9 @@
 msgid "Unknown error: 0x%X"
 msgstr "未知錯誤:0x%X"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "無法 Ping 使用者 %s"
+msgstr "無法登入:%s"
 
 #  XXX 暫譯
 #, c-format
@@ -6416,7 +6430,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s 目前似乎離線,所以不會收到您剛才送出的訊息。"
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
@@ -6444,10 +6457,9 @@
 msgid "Server port"
 msgstr "伺服器通訊埠"
 
-# XXX 暫譯 - 20061025
-#, fuzzy
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
 msgid "Received unexpected response from "
-msgstr "伺服器發出了奇怪的 HTTP 回應。"
+msgstr "伺服器發出了奇怪的回應,伺服器位址 "
 
 #. username connecting too frequently
 msgid ""
@@ -6457,12 +6469,13 @@
 "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#, fuzzy, c-format
+# NOTE 參見 http://pidgin.im/pipermail/translators/2009-July/000394.html
+#, c-format
 msgid "Error requesting "
-msgstr "解析 %s 途中發生了錯誤"
+msgstr "要求途中發生了錯誤,伺服器位址 "
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL 不允許您的帳號在這裏登入"
 
 msgid "Could not join chat room"
 msgstr "無法加入聊天室"
@@ -6470,9 +6483,8 @@
 msgid "Invalid chat room name"
 msgstr "聊天室名稱無效"
 
-#, fuzzy
 msgid "Received invalid data on connection with server"
-msgstr "連線至伺服器時收到無效的資料。"
+msgstr "連線至伺服器時收到無效的資料"
 
 #. *< type
 #. *< ui_requirement
@@ -6519,7 +6531,6 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "在與遠端使用者的連線上收到無交的資料。"
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "無法與遠端使用者建立連線。"
 
@@ -6579,7 +6590,7 @@
 msgid "Request denied"
 msgstr "要求被拒"
 
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#Pidgin提供
+# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
 # NOTE 整句的意思其實係「您一次過傳送太多資訊了」
 msgid "Busted SNAC payload"
 msgstr "SNAC負載過大"
@@ -6738,17 +6749,15 @@
 msgstr "警告等級"
 
 msgid "Buddy Comment"
-msgstr "好友說明"
-
-#, fuzzy, c-format
+msgstr "好友備註"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"無法連線至認證伺服器:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "無法連線至認證伺服器:%s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "無法連線到伺服器。"
+msgstr "無法連線到 BOS 伺服器:%s"
 
 msgid "Username sent"
 msgstr "已送出使用者名稱"
@@ -6760,14 +6769,14 @@
 msgid "Finalizing connection"
 msgstr "完成連線中"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"無法登入:無法以 %s 身份登入,因為這個帳號是無效的。帳號必須為有效電郵地址;"
-"或者以英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
+"無法以 %s 身份登入,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以英文"
+"字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6785,14 +6794,13 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "使用者不存在"
-
+msgstr "使用者名稱不存在"
+
+# XXX「suspend」真是「停用」嗎?
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "您的帳號目前停用中。"
+msgstr "您的帳號目前停用中"
 
 #  NOTE「暫時無法使用」應該比「暫時不存在」通順
 #  NOTE 譯文更動 by Ambrose
@@ -6801,22 +6809,21 @@
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "暫時無法使用 AOL 即時訊息服務。"
 
+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "您所使用的用戶端程式太過老舊。請到 %s 更新"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
+"您的連線/斷線動作太過頻繁。請等待一分鐘後再行重試。如果您依然繼續嘗試著連"
 "線,那麼您的等待時間將會更加的延長。"
 
-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "您所輸入的 SecurID 碼無效。"
+msgstr "您所輸入的 SecurID 碼無效"
 
 msgid "Enter SecurID"
 msgstr "請輸入 SecurID"
@@ -6824,12 +6831,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "請輸入數碼顯示器所顯示的六位數字。"
 
-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "確定(_O)"
-
 msgid "Password sent"
 msgstr "成功送出密碼"
 
@@ -6839,12 +6840,6 @@
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "請通過我的認證要求,好讓我可以將您加入我的好友清單中。"
 
-msgid "Authorization Request Message:"
-msgstr "認證要求訊息:"
-
-msgid "Please authorize me!"
-msgstr "請通過我的認證!"
-
 msgid "No reason given."
 msgstr "沒有給予原因。"
 
@@ -7147,17 +7142,14 @@
 msgid "Away message too long."
 msgstr "離開訊息過長。"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"所以無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以"
-"英文字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
-
-msgid "Unable to Add"
-msgstr "無法加入"
+"無法新增好友「%s」,因為這個帳號是無效的。帳號必須為有效電郵地址;或者以英文"
+"字母起始,並只含英文字母、數字及空白;或者只由數字組成。"
 
 msgid "Unable to Retrieve Buddy List"
 msgstr "無法取得好友清單"
@@ -7172,18 +7164,18 @@
 msgid "Orphans"
 msgstr "孤兒們"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"因為您的好友法單中有太多的好友,所以沒有辦法加入好友 %s。請在移除部份好友後重"
-"試。"
+"因為您的好友清單中有太多的好友,所以沒有辦法加入好友 %s。請移除其中一個,然後"
+"重試。"
 
 msgid "(no name)"
 msgstr "(沒有名字)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "無法把 %s 加入好友清單,原因不明。"
 
@@ -7222,7 +7214,7 @@
 msgid "Authorization Denied"
 msgstr "認證被拒"
 
-# NOTE: 這裡的字義係由 #Pidgin 的 MrHappy 及 deryni 提供的
+# NOTE: 這裡的字義係由 #gaim 的 MrHappy 及 deryni 提供的
 # NOTE: KingAnt 提供的字義有些不同,暫時不予理會
 msgid "_Exchange:"
 msgstr "頻道號碼(_E):"
@@ -7239,10 +7231,10 @@
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "%s 的好友說明"
+msgstr "%s 的好友備註"
 
 msgid "Buddy Comment:"
-msgstr "好友說明:"
+msgstr "好友備註:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7261,7 +7253,7 @@
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "編輯好友說明"
+msgstr "編輯好友備註"
 
 msgid "Get Status Msg"
 msgstr "取得狀態訊息"
@@ -7273,12 +7265,12 @@
 msgid "Re-request Authorization"
 msgstr "重新要求認證"
 
-# NOTE Require意為「需要」,不是「要求」
+# NOTE 在這裏「Require」是指別人如果要新增您為好友,得先向您發出驗證要求,再由您允許
 msgid "Require authorization"
-msgstr "需要認證"
+msgstr "必須驗證"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "允許其他使用者在網路上查看您目前的狀態(會導致您收到垃圾訊息!)"
+msgstr "允許在網路上檢視您目前的狀態(會導致您收到垃圾訊息!)"
 
 msgid "ICQ Privacy Options"
 msgstr "ICQ 隱私選頊"
@@ -7352,9 +7344,8 @@
 msgid "Search for Buddy by Information"
 msgstr "依照資訊尋找好友"
 
-#, fuzzy
 msgid "Use clientLogin"
-msgstr "使用者沒有登入"
+msgstr "使用 clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7490,9 +7481,8 @@
 msgid "Phone Number"
 msgstr "電話號碼"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "給予認證?"
+msgstr "允許新增您為好友"
 
 msgid "Cellphone Number"
 msgstr "行動電話號碼"
@@ -7556,40 +7546,37 @@
 msgid "Note"
 msgstr "備註"
 
+# NOTE 正式的QQ介面寫「备注」(備註)
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "修改地址"
+msgstr "好友備註"
 
 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "請隨意修改備註"
+
 msgid "_Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "修改(_M)"
+
 msgid "Memo Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "修改備註"
+
+# XXX 中文正常應該不會用「says」一類的擬人字眼? - acli 20090305
 msgid "Server says:"
-msgstr "伺服器忙碌"
+msgstr "伺服器回應:"
 
 msgid "Your request was accepted."
-msgstr ""
+msgstr "請求已獲接受。"
 
 msgid "Your request was rejected."
-msgstr ""
-
-# NOTE Require意為「需要」,不是「要求」
+msgstr "請求已被拒絶。"
+
 #, c-format
 msgid "%u requires verification"
 msgstr "%u 要求認證"
 
-#, fuzzy
+# XXX 暫譯 - acli 20090803
 msgid "Add buddy question"
-msgstr "將使用者加入您的好友清單?"
+msgstr "新增好友的認證問題"
 
 msgid "Enter answer here"
 msgstr "在此輸入答案"
@@ -7606,14 +7593,16 @@
 msgid "Sorry, you're not my style."
 msgstr "不好意思,你不是我的菜…"
 
+# NOTE 請看下面 =P
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u 需要授權"
-
-#, fuzzy
+msgstr "%u 需要認證"
+
+# NOTE 這是視窗標題,對應下面的「Enter request here」和「Would you be my friend?」
 msgid "Add buddy authorize"
-msgstr "將使用者加入您的好友清單?"
-
+msgstr "新增好友認證"
+
+# NOTE 其他協定譯「認證要求訊息:」
 msgid "Enter request here"
 msgstr "在此輸入要求"
 
@@ -7631,7 +7620,7 @@
 msgstr "無效的 QQ 號碼"
 
 msgid "Failed sending authorize"
-msgstr "送出授權失敗"
+msgstr "送出認證失敗"
 
 #, c-format
 msgid "Failed removing buddy %u"
@@ -7690,10 +7679,10 @@
 msgstr "用戶"
 
 msgid "Requesting"
-msgstr ""
+msgstr "請求中"
 
 msgid "Admin"
-msgstr ""
+msgstr "管理人"
 
 msgid "Notice"
 msgstr "通知"
@@ -7719,19 +7708,17 @@
 msgid "Input request here"
 msgstr "請輸入要求"
 
-#  NOTE QQ「member」應是「成員」
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "成功加入 Qun %s (%u)"
-
-#  NOTE QQ「member」應是「成員」
+msgstr "成功加入群組 %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "成功加入 Qun"
+msgstr "成功加入群組"
 
 # NOTE 這是 QQ_ROOM_JOIN_DENIED
 #, c-format
 msgid "Qun %u denied from joining"
-msgstr "加入 Qun %u 被拒絕"
+msgstr "加入群組 %u 被拒絕"
 
 msgid "QQ Qun Operation"
 msgstr "QQ 群組操作"
@@ -7740,15 +7727,15 @@
 msgstr "失敗:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr "加入 Qun,未知的回覆"
+msgstr "加入群組途中收到未知的回覆"
 
 msgid "Quit Qun"
-msgstr "離開 Qun"
+msgstr "離開群組"
 
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
-msgstr "請注意,假如您是創立者,這最終會把這個群 (Qun) 移除。"
+msgstr "請注意,假如您是創立者,這最終會把這個群組 (Qun) 移除。"
 
 #  NOTE 這個「你」字沒有打錯,主要是法文及德文的譯者都採用「你」
 #  NOTE(法文「tu」、德文「du」)而不是「您」(「vous」、「Sie」),
@@ -7758,14 +7745,14 @@
 
 #  NOTE QQ「member」應是「成員」
 msgid "Successfully changed Qun members"
-msgstr "成功的變更了 Qun 成員"
+msgstr "成功的變更了群組成員"
 
 # FIXME 暫譯 ambrose 20070415
 msgid "Successfully changed Qun information"
 msgstr "成功的變更了 Qun 資訊"
 
 msgid "You have successfully created a Qun"
-msgstr "成功建立了一個群 (Qun)"
+msgstr "成功建立了一個群組 (Qun)"
 
 msgid "Would you like to set up detailed information now?"
 msgstr "你現在要立即設定詳細資訊嗎?"
@@ -7773,9 +7760,10 @@
 msgid "Setup"
 msgstr "設定"
 
-#, fuzzy, c-format
+# NOTE %s 為「reason」
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "使用者 %d 要求加入群組 %d"
+msgstr "使用者 %u 要求加入群組 %u,理由為「%s」"
 
 #, c-format
 msgid "%u request to join Qun %u"
@@ -7783,11 +7771,12 @@
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr ""
-
+msgstr "加入群組 %u 失敗,群組管理員為 %u"
+
+# NOTE %s 為「reason」
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>管理員 %2$u 允許了您加入群組 %1$u,理由為「%3$s」</b>"
 
 # XXX「Remove Buddy」和「Remove Contact」在中文版Pidgin無法析別;可能有改進的空間
 #, c-format
@@ -7801,9 +7790,9 @@
 
 # XXX 問題:
 # XXX gtk/gtkft.c - 「Unknown」是一指一個未能計算的數值,譯「未知」較好
-# XXX libPidgin/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
+# XXX libgaim/account.c - 「Unknown」指不知道是什麼通訊協定,譯「不明」較好(因為一定「曾經知道」,
 # XXX                      我在「帳號清單」看見「未知」真的看了很久也看不明白)
-# XXX libPidgin/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
+# XXX libgaim/protocols/* - 「Unknown」指不明的好友狀態,可能是指「不明」(通訊系統回報的狀態是「不明」)
 # XXX                       或者「未知」(出現了 Pidgin 未見過的狀態代號)
 # XXX - Ambrose 20061123
 #, c-format
@@ -7866,9 +7855,12 @@
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>伺服器位址</b>:%s<br>\n"
 
-#, fuzzy, c-format
+#  NOTE 直譯:「客戶端旗標」
+#  NOTE 根據原始碼,所謂 Client Tag 係指你的客戶端有什麼功能 (qq2007、QQ2008等等)
+#  NOTE 在OSCAR協定模組對應的欄位 (Capabilities) 譯「相容性」
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>登入時間:</b>%s<br>\n"
+msgstr "<b>相容性:</b>%s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
@@ -7927,7 +7919,7 @@
 msgstr "<p><b>仔細的品管人員</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "如有遺漏務請通知……謝謝!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>還有所有幕後默默貢獻的無名英雄們…</i><br>\n"
@@ -7949,14 +7941,13 @@
 msgstr "帳號資訊"
 
 msgid "Update all QQ Quns"
-msgstr ""
+msgstr "更新所有 QQ 群"
 
 msgid "About OpenQ"
 msgstr "關於 OpenQ"
 
-#, fuzzy
 msgid "Modify Buddy Memo"
-msgstr "修改地址"
+msgstr "修改好友備註"
 
 #. *< type
 #. *< ui_requirement
@@ -7998,7 +7989,7 @@
 msgstr "顯示伺服器是日訊息"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "收到聊天室訊息時自動顯示聊天室"
 
 # XXX 20080810 acli - 譯文有待改進,原文也是
 msgid "Keep alive interval (seconds)"
@@ -8008,7 +7999,6 @@
 msgid "Update interval (seconds)"
 msgstr "每隔多少秒更新"
 
-#, fuzzy
 msgid "Unable to decrypt server reply"
 msgstr "無法解密伺服器回應"
 
@@ -8028,7 +8018,7 @@
 #. need activation
 #. need activation
 msgid "Activation required"
-msgstr "必須啟動帳號"
+msgstr "必須先啟動帳號"
 
 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
@@ -8046,9 +8036,11 @@
 msgid "Captcha Image"
 msgstr "驗證圖片"
 
+# NOTE 這裏的所謂「Enter code」係指輸入驗證圖片上所寫的文字
 msgid "Enter code"
-msgstr "輸入啟動碼"
-
+msgstr "輸入驗證文字"
+
+# NOTE 視窗標題
 msgid "QQ Captcha Verification"
 msgstr "QQ 圖示驗證"
 
@@ -8071,17 +8063,15 @@
 msgid "Socket error"
 msgstr "Socket 錯誤"
 
-#, fuzzy
 msgid "Getting server"
-msgstr "設定使用者資訊..."
+msgstr "取得伺服器位址中"
 
 # XXX 這是看了原始碼後的結論(但可能會錯)- acli 20080930
 msgid "Requesting token"
 msgstr "請求符記中"
 
-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "無法連線到伺服器。"
+msgstr "無法解析主機名稱"
 
 msgid "Invalid server or port"
 msgstr "伺服器或通訊埠無效"
@@ -8136,15 +8126,14 @@
 msgid "QQ Qun Command"
 msgstr "QQ 群組指令"
 
-#, fuzzy
 msgid "Unable to decrypt login reply"
-msgstr "無法解密伺服器回應"
+msgstr "無法解密登入回應"
 
 msgid "Unknown LOGIN CMD"
 msgstr "未知的登入指令"
 
 msgid "Unknown CLIENT CMD"
-msgstr "無知的用戶端指令"
+msgstr "不明的用戶端指令"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -8270,7 +8259,6 @@
 msgid "Create New Conference..."
 msgstr "開啟新會議室..."
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite user to a conference"
 msgstr "邀請使用者進入會議室"
 
@@ -8283,12 +8271,11 @@
 "從下方的清單中選取一個會議室,同時發出邀請給使用者%s。如果您想開啟一個新的會"
 "議室,並且邀請這個使用者加入,您可以選擇「開啟新會議室」選項。"
 
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
 msgid "Invite to Conference"
 msgstr "邀請進入會議室"
 
 msgid "Invite to Conference..."
-msgstr "邀請進入會議室"
+msgstr "邀請進入會議室..."
 
 #  XXX 要覆查 - 20061029
 msgid "Send TEST Announcement"
@@ -9125,7 +9112,6 @@
 msgid "Disconnected by server"
 msgstr "伺服器中斷了連線"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "連線至 SILC 伺服器時發生錯誤"
 
@@ -9139,22 +9125,16 @@
 msgid "Performing key exchange"
 msgstr "交換密鑰中"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
-msgstr "無法讀取 SILC 密鑰對"
+msgstr "無法載入 SILC 密鑰對"
 
 #. Progress
 msgid "Connecting to SILC Server"
 msgstr "連線至 SILC 伺服器中"
 
-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "無法讀取 SILC 密鑰對"
-
 msgid "Out of memory"
 msgstr "記憶體不夠"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "無法初始化 SILC 協定"
 
@@ -9455,9 +9435,8 @@
 msgid "Creating SILC key pair..."
 msgstr "產生 SILC 密鑰對中..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "無法產生 SILC 密鑰對\n"
+msgstr "無法產生 SILC 密鑰對"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9595,7 +9574,6 @@
 msgid "Failure: Authentication failed"
 msgstr "失敗:認證失敗"
 
-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "無法初始化 SILC 的用戶端連線"
 
@@ -9603,20 +9581,18 @@
 msgid "John Noname"
 msgstr "無名氏"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
-msgstr "無法讀取 SILC 密鑰對:%s"
+msgstr "無法載入 SILC 密鑰對:%s"
 
 msgid "Unable to create connection"
 msgstr "無法建立連結"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "不明的伺服器回應。"
-
-#, fuzzy
+msgstr "不明的伺服器回應"
+
 msgid "Unable to create listen socket"
-msgstr "無法建立 Socket"
+msgstr "無法建立監聽 Socket"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 的帳號不可含有空白字元或「@」符號"
@@ -9679,7 +9655,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 協定模組"
 
@@ -9711,9 +9686,8 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天室通訊埠"
 
-#, fuzzy
 msgid "Yahoo JAPAN ID..."
-msgstr "Yahoo 帳號"
+msgstr "Yahoo JAPAN 帳號..."
 
 #. *< type
 #. *< ui_requirement
@@ -9725,12 +9699,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo 協定模組"
+msgstr "Yahoo JAPAN 協定模組"
 
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "無法發送您的短訊"
 
 # NOTE 譯文更動 by Ambrose
 msgid "Your Yahoo! message did not get sent."
@@ -9757,28 +9730,24 @@
 msgstr "新增好友被拒"
 
 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "連線至伺服器時收到無效的資料。"
+msgstr "收到無效的資料"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
-msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
+msgstr "帳號已被封鎖:登入失敗次數太多。登入 Yahoo 網站或許可以解除封鎖。"
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
-msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
+msgstr "帳號已被封鎖:原因不明。登入 Yahoo 網站或許可以解除封鎖。"
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "錯誤的帳號或密碼"
+msgstr "未有輸入帳號或密碼"
 
 #, c-format
 msgid ""
@@ -9803,18 +9772,18 @@
 msgid "Ignore buddy?"
 msgstr "忽略使用者?"
 
+# NOTE「封鎖」好像比「暫時關閉」通順? - acli 20090730
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "你的帳戶目前被暫時關閉。請您登入 Yahoo! 網站。"
+msgstr "您的帳戶目前已被封鎖。請您登入 Yahoo! 網站。"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "未知的錯誤代碼 %d。已經登入到 Yahoo!,官方網站上可能已經修正這個錯誤。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr "無法將好友「%1$s」新增至帳號「%3$s」在伺服器上的清單內的群組「%2$s」。"
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "無法將好友新增至伺服器上的清單內"
 
@@ -9823,21 +9792,16 @@
 msgstr "[ 音效檔 %s/%s/%s.swf ] %s"
 
 # XXX 暫譯 - 20061025
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "伺服器發出了奇怪的 HTTP 回應。"
-
-#, fuzzy, c-format
+msgstr "伺服器發出了奇怪的 HTTP 回應"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"與 %s 之間的連線突然中斷:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "與 %s 之間的連線突然中斷:%s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"無法與伺服器建立連線:\n"
-"%s"
+msgstr "無法與 %s 建立連線:%s"
 
 msgid "Not at Home"
 msgstr "不在家"
@@ -9879,7 +9843,7 @@
 msgid "Don't Appear Permanently Offline"
 msgstr "停止長期報稱離線"
 
-# NOTE #Pidgin 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
+# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join in Chat"
 msgstr "加入好友目前所在的聊天室"
@@ -9895,9 +9859,9 @@
 msgstr "開始 Doodle"
 
 msgid "Select the ID you want to activate"
-msgstr ""
-
-# NOTE #Pidgin 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
+msgstr "請輸入希望啟動的 ID"
+
+# NOTE #gaim 的 Vann 及 LSchiere 解:如果選取了的好友目前處於一個聊天,便加入該個聊天
 # NOTE Yahoo 的「Chat」正式譯文為「聯誼園地」
 msgid "Join whom in chat?"
 msgstr "加入誰的聊天室?"
@@ -9920,9 +9884,9 @@
 msgid "Unable to connect."
 msgstr "無法連線。"
 
-# TODO - 覆查譯文 - 20061028
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=descriptor&qrytype=en&x=0&y=0
 msgid "Unable to establish file descriptor."
-msgstr "無法建立檔案介紹。"
+msgstr "無法建立檔描述符。"
 
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
@@ -9994,11 +9958,8 @@
 msgstr "這個使用者的資訊是空白的。"
 
 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
-
-msgid "Invitation Rejected"
-msgstr "邀請被婉拒了"
+msgid "%s has declined to join."
+msgstr "%s 婉拒了加入聊天室。"
 
 msgid "Failed to join chat"
 msgstr "無法加入聊天室"
@@ -10053,7 +10014,6 @@
 msgid "User Rooms"
 msgstr "使用者建立之聊天室"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
 msgstr "與 YCHT 伺服器出現連線錯誤"
 
@@ -10177,7 +10137,7 @@
 # NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Export to .anyone"
@@ -10189,7 +10149,7 @@
 # NOTE: 這是Zephyr使用者會自然明白的術語,不用費心解釋
 # NOTE: aatharuv: Most zephyr clients use ".anyone" to store the Zephyr
 # NOTE: buddylist. The export to .anyone option controls whether you want
-# NOTE: Pidgin to write to .anyone upon logout. Some people use multiple
+# NOTE: gaim to write to .anyone upon logout. Some people use multiple
 # NOTE: clients and prefer to have separate buddylists for separate clients.
 # NOTE: Similarly, .zephyr.subs controls the chats that a person subs.
 msgid "Import from .anyone"
@@ -10207,17 +10167,18 @@
 msgid "Exposure"
 msgstr "現身程度"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "無法解析 HTTP 代理伺服應的回應:%s\n"
+msgstr "無法解析 HTTP 代理伺服應的回應:%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理伺服器連線錯誤 %d"
 
-#, fuzzy, c-format
+# NOTE 參閱 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=tunnel&qrytype=en&x=35&y=11
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "拒絕存取:HTTP 代理伺服器禁止通訊埠 %d 的資料傳送。"
+msgstr "拒絕存取:HTTP 代理伺服器禁止使用通訊埠 %d 穿隧"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10462,12 +10423,15 @@
 msgid "Address already in use."
 msgstr "位址已在使用中"
 
+# NOTE 這個 %s 係指 filename
 #, c-format
 msgid "Error Reading %s"
 msgstr "讀取 %s 途中發生了錯誤"
 
-# NOTE 「They」是什麼呢?譯成「它們」的話,「它們」又是什麼呢?寫長一點好了。
-#, fuzzy, c-format
+# NOTE 第一個 %s 是 description,第二個 %s 是 filename_full
+# NOTE 上文有註釋「If we could not parse the file then show the user an error message」
+# NOTE 所以所謂「reading」其實係指「解析」而不是「讀入」
+#, 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~."
@@ -10519,8 +10483,8 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "使用下列好友圖示(_I):"
 
-msgid "_Advanced"
-msgstr "進階設定(_A)"
+msgid "Ad_vanced"
+msgstr "進階設定(_V)"
 
 msgid "Use GNOME Proxy Settings"
 msgstr "使用 GNOME 的代理伺服器設定"
@@ -10584,9 +10548,8 @@
 msgid "Create _this new account on the server"
 msgstr "在伺服器上建立這個新帳號(_T)"
 
-#, fuzzy
-msgid "_Proxy"
-msgstr "代理伺服器"
+msgid "P_roxy"
+msgstr "代理伺服器(_R)"
 
 msgid "Enabled"
 msgstr "啟動"
@@ -10633,9 +10596,8 @@
 msgid "Please update the necessary fields."
 msgstr "請按需要更新欄位內的資訊。"
 
-#, fuzzy
 msgid "A_ccount"
-msgstr "帳號"
+msgstr "帳號(_C)"
 
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
@@ -10660,17 +10622,14 @@
 msgid "I_M"
 msgstr "即時訊息(_M)"
 
-#, fuzzy
 msgid "_Audio Call"
-msgstr "新增聊天室(_A)"
+msgstr "語音通話(_A)"
 
 msgid "Audio/_Video Call"
-msgstr ""
-
-# XXX 暫譯
-#, fuzzy
+msgstr "語音/視像通話"
+
 msgid "_Video Call"
-msgstr "視像聊天"
+msgstr "視像通話(_V)"
 
 msgid "_Send File..."
 msgstr "傳送檔案(_S)..."
@@ -10681,11 +10640,9 @@
 msgid "View _Log"
 msgstr "觀看日誌(_L)"
 
-#, fuzzy
 msgid "Hide When Offline"
 msgstr "離線時隱藏"
 
-#, fuzzy
 msgid "Show When Offline"
 msgstr "離線時顯示"
 
@@ -10817,9 +10774,8 @@
 msgid "/Tools/_Certificates"
 msgstr "/工具/憑證(_C)"
 
-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
-msgstr "/工具/表情(_Y)"
+msgstr "/工具/自定表情(_Y)"
 
 msgid "/Tools/Plu_gins"
 msgstr "/工具/模組(_G)"
@@ -10949,8 +10905,9 @@
 msgid "By status"
 msgstr "依照狀態"
 
+# XXX 暫譯 20090305 acli
 msgid "By recent log activity"
-msgstr ""
+msgstr "依照日誌更新時間"
 
 #, c-format
 msgid "%s disconnected"
@@ -10967,7 +10924,7 @@
 msgstr "重新啟動"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL 常見問題"
 
 msgid "Welcome back!"
 msgstr "歡迎歸來!"
@@ -11099,109 +11056,99 @@
 msgstr "背景顏色"
 
 msgid "The background color for the buddy list"
-msgstr ""
-
-#, fuzzy
+msgstr "好友清單的背景顏色"
+
 msgid "Layout"
-msgstr "寮國文"
+msgstr "佈局"
 
 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "好友清單內圖示、名稱和狀態的佈局"
 
 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "背景顏色"
+msgstr "展開的群組的背景顏色"
 
 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "群組展開時的群組名稱的背景顏色"
+
+# NOTE 根據gtkblist-theme-loader的原始碼,這個「文字」選項應該係指PidginThemeFont(字體名稱、字體顏色兩項),下同
 msgid "Expanded Text"
-msgstr "展開(_E)"
+msgstr "展開的群組的名稱"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "群組展開時群組名稱的字體及文字顏色"
+
 msgid "Collapsed Background Color"
-msgstr "設定背景顏色"
+msgstr "收起的群組的背景顏色"
 
 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "群組收起時群組名稱的背景顏色"
+
 msgid "Collapsed Text"
-msgstr "收起(_C)"
+msgstr "收起的群組的名稱"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "群組收起時群組名稱的字體及文字顏色"
 
 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "設定背景顏色"
+msgstr "好友/聊天室的背景顏色"
 
 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "好友或聊天室名稱的背景顏色"
+
 msgid "Contact Text"
-msgstr "捷徑"
-
+msgstr "整組好友的名稱"
+
+# NOTE "the text font and color to be used for expanded contacts" (blist-theme.h)
+# NOTE 根據deryni的解釋,當contact收起時,我們見到的是priority buddy
+# NOTE 但當contact展開時,我們見到的是一個contact的名稱和包含在contact內的所有buddy
+# NOTE 照推理,所謂「text information for when a contact is expanded」應該是指contact的名稱
 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "好友展開時整組好友的名稱的字體及文字顏色"
+
 msgid "On-line Text"
-msgstr "上線"
+msgstr "上線好友的名稱"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "好友上線時好友名稱的字體及文字顏色"
+
 msgid "Away Text"
-msgstr "離開"
+msgstr "離開好友的名稱"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "好友離開時好友名稱的字體及文字顏色"
+
 msgid "Off-line Text"
-msgstr "離線"
+msgstr "離線好友的名稱"
 
 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-# XXX 要覆查 - acli 20070914
-#, fuzzy
+msgstr "好友離線時好友名稱的字體及文字顏色"
+
 msgid "Idle Text"
-msgstr "情緒描述"
+msgstr "閒置好友的名稱"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "好友閒置時好友名稱的字體及文字顏色"
+
 msgid "Message Text"
-msgstr "訊息送出"
+msgstr "有未讀訊息的好友名稱"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "好友有未讀訊息時好友名稱的字體及文字顏色"
 
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "提到您的暱稱的聊天室名稱"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
-
-#, fuzzy
+msgstr "聊天室中提到您的暱稱時聊天室名稱的字體及文字顏色"
+
 msgid "The text information for a buddy's status"
-msgstr "更改 %s 的個人資訊"
+msgstr "好友狀態的字體及文字顏色"
 
 # XXX 譯文有待改進 - acli 20070913
-#, fuzzy
 msgid "Type the host name for this certificate."
 msgstr "請輸入這張憑證所屬的主機名稱。"
 
@@ -11253,7 +11200,6 @@
 msgid "Get Away Message"
 msgstr "取得離開訊息"
 
-#, fuzzy
 msgid "Last Said"
 msgstr "上次提到"
 
@@ -11302,21 +11248,18 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/交談/清空交談內容(_R)"
 
-#, fuzzy
+# XXX 媒體?  - acli 20090730
 msgid "/Conversation/M_edia"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體(_E)"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體/語音通話(_A)"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/交談/更多(_O)"
-
-#, fuzzy
+msgstr "/交談/媒體/視像通話(_V)"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/交談/觀看歷史記錄(_L)"
+msgstr "/交談/媒體/語音/視像通話(_C)"
 
 msgid "/Conversation/Se_nd File..."
 msgstr "/交談/傳送檔案(_N)..."
@@ -11390,17 +11333,15 @@
 msgid "/Conversation/View Log"
 msgstr "/交談/觀看歷史記錄"
 
-#, fuzzy
+# XXX 媒體? - acli 20090730
 msgid "/Conversation/Media/Audio Call"
-msgstr "/交談/更多"
-
-#, fuzzy
+msgstr "/交談/媒體/語音通話"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/交談/觀看歷史記錄"
-
-#, fuzzy
+msgstr "/交談/媒體/視像通話"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/交談/更多"
+msgstr "/交談/媒體/語音/視像通話"
 
 msgid "/Conversation/Send File..."
 msgstr "/交談/傳送檔案..."
@@ -11600,7 +11541,7 @@
 msgstr "張家興"
 
 msgid "voice and video"
-msgstr ""
+msgstr "語音及視像功能"
 
 msgid "support"
 msgstr "支援"
@@ -11738,9 +11679,8 @@
 msgid "Hungarian"
 msgstr "匈牙利文"
 
-#, fuzzy
 msgid "Armenian"
-msgstr "羅馬尼亞文"
+msgstr "亞美尼亞文"
 
 msgid "Indonesian"
 msgstr "印尼文"
@@ -11763,9 +11703,9 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu 旗下所有喬治亞文翻譯人員"
 
-#, fuzzy
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 msgid "Khmer"
-msgstr "其他"
+msgstr "高棉文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=K
 # NOTE 註:KDE 譯「坎納達」
@@ -11865,8 +11805,9 @@
 msgid "Swedish"
 msgstr "瑞典文"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=swahili&qrytype=en&x=29&y=7
 msgid "Swahili"
-msgstr ""
+msgstr "斯瓦西里文"
 
 # NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=T
 # NOTE 港一般譯「泰米爾」,台一般譯「塔米爾」(看來較常見)或「泰米爾」
@@ -11949,7 +11890,7 @@
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
-"<FONT SIZE=\"4\">IRC 頻道</FONT> irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
+"<FONT SIZE=\"4\">IRC 頻道:</FONT>irc.freenode.net 上的 #pidgin 頻道<BR><BR>"
 
 #, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
@@ -11959,8 +11900,8 @@
 msgid "Current Developers"
 msgstr "現任開發者"
 
-# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on Pidgin ;-)
-# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 Pidgin 賣力」
+# NOTE LSchiere2: wing: it means they must be crazy or they wouldn't work on gaim ;-)
+# NOTE Luke Schierer 說:「這些人一個是瘋了,否則不會為 gaim 賣力」
 # NOTE 所以正確的譯文應是「瘋癲的模組作者」或者「模組的瘋癲作者」之類……
 # NOTE 不過這樣好像有點過份,所以翻成「狂熱的模組作者」會比較好 :P
 msgid "Crazy Patch Writers"
@@ -12193,14 +12134,6 @@
 msgid "File transfer _details"
 msgstr "檔案傳輸細節(_D)"
 
-#. Pause button
-msgid "_Pause"
-msgstr "暫停(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "恢復(_R)"
-
 #  NOTE Nautilus譯「貼上文本」,Abiword譯「未格式化貼上」,聽來都有些怪
 msgid "Paste as Plain _Text"
 msgstr "貼上純文字(_T)"
@@ -12220,7 +12153,6 @@
 msgid "Hyperlink visited color"
 msgstr "瀏覽過的連結顏色"
 
-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "當滑鼠經過瀏覽過(或已啟動)的連結時的連結顏色。"
 
@@ -12258,21 +12190,18 @@
 msgstr ""
 "收到的訊息是對方以「輕聲的說」這種動作發出的訊息時,用來顯示對方帳號的顏色"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "收到的訊息是代表對方發出的一個動作時,用來顯示對帳號的顏色。"
+msgstr "收到的訊息是代表對方「輕聲的說」時,用來顯示對帳號的顏色。"
 
 msgid "Whisper Message Name Color"
 msgstr "輕聲訊息帳號顏色"
 
-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "收到的訊息是代表對方發出的一個動作時,用來顯示對帳號的顏色。"
+msgstr "收到的訊息是輕聲訊息時,用來顯示對帳號的顏色。"
 
 msgid "Typing notification color"
 msgstr "輸入通知顏色"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
 msgstr "用來顯示輸入通知的顏色"
 
@@ -12286,7 +12215,7 @@
 msgid "Enable typing notification"
 msgstr "啟用輸入通知"
 
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -12296,7 +12225,7 @@
 "\n"
 "暫且當成 PNG 檔處理。"
 
-# NOTE "Defaulting to PNG" 是指 Pidgin 在無計可施的情況下盲猜影像是 PNG 格式
+# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -12533,7 +12462,7 @@
 
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12555,6 +12484,7 @@
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網路實際狀態,強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12565,7 +12495,7 @@
 
 #  FIXME
 #  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12586,6 +12516,7 @@
 "\n"
 "  -c, --config=DIR    設定檔所在目錄\n"
 "  -d, --debug         在標準輸出中顯示除錯訊息\n"
+"  -f, --force-online  忽略網路實際狀態,強制將狀態設為上線\n"
 "  -h, --help          顯示輔助訊息並離開\n"
 "  -m, --multiple      允許同時執行多個Pidgin進程\n"
 "  -n, --nologin       不自動登入\n"
@@ -12620,23 +12551,25 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
+# XXX 媒體? - acli 20090730
 msgid "/_Media"
-msgstr ""
-
+msgstr "/媒體(_M)"
+
+# XXX 暫譯 - acli 20090730
 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/媒體/掛斷(_H)"
+
+# XXX 暫譯 - acli 20090730
 msgid "Calling..."
-msgstr "計算中..."
+msgstr "撥打中..."
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s 希望跟您進行語音/視像通話。"
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s 希望跟您進行視像通話。"
 
 #, c-format
 msgid "%s has %d new message."
@@ -12665,9 +12598,8 @@
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "您選用了「使用者自定瀏覽器」,卻未有設定指令。"
 
-#, fuzzy
 msgid "No message"
-msgstr "不明的訊息"
+msgstr "沒有訊息"
 
 msgid "Open All Messages"
 msgstr "開啟所有訊息"
@@ -12675,16 +12607,18 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有郵件!</span>"
 
-#, fuzzy
+# XXX 這似乎是「好友狀態捕捉」發生時的通知視窗的視窗標題
+# XXX 暫譯,譯文有待改進 - acli 20090730
 msgid "New Pounces"
-msgstr "新增好友狀態捕捉"
-
+msgstr "新發生的好友狀態捕捉"
+
+# XXX 譯「確定」是否較正常? - acli 20090730
 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "關閉"
+
+# XXX 暫譯,譯文有待改進 - acli 20090730
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">您有郵件!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">您捕捉到了好友狀態!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "以下的模組將會被卸載。"
@@ -12732,7 +12666,6 @@
 msgid "Select a file"
 msgstr "選擇檔案"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "編輯好友狀態捕捉"
 
@@ -12809,64 +12742,59 @@
 msgid "Pounce Target"
 msgstr "捕捉目標"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
 msgstr "開始輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Paused while typing"
 msgstr "暫停輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed on"
 msgstr "登入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s 由閒置返回 (%s)"
-
-#, fuzzy, c-format
+msgstr "由閒置返回"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "返回"
-
-#, fuzzy, c-format
+msgstr "由離開返回"
+
+#, c-format
 msgid "Stopped typing"
 msgstr "停止輸入"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
 msgstr "登出"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Became idle"
 msgstr "閒置"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Went away"
-msgstr "離開期間"
-
-#, fuzzy, c-format
+msgstr "離開"
+
+#, c-format
 msgid "Sent a message"
 msgstr "送出訊息"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "未知的捕捉事件。請回報這個問題!"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "未知的捕捉事件……請回報這個問題!"
+
+# XXX 要覆查 - 20090730
 msgid "Theme failed to unpack."
-msgstr "無法打開表情主題。"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "無法解開表情主題檔。"
+
 msgid "Theme failed to load."
-msgstr "無法打開表情主題。"
-
-# XXX 要覆查 - 20061025
-#, fuzzy
+msgstr "無法載入表情主題。"
+
 msgid "Theme failed to copy."
-msgstr "無法打開表情主題。"
+msgstr "無法複製表情主題。"
 
 #  NOTE 直譯「安裝主題」好像很無棱兩可,加個「檔」字好像較好
 msgid "Install Theme"
@@ -12889,9 +12817,8 @@
 msgstr "允許使用 Escape 鍵關閉交談(_O)"
 
 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "好友清單"
+msgstr "好友清單主題"
 
 #. System Tray
 msgid "System Tray Icon"
@@ -12903,9 +12830,8 @@
 msgid "On unread messages"
 msgstr "有未讀訊息時"
 
-#, fuzzy
 msgid "Conversation Window"
-msgstr "即時訊息交談視窗"
+msgstr "交談視窗"
 
 msgid "_Hide new IM conversations:"
 msgstr "隱藏新的即時訊息交談(_H):"
@@ -13011,9 +12937,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">例:stunserver.org</span>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "自動偵測 IP 位址(_A)"
+msgstr "使用自動偵測得來的 IP 位址(_A):%s"
 
 msgid "Public _IP:"
 msgstr "公共IP (_I):"
@@ -13033,9 +12959,10 @@
 msgid "_End port:"
 msgstr "結束通訊埠(_E):"
 
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=relay&qrytype=en&x=29&y=11
 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "中繼伺服器 (TURN)"
 
 msgid "Proxy Server &amp; Browser"
 msgstr "代理伺服器及瀏覽器"
@@ -13217,7 +13144,7 @@
 msgstr "以鍵盤及滑鼠的使用為基準"
 
 msgid "_Auto-reply:"
-msgstr "何時送出自動回應:"
+msgstr "何時送出自動回應(_A):"
 
 msgid "When both away and idle"
 msgstr "當離開並同時閒置時"
@@ -13382,11 +13309,10 @@
 msgid "Status for %s"
 msgstr "狀態:%s"
 
-# XXX 20080810 acli - 暫譯
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
-msgstr "給定的捷徑已有相關的自訂表情,請指定另一個捷徑。"
+msgstr "「%s」已自訂表情,請指定另一個捷徑。"
 
 msgid "Custom Smiley"
 msgstr "自訂表情"
@@ -13400,28 +13326,26 @@
 msgid "Add Smiley"
 msgstr "新增表情"
 
-#, fuzzy
 msgid "_Image:"
-msgstr "影像(_I)"
-
+msgstr "影像(_I):"
+
+# XXX 暫譯 - 20090305 acli
 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "捷徑"
+msgstr "捷徑文字(_H):"
 
 msgid "Smiley"
 msgstr "表情"
 
-#, fuzzy
+# XXX 暫譯 - 20090305 acli
 msgid "Shortcut Text"
-msgstr "捷徑"
+msgstr "捷徑文字"
 
 msgid "Custom Smiley Manager"
 msgstr "自訂表情管理"
 
-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "選擇好友"
+msgstr "選擇好友圖示"
 
 msgid "Click to change your buddyicon for this account."
 msgstr "點選以更改這個帳號的圖示。"
@@ -13506,7 +13430,6 @@
 msgid "Cannot send launcher"
 msgstr "無法傳送啟動器"
 
-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
@@ -13541,9 +13464,8 @@
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "無法載入影像「%s」,原因不明,大概是影像檔已損壞"
 
-#, fuzzy
 msgid "_Open Link"
-msgstr "在瀏覽器中打開連結(_O):"
+msgstr "打開連結(_O)"
 
 msgid "_Copy Link Location"
 msgstr "複製連結位址(_C)"
@@ -13551,9 +13473,21 @@
 msgid "_Copy Email Address"
 msgstr "複製電子郵件地址(_C)"
 
+msgid "_Open File"
+msgstr "開啟檔案(_O)"
+
+msgid "Open _Containing Directory"
+msgstr "開啟上層目錄(_C)"
+
 msgid "Save File"
 msgstr "儲存檔案"
 
+msgid "_Play Sound"
+msgstr "播放音效(_P)"
+
+msgid "_Save File"
+msgstr "儲存檔案(_S)"
+
 msgid "Select color"
 msgstr "選擇顏色"
 
@@ -13578,6 +13512,9 @@
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+msgid "_Pause"
+msgstr "暫停(_P)"
+
 # TODO 要覆查 - 20080826
 msgid "_Edit"
 msgstr "修改(_E)"
@@ -13649,80 +13586,73 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "顯示一些有關好友的在線狀態的統計"
 
-#, fuzzy
+#  NOTE 這是「Select an XMPP server to query」所在視窗的標題
 msgid "Server name request"
-msgstr "伺服器位址"
-
-# NOTE「會議室」是暫時的意譯。Yahoo! 好像沒有為「Conference」提供正式中譯名。
-# XXX
-#, fuzzy
+msgstr "要求伺服器名稱"
+
+#  XXX 這是半肓猜,看了原始碼也看不明,開發者又不答我的問題 - acli 20090803
 msgid "Enter an XMPP Server"
-msgstr "登入會議伺服器"
-
-#, fuzzy
+msgstr "請輸入 XMPP 伺服器名稱"
+
 msgid "Select an XMPP server to query"
-msgstr "選擇查詢的會議伺服器"
-
-#  XXX 暫譯
-#, fuzzy
+msgstr "選擇查詢的 XMPP 伺服器"
+
+#  NOTE 這是按鈕
+#  FIXME 譯文有待改進 - acli 20090730
 msgid "Find Services"
-msgstr "所用之線上服務"
-
-#, fuzzy
+msgstr "搜尋服務"
+
 msgid "Add to Buddy List"
-msgstr "送出好友清單"
-
-#, fuzzy
+msgstr "新增至好友清單"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=gateway&qrytype=en&x=27&y=7
 msgid "Gateway"
-msgstr "離開"
-
-#, fuzzy
+msgstr "閘道器"
+
 msgid "Directory"
-msgstr "日誌目錄"
-
-#, fuzzy
+msgstr "目錄"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=collection&qrytype=en&x=30&y=9
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Collection"
-msgstr "選取音效"
-
-#, fuzzy
+msgstr "PubSub 集子節點"
+
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/standard.jsp?keyword=leaf&qrytype=en&x=37&y=11
+# NOTE 參見 http://wiki.jabbercn.org/index.php?title=XEP-0060&variant=zh-hant
 msgid "PubSub Leaf"
-msgstr "PubSub 服務"
-
-#, fuzzy
+msgstr "PubSub 葉子節點"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "描述"
+msgstr ""
+"\n"
+"<b>描述:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "服務探尋資訊"
-
-#, fuzzy
+msgstr "服務探索"
+
 msgid "_Browse"
-msgstr "瀏覽器(_B):"
-
-#, fuzzy
+msgstr "瀏覽(_B)"
+
 msgid "Server does not exist"
-msgstr "使用者不存在"
-
-#, fuzzy
+msgstr "伺服器不存在"
+
 msgid "Server does not support service discovery"
-msgstr "伺服器並不提供任何一種被支援的認證方式"
-
-#, fuzzy
+msgstr "伺服器不支援服務探索"
+
 msgid "XMPP Service Discovery"
-msgstr "服務探尋資訊"
-
+msgstr "XMPP 服務探索"
+
+#  FIXME 譯文有待改進 - acli 20090730
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "讓您瀏覽和註冊服務。"
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
+msgstr "幫助在傳統的傳送協定或其他 XMPP 服務中註冊。"
 
 msgid "Buddy is idle"
 msgstr "好友閒置"
@@ -14131,7 +14061,6 @@
 msgstr "集體作曲用的音樂訊息模組"
 
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
@@ -14261,7 +14190,6 @@
 msgid "Highlighted Message Name Color"
 msgstr "已標示訊息名稱顏"
 
-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "輸入通知顏色"
 
@@ -14296,23 +14224,20 @@
 msgstr ""
 
 # XXX 這是我譯的,但我認為這是很差的譯文,看了也不知是什麼 - acli 20080511
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "啟用輸入通知"
-
-#, fuzzy
+msgstr "停用輸入通知"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Pidgin GTK+ 佈景主題設定"
-
-#, fuzzy
+msgstr "GTK+ 佈景主題控制設定"
+
 msgid "Colors"
-msgstr "關閉"
+msgstr "顏色"
 
 msgid "Fonts"
 msgstr "字型"
 
 msgid "Miscellaneous"
-msgstr ""
+msgstr "雜項"
 
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc檔專用工具"
@@ -14353,10 +14278,10 @@
 msgid "New Version Available"
 msgstr "有新版本"
 
+# NOTE 這個「Later」是指「稍後下載」(即說:我知道有新版本了,稍後我會下載,暫時別煩我)
 msgid "Later"
-msgstr "稍後"
-
-# NOTE: ui_name, ui_website - 這是「請從ui_website下載ui_name」的廣告訊息(quit message),ui_name通常就是「pidgin」
+msgstr "稍後下載"
+
 msgid "Download Now"
 msgstr "立即下載"
 
@@ -14400,7 +14325,6 @@
 
 # XXX 譯文有待改進 - acli 20080508
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -14459,103 +14383,85 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "依照使用者所定義的規則來取代送出訊息中的文字。"
 
-#, fuzzy
 msgid "Just logged in"
-msgstr "尚未登入"
-
-#, fuzzy
+msgstr "剛巧登入"
+
 msgid "Just logged out"
-msgstr "尚未登入"
+msgstr "剛巧登出"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-# TODO 看起來應該為加一個新的聊天室,並把聊天室歸類到某個群組。
-# NOTE 譯文更動 by Paladin
-#, fuzzy
+"代表好友的圖示/\n"
+"代表不明者的圖示"
+
 msgid "Icon for Chat"
-msgstr "加入聊天室"
-
-#  NOTE「Ignore」原譯「忽略使用者」,但 gtkprefs.c 中的「Ignore」
-#  NOTE 乃「忽略格式」的意思,故只能譯成「忽略」
-#, fuzzy
+msgstr "代表聊天室的圖示"
+
 msgid "Ignored"
-msgstr "忽略"
-
-#, fuzzy
+msgstr "已忽略"
+
+#  NOTE「Founder」這處係指聊天室的建立者
 msgid "Founder"
-msgstr "再大聲"
-
-#, fuzzy
+msgstr "建立者"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "管理員"
+
+#  NOTE 指聊天室內擁有部分管理員權限的人員,Konversation譯「助理」,Chatzilla譯「次管理員」
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-# NOTE 這是我們允許別人發出的認證要求後顯示給我們自己看的
-#, fuzzy
+msgstr "助理"
+
 msgid "Authorization dialog"
-msgstr "給予認證"
-
-# TODO 要覆查 - 20061025
-#, fuzzy
+msgstr "認證視窗"
+
 msgid "Error dialog"
-msgstr "錯誤訊息"
-
-# XXX 20070518
-#, fuzzy
+msgstr "錯誤訊息視窗"
+
 msgid "Information dialog"
-msgstr "資訊"
+msgstr "資訊訊息視窗"
 
 msgid "Mail dialog"
-msgstr ""
-
-#  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20070415
-#, fuzzy
+msgstr "郵件視窗"
+
+#  XXX 這譯文絶對有問題,但想不到怎樣譯較好 - ambrose 20090730
 msgid "Question dialog"
-msgstr "對話視窗 (Request Dialog)"
-
-#, fuzzy
+msgstr "提問視窗"
+
 msgid "Warning dialog"
-msgstr "警告等級"
+msgstr "警告訊息視窗"
 
 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "這是什麼類型的視窗?"
+
 msgid "Status Icons"
-msgstr "狀態:%s"
-
-#  XXX 無劃一譯法,有譯「地區」、「區域」甚至「場所」(?!)
-#, fuzzy
+msgstr "狀態圖示"
+
+# XXX 暫譯 - acli 20090730
 msgid "Chatroom Emblems"
-msgstr "聊天室區域 (Locale)"
-
-#, fuzzy
+msgstr "聊天室圖示"
+
 msgid "Dialog Icons"
-msgstr "變更圖示"
-
-#, fuzzy
+msgstr "視窗圖示"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin GTK+ 佈景主題設定"
-
-#, fuzzy
+msgstr "Pidgin 圖示主題編輯器"
+
 msgid "Contact"
-msgstr "聯絡資訊"
-
-#, fuzzy
+msgstr "好友"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "好友清單"
-
-#, fuzzy
+msgstr "Pidgin 好友清單主題編輯器"
+
 msgid "Edit Buddylist Theme"
-msgstr "好友清單"
+msgstr "編輯好友清單主題"
 
 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "編輯圖示主題"
 
 #. *< type
 #. *< ui_requirement
@@ -14564,16 +14470,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Pidgin GTK+ 佈景主題設定"
+msgstr "Pidgin 主題編輯器"
 
 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Pidgin GTK+ 佈景主題設定"
+msgstr "Pidgin 主題編輯器。"
 
 #. *< type
 #. *< ui_requirement
@@ -14731,9 +14635,10 @@
 msgid "_Keep Buddy List window on top:"
 msgstr "好友清單視窗保持在桌面最上層(_K);"
 
+# NOTE 譯文改動 by Ambrose 20090806, see Always/Never
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "只在停駐時生效"
+msgstr "只在停駐時啟動"
 
 msgid "Windows Pidgin Options"
 msgstr "Windows 版 Pidgin 選項"
@@ -14741,7 +14646,6 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Windows 版 Pidgin 的相關選項。"
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Windows 版 Pidgin 的相關選項,例如好友清單的停駐功能。"
@@ -14785,6 +14689,27 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+#~ msgid "_Resume"
+#~ msgstr "恢復(_R)"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "無法讀取 SILC 密鑰對"
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "邀請被婉拒了"
+
+#~ msgid "Invite message"
+#~ msgstr "邀請訊息"
+
+#~ msgid ""
+#~ "Please enter the name of the user you wish to invite,\n"
+#~ "along with an optional invite message."
+#~ msgstr "請輸入您想邀請的使用者名稱,以及選擇性填寫邀請的訊息。"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "無法開啟Socket"
 
@@ -14810,23 +14735,10 @@
 #~ msgid "Read error"
 #~ msgstr "讀取錯誤"
 
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法與伺服器建立連線:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "寫入錯誤"
-
 # NOTE 這是功能名稱(直譯)
 #~ msgid "Last Activity"
 #~ msgstr "最近活動"
 
-#~ msgid "Service Discovery Info"
-#~ msgstr "服務探尋資訊"
-
 #  FIXME acli 2070914
 #~ msgid "Service Discovery Items"
 #~ msgstr "服務探尋項目"
@@ -14850,9 +14762,6 @@
 #~ msgid "Ad-Hoc Commands"
 #~ msgstr "臨時指令"
 
-#~ msgid "PubSub Service"
-#~ msgstr "PubSub 服務"
-
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "SOCKS5 位元組串流"
 
@@ -14965,6 +14874,9 @@
 #~ msgid "Hop Check"
 #~ msgstr "中繼段檢查"
 
+#~ msgid "Write error"
+#~ msgstr "寫入錯誤"
+
 #~ msgid "Read Error"
 #~ msgstr "讀取錯誤"
 
@@ -14991,9 +14903,6 @@
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "錯誤:沒有安裝 SSL 支援。"
 
-#~ msgid "Incorrect password."
-#~ msgstr "密碼錯誤。"
-
 #~ msgid ""
 #~ "Could not connect to BOS server:\n"
 #~ "%s"
@@ -15001,14 +14910,17 @@
 #~ "無法連線到 BOS 伺服器:\n"
 #~ "%s"
 
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
+#~ msgid "Invalid username."
+#~ msgstr "使用者名稱無效。"
+
+#~ msgid "Incorrect password."
+#~ msgstr "密碼錯誤。"
 
 #~ msgid "Could Not Connect"
 #~ msgstr "無法連線"
 
-#~ msgid "Invalid username."
-#~ msgstr "使用者名稱無效。"
+#~ msgid "You may be disconnected shortly.  Check %s for updates."
+#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
 
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "無法解密伺服器回應"
@@ -15040,81 +14952,6 @@
 #~ msgid "Could not create listen socket"
 #~ msgstr "無法建立 Socket 監聽"
 
-#~ msgid "Could not resolve hostname"
-#~ msgstr "無法解析主機"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "密碼錯誤"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法與 %s 建立連線:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "傳呼伺服器(日本地區)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "檔案傳輸伺服器(日本地區)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "無法解析主機"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr "登入這個伺服器需要使用 TLS/SSL,但找不到 TLS/SSL 支援。"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "隱藏即時訊息交談視窗"
-
-#~ msgid "More Data needed"
-#~ msgstr "需要進一步的資料"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "請給這個表情給定一個相關的捷徑。"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "請給這個表情選擇一個圖像。"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "啟用哪一個 ID?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "游標顏色"
-
-#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "第二游標顏色"
-
-#~ msgid "Interface colors"
-#~ msgstr "介面顏色"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget 大小"
-
-#~ msgid "Invite message"
-#~ msgstr "邀請訊息"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr "請輸入您想邀請的使用者名稱,以及選擇性填寫邀請的訊息。"
-
 #~ msgid "Looking up %s"
 #~ msgstr "找尋 %s 中"
 
@@ -15260,21 +15097,68 @@
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "TOC 協定模組"
 
+#~ msgid "Activate which ID?"
+#~ msgstr "啟用哪一個 ID?"
+
+#~ msgid "Yahoo Japan"
+#~ msgstr "Yahoo Japan"
+
+#~ msgid "Japan Pager server"
+#~ msgstr "傳呼伺服器(日本地區)"
+
+#~ msgid "Japan file transfer server"
+#~ msgstr "檔案傳輸伺服器(日本地區)"
+
+#~ msgid ""
+#~ "Lost connection with server\n"
+#~ "%s"
+#~ msgstr ""
+#~ "與伺服器之間的連線突然中斷\n"
+#~ "%s"
+
+#~ msgid "Could not resolve host name"
+#~ msgstr "無法解析主機"
+
 #~ msgid "%s Options"
 #~ msgstr "%s 選項"
 
 #~ msgid "Proxy Options"
 #~ msgstr "代理伺服器選項"
 
+#~ msgid "Conversation Window Hiding"
+#~ msgstr "隱藏即時訊息交談視窗"
+
+#~ msgid "ST_UN server:"
+#~ msgstr "STUN 伺服器(_U):"
+
+#~ msgid "More Data needed"
+#~ msgstr "需要進一步的資料"
+
+#~ msgid "Please provide a shortcut to associate with the smiley."
+#~ msgstr "請給這個表情給定一個相關的捷徑。"
+
+#~ msgid "Please select an image for the smiley."
+#~ msgstr "請給這個表情選擇一個圖像。"
+
+#~ msgid "Cursor Color"
+#~ msgstr "游標顏色"
+
+#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
+#~ msgid "Secondary Cursor Color"
+#~ msgstr "第二游標顏色"
+
+#~ msgid "Interface colors"
+#~ msgstr "介面顏色"
+
+#~ msgid "Widget Sizes"
+#~ msgstr "Widget 大小"
+
 #~ msgid "By log size"
 #~ msgstr "依照日誌大小"
 
 #~ msgid "_Open Link in Browser"
 #~ msgstr "在瀏覽器中打開連結(_O)"
 
-#~ msgid "ST_UN server:"
-#~ msgstr "STUN 伺服器(_U):"
-
 #~ msgid "Smiley _Image"
 #~ msgstr "表情圖像(_I)"
 
@@ -15300,14 +15184,6 @@
 #~ msgstr[0] "與伺服器失去連線(%d 秒內收不到任何資料)"
 #~ msgstr[1] "與伺服器失去連線(%d 秒內收不到任何資料)"
 
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "新增好友"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "登入回應解密失敗"
-
 #~ msgid "Keep alive error"
 #~ msgstr "Keep Alive錯誤"
 
@@ -15318,14 +15194,9 @@
 #~ "與伺服器之間的連線突然中斷:\n"
 #~ "%d, %s"
 
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "連結伺服器"
-
 #~ msgid "Failed to send IM."
 #~ msgstr "送出即時訊息失敗。"
 
-#, fuzzy
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "您並非群組「%s」的成員\n"
 
@@ -15487,10 +15358,6 @@
 #~ msgid "QQ Server Notice"
 #~ msgstr "QQ 伺服器通告"
 
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "遠端結束連線"
-
 #~ msgid "developer"
 #~ msgstr "開發者"