Mercurial > pidgin.yaz

--- a/ChangeLog	Sun Aug 16 23:25:38 2009 +0000
+++ b/ChangeLog	Sun Aug 16 23:25:51 2009 +0000
@@ -47,6 +47,8 @@
 	* Various memory leaks fixed as reported by Josh Mueller.
 	* Properly handle an IRC buddy appearing in multiple groups.
 	* Escape HTML entities in usernames when written with the HTML logger.
+	* Do not display MySpace status changes as incoming IMs.  (Mark Doliner and
+	  Justin Williams)

 	AIM and ICQ:
 	* Preliminary support for a new authentication scheme called
@@ -190,6 +192,8 @@
 	* The hardware cursor is updated correctly. This will be useful
 	  especially for users of braille terminals, screen readers etc.
 	* Added a TinyURL plugin, which aids copying longer URLs.
+	* Fixed UTF-8 compatibility problems which could cause exits or other
+	  unrequested behaviour.

 	Pidgin GTK+ Theme Control Plugin:
 	* Removed mouse cursor color preferences.
--- a/ChangeLog.API	Sun Aug 16 23:25:38 2009 +0000
+++ b/ChangeLog.API	Sun Aug 16 23:25:51 2009 +0000
@@ -18,6 +18,9 @@
 		* Three Blist UI ops used to overload libpurple's built-in saving
 		  of the buddy list to blist.xml. If a UI implements these, it probably
 		  wants to add the buddies itself and not call purple_blist_load.
+		* Three File Transfer UI ops used to overload libpurple's use of fread
+		  and fwrite for saving a file locally. These allow a UI to stream a
+		  file through a socket without buffering the file on the local disk.
 		* Jabber plugin signals (see jabber-signals.dox)
 		* purple_account_remove_setting
 		* purple_buddy_destroy
@@ -65,6 +68,8 @@
 		* purple_strequal
 		* purple_utf8_strip_unprintables
 		* purple_util_fetch_url_request_len_with_account
+		* purple_xfer_prpl_ready
+		* purple_xfer_ui_ready
 		* xmlnode_from_file
 		* xmlnode_get_parent
 		* xmlnode_set_attrib_full
@@ -95,6 +100,10 @@
 		* status is set before emitting signals in purple_xfer_set_status.
 		* Creating multiple distinct chats with the same name (i.e. "MSN Chat")
 		  is deprecated and will be removed in libpurple 3.0.0.
+		* purple_xfer_start now accepts -1 as the fd parameter if the protocol
+		  plugin will administer the transfer itself. 0 is still accepted for
+		  backward compatibility since older versions of libpurple will not
+		  accept -1.

 		Deprecated:
 		* buddy-added and buddy-removed blist signals
--- a/INSTALL	Sun Aug 16 23:25:38 2009 +0000
+++ b/INSTALL	Sun Aug 16 23:25:51 2009 +0000
@@ -158,7 +158,7 @@

 	`--with-dynamic-prpls' takes a list of comma separated protocols also.  If used only those listed will be built.  If no protocols are listed with either `--with-static-prpls' or with `--with-dynamic-prpls' then Pidgin and Finch will be effectively useless.

-	If configure does not find python, it will build without DBUS support.  Thiswill disable scripts such as purple-remote and purple-uri-handler, effectively disabling integration with the browser.  You can tell configure where your python binary is located with `--with-python=PATH'
+	If configure does not find python, it will build without DBUS support.  This will disable scripts such as purple-remote and purple-uri-handler, effectively disabling integration with the browser.  You can tell configure where your python binary is located with `--with-python=PATH'

 Specifying the System Type
 ==========================
--- a/doc/core-signals.dox	Sun Aug 16 23:25:38 2009 +0000
+++ b/doc/core-signals.dox	Sun Aug 16 23:25:51 2009 +0000
@@ -2,6 +2,7 @@

  @signals
   @signal quitting
+  @signal uri-handler
  @endsignals

  @see core.h
@@ -16,5 +17,16 @@
    Emitted when libpurple is quitting.
  @endsignaldef

+ @signaldef uri-handler
+  @signalproto
+gboolean (*uri_handler)(const gchar *proto, const gchar *cmd, GHashTable *params);
+  @endsignalproto
+  @signaldesc
+   Emitted when handling a registered URI.
+  @param proto The protocol of the URI.
+  @param cmd The 'command' of the URI.
+  @param params Any key/value parameters from the URI.
+ @endsignaldef
+
  */
 // vim: syntax=c.doxygen tw=75 et
--- a/doc/funniest_home_convos.txt	Sun Aug 16 23:25:38 2009 +0000
+++ b/doc/funniest_home_convos.txt	Sun Aug 16 23:25:51 2009 +0000
@@ -572,3 +572,42 @@
 15:46 <khc> well, there was a Grand Smiley Theme Database
 15:47 <SimGuy> the GSTD sounds like a bad acronym
 15:47 <khc> I realized after typing that
+
+--
+
+(01:51:38 AM) user entered the room.
+(01:52:46 AM) user: .addKeyActionListener(new KeyActionListener() onKeyPress() {if (event.geyKeyPresss().equals(Key.UP_ARROW) { inputbox.text = history.pop() }}}}}}});
+(01:52:51 AM) user: THERE, FOR **** SAKE
+(01:52:53 AM) user: its 2009
+(01:53:06 AM) user: oh wait. ctrl up works
+(01:53:07 AM) user: lol
+(01:53:11 AM) user: yey me
+(01:53:16 AM) user left the room.
+(01:55:31 AM) darkrain42: Wow.
+(01:58:15 AM) QuLogic: I think he failed to realize we'd have to re-write pidgin in java to do that
+(01:59:44 AM) khc: history.pop() is clearly wrong too
+
+--
+
+Some time later:
+(02:41:55 AM) user entered the room.
+(02:42:24 AM) user: didn't I read some idiot post, about 2 years ago, before pidgin was renamed / forked, over one dev refusing to make minimize on close?
+(02:43:12 AM) QuLogic: I see you've learned to at least ask a question before jumping to random conclusions
+(02:44:01 AM) user: QuLogic: :-))))))))))))))))))))))
+(02:44:12 AM) user: hey, I submitted a code patch!
+(02:44:36 AM) user: now, anyway, what happened? why did I get the buddy list (empty) stealing focus, and why did it exit on close?
+(02:44:40 AM) QuLogic: it's not really a patch if it's in the wrong language
+(02:44:42 AM) user: I've had this argument before, in 2006
+(02:44:55 AM) user: QuLogic: simple, rewrite the rest ;-)
+(02:44:58 AM) khc: pidgin never steals focus
+(02:45:10 AM) khc: if it exit on close, it's because you didn't turn on the systray icon
+(02:47:17 AM) user: khc - and that isn't default... why? anyway. I recall something on the matter, and I think this was the project (pre-fork?) or is this the unforked, renamed? I forget.
+(02:47:42 AM) user: Whoever it was arguing about it (and font sizes I believe) was an idiot... not one of you I suppose, just making idle chit chat.
+(02:47:43 AM) user: thanks
+(02:47:48 AM) darkrain42: It is on by default. Some distros change that.
+(02:48:00 AM) darkrain42: And I don't even know what you're arguing about at this point.
+(02:48:11 AM) user: ... /leave - That command doesn't work on this protocol... /leave #pidgin ...That comm..... :-(((
+(02:48:18 AM) user: darkrain42: now arguing, just remembering something
+(02:48:27 AM) user left the room.
+(02:49:04 AM) darkrain42: Wow. (again)
+
--- a/doc/jabber-signals.dox	Sun Aug 16 23:25:38 2009 +0000
+++ b/doc/jabber-signals.dox	Sun Aug 16 23:25:51 2009 +0000
@@ -8,6 +8,7 @@
   @signal jabber-register-namespace-watcher
   @signal jabber-unregister-namespace-watcher
   @signal jabber-sending-xmlnode
+  @signal jabber-receiving-xmlnode
  @endsignals

  <hr>
@@ -71,7 +72,7 @@

  @signaldef jabber-watched-iq
   @signalproto
-gboolean (*watched_iq)(PurpleConnection *pc, const char *type, const char *id,
+gboolean (*watched_iq)(PurpleConnection *gc, const char *type, const char *id,
                        const char *from, xmlnode *child);
   @endsignalproto
   @signaldesc
@@ -87,18 +88,6 @@
           process it. FALSE otherwise.
  @endsignaldef

- @signaldef jabber-sending-xmlnode
-  @signalproto
-void (sending_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
-  @endsignalproto
-  @signaldesc
-   Emit this signal (@c purple_signal_emit) to send a stanza. It is preferred
-   to use this instead of prpl_info->send_raw.
-   @param gc      The connectoin on which to send the stanza.
-   @param stanza  The stanza to send. If stanza is not NULL after being sent,
-                  the emitter should free it.
- @endsignaldef
-
  @signaldef jabber-register-namespace-watcher
   @signalproto
 void (register_namespace_watcher)(const char *node, const char *namespace);
@@ -121,5 +110,29 @@
   @param namespace The IQ child namespace to no longer watch.
  @endsignaldef

+ @signaldef jabber-sending-xmlnode
+  @signalproto
+void (sending_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+  @endsignalproto
+  @signaldesc
+   Emit this signal (@c purple_signal_emit) to send a stanza. It is preferred
+   to use this instead of prpl_info->send_raw.
+   @param gc      The connection on which to send the stanza.
+   @param stanza  The stanza to send. If stanza is not NULL after being sent,
+                  the emitter should free it.
+ @endsignaldef
+
+ @signaldef jabber-receiving-xmlnode
+  @signalproto
+void (receiving_xmlnode)(PurpleConnection *gc, xmlnode **stanza);
+  @endsignalproto
+  @signaldesc
+   Emitted when an XMPP stanza is received. Allows a plugin to process any
+   stanza.
+   @param gc     The connection on which the stanza was received.
+   @param stanza The received stanza. Set stanza to NULL (and free it) to
+                 stop processing the stanza.
+ @endsignaldef
+
 */
 // vim: syntax=c.doxygen tw=75 et
--- a/finch/libgnt/gntkeys.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/finch/libgnt/gntkeys.c	Sun Aug 16 23:25:51 2009 +0000
@@ -166,7 +166,7 @@
 				strstr(term, "xterm") == term ||
 				strstr(term, "vt100") == term)
 			*(text + 1) = 'O';
-	} else if (*(unsigned char*)text == 195) {
+	} else if (g_utf8_get_char(text) == 195) {
 		if (*(text + 2) == 0 && strstr(term, "xterm") == term) {
 			*(text) = 27;
 			*(text + 1) -= 64;  /* Say wha? */
--- a/libpurple/ft.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/ft.c	Sun Aug 16 23:25:51 2009 +0000
@@ -40,8 +40,35 @@
 static PurpleXferUiOps *xfer_ui_ops = NULL;
 static GList *xfers;

+/*
+ * A hack to store more data since we can't extend the size of PurpleXfer
+ * easily.
+ */
+static GHashTable *xfers_data = NULL;
+
+typedef struct _PurpleXferPrivData {
+	/*
+	 * Used to moderate the file transfer when either the read/write ui_ops are
+	 * set or fd is not set. In those cases, the UI/prpl call the respective
+	 * function, which is somewhat akin to a fd watch being triggered.
+	 */
+	enum {
+		PURPLE_XFER_READY_NONE = 0x0,
+		PURPLE_XFER_READY_UI   = 0x1,
+		PURPLE_XFER_READY_PRPL = 0x2,
+	} ready;
+} PurpleXferPrivData;
+
 static int purple_xfer_choose_file(PurpleXfer *xfer);

+static void
+purple_xfer_priv_data_destroy(gpointer data)
+{
+	PurpleXferPrivData *priv = data;
+
+	g_free(priv);
+}
+
 GList *
 purple_xfers_get_all()
 {
@@ -53,6 +80,7 @@
 {
 	PurpleXfer *xfer;
 	PurpleXferUiOps *ui_ops;
+	PurpleXferPrivData *priv;

 	g_return_val_if_fail(type    != PURPLE_XFER_UNKNOWN, NULL);
 	g_return_val_if_fail(account != NULL,              NULL);
@@ -70,6 +98,11 @@
 	xfer->current_buffer_size = FT_INITIAL_BUFFER_SIZE;
 	xfer->fd = -1;

+	priv = g_new0(PurpleXferPrivData, 1);
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	g_hash_table_insert(xfers_data, xfer, priv);
+
 	ui_ops = purple_xfer_get_ui_ops(xfer);

 	if (ui_ops != NULL && ui_ops->new_xfer != NULL)
@@ -102,9 +135,11 @@
 	g_free(xfer->remote_ip);
 	g_free(xfer->local_filename);

+	g_hash_table_remove(xfers_data, xfer);
+
 	PURPLE_DBUS_UNREGISTER_POINTER(xfer);
+	xfers = g_list_remove(xfers, xfer);
 	g_free(xfer);
-	xfers = g_list_remove(xfers, xfer);
 }

 void
@@ -482,13 +517,16 @@
 	if (type == PURPLE_XFER_SEND) {
 		/* Sending a file */
 		/* Check the filename. */
+		PurpleXferUiOps *ui_ops;
+		ui_ops = purple_xfer_get_ui_ops(xfer);
+
 #ifdef _WIN32
 		if (g_strrstr(filename, "../") || g_strrstr(filename, "..\\"))
 #else
 		if (g_strrstr(filename, "../"))
 #endif
 		{
-			char *utf8 = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);
+			utf8 = g_filename_to_utf8(filename, -1, NULL, NULL, NULL);

 			msg = g_strdup_printf(_("%s is not a valid filename.\n"), utf8);
 			purple_xfer_error(type, account, xfer->who, msg);
@@ -499,15 +537,20 @@
 			return;
 		}

-		if (g_stat(filename, &st) == -1) {
-			purple_xfer_show_file_error(xfer, filename);
-			purple_xfer_unref(xfer);
-			return;
+		if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+			if (g_stat(filename, &st) == -1) {
+				purple_xfer_show_file_error(xfer, filename);
+				purple_xfer_unref(xfer);
+				return;
+			}
+
+			purple_xfer_set_local_filename(xfer, filename);
+			purple_xfer_set_size(xfer, st.st_size);
+		} else {
+			utf8 = g_strdup(filename);
+			purple_xfer_set_local_filename(xfer, filename);
 		}

-		purple_xfer_set_local_filename(xfer, filename);
-		purple_xfer_set_size(xfer, st.st_size);
-
 		base = g_path_get_basename(filename);
 		utf8 = g_filename_to_utf8(base, -1, NULL, NULL, NULL);
 		g_free(base);
@@ -516,7 +559,6 @@
 		msg = g_strdup_printf(_("Offering to send %s to %s"),
 				utf8, buddy ? purple_buddy_get_alias(buddy) : xfer->who);
 		g_free(utf8);
-
 		purple_xfer_conversation_write(xfer, msg, FALSE);
 		g_free(msg);
 	}
@@ -884,9 +926,6 @@

 	if (xfer->ops.read != NULL)	{
 		r = (xfer->ops.read)(buffer, xfer);
-		if ((purple_xfer_get_size(xfer) > 0) &&
-			((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
-			purple_xfer_set_completed(xfer, TRUE);
 	}
 	else {
 		*buffer = g_malloc0(s);
@@ -896,9 +935,6 @@
 			r = 0;
 		else if (r < 0)
 			r = -1;
-		else if ((purple_xfer_get_size(xfer) > 0) &&
-			((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
-			purple_xfer_set_completed(xfer, TRUE);
 		else if (r == 0)
 			r = -1;
 	}
@@ -939,29 +975,39 @@
 }

 static void
-transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
+do_transfer(PurpleXfer *xfer)
 {
 	PurpleXferUiOps *ui_ops;
-	PurpleXfer *xfer = (PurpleXfer *)data;
 	guchar *buffer = NULL;
 	gssize r = 0;

-	if (condition & PURPLE_INPUT_READ) {
+	ui_ops = purple_xfer_get_ui_ops(xfer);
+
+	if (xfer->type == PURPLE_XFER_RECEIVE) {
 		r = purple_xfer_read(xfer, &buffer);
 		if (r > 0) {
-			const size_t wc = fwrite(buffer, 1, r, xfer->dest_fp);
+			size_t wc;
+			if (ui_ops && ui_ops->ui_write)
+				wc = ui_ops->ui_write(xfer, buffer, r);
+			else
+				wc = fwrite(buffer, 1, r, xfer->dest_fp);
+
 			if (wc != r) {
 				purple_debug_error("filetransfer", "Unable to write whole buffer.\n");
 				purple_xfer_cancel_local(xfer);
 				g_free(buffer);
 				return;
 			}
+
+			if ((purple_xfer_get_size(xfer) > 0) &&
+				((purple_xfer_get_bytes_sent(xfer)+r) >= purple_xfer_get_size(xfer)))
+				purple_xfer_set_completed(xfer, TRUE);
 		} else if(r < 0) {
 			purple_xfer_cancel_remote(xfer);
 			g_free(buffer);
 			return;
 		}
-	} else if (condition & PURPLE_INPUT_WRITE) {
+	} else if (xfer->type == PURPLE_XFER_SEND) {
 		size_t result;
 		size_t s = MIN(purple_xfer_get_bytes_remaining(xfer), xfer->current_buffer_size);

@@ -975,26 +1021,53 @@
 			return;
 		}

-		buffer = g_malloc0(s);
+		if (ui_ops && ui_ops->ui_read) {
+			gssize tmp = ui_ops->ui_read(xfer, &buffer, s);
+			if (tmp == 0) {
+				/*
+				 * UI isn't ready to send data. It will call
+				 * purple_xfer_ui_ready when ready, which sets back up this
+				 * watcher.
+				 */
+				if (xfer->watcher != 0) {
+					purple_timeout_remove(xfer->watcher);
+					xfer->watcher = 0;
+				}

-		result = fread(buffer, 1, s, xfer->dest_fp);
-		if (result != s) {
-			purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
-			purple_xfer_cancel_remote(xfer);
-			g_free(buffer);
-			return;
+				return;
+			} else if (tmp < 0) {
+				purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
+				purple_xfer_cancel_local(xfer);
+				return;
+			}
+
+			result = tmp;
+		} else {
+			buffer = g_malloc0(s);
+			result = fread(buffer, 1, s, xfer->dest_fp);
+			if (result != s) {
+				purple_debug_error("filetransfer", "Unable to read whole buffer.\n");
+				purple_xfer_cancel_local(xfer);
+				g_free(buffer);
+				return;
+			}
 		}

 		/* Write as much as we're allowed to. */
-		r = purple_xfer_write(xfer, buffer, s);
+		r = purple_xfer_write(xfer, buffer, result);

 		if (r == -1) {
 			purple_xfer_cancel_remote(xfer);
 			g_free(buffer);
 			return;
-		} else if (r < s) {
-			/* We have to seek back in the file now. */
-			fseek(xfer->dest_fp, r - s, SEEK_CUR);
+		} else if (r < result) {
+			if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+				/* We have to seek back in the file now. */
+				fseek(xfer->dest_fp, r - s, SEEK_CUR);
+			}
+			else {
+				ui_ops->data_not_sent(xfer, buffer + r, result - r);
+			}
 		} else {
 			/*
 			 * We managed to write the entire buffer.  This means our
@@ -1016,8 +1089,6 @@

 		g_free(buffer);

-		ui_ops = purple_xfer_get_ui_ops(xfer);
-
 		if (ui_ops != NULL && ui_ops->update_progress != NULL)
 			ui_ops->update_progress(xfer,
 				purple_xfer_get_progress(xfer));
@@ -1028,22 +1099,45 @@
 }

 static void
+transfer_cb(gpointer data, gint source, PurpleInputCondition condition)
+{
+	PurpleXfer *xfer = data;
+
+	if (xfer->dest_fp == NULL) {
+		/* The UI is moderating its side manually */
+		PurpleXferPrivData *priv = g_hash_table_lookup(xfers_data, xfer);
+		if (0 == (priv->ready & PURPLE_XFER_READY_UI)) {
+			priv->ready |= PURPLE_XFER_READY_PRPL;
+
+			purple_input_remove(xfer->watcher);
+			xfer->watcher = 0;
+			return;
+		}
+	}
+
+	do_transfer(xfer);
+}
+
+static void
 begin_transfer(PurpleXfer *xfer, PurpleInputCondition cond)
 {
 	PurpleXferType type = purple_xfer_get_type(xfer);
+	PurpleXferUiOps *ui_ops = purple_xfer_get_ui_ops(xfer);

-	xfer->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer),
-						  type == PURPLE_XFER_RECEIVE ? "wb" : "rb");
+	if (ui_ops == NULL || (ui_ops->ui_read == NULL && ui_ops->ui_write == NULL)) {
+		xfer->dest_fp = g_fopen(purple_xfer_get_local_filename(xfer),
+		                        type == PURPLE_XFER_RECEIVE ? "wb" : "rb");

-	if (xfer->dest_fp == NULL) {
-		purple_xfer_show_file_error(xfer, purple_xfer_get_local_filename(xfer));
-		purple_xfer_cancel_local(xfer);
-		return;
+		if (xfer->dest_fp == NULL) {
+			purple_xfer_show_file_error(xfer, purple_xfer_get_local_filename(xfer));
+			purple_xfer_cancel_local(xfer);
+			return;
+		}
+
+		fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET);
 	}

-	fseek(xfer->dest_fp, xfer->bytes_sent, SEEK_SET);
-
-	if (xfer->fd)
+	if (xfer->fd != -1)
 		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);

 	xfer->start_time = time(NULL);
@@ -1068,6 +1162,54 @@
 }

 void
+purple_xfer_ui_ready(PurpleXfer *xfer)
+{
+	PurpleInputCondition cond;
+	PurpleXferType type;
+	PurpleXferPrivData *priv;
+
+	g_return_if_fail(xfer != NULL);
+
+	priv = g_hash_table_lookup(xfers_data, xfer);
+	priv->ready |= PURPLE_XFER_READY_UI;
+
+	if (0 == (priv->ready & PURPLE_XFER_READY_PRPL))
+		return;
+
+	type = purple_xfer_get_type(xfer);
+	if (type == PURPLE_XFER_SEND)
+		cond = PURPLE_INPUT_WRITE;
+	else /* if (type == PURPLE_XFER_RECEIVE) */
+		cond = PURPLE_INPUT_READ;
+
+	if (xfer->watcher == 0 && xfer->fd != -1)
+		xfer->watcher = purple_input_add(xfer->fd, cond, transfer_cb, xfer);
+
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	do_transfer(xfer);
+}
+
+void
+purple_xfer_prpl_ready(PurpleXfer *xfer)
+{
+	PurpleXferPrivData *priv;
+
+	g_return_if_fail(xfer != NULL);
+
+	priv = g_hash_table_lookup(xfers_data, xfer);
+	priv->ready |= PURPLE_XFER_READY_PRPL;
+
+	/* I don't think fwrite/fread are ever *not* ready */
+	if (xfer->dest_fp == NULL && 0 == (priv->ready & PURPLE_XFER_READY_UI))
+		return;
+
+	priv->ready = PURPLE_XFER_READY_NONE;
+
+	do_transfer(xfer);
+}
+
+void
 purple_xfer_start(PurpleXfer *xfer, int fd, const char *ip,
 				unsigned int port)
 {
@@ -1081,6 +1223,13 @@

 	purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_STARTED);

+	/*
+	 * FIXME 3.0.0 -- there's too much broken code depending on fd == 0
+	 * meaning "don't use a real fd"
+	 */
+	if (fd == 0)
+		fd = -1;
+
 	if (type == PURPLE_XFER_RECEIVE) {
 		cond = PURPLE_INPUT_READ;

@@ -1127,7 +1276,7 @@
 		xfer->watcher = 0;
 	}

-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);

 	if (xfer->dest_fp != NULL) {
@@ -1190,7 +1339,7 @@
 		xfer->watcher = 0;
 	}

-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);

 	if (xfer->dest_fp != NULL) {
@@ -1255,7 +1404,7 @@
 		xfer->watcher = 0;
 	}

-	if (xfer->fd != 0)
+	if (xfer->fd != -1)
 		close(xfer->fd);

 	if (xfer->dest_fp != NULL) {
@@ -1325,6 +1474,9 @@
 purple_xfers_init(void) {
 	void *handle = purple_xfers_get_handle();

+	xfers_data = g_hash_table_new_full(g_direct_hash, g_direct_equal,
+	                                   NULL, purple_xfer_priv_data_destroy);
+
 	/* register signals */
 	purple_signal_register(handle, "file-recv-accept",
 	                     purple_marshal_VOID__POINTER, NULL, 1,
@@ -1371,6 +1523,9 @@

 	purple_signals_disconnect_by_handle(handle);
 	purple_signals_unregister_by_instance(handle);
+
+	g_hash_table_destroy(xfers_data);
+	xfers_data = NULL;
 }

 void
--- a/libpurple/ft.h	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/ft.h	Sun Aug 16 23:25:51 2009 +0000
@@ -77,10 +77,50 @@
 	void (*cancel_local)(PurpleXfer *xfer);
 	void (*cancel_remote)(PurpleXfer *xfer);

+	/**
+	 * UI op to write data received from the prpl. The UI must deal with the
+	 * entire buffer and return size, or it is treated as an error.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  The buffer to write
+	 * @param size    The size of the buffer
+	 *
+	 * @return size if the write was successful, or a value between 0 and
+	 *         size on error.
+	 * @since 2.6.0
+	 */
+	gssize (*ui_write)(PurpleXfer *xfer, const guchar *buffer, gssize size);
+
+	/**
+	 * UI op to read data to send to the prpl for a file transfer.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  A pointer to a buffer. The UI must allocate this buffer.
+	 *                libpurple will free the data.
+	 * @param size    The maximum amount of data to put in the buffer.
+	 *
+	 * @returns The amount of data in the buffer, 0 if nothing is available,
+	 *          and a negative value if an error occurred and the transfer
+	 *          should be cancelled (libpurple will cancel).
+	 * @since 2.6.0
+	 */
+	gssize (*ui_read)(PurpleXfer *xfer, guchar **buffer, gssize size);
+
+	/**
+	 * Op to notify the UI that not all the data read in was written. The UI
+	 * should re-enqueue this data and return it the next time read is called.
+	 *
+	 * This MUST be implemented if read and write are implemented.
+	 *
+	 * @param xfer    The file transfer structure
+	 * @param buffer  A pointer to the beginning of the unwritten data.
+	 * @param size    The amount of unwritten data.
+	 *
+	 * @since 2.6.0
+	 */
+	void (*data_not_sent)(PurpleXfer *xfer, const guchar *buffer, gsize size);
+
 	void (*_purple_reserved1)(void);
-	void (*_purple_reserved2)(void);
-	void (*_purple_reserved3)(void);
-	void (*_purple_reserved4)(void);
 } PurpleXferUiOps;

 /**
@@ -132,7 +172,6 @@
 		gssize (*read)(guchar **buffer, PurpleXfer *xfer);
 		gssize (*write)(const guchar *buffer, size_t size, PurpleXfer *xfer);
 		void (*ack)(PurpleXfer *xfer, const guchar *buffer, size_t size);
-
 	} ops;

 	PurpleXferUiOps *ui_ops;            /**< UI-specific operations. */
@@ -548,6 +587,12 @@
  * file receive transfer. On send, @a fd must be specified, and
  * @a ip and @a port are ignored.
  *
+ * Prior to libpurple 2.6.0, passing '0' to @a fd was special-cased to
+ * allow the protocol plugin to facilitate the file transfer itself. As of
+ * 2.6.0, this is supported (for backward compatibility), but will be
+ * removed in libpurple 3.0.0. If a prpl detects that the running libpurple
+ * is running 2.6.0 or higher, it should use the invalid fd '-1'.
+ *
  * @param xfer The file transfer.
  * @param fd   The file descriptor for the socket.
  * @param ip   The IP address to connect to.
@@ -617,6 +662,28 @@
  */
 void purple_xfer_conversation_write(PurpleXfer *xfer, char *message, gboolean is_error);

+/**
+ * Allows the UI to signal it's ready to send/receive data (depending on
+ * the direction of the file transfer. Used when the UI is providing
+ * read/write/data_not_sent UI ops.
+ *
+ * @param xfer The file transfer which is ready.
+ *
+ * @since 2.6.0
+ */
+void purple_xfer_ui_ready(PurpleXfer *xfer);
+
+/**
+ * Allows the prpl to signal it's readh to send/receive data (depending on
+ * the direction of the file transfer. Used when the prpl provides read/write
+ * ops and cannot/does not provide a raw fd to the core.
+ *
+ * @param xfer The file transfer which is ready.
+ *
+ * @since 2.6.0
+ */
+void purple_xfer_prpl_ready(PurpleXfer *xfer);
+
 /*@}*/

 /**************************************************************************/
--- a/libpurple/media.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/media.c	Sun Aug 16 23:25:51 2009 +0000
@@ -1906,8 +1906,8 @@
 		gst_element_add_pad(session->media->priv->confbin, ghost);
 	}

+	gst_element_set_state(session->tee, GST_STATE_PLAYING);
 	gst_element_link(session->src, session->media->priv->confbin);
-	gst_element_set_state(session->tee, GST_STATE_PLAYING);

 	g_object_get(session->session, "sink-pad", &sinkpad, NULL);
 	if (session->type & PURPLE_MEDIA_SEND_AUDIO) {
@@ -1922,10 +1922,10 @@
 		g_free(name);
 		gst_bin_add(GST_BIN(session->media->priv->confbin), volume);
 		gst_bin_add(GST_BIN(session->media->priv->confbin), level);
-		gst_element_link(session->tee, volume);
-		gst_element_link(volume, level);
 		gst_element_set_state(level, GST_STATE_PLAYING);
 		gst_element_set_state(volume, GST_STATE_PLAYING);
+		gst_element_link(volume, level);
+		gst_element_link(session->tee, volume);
 		srcpad = gst_element_get_static_pad(level, "src");
 		g_object_set(volume, "volume", input_volume, NULL);
 	} else {
@@ -2463,12 +2463,13 @@
 			gst_bin_add(GST_BIN(priv->confbin), stream->volume);
 			gst_bin_add(GST_BIN(priv->confbin), stream->level);
 			gst_bin_add(GST_BIN(priv->confbin), sink);
+			gst_element_set_state(sink, GST_STATE_PLAYING);
+			gst_element_set_state(stream->level, GST_STATE_PLAYING);
+			gst_element_set_state(stream->volume, GST_STATE_PLAYING);
+			gst_element_set_state(queue, GST_STATE_PLAYING);
 			gst_element_link(stream->level, sink);
 			gst_element_link(stream->volume, stream->level);
 			gst_element_link(queue, stream->volume);
-			gst_element_sync_state_with_parent(sink);
-			gst_element_sync_state_with_parent(stream->level);
-			gst_element_sync_state_with_parent(stream->volume);
 			sink = queue;
 		} else if (codec->media_type == FS_MEDIA_TYPE_VIDEO) {
 			stream->src = gst_element_factory_make(
@@ -2477,13 +2478,13 @@
 					"fakesink", NULL);
 			g_object_set(G_OBJECT(sink), "async", FALSE, NULL);
 			gst_bin_add(GST_BIN(priv->confbin), sink);
+			gst_element_set_state(sink, GST_STATE_PLAYING);
 		}
 		stream->tee = gst_element_factory_make("tee", NULL);
 		gst_bin_add_many(GST_BIN(priv->confbin),
 				stream->src, stream->tee, NULL);
-		gst_element_sync_state_with_parent(sink);
-		gst_element_sync_state_with_parent(stream->tee);
-		gst_element_sync_state_with_parent(stream->src);
+		gst_element_set_state(stream->tee, GST_STATE_PLAYING);
+		gst_element_set_state(stream->src, GST_STATE_PLAYING);
 		gst_element_link_many(stream->src, stream->tee, sink, NULL);
 	}

@@ -2617,26 +2618,27 @@
 				0, PURPLE_MEDIA_STATE_NEW,
 				session->id, NULL);

-		session_type = purple_media_from_fs(media_type,
-				FS_DIRECTION_SEND);
-		src = purple_media_manager_get_element(
-				media->priv->manager, session_type,
-				media, session->id, who);
-		if (!GST_IS_ELEMENT(src)) {
-			purple_debug_error("media",
-					"Error creating src for session %s\n",
-					session->id);
-			purple_media_end(media, session->id, NULL);
-			return FALSE;
+		if (type_direction & FS_DIRECTION_SEND) {
+			session_type = purple_media_from_fs(media_type,
+					FS_DIRECTION_SEND);
+			src = purple_media_manager_get_element(
+					media->priv->manager, session_type,
+					media, session->id, who);
+			if (!GST_IS_ELEMENT(src)) {
+				purple_debug_error("media",
+						"Error creating src for session %s\n",
+						session->id);
+				purple_media_end(media, session->id, NULL);
+				return FALSE;
+			}
+
+			purple_media_set_src(media, session->id, src);
+			gst_element_set_state(session->src, GST_STATE_PLAYING);
+			purple_media_manager_create_output_window(
+					media->priv->manager,
+					session->media,
+					session->id, NULL);
 		}
-
-		purple_media_set_src(media, session->id, src);
-		gst_element_set_state(session->src, GST_STATE_PLAYING);
-
-		purple_media_manager_create_output_window(
-				media->priv->manager,
-				session->media,
-				session->id, NULL);
 	}

 	if (!(participant = purple_media_add_participant(media, who))) {
@@ -3002,14 +3004,23 @@

 		if (session == NULL)
 			return FALSE;
-
-		g_object_get(session->session, "codecs-ready", &ret, NULL);
+		if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
+				PURPLE_MEDIA_SEND_VIDEO))
+			g_object_get(session->session,
+					"codecs-ready", &ret, NULL);
+		else
+			ret = TRUE;
 	} else {
 		GList *values = g_hash_table_get_values(media->priv->sessions);
 		for (; values; values = g_list_delete_link(values, values)) {
 			PurpleMediaSession *session = values->data;
-			g_object_get(session->session,
-					"codecs-ready", &ret, NULL);
+			if (session->type & (PURPLE_MEDIA_SEND_AUDIO |
+					PURPLE_MEDIA_SEND_VIDEO))
+				g_object_get(session->session,
+						"codecs-ready", &ret, NULL);
+			else
+				ret = TRUE;
+
 			if (ret == FALSE)
 				break;
 		}
--- a/libpurple/mediamanager.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/mediamanager.c	Sun Aug 16 23:25:51 2009 +0000
@@ -473,7 +473,6 @@
 			gst_element_link(tee, fakesink);

 			ret = bin;
-			gst_element_set_locked_state(ret, TRUE);
 			gst_object_ref(ret);
 			gst_bin_add(GST_BIN(purple_media_manager_get_pipeline(
 					manager)), ret);
@@ -714,7 +713,7 @@
 				(participant == ow->participant)) &&
 				!strcmp(session_id, ow->session_id)) {
 			GstBus *bus;
-			GstElement *queue;
+			GstElement *queue, *colorspace;
 			GstElement *tee = purple_media_get_tee(media,
 					session_id, participant);

@@ -723,6 +722,8 @@

 			queue = gst_element_factory_make(
 					"queue", NULL);
+			colorspace = gst_element_factory_make(
+					"ffmpegcolorspace", NULL);
 			ow->sink = purple_media_manager_get_element(
 					manager, PURPLE_MEDIA_RECV_VIDEO,
 					ow->media, ow->session_id,
@@ -743,7 +744,7 @@
 			}

 			gst_bin_add_many(GST_BIN(GST_ELEMENT_PARENT(tee)),
-					queue, ow->sink, NULL);
+					queue, colorspace, ow->sink, NULL);

 			bus = gst_pipeline_get_bus(GST_PIPELINE(
 					manager->priv->pipeline));
