Mercurial > pidgin.yaz

--- a/COPYRIGHT	Mon Aug 24 19:23:56 2009 +0000
+++ b/COPYRIGHT	Tue Sep 01 19:51:07 2009 +0000
@@ -307,6 +307,7 @@
 Arkadiusz Miskiewicz
 David Mohr
 Andrew Molloy
+Tomasz Mon
 Michael Monreal
 Laurent Montaron
 Marco Monteiro
--- a/ChangeLog	Mon Aug 24 19:23:56 2009 +0000
+++ b/ChangeLog	Tue Sep 01 19:51:07 2009 +0000
@@ -5,7 +5,7 @@
 	* Fix --disable-avahi to actually disable it in configure, as opposed
 	  to just making the warning non-fatal.
 	* Sending custom smileys in MSN chats is now supported.
-	* Fix using GNOME proxy settings properly.
+	* Fix using GNOME proxy settings properly.  (Erik van Pienbroek)

 	XMPP:
 	* Prompt the user before cancelling a presence subscription.
@@ -13,9 +13,27 @@
 	* Fix connecting to XMPP domains with no SRV records from Pidgin on
 	  Windows.
 	* Fix typing notifications with Pidgin 2.5.9 or earlier.
+	* Fix connecting using BOSH and legacy authentication (XEP-0078).
+	* Adding buddies of the form "romeo@montague.net/Resource" are handled
+	  properly.  In addition, it is no longer possible to add buddies of
+	  the form "room@conference.example.net/User", where
+	  room@conference.example.net is a MUC.
+	* Don't crash when receiving "smileyfied" XHTML-IM from clients that don't
+	  support bits of binary (ie. when getting an empty <data/> in return)
+
+	Yahoo!/Yahoo! JAPAN:
+	* Accounts now have "Use account proxy for SSL connections" option.  This
+	  option force-overrides the account specific proxy settings for SSL
+	  connections only and instead uses the global proxy configuration.

 	Finch:
 	* Properly detect libpanel on OpenBSD.  (Brad Smith)
+	* Remove IO watches in gnt_quit.  (Tomasz Mon)
+
+	Pidgin:
+	* Fix the auto-personize functionality in the Buddy List.
+	* Set the window icon for the media window to an icon corresponding to
+	  the type of call (headphone or webcam).

 version 2.6.1 (08/18/2009):
 	* Fix a crash when some users send you a link in a Yahoo IM
--- a/ChangeLog.API	Mon Aug 24 19:23:56 2009 +0000
+++ b/ChangeLog.API	Tue Sep 01 19:51:07 2009 +0000
@@ -1,5 +1,14 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul

+version 2.6.2 (09/??/2009):
+	Perl:
+		Added:
+		* Purple::XMLNode::get_next(), which returns the next neighbor tag of
+		  the current node.
+		Changed:
+		* Purple::XMLNode::get_child() will return the first child node if
+		  passed "" or undef as the name of the node.
+
 version 2.6.1 (08/18/2009):
 	No changes
--- a/finch/Makefile.am	Mon Aug 24 19:23:56 2009 +0000
+++ b/finch/Makefile.am	Tue Sep 01 19:51:07 2009 +0000
@@ -78,7 +78,6 @@

 AM_CPPFLAGS = \
 	-DSTANDALONE \
-	-DBR_PTHREADS=0 \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)/finch/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
--- a/finch/libgnt/gntmain.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/finch/libgnt/gntmain.c	Tue Sep 01 19:51:07 2009 +0000
@@ -69,7 +69,8 @@
  */

 static GIOChannel *channel = NULL;
-static int channel_read_callback;
+static guint channel_read_callback = 0;
+static guint channel_error_callback = 0;

 static gboolean ascii_only;
 static gboolean mouse_enabled;
@@ -314,11 +315,11 @@
 	channel_read_callback = result = g_io_add_watch_full(channel,  G_PRIORITY_HIGH,
 					(G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI),
 					io_invoke, NULL, NULL);
-
-	g_io_add_watch_full(channel,  G_PRIORITY_HIGH,
+
+	channel_error_callback = g_io_add_watch_full(channel,  G_PRIORITY_HIGH,
 					(G_IO_NVAL),
 					io_invoke_error, GINT_TO_POINTER(result), NULL);
-
+
 	g_io_channel_unref(channel);  /* Apparently this caused crashes for some people.
 	                                 But irssi does this, so I am going to assume the
 	                                 crashes were caused by some other stuff. */
@@ -583,6 +584,13 @@

 void gnt_quit()
 {
+	/* Prevent io_invoke() from being called after wm is destroyed */
+	g_source_remove(channel_error_callback);
+	g_source_remove(channel_read_callback);
+
+	channel_error_callback = 0;
+	channel_read_callback = 0;
+
 	g_object_unref(G_OBJECT(wm));
 	wm = NULL;
--- a/libpurple/Makefile.am	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/Makefile.am	Tue Sep 01 19:51:07 2009 +0000
@@ -299,7 +299,6 @@
 	-lm

 AM_CPPFLAGS = \
-	-DBR_PTHREADS=0 \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
--- a/libpurple/account.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/account.c	Tue Sep 01 19:51:07 2009 +0000
@@ -1206,11 +1206,14 @@
 purple_account_disconnect(PurpleAccount *account)
 {
 	PurpleConnection *gc;
+	const char *username;

 	g_return_if_fail(account != NULL);
 	g_return_if_fail(!purple_account_is_disconnected(account));

-	purple_debug_info("account", "Disconnecting account %p\n", account);
+	username = purple_account_get_username(account);
+	purple_debug_info("account", "Disconnecting account %s (%p)\n",
+	                  username ? username : "(null)", account);

 	account->disconnecting = TRUE;

@@ -2287,9 +2290,13 @@
 purple_account_add_buddy(PurpleAccount *account, PurpleBuddy *buddy)
 {
 	PurplePluginProtocolInfo *prpl_info = NULL;
-	PurpleConnection *gc = purple_account_get_connection(account);
+	PurpleConnection *gc;
 	PurplePlugin *prpl = NULL;

+	g_return_if_fail(account != NULL);
+	g_return_if_fail(buddy != NULL);
+
+	gc = purple_account_get_connection(account);
 	if (gc != NULL)
 	        prpl = purple_connection_get_prpl(gc);
--- a/libpurple/blist.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/blist.h	Tue Sep 01 19:51:07 2009 +0000
@@ -223,7 +223,7 @@
 	 * be set to a fallback function that saves data to blist.xml like in
 	 * previous libpurple versions.
 	 *
-	 * @attrib node    The node which has been modified.
+	 * @param node    The node which has been modified.
 	 *
 	 * @since 2.6.0.
 	 */
@@ -238,7 +238,7 @@
 	 * be set to a fallback function that saves data to blist.xml like in
 	 * previous libpurple versions.
 	 *
-	 * @attrib node  The node which has been modified.
+	 * @param node  The node which has been modified.
 	 * @since 2.6.0.
 	 */
 	void (*remove_node)(PurpleBlistNode *node);
@@ -252,7 +252,7 @@
 	 * be set to a fallback function that saves data to blist.xml like in
 	 * previous libpurple versions.
 	 *
-	 * @attrib account  The account whose data to save. If NULL, save all data
+	 * @param account  The account whose data to save. If NULL, save all data
 	 *                  for all accounts.
 	 * @since 2.6.0.
 	 */
--- a/libpurple/conversation.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/conversation.h	Tue Sep 01 19:51:07 2009 +0000
@@ -1322,7 +1322,7 @@
  * @param user     The user to invite to the chat.
  * @param message  The message to send with the invitation.
  * @param confirm  Prompt before sending the invitation. The user is always
- *                 prompted if either #user or #message is @c NULL.
+ *                 prompted if either \a user or \a message is @c NULL.
  *
  * @since 2.6.0
  */
--- a/libpurple/core.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/core.h	Tue Sep 01 19:51:07 2009 +0000
@@ -24,6 +24,16 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+/*! @mainpage Pidgin/Finch/libpurple API Documentation
+ *
+ * <a href="group__core.html">libpurple</a> is intended to be the core of an IM
+ * program.  <a href="group__pidgin.html">Pidgin</a> is a GTK+ frontend
+ * to libpurple, and <a href="group__finch.html">Finch</a> is an ncurses
+ * frontend built using <a href="group__gnt.html">libgnt</a>
+ * (GLib Ncurses Toolkit).
+ */
+
 #ifndef _PURPLE_CORE_H_
 #define _PURPLE_CORE_H_
--- a/libpurple/dnssrv.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/dnssrv.h	Tue Sep 01 19:51:07 2009 +0000
@@ -98,11 +98,11 @@
 /**
  * Get the value of the current TXT record.
  *
- * @param resp  The TXT response record
+ * @param response  The TXT response record
  * @returns The value of the current TXT record.
  * @since 2.6.0
  */
-const gchar *purple_txt_response_get_content(PurpleTxtResponse *resp);
+const gchar *purple_txt_response_get_content(PurpleTxtResponse *response);

 /**
  * Destroy a TXT DNS response object.
@@ -110,7 +110,7 @@
  * @param response The PurpleTxtResponse to destroy.
  * @since 2.6.0
  */
-void purple_txt_response_destroy(PurpleTxtResponse *resp);
+void purple_txt_response_destroy(PurpleTxtResponse *response);

 #ifdef __cplusplus
 }
--- a/libpurple/example/Makefile.am	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/example/Makefile.am	Tue Sep 01 19:51:07 2009 +0000
@@ -12,7 +12,6 @@

 AM_CPPFLAGS = \
 	-DSTANDALONE \
-	-DBR_PTHREADS=0 \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
--- a/libpurple/media-gst.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/media-gst.h	Tue Sep 01 19:51:07 2009 +0000
@@ -42,7 +42,7 @@
 #define PURPLE_IS_MEDIA_ELEMENT_INFO_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), PURPLE_TYPE_MEDIA_ELEMENT_INFO))
 #define PURPLE_MEDIA_ELEMENT_INFO_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), PURPLE_TYPE_MEDIA_ELEMENT_INFO, PurpleMediaElementInfo))

-/** @copydoc _PurpleMediaElementInfo */
+/** An opaque structure representing an audio/video source/sink. */
 typedef struct _PurpleMediaElementInfo PurpleMediaElementInfo;
 typedef struct _PurpleMediaElementInfoClass PurpleMediaElementInfoClass;
 typedef GstElement *(*PurpleMediaElementCreateCallback)(PurpleMedia *media,
@@ -138,6 +138,9 @@
  *
  * @param manager The media manager to use to obtain the source/sink.
  * @param type The type of source/sink to get.
+ * @param media The media call this element is requested for.
+ * @param session_id The id of the session this element is requested for or NULL.
+ * @param participant The remote user this element is requested for or NULL.
  *
  * @since 2.6.0
  */
--- a/libpurple/media.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/media.c	Tue Sep 01 19:51:07 2009 +0000
@@ -2046,13 +2046,32 @@
 				FsError error_no;
 				gst_structure_get_enum(msg->structure, "error-no",
 						FS_TYPE_ERROR, (gint*)&error_no);
-				/*
-				 * Unknown CName is only a problem for the
-				 * multicast transmitter which isn't used.
-				 */
-				if (error_no != FS_ERROR_UNKNOWN_CNAME)
-					purple_debug_error("media", "farsight-error: %i: %s\n", error_no,
-						  	gst_structure_get_string(msg->structure, "error-msg"));
+				switch (error_no) {
+					case FS_ERROR_NO_CODECS:
+						purple_media_error(media, _("No codecs found. Install some GStreamer codecs found in GStreamer plugins packages."));
+						purple_media_end(media, NULL, NULL);
+						break;
+					case FS_ERROR_NO_CODECS_LEFT:
+						purple_media_error(media, _("No codecs left. Your codec preferences in fs-codecs.conf are too strict."));
+						purple_media_end(media, NULL, NULL);
+						break;
+					case FS_ERROR_UNKNOWN_CNAME:
+					/*
+					 * Unknown CName is only a problem for the
+					 * multicast transmitter which isn't used.
+					 * It is also deprecated.
+					 */
+						break;
+					default:
+						purple_debug_error("media", "farsight-error: %i: %s\n", error_no,
+							  	gst_structure_get_string(msg->structure, "error-msg"));
+						break;
+				}
+
+				if (FS_ERROR_IS_FATAL(error_no)) {
+					purple_media_error(media, _("A non-recoverable Farsight2 error has occurred."));
+					purple_media_end(media, NULL, NULL);
+				}
 			} else if (gst_structure_has_name(msg->structure,
 					"farsight-new-local-candidate")) {
 				FsStream *stream = g_value_get_object(gst_structure_get_value(msg->structure, "stream"));
@@ -2134,7 +2153,7 @@
 			GstElement *lastElement = NULL;
 			while (!GST_IS_PIPELINE(element)) {
 				if (element == media->priv->confbin) {
-					purple_media_error("media", _("Conference error."));
+					purple_media_error(media, _("Conference error."));
 					purple_media_end(media, NULL, NULL);
 					break;
 				}
@@ -2259,6 +2278,18 @@
 					purple_media_to_fs_stream_direction(
 					stream->session->type), NULL);
 			stream->accepted = TRUE;
+
+			if (stream->remote_candidates != NULL) {
+				GError *err = NULL;
+				fs_stream_set_remote_candidates(stream->stream,
+						stream->remote_candidates, &err);
+
+				if (err) {
+					purple_debug_error("media", "Error adding remote"
+							" candidates: %s\n", err->message);
+					g_error_free(err);
+				}
+			}
 		}
 	} else if (local == TRUE && (type == PURPLE_MEDIA_INFO_MUTE ||
 			type == PURPLE_MEDIA_INFO_UNMUTE)) {
@@ -2570,7 +2601,7 @@
 				media->priv->conference, media_type, &err);

 		if (err != NULL) {
-			purple_media_error(media, "Error creating session: %s\n", err->message);
+			purple_media_error(media, _("Error creating session: %s"), err->message);
 			g_error_free(err);
 			g_free(session);
 			return FALSE;
@@ -2884,13 +2915,15 @@
 	stream->remote_candidates = g_list_concat(stream->remote_candidates,
 			purple_media_candidate_list_to_fs(remote_candidates));

-	fs_stream_set_remote_candidates(stream->stream,
-			stream->remote_candidates, &err);
-
-	if (err) {
-		purple_debug_error("media", "Error adding remote"
-				" candidates: %s\n", err->message);
-		g_error_free(err);
+	if (stream->accepted == TRUE) {
+		fs_stream_set_remote_candidates(stream->stream,
+				stream->remote_candidates, &err);
+
+		if (err) {
+			purple_debug_error("media", "Error adding remote"
+					" candidates: %s\n", err->message);
+			g_error_free(err);
+		}
 	}
 #endif
 }
--- a/libpurple/media.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/media.h	Tue Sep 01 19:51:07 2009 +0000
@@ -59,11 +59,11 @@
 #define PURPLE_MEDIA_TYPE_STATE      (purple_media_state_changed_get_type())
 #define PURPLE_MEDIA_TYPE_INFO_TYPE	(purple_media_info_type_get_type())

-/** @copydoc _PurpleMedia */
+/** An opaque structure representing a media call. */
 typedef struct _PurpleMedia PurpleMedia;
-/** @copydoc _PurpleMediaCandidate */
+/** An opaque structure representing a network candidate (IP Address and port pair). */
 typedef struct _PurpleMediaCandidate PurpleMediaCandidate;
-/** @copydoc _PurpleMediaCodec */
+/** An opaque structure representing an audio or video codec. */
 typedef struct _PurpleMediaCodec PurpleMediaCodec;

 /** Media caps */
@@ -559,6 +559,7 @@
  * @param media The media object to find the session in.
  * @param sess_id The session id of the session find the stream in.
  * @param participant The name of the remote user to set the candidates from.
+ * @param codecs The list of remote codecs to set.
  *
  * @return @c TRUE The codecs were set successfully, or @c FALSE otherwise.
  *
--- a/libpurple/mediamanager.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/mediamanager.h	Tue Sep 01 19:51:07 2009 +0000
@@ -30,9 +30,9 @@
 #include <glib.h>
 #include <glib-object.h>

-/** @copydoc _PurpleMediaManager */
+/** An opaque structure representing a group of (usually all) media calls. */
 typedef struct _PurpleMediaManager PurpleMediaManager;
-/** @copydoc _PurpleMediaManagerClass */
+/** The GObject class structure of the PurpleMediaManager object. */
 typedef struct _PurpleMediaManagerClass PurpleMediaManagerClass;

 #include "account.h"
@@ -81,6 +81,7 @@
  * @param account The account to create the session on.
  * @param conference_type The conference type to feed into Farsight2.
  * @param remote_user The remote user to initiate the session with.
+ * @param initiator TRUE if the local user is the initiator of this media call, FALSE otherwise.
  *
  * @return A newly created media session.
  *
--- a/libpurple/plugins/perl/common/XMLNode.xs	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/plugins/perl/common/XMLNode.xs	Tue Sep 01 19:51:07 2009 +0000
@@ -32,6 +32,18 @@
 xmlnode_get_child(parent, name)
 	Purple::XMLNode parent
 	const char *name
+PREINIT:
+	xmlnode *tmp;
+CODE:
+	if (!name || *name == '\0') {
+		tmp = parent->child;
+		while (tmp && tmp->type != XMLNODE_TYPE_TAG)
+			tmp = tmp->next;
+		RETVAL = tmp;
+	} else
+		RETVAL = xmlnode_get_child(parent, name);
+OUTPUT:
+	RETVAL

 Purple::XMLNode
 xmlnode_get_child_with_namespace(parent, name, xmlns)
@@ -44,6 +56,19 @@
 	Purple::XMLNode node

 Purple::XMLNode
+xmlnode_get_next(node)
+	Purple::XMLNode node
+PREINIT:
+	xmlnode *tmp;
+CODE:
+	tmp = node->next;
+	while (tmp && tmp->type != XMLNODE_TYPE_TAG)
+		tmp = tmp->next;
+	RETVAL = tmp;
+OUTPUT:
+	RETVAL
+
+Purple::XMLNode
 xmlnode_get_next_twin(node)
 	Purple::XMLNode node
--- a/libpurple/protocols/jabber/auth.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/auth.c	Tue Sep 01 19:51:07 2009 +0000
@@ -575,6 +575,7 @@
                                xmlnode *packet, gpointer data)
 {
 	if (type == JABBER_IQ_RESULT) {
+		jabber_stream_set_state(js, JABBER_STREAM_POST_AUTH);
 		jabber_disco_items_server(js);
 	} else {
 		PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
@@ -1072,7 +1073,12 @@
 	}
 #endif

-	jabber_stream_set_state(js, JABBER_STREAM_REINITIALIZING);
+	/*
+	 * The stream will be reinitialized later in jabber_recv_cb_ssl() or
+	 * jabber_bosh_connection_send.
+	 */
+	js->reinit = TRUE;
+	jabber_stream_set_state(js, JABBER_STREAM_POST_AUTH);
 }

 void jabber_auth_handle_failure(JabberStream *js, xmlnode *packet)
--- a/libpurple/protocols/jabber/bosh.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/bosh.c	Tue Sep 01 19:51:07 2009 +0000
@@ -70,7 +70,6 @@

 	gboolean pipelining;
 	gboolean ssl;
-	gboolean needs_restart;

 	enum {
 		BOSH_CONN_OFFLINE,
@@ -197,7 +196,6 @@
 	conn->path = g_strdup_printf("/%s", path);
 	g_free(path);
 	conn->pipelining = TRUE;
-	conn->needs_restart = FALSE;

 	if ((user && user[0] != '\0') || (passwd && passwd[0] != '\0')) {
 		purple_debug_info("jabber", "Ignoring unexpected username and password "
@@ -377,10 +375,10 @@
 	                conn->sid,
 	                conn->js->user->domain);

-	if (conn->needs_restart) {
+	if (conn->js->reinit) {
 		packet = g_string_append(packet, " xmpp:restart='true'/>");
 		/* TODO: Do we need to wait for a response? */
-		conn->needs_restart = FALSE;
+		conn->js->reinit = FALSE;
 	} else {
 		gsize read_amt;
 		if (type == PACKET_TERMINATE)
@@ -406,12 +404,6 @@
 	jabber_bosh_connection_send(conn, PACKET_TERMINATE, NULL);
 }

-static void jabber_bosh_connection_stream_restart(PurpleBOSHConnection *conn)
-{
-	conn->needs_restart = TRUE;
-	jabber_bosh_connection_send(conn, PACKET_NORMAL, NULL);
-}
-
 static gboolean jabber_bosh_connection_error_check(PurpleBOSHConnection *conn, xmlnode *node) {
 	const char *type;

@@ -490,35 +482,8 @@
 	}
 }

-static void auth_response_cb(PurpleBOSHConnection *conn, xmlnode *node) {
-	xmlnode *child;
-
-	g_return_if_fail(node != NULL);
-	if (jabber_bosh_connection_error_check(conn, node))
-		return;
-
-	child = node->child;
-	while(child != NULL && child->type != XMLNODE_TYPE_TAG) {
-		child = child->next;
-	}
-
-	/* We're only expecting one XML node here, so only process the first one */
-	if (child != NULL && child->type == XMLNODE_TYPE_TAG) {
-		JabberStream *js = conn->js;
-		if (!strcmp(child->name, "success")) {
-			jabber_bosh_connection_stream_restart(conn);
-			jabber_process_packet(js, &child);
-			conn->receive_cb = jabber_bosh_connection_received;
-		} else {
-			js->state = JABBER_STREAM_AUTHENTICATING;
-			jabber_process_packet(js, &child);
-		}
-	} else {
-		purple_debug_warning("jabber", "Received unexepcted empty BOSH packet.\n");
-	}
-}
-
 static void boot_response_cb(PurpleBOSHConnection *conn, xmlnode *node) {
+	JabberStream *js = conn->js;
 	const char *sid, *version;
 	const char *inactivity, *requests;
 	xmlnode *packet;
@@ -536,7 +501,7 @@
 	if (sid) {
 		conn->sid = g_strdup(sid);
 	} else {
-		purple_connection_error_reason(conn->js->gc,
+		purple_connection_error_reason(js->gc,
 		        PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 		        _("No session ID given"));
 		return;
@@ -553,7 +518,7 @@
 			minor = atoi(dot + 1);

 		if (major != 1 || minor < 6) {
-			purple_connection_error_reason(conn->js->gc,
+			purple_connection_error_reason(js->gc,
 			        PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 			        _("Unsupported version of BOSH protocol"));
 			return;
@@ -583,11 +548,13 @@
 	if (requests)
 		conn->max_requests = atoi(requests);

+	jabber_stream_set_state(js, JABBER_STREAM_AUTHENTICATING);
+
 	/* FIXME: Depending on receiving features might break with some hosts */
 	packet = xmlnode_get_child(node, "features");
 	conn->state = BOSH_CONN_ONLINE;
-	conn->receive_cb = auth_response_cb;
-	jabber_stream_features_parse(conn->js, packet);
+	conn->receive_cb = jabber_bosh_connection_received;
+	jabber_stream_features_parse(js, packet);
 }

 static void jabber_bosh_connection_boot(PurpleBOSHConnection *conn) {
@@ -663,8 +630,8 @@
 	conn->headers_done = FALSE;
 	conn->handled_len = conn->body_len = 0;

-	if (conn->bosh->needs_restart)
-		jabber_bosh_connection_stream_restart(conn->bosh);
+	if (conn->bosh->js->reinit)
+		jabber_bosh_connection_send(conn->bosh, PACKET_NORMAL, NULL);
 	else if (conn->bosh->state == BOSH_CONN_ONLINE) {
 		purple_debug_info("jabber", "BOSH session already exists. Trying to reuse it.\n");
 		if (conn->bosh->requests == 0 || conn->bosh->pending->bufused > 0) {
--- a/libpurple/protocols/jabber/caps.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/caps.c	Tue Sep 01 19:51:07 2009 +0000
@@ -601,8 +601,8 @@
 	jabber_caps_cbplususerdata *userdata;

 	if (exts && hash) {
-		purple_debug_info("jabber", "Ignoring exts in new-style caps from %s\n",
-		                     who);
+		purple_debug_misc("jabber", "Ignoring exts in new-style caps from %s\n",
+		                  who);
 		g_strfreev(exts);
 		exts = NULL;
 	}
--- a/libpurple/protocols/jabber/data.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/data.c	Tue Sep 01 19:51:07 2009 +0000
@@ -56,31 +56,44 @@
 JabberData *
 jabber_data_create_from_xml(xmlnode *tag)
 {
-	JabberData *data = g_new0(JabberData, 1);
-	gsize size;
-	gpointer raw_data = NULL;
+	JabberData *data;
+	gchar *raw_data = NULL;
+	const gchar *cid, *type;
+
+	/* check if this is a "data" tag */
+	if (strcmp(tag->name, "data") != 0) {
+		purple_debug_error("jabber", "Invalid data element\n");
+		return NULL;
+	}
+
+	cid = xmlnode_get_attrib(tag, "cid");
+	type = xmlnode_get_attrib(tag, "type");

-	if (data == NULL) {
-		purple_debug_error("jabber", "Could not allocate data object\n");
+	if (!cid || !type) {
+		purple_debug_error("jabber", "cid or type missing\n");
+		return NULL;
+	}
+
+	raw_data = xmlnode_get_data(tag);
+
+	if (raw_data == NULL || *raw_data == '\0') {
+		purple_debug_error("jabber", "data element was empty");
+		g_free(raw_data);
+		return NULL;
+	}
+
+	data = g_new0(JabberData, 1);
+	data->data = purple_base64_decode(raw_data, &data->size);
+	g_free(raw_data);
+
+	if (data->data == NULL) {
+		purple_debug_error("jabber", "Malformed base64 data\n");
 		g_free(data);
 		return NULL;
 	}

-	/* check if this is a "data" tag */
-	if (strcmp(tag->name, "data") != 0) {
-		purple_debug_error("jabber", "Invalid data element");
-		g_free(data);
-		return NULL;
-	}
-
-	data->cid = g_strdup(xmlnode_get_attrib(tag, "cid"));
-	data->type = g_strdup(xmlnode_get_attrib(tag, "type"));
-
-	raw_data = xmlnode_get_data(tag);
-	data->data = purple_base64_decode(raw_data, &size);
-	data->size = size;
-
-	g_free(raw_data);
+	data->cid = g_strdup(cid);
+	data->type = g_strdup(type);

 	return data;
 }
--- a/libpurple/protocols/jabber/google.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/google.c	Tue Sep 01 19:51:07 2009 +0000
@@ -296,6 +296,9 @@
 		gchar *sid, gchar *name, gboolean local,
 		GoogleSession *session)
 {
+	if (sid != NULL || name != NULL)
+		return;
+
 	if (type == PURPLE_MEDIA_INFO_HANGUP) {
 		xmlnode *sess;
 		JabberIq *iq = jabber_iq_new(session->js, JABBER_IQ_SET);
@@ -314,6 +317,8 @@
 		xmlnode_insert_child(iq->node, sess);

 		jabber_iq_send(iq);
+	} else if (type == PURPLE_MEDIA_INFO_ACCEPT && local == TRUE) {
+		google_session_ready(session);
 	}
 }
--- a/libpurple/protocols/jabber/jabber.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Tue Sep 01 19:51:07 2009 +0000
@@ -1605,13 +1605,10 @@
 				jabber_auth_start_old(js);
 			}
 			break;
-		case JABBER_STREAM_REINITIALIZING:
+		case JABBER_STREAM_POST_AUTH:
 			purple_connection_update_progress(js->gc, _("Re-initializing Stream"),
 					(js->gsc ? 8 : 4), JABBER_CONNECT_STEPS);

-			/* The stream will be reinitialized later, in jabber_recv_cb_ssl() */
-			js->reinit = TRUE;
-
 			break;
 		case JABBER_STREAM_CONNECTED:
 			/* Send initial presence */
--- a/libpurple/protocols/jabber/jabber.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Tue Sep 01 19:51:07 2009 +0000
@@ -87,7 +87,7 @@
 	JABBER_STREAM_INITIALIZING,
 	JABBER_STREAM_INITIALIZING_ENCRYPTION,
 	JABBER_STREAM_AUTHENTICATING,
-	JABBER_STREAM_REINITIALIZING,
+	JABBER_STREAM_POST_AUTH,
 	JABBER_STREAM_CONNECTED
 } JabberStreamState;
--- a/libpurple/protocols/jabber/jutil.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/jutil.c	Tue Sep 01 19:51:07 2009 +0000
@@ -277,8 +277,8 @@
 #endif /* USE_IDN */
 }

-JabberID*
-jabber_id_new(const char *str)
+static JabberID*
+jabber_id_new_internal(const char *str, gboolean allow_terminating_slash)
 {
 	const char *at = NULL;
 	const char *slash = NULL;
@@ -323,7 +323,7 @@
 						/* JIDs cannot start with / */
 						return NULL;
 					}
-					if (c[1] == '\0') {
+					if (c[1] == '\0' && !allow_terminating_slash) {
 						/* JIDs cannot end with / */
 						return NULL;
 					}
@@ -386,14 +386,16 @@
 			jid->node = g_ascii_strdown(str, at - str);
 			if (slash) {
 				jid->domain = g_ascii_strdown(at + 1, slash - (at + 1));
-				jid->resource = g_strdup(slash + 1);
+				if (*(slash + 1))
+					jid->resource = g_strdup(slash + 1);
 			} else {
 				jid->domain = g_ascii_strdown(at + 1, -1);
 			}
 		} else {
 			if (slash) {
 				jid->domain = g_ascii_strdown(str, slash - str);
-				jid->resource = g_strdup(slash + 1);
+				if (*(slash + 1))
+					jid->resource = g_strdup(slash + 1);
 			} else {
 				jid->domain = g_ascii_strdown(str, -1);
 			}
@@ -421,14 +423,16 @@
 		node = g_utf8_casefold(str, at-str);
 		if(slash) {
 			domain = g_utf8_casefold(at+1, slash-(at+1));
-			jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
+			if (*(slash + 1))
+				jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
 		} else {
 			domain = g_utf8_casefold(at+1, -1);
 		}
 	} else {
 		if(slash) {
 			domain = g_utf8_casefold(str, slash-str);
-			jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
+			if (*(slash + 1))
+				jid->resource = g_utf8_normalize(slash+1, -1, G_NORMALIZE_NFKC);
 		} else {
 			domain = g_utf8_casefold(str, -1);
 		}
@@ -485,45 +489,45 @@
 	return out;
 }

-char *jabber_get_bare_jid(const char *in)
+char *
+jabber_get_bare_jid(const char *in)
 {
 	JabberID *jid = jabber_id_new(in);
 	char *out;

-	if(!jid)
+	if (!jid)
 		return NULL;
-
-	out = g_strdup_printf("%s%s%s", jid->node ? jid->node : "",
-			jid->node ? "@" : "", jid->domain);
+	out = jabber_id_get_bare_jid(jid);
 	jabber_id_free(jid);

 	return out;
 }

+char *
+jabber_id_get_bare_jid(const JabberID *jid)
+{
+	g_return_val_if_fail(jid != NULL, NULL);
+
+	return g_strconcat(jid->node ? jid->node : "",
+	                   jid->node ? "@" : "",
+	                   jid->domain,
+	                   NULL);
+}
+
+JabberID *
+jabber_id_new(const char *str)
+{
+	return jabber_id_new_internal(str, FALSE);
+}
+
 const char *jabber_normalize(const PurpleAccount *account, const char *in)
 {
 	PurpleConnection *gc = account ? account->gc : NULL;
 	JabberStream *js = gc ? gc->proto_data : NULL;
 	static char buf[3072]; /* maximum legal length of a jabber jid */
 	JabberID *jid;
-	char *tmp;
-	size_t len = strlen(in);

-	/*
-	 * If the JID ends with a '/', jabber_id_new is going to throw it away as
-	 * invalid.  However, this is what the UI generates for a JID with no
-	 * resource. Deal with that by dropping away the '/'...
-	 */
-	if (in[len - 1] == '/')
-		tmp = g_strndup(in, len - 1);
-	else
-		tmp = (gchar *)in;
-
-	jid = jabber_id_new(tmp);
-
-	if (tmp != in)
-		g_free(tmp);
-
+	jid = jabber_id_new_internal(in, TRUE);
 	if(!jid)
 		return NULL;
--- a/libpurple/protocols/jabber/jutil.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/jutil.h	Tue Sep 01 19:51:07 2009 +0000
@@ -37,6 +37,7 @@

 char *jabber_get_resource(const char *jid);
 char *jabber_get_bare_jid(const char *jid);
+char *jabber_id_get_bare_jid(const JabberID *jid);

 const char *jabber_normalize(const PurpleAccount *account, const char *in);
--- a/libpurple/protocols/jabber/message.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/message.c	Tue Sep 01 19:51:07 2009 +0000
@@ -503,7 +503,7 @@
 	xmlnode *item_not_found = xmlnode_get_child(packet, "item-not-found");

 	/* did we get a data element as result? */
-	if (data_element) {
+	if (data_element && type == JABBER_IQ_RESULT) {
 		JabberData *data = jabber_data_create_from_xml(data_element);

 		if (data) {
--- a/libpurple/protocols/jabber/roster.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/jabber/roster.c	Tue Sep 01 19:51:07 2009 +0000
@@ -26,6 +26,7 @@
 #include "util.h"

 #include "buddy.h"
+#include "chat.h"
 #include "google.h"
 #include "presence.h"
 #include "roster.h"
@@ -336,6 +337,7 @@
 {
 	JabberStream *js = gc->proto_data;
 	char *who;
+	JabberID *jid;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
 	const char *name;
@@ -345,13 +347,39 @@
 		return;

 	name = purple_buddy_get_name(buddy);
-	if(!(who = jabber_get_bare_jid(name)))
+	jid = jabber_id_new(name);
+	if (jid == NULL) {
+		/* TODO: Remove the buddy from the list? */
 		return;
+	}

-	jb = jabber_buddy_find(js, name, FALSE);
+	/* Adding a chat room or a chat buddy to the roster is *not* supported. */
+	if (jabber_chat_find(js, jid->node, jid->domain) != NULL) {
+		/*
+		 * This is the same thing Bonjour does. If it causes problems, move
+		 * it to an idle callback.
+		 */
+		purple_debug_warning("jabber", "Cowardly refusing to add a MUC user "
+		                     "to your buddy list and removing the buddy. "
+		                     "Buddies can only be added by real (non-MUC) "
+		                     "JID\n");
+		purple_blist_remove_buddy(buddy);
+		jabber_id_free(jid);
+		return;
+	}

-	purple_debug_info("jabber", "jabber_roster_add_buddy(): Adding %s\n",
-	                  name);
+	who = jabber_id_get_bare_jid(jid);
+	if (jid->resource != NULL) {
+		/*
+		 * If the buddy name added contains a resource, strip that off and
+		 * rename the buddy.
+		 */
+		purple_blist_rename_buddy(buddy, who);
+	}
+
+	jb = jabber_buddy_find(js, who, FALSE);
+
+	purple_debug_info("jabber", "jabber_roster_add_buddy(): Adding %s\n", who);

 	jabber_roster_update(js, who, NULL);
--- a/libpurple/protocols/oscar/oscar.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue Sep 01 19:51:07 2009 +0000
@@ -2405,6 +2405,21 @@
 	if (purple_markup_find_tag("body", tmp, &start, &end, &attribs))
 	{
 		const char *ichattextcolor, *ichatballooncolor;
+		const char *start2, *end2;
+		GData *unused;
+
+		/*
+		 * Find the ending </body> so we can strip off the outer <html/>
+		 * and <body/>
+		 */
+		if (purple_markup_find_tag("/body", end + 1, &start2, &end2, &unused))
+		{
+			gchar *tmp2;
+			tmp2 = g_strndup(end + 1, (start2 - 1) - (end + 1) + 1);
+			g_free(tmp);
+			tmp = tmp2;
+			g_datalist_clear(&unused);
+		}

 		ichattextcolor = g_datalist_get_data(&attribs, "ichattextcolor");
 		if (ichattextcolor != NULL)
--- a/libpurple/protocols/simple/Makefile.am	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/simple/Makefile.am	Tue Sep 01 19:51:07 2009 +0000
@@ -13,7 +13,7 @@

 libsimple_la_LDFLAGS = -module -avoid-version

-if STATIC_MSN
+if STATIC_SIMPLE

 st = -DPURPLE_STATIC_PRPL
 noinst_LTLIBRARIES   = libsimple.la
--- a/libpurple/protocols/yahoo/libymsg.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Tue Sep 01 19:51:07 2009 +0000
@@ -2097,7 +2097,7 @@
 		break;
 	case 1013:
 		msg = g_strdup(_("Error 1013: The username you have entered is invalid."
-					"  The most common cause of this error is entering your e-mail"
+					"  The most common cause of this error is entering your email"
 					" address instead of your Yahoo! ID."));
 		reason = PURPLE_CONNECTION_ERROR_INVALID_USERNAME;
 		break;
@@ -4427,7 +4427,7 @@
 		else
 			yahoo_packet_hash(pkt, "ssssss", 49, "TYPING", 1, purple_connection_get_display_name(gc),
 	                  14, " ", 13, state == PURPLE_TYPING ? "1" : "0",
-	                  5, who+4, 1002, "1");
+	                  5, who, 1002, "1");
 		yahoo_packet_send_and_free(pkt, yd);
 	}

@@ -4776,6 +4776,7 @@
 void yahoo_add_deny(PurpleConnection *gc, const char *who) {
 	YahooData *yd = (YahooData *)gc->proto_data;
 	struct yahoo_packet *pkt;
+	gboolean msn = FALSE;

 	if (!yd->logged_in)
 		return;
@@ -4783,15 +4784,21 @@
 	if (!who || who[0] == '\0')
 		return;

+	msn = !g_ascii_strncasecmp(who, "msn/", 4);
 	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, yd->session_id);
-	yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc),
-	                  7, who, 13, "1");
+
+	if(msn)
+		yahoo_packet_hash(pkt, "ssss", 1, purple_connection_get_display_name(gc), 7, who+4, 241, "2", 13, "1");
+	else
+		yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc), 7, who, 13, "1");
+
 	yahoo_packet_send_and_free(pkt, yd);
 }

 void yahoo_rem_deny(PurpleConnection *gc, const char *who) {
 	YahooData *yd = (YahooData *)gc->proto_data;
 	struct yahoo_packet *pkt;
+	gboolean msn = FALSE;

 	if (!yd->logged_in)
 		return;
@@ -4799,8 +4806,14 @@
 	if (!who || who[0] == '\0')
 		return;

+	msn = !g_ascii_strncasecmp(who, "msn/", 4);
 	pkt = yahoo_packet_new(YAHOO_SERVICE_IGNORECONTACT, YAHOO_STATUS_AVAILABLE, yd->session_id);
-	yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc), 7, who, 13, "2");
+
+	if(msn)
+		yahoo_packet_hash(pkt, "ssss", 1, purple_connection_get_display_name(gc), 7, who+4, 241, "2", 13, "2");
+	else
+		yahoo_packet_hash(pkt, "sss", 1, purple_connection_get_display_name(gc), 7, who, 13, "2");
+
 	yahoo_packet_send_and_free(pkt, yd);
 }
--- a/libpurple/smiley.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/smiley.h	Tue Sep 01 19:51:07 2009 +0000
@@ -192,7 +192,7 @@
  * @param smiley  The custom smiley.
  *
  * @return A full path to the file, or @c NULL under various conditions.
- *         The caller should use #g_free to free the returned string.
+ *         The caller should use g_free to free the returned string.
  */
 char *purple_smiley_get_full_path(PurpleSmiley *smiley);
--- a/libpurple/status.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/status.h	Tue Sep 01 19:51:07 2009 +0000
@@ -72,6 +72,16 @@
  * for the current PurpleSession.
  */

+/**
+ * PurpleStatusType's are created by each PRPL.  They outline the
+ * available statuses of the protocol.  AIM, for example, supports
+ * an available state with an optional available message, an away
+ * state with a mandatory message, and an invisible state (which is
+ * technically "independent" of the other two, but we'll get into
+ * that later).  PurpleStatusTypes are very permanent.  They are
+ * hardcoded in each PRPL and will not change often.  And because
+ * they are hardcoded, they do not need to be saved to any XML file.
+ */
 typedef struct _PurpleStatusType      PurpleStatusType;
 typedef struct _PurpleStatusAttr      PurpleStatusAttr;
 typedef struct _PurplePresence        PurplePresence;
--- a/libpurple/tests/test_jabber_jutil.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/tests/test_jabber_jutil.c	Tue Sep 01 19:51:07 2009 +0000
@@ -153,6 +153,14 @@
 }
 END_TEST

+START_TEST(test_jabber_normalize)
+{
+	assert_string_equal("paul@darkrain42.org", jabber_normalize(NULL, "PaUL@DaRkRain42.org"));
+	assert_string_equal("paul@darkrain42.org", jabber_normalize(NULL, "PaUL@DaRkRain42.org/"));
+	assert_string_equal("paul@darkrain42.org", jabber_normalize(NULL, "PaUL@DaRkRain42.org/resource"));
+}
+END_TEST
+
 Suite *
 jabber_jutil_suite(void)
 {
@@ -172,6 +180,7 @@
 	tcase_add_test(tc, test_nodeprep_validate_illegal_chars);
 	tcase_add_test(tc, test_nodeprep_validate_too_long);
 	tcase_add_test(tc, test_jabber_id_new);
+	tcase_add_test(tc, test_jabber_normalize);
 	suite_add_tcase(s, tc);

 	return s;
--- a/libpurple/theme-loader.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/theme-loader.c	Tue Sep 01 19:51:07 2009 +0000
@@ -118,7 +118,7 @@

 	/* TYPE STRING (read only) */
 	pspec = g_param_spec_string("type", "Type",
-				    "The string represtenting the type of the theme",
+				    "The string representing the type of the theme",
 				    NULL,
 				    G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
 	g_object_class_install_property(obj_class, PROP_TYPE, pspec);
--- a/libpurple/theme-loader.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/theme-loader.h	Tue Sep 01 19:51:07 2009 +0000
@@ -71,11 +71,11 @@
 GType purple_theme_loader_get_type(void);

 /**
- * Returns the string represtenting the type of the theme loader
+ * Returns the string representing the type of the theme loader
  *
  * @param self The theme loader
  *
- * @returns The string represting this type
+ * @returns The string representing this type
  */
 const gchar *purple_theme_loader_get_type_string(PurpleThemeLoader *self);
--- a/libpurple/theme.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/theme.c	Tue Sep 01 19:51:07 2009 +0000
@@ -190,7 +190,7 @@

 	/* TYPE STRING (read only) */
 	pspec = g_param_spec_string("type", "Type",
-			"The string represtenting the type of the theme",
+			"The string representing the type of the theme",
 			NULL,
 			G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
 	g_object_class_install_property(obj_class, PROP_TYPE, pspec);
--- a/libpurple/theme.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/theme.h	Tue Sep 01 19:51:07 2009 +0000
@@ -73,7 +73,7 @@
  *
  * @param theme  The purple theme.
  *
- * @return The string representating the name of the theme.
+ * @return The string representing the name of the theme.
  */
 const gchar *purple_theme_get_name(PurpleTheme *theme);

@@ -124,7 +124,7 @@
  *
  * @param theme  The purple theme.
  *
- * @return The string represtenting the type.
+ * @return The string representing the type.
  */
 const gchar *purple_theme_get_type_string(PurpleTheme *theme);

@@ -133,7 +133,7 @@
  *
  * @param theme  The purple theme.
  *
- * @return The string represtenting the theme directory.
+ * @return The string representing the theme directory.
  */
 const gchar *purple_theme_get_dir(PurpleTheme *theme);
--- a/libpurple/util.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/util.c	Tue Sep 01 19:51:07 2009 +0000
@@ -3129,6 +3129,9 @@
 	const char *ret = NULL;
 	static char buf[BUF_LEN];

+	/* This should prevent a crash if purple_normalize gets called with NULL str, see #10115 */
+	g_return_val_if_fail(str != NULL, "");
+
 	if (account != NULL)
 	{
 		PurplePlugin *prpl = purple_find_prpl(purple_account_get_protocol_id(account));
@@ -4652,25 +4655,26 @@
 purple_utf8_strip_unprintables(const gchar *str)
 {
 	gchar *workstr, *iter;
+	const gchar *bad;

 	if (str == NULL)
 		/* Act like g_strdup */
 		return NULL;

-	g_return_val_if_fail(g_utf8_validate(str, -1, NULL), NULL);
+	if (!g_utf8_validate(str, -1, &bad)) {
+		purple_debug_error("util", "purple_utf8_strip_unprintables(%s) failed; "
+		                           "first bad character was %02x (%c)\n",
+		                   str, *bad, *bad);
+		g_return_val_if_reached(NULL);
+	}

 	workstr = iter = g_new(gchar, strlen(str) + 1);
-	while (*str) {
-		gunichar c = g_utf8_get_char(str);
-		const gchar *next = g_utf8_next_char(str);
-		size_t len = next - str;
-
-		if (g_unichar_isprint(c)) {
-			memcpy(iter, str, len);
-			iter += len;
+	for ( ; *str; ++str) {
+		guchar c = *str;
+		if (c >= 0x20 || c == '\t' || c == '\n' || c == '\r') {
+			*iter = c;
+			++iter;
 		}
-
-		str = next;
 	}

 	/* nul-terminate the new string */
--- a/libpurple/util.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/libpurple/util.h	Tue Sep 01 19:51:07 2009 +0000
@@ -31,8 +31,14 @@

 #include <stdio.h>

+/**
+  * An opaque structure representing a URL request. Can be used to cancel
+  * the request.
+  */
 typedef struct _PurpleUtilFetchUrlData PurpleUtilFetchUrlData;
+/** @copydoc _PurpleMenuAction */
 typedef struct _PurpleMenuAction PurpleMenuAction;
+/** @copydoc _PurpleKeyValuePair */
 typedef struct _PurpleKeyValuePair PurpleKeyValuePair;

 #include "account.h"
@@ -107,7 +113,7 @@
  * @param album     The album of the song, can be @c NULL.
  * @param unused    Currently unused, must be @c NULL.
  *
- * @return   The formatted string. The caller must #g_free the returned string.
+ * @return   The formatted string. The caller must g_free the returned string.
  * @since 2.4.0
  */
 char * purple_util_format_song_info(const char *title, const char *artist,
@@ -1286,16 +1292,14 @@
 /**
  * Removes unprintable characters from a UTF-8 string. These characters
  * (in particular low-ASCII characters) are invalid in XML 1.0 and thus
- * are not allowed in XMPP and are rejected by libxml2 by default. This
- * function uses g_unichar_isprint to determine what characters should
- * be stripped. The returned string must be freed by the caller.
+ * are not allowed in XMPP and are rejected by libxml2 by default.
+ *
+ * The returned string must be freed by the caller.
  *
  * @param str A valid UTF-8 string.
  *
  * @return A newly allocated UTF-8 string without the unprintable characters.
  * @since 2.6.0
- *
- * @see g_unichar_isprint
  */
 gchar *purple_utf8_strip_unprintables(const gchar *str);
--- a/pidgin/Makefile.am	Mon Aug 24 19:23:56 2009 +0000
+++ b/pidgin/Makefile.am	Tue Sep 01 19:51:07 2009 +0000
@@ -214,7 +214,6 @@
 endif

 AM_CPPFLAGS = \
-	-DBR_PTHREADS=0 \
 	-DDATADIR=\"$(datadir)\" \
 	-DLIBDIR=\"$(libdir)/pidgin/\" \
 	-DLOCALEDIR=\"$(datadir)/locale\" \
--- a/pidgin/gtkblist.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/pidgin/gtkblist.c	Tue Sep 01 19:51:07 2009 +0000
@@ -501,10 +501,12 @@

 		type = purple_blist_node_get_type(node);

-		if(type == PURPLE_BLIST_BUDDY_NODE)
+		if (type == PURPLE_BLIST_BUDDY_NODE) {
 			node = purple_blist_node_get_parent(node);
-
-		if(type == PURPLE_BLIST_CONTACT_NODE)
+			type = purple_blist_node_get_type(node);
+		}
+
+		if (type != PURPLE_BLIST_CONTACT_NODE)
 			continue;

 		for (b = purple_blist_node_get_first_child(node);
--- a/pidgin/gtkdialogs.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/pidgin/gtkdialogs.c	Tue Sep 01 19:51:07 2009 +0000
@@ -230,7 +230,7 @@
 	{N_("Turkish"),             "tr", "Serdar Soytetir", "tulliana@gmail.com"},
 	{N_("Urdu"),                "ur", "RKVS Raman", "rkvsraman@gmail.com"},
 	{N_("Vietnamese"),          "vi", N_("T.M.Thanh and the Gnome-Vi Team"), "gnomevi-list@lists.sf.net"},
-	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "aronmalache@163.com"},
+	{N_("Simplified Chinese"),  "zh_CN", "Aron Xu", "happyaron.xu@gmail.com"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Abel Cheung", "abelindsay@gmail.com"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Ambrose C. Li", "acli@ada.dhs.org"},
 	{N_("Hong Kong Chinese"),   "zh_HK", "Paladin R. Liu", "paladin@ms1.hinet.net"},
@@ -470,15 +470,15 @@
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\""
 				"http://developer.pidgin.im/wiki/FAQ\">"
 				"http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"));
-	g_string_append_printf(str, _("<FONT SIZE=\"4\">Help via e-mail:</FONT>"
-				" <A HREF=\"mailto:support@pidgin.im\">support@pidgin.im</A>"
-				" (This is a"
-				" <A HREF=\"http://pidgin.im/cgi-bin/mailman/listinfo/support\">"
-				"mailing list</A>, and messages sent here are"
-				" <A HREF=\"http://pidgin.im/pipermail/support/\">publicly"
-				" archived!</A>  Furthermore, we do <I><B>not</B></I> support"
-				" MXit, Facebook, Skype, or any other third-party plugins on"
-				" this list.)<BR/><BR/>"));
+	g_string_append_printf(str,
+			_("<font size=\"4\">Help from other Pidgin users:</font> "
+			"<a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>"
+			"This is a <b>public</b> mailing list! "
+			"(<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)<br/>"
+			"We can't help with 3rd party protocols or plugins!<br/>"
+			"This list's primary language is <b>English</b>.  You are "
+			"welcome to post in another language, but the responses may "
+			"be less helpful.<br/><br/>"));
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">IRC Channel:</FONT> "
 				"#pidgin on irc.freenode.net<BR><BR>"));
 	g_string_append_printf(str, _("<FONT SIZE=\"4\">XMPP MUC:</FONT> "
--- a/pidgin/gtkimhtml.h	Mon Aug 24 19:23:56 2009 +0000
+++ b/pidgin/gtkimhtml.h	Tue Sep 01 19:51:07 2009 +0000
@@ -188,8 +188,8 @@
 	GSList *anchors;
 	GtkIMHtmlSmileyFlags flags;
 	GtkIMHtml *imhtml;
-	gpointer data;       /** @Since 2.6.0 */
-	gsize datasize;      /** @Since 2.6.0 */
+	gpointer data;       /** @since 2.6.0 */
+	gsize datasize;      /** @since 2.6.0 */
 };

 struct _GtkIMHtmlScalable {
@@ -906,7 +906,7 @@
  *                      @c TRUE if the request for context menu was processed
  *                      successfully, @c FALSE otherwise.
  *
- * @return  @c TRUE if the protocol was successfully registered (or unregistered, when #activate is @c NULL)
+ * @return  @c TRUE if the protocol was successfully registered (or unregistered, when \a activate is @c NULL)
  *
  * @since 2.6.0
  */
--- a/pidgin/gtkmedia.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/pidgin/gtkmedia.c	Tue Sep 01 19:51:07 2009 +0000
@@ -34,6 +34,7 @@

 #include "gtkmedia.h"
 #include "gtkutils.h"
+#include "pidginstock.h"

 #ifdef USE_VV
 #include "media-gst.h"
@@ -499,13 +500,14 @@
 	}

 	gtkmedia->priv->request_type = PURPLE_MEDIA_NONE;
-
-	purple_request_accept_cancel(gtkmedia, _("Incoming Call"),
-			message, NULL, PURPLE_DEFAULT_ACTION_NONE,
-			(void*)account, gtkmedia->priv->screenname, NULL,
-			gtkmedia->priv->media,
-			pidgin_media_accept_cb,
-			pidgin_media_reject_cb);
+	if (!purple_media_accepted(gtkmedia->priv->media, NULL, NULL)) {
+		purple_request_accept_cancel(gtkmedia, _("Incoming Call"),
+				message, NULL, PURPLE_DEFAULT_ACTION_NONE,
+				(void*)account, gtkmedia->priv->screenname,
+				NULL, gtkmedia->priv->media,
+				pidgin_media_accept_cb,
+				pidgin_media_reject_cb);
+	}
 	pidgin_media_emit_message(gtkmedia, message);
 	g_free(message);
 	return FALSE;
@@ -609,6 +611,7 @@
 	GtkWidget *send_widget = NULL, *recv_widget = NULL, *button_widget = NULL;
 	PurpleMediaSessionType type =
 			purple_media_get_session_type(media, sid);
+	GdkPixbuf *icon = NULL;

 	if (gtkmedia->priv->recv_widget == NULL
 			&& type & (PURPLE_MEDIA_RECV_VIDEO |
@@ -742,6 +745,22 @@
 				gtkmedia);
 	}

+	/* set the window icon according to the type */
+	if (type & PURPLE_MEDIA_VIDEO) {
+		icon = gtk_widget_render_icon(GTK_WIDGET(gtkmedia),
+			PIDGIN_STOCK_TOOLBAR_VIDEO_CALL,
+			gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE), NULL);
+	} else if (type & PURPLE_MEDIA_AUDIO) {
+		icon = gtk_widget_render_icon(GTK_WIDGET(gtkmedia),
+			PIDGIN_STOCK_TOOLBAR_AUDIO_CALL,
+			gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_LARGE), NULL);
+	}
+
+	if (icon) {
+		gtk_window_set_icon(GTK_WINDOW(gtkmedia), icon);
+		g_object_unref(icon);
+	}
+
 	gtk_widget_show(gtkmedia->priv->display);
 }

@@ -772,6 +791,8 @@
 		pidgin_media_emit_message(gtkmedia,
 				_("You have rejected the call."));
 	} else if (type == PURPLE_MEDIA_INFO_ACCEPT) {
+		if (local == TRUE)
+			purple_request_close_with_handle(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),
--- a/pidgin/pidginstock.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/pidgin/pidginstock.c	Tue Sep 01 19:51:07 2009 +0000
@@ -603,7 +603,7 @@
 	pidgin_stock_load_stock_icon_theme(NULL);

 	/* Pre-load Status icon theme - this avoids a bug with displaying the correct icon in the tray, theme is destroyed after*/
-	if (purple_prefs_get_string(PIDGIN_PREFS_ROOT "/icon/status/theme") &&
+	if (purple_prefs_get_string(PIDGIN_PREFS_ROOT "/status/icon-theme") &&
 	   (path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/status/icon-theme-dir"))) {

 		PidginStatusIconTheme *theme = PIDGIN_STATUS_ICON_THEME(purple_theme_loader_build(PURPLE_THEME_LOADER(loader), path));
--- a/pidgin/plugins/Makefile.am	Mon Aug 24 19:23:56 2009 +0000
+++ b/pidgin/plugins/Makefile.am	Tue Sep 01 19:51:07 2009 +0000
@@ -93,7 +93,7 @@
 themeedit_la_SOURCES        = themeedit.c themeedit-icon.c themeedit-icon.h
 timestamp_la_SOURCES        = timestamp.c
 timestamp_format_la_SOURCES = timestamp_format.c
-vvconfig_SOURCES            = vvconfig.c
+vvconfig_la_SOURCES         = vvconfig.c
 xmppconsole_la_SOURCES      = xmppconsole.c

 convcolors_la_LIBADD        = $(GTK_LIBS)
--- a/pidgin/plugins/gestures/stroke.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/pidgin/plugins/gestures/stroke.c	Tue Sep 01 19:51:07 2009 +0000
@@ -207,10 +207,7 @@
       metrics->max_x = -1;
       metrics->max_y = -1;

-      metrics->pointList = (GSList*) g_malloc (sizeof (GSList));
-
-      metrics->pointList->data = new_point_p;
-      metrics->pointList->next = NULL;
+      metrics->pointList = g_slist_prepend(metrics->pointList, new_point_p);
       metrics->point_count = 0;

     } else {
--- a/pidgin/plugins/gevolution/gevo-util.c	Mon Aug 24 19:23:56 2009 +0000
+++ b/pidgin/plugins/gevolution/gevo-util.c	Tue Sep 01 19:51:07 2009 +0000
@@ -35,14 +35,16 @@

 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, buddy_name, account);

-	if ((group = purple_find_group(group_name)) == NULL)
+	group = purple_find_group(group_name);
+	if (group == NULL)
 	{
 		group = purple_group_new(group_name);
 		purple_blist_add_group(group, NULL);
 	}

-	if ((buddy = purple_find_buddy_in_group(account, buddy_name, group)))
-	{
+	buddy = purple_find_buddy_in_group(account, buddy_name, group);
+	if (buddy == NULL)
+	{
 		buddy = purple_buddy_new(account, buddy_name, alias);
 		purple_blist_add_buddy(buddy, NULL, group, NULL);
 	}
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Mon Aug 24 19:23:56 2009 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Tue Sep 01 19:51:07 2009 +0000
@@ -12,6 +12,7 @@
 Var ISSILENT
 Var STARTUP_RUN_KEY
 Var SPELLCHECK_SEL
+Var LANGUAGE_SET

 ;--------------------------------
 ;Configuration
@@ -74,7 +75,7 @@
 !define PERL_REG_KEY				"SOFTWARE\Perl"
 !define PERL_DLL				"perl510.dll"
 !define GTK_DEFAULT_INSTALL_PATH		"$COMMONFILES\GTK\2.0"
-!define GTK_RUNTIME_INSTALLER			"..\..\..\..\gtk_installer\gtk-runtime*.exe"
+!define GTK_RUNTIME_INSTALLER			"..\..\..\..\gtk_installer\gtk-runtime-${GTK_INSTALL_VERSION}*.exe"

 !define ASPELL_REG_KEY				"SOFTWARE\Aspell"
 !define DOWNLOADER_URL				"http://pidgin.im/win32/download_redir.php"
@@ -1341,10 +1342,12 @@
   IfSilent 0 +2
     StrCpy $ISSILENT "/NOUI"

+  StrCpy $LANGUAGE_SET "0"
   ClearErrors
   ${GetOptions} "$R3" "/L=" $R1
   IfErrors +3
   StrCpy $LANGUAGE $R1
+  StrCpy $LANGUAGE_SET "1"
   Goto skip_lang

   ; Select Language
@@ -1407,6 +1410,17 @@
   Pop $R0
 FunctionEnd

+Function .onInstSuccess
+  ; NSIS doesn't appear to save the language when in Silent Mode, so we do so manually
+  IfSilent 0 done
+
+  StrCmp $LANGUAGE_SET "0" done
+
+  WriteRegStr "${MUI_LANGDLL_REGISTRY_ROOT}" "${MUI_LANGDLL_REGISTRY_KEY}" "${MUI_LANGDLL_REGISTRY_VALUENAME}" $LANGUAGE
+
+  done:
+FunctionEnd
+
 Function un.onInit
   Call un.RunCheck
   StrCpy $name "Pidgin ${PIDGIN_VERSION}"
--- a/po/ChangeLog	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/ChangeLog	Tue Sep 01 19:51:07 2009 +0000
@@ -1,5 +1,19 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul

+version 2.6.2
+	* Basque translation updated (Mikel Pascual Aldabaldetreku)
+	* Chinese (Simplified) translation updated (Aron Xu)
+	* Finnish translation updated (Timo Jyrinki)
+	* French translation updated (Éric Boumaour)
+	* German translation updated (Jochen Kemnade)
+	* Hebrew translation updated (Shalom Craimer)
+	* Hungarian translation updated (Gabor Kelemen)
+	* Italian translation updated (Claudio Satriano)
+	* Lithuanian translation updated (Laurynas Biveinis)
+	* Portuguese (Brazilian) translation updated (Rodrigo Luiz
+	  Marques Flores)
+	* Slovenian translation updated (Martin Srebotnjak)
+
 version 2.6.1
 	* No changes
--- a/po/POTFILES.in	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/POTFILES.in	Tue Sep 01 19:51:07 2009 +0000
@@ -50,6 +50,7 @@
 libpurple/ft.c
 libpurple/gconf/purple.schemas.in
 libpurple/log.c
+libpurple/media.c
 libpurple/mediamanager.c
 libpurple/plugin.c
 libpurple/plugins/autoaccept.c
@@ -266,6 +267,7 @@
 pidgin/plugins/ticker/ticker.c
 pidgin/plugins/timestamp.c
 pidgin/plugins/timestamp_format.c
+pidgin/plugins/vvconfig.c
 pidgin/plugins/win32/transparency/win2ktrans.c
 pidgin/plugins/win32/winprefs/winprefs.c
 pidgin/plugins/xmppconsole.c
--- a/po/de.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/de.po	Tue Sep 01 19:51:07 2009 +0000
@@ -11,9 +11,9 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-14 16:32+0200\n"
-"PO-Revision-Date: 2009-08-14 16:31+0200\n"
-"Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
+"POT-Creation-Date: 2009-08-30 11:00+0200\n"
+"PO-Revision-Date: 2009-08-30 11:00+0200\n"
+"Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -876,8 +876,8 @@
 msgid "System Log"
 msgstr "System-Mitschnitt"

-msgid "Calling ... "
-msgstr "Anrufen ... "
+msgid "Calling..."
+msgstr "Anrufen..."

 msgid "Hangup"
 msgstr "Auflegen"
@@ -1519,6 +1519,30 @@
 "Wenn eine neue Unterhaltung eröffnet wird, fügt dieses Plugin die letzte "
 "Unterhaltung in die aktuelle Unterhaltung ein."

+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Hole TinyURL..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "TinyURL nur für URLs mit mindestens dieser Länge generieren"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Adresspräfix für TinyURL (oder andere)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL-Plugin"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr ""
+"URLs aus erhaltenen Nachrichten zum einfacheren Kopieren in TinyURLs "
+"umwandeln"
+
 msgid "Online"
 msgstr "Online"

@@ -1562,30 +1586,6 @@
 msgid "Lastlog plugin."
 msgstr "Verlauf-Plugin."

-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"Hole TinyURL..."
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr "TinyURL nur für URLs mit mindestens dieser Länge generieren"
-
-msgid "TinyURL (or other) address prefix"
-msgstr "Adresspräfix für TinyURL (oder andere)"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "TinyURL-Plugin"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
-"URLs aus erhaltenen Nachrichten zum einfacheren Kopieren in TinyURLs "
-"umwandeln"
-
 msgid "accounts"
 msgstr "Konten"

@@ -1647,6 +1647,41 @@
 msgid "buddy list"
 msgstr "Buddy-Liste"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+"Das Zertifikat ist selbstsigniert und kann nicht automatisch geprüft werden."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "Das Root-Zertifikat, welches angegeben wird, ist für Pidgin ungültig."
+
+msgid "The certificate is not valid yet."
+msgstr "Das Zertifikat ist noch nicht gültig."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr ""
+"Das Zertifikat ist abgelaufen und sollte nicht als gültig angesehen werden."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "Das präsentierte Zertifikat wurde nicht für diese Domain ausgestellt."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Sie haben keine Datenbank für Root-Zertifikate. Zertifikate können nicht "
+"überprüft werden."
+
+msgid "The certificate chain presented is invalid."
+msgstr "Die präsentierte Zertifizierungskette ist ungültig."
+
+msgid "The certificate has been revoked."
+msgstr "Das Zertifikat wurde widerrufen."
+
+msgid "An unknown certificate error occurred."
+msgstr "Es ist ein unbekannter Zertifikatfehler aufgetreten."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(stimmt nicht überein)"

@@ -1691,75 +1726,24 @@
 msgstr "Ze_rtifikat ansehen..."

 #, 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 ""
-"Das Zertifikat, welches von „%s“ präsentiert wurde, behauptet stattdessen "
-"von „%s“ zu kommen.  Das kann bedeuten, dass Sie tatsächlich nicht mit dem "
-"Dienst verbunden sind, mit dem Sie glauben verbunden zu sein."
-
-#. 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
+msgid "The certificate for %s could not be validated."
+msgstr "Das Zertifikat für %s konnte nicht validiert werden."
+
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL-Zertifikatfehler"

-msgid "Invalid certificate chain"
-msgstr "Ungültige Zertifikationskette"
-
-#. 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 ""
-"Sie haben keine Datenbank für Root-Zertifikate. Zertifikate können nicht "
-"überprüft werden."
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"Das Zertifikat von „%s“ ist selbstsigniert. Es kann nicht automatisch "
-"geprüft werden."
-
-#. FIXME 2.6.1
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "Die Zertifizierungskette, die für %s präsentiert wird, ist ungültig."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "Das Root-Zertifikat, welches angegeben wird, ist für Pidgin ungültig."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"Die Zertifizierungskette, welche von %s präsentiert wird, hat keine gültige "
-"digitale Signatur von der Zertifizierungsstelle, zu der die Signatur gehört."
-
-msgid "Invalid certificate authority signature"
-msgstr "Unbekannte Zertifizierungsstellensignatur"
+msgid "Unable to validate certificate"
+msgstr "Kann Zertifikat nicht validieren"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"Das Zertifikat behauptet stattdessen von „%s“ zu kommen. Das kann bedeuten, "
+"dass Sie tatsächlich nicht mit dem Dienst verbunden sind, mit dem Sie "
+"glauben verbunden zu sein."

 #. Make messages
 #, c-format
@@ -1996,18 +1980,18 @@
 msgstr "Dateiübertragung ist komplett"

 #, c-format
-msgid "You canceled the transfer of %s"
+msgid "You cancelled the transfer of %s"
 msgstr "Sie haben die Dateiübertragung von %s abgebrochen"

 msgid "File transfer cancelled"
 msgstr "Dateiübertragung wurde abgebrochen"

 #, c-format
-msgid "%s canceled the transfer of %s"
+msgid "%s cancelled the transfer of %s"
 msgstr "%s hat die Übertragung von %s abgebrochen"

 #, c-format
-msgid "%s canceled the file transfer"
+msgid "%s cancelled the file transfer"
 msgstr "%s hat die Datenübertragung abgebrochen"

 #, c-format
@@ -2202,6 +2186,35 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"

+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Keine Codecs gefunden. Installieren Sie einige GStreamer-Codecs mithilfe von "
+"GStreamer-Plugin-Paketen."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Keine Codecs übrig, Ihre Codec-Einstellungen in fs-codecs.conf sind zu "
+"streng."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Ein nicht behebbarer Farsight2-Fehler ist aufgetreten."
+
+msgid "Conference error."
+msgstr "Konferenz-Fehler"
+
+msgid "Error with your microphone."
+msgstr "Fehler mit Ihrem Mikrofon"
+
+msgid "Error with your webcam."
+msgstr "Fehler mit Ihrer Webcam"
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Fehler beim Aufbauen der Sitzung: %s"
+
 msgid "Error creating conference."
 msgstr "Fehler beim Erstellen der Konferenz."

@@ -2463,14 +2476,15 @@
 "Plugin zum Testen der IPC-Unterstützung als Server. Die IPC-Kommandos werden "
 "registriert."

-msgid "Join/Part Hiding Configuration"
-msgstr "Verstecken der Betreten-/Verlassen-Meldungen"
-
-msgid "Minimum Room Size"
-msgstr "Minimale Raumgröße"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "Benutzer-Inaktivitäts-Zeitüberschreitung"
+msgid "Hide Joins/Parts"
+msgstr "Joins/Parts verstecken"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "Für Räume mit mehr als so vielen Leuten"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "Wenn Benutzer so viele Minuten nicht gesprochen hat"

 msgid "Apply hiding rules to buddies"
 msgstr "Regeln zum Verstecken auf Buddies anwenden"
@@ -3929,15 +3943,22 @@
 msgid "Logo"
 msgstr "Logo"

+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+"%s wird Ihre Status-Updates nicht länger sehen können. Wollen Sie fortfahren?"
+
+msgid "Cancel Presence Notification"
+msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
+
 msgid "Un-hide From"
 msgstr "Sichtbar von"

 msgid "Temporarily Hide From"
 msgstr "Temporär versteckt von"

-msgid "Cancel Presence Notification"
-msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
-
 msgid "(Re-)Request authorization"
 msgstr "(Nochmal) nach Autorisierung fragen"

@@ -4554,7 +4575,7 @@

 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
+"users with a role or set users' role with the room."
 msgstr ""
 "role &lt;owner|admin|member|outcast|none&gt; [Benutzer1] [Benutzer2] ...: "
 "Benutzer mit einer Rolle für den Raum erfragen oder Benutzern eine Rolle "
@@ -4935,8 +4956,8 @@
 msgid "Not expected"
 msgstr "Nicht erwartet"

-msgid "Friendly name changes too rapidly"
-msgstr "Benutzernamen werden zu oft geändert"
+msgid "Friendly name is changing too rapidly"
+msgstr "Benutzername wird zu oft geändert"

 msgid "Server too busy"
 msgstr "Server ist zu beschäftigt"
@@ -5507,9 +5528,10 @@
 "unterstützt."

 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s hat Ihnen eine Webcam-Einladung gesendet, die noch nicht unterstützt wird."
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s hat Sie eingeladen sein/ihr Webcam-Bild zu sehen, dies wird aber noch "
+"nicht unterstützt."

 msgid "Away From Computer"
 msgstr "Abwesend"
@@ -5569,6 +5591,9 @@
 msgid "The username specified is invalid."
 msgstr "Der angegebene Benutzername ist ungültig."

+msgid "Friendly name changes too rapidly"
+msgstr "Benutzernamen werden zu oft geändert"
+
 msgid "This Hotmail account may not be active."
 msgstr "Dieses Hotmail-Konto ist vielleicht nicht aktiv."

@@ -6256,8 +6281,10 @@
 msgid "Server port"
 msgstr "Server-Port"

-msgid "Received unexpected response from "
-msgstr "Unerwartete Antwort erhalten von "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "Unerwartete Antwort von %s erhalten"

 #. username connecting too frequently
 msgid ""
@@ -6268,8 +6295,11 @@
 "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, müssen Sie sogar "
 "noch länger warten."

-msgid "Error requesting "
-msgstr "Fehler beim Anfordern von "
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "Fehler beim Anfordern von %s: %s"

 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL erlaubt Ihnen nicht, sich hier mit Ihrem Benutzernamen anzumelden"
@@ -7074,6 +7104,9 @@
 msgid "C_onnect"
 msgstr "V_erbinden"

+msgid "You closed the connection."
+msgstr "Sie haben die Verbindung beendet"
+
 msgid "Get AIM Info"
 msgstr "AIM-Info"

@@ -7084,6 +7117,9 @@
 msgid "Get Status Msg"
 msgstr "Abwesenheitsmitteilung abrufen"

+msgid "End Direct IM Session"
+msgstr "Direkt-IM-Sitzung beenden"
+
 msgid "Direct IM"
 msgstr "Direkte Nachricht"

@@ -7917,7 +7953,7 @@
 msgstr "Dateiübertragung"

 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d hat die Übertragung von %s abgebrochen"

 #, c-format
@@ -9454,6 +9490,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferenz- und Chateinladungen ignorieren"

+msgid "Use account proxy for SSL connections"
+msgstr "Proxy-Zugang für SSL-Verbindungen benutzen"
+
 msgid "Chat room list URL"
 msgstr "Chatraumliste (URL)"

@@ -9479,6 +9518,11 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Yahoo!-Japan-Protokoll-Plugin"

+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s hat Ihnen eine Webcam-Einladung gesendet, die noch nicht unterstützt wird."
+
 msgid "Your SMS was not delivered"
 msgstr "Ihre SMS wurde nicht ausgeliefert"

@@ -9554,9 +9598,26 @@
 msgid "Ignore buddy?"
 msgstr "Buddy ignorieren?"

-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr ""
-"Ihr Konto ist gesperrt. Bitte melden Sie sich auf der Yahoo! Webseite an."
+msgid "Invalid username or password"
+msgstr "Ungültiger Benutzername oder Passwort"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"Ihr Konto wurde aufgrund zu vieler fehlgeschlagener Login-Versuche gesperrt. "
+"Bitte versuchen Sie sich auf der Yahoo!-Webseite anzumelden."
+
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "Unbekannter Fehler 52. Ein Neu-Verbinden sollte dies beheben."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"Fehler 1013: Der Benutzername, den Sie eingegeben haben, ist ungültig. Die "
+"häufigste Ursache für diesen Fehler ist das Eingeben der E-Mail-Adresse "
+"anstatt der Yahoo!-ID."

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10324,6 +10385,124 @@
 "Listenfenster zu diesem Dialog zurückkehren und Konten hinzufügen, "
 "bearbeiten oder löschen"

+#. Buddy List
+msgid "Background Color"
+msgstr "Hintergrundfarbe"
+
+msgid "The background color for the buddy list"
+msgstr "Die Hintergrundfarbe für die Buddy-Liste"
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "Das Layout von Icons, Namen und Status der Kontaktliste"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "Hintergrundfarbe (ausgeklappt)"
+
+msgid "The background color of an expanded group"
+msgstr "Die Hintergrundfarbe für eine ausgeklappte Gruppe"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "Text (ausgeklappt)"
+
+msgid "The text information for when a group is expanded"
+msgstr "Die Textinformation für eine ausgeklappte Gruppe"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "Hintergrundfarbe (zusammengeklappt)"
+
+msgid "The background color of a collapsed group"
+msgstr "Die Hintergrundfarbe für eine zusammengeklappte Gruppe"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "Text (zusammengeklappt)"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Die Textinformation für eine zusammengeklappte Gruppe"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "Hintergrundfarbe für Kontakt/Chat"
+
+msgid "The background color of a contact or chat"
+msgstr "Die Hintergrundfarbe für einen Kontakt oder Chat"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Text für Kontakt"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Die Textinformation für einen ausgeklappten Kontakt"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "Online-Text"
+
+msgid "The text information for when a buddy is online"
+msgstr "Die Textinformation für einen Online-Buddy"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "Abwesenheitstext"
+
+msgid "The text information for when a buddy is away"
+msgstr "Die Textinformation für einen abwesenden Buddy"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "Offline-Text"
+
+msgid "The text information for when a buddy is offline"
+msgstr "Die Textinformation wenn ein Buddy offline ist"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "Untätigkeitstext"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Die Textinformation für einen untätigen Buddy"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "Nachrichtentext"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Die Textinformation für einen Buddy mit ungelesenen Nachrichten"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "Nachrichtentext (mit enthaltenem Spitznamen)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"Die Textinformation für einen Chat mit einer ungelesenen Nachricht, in der "
+"Ihr Nickname vorkommt"
+
+msgid "The text information for a buddy's status"
+msgstr "Die Textinformation für den Status eines Buddys"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -10764,8 +10943,8 @@
 msgid "_Group:"
 msgstr "_Gruppe:"

-msgid "Auto_join when account becomes online."
-msgstr "Automatisch _beitreten, wenn das Konto online geht."
+msgid "Auto_join when account connects."
+msgstr "Automatisch _beitreten, wenn sich das Konto verbindet."

 msgid "_Remain in chat after window is closed."
 msgstr "In _Chat bleiben, nachdem das Fenster geschlossen wird."
@@ -10797,100 +10976,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys sortieren"

-#. Buddy List
-msgid "Background Color"
-msgstr "Hintergrundfarbe"
-
-msgid "The background color for the buddy list"
-msgstr "Die Hintergrundfarbe für die Buddy-Liste"
-
-msgid "Layout"
-msgstr "Layout"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "Das Layout von Icons, Namen und Status der Kontaktliste"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "Hintergrundfarbe (ausgeklappt)"
-
-msgid "The background color of an expanded group"
-msgstr "Die Hintergrundfarbe für eine ausgeklappte Gruppe"
-
-msgid "Expanded Text"
-msgstr "Text (ausgeklappt)"
-
-msgid "The text information for when a group is expanded"
-msgstr "Die Textinformation für eine ausgeklappte Gruppe"
-
-msgid "Collapsed Background Color"
-msgstr "Hintergrundfarbe (zusammengeklappt)"
-
-msgid "The background color of a collapsed group"
-msgstr "Die Hintergrundfarbe für eine zusammengeklappte Gruppe"
-
-msgid "Collapsed Text"
-msgstr "Text (zusammengeklappt)"
-
-msgid "The text information for when a group is collapsed"
-msgstr "Die Textinformation für eine zusammengeklappte Gruppe"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "Hintergrundfarbe für Kontakt/Chat"
-
-msgid "The background color of a contact or chat"
-msgstr "Die Hintergrundfarbe für einen Kontakt oder Chat"
-
-msgid "Contact Text"
-msgstr "Text für Kontakt"
-
-msgid "The text information for when a contact is expanded"
-msgstr "Die Textinformation für einen ausgeklappten Kontakt"
-
-msgid "On-line Text"
-msgstr "Online-Text"
-
-msgid "The text information for when a buddy is online"
-msgstr "Die Textinformation für einen Online-Buddy"
-
-msgid "Away Text"
-msgstr "Abwesenheitstext"
-
-msgid "The text information for when a buddy is away"
-msgstr "Die Textinformation für einen abwesenden Buddy"
-
-msgid "Off-line Text"
-msgstr "Offline-Text"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "Die Textinformation für einen Offline-Buddy"
-
-msgid "Idle Text"
-msgstr "Untätigkeitstext"
-
-msgid "The text information for when a buddy is idle"
-msgstr "Die Textinformation für einen untätigen Buddy"
-
-msgid "Message Text"
-msgstr "Nachrichtentext"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "Die Textinformation für einen Buddy mit ungelesenen Nachrichten"
-
-msgid "Message (Nick Said) Text"
-msgstr "Nachrichtentext (mit enthaltenem Spitznamen)"
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-"Die Textinformation für einen Chat mit einer ungelesenen Nachricht, in der "
-"Ihr Nickname vorkommt"
-
-msgid "The text information for a buddy's status"
-msgstr "Die Textinformation für den Status eines Buddys"
-
 msgid "Type the host name for this certificate."
 msgstr "Geben Sie einen Hostnamen für dieses Zertifikat an."

@@ -10975,6 +11060,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Unterhaltung/_Neue Sofortnachricht..."

+msgid "/Conversation/Join a _Chat..."
+msgstr "/Unterhaltung/Einen Cha_t betreten..."
+
 msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."

@@ -11357,8 +11445,8 @@
 msgid "Estonian"
 msgstr "Estnisch"

-msgid "Euskera(Basque)"
-msgstr "Euskera (Baskisch)"
+msgid "Basque"
+msgstr "Baskisch"

 msgid "Persian"
 msgstr "Persisch"
@@ -11559,11 +11647,20 @@
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"

 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Hilfe per E-Mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Hilfe von anderen Pidgin-Benutzern:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>Dies ist eine <b>öffentliche</"
+"b> Mailing-Liste! (<a href=\"http://pidgin.im/pipermail/support/\">Archiv</"
+"a>)<br/>Wir können nicht bei Problemen mit Drittanbieter-Protokollen oder "
+"Plugins helfen!<br/>Die Hauptsprache dieser Liste ist <b>Englisch</b>.  Sie "
+"können gern in einer anderen Sprache schreiben, aber die Antworten könnten "
+"weniger hilfreich sein.<br/><br/>"

 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
@@ -12132,67 +12229,46 @@

 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
+msgstr ""
 "Benutzung: %s [OPTION]...\n"
 "\n"
-"  -c, --config=VERZ   benutze VERZ als Konfigurationsverzeichnis\n"
-"  -d, --debug         gibt Debugging-Meldungen nach stdout aus\n"
-"  -f, --force-online  online erzwingen, ungeachtet des Netzwerk-Status\n"
-"  -h, --help          zeigt diese Hilfe und beendet das Programm\n"
-"  -m, --multiple      mehrere Instanzen erlauben\n"
-"  -n, --nologin       nicht automatisch anmelden\n"
-"  -l, --login[=NAME]  angegebene Konten aktivieren (optionales Argument\n"
-"                      NAME bestimmt Konto(n), die benutzt werden sollen,\n"
-"                      getrennt durch Kommata. Ohne diesen Parameter wird\n"
-"                      nur das erste Konto aktiviert).\n"
-"  --display=DISPLAY   zu benutzendes X-Display\n"
-"  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
-
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Benutzung: %s [OPTION]...\n"
-"\n"
-"  -c, --config=VERZ   benutze VERZ als Konfigurationsverzeichnis\n"
-"  -d, --debug         gibt Debugging-Meldungen nach stdout aus\n"
-"  -f, --force-online  online erzwingen, ungeachtet des Netzwerkstatus\n"
-"  -h, --help          zeigt diese Hilfe und beendet das Programm\n"
-"  -m, --multiple      mehrere Instanzen erlauben\n"
-"  -n, --nologin       nicht automatisch anmelden\n"
-"  -l, --login[=NAME]  angegebene Konten aktivieren (optionales Argument\n"
-"                      NAME bestimmt Konto(n), die benutzt werden sollen,\n"
-"                      getrennt durch Kommata. Ohne diesen Parameter wird\n"
-"                      nur das erste Konto aktiviert).\n"
-"  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
+
+msgid "use DIR for config files"
+msgstr "DIR als Konfigurationsverzeichnis benutzen"
+
+msgid "print debugging messages to stdout"
+msgstr "Debug-Nachrichten nach stdout ausgeben"
+
+msgid "force online, regardless of network status"
+msgstr "online erzwingen, ungeachtet des Netzwerkstatus"
+
+msgid "display this help and exit"
+msgstr "diese Hilfe anzeigen und das Programm beenden"
+
+msgid "allow multiple instances"
+msgstr "mehrere Instanzen erlauben"
+
+msgid "don't automatically login"
+msgstr "nicht automatisch anmelden"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"angegebene Konten aktivieren (optionales Argument NAME\n"
+"                      bestimmt Konto(n), die benutzt werden sollen,\n"
+"                      getrennt durch Kommata."
+
+msgid "Without this only the first account will be enabled)."
+msgstr "Ohne diesen Parameter wirdnur das erste Konto aktiviert)."
+
+msgid "X display to use"
+msgstr "das zu benutzenden X-Display"
+
+msgid "display the current version and exit"
+msgstr "zeigt die aktuelle Version und beendet das Programm"

 #, c-format
 msgid ""
@@ -12237,9 +12313,6 @@
 msgid "/Media/_Hangup"
 msgstr "/Medien/_Auflegen"

-msgid "Calling..."
-msgstr "Anrufen..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s möchte eine Audio-/Video-Sitzung mit Ihnen starten."
@@ -13246,66 +13319,6 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Statistische Informationen über die Verfügbarkeit Ihrer Buddys zeigen"

-msgid "Server name request"
-msgstr "Servernamen-Anfrage"
-
-msgid "Enter an XMPP Server"
-msgstr "Geben Sie einen XMPP-Server ein"
-
-msgid "Select an XMPP server to query"
-msgstr "Wählen Sie einen XMPP-Server zur Abfrage"
-
-msgid "Find Services"
-msgstr "Dienste suchen"
-
-msgid "Add to Buddy List"
-msgstr "Zur Buddy-Liste hinzufügen"
-
-msgid "Gateway"
-msgstr "Gateway"
-
-msgid "Directory"
-msgstr "Verzeichnis"
-
-msgid "PubSub Collection"
-msgstr "PubSub-Sammlung"
-
-msgid "PubSub Leaf"
-msgstr "PubSub-Blatt"
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Beschreibung:</b>"
-
-#. Create the window.
-msgid "Service Discovery"
-msgstr "Dienstsuche"
-
-msgid "_Browse"
-msgstr "_Suchen"
-
-msgid "Server does not exist"
-msgstr "Server existiert nicht"
-
-msgid "Server does not support service discovery"
-msgstr "Server unterstützt keine Dienstsuche"
-
-msgid "XMPP Service Discovery"
-msgstr "XMPP-Dienstsuche"
-
-msgid "Allows browsing and registering services."
-msgstr "Erlaubt das Durchsuchen und Registrieren von Diensten."
-
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr ""
-"Dieses Plugin ist nützlich zum Registrieren bei veralteten Transports oder "
-"anderen XMPP-Diensten."
-
 msgid "Buddy is idle"
 msgstr "Buddy ist untätig"

@@ -13399,6 +13412,68 @@
 msgid "Apply in IMs"
 msgstr "In IMs anwenden"

+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "Servernamen-Anfrage"
+
+msgid "Enter an XMPP Server"
+msgstr "Geben Sie einen XMPP-Server ein"
+
+msgid "Select an XMPP server to query"
+msgstr "Wählen Sie einen XMPP-Server zur Abfrage"
+
+msgid "Find Services"
+msgstr "Dienste suchen"
+
+msgid "Add to Buddy List"
+msgstr "Zur Buddy-Liste hinzufügen"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Directory"
+msgstr "Verzeichnis"
+
+msgid "PubSub Collection"
+msgstr "PubSub-Sammlung"
+
+msgid "PubSub Leaf"
+msgstr "PubSub-Blatt"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Beschreibung:</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Dienstsuche"
+
+msgid "_Browse"
+msgstr "_Suchen"
+
+msgid "Server does not exist"
+msgstr "Server existiert nicht"
+
+msgid "Server does not support service discovery"
+msgstr "Server unterstützt keine Dienstsuche"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP-Dienstsuche"
+
+msgid "Allows browsing and registering services."
+msgstr "Erlaubt das Durchsuchen und Registrieren von Diensten."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Dieses Plugin ist nützlich zum Registrieren bei veralteten Transports oder "
+"anderen XMPP-Diensten."
+
 msgid "By conversation count"
 msgstr "Nach der Zahl der Gespräche"

@@ -14192,6 +14267,52 @@
 "Dieses Plugin erlaubt es dem Benutzer die Zeitstempel in Unterhaltungen und "
 "im Mitschnitt anzupassen."

+msgid "Audio"
+msgstr "Audio"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Output"
+msgstr "Ausgang"
+
+msgid "_Plugin"
+msgstr "_Plugin"
+
+msgid "_Device"
+msgstr "_Gerät"
+
+msgid "Input"
+msgstr "Eingang"
+
+msgid "P_lugin"
+msgstr "P_lugin"
+
+msgid "D_evice"
+msgstr "G_erät"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Sprach-/Video-Einstellungen"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Mikrofon und Webcam konfigurieren"
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+"Die Mikrofon- und Webcam-Einstellungen für Audio- und Video-Anrufe bearbeiten"
+
 msgid "Opacity:"
 msgstr "Durchlässigkeit:"

@@ -14318,6 +14439,3 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Dieses Plugin ist nützlich zur Fehlersuche in XMPP-Servern oder -Clients."
-
-#~ msgid "Failed to open the file"
-#~ msgstr "Öffnen der Datei fehlgeschlagen"
--- a/po/eu.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/eu.po	Tue Sep 01 19:51:07 2009 +0000
@@ -7,8 +7,8 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 17:40-0700\n"
-"PO-Revision-Date: 2009-08-04 21:14+0200\n"
+"POT-Creation-Date: 2009-08-29 21:39-0700\n"
+"PO-Revision-Date: 2009-08-29 23:23+0200\n"
 "Last-Translator: Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>\n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -865,8 +865,8 @@
 msgid "System Log"
 msgstr "Sistemaren Txostena"

-msgid "Calling ... "
-msgstr "Deitzen ... "
+msgid "Calling..."
+msgstr "Deitzen..."

 msgid "Hangup"
 msgstr "Eskegi"
@@ -1414,15 +1414,17 @@
 msgstr "Ezin da plugin hau kargatu, ez zelako X11 jasateko eraiki."

 msgid "GntClipboard"
-msgstr ""
+msgstr "GntArbela"

 msgid "Clipboard plugin"
-msgstr ""
+msgstr "Arbela plugina"

 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
+"Gnt arbelaren edukiak aldatzean, X-en eskura jarriko dira edukiak, ahal "
+"izanez gero."

 #, c-format
 msgid "%s just signed on"
@@ -1502,6 +1504,29 @@
 "Solasaldi berri bat irekitzean, plugin honek azken solasaldia sartuko du "
 "solasaldi berrian."

+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"TinyURLa eskuratzen..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "Luzera hau edo gehiago URL-entzat bakarrik sortu TinyURLak"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (edo antzekoak) helbide-aurrizkia"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL plugina"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr "URLa(k) dituen mezu bat jasotzean, TinyURL erabili errazago kopiatzeko"
+
 msgid "Online"
 msgstr "Konektatuta"

@@ -1545,29 +1570,6 @@
 msgid "Lastlog plugin."
 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 "Luzera hau edo gehiago url-entzat bakarrik sortu TinyURLak"
-
-msgid "TinyURL (or other) address prefix"
-msgstr "TinyURL (edo antzekoak) helbide-aurrizkia"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "TinyURL plugina"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr "URLa(k) dituen mezu bat jasotzean, TinyURL erabili errazago kopiatzeko"
-
 msgid "accounts"
 msgstr "kontuak "

@@ -1629,6 +1631,39 @@
 msgid "buddy list"
 msgstr "lagun-zerrenda"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "Auto-sinatua da zertifikatua eta ezin da automatikoki egiaztatu."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "Pidgin-ek ez du ezagutzen hau eskaini duela dioen erro-zertifikatua."
+
+msgid "The certificate is not valid yet."
+msgstr "Zertifikatua ez da baliozkoa oraindik."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr "Iraungi egin da zertifikatua, eta ezin da baliozkotzat hartu."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "Aurkeztutako zertifikatua ez dago domeinu honetara esleitua."
+
+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."
+
+msgid "The certificate chain presented is invalid."
+msgstr "Baliogabea da aurkeztutako zertifikatu-katea."
+
+msgid "The certificate has been revoked."
+msgstr "Baliogabetua izan da zertifikatua."
+
+msgid "An unknown certificate error occurred."
+msgstr "Zertifikatu-errore ezezaguna gertatu da."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(EZ DATOR BAT)"

@@ -1672,74 +1707,23 @@
 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
+msgid "The certificate for %s could not be validated."
+msgstr "Ezin izan da %s(r)entzako zertifikatua balioztatu."
+
 #. 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
-#, c-format
-msgid ""
-"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 "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 "Pidgin-ek ez du ezagutzen hau eskaini duela dioen erro-zertifikatua."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"%s(e)k aurkeztutako zertifikatu-kateak ez dauka berak dioen Zertifikatu "
-"Autoritatearen baliozko sinadura digitalik."
-
-msgid "Invalid certificate authority signature"
-msgstr "Zertifikatu-autoritate sinadura baliogabea"
+msgid "Unable to validate certificate"
+msgstr "Ezin zertifikatua balioztatu"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"Ordea, \"%s\"(r)ena dela dio zertifikatuak. Agian ez zara zuk uste duzun "
+"zerbitzura konektatzen ari."

 #. Make messages
 #, c-format
@@ -1777,7 +1761,6 @@
 msgstr "+++ %s irten egin da"

 #. Unknown error
-#, c-format
 msgid "Unknown error"
 msgstr "Errore ezezaguna"

@@ -1977,18 +1960,18 @@
 msgstr "Fitxategi-transferentzia burututa"

 #, c-format
-msgid "You canceled the transfer of %s"
-msgstr "%s(r)en transferentzia bertan behera utzi duzu"
+msgid "You cancelled the transfer of %s"
+msgstr "Bertan behera utzi duzu %s(r)en transferentzia"

 msgid "File transfer cancelled"
-msgstr "Fitxategi-transferentzia bertan behera utzi da"
-
-#, c-format
-msgid "%s canceled the transfer of %s"
+msgstr "Bertan behera utzi da fitxategi-transferentzia"
+
+#, c-format
+msgid "%s cancelled the transfer of %s"
 msgstr "%s(e)k bertan behera utzi du transferentzia: %s"

 #, c-format
-msgid "%s canceled the file transfer"
+msgid "%s cancelled the file transfer"
 msgstr "%s(e)k bertan behera utzi du fitxategi-transferentzia"

 #, c-format
@@ -2183,6 +2166,35 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <ERANTZUN AUTOMATIKOA>: %s\n"

+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Ez da codec-ik aurkitu. GStreamer plugin-paketeetan topatuko dituzun "
+"GStreamer codec-ak instalatu itzazu."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Ez da codec-ik geratzen. Zorrotzegiak dira \"fs-codecs.conf\"-en dituzun "
+"hobespenak."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Farsight2-errore berreskuraezina bat gertatu da."
+
+msgid "Conference error."
+msgstr "Konferentzia-errorea"
+
+msgid "Error with your microphone."
+msgstr "Errorea zure mikrofonoarekin."
+
+msgid "Error with your webcam."
+msgstr "Errorea zure web kamerarekin."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Errorea sesioa sortzean: %s"
+
 msgid "Error creating conference."
 msgstr "Errorea konferentzia sortzean."

@@ -2193,9 +2205,9 @@
 msgid "This plugin has not defined an ID."
 msgstr "Plugin honek ez du IDrik zehaztu."

-#, fuzzy, c-format
+#, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "Plugin magikoa gaizki elkartua %d (%d beharrezkoa) "
+msgstr "Plugin magia okerra %d (%d behar)"

 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
@@ -2442,14 +2454,15 @@
 "Zerbitzari gisa IPC euskarria probatzeko plugina. IPC aginduak "
 "erregistratzen ditu."

-msgid "Join/Part Hiding Configuration"
-msgstr "Batu/Irten Ezkutatzearen Konfigurazioa"
-
-msgid "Minimum Room Size"
-msgstr "Gela-Tamaina Minimoa"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "Erabiltzaile Inaktibitate Denbora-muga (minututan)"
+msgid "Hide Joins/Parts"
+msgstr "Batu/Irteerak Ezkutatu"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "Jende hau baina gehiago duten geletan"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "Erabiltzaileak ez badu hitz egin minutu hauetan"

 msgid "Apply hiding rules to buddies"
 msgstr "Lagunei aplikatu ezkutatze arauak"
@@ -2743,7 +2756,7 @@
 msgstr "Azaldu notifikazio mezua solasaldian"

 msgid "Raise psychic conversations"
-msgstr ""
+msgstr "Solasaldi psikikoak igo"

 #. *< type
 #. *< ui_requirement
@@ -3741,27 +3754,27 @@

 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"Zerbitzariak testu-arrunt autentifikazioa behar du, enkriptatu gabeko jarioan"
+"Zerbitzariak testu-arrunt balioztatzea behar du, enkriptatu gabeko jarioan"

 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s(e)k testu-arrunt autentifikazioa behar du, enkriptatu gabeko jarioan.   "
-"Hau baimendu eta autentifikazioarekin jarraitu?"
+"%s(e)k testu-arrunt balioztatzea behar du, enkriptatu gabeko jarioan.   Hau "
+"baimendu eta balioztatzearekin jarraitu?"

 msgid "Plaintext Authentication"
-msgstr "Testu-arrunt Autentifikazioa"
+msgstr "Testu-arrunt Balioztatzea"

 msgid "SASL authentication failed"
-msgstr "Errorea SASL autentifikazioan"
+msgstr "Errorea SASL balioztatzean"

 msgid "Invalid response from server"
 msgstr "Erantzun baliogabea zerbitzaritik"

 msgid "Server does not use any supported authentication method"
-msgstr "Zerbitzariak ez du jasandako autentifikazio-metodorik erabiltzen"
+msgstr "Zerbitzariak ez du jasandako balioztatze-metodorik erabiltzen"

 msgid "You require encryption, but it is not available on this server."
 msgstr "Enkripzioa behar duzu, baina zerbitzari honetan ezin da erabili."
@@ -3894,15 +3907,21 @@
 msgid "Logo"
 msgstr "Logotipoa"

+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "%s(e)k ezingo ditu zure egoera-aldaketak ikusi. Jarraitu nahi duzu?"
+
+msgid "Cancel Presence Notification"
+msgstr "Presentzia-Jakinarazpena Ezeztatu"
+
 msgid "Un-hide From"
 msgstr "Honengandik Ez Ezkutatu"

 msgid "Temporarily Hide From"
 msgstr "Honengandik Ezkutatu Oraingoz"

-msgid "Cancel Presence Notification"
-msgstr "Presentzia-Jakinarazpena Ezeztatu"
-
 msgid "(Re-)Request authorization"
 msgstr "Baimena (berriro) Eskatu"

@@ -4052,8 +4071,9 @@
 msgid "Roles:"
 msgstr "Funtzioak:"

+#, fuzzy
 msgid "Ping timed out"
-msgstr ""
+msgstr "Ping-denbora agortua"

 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
@@ -4150,7 +4170,7 @@
 msgstr "SSL/TLS hasiarazten"

 msgid "Authenticating"
-msgstr "Autentifikatzen"
+msgstr "Balioztatzen"

 msgid "Re-initializing Stream"
 msgstr "Jarioa Berrasiaratzen"
@@ -4320,10 +4340,10 @@
 msgstr "Baimen-mekanismo ahulegia"

 msgid "Temporary Authentication Failure"
-msgstr "Aldiuneko Autentifikazio-Errorea"
+msgstr "Aldiuneko Balioztatze-Errorea"

 msgid "Authentication Failure"
-msgstr "Autentifikazio-Errorea"
+msgstr "Balioztatze-Errorea"

 msgid "Bad Format"
 msgstr "Formatu Baliogabea"
@@ -4510,10 +4530,11 @@

 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
+"users with a role or set users' role with the room."
 msgstr ""
 "role &lt;moderator|participant|visitor|none&gt; [ezizena1] [ezizena2] ...: "
-"Gela batean rol bat duten erabiltzaileak eskuratu, edo rol bat ezarri."
+"Gela batean rol bat duten erabiltzaileak eskuratu, edo erabiltzailearen rola "
+"ezarri."

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;erabiltzailea&gt; [mezua]:  Erabiltzailea gelara gonbidatu."
@@ -4561,7 +4582,7 @@
 msgstr "SSL zaharra (5223 ataka) behartu"

 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "Enkriptatu gabeko jarioen bidezko testu-arrunt autentifikazioa onartu"
+msgstr "Enkriptatu gabeko jarioen bidezko testu-arrunt balioztatzea onartu"

 msgid "Connect port"
 msgstr "Konexio-ataka"
@@ -4657,9 +4678,6 @@
 msgid "Transfer was closed."
 msgstr "Transferentzia itxiarazi da."

-msgid "Failed to open the file"
-msgstr "Ezin fitxategia ireki"
-
 msgid "Failed to open in-band bytestream"
 msgstr "Ezin banda barneko byte-jarioa ireki"

@@ -4848,7 +4866,7 @@
 msgid "Required fields missing"
 msgstr "Beharrezko eremu batzuk falta"

-#, fuzzy, c-format
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Emaitza gehiegi FND baterako"

@@ -4936,9 +4954,8 @@
 msgid "Not expected"
 msgstr "Ez zen espero"

-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Lagunarteko izena bizkorregi aldatzen ari da"
+msgid "Friendly name is changing too rapidly"
+msgstr "Azkarregi ari da aldatzen lagunarteko izena"

 #, c-format
 msgid "Server too busy"
@@ -4946,7 +4963,7 @@

 #, c-format
 msgid "Authentication failed"
-msgstr "Ezin autentifikatu"
+msgstr "Ezin balioztatu"

 #, c-format
 msgid "Not allowed when offline"
@@ -5370,10 +5387,10 @@
 msgstr "nudge: erabiltzaile bati ukondokada eman, bere harreta eskuratzeko"

 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "Windows Live ID autentifikazioa: Ezin konektatu"
+msgstr "Windows Live ID balioztatzea: Ezin konektatu"

 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Windows Live ID autentifikazioa: Erantzun baliogabea"
+msgstr "Windows Live ID balioztatzea: Erantzun baliogabea"

 #, c-format
 msgid "%s just sent you a Nudge!"
@@ -5474,7 +5491,7 @@

 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "Ezin autentifikatu: %s"
+msgstr "Ezin balioztatu: %s"

 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
@@ -5489,7 +5506,7 @@
 msgstr "Transferitzen"

 msgid "Starting authentication"
-msgstr "Autentifikazioa hasieratzen"
+msgstr "Balioztatzea hasieratzen"

 msgid "Getting cookie"
 msgstr "Cookie-a eskuratzen"
@@ -5507,8 +5524,10 @@
 "oraindik."

 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s(e)k web-kamera gonbita bidali dizu, baina oraindik ez dago jasana."
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s(e)k bere web kamera ikustera gonbidatu zaitu, baina hau ez dago jasana "
+"oraindik."

 msgid "Away From Computer"
 msgstr "Ordenagailutik Urrun"
@@ -5557,6 +5576,10 @@
 msgid "The username specified is invalid."
 msgstr "Baliogabea da zehaztutako erabiltzaile-izena."

+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "Lagunarteko izena bizkorregi aldatzen ari da"
+
 msgid "This Hotmail account may not be active."
 msgstr "Posible da Hotmail-kontu hau aktibatuta ez egotea."

@@ -5629,7 +5652,7 @@
 msgstr "Halako erabiltzailerik ez: %s"

 msgid "User lookup"
-msgstr ""
+msgstr "Erabiltzaile bilaketa"

 msgid "Reading challenge"
 msgstr "Erronka irakurtzen"
@@ -6167,7 +6190,7 @@
 msgstr "GroupWise Konferentzia %d"

 msgid "Authenticating..."
-msgstr "Autentifikatzen..."
+msgstr "Balioztatzen..."

 msgid "Waiting for response..."
 msgstr "Erantzunaren zain..."
@@ -6227,8 +6250,10 @@
 msgid "Server port"
 msgstr "Zerbitzariaren ataka"

-msgid "Received unexpected response from "
-msgstr "Espero ez zen erantzuna jaso da "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "Espero ez zen erantzuna jaso da %s(e)tik"

 #. username connecting too frequently
 msgid ""
@@ -6239,12 +6264,14 @@
 "saiatu aurretik. Saiatzen jarraituz gero, agian gehiago ere itxaron beharko "
 "duzu."

-#, c-format
-msgid "Error requesting "
-msgstr "Errorea eskaeran."
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "Errorea %s eskatzean: %s"

 msgid "AOL does not allow your screen name to authenticate here"
-msgstr "AOL-k ez du zure pantaila-izena hemen autentifikatzea onartzen"
+msgstr "AOL-k ez du zure pantaila-izena hemen balioztatzea onartzen"

 msgid "Could not join chat room"
 msgstr "Ezin gelara batu"
@@ -6503,7 +6530,7 @@

 #, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr "Ezin autentifikazio-zerbitzarira konektatu: %s"
+msgstr "Ezin balioztatze-zerbitzarira konektatu: %s"

 #, c-format
 msgid "Unable to connect to BOS server: %s"
@@ -6552,9 +6579,8 @@
 msgstr "Erabiltzaile-izena ez da existitzen"

 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Zure kontua suspendituta dago"
+msgstr "Zure kontua suspendituta dago oraintxe"

 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
@@ -7017,6 +7043,9 @@
 msgid "C_onnect"
 msgstr "_Konektatu"

+msgid "You closed the connection."
+msgstr "Konexioa itxi duzu."
+
 msgid "Get AIM Info"
 msgstr "AIM-Informazioa Eskuratu"

@@ -7027,6 +7056,9 @@
 msgid "Get Status Msg"
 msgstr "Egoera-Mezua Eskuratu"

+msgid "End Direct IM Session"
+msgstr "Zuzeneko IM Sesioa Amaitu"
+
 msgid "Direct IM"
 msgstr "Zuzeneko IM"

@@ -7460,7 +7492,7 @@
 msgstr "QQ Qun-era Batu"

 msgid "Input request here"
-msgstr ""
+msgstr "Hemen sartu eskaera"

 #, c-format
 msgid "Successfully joined Qun %s (%u)"
@@ -7719,7 +7751,7 @@
 msgstr "Solasaldi-gela erakutsi mezua jasotzean"

 msgid "Keep alive interval (seconds)"
-msgstr ""
+msgstr "Bizirik mantentzeko tartea (segundoak)"

 msgid "Update interval (seconds)"
 msgstr "Eguneratze-tartea (segundoak)"
@@ -7862,7 +7894,7 @@
 msgstr "Fitxategi Bidalia"

 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d(e)k bertan behera utzi du %s fitxategiaren transferentzia"

 #, c-format
@@ -8078,13 +8110,11 @@
 msgid "Local Buddy List Only"
 msgstr "Lagun-Zerrenda Lokala Bakarrik"

-#, fuzzy
 msgid "Merge List from Server"
-msgstr "Ezabatu lagunen zerrenda zerbitzaritik"
-
-#, fuzzy
+msgstr "Zerbitzariko Zerrenda Batu"
+
 msgid "Merge and Save List to Server"
-msgstr "Esportatu lagunen zerrenda zerbitzarira"
+msgstr "Batu eta Zerbitzarian Gorde Zerrenda"

 msgid "Synchronize List with Server"
 msgstr "Zerbitzariarekin Sinkronizatu Zerrenda"
@@ -8494,14 +8524,14 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"Kanalaren autentifikazioari esker, baimendu gabeko sarrerak ekiditen dira. "
+"Kanalaren balioztatzeari 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 Balioztatzea"

 msgid "Add / Remove"
 msgstr "Gehitu / Kendu"
@@ -8796,7 +8826,7 @@
 msgstr "Sesioa berrabiarazten"

 msgid "Authenticating connection"
-msgstr "Konexioa autentifikatzen"
+msgstr "Konexioa balioztatzen"

 msgid "Verifying server public key"
 msgstr "Zerbitzariaren gako publikoa egiaztatzen"
@@ -8919,9 +8949,8 @@
 msgid "Timezone (UTC)"
 msgstr "Ordu-zona (UTC)"

-#, fuzzy
 msgid "User Online Status Attributes"
-msgstr "Erabiltzailearen lineako egoeraren atributuak"
+msgstr "Erabiltzailearen Online Egoeraren Atributuak"

 msgid ""
 "You can let other users see your online status information and your personal "
@@ -9147,7 +9176,7 @@
 msgstr ""

 msgid "Public key authentication"
-msgstr "Gako publikoaren autentifikazioa"
+msgstr "Gako publikoaren balioztatzea"

 msgid "Block IMs without Key Exchange"
 msgstr "Gako-trukerik gabe IMak blokeatu"
@@ -9302,7 +9331,7 @@

 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "Hutsegitea: Huts egin du autentifikazioak"
+msgstr "Hutsegitea: Huts egin du balioztatzeak"

 msgid "Unable to initialize SILC Client connection"
 msgstr "Ezin SILC Bezeroaren konexioa hasieratu"
@@ -9405,6 +9434,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferentzia eta berriketa-geletarako gonbidapenak ezikusi"

+msgid "Use account proxy for SSL connections"
+msgstr "Kontuaren proxy-a erabili SSL konexioetarako"
+
 msgid "Chat room list URL"
 msgstr "Berriketa-gelen zerrendaren URLa"

@@ -9430,6 +9462,10 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Yahoo! JAPAN Protokolo-Plugina"

+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s(e)k web-kamera gonbita bidali dizu, baina oraindik ez dago jasana."
+
 msgid "Your SMS was not delivered"
 msgstr "Ez da zure SMSa bidali"

@@ -9485,12 +9521,11 @@
 "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.  Ziurrenik ezingo duzu Yahoo-ra konektatu.  %s(e)ra joan eguneraketa "
-"bila."
+"Yahoo zerbitzariak balioztatzeko metodo ezezagun bat erabiltzea eskatu 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!-Balioztatzeak"

 #, c-format
 msgid ""
@@ -9503,8 +9538,26 @@
 msgid "Ignore buddy?"
 msgstr "Laguna ezikusi?"

-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Zure kontua blokeatuta dago; Yahoo! webgunean konektatu zaitez."
+msgid "Invalid username or password"
+msgstr "Erabiltzaile-izen edo pasahitz okerra"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"Zure kontua blokeatua izan da, konexio-saiakera gehiegi hutsegin direlako.   "
+"Yahoo! webgunean konektatuz konpon liteke."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "52 errore ezezaguna.  Berriro konektatzean konpondu beharko litzateke."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"1013 errorea: Baliogabea da zuk sartutako erabiltzaile-izena.  Askotan, "
+"jendeak bere e-posta helbidea sartzen du bere Yahoo! IDa sartu beharrean."

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10264,6 +10317,124 @@
 "Lagun-Zerrenda leihoko <b>Kontuak->Kontuak Kudeatu</b> sakatu ezazu leiho "
 "honetara itzuli eta kontuak gehitu, editatu edo kentzeko"

+#. Buddy List
+msgid "Background Color"
+msgstr "Atzealdeko Kolorea"
+
+msgid "The background color for the buddy list"
+msgstr "Lagun-zerrendaren atzealdeko kolorea."
+
+msgid "Layout"
+msgstr "Diseinua"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "Lagun-zerrendako ikono, izen eta egoeren diseinua"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "Atzealde Zabalduaren Kolorea"
+
+msgid "The background color of an expanded group"
+msgstr "Talde zabalduaren atzealdearen kolorea"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "Testu Zabaldua"
+
+msgid "The text information for when a group is expanded"
+msgstr "Talde zabalduaren testu-informazioa"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "Atzealde Tolestuaren Kolorea"
+
+msgid "The background color of a collapsed group"
+msgstr "Talde tolestuaren atzealdearen kolorea"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "Testu Tolestua"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Talde tolestuaren testu-informazioa"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "Kontaktu/Solasaldien Atzealdearen Kolorea"
+
+msgid "The background color of a contact or chat"
+msgstr "Kontaktu edo solasaldien atzealdearen kolorea"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Kontaktu-Testua"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Kontaktua zabaltzen denerako testu-informazioa"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "Online-Testua"
+
+msgid "The text information for when a buddy is online"
+msgstr "Lagun bat online dagoenerako testu-informazioa"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "Kanpoan-Testua"
+
+msgid "The text information for when a buddy is away"
+msgstr "Lagun bat kanpoan dagoenerako testu-informazioa"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "Offline-Testua"
+
+msgid "The text information for when a buddy is offline"
+msgstr "Lagun bat offline dagoenerako testu-informazioa"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "inaktibo-Testua"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Lagun bat inaktibo dagoenerako testu-informazioa"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "Mezu-Testua"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Lagun batek irakurri gabeko mezu bat daukanerako testu-informazioa"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "Mezu-Testua(Ezizena Aipatua)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"Solasaldi batean zure ezizena aipatzenduen irakurri gabeko mezu bat "
+"dagoenerako testu-informazioa"
+
+msgid "The text information for a buddy's status"
+msgstr "Lagunaren egoerarako testu-informazioa"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -10692,7 +10863,7 @@
 msgid "_Group:"
 msgstr "_Taldea:"

-msgid "Auto_join when account becomes online."
+msgid "Auto_join when account connects."
 msgstr "Auto-_batu kontua konektatzean."

 msgid "_Remain in chat after window is closed."
@@ -10725,100 +10896,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Lagunak/Lagunak Antolatu"

-#. Buddy List
-msgid "Background Color"
-msgstr "Atzealdeko Kolorea"
-
-msgid "The background color for the buddy list"
-msgstr "Lagun-zerrendaren atzealdeko kolorea."
-
-msgid "Layout"
-msgstr "Diseinua"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "Lagun-zerrendako ikono, izena eta egoeren diseinua"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "Atzealde Zabalduaren Kolorea"
-
-msgid "The background color of an expanded group"
-msgstr "Talde zabalduaren atzealdearen kolorea"
-
-msgid "Expanded Text"
-msgstr "Testu Zabaldua"
-
-msgid "The text information for when a group is expanded"
-msgstr "Talde zabalduaren testu-informazioa"
-
-msgid "Collapsed Background Color"
-msgstr "Atzealde Tolestuaren Kolorea"
-
-msgid "The background color of a collapsed group"
-msgstr "Talde tolestuaren atzealdearen kolorea"
-
-msgid "Collapsed Text"
-msgstr "Testu Tolestua"
-
-msgid "The text information for when a group is collapsed"
-msgstr "Talde tolestuaren testu-informazioa"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "Kontaktu/Solasaldien Atzealdearen Kolorea"
-
-msgid "The background color of a contact or chat"
-msgstr "Kontaktu edo solasaldien atzealdearen kolorea"
-
-msgid "Contact Text"
-msgstr "Kontaktu-Testua"
-
-msgid "The text information for when a contact is expanded"
-msgstr "Kontaktua zabaltzen denerako testu-informazioa"
-
-msgid "On-line Text"
-msgstr "Online-Testua"
-
-msgid "The text information for when a buddy is online"
-msgstr "Lagun bat online dagoenerako testu-informazioa"
-
-msgid "Away Text"
-msgstr "Kanpoan-Testua"
-
-msgid "The text information for when a buddy is away"
-msgstr "Lagun bat kanpoan dagoenerako testu-informazioa"
-
-msgid "Off-line Text"
-msgstr "Offline-Testua"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "Lagun bat offline dagoenerako testu-informazioa"
-
-msgid "Idle Text"
-msgstr "inaktibo-Testua"
-
-msgid "The text information for when a buddy is idle"
-msgstr "Lagun bat inaktibo dagoenerako testu-informazioa"
-
-msgid "Message Text"
-msgstr "Mezu-Testua"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "Lagun batek irakurri gabeko mezu bat daukanerako testu-informazioa"
-
-msgid "Message (Nick Said) Text"
-msgstr "Mezu-Testua(Ezizena Aipatua)"
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-"Solasaldi batean zure ezizena aipatzenduen irakurri gabeko mezu bat "
-"daukanerako testu-informazioa"
-
-msgid "The text information for a buddy's status"
-msgstr "Lagunaren egoerarako testu-informazioa"
-
 msgid "Type the host name for this certificate."
 msgstr "Zertifikatu honen ostalari-izena idatzi ezazu."

@@ -10901,6 +10978,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Solasaldia/Istanteko _Mezu Berria..."

+msgid "/Conversation/Join a _Chat..."
+msgstr "/Solasaldia/Be_rriketara Batu..."
+
 msgid "/Conversation/_Find..."
 msgstr "/Solasaldia/_Bilatu..."

@@ -11210,9 +11290,8 @@
 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]"
+msgstr "hacker eta aukeratutako gidaria [zerri alperra]"

 msgid "support/QA"
 msgstr "euskarria/Galderak"
@@ -11283,7 +11362,7 @@
 msgid "Estonian"
 msgstr "Estoniera"

-msgid "Euskera(Basque)"
+msgid "Basque"
 msgstr "Euskara"

 msgid "Persian"
@@ -11349,7 +11428,6 @@
 msgid "Kurdish"
 msgstr "Kurduera"

-#, fuzzy
 msgid "Lao"
 msgstr "Laoera"

@@ -11489,11 +11567,20 @@

 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">E-posta bidezko laguntza:</FONT> <A HREF=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Beste erabiltzaileen laguntza:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>Posta-zerrenda hau "
+"<b>publikoa</b> da! (<a href=\"http://pidgin.im/pipermail/support/"
+"\">artxiboa</a>)<br/>Ezin zaitugu beste egileen protokolo edo pluginekin "
+"lagundu!<br/>Zerrenda honetan erabilitako hizkuntza nagusia <b>Ingelesa</b> "
+"da.  Beste edozein hizkuntza erabil dezakezu, baina eratzun gutxiago jasoko "
+"dituzu.<br/><br/>"

 #, c-format
 msgid ""
@@ -12055,66 +12142,46 @@

 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
+msgstr ""
 "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"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"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"
+
+msgid "use DIR for config files"
+msgstr "DIR erabili konfigurazio-fitxategietarako"
+
+msgid "print debugging messages to stdout"
+msgstr "arazte-mezuak idatzi stdout-en"
+
+msgid "force online, regardless of network status"
+msgstr "online egotera behartu, sarearen egoera kontutan hartu gabe"
+
+msgid "display this help and exit"
+msgstr "laguntza hau erakutsi eta irten"
+
+msgid "allow multiple instances"
+msgstr "istantzia ugari onartu"
+
+msgid "don't automatically login"
+msgstr "ez automatikoki konektatu"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"zehaztutako kontua(k) gaitu (NAME argumentu opzionalak\n"
+"                      zehazten ditu erabili beharrelo kontuak, komaz "
+"bereiztuak."
+
+msgid "Without this only the first account will be enabled)."
+msgstr "Hau gabe, lehen kontua bakarrik gaituko da)."
+
+msgid "X display to use"
+msgstr "Erabiliko den X pantaila"
+
+msgid "display the current version and exit"
+msgstr "egungo bertsioa erakutsi eta irten"

 #, c-format
 msgid ""
@@ -12147,9 +12214,6 @@
 msgid "/Media/_Hangup"
 msgstr "/Multimedia/E_skegi"

-msgid "Calling..."
-msgstr "Deitzen..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s(e)k audio-/bideo-sesio bat hasiarazi nahi du zurekin."
@@ -12158,6 +12222,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s(e)k bideo-sesio bat hasiarazi nahi du zurekin."

+msgid "Incoming Call"
+msgstr "Deia Jasotzen"
+
+msgid "_Pause"
+msgstr "_Pausarazi"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -12201,9 +12271,8 @@
 msgid "Dismiss"
 msgstr "Mespretxatu"

-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Alerta daukazu!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Alerta bidali duzu!</span>"

 msgid "The following plugins will be unloaded."
 msgstr "Plugin hauek memoriatik deskargatuko dira."
@@ -13061,8 +13130,9 @@
 msgid "_Open File"
 msgstr "Fitxategia _Ireki"

+#, fuzzy
 msgid "Open _Containing Directory"
-msgstr ""
+msgstr "Bere _Direktorioa Ireki"

 msgid "Save File"
 msgstr "Fitxategia Gorde"
@@ -13097,9 +13167,6 @@
 msgid "_Open Mail"
 msgstr "_Posta Ireki"

-msgid "_Pause"
-msgstr "_Pausarazi"
-
 msgid "_Edit"
 msgstr "_Editatu"

@@ -13165,67 +13232,6 @@
 "Zure lagunen eskuragarritasunaren inguruko informazio estatistikoa erakusten "
 "du"

-msgid "Server name request"
-msgstr "Zerbitzari-izen eskaera"
-
-msgid "Enter an XMPP Server"
-msgstr "XMPP Zerbitzarira sartu"
-
-msgid "Select an XMPP server to query"
-msgstr "Galdetzeko XMPP-zerbitzari bat hautatu"
-
-msgid "Find Services"
-msgstr "Zerbitzuak Bilatu"
-
-msgid "Add to Buddy List"
-msgstr "Lagun-Zerrendara Gehitu"
-
-msgid "Gateway"
-msgstr "Pasabidea"
-
-msgid "Directory"
-msgstr "Direktorioa"
-
-msgid "PubSub Collection"
-msgstr "PubSub Kolekzioa"
-
-msgid "PubSub Leaf"
-msgstr ""
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Deskribapena:</b> "
-
-#. Create the window.
-msgid "Service Discovery"
-msgstr "Zerbitzu-Atzematea"
-
-msgid "_Browse"
-msgstr "_Arakatu"
-
-msgid "Server does not exist"
-msgstr "Zerbitzaria ez da existitzen"
-
-msgid "Server does not support service discovery"
-msgstr "Zerbitzariak ez du zerbitzu-atzematea onartzen"
-
-msgid "XMPP Service Discovery"
-msgstr "XMPP Zerbitzu Atzematea"
-
-msgid "Allows browsing and registering services."
-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"

@@ -13317,6 +13323,68 @@
 msgid "Apply in IMs"
 msgstr "IMetan Aplikatu"

+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "Zerbitzari-izen eskaera"
+
+msgid "Enter an XMPP Server"
+msgstr "XMPP Zerbitzarira sartu"
+
+msgid "Select an XMPP server to query"
+msgstr "Galdetzeko XMPP-zerbitzari bat hautatu"
+
+msgid "Find Services"
+msgstr "Zerbitzuak Bilatu"
+
+msgid "Add to Buddy List"
+msgstr "Lagun-Zerrendara Gehitu"
+
+msgid "Gateway"
+msgstr "Pasabidea"
+
+msgid "Directory"
+msgstr "Direktorioa"
+
+msgid "PubSub Collection"
+msgstr "PubSub Kolekzioa"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Deskribapena:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Zerbitzu-Atzematea"
+
+msgid "_Browse"
+msgstr "_Arakatu"
+
+msgid "Server does not exist"
+msgstr "Zerbitzaria ez da existitzen"
+
+msgid "Server does not support service discovery"
+msgstr "Zerbitzariak ez du zerbitzu-atzematea onartzen"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP Zerbitzu Atzematea"
+
+msgid "Allows browsing and registering services."
+msgstr "Zerbitzuak arakatu eta erregistratzea ahalbidetzen du."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Plugin hau transporte zahar eta beste XMPP-zerbitzu batzuk erregistratzeko "
+"erabilgarria da."
+
 msgid "By conversation count"
 msgstr "Solasaldi kopuruaren arabera"

@@ -13328,6 +13396,8 @@
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
+"Oharra: \"Solasaldi berriak\"entzako hobespenak \"Solasaldi kopuruaren "
+"arabera\" izan behar du."

 msgid "Number of conversations per window"
 msgstr "Leiho bakoitzeko solasaldi kopurua"
@@ -14108,6 +14178,53 @@
 "Plugin honi esker, erabiltzaileak elkarrizketen eta txosten-mezuen ordu-"
 "marken formatua pertsonalizatu dezake."

+msgid "Audio"
+msgstr "Audio"
+
+msgid "Video"
+msgstr "Bideo"
+
+msgid "Output"
+msgstr "Irteera"
+
+msgid "_Plugin"
+msgstr "_Plugina"
+
+msgid "_Device"
+msgstr "_Gailua"
+
+msgid "Input"
+msgstr "Sarrera"
+
+msgid "P_lugin"
+msgstr "P_lugina"
+
+msgid "D_evice"
+msgstr "G_ailua"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Ahots/Bideo Ezarpenak"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Zure mikrofono eta web kamera konfiguratu."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+"Ahots/bideo deietarako mikrofonoaren eta web kameraren hobespenak "
+"konfiguratu."
+
 msgid "Opacity:"
 msgstr "Opakotasuna:"

@@ -14236,6 +14353,116 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "XMPP zerbitzariak edo bezeroak arazteko erabilgarria da plugin hau."

+#~ msgid "Calling ... "
+#~ msgstr "Deitzen ... "
+
+#~ msgid "Invalid certificate chain"
+#~ msgstr "Zertifikatu-kate baliogabea"
+
+#~ msgid ""
+#~ "The certificate chain presented by %s does not have a valid digital "
+#~ "signature from the Certificate Authority from which it claims to have a "
+#~ "signature."
+#~ msgstr ""
+#~ "%s(e)k aurkeztutako zertifikatu-kateak ez dauka berak dioen Zertifikatu "
+#~ "Autoritatearen baliozko sinadura digitalik."
+
+#~ msgid "Invalid certificate authority signature"
+#~ msgstr "Zertifikatu-autoritate sinadura baliogabea"
+
+#~ msgid "Join/Part Hiding Configuration"
+#~ msgstr "Batu/Irten Ezkutatzearen Konfigurazioa"
+
+#~ msgid "Minimum Room Size"
+#~ msgstr "Gela-Tamaina Minimoa"
+
+#~ msgid "User Inactivity Timeout (in minutes)"
+#~ msgstr "Erabiltzaile Inaktibitate Denbora-muga (minututan)"
+
+#~ msgid "Failed to open the file"
+#~ msgstr "Ezin fitxategia ireki"
+
+#~ msgid "Your account is locked, please log in to the Yahoo! website."
+#~ msgstr "Zure kontua blokeatuta dago; Yahoo! webgunean konektatu zaitez."
+
+#~ msgid "Euskera(Basque)"
+#~ msgstr "Euskara"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">E-posta bidezko laguntza:</FONT> <A HREF=\"mailto:"
+#~ "support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  --display=DISPLAY   X display to use\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "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"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "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"
+
 #~ msgid "Malformed BOSH Connect Server"
 #~ msgstr "BOSH Konexio-Zerbitzari Baliogabea"

@@ -14696,9 +14923,6 @@
 #~ "eta saiatu berriro. Saiatzen jarraituz gero, agian gehiago ere itxaron "
 #~ "beharko duzu."

-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Sartzeko errore ezezagun bat gertatu da: %s."
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "Errore ezezagun bat (%d) gertatu da. Informazioa: %s."
--- a/po/fi.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/fi.po	Tue Sep 01 19:51:07 2009 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-16 21:37+0300\n"
-"PO-Revision-Date: 2009-07-16 21:36+0300\n"
+"POT-Creation-Date: 2009-08-30 16:49+0300\n"
+"PO-Revision-Date: 2009-08-30 16:48+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -867,7 +867,7 @@
 msgid "System Log"
 msgstr "Järjestelmäloki"

-msgid "Calling ... "
+msgid "Calling..."
 msgstr "Soitetaan..."

 msgid "Hangup"
@@ -1508,6 +1508,31 @@
 "Kun uusi keskustelu aloitetaan, tämä liitännäinen näyttää edellisen "
 "keskustelun keskusteluikkunassa."

+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Noudetaan TinyURL-osoitetta..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "Luo TinyURL vain tämän pituisille tai pidemmille osoitteille"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL:n (tai muun) osoite-etuliite"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL-liitännäinen"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr ""
+"Vastaanotettaessa viestiä jossa on URL-osoitteita, käytä TinyURL-palvelua "
+"helpompaa kopiomista varten"
+
 msgid "Online"
 msgstr "Linjoilla"

@@ -1551,31 +1576,6 @@
 msgid "Lastlog plugin."
 msgstr "Lastlog-liitännäinen."

-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"Noudetaan TinyURL-osoitetta..."
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr "Luo TinyURL vain tämän pituisille tai pidemmille osoitteille"
-
-msgid "TinyURL (or other) address prefix"
-msgstr "TinyURL:n (tai muun) osoite-etuliite"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "TinyURL-liitännäinen"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
-"Vastaanotettaessa viestiä jossa on URL-osoitteita, käytä TinyURL-palvelua "
-"helpompaa kopiomista varten"
-
 msgid "accounts"
 msgstr "käyttäjätilit"

@@ -1637,6 +1637,39 @@
 msgid "buddy list"
 msgstr "tuttavat"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+"Varmenne on itseallekirjoitettu eikä sitä voida automaattisesti tarkistaa."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "Tämän varmenteen myöntäjän juurivarmenne on tuntematon Pidginille."
+
+msgid "The certificate is not valid yet."
+msgstr "Varmenne ei ole vielä kelvollinen."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr "Varmenne on vanhentunut eikä sitä tulisi pitää kelvollisena."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "Esitetty varmenne ei ole kohdistettu tälle verkkonimelle."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Juurivarmennetietokantaa ei ole, joten tätä varmennetta ei voi kelpuuttaa."
+
+msgid "The certificate chain presented is invalid."
+msgstr "Esitetty varmenneketju ei ole kelvollinen."
+
+msgid "The certificate has been revoked."
+msgstr "Varmenne on kumottu."
+
+msgid "An unknown certificate error occurred."
+msgstr "Tuntematon varmennevirhe."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(EI TÄSMÄÄ)"

@@ -1679,66 +1712,24 @@
 msgid "_View Certificate..."
 msgstr "_Näytä varmenne..."

-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"Kohteen \"%s\" esittämä varmenne on itseallekirjoitettu. Sitä ei voida "
-"automaattisesti tarkistaa."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "Kohteelle %s esitetty varmenneketju ei ole kelvollinen."
-
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "Kohteelle %s esitettyä varmennetta ei voitu tarkistaa kelvolliseksi."
+
 #. TODO: Probably wrong.
-#. TODO: Probably wrong
 msgid "SSL Certificate Error"
 msgstr "SSL-varmennevirhe"

-msgid "Invalid certificate chain"
-msgstr "Epäkelpo varmenneketju"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Juurivarmennetietokantaa ei ole, joten tätä varmennetta ei voi kelpuuttaa."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "Tämän varmenteen myöntäjän juurivarmenne on tuntematon Pidginille."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"Kohteen %s esittämällä varmenneketjulla ei ole kelvollista digitaalista "
-"allekirjoitusta varmentajalta jolta se väittää allekirjoituksen olevan."
-
-msgid "Invalid certificate authority signature"
-msgstr "Epäkelpo varmentajan allekirjoitus"
-
-#. 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 ""
-"Kohteen \"%s\" esittämä varmenne näyttää olevan lähteestä \"%s\". Tämä "
-"saattaa tarkoittaa ettet ole yhdistämässä siihen palveluun johon luulet."
+msgid "Unable to validate certificate"
+msgstr "Varmenteen tunnistaminen kelvolliseksi eponnistui"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"Varmenne näyttää sen sijaan olevan lähteestä \"%s\". Tämä saattaa "
+"tarkoittaa, ettet ole yhdistämässä siihen palveluun johon luulet."

 #. Make messages
 #, c-format
@@ -1974,18 +1965,18 @@
 msgstr "Tiedostonsiirto valmis"

 #, c-format
-msgid "You canceled the transfer of %s"
+msgid "You cancelled the transfer of %s"
 msgstr "Peruutit tiedoston %s siirron"

 msgid "File transfer cancelled"
 msgstr "Tiedostonsiirto peruutettu"

 #, c-format
-msgid "%s canceled the transfer of %s"
+msgid "%s cancelled the transfer of %s"
 msgstr "%s peruutti tiedoston %s siirron"

 #, c-format
-msgid "%s canceled the file transfer"
+msgid "%s cancelled the file transfer"
 msgstr "Käyttäjä %s peruutti tiedostonsiirron"

 #, c-format
@@ -2179,6 +2170,35 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"

+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Koodekkeja ei löytynyt. Asenna GStreamer-koodekkeja GStreamerin "
+"liitännäispaketeista."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Koodekkeja ei jäljellä valittavaksi. Tiedoston fs-codecs.conf "
+"koodekkiasetukset ovat liian tiukat."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Korjaamaton Farsight2-virhe."
+
+msgid "Conference error."
+msgstr "Virhe neuvottelussa."
+
+msgid "Error with your microphone."
+msgstr "Virhe mikrofonin kanssa."
+
+msgid "Error with your webcam."
+msgstr "Virhe web-kameran kanssa."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Virhe luotaessa istuntoa: %s"
+
 msgid "Error creating conference."
 msgstr "Virhe luotaessa konferenssia."

@@ -2438,14 +2458,15 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Testiliitännäinen - IPC palvelimena. Tämä rekisteröi IPC-komennot."

-msgid "Join/Part Hiding Configuration"
-msgstr "Liittymisen/poistumisen piilotuksen asetukset"
-
-msgid "Minimum Room Size"
-msgstr "Huoneen minimikoko"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "Käyttäjän inaktiivisuuden aikakatkaisu (minuuteissa)"
+msgid "Hide Joins/Parts"
+msgstr "Piilota liittymiset/poistumiset"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "Huoneille, joissa enemmän kuin tämä määrä ihmisiä"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "Jos käyttäjä ei ole puhunut näin moneen minuuttiin"

 msgid "Apply hiding rules to buddies"
 msgstr "Toteuta piilotussäännöt tuttaville"
@@ -3806,6 +3827,11 @@
 msgid "Street Address"
 msgstr "Katuosoite"

+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Laajennettu osoite"

@@ -3888,20 +3914,24 @@
 msgid "Logo"
 msgstr "Logo"

+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "%s ei tule enää näkemään tilapäivityksiäsi. Haluatko jatkaa?"
+
+msgid "Cancel Presence Notification"
+msgstr "Peru paikallaoloilmoitus"
+
 msgid "Un-hide From"
 msgstr "\"Tule esiin\""

 msgid "Temporarily Hide From"
 msgstr "Piiloudu väliaikaisesti tuttavalta"

-#. && NOT ME
-msgid "Cancel Presence Notification"
-msgstr "Peru paikallaoloilmoitus"
-
 msgid "(Re-)Request authorization"
 msgstr "Pyydä valtuutusta uudelleen"

-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4133,9 +4163,6 @@
 msgid "Change Registration"
 msgstr "Muuta rekisteröitymistä"

-msgid "Malformed BOSH Connect Server"
-msgstr "Virheellisesti muodostettu BOSH-yhteyspalvein"
-
 msgid "Error unregistering account"
 msgstr "Virhe poistettaessa käyttäjätilin rekisteröitymistä"

@@ -4507,10 +4534,10 @@

 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
+"users with a role or set users' role with the room."
 msgstr ""
 "role &lt;moderator|participant|visitor|none&gt; [nimi1] [nimi2] ...: Aseta "
-"käyttäjän rooli huoneessa."
+"tai nouda käyttäjän/käyttäjien rooli huoneessa."

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
@@ -4653,9 +4680,6 @@
 msgid "Transfer was closed."
 msgstr "Siirto suljettiin."

-msgid "Failed to open the file"
-msgstr "Tiedoston avaaminen epäonnistui"
-
 msgid "Failed to open in-band bytestream"
 msgstr "Kaistansisäisen tavuvirran avaaminen epäonnistui"

@@ -4931,8 +4955,7 @@
 msgid "Not expected"
 msgstr "Odottamaton"

-#, c-format
-msgid "Friendly name changes too rapidly"
+msgid "Friendly name is changing too rapidly"
 msgstr "Tuttavanimi vaihtuu liian usein"

 #, c-format
@@ -5494,8 +5517,10 @@
 msgstr "%s on lähettänyt pyynnön nähdä webkamerasi, mutta tätä ei vielä tueta."

 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s on lähettänyt webkamera-kutsun, mikä ei ole vielä tuettuna."
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s on lähettänyt pyynnön, jotta näkisit hänen webkameran, mutta tätä ei "
+"vielä tueta."

 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
@@ -5546,6 +5571,10 @@
 msgid "The username specified is invalid."
 msgstr "Syötetty käyttäjänimi on virheellinen."

+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "Tuttavanimi vaihtuu liian usein"
+
 msgid "This Hotmail account may not be active."
 msgstr "Tämä Hotmail-tili ei välttämättä ole aktiivinen."

@@ -6218,8 +6247,10 @@
 msgid "Server port"
 msgstr "Palvelimen portti"

-msgid "Received unexpected response from "
-msgstr "Odottamaton vastaus palvelimelta "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "Odottamaton vastaus osoitteesta %s"

 #. username connecting too frequently
 msgid ""
@@ -6230,9 +6261,11 @@
 "ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."

-#, c-format
-msgid "Error requesting "
-msgstr "Virhe pyydettäessä "
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "Virhe pyydettäessä %s: %s"

 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL ei salli näyttönimen todentamista tätä kautta"
@@ -7005,6 +7038,9 @@
 msgid "C_onnect"
 msgstr "Y_hdistä"

+msgid "You closed the connection."
+msgstr "Katkaisit yhteyden."
+
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"

@@ -7015,6 +7051,9 @@
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"

+msgid "End Direct IM Session"
+msgstr "Lopeta suora pikaviestiyhteys"
+
 msgid "Direct IM"
 msgstr "Suora pikaviesti"

@@ -7847,7 +7886,7 @@
 msgstr "Tiedoston lähetys"

 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d peruutti tiedoston %s siirron"

 #, c-format
@@ -8832,9 +8871,6 @@
 msgid "Connecting to SILC Server"
 msgstr "Yhdistetään SILC-palvelimelle"

-msgid "Unable to not load SILC key pair"
-msgstr "SILC-avainparin lataamatta jättäminen ei onnistu"
-
 msgid "Out of memory"
 msgstr "Muisti loppu"

@@ -9371,6 +9407,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"

+msgid "Use account proxy for SSL connections"
+msgstr "Käytä tilin välipalvelinta SSL-yhteyksissä"
+
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"

@@ -9396,6 +9435,10 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Yahoo! JAPAN -yhteyskäytäntöliitännäinen"

+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s on lähettänyt webkamera-kutsun, mikä ei ole vielä tuettuna."
+
 msgid "Your SMS was not delivered"
 msgstr "Tekstiviestiä (SMS) ei välitetty"

@@ -9471,8 +9514,26 @@
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"

-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
+msgid "Invalid username or password"
+msgstr "Virheellinen käyttäjänimi tai salasana"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"Käyttäjätili lukittu. liian monta epäonnistunutta kirjautumisyritystä. "
+"Yahoo!--sivustolle kirjautuminen saattaa korjata tämän."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "Tuntematon virhe 52. Yhdistäminen uudelleen pitäisi auttaa."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"Virhe 1013: Syötetty käyttäjänimi on virheellinen. Yleisin syy virheelle on "
+"sähköpostiosoitteen syöttäminen Yahoo! ID:n sijaan."

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -9653,11 +9714,8 @@
 msgstr "Käyttäjän profiili on tyhjä."

 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
-
-msgid "Invitation Rejected"
-msgstr "Kutsusta kieltäydytty"
+msgid "%s has declined to join."
+msgstr "%s on kieltäytynyt liittymästä."

 msgid "Failed to join chat"
 msgstr "Ryhmäkeskusteluun liittyminen epäonnistui"
@@ -10236,6 +10294,124 @@
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
 "valitsemalla <b>Käyttäjätilit->Tilien hallinta</b> Tuttavat-ikkunassa."

+#. Buddy List
+msgid "Background Color"
+msgstr "Taustaväri"
+
+msgid "The background color for the buddy list"
+msgstr "Tuttavaluettelon taustaväri"
+
+msgid "Layout"
+msgstr "Asettelu"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "Tuttavien kuvakkeiden, nimien ja tilojen asettelu"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "Laajennettu taustaväri"
+
+msgid "The background color of an expanded group"
+msgstr "Laajennetun ryhmän taustavärin"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "Laajennettu teksti"
+
+msgid "The text information for when a group is expanded"
+msgstr "Tekstitieto ryhmää laajennettaessa"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "Supistettu taustaväri"
+
+msgid "The background color of a collapsed group"
+msgstr "Supistetun ryhmän taustaväri"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "Supistettu teksti"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Tekstitieto ryhmää supistettaessa"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "Yhteystiedon/keskustelun taustaväri"
+
+msgid "The background color of a contact or chat"
+msgstr "Yhteystiedon tai keskustelun taustaväri"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Yhteystiedon teksti"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Tekstitieto yhteystietoa laajennettaessa"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "Linjoilla-teksti"
+
+msgid "The text information for when a buddy is online"
+msgstr "Tekstitieto tuttavan ollessa linjoilla"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "Poissa-teksti"
+
+msgid "The text information for when a buddy is away"
+msgstr "Tekstitieto tuttavan ollessa poissa"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "Poissa linjoilta -teksti"
+
+msgid "The text information for when a buddy is offline"
+msgstr "Tekstitieto tuttavan ollessa poissa linjoilta"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "Joutenoloteksti"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Tekstitieto tuttavan ollessa jouten"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "Viestin teksti"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Tekstitieto kun tuttavalla on lukematon viesti"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "Viestin (henkilö sanoi) teksti"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"Tekstitieto kun keskustelussa on lukematon viesti, jossa mainitaan "
+"kutsumanimesi"
+
+msgid "The text information for a buddy's status"
+msgstr "Tekstitieto tuttavan tilalle"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -10671,7 +10847,7 @@
 msgid "_Group:"
 msgstr "_Ryhmä:"

-msgid "Auto_join when account becomes online."
+msgid "Auto_join when account connects."
 msgstr "Liity automaattisesti kun käyttä_jätili pääsee linjoille."

 msgid "_Remain in chat after window is closed."
@@ -10704,100 +10880,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"

-#. Buddy List
-msgid "Background Color"
-msgstr "Taustaväri"
-
-msgid "The background color for the buddy list"
-msgstr "Tuttavaluettelon taustaväri"
-
-msgid "Layout"
-msgstr "Asettelu"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "Tuttavien kuvakkeiden, nimien ja tilojen asettelu"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "Laajennettu taustaväri"
-
-msgid "The background color of an expanded group"
-msgstr "Laajennetun ryhmän taustavärin"
-
-msgid "Expanded Text"
-msgstr "Laajennettu teksti"
-
-msgid "The text information for when a group is expanded"
-msgstr "Tekstitieto ryhmää laajennettaessa"
-
-msgid "Collapsed Background Color"
-msgstr "Supistettu taustaväri"
-
-msgid "The background color of a collapsed group"
-msgstr "Supistetun ryhmän taustaväri"
-
-msgid "Collapsed Text"
-msgstr "Supistettu teksti"
-
-msgid "The text information for when a group is collapsed"
-msgstr "Tekstitieto ryhmää supistettaessa"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "Yhteystiedon/keskustelun taustaväri"
-
-msgid "The background color of a contact or chat"
-msgstr "Yhteystiedon tai keskustelun taustaväri"
-
-msgid "Contact Text"
-msgstr "Yhteystiedon teksti"
-
-msgid "The text information for when a contact is expanded"
-msgstr "Tekstitieto yhteystietoa laajennettaessa"
-
-msgid "On-line Text"
-msgstr "Linjoilla-teksti"
-
-msgid "The text information for when a buddy is online"
-msgstr "Tekstitieto tuttavan ollessa linjoilla"
-
-msgid "Away Text"
-msgstr "Poissa-teksti"
-
-msgid "The text information for when a buddy is away"
-msgstr "Tekstitieto tuttavan ollessa poissa"
-
-msgid "Off-line Text"
-msgstr "Poissa linjoilta -teksti"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "Tekstitieto tuttavan ollessa poissa linjoilta"
-
-msgid "Idle Text"
-msgstr "Joutenoloteksti"
-
-msgid "The text information for when a buddy is idle"
-msgstr "Tekstitieto tuttavan ollessa jouten"
-
-msgid "Message Text"
-msgstr "Viestin teksti"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "Tekstitieto kun tuttavalla on lukematon viesti"
-
-msgid "Message (Nick Said) Text"
-msgstr "Viestin (henkilö sanoi) teksti"
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-"Tekstitieto kun keskustelussa on lukematon viesti, jossa mainitaan "
-"kutsumanimesi"
-
-msgid "The text information for a buddy's status"
-msgstr "Tekstitieto tuttavan tilalle"
-
 msgid "Type the host name for this certificate."
 msgstr "Kirjoita isäntänimi tälle varmenteelle."

@@ -10882,6 +10964,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Keskustelu/Uusi _pikaviesti..."

+msgid "/Conversation/Join a _Chat..."
+msgstr "/Keskustelu/Liity _keskusteluun..."
+
 msgid "/Conversation/_Find..."
 msgstr "/Keskustelu/_Etsi..."

@@ -11264,8 +11349,8 @@
 msgid "Estonian"
 msgstr "viro"

-msgid "Euskera(Basque)"
-msgstr "euskara (baski)"
+msgid "Basque"
+msgstr "baski"

 msgid "Persian"
 msgstr "persia"
@@ -11469,11 +11554,20 @@

 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Apua sähköpostitse (engl.):</FONT> <A HREF=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Apua muilta Pidgin-käyttäjiltä:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>Tämä on <b>julkinen</b> "
+"sähköpostilista! (<a href=\"http://pidgin.im/pipermail/support/\">archive</"
+"a>)<br/>Emme voi auttaa kolmannen osapuolen yhteyskäytännöissä tai "
+"liitännäisissä.<br/>Tämän listan pääkieli on <b>englanti</b>. Voit käyttää "
+"myös muuta kieltä, mutta auttavan vastauksen saaminen voi tällöin olla "
+"hankalampaa.<br/><br/>"

 #, c-format
 msgid ""
@@ -11705,14 +11799,6 @@
 msgid "File transfer _details"
 msgstr "Tiedostonsiirron yksityiskohdat"

-#. Pause button
-msgid "_Pause"
-msgstr "_Tauko"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Jatka"
-
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"

@@ -12032,65 +12118,45 @@

 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
+msgstr ""
 "Käyttö: %s [VALITSIN]...\n"
 "\n"
-"  -c, --config=HAK    käytä hakemistoa HAK asetustiedostoille\n"
-"  -d, --debug         kirjoita virheenjäljitysviestit putkeen stdout\n"
-"  -f, --force-online  pakota ”tavoitettavissa” riippumatta verkon tilasta\n"
-"  -h, --help          näytä tämä ohje ja poistu\n"
-"  -m, --multiple      älä pitäydy vain yhdessä instanssissa\n"
-"  -n, --nologin       älä kirjaudu automaattisesti\n"
-"  -l, --login[=NIMI]  kirjaudu automaattisesti (valinnainen NIMI \n"
-"                      määrittelee käytettävät tilit pilkuin eroteltuina.\n"
-"                      Ilman tätä vain ensimmäinen tili otetaan käyttöön).\n"
-"  --display=NÄYTTÖ    käytettävä X-näyttö\n"
-"  -v, --version       näytä nykyinen versionumero ja poistu\n"
-
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Käyttö: %s [VALITSIN]...\n"
-"\n"
-"  -c, --config=HAK    käytä hakemistoa HAK asetustiedostoille\n"
-"  -d, --debug         kirjoita virheenjäljitysviestit putkeen stdout\n"
-"  -f, --force-online  pakota ”tavoitettavissa” riippumatta verkon tilasta\n"
-"  -h, --help          näytä tämä ohje ja poistu\n"
-"  -m, --multiple      älä pitäydy vain yhdessä instanssissa\n"
-"  -n, --nologin       älä kirjaudu automaattisesti\n"
-"  -l, --login[=NIMI]  kirjaudu automaattisesti (valinnainen NIMI \n"
-"                      määrittelee käytettävät tilit pilkuin eroteltuina.\n"
-"                      Ilman tätä vain ensimmäinen tili otetaan käyttöön).\n"
-"  -v, --version       näytä nykyinen versionumero ja poistu\n"
+
+msgid "use DIR for config files"
+msgstr "käytä hakemistoa DIR asetustiedostoille"
+
+msgid "print debugging messages to stdout"
+msgstr "tulosta virheenjäljitysviestit standardiulostuloon"
+
+msgid "force online, regardless of network status"
+msgstr "pakota tavoitettavissa olo, riippumatta verkon tilasta"
+
+msgid "display this help and exit"
+msgstr "näytä tämä ohje ja poistu"
+
+msgid "allow multiple instances"
+msgstr "salli usean samanaikaisen ohjelman käynnissä olon"
+
+msgid "don't automatically login"
+msgstr "älä kirjaudu sisään automaattisesti"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"ota käyttöön määritellyt tilit (valinnainen kenttä NAME\n"
+"                      määrittää käytettävät tilit, erotettuina pilkuilla."
+
+msgid "Without this only the first account will be enabled)."
+msgstr "Ilman tätä vain ensimmäinen tili otetaan käyttöön)."
+
+msgid "X display to use"
+msgstr "käytettävä X-näyttö"
+
+msgid "display the current version and exit"
+msgstr "näytä nykyinen versio ja poistu"

 #, c-format
 msgid ""
@@ -12135,9 +12201,6 @@
 msgid "/Media/_Hangup"
 msgstr "/Media/_Katkaise"

-msgid "Calling..."
-msgstr "Soitetaan..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s haluaa aloittaa ääni/videoistunnon kanssasi."
@@ -12146,6 +12209,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s haluaa aloittaa videoistunnon kanssasi."

+msgid "Incoming Call"
+msgstr "Saapuva puhelu"
+
+msgid "_Pause"
+msgstr "_Tauko"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13143,66 +13212,6 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Näyttää tilastotietoja tuttavien läsnäolosta"

-msgid "Server name request"
-msgstr "Palvelinnimen pyyntö"
-
-msgid "Enter an XMPP Server"
-msgstr "Syötä XMPP-palvelin"
-
-msgid "Select an XMPP server to query"
-msgstr "Valitse XMPP-palvelin johon kysely lähetetään"
-
-msgid "Find Services"
-msgstr "Etsi palveluita"
-
-msgid "Add to Buddy List"
-msgstr "Lisää tuttaviin"
-
-msgid "Gateway"
-msgstr "Yhdyskäytävä"
-
-msgid "Directory"
-msgstr "Hakemisto"
-
-msgid "PubSub Collection"
-msgstr "PubSub-kokoelma"
-
-msgid "PubSub Leaf"
-msgstr "PubSub-lehti"
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Kuvaus:</b> "
-
-#. Create the window.
-msgid "Service Discovery"
-msgstr "Palveluiden löytö"
-
-msgid "_Browse"
-msgstr "_Selaa"
-
-msgid "Server does not exist"
-msgstr "Palvelinta ei ole"
-
-msgid "Server does not support service discovery"
-msgstr "Palvelin ei palveluiden löytämistä"
-
-msgid "XMPP Service Discovery"
-msgstr "XMPP-palveluiden löytö"
-
-msgid "Allows browsing and registering services."
-msgstr "Sallii palveluiden selaamisen ja rekisteröimisen."
-
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr ""
-"Tätä liitännäistä voidaan käyttää vanhojen siirtotapojen tai muiden XMPP-"
-"palveluiden rekisteröimiseen."
-
 msgid "Buddy is idle"
 msgstr "Tuttava on jouten"

@@ -13292,6 +13301,68 @@
 msgid "Apply in IMs"
 msgstr "Käytä asetuksia pikaviesteissä"

+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "Palvelinnimen pyyntö"
+
+msgid "Enter an XMPP Server"
+msgstr "Syötä XMPP-palvelin"
+
+msgid "Select an XMPP server to query"
+msgstr "Valitse XMPP-palvelin johon kysely lähetetään"
+
+msgid "Find Services"
+msgstr "Etsi palveluita"
+
+msgid "Add to Buddy List"
+msgstr "Lisää tuttaviin"
+
+msgid "Gateway"
+msgstr "Yhdyskäytävä"
+
+msgid "Directory"
+msgstr "Hakemisto"
+
+msgid "PubSub Collection"
+msgstr "PubSub-kokoelma"
+
+msgid "PubSub Leaf"
+msgstr "PubSub-lehti"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Kuvaus:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Palveluiden löytö"
+
+msgid "_Browse"
+msgstr "_Selaa"
+
+msgid "Server does not exist"
+msgstr "Palvelinta ei ole"
+
+msgid "Server does not support service discovery"
+msgstr "Palvelin ei palveluiden löytämistä"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP-palveluiden löytö"
+
+msgid "Allows browsing and registering services."
+msgstr "Sallii palveluiden selaamisen ja rekisteröimisen."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Tätä liitännäistä voidaan käyttää vanhojen siirtotapojen tai muiden XMPP-"
+"palveluiden rekisteröimiseen."
+
 msgid "By conversation count"
 msgstr "Keskustelujen määrän mukaan"

@@ -13926,9 +13997,12 @@
 msgid "Founder"
 msgstr "Perustaja"

+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "Operaattori"

+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr "Puolioperaattori"

@@ -14076,6 +14150,52 @@
 "Tämä liitännäinen mahdollistaa keskustelu- ja lokiviestien aikaleimamuotojen "
 "muokkaamisen."

+msgid "Audio"
+msgstr "Ääni"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Output"
+msgstr "Ulostulo"
+
+msgid "_Plugin"
+msgstr "_Liitännäinen"
+
+msgid "_Device"
+msgstr "_Laite"
+
+msgid "Input"
+msgstr "Sisääntulo"
+
+msgid "P_lugin"
+msgstr "_Liitännäiset"
+
+msgid "D_evice"
+msgstr "Lait_e"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Ääni- ja videoasetukset"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Muuta mikrofonin ja web-kameran asetuksia."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+"Muuta mikrofonin ja web-kameran asetuksia ääni- tai videopuheluita varten."
+
 msgid "Opacity:"
 msgstr "Peitto:"

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

+#~ msgid "Calling ... "
+#~ msgstr "Soitetaan..."
+
+#~ msgid "Invalid certificate chain"
+#~ msgstr "Epäkelpo varmenneketju"
+
+#~ msgid ""
+#~ "The certificate chain presented by %s does not have a valid digital "
+#~ "signature from the Certificate Authority from which it claims to have a "
+#~ "signature."
+#~ msgstr ""
+#~ "Kohteen %s esittämällä varmenneketjulla ei ole kelvollista digitaalista "
+#~ "allekirjoitusta varmentajalta jolta se väittää allekirjoituksen olevan."
+
+#~ msgid "Invalid certificate authority signature"
+#~ msgstr "Epäkelpo varmentajan allekirjoitus"
+
+#~ msgid "Join/Part Hiding Configuration"
+#~ msgstr "Liittymisen/poistumisen piilotuksen asetukset"
+
+#~ msgid "Minimum Room Size"
+#~ msgstr "Huoneen minimikoko"
+
+#~ msgid "User Inactivity Timeout (in minutes)"
+#~ msgstr "Käyttäjän inaktiivisuuden aikakatkaisu (minuuteissa)"
+
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "Virheellisesti muodostettu BOSH-yhteyspalvein"
+
+#~ msgid "Failed to open the file"
+#~ msgstr "Tiedoston avaaminen epäonnistui"
+
+#~ msgid "Unable to not load SILC key pair"
+#~ msgstr "SILC-avainparin lataamatta jättäminen ei onnistu"
+
+#~ msgid "Your account is locked, please log in to the Yahoo! website."
+#~ msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
+
+#~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s kieltäytyi kutsustasi huoneeseen \"%s\" koska \"%s\"."
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "Kutsusta kieltäydytty"
+
+#~ msgid "Euskera(Basque)"
+#~ msgstr "euskara (baski)"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">Apua sähköpostitse (engl.):</FONT> <A HREF=\"mailto:"
+#~ "support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+
+#~ msgid "_Resume"
+#~ msgstr "_Jatka"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  --display=DISPLAY   X display to use\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "Käyttö: %s [VALITSIN]...\n"
+#~ "\n"
+#~ "  -c, --config=HAK    käytä hakemistoa HAK asetustiedostoille\n"
+#~ "  -d, --debug         kirjoita virheenjäljitysviestit putkeen stdout\n"
+#~ "  -f, --force-online  pakota ”tavoitettavissa” riippumatta verkon "
+#~ "tilasta\n"
+#~ "  -h, --help          näytä tämä ohje ja poistu\n"
+#~ "  -m, --multiple      älä pitäydy vain yhdessä instanssissa\n"
+#~ "  -n, --nologin       älä kirjaudu automaattisesti\n"
+#~ "  -l, --login[=NIMI]  kirjaudu automaattisesti (valinnainen NIMI \n"
+#~ "                      määrittelee käytettävät tilit pilkuin eroteltuina.\n"
+#~ "                      Ilman tätä vain ensimmäinen tili otetaan "
+#~ "käyttöön).\n"
+#~ "  --display=NÄYTTÖ    käytettävä X-näyttö\n"
+#~ "  -v, --version       näytä nykyinen versionumero ja poistu\n"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "Käyttö: %s [VALITSIN]...\n"
+#~ "\n"
+#~ "  -c, --config=HAK    käytä hakemistoa HAK asetustiedostoille\n"
+#~ "  -d, --debug         kirjoita virheenjäljitysviestit putkeen stdout\n"
+#~ "  -f, --force-online  pakota ”tavoitettavissa” riippumatta verkon "
+#~ "tilasta\n"
+#~ "  -h, --help          näytä tämä ohje ja poistu\n"
+#~ "  -m, --multiple      älä pitäydy vain yhdessä instanssissa\n"
+#~ "  -n, --nologin       älä kirjaudu automaattisesti\n"
+#~ "  -l, --login[=NIMI]  kirjaudu automaattisesti (valinnainen NIMI \n"
+#~ "                      määrittelee käytettävät tilit pilkuin eroteltuina.\n"
+#~ "                      Ilman tätä vain ensimmäinen tili otetaan "
+#~ "käyttöön).\n"
+#~ "  -v, --version       näytä nykyinen versionumero ja poistu\n"
+
 #~ msgid "_Proxy"
 #~ msgstr "_Välipalvelin"

@@ -14636,9 +14882,6 @@
 #~ "minuuttia ja yritä uudestaan. Jos jatkat yrittämistä, joudut odottamaan "
 #~ "vielä pidempään."

-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Tuntematon sisäänkirjautumisvirhe esiintyi: %s."
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "Tuntematon virhe, %d, esiintyi. Tiedot: %s"

@@ -16414,9 +16657,6 @@
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Piilota yhteydenkatkaisuvirheilmoitukset"

-#~ msgid "Hide Login Errors"
-#~ msgstr "Piilota sisäänkirjautumisvirheet"
-
 #~ msgid "Hide Reconnecting Dialog"
 #~ msgstr "Piilota uudelleenyhdistämisvirheilmoitukset"
--- a/po/fr.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/fr.po	Tue Sep 01 19:51:07 2009 +0000
@@ -21,8 +21,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-19 22:15+0200\n"
-"PO-Revision-Date: 2009-07-19 22:15+0200\n"
+"POT-Creation-Date: 2009-08-29 09:41+0200\n"
+"PO-Revision-Date: 2009-08-29 09:40+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -884,8 +884,8 @@
 msgid "System Log"
 msgstr "Archives des messages système"

-msgid "Calling ... "
-msgstr "Appel... "
+msgid "Calling..."
+msgstr "Appel..."

 msgid "Hangup"
 msgstr "Raccrocher"
@@ -1523,6 +1523,31 @@
 "Quand une nouvelle conversation est ouverte, le plugin rajoute la dernière "
 "conversation avec l'interlocuteur dans la fenêtre."

+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Récupération TinyURL..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "Création de TinyURL seulement pour les liens de cette taille mini"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Préfixe d'adresse TinyURL (ou autre)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Plugin TinyURL"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr ""
+"À la réception d'un message avec un ou plusieurs liens hypertextes, utilise "
+"TinyURL pour les copier plus facilement."
+
 msgid "Online"
 msgstr "En ligne"

@@ -1566,31 +1591,6 @@
 msgid "Lastlog plugin."
 msgstr "Dernière occurrence"

-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"Récupération TinyURL..."
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr "Création de TinyURL seulement pour les liens de cette taille mini"
-
-msgid "TinyURL (or other) address prefix"
-msgstr "Préfixe d'adresse TinyURL (ou autre)"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "Plugin TinyURL"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
-"À la réception d'un message avec un ou plusieurs liens hypertextes, utilise "
-"TinyURL pour les copier plus facilement."
-
 msgid "accounts"
 msgstr "Comptes"

@@ -1652,6 +1652,41 @@
 msgid "buddy list"
 msgstr "Liste de contacts"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "Le certificat est auto-signé. Il ne peut être vérifié automatiquement."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Le certificat racine dont est prétendu issu ce certificat est inconnu de "
+"Pidgin."
+
+msgid "The certificate is not valid yet."
+msgstr "Le certificat n'est pas encore valide."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr "Le certificat a expiré et ne devrait pas être considéré valide."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "Le certificat fournit ne correspond pas à ce domaine."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Vous n'avez pas de base de certificats racines. Ce certificat ne peut être "
+"validé."
+
+msgid "The certificate chain presented is invalid."
+msgstr "La chaine de certificat fournie est non valide."
+
+msgid "The certificate has been revoked."
+msgstr "Le certificat a été révoqué."
+
+msgid "An unknown certificate error occurred."
+msgstr "Une erreur de certificat inconnue est survenue."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(NE CORRESPOND PAS)"

@@ -1694,69 +1729,24 @@
 msgid "_View Certificate..."
 msgstr "_Voir le certificat..."

-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"Le certificat fournit par « %s » prétend est auto-signé. Il ne peut être "
-"vérifié automatiquement."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "La chaine de certificats fournie pour %s est non valide."
-
-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "Le certificat pour %s n'a pas pu être validé."
+
 #. TODO: Probably wrong.
-#. TODO: Probably wrong
 msgid "SSL Certificate Error"
 msgstr "Erreur de certificat SSL"

-msgid "Invalid certificate chain"
-msgstr "Chaine de certification non valide"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Vous n'avez pas de base de certificats racines. Ce certificat ne peut être "
-"validé."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-"Le certificat racine dont est prétendu issu ce certificat est inconnu de "
-"Pidgin."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"La chaine de certification fournie par %s n'a pas de signature numérique "
-"valide issue par l'autorité de certificats dont elle prétend l'origine. "
-
-msgid "Invalid certificate authority signature"
-msgstr "Signature d'autorité de certificats non valide"
-
-#. 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 ""
-"Le certificat fournit par « %s » prétend être de « %s ». Cela pourrait "
-"signifier que vous ne vous connectez pas au service que vous vouliez."
+msgid "Unable to validate certificate"
+msgstr "Impossible de valider le certificat"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"Le certificat fournit prétend être de « %s ». Cela pourrait signifier que "
+"vous ne vous connectez pas au service auquel vous croyez."

 #. Make messages
 #, c-format
@@ -1995,19 +1985,19 @@
 msgstr "Transfert de fichier terminé"

 #, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Vous avez a annulé le transfert de « %s »"
+msgid "You cancelled the transfer of %s"
+msgstr "Vous avez annulé le transfert de « %s »"

 msgid "File transfer cancelled"
 msgstr "Transfert de fichier annulé"

 #, c-format
-msgid "%s canceled the transfer of %s"
+msgid "%s cancelled the transfer of %s"
 msgstr "%s a annulé le transfert de « %s »"

 #, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s a annulé le transfert du fichier"
+msgid "%s cancelled the file transfer"
+msgstr "%s a annulé le transfert de fichier"

 #, c-format
 msgid "File transfer to %s failed."
@@ -2203,6 +2193,35 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Réponse automatique> : %s\n"

+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Aucun codec n'a été trouvé. Veuillez installer des codecs GStreamer "
+"disponible avec les plugins pour GStreamer"
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Il ne reste aucun codec. Vos préférences dans fs-codecs.conf sont trop "
+"strictes."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Une erreur insurmontable de Farsight2 est survenue."
+
+msgid "Conference error."
+msgstr "Erreur de conférence."
+
+msgid "Error with your microphone."
+msgstr "Problème avec votre micro."
+
+msgid "Error with your webcam."
+msgstr "Problème avec votre webcam."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Erreur à la création de la session : %s"
+
 msgid "Error creating conference."
 msgstr "Erreur à la création de la conférence."

@@ -2399,7 +2418,7 @@
 msgstr "I'nactivat'eur"

 msgid "Set Account Idle Time"
-msgstr "Durée d'inactivité pour le compte"
+msgstr "Durée d'inactivité pour un compte"

 msgid "_Set"
 msgstr "_Changer"
@@ -2408,7 +2427,7 @@
 msgstr "Aucun de vos comptes n'est inactif."

 msgid "Unset Account Idle Time"
-msgstr "Désactiver le temps d'inactivité pour le compte"
+msgstr "Désactiver le temps d'inactivité pour un compte"

 msgid "_Unset"
 msgstr "_Désactiver"
@@ -2464,14 +2483,15 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Teste le support du serveur IPC. Enregistre les commandes IPC."

-msgid "Join/Part Hiding Configuration"
-msgstr "Configuration du masquage des Join/Part"
-
-msgid "Minimum Room Size"
-msgstr "Taille minimum du salon"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "Temps d'inactivité de déclenchement (en minutes)"
+msgid "Hide Joins/Parts"
+msgstr "Cacher les arrivées et départs"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "Pour les salons avec plus de tant de personnes"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "Si l'utilisateur n'a pas parlé pendant tant de minutes"

 msgid "Apply hiding rules to buddies"
 msgstr "Appliquer les règles de masquage aux contacts"
@@ -3006,12 +3026,12 @@
 msgstr "Erreur de communication avec le mDNSResponder local."

 msgid "Invalid proxy settings"
-msgstr "Paramètres du serveur mandataire incorrects"
+msgstr "Paramètres du proxy incorrects"

 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
-msgstr "Le nom d'hôte ou le port pour le serveur mandataire est incorrect."
+msgstr "Le nom d'hôte ou le port pour le proxy est incorrect."

 msgid "Token Error"
 msgstr "Erreur de jeton"
@@ -3851,6 +3871,11 @@
 msgid "Street Address"
 msgstr "Adresse"

+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Adresse (suite)"

@@ -3933,20 +3958,24 @@
 msgid "Logo"
 msgstr "Logo"

+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "%s ne pourra plus voir vos changements d'état. Voulez-vous continuer ?"
+
+msgid "Cancel Presence Notification"
+msgstr "Annuler la notification de présence"
+
 msgid "Un-hide From"
 msgstr "Se montrer à"

 msgid "Temporarily Hide From"
 msgstr "Se cacher de"

-#. && NOT ME
-msgid "Cancel Presence Notification"
-msgstr "Annuler la notification de présence"
-
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Demander autorisation"

-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4560,7 +4589,7 @@

 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
+"users with a role or set users' role with the room."
 msgstr ""
 "role &lt;moderator|participant|visitor|none&gt; [pseudo1] [pseudo2] ... : "
 "Récupère les utilisateurs avec un certain rôle ou change le rôle "
@@ -4624,7 +4653,7 @@
 msgstr "Serveur de connexion"

 msgid "File transfer proxies"
-msgstr "Serveur mandataire de transfert de fichiers"
+msgstr "Proxy pour le transfert de fichiers"

 msgid "BOSH URL"
 msgstr "URL BOSH"
@@ -4708,9 +4737,6 @@
 msgid "Transfer was closed."
 msgstr "Le transfert a été interrompu."

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

@@ -4990,9 +5016,8 @@
 msgid "Not expected"
 msgstr "Non attendu"

-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Le pseudonyme change trop rapidement"
+msgid "Friendly name is changing too rapidly"
+msgstr "L'alias change trop rapidement"

 #, c-format
 msgid "Server too busy"
@@ -5560,9 +5585,8 @@
 msgstr "%s demande à voir votre webcam, ce qui n'est pas encore supporté."

 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s vous a envoyé une invitation webcam, ce qui n'est pas encore supporté."
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr "%s vous invite à voir sa webcam, ce qui n'est pas encore supporté."

 msgid "Away From Computer"
 msgstr "Absent"
@@ -5615,6 +5639,10 @@
 msgid "The username specified is invalid."
 msgstr "Le nom d'utilisateur fourni est non valide."

+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "Le pseudonyme change trop rapidement"
+
 msgid "This Hotmail account may not be active."
 msgstr "Ce compte Hotmail ne semble pas être actif."

@@ -6292,8 +6320,10 @@
 msgid "Server port"
 msgstr "Port du serveur"

-msgid "Received unexpected response from "
-msgstr "Réception d'un message non attendu de "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "Réception d'une réponse non attendue de %s"

 #. username connecting too frequently
 msgid ""
@@ -6304,9 +6334,11 @@
 "réessayez. Si vous persistez maintenant, il vous faudra attendre encore plus "
 "longtemps."

-#, c-format
-msgid "Error requesting "
-msgstr "Erreur à la demande de "
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "Erreur à la demande de %s : %s"

 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL n'autorise pas votre nom d'utilisateur pour authentification ici."
@@ -7101,6 +7133,9 @@
 msgid "C_onnect"
 msgstr "_Connecter"

+msgid "You closed the connection."
+msgstr "Vous avez fermé la connexion."
+
 msgid "Get AIM Info"
 msgstr "Récupérer les infos AIM"

@@ -7111,6 +7146,9 @@
 msgid "Get Status Msg"
 msgstr "Obtenir le message d'état"

+msgid "End Direct IM Session"
+msgstr "Terminer la connexion directe"
+
 msgid "Direct IM"
 msgstr "Connexion directe"

@@ -7203,7 +7241,7 @@
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
-"Toujours utiliser le serveur mandataire AIM/ICQ\n"
+"Toujours utiliser le proxy AIM/ICQ\n"
 "pour le transfert de fichiers\n"
 "(plus lent, mais ne révèle pas votre adresse IP)"

@@ -7219,7 +7257,7 @@
 msgstr "Tentative de connexion vers %s:%hu."

 msgid "Attempting to connect via proxy server."
-msgstr "Tentative de connexion au travers d'un serveur mandataire."
+msgstr "Tentative de connexion au travers d'un proxy."

 #, c-format
 msgid "%s has just asked to directly connect to %s"
@@ -7941,7 +7979,7 @@
 msgstr "Envoi de fichier"

 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d a annulé le transfert de %s"

 #, c-format
@@ -9421,10 +9459,10 @@
 msgstr "Utiliser UDP"

 msgid "Use proxy"
-msgstr "Utiliser un serveur mandataire"
+msgstr "Utiliser un proxy"

 msgid "Proxy"
-msgstr "Serveur mandataire"
+msgstr "Proxy"

 msgid "Auth User"
 msgstr "Utilisateur d'authentification"
@@ -9475,6 +9513,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer les invitations aux conférences et salons de discussions"

+msgid "Use account proxy for SSL connections"
+msgstr "Utiliser le proxy du compte pour les connexions SSL"
+
 msgid "Chat room list URL"
 msgstr "URL de liste des salons de discussions"

@@ -9500,6 +9541,11 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Plugin pour le protocole Yahoo Japon"

+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s vous a envoyé une invitation webcam, ce qui n'est pas encore supporté."
+
 msgid "Your SMS was not delivered"
 msgstr "Votre SMS n'a pas été transmis"

@@ -9576,14 +9622,32 @@
 msgid "Ignore buddy?"
 msgstr "Ignorer ce contact ?"

-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr ""
-"Votre compte est bloqué. Veuillez vous connecter par le site web Yahoo!."
+msgid "Invalid username or password"
+msgstr "Nom d'utilisateur ou mot de passe incorrect"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"Votre compté a été bloqué à cause du nombre d'échecs de d'authentification "
+"de mot de passe. Veuillez vous connecter sur le site web Yahoo."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "Erreur inconnue 52. Se reconnecter devrait corriger ce problème."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"Erreur 1013 : le nom d'utilisateur que vous avez saisi n'est pas valide. La "
+"cause la plus courante est que vous avez saisi votre adresse de courrier "
+"électronique plutôt que votre identifiant Yahoo."

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
-"Erreur inconnue n°%d. Se connecter sur le site web Yahoo! peut corriger le "
+"Erreur inconnue n°%d. Se connecter sur le site web Yahoo peut corriger le "
 "problème."

 #, c-format
@@ -9949,17 +10013,15 @@

 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Impossible de reconnaître la réponse du serveur mandataire HTTP : %s"
+msgstr "Impossible de reconnaître la réponse du proxy HTTP : %s"

 #, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "Erreur de connexion au serveur mandataire HTTP %d."
+msgstr "Erreur de connexion au proxy HTTP %d."

 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr ""
-"Accès interdit : le serveur mandataire n'autorise pas le passage par le port "
-"%d"
+msgstr "Accès interdit : le proxy n'autorise pas le passage par le port %d"

 #, c-format
 msgid "Error resolving %s"
@@ -10257,13 +10319,13 @@
 msgstr "_Avancé"

 msgid "Use GNOME Proxy Settings"
-msgstr "Utiliser les paramètres mandataires de GNOME"
+msgstr "Utiliser les paramètres proxy de GNOME"

 msgid "Use Global Proxy Settings"
-msgstr "Utiliser les paramètres mandataires globaux"
+msgstr "Utiliser les paramètres proxy globaux"

 msgid "No Proxy"
-msgstr "Pas de serveur mandataire"
+msgstr "Pas de proxy"

 msgid "HTTP"
 msgstr "HTTP"
@@ -10317,7 +10379,7 @@
 msgstr "Créer ce _nouveau compte sur le serveur"

 msgid "P_roxy"
-msgstr "Serveur _mandataire"
+msgstr "_Proxy"

 msgid "Enabled"
 msgstr "Activé"
@@ -10348,6 +10410,124 @@
 "comptes, choisissez <b>Comptes->Gérer les comptes</b> dans la fenêtre de la "
 "liste de contacts."

+#. Buddy List
+msgid "Background Color"
+msgstr "Couleur de fond"
+
+msgid "The background color for the buddy list"
+msgstr "La couleur de fond pour la liste de contacts"
+
+msgid "Layout"
+msgstr "Arrangement"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "L'arrangement des icônes, noms et états dans la liste de contacts"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "Couleur de fond déplié"
+
+msgid "The background color of an expanded group"
+msgstr "La couleur de fond pour un groupe de contacts déplié"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "Texte déplié"
+
+msgid "The text information for when a group is expanded"
+msgstr "L'information textuelle pour un groupe de contacts déplié"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "Couleur de fond replié"
+
+msgid "The background color of a collapsed group"
+msgstr "La couleur de fond pour un groupe de contacts replié"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "Texte replié"
+
+msgid "The text information for when a group is collapsed"
+msgstr "L'information textuelle pour un groupe de contacts replié"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "Couleur du fond des contacts et salons"
+
+msgid "The background color of a contact or chat"
+msgstr "La couleur de fond pour un contact ou un salon de discussions"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Texte des contacts"
+
+msgid "The text information for when a contact is expanded"
+msgstr "L'information textuelle pour un contact déplié"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "Texte des contacts connectés"
+
+msgid "The text information for when a buddy is online"
+msgstr "L'information textuelle pour un contact connecté"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "Texte des contacts absents"
+
+msgid "The text information for when a buddy is away"
+msgstr "L'information textuelle pour un contact absent"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "Texte des contacts déconnectés"
+
+msgid "The text information for when a buddy is offline"
+msgstr "L'information textuelle pour un contact déconnecté"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "Texte des contacts inactifs"
+
+msgid "The text information for when a buddy is idle"
+msgstr "L'information textuelle pour un contact inactif"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "Texte des messages non-lus"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "L'information textuelle pour les messages non-lus d'un contact"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "Texte des messages avec pseudo"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"L'information textuelle pour les messages dans lesquels apparaissent votre "
+"pseudo"
+
+msgid "The text information for a buddy's status"
+msgstr "L'information textuelle pour l'état des contacts"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -10786,7 +10966,7 @@
 msgid "_Group:"
 msgstr "_Groupe :"

-msgid "Auto_join when account becomes online."
+msgid "Auto_join when account connects."
 msgstr "Rejoindre _automatiquement quand le compte est activé."

 msgid "_Remain in chat after window is closed."
@@ -10819,100 +10999,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacts/Trier les contacts"

-#. Buddy List
-msgid "Background Color"
-msgstr "Couleur de fond"
-
-msgid "The background color for the buddy list"
-msgstr "La couleur de fond pour la liste de contacts"
-
-msgid "Layout"
-msgstr "Arrangement"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "L'arrangement des icônes, noms et états dans la liste"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "Couleur de fond déplié"
-
-msgid "The background color of an expanded group"
-msgstr "La couleur de fond pour un groupe de contacts déplié"
-
-msgid "Expanded Text"
-msgstr "Texte déplié"
-
-msgid "The text information for when a group is expanded"
-msgstr "L'information textuelle pour un groupe de contacts déplié"
-
-msgid "Collapsed Background Color"
-msgstr "Couleur de fond replié"
-
-msgid "The background color of a collapsed group"
-msgstr "La couleur de fond pour un groupe de contacts replié"
-
-msgid "Collapsed Text"
-msgstr "Texte replié"
-
-msgid "The text information for when a group is collapsed"
-msgstr "L'information textuelle pour un groupe de contacts replié"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "Couleur du fond des contacts et salons"
-
-msgid "The background color of a contact or chat"
-msgstr "La couleur de fond pour un contact ou un salon de discussions"
-
-msgid "Contact Text"
-msgstr "Texte des contacts"
-
-msgid "The text information for when a contact is expanded"
-msgstr "L'information textuelle pour un contact déplié"
-
-msgid "On-line Text"
-msgstr "Texte des contacts connectés"
-
-msgid "The text information for when a buddy is online"
-msgstr "L'information textuelle pour un contact connecté"
-
-msgid "Away Text"
-msgstr "Texte des contacts absents"
-
-msgid "The text information for when a buddy is away"
-msgstr "L'information textuelle pour un contact absent"
-
-msgid "Off-line Text"
-msgstr "Texte des contacts déconnectés"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "L'information textuelle pour un contact déconnecté"
-
-msgid "Idle Text"
-msgstr "Texte des contacts inactifs"
-
-msgid "The text information for when a buddy is idle"
-msgstr "L'information textuelle pour un contact inactif"
-
-msgid "Message Text"
-msgstr "Texte des messages non-lus"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "L'information textuelle pour les messages non-lus d'un contact"
-
-msgid "Message (Nick Said) Text"
-msgstr "Texte des messages avec pseudo"
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-"L'information textuelle pour les messages dans lesquels apparaissent votre "
-"pseudo"
-
-msgid "The text information for a buddy's status"
-msgstr "L'information textuelle pour l'état des contacts"
-
 msgid "Type the host name for this certificate."
 msgstr "Saisissez le nom d'hôte correspondant à ce certificat."

@@ -10996,6 +11082,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversation/Envoyer un _message..."

+msgid "/Conversation/Join a _Chat..."
+msgstr "/Conversation/Re_joindre un salon..."
+
 msgid "/Conversation/_Find..."
 msgstr "/Conversation/_Chercher..."

@@ -11379,7 +11468,7 @@
 msgid "Estonian"
 msgstr "Estonien"

-msgid "Euskera(Basque)"
+msgid "Basque"
 msgstr "Basque"

 msgid "Persian"
@@ -11583,11 +11672,20 @@

 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Aide par courrier électronique :</FONT> <A HREF=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Aide d'autres utilisateurs de Pidgin :</font> <a href="
+"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Ceci est une liste de "
+"messagerie <b>publique</b> ! (<a href=\"http://pidgin.im/pipermail/support/"
+"\">archives</a>)<br/>Nous ne pouvons pas vous aider pour les plugins ou "
+"protocoles fournis par des tiers.<br/> La langue principale de cette liste "
+"est l'<b>anglais</b>. Vous pouvez envoyer vos messages dans une autre langue "
+"mais les réponses seront probablement moins nombreuses ou utiles.<br/><br/>"

 #, c-format
 msgid ""
@@ -11823,14 +11921,6 @@
 msgid "File transfer _details"
 msgstr "_Détails du transfert"

-#. Pause button
-msgid "_Pause"
-msgstr "_Pause"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Reprise"
-
 msgid "Paste as Plain _Text"
 msgstr "Coller comme _texte seulement"

@@ -12156,71 +12246,45 @@

 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Usage : %s [option]...\n"
-"\n"
-"  -c, --config=DOS    lit les fichiers de configuration depuis le dossier "
-"DOS\n"
-"  -d, --debug         affiche les messages de debug sur la sortie standard\n"
-"  -f, --force-online  force online, quelque soit l'état du réseau\n"
-"  -h, --help          affiche ce texte d'aide\n"
-"  -m, --multiple      ne vérifie pas la présence d'une seule instance du "
-"programme\n"
-"  -n, --nologin       ne se connecte pas automatiquement au lancement\n"
-"  -l, --login[=NOM]   connexion automatique au lancement (l'argument NOM\n"
-"                      facultatif indique les comptes à activer séparés par\n"
-"                      des virgules, sinon seul le premier compte sera "
-"activé)\n"
-"  --display=DISPLAY   affichage X à utiliser\n"
-"  -v, --version       affiche le numéro de la version actuelle\n"
-
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Usage : %s [option] ...\n"
-"\n"
-"  -c, --config=REP    lit les fichiers de configuration depuis le dossier "
-"REP\n"
-"  -d, --debug         affiche les messages de debug sur la sortie standard\n"
-"  -f, --force-online  force online, quelque soit l'état du réseau\n"
-"  -h, --help          affiche ce texte d'aide\n"
-"  -m, --multiple      ne vérifie pas la présence d'une seule instance du "
-"programme\n"
-"  -n, --nologin       ne se connecte pas automatiquement au lancement\n"
-"  -l, --login[=NOM]   connexion automatique au lancement (l'argument NOM\n"
-"                      facultatif indique les comptes à activer séparés par\n"
-"                      des virgules, sinon seul le premier compte sera "
-"activé)\n"
-"  -v, --version       affiche le numéro de la version actuelle\n"
+msgstr ""
+"Usage : %s [OPTION]...\n"
+"\n"
+
+msgid "use DIR for config files"
+msgstr "utilise le dossier DIR pour les fichiers de config"
+
+msgid "print debugging messages to stdout"
+msgstr "affiche les messages de debug sur la sortie standard"
+
+msgid "force online, regardless of network status"
+msgstr "force en ligne quelque soit l'état du réseau"
+
+msgid "display this help and exit"
+msgstr "affiche ce message et puis c'est tout"
+
+msgid "allow multiple instances"
+msgstr "autoriser plusieurs instances du logiciel"
+
+msgid "don't automatically login"
+msgstr "ne pas se connecter automatiquement"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"active certains comptes (l'argument facultatif NAME\n"
+"                      spécifie ces comptes, séparés par des virgules."
+
+msgid "Without this only the first account will be enabled)."
+msgstr "Sans cela, seul le premier compte sera activé.)"
+
+msgid "X display to use"
+msgstr "affichage X à utiliser"
+
+msgid "display the current version and exit"
+msgstr "affiche le numéro version et rend la main"

 #, c-format
 msgid ""
@@ -12266,9 +12330,6 @@
 msgid "/Media/_Hangup"
 msgstr "/Média/_Raccrocher"

-msgid "Calling..."
-msgstr "Appel..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s veut engager une session audio/vidéo."
@@ -12277,6 +12338,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s veut engager une session vidéo."

+msgid "Incoming Call"
+msgstr "Appel entrant"
+
+msgid "_Pause"
+msgstr "_Pause"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -12666,12 +12733,10 @@
 msgstr "Serveur relai (TURN)"

 msgid "Proxy Server &amp; Browser"
-msgstr "Serveur mandataire &amp; navigateur"
+msgstr "Serveur proxy &amp; navigateur"

 msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
-"<b>Le programme de configuration de serveur mandataire n'a pas été trouvé.</"
-"b>"
+msgstr "<b>Le programme de configuration de proxy n'a pas été trouvé.</b>"

 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Le programme de configuration du navigateur n'a pas été trouvé.</b>"
@@ -12680,17 +12745,17 @@
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""
-"Le choix du serveur mandataire & navigateur\n"
+"Le choix du serveur proxy & navigateur\n"
 "est géré par les options de GNOME"

 msgid "Configure _Proxy"
-msgstr "_Configurer le serveur mandataire"
+msgstr "_Configurer le proxy"

 msgid "Configure _Browser"
 msgstr "_Configurer le navigateur"

 msgid "Proxy Server"
-msgstr "Serveur mandataire"
+msgstr "Serveur proxy"

 msgid "No proxy"
 msgstr "Aucun"
@@ -13283,66 +13348,6 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Affiche des statistiques sur la disponibilité de vos contacts"

-msgid "Server name request"
-msgstr "Demande du nom du serveur"
-
-msgid "Enter an XMPP Server"
-msgstr "Saisissez l'adresse d'un serveur XMPP"
-
-msgid "Select an XMPP server to query"
-msgstr "Choisissez un serveur XMPP à consulter"
-
-msgid "Find Services"
-msgstr "Trouver des services"
-
-msgid "Add to Buddy List"
-msgstr "Ajouter à la liste de contacts"
-
-msgid "Gateway"
-msgstr "Portail"
-
-msgid "Directory"
-msgstr "Annuaire"
-
-msgid "PubSub Collection"
-msgstr "Ensemble PubSub"
-
-msgid "PubSub Leaf"
-msgstr "Feuillet PubSub"
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Description :</b> "
-
-#. Create the window.
-msgid "Service Discovery"
-msgstr "Découverte de services"
-
-msgid "_Browse"
-msgstr "_Parcourir"
-
-msgid "Server does not exist"
-msgstr "Le serveur n'existe pas"
-
-msgid "Server does not support service discovery"
-msgstr "Le serveur ne supporte pas la découverte de services"
-
-msgid "XMPP Service Discovery"
-msgstr "Découverte de services XMPP"
-
-msgid "Allows browsing and registering services."
-msgstr "Permet la visualisation et l'enregistrement de services."
-
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr ""
-"Ce plugin est utile pour s'abonner avec d'anciens transports ou d'autres "
-"services XMPP."
-
 msgid "Buddy is idle"
 msgstr "L'utilisateur est inactif"

@@ -13436,6 +13441,68 @@
 msgid "Apply in IMs"
 msgstr "Utiliser pour les messages"

+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "Demande du nom du serveur"
+
+msgid "Enter an XMPP Server"
+msgstr "Saisissez l'adresse d'un serveur XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Choisissez un serveur XMPP à consulter"
+
+msgid "Find Services"
+msgstr "Trouver des services"
+
+msgid "Add to Buddy List"
+msgstr "Ajouter à la liste de contacts"
+
+msgid "Gateway"
+msgstr "Portail"
+
+msgid "Directory"
+msgstr "Annuaire"
+
+msgid "PubSub Collection"
+msgstr "Ensemble PubSub"
+
+msgid "PubSub Leaf"
+msgstr "Feuillet PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Description :</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Découverte de services"
+
+msgid "_Browse"
+msgstr "_Parcourir"
+
+msgid "Server does not exist"
+msgstr "Le serveur n'existe pas"
+
+msgid "Server does not support service discovery"
+msgstr "Le serveur ne supporte pas la découverte de services"
+
+msgid "XMPP Service Discovery"
+msgstr "Découverte de services XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permet la visualisation et l'enregistrement de services."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Ce plugin est utile pour s'abonner avec d'anciens transports ou d'autres "
+"services XMPP."
+
 msgid "By conversation count"
 msgstr "Par nombre de conversations"

@@ -14081,9 +14148,12 @@
 msgid "Founder"
 msgstr "Fondateur"

+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "Opérateur"

+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr "Demi-opérateur"

@@ -14231,6 +14301,51 @@
 "Permet à l'utilisateur de personnaliser dans les conversions et les archives "
 "la manière dont est affiché l'horodatage."

+msgid "Audio"
+msgstr "Audio"
+
+msgid "Video"
+msgstr " Vidéo"
+
+msgid "Output"
+msgstr "Sortie"
+
+msgid "_Plugin"
+msgstr "_Plugins"
+
+msgid "_Device"
+msgstr "_Appareil"
+
+msgid "Input"
+msgstr "Entrée"
+
+msgid "P_lugin"
+msgstr "P_lugins"
+
+msgid "D_evice"
+msgstr "Appa_reil"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Paramètres voix et vidéo"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Configure votre micro et votre webcam."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "Permet de configurer le matériel pour les messages avec voix et vidéo."
+
 msgid "Opacity:"
 msgstr "Opacité :"

@@ -14358,6 +14473,18 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Ce plugin est utile pour débugger les clients ou serveurs XMPP."

+#~ msgid "Calling ... "
+#~ msgstr "Appel... "
+
+#~ msgid "Failed to open the file"
+#~ msgstr "Impossible d'ouvrir le fichier"
+
+#~ msgid "Euskera(Basque)"
+#~ msgstr "Basque"
+
+#~ msgid "_Resume"
+#~ msgstr "_Reprise"
+
 #~ msgid "Invitation Rejected"
 #~ msgstr "Invitation refusée"

@@ -14520,12 +14647,6 @@
 #~ msgid "Login failed (%s)."
 #~ msgstr "Échec à la connexion (%s)"

-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr ""
-#~ "Vous venez d'être déconnecté à la suite d'une connexion depuis un autre "
-#~ "endroit."
-
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "Support SSL non installé"

@@ -14538,11 +14659,6 @@
 #~ msgid "Could Not Connect"
 #~ msgstr "Impossible de se connecter."

-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "Vous risquez être déconnecté sous peu. Consultez %s pour plus "
-#~ "d'informations."
-
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "Impossible de déchiffrer la réponse du serveur"

@@ -14709,23 +14825,6 @@
 #~ msgid "The service is temporarily unavailable."
 #~ msgstr "Le service est temporairement indisponible."

-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "Votre niveau d'avertissement est actuellement trop élevé pour que vous "
-#~ "puissiez vous connecter."
-
-#~ 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 ""
-#~ "Vous vous êtes connecté et déconnecté trop rapidement. Attendez 10 "
-#~ "minutes et réessayez. Si vous persistez maintenant, il vous faudra "
-#~ "attendre encore plus longtemps."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Une erreur inconnue est survenue à la connexion : %s"
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "Une erreur inconnue (%d) s'est produite : %s"

@@ -14738,11 +14837,6 @@
 #~ msgid "Waiting for reply..."
 #~ msgstr "En attente de réponse..."

-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr ""
-#~ "TOC est revenu de sa pause. Vous pouvez désormais envoyer des messages à "
-#~ "nouveau."
-
 #~ msgid "Password Change Successful"
 #~ msgstr "Changement de mot de passe effectué."

@@ -14769,11 +14863,6 @@
 #~ msgid "Save As..."
 #~ msgstr "Enregistrer sous..."

-#~ 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 demande à %s d'accepter %d fichier : %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s demande à %s d'accepter %d fichiers : %s (%.2f %s)%s%s"
-
 #~ msgid "%s requests you to send them a file"
 #~ msgstr "%s vous demande de leur envoyer un fichier"
--- a/po/he.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/he.po	Tue Sep 01 19:51:07 2009 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-15 09:57-0400\n"
-"PO-Revision-Date: 2009-08-16 08:51+0200\n"
+"POT-Creation-Date: 2009-08-30 20:44-0700\n"
+"PO-Revision-Date: 2009-08-30 09:44+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -47,8 +47,13 @@
 "  -v, --version       הצג את הגירסא של התוכנה וצא\n"

 #, c-format
-msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
-msgstr "%s נתקל בשגיאות בעת המרת הגדרותיך מ- %s ל- %s. יש לחקור את העניין, ולסיים את ההעברה ידנית. נשמח אם באפשורתך לדווח על תקלה זו ב- http://developer.pidgin.im"
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s נתקל בשגיאות בעת המרת הגדרותיך מ- %s ל- %s. יש לחקור את העניין, ולסיים את "
+"ההעברה ידנית. נשמח אם באפשורתך לדווח על תקלה זו ב- http://developer.pidgin.im"

 msgid "Error"
 msgstr "שגיאה"
@@ -344,8 +349,11 @@
 msgid "Unblock"
 msgstr "הסר חסימה"

-msgid "Please enter the username or alias of the person you would like to Block/Unblock."
-msgstr "יש להזין את שם המשתמש או הכינוי של האדם אותו ברצונך לחסום/להוציא מחסימה."
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+"יש להזין את שם המשתמש או הכינוי של האדם אותו ברצונך לחסום/להוציא מחסימה."

 #. Not multiline
 #. Not masked?
@@ -371,8 +379,11 @@
 msgid "Join"
 msgstr "הצטרף"

-msgid "Please enter the username or alias of the person whose log you would like to view."
-msgstr "יש להזין את שם המשתמש או הכינוי של האדם שאת יומן-השיחות שלו ברצונך לקרוא."
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"יש להזין את שם המשתמש או הכינוי של האדם שאת יומן-השיחות שלו ברצונך לקרוא."

 #. Create the "Options" frame.
 msgid "Options"
@@ -518,7 +529,8 @@
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
@@ -527,8 +539,12 @@
 msgid "Re-enable Account"
 msgstr "הפעל מחדש חשבון"

-msgid "The account has disconnected and you are no longer in this chat. You will be automatically rejoined in the chat when the account reconnects."
-msgstr "החשבון נותק וכבר אינך בצא'ט זה. החזרה לצ'אט תיעשה באופן אוטומטי ברגע שהחשבון יתחבר מחדש."
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+"החשבון נותק וכבר אינך בצא'ט זה. החזרה לצ'אט תיעשה באופן אוטומטי ברגע שהחשבון "
+"יתחבר מחדש."

 msgid "No such command."
 msgstr "אין פקודה כזו."
@@ -573,7 +589,8 @@
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "רישום הוחל. הודעות בשיחה זו יירשמו מעתה."

-msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
 msgstr "רישום הופסק. הודעות בשיחה זו לא יירשמו מעתה."

 msgid "Send To"
@@ -623,20 +640,28 @@
 "להלן הפקודות שאפשריים בהקשר הנוכחי:\n"

 #, c-format
-msgid "%s is not a valid message class. See '/help msgcolor' for valid message classes."
-msgstr "%s אינו מחלקת מסרים תקפה. יש לראות את המידע בתוך '/help msgcolor' לרשימה של מחלקות-מסרים תקפות."
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s אינו מחלקת מסרים תקפה. יש לראות את המידע בתוך '/help msgcolor' לרשימה של "
+"מחלקות-מסרים תקפות."

 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
 msgstr "%s אינו צבע תקף. יש לראות את '/help msgcolor' לצבעים תקפים."

-msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
 msgstr "say &lt;message&gt;:  שלח הודעה כרגיל, כאילו לא דרך פקודה."

 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr "me &lt;action&gt;:  שלח למשתמש או צ'אט פעולה נוסח IRC."

-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
 msgstr "debug &lt;option&gt;:  שלח כל מיני רסיסי מידע לחלון שיחה הנוכחי."

 msgid "clear: Clears the conversation scrollback."
@@ -666,8 +691,18 @@
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: הצג את חלון המצבים-השמורים."

-msgid "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color for different classes of messages in the conversation window.<br>    &lt;class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/background&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
-msgstr "msgcolor &lt;מחלקה&gt; &lt;צבע-תוכן&gt; &lt;רקע&gt;: קבע צבע עבור מחלקות שונות של הודעות בחלון השיחה.<br>    &lt;מחלקה&gt;: receive, send, highlight, action, timestamp<br>    &lt;צבע-תוכן/רקע&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>לדוגמא:<br>    msgcolor send cyan default"
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;מחלקה&gt; &lt;צבע-תוכן&gt; &lt;רקע&gt;: קבע צבע עבור מחלקות "
+"שונות של הודעות בחלון השיחה.<br>    &lt;מחלקה&gt;: receive, send, highlight, "
+"action, timestamp<br>    &lt;צבע-תוכן/רקע&gt;: black, red, green, blue, "
+"white, gray, darkgray, magenta, cyan, default<br><br>לדוגמא:<br>    msgcolor "
+"send cyan default"

 msgid "Unable to open file."
 msgstr "אין אפשרות לפתוח את הקובץ."
@@ -769,13 +804,18 @@
 msgid "%B %Y"
 msgstr "%B %Y"

-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
 msgstr "אירועי מערכת רק יירשמו אם סומן \"רשום כל שינויי סטטוס ליומן המערכת\"."

-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
 msgstr "הודעות רק יירשמו אם סומן \"רשום את כל ההודעות\"."

-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr "צ'אטים רק יירשמו אם סומן \"רשום את כל הצ'אטים\"."

 msgid "No logs were found"
@@ -802,8 +842,8 @@
 msgid "System Log"
 msgstr "דו\"ח מערכת"

-msgid "Calling ... "
-msgstr "מתקשר ..."
+msgid "Calling..."
+msgstr "מתקשר..."

 msgid "Hangup"
 msgstr "התנתק"
@@ -915,8 +955,11 @@
 msgid "The selected file is not a valid plugin."
 msgstr "הקובץ שנבחר אינו תוסף."

-msgid "Please open the debug window and try again to see the exact error message."
-msgstr "יש לפתוח את חלון ניפוי הבאגים ולנסות שוב על מנת לראות את הודעת השגיאה המדוייקת."
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"יש לפתוח את חלון ניפוי הבאגים ולנסות שוב על מנת לראות את הודעת השגיאה "
+"המדוייקת."

 msgid "Select plugin to install"
 msgstr "יש לבחור תוסף להתקין"
@@ -1352,7 +1395,9 @@
 msgid "Clipboard plugin"
 msgstr "תוסף לוח ההעתקה"

-msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
 msgstr "כאשר תוכן לוח ההעתקה של gnt משתנה, התוכן גם נעשה זמין עבור X, אם ניתן."

 #, c-format
@@ -1412,7 +1457,8 @@
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
 msgstr ""
 "ניתן לאפשר רישום מתוך כלים -> העדפות -> רישום.\n"
 "\n"
@@ -1424,9 +1470,34 @@
 msgid "Shows recently logged conversations in new conversations."
 msgstr "מציג שיחות אחרונות בחלונות שיחה חדשות."

-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
 msgstr "כאשר חלון שיחה חדש נפתח, תוסף זה יכניס את השיחה האחרונה לראש החלון."

+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"מביא TinyURL..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "רק ייצר TinyURL עבור כתובות באורך הזה ומעלה"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "ראשית כתובת עבור TinyURL (או אחר)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "תוסף TinyURL"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr "בעת קבלת הודעה עם כתובת, השתמש ב-TinyURL להעתקה קלה יותר"
+
 msgid "Online"
 msgstr "מחובר"

@@ -1470,29 +1541,6 @@
 msgid "Lastlog plugin."
 msgstr "תוסף Lastlog."

-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"מביא TinyURL..."
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr "רק ייצר TinyURL עבור כתובות באורך הזה ומעלה"
-
-msgid "TinyURL (or other) address prefix"
-msgstr "ראשית כתובת עבור TinyURL (או אחר)"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "תוסף TinyURL"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr "בעת קבלת הודעה עם כתובת, השתמש ב-TinyURL להעתקה קלה יותר"
-
 msgid "accounts"
 msgstr "חשבונות"

@@ -1554,6 +1602,37 @@
 msgid "buddy list"
 msgstr "רשימת אנשי קשר"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "התעודה נחתמה על ידי עצמה ולא ניתן לבדוק אותה אוטומטית."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "תעודת-השורש שלכאורה הנפיקה את התעודה אינה מוכרת לפידג'ין."
+
+msgid "The certificate is not valid yet."
+msgstr "התעודה עדיין אינה תקפה."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr "תוקף התעודה פג, ולכן אין להחשיבה כתקפה."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "התעודה שהוצגה לא הונפקה עבור האתר הזה."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr "אין לך מסד-נתונים של תעודות שורש, אז לא ניתן לאשרר תעודה זו."
+
+msgid "The certificate chain presented is invalid."
+msgstr "שרשרת התעודות בהנפקת תעודה זו אינה תקפה."
+
+msgid "The certificate has been revoked."
+msgstr "התעודה בוטלה."
+
+msgid "An unknown certificate error occurred."
+msgstr "אירעה שגיאה לא-מוכרת עם התעודה."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(לא תואם)"

@@ -1597,56 +1676,23 @@
 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
+msgid "The certificate for %s could not be validated."
+msgstr "לא ניתן לבצע אימות של התעודה עבור %s."
+
 #. 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
-msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
-msgstr "התעודה שהוצגה על ידי \"%s\" נחתמה על ידי עצמה. לא ניתן לבצע בדיקה אוטומטית."
-
-#. FIXME 2.6.1
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "שרשרת רשויות הנפקת התעודה עבור %s אינה תקפה."
-
-#. vrq will be completed by user_auth
-msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "תעודת-השורש שלכאורה הנפיקה את התעודה אינה מוכרת לפידג'ין."
-
-#, c-format
-msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
-msgstr "שרשרת התעודות שהוצגה על ידי %s לא מכילה חתימה תקפה מרשויות ההנפקה שמהם היא טוענת שיש לה חתימה."
-
-msgid "Invalid certificate authority signature"
-msgstr "חתימת רשות הנפקות לא תקפה"
+msgid "Unable to validate certificate"
+msgstr "לא ניתן לאמת את התעודה"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"התעודה טוענת שהיא באה בעצם מאת \"%s\". ייתכן וזה אומר שהשירות אליו התחברת "
+"אינו השירות שחשבת שהוא."

 #. Make messages
 #, c-format
@@ -1684,7 +1730,6 @@
 msgstr "+++ %s התנתק"

 #. Unknown error
-#, c-format
 msgid "Unknown error"
 msgstr "שגיאה לא מוכרת"

@@ -1735,7 +1780,9 @@
 msgstr "הזמן לצ'אט"

 #. Put our happy label in it.
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
 msgstr "יש להזין את שם המשתמש שברצונך להזמין, יחד עם הודעת הזמנה אופציונלית."

 #, c-format
@@ -1880,19 +1927,19 @@
 msgstr "הושלמה העברת הקובץ"

 #, c-format
-msgid "You canceled the transfer of %s"
+msgid "You cancelled the transfer of %s"
 msgstr "ביטלת את העברת %s"

 msgid "File transfer cancelled"
 msgstr "העברת הקובץ בוטלה"

 #, c-format
-msgid "%s canceled the transfer of %s"
+msgid "%s cancelled the transfer of %s"
 msgstr "%s ביטל את העברת %s"

 #, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s ביטל את העברת הקובץ"
+msgid "%s cancelled the file transfer"
+msgstr "העברת הקובץ בוטלה על ידי %s"

 #, c-format
 msgid "File transfer to %s failed."
@@ -1953,31 +2000,49 @@
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "המטפל בכתובות \"ymsgr\""

-msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"aim\"."

-msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"gg\"."

-msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"icq\"."

-msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"irc\"."

-msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"msnim\"."

-msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"aim\"."

-msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"xmpp\"."

-msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
 msgstr "אמת אם הפקודה שהוגדרת לכפתור \"פקודה\" צריך לטפל בכתובות \"ymsgr\"."

-msgid "True if the command used to handle this type of URL should be run in a terminal."
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
 msgstr "אמת אם הפקודה לטיפול בסוג זה של כתובת צריכה לרוץ בטרמינל."

 msgid "Whether the specified command should handle \"aim\" URLs"
@@ -2023,12 +2088,20 @@
 msgstr "XML"

 #, c-format
-msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה אוטומטי&gt;:</b></font> %s<br/>\n"
-
-#, c-format
-msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה אוטומטי&gt;:</b></font> %s<br/>\n"
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה "
+"אוטומטי&gt;:</b></font> %s<br/>\n"
+
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;מענה "
+"אוטומטי&gt;:</b></font> %s<br/>\n"

 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>לא ניתן למצוא את נתיב הרישום!</b></font>"
@@ -2041,6 +2114,32 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <מענה-אוטומטי>: %s\n"

+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"לא נמצאו דוחסים. יש להתקין דוחסים של GStreamer מתוך חבילות התוסף GStreamer."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr "לא נותרו דוחסים. ההגדרות שלך בקובץ fs-codecs.conf נוקשות מדי."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "אירעה שגיאה שלא ניתן להתאושש ממנה ב-Farsight2."
+
+msgid "Conference error."
+msgstr "שגיאה בועידה."
+
+msgid "Error with your microphone."
+msgstr "שגיאה עם המיקרופון שלך."
+
+msgid "Error with your webcam."
+msgstr "שגיאה עם המצלמה שלך."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "שגיאה ביצירת החיבור: %s"
+
 msgid "Error creating conference."
 msgstr "שגיאה ביצירת שיחת הועידה."

@@ -2059,11 +2158,14 @@
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "אי-התאמה בגירסת ABI %d.%d.x (צריך %d.%d.x)"

-msgid "Plugin does not implement all required functions (list_icon, login and close)"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
 msgstr "התוסף לא מיישם את כל הפונקציות הדרושות (list_icon, login וכן close)"

 #, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
 msgstr "חסר תוסף %s. מומלץ להתקין את התוסף מחדש ולנסות שנית."

 msgid "Unable to load the plugin"
@@ -2264,8 +2366,12 @@
 msgstr "בודק תמיכה ב-IPC, כלקוח."

 #. *  description
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr "בודק את תוסף התמיכה ב-IPC, כלקוח. זה מאתר את השרת של התוסף וקורא לפקודות הרשומות."
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+"בודק את תוסף התמיכה ב-IPC, כלקוח. זה מאתר את השרת של התוסף וקורא לפקודות "
+"הרשומות."

 #. *< type
 #. *< ui_requirement
@@ -2286,14 +2392,15 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "בדוק את תוסף התמיכה ב-IPC, בתור שרת. זה רושם את פקודות ה-IPC."

-msgid "Join/Part Hiding Configuration"
-msgstr "הגדרות הסתרת הצטרפות/עזיבה"
-
-msgid "Minimum Room Size"
-msgstr "גודל חדר מינימלי"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "חוסר פעילות משתמש (בדקות)"
+msgid "Hide Joins/Parts"
+msgstr "הסתר הצטרפויות/עזיבות"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "עבור חדרים עם יותר ממספר זה של משתתפים"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "אם המשתמש לא דיבר כמספר זה של דקות"

 msgid "Apply hiding rules to buddies"
 msgstr "החל חוקי-הסתר על אנשי-הקשר"
@@ -2314,8 +2421,12 @@
 msgstr "מסתיר הודעות הצטרפות/עזיבה לא נחוצות."

 #. *  description
-msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
-msgstr "תוסף זה מסתיר הודעות הצטרפות/עזיבה בחדרי-צ'אט גדולים, מלבד עבור אותם משתמשים שלוקחים חלק פעיל בשיחה."
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+"תוסף זה מסתיר הודעות הצטרפות/עזיבה בחדרי-צ'אט גדולים, מלבד עבור אותם משתמשים "
+"שלוקחים חלק פעיל בשיחה."

 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2340,7 +2451,9 @@
 msgid "You were disconnected from the server."
 msgstr "נותקת מהשרת."

-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
 msgstr "את/ה כרגע מנותק/ת. הודעות לא יתקבלו אלא רק בזמן שאת/ה מחובר/ת."

 msgid "Message could not be sent because the maximum length was exceeded."
@@ -2422,13 +2535,17 @@

 #. * description
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
-"\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
-msgstr ""
-"בעת צפייה ביומני-שיחה, תוסף זה יכלול יומנים מתוכנות צ'אט אחרות. כרגע, זה כולל Adium, MSN Messenger, aMSN, Trillian.\n"
-"\n"
-"אזהרה: תוסף זה עדיין בשלבי פיתוח מוקדמים וייתכן ויקרוס לעיתים קרובות.  יש להשתמש בו על חשבון סיכונך האישי בלבד!"
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+"בעת צפייה ביומני-שיחה, תוסף זה יכלול יומנים מתוכנות צ'אט אחרות. כרגע, זה "
+"כולל Adium, MSN Messenger, aMSN, Trillian.\n"
+"\n"
+"אזהרה: תוסף זה עדיין בשלבי פיתוח מוקדמים וייתכן ויקרוס לעיתים קרובות.  יש "
+"להשתמש בו על חשבון סיכונך האישי בלבד!"

 msgid "Mono Plugin Loader"
 msgstr "אשף הטענת תוספי Mono"
@@ -2460,8 +2577,12 @@
 msgstr "מוסיף שורה חדשה לפני הודעה מוצגת."

 #. *< summary
-msgid "Prepends a newline to messages so that the rest of the message appears below the username in the conversation window."
-msgstr "מוסיף תו שורה חדשה לתחילת הודעות כדי ששאר ההודעה תופיע מתחת לשם המשתמש בחלון השיחה."
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the username in the conversation window."
+msgstr ""
+"מוסיף תו שורה חדשה לתחילת הודעות כדי ששאר ההודעה תופיע מתחת לשם המשתמש בחלון "
+"השיחה."

 msgid "Offline Message Emulation"
 msgstr "אמולציה של הודעות לא-מקוונות"
@@ -2469,12 +2590,20 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "שמור הודעות שנשלחו למשתמש לא-מחובר בתור תגובת-פעילות."

-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 "\"%s\" is currently offline. Do you want to save the rest of the messages in a pounce and automatically send them when \"%s\" logs back in?"
-msgstr "\"%s\" לא מחובר כרגע. האם ברצונך לשמור את שאר ההודעות בתגובת-פעילות על מנת שהם יישלחו אליו אוטומטים כאשר \"%s\" יתחבר מחדש?"
+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 ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+"\"%s\" לא מחובר כרגע. האם ברצונך לשמור את שאר ההודעות בתגובת-פעילות על מנת "
+"שהם יישלחו אליו אוטומטים כאשר \"%s\" יתחבר מחדש?"

 msgid "Offline Message"
 msgstr "הודעות לא-מקוונות"
@@ -2514,10 +2643,12 @@

 #. *  description
 msgid ""
-"Allows you to enforce on a per-account basis that passwords not being saved are only used in a single successful connection.\n"
+"Allows you to enforce on a per-account basis that passwords not being saved "
+"are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
-"מאפשר לך לאכוף לכל חשבון משתמש שסיסמאות שאינן נשמרות ישומשו רק לחיבור יחיד שמצליח.\n"
+"מאפשר לך לאכוף לכל חשבון משתמש שסיסמאות שאינן נשמרות ישומשו רק לחיבור יחיד "
+"שמצליח.\n"
 "הערה: על מנת שזה יעבוד אין לשמור את סיסמת החשבון."

 #. *< type
@@ -2541,8 +2672,12 @@
 msgid "Psychic mode for incoming conversation"
 msgstr "מצב מנבא-עתידות לשיחות נכנסות"

-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr "גורם לחלונות-שיחה להופיע כבר כאשר אנשי קשר מתחילים לכתוב הודעה.  זה עובד עבור AIM, ICQ, XMPP, Sametime, Yahoo!"
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"גורם לחלונות-שיחה להופיע כבר כאשר אנשי קשר מתחילים לכתוב הודעה.  זה עובד "
+"עבור AIM, ICQ, XMPP, Sametime, Yahoo!"

 msgid "You feel a disturbance in the force..."
 msgstr "אתה מרגיש הפרעה בכוח..."
@@ -2688,8 +2823,12 @@
 #. *< version
 #. *  summary
 #. *  description
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
-msgstr "מודיע בחלון השיחה כאשר איש הקשר מתרחק מהמתחשב, עובר למצב של חוזר פעילות, או חוזר."
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"מודיע בחלון השיחה כאשר איש הקשר מתרחק מהמתחשב, עובר למצב של חוזר פעילות, או "
+"חוזר."

 msgid "Tcl Plugin Loader"
 msgstr "מטעין לתוספי Tcl"
@@ -2697,16 +2836,25 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "מספק תמיכה לטעינת תוספי Tcl"

-msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
-msgstr "לא היה ניתן לזהות ActiveTCL מתוקן. אם ברצונך להשתמש בתוספי TCL, יש להתקין ActiveTCL מתוך 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 "חבילת \"בונג'ור\" של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://d.pidgin.im/BonjourWindows למידע נוסף."
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+"לא היה ניתן לזהות ActiveTCL מתוקן. אם ברצונך להשתמש בתוספי TCL, יש להתקין "
+"ActiveTCL מתוך 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 ""
+"חבילת \"בונג'ור\" של אפל עבור חלונות לא נמצאה, ראה את השו\"ת באתר: http://d."
+"pidgin.im/BonjourWindows למידע נוסף."

 msgid "Unable to listen for incoming IM connections"
 msgstr "לא ניתן להקשיב לחיבורי הודעות נכנסת"

-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "לא מצליח לתקשר עם שרת ה-mDNS המקומי. האם הוא כבר רץ?"

 msgid "First name"
@@ -2772,7 +2920,9 @@
 msgid "Invalid proxy settings"
 msgstr "הגדרות לא תקפות של מתווכים"

-msgid "Either the host name or port number specified for your given proxy type is invalid."
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
 msgstr "או כתובת השרת או יציאת השרת שניתנה עבור סוג המתווך שהוגדרלא תקפים."

 msgid "Token Error"
@@ -3266,10 +3416,14 @@
 msgid "Invalid nickname"
 msgstr "שם המשתמש לא חוקי"

-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
 msgstr "הכינוי שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."

-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
 msgstr "שם החשבון שבחרת נדחה ע\"י השרת. כנראה הוא מכיל אותיות לא חוקיות."

 #. We only want to do the following dance if the connection
@@ -3316,8 +3470,11 @@
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;פעולה לביצוע&gt;: פעל פעולה ."

-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "away [הודעה]:  קבע הודעת ריחוק מהמחשב, או השתמש ללא הודעה לחזור לזמינות."
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [הודעה]:  קבע הודעת ריחוק מהמחשב, או השתמש ללא הודעה לחזור לזמינות."

 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
 msgstr "ctcp <שם> <הודעה>: שלך הודעת ctcp לאותו כינוי."
@@ -3325,26 +3482,56 @@
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: שלח פקודה אל chanserv"

-msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
-msgstr "deop &lt;שם1&gt1; [שם2] ...:  הסר סטטוס של מפעיל הערוץ ממישהו. חובה להיות מפעיל ערוץ כדי לבצע פעולה זו."
-
-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;שם1&gt; [שם2] ...:  הסר יכולת דיבור בערוץ ממישהו, אשר רק מונע מהם לדבר אם הערוץ במצב של תיווך (+m). חובה להיות מפעיל ערוץ כדי לבצע פעולה זו."
-
-msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
-msgstr "invite &lt;שם&gt; [חדר]:  הזמן מישהו להצטרף אליך בערוץ הנתון, או בערוץ הנוכחי."
-
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
-
-msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
-
-msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
-msgstr "kick &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מהערוץ. צריך להיות מפעיל הערוץ כדי לעשות זאת."
-
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
-msgstr "list: הצג רשימה של חדרי צ'אט ברשת. <i>אזהרה, יש שרתים שינתקו אותך ברגע ביצוע פעולה זו.</i>"
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;שם1&gt1; [שם2] ...:  הסר סטטוס של מפעיל הערוץ ממישהו. חובה להיות "
+"מפעיל ערוץ כדי לבצע פעולה זו."
+
+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;שם1&gt; [שם2] ...:  הסר יכולת דיבור בערוץ ממישהו, אשר רק מונע "
+"מהם לדבר אם הערוץ במצב של תיווך (+m). חובה להיות מפעיל ערוץ כדי לבצע פעולה "
+"זו."
+
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;שם&gt; [חדר]:  הזמן מישהו להצטרף אליך בערוץ הנתון, או בערוץ "
+"הנוכחי."
+
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, עם "
+"אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
+
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;חדר1&gt;[,חדר2][...] [מפתח1[,מפתח2][,...]]: הזן ערוץ אחד או יותר, "
+"עם אפשרות להזין מפתח לכל אחד מן החדרים, בשעת הצורך."
+
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מהערוץ. צריך להיות מפעיל הערוץ כדי "
+"לעשות זאת."
+
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list: הצג רשימה של חדרי צ'אט ברשת. <i>אזהרה, יש שרתים שינתקו אותך ברגע ביצוע "
+"פעולה זו.</i>"

 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;פעולה לביצוע&gt;:  בצע פעולה"
@@ -3352,11 +3539,18 @@
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: שלח פקודה אל memoserv"

-msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
-msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;שם כינוי|ערוץ&gt;:  קבע או הסר מצבי ערוץ או משתמש."
-
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "msg &lt;שם כינוי&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;שם כינוי|ערוץ&gt;:  קבע או הסר מצבי ערוץ "
+"או משתמש."
+
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;שם כינוי&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."

 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [ערוץ]:  הצג את רשימת המשתמשים שכרגע בערוץ."
@@ -3370,23 +3564,41 @@
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr "me &lt;action&gt;:  שלח למשתמש או צ'אט התראה."

-msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
-msgstr "op &lt;שם כינוי1&gt; [שם כינוי2] ...:  נותן סטטוס של מפעיל ערוץ למישהו. עליך להיות מפעיל ערוץ לבצע פעולה זו."
-
-msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "operwall &lt;הודעה&gt;:  אם אינך יודע/ת מה זה עושה, כנראה את/ה לא יכול/ה להשתמש בזה."
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;שם כינוי1&gt; [שם כינוי2] ...:  נותן סטטוס של מפעיל ערוץ למישהו. עליך "
+"להיות מפעיל ערוץ לבצע פעולה זו."
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;הודעה&gt;:  אם אינך יודע/ת מה זה עושה, כנראה את/ה לא יכול/ה "
+"להשתמש בזה."

 msgid "operserv: Send a command to operserv"
 msgstr " operserv: שלח פקודה אל operserv"

-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [חדר] [הודעה]:  עזוב את החדר הנוכחי, או חדר מסויים, עם אפשרות להודעה."
-
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
-msgstr "ping [שם כינוי]:  שואל כמה איטית התגובה של משתמש (או של השרת אם לא צויין משתמש."
-
-msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "query &lt;שם משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [חדר] [הודעה]:  עזוב את החדר הנוכחי, או חדר מסויים, עם אפשרות להודעה."
+
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [שם כינוי]:  שואל כמה איטית התגובה של משתמש (או של השרת אם לא צויין "
+"משתמש."
+
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;שם משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש (בניגוד לערוץ)."

 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [הודעה]:  התנתקות מהשרת, עם אפשרות להודעה."
@@ -3394,8 +3606,12 @@
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  שלח פקודה ישירות לשרת."

-msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
-msgstr "remove &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מחדר. צריך להיות מפעיל הערוץ לבצע פעולה זו."
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;שם כינוי&gt; [הודעה]:  הסר מישהו מחדר. צריך להיות מפעיל הערוץ "
+"לבצע פעולה זו."

 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: מציג את השעה המקומית בשרת ה-IRC."
@@ -3409,11 +3625,18 @@
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [שם כינוי]: שלח בקשה CTCP VERSION למשתמש"

-msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
-msgstr "voice &lt;שם כינוי1&gt; [שם כינוי2] ...:  תן סטטוס דיבור למישהו. חובה להיות מפעיל הערוץ לבצע פעולה זו."
-
-msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "wallops &lt;הודעה&gt;:  אם אינך יודע/ת מה זה, את/ה כנראה לא יכול להשתמש בזה."
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;שם כינוי1&gt; [שם כינוי2] ...:  תן סטטוס דיבור למישהו. חובה להיות "
+"מפעיל הערוץ לבצע פעולה זו."
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;הודעה&gt;:  אם אינך יודע/ת מה זה, את/ה כנראה לא יכול להשתמש בזה."

 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [שרת] &lt;שם כינוי&gt;:  השג מידע על משתמש."
@@ -3453,7 +3676,9 @@
 msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת"

 #, c-format
-msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
 msgstr "%s דורש אימות לא מוצפן מעל תקשורת לא מוצפנת. לאפשר ולהמשיך בכל זאת?"

 msgid "Plaintext Authentication"
@@ -3555,7 +3780,9 @@
 msgid "Edit XMPP vCard"
 msgstr "ערוך את ה- XMPP vCard"

-msgid "All items below are optional. Enter only the information with which you feel comfortable."
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
 msgstr "כל הפריטים להלן הם בחירה. יש להזין רק את המידע שאת/ה מרגיש/ה נוח לתת."

 msgid "Client"
@@ -3595,15 +3822,21 @@
 msgid "Logo"
 msgstr "סמל"

+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "%s כבר לא יוכל לראות את עדכוני המצב שלך. האם ברצונך להמשיך?"
+
+msgid "Cancel Presence Notification"
+msgstr "בטל התרעת נוכחות"
+
 msgid "Un-hide From"
 msgstr "הצג תבנית"

 msgid "Temporarily Hide From"
 msgstr "הסתר את התבנית זמנית"

-msgid "Cancel Presence Notification"
-msgstr "בטל התרעת נוכחות"
-
 msgid "(Re-)Request authorization"
 msgstr "בקש אימות (מחדש)"

@@ -3637,8 +3870,12 @@
 msgstr "להלן תוצאות החיפוש שלך"

 #. 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 "מצא איש קשר על ידי הזנן קריטריונים לחיפוש בשדות הנתונים. הערה: כל שדה תומך בחיפושים עם אותיות חלופיות (%)"
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"מצא איש קשר על ידי הזנן קריטריונים לחיפוש בשדות הנתונים. הערה: כל שדה תומך "
+"בחיפושים עם אותיות חלופיות (%)"

 msgid "Directory Query Failed"
 msgstr "שגיאה בשאילתת הספרייה"
@@ -3752,7 +3989,9 @@
 msgid "Ping timed out"
 msgstr "פינג לא חזר בזמן"

-msgid "Unable to find alternative XMPP connection methods after failing to connect directly."
+msgid ""
+"Unable to find alternative XMPP connection methods after failing to connect "
+"directly."
 msgstr "לא יכול למצוא צורות חיבור XMPP חלופיות אחרי כישלון בחיבור ישירות."

 msgid "Invalid XMPP ID"
@@ -3806,7 +4045,8 @@
 msgid "Unregister"
 msgstr "הסר רישום"

-msgid "Please fill out the information below to change your account registration."
+msgid ""
+"Please fill out the information below to change your account registration."
 msgstr ".יש להזין את המידע להלן כדי לשנות את רישום החשבון שלך"

 msgid "Please fill out the information below to register your new account."
@@ -4123,7 +4363,9 @@
 msgstr "לא ניתן לזמזם, מכיוון שייתכן כי%s לא מחובר."

 #, c-format
-msgid "Unable to buzz, because %s does not support it or does not wish to receive buzzes now."
+msgid ""
+"Unable to buzz, because %s does not support it or does not wish to receive "
+"buzzes now."
 msgstr "לא ניתן לזמזם, כי %s  לא תומך בזה או לא רוצה לקבל זימזומים כרגע."

 #, c-format
@@ -4155,7 +4397,9 @@
 msgstr "ייזום מדיה נכשל"

 #, c-format
-msgid "Please select the resource of %s with which you would like to start a media session."
+msgid ""
+"Please select the resource of %s with which you would like to start a media "
+"session."
 msgstr "יש לבחור את המשאב של %s איתו ברצונך להתחיל תקשורת מדיה."

 msgid "Select a Resource"
@@ -4182,11 +4426,19 @@
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
 msgstr "ban &lt;משתמש&gt; [סיבה]:  חסום משתמש מן החדר."

-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;בעלים|מפעיל|חבר|בגלות|ללא&gt; [שם1][שם2]...: שלוף או קבע את ייחוסם של משתמשים עם החדר."
-
-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;בעלים|מפעיל|חבר|בגלות|ללא&gt; [שם1][שם2]...: שלוף או קבע את ייחוסם של משתמשים עם החדר."
+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;בעלים|מפעיל|חבר|בגלות|ללא&gt; [שם1][שם2]...: "
+"שלוף או קבע את ייחוסם של משתמשים עם החדר."
+
+msgid ""
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
+"users with a role or set users' role with the room."
+msgstr ""
+"role &lt;moderator|participant|visitor|none&gt;  [שם1][שם2]...: שלוף או קבע "
+"את ייחוסם של משתמשים עם החדר."

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;משתמש&gt; [חדר]:  הזמן משתמש לחדר."
@@ -4197,7 +4449,8 @@
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;משתמש&gt; [סיבה]:  בעט משתמש מהחדר."

-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr "msg &lt;משתמש&gt; &lt;הודעה&gt;:  שלח הודעה פרטית למשתמש אחר."

 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
@@ -4296,8 +4549,11 @@
 msgid "Create New Room"
 msgstr "צור חדר חדש"

-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr "החדר החדש שיצרת. האם ברצונך לשנות את ההגדרות שלו, או לקבל את ברירות המחדל?"
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"החדר החדש שיצרת. האם ברצונך לשנות את ההגדרות שלו, או לקבל את ברירות המחדל?"

 msgid "_Configure Room"
 msgstr "הגדרות החדר"
@@ -4366,8 +4622,11 @@
 msgid "Please specify a new nickname for you."
 msgstr "אנא הזן כינוי חדש עבורך."

-msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
-msgstr "המידע הזה נגיש לכל אנשי-הקשר ברשימת אנשי הקשר שלך, אז יש לבחור משהו מתאים."
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"המידע הזה נגיש לכל אנשי-הקשר ברשימת אנשי הקשר שלך, אז יש לבחור משהו מתאים."

 msgid "Set Nickname..."
 msgstr "קבע כינוי..."
@@ -4396,11 +4655,17 @@
 msgstr "אירוע סינכרון רשימת אנשי הקשר ב-%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 ברשימה המקומית הוא בתוך הקבוצה \"%s\" אך לא ברשימה שעל השרת. האם ברצונך להוסיף איש קשר זה?"
-
-#, c-format
-msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
+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 ברשימה המקומית הוא בתוך הקבוצה \"%s\" אך לא ברשימה שעל השרת. האם ברצונך "
+"להוסיף איש קשר זה?"
+
+#, 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 הרשימה המקומית אך לא ברשימה שעל השרת. האם ברצונך להוסיף איש קשר זה?"

 #, c-format
@@ -4583,8 +4848,7 @@
 msgid "Not expected"
 msgstr "לא היה צפוי"

-#, c-format
-msgid "Friendly name changes too rapidly"
+msgid "Friendly name is changing too rapidly"
 msgstr "השם הידידותי משתנה מהר מדי"

 #, c-format
@@ -4687,8 +4951,12 @@
 msgid "Allow MSN Mobile pages?"
 msgstr "אפשר הודעות לנייד מ-MSN?"

-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 "האם ברצונך לאפשר או לא לאפשר לאנשים מרשימת אנשי הקשר שלך לשלוח לך הודעות לטלפון הנייד או שאר מכשירים ניידים?"
+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 ""
+"האם ברצונך לאפשר או לא לאפשר לאנשים מרשימת אנשי הקשר שלך לשלוח לך הודעות "
+"לטלפון הנייד או שאר מכשירים ניידים?"

 msgid "Allow"
 msgstr "אפשר"
@@ -4704,7 +4972,8 @@
 msgstr "אין טקסט חסום עבור חשבון זה."

 #, c-format
-msgid "MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr "שרתי MSN כרגע חוסמים את הביטוי הרגוליים הבאים:<br/>%s"

 msgid "This account does not have email enabled."
@@ -4798,8 +5067,12 @@
 msgstr "נדרשת תמיכה ב-SSL עבור MSN. נא להתקין ספריית SSL נתמכת."

 #, c-format
-msgid "Unable to add the buddy %s because the username is invalid.  Usernames must be a valid email address."
-msgstr "לא ניתן להוסיף את החבר %s מכיוון ששם המשתמש אינו חוקי. שמות משתמשים מוכרחים להיות כתובות אימייל תקפות."
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"לא ניתן להוסיף את החבר %s מכיוון ששם המשתמש אינו חוקי. שמות משתמשים מוכרחים "
+"להיות כתובות אימייל תקפות."

 msgid "Unable to Add"
 msgstr "לא ניתן להוסיף"
@@ -4955,10 +5228,17 @@
 msgid "The user has not created a public profile."
 msgstr "המשתמש לא יצר פרופיל ציבורי."

-msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
-msgstr "MSN דיווחה שלא יכלה למצוא את פרופיל המשתמש. זאת אומרת שהמשתמש לא קיים, או שהמשתמש קיים אך לא יצר פרופיל ציבורי."
-
-msgid "Could not find any information in the user's profile. The user most likely does not exist."
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN דיווחה שלא יכלה למצוא את פרופיל המשתמש. זאת אומרת שהמשתמש לא קיים, או "
+"שהמשתמש קיים אך לא יצר פרופיל ציבורי."
+
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
 msgstr "לא יכול למצוא מידע בתוך פרופיל המשתמש. ככל הנראה המשתמש לא קיים."

 msgid "View web profile"
@@ -5018,24 +5298,36 @@

 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
-"\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
-"שרת ה-MSN יכבה לתחזוקה בעוד %d דקה. את/ה תנותק/י אוטומטית.אנא סיימ/י את השיחות שלך בהקדם.\n"
+"שרת ה-MSN יכבה לתחזוקה בעוד %d דקה. את/ה תנותק/י אוטומטית.אנא סיימ/י את "
+"השיחות שלך בהקדם.\n"
 "\n"
 "לאחר שהתחזוקה הושלמה, תוכל/י להתחבר מחדש."
 msgstr[1] ""
-"שרת ה-MSN יכבה לתחזוקה בעוד %d דקות. את/ה תנותק/י אוטומטית.אנא סיימ/י את השיחות שלך בהקדם.\n"
+"שרת ה-MSN יכבה לתחזוקה בעוד %d דקות. את/ה תנותק/י אוטומטית.אנא סיימ/י את "
+"השיחות שלך בהקדם.\n"
 "\n"
 "לאחר שהתחזוקה הושלמה, תוכל/י להתחבר מחדש."

-msgid "Message was not sent because the system is unavailable. This normally happens when the user is blocked or does not exist."
-msgstr "ההודעה לא נשלחה משום שהמערכת לא זמינה. בדרך-כלל זה קורה כשהמשתמש חסום או לא קיים."
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"ההודעה לא נשלחה משום שהמערכת לא זמינה. בדרך-כלל זה קורה כשהמשתמש חסום או לא "
+"קיים."

 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "ההודעה לא נשלחה מכיוון שההודעות נשלחות מהר מדי."
@@ -5079,7 +5371,8 @@
 msgid "Unable to authenticate: %s"
 msgstr "לא ניתן לאמת: %s"

-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr "רשימת אנשי הקשר שלך ב-MSN אינה זמינה כרגע. יש לנסות שנית מאוחר יותר."

 msgid "Handshaking"
@@ -5102,11 +5395,12 @@

 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "נשלחה בקשה מאת %s לצפות במצלמת האינטרנט שלך, אבל בקשה זו אינה נתמכת כרגע."
-
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s שלח לך"
+msgstr ""
+"נשלחה בקשה מאת %s לצפות במצלמת האינטרנט שלך, אבל בקשה זו אינה נתמכת כרגע."
+
+#, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr "הוזמנת על ידי %s לצפות במצלמת הוידאו שלו/ה, אבל אין תמיכה בזה עדיין."

 msgid "Away From Computer"
 msgstr "מרוחק מהמחשב"
@@ -5132,10 +5426,15 @@
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "לא ניתן לשלוח את ההודעה כיוון שאני שולחים מהר מדי:"

-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 "לא היה ניתן לשלוח את ההודעה, מכיוון שלא יכולנו לבצע התקשרות עם השרת. ככל הנראה זו בעייה עם השרת, יש לנסות שוב בעוד מספר דקות:"
-
-msgid "Message could not be sent because an error with the switchboard occurred:"
+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 ""
+"לא היה ניתן לשלוח את ההודעה, מכיוון שלא יכולנו לבצע התקשרות עם השרת. ככל "
+"הנראה זו בעייה עם השרת, יש לנסות שוב בעוד מספר דקות:"
+
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
 msgstr "לא ניתן לשלוח את ההודעה כיוון שאירעה שגיאה עם המרכזייה:"

 msgid "Message may have not been sent because an unknown error occurred:"
@@ -5150,6 +5449,10 @@
 msgid "The username specified is invalid."
 msgstr "שם המשתמש שהוזן אינו חוקי."

+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "השם הידידותי משתנה מהר מדי"
+
 msgid "This Hotmail account may not be active."
 msgstr "ייתכן וחשבון ה-Hotmail הזה אינו פעיל."

@@ -5270,10 +5573,16 @@
 msgstr "חברי בהודעות מידיות"

 #, c-format
-msgid "%d buddy was added or updated from the server (including buddies already on the server-side list)"
-msgid_plural "%d buddies were added or updated from the server (including buddies already on the server-side list)"
-msgstr[0] "%d איש-קשר נוסף או עודכן מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
-msgstr[1] "%d אנשי-קשר נוספו או עודכנו מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d איש-קשר נוסף או עודכן מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"
+msgstr[1] ""
+"%d אנשי-קשר נוספו או עודכנו מהשרת (כולל אנשי-קשר שכבר היו על הרשימה בשרת)"

 msgid "Add contacts from server"
 msgstr "הוסף אנשי-קשר מהשרת"
@@ -5283,8 +5592,14 @@
 msgstr "שגיאת פרוטוקול, קוד %d: %s"

 #, 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 סיסמתך הינה באורך %zu תוים, יותר מהאורך המצופה של %d. יש לקצר את הסיסמא באתר http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword ולנסות שנית."
+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 סיסמתך הינה באורך %zu תוים, יותר מהאורך המצופה של %d. יש לקצר את הסיסמא "
+"באתר http://profileedit.myspace.com/index.cfm?fuseaction=accountSettings."
+"changePassword ולנסות שנית."

 msgid "Incorrect username or password"
 msgstr "שם משתמש או סיסמה שגויים"
@@ -5319,8 +5634,11 @@
 msgid "The RC4 cipher could not be found"
 msgstr "צופן ה- RC4 לא נמצא"

-msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
-msgstr "יש לשדרג לגירסא של libpurple עם תמיכת RC4 (>= 2.0.1). תוסף MySpaceIM לא יטען."
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"יש לשדרג לגירסא של libpurple עם תמיכת RC4 (>= 2.0.1). תוסף MySpaceIM לא יטען."

 msgid "Add friends from MySpace.com"
 msgstr "הוסף חברים מתוך MySpace.com"
@@ -5374,8 +5692,14 @@
 msgid "Client Version"
 msgstr "גירסת לקוח"

-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 "קרתה שגיאה בעת קביעת שם המשתמש. יש לנסות שנית, או לגשת אל http://editprofile.myspace.com/index.cfm?fuseaction=profile.username על מנת לקבוע את שם המשתמש שלך."
+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 ""
+"קרתה שגיאה בעת קביעת שם המשתמש. יש לנסות שנית, או לגשת אל http://editprofile."
+"myspace.com/index.cfm?fuseaction=profile.username על מנת לקבוע את שם המשתמש "
+"שלך."

 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - שם המשתמש זמין"
@@ -5596,7 +5920,9 @@
 msgid "Could not recognize the host of the username you entered"
 msgstr "לא ניתן לזהות את השרת אותו הזנת"

-msgid "Your account has been disabled because too many incorrect passwords were entered"
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
 msgstr "חשבונך הושעה  עקב ריבוי הזנת סיסמאות שגויות"

 msgid "You cannot add the same person twice to a conversation"
@@ -5617,7 +5943,9 @@
 msgid "The user has blocked you"
 msgstr "משתמש זה חסם אותך"

-msgid "This evaluation version does not allow more than ten users to log in at one time"
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
 msgstr "גירסת הניסוי הזו אינה מאפשרת ליותר מ-10 משתמשים להתחבר בו זמנית"

 msgid "The user is either offline or you are blocked"
@@ -5657,12 +5985,20 @@
 msgstr "לא ניתן לשלוח הודעה. לא יכול ליצור את הועידה (%s)."

 #, c-format
-msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
-msgstr "לא ניתן להעביר את המשתמש %s לתיקייה %s ברשימה אצל השרת.שגיאה בעת יצירת התיקייה (%s)."
-
-#, c-format
-msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
-msgstr "לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך.שגיאה ביצירת תיקייה ברשימת של השרת (%s)."
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"לא ניתן להעביר את המשתמש %s לתיקייה %s ברשימה אצל השרת.שגיאה בעת יצירת "
+"התיקייה (%s)."
+
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+"לא ניתן להוסיף את %s לרשימת אנשי הקשר שלך.שגיאה ביצירת תיקייה ברשימת של השרת "
+"(%s)."

 #, c-format
 msgid "Could not get details for user %s (%s)."
@@ -5747,10 +6083,13 @@
 msgstr "האם ברצונך להצטרף לשיחה?"

 #, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr "ככל הנראה, %s אינו מחובר ולא קיבל את ההודעה ששלחת הרגע."

-msgid "Unable to connect to server. Please enter the address of the server to which you wish to connect."
+msgid ""
+"Unable to connect to server. Please enter the address of the server to which "
+"you wish to connect."
 msgstr "לא ניתן להתחבר לשרת. יש להזין את כתובת השרת אליו ברצונך להתחבר."

 msgid "This conference has been closed. No more messages can be sent."
@@ -5775,16 +6114,24 @@
 msgid "Server port"
 msgstr "פורט השרת"

-msgid "Received unexpected response from "
-msgstr "התקבלה תגובה לא-צפויה מאת"
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "התקבלה תגובה לא-צפויה מאת %s"

 #. 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 "התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, תיאלץ להמתין אפילו יותר."
-
-#, c-format
-msgid "Error requesting "
-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 ""
+"התחברת והתנתקת התדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך לנסות, "
+"תיאלץ להמתין אפילו יותר."
+
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "שגיאה בבקשת %s: %s"

 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL אינם מאפשרים לאמת את שם המשתמש שלך כאן"
@@ -5850,8 +6197,12 @@
 msgstr "בוצע חיבור ישיר"

 #, 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 ניסה לשלוח קובץ %s אליך, אבל אנו מאפשרים רק קבצים עד %s מעל Direct IM.  במקום זאת, יש לנסות להעביר את הקובץ בעזרת מנגנון העברת הקבצים.\n"
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s ניסה לשלוח קובץ %s אליך, אבל אנו מאפשרים רק קבצים עד %s מעל Direct IM.  "
+"במקום זאת, יש לנסות להעביר את הקובץ בעזרת מנגנון העברת הקבצים.\n"

 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -5929,12 +6280,23 @@
 msgid "Not while on AOL"
 msgstr "לא בזמן שהות ב-AOL"

-msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
-msgstr "(הייתה שגיאה בעת קבלת הודעה זו.  איש-הקשר איתו בשיחה כנראה משתמש בקידוד שונה מן המצופה. אם הינך יודע/ת באיזה קידוד הוא משתמש, ניתן להגדיר זאת בהגדרות המתקדמות של החשבון עבור החשבון הזה של AIM/ICQ.)"
-
-#, 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 "(הייתה תקלה בקבלת הודעה זו. או שלך ולמשתמש %s יש קידודים שונים,או שלמשתמש %s יש תוכנה עם באגים.)"
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+"(הייתה שגיאה בעת קבלת הודעה זו.  איש-הקשר איתו בשיחה כנראה משתמש בקידוד שונה "
+"מן המצופה. אם הינך יודע/ת באיזה קידוד הוא משתמש, ניתן להגדיר זאת בהגדרות "
+"המתקדמות של החשבון עבור החשבון הזה של AIM/ICQ.)"
+
+#, 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 ""
+"(הייתה תקלה בקבלת הודעה זו. או שלך ולמשתמש %s יש קידודים שונים,או שלמשתמש %s "
+"יש תוכנה עם באגים.)"

 #. Label
 msgid "Buddy Icon"
@@ -6046,8 +6408,14 @@
 msgstr "מבצע גימור לחיבור"

 #, 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 כיוון ששם משתמש זה אינו תקף. שמות משתמשים חייבים להיות כתובות אימייל חוקיות, או לחילופין להתחיל באות ולהכיל רק אותיות מספרים ורווחים, או לחילופין להכיל אך ורק מספרים."
+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 כיוון ששם משתמש זה אינו תקף. שמות משתמשים חייבים "
+"להיות כתובות אימייל חוקיות, או לחילופין להתחיל באות ולהכיל רק אותיות מספרים "
+"ורווחים, או לחילופין להכיל אך ורק מספרים."

 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6082,8 +6450,12 @@
 msgstr "גירסת תוכנת הלקוח בה את/ה משתמש/ת ישנה מדי. אנא שדרג/י ב-%s"

 #. IP address connecting too frequently
-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 "התחברת והתנתקת בתדירות גבוהה מדיי. יש להמתין דקה ולנסות שנית. אם תמשיכ/י לנסות, תיאלצ/י להמתין אפילו יותר."
+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 ""
+"התחברת והתנתקת בתדירות גבוהה מדיי. יש להמתין דקה ולנסות שנית. אם תמשיכ/י "
+"לנסות, תיאלצ/י להמתין אפילו יותר."

 msgid "The SecurID key entered is invalid"
 msgstr "המפתח SecurID שהוזן אינו תקף."
@@ -6111,7 +6483,8 @@

 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
 "המשתמש %u דחה את בקשתך להוסיף אותם לרשימת אנשי הקשר שלהם מהסיבה להלן:\n"
@@ -6187,20 +6560,25 @@
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שהן היו גדולות מדי."

 #, c-format
-msgid "You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] "פספסת %hu הודעה מאת %s מכיוון שמהירות השליחה מופרזת."
 msgstr[1] "פספסת %hu הודעות מאת %s מכיוון שמהירות השליחה מופרזת."

 #, 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."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] "לא קיבלת %hu הודעה מאת %s בגלל שרמת האזהרה של השולח גבוהה מדי."
 msgstr[1] "לא קיבלת %hu הודעות מאת %s בגלל שרמת האזהרה של השולח גבוהה מדי."

 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
-msgid_plural "You missed %hu messages from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
 msgstr[0] "לא קיבלת %hu הודעה מאת %s בגלל שרמת-האזהרה שלך גבוהה מדי."
 msgstr[1] "לא קיבלת %hu הודעות מאת %s בגלל שרמת-האזהרה שלך גבוהה מדי."

@@ -6242,11 +6620,17 @@
 msgstr "החיבור AIM שלך אולי יתנתק."

 #. The conversion failed!
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
 msgstr "[לא ניתן להציג הודעה ממשתמש זה כיוון שהיא מכילה תווים לא חוקיים.]"

-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 "הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת במהירות שליחת ההודעת יש לחכות 10 שניות ולנסות שנית."
+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 ""
+"הפעולה האחרונה שניסית לבצע לא התבצעה כיוון שאתה הפרזת במהירות שליחת ההודעת "
+"יש לחכות 10 שניות ולנסות שנית."

 #, c-format
 msgid "You have been disconnected from chat room %s."
@@ -6299,28 +6683,44 @@
 msgstr "התקבלה בקשה לאישור החשבון"

 #, c-format
-msgid "Error 0x%04x: Unable to format username because the requested name differs from the original."
-msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש שונה מהשם המקורי."
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+"שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש שונה מהשם המקורי."

 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש לא תקני."

 #, c-format
-msgid "Error 0x%04x: Unable to format username because the requested name is too long."
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
 msgstr "שגיאה 0x%04x: לא ניתן לפרמט את שם המשתמש, כיוו ששם המשתמש ארוך מדי."

 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this username."
-msgstr "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שיש כבר בקשה מחכה עבור משתמש זה."
-
-#, 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: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת הנתונה מיוחסת ליותר מדי שמות משתמשים."
-
-#, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
-msgstr "שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת שניתנה לא חוקית."
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+"שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שיש כבר בקשה מחכה עבור "
+"משתמש זה."
+
+#, 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: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת הנתונה מיוחסת "
+"ליותר מדי שמות משתמשים."
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+"שגיאה 0x%04x: לא ניתן לשנות את כתובת הדוא\"ל כיוון שהכתובת שניתנה לא חוקית."

 #, c-format
 msgid "Error 0x%04x: Unknown error."
@@ -6336,18 +6736,28 @@
 msgid "Account Info"
 msgstr "מידע על החשבון"

-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr "הודעת-התמונה לא נשלחה. עליך להיות מחובר/ת בתקשורת ישירה לשלוח תמונות."

 msgid "Unable to set AIM profile."
 msgstr "אין אפשרות לקבוע את פרופיל ה-AIM."

-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 "ככל הנראה ניסית לקבוע את פרופיל המשתמש שלך לפני סיום תהליך האימות. הפרופיל לא השתנה; יש לנסות שנית לאחר סיום תהליך האימות."
-
-#, c-format
-msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
+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 ""
+"ככל הנראה ניסית לקבוע את פרופיל המשתמש שלך לפני סיום תהליך האימות. הפרופיל "
+"לא השתנה; יש לנסות שנית לאחר סיום תהליך האימות."
+
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
 msgstr[0] "עברת את אורך הפרופיל המקסימלי של %d בייט. הפרופיל קוצר עבורך."
 msgstr[1] "עברת את אורך הפרופיל המקסימלי של %d בייטים. הפרופיל קוצר עבורך."

@@ -6355,8 +6765,12 @@
 msgstr "הפרופיל ארוך מדי."

 #, c-format
-msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
 msgstr[0] "עברת את אורך הודעת הריחוק המקסימלי של %d בייט. הוא קוצר עבורך."
 msgstr[1] "עברת את אורך הודעת הריחוק המקסימלי של %d בייטים. הוא קוצר עבורך."

@@ -6364,21 +6778,35 @@
 msgstr "הודעת הריחוק מהמחשב ארוכה מדי."

 #, 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 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 Retrieve Buddy List"
 msgstr "לא ניתן לשלוף את רשימת החברים"

-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 "שרתי ה-AIM זמנית לא יכלו לשלוח את רשימת אנשי הקשר שלך. הרשימה לא אבדה, וככל הנראה תהייה זמינה בדקות הקרובות."
+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 ""
+"שרתי ה-AIM זמנית לא יכלו לשלוח את רשימת אנשי הקשר שלך. הרשימה לא אבדה, וככל "
+"הנראה תהייה זמינה בדקות הקרובות."

 msgid "Orphans"
 msgstr "יתומים"

 #, 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 לרשימת החברים שלך, כיוון שיש יותר מדי חברים ברשימה. יש להסיר אחד ולנסות שנית."
+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 לרשימת החברים שלך, כיוון שיש יותר מדי חברים ברשימה. יש "
+"להסיר אחד ולנסות שנית."

 msgid "(no name)"
 msgstr "(ללא שם)"
@@ -6388,8 +6816,11 @@
 msgstr "לא ניתן להוסיף את החבר%s מסיבה לא ידועה."

 #, 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 התיר/ה לך להוסיף אותו/ה לרשימת אנשי הקשר שלך. האם ברצונך להוסיפו/ה?"
+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 התיר/ה לך להוסיף אותו/ה לרשימת אנשי הקשר שלך. האם ברצונך להוסיפו/ה?"

 msgid "Authorization Given"
 msgstr "ההרשאה ניתנה"
@@ -6405,7 +6836,8 @@
 #. Denied
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
 "המשתמש %s דחה את בקשתך להוסיף אותו לרשימת אנשי הקשר שלך מהסיבה להלן:\n"
@@ -6434,12 +6866,19 @@
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "בחרת לפתוח בתקשורת ישירה להודעות עם %s."

-msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
-msgstr "משום שפעולה זו חושפת את כתובת ה-IP שלך, יתכן והיא מהווה סיכון לביטחונך.  להמשיך בכל זאת?"
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"משום שפעולה זו חושפת את כתובת ה-IP שלך, יתכן והיא מהווה סיכון לביטחונך.  "
+"להמשיך בכל זאת?"

 msgid "C_onnect"
 msgstr "התחבר"

+msgid "You closed the connection."
+msgstr "סגרת את החיבור."
+
 msgid "Get AIM Info"
 msgstr "הצג פרטי AIM"

@@ -6450,6 +6889,9 @@
 msgid "Get Status Msg"
 msgstr "הורד הודעת מצב"

+msgid "End Direct IM Session"
+msgstr "סיים חיבור IM ישיר"
+
 msgid "Direct IM"
 msgstr "תקשורת ישירה להודעות"

@@ -6480,8 +6922,12 @@
 msgid "You are awaiting authorization from the following buddies"
 msgstr "אתה מחכה להרשאה מאנשי הקשר להלן"

-msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
-msgstr "יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם ולבחור \"בקש הרשאה שוב\"."
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"יש באפשרותך לבקש שוב הרשאה מאנשי קשר אלו ע\"י לחיצה ימנית עם העכבר עליהם "
+"ולבחור \"בקש הרשאה שוב\"."

 msgid "Find Buddy by Email"
 msgstr "מצא איש קשר לפי דוא\"ל"
@@ -6559,8 +7005,13 @@
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ביקש כעת להתחבר ישירות אל %s"

-msgid "This requires a direct connection between the two computers and is necessary for IM Images.  Because your IP address will be revealed, this may be considered a privacy risk."
-msgstr "זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."
+msgid ""
+"This requires a direct connection between the two computers and is necessary "
+"for IM Images.  Because your IP address will be revealed, this may be "
+"considered a privacy risk."
+msgstr ""
+"זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת "
+"ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."

 msgid "Aquarius"
 msgstr "דלי"
@@ -7269,7 +7720,7 @@
 msgstr "שליחת קובץ"

 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d ביטל את העברת %s"

 #, c-format
@@ -7318,7 +7769,8 @@
 msgstr "מפעיל שירותים"

 #, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
 msgstr "אדמיניסטרטור Sametime שם את ההודעה להלן על השרת %s"

 msgid "Sametime Administrator Announcement"
@@ -7359,7 +7811,9 @@
 msgstr "צור שיחת ועידה עם המשתמש"

 #, c-format
-msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
 msgstr "יש להזין נושא עבוד שיחת הועידה, והודעת הזמנה שתישלח אל %s"

 msgid "New Conference"
@@ -7378,8 +7832,13 @@
 msgstr "הזמן משתמש אל ועידה"

 #, c-format
-msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
-msgstr "בחר שיחת ועידה מהרשימה להלן לשלוח הזמנה למשתמש %s.בחר \"צור ועידה חדשה\" אם ברצונך ליצור ועידה חדשה להזמין אליה משתמש זה."
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"בחר שיחת ועידה מהרשימה להלן לשלוח הזמנה למשתמש %s.בחר \"צור ועידה חדשה\" אם "
+"ברצונך ליצור ועידה חדשה להזמין אליה משתמש זה."

 msgid "Invite to Conference"
 msgstr "הזמן לועידה"
@@ -7397,8 +7856,12 @@
 msgstr "לא ניתן שרת קהילה של Sametime"

 #, 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 "לא הוגדר שם או כתובת IP עבור חשבון ה-Meanwhile %s. יש להזין אחת להלן כדי להמשיך בכניסה למערכת."
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+"לא הוגדר שם או כתובת IP עבור חשבון ה-Meanwhile %s. יש להזין אחת להלן כדי "
+"להמשיך בכניסה למערכת."

 msgid "Meanwhile Connection Setup"
 msgstr "הגדרות תקשורת Meanwhile"
@@ -7426,8 +7889,12 @@
 msgstr "שם משתמש דו-משמעי הוזן"

 #, 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' יכול להתכוון אל כל אחד מן המשתמשים להלן. אנא בחר/י את המשתמשהנכון מן הרשימה כדי להוסיף אותם לרשימת אנשי הקשר שלך."
+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' יכול להתכוון אל כל אחד מן המשתמשים להלן. אנא בחר/י את המשתמשהנכון "
+"מן הרשימה כדי להוסיף אותם לרשימת אנשי הקשר שלך."

 msgid "Select User"
 msgstr "בחר משתמש"
@@ -7436,8 +7903,12 @@
 msgstr "אין אפשרות להוסיף משתמש: המשתמש לא נמצא"

 #, 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' לא תואם לאף משתמש בקהילה ה-Sametime שלך.והוא הוסר מרשימת אנשי הקשר שלך."
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"המזהה '%s' לא תואם לאף משתמש בקהילה ה-Sametime שלך.והוא הוסר מרשימת אנשי "
+"הקשר שלך."

 #, c-format
 msgid ""
@@ -7490,8 +7961,13 @@
 msgstr "תוצאות מתוך רשימת הכתובות של Notes"

 #, 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' יכול להתכוון לכל אחד מקבוצות ספרי הכתובות של Notes שלהלן.אנא בחר י את הקבוצה הנכונה מתוך הרשימה כדי להוסיף אותה לרשימת אנשי הקשר שלך."
+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' יכול להתכוון לכל אחד מקבוצות ספרי הכתובות של Notes שלהלן.אנא בחר "
+"י את הקבוצה הנכונה מתוך הרשימה כדי להוסיף אותה לרשימת אנשי הקשר שלך."

 msgid "Select Notes Address Book"
 msgstr "בחר ספר כתובות של Notes"
@@ -7500,22 +7976,33 @@
 msgstr "לא ניתן להוסיף קבוצה: הקבוצה לא נמצאה"

 #, c-format
-msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
 msgstr "המזהה '%s' לא תואם לאף קבוצת ספרי הכתובות של Notes בקהילה שלך."

 msgid "Notes Address Book Group"
 msgstr "קבוצה מספר כתובות של Notes"

-msgid "Enter the name of a Notes Address Book group in the field below to add the group and its members to your buddy list."
-msgstr "יש להזין שם שלקבוצה בספר כתובות של Notes בשדה להלן על-מנת להוסיף את הקבוצה וחבריה לרשימת אנשי הקשר שלך."
+msgid ""
+"Enter the name of a Notes Address Book group in the field below to add the "
+"group and its members to your buddy list."
+msgstr ""
+"יש להזין שם שלקבוצה בספר כתובות של Notes בשדה להלן על-מנת להוסיף את הקבוצה "
+"וחבריה לרשימת אנשי הקשר שלך."

 #, c-format
 msgid "Search results for '%s'"
 msgstr "תוצאות חיפוש עבור %s"

 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
-msgstr "המזהה '%s' יכול להתכוון לכל אחר מן המשתמשים שלהלן. יש באפשרותך להוסיף אותם אל רשימת אנשי הקשר שלך או לשלוח להם הודעות בעזרת כפתורי הפעולה שלמטה."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"המזהה '%s' יכול להתכוון לכל אחר מן המשתמשים שלהלן. יש באפשרותך להוסיף אותם "
+"אל רשימת אנשי הקשר שלך או לשלוח להם הודעות בעזרת כפתורי הפעולה שלמטה."

 msgid "Search Results"
 msgstr "תוצאות חיפוש"
@@ -7533,8 +8020,12 @@
 msgid "Search for a user"
 msgstr "חיפוש משתמש"

-msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
-msgstr "יש להזין שם או מזהה חלקי בשדה להלן כדי לחפש משתמשים תואמים בקהילת ב Sametime שלך."
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"יש להזין שם או מזהה חלקי בשדה להלן כדי לחפש משתמשים תואמים בקהילת ב Sametime "
+"שלך."

 msgid "User Search"
 msgstr "חיפוש משתמש"
@@ -7590,8 +8081,11 @@
 msgstr "המשתמש המרוחק כבר לא נוכח ברשת"

 #, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
-msgstr "בקשה להסכמה על מפתחות התקבלה מאת %s. האם ברצונך לבצע את ההסכמה על מפתחות?"
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"בקשה להסכמה על מפתחות התקבלה מאת %s. האם ברצונך לבצע את ההסכמה על מפתחות?"

 #, c-format
 msgid ""
@@ -7637,8 +8131,12 @@
 msgid "The %s buddy is not trusted"
 msgstr "איש הקשר %s אינו נבטח"

-msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
-msgstr "אינך יכול/ה לקבל התרעות על איש קשר עד אשר תייבא/י את המפתח הציבורי שלו.  ניתן להשתמש בפקודת השג מפתח ציבורי על-מנת להשיג את המפתח הציבורי."
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"אינך יכול/ה לקבל התרעות על איש קשר עד אשר תייבא/י את המפתח הציבורי שלו.  "
+"ניתן להשתמש בפקודת השג מפתח ציבורי על-מנת להשיג את המפתח הציבורי."

 #. Open file selector to select the public key.
 msgid "Open..."
@@ -7648,8 +8146,12 @@
 msgid "The %s buddy is not present in the network"
 msgstr "המשתמש %s לא נוכח ברשת"

-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
-msgstr "להוסיף את איש הקשר, עליך לייבא את המפתח הציבורי שלו.ניתן ללחוץ על \"ייבא\" לייבא מפתח ציבורי."
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"להוסיף את איש הקשר, עליך לייבא את המפתח הציבורי שלו.ניתן ללחוץ על \"ייבא\" "
+"לייבא מפתח ציבורי."

 msgid "_Import..."
 msgstr "ייבא..."
@@ -7657,11 +8159,19 @@
 msgid "Select correct user"
 msgstr "בחר/י משתמש נכון"

-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 "יותר ממשתמש אחד נמצא עם אותו מפתח ציבורי. יש לבחור מהרשימה את המשתמש הנכון להוסיף לרשימת אנשי הקשר."
-
-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 "יותר ממשתמש אחד נמצא עם אותו שם. יש לבחור מהרשימה את המשתמש הנכון להוסיף לרשימת אנשי הקשר."
+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 ""
+"יותר ממשתמש אחד נמצא עם אותו מפתח ציבורי. יש לבחור מהרשימה את המשתמש הנכון "
+"להוסיף לרשימת אנשי הקשר."
+
+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 ""
+"יותר ממשתמש אחד נמצא עם אותו שם. יש לבחור מהרשימה את המשתמש הנכון להוסיף "
+"לרשימת אנשי הקשר."

 msgid "Detached"
 msgstr "מנותק"
@@ -7811,8 +8321,17 @@
 msgstr "רשימת המפתחות הציבוריים של הערוץ"

 #, c-format
-msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
-msgstr "אימות בערוץ היא לצורך איבטוח הערוץ מגישה לא מורשית. ייתכן והאימות יהיה על בסיס סיסמה וחתימה דיגיטלית. אם הסיסמא נקבעה, חובה לתת אותה כדי להצטרף. אם נקבעו מפתחות ציבוריים לערוץ, אז רק משתמשים שהמפתח הציבורי שלהם ברשימה יוכלו להצטרף."
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"אימות בערוץ היא לצורך איבטוח הערוץ מגישה לא מורשית. ייתכן והאימות יהיה על "
+"בסיס סיסמה וחתימה דיגיטלית. אם הסיסמא נקבעה, חובה לתת אותה כדי להצטרף. אם "
+"נקבעו מפתחות ציבוריים לערוץ, אז רק משתמשים שהמפתח הציבורי שלהם ברשימה יוכלו "
+"להצטרף."

 msgid "Channel Authentication"
 msgstr "אימות בערוץ"
@@ -7876,7 +8395,8 @@
 msgstr "קביעת סודיות ערוץ"

 #, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr "חובה להצטרף לערוץ %s לפני הצטרפות לקבוצה הפרטית"

 msgid "Join Private Group"
@@ -8116,8 +8636,12 @@
 msgstr "נדרשת סיסמא"

 #, c-format
-msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
-msgstr "המפתח הציבורי של %s התקבל. ההעתק המקומי אינו תואם למפתח זה. האם ברצונך להמשיך ולקבל את המפתח הציבורי?"
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"המפתח הציבורי של %s התקבל. ההעתק המקומי אינו תואם למפתח זה. האם ברצונך "
+"להמשיך ולקבל את המפתח הציבורי?"

 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
@@ -8153,7 +8677,8 @@
 msgid "Key Exchange failed"
 msgstr "החלפת המפתחות נכשלה"

-msgid "Resuming detached session failed. Press Reconnect to create new connection."
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
 msgstr "המשך תהליך פעולה שנותק, נכשל. לחצ/י על חיבור מחדש ליצור חיבור חדש."

 msgid "Performing key exchange"
@@ -8226,8 +8751,13 @@
 msgid "User Online Status Attributes"
 msgstr "מאפייני מצב משתמש זמין ומחובר"

-msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
-msgstr "ניתן לאפשר למשתמשים אחרים לראות את מצב החיבור שלך ומידע אישי. יש למלא את המידע שברצונך לאפשר למשתמשים אחרים לראות עליך."
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+"ניתן לאפשר למשתמשים אחרים לראות את מצב החיבור שלך ומידע אישי. יש למלא את "
+"המידע שברצונך לאפשר למשתמשים אחרים לראות עליך."

 msgid "Message of the Day"
 msgstr "ההודעה להיום"
@@ -8346,11 +8876,17 @@
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;שם כינוי&gt;:  הצג מידע על משתמש"

-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
-msgstr "cmode &lt;ערוץ&gt; [+|-&lt;מצבים&gt;] [פרמטרים]: שנה או הצג את מצבי הערוץ"
-
-msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
-msgstr "cumode &lt;ערוץ&gt; +|-&lt;מצבים&gt; &lt;שם כינוי&gt;:  שנה מצבי משתמש בערוץ"
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;ערוץ&gt; [+|-&lt;מצבים&gt;] [פרמטרים]: שנה או הצג את מצבי הערוץ"
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;ערוץ&gt; +|-&lt;מצבים&gt; &lt;שם כינוי&gt;:  שנה מצבי משתמש בערוץ"

 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;מצבי משתמש&gt;:  קביעת מצבי המשתמש שלך ברשת"
@@ -8358,8 +8894,12 @@
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;שם כינוי&gt; [-pubkey]:  השג הרשאות מפעיל שרת"

-msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
-msgstr "invite &lt;ערוץ&gt; [-|+]&lt;שם כינוי&gt;:  הזמן משתמש או הוסף/הסר מרשימת ההזמנות של הערוץ"
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;ערוץ&gt; [-|+]&lt;שם כינוי&gt;:  הזמן משתמש או הוסף/הסר מרשימת "
+"ההזמנות של הערוץ"

 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;ערוץ&gt; &lt;שם כינוי&gt; [הערה]:  בעט משתמש מן הערוץ"
@@ -8382,8 +8922,12 @@
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;ערוץ&gt;:  הצג את רשימת הערוצים"

-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;ערוצ(ים)&gt;:  הצג רשימת אנשים מסוג מסויים בערוצ(ים)"
+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;ערוצ(ים)&gt;:  הצג רשימת "
+"אנשים מסוג מסויים בערוצ(ים)"

 #. *< type
 #. *< ui_requirement
@@ -8520,7 +9064,9 @@
 msgstr "%s שלח הודעה אל הלוח הלבן. האם ברצונך לפתוח את הלוח הלבן?"

 #, c-format
-msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
 msgstr "%s שלח הודעה אל הלוח הלבן בערוץ %s.האם ברצונך לפתוח את הלוח הלבן?"

 msgid "Whiteboard"
@@ -8673,6 +9219,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "התעלם מהזמנות לשיחות-ועידה ולחדרי-צ'אט"

+msgid "Use account proxy for SSL connections"
+msgstr "השתמש בחשבון שרת-תיווך עבור חיבורי SSL"
+
 msgid "Chat room list URL"
 msgstr "מיקום של רשימת חדרי הצ'אט"

@@ -8698,6 +9247,10 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "תוסף פרוטוקול Yahoo! יפן"

+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s שלח לך"
+
 msgid "Your SMS was not delivered"
 msgstr "הסמס שלך לא הגיע ליעדו"

@@ -8709,8 +9262,12 @@
 msgstr "הודעת מערכת עבור %s מ-Yahoo!:"

 #, c-format
-msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
-msgstr "%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך. מהסיבה הבאה: %s."
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+"%s )רטרואקטיבית( דחה את בקשתך להוסיף אותך לרשימת אנשי הקשר שלך. מהסיבה הבאה: "
+"%s."

 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
@@ -8724,11 +9281,17 @@
 msgstr "התקבל מידע שגוי"

 #. security lock from too many failed login attempts
-msgid "Account locked: Too many failed login attempts.  Logging into the Yahoo! website may fix this."
-msgstr "החשבון נעול: יותר מדי ניסיון התחברות כושלים. התחברות באתר Yahoo! אולי תתקן את זה."
+msgid ""
+"Account locked: Too many failed login attempts.  Logging into the Yahoo! "
+"website may fix this."
+msgstr ""
+"החשבון נעול: יותר מדי ניסיון התחברות כושלים. התחברות באתר Yahoo! אולי תתקן "
+"את זה."

 #. indicates a lock of some description
-msgid "Account locked: Unknown reason.  Logging into the Yahoo! website may fix this."
+msgid ""
+"Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
+"this."
 msgstr "החשבון נעול: סיבה לא ידועה. התחברות באתר Yahoo! אולי תתקן את זה."

 #. username or password missing
@@ -8736,21 +9299,48 @@
 msgstr "שם משתמש או סיסמה חסרים"

 #, 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. בדוק ב-%s לעידכונים."
+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. "
+"בדוק ב-%s לעידכונים."

 msgid "Failed Yahoo! Authentication"
 msgstr "כישלון באימות מול Yahoo!"

 #, 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, אך משתמש זה נמצא ברשימת אנשי הקשר שלך. לחיצה על \"כן\" תסיר ותתעלם מן המשתמש."
+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, אך משתמש זה נמצא ברשימת אנשי הקשר שלך. לחיצה על \"כן\" "
+"תסיר ותתעלם מן המשתמש."

 msgid "Ignore buddy?"
 msgstr "התעלם ממשתמש?"

-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "חשבונך נעול, יש לגשת לאתר של Yahoo."
+msgid "Invalid username or password"
+msgstr "שם משתמש או סיסמה לא-תקפים"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"חשבונך נעול בגלל יותר מדי ניסיון התחברות כושלים. יש לנסות להיכנס לאתר של "
+"Yahoo!."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "שגיאה לא-מוכרת מספר 52. התחברות מחדש אמורה לתקן זאת."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"שגיאה 1013: שם המשתמש שהזנת אינו חוקי. בדרך-כלל זה בגלל שהזנת את כתובת "
+"האימייל שלך במקום את שם המשתמש שלך ב-Yahoo!."

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -8863,10 +9453,14 @@
 msgid "Yahoo! Profile"
 msgstr "פרופיל Yahoo!"

-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
 msgstr "סליחה, אך פרופילים המסומנים כמכילים מידע למבוגרים בלבד לא נתמכים כרגע."

-msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
 msgstr "אם ברצונך לראות פרופיל זה, יש להשתמש בקישור הזה בדפדפן האינטרנט שלך:"

 msgid "Yahoo! ID"
@@ -8893,14 +9487,25 @@
 msgid "Last Update"
 msgstr "עודכן לאחרונה"

-msgid "This profile is in a language or format that is not supported at this time."
+msgid ""
+"This profile is in a language or format that is not supported at this time."
 msgstr "פרופיל זה אינו בשפה או פורמט אשר אינם נתמכים כרגע."

-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
-msgstr "לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זוהי תקלה זמנית בשרת. יש לנסות שנית מאוחר יותר."
-
-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 "לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זה אומר שהמשתמש לא קיים; ברם, לעיתים Yahoo! לא מצליח למצוא פרופיל משתמש. אם את/ה בטוח/ה שהמשתמש קיים, נס/י שנית מאוחר יותר."
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זוהי תקלה זמנית בשרת. יש לנסות "
+"שנית מאוחר יותר."
+
+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 ""
+"לא ניתן לשלוף את פרופיל המשתמש. ככל הנראה זה אומר שהמשתמש לא קיים; ברם, "
+"לעיתים Yahoo! לא מצליח למצוא פרופיל משתמש. אם את/ה בטוח/ה שהמשתמש קיים, נס/י "
+"שנית מאוחר יותר."

 msgid "The user's profile is empty."
 msgstr "פרופיל המשתמש ריק."
@@ -8924,8 +9529,12 @@
 msgid "Not available"
 msgstr "לא זמין"

-msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
-msgstr "שגיאה לא מוכרת. עליך להתנתק ולחכות כחמש דקות לפני שיהיה אפשר להצטרף שוב לחדר צ'אט"
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"שגיאה לא מוכרת. עליך להתנתק ולחכות כחמש דקות לפני שיהיה אפשר להצטרף שוב לחדר "
+"צ'אט"

 #, c-format
 msgid "You are now chatting in %s."
@@ -8958,7 +9567,9 @@
 msgid "Connection problem with the YCHT server"
 msgstr "שגיאה עם החיבור אל שרת ה-YCHT."

-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
 msgstr "(הייתה שגיאה בהמרת ההודעה.\t בדוק את הגדרות ה'קידוד' בעורך החשבונות)"

 #, c-format
@@ -9006,17 +9617,29 @@
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr "sub &lt;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: הצטרף לצ'אט חדש"

-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr "zi &lt;ישות&gt;: שלח הודעה ל-&lt;הודעה, <i>ישות</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;מחלקה&gt; &lt;ישות&gt;: שלח הודעה ל-&lt;<i>מחלקה</i>,<i>ישות</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;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,<i>ישות</i>,<i>נמען</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;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;הודעה,<i>ישות</i>,<i>נמען</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;מחלקה&gt; &lt;ישות&gt;: שלח הודעה ל-&lt;<i>מחלקה</i>,<i>ישות</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;מחלקה&gt; &lt;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,"
+"<i>ישות</i>,<i>נמען</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;ישות&gt; &lt;נמען&gt;: שלח הודעה אל &lt;הודעה,<i>ישות</i>,<i>נמען</"
+"i>&gt;"

 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;מחלקה&gt;: שלח הודעה אל &lt;<i>מחלקה</i>,אישי,*&gt;"
@@ -9262,8 +9885,12 @@
 msgstr "שגיאה בקריאה מתוך %s: אורך המשוב ארוך מדי (מוגבל עד %d בייט)"

 #, c-format
-msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
-msgstr "לא ניתן להקצות מספיק זיכרון להחזיק את התוכן מ-%s.  שרת האתר אולי מנסה לעשות משהו מזיק."
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"לא ניתן להקצות מספיק זיכרון להחזיק את התוכן מ-%s.  שרת האתר אולי מנסה לעשות "
+"משהו מזיק."

 #, c-format
 msgid "Error reading from %s: %s"
@@ -9315,8 +9942,11 @@
 msgstr "שגיאה בקריאת %s"

 #, 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 "חלה שגיאה בעת קריאת ה-%s שלך. הקובץ לא נטען, ושם ההובץ הישן שונה ל-%s~."
+msgid ""
+"An error was encountered reading your %s.  The file has not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+"חלה שגיאה בעת קריאת ה-%s שלך. הקובץ לא נטען, ושם ההובץ הישן שונה ל-%s~."

 msgid "Internet Messenger"
 msgstr "למסרים באינטרנט"
@@ -9436,24 +10066,154 @@
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the <b>Add...</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add...</b> again to configure them all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Manage Accounts</b> in the Buddy List window"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add...</b> button below and configure your first account. If you want %s "
+"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
+"them all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>ברוכים הבאים אל%s!</span>\n"
 "\n"
-"אין ברשותך שם חשבונות מוגדרים. על מנת להתחבר עם %s יש ללחוץ על הכפתור <b>הוסף...</b> שלהלן להגדיר את חשבונך הראשון. אם ברצונך ש-%s יתחבר לכמה חשבונות, יש ללחוץ על <b>הוסף...</b> שוב על מנת להגדיר את כולם.\n"
-"\n"
-"ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי <b>חשבונות->נהל חשבונות</b> שבחלון רשימת החברים"
+"אין ברשותך שם חשבונות מוגדרים. על מנת להתחבר עם %s יש ללחוץ על הכפתור "
+"<b>הוסף...</b> שלהלן להגדיר את חשבונך הראשון. אם ברצונך ש-%s יתחבר לכמה "
+"חשבונות, יש ללחוץ על <b>הוסף...</b> שוב על מנת להגדיר את כולם.\n"
+"\n"
+"ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי "
+"<b>חשבונות->נהל חשבונות</b> שבחלון רשימת החברים"
+
+#. Buddy List
+msgid "Background Color"
+msgstr "צבע הרקע"
+
+msgid "The background color for the buddy list"
+msgstr "צבע הרקע עבור רשימת החברים"
+
+msgid "Layout"
+msgstr "מתווה"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "מיקומי הסמלים, השמות והמצבים ברשימת החברים"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "צבע רקע עבור מורחב"
+
+msgid "The background color of an expanded group"
+msgstr "צבע-הרקע של קבוצה שהורחבה"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "טקסט מורחב"
+
+msgid "The text information for when a group is expanded"
+msgstr "טקסט למידע כשקבוצה מורחבת"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "צבע רקע עבור עבור מקופל"
+
+msgid "The background color of a collapsed group"
+msgstr "צבע-הרקע של קבוצה שצומצמה"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "טקסט מקופל"
+
+msgid "The text information for when a group is collapsed"
+msgstr "טקסט למידע כשקבוצה מצומצמת"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "צבע רקע עבור צ'אט/איש-קשר"
+
+msgid "The background color of a contact or chat"
+msgstr "צבע-הרקע של איש-קשר או צ'אט"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "טקסט איש-קשר"
+
+msgid "The text information for when a contact is expanded"
+msgstr "טקסט למידע כשאיש-קשר מורחב"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "טקסט כשמחובר"
+
+msgid "The text information for when a buddy is online"
+msgstr "טקסט למידע כשאיש-קשר מחובר"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "טקסט כשרחוק מהמחשב"
+
+msgid "The text information for when a buddy is away"
+msgstr "טקסט למידע כשאיש-קשר מרוחק מהמחשב"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "טקסט כשמנותק"
+
+msgid "The text information for when a buddy is offline"
+msgstr "טקסט למידע כשחבר אינו מחובר."
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "טקסט כשחסר-פעילות"
+
+msgid "The text information for when a buddy is idle"
+msgstr "טקסט למידע כשאיש-קשר חסר-פעילות"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "טקסט הודעת"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "טקסט למידע כשלאיש-קשר יש הודעות שלא נקראו"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "טקסט הודעות (מישהו אמר)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr "טקסט להציג כשצ'אט מכיל הודעה שלא נקראה שמזכירה את הכינוי שלך"
+
+msgid "The text information for a buddy's status"
+msgstr "הטקסט עבור מצבו של חבר"

 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "יש לך %d איש-קשר בשם %s. האם ברצונך למזג אותך?"
 msgstr[1] "יש לך כעת %d אנשי-קשר בשם %s. האם ברצונך למזג אותך?"

-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 "מיזוג אנשי-קשר אלה יגרום להם להיות תחת פריט יחיד ברשימת אנשי הקשר, ולהשתמש בחלון שיחה יחיד. ניתן להפריד אותם אח\"כ על ידי בחירת 'הרחב' מהתפריט עבור איש הקשר"
+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 ""
+"מיזוג אנשי-קשר אלה יגרום להם להיות תחת פריט יחיד ברשימת אנשי הקשר, ולהשתמש "
+"בחלון שיחה יחיד. ניתן להפריד אותם אח\"כ על ידי בחירת 'הרחב' מהתפריט עבור איש "
+"הקשר"

 msgid "Please update the necessary fields."
 msgstr "יש לעדכן את השדות הנחוצים."
@@ -9461,7 +10221,9 @@
 msgid "A_ccount"
 msgstr "ח_שבון"

-msgid "Please enter the appropriate information about the chat you would like to join.\n"
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
 msgstr "יש להזין את המידע המתאים על הצ'אט שברצונך להצטרף אליו.\n"

 msgid "Room _List"
@@ -9552,7 +10314,8 @@
 msgid "/Tools/Mute Sounds"
 msgstr "/כלים/השתק צלילים"

-msgid "You are not currently signed on with an account that can add that buddy."
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr "אינך מחובר/ת כרגע עם החשבון שמסוגל להוסיף איש קשר זה."

 #. I don't believe this can happen currently, I think
@@ -9781,7 +10544,8 @@

 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
-msgid_plural "%d accounts were disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
 msgstr[0] "חשבון %d סומן כלא-פעיל כי התחברת ממיקום נוסף:"
 msgstr[1] "%d חשבונות סומנו כלא-פעילים כי התחברת ממיקום נוסף:"

@@ -9802,11 +10566,15 @@
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>ברוכים הבאים ל-%s!</span>\n"
 "\n"
-"אין ברשותך חשבונות מופעלים. ניתן להפעיל את החשבונות שלך מתוך חלון <b>חשבונות</b> דרך <b>חשבונות->נהל</b>. ברגע שיהיו חשבונות פעילים, תהיה לך אפשרות להתחבר, לקבוע את המצב שלך, ולדבר עם חבריך."
+"אין ברשותך חשבונות מופעלים. ניתן להפעיל את החשבונות שלך מתוך חלון "
+"<b>חשבונות</b> דרך <b>חשבונות->נהל</b>. ברגע שיהיו חשבונות פעילים, תהיה לך "
+"אפשרות להתחבר, לקבוע את המצב שלך, ולדבר עם חבריך."

 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -9841,11 +10609,16 @@
 msgid "This protocol does not support chat rooms."
 msgstr "פרוטוקול זה אינו תומך בחדרי צ'אט"

-msgid "You are not currently signed on with any protocols that have the ability to chat."
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
 msgstr "אינך מחובר/ת בפרוטוקול כלשהו המאפשר שימוש בצ'אט."

-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr "יש להזין שם נוסף, ומידע מתאים על הצ'אט שברצונך להוסיף לרשימת אנשי הקשר שלך.\n"
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"יש להזין שם נוסף, ומידע מתאים על הצ'אט שברצונך להוסיף לרשימת אנשי הקשר שלך.\n"

 msgid "A_lias:"
 msgstr "שם:"
@@ -9853,8 +10626,8 @@
 msgid "_Group:"
 msgstr "_קבוצה:"

-msgid "Auto_join when account becomes online."
-msgstr "הצטרפות אוטומטית כאשר החשבון נעשה מקוון."
+msgid "Auto_join when account connects."
+msgstr "הצט_רף אוטומטית כשהחשבון נעשה מקוון."

 msgid "_Remain in chat after window is closed."
 msgstr "הש_אר בצ'אט אחרי שהחלון נסגר."
@@ -9886,96 +10659,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/אנשי קשר/מיין אנשי-קשר"

-#. Buddy List
-msgid "Background Color"
-msgstr "צבע הרקע"
-
-msgid "The background color for the buddy list"
-msgstr "צבע הרקע עבור רשימת החברים"
-
-msgid "Layout"
-msgstr "מתווה"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "מיקומי הסמלים, השמות והמצבים ברשימת אנשי-הקשר"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "צבע רקע עבור מורחב"
-
-msgid "The background color of an expanded group"
-msgstr "צבע-הרקע של קבוצה שהורחבה"
-
-msgid "Expanded Text"
-msgstr "טקסט מורחב"
-
-msgid "The text information for when a group is expanded"
-msgstr "טקסט למידע כשקבוצה מורחבת"
-
-msgid "Collapsed Background Color"
-msgstr "צבע רקע עבור עבור מקופל"
-
-msgid "The background color of a collapsed group"
-msgstr "צבע-הרקע של קבוצה שצומצמה"
-
-msgid "Collapsed Text"
-msgstr "טקסט מקופל"
-
-msgid "The text information for when a group is collapsed"
-msgstr "טקסט למידע כשקבוצה מצומצמת"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "צבע רקע עבור צ'אט/איש-קשר"
-
-msgid "The background color of a contact or chat"
-msgstr "צבע-הרקע של איש-קשר או צ'אט"
-
-msgid "Contact Text"
-msgstr "טקסט איש-קשר"
-
-msgid "The text information for when a contact is expanded"
-msgstr "טקסט למידע כשאיש-קשר מורחב"
-
-msgid "On-line Text"
-msgstr "טקסט כשמחובר"
-
-msgid "The text information for when a buddy is online"
-msgstr "טקסט למידע כשאיש-קשר מחובר"
-
-msgid "Away Text"
-msgstr "טקסט כשרחוק מהמחשב"
-
-msgid "The text information for when a buddy is away"
-msgstr "טקסט למידע כשאיש-קשר מרוחק מהמחשב"
-
-msgid "Off-line Text"
-msgstr "טקסט כשמנותק"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "טקסט למידע כשאיש-קשר מנותק"
-
-msgid "Idle Text"
-msgstr "טקסט כשחסר-פעילות"
-
-msgid "The text information for when a buddy is idle"
-msgstr "טקסט למידע כשאיש-קשר חסר-פעילות"
-
-msgid "Message Text"
-msgstr "טקסט הודעת"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "טקסט למידע כשלאיש-קשר יש הודעות שלא נקראו"
-
-msgid "Message (Nick Said) Text"
-msgstr "טקסט הודעות (מישהו אמר)"
-
-msgid "The text information for when a chat has an unread message that mentions your nick"
-msgstr "טקסט להציג כשצ'אט מכיל הודעה שלא-נקראה שמזכירה את הכינוי שלך"
-
-msgid "The text information for a buddy's status"
-msgstr "הטקסט עבור מצבו של חבר"
-
 msgid "Type the host name for this certificate."
 msgstr "יש להקליד את שם השרת שעבורו נועדה תעודה זו"

@@ -9989,7 +10672,8 @@
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "איש קשר זה אינו באותו פרוטוקול של צ'אט זה"

-msgid "You are not currently signed on with an account that can invite that buddy."
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
 msgstr "אינך מחובר/ת בחשבון שיכול להזמין את איש הקשר הזה."

 msgid "Invite Buddy Into Chat Room"
@@ -10057,6 +10741,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/שיחה/הוד_עה חדשה..."

+msgid "/Conversation/Join a _Chat..."
+msgstr "/שיחה/ה_צטרף לשיחה..."
+
 msgid "/Conversation/_Find..."
 msgstr "/שיחה/_חפש..."

@@ -10438,8 +11125,8 @@
 msgid "Estonian"
 msgstr "אסטונית"

-msgid "Euskera(Basque)"
-msgstr "אאוסקרה(בסקית)"
+msgid "Basque"
+msgstr "בסקית"

 msgid "Persian"
 msgstr "פרסית"
@@ -10611,19 +11298,52 @@
 msgstr "אודות %s"

 #, c-format
-msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr "%s הינה תוכנת שליחת הודעות מיידיות גרפית מודולרית מבוססת libpurple אשר לבצע חיבורים אל AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, QQ ובכולם בו- זמנית. התוכנה נכתבה בעזרת GTK+.<BR><BR>מותר לערוך שינויים ולהפיץ את התוכנה תחת הנחיות רישיון הGPL (גרסא 2 והלאה). יותר). העתק של ה-GPL מוכל בתוך הקובץ 'COPYING' המופץ עם %s. %s היא תחת זכויות המפתחים והתורמים לפיתוח. ראה את הקובץ 'COPYRIGHT' לרשימה מלאה של התורמים. איננו מספקים שום אחריות לתוכנה זו.<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\">שו\"ת:</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 "<FONT SIZE=\"4\">עזרה דרך האימייל:</FONT> <A HREF=\"mailto:support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
-
-#, c-format
-msgid "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+"%s הינה תוכנת שליחת הודעות מיידיות גרפית מודולרית מבוססת libpurple אשר לבצע "
+"חיבורים אל AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel "
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, QQ ובכולם "
+"בו- זמנית. התוכנה נכתבה בעזרת GTK+.<BR><BR>מותר לערוך שינויים ולהפיץ את "
+"התוכנה תחת הנחיות רישיון הGPL (גרסא 2 והלאה). יותר). העתק של ה-GPL מוכל בתוך "
+"הקובץ 'COPYING' המופץ עם %s. %s היא תחת זכויות המפתחים והתורמים לפיתוח. ראה "
+"את הקובץ 'COPYRIGHT' לרשימה מלאה של התורמים. איננו מספקים שום אחריות לתוכנה "
+"זו.<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\">שו\"ת:</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 from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">עזרה ממשתמשי פידג'ין אחרים:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>זוהי רשימת תפוצה<b>פומבית</b>! "
+"(<a href=\"http://pidgin.im/pipermail/support/\">ארכיון</a>)<br/>אנחנו לא "
+"מסוגלים לעזור עם תוספים מצד-שלישי!<br/>השפה השולטת בה היא <b>אנגלית</b>.  "
+"מותר לשלוח הודעות גם בשפות אחרות, אבל ייתכן והתגובות יעזרו לך פחות.<br/><br/>"
+
+#, c-format
+msgid ""
+"<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">ערוץ IRC:</FONT> #pidgin על irc.freenode.net<BR><BR>"

 #, c-format
@@ -10660,7 +11380,9 @@
 msgid "Get User Info"
 msgstr "מידע כללי על המשתמש"

-msgid "Please enter the username or alias of the person whose info you would like to view."
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
 msgstr "יש להזין את שם המשתמש או הכינוי של האדם עליו תרצו לקרוא מידע."

 msgid "View User Log"
@@ -10686,10 +11408,18 @@
 msgstr "הזן שם נוסף לשיחה זו."

 #, c-format
-msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
-msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
-msgstr[0] "האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d איש קשר אחר בתוכו מתוך רשימת אנשי הקשר שלך?"
-msgstr[1] "האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d אנשי קשר אחרים בתוכו מתוך רשימת אנשי הקשר שלך?"
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d איש קשר אחר בתוכו "
+"מתוך רשימת אנשי הקשר שלך?"
+msgstr[1] ""
+"האם ברצונך להמשיך ולהסיר את איש הקשר המכיל את %s ועוד %d אנשי קשר אחרים "
+"בתוכו מתוך רשימת אנשי הקשר שלך?"

 msgid "Remove Contact"
 msgstr "הסר איש קשר"
@@ -10698,7 +11428,9 @@
 msgstr "ה_סר איש קשר"

 #, c-format
-msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
 msgstr "האם הנך בטוח/ה שברצונך לאחד את הקבוצה %s לתוך הקבוצה %s?"

 msgid "Merge Groups"
@@ -10708,7 +11440,9 @@
 msgstr "מזג קבוצות"

 #, c-format
-msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את הקבוצה %s וכל חבריה מרשימת אנשי הקשר שלך?"

 msgid "Remove Group"
@@ -10718,7 +11452,8 @@
 msgstr "הסר _קבוצה"

 #, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את %s מרשימת אנשי הקשר שלך?"

 msgid "Remove Buddy"
@@ -10728,7 +11463,9 @@
 msgstr "הסר איש קשר"

 #, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
 msgstr "האם ברצונך להמשיך ולהסיר את הצ'אט %s מרשימת אנשי הקשר שלך?"

 msgid "Remove Chat"
@@ -10968,7 +11705,9 @@
 msgid "_Description"
 msgstr "_תיאור"

-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
 msgstr "יש להזין כתובת ותיאור עבור הקישור ברצונך להכניס. לא חובה להזין תיאור."

 msgid "Please enter the URL of the link that you want to insert."
@@ -11098,15 +11837,21 @@
 msgstr "יש לבדוק הרשאות ולנסות בשנית."

 #, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation with %s which started at %s?"
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
 msgstr "האם ברצונך למחוק את רישום השיחה עם %s שהתחלת ב- %s?"

 #, c-format
-msgid "Are you sure you want to permanently delete the log of the conversation in %s which started at %s?"
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
 msgstr "האם ברצונך למחוק את רישום השיחה ב- %s שהתחיל ב- %s?"

 #, c-format
-msgid "Are you sure you want to permanently delete the system log which started at %s?"
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
 msgstr "האם ברצונך למחוק את רישום יומן המערכת שהחל ב- %s?"

 msgid "Delete Log?"
@@ -11133,64 +11878,45 @@

 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"שימוש: %s [אפשרות]...\n"
-"\n"
-"  -c, --config=ספריה  השתמש בספרייה לקבצי הגדרות\n"
-"  -d, --debug         שלח הודעות ניפוי באגים ל-stdout\n"
-"  -f, --force-online  אלץ מצב מקוון, בלי להתחשב במצב הרשת\n"
-"  -h, --help          הצג הודעה זו וצא\n"
-"  -m, --multiple      אל תוודא שרק עותק אחד רץ\n"
-"  -n, --nologin       אל תתחבר אוטומטית\n"
-"  -l, --login[=שמות]  היכנס אוטומטית )אפשרות לתת שמות חשבונות לחבר,\n"
-"                      ובין כל שם צריך להיות פסיק)\n"
-"  --display=DISPLAY   מספר התצוגה להשתמש בו בחלונות X\n"
-"  -v, --version       הצג את הגירסאשל התוכנה וצא\n"
-
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"שימוש: %s [אפשרות]...\n"
-"\n"
-"  -c, --config=ספריה  השתמש בספרייה לקבצי הגדרות\n"
-"  -d, --debug         שלח הודעות ניפוי באגים ל-stdout\n"
-"  -f, --force-online  אלץ מצב מקוון, בלי להתחשב במצב הרשת\n"
-"  -h, --help          הצג הודעה זו וצא\n"
-"  -m, --multiple      אל תוודא שרק עותק אחד רץ\n"
-"  -n, --nologin       אל תתחבר אוטומטית\n"
-"  -l, --login[=שמות]  היכנס אוטומטית )אפשרות לתת שמות חשבונות לחבר,\n"
-"                      ובין כל שם צריך להיות פסיק)\n"
-"  --display=DISPLAY   מספר התצוגה להשתמש בו בחלונות X\n"
-"  -v, --version       הצג את הגרסה של התוכנה וצא\n"
+msgstr ""
+"שימוש: %s [הגדרה]...\n"
+"\n"
+
+msgid "use DIR for config files"
+msgstr "השתמש בספרייה DIR לקבצי הגדרות"
+
+msgid "print debugging messages to stdout"
+msgstr "הדפס הודעות איתור-באגים ל-stdout"
+
+msgid "force online, regardless of network status"
+msgstr "אלץ התחברות, ללא התחשבות במצב הרשת"
+
+msgid "display this help and exit"
+msgstr "הצג את מסך עזרה זה, וצא"
+
+msgid "allow multiple instances"
+msgstr "אפשר להפעיל יותר מעותק יחיד"
+
+msgid "don't automatically login"
+msgstr "אל תתחבר אוטומטית"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"אפשר חשבונות (פרמטר של שם החשבון\n"
+"                      מגדיר איזה חשבונות להשתמש בהם, מופרדים על ידי פסיקים."
+
+msgid "Without this only the first account will be enabled)."
+msgstr "בלי זה רק החשבון הראשון יהיה פעיל)."
+
+msgid "X display to use"
+msgstr "תצוגת X להשתמש בה"
+
+msgid "display the current version and exit"
+msgstr "הצג אצ הגירסא הנוכחית וצא"

 #, c-format
 msgid ""
@@ -11214,7 +11940,8 @@
 "על ידי דיווח באג באתר:\n"
 "%ssimpleticket/\n"
 "\n"
-"יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ core.\n"
+"יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ "
+"core.\n"
 "אם אינך יודע/ת להוציא את ה-backtrace, אנא קרא את ההוראות ב:\n"
 "%swiki/GetABacktrace\n"

@@ -11233,9 +11960,6 @@
 msgid "/Media/_Hangup"
 msgstr "/מדיה/_ניתוק"

-msgid "Calling..."
-msgstr "מתקשר..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "נתקבלה בקשה מאת %s להתחיל התקשרות קול/וידאו איתך."
@@ -11273,7 +11997,8 @@
 msgid "Error launching \"%s\": %s"
 msgstr "שגיאה בהפעלת הפקודה \"%s\": %s"

-msgid "The 'Manual' browser command has been chosen, but no command has been set."
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "נבחרה לביצוע הפקודה 'הידנית' של הדפדפן, אבל לא נקבעה הוראה לביצוע."

 msgid "No message"
@@ -11306,7 +12031,9 @@
 msgid "Could not unload plugin"
 msgstr "לא ניתן להפסיק את פעולת התוסף"

-msgid "The plugin could not be unloaded now, but will be disabled at the next startup."
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
 msgstr "לא ניתן לכבות את התוסף כרגע, אבל הוא יכובה בהפעלה הבאה של התוכנה."

 #, c-format
@@ -11470,8 +12197,12 @@
 msgid "Install Theme"
 msgstr "התקן עיצוב"

-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 "בחר ערכת החיוכים מרשימה למטה. ערכות חדשות ניתן להתקין ע\"י גרירתם על רשימת הערכות."
+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 ""
+"בחר ערכת החיוכים מרשימה למטה. ערכות חדשות ניתן להתקין ע\"י גרירתם על רשימת "
+"הערכות."

 msgid "Icon"
 msgstr "סמל"
@@ -11584,8 +12315,12 @@
 msgid "Default Formatting"
 msgstr "פורמט ברירת המחדל"

-msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
-msgstr "ככה ייראה הטקסט של הודעות יוצאות כאשר תשתמש/י בפרוטוקולים שתומכים בפירמוט טקסט."
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+"ככה ייראה הטקסט של הודעות יוצאות כאשר תשתמש/י בפרוטוקולים שתומכים בפירמוט "
+"טקסט."

 msgid "Cannot start proxy configuration program."
 msgstr "לא יכול להפעיל את תוכנת הגדרת שרת התיווך."
@@ -11966,7 +12701,8 @@
 msgstr "מצב עבור %s"

 #, c-format
-msgid "A custom smiley for '%s' already exists.  Please use a different shortcut."
+msgid ""
+"A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr "כבר קיים חייכן משלך עבור '%s'. יש לנסות קיצור-דרך אחר."

 msgid "Custom Smiley"
@@ -12033,14 +12769,20 @@
 msgstr "לא ניתן לשלוח את הספריה %s."

 #, c-format
-msgid "%s cannot transfer a folder. You will need to send the files within individually."
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
 msgstr "%s לא יכול להעביר ספריה. תיאלצ/י לשלוח את הקבצים בתוך הספריה אחד-אחד."

 msgid "You have dragged an image"
 msgstr "גררת תמונה"

-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 "ניתן לשלוח תמונה זו כקובץ מועבר, לשים אותה בהודעה זו, או להשתמש בה בתור סמל עבור איש הקשר הזה."
+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 ""
+"ניתן לשלוח תמונה זו כקובץ מועבר, לשים אותה בהודעה זו, או להשתמש בה בתור סמל "
+"עבור איש הקשר הזה."

 msgid "Set as buddy icon"
 msgstr "קבע להיות סמל איש הקשר"
@@ -12054,10 +12796,14 @@
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "האם ברצונך לקבוע את זה להיות הסמל של איש קשר זה?"

-msgid "You can send this image as a file transfer, or use it as the buddy icon for this user."
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
 msgstr "ניתן לשלוח תמונה זו כקובץ מועבר, או להשתמש בה בתור סמל עבור משתמש זה."

-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
 msgstr "ניתן להכניס תמונה זו לתוך ההודעה, או להשתמש בה כסמל איש הקשר הזה."

 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
@@ -12068,8 +12814,12 @@
 msgid "Cannot send launcher"
 msgstr "לא ניתן לשלוח את קובץ המפעיל"

-msgid "You dragged a desktop launcher. Most likely you wanted to send the target of this launcher instead of this launcher itself."
-msgstr "גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל מצביע עליו, ולא את המפעיל עצמו."
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send the target of "
+"this launcher instead of this launcher itself."
+msgstr ""
+"גררת קובץ מפעיל של שולחן העבודה. קרוב לודאי שרצית לשלוח את מה שהמפעיל מצביע "
+"עליו, ולא את המפעיל עצמו."

 #, c-format
 msgid ""
@@ -12096,7 +12846,8 @@
 msgstr "כישלון בעת פתיחת הקובץ '%s': %s"

 #, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr "כישלון בעת טעינת התמונה '%s': סיבה לא ידועה, כנראה קובץ תמונה פגום"

 msgid "_Open Link"
@@ -12210,6 +12961,97 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "מציג מידע סטטיסטי על זמינות אנשי-הקשר שלך"

+msgid "Buddy is idle"
+msgstr "איש הקשר במנוחה"
+
+msgid "Buddy is away"
+msgstr "איש הקשר התרחק מהמחשב"
+
+msgid "Buddy is \"extended\" away"
+msgstr "איש הקשר התרחק מהמחשב לזמן ממושך"
+
+#. Not used yet.
+msgid "Buddy is mobile"
+msgstr "איש הקשר נייד"
+
+msgid "Buddy is offline"
+msgstr "איש הקשר איננו מחובר"
+
+msgid "Point values to use when..."
+msgstr "ערכי ניקוד שיש להשתמש בהם כאשר..."
+
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr "איש הקשר עם הניקוד <i>הגבוה</i> יהיה איש הקשר עם העדיפות.\n"
+
+msgid "Use last buddy when scores are equal"
+msgstr "השתמש באיש הקשר האחרון כשהניקוד שווה"
+
+msgid "Point values to use for account..."
+msgstr "ערכי הניקוד לשימוש עבור החשבון..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Priority"
+msgstr "שנה עדיפות"
+
+#. *< name
+#. *< version
+#. *< summary
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr "מאפשר שליטה על הערכים המיוחסים למצבים השונים של אנשי הקשר."
+
+#. *< description
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"מאפשר לשנות את ערכי הניקוד לחוסר פעילות/ריחוק/ניתוק אשר נעשה בו שימוש "
+"בחישובי הדירוג של אנשי הקשר."
+
+msgid "Conversation Colors"
+msgstr "צבעי שיחה"
+
+msgid "Customize colors in the conversation window"
+msgstr "התאם אישית את הצבעים בחלון השיחה"
+
+# prev line added per "msgfmt" recommendation
+msgid "Error Messages"
+msgstr "הודעות שגיאה"
+
+msgid "Highlighted Messages"
+msgstr "הודעות מסומנות"
+
+msgid "System Messages"
+msgstr "הודעות מערכת"
+
+msgid "Sent Messages"
+msgstr "הודעות שנשלחו"
+
+msgid "Received Messages"
+msgstr "הודעות שהתקבלו"
+
+#, c-format
+msgid "Select Color for %s"
+msgstr "בחירת צבע עבור %s"
+
+msgid "Ignore incoming format"
+msgstr "התעלם מהעיצוב הנכנס"
+
+msgid "Apply in Chats"
+msgstr "הפעל בצ'אטים"
+
+msgid "Apply in IMs"
+msgstr "הפעל בהודעות מיידיות"
+
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
 msgid "Server name request"
 msgstr "בקשת שם שרת"

@@ -12263,90 +13105,11 @@
 msgid "Allows browsing and registering services."
 msgstr "מאפשר רישום ועיון ברשימת השירותים"

-msgid "This plugin is useful for registering with legacy transports or other XMPP services."
-msgstr "תוסף זה שימושי לטובת רישום עם פרוטוקולי תקשורת ישנים או שירותי XMPP אחרים."
-
-msgid "Buddy is idle"
-msgstr "איש הקשר במנוחה"
-
-msgid "Buddy is away"
-msgstr "איש הקשר התרחק מהמחשב"
-
-msgid "Buddy is \"extended\" away"
-msgstr "איש הקשר התרחק מהמחשב לזמן ממושך"
-
-#. Not used yet.
-msgid "Buddy is mobile"
-msgstr "איש הקשר נייד"
-
-msgid "Buddy is offline"
-msgstr "איש הקשר איננו מחובר"
-
-msgid "Point values to use when..."
-msgstr "ערכי ניקוד שיש להשתמש בהם כאשר..."
-
-msgid "The buddy with the <i>largest score</i> is the buddy who will have priority in the contact.\n"
-msgstr "איש הקשר עם הניקוד <i>הגבוה</i> יהיה איש הקשר עם העדיפות.\n"
-
-msgid "Use last buddy when scores are equal"
-msgstr "השתמש באיש הקשר האחרון כשהניקוד שווה"
-
-msgid "Point values to use for account..."
-msgstr "ערכי הניקוד לשימוש עבור החשבון..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-msgid "Contact Priority"
-msgstr "שנה עדיפות"
-
-#. *< name
-#. *< version
-#. *< summary
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "מאפשר שליטה על הערכים המיוחסים למצבים השונים של אנשי הקשר."
-
-#. *< description
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "מאפשר לשנות את ערכי הניקוד לחוסר פעילות/ריחוק/ניתוק אשר נעשה בו שימוש בחישובי הדירוג של אנשי הקשר."
-
-msgid "Conversation Colors"
-msgstr "צבעי שיחה"
-
-msgid "Customize colors in the conversation window"
-msgstr "התאם אישית את הצבעים בחלון השיחה"
-
-# prev line added per "msgfmt" recommendation
-msgid "Error Messages"
-msgstr "הודעות שגיאה"
-
-msgid "Highlighted Messages"
-msgstr "הודעות מסומנות"
-
-msgid "System Messages"
-msgstr "הודעות מערכת"
-
-msgid "Sent Messages"
-msgstr "הודעות שנשלחו"
-
-msgid "Received Messages"
-msgstr "הודעות שהתקבלו"
-
-#, c-format
-msgid "Select Color for %s"
-msgstr "בחירת צבע עבור %s"
-
-msgid "Ignore incoming format"
-msgstr "התעלם מהעיצוב הנכנס"
-
-msgid "Apply in Chats"
-msgstr "הפעל בצ'אטים"
-
-msgid "Apply in IMs"
-msgstr "הפעל בהודעות מיידיות"
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"תוסף זה שימושי לטובת רישום עם פרוטוקולי תקשורת ישנים או שירותי XMPP אחרים."

 msgid "By conversation count"
 msgstr "עפ\"י מספר השיחות"
@@ -12355,8 +13118,11 @@
 msgstr "מיקום חלון שיחה"

 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
-msgstr "הערה: ההעדפה עבור \"שיחות חדשות\" חייבת להקבע להיות \"על פי מספר השיחות\"."
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"הערה: ההעדפה עבור \"שיחות חדשות\" חייבת להקבע להיות \"על פי מספר השיחות\"."

 msgid "Number of conversations per window"
 msgstr "מספר שיחות בכל חלון"
@@ -12380,7 +13146,9 @@

 #. *< summary
 #. *  description
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
 msgstr "הגבל את מספר השיחות בכל חלון-שיחה, עם אפשרות להפריד בין הודעות לצ'אטים"

 #. Configuration frame
@@ -12414,12 +13182,14 @@

 #. *  description
 msgid ""
-"Allows support for mouse gestures in conversation windows. Drag the middle mouse button to perform certain actions:\n"
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
 " • Drag down and then to the right to close a conversation.\n"
 " • Drag up and then to the left to switch to the previous conversation.\n"
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"מאפשר תמיכה בפעולות עכבר בחלונות שיחה. גרור/י עם הכפתור האמצעי כדי לבצע פעולות מסוימות:\n"
+"מאפשר תמיכה בפעולות עכבר בחלונות שיחה. גרור/י עם הכפתור האמצעי כדי לבצע "
+"פעולות מסוימות:\n"
 " • גרור/י מטה ואז לימין לסגור חלון.\n"
 " • גרור/י מעלה ואז שמאלה לעבור לשיחה הקודמת.\n"
 " • גרור/י מעלה ואז ימינה לעבור לשיחה הבאה."
@@ -12443,8 +13213,12 @@
 msgstr "בחר איש קשר"

 #. Add the label.
-msgid "Select a person from your address book to add this buddy to, or create a new person."
-msgstr "יש לבחור משתמש מרשימת הכתובות שלך כדי להוסיף אליו את איש הקשר הזה, או ליצור חדש"
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"יש לבחור משתמש מרשימת הכתובות שלך כדי להוסיף אליו את איש הקשר הזה, או ליצור "
+"חדש"

 #. Add the expander
 msgid "User _details"
@@ -12585,7 +13359,9 @@
 msgid "C_hat windows"
 msgstr "חלונות _שיחה"

-msgid "A music messaging session has been requested. Please click the MM icon to accept."
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
 msgstr "התקבלה בקשה לשיחת מוזיקה. נא ללחוץ על כפתור ה-MM להסכים."

 msgid "Music messaging session confirmed."
@@ -12625,8 +13401,12 @@
 msgstr "תוסף להודעות מוזיקה להלחנה משותפת."

 #. *  summary
-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 "התוסף להודעות מוזיקה מאפשר למספר משתמשים לעבוד יחד על יצירה מוזיקלית על ידי עריכה של לחן משותף בזמן אמת."
+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 ""
+"התוסף להודעות מוזיקה מאפשר למספר משתמשים לעבוד יחד על יצירה מוזיקלית על ידי "
+"עריכה של לחן משותף בזמן אמת."

 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -12813,8 +13593,12 @@
 msgid "Lets you send raw input to text-based protocols."
 msgstr "מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט."

-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 "מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט (XMPP, MSN, IRC, TOC).לחץ 'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."
+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 ""
+"מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט (XMPP, MSN, IRC, TOC).לחץ "
+"'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."

 #, c-format
 msgid "You can upgrade to %s %s today."
@@ -12845,8 +13629,11 @@
 msgstr "בודק מדי-פעם אם יצאו גרסאות חדשות."

 #. *  description
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "בודק מדי פעם אם יצאו גרסאות חדשות ומודיע למשתמש, בצירוף רשימת השינויים."
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"בודק מדי פעם אם יצאו גרסאות חדשות ומודיע למשתמש, בצירוף רשימת השינויים."

 #. *< major version
 #. *< minor version
@@ -12865,8 +13652,12 @@
 msgstr "כפתור שליחה בחלון שיחה."

 #. *< summary
-msgid "Adds a Send button to the entry area of the conversation window. Intended for use when no physical keyboard is present."
-msgstr "מוסיף כפתור שליחה לאיזור הקלט של חלון השיחה. נועד לתרחיש שאין בנמצא מקלדת פיזית."
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for use when no physical keyboard is present."
+msgstr ""
+"מוסיף כפתור שליחה לאיזור הקלט של חלון השיחה. נועד לתרחיש שאין בנמצא מקלדת "
+"פיזית."

 msgid "Duplicate Correction"
 msgstr "כפילות בתיקונים"
@@ -13085,9 +13876,56 @@
 msgstr "מגדיר את פורמט חותמות-הזמן בהודעות."

 #. *  description
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
 msgstr "תוסף זה מאפשר למשתמש לקבוע אפשרויות שיחה וחותמות-זמן ליומני שיחה."

+msgid "Audio"
+msgstr "או_טומטי"
+
+msgid "Video"
+msgstr " ו_ידאו"
+
+msgid "Output"
+msgstr "פלט"
+
+msgid "_Plugin"
+msgstr "תוס_פים"
+
+msgid "_Device"
+msgstr "מכ_שיר"
+
+msgid "Input"
+msgstr "קלט"
+
+msgid "P_lugin"
+msgstr "ת_וספים"
+
+msgid "D_evice"
+msgstr "מ_כשיר"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "הגדרות קול/וידאו"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "קביעת הגדרות המיקרופון והמצלמה שלך."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "קביעת הגדרות מיקרופון ומצלמת-וידאו עבור שיחות קול ווידאו."
+
 msgid "Opacity:"
 msgstr "שקיפות:"

@@ -13134,7 +13972,8 @@

 #. *  description
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
@@ -13170,8 +14009,11 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "אפשרויות לפידג'ין היחודיות לחלונות."

-msgid "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr "מאפשר גישה לאפשרויות הייחודיות לפידג'ין בחלונות, כגון עגינה של רשימת אנשי הקשר."
+msgid ""
+"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgstr ""
+"מאפשר גישה לאפשרויות הייחודיות לפידג'ין בחלונות, כגון עגינה של רשימת אנשי "
+"הקשר."

 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>התנתק.</font>"
@@ -13210,220 +14052,414 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."

+#~ msgid "Calling ... "
+#~ msgstr "מתקשר ..."
+
+#~ msgid "Invalid certificate chain"
+#~ msgstr "שרשרת תעודות לא-תקפה"
+
+#~ msgid ""
+#~ "The certificate chain presented by %s does not have a valid digital "
+#~ "signature from the Certificate Authority from which it claims to have a "
+#~ "signature."
+#~ msgstr ""
+#~ "שרשרת התעודות שהוצגה על ידי %s לא מכילה חתימה תקפה מרשויות ההנפקה שמהם "
+#~ "היא טוענת שיש לה חתימה."
+
+#~ msgid "Invalid certificate authority signature"
+#~ msgstr "חתימת רשות הנפקות לא תקפה"
+
+#~ msgid "Join/Part Hiding Configuration"
+#~ msgstr "הגדרות הסתרת הצטרפות/עזיבה"
+
+#~ msgid "Minimum Room Size"
+#~ msgstr "גודל חדר מינימלי"
+
+#~ msgid "User Inactivity Timeout (in minutes)"
+#~ msgstr "חוסר פעילות משתמש (בדקות)"
+
+#~ msgid "Your account is locked, please log in to the Yahoo! website."
+#~ msgstr "חשבונך נעול, יש לגשת לאתר של Yahoo."
+
+#~ msgid "Euskera(Basque)"
+#~ msgstr "אאוסקרה(בסקית)"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">עזרה דרך האימייל:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  --display=DISPLAY   X display to use\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "שימוש: %s [אפשרות]...\n"
+#~ "\n"
+#~ "  -c, --config=ספריה  השתמש בספרייה לקבצי הגדרות\n"
+#~ "  -d, --debug         שלח הודעות ניפוי באגים ל-stdout\n"
+#~ "  -f, --force-online  אלץ מצב מקוון, בלי להתחשב במצב הרשת\n"
+#~ "  -h, --help          הצג הודעה זו וצא\n"
+#~ "  -m, --multiple      אל תוודא שרק עותק אחד רץ\n"
+#~ "  -n, --nologin       אל תתחבר אוטומטית\n"
+#~ "  -l, --login[=שמות]  היכנס אוטומטית )אפשרות לתת שמות חשבונות לחבר,\n"
+#~ "                      ובין כל שם צריך להיות פסיק)\n"
+#~ "  --display=DISPLAY   מספר התצוגה להשתמש בו בחלונות X\n"
+#~ "  -v, --version       הצג את הגירסאשל התוכנה וצא\n"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "שימוש: %s [אפשרות]...\n"
+#~ "\n"
+#~ "  -c, --config=ספריה  השתמש בספרייה לקבצי הגדרות\n"
+#~ "  -d, --debug         שלח הודעות ניפוי באגים ל-stdout\n"
+#~ "  -f, --force-online  אלץ מצב מקוון, בלי להתחשב במצב הרשת\n"
+#~ "  -h, --help          הצג הודעה זו וצא\n"
+#~ "  -m, --multiple      אל תוודא שרק עותק אחד רץ\n"
+#~ "  -n, --nologin       אל תתחבר אוטומטית\n"
+#~ "  -l, --login[=שמות]  היכנס אוטומטית )אפשרות לתת שמות חשבונות לחבר,\n"
+#~ "                      ובין כל שם צריך להיות פסיק)\n"
+#~ "  --display=DISPLAY   מספר התצוגה להשתמש בו בחלונות X\n"
+#~ "  -v, --version       הצג את הגרסה של התוכנה וצא\n"
+
 #~ msgid "Failed to open the file"
 #~ msgstr "כישלון בעת פתיחת הקובץ"
+
 #~ msgid "_Resume"
 #~ msgstr "ה_משך"
+
 #~ msgid "Malformed BOSH Connect Server"
 #~ msgstr "שרת חיבור BOSH משובש"
+
 #~ 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 "ההזמנה נדחתה"

 #, fuzzy
 #~ msgid "_Proxy"
 #~ msgstr "מתווך"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "אין אפשרות לפתוח שקע"
+
 #~ msgid "Could not listen on socket"
 #~ msgstr "אין אפשרות להקשיב בשקע זה"
+
 #~ msgid "Unable to read socket"
 #~ msgstr "אין אפשרות לקרוא את השקע"
+
 #~ msgid "Connection failed."
 #~ msgstr "ההתחברות נכשלה."
+
 #~ msgid "Server has disconnected"
 #~ msgstr "השרת התנתק"
+
 #~ msgid "Couldn't create socket"
 #~ msgstr "אין אפשרות ליצור שקע"
+
 #~ msgid "Couldn't connect to host"
 #~ msgstr "לא ניתן להתחבר לשרת"
+
 #~ msgid "Read error"
 #~ msgstr "שגיאה בקריאה"
+
 #~ msgid ""
 #~ "Could not establish a connection with the server:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "לא ניתן ליצור חיבור עם השרת:\n"
 #~ "%s"
+
 #~ msgid "Write error"
 #~ msgstr "שגיאה בכתיבה"
+
 #~ msgid "Last Activity"
 #~ msgstr "פעילות אחרונה"
+
 #~ msgid "Service Discovery Info"
 #~ msgstr "מידע של שירות תגלית"
+
 #~ msgid "Service Discovery Items"
 #~ msgstr "פריטי שירות תגלית"
+
 #~ msgid "Extended Stanza Addressing"
 #~ msgstr "כתובות מורחבות לסטאנזות"
+
 #~ msgid "Multi-User Chat"
 #~ msgstr "צ'אט מרובה משתמשים"
+
 #~ msgid "Multi-User Chat Extended Presence Information"
 #~ msgstr "מידע נוכחותי בצ'אט מרובה משתמשים"
+
 #~ msgid "In-Band Bytestreams"
 #~ msgstr "זרמי-נתונים לפי הסדר"
+
 #~ msgid "Ad-Hoc Commands"
 #~ msgstr "פקודות זמניות"
+
 #~ msgid "PubSub Service"
 #~ msgstr "שירות PubSub"
+
 #~ msgid "SOCKS5 Bytestreams"
 #~ msgstr "זרמי-נתונים של SOCKS5"
+
 #~ msgid "Out of Band Data"
 #~ msgstr "מידע שלא לפי סדר"
+
 #~ msgid "XHTML-IM"
 #~ msgstr "XHTML-IM"
+
 #~ msgid "In-Band Registration"
 #~ msgstr "רישום דרך התור"
+
 #~ msgid "User Location"
 #~ msgstr "מיקום משתמש"
+
 #~ msgid "User Avatar"
 #~ msgstr "תמונת משתמש"
+
 #~ msgid "Chat State Notifications"
 #~ msgstr "התרעות על מצבי צ'אט"
+
 #~ msgid "Software Version"
 #~ msgstr "גירסת תוכנה"
+
 #~ msgid "Stream Initiation"
 #~ msgstr "איתחול זרם"
+
 #~ msgid "User Mood"
 #~ msgstr "מצב-רוח המשתמש"
+
 #~ msgid "User Activity"
 #~ msgstr "פעילות משתמש"
+
 #~ msgid "Entity Capabilities"
 #~ msgstr "יכולות ישות"
+
 #~ msgid "Encrypted Session Negotiations"
 #~ msgstr "מיקוחים לחיבור מוצפן"
+
 #~ msgid "User Tune"
 #~ msgstr "שיר משתמש"
+
 #~ msgid "Roster Item Exchange"
 #~ msgstr "החלפת פריטי רשימה"
+
 #~ msgid "Reachability Address"
 #~ msgstr "כתובת זמינות"
+
 #~ msgid "User Profile"
 #~ msgstr "פרופיל משתמש"
+
 #~ msgid "Jingle"
 #~ msgstr "ג'ינגל"
+
 #~ msgid "Jingle Audio"
 #~ msgstr "צליל ג'ינגל"
+
 #~ msgid "User Nickname"
 #~ msgstr "כינוי משתמש"
+
 #~ msgid "Jingle ICE UDP"
 #~ msgstr "ג'ינגל ICE UDP"
+
 #~ msgid "Jingle ICE TCP"
 #~ msgstr "ג'ינגל ICE TCP"
+
 #~ msgid "Jingle Raw UDP"
 #~ msgstr "ג'ינגל UDP לא-מעובד"
+
 #~ msgid "Jingle Video"
 #~ msgstr "ג'ינגל וידאו"
+
 #~ msgid "Jingle DTMF"
 #~ msgstr "ג'ינגל DTMF"
+
 #~ msgid "Message Receipts"
 #~ msgstr "קבלות הודעות"
+
 #~ msgid "Public Key Publishing"
 #~ msgstr "פירסום מפתח ציבורי"
+
 #~ msgid "User Chatting"
 #~ msgstr "משתמש מצ'וטט"
+
 #~ msgid "User Browsing"
 #~ msgstr "משתמש גולש"
+
 #~ msgid "User Gaming"
 #~ msgstr "משתמש משחק"
+
 #~ msgid "User Viewing"
 #~ msgstr "משתמש צופה"
+
 #~ msgid "Stanza Encryption"
 #~ msgstr "הצפנת סטנזה"
+
 #~ msgid "Entity Time"
 #~ msgstr "זמן ישות"
+
 #~ msgid "Delayed Delivery"
 #~ msgstr "משלוח מעוכב"
+
 #~ msgid "Collaborative Data Objects"
 #~ msgstr "אובייקטי מידע שיתופיים"
+
 #~ msgid "File Repository and Sharing"
 #~ msgstr "ספריית קבצים ושיתוף"
+
 #~ msgid "STUN Service Discovery for Jingle"
 #~ msgstr "שירות תגלית STUN עבור ג'ינגל"
+
 #~ msgid "Simplified Encrypted Session Negotiation"
 #~ msgstr "מיקוח פשוט לחיבור המוצפן"
+
 #~ msgid "Hop Check"
 #~ msgstr "בדיקת קפיצות"
+
 #~ msgid "Read Error"
 #~ msgstr "שגיאה בקריאה"
+
 #~ msgid "Failed to connect to server."
 #~ msgstr "כשל בהתחברות לשרת"
+
 #~ msgid "Read buffer full (2)"
 #~ msgstr "תור-הקריאה מלא (2)"
+
 #~ msgid "Unparseable message"
 #~ msgstr "הודעת שלא ניתנת לפיענוח"
+
 #~ msgid "Couldn't connect to host: %s (%d)"
 #~ msgstr "לא ניתן להתחבר לשרת: %s (%d)"
+
 #~ msgid "Login failed (%s)."
 #~ msgstr "לא ניתן להתחבר (%s)."
+
 #~ msgid ""
 #~ "You have been logged out because you logged in at another workstation."
 #~ msgstr "נותקת כיוון שהתחברת ממחשב אחר."
+
 #~ msgid "Error. SSL support is not installed."
 #~ msgstr "שגיאה. לא מותקנת תמיכה ב-SSL."
+
 #~ msgid "Incorrect password."
 #~ msgstr "סיסמה לא נכונה."
+
 #~ msgid ""
 #~ "Could not connect to BOS server:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "לא ניתן להתחבר לשרת ה-BOS:\n"
 #~ "%s"
+
 #~ msgid "You may be disconnected shortly.  Check %s for updates."
 #~ msgstr "ייתכן ותנותק/י בקרוב. יש לבדוק את %s לעידכונים."
+
 #~ msgid "Could Not Connect"
 #~ msgstr "לא ניתן להתחבר"
+
 #~ msgid "Invalid username."
 #~ msgstr "שם משתמש לא תקף."

 #, fuzzy
 #~ msgid "Could not decrypt server reply"
 #~ msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
+
 #~ msgid "Connection lost"
 #~ msgstr "החיבור אבד"
+
 #~ msgid "Couldn't resolve host"
 #~ msgstr "לא ניתן למצוא כתובת שרת"
+
 #~ msgid "Connection closed (writing)"
 #~ msgstr "החיבור נסגר (כתיבה)"
+
 #~ msgid "Connection reset"
 #~ msgstr "החיבור אותחל"
+
 #~ msgid "Error reading from socket: %s"
 #~ msgstr "שגיאה בקריאת נתונים מהשקע: %s"
+
 #~ msgid "Unable to connect to host"
 #~ msgstr "לא ניתן להתחבר לשרת"
+
 #~ msgid "Could not write"
 #~ msgstr "לא ניתן לכתוב"
+
 #~ msgid "Could not connect"
 #~ msgstr "לא ניתן להתחבר"
+
 #~ msgid "Could not create listen socket"
 #~ msgstr "אין אפשרות ליצור שקע-קשב"
+
 #~ 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 יפן"
+
 #~ msgid "Japan Pager server"
 #~ msgstr "שרת ה-Pager ביפן"
+
 #~ msgid "Japan file transfer server"
 #~ msgstr "שרת יפני להעברת קבצים"
+
 #~ msgid ""
 #~ "Lost connection with server\n"
 #~ "%s"
 #~ msgstr ""
 #~ "אבד החיבור עם השרת\n"
 #~ "%s"
+
 #~ msgid "Could not resolve host name"
 #~ msgstr "לא ניתן למצוא כתובת שרת"

@@ -13432,39 +14468,53 @@
 #~ "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 "צבע הסמן"
+
 #~ msgid "Secondary Cursor Color"
 #~ msgstr "צבע משני של הסמן"
+
 #~ msgid "Interface colors"
 #~ msgstr "צבעי ממשק"
+
 #~ msgid "Widget Sizes"
 #~ 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 ""
 #~ "יש להזין את שם המשתמש שברצונך להזמין,\n"
 #~ "יחד עם הודעת הזמנה אופציונלית."
+
 #~ msgid "Unable to retrieve MSN Address Book"
 #~ msgstr "לא יכול לאחזר את רשימת הכתובות של 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] "אבד החיבור אל השרת (לא התקבל מידע תוך %d שניה)"
 #~ msgstr[1] "אבד החיבור אל השרת (לא התקבל מידע תוך %d שניות)"
+
 #~ msgid ""
 #~ "You may be disconnected shortly.  You may want to use TOC until this is "
 #~ "fixed.  Check %s for updates."
@@ -13479,8 +14529,10 @@
 #, fuzzy
 #~ msgid "Can not decrypt get server reply"
 #~ msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
+
 #~ msgid "Keep alive error"
 #~ msgstr "שגיאה בהשאר-חי"
+
 #~ msgid ""
 #~ "Lost connection with server:\n"
 #~ "%d, %s"
@@ -13491,65 +14543,93 @@
 #, fuzzy
 #~ msgid "Connecting server ..."
 #~ msgstr "שרת ההתחברות"
+
 #~ msgid "Failed to send IM."
 #~ msgstr "כישלון בשליחת הודעה."

 #, fuzzy
 #~ msgid "Not a member of room \"%s\"\n"
 #~ msgstr "אינך חבר/ה בקבוצה \"%s\"\n"
+
 #~ msgid "Looking up %s"
 #~ msgstr "מחפש את %s..."
+
 #~ msgid "Connect to %s failed"
 #~ msgstr "ההתחברות אל %s לא הצליחה."
+
 #~ msgid "Signon: %s"
 #~ msgstr "מתחבר: %s"
+
 #~ msgid "Unable to write file %s."
 #~ msgstr "אין אפשרות לכתוב אל הקובץ %s"
+
 #~ msgid "Unable to read file %s."
 #~ msgstr "אין אפשרות לקרוא את הקובץ %s."
+
 #~ msgid "Message too long, last %s bytes truncated."
 #~ msgstr "הודעה ארוכה מדי, %s הבייטים האחרונים נקטמו."
+
 #~ msgid "%s not currently logged in."
 #~ msgstr "%s אינו מחובר כרגע."
+
 #~ msgid "Warning of %s not allowed."
 #~ msgstr "אזהרה של %s  אינה מותרת."
+
 #~ msgid ""
 #~ "A message has been dropped, you are exceeding the server speed limit."
 #~ msgstr "אבדה הודעה; אתה עובר על הגבלת המהירות של השרת."
+
 #~ msgid "Chat in %s is not available."
 #~ msgstr "צ'אט ב-%s אינו זמין."
+
 #~ msgid "You are sending messages too fast to %s."
 #~ msgstr "אתה שולח הודעות אל %s מהר מדיי."
+
 #~ msgid "You missed an IM from %s because it was too big."
 #~ msgstr "פספסת הודעה מ-%s כיוון שהיא הייתה ארוכה מדי."
+
 #~ msgid "You missed an IM from %s because it was sent too fast."
 #~ msgstr "פספסת הודעה מ-%s כיוון שהיא נשלחה מהר מדי."
+
 #~ msgid "Failure."
 #~ msgstr "כישלון."
+
 #~ msgid "Too many matches."
 #~ msgstr "יותר מידי תוצאות"
+
 #~ msgid "Need more qualifiers."
 #~ msgstr "החיפוש זקוק ליותר מגדירים."
+
 #~ msgid "Dir service temporarily unavailable."
 #~ msgstr "שירות המדריך אינו זמין זמנית."
+
 #~ msgid "Email lookup restricted."
 #~ msgstr "חיפוש הדוא\"ל מוגבל."
+
 #~ msgid "Keyword ignored."
 #~ msgstr "יתעלם ממילת המפתח."
+
 #~ msgid "No keywords."
 #~ msgstr "אין מילות מפתח."
+
 #~ msgid "User has no directory information."
 #~ msgstr "אין מידע עבור משתמש זה"
+
 #~ msgid "Country not supported."
 #~ msgstr "המדינה אינה נתמכת."
+
 #~ msgid "Failure unknown: %s."
 #~ msgstr "כשל מוכר: %s"
+
 #~ msgid "Incorrect username or password."
 #~ msgstr "שם משתמש או סיסמא שגויים."
+
 #~ msgid "The service is temporarily unavailable."
 #~ msgstr "השירות אינו זמין זמנית."
+
 #~ msgid "Your warning level is currently too high to log in."
 #~ 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 "
@@ -13557,64 +14637,90 @@
 #~ msgstr ""
 #~ "התחברת והתנתקת בתדירות גבוהה מדיי. המתן 10 דקות ונסה שנית. אם תמשיך "
 #~ "לנסות, תיאלץ להמתין אפילו יותר."
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "ארעה שגיאה לא ידועה בזמן ניסיון לפתיחת %s"
+
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "ארעה שגיאה לא מוכרת, %d, מידע: %s"
+
 #~ msgid "Invalid Groupname"
 #~ msgstr "שם הקבוצה שגוי"
+
 #~ msgid "Connection Closed"
 #~ msgstr "החיבור נסגר."
+
 #~ msgid "Waiting for reply..."
 #~ msgstr "ממתין לתשובה..."
+
 #~ msgid "TOC has come back from its pause. You may now send messages again."
 #~ msgstr "TOC חזר מן ה-pause שלו. ניתן לשלוח הודעות שוב."
+
 #~ msgid "Password Change Successful"
 #~ msgstr "הסיסמה שלך שונתה בהצלחה."
+
 #~ msgid "Get Dir Info"
 #~ msgstr "השג מידע על המשתמש"
+
 #~ msgid "Set Dir Info"
 #~ msgstr "קבע מידע על המשתמש"
+
 #~ msgid "Could not open %s for writing!"
 #~ msgstr "לא ניתן לפתוח %s לכתיבה"
+
 #~ msgid "File transfer failed; other side probably canceled."
 #~ msgstr "כשל בהעברת הקובץ, כנראה צד שני ביטל"
+
 #~ msgid "Could not connect for transfer."
 #~ msgstr "לא ניתן לחבר את ההעברה."
+
 #~ msgid "Could not write file header.  The file will not be transferred."
 #~ msgstr "לא ניתן לכתוב את רישת הקובץ. הקובץ לא יועבר."
+
 #~ msgid "Save As..."
 #~ msgstr "שמור בשם..."
+
 #~ 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 מבקש מ-%s לקבל %d קובץ: %s (%.2f %s)%s%s"
 #~ msgstr[1] "%s מבקש מ-%s לקבל %d קבצים: %s (%.2f %s)%s%s"
+
 #~ msgid "%s requests you to send them a file"
 #~ msgstr "%s מבקש/ת ממך לשלוח לו/לה קובץ"
+
 #~ msgid "TOC Protocol Plugin"
 #~ msgstr "תוסף פרוטוקול TOC"
+
 #~ msgid "User information for %s unavailable"
 #~ msgstr "פרטי המשתמש %s אינם זמינים"
+
 #~ msgid "%s Options"
 #~ msgstr "%s אפשרויות"
+
 #~ msgid "Proxy Options"
 #~ msgstr "אפשרויות פרוקסי"
+
 #~ msgid "By log size"
 #~ msgstr "לפי גודל יומן השיחות"
+
 #~ msgid "_Open Link in Browser"
 #~ msgstr "_פתח את הקישור בדפדפן"
+
 #~ msgid "ST_UN server:"
 #~ msgstr "שרת STUN:"
+
 #~ msgid "Smiley _Image"
 #~ msgstr "_תמונת חייכן"
+
 #~ msgid "Smiley S_hortcut"
 #~ msgstr "קיצורים ל_חייכנים"
+
 #~ msgid "_Flash window when chat messages are received"
 #~ msgstr "_הבהב את חלון השיחה בעת קבלת הודעות צ'אט"
+
 #~ msgid "A group with the name already exists."
 #~ msgstr "קבוצה בשם זה כבר קיימת."
+
 #~ msgid "Primary Information"
 #~ msgstr "מידע ראשי"
+
 #~ msgid "Blood Type"
 #~ msgstr "סוג דם"

@@ -13625,16 +14731,21 @@
 #, fuzzy
 #~ msgid "Successed:"
 #~ msgstr "מהירות:"
+
 #~ msgid ""
 #~ "Setting custom faces is not currently supported. Please choose an image "
 #~ "from %s."
 #~ msgstr "אין כרגע תמיכה בהתאמה אישית של פרצופים. יש לבחור בתמונה מתוך %s."
+
 #~ msgid "Invalid QQ Face"
 #~ msgstr "פרצוף QQ לא תקף"
+
 #~ msgid "You rejected %d's request"
 #~ msgstr "דחית את בקשת %d"
+
 #~ msgid "Reject request"
 #~ msgstr "דחה בקשה"
+
 #~ msgid "Add buddy with auth request failed"
 #~ msgstr "כישלון בהוספת איש-קשר עם בקשת אימות"

@@ -13645,10 +14756,13 @@
 #, fuzzy
 #~ msgid "QQ Number Error"
 #~ msgstr "מספר QQ"
+
 #~ msgid "Group Description"
 #~ msgstr "תיאור הקבוצה"
+
 #~ msgid "Auth"
 #~ msgstr "אימות"
+
 #~ msgid "Approve"
 #~ msgstr "אשר"

@@ -13663,24 +14777,30 @@
 #, fuzzy
 #~ msgid "[%d] added to Qun \"%d\""
 #~ msgstr "את/ה [%d] נוספת אל הקבוצה \"%d\""
+
 #~ msgid "I am a member"
 #~ msgstr "אני הנני חבר/ה"

 #, fuzzy
 #~ msgid "I am requesting"
 #~ msgstr "בקשה שגויה"
+
 #~ msgid "I am the admin"
 #~ msgstr "אני המנהל/ת"
+
 #~ msgid "Unknown status"
 #~ msgstr "מצב לא ידוע"

 #, fuzzy
 #~ msgid "Remove from Qun"
 #~ msgstr "הסר קבוצה"
+
 #~ msgid "You entered a group ID outside the acceptable range"
 #~ msgstr "הזנת מזהה-קבוצה מחוץ לטווח התקף"
+
 #~ msgid "Are you sure you want to leave this Qun?"
 #~ msgstr "האם ברצונך לעזוב את Qun זה?"
+
 #~ msgid "Do you want to approve the request?"
 #~ msgstr "האם ברצונך לאשר את הבקשה?"

@@ -13691,20 +14811,26 @@
 #, fuzzy
 #~ msgid "Change Qun information"
 #~ msgstr "מידע על הערוץ"
+
 #~ msgid "System Message"
 #~ msgstr "הודעת מערכת"
+
 #~ msgid "<b>Last Login IP</b>: %s<br>\n"
 #~ msgstr "<b>כתובת חיבור אחרונה</b>: %s<br>\n"
+
 #~ msgid "<b>Last Login Time</b>: %s\n"
 #~ msgstr "<b>זמן חיבור אחרון</b>: %s\n"
+
 #~ msgid "Set My Information"
 #~ msgstr "קבע את המידע שלי"

 #, fuzzy
 #~ msgid "Leave the QQ Qun"
 #~ msgstr "עזוב QQ Qun זה"
+
 #~ msgid "Block this buddy"
 #~ msgstr "חסום משתמש זה"
+
 #~ msgid "Invalid token reply code, 0x%02X"
 #~ msgstr "קוד-תגובה שגוי, 0x%02X"

@@ -13715,6 +14841,7 @@
 #, fuzzy
 #~ msgid "Failed to connect all servers"
 #~ msgstr "כישלון בהתחברות לשרת"
+
 #~ msgid "Connecting server %s, retries %d"
 #~ msgstr "מתחבר עם שרת %s, ניסיונות %d"

@@ -13733,6 +14860,7 @@
 #, fuzzy
 #~ msgid "QQ Budy"
 #~ msgstr "איש הקשר"
+
 #~ msgid "%s wants to add you [%s] as a friend"
 #~ msgstr "%s רוצה להוסיף אותך [%s] כחבר"

@@ -13743,6 +14871,7 @@
 #, fuzzy
 #~ msgid "Would you add?"
 #~ msgstr "האם ברצונך להוסיף אותו?"
+
 #~ msgid "%s"
 #~ msgstr "%s"

@@ -13753,116 +14882,166 @@
 #, fuzzy
 #~ msgid "Network disconnected"
 #~ msgstr "הצד המרוחק מנותק"
+
 #~ msgid "developer"
 #~ msgstr "מפתח"
+
 #~ msgid "XMPP developer"
 #~ msgstr "מפתח XMPP"
+
 #~ msgid "Artists"
 #~ msgstr "אמנים"
+
 #~ msgid ""
 #~ "You are using %s version %s.  The current version is %s.  You can get it "
 #~ "from <a href=\"%s\">%s</a><hr>"
 #~ msgstr ""
 #~ "%s שבשימוש הוא גירסא %s. הגירסא הנוכחית היא %s.  ניתן להשיג אותה מ-<a "
 #~ "href=\"%s\">%s</a><hr>"
+
 #~ msgid "<b>ChangeLog:</b><br>%s"
 #~ msgstr "<b>רשימת שינויים:</b><br>%s"
+
 #~ msgid "EOF while reading from resolver process"
 #~ msgstr "קבלת סיום-קובץ בעת קריאה מתהליך ה-resolver"
+
 #~ msgid "Your information has been updated"
 #~ msgstr "המידע שלך עודכן"
+
 #~ msgid "Input your reason:"
 #~ msgstr "הזנ/י את סיבתך:"
+
 #~ msgid "You have successfully removed a buddy"
 #~ msgstr "הסרת איש-קשר בהצלחה"
+
 #~ msgid "You have successfully removed yourself from your friend's buddy list"
 #~ msgstr "הסרת את עצמך בהצלחה מרשימת אנשי הקשר של חברך"
+
 #~ msgid "You have added %d to buddy list"
 #~ msgstr "הוספת את %d לרשימת אנשי-קשר"
+
 #~ msgid "Invalid QQid"
 #~ msgstr "QQid לא תקף"
+
 #~ msgid "Please enter external group ID"
 #~ msgstr "יש להזין ID של הקבוצה החיצונית"
+
 #~ msgid "Reason: %s"
 #~ msgstr "סיבה: %s"
+
 #~ msgid "Your request to join group %d has been approved by admin %d"
 #~ msgstr "בקשתך להצטרף לקבוצה %d אושרה על ידי המנהל %d"
+
 #~ msgid "I am applying to join"
 #~ msgstr "אני מבקש/ת להצטרף"
+
 #~ msgid "You have successfully left the group"
 #~ msgstr "עבת את הקבוצה בהצלחה "
+
 #~ msgid "QQ Group Auth"
 #~ msgstr "אימות לקבוצת QQ"
+
 #~ msgid "Your authorization request has been accepted by the QQ server"
 #~ msgstr "בקשת האימות שלך התקבלה בחיוב על ידי שרת ה-QQ"
+
 #~ msgid "Enter your reason:"
 #~ msgstr "הזנ/י את סיבתך:"
+
 #~ msgid " Space"
 #~ msgstr " ספייס"
+
 #~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
 #~ msgstr "<b>שם מחשב אמיתי</b>: %s: %d<br>\n"
+
 #~ msgid "Show Login Information"
 #~ msgstr "הצג מידע על החיבור"
+
 #~ msgid "resend interval(s)"
 #~ msgstr "פרק זמן בין שליחות חוזרות"
+
 #~ msgid "hostname is NULL or port is 0"
 #~ msgstr "שם המחשב ריק, או מספר השקע 0"
+
 #~ msgid "Unable to login. Check debug log."
 #~ msgstr "לא ניתן להיכנס. יש לבדוק ביומן רישום הבאגים"
+
 #~ msgid "Failed room reply"
 #~ msgstr "כשל במשוב מהחדר"
+
 #~ msgid "User %s rejected your request"
 #~ msgstr "המשתמש %s סרב לבקשתך"
+
 #~ msgid "User %s approved your request"
 #~ msgstr "המשתמש %s אישר את בקשתך"
+
 #~ msgid "Notice from: %s"
 #~ msgstr "הודעה מאת: %s"
+
 #~ msgid "Code [0x%02X]: %s"
 #~ msgstr "קוד [0x%02X]: %s"
+
 #~ msgid "Group Operation Error"
 #~ msgstr "שגיאה בפעולת-קבוצה"
+
 #~ msgid "Error setting socket options"
 #~ msgstr "שגיאה בקביעת הגדרות השקע"
+
 #~ msgid ""
 #~ "Windows Live ID authentication: cannot find authenticate token in server "
 #~ "response"
 #~ msgstr "אימות מזהה Windows Live: לא ניתן למצוא סמל אימות בתגובת השרת"
+
 #~ msgid "Windows Live ID authentication Failed"
 #~ msgstr "אימות מזהה Windows Live נכשלה"
+
 #~ msgid "Too evil (sender)"
 #~ msgstr "השולח מרושע מדי"
+
 #~ msgid "Too evil (receiver)"
 #~ msgstr "המקבל מרושע מדי"
+
 #~ msgid "Available Message"
 #~ msgstr "הודעת זמינות"
+
 #~ msgid "Away Message"
 #~ msgstr "הודעת ריחוק מהמחשב"
+
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(שולף)</i>"
+
 #~ msgid "TCP Address"
 #~ msgstr "כתובת TCP"
+
 #~ msgid "UDP Address"
 #~ msgstr "כתובת UDP"

 #, fuzzy
 #~ msgid "Display Statistics"
 #~ msgstr "סטטיסטיקות של השרת"
+
 #~ msgid "Screen name:"
 #~ msgstr "שם לתצוגה:"
+
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "מישהו מזכיר את שמך בצ'אט"
+
 #~ msgid ""
 #~ "This server requires plaintext authentication over an unencrypted "
 #~ "connection.  Allow this and continue authentication?"
 #~ msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת.להמשיך בכל זאת?"
+
 #~ msgid "Use GSSAPI (Kerberos v5) for authentication"
 #~ msgstr "השתמש בGSSAPI (קרברוס גירסה 5) לצורך אימות"
+
 #~ msgid "Invalid screen name"
 #~ msgstr "שם לתצוגה לא תקין"
+
 #~ msgid "Invalid screen name."
 #~ msgstr "שם-תצוגה לא תקין."
+
 #~ msgid "Screen _name:"
 #~ msgstr "שם לתצוגה:"
+
 #~ msgid ""
 #~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
@@ -13871,10 +15050,10 @@
 #~ "%s%s<span weight=\"bold\">נכתב ע\"י:</span>\t%s\n"
 #~ "<span weight=\"bold\">אתר:</span>\t\t%s\n"
 #~ "<span weight=\"bold\">שם קובץ:</span>\t\t%s"
+
 #~ msgid ""
 #~ "The contact availability plugin (cap) is used to display statistical "
 #~ "information about buddies in a users contact list."
 #~ msgstr ""
 #~ "התוסף לניבוי זמינות אנשי-קשר מציג מידע סטטיסטי על החברים ברשימת אנשי הקשר "
 #~ "של המשתמש."
-
--- a/po/hu.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/hu.po	Tue Sep 01 19:51:07 2009 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: pidgin 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-21 17:54+0200\n"
-"PO-Revision-Date: 2009-08-21 17:54+0200\n"
+"POT-Creation-Date: 2009-08-29 01:02+0200\n"
+"PO-Revision-Date: 2009-08-29 00:59+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
 "MIME-Version: 1.0\n"
@@ -1637,6 +1637,39 @@
 msgid "buddy list"
 msgstr "partnerlista"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr "A tanúsítvány saját aláírású és nem ellenőrizhető automatikusan."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr "A tanúsítványt kiadó gyökértanúsítványt a Pidgin nem ismeri."
+
+msgid "The certificate is not valid yet."
+msgstr "A tanúsítvány még nem érvényes."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr "A tanúsítvány lejárt és nem tekinthető érvényesnek."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "A bemutatott tanúsítvány nem ehhez a tartományhoz lett kiállítva."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"A gyökértanúsítványok adatbázisa nem érhető el, így ez a tanúsítvány nem "
+"ellenőrizhető."
+
+msgid "The certificate chain presented is invalid."
+msgstr "A bemutatott tanúsítványlánc érvénytelen."
+
+msgid "The certificate has been revoked."
+msgstr "A tanúsítványt visszavonták."
+
+msgid "An unknown certificate error occurred."
+msgstr "Ismeretlen tanúsítványhiba történt."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(NEM EGYEZIK)"

@@ -1680,87 +1713,23 @@
 msgstr "_Tanúsítvány megjelenítése…"

 #, 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 ""
-"A(z) „%s” által bemutatott tanúsítvány a következőtől származónak mondja "
-"magát: „%s”. Ez azt jelentheti, hogy a kívánttól eltérő szolgáltatáshoz "
-"kapcsolódik."
-
-#. 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
+msgid "The certificate for %s could not be validated."
+msgstr "A következő tanúsítványa nem ellenőrizhető: %s."
+
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL tanúsítványhiba"

-msgid "Invalid certificate chain"
-msgstr "Érvénytelen tanúsítványlánc"
-
-#. 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 ""
-"A gyökértanúsítványok adatbázisa nem érhető el, így ez a tanúsítvány nem "
-"ellenőrizhető."
-
-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"A(z) „%s” által bemutatott tanúsítvány saját aláírású. Nem ellenőrizhető "
-"automatikusan."
-
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "A következőhöz bemutatott tanúsítványlánc nem érvényes: %s."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr "A tanúsítványt kiadó gyökértanúsítványt a Pidgin nem ismeri."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"A(z) %s által bemutatott tanúsítványlánc nem rendelkezik érvényes digitális "
-"aláírással attól a hitelesítésszolgáltatótól, amely aláírásával állítása "
-"szerint rendelkezik."
-
-msgid "Invalid certificate authority signature"
-msgstr "A hitelesítésszolgáltató aláírása érvénytelen"
-
-#, c-format
-msgid "Failed to validate expiration time for %s"
-msgstr "Nem sikerült ellenőrizni a következő lejárati idejét: %s"
-
-#, c-format
-msgid "The certificate for %s is expired."
-msgstr "%s tanúsítványa lejárt."
-
-#, c-format
-msgid "The certificate for %s should not yet be in use."
-msgstr "A következő tanúsítványát még nem lenne szabad használni: %s."
+msgid "Unable to validate certificate"
+msgstr "A tanúsítvány nem ellenőrizhető"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"A tanúsítvány a következőtől származónak mondja magát: „%s”. Ez azt "
+"jelentheti, hogy a kívánttól eltérő szolgáltatáshoz kapcsolódik."

 #. Make messages
 #, c-format
@@ -2203,6 +2172,35 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATIKUS VÁLASZ>: %s\n"

+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Nem találhatók kodekek. Telepítsen néhány GStreamer kodeket, ezek a "
+"GStreamer bővítménycsomagokban találhatók."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Nincs több kodek. A fs-codecs.conf fájlban megadott kodekbeállítások túl "
+"szigorúak."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Helyrehozhatatlan Farsight2 hiba történt."
+
+msgid "Conference error."
+msgstr "Konferenciahiba"
+
+msgid "Error with your microphone."
+msgstr "Hiba történt a mikrofonnal."
+
+msgid "Error with your webcam."
+msgstr "Hiba történt a webkamerával."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Hiba a munkamenet létrehozásakor: %s"
+
 msgid "Error creating conference."
 msgstr "Hiba a konferencia létrehozásakor."

@@ -9489,6 +9487,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"

+msgid "Use account proxy for SSL connections"
+msgstr "Fiókproxy használata SSL kapcsolatokhoz"
+
 msgid "Chat room list URL"
 msgstr "Csevegőszobák listájának URL címe"

@@ -9610,7 +9611,7 @@

 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
-"of this error is entering your e-mail address instead of your Yahoo! ID."
+"of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
 "1013-as hiba: A megadott felhasználónév érvénytelen. Ennek leggyakoribb oka, "
 "hogy az e-mail címét adta meg a Yahoo! azonosítója helyett."
@@ -11639,20 +11640,19 @@

 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A> (This is a <A HREF=\"http://pidgin.im/cgi-bin/"
-"mailman/listinfo/support\">mailing list</A>, and messages sent here are <A "
-"HREF=\"http://pidgin.im/pipermail/support/\">publicly archived!</A>  "
-"Furthermore, we do <I><B>not</B></I> support MXit, Facebook, Skype, or any "
-"other third-party plugins on this list.<BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Segítség e-mailben:</FONT> <A HREF=\"mailto:support@pidgin."
-"im\">support@pidgin.im</A> (Ez egy angol nyelvű <A HREF=\"http://pidgin.im/"
-"cgi-bin/mailman/listinfo/support\">levelezőlista</A>, az ide küldött levelek "
-"<A HREF=\"http://pidgin.im/pipermail/support/\">nyilvánosan elérhetők "
-"lesznek!</A> Továbbá, ezen a listán <I><B>nem</B></I> támogatjuk az MXit, "
-"Facebook, Skype, vagy bármely más harmadik féltől származó bővítményt.<BR/"
-"><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Segítség más Pidgin felhasználóktól:</font> <a href="
+"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Ez egy <b>nyilvános</"
+"b> levelezőlista! (<a href=\"http://pidgin.im/pipermail/support/\">archívum</"
+"a>)<br/>Nem tudunk segíteni külső protokollokkal vagy bővítményekkel "
+"kapcsolatban!<br/>Ez a lista <b>angol</b> nyelvű. Írhat más nyelven is, de a "
+"válaszok nem biztos, hogy túl hasznosak lesznek.<br/><br/>"

 #, c-format
 msgid ""
@@ -14254,6 +14254,51 @@
 "Ez a bővítmény lehetővé teszi a felhasználó számára a társalgási és "
 "naplóüzenetek időpecsét-formátumainak testreszabását."

+msgid "Audio"
+msgstr "Hang"
+
+msgid "Video"
+msgstr "Videó"
+
+msgid "Output"
+msgstr "Kimenet"
+
+msgid "_Plugin"
+msgstr "_Bővítmény"
+
+msgid "_Device"
+msgstr "_Eszköz"
+
+msgid "Input"
+msgstr "Bemenet"
+
+msgid "P_lugin"
+msgstr "Bő_vítmény"
+
+msgid "D_evice"
+msgstr "_Eszköz"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Hang/videobeállítások"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Mikrofon és webkamera beállítása."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "Mikrofon- és webkamera-beállítások megadása hang- és videohívásokhoz."
+
 msgid "Opacity:"
 msgstr "Átlátszatlanság:"
--- a/po/it.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/it.po	Tue Sep 01 19:51:07 2009 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-05 09:08-0700\n"
-"PO-Revision-Date: 2009-08-05 14:56+0100\n"
+"POT-Creation-Date: 2009-08-29 21:30-0700\n"
+"PO-Revision-Date: 2009-08-29 09:39+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -874,7 +874,7 @@
 msgid "System Log"
 msgstr "Log di sistema"

-msgid "Calling ... "
+msgid "Calling..."
 msgstr "Chiamata in corso..."

 msgid "Hangup"
@@ -1518,6 +1518,33 @@
 "Quando viene aperta una nuova conversazione, questo plugin inserirà l'ultima "
 "conversazione in quella corrente."

+#, c-format
+msgid ""
+"\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 "Prefisso per gli indirizzi TinyURL (o altri)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Plugin TinyURL"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr ""
+"Quando ricevi un messaggio con degli URL, trasformali in TinyURL per poterli "
+"copiare più facilmente"
+
 msgid "Online"
 msgstr "Online"

@@ -1562,33 +1589,6 @@
 msgid "Lastlog plugin."
 msgstr "Plugin Lastlog"

-#, c-format
-msgid ""
-"\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 "Prefisso per gli indirizzi TinyURL (o altri)"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-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"

@@ -1650,6 +1650,44 @@
 msgid "buddy list"
 msgstr "lista contatti"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+"Il certificato presentato è auto-firmato e non può essere verificato "
+"automaticamente."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Il certificato root dal quale questo certificato dichiara di provenire è "
+"sconosciuto a Pidgin."
+
+msgid "The certificate is not valid yet."
+msgstr "Il certificato non è ancora valido."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr ""
+"Il certificato è scaduto e non dovrebbe essere considerato come valido."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "Il certificato presentato non è stato emesso da questo dominio."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Non hai alcun database di certificati root. Pertanto, questo certificato non "
+"può essere validato."
+
+msgid "The certificate chain presented is invalid."
+msgstr "La catena di certificati presentata non è valida."
+
+msgid "The certificate has been revoked."
+msgstr "Il ceritifcato è stato revocato."
+
+msgid "An unknown certificate error occurred."
+msgstr "Si è verificato un errore di certificato sconosciuto."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(NON CORRISPONDE)"

@@ -1694,77 +1732,23 @@
 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
+msgid "The certificate for %s could not be validated."
+msgstr "Il certificato per %s non può essere validato."
+
 #. 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
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"Il certificato presentato da \"%s\" è auto-firmato. Non può essere "
-"verificato automaticamente."
-
-#. 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."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-"Il certificato root dal quale questo certificato dichiara di provenire è "
-"sconosciuto a Pidgin."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"La catena di certificati presentata da %s non possiede una firma digitale "
-"valida da parte dell'Authority per i Certificati a cui è collegata."
-
-msgid "Invalid certificate authority signature"
-msgstr "Firma dell'autorità per i certificati non valida"
+msgid "Unable to validate certificate"
+msgstr "Impossibile validare il certificato"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"Il certificato afferma invece di provenire da \"%s\". Questo può significare "
+"che non ti stai connettendo al servizio al quale credi."

 #. Make messages
 #, c-format
@@ -1802,7 +1786,6 @@
 msgstr "+++ %s si è disconnesso"

 #. Unknown error
-#, c-format
 msgid "Unknown error"
 msgstr "Errore sconosciuto"

@@ -2005,18 +1988,18 @@
 msgstr "Trasferimento file completato"

 #, c-format
-msgid "You canceled the transfer of %s"
+msgid "You cancelled the transfer of %s"
 msgstr "Hai annullato il trasferimento di %s"

 msgid "File transfer cancelled"
 msgstr "Trasferimento file annullato"

 #, c-format
-msgid "%s canceled the transfer of %s"
+msgid "%s cancelled the transfer of %s"
 msgstr "%s ha annullato il trasferimento di %s"

 #, c-format
-msgid "%s canceled the file transfer"
+msgid "%s cancelled the file transfer"
 msgstr "%s ha annullato il trasferimento file"

 #, c-format
@@ -2214,6 +2197,35 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RISPOSTA AUTOMATICA>: %s\n"

+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Nessun codec trovato. Installa i codec GStreamer reperibili nei pacchetti "
+"dei plugin di GStreamer."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Non è rimasto nessun codec disponibile. Le tue preferenze per i codec in fs-"
+"codecs.conf sono troppo restrittive."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Si è verificato un errore irreversibile di Farsight2."
+
+msgid "Conference error."
+msgstr "Errore nella conferenza"
+
+msgid "Error with your microphone."
+msgstr "Problema con il tuo microfono."
+
+msgid "Error with your webcam."
+msgstr "Problema con la tua webcam."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Errore nella creazione della sessione: %s"
+
 msgid "Error creating conference."
 msgstr "Errore nella creazione della conferenza."

@@ -2478,14 +2490,15 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "Verifica il supporto plugin IPC come server. Registra i comandi IPC."

-msgid "Join/Part Hiding Configuration"
-msgstr "Impostazioni per nascondere i messaggi di Join/Part"
-
-msgid "Minimum Room Size"
-msgstr "Dimensione minima della stanza"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "Tempo massimo di inattività per l'utente (in minuti)"
+msgid "Hide Joins/Parts"
+msgstr "Nascondi i messaggi di Ingresso/Uscita"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "Per le stanze con un numero di persone superiore al seguente"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "Se l'utente non ha parlato per il seguente numero di minuti"

 msgid "Apply hiding rules to buddies"
 msgstr "Applica le regole per nascondere i contatti"
@@ -3939,15 +3952,23 @@
 msgid "Logo"
 msgstr "Logo"

+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+"%s non sarà più in grado di vedere i tuoi cambiamenti di stato. Vuoi "
+"continuare?"
+
+msgid "Cancel Presence Notification"
+msgstr "Elimina la notifica di presenza"
+
 msgid "Un-hide From"
 msgstr "Annulla nascondi \"Da\""

 msgid "Temporarily Hide From"
 msgstr "Nascondi temporaneamente \"Da\""

-msgid "Cancel Presence Notification"
-msgstr "Elimina la notifica di presenza"
-
 msgid "(Re-)Request authorization"
 msgstr "Richiedi nuovamente l'autorizzazione"

@@ -4558,7 +4579,7 @@

 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
+"users with a role or set users' role with the room."
 msgstr ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...:  "
 "Ottieni il nome degli utenti con un certo ruolo oppure imposta il ruolo "
@@ -4708,9 +4729,6 @@
 msgid "Transfer was closed."
 msgstr "Il trasferimento è stato chiuso."

-msgid "Failed to open the file"
-msgstr "Impossibile aprire il file"
-
 msgid "Failed to open in-band bytestream"
 msgstr "Impossibile aprire il flusso di byte in-band"

@@ -4986,8 +5004,7 @@
 msgid "Not expected"
 msgstr "Non atteso"

-#, c-format
-msgid "Friendly name changes too rapidly"
+msgid "Friendly name is changing too rapidly"
 msgstr "L'alias cambia troppo rapidamente"

 #, c-format
@@ -5558,9 +5575,9 @@
 "supportata."

 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è "
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s ti ha invitato a vedere il suo video, ma questa caratteristica non è "
 "ancora supportata."

 msgid "Away From Computer"
@@ -5617,6 +5634,10 @@
 msgid "The username specified is invalid."
 msgstr "Il nome utente specificato non è valido."

+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "L'alias cambia troppo rapidamente"
+
 msgid "This Hotmail account may not be active."
 msgstr "Questo account Hotmail potrebbe essere non attivo."

@@ -5692,10 +5713,10 @@
 msgstr "Ricerca utente"

 msgid "Reading challenge"
-msgstr ""
+msgstr "Lettura del challenge in corso"

 msgid "Unexpected challenge length from server"
-msgstr ""
+msgstr "Lunghezza del challenge fornito dal server non valida "

 msgid "Logging in"
 msgstr "Login in corso"
@@ -6298,8 +6319,10 @@
 msgid "Server port"
 msgstr "Porta del server"

-msgid "Received unexpected response from "
-msgstr "È stata ricevuta una risposta inattesa da parte di"
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "È stata ricevuta una risposta inattesa da parte di %s"

 #. username connecting too frequently
 msgid ""
@@ -6309,9 +6332,11 @@
 "Ti sei connesso e disconnesso con troppa frequenza. Aspetta dieci minuti e "
 "riprova. Se continui a provare, avrai bisogno di aspettare ancora di più."

-#, c-format
-msgid "Error requesting "
-msgstr "Errore nella richiesta"
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "Errore nella richiesta di %s: %s"

 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL non autorizza il tuo nome utente ad autenticarsi qui"
@@ -6374,7 +6399,7 @@
 msgstr "Impossibile stabilire una connessione con l'utente remoto."

 msgid "Direct IM established"
-msgstr "IM diretto avviato"
+msgstr "Sessione di messaggi immediati diretti avviata"

 #, c-format
 msgid ""
@@ -6382,7 +6407,7 @@
 "IM.  Try using file transfer instead.\n"
 msgstr ""
 "%s ha cercato di inviarti un file di %s, ma sono consentiti soltanto file di "
-"dimensione fino a %s in un messaggio diretto. Prova ad usare il "
+"dimensione fino a %s in un messaggio immediato diretto. Prova ad usare il "
 "trasferimento file, invece.\n"

 #, c-format
@@ -7092,7 +7117,8 @@

 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Hai scelto di aprire una connessione IM diretta con %s."
+msgstr ""
+"Hai scelto di aprire una connessione per messaggi immediati diretti con %s."

 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
@@ -7104,6 +7130,9 @@
 msgid "C_onnect"
 msgstr "C_onnetti"

+msgid "You closed the connection."
+msgstr "Hai chiuso la connessione."
+
 msgid "Get AIM Info"
 msgstr "Ottieni info AIM"

@@ -7114,6 +7143,9 @@
 msgid "Get Status Msg"
 msgstr "Ottieni messaggio di stato"

+msgid "End Direct IM Session"
+msgstr "Termina la sessione di messaggi immediati diretti"
+
 msgid "Direct IM"
 msgstr "Messaggio immediato diretto"

@@ -7208,7 +7240,7 @@
 "but does not reveal your IP address)"
 msgstr ""
 "Utilizza sempre il server proxy ICQ per\n"
-"il trasferimento file e i messaggi diretti\n"
+"il trasferimento file e i messaggi immediati diretti\n"
 "(più lento, ma non rivela il tuo indirizzo IP)"

 msgid "Allow multiple simultaneous logins"
@@ -7217,8 +7249,8 @@
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr ""
-"È in corso la richiesta a %s di connessione verso di noi su %s:%hu per MI "
-"diretti."
+"È in corso la richiesta a %s di connessione verso di noi su %s:%hu per "
+"messaggi immediati diretti."

 #, c-format
 msgid "Attempting to connect to %s:%hu."
@@ -7947,7 +7979,7 @@
 msgstr "File inviato"

 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d ha annullato il trasferimento di %s"

 #, c-format
@@ -9485,6 +9517,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignora gli inviti a conferenze e a stanze di discussione"

+msgid "Use account proxy for SSL connections"
+msgstr "Usa un account proxy per le connessioni SSL"
+
 msgid "Chat room list URL"
 msgstr "URL della lista delle stanze di discussione"

@@ -9510,6 +9545,12 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Plugin per il protocollo Yahoo! Giappone"

+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s ti ha inviato un invito alla videoconferenza. Questa caratteristica non è "
+"ancora supportata."
+
 msgid "Your SMS was not delivered"
 msgstr "Il tuo SMS non è stato consegnato"

@@ -9585,10 +9626,27 @@
 msgid "Ignore buddy?"
 msgstr "Ignora il contatto?"

-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr ""
-"Il tuo account è bloccato. Per piacere, effettua il login sul sito web di "
-"Yahoo!."
+msgid "Invalid username or password"
+msgstr "Password o nome utente non validi"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"Il tuo account è stato bloccato a causa di troppi tentativi di accesso "
+"falliti. Prova ad effettuare l'accesso dal sito web di Yahoo!."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "Errore sconosciuto 52. Prova a connetterti nuovamente."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"Errore 1013: Il nome utente inserito non è valido. La causa più comune di "
+"questo errore è l'utilizzo del proprio indirizzo email al posto dell'ID "
+"Yahoo!"

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10353,6 +10411,124 @@
 "account, attraverso <b>Account->Gestisci account</b> nella finestra della "
 "Lista contatti."

+#. Buddy List
+msgid "Background Color"
+msgstr "Colore dello sfondo"
+
+msgid "The background color for the buddy list"
+msgstr "Il colore di sfondo per la lista contatti"
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "Il layout di icone, nome e stato della lista contatti"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "Colore di sfondo per i gruppi massimizzati"
+
+msgid "The background color of an expanded group"
+msgstr "Il colore di sfondo per un gruppo massimizzato"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "Testo per i gruppi massimizzati"
+
+msgid "The text information for when a group is expanded"
+msgstr "L'informazione testuale per un gruppo massimizzato"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "Colore di sfondo per i gruppi minimizzati"
+
+msgid "The background color of a collapsed group"
+msgstr "Il colore di sfondo per un gruppo minimizzato"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "Testo per i gruppi minimizzati"
+
+msgid "The text information for when a group is collapsed"
+msgstr "L'informazione testuale per un gruppo minimizzato"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "Colore di sfondo per contatti/chat"
+
+msgid "The background color of a contact or chat"
+msgstr "Il colore di sfondo per un contatto o una chat"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Testo per i contatti"
+
+msgid "The text information for when a contact is expanded"
+msgstr "L'informazione testuale quando un contatto è massimizzato"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "Testo per i contatti in linea"
+
+msgid "The text information for when a buddy is online"
+msgstr "L'informazione testuale quando un contatto è in linea"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "Testo per i contatti assenti"
+
+msgid "The text information for when a buddy is away"
+msgstr "L'informazione testuale quando un contatto è assente"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "Testo per i contatti non in linea"
+
+msgid "The text information for when a buddy is offline"
+msgstr "L'informazione testuale quando un contatto non è in linea"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "Testo per i contatti inattivi"
+
+msgid "The text information for when a buddy is idle"
+msgstr "L'informazione testuale quando un contatto è inattivo"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "Testo per i messaggi non letti"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "L'informazione testuale quando un contatto ha un messaggio non letto"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "Testo per i messaggi con nick"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"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 "L'informazione testuale sullo stato di un contatto"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -10788,7 +10964,7 @@
 msgid "_Group:"
 msgstr "_Gruppo:"

-msgid "Auto_join when account becomes online."
+msgid "Auto_join when account connects."
 msgstr "Entra _automaticamente quando l'account si connette."

 msgid "_Remain in chat after window is closed."
@@ -10821,100 +10997,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contatti/Ordina contatti"

-#. Buddy List
-msgid "Background Color"
-msgstr "Colore dello sfondo"
-
-msgid "The background color for the buddy list"
-msgstr "Il colore di sfondo per la lista contatti"
-
-msgid "Layout"
-msgstr "Layout"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "Il layout di icone, nome e stato della lista contatti"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "Colore di sfondo per i gruppi massimizzati"
-
-msgid "The background color of an expanded group"
-msgstr "Il colore di sfondo per un gruppo massimizzato"
-
-msgid "Expanded Text"
-msgstr "Testo per i gruppi massimizzati"
-
-msgid "The text information for when a group is expanded"
-msgstr "L'informazione testuale per un gruppo massimizzato"
-
-msgid "Collapsed Background Color"
-msgstr "Colore di sfondo per i gruppi minimizzati"
-
-msgid "The background color of a collapsed group"
-msgstr "Il colore di sfondo per un gruppo minimizzato"
-
-msgid "Collapsed Text"
-msgstr "Testo per i gruppi minimizzati"
-
-msgid "The text information for when a group is collapsed"
-msgstr "L'informazione testuale per un gruppo minimizzato"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "Colore di sfondo per contatti/chat"
-
-msgid "The background color of a contact or chat"
-msgstr "Il colore di sfondo per un contatto o una chat"
-
-msgid "Contact Text"
-msgstr "Testo per i contatti"
-
-msgid "The text information for when a contact is expanded"
-msgstr "L'informazione testuale quando un contatto è massimizzato"
-
-msgid "On-line Text"
-msgstr "Testo per i contatti in linea"
-
-msgid "The text information for when a buddy is online"
-msgstr "L'informazione testuale quando un contatto è in linea"
-
-msgid "Away Text"
-msgstr "Testo per i contatti assenti"
-
-msgid "The text information for when a buddy is away"
-msgstr "L'informazione testuale quando un contatto è assente"
-
-msgid "Off-line Text"
-msgstr "Testo per i contatti non in linea"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "L'informazione testuale quando un contatto non è in linea"
-
-msgid "Idle Text"
-msgstr "Testo per i contatti inattivi"
-
-msgid "The text information for when a buddy is idle"
-msgstr "L'informazione testuale quando un contatto è inattivo"
-
-msgid "Message Text"
-msgstr "Testo per i messaggi non letti"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "L'informazione testuale quando un contatto ha un messaggio non letto"
-
-msgid "Message (Nick Said) Text"
-msgstr "Testo per i messaggi con nick"
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-"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 "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."

@@ -11000,6 +11082,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Contatti/Nuovo _messaggio immediato..."

+msgid "/Conversation/Join a _Chat..."
+msgstr "/Conversazione/Entra in una _Chat..."
+
 msgid "/Conversation/_Find..."
 msgstr "/Conversazione/_Trova..."

@@ -11381,8 +11466,8 @@
 msgid "Estonian"
 msgstr "Estone"

-msgid "Euskera(Basque)"
-msgstr "Euskera (Basco)"
+msgid "Basque"
+msgstr "Basco"

 msgid "Persian"
 msgstr "Persiano"
@@ -11585,11 +11670,20 @@

 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Help via email:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Aiuto da altri utenti di Pidgin:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>Questa è una mailing list "
+"<b>pubblica</b>! (<a href=\"http://pidgin.im/pipermail/support/\">archivio</"
+"a>)<br/>Non possiamo fornire aiuto su protocolli o plugin forniti da terzi!"
+"<br/>La lingua primaria di questa lista è l'<b>inglese</b>. Sei libero di "
+"scrivere in un'altra lingua, ma le risposte potrebbero essere meno esaustive."
+"<br/><br/>"

 #, c-format
 msgid ""
@@ -12148,68 +12242,48 @@

 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Uso: %s [OPZIONI]...\n"
-"\n"
-"  -c, --config=DIR    usa DIR per i file di configurazione\n"
-"  -d, --debug         stampa messaggi di debug sullo standard output\n"
-"  -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"
-"  -l, --login[=NOME]  effettua il login automatico (l'argomento opzionale "
-"NOME\n"
-"                      specifica gli account da usare, separati da virgole)\n"
-"  --display=DISPLAY   display X da utilizzare\n"
-"  -v, --version       mostra la versione attuale ed esce\n"
-
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Uso: %s [OPZIONI]...\n"
-"\n"
-"  -c, --config=DIR    usa DIR per i file di configurazione\n"
-"  -d, --debug         stampa messaggi di debug sullo standard output\n"
-"  -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"
-"  -l, --login[=NOME]  effettua il login automatico (l'argomento opzionale "
-"NOME\n"
-"                      specifica gli account da usare, separati da virgole)\n"
-"  --display=DISPLAY   display X da utilizzare\n"
-"  -v, --version       mostra la versione attuale ed esce\n"
+msgstr ""
+"Uso: %s [OPZIONE]...\n"
+"\n"
+
+msgid "use DIR for config files"
+msgstr "usa DIR per i file di configurazione"
+
+msgid "print debugging messages to stdout"
+msgstr "stampa messaggi di debug sullo standard output"
+
+msgid "force online, regardless of network status"
+msgstr "forza la connessione, qualunque sia lo stato della rete"
+
+msgid "display this help and exit"
+msgstr "mostra questo aiuto ed esce"
+
+msgid "allow multiple instances"
+msgstr "consente istanze multiple"
+
+msgid "don't automatically login"
+msgstr "non effettua il login automatico"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"abilita gli account specificati (l'argomento opzionale\n"
+"                      NAME specifica gli account da usare, separati da "
+"virgole."
+
+msgid "Without this only the first account will be enabled)."
+msgstr ""
+"Senza questo argomento, sarà abilitato solo il primo\n"
+"                      account)"
+
+msgid "X display to use"
+msgstr "Display X da usare"
+
+msgid "display the current version and exit"
+msgstr "mostra la versione attuale ed esce"

 #, c-format
 msgid ""
@@ -12253,9 +12327,6 @@
 msgid "/Media/_Hangup"
 msgstr "/Media/_Riaggancia"

-msgid "Calling..."
-msgstr "Chiamata in corso..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s vuole avviare una sessione audio/video con te."
@@ -12264,6 +12335,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s vuole avviare una sessione video con te."

+msgid "Incoming Call"
+msgstr "Chiamata in entrata"
+
+msgid "_Pause"
+msgstr "_Pausa"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13207,9 +13284,6 @@
 msgid "_Open Mail"
 msgstr "_Leggi la Posta"

-msgid "_Pause"
-msgstr "_Pausa"
-
 msgid "_Edit"
 msgstr "_Modifica"

@@ -13273,66 +13347,6 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Mostra informazioni statistiche sulla disponibilità dei tuoi contatti"

-msgid "Server name request"
-msgstr "Richiesta nome server"
-
-msgid "Enter an XMPP Server"
-msgstr "Specifica un server XMPP"
-
-msgid "Select an XMPP server to query"
-msgstr "Scegli un server XMPP da interrogare"
-
-msgid "Find Services"
-msgstr "Cerca servizi"
-
-msgid "Add to Buddy List"
-msgstr "Aggiungi alla lista contatti"
-
-msgid "Gateway"
-msgstr "Gateway"
-
-msgid "Directory"
-msgstr "Directory"
-
-msgid "PubSub Collection"
-msgstr ""
-
-msgid "PubSub Leaf"
-msgstr ""
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Descrizione:</b>"
-
-#. Create the window.
-msgid "Service Discovery"
-msgstr "Scoperta servizi"
-
-msgid "_Browse"
-msgstr "_Sfoglia"
-
-msgid "Server does not exist"
-msgstr "Il server non esiste"
-
-msgid "Server does not support service discovery"
-msgstr "Il server non supporta la scoperta dei servizi"
-
-msgid "XMPP Service Discovery"
-msgstr "Scoperta servizi XMPP"
-
-msgid "Allows browsing and registering services."
-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 registrarsi a versioni precedenti del protocollo o "
-"ad altri servizi XMPP."
-
 msgid "Buddy is idle"
 msgstr "Il contatto è inattivo"

@@ -13425,6 +13439,68 @@
 msgid "Apply in IMs"
 msgstr "Applica ai MI"

+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "Richiesta nome server"
+
+msgid "Enter an XMPP Server"
+msgstr "Specifica un server XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Scegli un server XMPP da interrogare"
+
+msgid "Find Services"
+msgstr "Cerca servizi"
+
+msgid "Add to Buddy List"
+msgstr "Aggiungi alla lista contatti"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Directory"
+msgstr "Directory"
+
+msgid "PubSub Collection"
+msgstr ""
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descrizione:</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Scoperta servizi"
+
+msgid "_Browse"
+msgstr "_Sfoglia"
+
+msgid "Server does not exist"
+msgstr "Il server non esiste"
+
+msgid "Server does not support service discovery"
+msgstr "Il server non supporta la scoperta dei servizi"
+
+msgid "XMPP Service Discovery"
+msgstr "Scoperta servizi XMPP"
+
+msgid "Allows browsing and registering services."
+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 registrarsi a versioni precedenti del protocollo o "
+"ad altri servizi XMPP."
+
 msgid "By conversation count"
 msgstr "Per numero di conversazioni"

@@ -14223,6 +14299,52 @@
 "Questo plugin consente di personalizzare i formati dei timestamp per i "
 "messaggi nelle conversazioni e nei log."

+msgid "Audio"
+msgstr "Audio"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Output"
+msgstr "Uscita"
+
+msgid "_Plugin"
+msgstr "_Plugin"
+
+msgid "_Device"
+msgstr "_Dispositivo"
+
+msgid "Input"
+msgstr "Ingresso"
+
+msgid "P_lugin"
+msgstr "P_lugin"
+
+msgid "D_evice"
+msgstr "D_ispositivo"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Impostazioni Voce/Video"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Configura il tuo microfono e la tua webcam."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+"Configura le impostazioni di microfono e webcam per le chiamate voce/video."
+
 msgid "Opacity:"
 msgstr "Opacità:"

@@ -14351,6 +14473,3 @@
 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 ": %s"
-#~ msgstr ": %s"
--- a/po/lt.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/lt.po	Tue Sep 01 19:51:07 2009 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-28 22:02+0200\n"
-"PO-Revision-Date: 2009-07-28 22:01+0200\n"
+"POT-Creation-Date: 2009-08-30 15:08+0200\n"
+"PO-Revision-Date: 2009-08-30 15:07+0200\n"
 "Last-Translator: Laurynas Biveinis <laurynas.biveinis@gmail.com>\n"
 "Language-Team:\n"
 "MIME-Version: 1.0\n"
@@ -105,7 +105,7 @@
 #. Cancel button
 #. Cancel
 msgid "Cancel"
-msgstr "A_tšaukti"
+msgstr "Atšaukti"

 #. Save button
 #. Save
@@ -892,8 +892,8 @@
 msgid "System Log"
 msgstr "Sistemos žurnalas"

-msgid "Calling ... "
-msgstr "Skambinama ..."
+msgid "Calling..."
+msgstr "Skambinama..."

 msgid "Hangup"
 msgstr "Padėti ragelį"
@@ -1542,6 +1542,30 @@
 "Kai pradedamas naujas pokalbis, šis papildinys įterps paskutinio pokalbio "
 "tekstą su tuo pačiu pašnekovu į pokalbių langą."

+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Gaunamas „TinyURL“..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr ""
+"Kurti „TinyURL“ tik URL adresams, esantiems bent tokio ilgio arba ilgesniems"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "„TinyURL“ (ar kitos tarnybos) adreso prefiksas"
+
+msgid "TinyURL"
+msgstr "„TinyURL“"
+
+msgid "TinyURL plugin"
+msgstr "„TinyURL“ papildinys"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr "„TinyURL“ paslauga lengvesniam URL adresų kopijavimui iš gautų žinučių"
+
 msgid "Online"
 msgstr "Prisijungęs"

@@ -1589,30 +1613,6 @@
 msgid "Lastlog plugin."
 msgstr "„Lastlog“ papildinys."

-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"Gaunamas „TinyURL“..."
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
-"Kurti „TinyURL“ tik URL adresams, esantiems bent tokio ilgio arba ilgesniems."
-
-msgid "TinyURL (or other) address prefix"
-msgstr "„TinyURL“ (ar kitos tarnybos) adreso prefiksas"
-
-msgid "TinyURL"
-msgstr "„TinyURL“"
-
-msgid "TinyURL plugin"
-msgstr "„TinyURL“ papildinys"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr "„TinyURL“ paslauga lengvesniam URL adresų kopijavimui iš gautų žinučių"
-
 msgid "accounts"
 msgstr "paskyros"

@@ -1674,6 +1674,44 @@
 msgid "buddy list"
 msgstr "bičiulių sąrašas"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+"Liudijimas yra pasirašytas paties jo savininko.  Jis negali būti "
+"automatiškai patikrintas."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Šis liudijimas nurodo jį išleidusį pagrindinį liudijimą, kurio Pidgin nežino."
+
+msgid "The certificate is not valid yet."
+msgstr "Liudijimas dar neįsigaliojęs."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr ""
+"Liudijimo galiojimas pasibaigęs.  Šis liudijimas neturėtų būti laikomas "
+"galiojančiu."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "Pateiktasis liudijimas yra skirtas ne šiam srities vardui."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Neturite pagrindinių liudijimų duomenų bazės, todėl šis liudijimas negali "
+"būti patikrintas."
+
+msgid "The certificate chain presented is invalid."
+msgstr "Pateikta neteisinga liudijimų grandinė."
+
+msgid "The certificate has been revoked."
+msgstr "Liudijimas buvo atšauktas."
+
+msgid "An unknown certificate error occurred."
+msgstr "Įvyko nežinoma liudijimo klaida."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(NESUTAMPA)"

@@ -1716,70 +1754,25 @@
 msgid "_View Certificate..."
 msgstr "_Rodyti liudijimą..."

-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"Liudijimas, kurį pateikė „%s“, yra paties pasirašytas.  Jis negali būti "
-"automatiškai patikrintas."
-
-#. FIXME 2.6.1
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "Liudijimų grandinė, pateikta %s, yra neteisinga."
-
-#. 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
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "%s liudijimas negalėjo būti patikrintas."
+
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "SSL liudijimo klaida"

-msgid "Invalid certificate chain"
-msgstr "Neteisinga liudijimų grandinė"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Neturite pagrindinių liudijimų duomenų bazės, todėl šis liudijimas negali "
-"būti patikrintas."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-"Šis liudijimas nurodo jį išleidusį pagrindinį liudijimą, kurio Pidgin nežino."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"Liudijimų grandinė, kurią pateikė %s, neturi galiojančio skaitmeninio parašo "
-"iš liudijimų įstaigos, iš kurios ji teigia gavusi parašą."
-
-msgid "Invalid certificate authority signature"
-msgstr "Neteisingas liudijimų įstaigos parašas"
-
-#. 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 ""
-"Liudijimas, pateiktas „%s“, tvirtina, kad iš tikrųjų priklauso „%s“.  Galbūt "
-"jūs jungiatės ne prie tos paslaugos, prie kurios manote, kad jungiatės."
+#  Data is assumed to be the destination sn
+msgid "Unable to validate certificate"
+msgstr "Nepavyko patikrinti liudijimo"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"Liudijimas iš tikrųjų priklauso „%s“.  Galbūt jūs jungiatės ne prie tos "
+"paslaugos, prie kurios manote, kad jungiatės."

 #. Make messages
 #, c-format
@@ -2017,18 +2010,18 @@
 msgstr "Failo perdavimas baigtas"

 #, c-format
-msgid "You canceled the transfer of %s"
+msgid "You cancelled the transfer of %s"
 msgstr "Jūs nutraukėte %s perdavimą"

 msgid "File transfer cancelled"
 msgstr "Failo perdavimas nutrauktas"

 #, c-format
-msgid "%s canceled the transfer of %s"
+msgid "%s cancelled the transfer of %s"
 msgstr "%s nutraukė %s perdavimą"

 #, c-format
-msgid "%s canceled the file transfer"
+msgid "%s cancelled the file transfer"
 msgstr "%s nutraukė failo perdavimą"

 #, c-format
@@ -2224,6 +2217,34 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMATINIS-ATSAKYMAS>: %s\n"

+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Kodekų nerasta.  Įdiekite GStreamer kodekus iš GStreamer papildinių paketų."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Neliko tinkamų kodekų.  Jūsų kodekų nuostatos fs-codecs.conf faile yra per "
+"griežtos."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Įvyko nepataisoma „Farsight2“ klaida."
+
+msgid "Conference error."
+msgstr "Konferencijos klaida."
+
+msgid "Error with your microphone."
+msgstr "Problema su jūsų mikrofonu."
+
+msgid "Error with your webcam."
+msgstr "Problema su jūsų internetine kamera."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Seanso sukūrimo klaida: %s"
+
 msgid "Error creating conference."
 msgstr "Konferencijos sukūrimo klaida."

@@ -2498,14 +2519,15 @@
 msgstr ""
 "Patikrina papildinių IPC palaikymą serveriams. Priregistruoja IPC komandas."

-msgid "Join/Part Hiding Configuration"
-msgstr "Prisijungimų ir atsijungimų slėpimo parinktys"
-
-msgid "Minimum Room Size"
-msgstr "Mažiausias kambario dydis"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "Vartotojo neveiklumo laukimo laikas (minutėmis)"
+msgid "Hide Joins/Parts"
+msgstr "Slėpti pokalbių kambarių narių prisijungimus ir atsijungimus"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "Kambariams, turintiems daugiau negu tiek asmenų"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "Jei naudotojas nešnekėjo tiek minučių"

 msgid "Apply hiding rules to buddies"
 msgstr "Pritaikyti bičiuliams slėpimo taisykles"
@@ -3919,6 +3941,11 @@
 msgid "Street Address"
 msgstr "Adresas"

+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Išplėstas adresas"

@@ -4002,23 +4029,27 @@
 msgid "Logo"
 msgstr "Logotipas"

+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "%s nebegalės matyti jūsų būsenos atnaujinimų.  AR norite tęsti?"
+
+msgid "Cancel Presence Notification"
+msgstr "Nutraukti informavimą apie buvimą"
+
 msgid "Un-hide From"
 msgstr "Nustoti slėpti nuo"

 msgid "Temporarily Hide From"
 msgstr "Laikinai paslėpti nuo"

-#. && NOT ME
-msgid "Cancel Presence Notification"
-msgstr "Nutraukti informavimą apie buvimą"
-
 msgid "(Re-)Request authorization"
 msgstr "Pareikalauti (iš naujo) prieigos teisės"

 #  if(NOT ME)
 #  shouldn't this just happen automatically when the buddy is
 #  removed?
-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4622,7 +4653,7 @@

 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
+"users with a role or set users' role with the room."
 msgstr ""
 "role &lt;moderator|participant|visitor|none&gt; [vardas1] [vardas2] ...: "
 "Gauti naudotojus su nurodytu vaidmeniu arba nustatyti vartotojų vaidmenį "
@@ -4775,9 +4806,6 @@
 msgid "Transfer was closed."
 msgstr "Perdavimas buvo uždarytas."

-msgid "Failed to open the file"
-msgstr "Nepavyko atverti failo"
-
 msgid "Failed to open in-band bytestream"
 msgstr "Nepavyko atidaryti baitų srauto pagrindiniame XMPP sraute („in-band“)"

@@ -5055,8 +5083,7 @@
 msgid "Not expected"
 msgstr "Netikėta"

-#, c-format
-msgid "Friendly name changes too rapidly"
+msgid "Friendly name is changing too rapidly"
 msgstr "Patogusis vardas keičiasi per dažnai"

 #, c-format
@@ -5630,10 +5657,10 @@
 "nepalaiko."

 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s atsiuntė kvietimą internetinės vaizdo kameros pokalbiui, ko Pidgin dar "
-"nepalaiko."
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s atsiuntė kvietimą internetinės vaizdo kameros pokalbiui, kas dar nėra "
+"palaikoma."

 msgid "Away From Computer"
 msgstr "Pasitraukęs nuo kompiuterio"
@@ -5682,6 +5709,10 @@
 msgid "The username specified is invalid."
 msgstr "Nurodytas neteisingas vardas."

+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "Patogusis vardas keičiasi per dažnai"
+
 msgid "This Hotmail account may not be active."
 msgstr "Ši Hotmail paskyra gali būti neaktyvi."

@@ -6360,8 +6391,10 @@
 msgid "Server port"
 msgstr "Serverio prievadas"

-msgid "Received unexpected response from "
-msgstr "Gautas nelauktas atsakymas iš "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "Gautas nelauktas atsakymas iš %s"

 #. username connecting too frequently
 msgid ""
@@ -6372,9 +6405,11 @@
 "ir bandykite vėl. Jei vis tiek bandysite jungtis, Jums reikės laukti dar "
 "ilgiau."

-#, c-format
-msgid "Error requesting "
-msgstr "Užklausos klaida: "
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "Užklausos %s metu gauta klaida: %s"

 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL neleidžia jūsų vardui prisijungti"
@@ -7207,6 +7242,9 @@
 msgid "C_onnect"
 msgstr "_Jungtis"

+msgid "You closed the connection."
+msgstr "Tu uždarei jungtį."
+
 msgid "Get AIM Info"
 msgstr "Gauti AIM informaciją"

@@ -7217,6 +7255,9 @@
 msgid "Get Status Msg"
 msgstr "Gauti būsenos pranešimą"

+msgid "End Direct IM Session"
+msgstr "Pabaigti tiesioginio ryšio seansą"
+
 msgid "Direct IM"
 msgstr "Tiesioginis ryšys"

@@ -8067,7 +8108,7 @@
 msgstr "Failo siuntimas"

 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d nutraukė %s perdavimą"

 #, c-format
@@ -9633,6 +9674,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoruoti kvietimus į konferencijas ir pokalbių kambarius"

+msgid "Use account proxy for SSL connections"
+msgstr "Naudoti paskyros tarpininko serverį SSL jungtims"
+
 msgid "Chat room list URL"
 msgstr "Pokalbių kambarių sąrašo URL"

@@ -9658,6 +9702,12 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Yahoo! Japonija protokolo papildinys"

+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s atsiuntė kvietimą internetinės vaizdo kameros pokalbiui, ko Pidgin dar "
+"nepalaiko."
+
 msgid "Your SMS was not delivered"
 msgstr "Jūsų SMS nebuvo pristatyta"

@@ -9732,8 +9782,27 @@
 msgid "Ignore buddy?"
 msgstr "Ar ignoruoti bičiulį?"

-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Jūsų abonentas užblokuotas, prisijunkite prie Yahoo! svetainės."
+msgid "Invalid username or password"
+msgstr "Neteisingas naudotojo vardas arba slaptažodis"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"Paskyra užblokuota, nes buvo per daug nepavykusių bandymų prisijungti.  "
+"Pabandytki prisijungti prie Yahoo! svetainės prieš bandydami iš naujo "
+"prisijungti."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "Nežinoma klaida 52.  Prisijungimas iš naujo turėtų ją pataisyti."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"Klaida 1013: jūsų įvestas naudotojo vardas yra neteisingas.  Dažniausia šios "
+"klaidos priežastis yra įvestas el. pašto adresas vietoj Yahoo! ID."

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10510,6 +10579,122 @@
 "Vėliau galite sugrįžti į šį langą sukurti, keisti, ar pašalinti paskyrų per "
 "<b>Paskyros->Tvarkyti paskyras</b> meniu bičiulių sąrašo lange."

+#. Buddy List
+msgid "Background Color"
+msgstr "Fono spalva"
+
+msgid "The background color for the buddy list"
+msgstr "Bičiulių sąrašo fono spalvo"
+
+msgid "Layout"
+msgstr "Išdėstymas"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "Piktogramų, vardų ir būsenos pranešimų išdėstymas bičiulių sąraše"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "Išskleisto fono spalva"
+
+msgid "The background color of an expanded group"
+msgstr "Išskleistos grupės fono spalva"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "Išskleistas tekstas"
+
+msgid "The text information for when a group is expanded"
+msgstr "Tekstas, kai grupė išskleidžiama"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "Suskleisto fono spalva"
+
+msgid "The background color of a collapsed group"
+msgstr "Suskleistos grupės fono spalva"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "Suskleistas tekstas"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Tekstas, kai grupė suskleidžiama"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "Kontakto/pokalbio fono spalva"
+
+msgid "The background color of a contact or chat"
+msgstr "Fono spalva kontaktui arba pokalbiui"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Kontakto tekstas"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Tekstas, kai kontaktas išskleidžiamas"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "Prisijungusio bičiulio tekstas"
+
+msgid "The text information for when a buddy is online"
+msgstr "Tekstas, kai bičiulis yra prisijungęs"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "Pasitraukusio bičiulio tekstas"
+
+msgid "The text information for when a buddy is away"
+msgstr "Tekstas, kai bičiulis yra pasišalinęs"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "Atsijungusio bičiulio tekstas"
+
+msgid "The text information for when a buddy is offline"
+msgstr "Tekstas, kai bičiulis yra atsijungęs"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "Neveiklaus bičiulio tekstas"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Tekstas, kai bičiulis yra neveiklus"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "Žinutės tekstas"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Tekstas, kai bičiulis yra gavęs neperskaitytą žinutę"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "Žinutės (pasakytas vardas) tekstas"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr "Tekstas, kai pokalbis turi neperskaitytą žinutę, kuri mini jūsų vardą"
+
+msgid "The text information for a buddy's status"
+msgstr "Teksto informacija bičiulio būklei"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -10969,7 +11154,7 @@
 msgid "_Group:"
 msgstr "_Grupė:"

-msgid "Auto_join when account becomes online."
+msgid "Auto_join when account connects."
 msgstr "Automatiškai prisi_jungti, kai paskyra aktyvuojama."

 msgid "_Remain in chat after window is closed."
@@ -11005,98 +11190,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Bičiuliai/Surikiuoti bičiulius"

-#. Buddy List
-msgid "Background Color"
-msgstr "Fono spalva"
-
-msgid "The background color for the buddy list"
-msgstr "Bičiulių sąrašo fono spalvo"
-
-msgid "Layout"
-msgstr "Išdėstymas"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "Piktogramų, vardų ir būklės pranešimų išdėstymas bičiulių sąraše"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "Išskleisto fono spalva"
-
-msgid "The background color of an expanded group"
-msgstr "Išskleistos grupės fono spalva"
-
-msgid "Expanded Text"
-msgstr "Išskleistas tekstas"
-
-msgid "The text information for when a group is expanded"
-msgstr "Tekstas, kai grupė išskleidžiama"
-
-msgid "Collapsed Background Color"
-msgstr "Suskleisto fono spalva"
-
-msgid "The background color of a collapsed group"
-msgstr "Suskleistos grupės fono spalva"
-
-msgid "Collapsed Text"
-msgstr "Suskleistas tekstas"
-
-msgid "The text information for when a group is collapsed"
-msgstr "Tekstas, kai grupė suskleidžiama"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "Kontakto/pokalbio fono spalva"
-
-msgid "The background color of a contact or chat"
-msgstr "Fono spalva kontaktui arba pokalbiui"
-
-msgid "Contact Text"
-msgstr "Kontakto tekstas"
-
-msgid "The text information for when a contact is expanded"
-msgstr "Tekstas, kai kontaktas išskleidžiamas"
-
-msgid "On-line Text"
-msgstr "Prisijungusio bičiulio tekstas"
-
-msgid "The text information for when a buddy is online"
-msgstr "Tekstas, kai bičiulis yra prisijungęs"
-
-msgid "Away Text"
-msgstr "Pasitraukusio bičiulio tekstas"
-
-msgid "The text information for when a buddy is away"
-msgstr "Tekstas, kai bičiulis yra pasišalinęs"
-
-msgid "Off-line Text"
-msgstr "Atsijungusio bičiulio tekstas"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "Tekstas, kai bičiulis yra atsijungęs"
-
-msgid "Idle Text"
-msgstr "Neveiklaus bičiulio tekstas"
-
-msgid "The text information for when a buddy is idle"
-msgstr "Tekstas, kai bičiulis yra neveiklus"
-
-msgid "Message Text"
-msgstr "Žinutės tekstas"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "Tekstas, kai bičiulis yra gavęs neperskaitytą žinutę"
-
-msgid "Message (Nick Said) Text"
-msgstr "Žinutės (pasakytas vardas) tekstas"
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr "Tekstas, kai pokalbis turi neperskaitytą žinutė, kuri mini jūsų vardą"
-
-msgid "The text information for a buddy's status"
-msgstr "Teksto informacija bičiulio būklei"
-
 msgid "Type the host name for this certificate."
 msgstr "Įveskite mazgo, kuriam skirtas šis liudijimas, vardą"

@@ -11182,6 +11275,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pokalbis/_Nauja žinutė..."

+msgid "/Conversation/Join a _Chat..."
+msgstr "/Pokalbis/_Prisijungti prie pokalbio..."
+
 msgid "/Conversation/_Find..."
 msgstr "/Pokalbis/_Ieškoti..."

@@ -11571,7 +11667,7 @@
 msgid "Estonian"
 msgstr "Estų kalba"

-msgid "Euskera(Basque)"
+msgid "Basque"
 msgstr "Baskų kalba"

 msgid "Persian"
@@ -11775,11 +11871,19 @@

 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Pagalba el. paštu:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Pagalba iš kitų Pidgin naudotojų:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>\n"
+"Tai yra <b>vieša</b> el. pašto grupė! (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archyvas</a>)<br/>\n"
+"Pagrindinė šios grupės kalba yra <b>anglų</b>.  Jūs galite rašyti ir kitomis "
+"kalbomis, bet rizikuojate gauti mažiau naudingų atsakymų.<br/><br/>"

 #, c-format
 msgid ""
@@ -12337,69 +12441,46 @@

 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
+msgstr ""
 "Vartojimas: %s [PARINKTIS]...\n"
 "\n"
-"  -c, --config=KATALOGAS  naudoti „KATALOGAS“ konfigūracinių failų paieškai\n"
-"  -d, --debug             išvesti derinimo pranešimus į standartinę išvestį\n"
-"  -f, --force-online      priversti prisijungti, nepaisant tinklo būklės\n"
-"  -h, --help              parodyti šią pagalbą ir baigti\n"
-"  -m, --multiple          netikrinti, ar vienu metu paleista tik viena "
-"kopija\n"
-"  -n, --nologin           neprisijungti automatiškai\n"
-"  -l, --login[=VARDAS]    prisijungti automatiškai (neprivalomas argumentas\n"
-"                          „VARDAS“ nurodo paskyrą ar kableliais atskirtas \n"
-"                          paskyras)\n"
-"  --display=DISPLAY       X displėjus naudojimui\n"
-"  -v, --version           parodyti šios programos versiją ir baigti\n"
-
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Vartojimas: %s [PARINKTIS]...\n"
-"\n"
-"  -c, --config=KATALOGAS  naudoti „KATALOGAS“ konfigūracinių failų paieškai\n"
-"  -d, --debug             išvesti derinimo pranešimus į standartinę išvestį\n"
-"  -f, --force-online      priversti prisijungti nepaisant tinklo būklės\n"
-"  -h, --help              parodyti šią pagalbą ir baigti\n"
-"  -m, --multiple          netikrinti, ar vienu metu paleista tik viena "
-"kopija\n"
-"  -n, --nologin           neprisijungti automatiškai\n"
-"  -l, --login[=VARDAS]    prisijungti automatiškai (neprivalomas argumentas\n"
-"                          „VARDAS“ nurodo paskyrą ar kableliais atskirtas \n"
-"                          paskyras.)  Be šio argumento bus įjungta tik "
-"pirmoji\n"
-"                          paskyra.\n"
-"  -v, --version           parodyti šios programos versiją ir baigti\n"
+
+msgid "use DIR for config files"
+msgstr "naudoti „DIR“ kaip konfigūracinių failų katalogą"
+
+msgid "print debugging messages to stdout"
+msgstr "rašyti derinimo pranešimus į standartinę išvestį"
+
+msgid "force online, regardless of network status"
+msgstr "bandyti priverstinai prisijungti, nepaisant tinklo būklės"
+
+msgid "display this help and exit"
+msgstr "parodyti šią pagalbą ir baigti"
+
+msgid "allow multiple instances"
+msgstr "leisti vienu metu paleistas kelias programas"
+
+msgid "don't automatically login"
+msgstr "neprisijungti automatiškai"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"aktyvuoti nurodytą paskyrą ar paskyras (neprivalomas argumentas „NAME“ "
+"nurodo, kurią paskyrą ar paskiras aktyvuoti.  Kelių paskyrų vardai "
+"atskiriami kableliais."
+
+msgid "Without this only the first account will be enabled)."
+msgstr "Be šio argumento bus aktyvuota pirmoji paskyra)."
+
+msgid "X display to use"
+msgstr "kurį X vaizduoklį naudoti"
+
+msgid "display the current version and exit"
+msgstr "parodyti programos versiją ir baigti"

 #, c-format
 msgid ""
@@ -12444,9 +12525,6 @@
 msgid "/Media/_Hangup"
 msgstr "/Terpė/_Baigti skambutį"

-msgid "Calling..."
-msgstr "Skambinama..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s nori pradėti garso ir vaizdo pokalbį su jumis."
@@ -12455,6 +12533,13 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s nori pradėti vaizdo pokalbį su jumis."

+msgid "Incoming Call"
+msgstr "Įeinantis skambutis"
+
+#  Pause button
+msgid "_Pause"
+msgstr "_Sustabdyti"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13427,10 +13512,6 @@
 msgid "_Open Mail"
 msgstr "_Atverti paštą"

-#  Pause button
-msgid "_Pause"
-msgstr "_Sustabdyti"
-
 msgid "_Edit"
 msgstr "K_eisti"

@@ -13494,66 +13575,6 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Rodo statistiką apie bičiulių prieinamumą"

-msgid "Server name request"
-msgstr "Serverio vardo užklausa"
-
-msgid "Enter an XMPP Server"
-msgstr "Įveskite XMPP serverį"
-
-msgid "Select an XMPP server to query"
-msgstr "Pasirinkite XMPP serverį užklausai"
-
-msgid "Find Services"
-msgstr "Rasti servisus"
-
-msgid "Add to Buddy List"
-msgstr "Pridėti į bičiulių sąrašą"
-
-msgid "Gateway"
-msgstr "Tinklų sąsaja („Gateway“)"
-
-msgid "Directory"
-msgstr "Katalogas"
-
-msgid "PubSub Collection"
-msgstr "„PubSub Collection“"
-
-msgid "PubSub Leaf"
-msgstr "„PubSub Leaf“"
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Aprašymas:</b> "
-
-#. Create the window.
-msgid "Service Discovery"
-msgstr "Servisų suradimas"
-
-msgid "_Browse"
-msgstr "_Naršyti"
-
-msgid "Server does not exist"
-msgstr "Serveris neegzistuoja"
-
-msgid "Server does not support service discovery"
-msgstr "Serveris nepalaiko servisų suradimo"
-
-msgid "XMPP Service Discovery"
-msgstr "XMPP servisų suradimas"
-
-msgid "Allows browsing and registering services."
-msgstr "Leidžia naršymo ir registravimo paslaugas."
-
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr ""
-"Šis papildinys naudingas registravimuisi su senais transporto protokolais ar "
-"kitais XMPP servisais."
-
 msgid "Buddy is idle"
 msgstr "bičiulis yra neveiklus"

@@ -13643,6 +13664,68 @@
 msgid "Apply in IMs"
 msgstr "Taikyti asmeniniams pokalbiams"

+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "Serverio vardo užklausa"
+
+msgid "Enter an XMPP Server"
+msgstr "Įveskite XMPP serverį"
+
+msgid "Select an XMPP server to query"
+msgstr "Pasirinkite XMPP serverį užklausai"
+
+msgid "Find Services"
+msgstr "Rasti servisus"
+
+msgid "Add to Buddy List"
+msgstr "Pridėti į bičiulių sąrašą"
+
+msgid "Gateway"
+msgstr "Tinklų sąsaja („Gateway“)"
+
+msgid "Directory"
+msgstr "Katalogas"
+
+msgid "PubSub Collection"
+msgstr "„PubSub Collection“"
+
+msgid "PubSub Leaf"
+msgstr "„PubSub Leaf“"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Aprašymas:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Servisų suradimas"
+
+msgid "_Browse"
+msgstr "_Naršyti"
+
+msgid "Server does not exist"
+msgstr "Serveris neegzistuoja"
+
+msgid "Server does not support service discovery"
+msgstr "Serveris nepalaiko servisų suradimo"
+
+msgid "XMPP Service Discovery"
+msgstr "XMPP servisų suradimas"
+
+msgid "Allows browsing and registering services."
+msgstr "Leidžia naršymo ir registravimo paslaugas."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Šis papildinys naudingas registravimuisi su senais transporto protokolais ar "
+"kitais XMPP servisais."
+
 msgid "By conversation count"
 msgstr "Pagal pokalbių skaičių"

@@ -14386,9 +14469,12 @@
 msgid "Founder"
 msgstr "Steigėjas"

+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "Operatorius"

+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr "Pusiau operatorius"

@@ -14557,6 +14643,54 @@
 "Šis papildinys leidžia vartotojui pasirinkti pokalbių ir žurnalų žinučių "
 "laiko žymių formatus."

+msgid "Audio"
+msgstr "Garsas"
+
+msgid "Video"
+msgstr "Vaizdas"
+
+msgid "Output"
+msgstr "Išvestis"
+
+msgid "_Plugin"
+msgstr "_Papildinys"
+
+msgid "_Device"
+msgstr "_Įrenginys"
+
+msgid "Input"
+msgstr "Įvestis"
+
+msgid "P_lugin"
+msgstr "P_apildinys"
+
+msgid "D_evice"
+msgstr "Į_renginys"
+
+#  Use Environmental Settings
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Balso ir vaizdo nustatymai"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Konfigūruoti jūsų mikrofoną ir internetinę kamerą."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+"Nustatyti mikrofono ir internetinės kameros nuostatas vaizdo ir garso "
+"skambučiams."
+
 msgid "Opacity:"
 msgstr "Nepermatomumas:"
--- a/po/pt_BR.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/pt_BR.po	Tue Sep 01 19:51:07 2009 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-25 09:57-0400\n"
-"PO-Revision-Date: 2009-02-24 22:11-0300\n"
+"POT-Creation-Date: 2009-08-29 21:29-0700\n"
+"PO-Revision-Date: 2009-08-29 14:35-0300\n"
 "Last-Translator: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
 "Language-Team: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
 "MIME-Version: 1.0\n"
@@ -868,8 +868,8 @@
 msgid "System Log"
 msgstr "Histórico do sistema"

-msgid "Calling ... "
-msgstr "Ligando ... "
+msgid "Calling..."
+msgstr "Chamando..."

 msgid "Hangup"
 msgstr "Colocar no gancho"
@@ -1510,6 +1510,31 @@
 "Quando uma nova conversa é aberta este plug-in irá inserir a última conversa "
 "na conversa atual."

+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Obtendo TinyURL..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "Somente criar TinyURL para endereços deste tamanho ou maiores"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (ou outro) prefixo de endereço"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Plug-in do TinyURL"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr ""
+"Quando receber uma mensagem com endereço(s), usar o TinyURL para copiá-los "
+"facilmente"
+
 msgid "Online"
 msgstr "Conectado"

@@ -1553,31 +1578,6 @@
 msgid "Lastlog plugin."
 msgstr "Plug-in Lastlog"

-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"Obtendo TinyURL..."
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr "Somente criar TinyURL para endereços deste tamanho ou maiores"
-
-msgid "TinyURL (or other) address prefix"
-msgstr "TinyURL (ou outro) prefixo de endereço"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "Plug-in do TinyURL"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
-"Quando receber uma mensagem com endereço(s), usar o TinyURL para copiá-los "
-"mais fácil"
-
 msgid "accounts"
 msgstr "contas"

@@ -1639,6 +1639,42 @@
 msgid "buddy list"
 msgstr "lista de amigos"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+"O certificado enviado é auto-assinado e não pode ser verificado "
+"automaticamente."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"O certificado raiz que expediu este certificado não é conhecido pelo Pidgin."
+
+msgid "The certificate is not valid yet."
+msgstr "O certificado ainda não é válido."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr "O certificado expirou e não deve ser considerado válido."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "O certificado apresentado não foi expedido por este domínio."
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Você não tem um banco de dados de certificados raiz, logo este certificado "
+"não pode ser validado."
+
+msgid "The certificate chain presented is invalid."
+msgstr "A cadeia de certificados apresentada é inválida."
+
+msgid "The certificate has been revoked."
+msgstr "O certificado foi revogado."
+
+msgid "An unknown certificate error occurred."
+msgstr "Um erro desconhecido de certificado ocorreu."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(NÃO COINCIDE)"

@@ -1681,71 +1717,24 @@
 msgid "_View Certificate..."
 msgstr "_Ver certificado..."

-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"O certificado enviado por \"%s\" é auto-assinado. Ele não pode ser "
-"verificado automaticamente."
-
-#. FIXME 2.6.1
-#, c-format
-msgid "The certificate chain presented for %s is not valid."
-msgstr "A cadeia de certificados enviada para %s não é válida."
-
-#. 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
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr "O certificado para %s não pôde ser validado."
+
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
 msgstr "Erro no certificado SSL"

-msgid "Invalid certificate chain"
-msgstr "Cadeia de certificado inválida"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Você não tem um banco de dados de certificados raiz, logo este certificado "
-"não pode ser validado."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-"O certificado raiz que expediu este certificado não é conhecido pelo Pidgin."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"A cadeia de certificado apresentada por %s não tem uma assinatura digital "
-"válida vinda da Autoridade de Certificação do qual ele diz ter uma "
-"assinatura."
-
-msgid "Invalid certificate authority signature"
-msgstr "Assinatura de autoridade de certificação inválida"
-
-#. 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 ""
-"O certificado enviado por \"%s\" diz vir de \"%s\". Isto significa que você "
-"pode não estar conectando ao serviço que pensa estar."
+msgid "Unable to validate certificate"
+msgstr "Não foi possível validar o certificado"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
+msgstr ""
+"O certificado afirma ser de \"%s\". Isto pode significar que você não está "
+"conectando ao serviço que você acredita estar."

 #. Make messages
 #, c-format
@@ -1982,18 +1971,18 @@
 msgstr "Transferência de arquivo completa"

 #, c-format
-msgid "You canceled the transfer of %s"
+msgid "You cancelled the transfer of %s"
 msgstr "Você cancelou a transferência de %s"

 msgid "File transfer cancelled"
 msgstr "Transferência de arquivo cancelada"

 #, c-format
-msgid "%s canceled the transfer of %s"
+msgid "%s cancelled the transfer of %s"
 msgstr "%s cancelou a transferência de %s"

 #, c-format
-msgid "%s canceled the file transfer"
+msgid "%s cancelled the file transfer"
 msgstr "%s cancelou a transferência de arquivo"

 #, c-format
@@ -2191,6 +2180,35 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-RESPOSTA>: %s\n"

+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Nenhum codec encontrado. Instale alguns codecs encontrados nos pacotes de "
+"plug-ins do GStreamer."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Nenhum codec encontrado. Suas preferências de codec em fs-codecs.conf são "
+"muito rígidas."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Um erro não recuperado Farsight2 ocorreu."
+
+msgid "Conference error."
+msgstr "Erro de conferência"
+
+msgid "Error with your microphone."
+msgstr "Erro com seu microfone"
+
+msgid "Error with your webcam."
+msgstr "Erro com sua webcam."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Erro ao criar a sessão: %s"
+
 msgid "Error creating conference."
 msgstr "Erro ao criar a conferência"

@@ -2458,14 +2476,15 @@
 "Testa o suporte IPC dos plug-ins, como um servidor. Isto registra os "
 "comandos IPC."

-msgid "Join/Part Hiding Configuration"
-msgstr "Configuração da ocultação de mensagens de entrada/saída"
-
-msgid "Minimum Room Size"
-msgstr "Tamanho mínimo da sala"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "Limite de inatividade de usuário (em minutos)"
+msgid "Hide Joins/Parts"
+msgstr "Oculta Entradas/Saídas"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "Para salas com mais que este número de pessoas"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "Se o usuário não falou à este número de minutos"

 msgid "Apply hiding rules to buddies"
 msgstr "Aplicar regras de sumiço para amigos"
@@ -3834,6 +3853,11 @@
 msgid "Street Address"
 msgstr "Endereço (Rua)"

+#.
+#. * EXTADD is correct, EXTADR is generated by other
+#. * clients. The next time someone reads this, remove
+#. * EXTADR.
+#.
 msgid "Extended Address"
 msgstr "Endereço (Complemento)"

@@ -3916,20 +3940,25 @@
 msgid "Logo"
 msgstr "Logotipo"

+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+"%s não poderá mais ver sua atualização de status.  Você quer continuar ?"
+
+msgid "Cancel Presence Notification"
+msgstr "Cancelar notificação de presença"
+
 msgid "Un-hide From"
 msgstr "Não ocultar-se de"

 msgid "Temporarily Hide From"
 msgstr "Ocultar-se temporariamente de"

-#. && NOT ME
-msgid "Cancel Presence Notification"
-msgstr "Cancelar notificação de presença"
-
 msgid "(Re-)Request authorization"
 msgstr "(Re-)Pedir autorização"

-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4539,10 +4568,10 @@

 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;moderator|participant|visitor|none&gt;: recebe ou define o cargo do "
-"usuário na sala."
+"users with a role or set users' role with the room."
+msgstr ""
+"role &lt;moderator|participant|visitor|none&gt; [apelido1] [apelido2] ...: "
+"Recebe ou define o cargo de usuários na sala."

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;usuário&gt; [mensagem]:  Convida o usuário para a sala."
@@ -4687,9 +4716,6 @@
 msgid "Transfer was closed."
 msgstr "A Transferência de arquivo foi fechada."

-msgid "Failed to open the file"
-msgstr "Falha ao abrir arquivo"
-
 msgid "Failed to open in-band bytestream"
 msgstr "Falha ao abrir o fluxo de bytes in-band"

@@ -4970,8 +4996,7 @@
 msgid "Not expected"
 msgstr "Inesperado"

-#, c-format
-msgid "Friendly name changes too rapidly"
+msgid "Friendly name is changing too rapidly"
 msgstr "O apelido foi mudado rapidamente demais"

 #, c-format
@@ -5543,9 +5568,10 @@
 "suporte."

 #, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s te enviou um convite para ver webcam, que é um recurso não suportado."
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s te convidou para ver a webcam dele(a), mas ainda não há suporte para este "
+"recurso."

 msgid "Away From Computer"
 msgstr "Ausente"
@@ -5597,6 +5623,10 @@
 msgid "The username specified is invalid."
 msgstr "O nome de usuário especificado é inválido."

+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "O apelido foi mudado rapidamente demais"
+
 msgid "This Hotmail account may not be active."
 msgstr "Esta conta do Hotmail pode não estar ativa."

@@ -6276,8 +6306,10 @@
 msgid "Server port"
 msgstr "Porta do servidor"

-msgid "Received unexpected response from "
-msgstr "Recebido resposta inesperada de "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "Recebida resposta inesperada de %s"

 #. username connecting too frequently
 msgid ""
@@ -6288,9 +6320,11 @@
 "minutos e tente novamente. Se você continuar tentando, vai ter que esperar "
 "ainda mais."

-#, c-format
-msgid "Error requesting "
-msgstr "Erro solicitando "
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "Erro solicitando %s: %s"

 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "A AOL não permite que seu nome de tela autentique aqui"
@@ -7077,6 +7111,9 @@
 msgid "C_onnect"
 msgstr "C_onectar"

+msgid "You closed the connection."
+msgstr "Você encerrou a conexão."
+
 msgid "Get AIM Info"
 msgstr "Ver informações do AIM"

@@ -7087,6 +7124,9 @@
 msgid "Get Status Msg"
 msgstr "Ver mensagem de status"

+msgid "End Direct IM Session"
+msgstr "Finalizar sessão de MI direta"
+
 msgid "Direct IM"
 msgstr "Mensagem instantânea direta"

@@ -7917,7 +7957,7 @@
 msgstr "Envio de arquivo"

 #, c-format
-msgid "%d canceled the transfer of %s"
+msgid "%d cancelled the transfer of %s"
 msgstr "%d cancelou a transferência de %s"

 #, c-format
@@ -9450,6 +9490,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para bate-papos e conferências"

+msgid "Use account proxy for SSL connections"
+msgstr "Use proxy da conta para conexões SSL"
+
 msgid "Chat room list URL"
 msgstr "URL da lista de salas de bate-papo"

@@ -9475,6 +9518,11 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Plug-in do protocolo Yahoo! JAPAN"

+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+"%s te enviou um convite para ver webcam, que é um recurso não suportado."
+
 msgid "Your SMS was not delivered"
 msgstr "Seu SMS não foi entregue"

@@ -9550,8 +9598,27 @@
 msgid "Ignore buddy?"
 msgstr "Ignorar amigo?"

-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Sua conta está travada, favor entrar no site do Yahoo!."
+msgid "Invalid username or password"
+msgstr "Nome de usuário ou senha inválido(a)"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"Sua conta foi travada travada devido às muitas tentativas de login "
+"fracassadas.  Por favor, tente entrar na sua conta no site do Yahoo!."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "Erro desconhecido 52. Reconectar-se deve corrigir isso."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"Erro 1013: O nome de usuário que você digitou é inválido.  A causa mais "
+"comum deste erro é digitar seu endereço de e-mail ao invés de sua ID do "
+"Yahoo!."

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10316,6 +10383,124 @@
 "Você pode voltar a esta janela para adicionar, alterar ou remover contas a "
 "partir do menu <b>Contas->Gerenciar Contas</b> na janela da Lista de Amigos"

+#. Buddy List
+msgid "Background Color"
+msgstr "Cor do fundo"
+
+msgid "The background color for the buddy list"
+msgstr "A cor de fundo para sua lista de amigos."
+
+msgid "Layout"
+msgstr "Layout"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "O layout de ícones, nome e status da lista de amigos"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "Cor do fundo expandido"
+
+msgid "The background color of an expanded group"
+msgstr "A cor de fundo de um grupo expandido"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "Texto Expandido"
+
+msgid "The text information for when a group is expanded"
+msgstr "A informação de texto para quando um grupo estiver expandido"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "Cor de fundo colapsado"
+
+msgid "The background color of a collapsed group"
+msgstr "A cor de fundo de um grupo colapsado"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "Texto colapsado"
+
+msgid "The text information for when a group is collapsed"
+msgstr "A informação de texto para quando um grupo for colapsado"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "Cor de fundo do Contato/Bate-papo"
+
+msgid "The background color of a contact or chat"
+msgstr "A cor de fundo de um contato ou bate-papo"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Texto de contato"
+
+msgid "The text information for when a contact is expanded"
+msgstr "A informação de texto para quando um contato está expandido"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "Texto de online"
+
+msgid "The text information for when a buddy is online"
+msgstr "A informação de texto para quando um contato está conectado"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "Texto de ausante"
+
+msgid "The text information for when a buddy is away"
+msgstr "A informação de texto para quando um contato está ausente"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "Texto de off-line"
+
+msgid "The text information for when a buddy is offline"
+msgstr "A informação de texto para quando um contato está desconectado"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "Texto de inativo"
+
+msgid "The text information for when a buddy is idle"
+msgstr "A informação de texto para quando um contato está inativo"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "Texto de mensagem"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "A informação de texto para quando um contato tem uma mensagem não lida"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "Mensagem texto (Apelido diz)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"A informação de texto para quando um bate-papo tem uma mensagem não lida que "
+"menciona seu apelido"
+
+msgid "The text information for a buddy's status"
+msgstr "Informação de texto para o status de um amigo"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -10753,7 +10938,7 @@
 msgid "_Group:"
 msgstr "_Grupo:"

-msgid "Auto_join when account becomes online."
+msgid "Auto_join when account connects."
 msgstr "Entrar automaticamente ao conectar."

 msgid "_Remain in chat after window is closed."
@@ -10786,100 +10971,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Amigos/Ordenar amigos"

-#. Buddy List
-msgid "Background Color"
-msgstr "Cor do fundo"
-
-msgid "The background color for the buddy list"
-msgstr "A cor de fundo para sua lista de amigos."
-
-msgid "Layout"
-msgstr "Layout"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "O layout de ícones, nome e status da lista"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "Cor do fundo expandido"
-
-msgid "The background color of an expanded group"
-msgstr "A cor de fundo de um grupo expandido"
-
-msgid "Expanded Text"
-msgstr "Texto Expandido"
-
-msgid "The text information for when a group is expanded"
-msgstr "A informação de texto para quando um grupo estiver expandido"
-
-msgid "Collapsed Background Color"
-msgstr "Cor de fundo colapsado"
-
-msgid "The background color of a collapsed group"
-msgstr "A cor de fundo de um grupo colapsado"
-
-msgid "Collapsed Text"
-msgstr "Texto colapsado"
-
-msgid "The text information for when a group is collapsed"
-msgstr "A informação de texto para quando um grupo for colapsado"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "Cor de fundo do Contato/Bate-papo"
-
-msgid "The background color of a contact or chat"
-msgstr "A cor de fundo de um contato ou bate-papo"
-
-msgid "Contact Text"
-msgstr "Texto de contato"
-
-msgid "The text information for when a contact is expanded"
-msgstr "A informação de texto para quando um contato está expandido"
-
-msgid "On-line Text"
-msgstr "Texto de online"
-
-msgid "The text information for when a buddy is online"
-msgstr "A informação de texto para quando um contato está conectado"
-
-msgid "Away Text"
-msgstr "Texto de ausante"
-
-msgid "The text information for when a buddy is away"
-msgstr "A informação de texto para quando um contato está ausente"
-
-msgid "Off-line Text"
-msgstr "Texto de off-line"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "A informação de texto para quando um contato está desconectado"
-
-msgid "Idle Text"
-msgstr "Texto de inativo"
-
-msgid "The text information for when a buddy is idle"
-msgstr "A informação de texto para quando um contato está inativo"
-
-msgid "Message Text"
-msgstr "Texto de mensagem"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "A informação de texto para quando um contato tem uma mensagem não lida"
-
-msgid "Message (Nick Said) Text"
-msgstr "Mensagem texto (Apelido diz)"
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-"A informação de texto para quando um bate-papo tem uma mensagem não lida que "
-"mensiona seu apelido"
-
-msgid "The text information for a buddy's status"
-msgstr "Informação de texto para o status de um amigo"
-
 msgid "Type the host name for this certificate."
 msgstr "Digite o nome de host para este certificado."

@@ -10962,6 +11053,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/Nova _mensagem instantânea..."

+msgid "/Conversation/Join a _Chat..."
+msgstr "/Conversa/_Convidar para um bate-papo..."
+
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Procurar..."

@@ -11344,7 +11438,7 @@
 msgid "Estonian"
 msgstr "Estônio"

-msgid "Euskera(Basque)"
+msgid "Basque"
 msgstr "Basco"

 msgid "Persian"
@@ -11547,11 +11641,20 @@

 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Ajuda por e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Ajuda de outros usuários do Pidgin:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>Esta é uma lista de discussão "
+"<b>pública</b> (<a href=\"http://pidgin.im/pipermail/support/\">arquivo</a>)"
+"<br/>Nós não podemos ajudá-lo com protocolos ou plug-ins de terceiros!<br/> "
+"O idioma primário desta lista é o <b>Inglês</b>.  Você é bem vindo para "
+"enviar mensagens em outro idioma, mas as respostas podem ajudar menos.<br/"
+"><br/>"

 #, c-format
 msgid ""
@@ -11789,14 +11892,6 @@
 msgid "File transfer _details"
 msgstr "_Detalhes da transferência"

-#. Pause button
-msgid "_Pause"
-msgstr "_Pausar"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Continuar"
-
 msgid "Paste as Plain _Text"
 msgstr "Colar como _texto puro"

@@ -12122,65 +12217,45 @@

 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Uso: %s [OPÇÃO]...\n"
-"\n"
-"  -c, --config=DIR    use o diretório DIR para os arquivos de configuração\n"
-"  -d, --debug         imprima mensagens de depuração para a saída padrão\n"
-"  -f, --force-online  força estar online, independente do status da rede\n"
-"  -h, --help          exiba esta ajuda e saia\n"
-"  -m, --multiple      permitir uso simultâneo de mais de uma instância\n"
-"  -n, --nologin       não conecte automaticamente\n"
-"  -l, --login[=NOME]  conecte automaticamente (argumento opcional NOME\n"
-"                      especifica as contas a serem usadas, separadas por\n"
-"                      vírgula)\n"
-"  --display=DISPLAY   seleciona o display X a usar\n"
-"  -v, --version       exiba a versão atual e saia\n"
-
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Uso: %s [OPÇÃO]...\n"
-"\n"
-"  -c, --config=DIR    use o diretório DIR para os arquivos de configuração\n"
-"  -d, --debug         imprima mensagens de depuração para a saída padrão\n"
-"  -f, --force-online  força estar online, independente do status da rede\n"
-"  -h, --help          exiba esta ajuda e saia\n"
-"  -m, --multiple      permitir uso simultâneo de mais de uma instância\n"
-"  -n, --nologin       não conecte automaticamente\n"
-"  -l, --login[=NOME]  conecte automaticamente (argumento opcional NOME\n"
-"                      especifica as contas a serem usadas, separadas por\n"
-"                      vírgula)\n"
-"  -v, --version       exiba a versão atual e saia\n"
+msgstr ""
+"Uso  : %s [OPÇÃO] ...\n"
+"\n"
+
+msgid "use DIR for config files"
+msgstr "usar DIR para arquivos de configuraçãp"
+
+msgid "print debugging messages to stdout"
+msgstr "imprimir mensagens de depuração para a saída padrão"
+
+msgid "force online, regardless of network status"
+msgstr "forçar ficar conectado, independente do status da rede"
+
+msgid "display this help and exit"
+msgstr "mostrar essa ajuda e sair"
+
+msgid "allow multiple instances"
+msgstr "permitir múltiplas instâncias"
+
+msgid "don't automatically login"
+msgstr "não fazer login automaticamente"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"habilitar conta(s) especificada(s) (argumento opcional NOME\n"
+"                      contas especificadas para usar, separadas por vírgulas."
+
+msgid "Without this only the first account will be enabled)."
+msgstr "sem isso apenas a primeira conta será habilitada)."
+
+msgid "X display to use"
+msgstr "Tela do X para utilizar"
+
+msgid "display the current version and exit"
+msgstr "mostrar a versão atual e sair"

 #, c-format
 msgid ""
@@ -12226,9 +12301,6 @@
 msgid "/Media/_Hangup"
 msgstr "/Mídia/Colocar no gancho"

-msgid "Calling..."
-msgstr "Chamando..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s quer começar uma sessão de aúdio/vídeo com você."
@@ -12237,6 +12309,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s quer iniciar uma sessão de vídeo com você."

+msgid "Incoming Call"
+msgstr "Recebendo chamada"
+
+msgid "_Pause"
+msgstr "_Pausar"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13243,66 +13321,6 @@
 msgstr ""
 "Mostrar informações estatísticas sobre a disponibilidade de seus amigos"

-msgid "Server name request"
-msgstr "Endereço do servidor"
-
-msgid "Enter an XMPP Server"
-msgstr "Entrar num servidor de XMPP"
-
-msgid "Select an XMPP server to query"
-msgstr "Selecione um servidor de SMTP para consultar"
-
-msgid "Find Services"
-msgstr "Encontrar serviços"
-
-msgid "Add to Buddy List"
-msgstr "Adicionar à lista de amigos"
-
-msgid "Gateway"
-msgstr "Gateway"
-
-msgid "Directory"
-msgstr "Diretório"
-
-msgid "PubSub Collection"
-msgstr "Coleção PubSub"
-
-msgid "PubSub Leaf"
-msgstr "Folha PubSub"
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Descrição</b>"
-
-#. Create the window.
-msgid "Service Discovery"
-msgstr "Descoberta de Serviços"
-
-msgid "_Browse"
-msgstr "Navegar:"
-
-msgid "Server does not exist"
-msgstr "Servidor não existe"
-
-msgid "Server does not support service discovery"
-msgstr "O servidor não tem suporte à descoberta de serviços"
-
-msgid "XMPP Service Discovery"
-msgstr "Descoberta de serviços XMPP"
-
-msgid "Allows browsing and registering services."
-msgstr "Permite navegação e serviços de registro."
-
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr ""
-"Este plug-in é útil para registrar com transportes legados ou outros "
-"serviços XMPP."
-
 msgid "Buddy is idle"
 msgstr "O amigo estiver inativo"

@@ -13394,6 +13412,68 @@
 msgid "Apply in IMs"
 msgstr "Aplicar em mensagens instantâneas"

+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "Endereço do servidor"
+
+msgid "Enter an XMPP Server"
+msgstr "Entrar num servidor de XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Selecione um servidor de SMTP para consultar"
+
+msgid "Find Services"
+msgstr "Encontrar serviços"
+
+msgid "Add to Buddy List"
+msgstr "Adicionar à lista de amigos"
+
+msgid "Gateway"
+msgstr "Gateway"
+
+msgid "Directory"
+msgstr "Diretório"
+
+msgid "PubSub Collection"
+msgstr "Coleção PubSub"
+
+msgid "PubSub Leaf"
+msgstr "Folha PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Descrição</b>"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Descoberta de Serviços"
+
+msgid "_Browse"
+msgstr "Navegar:"
+
+msgid "Server does not exist"
+msgstr "Servidor não existe"
+
+msgid "Server does not support service discovery"
+msgstr "O servidor não tem suporte à descoberta de serviços"
+
+msgid "XMPP Service Discovery"
+msgstr "Descoberta de serviços XMPP"
+
+msgid "Allows browsing and registering services."
+msgstr "Permite navegação e serviços de registro."
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr ""
+"Este plug-in é útil para registrar com transportes legados ou outros "
+"serviços XMPP."
+
 msgid "By conversation count"
 msgstr "Por número de conversas"

@@ -14038,9 +14118,12 @@
 msgid "Founder"
 msgstr "Fundador"

+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "Operador"

+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr "Operador parcial"

@@ -14189,6 +14272,51 @@
 "Este plug-in permite ao usuário personalizar os formatos de marcação de "
 "tempo nas conversas e logs."

+msgid "Audio"
+msgstr "Aúdio"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Output"
+msgstr "Saída"
+
+msgid "_Plugin"
+msgstr "_Plug-in"
+
+msgid "_Device"
+msgstr "_Dispositivo"
+
+msgid "Input"
+msgstr "Entrada"
+
+msgid "P_lugin"
+msgstr "P_lug-in"
+
+msgid "D_evice"
+msgstr "Dispositivo"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Definições de Voz/Vídeo"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Configure seu microfone e webcam."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr "Configure definições de microfone e webcam para chamadas de voz/vídeo."
+
 msgid "Opacity:"
 msgstr "Opacidade:"

@@ -14316,6 +14444,118 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este plug-in é útil para depurar servidores ou clientes XMPP."

+#~ msgid "Calling ... "
+#~ msgstr "Ligando ... "
+
+#~ msgid "Invalid certificate chain"
+#~ msgstr "Cadeia de certificado inválida"
+
+#~ msgid ""
+#~ "The certificate chain presented by %s does not have a valid digital "
+#~ "signature from the Certificate Authority from which it claims to have a "
+#~ "signature."
+#~ msgstr ""
+#~ "A cadeia de certificado apresentada por %s não tem uma assinatura digital "
+#~ "válida vinda da Autoridade de Certificação do qual ele diz ter uma "
+#~ "assinatura."
+
+#~ msgid "Invalid certificate authority signature"
+#~ msgstr "Assinatura de autoridade de certificação inválida"
+
+#~ msgid "Join/Part Hiding Configuration"
+#~ msgstr "Configuração da ocultação de mensagens de entrada/saída"
+
+#~ msgid "Minimum Room Size"
+#~ msgstr "Tamanho mínimo da sala"
+
+#~ msgid "User Inactivity Timeout (in minutes)"
+#~ msgstr "Limite de inatividade de usuário (em minutos)"
+
+#~ msgid "Failed to open the file"
+#~ msgstr "Falha ao abrir arquivo"
+
+#~ msgid "Your account is locked, please log in to the Yahoo! website."
+#~ msgstr "Sua conta está travada, favor entrar no site do Yahoo!."
+
+#~ msgid "Euskera(Basque)"
+#~ msgstr "Basco"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">Ajuda por e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+
+#~ msgid "_Resume"
+#~ msgstr "_Continuar"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  --display=DISPLAY   X display to use\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "Uso: %s [OPÇÃO]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use o diretório DIR para os arquivos de "
+#~ "configuração\n"
+#~ "  -d, --debug         imprima mensagens de depuração para a saída padrão\n"
+#~ "  -f, --force-online  força estar online, independente do status da rede\n"
+#~ "  -h, --help          exiba esta ajuda e saia\n"
+#~ "  -m, --multiple      permitir uso simultâneo de mais de uma instância\n"
+#~ "  -n, --nologin       não conecte automaticamente\n"
+#~ "  -l, --login[=NOME]  conecte automaticamente (argumento opcional NOME\n"
+#~ "                      especifica as contas a serem usadas, separadas por\n"
+#~ "                      vírgula)\n"
+#~ "  --display=DISPLAY   seleciona o display X a usar\n"
+#~ "  -v, --version       exiba a versão atual e saia\n"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "Uso: %s [OPÇÃO]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use o diretório DIR para os arquivos de "
+#~ "configuração\n"
+#~ "  -d, --debug         imprima mensagens de depuração para a saída padrão\n"
+#~ "  -f, --force-online  força estar online, independente do status da rede\n"
+#~ "  -h, --help          exiba esta ajuda e saia\n"
+#~ "  -m, --multiple      permitir uso simultâneo de mais de uma instância\n"
+#~ "  -n, --nologin       não conecte automaticamente\n"
+#~ "  -l, --login[=NOME]  conecte automaticamente (argumento opcional NOME\n"
+#~ "                      especifica as contas a serem usadas, separadas por\n"
+#~ "                      vírgula)\n"
+#~ "  -v, --version       exiba a versão atual e saia\n"
+
 #~ msgid "Malformed BOSH Connect Server"
 #~ msgstr "Servidor de conexão BOSH inválido"

@@ -14757,9 +14997,6 @@
 #~ "minutos e tente novamente. Se você continuar tentando, vai ter que "
 #~ "esperar ainda mais."

-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Um erro desconhecido ocorreu ao conectar: %s."
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "Um erro desconhecido, %d, ocorreu. Informações: %s"
--- a/po/sl.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/sl.po	Tue Sep 01 19:51:07 2009 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-03 10:04-0700\n"
-"PO-Revision-Date: 2009-07-30 12:54+0100\n"
+"POT-Creation-Date: 2009-08-28 20:00-0700\n"
+"PO-Revision-Date: 2009-08-28 18:51+0100\n"
 "Last-Translator: Martin Srebotnjak  <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
 "MIME-Version: 1.0\n"
@@ -876,7 +876,7 @@
 msgid "System Log"
 msgstr "Sistemski dnevnik"

-msgid "Calling ... "
+msgid "Calling..."
 msgstr "Klicanje ..."

 msgid "Hangup"
@@ -1516,6 +1516,29 @@
 msgstr ""
 "Ko je odprt nov pogovor, ta vtičnik vstavi zadnji pogovor v trenuten pogovor."

+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"Pridobivanje TinyURL ..."
+
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "Ustvari TinyURL le za naslove URL te dolžina ali daljše"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "Predpona naslova TinyURL (ali drugega)"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "Vtičnik TinyURL"
+
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr "Ob prejemu sporočil z URL-ji uporabi TinyURL za enostavnejše kopiranje"
+
 msgid "Online"
 msgstr "Prisoten"

@@ -1559,29 +1582,6 @@
 msgid "Lastlog plugin."
 msgstr "Vtičnik Lastlog."

-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-"\n"
-"Pridobivanje TinyURL ..."
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr "Ustvari TinyURL le za naslove URL te dolžina ali daljše"
-
-msgid "TinyURL (or other) address prefix"
-msgstr "Predpona naslova TinyURL (ali drugega)"
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "Vtičnik TinyURL"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr "Ob prejemu sporočil z URL-ji uporabi TinyURL za enostavnejše kopiranje"
-
 msgid "accounts"
 msgstr "Računi"

@@ -1643,6 +1643,44 @@
 msgid "buddy list"
 msgstr "Seznam prijateljev"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+"Predstavljeno digitalno potrdilo je samo-podpisano in ga samodejno ni mogoče "
+"preveriti."
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+"Korensko digitalno potrdilo, za katerega ta trdi, da ga je izdalo, je "
+"Pidginu neznano."
+
+msgid "The certificate is not valid yet."
+msgstr "Digitalno potrdilo še ni veljavno."
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr ""
+"Digitalno potrdilo je poteklo in ga ni priporočljivo šteti za veljavnega."
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr "Ponujeno digitalno potrdilo ni izdano za to domeno."
+
+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."
+
+msgid "The certificate chain presented is invalid."
+msgstr "Ponujena veriga digitalnih potrdil ni veljavna."
+
+msgid "The certificate has been revoked."
+msgstr "Digitalno potrdilo je bilo preklicano."
+
+msgid "An unknown certificate error occurred."
+msgstr "Prišlo je do neznane napake digitalnega potrdila."
+
 msgid "(DOES NOT MATCH)"
 msgstr "(SE NE UJEMA)"

@@ -1686,76 +1724,24 @@
 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
+msgid "The certificate for %s could not be validated."
+msgstr "Digitalnega potrdila za %s ni mogoče overiti."
+
 #. 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
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-"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."
-
-#. vrq will be completed by user_auth
-msgid ""
-"The root certificate this one claims to be issued by is unknown to Pidgin."
-msgstr ""
-"Korensko digitalno potrdilo, za katerega ta trdi, da ga je izdalo, je "
-"Pidginu neznano."
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-"Predstavljena veriga digitalnih potrdil %s nima veljavnega digitalnega "
-"podpisa izdajatelja digitalnih potrdil, katerega podpis naj bi imela."
-
-msgid "Invalid certificate authority signature"
-msgstr "Neveljaven podpis izdajatelja digitalnega potrdila"
+#  Data is assumed to be the destination sn
+msgid "Unable to validate certificate"
+msgstr "Ni možno overiti digitalnega potrdila"
+
+#, c-format
+msgid ""
+"The certificate 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 priča, da dejansko pripada \"%s\".  To "
+"pomeni, da se ne povezujete s storitvijo, s katero mislite, da se."

 #. Make messages
 #, c-format
@@ -1793,7 +1779,6 @@
 msgstr "+++ %s se je odjavil(a)"

 #. Unknown error
-#, c-format
 msgid "Unknown error"
 msgstr "Neznana napaka"

@@ -1993,19 +1978,19 @@
 msgstr "Prenos datoteke je dokončan."

 #, c-format
-msgid "You canceled the transfer of %s"
-msgstr "Prekinili ste prenos %s"
+msgid "You cancelled the transfer of %s"
+msgstr "Preklicali ste prenos %s"

 msgid "File transfer cancelled"
 msgstr "Prenos datoteke je preklican"

 #, c-format
-msgid "%s canceled the transfer of %s"
-msgstr "%s je prekinil prenos %s"
-
-#, c-format
-msgid "%s canceled the file transfer"
-msgstr "%s je prekinil prenos datoteke"
+msgid "%s cancelled the transfer of %s"
+msgstr "%s je preklical prenos %s"
+
+#, c-format
+msgid "%s cancelled the file transfer"
+msgstr "%s je preklical prenos datoteke"

 #, c-format
 msgid "File transfer to %s failed."
@@ -2197,6 +2182,34 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"

+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+"Ni najdenih kodekov. Namestite nekaj kodekov GStreamer iz paketov vtičnikov "
+"GStreamer."
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+"Ni preostalih kodekov. Vaše nastavitve kodekov v fs-codecs.conf so prestroge."
+
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "Prišlo je do napake Farsight2, od katere si ni mogoče opomoči."
+
+msgid "Conference error."
+msgstr "Konferenčna napaka."
+
+msgid "Error with your microphone."
+msgstr "Napaka na vašem mikrofonu."
+
+msgid "Error with your webcam."
+msgstr "Napaka na vaši spletni kameri."
+
+#, c-format
+msgid "Error creating session: %s"
+msgstr "Napaka pri ustvarjanju seje: %s"
+
 msgid "Error creating conference."
 msgstr "Napaka pri ustvarjanju konference."

@@ -2477,14 +2490,15 @@
 msgstr ""
 "Preskusite vtičnik s podporo IPC, kot strežnik. Ukazi IPC bodo registrirani."

-msgid "Join/Part Hiding Configuration"
-msgstr "Prilagoditev skrivanja pridruženosti/zapustitve"
-
-msgid "Minimum Room Size"
-msgstr "Najmanjša velikost sobe"
-
-msgid "User Inactivity Timeout (in minutes)"
-msgstr "Časovni rok neaktivnosti uporabnika (v minutah)"
+msgid "Hide Joins/Parts"
+msgstr "Skrij spoje/dele"
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr "Za sobe z več kot toliko ljudmi"
+
+msgid "If user has not spoken in this many minutes"
+msgstr "Če uporabnik ni govoril toliko minut"

 msgid "Apply hiding rules to buddies"
 msgstr "Uporabi pravila skrivanja za prijatelje"
@@ -3933,15 +3947,23 @@
 msgid "Logo"
 msgstr "Logotip"

+#, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr ""
+"Oseba %s ne bo več mogla videti posodobitev vašega stanja. Ali želite "
+"nadaljevati?"
+
+msgid "Cancel Presence Notification"
+msgstr "Prekliči obvestilo o prisotnosti"
+
 msgid "Un-hide From"
 msgstr "Ne skrij pred"

 msgid "Temporarily Hide From"
 msgstr "Začasno skrij pred"

-msgid "Cancel Presence Notification"
-msgstr "Prekliči obvestilo o prisotnosti"
-
 msgid "(Re-)Request authorization"
 msgstr "Ponovno zahtevaj pooblastitev"

@@ -4547,7 +4569,7 @@

 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
-"users with an role or set users' role with the room."
+"users with a role or set users' role with the room."
 msgstr ""
 "role &lt;moderator|participant|visitor|none&gt; [vzdevek1] [vzdevek2] ...: "
 "Pridobi uporabnike z vlogo ali nastavi vlogo uporabnikov v sobi."
@@ -4693,9 +4715,6 @@
 msgid "Transfer was closed."
 msgstr "Prenos je bil zaprt."

-msgid "Failed to open the file"
-msgstr "Datoteke ni mogoče odpreti"
-
 msgid "Failed to open in-band bytestream"
 msgstr "Znotraj pasovnega zlogovnega pretoka ni uspelo odpreti"

@@ -4972,9 +4991,8 @@
 msgid "Not expected"
 msgstr "Nepričakovano"

-#, c-format
-msgid "Friendly name changes too rapidly"
-msgstr "Prijateljsko ime se spreminja preveč pogosto"
+msgid "Friendly name is changing too rapidly"
+msgstr "Prijateljsko ime se spreminja prehitro"

 #, c-format
 msgid "Server too busy"
@@ -5551,8 +5569,10 @@
 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."
-msgstr "%s vam je poslal povabilo s spletno kamero, kar še ni podprto."
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr ""
+"%s vas je povabil(a), da gledati njegovo/njeno spletno kamero, kar pa še ni "
+"podprto."

 msgid "Away From Computer"
 msgstr "Stran od računalnika"
@@ -5603,6 +5623,10 @@
 msgid "The username specified is invalid."
 msgstr "Navedeno uporabniško ime ni veljavno."

+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "Prijateljsko ime se spreminja preveč pogosto"
+
 msgid "This Hotmail account may not be active."
 msgstr "Ta račun Hotmail morda ni aktiven."

@@ -6279,8 +6303,10 @@
 msgid "Server port"
 msgstr "Vrata strežnika"

-msgid "Received unexpected response from "
-msgstr "Prejet neveljaven odgovor - "
+#. Note to translators: %s in this string is a URL
+#, c-format
+msgid "Received unexpected response from %s"
+msgstr "Prejet nepričakovan odgovor s strani osebe %s"

 #. username connecting too frequently
 msgid ""
@@ -6290,9 +6316,11 @@
 "Povezava ste prevečkrat vzpostavili in prekinili. Počakajte deset minut in "
 "poskusite ponovno. Če ne počakate sedaj, boste čakali še dalj."

-#, c-format
-msgid "Error requesting "
-msgstr "Napaka pri zahtevanju - "
+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
+#, c-format
+msgid "Error requesting %s: %s"
+msgstr "Napaka pri zahtevanju %s: %s"

 msgid "AOL does not allow your screen name to authenticate here"
 msgstr ""
@@ -7108,6 +7136,9 @@
 msgid "C_onnect"
 msgstr "Po_veži se"

+msgid "You closed the connection."
+msgstr "Zaprli ste povezavo."
+
 msgid "Get AIM Info"
 msgstr "Dobi podatke AIM"

@@ -7118,6 +7149,9 @@
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"

+msgid "End Direct IM Session"
+msgstr "Končaj sejo neposrednega sporočanja"
+
 msgid "Direct IM"
 msgstr "Neposredni pogovor"

@@ -7948,8 +7982,8 @@
 msgstr "Datoteka poslana"

 #, c-format
-msgid "%d canceled the transfer of %s"
-msgstr "Uporabnik %d je prekinil prenos %s"
+msgid "%d cancelled the transfer of %s"
+msgstr "Oseba %d je prekinila prenos %s"

 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -9466,6 +9500,9 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"

+msgid "Use account proxy for SSL connections"
+msgstr "Pri povezavah SSL uporabi posredovalni strežnik za račune"
+
 msgid "Chat room list URL"
 msgstr "URL seznama sob pomenkov"

@@ -9491,6 +9528,10 @@
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Vtičnik za protokol Yahoo! JAPAN"

+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s vam je poslal povabilo s spletno kamero, kar še ni podprto."
+
 msgid "Your SMS was not delivered"
 msgstr "Vaš SMS ni bil dostavljen"

@@ -9564,8 +9605,26 @@
 msgid "Ignore buddy?"
 msgstr "Prezrem prijatelja?"

-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Vaš račun je zaklenjen. Prijavite se na spletno stran Yahoo!"
+msgid "Invalid username or password"
+msgstr "Neveljavno uporabniško ime ali geslo"
+
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr ""
+"Račun je bil zaklenjen zaradi prevelikega števila neuspelih poskusov "
+"prijave.  Prijavite se na spletno stran Yahoo!."
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr "Neznana napaka 52. Ponovno povezovanje jo bo najbrž odpravilo."
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""
+"Napaka 1013: Uporabniško ime, ki ste ga vnesli, ni veljavno. Najpogostejši "
+"vzrok za to napako je vnos e-poštnega naslova namesto dejanskega Yahoo! ID."

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10345,6 +10404,124 @@
 "Vedno se k temu oknu lahko vrnete in dodate, uredite ali odstranite račune z "
 "<b>Računi->Upravljaj z računi</b> v oknu seznama prijateljev."

+#. Buddy List
+msgid "Background Color"
+msgstr "Barva ozadja"
+
+msgid "The background color for the buddy list"
+msgstr "Barva ozadja seznama prijateljev"
+
+msgid "Layout"
+msgstr "Postavitev"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr "Postavitev ikon, imen in stanj na seznamu prijateljev"
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "Barva razširjenega ozadja"
+
+msgid "The background color of an expanded group"
+msgstr "Barva ozadja razpostrte skupine"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "Razširjeno besedilo"
+
+msgid "The text information for when a group is expanded"
+msgstr "Besedilna informacija, ko je skupina razpostrta"
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "Barva strnjenega ozadja"
+
+msgid "The background color of a collapsed group"
+msgstr "Barva ozadja strnjene skupine"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "Strnjeno besedilo"
+
+msgid "The text information for when a group is collapsed"
+msgstr "Besedilna informacija, ko je skupina strnjena"
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "Barva ozadja stika/klepeta"
+
+msgid "The background color of a contact or chat"
+msgstr "Barva ozadja stika ali klepeta"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "Besedilo za stik"
+
+msgid "The text information for when a contact is expanded"
+msgstr "Besedilna informacija, ko je stik razpostrt"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+msgid "Online Text"
+msgstr "Besedilo ob prisotnosti"
+
+msgid "The text information for when a buddy is online"
+msgstr "Besedilna informacija, ko je prijatelj povezan"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "Besedilo ob odsotnosti"
+
+msgid "The text information for when a buddy is away"
+msgstr "Besedilna informacija, ko je prijatelj nepovezan"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+msgid "Offline Text"
+msgstr "Besedilo ob nepovezanosti"
+
+msgid "The text information for when a buddy is offline"
+msgstr "Besedilna informacija, ko je prijatelj nepovezan"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "Besedilo ob nedejavnosti"
+
+msgid "The text information for when a buddy is idle"
+msgstr "Besedilna informacija, ko je prijatelj nedejaven"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "Besedilo sporočila"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr "Besedilna informacija, ko ima prijatelj neprebrano sporočilo"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr "Besedilo sporočila (je rekel vzdevek)"
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+"Besedilna informacija, ko je v pomenku neprebrano sporočilo, ki omenja vaš "
+"vzdevek"
+
+msgid "The text information for a buddy's status"
+msgstr "Besedilni podatki o stanju uporabika"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -10785,8 +10962,8 @@
 msgid "_Group:"
 msgstr "_Skupina:"

-msgid "Auto_join when account becomes online."
-msgstr "Samo_dejno se pridruži, ko račun postane povezan."
+msgid "Auto_join when account connects."
+msgstr "Samode_jno se pridruži, ko račun postane povezan."

 msgid "_Remain in chat after window is closed."
 msgstr "_Nadaljuj klepet, ko je okno zaprto."
@@ -10818,100 +10995,6 @@
 msgid "/Buddies/Sort Buddies"
 msgstr "/Prijatelji/Razvrsti prijatelje"

-#. Buddy List
-msgid "Background Color"
-msgstr "Barva ozadja"
-
-msgid "The background color for the buddy list"
-msgstr "Barva ozadja seznama prijateljev"
-
-msgid "Layout"
-msgstr "Postavitev"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr "Postavitev ikon, imen in stanj na seznamu prijateljev"
-
-#. Group
-msgid "Expanded Background Color"
-msgstr "Barva razširjenega ozadja"
-
-msgid "The background color of an expanded group"
-msgstr "Barva ozadja razpostrte skupine"
-
-msgid "Expanded Text"
-msgstr "Razširjeno besedilo"
-
-msgid "The text information for when a group is expanded"
-msgstr "Besedilna informacija, ko je skupina razpostrta"
-
-msgid "Collapsed Background Color"
-msgstr "Barva strnjenega ozadja"
-
-msgid "The background color of a collapsed group"
-msgstr "Barva ozadja strnjene skupine"
-
-msgid "Collapsed Text"
-msgstr "Strnjeno besedilo"
-
-msgid "The text information for when a group is collapsed"
-msgstr "Besedilna informacija, ko je skupina strnjena"
-
-#. Buddy
-msgid "Contact/Chat Background Color"
-msgstr "Barva ozadja stika/klepeta"
-
-msgid "The background color of a contact or chat"
-msgstr "Barva ozadja stika ali klepeta"
-
-msgid "Contact Text"
-msgstr "Besedilo za stik"
-
-msgid "The text information for when a contact is expanded"
-msgstr "Besedilna informacija, ko je stik razpostrt"
-
-msgid "On-line Text"
-msgstr "Besedilo ob prisotnosti"
-
-msgid "The text information for when a buddy is online"
-msgstr "Besedilna informacija, ko je prijatelj povezan"
-
-msgid "Away Text"
-msgstr "Besedilo ob odsotnosti"
-
-msgid "The text information for when a buddy is away"
-msgstr "Besedilna informacija, ko je prijatelj nepovezan"
-
-msgid "Off-line Text"
-msgstr "Besedilo ob nepovezanosti"
-
-msgid "The text information for when a buddy is off-line"
-msgstr "Besedilna informacija, ko je prijatelj nepovezan"
-
-msgid "Idle Text"
-msgstr "Besedilo ob nedejavnosti"
-
-msgid "The text information for when a buddy is idle"
-msgstr "Besedilna informacija, ko je prijatelj nedejaven"
-
-msgid "Message Text"
-msgstr "Besedilo sporočila"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr "Besedilna informacija, ko ima prijatelj neprebrano sporočilo"
-
-msgid "Message (Nick Said) Text"
-msgstr "Besedilo sporočila (je rekel vzdevek)"
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-"Besedilna informacija, ko je v pomenku neprebrano sporočilo, ki omenja vaš "
-"vzdevek"
-
-msgid "The text information for a buddy's status"
-msgstr "Besedilni podatki o stanju uporabika"
-
 msgid "Type the host name for this certificate."
 msgstr "Vnesite ime gostitelja za to digitalno potrdilo."

@@ -10995,6 +11078,9 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Pogovor/N_ovo neposredno sporočilo ..."

+msgid "/Conversation/Join a _Chat..."
+msgstr "/Pogovor/Pridruži se klepetu ..."
+
 msgid "/Conversation/_Find..."
 msgstr "/Pogovor/_Najdi ..."

@@ -11378,8 +11464,8 @@
 msgid "Estonian"
 msgstr "estonsko"

-msgid "Euskera(Basque)"
-msgstr "baskijsko"
+msgid "Basque"
+msgstr "baskovsko"

 msgid "Persian"
 msgstr "perzijsko"
@@ -11583,11 +11669,19 @@

 #, c-format
 msgid ""
-"<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
-"\">support@pidgin.im</A><BR/><BR/>"
-msgstr ""
-"<FONT SIZE=\"4\">Pomoč prek e-pošte (ang.):</FONT> <A HREF=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</A><BR/><BR/>"
+"<font size=\"4\">Help from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+"<font size=\"4\">Pomoč drugih uporabnikov Pidgina:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>To je <b>javen</b> dopisni "
+"seznam! (<a href=\"http://pidgin.im/pipermail/support/\">arhiv</a>)<br/"
+">Glede protokolov in vtičnikov drugih ne moremo pomagati!<br/>Glavni jezik "
+"tega seznama je <b>angleščina</b>.  Vabimo vas, da objavite tudi v drugih "
+"jezikih, vendar bodo odgovori najbrž manj v pomoč.<br/><br/>"

 #, c-format
 msgid ""
@@ -12144,65 +12238,46 @@

 #, c-format
 msgid ""
-"%s %s\n"
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Uporaba: %s [MOŽNOST] ...\n"
-"\n"
-"  -c, --config=DIR    uporabi DIR za nastavitvene datoteke\n"
-"  -d, --debug         izpiši sporočila za razhroščevanje na stdout\n"
-"  -f, --force-online  vsili povezanost ne glede na stanje omrežja\n"
-"  -h, --help          izpiši to pomoč in končaj program\n"
-"  -m, --multiple      ne dovoljuj le enega zagnanega programa\n"
-"  -n, --nologin       brez samodejne prijave\n"
-"  -l, --login[=NAME]  samodejna prijava (dodaten možen argument NAME\n"
-"                      določa račun(e) za prijavo, ločene z vejico.\n"
-"                      Brez tega bo omogočen le prvi račun).\n"
-"  --display=DISPLAY   zaslon X, ki naj bo uporabljen\n"
-"  -v, --version       izpiši trenutno različico in zapri program\n"
-
-#, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"Uporaba: %s [MOŽNOST] ...\n"
-"\n"
-"  -c, --config=DIR    uporabi DIR za nastavitvene datoteke\n"
-"  -d, --debug         izpiši sporočila za razhroščevanje na stdout\n"
-"  -f, --force-online  vsili povezanost ne glede na stanje omrežja\n"
-"  -h, --help          izpiši to pomoč in končaj program\n"
-"  -m, --multiple      ne dovoljuj le enega zagnanega programa\n"
-"  -n, --nologin       brez samodejne prijave\n"
-"  -l, --login[=NAME]  samodejna prijava (dodaten možen argument NAME\n"
-"                      določa račun(e) za prijavo, ločene z vejico.\n"
-"                      Brez tega bo omogočen le prvi račun).\n"
-"  -v, --version       izpiši trenutno različico in zapri program\n"
+msgstr ""
+"Uporaba: %s [MOŽNOST]...\n"
+"\n"
+
+msgid "use DIR for config files"
+msgstr "uporabi DIR za prilagoditvene datoteke"
+
+msgid "print debugging messages to stdout"
+msgstr "natisni sporočila za razhroščevanje na stdout"
+
+msgid "force online, regardless of network status"
+msgstr "vsili povezanost, ne glede na stanje omrežja"
+
+msgid "display this help and exit"
+msgstr "prikaži to besedilo pomoči in ustavi program"
+
+msgid "allow multiple instances"
+msgstr "dovoli več hkratnih prijav"
+
+msgid "don't automatically login"
+msgstr "ne prijavi se samodejno"
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+"omogoči navedene račune (neobvezen argument IME\n"
+"                      določa račune, ki naj bodo uporabljeni, ločene z "
+"vejicami."
+
+msgid "Without this only the first account will be enabled)."
+msgstr "Prez tega bo omogočen le prvi račun)."
+
+msgid "X display to use"
+msgstr "Zaslon X, ki naj bo uporabljen"
+
+msgid "display the current version and exit"
+msgstr "Prikaži trenutno različico in zapri program"

 #, c-format
 msgid ""
@@ -12246,9 +12321,6 @@
 msgid "/Media/_Hangup"
 msgstr "/Mediji/_Odloži"

-msgid "Calling..."
-msgstr "Klicanje ..."
-
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
 msgstr "%s želi z vami začeti zvočno/video sejo."
@@ -12257,6 +12329,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s želi z vami začeti video sejo."

+msgid "Incoming Call"
+msgstr "Dohodni klic"
+
+msgid "_Pause"
+msgstr "_Premor"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13198,9 +13276,6 @@
 msgid "_Open Mail"
 msgstr "_Odpri pošto"

-msgid "_Pause"
-msgstr "_Premor"
-
 msgid "_Edit"
 msgstr "_Uredi"

@@ -13264,66 +13339,6 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Prikaže statistične podatke o dostopnosti vašega prijatelja"

-msgid "Server name request"
-msgstr "Zahteva po imenu strežnika"
-
-msgid "Enter an XMPP Server"
-msgstr "Vnesite strežnik XMPP"
-
-msgid "Select an XMPP server to query"
-msgstr "Izberite strežnik XMPP za poizvedbo"
-
-msgid "Find Services"
-msgstr "Najdi storitve"
-
-msgid "Add to Buddy List"
-msgstr "Dodaj na seznam prijateljev"
-
-msgid "Gateway"
-msgstr "Prehod"
-
-msgid "Directory"
-msgstr "Imenik"
-
-msgid "PubSub Collection"
-msgstr "Zbirka PubSub"
-
-msgid "PubSub Leaf"
-msgstr "List PubSub"
-
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr ""
-"\n"
-"<b>Opis:</b> "
-
-#. Create the window.
-msgid "Service Discovery"
-msgstr "Odkrivanje storitev"
-
-msgid "_Browse"
-msgstr "Pre_brskaj"
-
-msgid "Server does not exist"
-msgstr "Strežnik ne obstaja"
-
-msgid "Server does not support service discovery"
-msgstr "Strežnik ne podpira odkrivanja storitev"
-
-msgid "XMPP Service Discovery"
-msgstr "Odkrivanje storitev XMPP"
-
-msgid "Allows browsing and registering services."
-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 registriranje z opuščenimi prenosi ali drugimi "
-"storitvami XMPP."
-
 msgid "Buddy is idle"
 msgstr "Prijatelj je nedejaven"

@@ -13415,6 +13430,68 @@
 msgid "Apply in IMs"
 msgstr "Uporabi pri sporočilih"

+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "Zahteva po imenu strežnika"
+
+msgid "Enter an XMPP Server"
+msgstr "Vnesite strežnik XMPP"
+
+msgid "Select an XMPP server to query"
+msgstr "Izberite strežnik XMPP za poizvedbo"
+
+msgid "Find Services"
+msgstr "Najdi storitve"
+
+msgid "Add to Buddy List"
+msgstr "Dodaj na seznam prijateljev"
+
+msgid "Gateway"
+msgstr "Prehod"
+
+msgid "Directory"
+msgstr "Imenik"
+
+msgid "PubSub Collection"
+msgstr "Zbirka PubSub"
+
+msgid "PubSub Leaf"
+msgstr "List PubSub"
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"<b>Opis:</b> "
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "Odkrivanje storitev"
+
+msgid "_Browse"
+msgstr "Pre_brskaj"
+
+msgid "Server does not exist"
+msgstr "Strežnik ne obstaja"
+
+msgid "Server does not support service discovery"
+msgstr "Strežnik ne podpira odkrivanja storitev"
+
+msgid "XMPP Service Discovery"
+msgstr "Odkrivanje storitev XMPP"
+
+msgid "Allows browsing and registering services."
+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 registriranje z opuščenimi prenosi ali drugimi "
+"storitvami XMPP."
+
 msgid "By conversation count"
 msgstr "Po številu pomenkov"

@@ -14205,6 +14282,53 @@
 "Ta vtičnik omogoča uporabniku prilagajati zapis časovnega žiga pogovorov in "
 "dnevniških sporočil."

+msgid "Audio"
+msgstr "Zvok"
+
+msgid "Video"
+msgstr "Video"
+
+msgid "Output"
+msgstr "Izhod"
+
+msgid "_Plugin"
+msgstr "_Vtičnik"
+
+msgid "_Device"
+msgstr "_Naprava"
+
+msgid "Input"
+msgstr "Vhod"
+
+msgid "P_lugin"
+msgstr "V_tičnik"
+
+msgid "D_evice"
+msgstr "N_aprava"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Voice/Video Settings"
+msgstr "Glasovne/video nastavitve"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr "Prilagodite svoj mikrofon in spletno kamero."
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""
+"Prilagodite nastavitve za mikrofon in spletno kamero za zvočne oz. video "
+"klice."
+
 msgid "Opacity:"
 msgstr "Neprosojnost:"

@@ -14332,1011 +14456,3 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
-
-#~ msgid "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"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Poslušanje vtičnice ni možno"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Ne morem brati vtičnice"
-
-#~ msgid "Connection failed."
-#~ msgstr "Povezava ni uspela."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "Strežnik ni več povezan"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Vtičnice ni bilo mogoče ustvariti"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Povezava do gostitelja ni uspela"
-
-#~ msgid "Read error"
-#~ msgstr "Napaka pri branju"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Povezave s strežnikom ni mogoče vzpostaviti:\n"
-#~ "%s"
-
-#~ 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 Items"
-#~ msgstr "Elementi razpoznave storitev"
-
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Razširjeno naslavljanje kitic"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "Večuporabniški pomenek"
-
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "Podatki o prisotnosti pri večuporabniškem pomenku"
-
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "Bitni tokovi v pasu"
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Improvizirani ukazi"
-
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "Bajtni tokovi SOCKS5"
-
-#~ msgid "Out of Band Data"
-#~ msgstr "Zmanjkalo je pasovnih podatkov"
-
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#~ msgid "In-Band Registration"
-#~ msgstr "Prijava v pasu"
-
-#~ msgid "User Location"
-#~ msgstr "Lokacija uporabnika"
-
-#~ msgid "User Avatar"
-#~ msgstr "Avatar uporabnika"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "Obvestila o stanjih klepeta"
-
-#~ msgid "Software Version"
-#~ msgstr "Programska različica"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "Vzpostavitev toka"
-
-#~ msgid "User Mood"
-#~ msgstr "Uporabnikovo počutje"
-
-#~ msgid "User Activity"
-#~ msgstr "Uporabnikova dejavnost"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "Zmožnosti entitete"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "Pogajanja šifrirane seje"
-
-#~ msgid "User Tune"
-#~ msgstr "Uporabnikova skladba"
-
-#~ msgid "Roster Item Exchange"
-#~ msgstr "Izmenjava elementov seznama"
-
-#~ msgid "Reachability Address"
-#~ msgstr "Naslov dosegljivosti"
-
-#~ msgid "User Profile"
-#~ msgstr "Profil uporabnika"
-
-#~ msgid "Jingle"
-#~ msgstr "Jingle"
-
-#~ msgid "Jingle Audio"
-#~ msgstr "Jingle - zvok"
-
-#~ msgid "User Nickname"
-#~ msgstr "Vzdevek uporabnika"
-
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "Jingle - ICE UDP"
-
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "Jingle - ICE TCP"
-
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "Jingle - surovi UDP"
-
-#~ msgid "Jingle Video"
-#~ msgstr "Jingle - video"
-
-#~ msgid "Jingle DTMF"
-#~ msgstr "Jingle - DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "Dokazila o prejemu sporočila"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "Objava javnega ključa"
-
-#~ msgid "User Chatting"
-#~ msgstr "Uporabnik klepeta"
-
-#~ msgid "User Browsing"
-#~ msgstr "Uporabnik brska"
-
-#~ msgid "User Gaming"
-#~ msgstr "Uporabnik igra"
-
-#~ msgid "User Viewing"
-#~ msgstr "Uporabnik gleda"
-
-#~ msgid "Stanza Encryption"
-#~ msgstr "Šifriranje kitic"
-
-#~ msgid "Entity Time"
-#~ msgstr "Čas entitete"
-
-#~ msgid "Delayed Delivery"
-#~ msgstr "Zakasnjena dostava"
-
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "Podatkovni predmeti sodelovanja"
-
-#~ msgid "File Repository and Sharing"
-#~ msgstr "Hramba datotek in skupna raba"
-
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "Razpoznava storitev STUN za Jingle"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "Poenostavljeno pogajanje šifrirane seje"
-
-#~ msgid "Hop Check"
-#~ msgstr "Preveri hop"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Kateri ID naj bo aktiviran?"
-
-#~ msgid "More Data needed"
-#~ msgstr "Potrebnih je več podatkov"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Podajte tipke za bližnjico, ki bodo povezane s smejčkom."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Izberite sliko smejčka."
-
-#~ msgid "Cursor Color"
-#~ msgstr "Barva kazalke"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Drugotna barva kazalke"
-
-#~ msgid "Interface colors"
-#~ msgstr "Barve vmesnika"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Velikosti gradnikov"
-
-#~ msgid "Invite message"
-#~ msgstr "Sporočilo povabila"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Vnesite ime uporabnika, ki ga želite povabiti,\n"
-#~ "dodate lahko tudi sporočilo - povabilo."
-
-#~ msgid "Looking up %s"
-#~ msgstr "Poizvedujem za %s"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Povezovanje na %s ni uspelo"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Prijavljanje: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Datoteke %s ni bilo mogoče zapisati."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Datoteke %s ni bilo mogoče prebrati."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "Sporočilo je predolgo, zato je bilo skrajšano za %s znakov."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s trenutno ni prijavljen."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Opozarjanje %s ni dovoljeno."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr ""
-#~ "Sporočilo je bilo izpuščeno, ker presegate omejitev hitrosti strežnika."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "Pomenek v %s ni dostopen."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "Prehitro pošiljate sporočila %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr ""
-#~ "Ker je bilo preveliko, ste zgrešili sporočilo, ki vam ga je poslal %s."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "Zgrešili ste sporočilo od %s, ker je bilo poslano prehitro."
-
-#~ msgid "Failure."
-#~ msgstr "Neuspeh."
-
-#~ msgid "Too many matches."
-#~ msgstr "Preveč zadetkov."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "Potrebujem več selekcije."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Imeniška storitev je trenutno nedosegljiva."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "Poizvedba po e-poštnem naslovu je omejena."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Ključna beseda zanemarjena."
-
-#~ msgid "No keywords."
-#~ msgstr "Brez ključnih besed."
-
-#~ msgid "User has no directory information."
-#~ msgstr "Uporabnik nima imeniških informacij."
-
-#~ msgid "Country not supported."
-#~ msgstr "Država ni podprta."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Neznan vzrok neuspeha: %s."
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "Neveljavno uporabniško ime ali geslo."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "Storitev je trenutno nedostopna."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "Vaša raven opozoril je trenutno previsoka, da bi se lahko prijavili."
-
-#~ 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 ""
-#~ "Prijavljali in odjavljali ste se prepogosto.  Počakajte deset minut in "
-#~ "poskusite ponovno.  Če tega ne boste upoštevali, bo trajalo še dlje."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Pri prijavljanju je prišlo do neznane napake: %s."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Prišlo je do neznane napake %d. Info: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Neveljavno ime skupine"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Povezava zaprta"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "Čakanje odgovora ..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC je nazaj z odmora. Sedaj lahko spet pošiljate sporočila."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Sprememba gesla uspešna"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Prikaži imeniške podatke"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Nastavi imeniške podatke"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Ne morem odpreti %s za pisanje!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Prenos datoteke ni bil uspešen; verjetno je prijatelj preklical prenos."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Ni se bilo mogoče povezati za prenos."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr "Ni bilo mogoče zapisati glave datoteke. Datoteka ne bo prenešena."
-
-#~ msgid "Save As..."
-#~ msgstr "Shrani kot ..."
-
-#~ 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 zahteva od %s, da sprejme %d datotek: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s zahteva od %s, da sprejme %d datoteko: %s (%.2f %s)%s%s"
-#~ msgstr[2] "%s zahteva od %s, da sprejme %d datoteki: %s (%.2f %s)%s%s"
-#~ msgstr[3] "%s zahteva od %s, da sprejme %d datoteke: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s zahteva, da jim pošljete datoteko"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "Vtičnik za protokol TOC"
-
-#~ msgid "%s Options"
-#~ msgstr "%s Možnosti"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Možnosti posredovalnega strežnika"
-
-#~ msgid "By log size"
-#~ msgstr "po obsegu dnevnika"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Odpri povezavo v brskalniku"
-
-#~ msgid "ST_UN server:"
-#~ msgstr "Strežnik ST_UN:"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "Sli_ka smejčka"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "_Tipke za bližnjice smejčka"
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Adresarja MSN ni mogoče pridobiti."
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "Morda bo povezava v kratkem prekinjena. Morda boste želeli uporabiti TOC "
-#~ "dokler to ni popravljeno. Preverite %s za posodobitve."
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "Utrip_aj z oknom, ko prispejo nova sporočila"
-
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] ""
-#~ "Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih "
-#~ "podatkov)"
-#~ msgstr[1] ""
-#~ "Povezava s strežnikom je izgubljena (v %d sekundi ni bilo prejetih "
-#~ "podatkov)"
-#~ msgstr[2] ""
-#~ "Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih "
-#~ "podatkov)"
-#~ msgstr[3] ""
-#~ "Povezava s strežnikom je izgubljena (v %d sekundah ni bilo prejetih "
-#~ "podatkov)"
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Dodaj prijatelja"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Odgovora na prijavo ni mogoče dešifrirati"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Napaka pri ohranjanju živega"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "Izgubljena povezava s strežnikom:\n"
-#~ "%d, %s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Poveži se na strežnik"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Neposrednega sporočila ni bilo mogoče poslati."
-
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Niste član(ica) skupine \"%s\"\n"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Podatki o uporabniku %s niso dostopni"
-
-#~ msgid "Primary Information"
-#~ msgstr "Osnovni podatki"
-
-#~ msgid "Blood Type"
-#~ msgstr "Krvna skupina"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Posodobi moje podatke"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Hitrost:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "Nastaviti poskušate obraz po meri, kar zaenkrat še ni podprto. Prosimo, "
-#~ "izberite sliko iz %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Neveljaven obraz QQ"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Zahtevo uporabnika %d ste zavrnili."
-
-#~ msgid "Reject request"
-#~ msgstr "Zavrni zahtevo"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Zahteva po dodajanju prijatelja s pooblastilom ni uspela"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Seznama prijateljev ni mogoče naložiti"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "Številka QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Opis skupine"
-
-#~ msgid "Auth"
-#~ msgstr "Pooblasti"
-
-#~ msgid "Approve"
-#~ msgstr "Odobri"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "Vašo zahtevo za pridružitev skupini %d je zavrnil administrator %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "Zapustili ste [%d] skupino \"%d\""
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Dodani ste [%d] bili v skupino \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "Sem član(ica)"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Napačna zahteva"
-
-#~ msgid "I am the admin"
-#~ msgstr "Jaz sem skrbnik"
-
-#~ msgid "Unknown status"
-#~ msgstr "Neznano stanje"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Odstrani skupino"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Vnesli ste ID skupine zunaj veljavnega obsega"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Ste prepričani, da želite zapustiti ta Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Želite odobriti zahtevo?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Telefonska št."
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Informacije o kanalu"
-
-#~ msgid "System Message"
-#~ msgstr "Sistemsko sporočilo"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>IP zadnje prijave:</b> %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Čas zadnje prijave</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Nastavi moje podatke"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Zapusti ta QQ Qun"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Blokiraj uporabnika"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "Neveljavna koda žetona odziva, "
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Napaka pri spreminjanju gesla"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Povezava na strežnik neuspešna"
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Povezovanje s strežnikom %s, ponovni poskusi: %d"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Želite odobriti zahtevo?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Ali želite dodati tega prijatelja?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s vas [%s] je dodal(a) na svoj seznam prijateljev."
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Prijatelj"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s vas [%s] želi dodati kot prijatelja"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s ni na vašem seznamu prijateljev."
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Ga želite dodati?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Vrata strežnika"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Oddaljeno odjavljeni"
-
-#~ msgid "developer"
-#~ msgstr "razvijalec"
-
-#~ msgid "XMPP developer"
-#~ msgstr "Razvijalec XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Oblikovalci"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Uporabljate %s različice %s.  Najnovejša dosegljiva različica je %s. "
-#~ "Prenesete jo lahko z naslova <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Dnevnik sprememb:</b><br>%s"
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "Skupina s tem imenom že obstaja."
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "EOF pri branju iz procesa razločevanja"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Vaši podatki so bili posodobljeni"
-
-#~ msgid "Input your reason:"
-#~ msgstr "Vnesite svoj razlog:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Uspešno ste odstranili prijatelja"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "Uspešno ste se odstranili s prijateljevega seznama prijateljev"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "%d ste dodali na svoj seznam prijateljev"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "Neveljaven QQid"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Prosimo, vnesite ID zunanje skupine"
-
-#~ msgid "Reason: %s"
-#~ msgstr "Razlog: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr "Vašo zahtevo za pridružitev skupini %d je odobril administrator %d"
-
-#~ msgid "I am applying to join"
-#~ msgstr "Prijavljam se za članstvo"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Uspešno ste zapustili skupino"
-
-#~ msgid "QQ Group Auth"
-#~ msgstr "Pooblaščanje skupine QQ"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "Strežnik QQ je sprejel vašo zahtevo za pooblastitev."
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Vnesite svoj razlog:"
-
-#~ msgid " Space"
-#~ msgstr " Prostor"
-
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>Ime strežnika</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Pokaži prijavne podatke"
-
-#~ msgid "resend interval(s)"
-#~ msgstr "Interval(i) ponovnega pošiljanja"
-
-#~ msgid "hostname is NULL or port is 0"
-#~ msgstr "ime gostitelja je NULL ali pa so vrata 0"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Prijava ni uspela. Preverite zapisnik razhroščevanja."
-
-#~ msgid "Failed room reply"
-#~ msgstr "Spodleteli odgovor sobe"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "Uuporabnik %s je zavrnil vašo zahtevo."
-
-#~ msgid "User %s approved your request"
-#~ msgstr "Uporabnik %s je ugodil vaši zahtevi"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Oznanilo pošilja: %s"
-
-#~ msgid "Keep the status message when the status is changed"
-#~ msgstr "Ohrani sporočilo stanja, ko se stanje spremeni"
-
-#~ msgid "Error setting socket options"
-#~ msgstr "Napaka pri nastavljanju možnosti vtičnice"
-
-#~ msgid ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-#~ msgstr ""
-#~ "Overjanje Windows Live ID: Žetona overovitve v odzivu strežnika ni mogoče "
-#~ "najti"
-
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Overovitev Windows Live ID ni uspela"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "Koda [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Napaka skupinske operacije"
-
-#~ msgid "TCP Address"
-#~ msgstr "Naslov TCP"
-
-#~ msgid "UDP Address"
-#~ msgstr "Naslov UDP"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "Preveč zloben (pošiljatelj)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "Preveč zloben (prejemnik)"
-
-#~ msgid "Available Message"
-#~ msgstr "Sporočilo o dosegljivosti"
-
-#~ msgid "Away Message"
-#~ msgstr "Sporočilo o odsotnosti"
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr "<i>(pridobivanje ...)</i>"
-
-#~ msgid "Display Statistics"
-#~ msgstr "Pokaži statistiko"
-
-#~ msgid "Screen name:"
-#~ msgstr "Zaslonsko ime:"
-
-#~ msgid "Someone says your screen name in chat"
-#~ msgstr "Nekdo omeni vaše pojavno ime v sobi"
-
-#~ msgid "Invalid screen name"
-#~ msgstr "Neveljavno pojavno ime"
-
-#~ msgid "Invalid screen name."
-#~ msgstr "Neveljavno pojavno ime."
-
-#~ msgid "Screen _name:"
-#~ msgstr "Pojavno _ime:"
-
-#~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "Strežnik zahteva overovitev z navadnim besedilom preko nešifrirane "
-#~ "povezave. Se strinjate s tem in želite nadaljevati z overovitvijo?"
-
-#~ msgid "Use GSSAPI (Kerberos v5) for authentication"
-#~ msgstr "Uporabi avtentikacijo GSSAPI (Kerberos v5)"
-
-#~ msgid ""
-#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
-#~ msgstr ""
-#~ "%s%s<span weight=\"bold\">Avtor:</span>\t%s\n"
-#~ "<span weight=\"bold\">Spletna stran:</span>\t\t%s\n"
-#~ "<span weight=\"bold\">Ime datoteke:</span>\t\t%s"
-
-#~ msgid ""
-#~ "The contact availability plugin (cap) is used to display statistical "
-#~ "information about buddies in a users contact list."
-#~ msgstr ""
-#~ "Vtičnik dosegljivosti stika (cap) se uporablja za prikaz statističnih "
-#~ "podatkov o prijateljih v seznamu stikov."
-
-#~ msgid "Screen name sent"
-#~ msgstr "Pojavno ime poslano"
-
-#~ msgid "Screen name"
-#~ msgstr "Pojavno ime"
-
-#~ msgid "_Merge"
-#~ msgstr "_Spoji"
-
-#~ msgid ""
-#~ "Please enter the screen name of the person you would like to add to your "
-#~ "buddy list. You may optionally enter an alias, or nickname,  for the "
-#~ "buddy. The alias will be displayed in place of the screen name whenever "
-#~ "possible.\n"
-#~ msgstr ""
-#~ "Prosim, vnesite pojavno ime osebe, ki jo želite dodati vašemu seznamu "
-#~ "prijateljev. Vnesete lahko tudi psevdonim ali vzdevek prijatelja. Kjer bo "
-#~ "izvedljivo, bo namesto pojavnega imena prikazan vzdevek.\n"
-
-#~ msgid "Pounce only when my status is not available"
-#~ msgstr "Opozori le tedaj, ko moje stanje ni na voljo"
-
-#~ msgid "There were errors unloading the plugin."
-#~ msgstr "Pri odlaganju vtičnika je prišlo do napake."
-
-#~ msgid "Couldn't open file"
-#~ msgstr "Ni mogoče odpreti datoteke"
-
-#~ msgid "Error initializing session"
-#~ msgstr "Napaka pri inicializaciji seje"
-
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Povezava s strežnikom stikov ni uspela."
-
-#~ msgid "Current media"
-#~ msgstr "Trenutni medij"
-
-#~ msgid ""
-#~ "Sorry, passwords over %d characters in length (yours is %d) are not "
-#~ "supported by MySpace."
-#~ msgstr ""
-#~ "Žal MySpace ne podpira gesel, daljših od %d znakov (vaše jih ima %d)."
-
-#~ msgid "Unable to make SSL connection to server."
-#~ msgstr "Ni se bilo mogoče povezati na strežnik preko SSL."
-
-#~ msgid "Invalid chat name specified."
-#~ msgstr "Navedeno je neveljavno ime pomenka."
-
-#~ msgid "Use recent buddies group"
-#~ msgstr "Uporabi nedavno skupino prijateljev"
-
-#~ msgid "Show how long you have been idle"
-#~ msgstr "Prikaz časa vaše odsotnosti"
-
-#~ msgid "Cannot find/access ~/.silc directory"
-#~ msgstr "Mape ~/.silc ni mogoče najti/do nje dostopati."
-
-#~ msgid "%s changed status from %s to %s"
-#~ msgstr "%s je spremenil stanje iz %s v %s"
-
-#~ msgid "%s is now %s"
-#~ msgstr "%s je zdaj %s"
-
-#~ msgid "%s is no longer %s"
-#~ msgstr "%s ni nič več %s"
-
-#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
-#~ msgstr "<span color=\"red\">%s ni več povezan: %s</span>"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s will not attempt to reconnect the account until you correct the error "
-#~ "and re-enable the account."
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "%s se ne bo poskušal ponovno prijaviti, dokler ne odpravite napake in "
-#~ "ponovno omogočite povezovanje računa."
-
-#~ msgid "User has typed something and stopped"
-#~ msgstr "Uporabnik je napisal nekaj in se ustavil."
--- a/po/sv.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/sv.po	Tue Sep 01 19:51:07 2009 +0000
@@ -2439,7 +2439,7 @@
 #. *< priority
 #. *< id
 msgid "Join/Part Hiding"
-msgstr " Dölj Går in/Lämnar"
+msgstr "Dölj Går in/Lämnar"

 #. *< name
 #. *< version
@@ -10921,7 +10921,7 @@
 msgstr "/Konversation/_Rensa tillbakablick"

 msgid "/Conversation/M_edia"
-msgstr "/Konversation/M_er"
+msgstr "/Konversation/M_edia"

 msgid "/Conversation/Media/_Audio Call"
 msgstr "/Konversation/Media/_Ljudsamtal"
--- a/po/zh_CN.po	Mon Aug 24 19:23:56 2009 +0000
+++ b/po/zh_CN.po	Tue Sep 01 19:51:07 2009 +0000
@@ -4,18 +4,20 @@
 # Funda Wang <fundawang@linux.net.cn>, 2003, 2004.
 # liyuekui <liyuekui@gmail.com>, 2009.
 # Aron Xu <aronmalache@163.com>, 2009.
+# fujianwzh <fujianwzh@gmail.com>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-04-23 00:32+0800\n"
+"POT-Creation-Date: 2009-08-31 19:52-0700\n"
+"PO-Revision-Date: 2009-08-23 22:12+0800\n"
 "Last-Translator: Aron Xu <aronmalache@163.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"

 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -24,7 +26,7 @@

 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s。试试“%s -h”查看帮助。\n"
+msgstr "%s。试试“%s -h”以获取更多信息。\n"

 #, c-format
 msgid ""
@@ -40,10 +42,10 @@
 "%s\n"
 "用法: %s [选项]...\n"
 "\n"
-"  -c, --config=目录   使用“目录”存储配置文件\n"
+"  -c, --config=目录   使用指定目录存储配置文件\n"
 "  -d, --debug         将调试信息打印到标准输出\n"
 "  -h, --help          显示帮助并退出\n"
-"  -n, --nologin       不自动登入\n"
+"  -n, --nologin       不自动登录\n"
 "  -v, --version       显示当前版本并退出\n"

 #, c-format
@@ -74,7 +76,7 @@
 msgstr "未安装协议插件。"

 msgid "(You probably forgot to 'make install'.)"
-msgstr "(您可能忘记运行“make install”。)"
+msgstr "(您可能忘记运行“make install”了。)"

 msgid "Modify Account"
 msgstr "修改账户"
@@ -86,7 +88,7 @@
 msgstr "协议："

 msgid "Username:"
-msgstr "用户名:"
+msgstr "用户名："

 msgid "Password:"
 msgstr "密码："
@@ -96,7 +98,7 @@

 #. Register checkbox
 msgid "Create this account on the server"
-msgstr "在服务器上创建此新帐户"
+msgstr "在服务器上创建新帐户"

 #. Cancel button
 #. Cancel
@@ -138,14 +140,14 @@
 msgstr "%s%s%s%s 已经将 %s 加为好友%s%s"

 msgid "Add buddy to your list?"
-msgstr "将用户加为好友吗？"
+msgstr "将该用户加为好友吗？"

 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s 想要将 %s 添加为好友%s%s"

 msgid "Authorize buddy?"
-msgstr "同意吗?"
+msgstr "同意吗？"

 msgid "Authorize"
 msgstr "同意"
@@ -158,12 +160,12 @@
 "Online: %d\n"
 "Total: %d"
 msgstr ""
-"在线: %d\n"
-"总计: %d"
+"在线：%d\n"
+"总计：%d"

 #, c-format
 msgid "Account: %s (%s)"
-msgstr "账户：%s(%s)"
+msgstr "账户：%s (%s)"

 #, c-format
 msgid ""
@@ -171,7 +173,7 @@
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"上次看见：%s前"
+"上次看见：%s 前"

 msgid "Default"
 msgstr "默认"
@@ -195,7 +197,7 @@
 msgstr "用户名"

 msgid "Alias (optional)"
-msgstr "联系人别名(可选)"
+msgstr "别名(可选)"

 msgid "Add in group"
 msgstr "添加到组"
@@ -229,7 +231,7 @@
 msgstr "添加聊天"

 msgid "You can edit more information from the context menu later."
-msgstr "您可以稍候从快捷菜单中编辑更多信息。"
+msgstr "稍后您可以从快捷菜单中编辑更多信息。"

 msgid "Error adding group"
 msgstr "添加组出错"
@@ -262,7 +264,7 @@
 msgstr "正在获取..."

 msgid "Get Info"
-msgstr "信息"
+msgstr "获取信息"

 msgid "Add Buddy Pounce"
 msgstr "添加好友千里眼"
@@ -284,16 +286,16 @@
 msgstr "重命名"

 msgid "Set Alias"
-msgstr "设定别名"
+msgstr "设置别名"

 msgid "Enter empty string to reset the name."
 msgstr "输入空字符串可重置名称。"

 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "删除此联系人也将删除该联系人中的全部好友"
+msgstr "删除此通讯录将同时删除该通讯录中的全部好友"

 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "删除此组也将删除该组中的全部好友"
+msgstr "删除此组将同时删除该组中的全部好友"

 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -317,7 +319,7 @@
 msgstr "切换标记"

 msgid "View Log"
-msgstr "查看日志"
+msgstr "查看聊天记录"

 #. General
 msgid "Nickname"
@@ -329,7 +331,7 @@
 msgstr "发呆"

 msgid "On Mobile"
-msgstr "移动"
+msgstr "正在使用手机"

 msgid "New..."
 msgstr "新建..."
@@ -352,7 +354,7 @@
 msgid ""
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
-msgstr "清输入你想要屏蔽/解除屏蔽的用户名活别名。"
+msgstr "清输入您想要屏蔽/解除屏蔽的用户名或别名。"

 #. Not multiline
 #. Not masked?
@@ -361,10 +363,10 @@
 msgstr "确定"

 msgid "New Instant Message"
-msgstr "新即时消息"
+msgstr "新建聊天"

 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr "您想要跟谁聊？请输入他/她的用户名或别名。"
+msgstr "您想要跟谁聊？请输入他或她的用户名或别名。"

 msgid "Channel"
 msgstr "频道"
@@ -381,7 +383,7 @@
 msgid ""
 "Please enter the username or alias of the person whose log you would like to "
 "view."
-msgstr "您想要查看和谁聊天的日志？请输入他/她的用户名或别名。"
+msgstr "您想要查看和谁的聊天记录？请输入他或她的用户名或别名。"

 #. Create the "Options" frame.
 msgid "Options"
@@ -397,10 +399,10 @@
 msgstr "加入聊天..."

 msgid "View Log..."
-msgstr "查看日志..."
+msgstr "查看聊天记录..."

 msgid "View All Logs"
-msgstr "查看全部日志"
+msgstr "查看全部聊天记录"

 msgid "Show"
 msgstr "显示"
@@ -421,7 +423,7 @@
 msgstr "按字母序"

 msgid "By Log Size"
-msgstr "按日志大小"
+msgstr "按聊天记录大小"

 msgid "Buddy"
 msgstr "好友"
@@ -453,7 +455,7 @@
 msgstr "证书导入错误"

 msgid "X.509 certificate import failed"
-msgstr "X.509 证书导入失败"
+msgstr "导入 X.509 证书失败"

 msgid "Select a PEM certificate"
 msgstr "选择 PEM 证书"
@@ -470,10 +472,10 @@
 msgstr "证书导出出错"

 msgid "X.509 certificate export failed"
-msgstr "X.509 证书导出失败"
+msgstr "导出 X.509 证书失败"

 msgid "PEM X.509 Certificate Export"
-msgstr "PEM X.509 证书导出"
+msgstr "导出 PEM X.509 证书"

 #, c-format
 msgid "Certificate for %s"
@@ -486,6 +488,10 @@
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"通用名：%s\n"
+"\n"
+"SHA1 指纹：\n"
+"%s"

 msgid "SSL Host Certificate"
 msgstr "SSL 主机证书"
@@ -513,7 +519,7 @@

 #, c-format
 msgid "%s (%s)"
-msgstr "%s(%s)"
+msgstr "%s (%s)"

 #, c-format
 msgid "%s disconnected."
@@ -528,7 +534,7 @@
 msgstr ""
 "%s\n"
 "\n"
-"Finch 将不会尝试重新连接账户，除非您纠正了错误然后重新启用账户。"
+"Finch 不会尝试重新连接账户，除非您纠正了错误然后重新启用账户。"

 msgid "Re-enable Account"
 msgstr "重新启用账户"
@@ -536,13 +542,13 @@
 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 ""
+msgstr "帐号已禁用，您已退出此会话。当帐号重新连接时您将自动重新加入此会话。"

 msgid "No such command."
-msgstr "没有这样的命令。"
+msgstr "无此命令。"

 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "系统错误: 您给命令传送的参数个数不对。"
+msgstr "系统错误：您给命令传送的参数个数不对。"

 msgid "Your command failed for an unknown reason."
 msgstr "您的命令失败，原因未知。"
@@ -557,7 +563,7 @@
 msgstr "命令无法在此协议下工作。"

 msgid "Message was not sent, because you are not signed on."
-msgstr "消息未发出，因为您尚未登入。"
+msgstr "消息未发出，因为您尚未登录。"

 #, c-format
 msgid "%s (%s -- %s)"
@@ -579,7 +585,7 @@
 msgstr "您已经离开了此聊天。"

 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "日志已启动。此会话中的后续消息将会被自动记录。"
+msgstr "聊天记录已启动。此会话中的后续消息将会被自动记录。"

 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
@@ -604,7 +610,7 @@
 msgstr "邀请"

 msgid "Enable Logging"
-msgstr "允许记录"
+msgstr "启用聊天记录"

 msgid "Enable Sounds"
 msgstr "启用声音"
@@ -612,74 +618,73 @@
 msgid "<AUTO-REPLY> "
 msgstr "<自动回复> "

-#, fuzzy, c-format
+#, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
-msgstr[0] "%d 个用户的列表:\n"
-msgstr[1] "%d 个用户的列表:\n"
+msgstr[0] "%d 个用户的列表：\n"

 msgid "Supported debug options are:  version"
-msgstr "支持的调试选项有: version"
+msgstr "支持的调试选项有：version"

 msgid "No such command (in this context)."
-msgstr "没有这样的命令(在此环境中)。"
+msgstr "在此环境中无此命令。"

 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
 "使用“/help &lt;命令&gt;”可获得具体命令的帮助。\n"
-"此环境下可使用下列命令:\n"
+"此环境下可使用下列命令：\n"

 #, c-format
 msgid ""
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
-msgstr "%s 不是有效的信息类型。查看'/help msgcolor' 已查找有效的信息"
+msgstr "%s 不是有效的信息类型。请查看“/help msgcolor”以查找有效的信息"

 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
-msgstr ""
+msgstr "%s 不是有效的颜色。请查看\"/help msgcolor\"以查找有效的颜色。"

 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
-msgstr "say &lt;消息&gt;: 发送普通消息，就好像您未使用命令。"
+msgstr "say &lt;消息&gt;：发送普通消息，就好像您未使用命令。"

 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
+msgstr "me &lt;动作&gt;：向好友或聊天发送 IRC 风格的动作。"

 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
-msgstr "debug &lt;选项&gt;: 在当前对话中发送各种调试信息。"
+msgstr "debug &lt;选项&gt;：在当前对话中发送各种调试信息。"

 msgid "clear: Clears the conversation scrollback."
-msgstr "clear: 清除对话回滚。"
+msgstr "clear：清除对话回滚。"

 msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;命令&gt;: 关于具体命令的帮助。"
+msgstr "help &lt;命令&gt;：关于具体命令的帮助。"

 msgid "users:  Show the list of users in the chat."
-msgstr "users: 在聊天中显示用户列表。"
+msgstr "users：在聊天中显示用户列表。"

 msgid "plugins: Show the plugins window."
-msgstr "plugins: 显示插件窗口。"
+msgstr "plugins：显示插件窗口。"

 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: 显示好友列表。"
+msgstr "buddylist：显示好友列表。"

 msgid "accounts: Show the accounts window."
 msgstr "accounts：显示账户窗口。"

 msgid "debugwin: Show the debug window."
-msgstr ""
+msgstr "debug窗口：显示调试窗口。"

 msgid "prefs: Show the preference window."
-msgstr ""
+msgstr "prefs：显示首选项窗口。"

 msgid "statuses: Show the savedstatuses window."
-msgstr ""
+msgstr "statuses：显示已存状态窗口。"

 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -688,6 +693,13 @@
 "background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
 "cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
+"msgcolor &lt;类型&gt; &lt;前景&gt; &lt;背景&gt;：设置会话窗口中不同类型消息的"
+"颜色。<br>   \n"
+"&lt;类型&gt;：receive(接受)，send(发送)，highlight(高亮)，action(动作)，"
+"timestamp(时间戳)<br>   \n"
+"&lt;前景/背景&gt;：black(黑)，red(红)，green(绿)，blue(蓝)，white(白)，gray"
+"(灰)，darkgray(暗灰)，magenta(瑰)，cyan(青)，default(默认)<br><br>\n"
+"例如：<br>    msgcolor send cyan default"

 msgid "Unable to open file."
 msgstr "无法打开文件。"
@@ -703,16 +715,15 @@
 msgstr "清除"

 msgid "Filter:"
-msgstr "过滤："
+msgstr "过滤器："

 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 个文件"
-msgstr[1] "文件传送 - 已完成 %d%%，共 %d 个文件"
+msgstr[0] "文件传送 - %2$d 个文件中的 %1$d%%"

 #. Create the window.
 msgid "File Transfers"
@@ -741,29 +752,29 @@
 msgstr "全部传送完成时关闭此窗口"

 msgid "Clear finished transfers"
-msgstr "清除未完成的传送"
+msgstr "清除已完成的传送"

 msgid "Stop"
 msgstr "停止"

 msgid "Waiting for transfer to begin"
-msgstr "正在传送开始"
+msgstr "正在等待传送开始"

 msgid "Canceled"
 msgstr "已取消"

 msgid "Failed"
-msgstr "已失败"
+msgstr "失败"

 #, c-format
 msgid "%.2f KiB/s"
-msgstr "%.2f KB/秒"
+msgstr "%.2f KiB/秒"

 msgid "Sent"
 msgstr "已发送"

 msgid "Received"
-msgstr "已收到"
+msgstr "已接收"

 msgid "Finished"
 msgstr "已完成"
@@ -805,10 +816,10 @@
 msgstr "仅当启用了“记录所有聊天”首选项时才会记录聊天。"

 msgid "No logs were found"
-msgstr "未找到日志。"
+msgstr "未找到聊天记录。"

 msgid "Total log size:"
-msgstr "总计日志大小："
+msgstr "总计聊天记录大小："

 #. Search box *********
 msgid "Scroll/Search: "
@@ -816,7 +827,7 @@

 #, c-format
 msgid "Conversations in %s"
-msgstr "与 %s 的对话"
+msgstr "在 %s 中的会话"

 #, c-format
 msgid "Conversations with %s"
@@ -828,11 +839,11 @@
 msgid "System Log"
 msgstr "系统日志"

-msgid "Calling ... "
+msgid "Calling..."
 msgstr "正在呼叫..."

 msgid "Hangup"
-msgstr ""
+msgstr "挂断"

 #. Number of actions
 msgid "Accept"
@@ -842,42 +853,41 @@
 msgstr "拒绝"

 msgid "Call in progress."
-msgstr ""
+msgstr "正在呼叫。"

 msgid "The call has been terminated."
-msgstr ""
+msgstr "呼叫被终止。"

 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s 希望与您进行语音聊天。"

 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
+msgstr "%s 正尝试与您建立不支持的媒体类型的会话。"

 msgid "You have rejected the call."
-msgstr "您已经拒绝呼叫"
+msgstr "您已经拒绝呼叫。"

 msgid "call: Make an audio call."
-msgstr "呼叫：音频呼叫。"
+msgstr "呼叫：语音聊天。"

 msgid "Emails"
 msgstr "电子邮件"

 msgid "You have mail!"
-msgstr "您有邮件了!"
+msgstr "来邮件了！"

 msgid "Sender"
-msgstr "发送方"
+msgstr "发送者"

 msgid "Subject"
 msgstr "主题"

-#, fuzzy, c-format
+#, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
-msgstr[0] "%s(%s) 有 %d 封新邮件。"
-msgstr[1] "%s(%s) 有 %d 封新邮件。"
+msgstr[0] "%s (%s) 有 %d 个新消息。"

 msgid "New Mail"
 msgstr "新邮件"
@@ -893,7 +903,7 @@
 msgstr "继续"

 msgid "IM"
-msgstr "开聊"
+msgstr "聊天"

 msgid "Invite"
 msgstr "邀请"
@@ -911,7 +921,7 @@
 msgstr "载入插件失败"

 msgid "unloading plugin failed"
-msgstr ""
+msgstr "卸载插件失败"

 #, c-format
 msgid ""
@@ -922,28 +932,28 @@
 "Website: %s\n"
 "Filename: %s\n"
 msgstr ""
-"名称: %s\n"
-"版本: %s\n"
-"描述: %s\n"
-"作者: %s\n"
-"网站: %s\n"
-"文件名: %s\n"
+"名称：%s\n"
+"版本：%s\n"
+"描述：%s\n"
+"作者：%s\n"
+"网站：%s\n"
+"文件名：%s\n"

 msgid "Plugin need to be loaded before you can configure it."
-msgstr "在您配置插件之前必须先装入它。"
+msgstr "在您配置插件之前必须先载入它。"

 msgid "No configuration options for this plugin."
 msgstr "此插件无配置选项。"

 msgid "Error loading plugin"
-msgstr "装入插件时出错"
+msgstr "载入插件时出错"

 msgid "The selected file is not a valid plugin."
-msgstr ""
+msgstr "选中的文件不是可用的插件。"

 msgid ""
 "Please open the debug window and try again to see the exact error message."
-msgstr ""
+msgstr "请打开调试窗口并再试一次以查看错误信息。"

 msgid "Select plugin to install"
 msgstr "选择插件以安装"
@@ -966,7 +976,7 @@
 msgstr "首选项"

 msgid "Please enter a buddy to pounce."
-msgstr "请输入要监视的好友。"
+msgstr "请输入要添加千里眼的好友。"

 msgid "New Buddy Pounce"
 msgstr "新建好友千里眼"
@@ -975,7 +985,7 @@
 msgstr "编辑好友千里眼"

 msgid "Pounce Who"
-msgstr "监视对象"
+msgstr "千里眼查看对象"

 #. Account:
 msgid "Account:"
@@ -986,13 +996,13 @@

 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "监视好友的行动..."
+msgstr "当好友有何动作时提示..."

 msgid "Signs on"
-msgstr "登入"
+msgstr "登录"

 msgid "Signs off"
-msgstr "登出"
+msgstr "退出"

 msgid "Goes away"
 msgstr "离开"
@@ -1010,7 +1020,7 @@
 msgstr "开始打字"

 msgid "Pauses while typing"
-msgstr "输入时暂停"
+msgstr "暂停打字"

 msgid "Stops typing"
 msgstr "停止打字"
@@ -1023,7 +1033,7 @@
 msgstr "动作"

 msgid "Open an IM window"
-msgstr "打开即时消息窗口"
+msgstr "打开聊天窗口"

 msgid "Pop up a notification"
 msgstr "弹出通知"
@@ -1038,69 +1048,69 @@
 msgstr "播放声音"

 msgid "Pounce only when my status is not Available"
-msgstr "仅当我的状态不可用时才监视"
+msgstr "仅当我的状态不可用时才提示"

 msgid "Recurring"
-msgstr "再现"
+msgstr "返回"

 msgid "Cannot create pounce"
-msgstr "无法创建监视"
+msgstr "无法创建千里眼"

 msgid "You do not have any accounts."
 msgstr "您没有帐户。"

 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "在创建好友千里眼前您必须创建一个帐户。"

 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "您真的想要删除 %s 在 %s 上的千里眼吗？"
+msgstr "您真的想要删除 %s 在 %s 上的好友千里眼吗？"

 msgid "Buddy Pounces"
 msgstr "好友千里眼"

 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s 开始向您打字(%s)"
+msgstr "%s 开始给您打字 (%s)"

 #, c-format
 msgid "%s has paused while typing to you (%s)"
-msgstr "%s 在给您打字时停了下来(%s)"
+msgstr "%s 在给您打字时停了下来 (%s)"

 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%s 已登入(%s)"
+msgstr "%s 已登录 (%s)"

 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s 发完呆了(%s)"
+msgstr "%s 发完呆了 (%s)"

 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%s 回来了(%s)"
+msgstr "%s 回来了 (%s)"

 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s 停止了给您打字(%s)"
+msgstr "%s 停止了给您打字 (%s)"

 #, c-format
 msgid "%s has signed off (%s)"
-msgstr "%s 已登出(%s)"
+msgstr "%s 已退出 (%s)"

 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s 发起了呆(%s)"
+msgstr "%s 发起了呆 (%s)"

 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s 走了。(%s)"
+msgstr "%s 离开了。(%s)"

 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 给您发送了消息。(%s)"

 msgid "Unknown pounce event. Please report this!"
-msgstr "未知的千里眼。请报告此错误！"
+msgstr "未知的好友千里眼动作。请报告此错误！"

 msgid "Based on keyboard use"
 msgstr "基于键盘使用"
@@ -1118,10 +1128,10 @@
 msgstr "显示离线好友"

 msgid "Notify buddies when you are typing"
-msgstr "提醒好友您正在打字给他们"
+msgstr "提醒好友您正在打字"

 msgid "Log format"
-msgstr "日志格式"
+msgstr "聊天记录格式"

 msgid "Log IMs"
 msgstr "记录对话"
@@ -1145,19 +1155,19 @@
 msgstr "将状态更改为"

 msgid "Conversations"
-msgstr "对话"
+msgstr "会话"

 msgid "Logging"
-msgstr "日志"
+msgstr "聊天记录"

 msgid "You must fill all the required fields."
-msgstr "您必须填入注册字段。"
+msgstr "请填写所有必须填写的区域。"

 msgid "The required fields are underlined."
-msgstr "所需区域已用下划线标出。"
+msgstr "必须填写的区域已用下划线标出。"

 msgid "Not implemented yet."
-msgstr "未实现。"
+msgstr "此功能尚未实现。"

 msgid "Save File..."
 msgstr "保存文件..."
@@ -1169,29 +1179,29 @@
 msgstr "选择位置..."

 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr "按'Enter'以寻找更多此分类下的聊天室。"
+msgstr "按回车键以寻找更多该类别的聊天室。"

 msgid "Get"
 msgstr "获取"

 #. Create the window.
 msgid "Room List"
-msgstr "房间列表"
+msgstr "聊天室列表"

 msgid "Buddy logs in"
-msgstr "好友登入"
+msgstr "好友登录"

 msgid "Buddy logs out"
-msgstr "好友登出"
+msgstr "好友退出"

 msgid "Message received"
-msgstr "消息已收到"
+msgstr "收到消息"

 msgid "Message received begins conversation"
-msgstr "收到的消息开始对话"
+msgstr "收到消息时开始对话"

 msgid "Message sent"
-msgstr "消息已送出"
+msgstr "发送消息"

 msgid "Person enters chat"
 msgstr "有人进入聊天"
@@ -1209,7 +1219,7 @@
 msgstr "有人在聊天中提到您的名字"

 msgid "GStreamer Failure"
-msgstr "GStreamer 失败"
+msgstr "GStreamer 错误"

 msgid "GStreamer failed to initialize."
 msgstr "GStreamer 初始化失败。"
@@ -1230,13 +1240,13 @@
 msgstr "自动"

 msgid "Console Beep"
-msgstr "控制台响铃"
+msgstr "终端响铃"

 msgid "Command"
 msgstr "命令"

 msgid "No Sound"
-msgstr "无声音"
+msgstr "无声"

 msgid "Sound Method"
 msgstr "声音方式"
@@ -1249,7 +1259,7 @@
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"声音命令(_O):\n"
+"声音命令：\n"
 "(%s 代表文件名)"

 #. Sound options
@@ -1325,13 +1335,13 @@
 msgstr "无效的标题"

 msgid "Please enter a non-empty title for the status."
-msgstr "请为状态输入非空标题。"
+msgstr "请为状态输入非空的标题。"

 msgid "Duplicate title"
 msgstr "重复标题"

 msgid "Please enter a different title for the status."
-msgstr "为下列状态使用不同的标题。"
+msgstr "请为状态输入不同的标题。"

 msgid "Substatus"
 msgstr "子状态"
@@ -1362,7 +1372,7 @@
 msgstr "状态"

 msgid "Error loading the plugin."
-msgstr "装入插件时出错。"
+msgstr "载入插件时出错。"

 msgid "Couldn't find X display"
 msgstr "找不到 X 显示"
@@ -1371,7 +1381,7 @@
 msgstr "找不到窗口"

 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
+msgstr "无法载入此插件，因为它没有加入 X11 支持。"

 msgid "GntClipboard"
 msgstr ""
@@ -1386,11 +1396,11 @@

 #, c-format
 msgid "%s just signed on"
-msgstr "%s 刚刚登入"
+msgstr "%s 刚刚登录"

 #, c-format
 msgid "%s just signed off"
-msgstr "%s 刚刚登出"
+msgstr "%s 刚刚退出"

 #, c-format
 msgid "%s sent you a message"
@@ -1405,38 +1415,38 @@
 msgstr "%s 在 %s 中发送了消息"

 msgid "Buddy signs on/off"
-msgstr "好友登入/登出"
+msgstr "好友登录/退出"

 msgid "You receive an IM"
-msgstr "您接受了 IM"
+msgstr "您接到了一条消息"

 msgid "Someone speaks in a chat"
-msgstr "有人在聊天中别人在聊天中提到您的名字"
+msgstr "有人在聊天中发言"

 msgid "Someone says your name in a chat"
-msgstr "别人在聊天中提到您的名字"
+msgstr "有人在聊天中提到了您的名字"

 msgid "Notify with a toaster when"
 msgstr ""

 msgid "Beep too!"
-msgstr ""
+msgstr "同时发出声音！"

 msgid "Set URGENT for the terminal window."
 msgstr ""

 msgid "GntGf"
-msgstr ""
+msgstr "GntGf"

 msgid "Toaster plugin"
 msgstr ""

 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
-msgstr "<b>与 %s 在 %s 的谈话</b><br>"
+msgstr "<b>与 %s 在 %s 的会话</b><br>"

 msgid "History Plugin Requires Logging"
-msgstr "历史插件请求登录"
+msgstr "历史插件需要聊天记录"

 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1444,18 +1454,46 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
+"聊天记录可以从 工具->首选项->聊天记录 中开启\n"
+"\n"
+"启用聊天记录会同时启用针对该类型的历史记录功能。"

 msgid "GntHistory"
 msgstr "GntHistory"

 msgid "Shows recently logged conversations in new conversations."
-msgstr "在新对话中显示显示最近记录的对话。"
+msgstr "在新对话中显示显示最近记录的聊天记录。"

 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr "打开新对话时，此插件将会将上次对话插入当前对话。"

+#, c-format
+msgid ""
+"\n"
+"Fetching TinyURL..."
+msgstr ""
+"\n"
+"正在获取 TinyURL..."
+
+#, fuzzy
+msgid "Only create TinyURL for URLs of this length or greater"
+msgstr "只为等于或超过此长度的 URL 创建 TinyURL"
+
+msgid "TinyURL (or other) address prefix"
+msgstr "TinyURL (或其他)地址前缀"
+
+msgid "TinyURL"
+msgstr "TinyURL"
+
+msgid "TinyURL plugin"
+msgstr "TinyURL 插件"
+
+#, fuzzy
+msgid "When receiving a message with URL(s), use TinyURL for easier copying"
+msgstr "当接收到带有 URL 的消息时将其转换到 TinyURL 以方便复制"
+
 msgid "Online"
 msgstr "在线"

@@ -1478,54 +1516,32 @@
 msgstr "未分组"

 msgid "Nested Subgroup"
-msgstr ""
+msgstr "嵌套子组"

 msgid "Nested Grouping (experimental)"
-msgstr ""
+msgstr "嵌套组(试验性)"

 msgid "Provides alternate buddylist grouping options."
 msgstr "提供其他分组选项。"

 msgid "Lastlog"
-msgstr "最近日志"
+msgstr "最近聊天记录"

 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""

-#, fuzzy
 msgid "GntLastlog"
-msgstr "历史"
+msgstr "GntLastlog"

 msgid "Lastlog plugin."
 msgstr "Lastlog 插件。"

-#, c-format
-msgid ""
-"\n"
-"Fetching TinyURL..."
-msgstr ""
-
-msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
-
-msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-msgid "TinyURL"
-msgstr "TinyURL"
-
-msgid "TinyURL plugin"
-msgstr "TinyURL 插件"
-
-msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
-
 msgid "accounts"
 msgstr "账户"

 msgid "Password is required to sign on."
-msgstr "需要密码才能登入。"
+msgstr "需要密码才能登录。"

 #, c-format
 msgid "Enter password for %s (%s)"
@@ -1582,8 +1598,43 @@
 msgid "buddy list"
 msgstr "好友列表"

+msgid "The certificate is self-signed and cannot be automatically checked."
+msgstr ""
+
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#, fuzzy
+msgid "The certificate is not valid yet."
+msgstr "选中的文件不是可用的插件。"
+
+msgid "The certificate has expired and should not be considered valid."
+msgstr ""
+
+#. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
+msgid "The certificate presented is not issued to this domain."
+msgstr ""
+
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr "您没有根证书数据库，所以无法验证此证书。"
+
+#, fuzzy
+msgid "The certificate chain presented is invalid."
+msgstr "指定的用户名无效。"
+
+#, fuzzy
+msgid "The certificate has been revoked."
+msgstr "呼叫被终止。"
+
+#, fuzzy
+msgid "An unknown certificate error occurred."
+msgstr "发生了未知登录错误: %s。"
+
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(不匹配)"

 #. Make messages
 #, c-format
@@ -1598,7 +1649,7 @@

 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "单用途证书验证"

 #. Scheme name
 #. Pool name
@@ -1622,59 +1673,22 @@
 msgid "_View Certificate..."
 msgstr "查看证书(_V)..."

-#. Prompt the user to authenticate the certificate
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" is self-signed. It cannot be "
-"automatically checked."
-msgstr ""
-
-#, 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.
+#, c-format
+msgid "The certificate for %s could not be validated."
+msgstr ""
+
 #. TODO: Probably wrong.
-#. TODO: Probably wrong
 msgid "SSL Certificate Error"
 msgstr "SSL 证书错误"

 #, fuzzy
-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."
-msgstr ""
-
-#, c-format
-msgid ""
-"The certificate chain presented by %s does not have a valid digital "
-"signature from the Certificate Authority from which it claims to have a "
-"signature."
-msgstr ""
-
-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."
+msgid "Unable to validate certificate"
+msgstr "无法通过身份验证: %s"
+
+#, c-format
+msgid ""
+"The certificate claims to be from \"%s\" instead. This could mean that you "
+"are not connecting to the service you believe you are."
 msgstr ""

 #. Make messages
@@ -1700,14 +1714,13 @@

 #, c-format
 msgid "+++ %s signed on"
-msgstr "+++ %s 已登入"
+msgstr "+++ %s 已登录"

 #, c-format
 msgid "+++ %s signed off"
-msgstr "+++ %s 已登出"
+msgstr "+++ %s 已退出"

 #. Unknown error
-#. Unknown error!
 msgid "Unknown error"
 msgstr "未知错误"

@@ -1740,11 +1753,11 @@

 #, c-format
 msgid "You are now known as %s"
-msgstr "您现在叫做 %s"
+msgstr "您已改名为 %s"

 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s 现在叫做 %s。"
+msgstr "%s 已改名为 %s。"

 #, c-format
 msgid "%s left the room."
@@ -1755,7 +1768,7 @@
 msgstr "%s 离开了聊天室(%s)。"

 msgid "Invite to chat"
-msgstr "邀请会议"
+msgstr "邀请聊天"

 #. Put our happy label in it.
 msgid ""
@@ -1765,7 +1778,7 @@

 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "获得连接失败: %s"
+msgstr "建立连接失败: %s"

 #, c-format
 msgid "Failed to get name: %s"
@@ -1809,7 +1822,7 @@

 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
+msgstr "解析器进程在应答请求前退出"

 #, c-format
 msgid "Thread creation failure: %s"
@@ -1846,7 +1859,7 @@
 msgstr "目录不可写。"

 msgid "Cannot send a file of 0 bytes."
-msgstr "无法发送 0 字节的文件。"
+msgstr "无法发送 0 字节文件。"

 msgid "Cannot send a directory."
 msgstr "无法发送目录。"
@@ -1894,25 +1907,29 @@
 msgstr "开始来自 %2$s 的 %1$s 传送"

 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "文件 %s 传送完成"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "文件 %s 传送完成"

 msgid "File transfer complete"
 msgstr "文件传送完成"

-#, c-format
-msgid "You canceled the transfer of %s"
+#, fuzzy, c-format
+msgid "You cancelled the transfer of %s"
 msgstr "您取消了 %s 的传送"

 msgid "File transfer cancelled"
-msgstr "文件传送已取消"
-
-#, c-format
-msgid "%s canceled the transfer of %s"
+msgstr "已取消文件传送"
+
+#, fuzzy, c-format
+msgid "%s cancelled the transfer of %s"
 msgstr "%s 取消了 %s 的传送"

-#, c-format
-msgid "%s canceled the file transfer"
+#, fuzzy, c-format
+msgid "%s cancelled the file transfer"
 msgstr "%s 取消了文件传送"

 #, c-format
@@ -1960,19 +1977,19 @@
 msgstr "“icq”URL 的处理程序"

 msgid "The handler for \"irc\" URLs"
-msgstr ""
+msgstr "“irc”URL 的处理程序"

 msgid "The handler for \"msnim\" URLs"
-msgstr ""
+msgstr "“msnim”URL 的处理程序"

 msgid "The handler for \"sip\" URLs"
-msgstr ""
+msgstr "“sip”URL 的处理程序"

 msgid "The handler for \"xmpp\" URLs"
-msgstr ""
+msgstr "“xmpp”URL 的处理程序"

 msgid "The handler for \"ymsgr\" URLs"
-msgstr ""
+msgstr "“ymsgr”URL 的处理程序"

 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
@@ -2056,7 +2073,7 @@
 msgstr ""

 msgid "Logging of this conversation failed."
-msgstr "此对话的记录失败。"
+msgstr "记录此对话的失败。"

 msgid "XML"
 msgstr "XML"
@@ -2078,7 +2095,7 @@
 "</b></font> %s<br/>\n"

 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>找不到日志路径！</b></font>"
+msgstr "<font color=\"red\"><b>找不到聊天记录路径！</b></font>"

 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
@@ -2088,16 +2105,42 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <自动回复>: %s\n"

-#, fuzzy
+msgid ""
+"No codecs found. Install some GStreamer codecs found in GStreamer plugins "
+"packages."
+msgstr ""
+
+msgid ""
+"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgstr ""
+
+#, fuzzy
+msgid "A non-recoverable Farsight2 error has occurred."
+msgstr "发生了未知登录错误: %s。"
+
+#, fuzzy
+msgid "Conference error."
+msgstr "会议已关闭"
+
+msgid "Error with your microphone."
+msgstr ""
+
+msgid "Error with your webcam."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error creating session: %s"
+msgstr "创建连接出错"
+
 msgid "Error creating conference."
-msgstr "创建连接出错"
+msgstr "创建会议出错"

 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "您正在使用 %s，但插件需要 %s。"

 msgid "This plugin has not defined an ID."
-msgstr ""
+msgstr "此插件没有定义 ID。"

 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
@@ -2118,14 +2161,14 @@
 msgstr "所需插件 %s 未找到。安装此插件然后再试一次。"

 msgid "Unable to load the plugin"
-msgstr "无法装入插件"
+msgstr "无法载入插件"

 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "所需插件 %s 无法装入。"
+msgstr "所需插件 %s 无法载入。"

 msgid "Unable to load your plugin."
-msgstr "无法装入您的插件。"
+msgstr "无法载入您的插件。"

 #, c-format
 msgid "%s requires %s, but it failed to unload."
@@ -2337,17 +2380,18 @@
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr "测试插件 IPC 支持，作为服务器。这将注册 IPC 命令。"

-msgid "Join/Part Hiding Configuration"
-msgstr "加入/离开隐藏配置"
-
-msgid "Minimum Room Size"
-msgstr ""
-
-msgid "User Inactivity Timeout (in minutes)"
+msgid "Hide Joins/Parts"
+msgstr ""
+
+#. Translators: Followed by an input request a number of people
+msgid "For rooms with more than this many people"
+msgstr ""
+
+msgid "If user has not spoken in this many minutes"
 msgstr ""

 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "对好友应用隐藏规则"

 #. *< type
 #. *< ui_requirement
@@ -2385,7 +2429,7 @@

 #, c-format
 msgid "%s has signed off."
-msgstr "%s 已登出。"
+msgstr "%s 已退出。"

 msgid "One or more messages may have been undeliverable."
 msgstr ""
@@ -2448,7 +2492,7 @@

 #. Add general preferences.
 msgid "General Log Reading Configuration"
-msgstr "常规日志读取配置"
+msgstr "常规聊天记录读取配置"

 msgid "Fast size calculations"
 msgstr "快速计算大小"
@@ -2458,7 +2502,7 @@

 #. Add Log Directory preferences.
 msgid "Log Directory"
-msgstr "日志目录"
+msgstr "聊天记录目录"

 #. *< type
 #. *< ui_requirement
@@ -2467,16 +2511,15 @@
 #. *< priority
 #. *< id
 msgid "Log Reader"
-msgstr "日志读取器"
+msgstr "聊天记录读取器"

 #. *< name
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "在日志查看器中包含其它即时通讯客户的日志。"
+msgstr "在聊天记录查看器中包含其它即时通讯客户的聊天记录。"

 #. * 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"
@@ -2484,23 +2527,22 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"查看日志时，此插件将包含其它即时通讯客户端的日志。目前支持的即时通讯客户端包"
-"括 Adium、Fire、Messenger Plus!、MSN Messenger 和 Trillian。\n"
+"查看聊天记录时，此插件将包含其它即时通讯客户端的聊天记录。目前支持的即时通讯"
+"客户端包括 Adium、Fire、Messenger Plus!、MSN Messenger 和 Trillian。\n"
 "\n"
-"警告：此插件仍处于内测阶段，可能会经常崩溃。请小心使用！"
+"警告：此插件仍处于 alpha 测试阶段，可能会经常崩溃。请小心使用！"

 msgid "Mono Plugin Loader"
-msgstr "Mono 插件装入器"
+msgstr "Mono 插件载入器"

 msgid "Loads .NET plugins with Mono."
-msgstr "装入 Mono 编写的 .NET 插件。"
+msgstr "载入 Mono 编写的 .NET 插件。"

 msgid "Add new line in IMs"
 msgstr ""

-#, fuzzy
 msgid "Add new line in Chats"
-msgstr "在聊天中应用"
+msgstr "在聊天中加入新行"

 #. *< magic
 #. *< major version
@@ -2560,9 +2602,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr ""

-#, fuzzy
 msgid "One Time Password"
-msgstr "输入密码"
+msgstr "一次性密码"

 #. *< type
 #. *< ui_requirement
@@ -2571,7 +2612,7 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "一次性密码支持"

 #. *< name
 #. *< version
@@ -2593,13 +2634,13 @@
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "Perl 插件装入器"
+msgstr "Perl 插件载入器"

 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "提供装入 Perl 插件的支持。"
+msgstr "提供载入 Perl 插件的支持。"

 msgid "Psychic Mode"
 msgstr ""
@@ -2624,9 +2665,8 @@
 msgid "Display notification message in conversations"
 msgstr "对话时显示通知消息"

-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "于隐藏对话"
+msgstr ""

 #. *< type
 #. *< ui_requirement
@@ -2642,7 +2682,7 @@
 #. *  summary
 #. *  description
 msgid "Test to see that all signals are working properly."
-msgstr "测试看看所有的信号是否都工作正确。"
+msgstr "测试看看所有的信号是否工作正常。"

 #. *< type
 #. *< ui_requirement
@@ -2662,7 +2702,7 @@

 #. Scheme name
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "X.509 证书"

 #. *< type
 #. *< ui_requirement
@@ -2730,7 +2770,7 @@

 #, c-format
 msgid "%s has signed on."
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"

 msgid "Notify When"
 msgstr "通知情况"
@@ -2742,7 +2782,7 @@
 msgstr "好友发呆(_I)"

 msgid "Buddy _Signs On/Off"
-msgstr "好友登入/登出(_S)"
+msgstr "好友登录/退出(_S)"

 #. *< type
 #. *< ui_requirement
@@ -2763,10 +2803,10 @@
 msgstr "好友离开/返回或发呆/睡醒时在对话窗口给出通知。"

 msgid "Tcl Plugin Loader"
-msgstr "Tcl 插件装入器"
+msgstr "Tcl 插件载入器"

 msgid "Provides support for loading Tcl plugins"
-msgstr "提供装入 Tcl 插件的支持"
+msgstr "提供载入 Tcl 插件的支持"

 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
@@ -2778,9 +2818,8 @@
 "im/BonjourWindows for more information."
 msgstr ""

-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr "无法监听连入的 IM 连接\n"
+msgstr "无法监听连入的 IM 连接"

 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2831,24 +2870,24 @@
 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
+#, c-format
 msgid "Unable to bind socket to port: %s"
 msgstr "无法将套接字绑定到端口"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to listen on socket: %s"
 msgstr ""
 "无法创建套接字：\n"
 "%s"

 msgid "Error communicating with local mDNSResponder."
-msgstr "与本地 DNS 服务通讯出错"
+msgstr "与本地 mDNSResponder 服务通讯出错"

 msgid "Invalid proxy settings"
 msgstr "无效的代理设置"
@@ -2878,31 +2917,28 @@
 msgstr "无法为 %s 写入 %s 好友列表"

 msgid "Couldn't load buddylist"
-msgstr "无法装入好友列表"
+msgstr "无法载入好友列表"

 msgid "Load Buddylist..."
-msgstr "装入好友列表..."
+msgstr "载入好友列表..."

 msgid "Buddylist loaded successfully!"
-msgstr "好友列表成功装入!"
+msgstr "好友列表成功载入!"

 msgid "Save buddylist..."
 msgstr "保存好友列表..."

 msgid "Load buddylist from file..."
-msgstr "从文件装入好友列表..."
-
-#, fuzzy
+msgstr "从文件载入好友列表..."
+
 msgid "You must fill in all registration fields"
 msgstr "填入注册字段。"

-#, fuzzy
 msgid "Passwords do not match"
 msgstr "密码不匹配。"

-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "无法创建新账户。发生了错误。\n"
+msgstr "无法创建新账户。发生了错误。"

 msgid "New Gadu-Gadu Account Registered"
 msgstr "注册了新的 Gadu-Gadu 账户"
@@ -2919,7 +2955,6 @@
 msgid "Enter captcha text"
 msgstr ""

-#, fuzzy
 msgid "Captcha"
 msgstr "保存图像"

@@ -2948,7 +2983,7 @@
 msgstr "女"

 msgid "Only online"
-msgstr "只在线"
+msgstr "仅在线"

 msgid "Find buddies"
 msgstr "查找好友"
@@ -3060,14 +3095,14 @@
 msgid "Chat _name:"
 msgstr "聊天名(_N)："

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "无法连接到服务器。"
+msgstr "无法解析服务器"

 #. 1. connect to server
 #. connect to the server
 msgid "Connecting"
-msgstr "正连接"
+msgstr "正在连接"

 msgid "Chat error"
 msgstr "聊天错误"
@@ -3075,7 +3110,6 @@
 msgid "This chat name is already in use"
 msgstr "此聊天名已经在使用中"

-#, fuzzy
 msgid "Not connected to the server"
 msgstr "未连接到服务器。"

@@ -3118,9 +3152,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu 用户"

-#, fuzzy
 msgid "GG server"
-msgstr "设置用户信息..."
+msgstr ""

 #, c-format
 msgid "Unknown command: %s"
@@ -3136,7 +3169,6 @@
 msgid "File Transfer Failed"
 msgstr "文件传送失败"

-#, fuzzy
 msgid "Unable to open a listening port."
 msgstr "无法打开监听端口。"

@@ -3160,10 +3192,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 ""
-"失去与服务器的连接：\n"
+"与服务器失去连接：\n"
 "%s"

 msgid "View MOTD"
@@ -3175,9 +3207,8 @@
 msgid "_Password:"
 msgstr "密码(_P)："

-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC 昵称不能包含空格"
+msgstr "IRC 昵称和服务器不能包含空格"

 msgid "SSL support unavailable"
 msgstr "SSL 支持不可用"
@@ -3186,11 +3217,11 @@
 msgstr "无法连接"

 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
 msgstr "无法连接到 %s"

-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
 msgstr "服务器关闭了连接。"

@@ -3251,7 +3282,7 @@
 msgstr "屏蔽: %s"

 msgid "End of ban list"
-msgstr "屏蔽列表结束"
+msgstr "屏蔽列表结尾"

 #, c-format
 msgid "You are banned from %s."
@@ -3290,7 +3321,7 @@

 #, c-format
 msgid "%s has changed the topic to: %s"
-msgstr "%s 将话题改为: %s"
+msgstr "%s 将话题改为：%s"

 #, c-format
 msgid "%s has cleared the topic."
@@ -3298,7 +3329,7 @@

 #, c-format
 msgid "The topic for %s is: %s"
-msgstr "%s 的话题为: %s"
+msgstr "%s 的话题为：%s"

 #, c-format
 msgid "Unknown message '%s'"
@@ -3321,14 +3352,14 @@
 msgstr "IRC 服务器的本地时间为："

 msgid "No such channel"
-msgstr "没有这样的频道"
+msgstr "无此频道"

 #. does this happen?
 msgid "no such channel"
 msgstr "没有这样的频道"

 msgid "User is not logged in"
-msgstr "用户未登入"
+msgstr "用户未登录"

 msgid "No such nick or channel"
 msgstr "没有这样的昵称或频道"
@@ -3341,20 +3372,20 @@
 msgstr "加入 %s 需要邀请。"

 msgid "Invitation only"
-msgstr "只邀请"
+msgstr "仅邀请"

 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "您被 %s: %s 踢出了"
+msgstr "您被已 %s 踢出 (%s)"

 #. Remove user from channel
 #, c-format
 msgid "Kicked by %s (%s)"
-msgstr "被 %s (%s) 踢出"
+msgstr "被 %s 踢出 (%s) "

 #, c-format
 msgid "mode (%s %s) by %s"
-msgstr "由 %3$s 管理(%1$s %2$s)"
+msgstr "由 %3$s 设定模式 (%1$s %2$s)"

 msgid "Invalid nickname"
 msgstr "无效的昵称"
@@ -3394,11 +3425,11 @@

 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
-msgstr "PING 响应 -- 延后: %lu 秒"
+msgstr "PING 响应 -- 延迟: %lu 秒"

 #, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "无法加入 %s：需要注册"
+msgstr "无法加入 %s：需要注册。"

 msgid "Cannot join channel"
 msgstr "无法加入频道"
@@ -3419,7 +3450,7 @@
 msgstr "away [消息]: 设置离开消息，不尾随消息则代表离开。"

 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <nick> <msg>：向指定昵称发送 CTCP 消息。"

 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: 向 chanserv 发送命令"
@@ -3435,27 +3466,27 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道语音状态，使其无法在频道被管理"
+"devoice &lt;昵称1&gt; [昵称2]……: 删除某人的频道发言权，使其无法在频道被管理"
 "(+m)时说话。您必须是频道管理员。"

 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
-msgstr "invite &lt;昵称&gt; [房间]: 邀请某人加入您指定的频道，或者当前频道。"
+msgstr "invite &lt;昵称&gt; [聊天室]: 邀请某人加入您指定的频道，或者当前频道。"

 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道，如需要"
-"的话可选提供频道密钥。"
+"j &lt;聊天室1&gt;[,聊天室][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道，如"
+"需要的话可选提供频道密钥。"

 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"join &lt;房间1&gt;[,房间][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道，如需"
-"要的话可选提供频道密钥。"
+"join &lt;聊天室1&gt;[,聊天室][,……] [密钥1[,密钥2][,……]]: 输入一个或多个频道，"
+"如需要的话可选提供频道密钥。"

 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
@@ -3466,7 +3497,7 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list: 显示网络上的聊天式列表。<i>警告，某些服务器可能因此而断开您的连接。</i>"
+"list：显示网络上的聊天室列表。<i>警告，某些服务器可能因此而断开您的连接。</i>"

 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;要执行的动作&gt;: 执行动作。"
@@ -3494,9 +3525,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 "me &lt;动作&gt;: 向好友或聊天发送 IRC 风格的动作。"
+msgstr "notice &lt;目标&gt;: 向好友或频道发送提示。"

 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3515,7 +3545,7 @@
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
-msgstr "part [房间] [消息]: 离开当前频道或指定频道，并留下可选的消息。"
+msgstr "part [聊天室] [消息]: 离开当前频道或指定频道，并留下可选的消息。"

 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
@@ -3525,18 +3555,18 @@
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
-msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私下消息(与频道相对)。"
+msgstr "query &lt;昵称&gt; &lt;消息&gt;: 给用户发送私人消息(与频道相对)。"

 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [消息]: 断开与服务器的连接，并留下可选的消息。"

 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quot [……]: 向服务器发送原始命令。"
+msgstr "quote [……]: 向服务器发送原始命令。"

 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
-msgstr "remove &lt;昵称&gt; [消息]: 从房间删除某人。您必须是频道管理员。"
+msgstr "remove &lt;昵称&gt; [消息]: 从聊天室删除某人。您必须是频道管理员。"

 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: 显示 IRC 服务器上当前的本地时间。"
@@ -3553,8 +3583,7 @@
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
-msgstr ""
-"voice &lt;昵称1&gt; [昵称2]: 为某人授予频道语音状态。您必须是频道管理员。"
+msgstr "voice &lt;昵称1&gt; [昵称2] ...：授予频道发言权。您必须是频道管理员。"

 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
@@ -3562,11 +3591,10 @@
 msgstr "wallops &lt;消息&gt;: 如果您不知道这是什么功能，请不要使用。"

 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
-
-#, fuzzy
+msgstr "whois [服务器] &lt;昵称&gt;：获得用户信息。"
+
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whois [服务器] &lt;昵称&gt;: 获得用户信息。"
+msgstr "whois [服务器] &lt;昵称&gt;：获得用户信息。"

 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -3584,39 +3612,33 @@
 msgid "Unknown Error"
 msgstr "未知错误"

-#, fuzzy
 msgid "Ad-Hoc Command Failed"
 msgstr "命令已禁用"

-#, fuzzy
 msgid "execute"
-msgstr "未期待"
-
-#, fuzzy
+msgstr "执行"
+
 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 登录，但没有找到 TLS/SSL 支持。"
+msgstr "您要求 TLS/SSL 登录，但未找到 TLS/SSL 支持。"

 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "服务器需要在不加密流上使用纯文本验证"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
-msgstr "服务器需要在不加密流上使用纯文本验证。允许这么做并继续验证吗？"
+msgstr "%s 需要在不加密流上使用纯文本验证。允许这么做并继续验证吗？"

 msgid "Plaintext Authentication"
 msgstr "纯文本认证"

-#, fuzzy
 msgid "SASL authentication failed"
 msgstr "认证失败"

-#, fuzzy
 msgid "Invalid response from server"
 msgstr "服务器的响应无效。"

@@ -3624,12 +3646,12 @@
 msgstr "服务器未使用任何支持的身份验证方法"

 msgid "You require encryption, but it is not available on this server."
-msgstr ""
+msgstr "您请求加密，但服务器不支持"

 msgid "Invalid challenge from server"
 msgstr "服务器的挑战无效"

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

@@ -3645,7 +3667,7 @@
 msgid "Unable to establish a connection with the server"
 msgstr "无法与服务器建立连接"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
 msgstr "无法与服务器建立连接"

@@ -3667,6 +3689,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 "额外地址"

@@ -3727,14 +3754,13 @@

 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "%s 前"
+
 msgid "Logged Off"
-msgstr "已登入"
+msgstr "已退出"

 msgid "Middle Name"
-msgstr "中名"
+msgstr "教名"

 msgid "Address"
 msgstr "地址"
@@ -3746,7 +3772,16 @@
 msgstr "相片"

 msgid "Logo"
-msgstr "图符"
+msgstr "Logo"
+
+#, fuzzy, c-format
+msgid ""
+"%s will no longer be able to see your status updates.  Do you want to "
+"continue?"
+msgstr "您即将从您的好友列表中删除 %s。您真的要这么做吗？"
+
+msgid "Cancel Presence Notification"
+msgstr "取消目前的通知"

 msgid "Un-hide From"
 msgstr "取消隐身"
@@ -3754,14 +3789,9 @@
 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"
@@ -3774,10 +3804,10 @@
 msgstr "退出"

 msgid "Chatty"
-msgstr "唠叨"
+msgstr "找我聊聊吧"

 msgid "Extended Away"
-msgstr "远远离开"
+msgstr "离开"

 msgid "Do Not Disturb"
 msgstr "请勿打扰"
@@ -3811,9 +3841,8 @@
 msgid "Server Instructions: %s"
 msgstr "服务器指令：%s"

-#, fuzzy
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "填入输入框可以搜索匹配的 Jabber 用户。"
+msgstr "填入输入框可以搜索匹配的 XMPP 用户。"

 msgid "Email Address"
 msgstr "电子邮件地址"
@@ -3838,7 +3867,7 @@
 msgstr "搜索目录"

 msgid "_Room:"
-msgstr "房间(_R)："
+msgstr "聊天室(_R)："

 msgid "_Server:"
 msgstr "服务器(_S)："
@@ -3848,10 +3877,10 @@

 #, c-format
 msgid "%s is not a valid room name"
-msgstr "%s 不是有效的房间名"
+msgstr "%s 不是有效的聊天室名"

 msgid "Invalid Room Name"
-msgstr "无效的房间名"
+msgstr "无效的聊天室名"

 #, c-format
 msgid "%s is not a valid server name"
@@ -3862,10 +3891,10 @@

 #, c-format
 msgid "%s is not a valid room handle"
-msgstr "%s 不是有效的房间昵称"
+msgstr "%s 不是有效的聊天室昵称"

 msgid "Invalid Room Handle"
-msgstr "无效的房间门昵称"
+msgstr "无效的聊天室昵称"

 msgid "Configuration error"
 msgstr "配置错误"
@@ -3874,10 +3903,10 @@
 msgstr "无法配置"

 msgid "Room Configuration Error"
-msgstr "房间配置错误"
+msgstr "聊天室配置错误"

 msgid "This room is not capable of being configured"
-msgstr "此房间无法进行配置"
+msgstr "此聊天室无法进行配置"

 msgid "Registration error"
 msgstr "注册错误"
@@ -3886,7 +3915,7 @@
 msgstr "不支持在非 MUC 聊天室中更改昵称"

 msgid "Error retrieving room list"
-msgstr "收取房间列表时出错"
+msgstr "收取聊天室列表时出错"

 msgid "Invalid Server"
 msgstr "无效的服务器"
@@ -3898,19 +3927,17 @@
 msgstr "选择要查询的会议服务器"

 msgid "Find Rooms"
-msgstr "查找房间"
-
-#, fuzzy
+msgstr "查找聊天室"
+
 msgid "Affiliations:"
-msgstr "别名："
+msgstr "友好关系："

 msgid "No users found"
 msgstr "未找到匹配的用户"

 msgid "Roles:"
-msgstr "角色："
-
-#, fuzzy
+msgstr "职务："
+
 msgid "Ping timed out"
 msgstr "Ping 超时"

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

-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "连接到服务器失败。"
+msgstr ""

 #, c-format
 msgid "Registration of %s@%s successful"
@@ -3954,7 +3980,7 @@
 msgstr "取消注册失败"

 msgid "State"
-msgstr "州/省"
+msgstr "省/州"

 msgid "Postal code"
 msgstr "邮政编码"
@@ -3995,11 +4021,6 @@
 msgid "Change Registration"
 msgstr "更改帐户"

-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "连接到服务器失败。"
-
-#, fuzzy
 msgid "Error unregistering account"
 msgstr "更改账户信息出错"

@@ -4028,7 +4049,7 @@
 msgstr "心情"

 msgid "Now Listening"
-msgstr ""
+msgstr "正在收听"

 msgid "Both"
 msgstr "双向"
@@ -4051,19 +4072,15 @@
 msgid "Subscription"
 msgstr "订阅"

-#, fuzzy
 msgid "Mood Text"
 msgstr "血型"

-#, fuzzy
 msgid "Allow Buzz"
 msgstr "允许"

-#, fuzzy
 msgid "Tune Artist"
 msgstr "美工"

-#, fuzzy
 msgid "Tune Title"
 msgstr "标题"

@@ -4073,7 +4090,6 @@
 msgid "Tune Genre"
 msgstr ""

-#, fuzzy
 msgid "Tune Comment"
 msgstr "好友注释"

@@ -4136,9 +4152,8 @@
 msgid "Item Not Found"
 msgstr "项目未找到"

-#, fuzzy
 msgid "Malformed XMPP ID"
-msgstr "Jabber ID 格式错误"
+msgstr "XMPP ID 格式错误"

 msgid "Not Acceptable"
 msgstr "不可接受"
@@ -4267,21 +4282,21 @@
 msgid "Unable to ban user %s"
 msgstr "无法屏蔽用户 %s"

-#, fuzzy, c-format
+#, c-format
 msgid "Unknown affiliation: \"%s\""
-msgstr "未知的错误代码: %s"
-
-#, fuzzy, c-format
+msgstr "未知的友好关系：%s"
+
+#, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "无法邀请用户(%s)。"
+msgstr "无法邀请用户%s 成为“%s”。"

 #, c-format
 msgid "Unknown role: \"%s\""
-msgstr "未知角色:“%s”"
-
-#, fuzzy, c-format
+msgstr "未知职务：“%s”"
+
+#, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "无法发送消息: %s"
+msgstr "无法为用户%2$s 设置“%1$s”职务"

 #, c-format
 msgid "Unable to kick user %s"
@@ -4291,15 +4306,15 @@
 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
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr "无法给 %s 发送文件，用户不支持文件传送"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
@@ -4312,60 +4327,56 @@
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "屏幕震动"
+
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "%s 已经将您[%s]添加为好友"
-
-#, fuzzy, c-format
+msgstr "%s 给您发送了屏幕震动！"
+
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "无法给 %s 发送消息。"
-
-#, fuzzy, c-format
+msgstr "无法同 %s 创建多媒体会话：无效的 JID。"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "无法给 %s 发送文件，用户不支持文件传送"
-
-#, fuzzy, c-format
+msgstr "无法同 %s 创建多媒体会话：用户不在线"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "无法给 %s 发送文件，用户不支持文件传送"
-
-#, fuzzy
+msgstr "无法同 %s 创建多媒体会话：没有添加用户监视"
+
 msgid "Media Initiation Failed"
-msgstr "注册失败"
-
-#, fuzzy, c-format
+msgstr "创建多媒体会话失败"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr "您想要查看谁的信息？请输入他/她的用户名或别名。"

-#, fuzzy
 msgid "Select a Resource"
-msgstr "选择文件"
-
-#, fuzzy
+msgstr "选择资源"
+
 msgid "Initiate Media"
-msgstr "发起聊天(_C)"
+msgstr "创建多媒体会话"

 msgid "config:  Configure a chat room."
-msgstr "config: 配置聊天室。"
+msgstr "配置：配置聊天室。"

 msgid "configure:  Configure a chat room."
-msgstr "configure: 配置聊天室。"
+msgstr "配置：配置聊天室。"

 msgid "part [room]:  Leave the room."
-msgstr "part [房间]: 离开聊天室。"
+msgstr "part [聊天室]: 离聊天天室。"

 msgid "register:  Register with a chat room."
-msgstr "register: 注册聊天室。"
+msgstr "注册：注册聊天室。"

 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [新话题]: 查看或更改话题。"

-#, fuzzy
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;用户&gt; [房间]: 在房间中屏蔽一个用户。"
+msgstr "ban &lt;用户&gt; [原因]: 在聊天室中屏蔽一个用户。"

 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
@@ -4375,21 +4386,19 @@
 #, 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;user&gt; &lt;moderator|participant|visitor|none&gt;: 设置用户在房间"
-"中的角色。"
+"users with a role or set users' role with the room."
+msgstr ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: 设置用户在聊天"
+"室中的职务。"

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入房间。"
-
-#, fuzzy
+msgstr "invite &lt;用户&gt; [消息]: 邀请用户加入聊天室。"
+
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "join: &lt;房间&gt; [服务器]: 加入此服务器上的聊天聊天室。"
-
-#, fuzzy
+msgstr "join: &lt;聊天室&gt; [密码]: 加入此服务器上的聊天聊天室。"
+
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
-msgstr "kick &lt;用户&gt; [房间]: 从房间中踢出一个用户。"
+msgstr "kick &lt;用户&gt; [原因]: 从聊天室中踢出一个用户。"

 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
@@ -4419,7 +4428,7 @@
 msgstr "域"

 msgid "Require SSL/TLS"
-msgstr ""
+msgstr "需要 SSL/TLS"

 msgid "Force old (port 5223) SSL"
 msgstr "强制旧 SSL(5223 端口)"
@@ -4472,7 +4481,7 @@

 #, c-format
 msgid "(Code %s)"
-msgstr " (代码 %s)"
+msgstr "(代码 %s)"

 msgid "XML Parse error"
 msgstr "XML 分析错误"
@@ -4489,42 +4498,35 @@
 msgstr "聊天 %s 出错"

 msgid "Create New Room"
-msgstr "创建新房间"
+msgstr "创建新聊天室"

 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
-msgstr "您正在创建新房间。您是想要进行配置，还是想要接受默认设置？"
+msgstr "您正在创建新聊天室。您是想要进行配置，还是想要接受默认设置？"

 msgid "_Configure Room"
-msgstr "配置房间(_C)"
+msgstr "配置聊天室(_C)"

 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 踢出 (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "被 %s (%s) 踢出"
-
-#, fuzzy
+msgstr "被 %s 踢出 (%s) "
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "打开文件时发生了错误。"
-
-#, fuzzy
+msgstr "打开文件时发生了错误。\n"
+
 msgid "Transfer was closed."
-msgstr "文件传送失败"
-
-#, fuzzy
-msgid "Failed to open the file"
-msgstr "打开文件“%s”：%s"
+msgstr "文件传送连接已关闭。"

 msgid "Failed to open in-band bytestream"
 msgstr ""
@@ -4536,61 +4538,53 @@
 msgid "File Send Failed"
 msgstr "发送文件失败"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "无法给 %s 发送消息。"
-
-#, fuzzy, c-format
+msgstr "无法给 %s 发送文件：无效的 JID"
+
+#, c-format
 msgid "Unable to send file to %s, user is not online"
-msgstr "无法给 %s 发送文件，用户不支持文件传送"
-
-#, fuzzy, c-format
+msgstr "无法给 %s 发送文件：用户不在线"
+
+#, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "无法给 %s 发送文件，用户不支持文件传送"
-
-#, fuzzy, c-format
+msgstr "无法给 %s 发送文件：未添加用户监视"
+
+#, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "您想要查看谁的信息？请输入他/她的用户名或别名。"

-#, fuzzy
 msgid "Edit User Mood"
-msgstr "用户模式"
+msgstr "编辑用户心情"

 msgid "Please select your mood from the list."
 msgstr ""

-#, fuzzy
 msgid "Set"
-msgstr "设置(_S)"
-
-#, fuzzy
+msgstr "设置"
+
 msgid "Set Mood..."
-msgstr "发送消息..."
-
-#, fuzzy
+msgstr "设置心情..."
+
 msgid "Set User Nickname"
-msgstr "设置用户限制"
-
-#, fuzzy
+msgstr "设置用户昵称"
+
 msgid "Please specify a new nickname for you."
-msgstr "请输入 %s 的新名称"
+msgstr "请您为自己指定新的昵称。"

 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""

-#, fuzzy
 msgid "Set Nickname..."
-msgstr "昵称"
-
-#, fuzzy
+msgstr "设置昵称..."
+
 msgid "Actions"
 msgstr "动作"

-#, fuzzy
 msgid "Select an action"
-msgstr "选择文件"
+msgstr "选择一个动作"

 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
@@ -4600,15 +4594,14 @@
 msgstr "无法添加“%s”。"

 msgid "Buddy Add error"
-msgstr ""
-
-#, fuzzy
+msgstr "添加好友出错"
+
 msgid "The username specified does not exist."
-msgstr "指定的用户名无效。"
+msgstr "指定的用户名不存在。"

 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "%s (%s) 的好友列表同步问题"
+msgstr "%s 上的好友列表同步问题(%s)"

 #, c-format
 msgid ""
@@ -4625,11 +4618,11 @@

 #, c-format
 msgid "Unable to parse message"
-msgstr "无法处理消息"
+msgstr "无法解析消息"

 #, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "错误(可能是客户端的 bug)"
+msgstr "语法错误(可能是客户端的 bug)"

 #, c-format
 msgid "Invalid email address"
@@ -4645,11 +4638,11 @@

 #, c-format
 msgid "Already logged in"
-msgstr "已登入"
-
-#, fuzzy, c-format
+msgstr "已登录"
+
+#, c-format
 msgid "Invalid username"
-msgstr "名称无效"
+msgstr "无效用户名"

 #, c-format
 msgid "Invalid friendly name"
@@ -4721,7 +4714,7 @@

 #, c-format
 msgid "Not logged in"
-msgstr "未登入"
+msgstr "未登录"

 #, c-format
 msgid "Service temporarily unavailable"
@@ -4793,7 +4786,7 @@

 #, c-format
 msgid "Passport not verified"
-msgstr "Passport 未验证"
+msgstr "通行证未验证"

 #, c-format
 msgid "Bad friend file"
@@ -4803,8 +4796,8 @@
 msgid "Not expected"
 msgstr "未期待"

-#, c-format
-msgid "Friendly name changes too rapidly"
+#, fuzzy
+msgid "Friendly name is changing too rapidly"
 msgstr "友好的名称更改太频繁"

 #, c-format
@@ -4825,15 +4818,14 @@

 #, c-format
 msgid "Kids Passport without parental consent"
-msgstr "没有父母在的儿童 Passport"
+msgstr "没有父母在的儿童通行证"

 #, c-format
 msgid "Passport account not yet verified"
-msgstr "Passport 账户未验证"
-
-#, fuzzy
+msgstr "通行证账户未验证"
+
 msgid "Passport account suspended"
-msgstr "Passport 账户未验证"
+msgstr "通行证账户已被取代"

 #, c-format
 msgid "Bad ticket"
@@ -4847,32 +4839,45 @@
 msgid "MSN Error: %s\n"
 msgstr "MSN 错误: %s\n"

-#, fuzzy
 msgid "Other Contacts"
-msgstr "首选联系人"
-
-#, fuzzy
+msgstr "其他联系人"
+
 msgid "Non-IM Contacts"
-msgstr "删除联系人"
-
-#, fuzzy, c-format
+msgstr "非即时消息联系人"
+
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr ""
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s 向您发送了语音聊天邀请，但尚不支持。"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
-msgstr "%s 向您发送了摄像头邀请，但尚不支持。"
+msgstr "%s 向您发送了语音聊天邀请，但尚不支持。"

 msgid "Nudge"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "引起注意"
+
+#, c-format
 msgid "%s has nudged you!"
-msgstr "%s 已经将您[%s]添加为好友"
+msgstr "%s 轻轻地推了您一下，希望您注意他！"

 #, c-format
 msgid "Nudging %s..."
-msgstr ""
-
-#, fuzzy
+msgstr "正在轻轻地推 %s ，以引起他对您的注意..."
+
 msgid "Email Address..."
-msgstr "电子邮件地址"
+msgstr "电子邮件地址..."

 msgid "Your new MSN friendly name is too long."
 msgstr "新的 MSN 友好名称太长。"
@@ -4908,11 +4913,10 @@
 msgid "Disallow"
 msgstr "禁止"

-#, fuzzy, c-format
+#, c-format
 msgid "Blocked Text for %s"
 msgstr "%s 的好友注释"

-#, fuzzy
 msgid "No text is blocked for this account."
 msgstr "此账户使用此好友图标(_I)："

@@ -4921,37 +4925,32 @@
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr ""

-#, fuzzy
 msgid "This account does not have email enabled."
-msgstr "此 Hotmail 账户可能未激活。"
+msgstr "此账户没有启用电子邮件。"

 msgid "Send a mobile message."
 msgstr "发送移动消息。"

 msgid "Page"
-msgstr "寻呼"
+msgstr ""

 msgid "Playing a game"
-msgstr ""
-
-#, fuzzy
+msgstr "正在玩游戏"
+
 msgid "Working"
-msgstr "工作"
+msgstr "正在工作"

 msgid "Has you"
 msgstr ""

-#, fuzzy
 msgid "Home Phone Number"
-msgstr "设置家庭电话号码..."
-
-#, fuzzy
+msgstr "家庭电话号码"
+
 msgid "Work Phone Number"
-msgstr "设置工作电话号码..."
-
-#, fuzzy
+msgstr "工作电话号码"
+
 msgid "Mobile Phone Number"
-msgstr "设置移动电话号码..."
+msgstr "移动电话号码"

 msgid "Be Right Back"
 msgstr "马上回来"
@@ -4971,21 +4970,17 @@
 #. saveable
 #. should be user_settable some day
 #. independent
-#, fuzzy
 msgid "Artist"
 msgstr "美工"

-#, fuzzy
 msgid "Album"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "相册"
+
 msgid "Game Title"
-msgstr "标题"
-
-#, fuzzy
+msgstr "游戏标题"
+
 msgid "Office Title"
-msgstr "标题"
+msgstr "办公标题"

 msgid "Set Friendly Name..."
 msgstr "设置友好的名称..."
@@ -5020,6 +5015,29 @@
 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 "获取配置文件出错"

@@ -5036,13 +5054,13 @@
 msgstr "位置"

 msgid "Hobbies and Interests"
-msgstr "嗜好和兴趣"
+msgstr "兴趣爱好"

 msgid "A Little About Me"
-msgstr "自我介绍"
+msgstr "自我简介"

 msgid "Social"
-msgstr "社会"
+msgstr "社会关系"

 msgid "Marital Status"
 msgstr "婚姻状况"
@@ -5063,7 +5081,7 @@
 msgstr "时尚"

 msgid "Humor"
-msgstr ""
+msgstr "心情"

 msgid "Music"
 msgstr "音乐"
@@ -5075,7 +5093,7 @@
 msgstr "联系信息"

 msgid "Personal"
-msgstr "个人"
+msgstr "个人信息"

 msgid "Significant Other"
 msgstr ""
@@ -5164,17 +5182,16 @@
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-"MSN 报告找不到用户的个人资料。这可能是因为用户不存在，或者用户没有创建公开的"
-"个人资料。"
+"MSN 找不到用户的个人资料。这可能是因为用户不存在，或者用户没有创建公开的个人"
+"资料。"

 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr "在用户的个人资料中找不到任何信息。用户可能不存在。"

-#, fuzzy
 msgid "View web profile"
-msgstr "离线时隐藏"
+msgstr "查看 Web 配置文件"

 #. *< type
 #. *< ui_requirement
@@ -5191,9 +5208,8 @@
 msgid "Use HTTP Method"
 msgstr "使用 HTTP 方式"

-#, fuzzy
 msgid "HTTP Method Server"
-msgstr "IPC 测试服务器"
+msgstr "HTTP 方式服务器"

 msgid "Show custom smileys"
 msgstr "显示自定义如下："
@@ -5201,38 +5217,35 @@
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge：向用户发送闪屏震动，以便引起他的注意"

-#, fuzzy
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "失败: 身份验证失败"
-
-#, fuzzy
+msgstr "Windows Live ID 验证：无法连接"
+
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "失败: 身份验证失败"
+msgstr "Windows Live ID 验证：无效应答"

 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s 刚刚给您发送了闪屏振动！"

-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "未知错误"
+msgstr "未知错误 (%d): %s"

 msgid "Unable to add user"
 msgstr "无法添加用户"

-#, fuzzy, c-format
+#. Unknown error!
+#, c-format
 msgid "Unknown error (%d)"
-msgstr "未知错误"
-
-#, fuzzy
+msgstr "未知错误 (%d)"
+
 msgid "The following users are missing from your addressbook"
-msgstr "下面是您搜索的结果"
-
-#, fuzzy
+msgstr "以下用户不在您的通讯录中"
+
 msgid "Mobile message was not sent because it was too long."
-msgstr "消息未发出，因为您尚未登入。"
-
-#, fuzzy, c-format
+msgstr "消息未发出，因为消息太长。"
+
+#, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
 "automatically be signed out at that time.  Please finish any conversations "
@@ -5247,33 +5260,21 @@
 "\n"
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
-msgstr[0] ""
-"MSN 服务器即将于 %d 分钟后关闭进行维护。到那时，您将会被自动登出。请尽快关闭"
-"现在进行中的对话。\n"
-"\n"
-"维护完成后，您将能够成功登入。"
-msgstr[1] ""
-"MSN 服务器即将于 %d 分钟后关闭进行维护。到那时，您将会被自动登出。请尽快关闭"
-"现在进行中的对话。\n"
-"\n"
-"维护完成后，您将能够成功登入。"
+msgstr[0] "消息未发出，因为消息太长。"

 msgid ""
 "Message was not sent because the system is unavailable. This normally "
 "happens when the user is blocked or does not exist."
 msgstr ""

-#, fuzzy
 msgid "Message was not sent because messages are being sent too quickly."
-msgstr "消息未发出，因为发送的频率太高："
-
-#, fuzzy
+msgstr "消息未发出，因为发送的频率太高。"
+
 msgid "Message was not sent because an unknown encoding error occurred."
-msgstr "消息未发出，因为发生了未知错误："
-
-#, fuzzy
+msgstr "消息未发出，因为发生了未知编码错误。"
+
 msgid "Message was not sent because an unknown error occurred."
-msgstr "消息未发出，因为发生了未知错误："
+msgstr "消息未发出，因为发生了未知错误。"

 msgid "Writing error"
 msgstr "写入错误"
@@ -5289,22 +5290,18 @@
 "%s 服务器的连接错误：\n"
 "%s"

-#, fuzzy
 msgid "Our protocol is not supported by the server"
 msgstr "服务器不支持此协议。"

-#, fuzzy
 msgid "Error parsing HTTP"
 msgstr "分析 HTTP 出错。"

-#, fuzzy
 msgid "You have signed on from another location"
-msgstr "您在其它位置用此用户名登入了。"
+msgstr "您在其它位置用此用户名登录了。"

 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 服务器目前维护中。"

@@ -5314,7 +5311,7 @@

 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "您的 MSN 好友列表临时不可用。请稍候再试一次。"
+msgstr "您的 MSN 好友列表临时不可用。请稍候再试。"

 msgid "Handshaking"
 msgstr "握手"
@@ -5334,16 +5331,16 @@
 msgid "Retrieving buddy list"
 msgstr "正在获取好友列表"

-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr "%s 向您发送了摄像头邀请，但尚不支持。"
-
-#, c-format
-msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr "%s 向您发送了摄像头邀请，但尚不支持。"
+msgstr "%s 向您发送了视频聊天邀请，但尚不支持。"
+
+#, fuzzy, c-format
+msgid "%s invited you to view his/her webcam, but this is not yet supported."
+msgstr "%s 向您发送了视频聊天邀请，但尚不支持。"

 msgid "Away From Computer"
-msgstr "远离电脑"
+msgstr "离开"

 msgid "On The Phone"
 msgstr "接听电话"
@@ -5378,18 +5375,19 @@
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "消息未发出，因为发生了未知错误："

-#, fuzzy
 msgid "Delete Buddy from Address Book?"
-msgstr "添加到地址簿"
-
-#, fuzzy
+msgstr "从通讯录删除好友？"
+
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "您是否想要将此人加为好友？"
-
-#, fuzzy
+msgstr "您是否要将这个好友也从通讯录中删除？"
+
 msgid "The username specified is invalid."
 msgstr "指定的用户名无效。"

+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr "友好的名称更改太频繁"
+
 msgid "This Hotmail account may not be active."
 msgstr "此 Hotmail 账户可能未激活。"

@@ -5406,9 +5404,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "MSN Protocol Plugin"
-msgstr "AIM 协议插件"
+msgstr "MSN 协议插件"

 #, c-format
 msgid "%s is not a valid group."
@@ -5419,19 +5416,19 @@

 #, c-format
 msgid "%s on %s (%s)"
-msgstr "%2$s(%3$s) 上的 %1$s"
+msgstr "%2$s 上的 %1$s (%3$s)"

 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "无法在 %s(%s) 上添加用户"
+msgstr "无法在 %s 上添加用户 (%s)"

 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "无法在 %s(%s) 上屏蔽用户"
+msgstr "无法在 %s 上屏蔽用户 (%s)"

 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "无法允许 %s(%s) 上的拥护"
+msgstr "无法允许 %s 上的用户 (%s)"

 #, c-format
 msgid "%s could not be added because your buddy list is full."
@@ -5462,62 +5459,53 @@
 msgid "No such user: %s"
 msgstr ""

-#, fuzzy
 msgid "User lookup"
-msgstr "用户房间"
+msgstr "用户查找"

 msgid "Reading challenge"
 msgstr "读取挑战"

-#, fuzzy
 msgid "Unexpected challenge length from server"
 msgstr "服务器的挑战无效"

-#, fuzzy
 msgid "Logging in"
-msgstr "日志"
-
-#, fuzzy
+msgstr "登录"
+
 msgid "MySpaceIM - No Username Set"
-msgstr "无名称"
+msgstr "MySpaceIM - 未设定用户名"

 msgid "You appear to have no MySpace username."
-msgstr ""
+msgstr "您没有 MySpace 用户名。"

 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
-msgstr ""
-
-#, fuzzy
+msgstr "您是否想立即设置？(注意：不可更改！)"
+
 msgid "Lost connection with server"
-msgstr ""
-"丢失与服务器的连接\n"
-"%s"
+msgstr "与服务器失去连接"

 #. 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 "发送消息"
+msgstr "新的邮件"

 msgid "New blog comments"
-msgstr ""
+msgstr "新博客评论"

 msgid "New profile comments"
 msgstr ""

 msgid "New friend requests!"
-msgstr ""
+msgstr "好友请求！"

 msgid "New picture comments"
-msgstr ""
+msgstr "新图片评论"

 msgid "MySpace"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpace"
+
 msgid "IM Friends"
-msgstr "即时消息窗口(_I)"
+msgstr "即时消息朋友"

 #, c-format
 msgid ""
@@ -5526,15 +5514,14 @@
 msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr[0] ""
-
-#, fuzzy
+msgstr[0] "即时消息朋友"
+
 msgid "Add contacts from server"
-msgstr "服务器的响应无效。"
-
-#, fuzzy, c-format
+msgstr "从服务器添加联系人"
+
+#, c-format
 msgid "Protocol error, code %d: %s"
-msgstr "进程返回了错误代码 %d"
+msgstr "协议错误，代码 %d: %s"

 #, c-format
 msgid ""
@@ -5543,37 +5530,30 @@
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""

-#, fuzzy
 msgid "Incorrect username or password"
-msgstr "昵称或密码不对"
+msgstr "用户名或密码错误"

 msgid "MySpaceIM Error"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM 错误"
+
 msgid "Invalid input condition"
-msgstr "完成连接"
-
-#, fuzzy
+msgstr "无效的输入条件"
+
 msgid "Failed to add buddy"
-msgstr "在聊天中加入好友失败"
-
-#, fuzzy
+msgstr "添加好友失败"
+
 msgid "'addbuddy' command failed."
-msgstr "从文件装入好友列表..."
-
-#, fuzzy
+msgstr "“添加好友” 命令失败。"
+
 msgid "persist command failed"
 msgstr "切换板失败"

-#, fuzzy
 msgid "Failed to remove buddy"
-msgstr "在聊天中加入好友失败"
+msgstr "移除好友失败"

 msgid "'delbuddy' command failed"
 msgstr ""

-#, fuzzy
 msgid "blocklist command failed"
 msgstr "切换板失败"

@@ -5589,19 +5569,17 @@
 msgstr ""

 msgid "Add friends from MySpace.com"
-msgstr ""
-
-#, fuzzy
+msgstr "从 MySpace.com 添加好友"
+
 msgid "Importing friends failed"
 msgstr "无效的好友文件"

 #. TODO: find out how
 msgid "Find people..."
-msgstr "查找好友..."
-
-#, fuzzy
+msgstr "查找..."
+
 msgid "Change IM name..."
-msgstr "更改密码..."
+msgstr "更改 IM 名称..."

 msgid "myim URL handler"
 msgstr ""
@@ -5616,35 +5594,31 @@
 msgstr ""

 msgid "Show headline in status text"
-msgstr ""
+msgstr "在状态文本显示新闻提要"

 msgid "Send emoticons"
 msgstr "发送表情"

 msgid "Screen resolution (dots per inch)"
-msgstr ""
-
-#, fuzzy
+msgstr "屏幕分辨率(每英寸点数)"
+
 msgid "Base font size (points)"
 msgstr "较大字体"

 msgid "User"
 msgstr "用户"

-#, fuzzy
 msgid "Headline"
 msgstr "昵称(_H)："

-#, fuzzy
 msgid "Song"
 msgstr "声音"

 msgid "Total Friends"
-msgstr ""
-
-#, fuzzy
+msgstr "好友总计"
+
 msgid "Client Version"
-msgstr "关闭对话"
+msgstr "客户端版本"

 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
@@ -5652,31 +5626,27 @@
 "to set your username."
 msgstr ""

-#, fuzzy
 msgid "MySpaceIM - Username Available"
-msgstr "服务不可用"
+msgstr "MySpaceIM - 用户名可用"

 msgid "This username is available. Would you like to set it?"
-msgstr ""
+msgstr "此用户名可用。您是否想设置为这个用户名？"

 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "一旦设置，将不可更改！"

 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM - 请设置一个用户名"
+
 msgid "This username is unavailable."
-msgstr "此主题没有可用的表情。"
-
-#, fuzzy
+msgstr "该用户名不可用。"
+
 msgid "Please try another username:"
-msgstr "请输入 %s 的新名称"
+msgstr "请尝试另外的用户名："

 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "无名称"
+msgstr "未设定用户名"

 msgid "Please enter a username to check its availability:"
 msgstr ""
@@ -5690,7 +5660,7 @@
 msgid "Zap"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "%s has zapped you!"
 msgstr "%s 已经将您[%s]添加为好友"

@@ -5702,7 +5672,7 @@
 msgid "Whack"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "%s has whacked you!"
 msgstr "%s 已经将您[%s]添加为好友"

@@ -5713,11 +5683,10 @@
 #. 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 "话题"

-#, fuzzy, c-format
+#, c-format
 msgid "%s has torched you!"
 msgstr "用户已经屏蔽了您"

@@ -5729,9 +5698,9 @@
 msgid "Smooch"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"

 #, c-format
 msgid "Smooching %s..."
@@ -5741,20 +5710,19 @@
 msgid "Hug"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"

 #, c-format
 msgid "Hugging %s..."
 msgstr ""

 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
 msgstr "打盹"

-#, fuzzy, c-format
+#, c-format
 msgid "%s has slapped you!"
 msgstr "%s 已经将您[%s]添加为好友"

@@ -5763,15 +5731,14 @@
 msgstr ""

 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
 msgstr "已走"

-#, fuzzy, c-format
+#, c-format
 msgid "%s has goosed you!"
 msgstr "%s 走了。"

-#, fuzzy, c-format
+#, c-format
 msgid "Goosing %s..."
 msgstr "查阅 %s"

@@ -5781,9 +5748,9 @@
 msgid "High-five"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"

 #, c-format
 msgid "High-fiving %s..."
@@ -5795,9 +5762,9 @@
 msgid "Punk"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"

 #, c-format
 msgid "Punking %s..."
@@ -5813,9 +5780,9 @@
 msgid "Raspberry"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "%s has raspberried you!"
-msgstr "%s 已登入。"
+msgstr "%s 已登录。"

 #, c-format
 msgid "Raspberrying %s..."
@@ -5875,7 +5842,6 @@
 msgid "Master archive is misconfigured"
 msgstr "主存档配置错误"

-#, fuzzy
 msgid "Could not recognize the host of the username you entered"
 msgstr "无法识别您输入用户名的主机"

@@ -5890,9 +5856,8 @@
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "您达到了所允许联系人的最大数目"

-#, fuzzy
 msgid "You have entered an incorrect username"
-msgstr "您输入了无效的用户名"
+msgstr "您输入了错误的用户名"

 msgid "An error occurred while updating the directory"
 msgstr "更新目录时发生了错误"
@@ -5915,7 +5880,7 @@
 msgid "Unknown error: 0x%X"
 msgstr "未知错误: 0x%X"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
 msgstr "无法 ping 用户 %s"

@@ -6043,7 +6008,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."
@@ -6071,8 +6035,9 @@
 msgid "Server port"
 msgstr "服务器端口"

-#, fuzzy
-msgid "Received unexpected response from "
+#. Note to translators: %s in this string is a URL
+#, fuzzy, c-format
+msgid "Received unexpected response from %s"
 msgstr "从服务器收到了意外的 HTTP 响应。"

 #. username connecting too frequently
@@ -6083,22 +6048,21 @@
 "您连接和断开得太频繁。请等十分钟，然后再试一次。如果您继续重试，您等的时间可"
 "能会更长。"

+#. Note to translators: The first %s is a URL, the second is an
+#. error message.
 #, fuzzy, c-format
-msgid "Error requesting "
-msgstr "请求登录令牌出错"
+msgid "Error requesting %s: %s"
+msgstr "请求时出错"

 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
-
-#, fuzzy
+msgstr "AOL 不允许通过此站点认证您的屏幕名称。"
+
 msgid "Could not join chat room"
-msgstr "无法连接"
-
-#, fuzzy
+msgstr "无法进入聊天室"
+
 msgid "Invalid chat room name"
-msgstr "无效的房间名"
-
-#, fuzzy
+msgstr "无效的聊天室名称"
+
 msgid "Received invalid data on connection with server"
 msgstr "在与服务器的连接中收到了无效的数据。"

@@ -6147,12 +6111,11 @@
 msgid "Received invalid data on connection with remote user."
 msgstr ""

-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
 msgstr "无法建立与远程用户的连接。"

 msgid "Direct IM established"
-msgstr "二人世界已建立"
+msgstr "二人世界直连聊天已建立"

 #, c-format
 msgid ""
@@ -6213,10 +6176,10 @@
 msgstr "本地许可/禁止"

 msgid "Warning level too high (sender)"
-msgstr ""
+msgstr "发送者警告级别过高"

 msgid "Warning level too high (receiver)"
-msgstr ""
+msgstr "接收者警告级别过高"

 msgid "User temporarily unavailable"
 msgstr "用户临时不可用"
@@ -6243,7 +6206,7 @@
 "your AIM/ICQ account.)"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
@@ -6313,7 +6276,6 @@
 msgid "Camera"
 msgstr "相机"

-#, fuzzy
 msgid "Screen Sharing"
 msgstr "用户名"

@@ -6341,17 +6303,16 @@
 msgid "Buddy Comment"
 msgstr "好友注释"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
 "无法连接到身份验证服务器：\n"
 "%s"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
 msgstr "无法连接到服务器。"

-#, fuzzy
 msgid "Username sent"
 msgstr "无名称"

@@ -6362,16 +6323,16 @@
 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 登录，原因是用户名无效。用户名必须是有效的电子邮件地址，"
 "或者以字母开头，且只能包含字母、数字和空格，或者只包含数字。"

-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr "您即将被断开。请检查 %s 上的更新。"

@@ -6387,12 +6348,10 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "用户不存在"
+msgstr "用户名不存在"

 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
 msgstr "您的账户被停用。"

@@ -6400,12 +6359,12 @@
 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."
@@ -6413,7 +6372,6 @@
 "您连接和断开得太频繁。请等十分钟，然后再试一次。如果您继续重试，您等的时间可"
 "能会更长。"

-#, fuzzy
 msgid "The SecurID key entered is invalid"
 msgstr "输入的 SecurID 密钥无效。"

@@ -6423,12 +6381,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 "密码已送出"

@@ -6438,12 +6390,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 "没有给出理由。"

@@ -6516,46 +6462,40 @@
 msgid "_Decline"
 msgstr "拒绝(_D)"

-#, fuzzy, c-format
+#, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息无效。"
-msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息无效。"
-
-#, fuzzy, c-format
+msgstr[0] "拒绝(_D)"
+
+#, 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 的 %1$hu 条消息，原因是这些消息太大。"
-msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因是这些消息太大。"
-
-#, fuzzy, c-format
+msgstr[0] "拒绝(_D)"
+
+#, 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 的 %1$hu 条消息，原因是达到了等级限制。"
-msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因是达到了等级限制。"
-
-#, fuzzy, c-format
+msgstr[0] "拒绝(_D)"
+
+#, 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 的 %1$hu 条消息，原因是他/她的警告级别过高。"
-msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因是他/她的警告级别过高。"
-
-#, fuzzy, c-format
+msgstr[0] "拒绝(_D)"
+
+#, 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 的 %1$hu 条消息，原因是您的警告级别过高。"
-msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因是您的警告级别过高。"
-
-#, fuzzy, c-format
+msgstr[0] "拒绝(_D)"
+
+#, 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 的 %1$hu 条消息，原因未知。"
-msgstr[1] "您错过了 %2$s 的 %1$hu 条消息，原因未知。"
+msgstr[0] "拒绝(_D)"

 #. Data is assumed to be the destination bn
 #, c-format
@@ -6580,7 +6520,7 @@
 msgstr "注册时间"

 msgid "Capabilities"
-msgstr "能力"
+msgstr "容量"

 msgid "Profile"
 msgstr "个人资料"
@@ -6634,10 +6574,10 @@
 msgid "Pop-Up Message"
 msgstr "弹出消息"

-#, fuzzy, c-format
+#, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
-msgstr[0] "下列用户名已经和 %s 关联"
+msgstr[0] "弹出消息"

 #, c-format
 msgid "No results found for email address %s"
@@ -6650,29 +6590,29 @@
 msgid "Account Confirmation Requested"
 msgstr "请求了账户确认"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name differs "
 "from the original."
 msgstr "错误 0x%04x：无法格式化用户名，原因是请求的用户名与原始用户名不符。"

-#, fuzzy, c-format
+#, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr "错误 0x%04x：无法格式化用户名，原因是用户名无效。"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to format username because the requested name is too "
 "long."
 msgstr "错误 0x%04x：无法格式化用户名，原因是请求的用户名太长。"

-#, 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：无法更改电子邮件地址，原因是此用户名已经有被推后的请求。"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
 "too many usernames associated with it."
@@ -6713,33 +6653,33 @@
 "您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定；请在您完全连接后"
 "再试一次。"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
 "truncated for you."
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
-msgstr[1] "已经超过了配置文件的最大长度 %d 字节。程序为您自动截断了。"
+msgstr[0] ""
+"您在登录过程完成之前请求设定配置文件。您的配置文件尚未设定；请在您完全连接后"
+"再试一次。"

 msgid "Profile too long."
 msgstr "配置文件太长。"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
 "truncated for you."
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
-msgstr[1] "已经超过了离开消息的最大长度 %d 字节。程序自动为您截断了消息。"
+msgstr[0] "配置文件太长。"

 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, "
@@ -6748,15 +6688,9 @@
 "无法添加好友 %s，原因是用户名无效。用户名必须是有效的电子邮件地址，或者以字母"
 "开头，且只能包含字母、数字和空格，或者只包含数字。"

-#, fuzzy
-msgid "Unable to Add"
-msgstr "无法添加"
-
-#, fuzzy
 msgid "Unable to Retrieve Buddy List"
 msgstr "无法获取好友列表"

-#, fuzzy
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
@@ -6767,7 +6701,7 @@
 msgid "Orphans"
 msgstr "孤儿"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
@@ -6777,11 +6711,11 @@
 msgid "(no name)"
 msgstr "(无名称)"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "您的命令失败，原因未知。"

-#, fuzzy, c-format
+#, 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?"
@@ -6829,7 +6763,7 @@

 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "您选择了与 %s 进行二人世界连接。"
+msgstr "您选择了与 %s 进行二人世界直连聊天。"

 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
@@ -6840,6 +6774,10 @@
 msgid "C_onnect"
 msgstr "连接(_O)"

+#, fuzzy
+msgid "You closed the connection."
+msgstr "服务器关闭了连接。"
+
 msgid "Get AIM Info"
 msgstr "获得 AIM 信息"

@@ -6850,6 +6788,10 @@
 msgid "Get Status Msg"
 msgstr "获取状态消息"

+#, fuzzy
+msgid "End Direct IM Session"
+msgstr "二人世界直连聊天已建立"
+
 msgid "Direct IM"
 msgstr "二人世界"

@@ -6868,7 +6810,6 @@
 msgid "The new formatting is invalid."
 msgstr "新格式化无效。"

-#, fuzzy
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr "用户名格式化只更改大写和空格。"

@@ -6900,22 +6841,19 @@
 msgid "_Search"
 msgstr "搜索(_S)"

-#, fuzzy
 msgid "Set User Info (web)..."
-msgstr "设置用户信息(URL)..."
+msgstr "设置用户信息(web)..."

 #. This only happens when connecting with the old-style BUCP login
-#, fuzzy
 msgid "Change Password (web)"
-msgstr "更改密码(URL)"
-
-#, fuzzy
+msgstr "更改密码(web)"
+
 msgid "Configure IM Forwarding (web)"
-msgstr "配置 IM 转发(URL)"
+msgstr "配置聊天转发(web)"

 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "显示隐私选项..."
+msgstr "设置隐私选项..."

 #. AIM actions
 msgid "Confirm Account"
@@ -6936,11 +6874,9 @@
 msgid "Search for Buddy by Information"
 msgstr "按信息搜索好友"

-#, fuzzy
 msgid "Use clientLogin"
-msgstr "用户未登入"
-
-#, fuzzy
+msgstr "使用客户端登录"
+
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
@@ -6954,18 +6890,18 @@

 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "请求 %s 连接到 %s:%hu 的二人世界。"
+msgstr "请求 %s 连接到 %s：%hu 的二人世界。"

 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "正在试图连接到 %s:%hu。"
+msgstr "正在试图连接到 %s：%hu。"

 msgid "Attempting to connect via proxy server."
 msgstr "正在试图通过代理服务器连接。"

 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s 刚刚请求和 %s 二人世界"
+msgstr "%s 刚刚请求于 %s 进行二人世界直连聊天"

 msgid ""
 "This requires a direct connection between the two computers and is necessary "
@@ -7050,16 +6986,14 @@
 msgid "Other"
 msgstr "其它"

-#, fuzzy
 msgid "Visible"
-msgstr "隐身"
+msgstr "可见"

 msgid "Friend Only"
-msgstr ""
-
-#, fuzzy
+msgstr "仅好友可见"
+
 msgid "Private"
-msgstr "隐私"
+msgstr "私有"

 msgid "QQ Number"
 msgstr "QQ 号码"
@@ -7068,7 +7002,7 @@
 msgstr "国家/地区"

 msgid "Province/State"
-msgstr "省"
+msgstr "省/州"

 msgid "Zipcode"
 msgstr "邮政编码"
@@ -7076,9 +7010,8 @@
 msgid "Phone Number"
 msgstr "电话号码"

-#, fuzzy
 msgid "Authorize adding"
-msgstr "同意吗?"
+msgstr "同意吗添加吗？"

 msgid "Cellphone Number"
 msgstr "手机号码"
@@ -7086,64 +7019,50 @@
 msgid "Personal Introduction"
 msgstr "个人简介"

-#, fuzzy
 msgid "City/Area"
-msgstr "城市"
-
-#, fuzzy
+msgstr "城市/地区"
+
 msgid "Publish Mobile"
-msgstr "个人手机"
-
-#, fuzzy
+msgstr "公开手机"
+
 msgid "Publish Contact"
-msgstr "给联系人起名"
+msgstr "公开联系方式"

 msgid "College"
 msgstr "大学"

-#, fuzzy
 msgid "Horoscope"
 msgstr "星座"

-#, fuzzy
 msgid "Zodiac"
-msgstr "属相"
-
-#, fuzzy
+msgstr "生肖"
+
 msgid "Blood"
-msgstr "被屏蔽"
-
-#, fuzzy
+msgstr "血型"
+
 msgid "True"
-msgstr "金牛座"
-
-#, fuzzy
+msgstr "真"
+
 msgid "False"
-msgstr "已失败"
-
-#, fuzzy
+msgstr "假"
+
 msgid "Modify Contact"
-msgstr "修改账户"
-
-#, fuzzy
+msgstr "修改联系人"
+
 msgid "Modify Address"
-msgstr "家庭住址"
-
-#, fuzzy
+msgstr "修改地址"
+
 msgid "Modify Extended Information"
-msgstr "修改我的信息"
-
-#, fuzzy
+msgstr "修改扩展信息"
+
 msgid "Modify Information"
-msgstr "修改我的信息"
-
-#, fuzzy
+msgstr "修改信息"
+
 msgid "Update"
-msgstr "上次更新"
-
-#, fuzzy
+msgstr "更新"
+
 msgid "Could not change buddy information."
-msgstr "请输入好友信息。"
+msgstr "无法更改好友信息。"

 msgid "Mobile"
 msgstr "移动"
@@ -7152,97 +7071,82 @@
 msgstr "备注"

 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "好友图标"
+msgstr "好友备注"

 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "修改他/她的备注"
+
 msgid "_Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "修改(_M)"
+
 msgid "Memo Modify"
-msgstr "修改"
-
-#, fuzzy
+msgstr "备注修改"
+
 msgid "Server says:"
-msgstr "服务器忙"
+msgstr "服务器回答："

 msgid "Your request was accepted."
-msgstr ""
+msgstr "您的请求被接受。"

 msgid "Your request was rejected."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "您的请求被拒绝。"
+
+#, c-format
 msgid "%u requires verification"
-msgstr "请求认证"
-
-#, fuzzy
+msgstr "%u 请求验证"
+
 msgid "Add buddy question"
-msgstr "将用户加为好友吗？"
-
-#, fuzzy
+msgstr "添加好友问题"
+
 msgid "Enter answer here"
-msgstr "在此输入请求"
+msgstr "在此输入回答"

 msgid "Send"
 msgstr "发送"

-#, fuzzy
 msgid "Invalid answer."
-msgstr "名称无效"
+msgstr "无效的回答。"

 msgid "Authorization denied message:"
 msgstr "认证拒绝消息："

-#, fuzzy
 msgid "Sorry, you're not my style."
-msgstr "抱歉，我不接受好友..."
-
-#, fuzzy, c-format
+msgstr "对不起，我不接受好友..."
+
+#, c-format
 msgid "%u needs authorization"
-msgstr "用户 %d 需要身份验证"
-
-#, fuzzy
+msgstr "%u 需要身份验证"
+
 msgid "Add buddy authorize"
-msgstr "将用户加为好友吗？"
-
-#, fuzzy
+msgstr "添加好友验证"
+
 msgid "Enter request here"
 msgstr "在此输入请求"

 msgid "Would you be my friend?"
-msgstr "您是否想要和我交朋友？"
-
-#, fuzzy
+msgstr "您是否愿意和我交朋友？"
+
 msgid "QQ Buddy"
-msgstr "添加好友"
-
-#, fuzzy
+msgstr "QQ 好友"
+
 msgid "Add buddy"
 msgstr "添加好友"

-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "无效的 QQ 头像"
-
-#, fuzzy
+msgstr "无效的 QQ 号码"
+
 msgid "Failed sending authorize"
-msgstr "请同意我将您加入好友！"
-
-#, fuzzy, c-format
+msgstr "发送验证失败"
+
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "在聊天中加入好友失败"
-
-#, fuzzy, c-format
+msgstr "移除好友 %u 失败"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s 已经将您从好友名单中删除。"
-
-#, fuzzy
+msgstr "%d 已经将您从好友名单中删除。"
+
 msgid "No reason given"
 msgstr "没有给出理由。"

@@ -7254,9 +7158,9 @@
 msgid "Would you like to add him?"
 msgstr "您是否想要添加他？"

-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "拒绝"
+msgstr "被 %s 拒绝"

 #, c-format
 msgid "Message: %s"
@@ -7271,89 +7175,73 @@
 msgid "QQ Qun"
 msgstr "QQ 群"

-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "请输入 %s 的新名称"
-
-#, fuzzy
+msgstr "请输入群的号码"
+
 msgid "You can only search for permanent Qun\n"
-msgstr "您只能搜索永久 QQ 群\n"
-
-#, fuzzy
+msgstr "您可以只搜索永久群\n"
+
 msgid "(Invalid UTF-8 string)"
-msgstr "无效的代理设置"
-
-#, fuzzy
+msgstr "(无效的 UTF-8 字符串)"
+
 msgid "Not member"
-msgstr "我不是成员"
-
-#, fuzzy
+msgstr "非成员"
+
 msgid "Member"
-msgstr "注册时间"
-
-#, fuzzy
+msgstr "成员"
+
 msgid "Requesting"
-msgstr "请求对话框"
-
-#, fuzzy
+msgstr "正在发送请求"
+
 msgid "Admin"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "管理员"
+
 msgid "Notice"
 msgstr "备注"

-#, fuzzy
 msgid "Detail"
-msgstr "默认"
+msgstr "详细信息"

 msgid "Creator"
 msgstr "创始人"

-#, fuzzy
 msgid "About me"
-msgstr "关于 %s"
-
-#, fuzzy
+msgstr "关于我"
+
 msgid "Category"
-msgstr "聊天错误"
-
-#, fuzzy
+msgstr "分类"
+
 msgid "The Qun does not allow others to join"
-msgstr "此群不允许其他人加入"
-
-#, fuzzy
+msgstr "该群不允许其他人加入"
+
 msgid "Join QQ Qun"
-msgstr "加入聊天"
+msgstr "加入 QQ 群"

 msgid "Input request here"
 msgstr "在此输入请求"

-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "您成功修改了群成员"
-
-#, fuzzy
+msgstr "成功加入群 %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "您成功修改了群成员"
+msgstr "成功加入群"

 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "群 %u 拒绝加入"

 msgid "QQ Qun Operation"
 msgstr "QQ 群操作"

-#, fuzzy
 msgid "Failed:"
-msgstr "已失败"
+msgstr "失败："

 msgid "Join Qun, Unknown Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "加入群，未知的回复"
+
 msgid "Quit Qun"
-msgstr "QQ 群"
+msgstr "退出群"

 msgid ""
 "Note, if you are the creator, \n"
@@ -7362,51 +7250,47 @@
 "请注意，如果您是创始人，\n"
 "此操作将永久删除此群。"

-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "抱歉，我不接受好友..."
-
-#, fuzzy
+msgstr "对不起，我们不接受加入申请..."
+
 msgid "Successfully changed Qun members"
-msgstr "您成功修改了群成员"
-
-#, fuzzy
+msgstr "成功修改了群成员"
+
 msgid "Successfully changed Qun information"
-msgstr "您成功修改了群信息"
+msgstr "成功修改了群信息"

 msgid "You have successfully created a Qun"
 msgstr "您成功创建了一个群"

-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "您现在是否想要设置群资料？"
+msgstr "您现在是否要设置详细信息？"

 msgid "Setup"
 msgstr "设置"

-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "用户 %d 申请加入 %d 群"
-
-#, fuzzy, c-format
+msgstr "用户 %u 申请加入 %u 群，验证信息为：%s"
+
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "用户 %d 申请加入 %d 群"
-
-#, fuzzy, c-format
+msgstr "用户 %u 申请加入 %u 群"
+
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "在聊天中加入好友失败"
+msgstr "管理员 %u 拒绝了您加入 %u 的请求"

 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "删除好友"
-
-#, fuzzy, c-format
+msgstr "<b>删除好友 %u。</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "删除好友"
+msgstr "<b>新好友 %u 已加入。</b>"

 #, c-format
 msgid "Unknown-%d"
@@ -7416,24 +7300,20 @@
 msgstr "等级"

 msgid " VIP"
-msgstr ""
+msgstr " VIP"

 msgid " TCP"
-msgstr ""
-
-#, fuzzy
+msgstr " TCP"
+
 msgid " FromMobile"
 msgstr "移动"

-#, fuzzy
 msgid " BindMobile"
 msgstr "移动"

-#, fuzzy
 msgid " Video"
-msgstr "实时视频"
-
-#, fuzzy
+msgstr "视频"
+
 msgid " Zone"
 msgstr "无"

@@ -7446,27 +7326,26 @@
 msgid "Invalid name"
 msgstr "名称无效"

-#, fuzzy
 msgid "Select icon..."
-msgstr "选择文件夹..."
-
-#, fuzzy, c-format
+msgstr "选择图标..."
+
+#, c-format
 msgid "<b>Login time</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>登录时间</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>登录时间</b>: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>目前在线人数</b>: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>总计在线好友</b>: %d<br>\n"
+
+#, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
-msgstr "<b>上次刷新</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>上次刷新</b>:: %d-%d-%d, %d:%d:%d<br>\n"
+
+#, c-format
 msgid "<b>Server</b>: %s<br>\n"
-msgstr "<b>服务器 IP</b>: %s: %d<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>服务器</b>: %s<br>\n"
+
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
 msgstr "<b>登录时间</b>: %s<br>\n"

@@ -7474,56 +7353,53 @@
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>连接方式</b>: %s<br>\n"

-#, fuzzy, c-format
+#, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>连接方式</b>: %s<br>\n"
-
-#, fuzzy, c-format
+msgstr "<b>我的 Internet IP</b>: %s:%d<br>\n"
+
+#, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
 msgstr "<b>目前在线人数</b>: %d<br>\n"

-#, fuzzy, c-format
+#, c-format
 msgid "<b>Resend</b>: %lu<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"

-#, fuzzy, c-format
+#, c-format
 msgid "<b>Lost</b>: %lu<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"

-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received</b>: %lu<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"

-#, fuzzy, c-format
+#, c-format
 msgid "<b>Received Duplicate</b>: %lu<br>\n"
 msgstr "<b>我的公网 IP</b>: %s<br>\n"

-#, fuzzy, c-format
+#, c-format
 msgid "<b>Time</b>: %d-%d-%d, %d:%d:%d<br>\n"
 msgstr "<b>登录时间</b>: %s<br>\n"

-#, fuzzy, c-format
+#, c-format
 msgid "<b>IP</b>: %s<br>\n"
-msgstr "<b>服务器 IP</b>: %s: %d<br>\n"
+msgstr "<b>IP</b>: %s<br>\n"

 msgid "Login Information"
 msgstr "登录信息"

 msgid "<p><b>Original Author</b>:<br>\n"
-msgstr ""
+msgstr "<p><b>原始作者</b>：<br>\n"

 msgid "<p><b>Code Contributors</b>:<br>\n"
-msgstr ""
-
-#, fuzzy
+msgstr "<p><b>代码贡献者</b>：<br>\n"
+
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"

-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<b>目前在线人数</b>: %d<br>\n"

-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
 msgstr "<b>上次刷新</b>: %s<br>\n"

@@ -7536,31 +7412,27 @@
 msgid "<i>Feel free to join us!</i> :)"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "About OpenQ %s"
-msgstr "关于 %s"
-
-#, fuzzy
+msgstr "关于 OpenQ %s"
+
 msgid "Change Icon"
-msgstr "保存图标"
+msgstr "更改图标"

 msgid "Change Password"
 msgstr "更改密码"

-#, fuzzy
 msgid "Account Information"
-msgstr "登录信息"
+msgstr "帐户信息"

 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "更新全部 QQ 群"
+
 msgid "About OpenQ"
-msgstr "关于 %s"
-
-#, fuzzy
+msgstr "关于 OpenQ"
+
 msgid "Modify Buddy Memo"
-msgstr "家庭住址"
+msgstr "修改好友备注"

 #. *< type
 #. *< ui_requirement
@@ -7572,59 +7444,50 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "QQ 协议插件"

-#, fuzzy
 msgid "Auto"
-msgstr "同意"
-
-#, fuzzy
+msgstr "自动"
+
 msgid "Select Server"
-msgstr "选择用户"
+msgstr "选择服务器"

 msgid "QQ2005"
-msgstr ""
+msgstr "QQ2005"

 msgid "QQ2007"
-msgstr ""
+msgstr "QQ2007"

 msgid "QQ2008"
-msgstr ""
-
-#, fuzzy
+msgstr "QQ2008"
+
 msgid "Connect by TCP"
-msgstr "正连接"
-
-#, fuzzy
+msgstr "通过 TCP 连接"
+
 msgid "Show server notice"
-msgstr "服务器端口"
-
-#, fuzzy
+msgstr "显示服务器通知"
+
 msgid "Show server news"
-msgstr "服务器地址"
+msgstr "显示服务器新闻"

 msgid "Show chat room when msg comes"
-msgstr ""
-
-#, fuzzy
+msgstr "当消息到来时显示聊天室"
+
 msgid "Keep alive interval (seconds)"
 msgstr "保持在线错误"

-#, fuzzy
 msgid "Update interval (seconds)"
 msgstr "保持在线错误"

-#, fuzzy
 msgid "Unable to decrypt server reply"
-msgstr "无法获取服务器信息"
+msgstr "无法解密服务器回复"

 #, c-format
 msgid "Failed requesting token, 0x%02X"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
 msgstr "无效的标题"

@@ -7635,40 +7498,33 @@
 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "需要注册"
+msgstr "需要激活"

 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
 msgstr ""

-#, fuzzy
 msgid "Requesting captcha"
 msgstr "正在请求 %s 的注意..."

-#, fuzzy
 msgid "Checking captcha"
 msgstr "正在请求 %s 的注意..."

-#, fuzzy
 msgid "Failed captcha verification"
 msgstr "Yahoo! 认证失败"

-#, fuzzy
 msgid "Captcha Image"
 msgstr "保存图像"

-#, fuzzy
 msgid "Enter code"
-msgstr "输入密码"
+msgstr "输入代码"

 msgid "QQ Captcha Verification"
 msgstr ""

-#, fuzzy
 msgid "Enter the text from the image"
-msgstr "请输入组名称"
+msgstr "输入图像显示的文本"

 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
@@ -7683,31 +7539,25 @@
 msgid "Socket error"
 msgstr "套接字错误"

-#, fuzzy
 msgid "Getting server"
 msgstr "设置用户信息..."

-#, fuzzy
 msgid "Requesting token"
 msgstr "请求被禁止"

-#, fuzzy
 msgid "Unable to resolve hostname"
-msgstr "无法连接到服务器。"
-
-#, fuzzy
+msgstr "无法解析服务器"
+
 msgid "Invalid server or port"
-msgstr "无效错误"
-
-#, fuzzy
+msgstr "无效服务器或端口"
+
 msgid "Connecting to server"
-msgstr "连接到 SILC 服务器"
-
-#, fuzzy
+msgstr "正在连接到服务器"
+
 msgid "QQ Error"
-msgstr "QQ 号错误"
-
-#, fuzzy, c-format
+msgstr "QQ 错误"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
@@ -7715,23 +7565,22 @@
 "%s"
 msgstr "ICQ 服务器转发"

-#, fuzzy, c-format
+#, c-format
 msgid "%s:%s"
-msgstr "%s(%s)"
-
-#, fuzzy, c-format
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "来自"
-
-#, fuzzy, c-format
+msgstr "来自 %s："
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
 msgstr "服务器指令：%s"

-#, fuzzy
 msgid "Unknown SERVER CMD"
-msgstr "未知原因"
+msgstr "未知服务器命令"

 #, c-format
 msgid ""
@@ -7739,21 +7588,17 @@
 "Room %u, reply 0x%02X"
 msgstr ""

-#, fuzzy
 msgid "QQ Qun Command"
-msgstr "命令"
-
-#, fuzzy
+msgstr "QQ 群命令"
+
 msgid "Unable to decrypt login reply"
-msgstr "无法获取服务器信息"
-
-#, fuzzy
+msgstr "无法解密服务器登录回复"
+
 msgid "Unknown LOGIN CMD"
-msgstr "未知原因"
-
-#, fuzzy
+msgstr "未知登录命令"
+
 msgid "Unknown CLIENT CMD"
-msgstr "未知原因"
+msgstr "未知客户端命令"

 #, c-format
 msgid "%d has declined the file %s"
@@ -7762,8 +7607,8 @@
 msgid "File Send"
 msgstr "发送文件"

-#, c-format
-msgid "%d canceled the transfer of %s"
+#, fuzzy, c-format
+msgid "%d cancelled the transfer of %s"
 msgstr "%d 取消了 %s 的传送"

 #, c-format
@@ -7779,13 +7624,13 @@
 msgstr "组 %s 的信息"

 msgid "Notes Address Book Information"
-msgstr "Notes 地址簿信息"
+msgstr "Notes 通讯录信息"

 msgid "Invite Group to Conference..."
 msgstr "邀请组加入会议..."

 msgid "Get Notes Address Book Info"
-msgstr "获得 Notes 地址簿信息"
+msgstr "获得 Notes 通讯录信息"

 msgid "Sending Handshake"
 msgstr "发送握手"
@@ -7794,16 +7639,16 @@
 msgstr "等候握手应答"

 msgid "Handshake Acknowledged, Sending Login"
-msgstr ""
+msgstr "握手成功，发送登录信息"

 msgid "Waiting for Login Acknowledgement"
-msgstr ""
+msgstr "正在等待登录确认"

 msgid "Login Redirected"
 msgstr "登录被重定向"

 msgid "Forcing Login"
-msgstr "强制登入"
+msgstr "强制登录"

 msgid "Login Acknowledged"
 msgstr "登录被接受"
@@ -7829,7 +7674,6 @@
 msgid "Unable to send message: "
 msgstr "无法发送消息: "

-#, fuzzy
 msgid "Place Closed"
 msgstr "已取消"

@@ -7916,7 +7760,6 @@
 msgid "Unknown (0x%04x)<br>"
 msgstr "未知 (0x%04x)<br>"

-#, fuzzy
 msgid "Last Known Client"
 msgstr "客户等级"

@@ -7929,7 +7772,7 @@
 msgid "An ambiguous user ID was entered"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
@@ -7996,7 +7839,7 @@
 msgstr "可能的匹配"

 msgid "Notes Address Book group results"
-msgstr "Notes 地址簿组结果"
+msgstr "Notes 通讯录组结果"

 #, c-format
 msgid ""
@@ -8006,7 +7849,7 @@
 msgstr ""

 msgid "Select Notes Address Book"
-msgstr "选择 Notes 地址簿"
+msgstr "选择 Notes 通讯录"

 msgid "Unable to add group: group not found"
 msgstr "无法从添加组：组未找到"
@@ -8018,7 +7861,7 @@
 msgstr ""

 msgid "Notes Address Book Group"
-msgstr "Notes 地址簿组"
+msgstr "Notes 通讯录组"

 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
@@ -8067,7 +7910,7 @@
 msgstr "导出 Sametime 列表..."

 msgid "Add Notes Address Book Group..."
-msgstr "添加 Notes 地址簿组..."
+msgstr "添加 Notes 通讯录组..."

 msgid "User Search..."
 msgstr "用户搜索..."
@@ -8130,7 +7973,7 @@
 msgstr "密钥协议请求"

 msgid "IM With Password"
-msgstr "带密码开聊"
+msgstr "带密码聊天"

 msgid "Cannot set IM key"
 msgstr "无法设定聊天密钥"
@@ -8148,7 +7991,7 @@
 msgstr "显示公钥"

 msgid "Could not load public key"
-msgstr "无法装入公钥"
+msgstr "无法载入公钥"

 msgid "User Information"
 msgstr "用户信息"
@@ -8268,10 +8111,10 @@
 msgstr "重置聊天密钥"

 msgid "IM with Key Exchange"
-msgstr "带密钥交换开聊"
+msgstr "带密钥交换聊天"

 msgid "IM with Password"
-msgstr "带密码开聊"
+msgstr "带密码聊天"

 msgid "Get Public Key..."
 msgstr "获取公钥..."
@@ -8283,7 +8126,7 @@
 msgstr "在白板上绘画"

 msgid "_Passphrase:"
-msgstr "密码句(_P)："
+msgstr "密码(_P)："

 #, c-format
 msgid "Channel %s does not exist in the network"
@@ -8309,7 +8152,7 @@

 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
-msgstr "<br><b>频道密码句:</b> %s"
+msgstr "<br><b>频道密码:</b> %s"

 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
 #, c-format
@@ -8340,7 +8183,7 @@
 msgstr "打开公钥..."

 msgid "Channel Passphrase"
-msgstr "频道密码句"
+msgstr "频道密码"

 msgid "Channel Public Keys List"
 msgstr "频道公钥列表"
@@ -8353,9 +8196,9 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"频道身份验证用于根据未经验证的访问保卫频道。身份验证可基于密码句和数字签名。"
-"如果设定了密码句，那么需要提供密码句才能加入。如果设定了频道公钥，那么只有那"
-"些公钥已经列出的用户才能加入。"
+"频道身份验证用于根据未经验证的访问保卫频道。身份验证可基于密码和数字签名。如"
+"果设定了密码，那么需要提供密码才能加入。如果设定了频道公钥，那么只有那些公钥"
+"已经列出的用户才能加入。"

 msgid "Channel Authentication"
 msgstr "频道认证"
@@ -8367,11 +8210,11 @@
 msgstr "组名称"

 msgid "Passphrase"
-msgstr "密码句"
+msgstr "密码"

 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "请输入 %s 频道私有组的名称和密码句。"
+msgstr "请输入 %s 频道私有组的名称和密码。"

 msgid "Add Channel Private Group"
 msgstr "添加频道私有组"
@@ -8413,10 +8256,10 @@
 msgstr "设定私有频道"

 msgid "Reset Secret Channel"
-msgstr "重置绝密频道"
+msgstr "重置秘密频道"

 msgid "Set Secret Channel"
-msgstr "设定绝密频道"
+msgstr "设定秘密频道"

 #, c-format
 msgid ""
@@ -8513,7 +8356,7 @@
 msgstr "被 %s (%s) 杀死"

 msgid "Server signoff"
-msgstr "服务器登出"
+msgstr "服务器退出"

 msgid "Personal Information"
 msgstr "个人信息"
@@ -8522,7 +8365,7 @@
 msgstr "生日"

 msgid "Job Role"
-msgstr "职位"
+msgstr "职务"

 msgid "Organization"
 msgstr "组织"
@@ -8569,10 +8412,10 @@
 msgstr "更改昵称失败"

 msgid "Roomlist"
-msgstr "房间列表"
+msgstr "聊天室列表"

 msgid "Cannot get room list"
-msgstr "无法获取房间列表"
+msgstr "无法获取聊天室列表"

 msgid "Network is empty"
 msgstr "网络为空"
@@ -8657,7 +8500,7 @@
 msgstr "校验服务器公钥"

 msgid "Passphrase required"
-msgstr "请求密码句"
+msgstr "需要密码"

 #, c-format
 msgid ""
@@ -8693,7 +8536,6 @@
 msgid "Disconnected by server"
 msgstr "服务器断开连接"

-#, fuzzy
 msgid "Error connecting to SILC Server"
 msgstr "连接到 SILC 服务器时出错"

@@ -8707,34 +8549,28 @@
 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 协议"

 msgid "Error loading SILC key pair"
-msgstr "装入 SILC 密钥对出错"
-
-#, fuzzy, c-format
+msgstr "载入 SILC 密钥对出错"
+
+#, c-format
 msgid "Download %s: %s"
-msgstr "%s 上的用户数: %s"
+msgstr "下载 %s：%s"

 msgid "Your Current Mood"
-msgstr "您目前的心情"
+msgstr "您现在的心情"

 #, c-format
 msgid "Normal"
@@ -8772,7 +8608,7 @@
 msgstr "让其它人看到您正在使用哪台计算机"

 msgid "Your VCard File"
-msgstr "您的 VCard 文件"
+msgstr "您的 vCard 文件"

 msgid "Timezone (UTC)"
 msgstr "时区(UTC)"
@@ -8801,7 +8637,7 @@
 msgstr "创建新的 SILC 密钥对"

 msgid "Passphrases do not match"
-msgstr "密码句不匹配"
+msgstr "密码不匹配"

 msgid "Key Pair Generation failed"
 msgstr "密钥对生成失败"
@@ -8816,7 +8652,7 @@
 msgstr "私钥文件"

 msgid "Passphrase (retype)"
-msgstr "密码句(重输)"
+msgstr "密码(重输)"

 msgid "Generate Key Pair"
 msgstr "创建密钥对"
@@ -8861,16 +8697,16 @@
 msgstr "未知命令: %s，(可能是客户端 bug)"

 msgid "part [channel]:  Leave the chat"
-msgstr "part [频道]: 离开聊天"
+msgstr "part [频道]: 离聊天天"

 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [频道]: 离开聊天"
+msgstr "leave [频道]: 离聊天天"

 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;新话题&gt;]: 查看或更改话题"

 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join: &lt;房间&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"
+msgstr "join: &lt;聊天室&gt; [&lt;服务器&gt;]: 加入此网络上的聊天室"

 msgid "list:  List channels on this network"
 msgstr "list: 列出此网络上的频道"
@@ -8920,7 +8756,7 @@
 msgstr "umode &lt;用户模式&gt;: 设置您在网络中的模式"

 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;昵称&gt; [-pubkey]: 获得服务器管理员权限"
+msgstr "oper &lt;昵称&gt; [-pubkey]：获得服务器管理员权限"

 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
@@ -8938,7 +8774,7 @@
 msgstr "ban [&lt;频道&gt; +|-&lt;昵称&gt;]: 在频道上屏蔽客户"

 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;昵称|服务器&gt;: 获取客户或服务器的公钥"
+msgstr "getkey &lt;昵称|服务器&gt;：获取客户或服务器的公钥"

 msgid "stats:  View server and network statistics"
 msgstr "stat: 查看服务器和网络统计"
@@ -9008,9 +8844,8 @@
 msgid "Creating SILC key pair..."
 msgstr "创建 SILC 密钥对..."

-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "创建 SILC 密钥对..."
+msgstr "无法创建 SILC 密钥对"

 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9047,9 +8882,9 @@
 msgid "Key Length: \t%d bits\n"
 msgstr "密钥长度:\t%d 位\n"

-#, fuzzy, c-format
+#, c-format
 msgid "Version: \t%s\n"
-msgstr "原因: %s"
+msgstr "版本：\t%s\n"

 #, c-format
 msgid ""
@@ -9146,33 +8981,28 @@
 msgid "Failure: Authentication failed"
 msgstr "失败: 身份验证失败"

-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
 msgstr "无法初始化 SILC 客户连接"

 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
 msgid "Unable to create listen socket"
 msgstr "无法创建套接字"

-#, fuzzy
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP 用户名不能包含空格或 @ 符号"

-#, fuzzy
 msgid "SIP connect server not specified"
 msgstr "服务器端口"

@@ -9210,17 +9040,16 @@
 msgstr "认证域"

 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join: &lt;房间&gt;: 加入 Yahoo 网络上的聊天室"
+msgstr "join: &lt;聊天室&gt;: 加入 Yahoo 网络上的聊天室"

 msgid "list: List rooms on the Yahoo network"
-msgstr "list: 列出 Yahoo 网络上的房间"
+msgstr "list: 列出 Yahoo 网络上的聊天室"

 msgid "doodle: Request user to start a Doodle session"
 msgstr ""

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

 #. *< type
 #. *< ui_requirement
@@ -9232,7 +9061,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
 msgstr "Yahoo 协议插件"

@@ -9249,13 +9077,16 @@
 msgstr "文件传送端口"

 msgid "Chat room locale"
-msgstr "聊天房间语系"
+msgstr "聊天聊天室语系"

 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略会议和聊天室邀请"

+msgid "Use account proxy for SSL connections"
+msgstr ""
+
 msgid "Chat room list URL"
-msgstr "聊天房间列表 URL"
+msgstr "聊天聊天室列表 URL"

 msgid "Yahoo Chat server"
 msgstr "Yahoo 聊天服务器"
@@ -9263,9 +9094,8 @@
 msgid "Yahoo Chat port"
 msgstr "Yahoo 聊天端口"

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

 #. *< type
 #. *< ui_requirement
@@ -9277,12 +9107,15 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
 msgstr "Yahoo 协议插件"

+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr "%s 向您发送了视频聊天邀请，但尚不支持。"
+
 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "您的 SMS 未被递送"

 msgid "Your Yahoo! message did not get sent."
 msgstr "未发送您的 Yahoo! 消息。"
@@ -9305,26 +9138,22 @@
 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! 网站可能修复。"

 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"

 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
 msgstr "昵称或密码不对"

@@ -9334,7 +9163,7 @@
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"Yahoo 服务器请求使用未识别的认证方式。您可能无法成功登入 Yahoo。请检查 %s 上"
+"Yahoo 服务器请求使用未识别的认证方式。您可能无法成功登录 Yahoo。请检查 %s 上"
 "的更新。"

 msgid "Failed Yahoo! Authentication"
@@ -9350,18 +9179,33 @@
 msgid "Ignore buddy?"
 msgstr "忽略好友？"

-msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "您的账户已锁定，请登录到 Yahoo! 网站。"
+#, fuzzy
+msgid "Invalid username or password"
+msgstr "用户名或密码错误"
+
+#, fuzzy
+msgid ""
+"Your account has been locked due to too many failed login attempts.  Please "
+"try logging into the Yahoo! website."
+msgstr "位置错误号 %d。登录到 Yahoo! 网站可能修复。"
+
+#, c-format
+msgid "Unknown error 52.  Reconnecting should fix this."
+msgstr ""
+
+msgid ""
+"Error 1013: The username you have entered is invalid.  The most common cause "
+"of this error is entering your email address instead of your Yahoo! ID."
+msgstr ""

 #, 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 "无法将好友 %s 添加到账户 %s 位于服务器列表上的组 %s。"

-#, fuzzy
 msgid "Unable to add buddy to server list"
 msgstr "无法将好友添加到服务器列表"

@@ -9369,17 +9213,16 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr ""

-#, fuzzy
 msgid "Received unexpected HTTP response from server"
 msgstr "从服务器收到了意外的 HTTP 响应。"

-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
 msgstr ""
 "失去与 %s 的连接：\n"
 "%s"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr "无法与服务器建立连接"

@@ -9407,15 +9250,14 @@
 msgid "Appear Permanently Offline"
 msgstr "显示为临时离线"

-#, fuzzy
 msgid "Presence"
-msgstr "首选项"
+msgstr ""

 msgid "Appear Offline"
 msgstr "显示为离线"

 msgid "Don't Appear Permanently Offline"
-msgstr "不显示临时离线"
+msgstr "不显示永久离线"

 msgid "Join in Chat"
 msgstr "加入聊天"
@@ -9423,7 +9265,6 @@
 msgid "Initiate Conference"
 msgstr "发起会议"

-#, fuzzy
 msgid "Presence Settings"
 msgstr "使用环境设置"

@@ -9431,7 +9272,7 @@
 msgstr ""

 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "选择您要激活的 ID"

 msgid "Join whom in chat?"
 msgstr "将谁加入聊天？"
@@ -9457,15 +9298,15 @@
 msgid "Unable to establish file descriptor."
 msgstr "无法建立文件描述符。"

-#, fuzzy, c-format
+#, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s 正在发送文件 %s"
+msgstr "%s 正在发送文件 %s\n"

 msgid "Write Error"
 msgstr "写错误"

 msgid "Yahoo! Japan Profile"
-msgstr "Yahoo 日本资料"
+msgstr "Yahoo! 日本资料"

 msgid "Yahoo! Profile"
 msgstr "Yahoo! 资料"
@@ -9473,7 +9314,7 @@
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
-msgstr "抱歉，标为含有成人内容的个人资料目前不被支持。"
+msgstr "对不起，标为含有成人内容的个人资料目前不被支持。"

 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
@@ -9504,10 +9345,9 @@
 msgid "Last Update"
 msgstr "上次更新"

-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
-msgstr "抱歉，此配置文件似乎是目前并不支持的语言或格式。"
+msgstr "对不起，此配置文件似乎是目前并不支持的语言或格式。"

 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -9526,22 +9366,19 @@
 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 "加入聊天失败"

 #. -6
 msgid "Unknown room"
-msgstr "未知房间"
+msgstr "未知聊天室"

 #. -15
 msgid "Maybe the room is full"
-msgstr "可能房间已满"
+msgstr "可能聊天室已满"

 #. -35
 msgid "Not available"
@@ -9563,7 +9400,7 @@
 msgstr "可能他们未在聊天中？"

 msgid "Fetching the room list failed."
-msgstr "获取房间列表失败。"
+msgstr "获取聊天室列表失败。"

 msgid "Voices"
 msgstr "语音"
@@ -9575,12 +9412,11 @@
 msgstr "连接问题"

 msgid "Unable to fetch room list."
-msgstr "无法获取房间列表。"
+msgstr "无法获取聊天室列表。"

 msgid "User Rooms"
-msgstr "用户房间"
-
-#, fuzzy
+msgstr "用户聊天室"
+
 msgid "Connection problem with the YCHT server"
 msgstr "YCHT 服务器连接出现问题。"

@@ -9594,7 +9430,7 @@
 msgstr "无法发送给聊天 %s,%s,%s"

 msgid "Hidden or not logged-in"
-msgstr "隐身或未登入"
+msgstr "隐身或未登录"

 #, c-format
 msgid "<br>At %s since %s"
@@ -9704,15 +9540,15 @@
 msgid "Exposure"
 msgstr "暴露"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "无法从 HTTP 代理分析响应：%s\n"
+msgstr "无法从 HTTP 代理分析响应：%s"

 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP 代理服务器连接错误 %d"

-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr "访问被禁止: HTTP 代理服务器禁止端口 %d 流过。"

@@ -9772,18 +9608,15 @@
 msgstr "接受聊天邀请吗？"

 #. Shortcut
-#, fuzzy
 msgid "Shortcut"
-msgstr "排序"
-
-#, fuzzy
+msgstr "快捷方式"
+
 msgid "The text-shortcut for the smiley"
-msgstr "GTK+ 文字快捷方式主题"
+msgstr "表情的文字快捷方式"

 #. Stored Image
-#, fuzzy
 msgid "Stored Image"
-msgstr "保存图像"
+msgstr "保存的图像"

 msgid "Stored Image. (that'll have to do for now)"
 msgstr ""
@@ -9810,11 +9643,11 @@
 msgstr "远远离开"

 msgid "Listening to music"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "正在听音乐"
+
+#, c-format
 msgid "%s (%s) changed status from %s to %s"
-msgstr "%s 将状态从 %s 更改为 %s"
+msgstr "%s (%s) 将状态从 %s 更改为 %s"

 #, c-format
 msgid "%s (%s) is now %s"
@@ -9856,41 +9689,35 @@
 msgid "Unknown."
 msgstr "未知。"

-#, fuzzy, c-format
+#, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "%d 秒"
-msgstr[1] "%d 秒"
-
-#, fuzzy, c-format
+msgstr[0] "未知。"
+
+#, c-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] "%d 天"
-msgstr[1] "%d 天"
-
-#, fuzzy, c-format
+msgstr[0] "未知。"
+
+#, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
-msgstr[0] "%s %d 小时"
-msgstr[1] "%s %d 小时"
-
-#, fuzzy, c-format
+msgstr[0] "未知。"
+
+#, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] "%d 小时"
-msgstr[1] "%d 小时"
-
-#, fuzzy, c-format
+msgstr[0] "未知。"
+
+#, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
-msgstr[0] "%s %d 分"
-msgstr[1] "%s %d 分"
-
-#, fuzzy, c-format
+msgstr[0] "未知。"
+
+#, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "%d 分"
-msgstr[1] "%d 分"
+msgstr[0] "未知。"

 #, c-format
 msgid "Could not open %s: Redirected too many times"
@@ -9900,7 +9727,7 @@
 msgid "Unable to connect to %s"
 msgstr "无法连接到 %s"

-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
 msgstr "从套接字读取时出错。"

@@ -9910,9 +9737,9 @@
 "server may be trying something malicious."
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: %s"
-msgstr "从套接字读取时出错。"
+msgstr "从 %s 读取出错：%s"

 #, c-format
 msgid "Error writing to %s: %s"
@@ -9926,44 +9753,44 @@
 msgid " - %s"
 msgstr ""

-#, fuzzy, c-format
+#, c-format
 msgid " (%s)"
-msgstr "%s(%s)"
+msgstr " (%s)"

 #. 10053
 #, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr ""
+msgstr "连接被您计算机上的其他软件中断。"

 #. 10054
-#, fuzzy, c-format
+#, c-format
 msgid "Remote host closed connection."
-msgstr "远程用户关闭了连接。"
+msgstr "远程主机关闭了连接。"

 #. 10060
-#, fuzzy, c-format
+#, c-format
 msgid "Connection timed out."
-msgstr "连接超时"
+msgstr "连接超时。"

 #. 10061
-#, fuzzy, c-format
+#, c-format
 msgid "Connection refused."
-msgstr "连接重置"
+msgstr "连接被拒绝。"

 #. 10048
-#, fuzzy, c-format
+#, c-format
 msgid "Address already in use."
-msgstr "此聊天名已经在使用中"
+msgstr "此地址已被使用。"

 #, c-format
 msgid "Error Reading %s"
 msgstr "读取 %s 出错"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
-msgstr "读取您的 %s 时遇到了错误。该文件未装入，旧文件被移动到 %s~ 中了。"
+msgstr "读取您的 %s 时遇到了错误。该文件未载入，旧文件被移动到 %s~ 中了。"

 msgid "Internet Messenger"
 msgstr "互联网通讯程序"
@@ -9982,7 +9809,7 @@

 #. Build the login options frame.
 msgid "Login Options"
-msgstr "登入选项"
+msgstr "登录选项"

 msgid "Pro_tocol:"
 msgstr "协议(_T)："
@@ -10007,7 +9834,7 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "用作当前账户头像(_I)："

-msgid "_Advanced"
+msgid "Ad_vanced"
 msgstr "高级(_A)"

 msgid "Use GNOME Proxy Settings"
@@ -10067,12 +9894,10 @@
 msgid "_Basic"
 msgstr "基本(_B)"

-#, fuzzy
 msgid "Create _this new account on the server"
-msgstr "在服务器上创建此新帐户"
-
-#, fuzzy
-msgid "_Proxy"
+msgstr "在服务器上创建此新帐户(_T)"
+
+msgid "P_roxy"
 msgstr "代理"

 msgid "Enabled"
@@ -10081,7 +9906,7 @@
 msgid "Protocol"
 msgstr "协议"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -10102,12 +9927,130 @@
 "如果您想要回到此窗口以便添加、编辑或删除帐户，可以从好友列表中窗口中选择<b>帐"
 "户->添加/编辑</b>"

-#, fuzzy, c-format
+#. Buddy List
+msgid "Background Color"
+msgstr "背景颜色"
+
+msgid "The background color for the buddy list"
+msgstr "此好友列表的背景色"
+
+msgid "Layout"
+msgstr "样式"
+
+msgid "The layout of icons, name, and status of the buddy list"
+msgstr ""
+
+#. Group
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Background Color"
+msgstr "背景颜色"
+
+msgid "The background color of an expanded group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its expanded state
+msgid "Expanded Text"
+msgstr "展开文本"
+
+msgid "The text information for when a group is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Background Color"
+msgstr "选择背景颜色"
+
+msgid "The background color of a collapsed group"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list group when in its collapsed state
+msgid "Collapsed Text"
+msgstr "折叠文本(_C)"
+
+msgid "The text information for when a group is collapsed"
+msgstr ""
+
+#. Buddy
+#. Note to translators: These two strings refer to the background color
+#. of a buddy list contact or chat room
+msgid "Contact/Chat Background Color"
+msgstr "联系人/聊天背景颜色"
+
+msgid "The background color of a contact or chat"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list contact when in its expanded state
+msgid "Contact Text"
+msgstr "联系人文字"
+
+msgid "The text information for when a contact is expanded"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is online
+#, fuzzy
+msgid "Online Text"
+msgstr "在线文字"
+
+msgid "The text information for when a buddy is online"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is away
+msgid "Away Text"
+msgstr "离开文字"
+
+msgid "The text information for when a buddy is away"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is offline
+#, fuzzy
+msgid "Offline Text"
+msgstr "离线文字"
+
+#, fuzzy
+msgid "The text information for when a buddy is offline"
+msgstr "更改 %s 的用户信息"
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when it is idle
+msgid "Idle Text"
+msgstr "发呆文字"
+
+msgid "The text information for when a buddy is idle"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message Text"
+msgstr "消息文本"
+
+msgid "The text information for when a buddy has an unread message"
+msgstr ""
+
+#. Note to translators: These two strings refer to the font and color
+#. of a buddy list buddy when they have sent you a new message
+msgid "Message (Nick Said) Text"
+msgstr ""
+
+msgid ""
+"The text information for when a chat has an unread message that mentions "
+"your nickname"
+msgstr ""
+
+msgid "The text information for a buddy's status"
+msgstr "更改 %s 的用户信息"
+
+#, 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] "您已经有名为 %2$s 的 %1$d 位联系人。您是否想要合并？"
-msgstr[1] "您已经有名为 %2$s 的 %1$d 位联系人。您是否想要合并？"
+msgstr[0] "更改 %s 的用户信息"

 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
@@ -10128,9 +10071,8 @@
 "join.\n"
 msgstr "请输入您想要加入的聊天的对应信息。\n"

-#, fuzzy
 msgid "Room _List"
-msgstr "房间列表"
+msgstr "聊天室列表(_L)"

 msgid "_Block"
 msgstr "屏蔽(_B)"
@@ -10142,21 +10084,19 @@
 msgstr "移至"

 msgid "Get _Info"
-msgstr "资料(_I)"
+msgstr "获取信息(_I)"

 msgid "I_M"
-msgstr "开聊(_M)"
-
-#, fuzzy
+msgstr "聊天(_M)"
+
 msgid "_Audio Call"
-msgstr "添加聊天(_A)"
+msgstr "音频聊天(_A)"

 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "音频/视频 呼叫(_V)"
+
 msgid "_Video Call"
-msgstr "可视聊天"
+msgstr "视频聊天(_V)"

 msgid "_Send File..."
 msgstr "发送文件(_S)..."
@@ -10165,13 +10105,11 @@
 msgstr "添加好友千里眼(_P)..."

 msgid "View _Log"
-msgstr "查看日志(_L)"
-
-#, fuzzy
+msgstr "查看聊天记录(_L)"
+
 msgid "Hide When Offline"
 msgstr "离线时隐藏"

-#, fuzzy
 msgid "Show When Offline"
 msgstr "离线时显示"

@@ -10181,9 +10119,8 @@
 msgid "_Remove"
 msgstr "删除(_R)"

-#, fuzzy
 msgid "Set Custom Icon"
-msgstr "设置自定义图标..."
+msgstr "设置自定义图标"

 msgid "Remove Custom Icon"
 msgstr "删除自定义图标"
@@ -10210,9 +10147,8 @@
 msgid "Persistent"
 msgstr "永久"

-#, fuzzy
 msgid "_Edit Settings..."
-msgstr "编辑设置"
+msgstr "编辑设置(_E)..."

 msgid "_Collapse"
 msgstr "折叠(_C)"
@@ -10221,16 +10157,15 @@
 msgstr "展开(_E)"

 msgid "/Tools/Mute Sounds"
-msgstr "/工具(T)/静音(S)"
+msgstr "/工具/静音"

 msgid ""
 "You are not currently signed on with an account that can add that buddy."
-msgstr "您目前登入的协议中没有一个可以添加好友的。"
+msgstr "您目前登录的协议中没有一个可以添加好友的。"

 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#, fuzzy
 msgid "Unknown node type"
 msgstr "未知的错误代码 %d"

@@ -10248,7 +10183,7 @@
 msgstr "/好友(B)/获取用户信息(_I)..."

 msgid "/Buddies/View User _Log..."
-msgstr "/好友(B)/查看用户日志(_L)..."
+msgstr "/好友(B)/查看用户聊天记录(_L)..."

 msgid "/Buddies/Sh_ow"
 msgstr "/好友(B)/显示(_O)"
@@ -10287,89 +10222,84 @@
 msgid "/_Accounts"
 msgstr "/账户(_A)"

-#, fuzzy
 msgid "/Accounts/Manage Accounts"
-msgstr "/账户(A)/管理"
+msgstr "/账户/管理帐户"

 #. Tools
 msgid "/_Tools"
 msgstr "/工具(_T)"

 msgid "/Tools/Buddy _Pounces"
-msgstr "/工具(T)/好友千里眼(_P)"
+msgstr "/工具/好友千里眼(_P)"

 msgid "/Tools/_Certificates"
-msgstr "/工具(T)/证书(_C)"
-
-#, fuzzy
+msgstr "/工具/证书(_C)"
+
 msgid "/Tools/Custom Smile_ys"
-msgstr "/工具(T)/隐私(I)"
+msgstr "/工具/自定义表情(_Y)"

 msgid "/Tools/Plu_gins"
-msgstr "/工具(T)/插件(_G)"
+msgstr "/工具/插件(_G)"

 msgid "/Tools/Pr_eferences"
-msgstr "/工具(T)/首选项(_E)"
+msgstr "/工具/首选项(_E)"

 msgid "/Tools/Pr_ivacy"
-msgstr "/工具(T)/隐私(_I)"
+msgstr "/工具/隐私(_I)"

 msgid "/Tools/_File Transfers"
-msgstr "/工具(T)/文件传送(_F)"
+msgstr "/工具/文件传送(_F)"

 msgid "/Tools/R_oom List"
-msgstr "/工具(T)/房间列表(_O)"
+msgstr "/工具/聊天室列表(_O)"

 msgid "/Tools/System _Log"
-msgstr "/工具(T)/系统日志(_L)"
+msgstr "/工具/系统日志(_L)"

 msgid "/Tools/Mute _Sounds"
-msgstr "/工具(T)/静音(_S)"
+msgstr "/工具/静音(_S)"

 #. Help
 msgid "/_Help"
 msgstr "/帮助(_H)"

 msgid "/Help/Online _Help"
-msgstr "/帮助(H)/在线帮助(_H)"
+msgstr "/帮助/在线帮助(_H)"

 msgid "/Help/_Debug Window"
-msgstr "/帮助(H)/调试窗口(_D)"
+msgstr "/帮助/调试窗口(_D)"

 msgid "/Help/_About"
-msgstr "/帮助(H)/关于(_A)"
-
-#, fuzzy, c-format
+msgstr "/帮助/关于(_A)"
+
+#, c-format
 msgid "<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>账户：</b>%s"
-
-#, fuzzy, c-format
+msgstr "<b>账户：</b>%s"
+
+#, c-format
 msgid ""
 "\n"
 "<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>账户：</b>%s"
-
-#, fuzzy, c-format
+"<b>成员：</b>%d"
+
+#, c-format
 msgid ""
 "\n"
 "<b>Topic:</b> %s"
 msgstr ""
 "\n"
-"<b>账户：</b>%s"
-
-#, fuzzy
+"<b>主题：</b>%s"
+
 msgid "(no topic set)"
-msgstr "未设定话题"
+msgstr "(未设定话题)"

 msgid "Buddy Alias"
 msgstr "好友别名"

 msgid "Logged In"
-msgstr "已登入"
+msgstr "已登录"

 msgid "Last Seen"
 msgstr "上次见面"
@@ -10383,9 +10313,8 @@
 msgid "Rockin'"
 msgstr ""

-#, fuzzy
 msgid "Total Buddies"
-msgstr "好友"
+msgstr "全部好友"

 #, c-format
 msgid "Idle %dd %dh %02dm"
@@ -10400,34 +10329,33 @@
 msgstr "发呆 %d分"

 msgid "/Buddies/New Instant Message..."
-msgstr "/好友(B)/新即时消息(M)..."
+msgstr "/好友/新即时消息..."

 msgid "/Buddies/Join a Chat..."
-msgstr "/好友(B)/加入聊天(C)..."
+msgstr "/好友/加入聊天..."

 msgid "/Buddies/Get User Info..."
-msgstr "/好友(B)/获取用户信息(I)..."
+msgstr "/好友/获取用户信息..."

 msgid "/Buddies/Add Buddy..."
-msgstr "/好友(B)/添加好友(A)..."
+msgstr "/好友/添加好友..."

 msgid "/Buddies/Add Chat..."
-msgstr "/好友(B)/添加聊天(H)..."
+msgstr "/好友/添加聊天..."

 msgid "/Buddies/Add Group..."
-msgstr "/好友(B)/添加组(G)..."
+msgstr "/好友/添加组..."

 msgid "/Tools/Privacy"
-msgstr "/工具(T)/隐私(I)"
+msgstr "/工具/隐私"

 msgid "/Tools/Room List"
-msgstr "/工具(T)/房间列表(O)"
-
-#, fuzzy, c-format
+msgstr "/工具/聊天室列表"
+
+#, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "来自 %2$s 的 %1$d 条未读消息\n"
-msgstr[1] "来自 %2$s 的 %1$d 条未读消息\n"
+msgstr[0] "/工具/聊天室列表\n"

 msgid "Manually"
 msgstr "手动"
@@ -10436,35 +10364,33 @@
 msgstr "按状态"

 msgid "By recent log activity"
-msgstr ""
+msgstr "按最近活跃度"

 #, c-format
 msgid "%s disconnected"
 msgstr "%s 已断开连接"

-#, fuzzy, c-format
+#, c-format
 msgid "%s disabled"
-msgstr "命令已禁用"
-
-#, fuzzy
+msgstr "%s 已禁用"
+
 msgid "Reconnect"
-msgstr "连接"
-
-#, fuzzy
+msgstr "重新连接"
+
 msgid "Re-enable"
-msgstr "重新启用账户"
+msgstr "重新启用"

 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL 常见问题"

 msgid "Welcome back!"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "欢迎回来！"
+
+#, 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] "您在其它位置用此用户名登入了。"
+msgstr[0] "欢迎回来！"

 msgid "<b>Username:</b>"
 msgstr "<b>用户名：</b>"
@@ -10479,7 +10405,7 @@
 msgstr "/账户(A)"

 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
@@ -10496,35 +10422,31 @@
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/好友(B)/显示(O)//离线好友(O)"
+msgstr "/好友/显示/离线好友"

 msgid "/Buddies/Show/Empty Groups"
-msgstr "/好友(B)/显示(O)//空组(E)"
+msgstr "/好友/显示/空组"

 msgid "/Buddies/Show/Buddy Details"
-msgstr "/好友(B)/显示(O)//好友详细资料(D)"
+msgstr "/好友/显示/好友详细资料"

 msgid "/Buddies/Show/Idle Times"
-msgstr "/好友(B)/显示(O)/发呆时间(T)"
+msgstr "/好友/显示/发呆时间"

 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/好友(B)/显示(O)/协议图标(P)"
-
-#, fuzzy
+msgstr "/好友/显示/协议图标"
+
 msgid "Add a buddy.\n"
-msgstr "添加好友"
-
-#, fuzzy
+msgstr "添加好友。\n"
+
 msgid "Buddy's _username:"
-msgstr "好友名称："
-
-#, fuzzy
+msgstr "好友名称(_U)："
+
 msgid "(Optional) A_lias:"
-msgstr "额外信息："
-
-#, fuzzy
+msgstr "别名(可选)："
+
 msgid "Add buddy to _group:"
-msgstr "将用户加为好友吗？"
+msgstr "将用户添加到组："

 msgid "This protocol does not support chat rooms."
 msgstr "此协议不支持聊天室。"
@@ -10532,7 +10454,7 @@
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
-msgstr "您目前登入的协议中没有一个可以聊天的。"
+msgstr "您目前登录的协议中没有一个可以聊天的。"

 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
@@ -10546,10 +10468,9 @@
 msgstr "组(_G)："

 #, fuzzy
-msgid "Auto_join when account becomes online."
+msgid "Auto_join when account connects."
 msgstr "帐户在线时自动加入。"

-#, fuzzy
 msgid "_Remain in chat after window is closed."
 msgstr "窗口关闭时隐藏聊天。"

@@ -10560,10 +10481,10 @@
 msgstr "启用账户"

 msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/帐户(A)/启用帐户"
+msgstr "<PurpleMain>/帐户/启用帐户"

 msgid "<PurpleMain>/Accounts/"
-msgstr "<PurpleMain>/账户(A)/"
+msgstr "<PurpleMain>/账户/"

 msgid "_Edit Account"
 msgstr "编辑账户(_E)"
@@ -10575,118 +10496,11 @@
 msgstr "禁用(_D)"

 msgid "/Tools"
-msgstr "/工具(T)"
+msgstr "/工具"

 msgid "/Buddies/Sort Buddies"
-msgstr "/好友(B)/好友排序(S)"
-
-#. Buddy List
-msgid "Background Color"
-msgstr "背景颜色"
-
-#, fuzzy
-msgid "The background color for the buddy list"
-msgstr "您已经将此群添加到好友"
-
-#, fuzzy
-msgid "Layout"
-msgstr "狮子座"
-
-msgid "The layout of icons, name, and status of the blist"
-msgstr ""
-
-#. Group
-#, fuzzy
-msgid "Expanded Background Color"
-msgstr "背景颜色"
-
-msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
-msgid "Expanded Text"
-msgstr "展开(_E)"
-
-msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
-msgid "Collapsed Background Color"
-msgstr "选择背景颜色"
-
-msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
-msgid "Collapsed Text"
-msgstr "折叠(_C)"
-
-msgid "The text information for when a group is collapsed"
-msgstr ""
-
-#. Buddy
-#, fuzzy
-msgid "Contact/Chat Background Color"
-msgstr "选择背景颜色"
-
-msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
-msgid "Contact Text"
-msgstr "排序"
-
-msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
-msgid "On-line Text"
-msgstr "在线"
-
-msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
-msgid "Away Text"
-msgstr "离开"
-
-msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
-msgid "Off-line Text"
-msgstr "离线"
-
-msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
-msgid "Idle Text"
-msgstr "血型"
-
-msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
-msgid "Message Text"
-msgstr "消息已送出"
-
-msgid "The text information for when a buddy has an unread message"
-msgstr ""
-
-msgid "Message (Nick Said) Text"
-msgstr ""
-
-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
-msgstr ""
-
-#, fuzzy
-msgid "The text information for a buddy's status"
-msgstr "更改 %s 的用户信息"
-
-#, fuzzy
+msgstr "/好友/好友排序"
+
 msgid "Type the host name for this certificate."
 msgstr "输入此证书所适用的主机名。"

@@ -10702,7 +10516,7 @@

 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
-msgstr "您目前登入的协议中没有一个可以邀请好友的。"
+msgstr "您目前登录的协议中没有一个可以邀请好友的。"

 msgid "Invite Buddy Into Chat Room"
 msgstr "邀请好友进入聊天室"
@@ -10715,7 +10529,7 @@

 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>与 %s 的谈话</h1>\n"
+msgstr "<h1>与 %s 的会话</h1>\n"

 msgid "Save Conversation"
 msgstr "保存对话"
@@ -10735,7 +10549,6 @@
 msgid "Get Away Message"
 msgstr "获得离开消息"

-#, fuzzy
 msgid "Last Said"
 msgstr "上次说道"

@@ -10757,9 +10570,8 @@
 msgid "Set Custom Icon..."
 msgstr "设置自定义图标..."

-#, fuzzy
 msgid "Change Size"
-msgstr "更改状态"
+msgstr "更改大小"

 msgid "Show All"
 msgstr "全部显示"
@@ -10769,96 +10581,96 @@
 msgstr "/对话(_C)"

 msgid "/Conversation/New Instant _Message..."
-msgstr "/对话(C)/新即时消息(_M)..."
+msgstr "/对话/新即时消息(_M)..."
+
+#, fuzzy
+msgid "/Conversation/Join a _Chat..."
+msgstr "/对话/邀请(_V)..."

 msgid "/Conversation/_Find..."
-msgstr "/对话(C)/查找(_F)..."
+msgstr "/对话/查找(_F)..."

 msgid "/Conversation/View _Log"
-msgstr "/对话(C)/查看日志(_L)"
+msgstr "/对话/查看聊天记录(_L)"

 msgid "/Conversation/_Save As..."
-msgstr "/对话(C)/另存为(_S)..."
+msgstr "/对话/另存为(_S)..."

 msgid "/Conversation/Clea_r Scrollback"
-msgstr "/对话(C)/清除回滚(_R)"
-
-#, fuzzy
+msgstr "/对话/清除回滚(_R)"
+
 msgid "/Conversation/M_edia"
-msgstr "/对话(C)/更多(_O)"
-
-#, fuzzy
+msgstr "/对话/媒体(_E)"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/对话(C)/更多(_O)"
-
-#, fuzzy
+msgstr "/对话/媒体/语音聊天(_A)"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/对话(C)/更多(_O)"
-
-#, fuzzy
+msgstr "/对话/媒体/视频聊天(_V)"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/对话(C)/查看日志(_L)"
+msgstr "/对话/媒体/音频\\/视频聊天(_C)"

 msgid "/Conversation/Se_nd File..."
-msgstr "/对话(C)/发送文件(_N)..."
+msgstr "/对话/发送文件(_N)..."

 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/对话(C)/添加好友千里眼(_P)..."
+msgstr "/对话/添加好友千里眼(_P)..."

 msgid "/Conversation/_Get Info"
-msgstr "/对话(C)/获取信息(_G)"
+msgstr "/对话/获取信息(_G)"

 msgid "/Conversation/In_vite..."
-msgstr "/对话(C)/邀请(_V)..."
+msgstr "/对话/邀请(_V)..."

 msgid "/Conversation/M_ore"
-msgstr "/对话(C)/更多(_O)"
+msgstr "/对话/更多(_O)"

 msgid "/Conversation/Al_ias..."
-msgstr "/对话(C)/别名(_L)..."
+msgstr "/对话/别名(_L)..."

 msgid "/Conversation/_Block..."
-msgstr "/对话(C)/屏蔽(_B)..."
+msgstr "/对话/屏蔽(_B)..."

 msgid "/Conversation/_Unblock..."
-msgstr "/对话(C)/取消屏蔽(_U)..."
+msgstr "/对话/取消屏蔽(_U)..."

 msgid "/Conversation/_Add..."
-msgstr "/对话(C)/添加(_A)..."
+msgstr "/对话/添加(_A)..."

 msgid "/Conversation/_Remove..."
-msgstr "/对话(C)/删除(_R)..."
+msgstr "/对话/删除(_R)..."

 msgid "/Conversation/Insert Lin_k..."
-msgstr "/对话(C)/插入链接(_K)..."
+msgstr "/对话/插入链接(_K)..."

 msgid "/Conversation/Insert Imag_e..."
-msgstr "/对话(C)/插入图像(_E)..."
+msgstr "/对话/插入图像(_E)..."

 msgid "/Conversation/_Close"
-msgstr "/对话(C)/关闭(_C)"
+msgstr "/对话/关闭(_C)"

 #. Options
 msgid "/_Options"
 msgstr "/选项(_O)"

 msgid "/Options/Enable _Logging"
-msgstr "/选项(O)/允许记录日志(_L)"
+msgstr "/选项/启用聊天记录(_L)"

 msgid "/Options/Enable _Sounds"
-msgstr "/选项(O)/允许声音(_S)"
+msgstr "/选项/启用声音(_S)"

 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/选项(O)/显示格式工具栏(_T)"
+msgstr "/选项/显示格式工具栏(_T)"

 msgid "/Options/Show Ti_mestamps"
-msgstr "/选项(O)/显示时间戳(_I)"
+msgstr "/选项/显示时间戳(_M)"

 msgid "/Conversation/More"
-msgstr "/对话(C)/更多(O)"
+msgstr "/对话/更多"

 msgid "/Options"
-msgstr "/选项(O)"
+msgstr "/选项"

 #. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
 #. * the 'Conversation' menu pops up.
@@ -10866,76 +10678,75 @@
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
 msgid "/Conversation"
-msgstr "/对话(C)"
+msgstr "/对话"

 msgid "/Conversation/View Log"
-msgstr "/对话(C)/查看日志(L)"
-
-#, fuzzy
+msgstr "/对话/查看聊天记录"
+
 msgid "/Conversation/Media/Audio Call"
-msgstr "/对话(C)/更多(O)"
-
-#, fuzzy
+msgstr "/对话/媒体/音频聊天"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/对话(C)/查看日志(L)"
-
-#, fuzzy
+msgstr "/对话/媒体/视频聊天"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/对话(C)/更多(O)"
+msgstr "/对话/媒体/音频\\/视频聊天"

 msgid "/Conversation/Send File..."
-msgstr "/对话(C)/发送文件(N)..."
+msgstr "/对话/发送文件..."

 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/对话(C)/添加好友千里眼(P)..."
+msgstr "/对话/添加好友千里眼..."

 msgid "/Conversation/Get Info"
-msgstr "/对话(C)/获取信息(G)"
+msgstr "/对话/获取信息"

 msgid "/Conversation/Invite..."
-msgstr "/对话(C)/邀请(V)..."
+msgstr "/对话/邀请..."

 msgid "/Conversation/Alias..."
-msgstr "/对话(C)/别名(L)..."
+msgstr "/对话/别名..."

 msgid "/Conversation/Block..."
-msgstr "/对话(C)/屏蔽(B)..."
+msgstr "/对话/屏蔽..."

 msgid "/Conversation/Unblock..."
-msgstr "/对话(C)/取消屏蔽(U)..."
+msgstr "/对话/取消屏蔽..."

 msgid "/Conversation/Add..."
-msgstr "/对话(C)/添加(A)..."
+msgstr "/对话/添加..."

 msgid "/Conversation/Remove..."
-msgstr "/对话(C)/删除(R)..."
+msgstr "/对话/删除..."

 msgid "/Conversation/Insert Link..."
-msgstr "/对话(C)/插入链接(K)..."
+msgstr "/对话/插入链接..."

 msgid "/Conversation/Insert Image..."
-msgstr "/对话(C)/插入图像(E)..."
+msgstr "/对话/插入图像..."

 msgid "/Options/Enable Logging"
-msgstr "/选项(O)/允许记录(L)"
+msgstr "/选项/启用聊天记录"

 msgid "/Options/Enable Sounds"
-msgstr "/选项(O)/允许声音(S)"
+msgstr "/选项/启用声音"

 msgid "/Options/Show Formatting Toolbars"
-msgstr "/选项(O)/显示格式工具栏(T)"
+msgstr "/选项/显示格式工具栏"

 msgid "/Options/Show Timestamps"
-msgstr "/选项(O)/显示时间戳(I)"
+msgstr "/选项/显示时间戳"

 msgid "User is typing..."
 msgstr "用户正在打字..."

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "\n"
 "%s has stopped typing"
-msgstr "%s 停止了给您打字(%s)"
+msgstr ""
+"\n"
+"%s 停止了打字(%s)"

 #. Build the Send To menu
 msgid "S_end To"
@@ -10948,17 +10759,16 @@
 msgid "0 people in room"
 msgstr "聊天室里没有人"

-#, fuzzy, c-format
+#, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
-msgstr[0] "聊天室里有 %d 个人"
-msgstr[1] "聊天室里有 %d 个人"
+msgstr[0] "聊天室里没有人"

 msgid "Typing"
-msgstr "正打字"
+msgstr "正在打字"

 msgid "Stopped Typing"
-msgstr "停止打字"
+msgstr "停止了打字"

 msgid "Nick Said"
 msgstr "昵称说"
@@ -11009,19 +10819,19 @@
 msgstr "按账户"

 msgid "Save Debug Log"
-msgstr "保存调试日志"
+msgstr "保存调试聊天记录"

 msgid "Invert"
-msgstr "反转"
+msgstr "反选"

 msgid "Highlight matches"
 msgstr "突出显示匹配项"

 msgid "_Icon Only"
-msgstr "只有图标(_I)"
+msgstr "仅图标(_I)"

 msgid "_Text Only"
-msgstr "只有文本(_T)"
+msgstr "仅文本(_T)"

 msgid "_Both Icon & Text"
 msgstr "图标和文本(_B)"
@@ -11042,7 +10852,7 @@
 msgstr "全部"

 msgid "Misc"
-msgstr "杂类"
+msgstr "杂项"

 msgid "Warning"
 msgstr "警告"
@@ -11051,12 +10861,11 @@
 msgstr "错误 "

 msgid "Fatal Error"
-msgstr "严重错误"
+msgstr "致命错误"

 msgid "bug master"
-msgstr ""
-
-#, fuzzy
+msgstr "Bug 主管"
+
 msgid "artist"
 msgstr "美工"

@@ -11065,17 +10874,16 @@
 msgstr "张家兴"

 msgid "voice and video"
-msgstr ""
+msgstr "声音和视频"

 msgid "support"
 msgstr "支持"

-#, fuzzy
 msgid "webmaster"
-msgstr "开发者和网管"
+msgstr "网络管理员"

 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "其他贡献者/质量保证"

 msgid "win32 port"
 msgstr "Win32 移植"
@@ -11094,22 +10902,22 @@
 msgstr "支持/质控"

 msgid "XMPP"
-msgstr ""
+msgstr "XMPP"

 msgid "original author"
 msgstr "原作者"

 msgid "lead developer"
-msgstr "领导开发者"
+msgstr "开发领导者"

 msgid "Afrikaans"
-msgstr ""
+msgstr "南非荷兰语"

 msgid "Arabic"
 msgstr "阿拉伯语"

 msgid "Belarusian Latin"
-msgstr ""
+msgstr "白俄罗斯拉丁语"

 msgid "Bulgarian"
 msgstr "保加利亚语"
@@ -11156,11 +10964,10 @@
 msgid "Spanish"
 msgstr "西班牙语"

-#, fuzzy
 msgid "Estonian"
-msgstr "波斯尼亚语"
-
-msgid "Euskera(Basque)"
+msgstr "爱沙尼亚语"
+
+msgid "Basque"
 msgstr ""

 msgid "Persian"
@@ -11172,9 +10979,8 @@
 msgid "French"
 msgstr "法语"

-#, fuzzy
 msgid "Irish"
-msgstr "库得语"
+msgstr "爱尔兰语"

 msgid "Galician"
 msgstr "加利西亚语"
@@ -11183,7 +10989,7 @@
 msgstr "古吉拉特语"

 msgid "Gujarati Language Team"
-msgstr "古吉拉特语团队"
+msgstr "古吉拉特语小组"

 msgid "Hebrew"
 msgstr "希伯莱语"
@@ -11194,9 +11000,8 @@
 msgid "Hungarian"
 msgstr "匈牙利语"

-#, fuzzy
 msgid "Armenian"
-msgstr "罗马尼亚语"
+msgstr "亚美尼亚语"

 msgid "Indonesian"
 msgstr "印度尼西亚语"
@@ -11211,17 +11016,16 @@
 msgstr "乔治亚语"

 msgid "Ubuntu Georgian Translators"
-msgstr "Ubuntu 乔治亚语翻译者"
-
-#, fuzzy
+msgstr "Ubuntu 乔治亚语翻译组"
+
 msgid "Khmer"
-msgstr "其它"
+msgstr "高棉语"

 msgid "Kannada"
-msgstr ""
+msgstr "坎纳达语"

 msgid "Kannada Translation team"
-msgstr ""
+msgstr "坎纳达语翻译小组"

 msgid "Korean"
 msgstr "朝鲜语"
@@ -11229,9 +11033,8 @@
 msgid "Kurdish"
 msgstr "库得语"

-#, fuzzy
 msgid "Lao"
-msgstr "狮子座"
+msgstr "老挝语"

 msgid "Lithuanian"
 msgstr "立陶宛语"
@@ -11239,30 +11042,26 @@
 msgid "Macedonian"
 msgstr "马其顿语"

-#, fuzzy
 msgid "Mongolian"
-msgstr "马其顿语"
-
-#, fuzzy
+msgstr "蒙古语"
+
 msgid "Bokmål Norwegian"
-msgstr "挪威语"
+msgstr "书面挪威语"

 msgid "Nepali"
 msgstr "尼泊尔语"

-#, fuzzy
 msgid "Dutch, Flemish"
-msgstr "荷兰语"
-
-#, fuzzy
+msgstr "荷兰弗拉芒语"
+
 msgid "Norwegian Nynorsk"
-msgstr "挪威语"
+msgstr "挪威尼诺斯克语"

 msgid "Occitan"
-msgstr ""
+msgstr "奥克西唐语"

 msgid "Punjabi"
-msgstr ""
+msgstr "旁遮普语"

 msgid "Polish"
 msgstr "波兰语"
@@ -11273,9 +11072,8 @@
 msgid "Portuguese-Brazil"
 msgstr "巴西葡萄牙语"

-#, fuzzy
 msgid "Pashto"
-msgstr "相片"
+msgstr "普什图语"

 msgid "Romanian"
 msgstr "罗马尼亚语"
@@ -11295,15 +11093,14 @@
 msgid "Serbian"
 msgstr "塞尔维亚语"

-#, fuzzy
 msgid "Sinhala"
-msgstr "社会"
+msgstr "僧伽罗语"

 msgid "Swedish"
 msgstr "瑞典语"

 msgid "Swahili"
-msgstr ""
+msgstr "斯瓦希里语"

 msgid "Tamil"
 msgstr "泰米尔语"
@@ -11318,22 +11115,22 @@
 msgstr "土耳其语"

 msgid "Urdu"
-msgstr ""
+msgstr "乌尔都语"

 msgid "Vietnamese"
 msgstr "越南语"

 msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh 及 Gnome 越南语团队"
+msgstr "T.M.Thanh 及Gnome 越南语小组"

 msgid "Simplified Chinese"
-msgstr "简体中文"
+msgstr "中文(中国)"

 msgid "Hong Kong Chinese"
-msgstr "香港地区中文"
+msgstr "中文(香港)"

 msgid "Traditional Chinese"
-msgstr "繁体中文"
+msgstr "中文(台湾)"

 msgid "Amharic"
 msgstr "阿姆哈拉语"
@@ -11354,27 +11151,40 @@
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
+"%s 是一个基于 libpurple 的图形化模块消息客户端，支持同时连接到 AIM，MSN，"
+"Yahoo!，XMPP，ICQ， IRC，SILC，SIP/SIMPLE，Novell GroupWise，Lotus Sametime，"
+"Bonjour，Zephyr，MySpaceIM，Gadu-Gadu 以及 QQ。它使用 GTK+ 编写。<BR><BR>您可"
+"以在 GNU 通用公共许可证第二版或任意更高版本的许可下修改并重新发布此软件。在发"
+"行的 %s 中应有一个 'COPYING' 文件包含 GPL 正文。%s 的版权由其贡献者所有，在 "
+"'COPYING'文件中给出了所有贡献这的列表。我们不对此软件做任何保证。<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 ""
-
-#, 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\">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 from other Pidgin users:</font> <a href=\"mailto:"
+"support@pidgin.im\">support@pidgin.im</a><br/>This is a <b>public</b> "
+"mailing list! (<a href=\"http://pidgin.im/pipermail/support/\">archive</a>)"
+"<br/>We can't help with 3rd party protocols or plugins!<br/>This list's "
+"primary language is <b>English</b>.  You are welcome to post in another "
+"language, but the responses may be less helpful.<br/><br/>"
+msgstr ""
+
+#, c-format
 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>"
-
-#, fuzzy, c-format
+msgstr ""
+"<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>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> irc.freenode.net 上的 #pidgin<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC：</FONT> devel@conference.pidgin.im<BR><BR>"

 msgid "Current Developers"
 msgstr "当前开发者"
@@ -11406,14 +11216,13 @@
 msgid "Get User Info"
 msgstr "获取用户信息"

-#, fuzzy
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr "您想要查看谁的信息？请输入他/她的用户名或别名。"

 msgid "View User Log"
-msgstr "查看用户日志"
+msgstr "查看用户聊天记录"

 msgid "Alias Contact"
 msgstr "给联系人起名"
@@ -11434,19 +11243,14 @@
 msgid "Enter an alias for this chat."
 msgstr "请输入此聊天的别名。"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
 "your buddy list.  Do you want to continue?"
 msgid_plural ""
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
-"吗？"
-msgstr[1] ""
-"您即将从您的好友列表中删除包含 %s 及 %d 个其它好友的联系人。您真的要这么做"
-"吗？"
+msgstr[0] "请输入此聊天的别名。"

 msgid "Remove Contact"
 msgstr "删除联系人"
@@ -11504,45 +11308,35 @@
 msgid "Right-click for more unread messages...\n"
 msgstr "用鼠标右键单击可查看更多未读消息...\n"

-#, fuzzy
 msgid "_Change Status"
-msgstr "更改状态"
-
-#, fuzzy
+msgstr "更改状态(_C)"
+
 msgid "Show Buddy _List"
-msgstr "显示好友列表"
-
-#, fuzzy
+msgstr "显示好友列表(_L)"
+
 msgid "_Unread Messages"
-msgstr "未读消息"
-
-#, fuzzy
+msgstr "未读消息(_U)"
+
 msgid "New _Message..."
-msgstr "新消息..."
-
-#, fuzzy
+msgstr "新消息(_M)..."
+
 msgid "_Accounts"
-msgstr "/账户(_A)"
-
-#, fuzzy
+msgstr "账户(_A)"
+
 msgid "Plu_gins"
-msgstr "插件"
-
-#, fuzzy
+msgstr "插件(_G)"
+
 msgid "Pr_eferences"
-msgstr "首选项"
-
-#, fuzzy
+msgstr "首选项(_E)"
+
 msgid "Mute _Sounds"
-msgstr "静音"
-
-#, fuzzy
+msgstr "静音(_S)"
+
 msgid "_Blink on New Message"
-msgstr "有新信息时闪烁"
-
-#, fuzzy
+msgstr "有新信息时闪烁(_B)"
+
 msgid "_Quit"
-msgstr "退出"
+msgstr "退出(_Q)"

 msgid "Not started"
 msgstr "未开始"
@@ -11596,20 +11390,12 @@
 msgstr "全部传送完成时关闭此窗口(_F)"

 msgid "C_lear finished transfers"
-msgstr "清除未完成的传送(_L)"
+msgstr "清除已完成的传送(_L)"

 #. "Download Details" arrow
 msgid "File transfer _details"
 msgstr "文件传送细节(_D)"

-#. Pause button
-msgid "_Pause"
-msgstr "暂停(_P)"
-
-#. Resume button
-msgid "_Resume"
-msgstr "继续(_R)"
-
 msgid "Paste as Plain _Text"
 msgstr "粘贴为纯文本(_T)"

@@ -11625,11 +11411,9 @@
 msgid "Color to draw hyperlinks."
 msgstr "绘制超级链接的颜色。"

-#, fuzzy
 msgid "Hyperlink visited color"
-msgstr "超级链接颜色"
-
-#, fuzzy
+msgstr "已访问超级链接的颜色"
+
 msgid "Color to draw hyperlink after it has been visited (or activated)."
 msgstr "绘制超级链接悬停时的颜色。"

@@ -11639,14 +11423,12 @@
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "绘制超级链接悬停时的颜色。"

-#, fuzzy
 msgid "Sent Message Name Color"
 msgstr "已发消息"

 msgid "Color to draw the name of a message you sent."
 msgstr ""

-#, fuzzy
 msgid "Received Message Name Color"
 msgstr "收到的消息"

@@ -11677,24 +11459,20 @@
 msgid "Color to draw the name of a whispered message."
 msgstr ""

-#, fuzzy
 msgid "Typing notification color"
-msgstr "通知删除"
-
-#, fuzzy
+msgstr "打字通知颜色"
+
 msgid "The color to use for the typing notification"
-msgstr "新邮件通知"
-
-#, fuzzy
+msgstr "此颜色用于打字通知"
+
 msgid "Typing notification font"
-msgstr "弹出通知"
+msgstr "打字通知字体"

 msgid "The font to use for the typing notification"
 msgstr ""

-#, fuzzy
 msgid "Enable typing notification"
-msgstr "新邮件通知"
+msgstr "启用打字通知"

 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
@@ -11740,9 +11518,8 @@
 msgid "_Save Image..."
 msgstr "保存图像(_S)..."

-#, fuzzy
 msgid "_Add Custom Smiley..."
-msgstr "显示自定义如下："
+msgstr "添加自定义表情(_A)..."

 msgid "Select Font"
 msgstr "选择字体"
@@ -11789,9 +11566,8 @@
 msgid "Smile!"
 msgstr "表情"

-#, fuzzy
 msgid "_Manage custom smileys"
-msgstr "显示自定义如下："
+msgstr "管理自定义表情(_M)"

 msgid "This theme has no available smileys."
 msgstr "此主题没有可用的表情。"
@@ -11883,24 +11659,23 @@
 msgid "_Smile!"
 msgstr "表情(_S)"

-#, fuzzy
 msgid "Log Deletion Failed"
-msgstr "SSL 连接失败"
+msgstr "删除日志失败"

 msgid "Check permissions and try again."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "检查许可并重试。"
+
+#, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
-msgstr "您真的想要永久删除自 %2$s 起与 %1$s 的对话日志吗？"
+msgstr "您真的想要永久删除自 %2$s 起与 %1$s 的聊天记录吗？"

 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
-msgstr "您真的想要永久删除自 %2$s 起在 %1$s 的对话日志吗？"
+msgstr "您真的想要永久删除自 %2$s 起在 %1$s 的对话聊天记录吗？"

 #, c-format
 msgid ""
@@ -11908,13 +11683,11 @@
 "s?"
 msgstr "您真的想要永久删除自 %s 起的系统日志吗？"

-#, fuzzy
 msgid "Delete Log?"
-msgstr "删除"
-
-#, fuzzy
+msgstr "要删除记录吗？"
+
 msgid "Delete Log..."
-msgstr "删除"
+msgstr "删除记录..."

 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
@@ -11926,64 +11699,49 @@

 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr "浏览日志文件夹(_B)"
+msgstr "浏览聊天记录文件夹(_B)"

 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s。试试“%s -h”查看帮助。\n"

-#, fuzzy, c-format
-msgid ""
-"%s %s\n"
+#, c-format
+msgid ""
 "Usage: %s [OPTION]...\n"
 "\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  --display=DISPLAY   X display to use\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"用法: %s [选项]...\n"
-"\n"
-"  -c, --config=目录   使用“目录”存储配置文件\n"
-"  -d, --debug         将调试信息打印到标准输出\n"
-"  -h, --help          显示帮助并退出\n"
-"  -n, --nologin       不自动登入\n"
-"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户，用逗号分隔)\n"
-"  -v, --version       显示当前版本并退出\n"
-
-#, fuzzy, c-format
-msgid ""
-"%s %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -f, --force-online  force online, regardless of network status\n"
-"  -h, --help          display this help and exit\n"
-"  -m, --multiple      do not ensure single instance\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  enable specified account(s) (optional argument NAME\n"
-"                      specifies account(s) to use, separated by commas.\n"
-"                      Without this only the first account will be enabled).\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"%s %s\n"
-"用法: %s [选项]...\n"
-"\n"
-"  -c, --config=目录   使用“目录”存储配置文件\n"
-"  -d, --debug         将调试信息打印到标准输出\n"
-"  -h, --help          显示帮助并退出\n"
-"  -n, --nologin       不自动登入\n"
-"  -l, --login[=名称]  自动登入(可选“名称”指定要使用的账户，用逗号分隔)\n"
-"  -v, --version       显示当前版本并退出\n"
+msgstr ""
+
+msgid "use DIR for config files"
+msgstr ""
+
+msgid "print debugging messages to stdout"
+msgstr ""
+
+msgid "force online, regardless of network status"
+msgstr ""
+
+msgid "display this help and exit"
+msgstr ""
+
+msgid "allow multiple instances"
+msgstr ""
+
+msgid "don't automatically login"
+msgstr ""
+
+msgid ""
+"enable specified account(s) (optional argument NAME\n"
+"                      specifies account(s) to use, separated by commas."
+msgstr ""
+
+msgid "Without this only the first account will be enabled)."
+msgstr ""
+
+msgid "X display to use"
+msgstr ""
+
+msgid "display the current version and exit"
+msgstr ""

 #, c-format
 msgid ""
@@ -12008,37 +11766,37 @@

 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "退出，因为另一个 libpurple 客户端已运行。\n"

 msgid "/_Media"
-msgstr ""
+msgstr "/媒体(_M)"

 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
-msgid "Calling..."
-msgstr "正在计算..."
+msgstr "/媒体/挂起(_H)"

 #, 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 ""
-
-#, fuzzy, c-format
+msgstr "%s 希望于您进行视频聊天。"
+
+msgid "Incoming Call"
+msgstr ""
+
+msgid "_Pause"
+msgstr "暂停(_P)"
+
+#, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
-msgstr[0] "%s 有 %d 封新邮件。"
-msgstr[1] "%s 有 %d 封新邮件。"
-
-#, fuzzy, c-format
+msgstr[0] "暂停(_P)"
+
+#, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
-msgstr[0] "<b>%d 封新邮件。</b>"
-msgstr[1] "<b>%d 封新邮件。</b>"
+msgstr[0] "暂停(_P)"

 #, c-format
 msgid "The browser command \"%s\" is invalid."
@@ -12055,9 +11813,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 "打开全部消息"
@@ -12065,14 +11822,12 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"

-#, fuzzy
 msgid "New Pounces"
 msgstr "新建好友千里眼"

 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "解散"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">您有新邮件了!</span>"

@@ -12085,39 +11840,33 @@
 msgid "Unload Plugins"
 msgstr "卸载插件"

-#, fuzzy
 msgid "Could not unload plugin"
-msgstr "无法装入公钥"
+msgstr "无法卸载插件"

 msgid ""
 "The plugin could not be unloaded now, but will be disabled at the next "
 "startup."
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "插件无法立即卸载，将在下次启动时禁用"
+
+#, 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\">错误：%s\n"
 "请检查插件网站中的更新。</span>"

-#, fuzzy
 msgid "Author"
-msgstr "同意"
-
-#, fuzzy
+msgstr "作者"
+
 msgid "<b>Written by:</b>"
-msgstr "<b>接收方：</b>"
-
-#, fuzzy
+msgstr "<b>开发：</b>"
+
 msgid "<b>Web site:</b>"
-msgstr "<b>发送为：</b>"
-
-#, fuzzy
+msgstr "<b>网站：</b>"
+
 msgid "<b>Filename:</b>"
-msgstr "<b>用户名：</b>"
+msgstr "<b>文件名：</b>"

 msgid "Configure Pl_ugin"
 msgstr "配置插件(_U)"
@@ -12128,7 +11877,6 @@
 msgid "Select a file"
 msgstr "选择文件"

-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "编辑好友千里眼"

@@ -12143,10 +11891,10 @@
 msgstr "好友名称(_B)："

 msgid "Si_gns on"
-msgstr "登入(_G)"
+msgstr "登录(_G)"

 msgid "Signs o_ff"
-msgstr "登出(_F)"
+msgstr "退出(_F)"

 msgid "Goes a_way"
 msgstr "离开(_W)"
@@ -12164,7 +11912,7 @@
 msgstr "开始打字(_T)"

 msgid "P_auses while typing"
-msgstr "输入时暂停(_A)"
+msgstr "暂停打字(_A)"

 msgid "Stops t_yping"
 msgstr "停止打字(_Y)"
@@ -12205,61 +11953,58 @@
 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
+msgstr "暂停打字"
+
+#, c-format
 msgid "Signed on"
-msgstr "登入"
-
-#, fuzzy, c-format
+msgstr "登录"
+
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s 发完呆了(%s)"
-
-#, fuzzy, c-format
+msgstr "发完呆了"
+
+#, c-format
 msgid "Returned from being away"
 msgstr "回来"

-#, fuzzy, c-format
+#, c-format
 msgid "Stopped typing"
 msgstr "停止打字"

-#, fuzzy, c-format
+#, c-format
 msgid "Signed off"
-msgstr "登出"
-
-#, fuzzy, c-format
+msgstr "退出"
+
+#, c-format
 msgid "Became idle"
 msgstr "发起了呆"

-#, fuzzy, c-format
+#, 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 "未知的千里眼。请报告此错误！"

-#, fuzzy
 msgid "Theme failed to unpack."
-msgstr "表情主题解包失败。"
-
-#, fuzzy
+msgstr "主题解包失败。"
+
 msgid "Theme failed to load."
-msgstr "表情主题解包失败。"
-
-#, fuzzy
+msgstr "主题加载失败。"
+
 msgid "Theme failed to copy."
-msgstr "表情主题解包失败。"
+msgstr "主题复制失败。"

 msgid "Install Theme"
 msgstr "安装主题"
@@ -12273,16 +12018,14 @@
 msgstr "图标"

 msgid "Keyboard Shortcuts"
-msgstr ""
-
-#, fuzzy
+msgstr "键盘快捷键"
+
 msgid "Cl_ose conversations with the Escape key"
-msgstr "与 %s 的对话"
+msgstr "使用 ESC 键关闭会话(_O)"

 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "好友列表"
+msgstr "好友列表主题"

 #. System Tray
 msgid "System Tray Icon"
@@ -12294,7 +12037,6 @@
 msgid "On unread messages"
 msgstr "有未读消息时"

-#, fuzzy
 msgid "Conversation Window"
 msgstr "即时消息对话窗口"

@@ -12366,7 +12108,7 @@
 msgstr "收到信息时闪烁窗口(_L)"

 msgid "Minimum input area height in lines:"
-msgstr ""
+msgstr "输入区最小行数："

 msgid "Font"
 msgstr "字体"
@@ -12389,18 +12131,17 @@
 msgstr "当您使用的协议支持格式时，您送出的信息将会显示为这样。"

 msgid "Cannot start proxy configuration program."
-msgstr ""
-
-#, fuzzy
+msgstr "无法启动代理配置程序。"
+
 msgid "Cannot start browser configuration program."
-msgstr "无法获取用户信息"
+msgstr "无法启动浏览器配置程序。"

 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："
@@ -12409,7 +12150,7 @@
 msgstr "端口"

 msgid "_Enable automatic router port forwarding"
-msgstr ""
+msgstr "启用自动路由器端口转发(_E)"

 msgid "_Manually specify range of ports to listen on"
 msgstr "手动指定要监听的端口范围(_M)"
@@ -12422,30 +12163,27 @@

 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
-
-#, fuzzy
+msgstr "中继服务器(转)"
+
 msgid "Proxy Server &amp; Browser"
-msgstr "代理服务器"
+msgstr "代理服务器 &amp; 浏览器"

 msgid "<b>Proxy configuration program was not found.</b>"
-msgstr ""
+msgstr "<b>未发现代理设定程序。</b>"

 msgid "<b>Browser configuration program was not found.</b>"
-msgstr ""
+msgstr "<b>未发现浏览器配置程序。</b>"

 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
 msgstr ""

-#, fuzzy
 msgid "Configure _Proxy"
-msgstr "配置房间(_C)"
-
-#, fuzzy
+msgstr "配置代理服务器(_P)"
+
 msgid "Configure _Browser"
-msgstr "配置房间(_C)"
+msgstr "配置浏览器(_B)"

 msgid "Proxy Server"
 msgstr "代理服务器"
@@ -12455,7 +12193,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 "通过 SOCKS4 代理使用远程 DNS"

 msgid "_User:"
 msgstr "用户(_U)："
@@ -12475,9 +12213,8 @@
 msgid "Konqueror"
 msgstr "Konqueror"

-#, fuzzy
 msgid "Desktop Default"
-msgstr "接受默认值(_A)"
+msgstr "桌面默认值"

 msgid "GNOME Default"
 msgstr "GNOME 默认"
@@ -12495,7 +12232,7 @@
 msgstr "Epiphany"

 msgid "Manual"
-msgstr "手动"
+msgstr "手工设置"

 msgid "Browser Selection"
 msgstr "浏览器选择"
@@ -12524,7 +12261,7 @@
 "(%s 代表 URL)"

 msgid "Log _format:"
-msgstr "日志格式(_F)："
+msgstr "聊天记录格式(_F)："

 msgid "Log all _instant messages"
 msgstr "记录所有即时消息(_I)"
@@ -12576,7 +12313,7 @@
 "Sound c_ommand:\n"
 "(%s for filename)"
 msgstr ""
-"声音命令(_O):\n"
+"声音命令(_O)：\n"
 "(%s 代表文件名)"

 msgid "M_ute sounds"
@@ -12777,9 +12514,8 @@
 msgid "Custom Smiley"
 msgstr "自定义表情"

-#, fuzzy
 msgid "Duplicate Shortcut"
-msgstr "重复更正"
+msgstr "重复的快捷方式"

 msgid "Edit Smiley"
 msgstr "修改表情"
@@ -12791,24 +12527,20 @@
 msgstr "图像(_I):"

 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "排序"
-
-#, fuzzy
+msgstr "快捷方式文本："
+
 msgid "Smiley"
 msgstr "表情"

-#, fuzzy
 msgid "Shortcut Text"
-msgstr "排序"
+msgstr "快捷方式文本"

 msgid "Custom Smiley Manager"
-msgstr ""
-
-#, fuzzy
+msgstr "自定义表情管理器"
+
 msgid "Select Buddy Icon"
-msgstr "选择好友"
+msgstr "选择好友图标"

 msgid "Click to change your buddyicon for this account."
 msgstr "点此修改当前账户所用图标。"
@@ -12823,21 +12555,20 @@
 msgstr "新状态..."

 msgid "Saved statuses..."
-msgstr "已存状态"
-
-#, fuzzy
+msgstr "已存状态..."
+
 msgid "Status Selector"
-msgstr "状态文本"
+msgstr "状态选择器"

 msgid "Google Talk"
 msgstr "Google Talk"

 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "装入 %s 时发生了下列错误: %s。"
+msgstr "载入 %s 时发生了下列错误: %s。"

 msgid "Failed to load image"
-msgstr "装入图像失败"
+msgstr "载入图像失败"

 #, c-format
 msgid "Cannot send folder %s."
@@ -12888,7 +12619,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."
@@ -12923,11 +12653,10 @@
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "装入图像“%s”失败：原因位置，可能是图像文件已损坏"
-
-#, fuzzy
+msgstr "载入图像“%s”失败：原因位置，可能是图像文件已损坏"
+
 msgid "_Open Link"
-msgstr "打开链接(_O)："
+msgstr "打开链接(_O)"

 msgid "_Copy Link Location"
 msgstr "复制链接地址(_C)"
@@ -12935,9 +12664,21 @@
 msgid "_Copy Email Address"
 msgstr "复制电子邮件地址(_C)"

+msgid "_Open File"
+msgstr "打开文件..."
+
+msgid "Open _Containing Directory"
+msgstr "聊天记录目录"
+
 msgid "Save File"
 msgstr "保存文件"

+msgid "_Play Sound"
+msgstr "播放声音"
+
+msgid "_Save File"
+msgstr "保存文件"
+
 msgid "Select color"
 msgstr "选择颜色"

@@ -13025,77 +12766,6 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr ""

-#, fuzzy
-msgid "Server name request"
-msgstr "服务器地址"
-
-#, fuzzy
-msgid "Enter an XMPP Server"
-msgstr "进入会议服务器"
-
-#, fuzzy
-msgid "Select an XMPP server to query"
-msgstr "选择要查询的会议服务器"
-
-#, fuzzy
-msgid "Find Services"
-msgstr "在线服务"
-
-#, fuzzy
-msgid "Add to Buddy List"
-msgstr "发送好友列表"
-
-#, fuzzy
-msgid "Gateway"
-msgstr "离开"
-
-#, fuzzy
-msgid "Directory"
-msgstr "日志目录"
-
-#, fuzzy
-msgid "PubSub Collection"
-msgstr "声音选择"
-
-msgid "PubSub Leaf"
-msgstr ""
-
-#, fuzzy
-msgid ""
-"\n"
-"<b>Description:</b> "
-msgstr "描述"
-
-#. Create the window.
-#, fuzzy
-msgid "Service Discovery"
-msgstr "服务目录信息"
-
-#, fuzzy
-msgid "_Browse"
-msgstr "浏览器(_B)："
-
-#, fuzzy
-msgid "Server does not exist"
-msgstr "用户不存在"
-
-#, fuzzy
-msgid "Server does not support service discovery"
-msgstr "服务器未使用任何支持的身份验证方法"
-
-#, fuzzy
-msgid "XMPP Service Discovery"
-msgstr "服务目录信息"
-
-msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr "此插件用于调试 XMPP 服务器或客户端。"
-
 msgid "Buddy is idle"
 msgstr "好友正发呆"

@@ -13182,6 +12852,67 @@
 msgid "Apply in IMs"
 msgstr "在对话中应用"

+# ## Forward to here.
+#. Note to translators: The string "Enter an XMPP Server" is asking the
+#. user to type the name of an XMPP server which will then be queried
+msgid "Server name request"
+msgstr "服务器地址"
+
+msgid "Enter an XMPP Server"
+msgstr "进入会议服务器"
+
+msgid "Select an XMPP server to query"
+msgstr "选择要查询的会议服务器"
+
+msgid "Find Services"
+msgstr "在线服务"
+
+msgid "Add to Buddy List"
+msgstr "发送好友列表"
+
+msgid "Gateway"
+msgstr "离开"
+
+msgid "Directory"
+msgstr "聊天记录目录"
+
+msgid "PubSub Collection"
+msgstr "声音选择"
+
+msgid "PubSub Leaf"
+msgstr ""
+
+msgid ""
+"\n"
+"<b>Description:</b> "
+msgstr ""
+"\n"
+"描述"
+
+#. Create the window.
+msgid "Service Discovery"
+msgstr "服务目录信息"
+
+msgid "_Browse"
+msgstr "浏览器(_B)："
+
+msgid "Server does not exist"
+msgstr "用户不存在"
+
+msgid "Server does not support service discovery"
+msgstr "服务器未使用任何支持的身份验证方法"
+
+msgid "XMPP Service Discovery"
+msgstr "服务目录信息"
+
+msgid "Allows browsing and registering services."
+msgstr ""
+
+msgid ""
+"This plugin is useful for registering with legacy transports or other XMPP "
+"services."
+msgstr "此插件用于调试 XMPP 服务器或客户端。"
+
 msgid "By conversation count"
 msgstr "按对话计数"

@@ -13270,7 +13001,7 @@

 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
-msgstr "下面是您的地址簿，请从中选择一个人，或者另外添加一个人。"
+msgstr "下面是您的通讯录，请从中选择一个人，或者另外添加一个人。"

 msgid "Group:"
 msgstr "组："
@@ -13287,7 +13018,7 @@
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
-msgstr "从您的地址簿中选择一个人可将其加为好友，您也可以创建一个新联系人。"
+msgstr "从您的通讯录中选择一个人可将其加为好友，您也可以创建一个新联系人。"

 #. Add the expander
 msgid "User _details"
@@ -13307,7 +13038,7 @@
 msgstr "此好友未发现电子邮件地址。"

 msgid "Add to Address Book"
-msgstr "添加到地址簿"
+msgstr "添加到通讯录"

 msgid "Send Email"
 msgstr "发送电子邮件"
@@ -13470,7 +13201,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."
@@ -13579,9 +13309,9 @@
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 "这个插件非常酷，它可以完成以下功能:\n"
-"- 在您登入后告诉您谁写的这个程序\n"
+"- 在您登录后告诉您谁写的这个程序\n"
 "- 颠倒所有收到的文本\n"
-"- 当您的好友登入后立即给他们发送信息"
+"- 当您的好友登录后立即给他们发送信息"

 msgid "Hyperlink Color"
 msgstr "超级链接颜色"
@@ -13589,11 +13319,9 @@
 msgid "Visited Hyperlink Color"
 msgstr "访问过的超级链接颜色"

-#, fuzzy
 msgid "Highlighted Message Name Color"
 msgstr "突出显示的消息"

-#, fuzzy
 msgid "Typing Notification Color"
 msgstr "通知删除"

@@ -13626,15 +13354,12 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ 文字快捷方式主题"

-#, fuzzy
 msgid "Disable Typing Notification Text"
 msgstr "新邮件通知"

-#, fuzzy
 msgid "GTK+ Theme Control Settings"
 msgstr "Pidgin GTK+ 主题控制"

-#, fuzzy
 msgid "Colors"
 msgstr "关闭"

@@ -13675,7 +13400,7 @@

 #, c-format
 msgid "You can upgrade to %s %s today."
-msgstr ""
+msgstr "您今天可以升级到 %s %s 。"

 msgid "New Version Available"
 msgstr "新版本可用"
@@ -13724,7 +13449,6 @@
 msgstr "对话窗口的发送按钮"

 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -13779,94 +13503,79 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "根据用户自定义的规则替换寄出消息中的文字。"

-#, fuzzy
 msgid "Just logged in"
-msgstr "未登入"
-
-#, fuzzy
+msgstr "未登录"
+
 msgid "Just logged out"
-msgstr "未登入"
+msgstr "未登录"

 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""

-#, fuzzy
 msgid "Icon for Chat"
 msgstr "加入聊天"

-#, fuzzy
 msgid "Ignored"
 msgstr "忽略"

-#, fuzzy
 msgid "Founder"
 msgstr "较大"

-#, fuzzy
+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "Opera"

+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr ""

-#, fuzzy
 msgid "Authorization dialog"
 msgstr "给出的认证"

-#, fuzzy
 msgid "Error dialog"
 msgstr "错误 "

-#, fuzzy
 msgid "Information dialog"
 msgstr "信息"

 msgid "Mail dialog"
 msgstr ""

-#, fuzzy
 msgid "Question dialog"
 msgstr "请求对话框"

-#, fuzzy
 msgid "Warning dialog"
 msgstr "警告级别"

 msgid "What kind of dialog is this?"
 msgstr ""

-#, fuzzy
 msgid "Status Icons"
-msgstr "%s 的状态"
-
-#, fuzzy
+msgstr "状态图标"
+
 msgid "Chatroom Emblems"
-msgstr "聊天房间语系"
-
-#, fuzzy
+msgstr "聊天聊天室语系"
+
 msgid "Dialog Icons"
 msgstr "保存图标"

-#, fuzzy
 msgid "Pidgin Icon Theme Editor"
 msgstr "Pidgin GTK+ 主题控制"

-#, fuzzy
 msgid "Contact"
 msgstr "联系信息"

-#, fuzzy
 msgid "Pidgin Buddylist Theme Editor"
 msgstr "好友列表"

-#, fuzzy
 msgid "Edit Buddylist Theme"
 msgstr "好友列表"

 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "编辑图标主题"

 #. *< type
 #. *< ui_requirement
@@ -13875,14 +13584,12 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
 msgstr "Pidgin GTK+ 主题控制"

 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
 msgstr "Pidgin GTK+ 主题控制"

@@ -13944,7 +13651,7 @@
 msgstr "对迟发的消息和聊天"

 msgid "_Message Logs:"
-msgstr "消息日志(_M)："
+msgstr "消息聊天记录(_M)："

 #. *< type
 #. *< ui_requirement
@@ -13965,7 +13672,59 @@
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
-msgstr "此插件允许用户自定义会话和日志消息的时间戳格式。"
+msgstr "此插件允许用户自定义会话和聊天记录消息的时间戳格式。"
+
+#, fuzzy
+msgid "Audio"
+msgstr "自动"
+
+#, fuzzy
+msgid "Video"
+msgstr "视频"
+
+msgid "Output"
+msgstr ""
+
+#, fuzzy
+msgid "_Plugin"
+msgstr "插件"
+
+#, fuzzy
+msgid "_Device"
+msgstr "设备"
+
+msgid "Input"
+msgstr ""
+
+#, fuzzy
+msgid "P_lugin"
+msgstr "插件"
+
+#, fuzzy
+msgid "D_evice"
+msgstr "设备"
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "Voice/Video Settings"
+msgstr "编辑设置"
+
+#. *< name
+#. *< version
+msgid "Configure your microphone and webcam."
+msgstr ""
+
+#. *< summary
+msgid "Configure microphone and webcam settings for voice/video calls."
+msgstr ""

 msgid "Opacity:"
 msgstr "不透明度："
@@ -14050,7 +13809,6 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Pidgin for Windows 特定的选项。"

-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr "提供 Pidgin for Windows 特定的选项，比如好友列表停靠。"
@@ -14092,6 +13850,89 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "此插件用于调试 XMPP 服务器或客户端。"

+#~ msgid "Calling ... "
+#~ msgstr "正在呼叫..."
+
+#~ msgid "Invalid certificate chain"
+#~ msgstr "无效的标题"
+
+#~ msgid "Join/Part Hiding Configuration"
+#~ msgstr "加入/离开隐藏配置"
+
+#~ msgid "User Inactivity Timeout (in minutes)"
+#~ msgstr "用户非活跃超时(以分钟计)"
+
+#~ msgid "Your account is locked, please log in to the Yahoo! website."
+#~ msgstr "您的账户已锁定，请登录到 Yahoo! 网站。"
+
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
+#~ "im\">support@pidgin.im</A><BR/><BR/>"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  --display=DISPLAY   X display to use\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "用法: %s [选项]...\n"
+#~ "\n"
+#~ "  -c, --config=目录\t使用指定目录存储配置文件\n"
+#~ "  -d, --debug\t\t将调试信息输出到标准输出\n"
+#~ "  -f, --force-online\t强制为在线状态而不顾网络状态\n"
+#~ "  -h, --help\t\t显示帮助并退出\n"
+#~ "  -m, --multiple\t不确认单个事例\n"
+#~ "  -n, --nologin\t不自动登录\n"
+#~ "  -l, --login[=名称]\t自动登录(可选“名称”指定要使用的账户，用逗号分隔)\n"
+#~ "  --display=DISPLAY\t要使用的 X 显示\n"
+#~ "  -v, --version\t显示当前版本并退出\n"
+
+#~ msgid ""
+#~ "%s %s\n"
+#~ "Usage: %s [OPTION]...\n"
+#~ "\n"
+#~ "  -c, --config=DIR    use DIR for config files\n"
+#~ "  -d, --debug         print debugging messages to stdout\n"
+#~ "  -f, --force-online  force online, regardless of network status\n"
+#~ "  -h, --help          display this help and exit\n"
+#~ "  -m, --multiple      do not ensure single instance\n"
+#~ "  -n, --nologin       don't automatically login\n"
+#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
+#~ "NAME\n"
+#~ "                      specifies account(s) to use, separated by commas.\n"
+#~ "                      Without this only the first account will be "
+#~ "enabled).\n"
+#~ "  -v, --version       display the current version and exit\n"
+#~ msgstr ""
+#~ "%s %s\n"
+#~ "用法: %s [选项]...\n"
+#~ "\n"
+#~ "  -c, --config=目录\t使用指定目录存储配置文件\n"
+#~ "  -d, --debug\t\t将调试信息输出到标准输出\n"
+#~ "  -f, --force-online\t强制为在线状态而不顾网络状态\n"
+#~ "  -h, --help\t\t显示帮助并退出\n"
+#~ "  -m, --multiple\t不确认单个事例\n"
+#~ "  -n, --nologin\t不自动登录\n"
+#~ "  -l, --login[=名称]\t自动登录(可选“名称”指定要使用的账户，用逗号分隔)\n"
+#~ "  --display=DISPLAY\t要使用的 X 显示\n"
+#~ "  -v, --version\t显示当前版本并退出\n"
+
 #~ msgid "Cannot open socket"
 #~ msgstr "无法打开套接字"

@@ -14187,41 +14028,35 @@

 #, fuzzy
 #~ msgid "Roster Item Exchange"
-#~ msgstr "带密钥交换开聊"
-
-#, fuzzy
+#~ msgstr "带密钥交换聊天"
+
 #~ msgid "Reachability Address"
-#~ msgstr "电子邮件地址"
+#~ msgstr "可用地址"

 #~ msgid "User Profile"
 #~ msgstr "用户资料"

-#, fuzzy
 #~ msgid "Jingle"
-#~ msgstr "加入"
+#~ msgstr "Jingle"

 #~ msgid "User Nickname"
 #~ msgstr "用户昵称"

-#, fuzzy
 #~ msgid "Jingle Video"
-#~ msgstr "实时视频"
+#~ msgstr "Jingle 视频"

 #, fuzzy
 #~ msgid "Message Receipts"
 #~ msgstr "消息已收到"

-#, fuzzy
 #~ msgid "Public Key Publishing"
-#~ msgstr "公钥漏印"
-
-#, fuzzy
+#~ msgstr "公钥发布"
+
 #~ msgid "User Chatting"
-#~ msgstr "用户选项"
-
-#, fuzzy
+#~ msgstr "用户聊天"
+
 #~ msgid "User Browsing"
-#~ msgstr "用户模式"
+#~ msgstr "用户浏览"

 #, fuzzy
 #~ msgid "User Gaming"
@@ -14231,27 +14066,36 @@
 #~ msgid "User Viewing"
 #~ msgstr "允许限制"

-#, fuzzy
 #~ msgid "Stanza Encryption"
-#~ msgstr "Trillian 加密"
+#~ msgstr "Stanza 加密"
+
+#~ msgid "Delayed Delivery"
+#~ msgstr "投递延迟"
+
+#~ msgid "Hop Check"
+#~ msgstr "跃点检查"

 #~ msgid "Read Error"
 #~ msgstr "读取错误"

+#, fuzzy
+#~ msgid "Malformed BOSH Connect Server"
+#~ msgstr "连接到服务器失败。"
+
+#~ msgid "Failed to open the file"
+#~ msgstr "打开文件失败"
+
 #~ msgid "Failed to connect to server."
 #~ msgstr "连接到服务器失败。"

-#, fuzzy
 #~ msgid "Read buffer full (2)"
-#~ msgstr "队列满"
-
-#, fuzzy
+#~ msgstr "读取缓冲区已满 (2)"
+
 #~ msgid "Unparseable message"
-#~ msgstr "无法处理消息"
-
-#, fuzzy
+#~ msgstr "无法解析消息"
+
 #~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "无法连接到主机"
+#~ msgstr "无法连接到主机：%s (%d)"

 #~ msgid "Login failed (%s)."
 #~ msgstr "登录失败(%s)。"
@@ -14282,13 +14126,11 @@
 #~ msgid "Could Not Connect"
 #~ msgstr "无法连接"

-#, fuzzy
 #~ msgid "Could not decrypt server reply"
-#~ msgstr "无法获取服务器信息"
-
-#, fuzzy
+#~ msgstr "无法解密服务器回复"
+
 #~ msgid "Invalid username."
-#~ msgstr "名称无效"
+#~ msgstr "无效的用户名。"

 #~ msgid "Connection lost"
 #~ msgstr "连接丢失"
@@ -14320,9 +14162,8 @@
 #~ msgid "Could not resolve hostname"
 #~ msgstr "无法解析主机名"

-#, fuzzy
 #~ msgid "Incorrect Password"
-#~ msgstr "密码不对"
+#~ msgstr "密码错误"

 #, fuzzy
 #~ msgid ""
@@ -14342,6 +14183,13 @@
 #~ msgstr "日本文件传送服务器"

 #~ msgid ""
+#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
+#~ msgstr "%s 拒绝您加入聊天室“%s”的会议邀请，原因为“%s”。"
+
+#~ msgid "Invitation Rejected"
+#~ msgstr "邀请已拒绝"
+
+#~ msgid ""
 #~ "Lost connection with server\n"
 #~ "%s"
 #~ msgstr ""
@@ -14351,11 +14199,16 @@
 #~ 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 支持。"
+#~ msgstr "无法连接到 %s：服务器需要 TLS/SSL 才能登录。未找到 TLS/SSL 支持。"
+
+#~ msgid "_Proxy"
+#~ msgstr "代理(_P)"
+
+#~ msgid "_Resume"
+#~ msgstr "继续(_R)"

 #~ msgid "Conversation Window Hiding"
 #~ msgstr "对话窗口隐藏"
@@ -14390,7 +14243,7 @@

 #, fuzzy
 #~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "选择 Notes 地址簿"
+#~ msgstr "选择 Notes 通讯录"

 #~ msgid ""
 #~ "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -14443,7 +14296,7 @@
 #~ msgstr "消息太长，最后 %s 字节被截断。"

 #~ msgid "%s not currently logged in."
-#~ msgstr "%s 目前未登入。"
+#~ msgstr "%s 目前未登录。"

 #~ msgid "Warning of %s not allowed."
 #~ msgstr "不允许对 %s 发出警告。"
@@ -14502,7 +14355,7 @@
 #~ 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 "
@@ -14512,9 +14365,6 @@
 #~ "您连接和断开得太频繁。请等十分钟，然后再试一次。如果您继续重试，您等的时间"
 #~ "可能会更长。"

-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "发生了未知登入错误: %s。"
-
 #~ msgid "An unknown error, %d, has occurred.  Info: %s"
 #~ msgstr "发生了未知错误 %d。信息: %s"

@@ -14574,7 +14424,7 @@
 #~ msgstr "代理选项"

 #~ msgid "By log size"
-#~ msgstr "按日志大小"
+#~ msgstr "按聊天记录大小"

 #~ msgid "_Open Link in Browser"
 #~ msgstr "在浏览器中打开链接(_O)"
@@ -14625,7 +14475,7 @@

 #, fuzzy
 #~ msgid "Add into %d's buddy list"
-#~ msgstr "无法装入好友列表"
+#~ msgstr "无法载入好友列表"

 #, fuzzy
 #~ msgid "QQ Number Error"
@@ -14899,7 +14749,7 @@
 #~ msgstr "输入您的原因："

 #~ msgid "Unable to login, check debug log"
-#~ msgstr "无法登录，请检查调试日志"
+#~ msgstr "无法登录，请检查调试聊天记录"

 #~ msgid "TCP Address"
 #~ msgstr "TCP 地址"