@@ -751,9 +752,11 @@
 					G_CALLBACK(window_id_cb), ow);
 			gst_object_unref(bus);

-			gst_element_sync_state_with_parent(ow->sink);
-			gst_element_link(queue, ow->sink);
-			gst_element_sync_state_with_parent(queue);
+			gst_element_set_state(ow->sink, GST_STATE_PLAYING);
+			gst_element_set_state(colorspace, GST_STATE_PLAYING);
+			gst_element_set_state(queue, GST_STATE_PLAYING);
+			gst_element_link(colorspace, ow->sink);
+			gst_element_link(queue, colorspace);
 			gst_element_link(tee, queue);
 		}
 	}
@@ -822,8 +825,14 @@
 		GstPad *pad = gst_element_get_static_pad(
 				output_window->sink, "sink");
 		GstPad *peer = gst_pad_get_peer(pad);
-		GstElement *queue = GST_ELEMENT_PARENT(peer);
+		GstElement *colorspace = GST_ELEMENT_PARENT(peer), *queue;
 		gst_object_unref(pad);
+		gst_object_unref(peer);
+		pad = gst_element_get_static_pad(colorspace, "sink");
+		peer = gst_pad_get_peer(pad);
+		queue = GST_ELEMENT_PARENT(peer);
+		gst_object_unref(pad);
+		gst_object_unref(peer);
 		pad = gst_element_get_static_pad(queue, "sink");
 		peer = gst_pad_get_peer(pad);
 		gst_object_unref(pad);
@@ -832,6 +841,9 @@
 		gst_element_set_locked_state(queue, TRUE);
 		gst_element_set_state(queue, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(queue)), queue);
+		gst_element_set_locked_state(colorspace, TRUE);
+		gst_element_set_state(colorspace, GST_STATE_NULL);
+		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(colorspace)), colorspace);
 		gst_element_set_locked_state(output_window->sink, TRUE);
 		gst_element_set_state(output_window->sink, GST_STATE_NULL);
 		gst_bin_remove(GST_BIN(GST_ELEMENT_PARENT(output_window->sink)),
--- a/libpurple/pounce.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/pounce.c	Sun Aug 16 23:25:51 2009 +0000
@@ -1157,4 +1157,7 @@
 	}

 	purple_signals_disconnect_by_handle(purple_pounces_get_handle());
+
+	g_hash_table_destroy(pounce_handlers);
+	pounce_handlers = NULL;
 }
--- a/libpurple/prefs.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/prefs.c	Sun Aug 16 23:25:51 2009 +0000
@@ -1450,6 +1450,8 @@
 		sync_prefs();
 	}

+	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
+
 	prefs_loaded = FALSE;
 	purple_prefs_destroy();
 	g_hash_table_destroy(prefs_hash);
--- a/libpurple/protocols/jabber/buddy.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Sun Aug 16 23:25:51 2009 +0000
@@ -513,6 +513,7 @@

 		xmlnode_insert_data(binval, enc, -1);
 		g_free(enc);
+		purple_imgstore_unref(img);
 	} else if (vc_node) {
 		xmlnode *photo;
 		/* TODO: Remove all PHOTO children? (see above note) */
--- a/libpurple/protocols/jabber/caps.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/jabber/caps.c	Sun Aug 16 23:25:51 2009 +0000
@@ -456,6 +456,11 @@
 	/* Only validate if these are v1.5 capabilities */
 	if (userdata->hash) {
 		gchar *hash = NULL;
+		/*
+		 * TODO: If you add *any* hash here, make sure the checksum buffer
+		 * size in jabber_caps_calculate_hash is large enough. The cipher API
+		 * doesn't seem to offer a "Get the hash size" function(?).
+		 */
 		if (!strcmp(userdata->hash, "sha-1")) {
 			hash = jabber_caps_calculate_hash(info, "sha1");
 		} else if (!strcmp(userdata->hash, "md5")) {
--- a/libpurple/protocols/jabber/chat.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/jabber/chat.c	Sun Aug 16 23:25:51 2009 +0000
@@ -750,6 +750,7 @@

 	if(!server || !*server) {
 		purple_notify_error(js->gc, _("Invalid Server"), _("Invalid Server"), NULL);
+		purple_roomlist_set_in_progress(js->roomlist, FALSE);
 		return;
 	}
--- a/libpurple/protocols/jabber/disco.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/jabber/disco.c	Sun Aug 16 23:25:51 2009 +0000
@@ -302,6 +302,8 @@
 			}
 		}

+		js->chat_servers = g_list_reverse(js->chat_servers);
+
 		capabilities |= JABBER_CAP_RETRIEVED;

 		if(jbr)
--- a/libpurple/protocols/jabber/iq.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/jabber/iq.c	Sun Aug 16 23:25:51 2009 +0000
@@ -282,11 +282,6 @@
 	id = xmlnode_get_attrib(packet, "id");
 	iq_type = xmlnode_get_attrib(packet, "type");

-	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
-			"jabber-receiving-iq", js->gc, iq_type, id, from, packet));
-	if (signal_return)
-		return;
-
 	/*
 	 * child will be either the first tag child or NULL if there is no child.
 	 * Historically, we used just the 'query' subchild, but newer XEPs use
@@ -345,6 +340,11 @@
 		return;
 	}

+	signal_return = GPOINTER_TO_INT(purple_signal_emit_return_1(jabber_plugin,
+			"jabber-receiving-iq", js->gc, iq_type, id, from, packet));
+	if (signal_return)
+		return;
+
 	/* First, lets see if a special callback got registered */
 	if(type == JABBER_IQ_RESULT || type == JABBER_IQ_ERROR) {
 		if((jcd = g_hash_table_lookup(js->iq_callbacks, id))) {
--- a/libpurple/protocols/jabber/jingle/rtp.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/jabber/jingle/rtp.c	Sun Aug 16 23:25:51 2009 +0000
@@ -589,8 +589,8 @@
 	if (!strcmp(senders, "both"))
 		type = is_audio == TRUE ? PURPLE_MEDIA_AUDIO
 				: PURPLE_MEDIA_VIDEO;
-	else if (!strcmp(senders, "initiator")
-			&& jingle_session_is_initiator(session))
+	else if ((strcmp(senders, "initiator") == 0) ==
+			jingle_session_is_initiator(session))
 		type = is_audio == TRUE ? PURPLE_MEDIA_SEND_AUDIO
 				: PURPLE_MEDIA_SEND_VIDEO;
 	else
--- a/libpurple/protocols/jabber/si.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/jabber/si.c	Sun Aug 16 23:25:51 2009 +0000
@@ -67,7 +67,7 @@

 	JabberIBBSession *ibb_session;
 	guint ibb_timeout_handle;
-	FILE *fp;
+	PurpleCircBuffer *ibb_buffer;
 } JabberSIXfer;

 /* some forward declarations */
@@ -1012,18 +1012,8 @@
 	if (size <= purple_xfer_get_bytes_remaining(xfer)) {
 		purple_debug_info("jabber", "about to write %" G_GSIZE_FORMAT " bytes from IBB stream\n",
 			size);
-		if(!fwrite(data, size, 1, jsx->fp)) {
-			purple_debug_error("jabber", "error writing to file\n");
-			purple_xfer_cancel_remote(xfer);
-			return;
-		}
-		purple_xfer_set_bytes_sent(xfer, purple_xfer_get_bytes_sent(xfer) + size);
-		purple_xfer_update_progress(xfer);
-
-		if (purple_xfer_get_bytes_remaining(xfer) == 0) {
-			purple_xfer_set_completed(xfer, TRUE);
-			purple_xfer_end(xfer);
-		}
+		purple_circ_buffer_append(jsx->ibb_buffer, data, size);
+		purple_xfer_prpl_ready(xfer);
 	} else {
 		/* trying to write past size of file transfers negotiated size,
 		  reject transfer to protect against malicious behaviour */
@@ -1034,6 +1024,25 @@

 }

+static gssize
+jabber_si_xfer_ibb_read(guchar **out_buffer, PurpleXfer *xfer)
+{
+	JabberSIXfer *jsx = xfer->data;
+	guchar *buffer;
+	gsize size;
+	gsize tmp;
+
+	size = jsx->ibb_buffer->bufused;
+	*out_buffer = buffer = g_malloc(size);
+	while ((tmp = purple_circ_buffer_get_max_read(jsx->ibb_buffer))) {
+		memcpy(buffer, jsx->ibb_buffer->outptr, tmp);
+		buffer += tmp;
+		purple_circ_buffer_mark_read(jsx->ibb_buffer, tmp);
+	}
+
+	return size;
+}
+
 static gboolean
 jabber_si_xfer_ibb_open_cb(JabberStream *js, const char *who, const char *id,
                            xmlnode *open)
@@ -1044,21 +1053,10 @@
 		JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 		JabberIBBSession *sess =
 			jabber_ibb_session_create_from_xmlnode(js, who, id, open, xfer);
-		const char *filename;

 		jabber_si_bytestreams_ibb_timeout_remove(jsx);

 		if (sess) {
-			/* open the file to write to */
-			filename = purple_xfer_get_local_filename(xfer);
-			jsx->fp = g_fopen(filename, "wb");
-			if (jsx->fp == NULL) {
-				purple_debug_error("jabber", "failed to open file %s for writing: %s\n",
-					filename, g_strerror(errno));
-				purple_xfer_cancel_remote(xfer);
-				return FALSE;
-			}
-
 			/* setup callbacks here...*/
 			jabber_ibb_session_set_data_received_callback(sess,
 				jabber_si_xfer_ibb_recv_data_cb);
@@ -1068,9 +1066,14 @@
 				jabber_si_xfer_ibb_error_cb);

 			jsx->ibb_session = sess;
+			jsx->ibb_buffer =
+				purple_circ_buffer_new(jabber_ibb_session_get_block_size(sess));
+
+			/* set up read function */
+			purple_xfer_set_read_fnc(xfer, jabber_si_xfer_ibb_read);

 			/* start the transfer */
-			purple_xfer_start(xfer, 0, NULL, 0);
+			purple_xfer_start(xfer, -1, NULL, 0);
 			return TRUE;
 		} else {
 			/* failed to create IBB session */
@@ -1086,32 +1089,17 @@
 	}
 }

-static void
-jabber_si_xfer_ibb_send_data(JabberIBBSession *sess)
+static gssize
+jabber_si_xfer_ibb_write(const guchar *buffer, size_t len, PurpleXfer *xfer)
 {
-	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
 	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
-	gsize remaining = purple_xfer_get_bytes_remaining(xfer);
-	gsize packet_size = remaining < jabber_ibb_session_get_block_size(sess) ?
-		remaining : jabber_ibb_session_get_block_size(sess);
-	gpointer data = g_malloc(packet_size);
-	int res;
+	JabberIBBSession *sess = jsx->ibb_session;
+	gsize packet_size = len < jabber_ibb_session_get_block_size(sess) ?
+		len : jabber_ibb_session_get_block_size(sess);

-	purple_debug_info("jabber", "IBB: about to read %" G_GSIZE_FORMAT " bytes from file %p\n",
-		packet_size, jsx->fp);
-	res = fread(data, packet_size, 1, jsx->fp);
+	jabber_ibb_session_send_data(sess, buffer, packet_size);

-	if (res == 1) {
-		jabber_ibb_session_send_data(sess, data, packet_size);
-		purple_xfer_set_bytes_sent(xfer,
-			purple_xfer_get_bytes_sent(xfer) + packet_size);
-		purple_xfer_update_progress(xfer);
-	} else {
-		purple_debug_error("jabber",
-			"jabber_si_xfer_ibb_send_data: error reading from file\n");
-		purple_xfer_cancel_local(xfer);
-	}
-	g_free(data);
+	return packet_size;
 }

 static void
@@ -1127,7 +1115,7 @@
 		purple_xfer_end(xfer);
 	} else {
 		/* send more... */
-		jabber_si_xfer_ibb_send_data(sess);
+		purple_xfer_prpl_ready(xfer);
 	}
 }

@@ -1135,28 +1123,13 @@
 jabber_si_xfer_ibb_opened_cb(JabberIBBSession *sess)
 {
 	PurpleXfer *xfer = (PurpleXfer *) jabber_ibb_session_get_user_data(sess);
-	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;
 	JabberStream *js = jabber_ibb_session_get_js(sess);
 	PurpleConnection *gc = js->gc;
 	PurpleAccount *account = purple_connection_get_account(gc);

 	if (jabber_ibb_session_get_state(sess) == JABBER_IBB_SESSION_OPENED) {
-		const char *filename = purple_xfer_get_local_filename(xfer);
-		jsx->fp = g_fopen(filename, "rb");
-		if (jsx->fp == NULL) {
-			purple_debug_error("jabber", "Failed to open file %s for reading: %s\n",
-				filename, g_strerror(errno));
-			purple_xfer_error(purple_xfer_get_type(xfer), account,
-				jabber_ibb_session_get_who(sess),
-				_("Failed to open the file"));
-			purple_xfer_cancel_local(xfer);
-			return;
-		}
-
-		purple_xfer_start(xfer, 0, NULL, 0);
-		purple_xfer_set_bytes_sent(xfer, 0);
-		purple_xfer_update_progress(xfer);
-		jabber_si_xfer_ibb_send_data(sess);
+		purple_xfer_start(xfer, -1, NULL, 0);
+		purple_xfer_prpl_ready(xfer);
 	} else {
 		/* error */
 		purple_xfer_error(purple_xfer_get_type(xfer), account,
@@ -1171,8 +1144,6 @@
 {
 	JabberSIXfer *jsx = (JabberSIXfer *) xfer->data;

-	purple_xfer_ref(xfer);
-
 	jsx->ibb_session = jabber_ibb_session_create(js, jsx->stream_id,
 		purple_xfer_get_remote_user(xfer), xfer);

@@ -1187,6 +1158,11 @@
 		jabber_ibb_session_set_error_callback(jsx->ibb_session,
 			jabber_si_xfer_ibb_error_cb);

+		purple_xfer_set_write_fnc(xfer, jabber_si_xfer_ibb_write);
+
+		jsx->ibb_buffer =
+			purple_circ_buffer_new(jabber_ibb_session_get_block_size(jsx->ibb_session));
+
 		/* open the IBB session */
 		jabber_ibb_session_open(jsx->ibb_session);

@@ -1342,10 +1318,8 @@
 			jabber_ibb_session_destroy(jsx->ibb_session);
 		}

-		if (jsx->fp) {
-			purple_debug_info("jabber",
-				"jabber_si_xfer_free: closing file for IBB transfer\n");
-			fclose(jsx->fp);
+		if (jsx->ibb_buffer) {
+			purple_circ_buffer_destroy(jsx->ibb_buffer);
 		}

 		purple_debug_info("jabber", "jabber_si_xfer_free(): freeing jsx %p\n", jsx);
@@ -1356,7 +1330,6 @@
 		g_free(jsx->rxqueue);
 		g_free(jsx);
 		xfer->data = NULL;
-
 	}
 }

@@ -1632,7 +1605,6 @@
 		jsx->local_streamhost_fd = -1;

 		jsx->ibb_session = NULL;
-		jsx->fp = NULL;

 		purple_xfer_set_init_fnc(xfer, jabber_si_xfer_init);
 		purple_xfer_set_cancel_send_fnc(xfer, jabber_si_xfer_cancel_send);
--- a/libpurple/protocols/msn/Makefile.mingw	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msn/Makefile.mingw	Sun Aug 16 23:25:51 2009 +0000
@@ -41,7 +41,6 @@
 			command.c \
 			contact.c\
 			dialog.c \
-			directconn.c \
 			error.c \
 			group.c \
 			history.c \
--- a/libpurple/protocols/msn/cmdproc.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msn/cmdproc.c	Sun Aug 16 23:25:51 2009 +0000
@@ -333,60 +333,38 @@
 			trans->timer = 0;
 		}

-	if (g_ascii_isdigit(cmd->command[0]))
+	if (g_ascii_isdigit(cmd->command[0]) && trans != NULL)
 	{
-		if (trans != NULL)
-		{
-			MsnErrorCb error_cb = NULL;
-			int error;
+		MsnErrorCb error_cb;
+		int error;

-			error = atoi(cmd->command);
-
-			if (trans->error_cb != NULL)
-				error_cb = trans->error_cb;
-
-			if (error_cb == NULL && cmdproc->cbs_table->errors != NULL)
-				error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command);
+		error = atoi(cmd->command);

-			if (error_cb != NULL)
-			{
-				error_cb(cmdproc, trans, error);
-			}
-			else
-			{
-#if 1
-				msn_error_handle(cmdproc->session, error);
-#else
-				purple_debug_warning("msn", "Unhandled error '%s'\n",
-								   cmd->command);
-#endif
-			}
+		error_cb = trans->error_cb;
+		if (error_cb == NULL)
+			error_cb = g_hash_table_lookup(cmdproc->cbs_table->errors, trans->command);

-			return;
-		}
+		if (error_cb != NULL)
+			error_cb(cmdproc, trans, error);
+		else
+			msn_error_handle(cmdproc->session, error);
+
+		return;
 	}

-	if (cmdproc->cbs_table->async != NULL)
-		cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command);
+	cb = g_hash_table_lookup(cmdproc->cbs_table->async, cmd->command);

-	if (cb == NULL && trans != NULL)
-	{
-		if (trans->callbacks != NULL)
-			cb = g_hash_table_lookup(trans->callbacks, cmd->command);
-	}
+	if (cb == NULL && trans != NULL && trans->callbacks != NULL)
+		cb = g_hash_table_lookup(trans->callbacks, cmd->command);

-	if (cb == NULL && cmdproc->cbs_table->fallback != NULL)
+	if (cb == NULL)
 		cb = g_hash_table_lookup(cmdproc->cbs_table->fallback, cmd->command);

 	if (cb != NULL)
-	{
 		cb(cmdproc, cmd);
-	}
 	else
-	{
 		purple_debug_warning("msn", "Unhandled command '%s'\n",
 						   cmd->command);
-	}

 	if (trans != NULL && trans->pendent_cmd != NULL)
 		msn_transaction_unqueue_cmd(trans, cmdproc);
--- a/libpurple/protocols/msn/directconn.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msn/directconn.c	Sun Aug 16 23:25:51 2009 +0000
@@ -247,14 +247,6 @@
 }

 static void
-msn_directconn_process_msg(MsnDirectConn *directconn, MsnMessage *msg)
-{
-	purple_debug_info("msn", "directconn: process_msg\n");
-
-	msn_slplink_process_msg(directconn->slplink, msg);
-}
-
-static void
 read_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
 	MsnDirectConn* directconn;
@@ -267,6 +259,19 @@
 	directconn = data;

 	/* Let's read the length of the data. */
+#error This code is broken.  See the note below.
+	/*
+	 * TODO: This has problems!  First of all, sizeof(body_len) will be
+	 *       different on 32bit systems and on 64bit systems (4 bytes
+	 *       vs. 8 bytes).
+	 *       Secondly, we're reading from a TCP stream.  There is no
+	 *       guarantee that we have received the number of bytes we're
+	 *       trying to read.  We need to read into a buffer.  If read
+	 *       returns <0 then we need to check errno.  If errno is EAGAIN
+	 *       then don't destroy anything, just exit and wait for more
+	 *       data.  See every other function in libpurple that does this
+	 *       correctly for an example.
+	 */
 	len = read(directconn->fd, &body_len, sizeof(body_len));

 	if (len <= 0)
@@ -337,7 +342,8 @@
 		msg = msn_message_new_msnslp();
 		msn_message_parse_slp_body(msg, body, body_len);

-		msn_directconn_process_msg(directconn, msg);
+		purple_debug_info("msn", "directconn: process_msg\n");
+		msn_slplink_process_msg(directconn->slplink, msg);
 	}
 	else
 	{
--- a/libpurple/protocols/msn/msg.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msn/msg.c	Sun Aug 16 23:25:51 2009 +0000
@@ -1102,6 +1102,7 @@
 {
 	GHashTable *body;
 	const gchar *guid;
+	gboolean accepted = FALSE;

 	g_return_if_fail(cmdproc != NULL);
 	g_return_if_fail(msg != NULL);
@@ -1129,6 +1130,9 @@
 		} else
 			purple_debug_warning("msn", "Invite msg missing "
 					"Application-GUID.\n");
+
+		accepted = TRUE;
+
 	} else if (!strcmp(guid, "{02D3C01F-BF30-4825-A83A-DE7AF41648AA}")) {
 		purple_debug_info("msn", "Computer call\n");

@@ -1154,9 +1158,35 @@
 				g_free(buf);
 			}
 		}
-	} else
-		purple_debug_warning("msn",
-				"Unhandled invite msg with GUID %s.\n", guid);
+	} else {
+		const gchar *application = g_hash_table_lookup(body, "Application-Name");
+		purple_debug_warning("msn", "Unhandled invite msg with GUID %s: %s.\n",
+		                     guid, application ? application : "(null)");
+	}
+
+	if (!accepted) {
+		const gchar *cookie = g_hash_table_lookup(body, "Invitation-Cookie");
+		if (cookie) {
+			MsnSwitchBoard *swboard = cmdproc->data;
+			char *text;
+			MsnMessage *cancel;
+
+			cancel = msn_message_new(MSN_MSG_TEXT);
+			msn_message_set_content_type(cancel, "text/x-msmsgsinvite");
+			msn_message_set_charset(cancel, "UTF-8");
+			msn_message_set_flag(cancel, 'U');
+
+			text = g_strdup_printf("Invitation-Command: CANCEL\r\n"
+			                       "Invitation-Cookie: %s\r\n"
+			                       "Cancel-Code: REJECT_NOT_INSTALLED\r\n",
+			                       cookie);
+			msn_message_set_bin_data(cancel, text, strlen(text));
+			g_free(text);
+
+			msn_switchboard_send_msg(swboard, cancel, TRUE);
+			msn_message_destroy(cancel);
+		}
+	}

 	g_hash_table_destroy(body);
 }
--- a/libpurple/protocols/msn/session.h	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msn/session.h	Sun Aug 16 23:25:51 2009 +0000
@@ -35,7 +35,6 @@
 #include "switchboard.h"
 #include "group.h"

-#include "cmdproc.h"
 #include "nexus.h"
 #include "httpconn.h"
 #include "oim.h"
--- a/libpurple/protocols/msn/slp.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msn/slp.c	Sun Aug 16 23:25:51 2009 +0000
@@ -244,6 +244,8 @@
 got_sessionreq(MsnSlpCall *slpcall, const char *branch,
 			   const char *euf_guid, const char *context)
 {
+	gboolean accepted = FALSE;
+
 	if (!strcmp(euf_guid, MSN_OBJ_GUID))
 	{
 		/* Emoticon or UserDisplay */
@@ -314,7 +316,10 @@
 		msn_slpmsg_set_image(slpmsg, img);
 		msn_slplink_queue_slpmsg(slplink, slpmsg);
 		purple_imgstore_unref(img);
+
+		accepted = TRUE;
 	}
+
 	else if (!strcmp(euf_guid, MSN_FT_GUID))
 	{
 		/* File Transfer */
@@ -360,6 +365,9 @@

 			purple_xfer_request(xfer);
 		}
+
+		accepted = TRUE;
+
 	} else if (!strcmp(euf_guid, MSN_CAM_REQUEST_GUID)) {
 		purple_debug_info("msn", "Cam request.\n");
 		if (slpcall && slpcall->slplink &&
@@ -382,6 +390,7 @@
 				g_free(buf);
 			}
 		}
+
 	} else if (!strcmp(euf_guid, MSN_CAM_GUID)) {
 		purple_debug_info("msn", "Cam invite.\n");
 		if (slpcall && slpcall->slplink &&
@@ -404,8 +413,16 @@
 				g_free(buf);
 			}
 		}
+
 	} else
 		purple_debug_warning("msn", "SLP SessionReq with unknown EUF-GUID: %s\n", euf_guid);
+
+	if (!accepted) {
+		char *content = g_strdup_printf("SessionID: %lu\r\n\r\n",
+		                                slpcall->session_id);
+		send_decline(slpcall, branch, "application/x-msnmsgr-sessionreqbody", content);
+		g_free(content);
+	}
 }

 void
--- a/libpurple/protocols/msn/slplink.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msn/slplink.c	Sun Aug 16 23:25:51 2009 +0000
@@ -456,7 +456,7 @@
 	slpmsg->info = "SLP FILE";

 	xfer = (PurpleXfer *)slpcall->xfer;
-	purple_xfer_start(slpcall->xfer, 0, NULL, 0);
+	purple_xfer_start(slpcall->xfer, -1, NULL, 0);
 	slpmsg->fp = xfer->dest_fp;
 	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
 		slpmsg->size = st.st_size;
@@ -502,7 +502,6 @@
 		g_return_if_reached();
 	}

-	slpmsg = NULL;
 	data = msn_message_get_bin_data(msg, &len);

 	/*
@@ -537,7 +536,7 @@
 					if (xfer != NULL)
 					{
 						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	0, NULL, 0);
+						purple_xfer_start(xfer,	-1, NULL, 0);

 						if (xfer->data == NULL) {
 							purple_xfer_unref(xfer);
@@ -566,13 +565,12 @@
 	else
 	{
 		slpmsg = msn_slplink_message_find(slplink, msg->msnslp_header.session_id, msg->msnslp_header.id);
-	}
-
-	if (slpmsg == NULL)
-	{
-		/* Probably the transfer was canceled */
-		purple_debug_error("msn", "Couldn't find slpmsg\n");
-		return;
+		if (slpmsg == NULL)
+		{
+			/* Probably the transfer was canceled */
+			purple_debug_error("msn", "Couldn't find slpmsg\n");
+			return;
+		}
 	}

 	if (slpmsg->fp)
--- a/libpurple/protocols/msn/slpmsg.h	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msn/slpmsg.h	Sun Aug 16 23:25:51 2009 +0000
@@ -50,10 +50,8 @@
 	long ack_id;
 	long ack_sub_id;
 	long long ack_size;
-	long app_id;

 	gboolean sip; /**< A flag that states if this is a SIP slp message. */
-	int ref_count; /**< The reference count. */
 	long flags;

 	FILE *fp;
--- a/libpurple/protocols/msn/sync.h	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msn/sync.h	Sun Aug 16 23:25:51 2009 +0000
@@ -34,6 +34,11 @@
 {
 	MsnSession *session;
 	MsnTable *cbs_table;
+
+	/*
+	 * TODO: What is the intended purpose of old_cbs_table?  Nothing
+	 *       sets it and it is only read in two places.
+	 */
 	MsnTable *old_cbs_table;

 	int num_users;
--- a/libpurple/protocols/msn/userlist.h	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msn/userlist.h	Sun Aug 16 23:25:51 2009 +0000
@@ -26,7 +26,6 @@

 typedef struct _MsnUserList MsnUserList;

-#include "cmdproc.h"
 #include "user.h"
 #include "group.h"
--- a/libpurple/protocols/msnp9/slplink.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/msnp9/slplink.c	Sun Aug 16 23:25:51 2009 +0000
@@ -496,7 +496,7 @@
 	slpmsg->info = "SLP FILE";
 #endif
 	xfer = (PurpleXfer *)slpcall->xfer;
-	purple_xfer_start(slpcall->xfer, 0, NULL, 0);
+	purple_xfer_start(slpcall->xfer, -1, NULL, 0);
 	slpmsg->fp = xfer->dest_fp;
 	if (g_stat(purple_xfer_get_local_filename(xfer), &st) == 0)
 		slpmsg->size = st.st_size;
@@ -561,7 +561,7 @@
 					if (xfer != NULL)
 					{
 						purple_xfer_ref(xfer);
-						purple_xfer_start(xfer,	0, NULL, 0);
+						purple_xfer_start(xfer,	-1, NULL, 0);

 						if (xfer->data == NULL) {
 							purple_xfer_unref(xfer);
--- a/libpurple/protocols/myspace/myspace.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.c	Sun Aug 16 23:25:51 2009 +0000
@@ -1341,6 +1341,27 @@
 	return ret;
 }
 #endif
+/**
+ * Process incoming status mood messages.
+ *
+ * @param session
+ * @param msg Status mood update message. Caller frees.
+ *
+ * @return TRUE if successful.
+ */
+static gboolean
+msim_incoming_status_mood(MsimSession *session, MsimMessage *msg) {
+	/* TODO: I dont know too much about this yet,
+	 * so until I see how the official client handles
+	 * this and decide if libpurple should as well,
+	 * well just say we used it
+	 */
+	gchar *ss;
+	ss = msim_msg_get_string(msg, "msg");
+	purple_debug_info("msim", "Incoming Status Message: %s", ss ? ss : "(NULL)");
+	g_free(ss);
+	return TRUE;
+}

 /**
  * Process incoming status messages.
@@ -1692,11 +1713,19 @@
 			return msim_incoming_media(session, msg);
 		case MSIM_BM_UNOFFICIAL_CLIENT:
 			return msim_incoming_unofficial_client(session, msg);
+		case MSIM_BM_STATUS_MOOD:
+			return msim_incoming_status_mood(session, msg);
 		default:
-			/* Not really an IM, but show it for informational
-			 * purposes during development. */
-			/* TODO: This is probably wrong */
-			return msim_incoming_action_or_im(session, msg);
+			/*
+			 * Unknown message type!  We used to call
+			 *   msim_incoming_action_or_im(session, msg);
+			 * for these, but that doesn't help anything, and it means
+			 * we'll show broken gibberish if MySpace starts sending us
+			 * other message types.
+			 */
+			purple_debug_warning("myspace", "Received unknown imcoming "
+					"message, bm=%u\n", bm);
+			return TRUE;
 	}
 }
--- a/libpurple/protocols/myspace/myspace.h	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Sun Aug 16 23:25:51 2009 +0000
@@ -132,6 +132,7 @@
 #define MSIM_BM_ACTION_OR_IM_INSTANT    121
 #define MSIM_BM_MEDIA                   122
 #define MSIM_BM_PROFILE                 124
+#define MSIM_BM_STATUS_MOOD             126
 #define MSIM_BM_UNOFFICIAL_CLIENT       200

 /* Authentication algorithm for login2 */
--- a/libpurple/protocols/yahoo/libyahoo.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/yahoo/libyahoo.c	Sun Aug 16 23:25:51 2009 +0000
@@ -278,7 +278,7 @@
 	NULL,                                             /**< dependencies   */
 	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
 	"prpl-yahoo",                                     /**< id             */
-	"Yahoo!",	                                      /**< name           */
+	"Yahoo",	                                      /**< name           */
 	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("Yahoo! Protocol Plugin"),
--- a/libpurple/protocols/yahoo/libyahoojp.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/yahoo/libyahoojp.c	Sun Aug 16 23:25:51 2009 +0000
@@ -174,7 +174,7 @@
 	NULL,                                             /**< dependencies   */
 	PURPLE_PRIORITY_DEFAULT,                            /**< priority       */
 	"prpl-yahoojp",                                     /**< id             */
-	"Yahoo! JAPAN",	                                      /**< name           */
+	"Yahoo JAPAN",	                                      /**< name           */
 	DISPLAY_VERSION,                                  /**< version        */
 	                                                  /**  summary        */
 	N_("Yahoo! JAPAN Protocol Plugin"),
--- a/libpurple/protocols/yahoo/libymsg.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Sun Aug 16 23:25:51 2009 +0000
@@ -971,7 +971,7 @@

 	/* disconnect the peer if connected through p2p and sends wrong value for session id */
 	if( (pkt_type == YAHOO_PKT_TYPE_P2P) && (val_11 != yd->session_id) ) {
-		purple_debug_warning("yahoo","p2p: %s sent us message with wrong session id. Disconnecting p2p connection to peer\n", im->from);
+		purple_debug_warning("yahoo","p2p: %s sent us message with wrong session id. Disconnecting p2p connection to peer\n", im ? im->from : "(im was null)");
 		/* remove from p2p connection lists, also calls yahoo_p2p_disconnect_destroy_data */
 		g_hash_table_remove(yd->peers, im->from);
 		return;
--- a/libpurple/proxy.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/proxy.c	Sun Aug 16 23:25:51 2009 +0000
@@ -2531,4 +2531,9 @@
 		purple_proxy_connect_data_disconnect(handles->data, NULL);
 		purple_proxy_connect_data_destroy(handles->data);
 	}
+
+	purple_prefs_disconnect_by_handle(purple_proxy_get_handle());
+
+	purple_proxy_info_destroy(global_proxy_info);
+	global_proxy_info = NULL;
 }
--- a/libpurple/purple-send	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/purple-send	Sun Aug 16 23:25:51 2009 +0000
@@ -29,4 +29,3 @@
 shift
 dbus-send --dest=im.pidgin.purple.PurpleService --print-reply --type=method_call /im/pidgin/purple/PurpleObject im.pidgin.purple.PurpleInterface.$METHOD_NAME "$@"

-echo
--- a/libpurple/purple-send-async	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/purple-send-async	Sun Aug 16 23:25:51 2009 +0000
@@ -27,4 +27,3 @@
 shift
 dbus-send --dest=im.pidgin.purple.PurpleService --type=method_call /im/pidgin/purple/PurpleObject im.pidgin.purple.PurpleInterface.$METHOD_NAME "$@"

-echo
--- a/libpurple/savedstatuses.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/savedstatuses.c	Sun Aug 16 23:25:51 2009 +0000
@@ -1235,6 +1235,8 @@
 void
 purple_savedstatuses_uninit(void)
 {
+	gpointer handle = purple_savedstatuses_get_handle();
+
 	remove_old_transient_statuses();

 	if (save_timer != 0)
@@ -1253,6 +1255,7 @@
 	g_hash_table_destroy(creation_times);
 	creation_times = NULL;

-	purple_signals_unregister_by_instance(purple_savedstatuses_get_handle());
+	purple_signals_unregister_by_instance(handle);
+	purple_signals_disconnect_by_handle(handle);
 }
--- a/libpurple/status.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/status.c	Sun Aug 16 23:25:51 2009 +0000
@@ -1660,7 +1660,7 @@
 void
 purple_status_init(void)
 {
-	void *handle = purple_status_get_handle;
+	void *handle = purple_status_get_handle();

 	purple_prefs_add_none("/purple/status");
 	purple_prefs_add_none("/purple/status/scores");
@@ -1714,4 +1714,5 @@
 void
 purple_status_uninit(void)
 {
+	purple_prefs_disconnect_by_handle(purple_prefs_get_handle());
 }
--- a/libpurple/util.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/libpurple/util.c	Sun Aug 16 23:25:51 2009 +0000
@@ -405,7 +405,7 @@
 	encoded_word_state_t state = state_start;
 	const char *cur, *mark;
 	const char *charset0 = NULL, *encoding0 = NULL, *encoded_text0 = NULL;
-	char *n, *new;
+	GString *new;

 	/* token can be any CHAR (supposedly ISO8859-1/ISO2022), not just ASCII */
 	#define token_char_p(c) \
@@ -415,16 +415,9 @@
 	#define encoded_text_char_p(c) \
 		((c & 0x80) == 0 && c != '?' && c != ' ' && isgraph(c))

-	#define RECOVER_MARKED_TEXT strncpy(n, mark, cur - mark + 1); \
-		n += cur - mark + 1
-
 	g_return_val_if_fail(str != NULL, NULL);

-	/* NOTE: Assuming that we need just strlen(str)+1 *may* be wrong.
-	 * It would be wrong if one byte (in some unknown encoding) could
-	 * expand to >=4 bytes of UTF-8; I don't know if there are such things.
-	 */
-	n = new = g_malloc(strlen(str) + 1);
+	new = g_string_new(NULL);

 	/* Here we will be looking for encoded words and if they seem to be
 	 * valid then decode them.
@@ -437,7 +430,7 @@
 			if (*cur == '?') {
 				state = state_question1;
 			} else {
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -446,7 +439,7 @@
 				charset0 = cur;
 				state = state_charset;
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -454,7 +447,7 @@
 			if (*cur == '?') {
 				state = state_question2;
 			} else if (!token_char_p(*cur)) { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -463,7 +456,7 @@
 				encoding0 = cur;
 				state = state_encoding;
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -471,7 +464,7 @@
 			if (*cur == '?') {
 				state = state_question3;
 			} else if (!token_char_p(*cur)) { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -483,7 +476,7 @@
 				encoded_text0 = cur;
 				state = state_question4;
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -491,7 +484,7 @@
 			if (*cur == '?') {
 				state = state_question4;
 			} else if (!encoded_text_char_p(*cur)) {
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -513,7 +506,7 @@
 					char *converted = g_convert((const gchar *)decoded, dec_len, "utf-8", charset, NULL, &len, NULL);

 					if (converted) {
-						n = strncpy(n, converted, len) + len;
+						g_string_append_len(new, converted, len);
 						g_free(converted);
 					}
 					g_free(decoded);
@@ -523,7 +516,7 @@
 				g_free(encoded_text);
 				state = state_equal2; /* Restart the FSM */
 			} else { /* This should never happen */
-				RECOVER_MARKED_TEXT;
+				g_string_append_len(new, mark, cur - mark + 1);
 				state = state_start;
 			}
 			break;
@@ -533,19 +526,16 @@
 				state = state_equal1;
 			} else {
 				/* Some unencoded text. */
-				*n = *cur;
-				n += 1;
+				g_string_append_c(new, *cur);
 			}
 			break;
 		} /* switch */
 	} /* for */

-	if (state != state_start) {
-		RECOVER_MARKED_TEXT;
-	}
-	*n = '\0';
-
-	return new;
+	if (state != state_start)
+		g_string_append_len(new, mark, cur - mark + 1);
+
+	return g_string_free(new, FALSE);;
 }
--- a/pidgin/gtkblist.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/pidgin/gtkblist.c	Sun Aug 16 23:25:51 2009 +0000
@@ -622,7 +622,14 @@
 				struct _pidgin_blist_node *gtknode =
 					(struct _pidgin_blist_node *)purple_blist_node_get_ui_data(node);

-				if (purple_contact_get_alias(contact) || gtknode->contact_expanded) {
+				/*
+				 * XXX Using purple_contact_get_alias here breaks because we
+				 * specifically want to check the contact alias only (i.e. not
+				 * the priority buddy, which purple_contact_get_alias does).
+				 * Adding yet another get_alias is evil, so figure this out
+				 * later :-P
+				 */
+				if (contact->alias || gtknode->contact_expanded) {
 					purple_blist_alias_contact(contact, arg2);
 					gtk_blist_auto_personize(purple_blist_node_get_parent(node), arg2);
 				} else {
--- a/pidgin/gtkcertmgr.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/pidgin/gtkcertmgr.c	Sun Aug 16 23:25:51 2009 +0000
@@ -144,12 +144,12 @@
 tls_peers_mgmt_import_ok2_cb(gpointer data, const char *result)
 {
 	PurpleCertificate *crt = (PurpleCertificate *) data;
-	const char *id = result;

 	/* TODO: Perhaps prompt if you're overwriting a cert? */

 	/* Drop the certificate into the pool */
-	purple_certificate_pool_store(tpm_dat->tls_peers, id, crt);
+	if (result && *result)
+		purple_certificate_pool_store(tpm_dat->tls_peers, result, crt);

 	/* And this certificate is not needed any more */
 	purple_certificate_destroy(crt);
--- a/pidgin/gtkdialogs.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/pidgin/gtkdialogs.c	Sun Aug 16 23:25:51 2009 +0000
@@ -214,6 +214,7 @@
 	{N_("Portuguese-Brazil"),   "pt_BR", "Rodrigo Luiz Marques Flores", "rodrigomarquesflores@gmail.com"},
 	{N_("Pashto"),              "ps", "Kashif Masood", "masudmails@yahoo.com"},
 	{N_("Romanian"),            "ro", "Mişu Moldovan", "dumol@gnome.ro"},
+	{N_("Romanian"),            "ro", "Andrei Popescu", "andreimpopescu@gmail.com"},
 	{N_("Russian"),             "ru", "Антон Самохвалов", "samant.ua@mail.ru"},
 	{N_("Slovak"),              "sk", "Jozef Káčer", "quickparser@gmail.com"},
 	{N_("Slovak"),              "sk", "loptosko", "loptosko@gmail.com"},
--- a/pidgin/gtkimhtml.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/pidgin/gtkimhtml.c	Sun Aug 16 23:25:51 2009 +0000
@@ -2953,7 +2953,7 @@
 							font->size = oldfont->size;
 						else
 							font->size = 3;
-						if ((imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK)))
+						if ((imhtml->format_functions & (GTK_IMHTML_GROW|GTK_IMHTML_SHRINK)) && (font->size != 3 || (oldfont && oldfont->size == 3)))
 							gtk_imhtml_font_set_size(imhtml, font->size);
 						g_free(size);
 						fonts = g_slist_prepend (fonts, font);
--- a/pidgin/gtkmedia.c	Sun Aug 16 23:25:38 2009 +0000
+++ b/pidgin/gtkmedia.c	Sun Aug 16 23:25:51 2009 +0000
@@ -882,6 +882,14 @@
 	GstPad *ghost;
 	GstCaps *caps;

+#ifdef _WIN32
+	/* autovideosrc doesn't pick ksvideosrc for some reason */
+	src = gst_element_factory_make("ksvideosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("dshowvideosrc", NULL);
+	if (src == NULL)
+		src = gst_element_factory_make("autovideosrc", NULL);
+#else
 	src = gst_element_factory_make("gconfvideosrc", NULL);
 	if (src == NULL)
 		src = gst_element_factory_make("autovideosrc", NULL);
@@ -889,10 +897,7 @@
 		src = gst_element_factory_make("v4l2src", NULL);
 	if (src == NULL)
 		src = gst_element_factory_make("v4lsrc", NULL);
-	if (src == NULL)
-		src = gst_element_factory_make("ksvideosrc", NULL);
-	if (src == NULL)
-		src = gst_element_factory_make("dshowvideosrc", NULL);
+#endif
 	if (src == NULL) {
 		purple_debug_error("gtkmedia", "Unable to find a suitable "
 				"element for the default video source.\n");
--- a/po/ChangeLog	Sun Aug 16 23:25:38 2009 +0000
+++ b/po/ChangeLog	Sun Aug 16 23:25:51 2009 +0000
@@ -28,6 +28,8 @@
 	* Portuguese (Brazilian) translation updated (Rodrigo Luiz
 	  Marques Flores)
 	* Punjabi translation updated (Amanpreet Singh Alam)
+	* Romanian translation updated (Mişu Moldovan and new translator Andrei
+	  Popescu)
 	* Russian translation updated (Антон Самохвалов)
 	* Slovak translation updated (loptosko)
 	* Slovenian translation updated (Martin Srebotnjak)
--- a/po/de.po	Sun Aug 16 23:25:38 2009 +0000
+++ b/po/de.po	Sun Aug 16 23:25:51 2009 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-29 09:47+0200\n"
-"PO-Revision-Date: 2009-07-29 09:51+0200\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"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1690,6 +1690,45 @@
 msgid "_View Certificate..."
 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
+#. 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
@@ -1705,26 +1744,6 @@
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Die Zertifizierungskette, die für %s präsentiert wird, ist ungültig."

-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-#. TODO: Probably wrong.
-msgid "SSL Certificate Error"
-msgstr "SSL-Zertifikatfehler"
-
-msgid "Invalid certificate chain"
-msgstr "Ungültige Zertifikationskette"
-
-#. 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."
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1742,19 +1761,6 @@
 msgid "Invalid certificate authority signature"
 msgstr "Unbekannte Zertifizierungsstellensignatur"

-#. 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 ""
-"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."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -3836,6 +3842,11 @@
 msgid "Street Address"
 msgstr "Straße"

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

@@ -3924,14 +3935,12 @@
 msgid "Temporarily Hide From"
 msgstr "Temporär versteckt von"

-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheitsbenachrichtigung"

 msgid "(Re-)Request authorization"
 msgstr "(Nochmal) nach Autorisierung fragen"

-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4538,7 +4547,10 @@
 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;owner|admin|member|outcast|none&gt; [Benutzer1] [Benutzer2] ...: Benutzer mit einer Mitgliedschaft für den Raum erfragen oder setzen."
+msgstr ""
+"affiliate &lt;owner|admin|member|outcast|none&gt; [Benutzer1] "
+"[Benutzer2] ...: Benutzer mit einer Mitgliedschaft für den Raum erfragen "
+"oder setzen."

 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
@@ -4690,9 +4702,6 @@
 msgid "Transfer was closed."
 msgstr "Übertragung wurde geschlossen."

-msgid "Failed to open the file"
-msgstr "Öffnen der Datei fehlgeschlagen"
-
 msgid "Failed to open in-band bytestream"
 msgstr "Öffnen des In-Band-Bytestroms fehlgeschlagen"

@@ -12239,6 +12248,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s möchte eine Video-Sitzung mit Ihnen starten."

+msgid "Incoming Call"
+msgstr "Eingehender Anruf"
+
+msgid "_Pause"
+msgstr "_Pause"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13168,9 +13183,6 @@
 msgid "_Open Mail"
 msgstr "Mail ö_ffnen"

-msgid "_Pause"
-msgstr "_Pause"
-
 msgid "_Edit"
 msgstr "_Bearbeiten"

@@ -14028,9 +14040,12 @@
 msgid "Founder"
 msgstr "Gründer"

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

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

@@ -14303,3 +14318,6 @@
 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/he.po	Sun Aug 16 23:25:38 2009 +0000
+++ b/po/he.po	Sun Aug 16 23:25:51 2009 +0000
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-27 19:57-0700\n"
-"PO-Revision-Date: 2009-07-27 16:21+0200\n"
+"POT-Creation-Date: 2009-08-15 09:57-0400\n"
+"PO-Revision-Date: 2009-08-16 08:51+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,13 +47,8 @@
 "  -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 "שגיאה"
@@ -349,11 +344,8 @@
 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?
@@ -379,11 +371,8 @@
 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"
@@ -529,8 +518,7 @@
 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"
@@ -539,12 +527,8 @@
 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 "אין פקודה כזו."
@@ -589,8 +573,7 @@
 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"
@@ -640,28 +623,20 @@
 "להלן הפקודות שאפשריים בהקשר הנוכחי:\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."
@@ -691,18 +666,8 @@
 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 "אין אפשרות לפתוח את הקובץ."
@@ -804,18 +769,13 @@
 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"
@@ -955,11 +915,8 @@
 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 "יש לבחור תוסף להתקין"
@@ -1395,9 +1352,7 @@
 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
@@ -1457,8 +1412,7 @@
 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"
@@ -1470,9 +1424,7 @@
 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 "כאשר חלון שיחה חדש נפתח, תוסף זה יכניס את השיחה האחרונה לראש החלון."

 msgid "Online"
@@ -1644,20 +1596,16 @@
 msgid "_View Certificate..."
 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 אינה תקפה."
-
+#, 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.
@@ -1670,41 +1618,36 @@
 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."
+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."
+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 "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 "חתימת רשות הנפקות לא תקפה"

-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"תעודה שהוצגה על ידי \"%s\" טוענת שהיא באה בעצם מתוך \"%s\". ייתכן וזה אומר "
-"שהשירות אליו התחברת אינו השירות שחשבת."
-
 #. Make messages
 #, c-format
 msgid ""
@@ -1741,6 +1684,7 @@
 msgstr "+++ %s התנתק"

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

@@ -1791,9 +1735,7 @@
 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
@@ -2011,49 +1953,31 @@
 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"
@@ -2099,20 +2023,12 @@
 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>"
@@ -2143,14 +2059,11 @@
 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"
@@ -2351,12 +2264,8 @@
 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
@@ -2405,12 +2314,8 @@
 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
@@ -2435,9 +2340,7 @@
 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."
@@ -2519,17 +2422,13 @@

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

 msgid "Mono Plugin Loader"
 msgstr "אשף הטענת תוספי Mono"
@@ -2561,12 +2460,8 @@
 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 "אמולציה של הודעות לא-מקוונות"
@@ -2574,20 +2469,12 @@
 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 "הודעות לא-מקוונות"
@@ -2627,12 +2514,10 @@

 #. *  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
@@ -2656,12 +2541,8 @@
 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 "אתה מרגיש הפרעה בכוח..."
@@ -2807,12 +2688,8 @@
 #. *< 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"
@@ -2820,25 +2697,16 @@
 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"
@@ -2904,9 +2772,7 @@
 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"
@@ -3400,14 +3266,10 @@
 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
@@ -3454,11 +3316,8 @@
 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 לאותו כינוי."
@@ -3466,56 +3325,26 @@
 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;:  בצע פעולה"
@@ -3523,18 +3352,11 @@
 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 [ערוץ]:  הצג את רשימת המשתמשים שכרגע בערוץ."
@@ -3548,41 +3370,23 @@
 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 [הודעה]:  התנתקות מהשרת, עם אפשרות להודעה."
@@ -3590,12 +3394,8 @@
 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."
@@ -3609,18 +3409,11 @@
 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;:  השג מידע על משתמש."
@@ -3660,9 +3453,7 @@
 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"
@@ -3721,6 +3512,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 "מידע כתובת מורחב"

@@ -3759,9 +3555,7 @@
 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"
@@ -3807,14 +3601,12 @@
 msgid "Temporarily Hide From"
 msgstr "הסתר את התבנית זמנית"

-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "בטל התרעת נוכחות"

 msgid "(Re-)Request authorization"
 msgstr "בקש אימות (מחדש)"

-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -3845,12 +3637,8 @@
 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 "שגיאה בשאילתת הספרייה"
@@ -3964,9 +3752,7 @@
 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"
@@ -4020,8 +3806,7 @@
 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."
@@ -4338,9 +4123,7 @@
 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
@@ -4372,9 +4155,7 @@
 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"
@@ -4401,19 +4182,11 @@
 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 an role or set users' role with the room."
+msgstr "role &lt;משתמש&gt; &lt;בעלים|מפעיל|חבר|בגלות|ללא&gt; [שם1][שם2]...: שלוף או קבע את ייחוסם של משתמשים עם החדר."

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;משתמש&gt; [חדר]:  הזמן משתמש לחדר."
@@ -4424,8 +4197,7 @@
 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."
@@ -4524,11 +4296,8 @@
 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 "הגדרות החדר"
@@ -4553,9 +4322,6 @@
 msgid "Transfer was closed."
 msgstr "העברת הקובץ נסגרה."

-msgid "Failed to open the file"
-msgstr "כישלון בעת פתיחת הקובץ"
-
 msgid "Failed to open in-band bytestream"
 msgstr "כישלון בפתיחת תזרים מידע בתווך"

@@ -4600,11 +4366,8 @@
 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 "קבע כינוי..."
@@ -4633,17 +4396,11 @@
 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
@@ -4930,12 +4687,8 @@
 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 "אפשר"
@@ -4951,8 +4704,7 @@
 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."
@@ -5046,12 +4798,8 @@
 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 "לא ניתן להוסיף"
@@ -5207,17 +4955,10 @@
 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"
@@ -5277,36 +5018,24 @@

 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will "
-"automatically be signed out at that time.  Please finish any conversations "
-"in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully "
-"sign in."
+"After the maintenance has been completed, you will be able to successfully sign in."
 msgstr[0] ""
-"שרת ה-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 "ההודעה לא נשלחה מכיוון שההודעות נשלחות מהר מדי."
@@ -5350,8 +5079,7 @@
 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"
@@ -5374,8 +5102,7 @@

 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
-"נשלחה בקשה מאת %s לצפות במצלמת האינטרנט שלך, אבל בקשה זו אינה נתמכת כרגע."
+msgstr "נשלחה בקשה מאת %s לצפות במצלמת האינטרנט שלך, אבל בקשה זו אינה נתמכת כרגע."

 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
@@ -5405,15 +5132,10 @@
 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:"
@@ -5548,16 +5270,10 @@
 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 "הוסף אנשי-קשר מהשרת"
@@ -5567,14 +5283,8 @@
 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 "שם משתמש או סיסמה שגויים"
@@ -5609,11 +5319,8 @@
 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"
@@ -5667,14 +5374,8 @@
 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 - שם המשתמש זמין"
@@ -5895,9 +5596,7 @@
 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"
@@ -5918,9 +5617,7 @@
 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"
@@ -5960,20 +5657,12 @@
 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)."
@@ -6058,13 +5747,10 @@
 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."
@@ -6093,12 +5779,8 @@
 msgstr "התקבלה תגובה לא-צפויה מאת"

 #. 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 דקות ונסה שנית. אם תמשיך לנסות, "
-"תיאלץ להמתין אפילו יותר."
+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 "
@@ -6168,12 +5850,8 @@
 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."
@@ -6251,23 +5929,12 @@
 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"
@@ -6379,14 +6046,8 @@
 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."
@@ -6421,12 +6082,8 @@
 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 שהוזן אינו תקף."
@@ -6454,8 +6111,7 @@

 #, 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"
@@ -6531,25 +6187,20 @@
 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 בגלל שרמת-האזהרה שלך גבוהה מדי."

@@ -6591,17 +6242,11 @@
 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."
@@ -6654,44 +6299,28 @@
 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."
@@ -6707,28 +6336,18 @@
 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 בייטים. הפרופיל קוצר עבורך."

@@ -6736,12 +6355,8 @@
 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 בייטים. הוא קוצר עבורך."

@@ -6749,35 +6364,21 @@
 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 "(ללא שם)"
@@ -6787,11 +6388,8 @@
 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 "ההרשאה ניתנה"
@@ -6807,8 +6405,7 @@
 #. 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"
@@ -6837,12 +6434,8 @@
 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 "התחבר"
@@ -6887,12 +6480,8 @@
 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 "מצא איש קשר לפי דוא\"ל"
@@ -6970,13 +6559,8 @@
 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 "דלי"
@@ -7734,8 +7318,7 @@
 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"
@@ -7776,9 +7359,7 @@
 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"
@@ -7797,13 +7378,8 @@
 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 "הזמן לועידה"
@@ -7821,12 +7397,8 @@
 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"
@@ -7854,12 +7426,8 @@
 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 "בחר משתמש"
@@ -7868,12 +7436,8 @@
 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 ""
@@ -7926,13 +7490,8 @@
 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"
@@ -7941,33 +7500,22 @@
 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 "תוצאות חיפוש"
@@ -7985,12 +7533,8 @@
 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 "חיפוש משתמש"
@@ -8046,11 +7590,8 @@
 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 ""
@@ -8096,12 +7637,8 @@
 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..."
@@ -8111,12 +7648,8 @@
 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 "ייבא..."
@@ -8124,19 +7657,11 @@
 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 "מנותק"
@@ -8286,17 +7811,8 @@
 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 "אימות בערוץ"
@@ -8360,8 +7876,7 @@
 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"
@@ -8601,12 +8116,8 @@
 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?"
@@ -8642,8 +8153,7 @@
 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"
@@ -8716,13 +8226,8 @@
 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 "ההודעה להיום"
@@ -8841,17 +8346,11 @@
 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;:  קביעת מצבי המשתמש שלך ברשת"
@@ -8859,12 +8358,8 @@
 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; [הערה]:  בעט משתמש מן הערוץ"
@@ -8887,12 +8382,8 @@
 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
@@ -9029,9 +8520,7 @@
 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"
@@ -9220,12 +8709,8 @@
 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."
@@ -9239,17 +8724,11 @@
 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
@@ -9257,24 +8736,15 @@
 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 "התעלם ממשתמש?"
@@ -9393,14 +8863,10 @@
 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"
@@ -9427,32 +8893,21 @@
 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 "פרופיל המשתמש ריק."

-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s התחבר."
+msgstr "%s לא רוצה להצטרף."

 msgid "Failed to join chat"
 msgstr "לא ניתן להצטרף לשיחה"
@@ -9469,12 +8924,8 @@
 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."
@@ -9507,9 +8958,7 @@
 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
@@ -9557,29 +9006,17 @@
 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;"
@@ -9825,12 +9262,8 @@
 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"
@@ -9882,11 +9315,8 @@
 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 "למסרים באינטרנט"
@@ -10006,38 +9436,24 @@
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the "
-"<b>Add...</b> button below and configure your first account. If you want %s "
-"to connect to multiple IM accounts, press <b>Add...</b> again to configure "
-"them all.\n"
+"You have no IM accounts configured. To start connecting with %s press the <b>Add...</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add...</b> again to configure them all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Manage Accounts</b> in the Buddy List window"
+"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"
+"אין ברשותך שם חשבונות מוגדרים. על מנת להתחבר עם %s יש ללחוץ על הכפתור <b>הוסף...</b> שלהלן להגדיר את חשבונך הראשון. אם ברצונך ש-%s יתחבר לכמה חשבונות, יש ללחוץ על <b>הוסף...</b> שוב על מנת להגדיר את כולם.\n"
 "\n"
-"ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי "
-"<b>חשבונות->נהל חשבונות</b> שבחלון רשימת החברים"
+"ניתן גם לחזור לחלון זה על מנת להוסיף, לערוך, או להסיר חשבונות על-ידי <b>חשבונות->נהל חשבונות</b> שבחלון רשימת החברים"

 #, 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 "יש לעדכן את השדות הנחוצים."
@@ -10045,9 +9461,7 @@
 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"
@@ -10138,8 +9552,7 @@
 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
@@ -10368,8 +9781,7 @@

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

@@ -10390,15 +9802,11 @@
 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
@@ -10433,16 +9841,11 @@
 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 "שם:"
@@ -10567,9 +9970,7 @@
 msgid "Message (Nick Said) Text"
 msgstr "טקסט הודעות (מישהו אמר)"

-msgid ""
-"The text information for when a chat has an unread message that mentions "
-"your nick"
+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"
@@ -10588,8 +9989,7 @@
 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"
@@ -11211,45 +10611,19 @@
 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 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>"
 msgstr "<FONT SIZE=\"4\">ערוץ IRC:</FONT> #pidgin על irc.freenode.net<BR><BR>"

 #, c-format
@@ -11286,9 +10660,7 @@
 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"
@@ -11314,18 +10686,10 @@
 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 "הסר איש קשר"
@@ -11334,9 +10698,7 @@
 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"
@@ -11346,9 +10708,7 @@
 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"
@@ -11358,8 +10718,7 @@
 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"
@@ -11369,9 +10728,7 @@
 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"
@@ -11471,14 +10828,6 @@
 msgid "File transfer _details"
 msgstr "פרטי העברות קבצים"

-#. Pause button
-msgid "_Pause"
-msgstr "השהייה"
-
-#. Resume button
-msgid "_Resume"
-msgstr "ה_משך"
-
 msgid "Paste as Plain _Text"
 msgstr "הדבק בתור _טקסט רגיל"

@@ -11619,9 +10968,7 @@
 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."
@@ -11751,21 +11098,15 @@
 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?"
@@ -11873,8 +11214,7 @@
 "על ידי דיווח באג באתר:\n"
 "%ssimpleticket/\n"
 "\n"
-"יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ "
-"core.\n"
+"יש לפרט בדיוק מה עשית בזמן הנפילה, ולשלוח את הודעות ה-backtrace מהקובץ core.\n"
 "אם אינך יודע/ת להוציא את ה-backtrace, אנא קרא את ההוראות ב:\n"
 "%swiki/GetABacktrace\n"

@@ -11904,6 +11244,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "נתקבלה בקשה מאת %s להתחיל התקשרות וידאו איתך."

+msgid "Incoming Call"
+msgstr "שיחה נכנסת"
+
+msgid "_Pause"
+msgstr "השהייה"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -11927,8 +11273,7 @@
 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"
@@ -11961,9 +11306,7 @@
 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
@@ -12127,12 +11470,8 @@
 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 "סמל"
@@ -12245,12 +11584,8 @@
 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 "לא יכול להפעיל את תוכנת הגדרת שרת התיווך."
@@ -12631,8 +11966,7 @@
 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"
@@ -12699,20 +12033,14 @@
 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 "קבע להיות סמל איש הקשר"
@@ -12726,14 +12054,10 @@
 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
@@ -12744,12 +12068,8 @@
 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 ""
@@ -12776,8 +12096,7 @@
 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"
@@ -12944,11 +12263,8 @@
 msgid "Allows browsing and registering services."
 msgstr "מאפשר רישום ועיון ברשימת השירותים"

-msgid ""
-"This plugin is useful for registering with legacy transports or other XMPP "
-"services."
-msgstr ""
-"תוסף זה שימושי לטובת רישום עם פרוטוקולי תקשורת ישנים או שירותי XMPP אחרים."
+msgid "This plugin is useful for registering with legacy transports or other XMPP services."
+msgstr "תוסף זה שימושי לטובת רישום עם פרוטוקולי תקשורת ישנים או שירותי XMPP אחרים."

 msgid "Buddy is idle"
 msgstr "איש הקשר במנוחה"
@@ -12969,9 +12285,7 @@
 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"
+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"
@@ -12992,17 +12306,12 @@
 #. *< name
 #. *< version
 #. *< summary
-msgid ""
-"Allows for controlling the values associated with different buddy states."
+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 "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
+msgstr "מאפשר לשנות את ערכי הניקוד לחוסר פעילות/ריחוק/ניתוק אשר נעשה בו שימוש בחישובי הדירוג של אנשי הקשר."

 msgid "Conversation Colors"
 msgstr "צבעי שיחה"
@@ -13046,11 +12355,8 @@
 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 "מספר שיחות בכל חלון"
@@ -13074,9 +12380,7 @@

 #. *< 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
@@ -13110,14 +12414,12 @@

 #. *  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"
 " • גרור/י מעלה ואז ימינה לעבור לשיחה הבאה."
@@ -13141,12 +12443,8 @@
 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"
@@ -13287,9 +12585,7 @@
 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."
@@ -13329,12 +12625,8 @@
 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"
@@ -13521,12 +12813,8 @@
 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."
@@ -13557,11 +12845,8 @@
 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
@@ -13580,12 +12865,8 @@
 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 "כפילות בתיקונים"
@@ -13658,9 +12939,12 @@
 msgid "Founder"
 msgstr "מייסד"

+#. A user in a chat room who has special privileges.
 msgid "Operator"
 msgstr "מפעיל"

+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
 msgstr "חצי-מפעיל"

@@ -13801,9 +13085,7 @@
 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 "Opacity:"
@@ -13852,8 +13134,7 @@

 #. *  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 ""
@@ -13889,11 +13170,8 @@
 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>"
@@ -13932,306 +13210,220 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "תוסף זה שימושי לניפוי באגים בשרתים ולקוחות של XMPP."

+#~ 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 "לא ניתן למצוא כתובת שרת"

@@ -14240,53 +13432,39 @@
 #~ "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."
@@ -14301,10 +13479,8 @@
 #, fuzzy
 #~ msgid "Can not decrypt get server reply"
 #~ msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
-
 #~ msgid "Keep alive error"
 #~ msgstr "שגיאה בהשאר-חי"
-
 #~ msgid ""
 #~ "Lost connection with server:\n"
 #~ "%d, %s"
@@ -14315,93 +13491,65 @@
 #, 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 "
@@ -14409,93 +13557,64 @@
 #~ 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 "סוג דם"

@@ -14506,21 +13625,16 @@
 #, 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 "כישלון בהוספת איש-קשר עם בקשת אימות"

@@ -14531,13 +13645,10 @@
 #, fuzzy
 #~ msgid "QQ Number Error"
 #~ msgstr "מספר QQ"
-
 #~ msgid "Group Description"
 #~ msgstr "תיאור הקבוצה"
-
 #~ msgid "Auth"
 #~ msgstr "אימות"
-
 #~ msgid "Approve"
 #~ msgstr "אשר"

@@ -14552,30 +13663,24 @@
 #, 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 "האם ברצונך לאשר את הבקשה?"

@@ -14586,26 +13691,20 @@
 #, 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"

@@ -14616,7 +13715,6 @@
 #, fuzzy
 #~ msgid "Failed to connect all servers"
 #~ msgstr "כישלון בהתחברות לשרת"
-
 #~ msgid "Connecting server %s, retries %d"
 #~ msgstr "מתחבר עם שרת %s, ניסיונות %d"

@@ -14635,7 +13733,6 @@
 #, fuzzy
 #~ msgid "QQ Budy"
 #~ msgstr "איש הקשר"
-
 #~ msgid "%s wants to add you [%s] as a friend"
 #~ msgstr "%s רוצה להוסיף אותך [%s] כחבר"

@@ -14646,7 +13743,6 @@
 #, fuzzy
 #~ msgid "Would you add?"
 #~ msgstr "האם ברצונך להוסיף אותו?"
-
 #~ msgid "%s"
 #~ msgstr "%s"

@@ -14657,166 +13753,116 @@
 #, 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"
@@ -14825,10 +13871,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	Sun Aug 16 23:25:38 2009 +0000
+++ b/po/hu.po	Sun Aug 16 23:25:51 2009 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: pidgin 2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-31 12:01+0200\n"
-"PO-Revision-Date: 2009-07-31 11:58+0200\n"
+"POT-Creation-Date: 2009-08-14 20:04+0200\n"
+"PO-Revision-Date: 2009-08-14 19:58+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at gnome dot hu>\n"
 "MIME-Version: 1.0\n"
@@ -1787,6 +1787,7 @@
 msgstr "+++ %s kilépett"

 #. Unknown error
+#, c-format
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"

@@ -3922,14 +3923,12 @@
 msgid "Temporarily Hide From"
 msgstr "Ideiglenesen elrejt"

-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Jelenlét-értesítés törlése"

 msgid "(Re-)Request authorization"
 msgstr "Engedélyezés (újra)kérése"

-#. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
 msgid "Unsubscribe"
@@ -4685,9 +4684,6 @@
 msgid "Transfer was closed."
 msgstr "Az átvitel lezárva."

-msgid "Failed to open the file"
-msgstr "Nem sikerült megnyitni a fájlt"
-
 msgid "Failed to open in-band bytestream"
 msgstr "A bejövő adatfolyam megnyitása meghiúsult"

@@ -12201,7 +12197,7 @@
 "%swiki/GetABacktrace\n"
 msgstr ""
 "A %s %s összeomlott és megpróbált kiírni egy magfájlt.\n"
-"Ez a szoftver és nem az Ön hibája miatt történt.\n"
+"Ez a szoftver, és nem az Ön hibája miatt történt.\n"
 "\n"
 "Ha ismételten elő tudja állítani az összeomlást, akkor\n"
 "értesítse a Pidgin fejlesztőit a következő címen:\n"
@@ -12239,6 +12235,12 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s videókapcsolatot szeretne indítani."

+msgid "Incoming Call"
+msgstr "Bejövő hívás"
+
+msgid "_Pause"
+msgstr "_Szünet"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13178,9 +13180,6 @@
 msgid "_Open Mail"
 msgstr "_Levél megnyitása"

-msgid "_Pause"
-msgstr "_Szünet"
-
 msgid "_Edit"
 msgstr "S_zerkesztés"

@@ -14316,6 +14315,3 @@
 msgstr ""
 "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez "
 "hasznos."
-
-#~ msgid "_Resume"
-#~ msgstr "_Folytatás"
--- a/po/nn.po	Sun Aug 16 23:25:38 2009 +0000
+++ b/po/nn.po	Sun Aug 16 23:25:51 2009 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-02 23:34-0700\n"
-"PO-Revision-Date: 2009-08-01 13:29+0100\n"
+"POT-Creation-Date: 2009-08-09 19:06-0700\n"
+"PO-Revision-Date: 2009-08-09 02:41+0100\n"
 "Last-Translator: Yngve Spjeld Landro <nynorsk@landro.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -12132,6 +12132,9 @@
 msgid "%s wishes to start a video session with you."
 msgstr "%s ønskjer å starta ei biletøkt med deg."

+msgid "_Pause"
+msgstr "_Pause"
+
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -12673,7 +12676,7 @@
 "(%s for filnamn)"

 msgid "M_ute sounds"
-msgstr "&Demp lydar"
+msgstr "_Demp lydar"

 msgid "Sounds when conversation has _focus"
 msgstr "Lydar medan samtalevindauget har _fokus"
@@ -12688,7 +12691,7 @@
 msgstr "Spel"

 msgid "_Browse..."
-msgstr "Bla &gjennom…"
+msgstr "Bla _gjennom…"

 msgid "_Reset"
 msgstr "_Nullstill"
@@ -13068,9 +13071,6 @@
 msgid "_Open Mail"
 msgstr "_Opna e-post"

-msgid "_Pause"
-msgstr "_Pause"
-
 msgid "_Edit"
 msgstr "_Endra"
--- a/po/ro.po	Sun Aug 16 23:25:38 2009 +0000
+++ b/po/ro.po	Sun Aug 16 23:25:51 2009 +0000
@@ -1,14 +1,15 @@
 # Pidgin Romanian translation
 # This file is distributed under the same license as the Pidgin package.
-# Copyright (C) 2002-2008, Mișu Moldovan <dumol@gnome.ro>
+# 2002-2009, Mișu Moldovan <dumol@gnome.ro>
+# 2009, Andrei Popescu <andreimpopescu@gmail.com>
 # Contributions: 2007, Alexandru Szasz <alexxed@gmail.com>
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin-2.5.3\n"
+"Project-Id-Version: pidgin-2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-06 15:04-0700\n"
-"PO-Revision-Date: 2009-01-07 00:42+0200\n"
+"POT-Creation-Date: 2009-08-08 09:57-0400\n"
+"PO-Revision-Date: 2009-08-13 01:42+0300\n"
 "Last-Translator: Mișu Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
@@ -26,7 +27,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Încercați „%s -h” pentru mai multe informații.\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -871,12 +872,11 @@
 msgid "System Log"
 msgstr "Înregistrări de sistem"

-#, fuzzy
 msgid "Calling ... "
-msgstr "Se calculează..."
+msgstr "Se apelează..."

 msgid "Hangup"
-msgstr ""
+msgstr "Închide"

 #. Number of actions
 msgid "Accept"
@@ -886,25 +886,24 @@
 msgstr "Respingere"

 msgid "Call in progress."
-msgstr ""
+msgstr "Apel în curs."

 msgid "The call has been terminated."
-msgstr ""
+msgstr "Apelul a fost încheiat."

 #, c-format
 msgid "%s wishes to start an audio session with you."
-msgstr ""
+msgstr "%s dorește să inițieze o sesiune audio."

 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr ""
-
-#, fuzzy
+msgstr "%s încearcă să inițieze o sesiune media nesuportată."
+
 msgid "You have rejected the call."
-msgstr "Ați părăsit chat-ul%s%s"
+msgstr "Ați refuzat apelul"

 msgid "call: Make an audio call."
-msgstr ""
+msgstr "apelează: inițiază un apel audio"

 msgid "Emails"
 msgstr "Mailuri"
@@ -1370,7 +1369,7 @@
 msgstr "Activare"

 msgid "Invalid title"
-msgstr "Titlu invalid"
+msgstr "Titlu nevalid"

 msgid "Please enter a non-empty title for the status."
 msgstr "Introduceți un titlu de cel puțin un caracter pentru status."
@@ -1474,7 +1473,7 @@
 msgstr "Fă și zgomot!"

 msgid "Set URGENT for the terminal window."
-msgstr "Schimbă starea fereastrei terminalului în URGENT"
+msgstr "Schimbă starea ferestrei terminalului în URGENT"

 msgid "GntGf"
 msgstr "GntGf"
@@ -1562,22 +1561,23 @@
 "\n"
 "Fetching TinyURL..."
 msgstr ""
+"\n"
+"Se creează un TinyURL..."

 msgid "Only create TinyURL for urls of this length or greater"
-msgstr ""
+msgstr "Creează TinyURL numai pentru URL-uri de această lungime sau mai mari"

 msgid "TinyURL (or other) address prefix"
-msgstr ""
-
-#, fuzzy
+msgstr "Prefixul adresei TinyURL (sau altceva)"
+
 msgid "TinyURL"
-msgstr "URL piesă curentă"
+msgstr "TinyURL"

 msgid "TinyURL plugin"
-msgstr ""
+msgstr "Modul TinyURL"

 msgid "When receiving a message with URL(s), TinyURL for easier copying"
-msgstr ""
+msgstr "Când primiți un mesaj cu URL-uri, folosiți TinyURL pentru copiere mai ușoară"

 msgid "accounts"
 msgstr "conturi"
@@ -1682,6 +1682,45 @@
 msgid "_View Certificate..."
 msgstr "_Vizualizare certificat..."

+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Certificatul prezentat de „%s” pretinde însă că e de la „%s”. Aceast ar "
+"putea însemna că nu vă conectați la serviciul la care credeți că vă "
+"conectați."
+
+#. Had no CA pool, so couldn't verify the chain *and*
+#. * the subject name isn't valid.
+#. * I think this is bad enough to warrant a fatal error. It's
+#. * not likely anyway...
+#.
+#. TODO: Probably wrong.
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+#. TODO: Probably wrong.
+msgid "SSL Certificate Error"
+msgstr "Eroare în certificatul SSL"
+
+msgid "Invalid certificate chain"
+msgstr "Lanț de certificare nevalid"
+
+#. The subject name is correct, but we weren't able to verify the
+#. * chain because there was no pool of root CAs found. Prompt the user
+#. * to validate it.
+#.
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Nu aveți o bază de date de certificate root, deci acest certificat nu poate "
+"fi validat."
+
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
 #, c-format
@@ -1692,29 +1731,11 @@
 "Certificatul prezentat de „%s” este semnat în nume propriu. Nu poate fi "
 "verificat automat."

+#. FIXME 2.6.1
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Lanțul de certificare prezentat de %s nu este valid."

-#. TODO: Make this error either block the ensuing SSL
-#. connection error until the user dismisses this one, or
-#. stifle it.
-#. TODO: Probably wrong.
-#. TODO: Probably wrong
-msgid "SSL Certificate Error"
-msgstr "Eroare în certificatul SSL"
-
-msgid "Invalid certificate chain"
-msgstr "Lanț de certificare invalid"
-
-#. vrq will be completed by user_auth
-msgid ""
-"You have no database of root certificates, so this certificate cannot be "
-"validated."
-msgstr ""
-"Nu aveți o bază de date de certificate root, deci acest certificat nu poate "
-"fi validat."
-
 #. vrq will be completed by user_auth
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
@@ -1732,20 +1753,7 @@
 "la autoritatea de certificare cu care pretinde că a fost creat."

 msgid "Invalid certificate authority signature"
-msgstr "Semnătura invalidă de la autoritatea de certificare"
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
-"Certificatul prezentat de „%s” pretinde însă că e de la „%s”. Aceast ar "
-"putea însemna că nu vă conectați la serviciul la care credeți că vă "
-"conectați."
+msgstr "Semnătură nevalidă de la autoritatea de certificare"

 #. Make messages
 #, c-format
@@ -1783,7 +1791,7 @@
 msgstr "+++ %s s-a deconectat"

 #. Unknown error
-#. Unknown error!
+#, c-format
 msgid "Unknown error"
 msgstr "Eroare necunoscută"

@@ -1830,9 +1838,8 @@
 msgid "%s left the room (%s)."
 msgstr "%s a ieșit din chat (%s)."

-#, fuzzy
 msgid "Invite to chat"
-msgstr "Invită într-o conferință"
+msgstr "Invită într-un chat"

 #. Put our happy label in it.
 msgid ""
@@ -1973,6 +1980,10 @@
 msgstr "Se inițiază transferul fișierului %s de la %s"

 #, c-format
+msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
+msgstr "Transferul fișierului <A HREF=\"file://%s\">%s</A> s-a terminat"
+
+#, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transferul fișierului %s s-a terminat"

@@ -2195,9 +2206,8 @@
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <Răspuns-Automat>: %s\n"

-#, fuzzy
 msgid "Error creating conference."
-msgstr "Eroare la stabilirea conexiunii"
+msgstr "Eroare la inițierea conferinței"

 #, c-format
 msgid "You are using %s, but this plugin requires %s."
@@ -2518,8 +2528,8 @@
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"Sunteți momentan deconectat(ă). Nu veți mai primi mesaje până la următoarea "
-"autentificare."
+"Contul vă este momentan deconectat. Nu veți mai primi mesaje până la "
+"următoarea autentificare."

 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Mesajul nu a putut fi trimis pentru că a depășit mărimea maximă."
@@ -2599,7 +2609,6 @@
 msgstr "Importă înregistrările altor clienți IM."

 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2608,8 +2617,7 @@
 "at your own risk!"
 msgstr ""
 "La consultarea înregistrărilor, acest modul va include înregistrările din "
-"alți clienți IM precum: Adium, Fire, Messenger Plus!, MSN Messenger și "
-"Trillian.\n"
+"alți clienți IM precum: Adium, MSN Messenger, aMSN și Trillian.\n"
 "\n"
 "Atenție! Acest modul este în stadiu alpha și e instabil."

@@ -2656,13 +2664,12 @@
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Salvează ca întâmpinare mesajele trimise unui utilizator deconectat."

-#, fuzzy
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 "Restul de mesaje vor fi salvate ca întâmpinare. Puteți apoi edita sau șterge "
-"întâmpinarea din fereastra de editare a întâmpinărilor."
+"întâmpinarea din fereastra „Întâmpinări contacte”."

 #, c-format
 msgid ""
@@ -2692,9 +2699,8 @@
 msgid "Do not ask. Always save in pounce."
 msgstr "Nu întreba. Salvează într-o întâmpinare întotdeauna."

-#, fuzzy
 msgid "One Time Password"
-msgstr "Introduceți parola"
+msgstr "Parolă de unică folosință"

 #. *< type
 #. *< ui_requirement
@@ -2703,13 +2709,13 @@
 #. *< priority
 #. *< id
 msgid "One Time Password Support"
-msgstr ""
+msgstr "Suport pentru parole de unică folosință"

 #. *< name
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Impune ca parolele să fie folosite o singură dată"

 #. *  description
 msgid ""
@@ -2717,6 +2723,9 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Vă permite să impuneți pentru fiecare cont ca parolele ce nu sunt salvate "
+"să fie folosite pentru o singură conectare cu succes.\n"
+"Notă: Parola contului trebuie să nu fie salvată pentru a funcționa."

 #. *< type
 #. *< ui_requirement
@@ -2909,7 +2918,6 @@
 "Nu s-a detectat o instalare ActiveTCL. Dacă doriți să utilizați module TCL, "
 "instalați ActiveTCL de la http://www.activestate.com\n"

-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
@@ -2917,10 +2925,8 @@
 "Nu s-a găsit Apple Bonjour pentru Windows, pentru detalii consultați: http://"
 "d.pidgin.im/BonjourWindows ."

-#, fuzzy
 msgid "Unable to listen for incoming IM connections"
-msgstr ""
-"Utilizarea interfaței de rețea pentru a detecta noi conexiuni IM a eșuat\n"
+msgstr "Nu se poate asculta pentru noi conexiuni IM"

 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -2958,9 +2964,8 @@
 msgstr "Persoană Purple"

 #. Creating the options for the protocol
-#, fuzzy
 msgid "Local Port"
-msgstr "Localitate"
+msgstr "Port local"

 msgid "Bonjour"
 msgstr "Bonjour"
@@ -2972,33 +2977,31 @@
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Nu s-a putut trimite mesajul, discuția nu a putut fi inițiată."

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to create socket: %s"
 msgstr ""
-"Nu s-a putut crea un socket:\n"
-"%s"
-
-#, fuzzy, c-format
+"Nu s-a putut crea un socket: %s"
+
+#, c-format
 msgid "Unable to bind socket to port: %s"
-msgstr "Nu se poate face bind pentru socket pe port"
-
-#, fuzzy, c-format
+msgstr "Nu s-a putut lega socketul de port: %s"
+
+#, c-format
 msgid "Unable to listen on socket: %s"
 msgstr ""
-"Nu s-a putut crea un socket:\n"
-"%s"
+"Nu se poate asculta la socketul: %s"

 msgid "Error communicating with local mDNSResponder."
 msgstr "Eroare de comunicare locală cu mDNSResponder."

 msgid "Invalid proxy settings"
-msgstr "Opțiuni proxy invalide"
+msgstr "Opțiuni proxy greșite"

 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"Numele serverului sau portul precizat pentru tipul proxy-ului sunt invalide."
+"Numele serverului sau portul precizat pentru tipul proxy-ului sunt greșite."

 msgid "Token Error"
 msgstr "Eroare verificare"
@@ -3034,17 +3037,14 @@
 msgid "Load buddylist from file..."
 msgstr "Încarcă lista de contacte din fișierul..."

-#, fuzzy
 msgid "You must fill in all registration fields"
-msgstr "Completați câmpurile de înregistrare."
-
-#, fuzzy
+msgstr "Trebuie să completați toate câmpurile de înregistrare."
+
 msgid "Passwords do not match"
 msgstr "Parolele nu se potrivesc."

-#, fuzzy
 msgid "Unable to register new account.  An unknown error occurred."
-msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare.\n"
+msgstr "Noul cont nu poate fi înregistrat. A intervenit o eroare necunoscută."

 msgid "New Gadu-Gadu Account Registered"
 msgstr "Noul cont Gadu-Gadu a fost înregistrat"
@@ -3059,11 +3059,10 @@
 msgstr "Confirmare parolă"

 msgid "Enter captcha text"
-msgstr ""
-
-#, fuzzy
+msgstr "Introduceți textul captcha"
+
 msgid "Captcha"
-msgstr "Salvează imaginea"
+msgstr "Imagine captcha"

 msgid "Register New Gadu-Gadu Account"
 msgstr "Înregistrare cont nou Gadu-Gadu"
@@ -3202,9 +3201,9 @@
 msgid "Chat _name:"
 msgstr "_Nume chat:"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Conectarea la server a eșuat."
+msgstr "Nu se poate rezolva numele calculatorului '%s': %s"

 #. 1. connect to server
 #. connect to the server
@@ -3217,7 +3216,6 @@
 msgid "This chat name is already in use"
 msgstr "Există deja un chat cu acest nume"

-#, fuzzy
 msgid "Not connected to the server"
 msgstr "Neconectat la server."

@@ -3260,9 +3258,8 @@
 msgid "Gadu-Gadu User"
 msgstr "Utilizator Gadu-Gadu"

-#, fuzzy
 msgid "GG server"
-msgstr "Introducere detalii..."
+msgstr "Server GG"

 #, c-format
 msgid "Unknown command: %s"
@@ -3278,9 +3275,8 @@
 msgid "File Transfer Failed"
 msgstr "Transferul fișierului a eșuat"

-#, fuzzy
 msgid "Unable to open a listening port."
-msgstr "Nu s-a putut deschide un port pentru a asculta."
+msgstr "Nu s-a putut deschide un port pentru ascultare."

 msgid "Error displaying MOTD"
 msgstr "Eroare la afișarea MOTD"
@@ -3302,11 +3298,10 @@
 #.
 #. TODO: what to do here - do we really have to disconnect?
 #. TODO: do we really want to disconnect on a failure to write?
-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with server: %s"
 msgstr ""
-"S-a pierdut conexiunea cu serverul:\n"
-"%s"
+"S-a pierdut conexiunea cu serverul: %s"

 msgid "View MOTD"
 msgstr "Afișare MOTD"
@@ -3317,9 +3312,8 @@
 msgid "_Password:"
 msgstr "_Parolă:"

-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "Pseudonimele IRC nu pot conține spații"
+msgstr "Pseudonimele și serverele IRC nu pot conține spații"

 msgid "SSL support unavailable"
 msgstr "Suportul SSL nu este disponibil"
@@ -3328,11 +3322,11 @@
 msgstr "Conectare eșuată"

 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
-msgstr "Conectarea la %s a eșuat"
-
-#, fuzzy, c-format
+msgstr "Conectarea a eșuat: %s"
+
+#, c-format
 msgid "Server closed the connection"
 msgstr "Serverul a închis conexiunea."

@@ -3499,32 +3493,31 @@
 msgstr "mod (%s %s) de către %s"

 msgid "Invalid nickname"
-msgstr "Pseudonim invalid"
+msgstr "Pseudonim greșit"

 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "Pseudonimul ales a fost respins de către server. Probabil conține caractere "
-"invalide."
+"nevalide."

 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
 "Numele de cont ales a fost respins de către server. Probabil conține "
-"caractere invalide."
+"caractere nevalide."

 #. We only want to do the following dance if the connection
 #. has not been successfully completed.  If it has, just
 #. notify the user that their /nick command didn't go.
-#, fuzzy, c-format
+#, c-format
 msgid "The nickname \"%s\" is already being used."
-msgstr "Există deja un chat cu acest nume"
-
-#, fuzzy
+msgstr "Pseudonimul „%s” este deja utilizat."
+
 msgid "Nickname in use"
-msgstr "Pseudonim"
+msgstr "Pseudonim utilizat deja"

 msgid "Cannot change nick"
 msgstr "Nu se reușește schimbarea pseudonimului"
@@ -3537,7 +3530,7 @@
 msgstr "Ați părăsit chat-ul%s%s"

 msgid "Error: invalid PONG from server"
-msgstr "Eroare: PONG invalid de la server"
+msgstr "Eroare: PONG nevalid de la server"

 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
@@ -3768,13 +3761,11 @@
 msgid "execute"
 msgstr "execută"

-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel de "
+"Serverul necesită TLS/SSL, dar nu s-a găsit nici un fel de "
 "suport TLS/SSL."

-#, fuzzy
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr "Ați cerut criptare, dar nu s-a găsit nici un fel de suport TLS/SSL."

@@ -3792,13 +3783,11 @@
 msgid "Plaintext Authentication"
 msgstr "Autentificare în clar (plaintext)"

-#, fuzzy
 msgid "SASL authentication failed"
-msgstr "Autentificare eșuată"
-
-#, fuzzy
+msgstr "Autentificare SASL eșuată"
+
 msgid "Invalid response from server"
-msgstr "Răspuns invalid de la server."
+msgstr "Răspuns nevalid de la server."

 msgid "Server does not use any supported authentication method"
 msgstr "Serverul nu utilizează o metodă cunoscută de autentificare"
@@ -3807,38 +3796,32 @@
 msgstr "Ați cerut criptare, dar serverul nu suportă criptare"

 msgid "Invalid challenge from server"
-msgstr "Cerere invalidă de la server"
-
-#, fuzzy, c-format
+msgstr "Cerere nevalidă de la server"
+
+#, c-format
 msgid "SASL error: %s"
-msgstr "Eroare SASL"
+msgstr "Eroare SASL: %s"

 msgid "The BOSH connection manager terminated your session."
-msgstr ""
-
-#, fuzzy
+msgstr "Managerul de conexiune BOSH a încheiat sesiunea."
+
 msgid "No session ID given"
-msgstr "Fără motiv."
-
-#, fuzzy
+msgstr "Nu s-a primit un identificator de sesiune"
+
 msgid "Unsupported version of BOSH protocol"
-msgstr "Versiune nesuportată"
-
-#, fuzzy
+msgstr "Versiune nesuportată de protocol BOSH"
+
 msgid "Unable to establish a connection with the server"
 msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
-
-#, fuzzy, c-format
+"Nu s-a putut face o conexiune cu serverul"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
 msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
-
-#, fuzzy
+"Nu s-a putut face o conexiune cu serverul: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Nu se poate inițializa o nouă conexiune"
+msgstr "Nu se poate inițializa conexiunea SSL"

 msgid "Full Name"
 msgstr "Nume complet"
@@ -3855,6 +3838,11 @@
 msgid "Street Address"
 msgstr "Adresă locală"

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

@@ -3906,9 +3894,8 @@
 msgid "Operating System"
 msgstr "Sistem de operare"

-#, fuzzy
 msgid "Local Time"
-msgstr "Fișier local:"
+msgstr "Ora locală"

 msgid "Priority"
 msgstr "Prioritate"
@@ -3918,11 +3905,10 @@

 #, c-format
 msgid "%s ago"
-msgstr ""
-
-#, fuzzy
+msgstr "acum %s"
+
 msgid "Logged Off"
-msgstr "Autentificat"
+msgstr "Deconectat"

 msgid "Middle Name"
 msgstr "Inițială"
@@ -3945,14 +3931,12 @@
 msgid "Temporarily Hide From"
 msgstr "Ascunde-mă temporar de"

-#. && NOT ME
 msgid "Cancel Presence Notification"
 msgstr "Anulează notificarea prezenței"

 msgid "(Re-)Request authorization"
 msgstr "Solicit (din nou) autorizare"

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

 msgid "Invalid Directory"
-msgstr "Director invalid"
+msgstr "Director nevalid"

 msgid "Enter a User Directory"
 msgstr "Introduceți un director cu utilizatori"
@@ -4043,21 +4027,21 @@
 msgstr "%s nu este un nume valid de chat"

 msgid "Invalid Room Name"
-msgstr "Nume invalid de chat"
+msgstr "Nume incorect de chat"

 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s nu este un nume valid de server"

 msgid "Invalid Server Name"
-msgstr "Nume invalid de contact"
+msgstr "Nume incorect de contact"

 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s nu este un nume valid de chat"

 msgid "Invalid Room Handle"
-msgstr "Titlu invalid de chat"
+msgstr "Titlu incorect de chat"

 msgid "Configuration error"
 msgstr "Eroare de configurare"
@@ -4081,7 +4065,7 @@
 msgstr "Eroare la obținerea listei camerelor de chat"

 msgid "Invalid Server"
-msgstr "Server invalid"
+msgstr "Server nevalid"

 msgid "Enter a Conference Server"
 msgstr "Conectare la un server de conferințe"
@@ -4092,36 +4076,32 @@
 msgid "Find Rooms"
 msgstr "Caută camere de chat"

-#, fuzzy
 msgid "Affiliations:"
-msgstr "Alias:"
-
-#, fuzzy
+msgstr "Afilieri:"
+
 msgid "No users found"
-msgstr "Nu s-au găsit utilizatori care să corespundă"
-
-#, fuzzy
+msgstr "Nu s-au găsit utilizatori"
+
 msgid "Roles:"
-msgstr "Funcție"
-
-#, fuzzy
+msgstr "Roluri:"
+
 msgid "Ping timed out"
-msgstr "Expirare ping"
+msgstr "Ping expirat"

 msgid ""
 "Unable to find alternative XMPP connection methods after failing to connect "
 "directly."
 msgstr ""
+"Nu s-au găsit metode XMPP alternative de conectare după eșuarea conexiunii directe."

 msgid "Invalid XMPP ID"
-msgstr "ID XMPP invalid"
+msgstr "ID XMPP nevalid"

 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "ID XMPP invalid. Trebuie precizat domeniul."
-
-#, fuzzy
+msgstr "ID XMPP nevalid. Trebuie precizat domeniul."
+
 msgid "Malformed BOSH URL"
-msgstr "Conectarea la server a eșuat."
+msgstr "URL BOSH nevalid"

 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4190,10 +4170,6 @@
 msgid "Change Registration"
 msgstr "Modificare înregistrare"

-#, fuzzy
-msgid "Malformed BOSH Connect Server"
-msgstr "Conectarea la server a eșuat."
-
 msgid "Error unregistering account"
 msgstr "Eroare la ștergerea contului înregistrat"

@@ -4305,7 +4281,7 @@
 msgstr "Căutare utilizatori..."

 msgid "Bad Request"
-msgstr "Cerere invalidă"
+msgstr "Cerere nevalidă"

 msgid "Conflict"
 msgstr "Conflict"
@@ -4326,7 +4302,7 @@
 msgstr "Elementul nu a fost găsit"

 msgid "Malformed XMPP ID"
-msgstr "ID XMPP invalid"
+msgstr "ID XMPP nevalid"

 msgid "Not Acceptable"
 msgstr "Inacceptabil"
@@ -4368,10 +4344,10 @@
 msgstr "Codare incorectă la autorizare"

 msgid "Invalid authzid"
-msgstr "„Authzid” invalid"
+msgstr "„Authzid” nevalid"

 msgid "Invalid Authorization Mechanism"
-msgstr "Mecanism invalid de autorizare"
+msgstr "Mecanism nevalid de autorizare"

 msgid "Authorization mechanism too weak"
 msgstr "Mecanism de autorizare insuficient de sigur"
@@ -4395,25 +4371,25 @@
 msgstr "Conexiunea a expirat"

 msgid "Host Gone"
-msgstr "Gazda a dispărut"
+msgstr "Serverul nu mai e prezent"

 msgid "Host Unknown"
-msgstr "Gazdă necunoscută"
+msgstr "Server necunoscut"

 msgid "Improper Addressing"
 msgstr "Adresare neadecvată"

 msgid "Invalid ID"
-msgstr "Identitate invalidă"
+msgstr "Identitate nevalidă"

 msgid "Invalid Namespace"
-msgstr "„Namespace” invalid"
+msgstr "„Namespace” nevalid"

 msgid "Invalid XML"
-msgstr "XML invalid"
+msgstr "XML nevalid"

 msgid "Non-matching Hosts"
-msgstr "Gazdele nu se potrivesc"
+msgstr "Numele de server nu se potrivesc"

 msgid "Policy Violation"
 msgstr "Normele au fost încălcate"
@@ -4428,7 +4404,7 @@
 msgstr "XML restrictiv"

 msgid "See Other Host"
-msgstr "Verificați cealaltă gazdă"
+msgstr "Verificați celălalt nume de server"

 msgid "System Shutdown"
 msgstr "Închidere sistem"
@@ -4479,23 +4455,23 @@
 msgid "Unable to ping user %s"
 msgstr "Nu se poate da „ping” către utilizatorul %s"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr ""
-"Nu se poate da „buzz” pentru că nu se știe nimic despre utilizatorul %s."
-
-#, fuzzy, c-format
+"Nu se poate da „buzz” pentru că nu se știe nimic despre %s."
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr ""
 "Nu se poate da „buzz” pentru că utilizatorul %s ar putea fi deconectat."

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
 msgstr ""
 "Nu se poate da „buzz” pentru că aplicația utilizatorului „%s” nu suportă "
-"acest lucru."
+"acest lucru sau nu dorește să primească „buzz” acum."

 #, c-format
 msgid "Buzzing %s..."
@@ -4510,35 +4486,33 @@
 msgid "%s has buzzed you!"
 msgstr "%s v-a dat „buzz”!"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Nu se poate trimite fișierul către %s, JID invalid"
-
-#, fuzzy, c-format
+msgstr "Nu se poate iniția media cu %s, JID nevalid"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Nu se poate trimite fișierul către %s, contactul nu este conectat"
-
-#, fuzzy, c-format
+msgstr "Nu se poate iniția media cu %s, contactul nu este conectat"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
-msgstr "Nu se poate trimite fișierul către %s, nu e subscris pentru prezență"
-
-#, fuzzy
+msgstr "Nu se poate iniția media cu %s, nu e subscris pentru prezență"
+
 msgid "Media Initiation Failed"
-msgstr "Înregistrare eșuată"
-
-#, fuzzy, c-format
+msgstr "Inițializare media eșuată"
+
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
 msgstr ""
-"Precizați cărei resurse a contactului %s doriți să-i trimiteți fișierul"
+"Precizați cu ce resursă a contactului %s ați dori să porniți o sesiune media."

 msgid "Select a Resource"
 msgstr "Selectați o resursă"

-#, fuzzy
 msgid "Initiate Media"
-msgstr "Inițiază o _discuție"
+msgstr "Inițiază media"

 msgid "config:  Configure a chat room."
 msgstr "config:  Configurați o cameră de chat."
@@ -4559,21 +4533,19 @@
 msgstr ""
 "ban &lt;nume utilizator&gt; [chat]:  Blocați accesul unui utilizator în chat."

-#, fuzzy
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;nume ales&gt; &lt;deținător|administrator|membru|renegat|"
-"niciuna&gt;:  Setați afilierea unui utilizator față de camera de chat."
-
-#, fuzzy
+"affiliate &lt;deținător|administrator|membru|renegat|nimic&gt; [pseudonim1] [pseudonim2] ...:"
+" Aflați utilizatorii cu o afiliere sau setați afilierea utilizatorilor față de camera de chat."
+
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with an role or set users' role with the room."
 msgstr ""
-"role &lt;nume ales&gt; &lt;moderator|participant|vizitator|niciunul&gt;:  "
-"Setați rolul unui utilizator în camera de chat."
+"role &lt;moderator|participant|vizitator|nimic&gt; [pseudonim1] [pseudonim2] ...: "
+"Aflați utilizatorii cu un rol sau setați rolul utilizatorilor în camera de chat."

 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;nume ales&gt; [chat]:  Invitați un utilizator într-un chat."
@@ -4635,7 +4607,7 @@
 msgstr "Servere proxy pentru transfer de fișiere"

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

 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4699,32 +4671,28 @@
 msgid "_Accept Defaults"
 msgstr "_Opțiuni implicite"

-#, fuzzy
 msgid "No reason"
 msgstr "Fără motiv."

-#, fuzzy, c-format
+#, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Ați fost dat afară din %s: (%s)"
-
-#, fuzzy, c-format
+msgstr "Ați fost dat afară: (%s)"
+
+#, c-format
 msgid "Kicked (%s)"
-msgstr "Respins de %s: (%s)"
-
-#, fuzzy
+msgstr "Dat afară (%s)"
+
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "A apărut o eroare la deschiderea fișierului."
-
-#, fuzzy
+msgstr "A apărut o eroare la transferul de octeți în-bandă\n"
+
 msgid "Transfer was closed."
-msgstr "Transferul fișierului a eșuat"
-
-#, fuzzy
+msgstr "Transferul a fost închis"
+
 msgid "Failed to open the file"
-msgstr "Nu s-a putut deschide fișierul „%s”: %s"
+msgstr "Nu s-a putut deschide fișierul"

 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Nu s-a putut deschide fluxul de octeți în-bandă"

 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4736,7 +4704,7 @@

 #, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Nu se poate trimite fișierul către %s, JID invalid"
+msgstr "Nu se poate trimite fișierul către %s, JID nevalid"

 #, c-format
 msgid "Unable to send file to %s, user is not online"
@@ -4828,7 +4796,7 @@

 #, c-format
 msgid "Invalid email address"
-msgstr "Adresă de mail invalidă"
+msgstr "Adresă de mail nevalidă"

 #, c-format
 msgid "User does not exist"
@@ -4844,11 +4812,11 @@

 #, c-format
 msgid "Invalid username"
-msgstr "Nume invalid de utilizator"
+msgstr "Nume nevalid de utilizator"

 #, c-format
 msgid "Invalid friendly name"
-msgstr "Pseudonimul propriu este invalid"
+msgstr "Pseudonimul propriu este nevalid"

 #, c-format
 msgid "List full"
@@ -4880,7 +4848,7 @@

 #, c-format
 msgid "Invalid group"
-msgstr "Grup invalid"
+msgstr "Grup nevalid"

 #, c-format
 msgid "User not in group"
@@ -4992,7 +4960,7 @@

 #, c-format
 msgid "Bad friend file"
-msgstr "Fișier invalid"
+msgstr "Fișier „friend” nevalid"

 #, c-format
 msgid "Not expected"
@@ -5047,11 +5015,26 @@
 msgid "Non-IM Contacts"
 msgstr "Contacte de alt tip"

-#, fuzzy, c-format
+#, c-format
+msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
+msgstr "%s a trimis un wink. <a href='msn-wink://%s'>Apăsați aici pentru a-l reda</a>"
+
+#, c-format
+msgid "%s sent a wink, but it could not be saved"
+msgstr "%s a trimis un wink, dar nu a putut fi salvat"
+
+#, c-format
+msgid "%s sent a voice clip. <a href='audio://%s'>Click here to play it</a>"
+msgstr "%s a trimis un clip audio. <a href='audio://%s'>Apăsați aici pentru a-l reda</a>"
+
+#, c-format
+msgid "%s sent a voice clip, but it could not be saved"
+msgstr "%s a trimis un clip audio, dar acesta nu a putut fi salvat"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s v-a trimis o invitație de a-i vedea webcam-ul, invitație ce nu este încă "
-"suportată"
+"%s v-a trimis o invitație de chat audio, pentru care nu există încă suport."

 msgid "Nudge"
 msgstr "Buzz"
@@ -5205,6 +5188,29 @@
 msgstr ""
 "Pentru MSN aveți nevoie de suport SSL. Instalați bibliotecile SSL necesare. "

+#, c-format
+msgid ""
+"Unable to add the buddy %s because the username is invalid.  Usernames must "
+"be a valid email address."
+msgstr ""
+"Nu se poate adăuga contactul %s deoarece numele de utilizator este nevalid. "
+"Un nume valid trebuie să fie o adresă de mail."
+
+msgid "Unable to Add"
+msgstr "Adăugare eșuată"
+
+msgid "Authorization Request Message:"
+msgstr "Mesaj cerere de autorizare:"
+
+msgid "Please authorize me!"
+msgstr "Am nevoie de autorizare..."
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_OK"
+
 msgid "Error retrieving profile"
 msgstr "Eroare la descărcarea profilului"

@@ -5391,19 +5397,20 @@
 msgstr "Autentificare Windows Live ID: Conectare eșuată"

 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Autentificare Windows Live ID: Răspuns invalid"
+msgstr "Autentificare Windows Live ID: Răspuns nevalid"

 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s vă sâcâie cu un „nudge”!"

-#, fuzzy, c-format
+#, c-format
 msgid "Unknown error (%d): %s"
-msgstr "Eroare necunoscută (%d)"
+msgstr "Eroare necunoscută (%d): %s"

 msgid "Unable to add user"
 msgstr "Nu se poate adăuga utilizatorul"

+#. Unknown error!
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Eroare necunoscută (%d)"
@@ -5430,18 +5437,20 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"Serverul MSN va fi închis pentru întreținere într-un minut. Veți fi automat "
-"deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile începute.\n"
+"Serverul MSN va fi închis pentru întreținere într-un minut. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
+"începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
 msgstr[1] ""
-"Serverul MSN va fi închis pentru întreținere în %d minute. Veți fi automat "
-"deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile începute.\n"
+"Serverul MSN va fi închis pentru întreținere în %d minute. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
+"începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
 msgstr[2] ""
-"Serverul MSN va fi închis pentru întreținere în %d de minute. Veți fi "
-"automat deconectat(ă) în acel moment. Vă rugăm să încheiați discuțiile "
+"Serverul MSN va fi închis pentru întreținere în %d de minute. Contul vă "
+"va fi automat deconectat în acel moment. Vă rugăm să încheiați discuțiile "
 "începute.\n"
 "\n"
 "Veți putea să vă autentificați din nou după încheierea operațiunii."
@@ -5477,22 +5486,18 @@
 "Eroare de conectare de la serverul %s:\n"
 "%s"

-#, fuzzy
 msgid "Our protocol is not supported by the server"
 msgstr "Protocolul utilizat nu este suportat de către server."

-#, fuzzy
 msgid "Error parsing HTTP"
 msgstr "Eroare la prelucrarea datelor HTTP."

-#, fuzzy
 msgid "You have signed on from another location"
 msgstr "V-ați autentificat din altă parte."

 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr "Serverele MSN sunt temporar indisponibile. Reîncercați mai târziu."

-#, fuzzy
 msgid "The MSN servers are going down temporarily"
 msgstr "Serverele MSN vor fi oprite momentan."

@@ -5523,17 +5528,15 @@
 msgid "Retrieving buddy list"
 msgstr "Se descarcă lista de contacte"

-#, fuzzy, c-format
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
-"%s v-a trimis o invitație de a-i vedea webcam-ul, invitație ce nu este încă "
-"suportată"
+msgstr "%s v-a cerut o permisiune de acces la webcam, dar această cerere nu "
+"este încă suportată"

 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
-"%s v-a trimis o invitație de a-i vedea webcam-ul, invitație ce nu este încă "
-"suportată"
+msgstr "%s v-a trimis o invitație de acces la webcam, invitație ce nu este "
+"încă suportată"

 msgid "Away From Computer"
 msgstr "Absent din fața calculatorului"
@@ -5583,7 +5586,7 @@
 msgstr "Doriți să ștergeți acest contact din lista de contacte?"

 msgid "The username specified is invalid."
-msgstr "Numele de utilizator specificat este invalid."
+msgstr "Numele de utilizator specificat este nevalid."

 msgid "This Hotmail account may not be active."
 msgstr "Acest cont Hotmail s-ar putea să nu mai fie activ."
@@ -5702,7 +5705,6 @@
 msgid "MySpace"
 msgstr "MySpace"

-#, fuzzy
 msgid "IM Friends"
 msgstr "Prieteni IM"

@@ -5714,27 +5716,32 @@
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
+"Un contact a fost adăugat ori actualizat de pe server (incluzând contacte "
+"deja prezente în lista de pe server)"
 msgstr[1] ""
+"%d contacte au fost adăugat ori actualizat de pe server (incluzând contacte "
+"deja prezente în lista de pe server)"
 msgstr[2] ""
-
-#, fuzzy
+"%d de contacte au fost adăugat ori actualizat de pe server (incluzând "
+"contacte deja prezente în lista de pe server)"
+
 msgid "Add contacts from server"
-msgstr "Răspuns invalid de la server."
+msgstr "Adăugare contacte de pe server."

 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Eroare de protocol, codul %d: %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Aveți o parolă de %d caractere, mai mare decât lungimea maximă de %d în "
-"MySpaceIM. E necesar să introduceți o parolă mai scurtă la http://"
+"%s Aveți o parolă de %zu caractere, mai mare decât lungimea maximă de %d. "
+"Puteți introduce o parolă mai scurtă la http://"
 "profileedit.myspace.com/index.cfm?fuseaction=accountSettings.changePassword "
-"și să încercați din onu."
+"și să încercați din nou."

 msgid "Incorrect username or password"
 msgstr "Nume de utilizator sau parolă incorecte."
@@ -5743,7 +5750,7 @@
 msgstr "Eroare MySpaceIM"

 msgid "Invalid input condition"
-msgstr "Condiție de intrare invalidă"
+msgstr "Condiție de intrare nevalidă"

 msgid "Failed to add buddy"
 msgstr "Adăugarea contactului a eșuat"
@@ -5777,38 +5784,35 @@
 "MySpaceIM nu va încărcat."

 msgid "Add friends from MySpace.com"
-msgstr ""
-
-#, fuzzy
+msgstr "Adăugați contacte de pe MySpace.com"
+
 msgid "Importing friends failed"
-msgstr "activarea modulului a eșuat"
+msgstr "Importarea contactelor a eșuat"

 #. TODO: find out how
-#, fuzzy
 msgid "Find people..."
-msgstr "Căutare contacte..."
-
-#, fuzzy
+msgstr "Căutare persoane..."
+
 msgid "Change IM name..."
-msgstr "Schimbare parolă..."
+msgstr "Schimbare nume IM..."

 msgid "myim URL handler"
-msgstr ""
+msgstr "Gestionare URL myim"

 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "Nu s-a găsit un cont MySpaceIM pentru a deschide acest URL myim."

 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Activați contul MySpaceIM potrivit și încercați din nou."

 msgid "Show display name in status text"
-msgstr ""
+msgstr "Arată numele afișat în textul statusului"

 msgid "Show headline in status text"
-msgstr ""
+msgstr "Arată titlul în textul statusului"

 msgid "Send emoticons"
-msgstr ""
+msgstr "Trimite iconițe simbolice"

 msgid "Screen resolution (dots per inch)"
 msgstr "Rezoluție ecran (dpi)"
@@ -5822,53 +5826,49 @@
 msgid "Headline"
 msgstr "Titlu"

-#, fuzzy
 msgid "Song"
-msgstr "Sunete"
+msgstr "Melodie"

 msgid "Total Friends"
-msgstr ""
-
-#, fuzzy
+msgstr "Prieteni la cataramă"
+
 msgid "Client Version"
-msgstr "Încheie discuția"
+msgstr "Versiune client"

 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
-
-#, fuzzy
+"A apărut o eroare la inițializarea numelui de utilizator. Încercați din nou "
+"sau vizitați "
+"http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"pentru a alege un nume de utilizator."
+
 msgid "MySpaceIM - Username Available"
-msgstr "Serviciu indisponibil"
-
-#, fuzzy
+msgstr "MySpaceIM - nume disponibil"
+
 msgid "This username is available. Would you like to set it?"
-msgstr ""
-"%s a trimis un mesaj pentru „whiteboard”. Doriți să deschid un „whiteboard”?"
+msgstr "Acest nume de utilizator este disponibil. Doriți să-l folosiți?"

 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
-msgstr ""
+msgstr "DUPĂ INIȚIALIZARE ACESTA NU POATE FI SCHIMBAT!"

 msgid "MySpaceIM - Please Set a Username"
-msgstr ""
-
-#, fuzzy
+msgstr "MySpaceIM - Alegeți un nume de utilizator"
+
 msgid "This username is unavailable."
-msgstr "Această temă nu are iconițe disponibile."
-
-#, fuzzy
+msgstr "Acest nume de utilizator nu este disponibil."
+
 msgid "Please try another username:"
-msgstr "Introduceți noul nume pentru %s"
+msgstr "Încercați alt nume de utilizator:"

 #. Protocol won't log in now without a username set.. Disconnect
-#, fuzzy
 msgid "No username set"
-msgstr "Fără nume"
+msgstr "Nu s-a inițializat un nume de utilizator"

 msgid "Please enter a username to check its availability:"
-msgstr ""
+msgstr "Introduceți un nume de utilizator pentru a verifica disponibilitatea:"

 #. TODO: icons for each zap
 #. Lots of comments for translators:
@@ -5877,106 +5877,103 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Trăsnește"
+
+#, c-format
 msgid "%s has zapped you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a trăsnit!"

 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "%s este trăsnit..."

 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Pocnește"
+
+#, c-format
 msgid "%s has whacked you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a pocnit"

 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "%s este pocnit..."

 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#, fuzzy
 msgid "Torch"
-msgstr "Topic"
-
-#, fuzzy, c-format
+msgstr "Arde"
+
+#, c-format
 msgid "%s has torched you!"
-msgstr "Utilizatorul v-a blocat"
+msgstr "%s v-a ars!"

 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "%s este ars..."

 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Țucă"
+
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a țucat."

 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "%s este țucat"

 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Îmbrățișează"
+
+#, c-format
 msgid "%s has hugged you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a îmbrățișat."

 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "%s este îmbrățișat..."

 #. Slap means "to hit someone with an open/flat hand"
-#, fuzzy
 msgid "Slap"
-msgstr "Adormit"
-
-#, fuzzy, c-format
+msgstr "Plesnește"
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s v-a adăugat [%s]"
+msgstr "%s v-a plesnit!"

 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "%s este plesnit..."

 #. Goose means "to pinch someone on their butt"
-#, fuzzy
 msgid "Goose"
-msgstr "Dus"
-
-#, fuzzy, c-format
+msgstr "Pișcă de fund"
+
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s a intrat în absență."
-
-#, fuzzy, c-format
+msgstr "%s v-a pișcat de fund."
+
+#, c-format
 msgid "Goosing %s..."
-msgstr "Caut %s"
+msgstr "%s este pișcat de fund..."

 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
 msgid "High-five"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Bate palma"
+
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s s-a autentificat."
+msgstr "%s v-a bătut palma!"

 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "Ați bătut palma cu %s..."

 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
@@ -6100,15 +6097,15 @@
 "autentificați în același timp"

 msgid "The user is either offline or you are blocked"
-msgstr "Utilizatorul este deconectat sau sunteți blocat(ă)"
+msgstr "Utilizatorul este deconectat sau v-a blocat"

 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Eroare necunoscută: 0x%X"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to login: %s"
-msgstr "Autentificare eșuată."
+msgstr "Autentificare eșuată: %s"

 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
@@ -6241,7 +6238,6 @@
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s pare să fie deconectat și nu a primit mesajul ce i l-ați trimis."

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

-#, fuzzy
 msgid "Received unexpected response from "
-msgstr "S-a primit un răspuns HTTP neașteptat de la server."
+msgstr "S-a primit un răspuns neașteptat de la "

 #. username connecting too frequently
 msgid ""
@@ -6283,22 +6278,21 @@
 "V-ați conectat și deconectat prea des. Așteptați zece minute și încercați "
 "din nou. Dacă continuați să încercați, va trebui să așteptați mai mult."

-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting "
-msgstr "Eroare la cererea unui „token” de autentificare"
+msgstr "Eroare la cererea "

 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
+msgstr "AOL nu permite autentificarea acestui cont aici"

 msgid "Could not join chat room"
 msgstr "Nu s-a putut intra în camera de chat"

 msgid "Invalid chat room name"
-msgstr "Nume invalid de cameră de chat"
-
-#, fuzzy
+msgstr "Nume nevalid de cameră de chat"
+
 msgid "Received invalid data on connection with server"
-msgstr "S-au primit date invalide de la server."
+msgstr "S-au primit date nevalide la conectarea la server."

 #. *< type
 #. *< ui_requirement
@@ -6343,9 +6337,8 @@
 msgstr "S-a pierdut conexiunea cu utilizatorul la distanță:<br>%s"

 msgid "Received invalid data on connection with remote user."
-msgstr "S-au primit date invalide la conectarea la utilizatorul la distanță."
-
-#, fuzzy
+msgstr "S-au primit date nevalide la conectarea la utilizatorul la distanță."
+
 msgid "Unable to establish a connection with the remote user."
 msgstr "Nu s-a putut deschide o conexiune cu utilizatorul la distanță."

@@ -6366,10 +6359,10 @@
 msgstr "Fișierul %s are %s, care depășește mărimea maximă de %s."

 msgid "Invalid error"
-msgstr "Eroare invalidă"
+msgstr "Eroare nevalidă"

 msgid "Invalid SNAC"
-msgstr "SNAC invalid"
+msgstr "SNAC nevalid"

 msgid "Rate to host"
 msgstr "Limitare către server"
@@ -6405,7 +6398,7 @@
 msgstr "Cerere respinsă"

 msgid "Busted SNAC payload"
-msgstr "Încărcătură SNAC invalidă"
+msgstr "Încărcătură SNAC nevalidă"

 msgid "Insufficient rights"
 msgstr "Drepturi insuficiente"
@@ -6547,15 +6540,13 @@
 msgid "Buddy Comment"
 msgstr "Comentariu contact"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to authentication server: %s"
-msgstr ""
-"Conectarea pentru serverul de autentificare a eșuat:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Conectarea la serverul de autentificare a eșuat: %s"
+
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Conectarea la server a eșuat."
+msgstr "Conectarea la serverul BOS a eșuat: %s"

 msgid "Username sent"
 msgstr "S-a trimit numele de utilizator"
@@ -6567,16 +6558,16 @@
 msgid "Finalizing connection"
 msgstr "Finalizare conexiune"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Eroare la autentificare: autentificarea pentru %s a eșuat deoarece numele de "
-"utilizator este invalid. Un nume valid trebuie să fie o adresă de mail "
-"validă sau să înceapă cu o literă și să conțină doar litere, numere și "
-"spații sau să conțină doar numere."
+"Autentificarea contului %s a eșuat deoarece numele de utilizator este "
+"greșit. Un nume valid trebuie să fie o adresă de mail corectă ori să "
+"înceapă cu o literă și să conțină doar litere, numere și spații sau să "
+"conțină doar numere."

 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -6596,35 +6587,32 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
 msgstr "Utilizator inexistent"

 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Contul dumneavoastră este momentan suspendat."
+msgstr "Contul vă este momentan suspendat"

 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Serviciul de mesagerie instant AOL este temporar indisponibil."

+#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versiunea clientului folosit este prea veche. Actualizați-l la %s"

 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait a minute and "
 "try again. If you continue to try, you will need to wait even longer."
 msgstr ""
-"V-ați conectat și deconectat prea des. Așteptați zece minute și încercați "
+"V-ați conectat și deconectat prea des. Așteptați un minut și încercați "
 "din nou. Dacă continuați să încercați, va trebui să așteptați mai mult."

-#, fuzzy
 msgid "The SecurID key entered is invalid"
-msgstr "Cheia SecurID introdusă este invalidă."
+msgstr "Cheia SecurID introdusă este nevalidă."

 msgid "Enter SecurID"
 msgstr "Introducere SecurID"
@@ -6632,12 +6620,6 @@
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduceți numărul de șase cifre afișat digital."

-#. *
-#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
-#.
-msgid "_OK"
-msgstr "_OK"
-
 msgid "Password sent"
 msgstr "Parola a fost trimisă"

@@ -6649,12 +6631,6 @@
 "Am nevoie de autorizarea ta pentru a te putea adăuga apoi în lista mea de "
 "contacte."

-msgid "Authorization Request Message:"
-msgstr "Mesaj cerere de autorizare:"
-
-msgid "Please authorize me!"
-msgstr "Am nevoie de autorizare..."
-
 msgid "No reason given."
 msgstr "Fără motiv."

@@ -6732,9 +6708,9 @@
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
-msgstr[0] "Ați pierdut %hu mesaj de la %s deoarece era invalid."
-msgstr[1] "Ați pierdut %hu mesaje de la %s deoarece erau invalide."
-msgstr[2] "Ați pierdut %hu de mesaje de la %s deoarece erau invalide."
+msgstr[0] "Ați pierdut %hu mesaj de la %s deoarece era nevalid."
+msgstr[1] "Ați pierdut %hu mesaje de la %s deoarece erau nevalide."
+msgstr[2] "Ați pierdut %hu de mesaje de la %s deoarece erau nevalide."

 #, c-format
 msgid "You missed %hu message from %s because it was too large."
@@ -6826,7 +6802,7 @@
 "characters.]"
 msgstr ""
 "[Nu se poate afișa mesajul acestui utilizator deoarece conține caractere "
-"invalide]"
+"nevalide]"

 msgid ""
 "The last action you attempted could not be performed because you are over "
@@ -6837,7 +6813,7 @@

 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Ați fost deconectat(ă) din camera de chat %s."
+msgstr "Contul v-a fost deconectat din camera de chat %s."

 msgid "Mobile Phone"
 msgstr "Telefon mobil"
@@ -6898,7 +6874,7 @@
 msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate formata numele de utilizator pentru că este "
-"invalid."
+"nevalid."

 #, c-format
 msgid ""
@@ -6930,7 +6906,7 @@
 "invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru că adresa introdusă "
-"este invalidă."
+"este nevalidă."

 #, c-format
 msgid "Error 0x%04x: Unknown error."
@@ -6961,8 +6937,8 @@
 "fully connected."
 msgstr ""
 "Se pare că ați cerut să setați profilul înainte de a vă autentifica. "
-"Profilul vă va rămâne la fel. Încercați să-l setați din nou când veți fi "
-"conectat(ă) 100%."
+"Profilul vă va rămâne la fel. Încercați să-l setați din nou după o "
+"conectare pe deplin reușită."

 #, c-format
 msgid ""
@@ -6993,30 +6969,27 @@
 "truncated for you."
 msgstr[0] ""
 "Mesajul în absență depășește lungimea maximă de un octet. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 msgstr[1] ""
 "Mesajul în absență depășește lungimea maximă de %d octeți. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."
 msgstr[2] ""
 "Mesajul în absență depășește lungimea maximă de %d de octeți. S-a trunchiat "
-"mesajul și ați fost trecut(ă) în absență."
+"mesajul și contul v-a fost trecut în absență."

 msgid "Away message too long."
 msgstr "Mesaj în absență prea lung."

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Nu se poate adăuga contactul %s deoarece numele de utilizator este invalid. "
+"Nu se poate adăuga contactul %s deoarece numele de utilizator este nevalid. "
 "Un nume valid trebuie să fie o adresă de mail validă sau să înceapă cu o "
 "literă și să conțină doar litere, numere și spații sau doar numere."

-msgid "Unable to Add"
-msgstr "Adăugare eșuată"
-
 msgid "Unable to Retrieve Buddy List"
 msgstr "Descărcarea listei de contacte a eșuat"

@@ -7030,7 +7003,7 @@
 msgid "Orphans"
 msgstr "Orfani"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
@@ -7041,7 +7014,7 @@
 msgid "(no name)"
 msgstr "(fără nume)"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
 msgstr "Din motive necunoscute nu s-a putut adăuga contactul %s."

@@ -7137,7 +7110,7 @@
 msgstr "Opțiuni de securitate ICQ"

 msgid "The new formatting is invalid."
-msgstr "Formatul nou este invalid."
+msgstr "Formatul nou este nevalid."

 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
@@ -7205,9 +7178,8 @@
 msgid "Search for Buddy by Information"
 msgstr "Căutare contact după detalii"

-#, fuzzy
 msgid "Use clientLogin"
-msgstr "Utilizator neconectat"
+msgstr "Utilizați clientLogin"

 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -7405,99 +7377,84 @@
 msgstr "Notă"

 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "Avatar"
+msgstr "Notiță pentru contact"

 msgid "Change his/her memo as you like"
-msgstr ""
-
-#, fuzzy
+msgstr "Modificați notița sa după cum doriți"
+
 msgid "_Modify"
-msgstr "Modificare"
-
-#, fuzzy
+msgstr "_Modificare"
+
 msgid "Memo Modify"
-msgstr "Modificare"
-
-#, fuzzy
+msgstr "Modificare notiță"
+
 msgid "Server says:"
-msgstr "Server ocupat"
+msgstr "Serverul spune:"

 msgid "Your request was accepted."
-msgstr ""
+msgstr "Cererea v-a fost aprobată."

 msgid "Your request was rejected."
-msgstr ""
+msgstr "Cererea v-a fost respinsă."

 #, c-format
 msgid "%u requires verification"
 msgstr "%u solicită autorizare"

-#, fuzzy
 msgid "Add buddy question"
-msgstr "Doriți adăugarea utilizatorului în lista de contacte?"
-
-#, fuzzy
+msgstr "Întrebare la adăugarea contactului"
+
 msgid "Enter answer here"
-msgstr "Introduceți aici cererea"
+msgstr "Introduceți răspunsul aici"

 msgid "Send"
 msgstr "Trimite"

-#, fuzzy
 msgid "Invalid answer."
-msgstr "Nume invalid de utilizator"
+msgstr "Răspuns nevalid."

 msgid "Authorization denied message:"
 msgstr "Mesaj de autorizare refuzată:"

-#, fuzzy
 msgid "Sorry, you're not my style."
 msgstr "Scuze, nu ești genul meu..."

-#, fuzzy, c-format
+#, c-format
 msgid "%u needs authorization"
-msgstr "Utilizatorul %d are nevoie de autorizare"
-
-#, fuzzy
+msgstr "Utilizatorul %u necesită autorizare"
+
 msgid "Add buddy authorize"
-msgstr "Doriți adăugarea utilizatorului în lista de contacte?"
-
-#, fuzzy
+msgstr "Autorizare pentru adăugarea unui contact"
+
 msgid "Enter request here"
 msgstr "Introduceți aici cererea"

 msgid "Would you be my friend?"
 msgstr "Vrei să fim prieteni?"

-#, fuzzy
 msgid "QQ Buddy"
-msgstr "Contact"
-
-#, fuzzy
+msgstr "Contact QQ"
+
 msgid "Add buddy"
 msgstr "Adaugă contact"

-#, fuzzy
 msgid "Invalid QQ Number"
-msgstr "Avatar QQ invalid"
-
-#, fuzzy
+msgstr "Număr QQ nevalid"
+
 msgid "Failed sending authorize"
-msgstr "Am nevoie de autorizare..."
-
-#, fuzzy, c-format
+msgstr "Trimiterea autorizației a eșuat"
+
+#, c-format
 msgid "Failed removing buddy %u"
-msgstr "Ștergerea contactului a eșuat"
-
-#, fuzzy, c-format
+msgstr "Ștergerea contactului %u a eșuat"
+
+#, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "%s v-a șters din lista sa de contacte."
-
-#, fuzzy
+msgstr "Contactul %d a încercat să vă șteargă din listă, dar a eșuat"
+
 msgid "No reason given"
-msgstr "Fără motiv."
+msgstr "Fără motiv"

 #. only need to get value
 #, c-format
@@ -7507,9 +7464,9 @@
 msgid "Would you like to add him?"
 msgstr "Doriți să îl adăugați?"

-#, fuzzy, c-format
+#, c-format
 msgid "Rejected by %s"
-msgstr "Respingere"
+msgstr "Respins de %s"

 #, c-format
 msgid "Message: %s"
@@ -7524,141 +7481,122 @@
 msgid "QQ Qun"
 msgstr "QQ Qun"

-#, fuzzy
 msgid "Please enter Qun number"
-msgstr "Introduceți noul nume pentru %s"
-
-#, fuzzy
+msgstr "Introduceți numărul Qun"
+
 msgid "You can only search for permanent Qun\n"
-msgstr "Puteți căuta doar grupuri QQ permanente\n"
-
-#, fuzzy
+msgstr "Puteți căuta doar după un Qun permanent\n"
+
 msgid "(Invalid UTF-8 string)"
-msgstr "Opțiuni proxy invalide"
-
-#, fuzzy
+msgstr "(șir UTF-8 nevalid)"
+
 msgid "Not member"
 msgstr "Nu sunt un membru"

 msgid "Member"
 msgstr "Membru"

-#, fuzzy
 msgid "Requesting"
-msgstr "Dialog cerere"
-
-#, fuzzy
+msgstr "Se cere"
+
 msgid "Admin"
-msgstr "Adium"
-
-#, fuzzy
+msgstr "Admin"
+
 msgid "Notice"
-msgstr "Notă"
-
-#, fuzzy
+msgstr "Notificare"
+
 msgid "Detail"
-msgstr "Implicită"
+msgstr "Detaliu"

 msgid "Creator"
 msgstr "Inițiator"

-#, fuzzy
 msgid "About me"
-msgstr "Despre %s"
-
-#, fuzzy
+msgstr "Despre mine"
+
 msgid "Category"
-msgstr "Eroare de chat"
-
-#, fuzzy
+msgstr "Categorie"
+
 msgid "The Qun does not allow others to join"
-msgstr "Acest grup nu permite înscrierea altor contacte"
-
-#, fuzzy
+msgstr "Acest Qun nu permite intrarea altora"
+
 msgid "Join QQ Qun"
-msgstr "Intră într-un chat"
+msgstr "Intră în Qun QQ"

 msgid "Input request here"
 msgstr "Introduceți aici cererea"

-#, fuzzy, c-format
+#, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Ați modificat cu succes membrul Qun"
-
-#, fuzzy
+msgstr "Ați intrat cu succes în Qun %s (%u)"
+
 msgid "Successfully joined Qun"
-msgstr "Ați modificat cu succes membrul Qun"
+msgstr "Ați intrat cu succes în Qun"

 #, c-format
 msgid "Qun %u denied from joining"
-msgstr ""
+msgstr "Qun %u refuzat la intrare"

 msgid "QQ Qun Operation"
 msgstr "Operație QQ Qun"

-#, fuzzy
 msgid "Failed:"
-msgstr "Eșuat"
+msgstr "Eșuat:"

 msgid "Join Qun, Unknown Reply"
-msgstr ""
-
-#, fuzzy
+msgstr "Răspuns necunoscut la intrarea în Qun"
+
 msgid "Quit Qun"
-msgstr "QQ Qun"
+msgstr "Ieșire din Qun"

 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-"Notați că, dacă dumneavoastră sunteți inițiatorul, \n"
+"Notați că, dacă sunteți inițiatorul, \n"
 "această acțiune va elimina acest Qun."

-#, fuzzy
 msgid "Sorry, you are not our style"
-msgstr "Scuze, nu ești genul meu..."
-
-#, fuzzy
+msgstr "Scuze, nu ești genul nostru..."
+
 msgid "Successfully changed Qun members"
-msgstr "Ați modificat cu succes membrul Qun"
-
-#, fuzzy
+msgstr "Ați modificat cu succes membrii Qun"
+
 msgid "Successfully changed Qun information"
 msgstr "Ați modificat cu succes detaliile Qun"

 msgid "You have successfully created a Qun"
 msgstr "Ați creat cu succes un Qun"

-#, fuzzy
 msgid "Would you like to set up detailed information now?"
-msgstr "Doriți să setați detaliile Qun acum?"
+msgstr "Doriți să modificați informațiile detaliate acum?"

 msgid "Setup"
 msgstr "Opțiuni"

-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "Utilizatorul %d a cerut înscrierea în grupul %d"
-
-#, fuzzy, c-format
+msgstr "%u a cerut să intre în Qun %u pentru %s"
+
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "Utilizatorul %d a cerut înscrierea în grupul %d"
-
-#, fuzzy, c-format
+msgstr "Utilizatorul %u a cerut intrarea în grupul %u"
+
+#, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr "Intrarea în chat alături de acest contact a eșuat"
+msgstr "Intrarea în Qun %u, operat de admin %u a eșuat"

 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "<b>Intrarea în Qun %u este aprobată de admin %u pentru %s</b>"
+
+#, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "Ștergere contact"
-
-#, fuzzy, c-format
+msgstr "<b>Contactul %u a fost șters.</b>"
+
+#, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "Ștergere contact"
+msgstr "<b>Contactul nou %u a intrat.</b>"

 #, c-format
 msgid "Unknown-%d"
@@ -7673,30 +7611,26 @@
 msgid " TCP"
 msgstr " TCP"

-#, fuzzy
 msgid " FromMobile"
-msgstr "Mobil"
-
-#, fuzzy
+msgstr " DePeMobil"
+
 msgid " BindMobile"
-msgstr "Mobil"
-
-#, fuzzy
+msgstr " BindMobile"
+
 msgid " Video"
-msgstr "Video în direct"
-
-#, fuzzy
+msgstr " Video"
+
 msgid " Zone"
-msgstr "Fără"
+msgstr " Zone"

 msgid "Flag"
-msgstr ""
+msgstr "Fanion"

 msgid "Ver"
 msgstr "Ver"

 msgid "Invalid name"
-msgstr "Nume invalid"
+msgstr "Nume nevalid"

 msgid "Select icon..."
 msgstr "Alegeți o iconiță..."
@@ -7772,44 +7706,39 @@
 msgid "<p><b>Acknowledgement</b>:<br>\n"
 msgstr "<p><b>Mulțumiri</b>:<br>\n"

-#, fuzzy
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b>Prim autor</b>:<br>\n"
+msgstr "<p><b>Testeri neobosiți</b>:<br>\n"

 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "și alții, vă rugăm să ne spuneți... vă mulțumim!))"

 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>Și pentru toți băieții din ultimele rânduri...</i><br>\n"

 msgid "<i>Feel free to join us!</i> :)"
-msgstr "<i>Vă invităm să ni vă alăturați!</i> :)"
-
-#, fuzzy, c-format
+msgstr "<i>Vă invităm să vă alăturați nouă!</i> :)"
+
+#, c-format
 msgid "About OpenQ %s"
-msgstr "Despre %s"
-
-#, fuzzy
+msgstr "Despre OpenQ %s"
+
 msgid "Change Icon"
-msgstr "Salvare avatar"
+msgstr "Schimbare iconiță"

 msgid "Change Password"
 msgstr "Schimbare parolă"

-#, fuzzy
 msgid "Account Information"
-msgstr "Informații de autentificare"
+msgstr "Informații despre cont"

 msgid "Update all QQ Quns"
-msgstr ""
-
-#, fuzzy
+msgstr "Actualizează toate Qun QQ"
+
 msgid "About OpenQ"
-msgstr "Despre %s"
-
-#, fuzzy
+msgstr "Despre OpenQ"
+
 msgid "Modify Buddy Memo"
-msgstr "Editare adresă"
+msgstr "Editare notiță contact"

 #. *< type
 #. *< ui_requirement
@@ -7821,17 +7750,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "QQ Protocol Plugin"
 msgstr "Modul pentru protocolul QQ"

-#, fuzzy
 msgid "Auto"
-msgstr "Autor"
-
-#, fuzzy
+msgstr "Auto"
+
 msgid "Select Server"
-msgstr "Selectați utilizatorul"
+msgstr "Selectați serverul"

 msgid "QQ2005"
 msgstr "QQ2005"
@@ -7842,168 +7768,153 @@
 msgid "QQ2008"
 msgstr "QQ2008"

-#, fuzzy
 msgid "Connect by TCP"
 msgstr "Conectare folosind TCP"

-#, fuzzy
 msgid "Show server notice"
-msgstr "Port server"
-
-#, fuzzy
+msgstr "Afișare notificări server"
+
 msgid "Show server news"
-msgstr "Adresă server"
+msgstr "Afișare știri server"

 msgid "Show chat room when msg comes"
-msgstr ""
-
-#, fuzzy
+msgstr "Arată camera de chat când vine msg"
+
 msgid "Keep alive interval (seconds)"
-msgstr "Eroare „keep alive”"
-
-#, fuzzy
+msgstr "Interval „keep alive” (secunde)"
+
 msgid "Update interval (seconds)"
-msgstr "Eroare „keep alive”"
-
-#, fuzzy
+msgstr "Interval de actualizare (secunde)"
+
 msgid "Unable to decrypt server reply"
-msgstr "Nu s-au putut obține detalii despre server"
+msgstr "Nu s-a putut decripta răspunsul serverului"

 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Eșuarea la cererea jetonului, 0x%02X"
+
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Titlu invalid"
+msgstr "Lungime nevalidă de jeton, %d"

 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX nu este suportat în prezent"

 #. need activation
 #. need activation
 #. need activation
-#, fuzzy
 msgid "Activation required"
-msgstr "E nevoie de înregistrare"
+msgstr "Necesită activare"

 #, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr ""
-
-#, fuzzy
+msgstr "Cod necunoscut de răspuns la autentificare (0x%02X)"
+
 msgid "Requesting captcha"
-msgstr "Se cere atenție din partea contactului %s..."
-
-#, fuzzy
+msgstr "Se cere imaginea captcha"
+
 msgid "Checking captcha"
-msgstr "Se cere atenție din partea contactului %s..."
-
-#, fuzzy
+msgstr "Se verifică imaginea captcha"
+
 msgid "Failed captcha verification"
-msgstr "Autentificarea Yahoo! a eșuat"
-
-#, fuzzy
+msgstr "Verificarea imaginii captcha a eșuat"
+
 msgid "Captcha Image"
-msgstr "Salvează imaginea"
-
-#, fuzzy
+msgstr "Imagine captcha"
+
 msgid "Enter code"
-msgstr "Introduceți parola"
-
-#, fuzzy
+msgstr "Introduceți codul"
+
 msgid "QQ Captcha Verification"
-msgstr "Verificare certificat SSL"
-
-#, fuzzy
+msgstr "Verificare captcha QQ"
+
 msgid "Enter the text from the image"
-msgstr "Introduceți numele grupului"
+msgstr "Introduceți textul din imagine"

 #, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr ""
+msgstr "Răspuns necunoscut la verificarea parolei (0x%02X)"

 #, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
 msgstr ""
+"Cod necunoscut de răspuns la autentificare (0x%02X):\n"
+"%s"

 msgid "Socket error"
 msgstr "Eroare de socket"

-#, fuzzy
 msgid "Getting server"
-msgstr "Introducere detalii..."
-
-#, fuzzy
+msgstr "Se află serverul"
+
 msgid "Requesting token"
-msgstr "Cerere respinsă"
-
-#, fuzzy
+msgstr "Se cere jeton"
+
 msgid "Unable to resolve hostname"
-msgstr "Conectarea la server a eșuat."
-
-#, fuzzy
+msgstr "Nu se poate rezolva numele serverului"
+
 msgid "Invalid server or port"
-msgstr "Eroare invalidă"
-
-#, fuzzy
+msgstr "Server sau port nevalid"
+
 msgid "Connecting to server"
-msgstr "Conectare în progres la serverul SILC"
-
-#, fuzzy
+msgstr "Conectare la server"
+
 msgid "QQ Error"
-msgstr "Eroare QQid"
-
-#, fuzzy, c-format
+msgstr "Eroare QQ"
+
+#, c-format
 msgid ""
 "Server News:\n"
 "%s\n"
 "%s\n"
 "%s"
-msgstr "Schimb de server ICQ"
-
-#, fuzzy, c-format
+msgstr ""
+"Știri server:\n"
+"%s\n"
+"%s\n"
+"%s"
+
+#, c-format
 msgid "%s:%s"
-msgstr "%s (%s)"
-
-#, fuzzy, c-format
+msgstr "%s:%s"
+
+#, c-format
 msgid "From %s:"
-msgstr "Expeditor"
-
-#, fuzzy, c-format
+msgstr "Expeditor %s:"
+
+#, c-format
 msgid ""
 "Server notice From %s: \n"
 "%s"
-msgstr "Instrucțiuni server: %s"
-
-#, fuzzy
+msgstr ""
+"Notificare server Expeditor %s: \n"
+"%s"
+
 msgid "Unknown SERVER CMD"
-msgstr "Motiv necunoscut"
+msgstr "SERVER CMD necunoscut"

 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
-
-#, fuzzy
+"Răspuns de eroare %s(0x%02X)\n"
+"Camera %u, răspuns 0x%02X"
+
 msgid "QQ Qun Command"
-msgstr "Comandă"
-
-#, fuzzy
+msgstr "Comandă QQ Qun"
+
 msgid "Unable to decrypt login reply"
-msgstr "Nu s-au putut obține detalii despre server"
-
-#, fuzzy
+msgstr "Nu s-a putut decripta răspunsul de autentificare"
+
 msgid "Unknown LOGIN CMD"
-msgstr "Motiv necunoscut"
-
-#, fuzzy
+msgstr "LOGIN CMD necunoscut"
+
 msgid "Unknown CLIENT CMD"
-msgstr "Motiv necunoscut"
+msgstr "CLIENT CMD necunoscut"

 #, c-format
 msgid "%d has declined the file %s"
@@ -8979,9 +8890,8 @@
 msgid "Disconnected by server"
 msgstr "Deconectat de server"

-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "Eroare la conectarea la serverul SILC"
+msgstr "Eroare de conectare la serverul SILC"

 msgid "Key Exchange failed"
 msgstr "Schimbul de chei a eșuat"
@@ -8995,7 +8905,6 @@
 msgid "Performing key exchange"
 msgstr "Se efectuează schimbul de chei"

-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Nu s-a putut încărca perechea de chei SILC"

@@ -9003,14 +8912,9 @@
 msgid "Connecting to SILC Server"
 msgstr "Conectare în progres la serverul SILC"

-#, fuzzy
-msgid "Unable to not load SILC key pair"
-msgstr "Nu s-a putut încărca perechea de chei SILC"
-
 msgid "Out of memory"
 msgstr "Nu mai există memorie disponibilă"

-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "Nu s-a putut inițializa protocolul SILC"

@@ -9312,9 +9216,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Creez perechea de chei SILC..."

-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Nu s-a putut crea perechea de chei SILC\n"
+msgstr "Nu s-a putut crea perechea de chei SILC"

 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -9450,33 +9353,30 @@

 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "Eroare: Cookie invalid"
+msgstr "Eroare: Cookie nevalid"

 #, c-format
 msgid "Failure: Authentication failed"
 msgstr "Eroare: Autentificare eșuată"

-#, fuzzy
 msgid "Unable to initialize SILC Client connection"
-msgstr "Nu s-a putut inițializa conexiunea ca client SILC"
+msgstr "Nu s-a putut inițializa conexiunea client SILC"

 msgid "John Noname"
 msgstr "Ion Fărănume"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "Nu s-a putut încărca perechea de chei SILC: %s"

 msgid "Unable to create connection"
 msgstr "Nu se poate crea o nouă conexiune"

-#, fuzzy
 msgid "Unknown server response"
 msgstr "Răspuns necunoscut de la server."

-#, fuzzy
 msgid "Unable to create listen socket"
-msgstr "Nu se poate crea un socket"
+msgstr "Nu se poate crea un socket de ascultare"

 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "Numele de utilizatori SIP nu pot conține spații sau simbolul @"
@@ -9539,9 +9439,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Modul de protocol Yahoo"
+msgstr "Modul de protocol Yahoo!"

 msgid "Pager server"
 msgstr "Server pager"
@@ -9570,9 +9469,8 @@
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"

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

 #. *< type
 #. *< ui_requirement
@@ -9584,15 +9482,14 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Modul de protocol Yahoo"
+msgstr "Modul de protocol Yahoo! Japonia"

 msgid "Your SMS was not delivered"
-msgstr ""
+msgstr "Mesajul SMS nu v-a fost trimis"

 msgid "Your Yahoo! message did not get sent."
-msgstr "Mesajul dumneavoastră Yahoo! nu a fost trimis."
+msgstr "Mesajul Yahoo! nu v-a fost trimis."

 #, c-format
 msgid "Yahoo! system message for %s:"
@@ -9616,32 +9513,28 @@
 msgstr "Adăugarea contactului a fost refuzată"

 #. Some error in the received stream
-#, fuzzy
 msgid "Received invalid data"
-msgstr "S-au primit date invalide de la server."
+msgstr "S-au primit date nevalide"

 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
-"rezolva această problemă."
+"Cont blocat: prea multe tentative eșuate de autentificare. Autentificarea "
+"în paginile web Yahoo! ar putea rezolva această problemă."

 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
-"rezolva această problemă."
+"Cont blocat: motiv necunoscut. Autentificarea în paginile web Yahoo! ar "
+"putea rezolva această problemă."

 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Nume de utilizator sau parolă incorecte."
+msgstr "Nume de utilizator sau parolă lipsă."

 #, c-format
 msgid ""
@@ -9665,24 +9558,21 @@
 "Alegeți „Da” pentru a-l șterge din listă și a-l ignora de acum înainte."

 msgid "Ignore buddy?"
-msgstr "Ignor contactul?"
+msgstr "Ignorați contactul?"

 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Contul vă este blocat, autentificați-vă la www.yahoo.com !"
+msgstr "Contul vă este blocat, autentificați-vă în paginile web Yahoo!"

 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr ""
-"Eroare necunoscută cu numărul %d. Autentificarea la www.yahoo.com ar putea "
-"rezolva această problemă."
-
-#, fuzzy, c-format
+msgstr "Eroare necunoscută cu numărul %d. Autentificarea în paginile web "
+"Yahoo! ar putea rezolva această problemă."
+
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
-msgstr ""
-"Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server pentru "
-"contul %s."
-
-#, fuzzy
+msgstr "Contactul %s nu a putut fi adăugat în grupul %s în lista de pe server "
+"pentru contul %s."
+
 msgid "Unable to add buddy to server list"
 msgstr "Contactul nu a putut fi adăugat în lista de pe server"

@@ -9690,21 +9580,18 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Audibil %s/%s/%s.swf ] %s"

-#, fuzzy
 msgid "Received unexpected HTTP response from server"
 msgstr "S-a primit un răspuns HTTP neașteptat de la server."

-#, fuzzy, c-format
+#, c-format
 msgid "Lost connection with %s: %s"
 msgstr ""
-"S-a pierdut conexiunea cu %s:\n"
-"%s"
-
-#, fuzzy, c-format
+"S-a pierdut conexiunea cu %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
+"Nu s-a putut face o conexiune cu %s: %s"

 msgid "Not at Home"
 msgstr "Nu-s acasă"
@@ -9752,7 +9639,7 @@
 msgstr "Mâzgălituri"

 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Alegeți ID-ul ce doriți să-l activați"

 msgid "Join whom in chat?"
 msgstr "Cui doriți să vă alăturați în chat?"
@@ -9855,13 +9742,8 @@
 msgstr "Profilul utilizatorului este gol."

 #, c-format
-msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr ""
-"%s a declinat invitația la conferința din camera de chat „%s” din următorul "
-"motiv: „%s”."
-
-msgid "Invitation Rejected"
-msgstr "Invitație respinsă"
+msgid "%s has declined to join."
+msgstr "%s a refuzat să intre."

 msgid "Failed to join chat"
 msgstr "Intrarea în chat a eșuat"
@@ -9913,9 +9795,8 @@
 msgid "User Rooms"
 msgstr "Camere de chat utilizatori"

-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Probleme de conectare la serverul YCHT."
+msgstr "Probleme de conexiune cu serverul YCHT."

 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10046,17 +9927,17 @@
 msgid "Exposure"
 msgstr "Expunere"

-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s\n"
+msgstr "Nu se poate prelucra răspunsul de la serverul proxy HTTP: %s"

 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "Eroare la conectarea la serverul proxy HTTP: %d"

-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "Acces interzis: serverul proxy nu permite tunelarea portului %d."
+msgstr "Acces interzis: serverul proxy HTTP interzice tunelarea portului %d."

 #, c-format
 msgid "Error resolving %s"
@@ -10134,7 +10015,7 @@
 msgstr "Conexiunea SSL a eșuat"

 msgid "SSL peer presented an invalid certificate"
-msgstr "Partenerul SSL a prezentat un certificat invalid"
+msgstr "Partenerul SSL a prezentat un certificat nevalid"

 msgid "Unknown SSL error"
 msgstr "Eroare SSL necunoscută"
@@ -10307,13 +10188,13 @@
 msgid "Error Reading %s"
 msgstr "Eroare la citirea %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"A apărut o eroare la citirea fișierului %s. Încărcarea datelor a eșuat și "
-"vechiul fișier a fost redenumit „%s~”."
+"A apărut o eroare la citirea %s. Fișierul nu a fost încărcat și "
+"vechiul fișier a fost redenumit în „%s~”."

 msgid "Internet Messenger"
 msgstr "Mesagerie instant"
@@ -10357,7 +10238,7 @@
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizează această _iconiță pentru acest cont:"

-msgid "_Advanced"
+msgid "Ad_vanced"
 msgstr "_Avansat"

 msgid "Use GNOME Proxy Settings"
@@ -10420,9 +10301,8 @@
 msgid "Create _this new account on the server"
 msgstr "Creează acest _nou cont pe server"

-#, fuzzy
-msgid "_Proxy"
-msgstr "Proxy"
+msgid "P_roxy"
+msgstr "P_roxy"

 msgid "Enabled"
 msgstr "Activare"
@@ -10473,14 +10353,14 @@
 msgid "Please update the necessary fields."
 msgstr "Trebuie să actualizați câmpurile cerute."

-#, fuzzy
 msgid "A_ccount"
-msgstr "Cont"
+msgstr "_Cont"

 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Introduceți detaliile chat-ului în care doriți să intrați.\n"
+msgstr ""
+"Introduceți informațiile despre chat-ul în care doriți să participați.\n"

 msgid "Room _List"
 msgstr "_Listă de camere"
@@ -10500,16 +10380,14 @@
 msgid "I_M"
 msgstr "_Mesaj"

-#, fuzzy
 msgid "_Audio Call"
-msgstr "_Adaugă un chat"
+msgstr "_Apel audio"

 msgid "Audio/_Video Call"
-msgstr ""
-
-#, fuzzy
+msgstr "Apel audio/_video"
+
 msgid "_Video Call"
-msgstr "Videochat"
+msgstr "Apel _video"

 msgid "_Send File..."
 msgstr "_Trimitere fișier..."
@@ -10520,11 +10398,9 @@
 msgid "View _Log"
 msgstr "Arată în_registrările"

-#, fuzzy
 msgid "Hide When Offline"
 msgstr "Ascunde la deconectare"

-#, fuzzy
 msgid "Show When Offline"
 msgstr "Arată la deconectare"

@@ -10532,7 +10408,7 @@
 msgstr "_Alias..."

 msgid "_Remove"
-msgstr "Șter_ge"
+msgstr "Șt_erge"

 msgid "Set Custom Icon"
 msgstr "Iconiță personalizată..."
@@ -10547,7 +10423,7 @@
 msgstr "Adaugă un c_hat..."

 msgid "_Delete Group"
-msgstr "Șter_gere grup"
+msgstr "Șt_ergere grup"

 msgid "_Rename"
 msgstr "_Redenumire"
@@ -10577,7 +10453,7 @@
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
-"Nu sunteți autentificat(ă) cu nici un protocol prin care care să puteți "
+"Nu v-ați autentificat cu nici un protocol prin care care să puteți "
 "adăuga acel contact."

 #. I don't believe this can happen currently, I think
@@ -10652,7 +10528,6 @@
 msgid "/Tools/_Certificates"
 msgstr "/Unelte/_Certificate"

-#, fuzzy
 msgid "/Tools/Custom Smile_ys"
 msgstr "/Unelte/_Iconițe simbolice"

@@ -10784,7 +10659,7 @@
 msgstr "După status"

 msgid "By recent log activity"
-msgstr ""
+msgstr "După înregistrările recente"

 #, c-format
 msgid "%s disconnected"
@@ -10801,7 +10676,7 @@
 msgstr "Reactivare"

 msgid "SSL FAQs"
-msgstr ""
+msgstr "Întrebări frecvente SSL"

 msgid "Welcome back!"
 msgstr "Bine ați revenit!"
@@ -10882,8 +10757,7 @@
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
-"Nu sunteți autentificat(ă) cu vreun protocol prin care să puteți iniția un "
-"chat."
+"Nu v-ați autentificat cu vreun protocol prin care să puteți iniția un chat."

 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
@@ -10935,112 +10809,97 @@
 msgid "Background Color"
 msgstr "Culoare fundal"

-#, fuzzy
 msgid "The background color for the buddy list"
-msgstr "Acest grup a fost adăugat la lista dumneavoastră de contacte"
-
-#, fuzzy
+msgstr "Culoarea de fundal pentru lista de contacte"
+
 msgid "Layout"
-msgstr "Lao"
+msgstr "Dispunere"

 msgid "The layout of icons, name, and status of the blist"
-msgstr ""
+msgstr "Dispunerea iconițelor, numelui și a statusului în lista de contacte"

 #. Group
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Culoare fundal"
+msgstr "Culoare fundal la desfacere"

 msgid "The background color of an expanded group"
-msgstr ""
-
-#, fuzzy
+msgstr "Culoarea de fundal a unui grup desfăcut"
+
 msgid "Expanded Text"
-msgstr "Des_fă"
+msgstr "Text text la desfacere"

 msgid "The text information for when a group is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un grup desfăcut"
+
 msgid "Collapsed Background Color"
-msgstr "Selectați culoarea fundalului"
+msgstr "Culoare fundal la strângere"

 msgid "The background color of a collapsed group"
-msgstr ""
-
-#, fuzzy
+msgstr "Culoarea de fundal a unui grup strâns"
+
 msgid "Collapsed Text"
-msgstr "_Strânge"
+msgstr "Text la strângere"

 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "Informația text pentru un grup strâns"

 #. Buddy
-#, fuzzy
 msgid "Contact/Chat Background Color"
-msgstr "Selectați culoarea fundalului"
+msgstr "Culoare fundal contact/chat"

 msgid "The background color of a contact or chat"
-msgstr ""
-
-#, fuzzy
+msgstr "Culoarea de fundal a unui contact sau chat"
+
 msgid "Contact Text"
-msgstr "Combinație de semne"
+msgstr "Text contact"

 msgid "The text information for when a contact is expanded"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact strâns"
+
 msgid "On-line Text"
-msgstr "Conectat"
+msgstr "Text on-line"

 msgid "The text information for when a buddy is online"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact conectat"
+
 msgid "Away Text"
-msgstr "Absent"
+msgstr "Text absent"

 msgid "The text information for when a buddy is away"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact absent"
+
 msgid "Off-line Text"
-msgstr "Deconectat"
+msgstr "Text deconectat"

 msgid "The text information for when a buddy is off-line"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact deconectat"
+
 msgid "Idle Text"
-msgstr "Text dispoziție"
+msgstr "Text inactiv"

 msgid "The text information for when a buddy is idle"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un contact inactiv"
+
 msgid "Message Text"
-msgstr "Ați trimis un mesaj"
+msgstr "Text mesaj"

 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "Informația text pentru un contact cu un mesaj necitit"

 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Textul mesajului (utilizatorul a spus)"

 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nick"
-msgstr ""
-
-#, fuzzy
+msgstr "Informația text pentru un chat cu un mesaj necitit care vă "
+"menționează numele"
+
 msgid "The text information for a buddy's status"
-msgstr "Modificare detalii pentru %s"
-
-#, fuzzy
+msgstr "Informația text pentru starea unui contact"
+
 msgid "Type the host name for this certificate."
-msgstr ""
-"Introduceți numele calculatorului pentru care a fost eliberat certificatul"
+msgstr "Introduceți numele calculatorului pentru acest certificat."

 #. Widget creation function
 msgid "SSL Servers"
@@ -11055,7 +10914,7 @@
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
-"Nu sunteți autentificat(ă) cu nici un protocol prin care care să puteți "
+"Nu v-ați autentificat cu nici un protocol prin care care să puteți "
 "invita acel contact."

 msgid "Invite Buddy Into Chat Room"
@@ -11089,7 +10948,6 @@
 msgid "Get Away Message"
 msgstr "Obține mesajul în absență"

-#, fuzzy
 msgid "Last Said"
 msgstr "Ultima replică"

@@ -11136,21 +10994,17 @@
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Discuție/G_olește fereastra"

-#, fuzzy
 msgid "/Conversation/M_edia"
-msgstr "/Discuție/Mai m_ult"
-
-#, fuzzy
+msgstr "/Discuție/Me_dia"
+
 msgid "/Conversation/Media/_Audio Call"
-msgstr "/Discuție/Mai m_ult"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel _audio"
+
 msgid "/Conversation/Media/_Video Call"
-msgstr "/Discuție/Mai m_ult"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel _video"
+
 msgid "/Conversation/Media/Audio\\/Video _Call"
-msgstr "/Discuție/Arată în_registrările"
+msgstr "/Discuție/Media/Ap_el audio\\/video"

 msgid "/Conversation/Se_nd File..."
 msgstr "/Discuție/_Trimite un fișier..."
@@ -11159,7 +11013,7 @@
 msgstr "/Discuție/Adaugă î_ntâmpinare..."

 msgid "/Conversation/_Get Info"
-msgstr "/Discuție/D_etalii"
+msgstr "/Discuție/Detali_i"

 msgid "/Conversation/In_vite..."
 msgstr "/Discuție/_Invită..."
@@ -11180,13 +11034,13 @@
 msgstr "/Discuție/A_daugă..."

 msgid "/Conversation/_Remove..."
-msgstr "/Discuție/Șter_ge..."
+msgstr "/Discuție/Șt_erge..."

 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Discuție/Inserează o a_dresă..."
+msgstr "/Discuție/Inserea_ză o adresă..."

 msgid "/Conversation/Insert Imag_e..."
-msgstr "/Discuție/Inserea_ză o imagine..."
+msgstr "/Discuție/Inserează o ima_gine..."

 msgid "/Conversation/_Close"
 msgstr "/Discuție/În_chide"
@@ -11224,17 +11078,14 @@
 msgid "/Conversation/View Log"
 msgstr "/Discuție/Arată înregistrările"

-#, fuzzy
 msgid "/Conversation/Media/Audio Call"
-msgstr "/Discuție/Mai mult"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel audio"
+
 msgid "/Conversation/Media/Video Call"
-msgstr "/Discuție/Arată înregistrările"
-
-#, fuzzy
+msgstr "/Discuție/Media/Apel video"
+
 msgid "/Conversation/Media/Audio\\/Video Call"
-msgstr "/Discuție/Mai mult"
+msgstr "/Discuție/Media/Apel audio\\/video"

 msgid "/Conversation/Send File..."
 msgstr "/Discuție/Trimite un fișier..."
@@ -11420,7 +11271,7 @@
 msgstr "Ka-Hing Cheung"

 msgid "voice and video"
-msgstr ""
+msgstr "voce și video"

 msgid "support"
 msgstr "suport"
@@ -11546,9 +11397,8 @@
 msgid "Hungarian"
 msgstr "Maghiară"

-#, fuzzy
 msgid "Armenian"
-msgstr "Română"
+msgstr "Armeană"

 msgid "Indonesian"
 msgstr "Indoneziană"
@@ -11565,9 +11415,8 @@
 msgid "Ubuntu Georgian Translators"
 msgstr "Traducătorii Ubuntu din Georgia"

-#, fuzzy
 msgid "Khmer"
-msgstr "Altceva"
+msgstr "Khmeră"

 msgid "Kannada"
 msgstr "Kannada"
@@ -11590,9 +11439,8 @@
 msgid "Macedonian"
 msgstr "Macedoneană"

-#, fuzzy
 msgid "Mongolian"
-msgstr "Macedoneană"
+msgstr "Mongoleză"

 msgid "Bokmål Norwegian"
 msgstr "Norvegiană Bokmål"
@@ -11649,7 +11497,7 @@
 msgstr "Suedeză"

 msgid "Swahili"
-msgstr ""
+msgstr "Swahili"

 msgid "Tamil"
 msgstr "Tamil"
@@ -11715,21 +11563,25 @@
 "<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
 "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
 msgstr ""
+"<FONT SIZE=\"4\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+"\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"

 #, c-format
 msgid ""
 "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</A><BR/><BR/>"
 msgstr ""
-
-#, fuzzy, c-format
+"<FONT SIZE=\"4\">Ajutor prin mail:</FONT> <A HREF=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</A><BR/><BR/>"
+
+#, c-format
 msgid ""
 "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
-
-#, fuzzy, c-format
+msgstr "<FONT SIZE=\"4\">Canal IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
+
+#, c-format
 msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"

 msgid "Current Developers"
 msgstr "Programatori activi"
@@ -11811,7 +11663,7 @@
 msgstr "Ștergere contact"

 msgid "_Remove Contact"
-msgstr "Șter_gere contact"
+msgstr "Șt_ergere contact"

 #, c-format
 msgid ""
@@ -11839,7 +11691,7 @@
 msgstr "Ștergere grup"

 msgid "_Remove Group"
-msgstr "Șter_gere grup"
+msgstr "Șt_ergere grup"

 #, c-format
 msgid ""
@@ -11852,7 +11704,7 @@
 msgstr "Ștergere contact"

 msgid "_Remove Buddy"
-msgstr "Șter_ge contactul"
+msgstr "Șt_erge contactul"

 #, c-format
 msgid ""
@@ -11866,7 +11718,7 @@
 msgstr "Ștergere chat"

 msgid "_Remove Chat"
-msgstr "Șter_gere chat"
+msgstr "Șt_ergere chat"

 msgid "Right-click for more unread messages...\n"
 msgstr "Click dreapta pentru mai multe mesaje necitite...\n"
@@ -11953,19 +11805,11 @@
 msgstr "Închide fereastra la _terminarea tuturor transferurilor"

 msgid "C_lear finished transfers"
-msgstr "Șter_ge transferurile terminate"
+msgstr "Șt_erge transferurile terminate"

 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "_Detaliile transferului de fișiere"
-
-#. Pause button
-msgid "_Pause"
-msgstr "_Pauză"
-
-#. Resume button
-msgid "_Resume"
-msgstr "_Reluare"
+msgstr "Detaliile trans_ferului de fișiere"

 msgid "Paste as Plain _Text"
 msgstr "Lipește ca text _simplu"
@@ -11985,9 +11829,8 @@
 msgid "Hyperlink visited color"
 msgstr "Culoare adresă web"

-#, fuzzy
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Culoare pentru afișarea adreselor web vizitate ori activate."
+msgstr "Culoare pentru afișarea adreselor web vizitate (ori activate)."

 msgid "Hyperlink prelight color"
 msgstr "Culoare evidențiere adresă"
@@ -12022,23 +11865,20 @@
 msgid "Action Message Name Color for Whispered Message"
 msgstr "Culoare pentru mesajele comenzi în mod discret"

-#, fuzzy
 msgid "Color to draw the name of a whispered action message."
-msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
+msgstr "Culoare de utilizat pentru numele mesajelor discrete de acțiune."

 msgid "Whisper Message Name Color"
 msgstr "Culoare pentru mesajele discrete"

-#, fuzzy
 msgid "Color to draw the name of a whispered message."
-msgstr "Culoare de utilizat pentru numele mesajelor de tip comandă."
+msgstr "Culoare de utilizat pentru numele mesajelor discrete."

 msgid "Typing notification color"
 msgstr "Culoarea mesajelor de notificare"

-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "Culoare de utilizat pentru mesajele de notificare"
+msgstr "Culoare de utilizat pentru notificarea tastării"

 msgid "Typing notification font"
 msgstr "Fontul mesajelor de notificare"
@@ -12291,7 +12131,7 @@
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Încercați „%s -h” pentru mai multe informații.\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12313,6 +12153,7 @@
 "\n"
 "  -c, --config=DIR    utilizează calea DIR pentru fișierele de configurare\n"
 "  -d, --debug         arată mesaje de depanare în ieșirea standard (stdout)\n"
+"  -f, --force-online  forțează conectarea în orice condiții\n"
 "  -h, --help          arată acest mesaj de ajutor\n"
 "  -m, --multiple      permite instanțe multiple\n"
 "  -n, --nologin       fără autentificare automată\n"
@@ -12322,7 +12163,7 @@
 "  --display=ECRAN     ecran X de utilizat\n"
 "  -v, --version       arată versiunea curentă\n"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -12343,6 +12184,7 @@
 "\n"
 "  -c, --config=DIR    utilizează calea DIR pentru fișierele de configurare\n"
 "  -d, --debug         arată mesaje de depanare în ieșirea standard (stdout)\n"
+"  -f, --force-online  forțează conectarea în orice condiții\n"
 "  -h, --help          arată acest mesaj de ajutor\n"
 "  -m, --multiple      permite instanțe multiple\n"
 "  -n, --nologin       fără autentificare automată\n"
@@ -12387,25 +12229,27 @@

 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "Se iese pentru că un alt client libpurple este deja pornit.\n"

 msgid "/_Media"
-msgstr ""
+msgstr "/_Media"

 msgid "/Media/_Hangup"
-msgstr ""
-
-#, fuzzy
+msgstr "/Media/Înc_hide"
+
 msgid "Calling..."
-msgstr "Se calculează..."
+msgstr "Se apelează..."

 #, c-format
 msgid "%s wishes to start an audio/video session with you."
-msgstr ""
+msgstr "%s dorește să inițieze o sesiune audio/video."

 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr ""
+msgstr "%s dorește să inițieze o sesiune video."
+
+msgid "_Pause"
+msgstr "_Pauză"

 #, c-format
 msgid "%s has %d new message."
@@ -12423,7 +12267,7 @@

 #, c-format
 msgid "The browser command \"%s\" is invalid."
-msgstr "Navigatorul „%s” este invalid."
+msgstr "Navigatorul „%s” este nevalid."

 msgid "Unable to open URL"
 msgstr "Nu se poate deschide acest URL"
@@ -12438,9 +12282,8 @@
 "Ați ales să precizați o comandă pentru deschiderea unui navigator, dar nu "
 "ați introdus-o în preferințe."

-#, fuzzy
 msgid "No message"
-msgstr "Mesaj necunoscut"
+msgstr "Nici un mesaj"

 msgid "Open All Messages"
 msgstr "Deschide toate mesajele"
@@ -12448,16 +12291,14 @@
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Aveți mail nou!</span>"

-#, fuzzy
 msgid "New Pounces"
 msgstr "Întâmpinare nouă"

 msgid "Dismiss"
-msgstr ""
-
-#, fuzzy
+msgstr "Închide"
+
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Aveți mail nou!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Întâmpinare</span>"

 msgid "The following plugins will be unloaded."
 msgstr "Următoarele module vor fi dezactivate."
@@ -12507,7 +12348,6 @@
 msgid "Select a file"
 msgstr "Selectați un fișier"

-#, fuzzy
 msgid "Modify Buddy Pounce"
 msgstr "Editare întâmpinare"

@@ -12584,61 +12424,58 @@
 msgid "Pounce Target"
 msgstr "Țintă întâmpinare"

-#, fuzzy, c-format
+#, c-format
 msgid "Started typing"
-msgstr "Tastarea unui mesaj nou"
-
-#, fuzzy, c-format
+msgstr "A început să tasteze"
+
+#, c-format
 msgid "Paused while typing"
-msgstr "Pauză în timpul tastării"
-
-#, fuzzy, c-format
+msgstr "S-a oprit momentan din tastare"
+
+#, c-format
 msgid "Signed on"
-msgstr "Autentificare"
-
-#, fuzzy, c-format
+msgstr "S-a autentificat"
+
+#, c-format
 msgid "Returned from being idle"
-msgstr "%s s-a întors din inactivitate (%s)"
-
-#, fuzzy, c-format
+msgstr "S-a întors din inactivitate"
+
+#, c-format
 msgid "Returned from being away"
-msgstr "Întoarcerea din absență"
-
-#, fuzzy, c-format
+msgstr "S-a întors din absență"
+
+#, c-format
 msgid "Stopped typing"
-msgstr "M-am oprit din scris"
-
-#, fuzzy, c-format
+msgstr "S-a oprit din scris"
+
+#, c-format
 msgid "Signed off"
-msgstr "Deconectare"
-
-#, fuzzy, c-format
+msgstr "S-a deconectat"
+
+#, c-format
 msgid "Became idle"
-msgstr "Intrarea în inactivitate"
-
-#, fuzzy, c-format
+msgstr "A intrat în inactivitate"
+
+#, c-format
 msgid "Went away"
-msgstr "În absență"
-
-#, fuzzy, c-format
+msgstr "A devenit absent"
+
+#, c-format
 msgid "Sent a message"
-msgstr "Trimite un mesaj"
-
-#, fuzzy, c-format
+msgstr "A trimis un mesaj"
+
+#, c-format
 msgid "Unknown.... Please report this!"
-msgstr "Eveniment necunoscut în întâmpinare. Raportați această eroare."
-
-#, fuzzy
+msgstr "Eveniment necunoscut... Vă rugăm să raportați acest lucru!"
+
 msgid "Theme failed to unpack."
-msgstr "Tema de iconițe simbolice nu a putut fi dezarhivată."
-
-#, fuzzy
+msgstr "Tema nu a putut fi despachetată."
+
 msgid "Theme failed to load."
-msgstr "Tema de iconițe simbolice nu a putut fi dezarhivată."
-
-#, fuzzy
+msgstr "Tema nu a putut fi încărcată."
+
 msgid "Theme failed to copy."
-msgstr "Tema de iconițe simbolice nu a putut fi dezarhivată."
+msgstr "Tema nu a putut fi copiată."

 msgid "Install Theme"
 msgstr "Instalare temă"
@@ -12661,9 +12498,8 @@
 msgstr "Închide _fereastra de discuții cu tasta Esc"

 #. Buddy List Themes
-#, fuzzy
 msgid "Buddy List Theme"
-msgstr "Listă de contacte"
+msgstr "Tema listei de contacte"

 #. System Tray
 msgid "System Tray Icon"
@@ -12675,9 +12511,8 @@
 msgid "On unread messages"
 msgstr "Pentru mesajele necitite"

-#, fuzzy
 msgid "Conversation Window"
-msgstr "Ferestre de discuții"
+msgstr "Fereastra de discuții"

 msgid "_Hide new IM conversations:"
 msgstr "Ascunde discuțiile _noi:"
@@ -12780,9 +12615,9 @@
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplu: stunserver.org</span>"

-#, fuzzy, c-format
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "_Autodetectare adresă IP"
+msgstr "Utilizează adresa IP _autodetectată: %s"

 msgid "Public _IP:"
 msgstr "_IP public:"
@@ -12804,7 +12639,7 @@

 #. TURN server
 msgid "Relay Server (TURN)"
-msgstr ""
+msgstr "Server releu (TURN)"

 msgid "Proxy Server &amp; Browser"
 msgstr "Server proxy &amp; navigator"
@@ -12836,7 +12671,7 @@

 #. This is a global option that affects SOCKS4 usage even with account-specific proxy settings
 msgid "Use remote DNS with SOCKS4 proxies"
-msgstr ""
+msgstr "Cereri DNS prin proxy-urile SOCKS4"

 msgid "_User:"
 msgstr "Utili_zator:"
@@ -13149,12 +12984,11 @@
 msgid "Status for %s"
 msgstr "Status pentru %s"

-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"O iconiță simbolică personalizată există deja pentru combinația de semne "
-"selectată. Alegeți o altă combinație de semne."
+"Există deja o iconiță simbolică pentru '%s'. Alegeți altă combinație de semne."

 msgid "Custom Smiley"
 msgstr "Iconiță simbolică personalizată"
@@ -13168,28 +13002,24 @@
 msgid "Add Smiley"
 msgstr "Adăugare iconiță simbolică"

-#, fuzzy
 msgid "_Image:"
-msgstr "_Imagine"
+msgstr "_Imagine:"

 #. Shortcut text
-#, fuzzy
 msgid "S_hortcut text:"
-msgstr "Combinație de semne"
+msgstr "_Textul combinației de semne"

 msgid "Smiley"
 msgstr "Iconiță simbolice"

-#, fuzzy
 msgid "Shortcut Text"
-msgstr "Combinație de semne"
+msgstr "Textul combinației de semne"

 msgid "Custom Smiley Manager"
 msgstr "Administrator de iconițe personalizate"

-#, fuzzy
 msgid "Select Buddy Icon"
-msgstr "Selectare contact"
+msgstr "Selectare iconiță contact"

 msgid "Click to change your buddyicon for this account."
 msgstr "Clic aici pentru a vă schimba avatarul pentru acest cont."
@@ -13275,13 +13105,12 @@
 msgid "Cannot send launcher"
 msgstr "Lansatorul nu a putut fi trimis"

-#, fuzzy
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
 "Ați tras și plasat un lansator pentru desktop. Probabil doriți sa trimiteți "
-"nu lansatorul în sine, ci fișierul la care face referire."
+"fișierul la care face referire, nu lansatorul în sine."

 #, c-format
 msgid ""
@@ -13314,19 +13143,30 @@
 "Dintr-un motiv necunoscut nu s-a putut încărca imaginea „%s”, probabil este "
 "un fișier imagine corupt"

-#, fuzzy
 msgid "_Open Link"
-msgstr "_Deschide adresa:"
+msgstr "_Deschide linkul:"

 msgid "_Copy Link Location"
 msgstr "_Copiază adresa"

 msgid "_Copy Email Address"
-msgstr "C_opiază adresa de mail"
+msgstr "_Copiază adresa de mail"
+
+msgid "_Open File"
+msgstr "_Deschide fișierul..."
+
+msgid "Open _Containing Directory"
+msgstr "Deschide directorul ce _conține"

 msgid "Save File"
 msgstr "Salvare fișier"

+msgid "_Play Sound"
+msgstr "_Redare sunet"
+
+msgid "_Save File"
+msgstr "_Salvare fișier"
+
 msgid "Select color"
 msgstr "Selectare culoare"

@@ -13414,78 +13254,64 @@
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Arată statistici despre disponibilitatea contactelor"

-#, fuzzy
 msgid "Server name request"
-msgstr "Adresă server"
-
-#, fuzzy
+msgstr "Cerere nume server"
+
 msgid "Enter an XMPP Server"
-msgstr "Conectare la un server de conferințe"
-
-#, fuzzy
+msgstr "Introduceți un server XMPP"
+
 msgid "Select an XMPP server to query"
-msgstr "Selectați un server de conferințe pentru interogare"
-
-#, fuzzy
+msgstr "Selectați un server XMPP pentru interogare"
+
 msgid "Find Services"
-msgstr "Servicii de conectare"
-
-#, fuzzy
+msgstr "Căutare de servicii"
+
 msgid "Add to Buddy List"
-msgstr "Trimite lista de contacte"
-
-#, fuzzy
+msgstr "Adaugă la lista de contacte"
+
 msgid "Gateway"
-msgstr "Intrarea în absență"
-
-#, fuzzy
+msgstr "Gateway"
+
 msgid "Directory"
-msgstr "Director înregistrări"
-
-#, fuzzy
+msgstr "Director"
+
 msgid "PubSub Collection"
-msgstr "Selectați un sunet"
-
-#, fuzzy
+msgstr "Colecție PubSub"
+
 msgid "PubSub Leaf"
-msgstr "Serviciu PubSub"
-
-#, fuzzy
+msgstr "Frunză PubSub"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Descriere"
+msgstr ""
+"\n"
+"<b>Descriere:</b> "

 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Detalii servicii descoperite"
-
-#, fuzzy
+msgstr "Descoperire de servicii"
+
 msgid "_Browse"
-msgstr "_Navigator:"
-
-#, fuzzy
+msgstr "_Navigare:"
+
 msgid "Server does not exist"
-msgstr "Utilizator inexistent"
-
-#, fuzzy
+msgstr "Server inexistent"
+
 msgid "Server does not support service discovery"
-msgstr "Serverul nu permite blocarea"
-
-#, fuzzy
+msgstr "Serverul nu permite descoperirea serviciilor"
+
 msgid "XMPP Service Discovery"
-msgstr "Detalii servicii descoperite"
+msgstr "Descoperire de servicii XMPP"

 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Permite navigarea și înregistrarea serviciilor"
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
 msgstr ""
-"Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."
+"Acest modul este util pentru înregistrarea cu transporturi învechite sau alte servicii XMPP."

 msgid "Buddy is idle"
 msgstr "Contactul este inactiv"
@@ -13877,23 +13703,22 @@
 msgstr "Mesaje muzicale pentru compoziții în colaborare."

 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
 msgstr ""
-"Modulul de mesaje muzicale permite utilizatorilor să lucreze simultan la o "
+"Modulul de mesaje muzicale permite mai multor utilizatori să lucreze simultan la o "
 "piesă muzicală editând o partitură comună în timp real."

 #. ---------- "Notify For" ----------
 msgid "Notify For"
-msgstr "Notifică în:"
+msgstr "Notifică pentru"

 msgid "\t_Only when someone says your username"
-msgstr "\tDoar când cineva _vă spune numele de utilizator într-un chat"
+msgstr "\tD_oar când cineva vă spune numele de utilizator"

 msgid "_Focused windows"
-msgstr "F_erestrele în prim plan"
+msgstr "_Ferestrele în prim plan"

 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
@@ -14001,9 +13826,8 @@
 msgid "Highlighted Message Name Color"
 msgstr "Numele culorii pentru evidențierea mesajelor"

-#, fuzzy
 msgid "Typing Notification Color"
-msgstr "Culoarea mesajelor de notificare"
+msgstr "Culoarea mesajelor de notificare la tastare"

 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separare orizontală GtkTreeView"
@@ -14034,23 +13858,20 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Temă combinații de taste GTK+ Text"

-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Activează mesajele de notificare"
-
-#, fuzzy
+msgstr "Dezactivează textul notificării la tastare"
+
 msgid "GTK+ Theme Control Settings"
-msgstr "Control temă GTK+ Pidgin"
-
-#, fuzzy
+msgstr "Opțiuni de control a temei GTK+"
+
 msgid "Colors"
-msgstr "Închide"
+msgstr "Culori"

 msgid "Fonts"
 msgstr "Fonturi"

 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diverse"

 msgid "Gtkrc File Tools"
 msgstr "Unelte fișiere Gtkrc"
@@ -14135,11 +13956,10 @@
 msgstr "Buton de trimitere în fereastra de discuții"

 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
-msgstr "Adaugă un buton de trimitere a mesajului în fereastra de discuții."
+msgstr "Adaugă un buton de trimitere a mesajului în fereastra de discuții. A se folosi când nu există o tastatură fizică."

 msgid "Duplicate Correction"
 msgstr "Corecție duplicată"
@@ -14190,94 +14010,81 @@
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Schimbă mesajele trimise după reguli predefinite de utilizator."

-#, fuzzy
 msgid "Just logged in"
-msgstr "Neautentificat"
-
-#, fuzzy
+msgstr "Tocmai s-a autentificat"
+
 msgid "Just logged out"
-msgstr "Neautentificat"
+msgstr "Tocmai s-a deconectat"

 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-
-#, fuzzy
+"Iconiță pentru contact/\n"
+"Iconiță pentru persoane necunoscute"
+
 msgid "Icon for Chat"
-msgstr "Intră într-un chat"
-
-#, fuzzy
+msgstr "Iconiță pentru chat"
+
 msgid "Ignored"
-msgstr "Ignoră"
-
-#, fuzzy
+msgstr "Ignorat"
+
 msgid "Founder"
-msgstr "Mai tare"
-
-#, fuzzy
+msgstr "Fondator"
+
+#. A user in a chat room who has special privileges.
 msgid "Operator"
-msgstr "Opera"
-
+msgstr "Operator"
+
+#. A half operator is someone who has a subset of the privileges
+#. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Sub-operator"
+
 msgid "Authorization dialog"
-msgstr "Autorizare acordată"
-
-#, fuzzy
+msgstr "Dialog de autorizare"
+
 msgid "Error dialog"
-msgstr "Erori "
-
-#, fuzzy
+msgstr "Dialog de eroare"
+
 msgid "Information dialog"
-msgstr "Detalii"
+msgstr "Dialog de informare"

 msgid "Mail dialog"
-msgstr ""
-
-#, fuzzy
+msgstr "Dialog de mail"
+
 msgid "Question dialog"
-msgstr "Dialog cerere"
-
-#, fuzzy
+msgstr "Dialog de interogare"
+
 msgid "Warning dialog"
-msgstr "Nivel de avertizare"
+msgstr "Dialog de avertizare"

 msgid "What kind of dialog is this?"
-msgstr ""
-
-#, fuzzy
+msgstr "Ce fel de dialog este acesta?"
+
 msgid "Status Icons"
-msgstr "Status pentru %s"
-
-#, fuzzy
+msgstr "Iconițe de status"
+
 msgid "Chatroom Emblems"
-msgstr "Opțiuni locale chat"
-
-#, fuzzy
+msgstr "Embleme de camere de chat"
+
 msgid "Dialog Icons"
-msgstr "Salvare avatar"
-
-#, fuzzy
+msgstr "Iconițe de dialog"
+
 msgid "Pidgin Icon Theme Editor"
-msgstr "Control temă GTK+ Pidgin"
-
-#, fuzzy
+msgstr "Editor de teme de iconițe Pidgin"
+
 msgid "Contact"
-msgstr "Detalii contact"
-
-#, fuzzy
+msgstr "Contact"
+
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Listă de contacte"
-
-#, fuzzy
+msgstr "Editor de teme pentru lista de contacte Pidgin"
+
 msgid "Edit Buddylist Theme"
-msgstr "Listă de contacte"
+msgstr "Editare temă listă de contacte"

 msgid "Edit Icon Theme"
-msgstr ""
+msgstr "Editare temă de iconițe"

 #. *< type
 #. *< ui_requirement
@@ -14286,16 +14093,14 @@
 #. *< priority
 #. *< id
 #. *  description
-#, fuzzy
 msgid "Pidgin Theme Editor"
-msgstr "Control temă GTK+ Pidgin"
+msgstr "Editor de teme Pidgin"

 #. *< name
 #. *< version
 #. *  summary
-#, fuzzy
 msgid "Pidgin Theme Editor."
-msgstr "Control temă GTK+ Pidgin"
+msgstr "Editor de teme Pidgin."

 #. *< type
 #. *< ui_requirement
@@ -14464,12 +14269,11 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opțiuni Pidgin specifice Windows."

-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Permite alegerea unor opțiuni Pidgin pentru Windows, precum atașarea listei "
-"de contacte."
+"Permite alegerea unor opțiuni specifice Pidgin pentru Windows, precum "
+"atașarea listei de contacte."

 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Deconectat.</font>"
@@ -14509,842 +14313,3 @@
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor și clienților XMPP."

-#~ msgid "Cannot open socket"
-#~ msgstr "Nu s-a putut deschide un socket"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Nu se poate asculta pe socket"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Nu se poate citi din socket"
-
-#~ msgid "Connection failed."
-#~ msgstr "Conexiunea a eșuat."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "Serverul s-a deconectat"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Nu s-a putut crea un socket"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Conectarea la server a eșuat"
-
-#~ msgid "Read error"
-#~ msgstr "Eroare la citire"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nu s-a putut face o conexiune cu serverul:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "Eroare la scriere"
-
-#~ msgid "Last Activity"
-#~ msgstr "Ultima activitate"
-
-#~ msgid "Service Discovery Info"
-#~ msgstr "Detalii servicii descoperite"
-
-#~ msgid "Service Discovery Items"
-#~ msgstr "Servicii descoperite"
-
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Adresare „stanza” extinsă"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "Chat cu mai mulți utilizatori"
-
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr ""
-#~ "Detalii suplimentare despre prezența într-un chat cu mai mulți "
-#~ "utilizatori."
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Comenzi ad-hoc"
-
-#~ msgid "PubSub Service"
-#~ msgstr "Serviciu PubSub"
-
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "Fluxuri de date SOCKS5"
-
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#, fuzzy
-#~ msgid "In-Band Registration"
-#~ msgstr "Eroare la înregistrare"
-
-#~ msgid "User Location"
-#~ msgstr "Loc utilizator"
-
-#~ msgid "User Avatar"
-#~ msgstr "Avatar utilizator"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "Notificări de stări pentru chat"
-
-#~ msgid "Software Version"
-#~ msgstr "Versiune de software"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "Inițializare flux de date"
-
-#~ msgid "User Mood"
-#~ msgstr "Dispoziția utilizatorului"
-
-#~ msgid "User Activity"
-#~ msgstr "Acitivatea utilizatorului"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "Facilitățile entității"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "Negocieri sesiuni criptate"
-
-#~ msgid "User Tune"
-#~ msgstr "Piesă utilizator"
-
-#, fuzzy
-#~ msgid "Roster Item Exchange"
-#~ msgstr "IM cu schimb de chei"
-
-#, fuzzy
-#~ msgid "Reachability Address"
-#~ msgstr "Adresă de mail"
-
-#~ msgid "User Profile"
-#~ msgstr "Profil utilizator"
-
-#, fuzzy
-#~ msgid "Jingle"
-#~ msgstr "Intră"
-
-#~ msgid "User Nickname"
-#~ msgstr "Pseudonim utilizator"
-
-#, fuzzy
-#~ msgid "Jingle Video"
-#~ msgstr "Video în direct"
-
-#~ msgid "Message Receipts"
-#~ msgstr "Confirmări mesaje"
-
-#, fuzzy
-#~ msgid "Public Key Publishing"
-#~ msgstr "Amprentă silabică cheie publică"
-
-#, fuzzy
-#~ msgid "User Chatting"
-#~ msgstr "Opțiuni personale"
-
-#, fuzzy
-#~ msgid "User Browsing"
-#~ msgstr "Moduri utilizator"
-
-#, fuzzy
-#~ msgid "User Gaming"
-#~ msgstr "Nume utilizator"
-
-#, fuzzy
-#~ msgid "User Viewing"
-#~ msgstr "Limită utilizatori"
-
-#, fuzzy
-#~ msgid "Stanza Encryption"
-#~ msgstr "Criptare Trillian"
-
-#~ msgid "Delayed Delivery"
-#~ msgstr "Livrare întârziată"
-
-#~ msgid "File Repository and Sharing"
-#~ msgstr "Repozitorii de fișiere și partajare"
-
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "Negociere sesiune de criptare simplificată"
-
-#~ msgid "Hop Check"
-#~ msgstr "Verificare hopuri"
-
-#~ msgid "Read Error"
-#~ msgstr "Eroare la citire"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Conectarea la server a eșuat."
-
-#~ msgid "Unparseable message"
-#~ msgstr "Nu se poate prelucra mesajul"
-
-#, fuzzy
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Conectarea la server a eșuat"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Autentificare eșuată (%s)."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr ""
-#~ "Ați fost deconectat(ă) pentru că v-ați autentificat de pe o altă stație."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Eroare: suportul SSL nu este instalat."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Parolă incorectă."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Conectarea la serverul BOS a eșuat:\n"
-#~ "%s"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "S-ar putea să fiți în scurt timp deconectat(ă). Vizitați %s pentru "
-#~ "actualizări."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Conectare eșuată"
-
-#~ msgid "Invalid username."
-#~ msgstr "Nume invalid de utilizator"
-
-#, fuzzy
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Nu s-au putut obține detalii despre server"
-
-#~ msgid "Connection lost"
-#~ msgstr "Conexiune pierdută"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Nu s-a putut rezolva numele calculatorului"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Conexiune terminată (la scriere)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Conexiune resetată"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Eroare la citirea din socket: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Conectarea la server a eșuat"
-
-#~ msgid "Could not write"
-#~ msgstr "Nu s-a putut scrie"
-
-#~ msgid "Could not connect"
-#~ msgstr "Conectare eșuată"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Nu s-a putut crea un socket de ascultare"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Nu s-a putut rezolva numele calculatorului"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "Parolă greșită"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nu s-a putut face o conexiune cu %s:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japonia"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Server pager Japonia"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Server transfer de fișiere Japonia"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "S-a pierdut conexiunea cu serverul\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Nu s-a putut rezolva numele serverului"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Serverul necesită TLS/SSL pentru autentificare. Nu s-a găsit nici un fel "
-#~ "de suport TLS/SSL."
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Ascundere ferestre de discuții"
-
-#~ msgid "More Data needed"
-#~ msgstr "E nevoie de mai multe date"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Alegeți o combinație de semne de asociat acestei iconițe."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Selectați o imagine pentru această iconiță."
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Ce identitate doriți să activați?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "Culoare cursor"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Culoare cursor secundar"
-
-#~ msgid "Interface colors"
-#~ msgstr "Culori interfață"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Mărimi widget-uri"
-
-#~ msgid "Invite message"
-#~ msgstr "Mesaj de invitare"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Introduceți numele utilizatorului pe care doriți să-l invitați.\n"
-#~ "Puteți adăuga un mesaj de invitare opțional."
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Nu s-a putut descărca cartea de adrese MSN"
-
-#~ msgid "Looking up %s"
-#~ msgstr "Caut %s"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Conectarea la %s a eșuat"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Autentificare: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Nu se poate scrie fișierul %s."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Nu se poate citi fișierul %s."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "Mesaj prea lung, ultimii %s octeți au fost trunchiați."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s nu este autentificat momentan."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Atenționarea lui %s nu este permisă."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr ""
-#~ "Un mesaj s-a pierdut, ați depășit limita de viteză fixată de server."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "Chat-ul în %s nu este disponibil."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "Trimiteți mesajele prea rapid pentru %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "Ați pierdut un mesaj de la %s pentru că era prea mare."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr "Ați pierdut un mesaj de la %s pentru că a fost trimis prea repede."
-
-#~ msgid "Failure."
-#~ msgstr "Eșec."
-
-#~ msgid "Too many matches."
-#~ msgstr "Prea multe potriviri."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "E nevoie de mai multe atribute."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Serviciul „Dir” este temporar indisponibil."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "Căutarea după adresa de mail este restricționată."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Cuvântul-cheie a fost ignorat."
-
-#~ msgid "No keywords."
-#~ msgstr "Fără cuvinte-cheie."
-
-#~ msgid "User has no directory information."
-#~ msgstr "Nu există informații detaliate în director."
-
-#~ msgid "Country not supported."
-#~ msgstr "Nu există suport de țară."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Eșec necunoscut: %s."
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "Nume de utilizator sau parolă incorecte."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "Serviciul este temporar indisponibil."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr ""
-#~ "Nivelul propriu de avertizare este prea ridicat pentru a vă putea "
-#~ "autentifica."
-
-#~ msgid ""
-#~ "You have been connecting and disconnecting too frequently.  Wait ten "
-#~ "minutes and try again.  If you continue to try, you will need to wait "
-#~ "even longer."
-#~ msgstr ""
-#~ "V-ați conectat și deconectat de prea multe ori. Așteptați zece minute și "
-#~ "încercați din nou. Dacă veți continua să încercați, va trebui să "
-#~ "așteptați chiar mai mult."
-
-#~ msgid "An unknown signon error has occurred: %s."
-#~ msgstr "Eroare necunoscută la autentificare: %s."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Eroare necunoscută: %d. Detalii: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Grup invalid"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Conectare terminată"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "Aștept răspunsul..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC a revenit din așteptare. Puteți trimite mesaje din nou."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Parola a fost schimbată cu succes"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Descărcare detalii „Dir”"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Introducere detalii „Dir”"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Nu s-a putut deschide %s pentru scriere!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Transferul fișierului a eșuat, celălalt utilizator probabil l-a anulat."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Conectarea pentru transfer a eșuat."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr ""
-#~ "Nu s-a putut scrie antetul fișierului. Fișierul nu va fi transferat."
-
-#~ msgid "Save As..."
-#~ msgstr "Salvare ca..."
-
-#~ msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
-#~ msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
-#~ msgstr[0] "%s cere lui %s să accepte %d fișier: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s cere lui %s să accepte %d fișiere: %s (%.2f %s)%s%s"
-#~ msgstr[2] "%s cere lui %s să accepte %d de fișiere: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s vă cere să-i trimiteți un fișier"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "Modul de protocol TOC"
-
-#~ msgid "%s Options"
-#~ msgstr "Opțiuni %s"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Opțiuni proxy"
-
-#~ msgid "By log size"
-#~ msgstr "După mărimea înregistrărilor"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "_Deschide adresa în navigator"
-
-#~ msgid "ST_UN server:"
-#~ msgstr "Server ST_UN:"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "_Imagine iconiță simbolică"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "Combinație de _taste asociată"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "_Evidențiază fereastra la primirea de mesaje noi"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "S-ar putea să fiți rapid deconectat(ă). Poate doriți să încercați TOC "
-#~ "până ce se rezolvă această problemă. Vizitați %s pentru actualizări."
-
-#~ msgid "Connection to server lost (no data received within %d second)"
-#~ msgid_plural ""
-#~ "Connection to server lost (no data received within %d seconds)"
-#~ msgstr[0] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de o secundă)"
-#~ msgstr[1] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de %d secunde)"
-#~ msgstr[2] ""
-#~ "S-a pierdut conexiunea la server (nu s-au primit date de %d de secunde)"
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Adaugă contact"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Nu s-au putut obține detalii despre server"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Eroare „keep alive”"
-
-#, fuzzy
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "S-a pierdut conexiunea cu serverul:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Server de conectare"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Nu s-a putut trimite mesajul."
-
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Ați fost adăugat cu identitatea %d în grupul „%d”"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Detaliile utilizatorului %s nu sunt disponibile"
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "Există deja un grup cu acest nume."
-
-#~ msgid "Primary Information"
-#~ msgstr "Informații de bază"
-
-#~ msgid "Blood Type"
-#~ msgstr "Grupă sanguină"
-
-#, fuzzy
-#~ msgid "Update information"
-#~ msgstr "Actualizare detalii proprii"
-
-#, fuzzy
-#~ msgid "Successed:"
-#~ msgstr "Viteză:"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "Alegerea unui avatar personalizat nu este suportată deocamdată. Alegeți o "
-#~ "imagine de la %s."
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Avatar QQ invalid"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "Ați respins cererea făcută de %d"
-
-#~ msgid "Reject request"
-#~ msgstr "Respinge cererea"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Adaugă contactul cu cereri eșuate de autorizare"
-
-#, fuzzy
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Nu s-a putut încărca lista de contacte"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "Număr QQ"
-
-#~ msgid "Group Description"
-#~ msgstr "Descriere grup"
-
-#~ msgid "Auth"
-#~ msgstr "Autorizare"
-
-#~ msgid "Approve"
-#~ msgstr "Aprobă"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "Cererea de a vă alătura grupului %d v-a fost respinsă de adminul %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "[%d] a părăsit grupul „%d”"
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "Ați fost adăugat cu identitatea %d în grupul „%d”"
-
-#~ msgid "I am a member"
-#~ msgstr "Sunt un membru"
-
-#, fuzzy
-#~ msgid "I am requesting"
-#~ msgstr "Cerere invalidă"
-
-#~ msgid "I am the admin"
-#~ msgstr "Sunt admin"
-
-#~ msgid "Unknown status"
-#~ msgstr "Status necunoscut"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Ștergere grup"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Ați introdus un ID de grup prea mic sau prea mare"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Sigur doriți să părăsiți acest Qun?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Doriți să aprobați cererea?"
-
-#, fuzzy
-#~ msgid "Change Qun member"
-#~ msgstr "Telefon"
-
-#, fuzzy
-#~ msgid "Change Qun information"
-#~ msgstr "Detalii chat"
-
-#~ msgid "System Message"
-#~ msgstr "Mesaj de sistem"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>IP-ul ultimei autentificări</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Ultima autentificare</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Introducere detalii proprii"
-
-#, fuzzy
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "Ieșire din acest QQ Qun"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Blochează acest contact"
-
-#, fuzzy
-#~ msgid "Error password: %s"
-#~ msgstr "Eroare la schimbarea parolei"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Conectarea la server a eșuat."
-
-#, fuzzy
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr ""
-#~ "Eroare de conectare de la serverul %s:\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Doriți să aprobați cererea?"
-
-#, fuzzy
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Doriți să adăugați acest contact?"
-
-#, fuzzy
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s v-a adăugat în lista sa de contacte cu identitatea %s"
-
-#, fuzzy
-#~ msgid "QQ Budy"
-#~ msgstr "Contact"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s dorește să vă adauge în listă cu identitatea %s"
-
-#, fuzzy
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s nu este în lista dumneavoastră de contacte"
-
-#, fuzzy
-#~ msgid "Would you add?"
-#~ msgstr "Doriți să îl adăugați?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "Port server"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Deconectat la distanță"
-
-#~ msgid "developer"
-#~ msgstr "programator"
-
-#~ msgid "XMPP developer"
-#~ msgstr "programator XMPP"
-
-#~ msgid "Artists"
-#~ msgstr "Designeri"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Versiunea utilizată este %s versiunea %s. Ultima versiune este %s. O "
-#~ "puteți obține de la <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Noutăți:</b><br>%s"
-
-#~ msgid "EOF while reading from resolver process"
-#~ msgstr "EOF la citirea de la procesul „resolver”"
-
-#~ msgid "Your information has been updated"
-#~ msgstr "Detaliile v-au fost actualizate"
-
-#~ msgid "Input your reason:"
-#~ msgstr "Precizați motivul:"
-
-#~ msgid "You have successfully removed a buddy"
-#~ msgstr "Ați șters cu succes utilizatorul"
-
-#~ msgid "You have successfully removed yourself from your friend's buddy list"
-#~ msgstr "V-ați șters cu succes din lista contactului"
-
-#~ msgid "You have added %d to buddy list"
-#~ msgstr "Ați adăugat contactul %d în lista de contacte"
-
-#~ msgid "Invalid QQid"
-#~ msgstr "QQid invalid"
-
-#~ msgid "Please enter external group ID"
-#~ msgstr "Introduceți ID-ul grupului extern"
-
-#~ msgid "Reason: %s"
-#~ msgstr "Motiv: %s"
-
-#~ msgid "Your request to join group %d has been approved by admin %d"
-#~ msgstr "Cererea de a vă alătura grupului %d v-a fost aprobată de adminul %d"
-
-#~ msgid "I am applying to join"
-#~ msgstr "Solicit înscrierea"
-
-#~ msgid "You have successfully left the group"
-#~ msgstr "Ați părăsit cu succes grupul"
-
-#~ msgid "QQ Group Auth"
-#~ msgstr "Autorizare grup QQ"
-
-#~ msgid "Your authorization request has been accepted by the QQ server"
-#~ msgstr "Operațiunea de autorizare a fost acceptată de serverul QQ"
-
-#~ msgid "Enter your reason:"
-#~ msgstr "Precizați motivul:"
-
-#, fuzzy
-#~ msgid " Space"
-#~ msgstr "Salvează"
-
-#, fuzzy
-#~ msgid "<b>Real hostname</b>: %s: %d<br>\n"
-#~ msgstr "<b>IP server</b>: %s: %d<br>\n"
-
-#~ msgid "Show Login Information"
-#~ msgstr "Arată informațiile de autentificare"
-
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Autentificare eșuată. Verificați înregistrările de depanare"
-
-#, fuzzy
-#~ msgid "Failed room reply"
-#~ msgstr "Autentificare eșuată, nici un răspuns"
-
-#~ msgid "User %s rejected your request"
-#~ msgstr "%s v-a respins cererea"
-
-#~ msgid "User %s approved your request"
-#~ msgstr "%s v-a aprobat cererea"
-
-#~ msgid "Notice from: %s"
-#~ msgstr "Anunț de la: %s"
-
-#~ msgid "Error setting socket options"
-#~ msgstr "Eroare la introducerea opțiunilor socket-ului"
-
-#~ msgid ""
-#~ "Windows Live ID authentication: cannot find authenticate token in server "
-#~ "response"
-#~ msgstr ""
-#~ "Autentificare Windows Live ID: nu s-a găsit un „token” de autentificare "
-#~ "în răspunsul de la server"
-
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Autentificarea Windows Live ID a eșuat!"
-
-#~ msgid "Too evil (sender)"
-#~ msgstr "Prea periculos (expeditorul)"
-
-#~ msgid "Too evil (receiver)"
-#~ msgstr "Prea periculos (destinatarul)"
-
-#~ msgid "Available Message"
-#~ msgstr "Mesaj ce arată disponibilitatea"
-
-#~ msgid "Away Message"
-#~ msgstr "Mesaj în absență"
-
-#~ msgid "<i>(retrieving)</i>"
-#~ msgstr "<i>(se descarcă)</i>"
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "Cod [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Eroare de operare asupra grupului"
-
-#~ msgid "TCP Address"
-#~ msgstr "Adresă TCP"
-
-#~ msgid "UDP Address"
-#~ msgstr "Adresă UDP"