changeset 30563:9c24dd1f1c1a

merged from im.pidgin.pidgin
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 31 May 2010 02:29:34 +0900
parents 3ed54142386f (current diff) 0a1c592dc440 (diff)
children 89de882d25b1
files configure.ac pidgin/gtkblist.c
diffstat 36 files changed, 3151 insertions(+), 4742 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon May 31 02:28:09 2010 +0900
+++ b/ChangeLog	Mon May 31 02:29:34 2010 +0900
@@ -1,8 +1,11 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.1 (??/??/????):
+version 2.7.1 (05/29/2010):
 	General:
 	* Build fixes on OpenSolaris.  (Brian Lu)
+	* Add configure option --enable-trayicon-compat which installs tray
+	  icons into directories that are compatible with older versions of
+	  hicolor-icon-theme (0.9).
 
 	Pidgin:
 	* Restore the tray icon's blinking functionality.
@@ -24,6 +27,22 @@
 	* Allow connecting to servers that advertise EXTERNAL (broken in
 	  2.7.0)
 
+	MXit:
+	* Replace the MXit-specific mood management with the new standard Moods
+	  API.
+	* Add the standard MXit emoticons.
+	* Improve the handling of users being kicked from MultiMX rooms.
+	* MXit doesn't allow you to see your buddy's Email Address or Title,
+	  so remove those two fields from the "Buddy Information" page.
+	* Show buddy's Registration Country in their profile.
+	* Increment protocol version to v6.0
+	* If an invite you sent was rejected with a reason, display that
+	  message in the buddy tooltip.
+	* CAPTCHA value is a required field during account activation.
+	  (Resolves issue on Maemo)
+	* When your avatar image is changed, don't forget the user's profile
+	  information.
+
 	Windows-Specific Changes:
 	* Fix a regression introduced in 2.7.0 that caused Window Flashing not
 	  to work.
--- a/ChangeLog.API	Mon May 31 02:28:09 2010 +0900
+++ b/ChangeLog.API	Mon May 31 02:29:34 2010 +0900
@@ -1,6 +1,7 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.1 (??/??/????):
+version 2.7.1 (05/29/2010):
+	* No changes
 
 version 2.7.0 (05/12/2010):
 	libpurple:
--- a/NEWS	Mon May 31 02:28:09 2010 +0900
+++ b/NEWS	Mon May 31 02:29:34 2010 +0900
@@ -2,6 +2,21 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.7.1 (05/29/2010):
+	Elliott: Hey, I'm first!  How did that happen?!  Maybe because of the
+	interesting changes in this release.  Sure there were quite a few bug
+	fixes, but I know what you've all been waiting for is the direct
+	connections in MSN.  Trust me, it's really really fast!!
+
+	John: Whoa, short turnaround for us.  This is just 17 days after our
+	previous release!  This fixes a number of bugs that you've all been
+	reporting a ton of duplicate tickets about and even gives you the new
+	direct connection file transfer support for MSN.  Enjoy!
+	
+	Marcus: Quite a bit quicker to get this release out, compared with the
+	previous one :).  Fixes a number of bugs, and I'm sure the MSN direct
+	connections will please many users.  Enjoy!
+
 2.7.0 (05/12/2010):
 	John: We FINALLY got the ICQ X-Status stuff merged in!  And a few other
 	patches that have been sitting on Trac forever.  Couple that with some
--- a/configure.ac	Mon May 31 02:28:09 2010 +0900
+++ b/configure.ac	Mon May 31 02:29:34 2010 +0900
@@ -47,7 +47,7 @@
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [7])
 m4_define([purple_micro_version], [1])
-m4_define([purple_version_suffix], [devel])
+m4_define([purple_version_suffix], [])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -56,7 +56,7 @@
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [7])
 m4_define([gnt_micro_version], [1])
-m4_define([gnt_version_suffix], [devel])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
@@ -322,6 +322,8 @@
 	fi
 fi #enable_i18n
 
+AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
+
 dnl #######################################################################
 dnl # Check for GLib 2.12 (required)
 dnl #######################################################################
@@ -1342,7 +1344,7 @@
 fi
 
 if test "x$SUNCC" = "xyes"; then
-        CFLAGS="-features=extensions" 
+        CFLAGS="$CFLAGS -features=extensions" 
 fi
 AC_SUBST(CFLAGS)
 
@@ -2464,7 +2466,12 @@
 
 AM_CONDITIONAL(INSTALL_PIXMAPS, test "x$enable_pixmaps" = "xyes")
 
-AM_CONDITIONAL(INSTALL_I18N, test "x$enable_i18n" = "xyes")
+dnl #######################################################################
+dnl # Tweak status tray icon installation directory
+dnl #######################################################################
+AC_ARG_ENABLE(trayicon-compat, AC_HELP_STRING([--enable-trayicon-compat], [install tray icons in location compatible with older releases of hicolor-icon-theme]), enable_traycompat="$enableval", enable_traycompat=no)
+
+AM_CONDITIONAL(ENABLE_TRAYCOMPAT, test "x$enable_traycompat" = "xyes")
 
 dnl #######################################################################
 dnl # Check for Doxygen and dot (part of GraphViz)
@@ -2635,6 +2642,7 @@
 echo Use external libzephyr........ : $zephyr
 echo Use external libgadu.......... : $gadu_libs
 echo Install pixmaps............... : $enable_pixmaps
+echo Old tray icon compatibility... : $enable_traycompat
 echo Install translations.......... : $enable_i18n
 echo Has you....................... : yes
 echo
@@ -2662,7 +2670,7 @@
 fi
 if test "x$enable_i18n" = "xno" ; then
 	echo
-	echo Warning: You have disabled the building and intallation of translation
+	echo Warning: You have disabled the building and installation of translation
 	echo data.  This will prevent building pidgin.desktop and the GConf schemas.
 	echo Be sure you know what you are doing.
 fi
--- a/libpurple/dbus-analyze-functions.py	Mon May 31 02:28:09 2010 +0900
+++ b/libpurple/dbus-analyze-functions.py	Mon May 31 02:29:34 2010 +0900
@@ -170,7 +170,7 @@
                 return self.inputpurplestructure(type, name)
 
             # special case for *_get_data functions, be careful here...
-            elif (type[0] == "size_t") and (name == "len"):
+            elif (type[0] == "size_t" or type[0] == "gsize") and name == "len":
                 return self.inputgetdata(type, name)
             
             # unknown pointers are always replaced with NULL
--- a/libpurple/protocols/jabber/auth.c	Mon May 31 02:28:09 2010 +0900
+++ b/libpurple/protocols/jabber/auth.c	Mon May 31 02:29:34 2010 +0900
@@ -158,7 +158,7 @@
 
 		if (mech_name && *mech_name)
 			mechanisms = g_slist_prepend(mechanisms, mech_name);
-		else if (mech_name)
+		else
 			g_free(mech_name);
 
 	}
--- a/libpurple/protocols/jabber/chat.h	Mon May 31 02:28:09 2010 +0900
+++ b/libpurple/protocols/jabber/chat.h	Mon May 31 02:29:34 2010 +0900
@@ -102,8 +102,6 @@
 gboolean jabber_chat_role_user(JabberChat *chat, const char *who,
 		const char *role, const char *why);
 gboolean jabber_chat_role_list(JabberChat *chat, const char *role);
-gboolean jabber_chat_kick_user(JabberChat *chat, const char *who,
-		const char *why);
 
 PurpleRoomlist *jabber_roomlist_get_list(PurpleConnection *gc);
 void jabber_roomlist_cancel(PurpleRoomlist *list);
--- a/libpurple/protocols/msn/directconn.c	Mon May 31 02:28:09 2010 +0900
+++ b/libpurple/protocols/msn/directconn.c	Mon May 31 02:29:34 2010 +0900
@@ -63,13 +63,28 @@
 	}
 
 	g_sprintf(nonce_hash,
-	          "%08X-%04X-%04X-%04X-%08X%04X",
-	          GUINT32_FROM_LE(*((guint32 *)(digest + 0))),
-	          GUINT16_FROM_LE(*((guint16 *)(digest + 4))),
-	          GUINT16_FROM_LE(*((guint16 *)(digest + 6))),
-	          GUINT16_FROM_BE(*((guint16 *)(digest + 8))),
-	          GUINT32_FROM_BE(*((guint32 *)(digest + 10))),
-	          GUINT16_FROM_BE(*((guint16 *)(digest + 14)))
+	          "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X",
+
+	          digest[3],
+	          digest[2],
+	          digest[1],
+	          digest[0],
+
+	          digest[5],
+	          digest[4],
+
+	          digest[7],
+	          digest[6],
+
+	          digest[8],
+	          digest[9],
+
+	          digest[10],
+	          digest[11],
+	          digest[12],
+	          digest[13],
+	          digest[14],
+	          digest[15]
 	);
 }
 
@@ -314,13 +329,13 @@
 }
 
 void
-msn_dc_fallback_to_p2p(MsnDirectConn *dc)
+msn_dc_fallback_to_sb(MsnDirectConn *dc)
 {
 	MsnSlpLink *slplink;
 	MsnSlpCall *slpcall;
 	GQueue *queue = NULL;
 
-	purple_debug_info("msn", "msn_dc_try_fallback_to_p2p %p\n", dc);
+	purple_debug_info("msn", "msn_dc_fallback_to_sb %p\n", dc);
 
 	g_return_if_fail(dc != NULL);
 
@@ -677,7 +692,7 @@
 		purple_debug_warning("msn", "msn_dc_recv_cb: recv error\n");
 
 		if(dc->state != DC_STATE_ESTABLISHED)
-			msn_dc_fallback_to_p2p(dc);
+			msn_dc_fallback_to_sb(dc);
 		else
 			msn_dc_destroy(dc);
 		return;
@@ -687,7 +702,7 @@
 		purple_debug_info("msn", "msn_dc_recv_cb: recv EOF\n");
 
 		if(dc->state != DC_STATE_ESTABLISHED)
-			msn_dc_fallback_to_p2p(dc);
+			msn_dc_fallback_to_sb(dc);
 		else
 			msn_dc_destroy(dc);
 		return;
@@ -720,8 +735,8 @@
 			return;
 
 		case DC_PROCESS_FALLBACK:
-			purple_debug_warning("msn", "msn_dc_recv_cb: packet processing error, fall back to p2p\n");
-			msn_dc_fallback_to_p2p(dc);
+			purple_debug_warning("msn", "msn_dc_recv_cb: packet processing error, fall back to SB\n");
+			msn_dc_fallback_to_sb(dc);
 			return;
 
 		}
@@ -822,7 +837,7 @@
 	}
 
 	dc->connect_timeout_handle = 0;
-	msn_dc_fallback_to_p2p(dc);
+	msn_dc_fallback_to_sb(dc);
 
 	return FALSE;
 }
@@ -870,7 +885,7 @@
 		} else {
 			/*
 			 * Connection failed
-			 * Fall back to P2P transfer
+			 * Fall back to SB transfer
 			 */
 			msn_dc_outgoing_connection_timeout_cb(dc);
 		}
@@ -878,9 +893,9 @@
 	} else {
 		/*
 		 * Both internal and external connection attempts failed.
-		 * Fall back to p2p transfer.
+		 * Fall back to SB transfer.
 		 */
-		msn_dc_fallback_to_p2p(dc);
+		msn_dc_fallback_to_sb(dc);
 	}
 
 	return FALSE;
--- a/libpurple/protocols/msn/directconn.h	Mon May 31 02:28:09 2010 +0900
+++ b/libpurple/protocols/msn/directconn.h	Mon May 31 02:29:34 2010 +0900
@@ -145,7 +145,7 @@
  * create a listening socket.
  */
 void
-msn_dc_fallback_to_p2p(MsnDirectConn *dc);
+msn_dc_fallback_to_sb(MsnDirectConn *dc);
 
 /*
  * Increases the slpcall counter in DC. The direct connection remains open
--- a/libpurple/protocols/msn/slp.c	Mon May 31 02:28:09 2010 +0900
+++ b/libpurple/protocols/msn/slp.c	Mon May 31 02:29:34 2010 +0900
@@ -288,11 +288,11 @@
 	if (nonce) {
 		*ntype = DC_NONCE_SHA1;
 	} else {
-		guint32 n1, n5;
-		guint16 n2, n3, n4, n6;
+		guint32 n1, n6;
+		guint16 n2, n3, n4, n5;
 		nonce = get_token(content, "Nonce: {", "}\r\n");
 		if (nonce
-		 && sscanf(nonce, "%08x-%04hx-%04hx-%04hx-%08x%04hx",
+		 && sscanf(nonce, "%08x-%04hx-%04hx-%04hx-%04hx%08x",
 		           &n1, &n2, &n3, &n4, &n5, &n6) == 6) {
 			*ntype = DC_NONCE_PLAIN;
 			g_free(nonce);
@@ -301,8 +301,8 @@
 			*(guint16 *)(nonce +  4) = GUINT16_TO_LE(n2);
 			*(guint16 *)(nonce +  6) = GUINT16_TO_LE(n3);
 			*(guint16 *)(nonce +  8) = GUINT16_TO_BE(n4);
-			*(guint32 *)(nonce + 10) = GUINT32_TO_BE(n5);
-			*(guint16 *)(nonce + 14) = GUINT16_TO_BE(n6);
+			*(guint16 *)(nonce + 10) = GUINT16_TO_BE(n5);
+			*(guint32 *)(nonce + 12) = GUINT32_TO_BE(n6);
 		} else {
 			/* Invalid nonce, so ignore request */
 			g_free(nonce);
@@ -360,7 +360,7 @@
 
 			} else {
 				/* We weren't able to create a listener either. Use SB. */
-				msn_dc_fallback_to_p2p(dc);
+				msn_dc_fallback_to_sb(dc);
 			}
 
 		} else {
@@ -928,6 +928,25 @@
 	}
 }
 
+static void
+got_error(MsnSlpCall *slpcall,
+          const char *error, const char *type, const char *content)
+{
+	/* It's not valid. Kill this off. */
+	purple_debug_error("msn", "Received non-OK result: %s\n",
+	                   error ? error : "Unknown");
+
+	if (type && !strcmp(type, "application/x-msnmsgr-transreqbody")) {
+		MsnDirectConn *dc = slpcall->slplink->dc;
+		if (dc) {
+			msn_dc_fallback_to_sb(dc);
+			return;
+		}
+	}
+
+	slpcall->wasted = TRUE;
+}
+
 MsnSlpCall *
 msn_slp_sip_recv(MsnSlpLink *slplink, const char *body)
 {
@@ -1004,38 +1023,31 @@
 
 		g_return_val_if_fail(slpcall != NULL, NULL);
 
+		content_type = get_token(body, "Content-Type: ", "\r\n");
+
+		content = get_token(body, "\r\n\r\n", NULL);
+
 		if (strncmp(status, "200 OK", 6))
 		{
-			/* It's not valid. Kill this off. */
-			char temp[32];
+			char *error = NULL;
 			const char *c;
 
 			/* Eww */
 			if ((c = strchr(status, '\r')) || (c = strchr(status, '\n')) ||
 				(c = strchr(status, '\0')))
 			{
-				size_t offset =  c - status;
-				if (offset >= sizeof(temp))
-					offset = sizeof(temp) - 1;
-
-				strncpy(temp, status, offset);
-				temp[offset] = '\0';
+				size_t len = c - status;
+				error = g_strndup(status, len);
 			}
 
-			purple_debug_error("msn", "Received non-OK result: %s\n", temp);
+			got_error(slpcall, error, content_type, content);
+			g_free(error);
 
-			slpcall->wasted = TRUE;
-
-			/* msn_slpcall_destroy(slpcall); */
-			return slpcall;
+		} else {
+			/* Everything's just dandy */
+			got_ok(slpcall, content_type, content);
 		}
 
-		content_type = get_token(body, "Content-Type: ", "\r\n");
-
-		content = get_token(body, "\r\n\r\n", NULL);
-
-		got_ok(slpcall, content_type, content);
-
 		g_free(content_type);
 		g_free(content);
 	}
--- a/libpurple/protocols/msn/slplink.c	Mon May 31 02:28:09 2010 +0900
+++ b/libpurple/protocols/msn/slplink.c	Mon May 31 02:29:34 2010 +0900
@@ -91,8 +91,10 @@
 
 	g_return_if_fail(slplink != NULL);
 
-	if (slplink->swboard != NULL)
+	if (slplink->swboard != NULL) {
 		slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
+		slplink->swboard = NULL;
+	}
 
 	if (slplink->refs > 1) {
 		slplink->refs--;
@@ -207,12 +209,14 @@
 	 * If nothing else is using it then this might cause swboard to be
 	 * destroyed. */
 	if (slplink->slp_calls == NULL && slplink->swboard != NULL) {
+		slplink->swboard->slplinks = g_list_remove(slplink->swboard->slplinks, slplink);
 		msn_switchboard_release(slplink->swboard, MSN_SB_FLAG_FT);
 		slplink->swboard = NULL;
 	}
 
 	/* The slplink has no slpcalls in it, release it from the DC. */
 	if (slplink->slp_calls == NULL && slplink->dc != NULL) {
+		slplink->dc->slplink = NULL;
 		msn_dc_destroy(slplink->dc);
 		slplink->dc = NULL;
 	}
--- a/libpurple/protocols/qq/qq_base.c	Mon May 31 02:28:09 2010 +0900
+++ b/libpurple/protocols/qq/qq_base.c	Mon May 31 02:29:34 2010 +0900
@@ -588,9 +588,14 @@
 		inet_ntoa(qd->my_ip), qd->my_port);
 
 	tm_local = localtime(&server_time);
-	purple_debug_info("QQ", "Server time: %d-%d-%d, %d:%d:%d\n",
-			(1900 +tm_local->tm_year), (1 + tm_local->tm_mon), tm_local->tm_mday,
-			tm_local->tm_hour, tm_local->tm_min, tm_local->tm_sec);
+
+	if (tm_local != NULL)
+		purple_debug_info("QQ", "Server time: %d-%d-%d, %d:%d:%d\n",
+				(1900 +tm_local->tm_year), (1 + tm_local->tm_mon), tm_local->tm_mday,
+				tm_local->tm_hour, tm_local->tm_min, tm_local->tm_sec);
+	else
+		purple_debug_error("QQ", "Server time could not be parsed\n");
+
 	return TRUE;
 }
 
--- a/libpurple/roomlist.h	Mon May 31 02:28:09 2010 +0900
+++ b/libpurple/roomlist.h	Mon May 31 02:29:34 2010 +0900
@@ -57,7 +57,7 @@
 } PurpleRoomlistFieldType;
 
 #include "account.h"
-#include "glib.h"
+#include <glib.h>
 
 /**************************************************************************/
 /** Data Structures                                                       */
--- a/libpurple/upnp.c	Mon May 31 02:28:09 2010 +0900
+++ b/libpurple/upnp.c	Mon May 31 02:29:34 2010 +0900
@@ -919,16 +919,20 @@
 	GSList *l;
 
 	/* Remove ar from discovery_callbacks if present; it was inserted after a cb.
-	 * The same cb may be in the list multple times, so be careful to remove the one assocaited with ar. */
-	l  = discovery_callbacks;
+	 * The same cb may be in the list multiple times, so be careful to remove
+	 * the one associated with ar. */
+	l = discovery_callbacks;
 	while (l)
 	{
-		if (l->next && (l->next->data == ar)) {
-			discovery_callbacks = g_slist_delete_link(discovery_callbacks, l->next);
+		GSList *next = l->next;
+
+		if (next && (next->data == ar)) {
+			discovery_callbacks = g_slist_delete_link(discovery_callbacks, next);
+			next = l->next;
 			discovery_callbacks = g_slist_delete_link(discovery_callbacks, l);
 		}
 
-		l = l->next;
+		l = next;
 	}
 
 	if (ar->tima > 0)
--- a/pidgin/gtkblist.c	Mon May 31 02:28:09 2010 +0900
+++ b/pidgin/gtkblist.c	Mon May 31 02:29:34 2010 +0900
@@ -3460,7 +3460,7 @@
 				PurpleAccount *account = (PurpleAccount *) accounts->data;
 				PurpleConnection *gc = purple_account_get_connection(account);
 
-				if (gc->flags & PURPLE_CONNECTION_SUPPORT_MOODS) {
+				if (gc && gc->flags & PURPLE_CONNECTION_SUPPORT_MOODS) {
 					update_status_with_mood(account, mood, NULL);
 				}
 			}
--- a/pidgin/pixmaps/Makefile.am	Mon May 31 02:28:09 2010 +0900
+++ b/pidgin/pixmaps/Makefile.am	Mon May 31 02:29:34 2010 +0900
@@ -587,11 +587,31 @@
 		$(TOOLBAR_32) \
 		$(TOOLBAR_48) \
 		$(TRAY_THEME) \
+		$(TRAY_16_ICO)
+if ENABLE_TRAYCOMPAT
+# Install in a location compatible with hicolor-icon-theme 0.9
+
+pidginpixmaptray16dir = $(datadir)/pixmaps/pidgin/tray/hicolor/16x16/actions
+dist_pidginpixmaptray16_DATA = $(TRAY_16)
+
+pidginpixmaptray22dir = $(datadir)/pixmaps/pidgin/tray/hicolor/22x22/actions
+dist_pidginpixmaptray22_DATA = $(TRAY_22)
+
+pidginpixmaptray32dir = $(datadir)/pixmaps/pidgin/tray/hicolor/32x32/actions
+dist_pidginpixmaptray32_DATA = $(TRAY_32)
+
+pidginpixmaptray48dir = $(datadir)/pixmaps/pidgin/tray/hicolor/48x48/actions
+dist_pidginpixmaptray48_DATA = $(TRAY_48)
+
+else
+# Install in the "correct" locations
+
+nobase_dist_pidginpixmap_DATA += \
 		$(TRAY_16) \
-		$(TRAY_16_ICO) \
 		$(TRAY_22) \
 		$(TRAY_32) \
 		$(TRAY_48)
+endif
 
 nobase_dist_pidginicons_DATA = \
 		$(ICONS_16) \
--- a/pidgin/pixmaps/Makefile.mingw	Mon May 31 02:28:09 2010 +0900
+++ b/pidgin/pixmaps/Makefile.mingw	Mon May 31 02:29:34 2010 +0900
@@ -42,7 +42,10 @@
 	fi;
 	rm -f ./Makefile.am.mingw
 
-./Makefile.am.mingw: ./Makefile.am
-	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
+./Makefile.am.mingw: ./Makefile.am ./Makefile.mingw
+	sed \
+		-e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' \
+		-e 's/^if\ ENABLE_TRAYCOMPAT/ifeq (\$$(ENABLE_TRAYCOMPAT), 1)/' \
+		$< > $@
         include $@
 
--- a/pidgin/pixmaps/tray/hicolor/index.theme	Mon May 31 02:28:09 2010 +0900
+++ b/pidgin/pixmaps/tray/hicolor/index.theme	Mon May 31 02:29:34 2010 +0900
@@ -2,28 +2,55 @@
 Name=Pidgin
 Comment=Icon theme for Pidgin tray icons
 Hidden=True
-Directories=16x16/status,22x22/status,32x32/status,48x48/status,scalable/status
+Directories=16x16/actions,16x16/status,22x22/actions,22x22/status,32x32/actions,32x32/status,48x48/actions,48x48/status,scalable/actions,scalable/status
+
+[16x16/actions]
+Size=16
+Context=Actions
+Type=Threshold
 
 [16x16/status]
 Size=16
 Context=Status
 Type=Threshold
 
+[22x22/actions]
+Size=22
+Context=Actions
+Type=Threshold
+
 [22x22/status]
 Size=22
 Context=Status
 Type=Threshold
 
+[32x32/actions]
+Size=32
+Context=Actions
+Type=Threshold
+
 [32x32/status]
 Size=32
 Context=Status
 Type=Threshold
 
+[48x48/actions]
+Size=48
+Context=Actions
+Type=Threshold
+
 [48x48/status]
 Size=48
 Context=Status
 Type=Threshold
 
+[scalable/actions]
+MinSize=1
+Size=128
+MaxSize=256
+Context=Actions
+Type=Scalable
+
 [scalable/status]
 MinSize=1
 Size=128
--- a/pidgin/plugins/gevolution/add_buddy_dialog.c	Mon May 31 02:28:09 2010 +0900
+++ b/pidgin/plugins/gevolution/add_buddy_dialog.c	Mon May 31 02:29:34 2010 +0900
@@ -546,19 +546,11 @@
 	gtk_combo_box_set_active(GTK_COMBO_BOX(dialog->addrbooks_combo), 0);
 
 	/* Group box */
-	hbox = gtk_hbox_new(FALSE, 6);
-	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
-	gtk_widget_show(hbox);
-
-	label = gtk_label_new(_("Group:"));
-	gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
-	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
-	gtk_widget_show(label);
-
 	dialog->group_combo =
-		pidgin_text_combo_box_entry_new(NULL, gevo_get_groups());
-	gtk_box_pack_start(GTK_BOX(hbox), dialog->group_combo, TRUE, TRUE, 0);
-	gtk_widget_show(dialog->group_combo);
+		pidgin_text_combo_box_entry_new(group, gevo_get_groups());
+	pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Group:"), NULL,
+							  dialog->group_combo, TRUE, NULL);
+	gtk_widget_show_all(dialog->group_combo);
 
 	/* Cool. Now we only have a little left... */
 
--- a/pidgin/plugins/gevolution/gevolution.c	Mon May 31 02:28:09 2010 +0900
+++ b/pidgin/plugins/gevolution/gevolution.c	Mon May 31 02:29:34 2010 +0900
@@ -36,11 +36,20 @@
 
 #include "gevolution.h"
 
+#if 0
+/* These are private headers that we probably should never have been
+ * including. Maybe very early versions of e-d-s required this?
+ *
+ * also, bonobo has gone away as of e-d-s 2.29.1, and this plugin still
+ * seems to work even on e-d-s 1.10.3 without us touching it.
+ * Maybe it's not really working though. I'm sure we'll find out.
+ */
 #include <libedata-book/Evolution-DataServer-Addressbook.h>
 
 #include <libedata-book/e-data-book-factory.h>
 /* TODO: bonobo is going away eventually, we'll need to find an alternative */
 #include <bonobo/bonobo-main.h>
+#endif
 
 #include <glib.h>
 
@@ -227,12 +236,12 @@
 		char *app = g_find_program_in_path("evolution");
 		if (app != NULL)
 		{
-			char *command_line = g_strdup_printf("%s mailto:%s", app, mail);
-			char *quoted = g_shell_quote(command_line);
+			char *quoted = g_shell_quote(mail);
+			char *command_line = g_strdup_printf("%s mailto:%s", app, quoted);
 			g_free(app);
 			g_free(mail);
 
-			g_spawn_command_line_async(quoted, NULL);
+			g_spawn_command_line_async(command_line, NULL);
 			g_free(command_line);
 			g_free(quoted);
 		}
@@ -326,7 +335,9 @@
 static gboolean
 plugin_load(PurplePlugin *plugin)
 {
+#if 0
 	bonobo_activate();
+#endif
 
 	backup_blist_ui_ops = purple_blist_get_ui_ops();
 
@@ -372,7 +383,9 @@
 static void
 plugin_destroy(PurplePlugin *plugin)
 {
+#if 0
 	bonobo_debug_shutdown();
+#endif
 }
 
 static void
@@ -575,14 +588,20 @@
 	 *
 	 * So, in conclusion, this is an evil hack, but it doesn't harm anything
 	 * and it works.
+	 *
+	 * And for some reason it's needed even when we don't init bonobo ourselves
+	 * at all, so the above explanation is suspect. This is required even with
+	 * e-d-s >= 2.29.1 where bonobo is no longer in the picture.
 	 */
 	g_module_make_resident(plugin->handle);
 
+#if 0
 	if (!bonobo_init_full(NULL, NULL, bonobo_activation_orb_get(),
 						  CORBA_OBJECT_NIL, CORBA_OBJECT_NIL))
 	{
 		purple_debug_error("evolution", "Unable to initialize bonobo.\n");
 	}
+#endif
 }
 
 PURPLE_INIT_PLUGIN(gevolution, init_plugin, info)
--- a/pidgin/plugins/gevolution/new_person_dialog.c	Mon May 31 02:28:09 2010 +0900
+++ b/pidgin/plugins/gevolution/new_person_dialog.c	Mon May 31 02:29:34 2010 +0900
@@ -293,9 +293,10 @@
 						 G_CALLBACK(username_changed_cb), dialog);
 
 		/* Group */
-		dialog->group_combo = pidgin_text_combo_box_entry_new(NULL,
+		dialog->group_combo = pidgin_text_combo_box_entry_new(group,
 			gevo_get_groups());
 		add_pref_box(sg, vbox, _("Group:"), dialog->group_combo);
+		gtk_widget_show_all(dialog->group_combo);
 
 		/* Separator */
 		sep = gtk_hseparator_new();
--- a/po/ChangeLog	Mon May 31 02:28:09 2010 +0900
+++ b/po/ChangeLog	Mon May 31 02:29:34 2010 +0900
@@ -1,7 +1,17 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.7.1
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Chinese (Traditional) translation updated (Ambrose C. Li, Paladin R.
+	  Liu)
+	* Czech translation updated (David Vachulka)
 	* Hebrew translation updated (Shalom Craimer)
+	* Italian translation updated (Claudio Satriano)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Polish translation updated (Piotr Drąg)
+	* Slovenian translation updated (Martin Srebotnjak)
+	* Ukrainian translation updated (Oleksandr Kovalenko)
 
 version 2.7.0
 	* Afrikaans translation updated (Friedel Wolff)
--- a/po/POTFILES.in	Mon May 31 02:28:09 2010 +0900
+++ b/po/POTFILES.in	Mon May 31 02:29:34 2010 +0900
@@ -125,6 +125,7 @@
 libpurple/protocols/mxit/http.c
 libpurple/protocols/mxit/login.c
 libpurple/protocols/mxit/mxit.c
+libpurple/protocols/mxit/multimx.c
 libpurple/protocols/mxit/profile.c
 libpurple/protocols/mxit/protocol.c
 libpurple/protocols/mxit/roster.c
@@ -145,6 +146,7 @@
 libpurple/protocols/oscar/oft.c
 libpurple/protocols/oscar/oscar.c
 libpurple/protocols/oscar/peer.c
+libpurple/protocols/oscar/util.c
 libpurple/protocols/qq/buddy_info.c
 libpurple/protocols/qq/buddy_list.c
 libpurple/protocols/qq/buddy_memo.c
--- a/po/ca.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/ca.po	Mon May 31 02:29:34 2010 +0900
@@ -33,8 +33,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-25 21:38+0200\n"
-"PO-Revision-Date: 2010-05-25 21:51+0200\n"
+"POT-Creation-Date: 2010-05-30 16:10+0200\n"
+"PO-Revision-Date: 2010-05-30 16:10+0200\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -3992,6 +3992,7 @@
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Data de naixement"
 
@@ -5985,6 +5986,7 @@
 msgstr "El vostre MXitID"
 
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -6060,7 +6062,7 @@
 msgid "MXit Login Name"
 msgstr "Nom d'usuari de MXit"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "Sobrenom"
 
@@ -6109,7 +6111,7 @@
 msgid "Security Code"
 msgstr "Codi de seguretat"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Introduïu el codi de seguretat"
 
@@ -6157,6 +6159,16 @@
 msgid "Enable splash-screen popup"
 msgstr "Habilita la pantalla de presentació emergent"
 
+#. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Us han fet fora d'aquest MultiMX."
+
+msgid "was kicked"
+msgstr "ha estat fet fora"
+
+msgid "_Room Name:"
+msgstr "Nom de la _Sala:"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "S'ha trencat la connexió a MXit. Torneu-vos a connectar."
@@ -7935,6 +7947,75 @@
 "necessari per poder enviar imatges instantànies. Atès que es revelarà la "
 "vostra adreça IP, això es pot considerar un risc de privadesa."
 
+msgid "Invalid SNAC"
+msgstr "SNAC invàlid"
+
+msgid "Rate to host"
+msgstr "Velocitat cap a l'ordinador"
+
+msgid "Rate to client"
+msgstr "Velocitat cap al client"
+
+msgid "Service unavailable"
+msgstr "Servei no disponible"
+
+msgid "Service not defined"
+msgstr "Servei no definit"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC obsolet"
+
+msgid "Not supported by host"
+msgstr "El servidor no ho permet"
+
+msgid "Not supported by client"
+msgstr "El client no ho permet"
+
+msgid "Refused by client"
+msgstr "Rebutjat pel client"
+
+msgid "Reply too big"
+msgstr "Resposta massa gran"
+
+msgid "Responses lost"
+msgstr "S'han perdut respostes"
+
+msgid "Request denied"
+msgstr "Petició denegada"
+
+msgid "Busted SNAC payload"
+msgstr "Càrrega SNAC malmesa"
+
+msgid "Insufficient rights"
+msgstr "Drets insuficients"
+
+msgid "In local permit/deny"
+msgstr "En la llista de permès/denegat local"
+
+msgid "Warning level too high (sender)"
+msgstr "Nivell d'avís massa alt (remitent)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Nivell d'avís massa alt (receptor)"
+
+msgid "User temporarily unavailable"
+msgstr "Usuari no disponible temporalment"
+
+msgid "No match"
+msgstr "Cap coincidència"
+
+msgid "List overflow"
+msgstr "Sobreeiximent de la llista"
+
+msgid "Request ambiguous"
+msgstr "Petició ambigua"
+
+msgid "Queue full"
+msgstr "Cua plena"
+
+msgid "Not while on AOL"
+msgstr "No es pot fer mentre estigui a AOL"
+
 msgid "Aquarius"
 msgstr "Aquari"
 
@@ -15388,75 +15469,6 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "No tens permís per desinstal.lar aquesta aplicació."
 
-#~ msgid "Invalid SNAC"
-#~ msgstr "SNAC invàlid"
-
-#~ msgid "Rate to host"
-#~ msgstr "Velocitat cap a l'ordinador"
-
-#~ msgid "Rate to client"
-#~ msgstr "Velocitat cap al client"
-
-#~ msgid "Service unavailable"
-#~ msgstr "Servei no disponible"
-
-#~ msgid "Service not defined"
-#~ msgstr "Servei no definit"
-
-#~ msgid "Obsolete SNAC"
-#~ msgstr "SNAC obsolet"
-
-#~ msgid "Not supported by host"
-#~ msgstr "El servidor no ho permet"
-
-#~ msgid "Not supported by client"
-#~ msgstr "El client no ho permet"
-
-#~ msgid "Refused by client"
-#~ msgstr "Rebutjat pel client"
-
-#~ msgid "Reply too big"
-#~ msgstr "Resposta massa gran"
-
-#~ msgid "Responses lost"
-#~ msgstr "S'han perdut respostes"
-
-#~ msgid "Request denied"
-#~ msgstr "Petició denegada"
-
-#~ msgid "Busted SNAC payload"
-#~ msgstr "Càrrega SNAC malmesa"
-
-#~ msgid "Insufficient rights"
-#~ msgstr "Drets insuficients"
-
-#~ msgid "In local permit/deny"
-#~ msgstr "En la llista de permès/denegat local"
-
-#~ msgid "Warning level too high (sender)"
-#~ msgstr "Nivell d'avís massa alt (remitent)"
-
-#~ msgid "Warning level too high (receiver)"
-#~ msgstr "Nivell d'avís massa alt (receptor)"
-
-#~ msgid "User temporarily unavailable"
-#~ msgstr "Usuari no disponible temporalment"
-
-#~ msgid "No match"
-#~ msgstr "Cap coincidència"
-
-#~ msgid "List overflow"
-#~ msgstr "Sobreeiximent de la llista"
-
-#~ msgid "Request ambiguous"
-#~ msgstr "Petició ambigua"
-
-#~ msgid "Queue full"
-#~ msgstr "Cua plena"
-
-#~ msgid "Not while on AOL"
-#~ msgstr "No es pot fer mentre estigui a AOL"
-
 #~ msgid "Unknown reason."
 #~ msgstr "Motiu desconegut."
 
@@ -16630,9 +16642,6 @@
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Acabeu d'enviar un cop de colze!"
 
-#~ msgid "whacked"
-#~ msgstr "bufetejat"
-
 #~ msgid "torched"
 #~ msgstr "encès"
 
--- a/po/ca@valencia.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/ca@valencia.po	Mon May 31 02:29:34 2010 +0900
@@ -33,8 +33,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 23:18-0400\n"
-"PO-Revision-Date: 2010-05-04 23:17+0200\n"
+"POT-Creation-Date: 2010-05-27 09:57-0400\n"
+"PO-Revision-Date: 2010-05-25 21:51+0200\n"
 "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <tradgnome@softcatala.net>\n"
 "MIME-Version: 1.0\n"
@@ -322,7 +322,8 @@
 "En suprimir este contacte, també se suprimiran tots els amics que hi haja"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "En suprimir este grup, també se suprimiran tots els amics que hi haja"
+msgstr ""
+"En suprimir este grup, també se suprimiran tots els amics que hi haja"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -581,7 +582,8 @@
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Error de sintaxi: heu escrit un nombre d'arguments equivocat per a esta orde."
+"Error de sintaxi: heu escrit un nombre d'arguments equivocat per a esta "
+"orde."
 
 msgid "Your command failed for an unknown reason."
 msgstr "L'orde ha fallat per motius desconeguts."
@@ -641,7 +643,6 @@
 msgid "Conversation"
 msgstr "Conversa"
 
-# FIXME ?
 msgid "Clear Scrollback"
 msgstr "Neteja la finestra"
 
@@ -754,8 +755,8 @@
 "de les diferents classes de missatge en les finestres de conversa.<br>    "
 "&lt;classe&gt;: receive (rep), send (envia), highlight (ressalta), action "
 "(acció), timestamp (marca de temps)<br>    &lt;primer pla/fons&gt;: black "
-"(negre), red (roig), green (verd), blue (blau), white (blanc), gray (gris), "
-"darkgray (gris fosc), magenta, cyan (cian), default (per defecte)"
+"(negre), red (roig), green (verd), blue (blau), white (blanc), gray "
+"(gris), darkgray (gris fosc), magenta, cyan (cian), default (per defecte)"
 "<br><br>EXEMPLE:<br>    msgcolor send cyan default"
 
 msgid "Unable to open file."
@@ -1058,7 +1059,6 @@
 msgid "Edit Buddy Pounce"
 msgstr "Edita l'avís per a l'amic"
 
-# FIXME
 msgid "Pounce Who"
 msgstr "Avisa dels Who"
 
@@ -1385,6 +1385,7 @@
 msgid "Saved Statuses"
 msgstr "Estats alçats"
 
+#. title
 msgid "Title"
 msgstr "Títol"
 
@@ -1510,7 +1511,6 @@
 msgid "Beep too!"
 msgstr "Fes pip també!"
 
-# FIXME
 msgid "Set URGENT for the terminal window."
 msgstr "Estableix URGENT per a la finestra del terminal."
 
@@ -1948,7 +1948,6 @@
 msgid "Thread creation failure: %s"
 msgstr "S'ha produït un error en crear un fil: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Motiu desconegut"
 
@@ -2168,7 +2167,8 @@
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Cert si l'orde emprada per este tipus d'URL s'ha d'executar en un terminal."
+"Cert si l'orde emprada per este tipus d'URL s'ha d'executar en un "
+"terminal."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Si l'orde especificada ha de gestionar URL «aim»"
@@ -2721,8 +2721,8 @@
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
-"Afig una línia nova abans de cada missatge de manera que, en les finestres "
-"de conversa, els missatges apareixen sota el nom d'usuari."
+"Afig una línia nova abans de cada missatge de manera que, en les "
+"finestres de conversa, els missatges apareixen sota el nom d'usuari."
 
 msgid "Offline Message Emulation"
 msgstr "Emulació de missatge de fora de línia"
@@ -2767,7 +2767,6 @@
 msgid "One Time Password"
 msgstr "Contrasenya d'un sol ús"
 
-# FIXME ?
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2791,7 +2790,8 @@
 msgstr ""
 "Vos permet forçar que les contrasenyes siguen d'un sol ús per a comptes dels "
 "quals no s'alcen les contrasenyes.\n"
-"Nota: per poder fer servir això, cal que no s'alce la contrasenya del compte."
+"Nota: per poder fer servir això, cal que no s'alce la contrasenya del "
+"compte."
 
 #. *< type
 #. *< ui_requirement
@@ -2818,8 +2818,8 @@
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
-"Fa que apareguen finestres de conversa així que altres usuaris vos comencen "
-"a enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!"
+"Fa que apareguen finestres de conversa així que altres usuaris vos comencen a "
+"enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!"
 
 msgid "You feel a disturbance in the force..."
 msgstr "Sentireu un certa pertorbació en la força..."
@@ -3223,6 +3223,9 @@
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Nom"
 
@@ -3652,8 +3655,8 @@
 "must be a channel operator to do this."
 msgstr ""
 "devoice &lt;sobrenom1&gt; [sobrenom2] ...:  treu l'estat de veu a algú, "
-"prevenint que parlin al canal si este està moderat (+m). Heu de ser operador "
-"del canal per poder fer això."
+"prevenint que parlin al canal si este està moderat (+m). Heu de ser "
+"operador del canal per poder fer això."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
@@ -3884,7 +3887,7 @@
 "The server does support channel binding, but did not appear to advertise "
 "it.  This indicates a likely MITM attack"
 msgstr ""
-"Aques servidor permet vincular canals, tot i que no ho havia anunciat. Això "
+"Este servidor permet vincular canals, tot i que no ho havia anunciat. Això "
 "podria ser indicatiu d'un atac informàtic \"man-in-the-middle\""
 
 msgid "Server does not support channel binding"
@@ -3967,6 +3970,7 @@
 msgid "Postal Code"
 msgstr "Codi postal"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "País"
 
@@ -3981,8 +3985,6 @@
 msgid "Organization Unit"
 msgstr "Secció de l'organització"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "Títol de la faena"
 
@@ -3990,6 +3992,7 @@
 msgstr "Rol"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Data de naixement"
 
@@ -4849,7 +4852,7 @@
 msgstr "Error desconegut en la presència"
 
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "S'ha produit un error en el fluxe de transferència de dades en banda\n"
+msgstr "S'ha produït un error en el flux de transferència de dades en banda\n"
 
 msgid "Transfer was closed."
 msgstr "La transferència s'ha tancat."
@@ -4904,7 +4907,7 @@
 msgstr "Ansiós"
 
 msgid "Aroused"
-msgstr ""
+msgstr "Animat"
 
 msgid "Ashamed"
 msgstr "Avergonyit"
@@ -4937,7 +4940,7 @@
 msgstr "Acontentat"
 
 msgid "Cranky"
-msgstr ""
+msgstr "Empipat"
 
 msgid "Crazy"
 msgstr "Boig"
@@ -5003,7 +5006,7 @@
 msgstr "Calent"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Avergonyit"
 
 msgid "Humiliated"
 msgstr "Humiliat"
@@ -5018,7 +5021,7 @@
 msgstr "Impressionat"
 
 msgid "In awe"
-msgstr ""
+msgstr "Reverent"
 
 msgid "In love"
 msgstr "Enamorat"
@@ -5051,7 +5054,7 @@
 msgstr "Malèvol"
 
 msgid "Moody"
-msgstr "Animat"
+msgstr "Llunàtic"
 
 msgid "Nervous"
 msgstr "Nerviós"
@@ -5459,7 +5462,8 @@
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr "Actualment, servidors MSN bloquen estes expressions regulars:<br/>%s"
+msgstr ""
+"Actualment, servidors MSN bloquen estes expressions regulars:<br/>%s"
 
 msgid "This account does not have email enabled."
 msgstr "Este compte no té el correu habilitat."
@@ -5735,6 +5739,9 @@
 msgid "Show custom smileys"
 msgstr "Mostra emoticones personalitzades"
 
+msgid "Allow direct connections"
+msgstr "Permet connexions directes"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: doneu un cop de colze a un usuari perquè vos pare atenció"
 
@@ -5975,7 +5982,11 @@
 "Encara no s'ha pogut recuperar la informació del vostre perfil. Torneu-ho a "
 "intentar més tard."
 
+msgid "Your MXitId"
+msgstr "El vostre MXitID"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -6051,7 +6062,7 @@
 msgid "MXit Login Name"
 msgstr "Nom d'usuari de MXit"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "Sobrenom"
 
@@ -6100,7 +6111,7 @@
 msgid "Security Code"
 msgstr "Codi de seguretat"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Introduïu el codi de seguretat"
 
@@ -6126,7 +6137,11 @@
 msgid "Status Message"
 msgstr "Missatge d'estat"
 
+msgid "Rejection Message"
+msgstr "Missatge de rebuig"
+
 # Segons la viquipèdia
+#. hidden number
 msgid "Hidden Number"
 msgstr "Nombre ocult"
 
@@ -6414,8 +6429,8 @@
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
-"No s'ha pogut trobar cap compte adequat a MySpaceIM per poder obrir este URL "
-"myim."
+"No s'ha pogut trobar cap compte adequat a MySpaceIM per poder obrir este "
+"URL myim."
 
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Habiliteu el compte MySpaceIM adequat i proveu-ho de nou."
@@ -6709,7 +6724,8 @@
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"Esta versió d'avaluació no permet que entren més de deu usuaris a la vegada"
+"Esta versió d'avaluació no permet que entren més de deu usuaris a la "
+"vegada"
 
 msgid "The user is either offline or you are blocked"
 msgstr "L'usuari està fora de línia o bé esteu blocat"
@@ -6725,8 +6741,8 @@
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"No s'ha pogut enviar el missatge. No s'han pogut obtindre detalls de "
-"l'usuari (%s)."
+"No s'ha pogut enviar el missatge. No s'han pogut obtindre detalls de l'usuari "
+"(%s)."
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
@@ -6932,6 +6948,63 @@
 msgid "Invalid chat room name"
 msgstr "El nom de sala de xat no és vàlid"
 
+msgid "Invalid error"
+msgstr "Error invàlid"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Els controls parentals no permeten que es puga rebre MI"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "No es poden enviar SMS si no s'accepten els termes"
+
+msgid "Cannot send SMS"
+msgstr "No s'ha pogut enviar l'SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "No es poden enviar SMS a este país"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "No es poden enviar SMS a un país desconegut"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Els robots no poden iniciar MI"
+
+msgid "Bot account cannot IM this user"
+msgstr "Este robot no pot fer MI amb este usuari"
+
+msgid "Bot account reached IM limit"
+msgstr "Este robot ha superat el límit de MI"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Este robot ha superat el límit de MI diari"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Este robot ha superat el límit de MI mensual"
+
+msgid "Unable to receive offline messages"
+msgstr "No s'han pogut rebre els missatges fora de línia"
+
+msgid "Offline message store full"
+msgstr "El dipòsit per a missatge de fora de línia és ple"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "No s'ha pogut enviar el missatge: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "No s'ha pogut enviar el missatge: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "No s'ha pogut enviar el missatge a %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "No s'ha pogut enviar el missatge a %s: %s"
+
 msgid "Thinking"
 msgstr "Pensant"
 
@@ -7076,8 +7149,8 @@
 "%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 vos ha intentat enviar un fitxer %s, però ara mateix només permetem "
-"enviar fitxers de fins a %s a través de MI directa. Proveu-ho fent servir la "
+"%s vos ha intentat enviar un fitxer %s, però ara mateix només permetem enviar "
+"fitxers de fins a %s a través de MI directa. Proveu-ho fent servir la "
 "transferència de fitxers.\n"
 
 # FIXME
@@ -7085,116 +7158,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "El fitxer %s és %s, que és més gran que la mida màxima de %s."
 
-msgid "Invalid error"
-msgstr "Error invàlid"
-
-msgid "Invalid SNAC"
-msgstr "SNAC invàlid"
-
-msgid "Rate to host"
-msgstr "Velocitat cap a l'ordinador"
-
-msgid "Rate to client"
-msgstr "Velocitat cap al client"
-
-msgid "Service unavailable"
-msgstr "Servei no disponible"
-
-msgid "Service not defined"
-msgstr "Servei no definit"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC obsolet"
-
-msgid "Not supported by host"
-msgstr "El servidor no ho permet"
-
-msgid "Not supported by client"
-msgstr "El client no ho permet"
-
-msgid "Refused by client"
-msgstr "Rebutjat pel client"
-
-msgid "Reply too big"
-msgstr "Resposta massa gran"
-
-msgid "Responses lost"
-msgstr "S'han perdut respostes"
-
-msgid "Request denied"
-msgstr "Petició denegada"
-
-msgid "Busted SNAC payload"
-msgstr "Càrrega SNAC malmesa"
-
-msgid "Insufficient rights"
-msgstr "Drets insuficients"
-
-msgid "In local permit/deny"
-msgstr "En la llista de permés/denegat local"
-
-msgid "Warning level too high (sender)"
-msgstr "Nivell d'avís massa alt (remitent)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Nivell d'avís massa alt (receptor)"
-
-msgid "User temporarily unavailable"
-msgstr "Usuari no disponible temporalment"
-
-msgid "No match"
-msgstr "Cap coincidència"
-
-msgid "List overflow"
-msgstr "Sobreeiximent de la llista"
-
-msgid "Request ambiguous"
-msgstr "Petició ambigua"
-
-msgid "Queue full"
-msgstr "Cua plena"
-
-msgid "Not while on AOL"
-msgstr "No es pot fer mentre estiga a AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "Els controls parentals no permeten que es puga rebre MI"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "No es poden enviar SMS si no s'accepten els termes"
-
-msgid "Cannot send SMS"
-msgstr "No s'ha pogut enviar l'SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "No es poden enviar SMS a este país"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "No es poden enviar SMS a un país desconegut"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Els robots no poden iniciar MI"
-
-msgid "Bot account cannot IM this user"
-msgstr "Este robot no pot fer MI amb este usuari"
-
-msgid "Bot account reached IM limit"
-msgstr "Este robot ha superat el límit de MI"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Este robot ha superat el límit de MI diari"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Este robot ha superat el límit de MI mensual"
-
-msgid "Unable to receive offline messages"
-msgstr "No s'han pogut rebre els missatges fora de línia"
-
-msgid "Offline message store full"
-msgstr "El dipòsit per a missatge de fora de línia és ple"
-
 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 "
@@ -7211,8 +7174,9 @@
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
-"(S'ha produït un error en rebre este missatge. És molt possible que %s empri "
-"una codificació diferent a la vostra, o que %s tinga un client defectuós)"
+"(S'ha produït un error en rebre este missatge. És molt possible que %s "
+"empri una codificació diferent a la vostra, o que %s tinga un client "
+"defectuós)"
 
 #. Label
 msgid "Buddy Icon"
@@ -7347,9 +7311,9 @@
 "a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"No s'ha pogut entrar com a %s perquè este nom d'usuari no és vàlid. Els noms "
-"d'usuari han de ser adreces de correu vàlides, o començar amb una lletra i "
-"contindre només lletres, nombres o espais, o només nombres."
+"No s'ha pogut entrar com a %s perquè este nom d'usuari no és vàlid. Els "
+"noms d'usuari han de ser adreces de correu vàlides, o començar amb una "
+"lletra i contindre només lletres, nombres o espais, o només nombres."
 
 #, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
@@ -7545,28 +7509,9 @@
 msgstr[1] "Heu perdut %hu missatges de %s per motius desconeguts."
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "No s'ha pogut enviar el missatge: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "No s'ha pogut enviar el missatge: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "No s'ha pogut enviar el missatge a %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "No s'ha pogut enviar el missatge a %s: %s"
-
-#, c-format
 msgid "User information not available: %s"
 msgstr "La informació de l'usuari no està disponible: %s"
 
-msgid "Unknown reason."
-msgstr "Motiu desconegut."
-
 msgid "Online Since"
 msgstr "En línia des de"
 
@@ -7903,8 +7848,8 @@
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Podeu tornar a demanar l'autorització d'estos amics fent-hi clic a sobre amb "
-"el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
+"Podeu tornar a demanar l'autorització d'estos amics fent-hi clic a sobre "
+"amb el botó dret del ratolí, i seleccionant «Torna a demanar l'autorització»."
 
 msgid "Find Buddy by Email"
 msgstr "Troba un amic per l'adreça de correu"
@@ -8368,8 +8313,7 @@
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
-"<b>L'administrador %2$u vos ha permés unir-vos al Qun %1$u per %3$s</b>"
+msgstr "<b>L'administrador %2$u vos ha permés unir-vos al Qun %1$u per %3$s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -8499,8 +8443,7 @@
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>I tothom que ho ha fet possible...<i><br>\n"
 
-#, fuzzy
-msgid "<i>Feel free to join us!</i> :)"
+msgid "<i>Feel free to join vos!</i> :)"
 msgstr "<i>No dubteu a col·laborar amb nosaltres!</i> :)"
 
 #, c-format
@@ -8836,8 +8779,8 @@
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Seleccioneu a quina conferència, de les d'ací sota, voleu convidar l'usuari %"
-"s. Seleccioneu «Crea una nova conferència» si voleu crear-ne una de nova on "
+"Seleccioneu a quina conferència, de les d'ací sota, voleu convidar l'usuari "
+"%s. Seleccioneu «Crea una nova conferència» si voleu crear-ne una de nova on "
 "convidar-hi l'usuari."
 
 msgid "Invite to Conference"
@@ -9820,7 +9763,8 @@
 msgstr "topic [&lt;tema nou&gt;]: mostra o canvia el tema"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;canal&gt; [&lt;contrasenya&gt;]: entra en un xat d'esta xarxa"
+msgstr ""
+"join &lt;canal&gt; [&lt;contrasenya&gt;]: entra en un xat d'esta xarxa"
 
 msgid "list:  List channels on this network"
 msgstr "list:  llista els canals en esta xarxa"
@@ -9949,8 +9893,9 @@
 msgid "HMAC"
 msgstr "HMAC"
 
+# FIXME: Calc de la versió castellana
 msgid "Use Perfect Forward Secrecy"
-msgstr ""
+msgstr "Empra «confidencialitat directa perfecta»"
 
 msgid "Public key authentication"
 msgstr "Autenticació per clau pública"
@@ -9959,7 +9904,7 @@
 msgstr "Bloca la MI sense intercanvi de claus"
 
 msgid "Block messages to whiteboard"
-msgstr "Bloca els misstges a la pissarra"
+msgstr "Bloca els missatges a la pissarra"
 
 msgid "Automatically open whiteboard"
 msgstr "Obri la pissarra automàticament"
@@ -10213,7 +10158,7 @@
 msgstr "Bloca invitacions a conferències i sales de xat"
 
 msgid "Use account proxy for SSL connections"
-msgstr "Empra un compte per al servidor intermediàri per a connexions SSL"
+msgstr "Empra un compte per al servidor intermediari per a connexions SSL"
 
 msgid "Chat room list URL"
 msgstr "URL de la llista de sales de xat"
@@ -10237,8 +10182,8 @@
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
-"%s vos ha enviat una invitació a la seua càmera web, però això encara no "
-"està implementat."
+"%s vos ha enviat una invitació a la seua càmera web, però això encara no està "
+"implementat."
 
 msgid "Your SMS was not delivered"
 msgstr "No s'ha enviat l'SMS"
@@ -10255,15 +10200,14 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra "
-"llista pel següent motiu:\n"
+"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista "
+"pel següent motiu:\n"
 "%s"
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra "
-"llista."
+"%s vos ha denegat (retroactivament) la petició d'afegir-lo a la vostra llista."
 
 msgid "Add buddy rejected"
 msgstr "S'ha rebutjat afegir l'amic"
@@ -10492,7 +10436,8 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Si voleu veure este perfil, haureu de visitar este enllaç amb el navegador:"
+"Si voleu veure este perfil, haureu de visitar este enllaç amb el "
+"navegador:"
 
 msgid "Yahoo! ID"
 msgstr "ID de Yahoo!"
@@ -10534,9 +10479,9 @@
 "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 ""
-"No s'ha pogut obtindre el perfil de l'usuari. El més segur és que l'usuari "
-"no existisca, tot i que a vegades Yahoo! no pot trobar els perfils d'usuari. "
-"Si sabeu del cert que l'usuari existeix, torneu-ho a intentar més tard."
+"No s'ha pogut obtindre el perfil de l'usuari. El més segur és que l'usuari no "
+"existisca, tot i que a vegades Yahoo! no pot trobar els perfils d'usuari. Si "
+"sabeu del cert que l'usuari existeix, torneu-ho a intentar més tard."
 
 msgid "The user's profile is empty."
 msgstr "El perfil d'usuari està buit."
@@ -10564,8 +10509,8 @@
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"S'ha produït un error desconegut. Potser caldrà que eixiu i espereu uns cinc "
-"minuts abans d'intentar tornar a entrar a la sala de xat"
+"S'ha produït un error desconegut. Potser caldrà que eixiu i espereu uns "
+"cinc minuts abans d'intentar tornar a entrar a la sala de xat"
 
 #, c-format
 msgid "You are now chatting in %s."
@@ -10645,11 +10590,13 @@
 
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"inst &lt;instància&gt;: especifica la instància a fer servir en esta classe"
+"inst &lt;instància&gt;: especifica la instància a fer servir en esta "
+"classe"
 
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"topic &lt;instància&gt;: especifica la instància a fer servir en esta classe"
+"topic &lt;instància&gt;: especifica la instància a fer servir en esta "
+"classe"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
@@ -11135,8 +11082,8 @@
 "voleu que el %s es connecte amb més comptes de missatgeria instantània (MI), "
 "torneu a prémer <b>Afig</b> fins a configurar-los tots.\n"
 "\n"
-"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a partir "
-"del menú <b>Comptes->Gestiona els comptes</b> a finestra de la llista "
+"Podeu tornar a esta finestra per afegir, editar o suprimir comptes, a "
+"partir del menú <b>Comptes->Gestiona els comptes</b> a finestra de la llista "
 "d'amics."
 
 #. Buddy List
@@ -11272,8 +11219,8 @@
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
 "En fusionar estos contactes fareu que compartisquen una mateixa entrada en "
-"la llista d'amics i en la finestra de conversa. Més avant els podreu separar "
-"amb l'opció 'Expandeix' del menú contextual del contacte."
+"la llista d'amics i en la finestra de conversa. Més avant els podreu "
+"separar amb l'opció 'Expandeix' del menú contextual del contacte."
 
 msgid "Please update the necessary fields."
 msgstr "Actualitzeu els camps necessaris."
@@ -12180,9 +12127,8 @@
 msgid "Arabic"
 msgstr "Àrab"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Avergonyit"
+msgstr "Assamés"
 
 msgid "Belarusian Latin"
 msgstr "Bielorús (llatí)"
@@ -12311,9 +12257,8 @@
 msgid "Macedonian"
 msgstr "Macedoni"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Malai"
+msgstr "Malaiàlam"
 
 msgid "Mongolian"
 msgstr "Mongol"
@@ -12466,11 +12411,11 @@
 "<br/>"
 msgstr ""
 "<font size=\"4\"><b>Ajuda d'altres usuaris del Pidgin</b>:</font> <a href="
-"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Esta és una llista de "
-"correu <b>pública</b>. (<a href=\"http://pidgin.im/pipermail/support/"
+"\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>Esta és una llista "
+"de correu <b>pública</b>. (<a href=\"http://pidgin.im/pipermail/support/"
 "\">arxiu</a>)<br/>No vos podem ajudar amb connectors d'altres proveïdors.<br/"
-">En esta llista s'hi empra principalment l'<b>anglés</b>. Podeu escriure-hi "
-"en un altre idioma, però és possible que les respostes no siguen de gaire "
+">En esta llista s'hi empra principalment l'<b>anglés</b>. Podeu escriure-"
+"hi en un altre idioma, però és possible que les respostes no siguen de gaire "
 "ajuda.<br/>"
 
 #, c-format
@@ -12872,8 +12817,8 @@
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
-"Esta emoticona està inhabilitada perquè hi ha una emoticona personalitzada "
-"per esta drecera:\n"
+"Esta emoticona està inhabilitada perquè hi ha una emoticona "
+"personalitzada per esta drecera:\n"
 " %s"
 
 msgid "Smile!"
@@ -13055,7 +13000,6 @@
 msgid "display this help and exit"
 msgstr "mostra esta ajuda i ix"
 
-# FIXME: entrades/registres?
 msgid "allow multiple instances"
 msgstr "permet diverses instàncies"
 
@@ -13112,7 +13056,8 @@
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
-"Ara s'eixirà atès que ja hi ha un altre client del libpurple executant-se.\n"
+"Ara s'eixirà atès que ja hi ha un altre client del libpurple executant-"
+"se.\n"
 
 msgid "/_Media"
 msgstr "/_Medi"
@@ -13233,7 +13178,6 @@
 msgid "Modify Buddy Pounce"
 msgstr "Modifica l'avís per a l'amic"
 
-# FIXME
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
 msgstr "Avisa dels Whom"
@@ -13643,7 +13587,7 @@
 #. This is a global option that affects SOCKS4 usage even with
 #. * account-specific proxy settings
 msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Empra _DNS remot amb servidors intermediàris SOCKS4"
+msgstr "Empra _DNS remot amb servidors intermediaris SOCKS4"
 
 msgid "Proxy t_ype:"
 msgstr "_Tipus de servidor intermediari:"
@@ -13984,8 +13928,8 @@
 "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 ""
-"Podeu enviar esta imatge com una transferència de fitxer, incrustar-la en el "
-"missatge, o emprar-la com a icona d'amic per a este usuari."
+"Podeu enviar esta imatge com una transferència de fitxer, incrustar-la en "
+"el missatge, o emprar-la com a icona d'amic per a este usuari."
 
 msgid "Set as buddy icon"
 msgstr "Estableix com a icona de l'amic"
@@ -14003,15 +13947,15 @@
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"Podeu enviar esta imatge com una transferència de fitxer, o emprar-la com a "
-"icona d'amic per a este usuari."
+"Podeu enviar esta imatge com una transferència de fitxer, o emprar-la com "
+"a icona d'amic per a este usuari."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per a "
-"este usuari."
+"Podeu incrustar esta imatge en el missatge o utilitzar-la com a icona per "
+"a este usuari."
 
 #. I don't know if we really want to do anything here.  Most of
 #. * the desktop item types are crap like "MIME Type" (I have no
@@ -15208,8 +15152,7 @@
 
 msgid "Remove Buddy List window transparency on focus"
 msgstr ""
-"Treu la transparència de la finestra de la llista d'amics en obtindre el "
-"focus"
+"Treu la transparència de la finestra de la llista d'amics en obtindre el focus"
 
 #. *< type
 #. *< ui_requirement
@@ -15233,8 +15176,8 @@
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Este connector habilita la transparència variables en finestres de conversa, "
-"i la llista d'amics.\n"
+"Este connector habilita la transparència variables en finestres de "
+"conversa, i la llista d'amics.\n"
 "\n"
 "* Nota: este connector requereix Windows 2000 o superior."
 
@@ -15301,124 +15244,223 @@
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Este connector és útil per a depurar servidors o clients XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
 msgstr ""
-
+"$(^Name) és distribuït sota llicència GPL. Podeu consultar la llicència, "
+"només per proposits informatius, ací.  $_CLICK"
+
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
-msgstr ""
+msgstr "Una eina IGU multiplataforma, utilitzada per Pidgin"
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
 msgstr ""
-
+"Hi ha una instància del Pidgin executant-se. Ix del Pidgin i torna a "
+"intentar-ho."
+
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
-msgstr ""
-
+msgstr "Fitxers i dlls del nucli de Pidgin"
+
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr ""
-
+msgstr "Crear una entrada Pidgin al Menu Inici"
+
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr ""
-
+msgstr "Afegir un enllaç directe al Pidgin a l'Escriptori"
+
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
-#, fuzzy
+msgstr "Símbols de depuració (per informar d'errades)"
+
+#. Installer Subsection Text
 msgid "Desktop"
-msgstr "Valor predeterminat de l'escriptori"
-
+msgstr "Escriptori"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"S'ha produït un error en baixar l'entorn d'execució GTK+ ($R2).$\\rEl Pidgin "
+"requereix este entorn per a poder-s'executar. Si ho torneu a provar i no "
+"funciona, haureu de fer servir l'instal·lador «fora de línia» de http://"
+"pidgin.im/download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"S'ha produït un error en instal·lar els símbols de depuració ($R2).$\\rSi "
+"falla en reintentar-ho, haureu de fer servir l'instal·lador «fora de línia» "
+"de http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
 "installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
 "20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
-
-#, fuzzy
+"S'ha produït un error en instal·lar el corrector ortogràfic ($R3).$\\rSi "
+"falla en reintentar-ho, podeu seguir les instruccions d'instal·lació manual "
+"d'ací: http://developer.pidgin.im/wiki/Installing%"
+"20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
-msgstr "Versió del mòdul d'execució de GTK+"
-
-#, fuzzy
+msgstr "Entorn d'Execució GTK+ (necessari si no està instal·lat)"
+
+#. Installer Subsection Text
 msgid "Localizations"
-msgstr "Ubicació"
-
-#. License Page
-#, fuzzy
+msgstr "Localitzacions"
+
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
-msgstr "Text"
-
-#. Components Page
-#, fuzzy
+msgstr "Següent >"
+
+#. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
-msgstr "Missatger d'Internet Pidgin"
-
-#. GTK+ Section Prompts
+msgstr "Client Pidgin de Missatgeria Instantània (necessari)"
+
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
-
-#, fuzzy
+"El Pidgin requereix un entorn d'execució GTK+ compatible (que no pareix que "
+"tingueu instal·lat).$\\rEsteu segur que en voleu ometre la instal·lació?"
+
+#. Installer Subsection Text
 msgid "Shortcuts"
-msgstr "Drecera"
-
+msgstr "Enllaços directes"
+
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr ""
-
-#. Spellcheck Section Prompts
+msgstr "Enllaços directes per iniciar el Pidgin"
+
+#. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
-
-#, fuzzy
+msgstr "Suport a la Verificació de l'Ortografia "
+
+#. Installer Subsection Text
 msgid "Start Menu"
-msgstr "Inicialització"
-
+msgstr "Menu Inici"
+
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
-
-#, fuzzy
+"Suport per a Verificació de l'Ortografia.  (és necesaria connexió a internet "
+"per dur a terme la instal.lació)"
+
 msgid "The installer is already running."
-msgstr "Ja hi ha algú amb el sobrenom «%s»."
-
-#. Uninstall Section Prompts
+msgstr "L'instal.lador encara està executant-se."
+
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
-
-#. URL Handler section
-#, fuzzy
+"L'instal.lador podria no trobar les entrades del registre de Pidgin.$"
+"\\rProbablement un altre usuari ha instal.lat esta aplicació."
+
+#. Installer Subsection Text
 msgid "URI Handlers"
-msgstr "Gestor d'URL myim"
-
-#. Pidgin Section Prompts and Texts
+msgstr "Gestors d'URI"
+
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
 msgstr ""
-
-#. Installer Finish Page
+"No s'ha pogut desinstal·lar la versió actual del Pidgin. La nova versió "
+"s'instal·larà sense suprimir-ne la que hi ha actualment instal·lada."
+
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
-msgstr ""
+msgstr "Visita la pàgina web de Pidgin per Windows"
 
 msgid "You do not have permission to uninstall this application."
-msgstr ""
+msgstr "No tens permís per desinstal.lar esta aplicació."
+
+#~ msgid "Invalid SNAC"
+#~ msgstr "SNAC invàlid"
+
+#~ msgid "Rate to host"
+#~ msgstr "Velocitat cap a l'ordinador"
+
+#~ msgid "Rate to client"
+#~ msgstr "Velocitat cap al client"
+
+#~ msgid "Service unavailable"
+#~ msgstr "Servei no disponible"
+
+#~ msgid "Service not defined"
+#~ msgstr "Servei no definit"
+
+#~ msgid "Obsolete SNAC"
+#~ msgstr "SNAC obsolet"
+
+#~ msgid "Not supported by host"
+#~ msgstr "El servidor no ho permet"
+
+#~ msgid "Not supported by client"
+#~ msgstr "El client no ho permet"
+
+#~ msgid "Refused by client"
+#~ msgstr "Rebutjat pel client"
+
+#~ msgid "Reply too big"
+#~ msgstr "Resposta massa gran"
+
+#~ msgid "Responses lost"
+#~ msgstr "S'han perdut respostes"
+
+#~ msgid "Request denied"
+#~ msgstr "Petició denegada"
+
+#~ msgid "Busted SNAC payload"
+#~ msgstr "Càrrega SNAC malmesa"
+
+#~ msgid "Insufficient rights"
+#~ msgstr "Drets insuficients"
+
+#~ msgid "In local permit/deny"
+#~ msgstr "En la llista de permès/denegat local"
+
+#~ msgid "Warning level too high (sender)"
+#~ msgstr "Nivell d'avís massa alt (remitent)"
+
+#~ msgid "Warning level too high (receiver)"
+#~ msgstr "Nivell d'avís massa alt (receptor)"
+
+#~ msgid "User temporarily unavailable"
+#~ msgstr "Usuari no disponible temporalment"
+
+#~ msgid "No match"
+#~ msgstr "Cap coincidència"
+
+#~ msgid "List overflow"
+#~ msgstr "Sobreeiximent de la llista"
+
+#~ msgid "Request ambiguous"
+#~ msgstr "Petició ambigua"
+
+#~ msgid "Queue full"
+#~ msgstr "Cua plena"
+
+#~ msgid "Not while on AOL"
+#~ msgstr "No es pot fer mentre estigui a AOL"
+
+#~ msgid "Unknown reason."
+#~ msgstr "Motiu desconegut."
 
 #~ msgid "Current Mood"
 #~ msgstr "Estat d'ànim actual"
@@ -15430,7 +15472,7 @@
 #~ msgstr "Canvieu el vostre estat d'ànim"
 
 #~ msgid "How do you feel right now?"
-#~ msgstr "Com vos trobeu ara mateix?"
+#~ msgstr "Com us trobeu ara mateix?"
 
 #~ msgid "Change Mood..."
 #~ msgstr "Canvia l'estat d'ànim..."
--- a/po/cs.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/cs.po	Mon May 31 02:29:34 2010 +0900
@@ -9,15 +9,16 @@
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 23:18-0400\n"
-"PO-Revision-Date: 2010-05-04 19:13+0100\n"
+"POT-Creation-Date: 2010-05-29 20:58-0400\n"
+"PO-Revision-Date: 2010-05-26 18:44+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -1343,6 +1344,7 @@
 msgid "Saved Statuses"
 msgstr "Uložené stavy"
 
+#. title
 msgid "Title"
 msgstr "Titul"
 
@@ -1896,7 +1898,6 @@
 msgid "Thread creation failure: %s"
 msgstr "Chyba při vytváření vlákna: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
@@ -3160,6 +3161,9 @@
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Křestní jméno"
 
@@ -3900,6 +3904,7 @@
 msgid "Postal Code"
 msgstr "PSČ"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Země"
 
@@ -3914,8 +3919,6 @@
 msgid "Organization Unit"
 msgstr "Jednotka organizace"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "Název zaměstnání"
 
@@ -3923,6 +3926,7 @@
 msgstr "Role"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Datum narození"
 
@@ -5642,6 +5646,9 @@
 msgid "Show custom smileys"
 msgstr "Zobrazovat systémové smajlíky"
 
+msgid "Allow direct connections"
+msgstr "Povolit přímé připojení"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: získat pozornost uživatele šťouchnutím"
 
@@ -5865,7 +5872,11 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Informace z profilu nebyly získány, zkuste to prosím později."
 
+msgid "Your MXitId"
+msgstr "Tvoje MXitId"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5939,7 +5950,7 @@
 msgid "MXit Login Name"
 msgstr "Přihlašovací jméno MXit"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "Přezdívka"
 
@@ -5984,7 +5995,7 @@
 msgid "Security Code"
 msgstr "Bezpečnostní kód"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Vložte bezpečnostní kód"
 
@@ -6010,6 +6021,10 @@
 msgid "Status Message"
 msgstr "Stavová zpráva"
 
+msgid "Rejection Message"
+msgstr "Zamítnutí zprávy"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Skryté číslo"
 
@@ -6027,6 +6042,19 @@
 msgid "Enable splash-screen popup"
 msgstr "Povolit zobrazení spouštěcí obrazovky"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Byl jste vykopnut: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Špatný lístek"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Místnost:"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Ztratili jste spojení s MXit. Prosím přihlaste se znovu."
@@ -6794,6 +6822,63 @@
 msgid "Invalid chat room name"
 msgstr "Neplatný název místnosti"
 
+msgid "Invalid error"
+msgstr "Neplatná chyba"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Nemohu získat IM z důvodu rodičovské ochrany"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Nemohu poslat SMS bez přijmutí podmínek"
+
+msgid "Cannot send SMS"
+msgstr "Nemohu odeslat SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Nemohu odeslat SMS do této země"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Nemohu poslat SMS do neznámé země"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot účet nemůže zahájit IM "
+
+msgid "Bot account cannot IM this user"
+msgstr "Bot účet nemůže IM tohoto uživatele"
+
+msgid "Bot account reached IM limit"
+msgstr "Bot účet dosáhl IM limit"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Bot účet dosáhl denní IM limit"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot účet dosáhl měsíční IM limit"
+
+msgid "Unable to receive offline messages"
+msgstr "Nemohu přijmout offline zprávy"
+
+msgid "Offline message store full"
+msgstr "Úložiště offline zpráv je plné"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Nemohu odeslat zprávu: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Nemohu odeslat zprávu: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Nemohu odeslat zprávu pro %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Nemohu odeslat zprávu pro %s: %s"
+
 msgid "Thinking"
 msgstr "Zamyšlený"
 
@@ -6944,116 +7029,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Soubor %s je %s, což je větší než maximální velikost %s."
 
-msgid "Invalid error"
-msgstr "Neplatná chyba"
-
-msgid "Invalid SNAC"
-msgstr "Neplatné SNAC"
-
-msgid "Rate to host"
-msgstr "Rychlost k hostiteli"
-
-msgid "Rate to client"
-msgstr "Rychlost ke klientovi"
-
-msgid "Service unavailable"
-msgstr "Služba nedostupná"
-
-msgid "Service not defined"
-msgstr "Služba nedefinována"
-
-msgid "Obsolete SNAC"
-msgstr "Zastaralé SNAC"
-
-msgid "Not supported by host"
-msgstr "Nepodporováno hostitelem"
-
-msgid "Not supported by client"
-msgstr "Nepodporováno klientem"
-
-msgid "Refused by client"
-msgstr "Odmítnuto klientem"
-
-msgid "Reply too big"
-msgstr "Odpověď příliš velká"
-
-msgid "Responses lost"
-msgstr "Odpovědi ztraceny"
-
-msgid "Request denied"
-msgstr "Požadavek zamítnut"
-
-msgid "Busted SNAC payload"
-msgstr "Poškozená data SNAC"
-
-msgid "Insufficient rights"
-msgstr "Nedostatečná oprávnění"
-
-msgid "In local permit/deny"
-msgstr "V místním povolit/zakázat"
-
-msgid "Warning level too high (sender)"
-msgstr "Hladina varování příliš vysoká (odeslání)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Hladina varování příliš vysoká (příjem)"
-
-msgid "User temporarily unavailable"
-msgstr "Uživatel dočasně nedostupný"
-
-msgid "No match"
-msgstr "Žádná shoda"
-
-msgid "List overflow"
-msgstr "Přetečení seznamu"
-
-msgid "Request ambiguous"
-msgstr "Požadavek nejednoznačný"
-
-msgid "Queue full"
-msgstr "Fronta plná"
-
-msgid "Not while on AOL"
-msgstr "Ne když na AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "Nemohu získat IM z důvodu rodičovské ochrany"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Nemohu poslat SMS bez přijmutí podmínek"
-
-msgid "Cannot send SMS"
-msgstr "Nemohu odeslat SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Nemohu odeslat SMS do této země"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Nemohu poslat SMS do neznámé země"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Bot účet nemůže zahájit IM "
-
-msgid "Bot account cannot IM this user"
-msgstr "Bot účet nemůže IM tohoto uživatele"
-
-msgid "Bot account reached IM limit"
-msgstr "Bot účet dosáhl IM limit"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Bot účet dosáhl denní IM limit"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Bot účet dosáhl měsíční IM limit"
-
-msgid "Unable to receive offline messages"
-msgstr "Nemohu přijmout offline zprávy"
-
-msgid "Offline message store full"
-msgstr "Úložiště offline zpráv je plné"
-
 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 "
@@ -7417,28 +7392,9 @@
 msgstr[2] "Přišli jste o %hu zpráv od %s z neznámého důvodu."
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Nemohu odeslat zprávu: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Nemohu odeslat zprávu: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nemohu odeslat zprávu pro %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Nemohu odeslat zprávu pro %s: %s"
-
-#, c-format
 msgid "User information not available: %s"
 msgstr "Informace o uživateli nejsou k dispozici: %s"
 
-msgid "Unknown reason."
-msgstr "Neznámý důvod."
-
 msgid "Online Since"
 msgstr "Odpojen od"
 
@@ -7865,6 +7821,75 @@
 "Images. Protože bude odkryta vaše IP adresa, dá se to považovat za riziko "
 "pro soukromí."
 
+msgid "Invalid SNAC"
+msgstr "Neplatné SNAC"
+
+msgid "Rate to host"
+msgstr "Rychlost k hostiteli"
+
+msgid "Rate to client"
+msgstr "Rychlost ke klientovi"
+
+msgid "Service unavailable"
+msgstr "Služba nedostupná"
+
+msgid "Service not defined"
+msgstr "Služba nedefinována"
+
+msgid "Obsolete SNAC"
+msgstr "Zastaralé SNAC"
+
+msgid "Not supported by host"
+msgstr "Nepodporováno hostitelem"
+
+msgid "Not supported by client"
+msgstr "Nepodporováno klientem"
+
+msgid "Refused by client"
+msgstr "Odmítnuto klientem"
+
+msgid "Reply too big"
+msgstr "Odpověď příliš velká"
+
+msgid "Responses lost"
+msgstr "Odpovědi ztraceny"
+
+msgid "Request denied"
+msgstr "Požadavek zamítnut"
+
+msgid "Busted SNAC payload"
+msgstr "Poškozená data SNAC"
+
+msgid "Insufficient rights"
+msgstr "Nedostatečná oprávnění"
+
+msgid "In local permit/deny"
+msgstr "V místním povolit/zakázat"
+
+msgid "Warning level too high (sender)"
+msgstr "Hladina varování příliš vysoká (odeslání)"
+
+msgid "Warning level too high (receiver)"
+msgstr "Hladina varování příliš vysoká (příjem)"
+
+msgid "User temporarily unavailable"
+msgstr "Uživatel dočasně nedostupný"
+
+msgid "No match"
+msgstr "Žádná shoda"
+
+msgid "List overflow"
+msgstr "Přetečení seznamu"
+
+msgid "Request ambiguous"
+msgstr "Požadavek nejednoznačný"
+
+msgid "Queue full"
+msgstr "Fronta plná"
+
+msgid "Not while on AOL"
+msgstr "Ne když na AOL"
+
 msgid "Aquarius"
 msgstr "Vodnář"
 
@@ -12002,9 +12027,8 @@
 msgid "Arabic"
 msgstr "Arabština"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Hanbící se"
+msgstr "Ásámština"
 
 msgid "Belarusian Latin"
 msgstr "Běloruština (latinka)"
@@ -12132,9 +12156,8 @@
 msgid "Macedonian"
 msgstr "Makedonština"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Malajština"
+msgstr "Malayalam"
 
 msgid "Mongolian"
 msgstr "Mongolština"
@@ -12250,8 +12273,8 @@
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s je modulární klient IM založený na libpurple, schopný zároveň používat "
 "několik služeb pro přenos zpráv.  %s je napsán v C pomocí GTK+. %s můžete "
@@ -12794,21 +12817,21 @@
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Opravdu že chcete natrvalo odstranit záznam konverzace s %s, který začal v %"
-"s?"
-
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
-"Opravdu že chcete natrvalo odstranit záznam konverzace v %s, který začal v %"
-"s?"
-
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Opravdu že chcete natrvalo odstranit záznam konverzace s %s, který začal v "
+"%s?"
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
+msgstr ""
+"Opravdu že chcete natrvalo odstranit záznam konverzace v %s, který začal v "
+"%s?"
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Opravdu chcete natrvalo odstranit systémový záznam, který začal v %s?"
 
 msgid "Delete Log?"
@@ -15053,6 +15076,7 @@
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Tento zásuvný modul je užitečný pro ladění serverů nebo klientů XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15060,95 +15084,113 @@
 "K použití $(^Name) se vztahuje GPL licence. Licence je zde uvedena pouze pro "
 "Vaší informaci. $_CLICK"
 
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr "Multi-platform GUI toolkit používaný Pidginem"
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
-msgstr ""
-
+msgstr "Pidgin je aktuálně spuštěn. Prosím ukončete Pidgin a zkuste to znovu."
+
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
 msgstr "Základní soubory a DLL pro Pidgin"
 
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr ""
-
+msgstr "Vytvořit položku v menu Start pro Pidgin"
+
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr ""
-
+msgstr "Vytvořit zástupce na ploše pro Pidgin"
+
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
-#, fuzzy
+msgstr "Debug symboly (potřebné pro reportování chyb)"
+
+#. Installer Subsection Text
 msgid "Desktop"
-msgstr "Výchozí prostředí"
-
+msgstr "Plocha"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Chyba stahování GTK+ Runtime z ($R2).$\\rRuntime je potřeba pro správnou "
+"funkci Pidgin. Jestliže jeho stažení selže, použijte 'Offline instalační "
+"program' z http://pidgin.im/download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Chyba instalace Debug symbolů: ($R2).$\\rJestliže jeho stažení selže, "
+"použijte 'Offline instalační program' z http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
-msgstr ""
-
-#, fuzzy
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Chyba instalace Kontroly pravopisu z ($R3).$\\rJestliže jeho stažení selže, "
+"postupujte podle instrukcí na: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
-msgstr "GTK+ Runtime Environment (nutné)"
-
-#, fuzzy
+msgstr "GTK+ Runtime (nutné)"
+
+#. Installer Subsection Text
 msgid "Localizations"
-msgstr "Umístění"
-
-#. License Page
+msgstr "Lokalizace"
+
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
 msgstr "Další >"
 
-#. Components Page
+#. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
 msgstr "Pidgin Instant Messaging Client (nutné)"
 
-#. GTK+ Section Prompts
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
-
-#, fuzzy
+"Pidgin potřebuje kompatabilní GTK+ Runtime (vypadá to, že momentálně chybí).$"
+"\\rJste si jistí přeskočením instalace GTK+ Runtime?"
+
+#. Installer Subsection Text
 msgid "Shortcuts"
-msgstr "Klávesová zkratka"
-
+msgstr "Zástupci"
+
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr ""
-
-#. Spellcheck Section Prompts
+msgstr "Zástupce pro spuštění Pidgin"
+
+#. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
-
-#, fuzzy
+msgstr "Podpora kontroly pravopisu"
+
+#. Installer Subsection Text
 msgid "Start Menu"
-msgstr "Spuštění"
-
+msgstr "Start menu"
+
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
-
-#, fuzzy
+"Podpora kontroly pravopisu. (Internetové připojení je potřeba pro instalaci)"
+
 msgid "The installer is already running."
-msgstr "Přezdívka \"%s\" se již používá"
-
-#. Uninstall Section Prompts
+msgstr "Instalační program již běží."
+
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
@@ -15156,24 +15198,27 @@
 "Odinstalční proces nemůže najít záznamy pro Pidgin v registrech.$"
 "\\rPravděpodobně instalaci této aplikace provedl jiný uživatel."
 
-#. URL Handler section
-#, fuzzy
+#. Installer Subsection Text
 msgid "URI Handlers"
-msgstr "Obsluha URL myim"
-
-#. Pidgin Section Prompts and Texts
+msgstr "Obsluha URI"
+
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
 msgstr ""
-
-#. Installer Finish Page
+"Nemohu odinstalovat aktuálně nainstalovanou verzi Pidgin. Nová verze bude "
+"nainstalována bez odstranění aktuálně nainstalované verze."
+
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
 msgstr "Navštívit Pidgin Web Page"
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Nemáte oprávnění k odinstalaci této aplikace."
 
+#~ msgid "Unknown reason."
+#~ msgstr "Neznámý důvod."
+
 #~ msgid "Current Mood"
 #~ msgstr "Momentální nálada"
 
--- a/po/de.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/de.po	Mon May 31 02:29:34 2010 +0900
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-26 10:42+0200\n"
-"PO-Revision-Date: 2010-05-26 10:42+0200\n"
+"POT-Creation-Date: 2010-05-29 17:30+0200\n"
+"PO-Revision-Date: 2010-05-29 17:30+0200\n"
 "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -717,7 +717,7 @@
 msgstr "debugwin: Das Debugging-Fenster anzeigen."
 
 msgid "prefs: Show the preference window."
-msgstr "prefs: Das Einstellungs-Fenster anzeigen."
+msgstr "prefs: Das Einstellungsfenster anzeigen."
 
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Das Fenster mit gespeicherten Status-Infos anzeigen."
@@ -842,7 +842,7 @@
 "log\" preference is enabled."
 msgstr ""
 "Systemereignisse werden nur mitgeschnitten, wenn die Option „Schneide alle "
-"Statusveränderungen im System-Mitschnitt mit“ aktiviert ist."
+"Statusveränderungen im Systemmitschnitt mit“ aktiviert ist."
 
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
@@ -879,7 +879,7 @@
 msgstr "Alle Unterhaltungen"
 
 msgid "System Log"
-msgstr "System-Mitschnitt"
+msgstr "Systemmitschnitt"
 
 msgid "Calling..."
 msgstr "Anrufen..."
@@ -1420,7 +1420,7 @@
 msgstr "Klänge"
 
 msgid "Statuses"
-msgstr "Status-Meldungen"
+msgstr "Statusmeldungen"
 
 msgid "Error loading the plugin."
 msgstr "Beim Laden des Plugins traten Fehler auf."
@@ -2248,7 +2248,7 @@
 msgstr "Fehler mit Ihrer Webcam"
 
 msgid "Conference error"
-msgstr "Konferenz-Fehler"
+msgstr "Konferenzfehler"
 
 #, c-format
 msgid "Error creating session: %s"
@@ -3983,6 +3983,7 @@
 msgstr "Funktion"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Geburtstag"
 
@@ -5976,7 +5977,7 @@
 
 #. show error to user
 msgid "Profile Update Error"
-msgstr "Profil-Aktualisierungs-Fehler"
+msgstr "Profil-Aktualisierungsfehler"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -5992,6 +5993,7 @@
 msgstr "Ihre MXit-ID"
 
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -6069,7 +6071,7 @@
 msgid "MXit Login Name"
 msgstr "MXit-Login-Name"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "Spitzname"
 
@@ -6124,7 +6126,7 @@
 msgid "Security Code"
 msgstr "Sicherheitscode"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Geben Sie den Sicherheitscode ein"
 
@@ -11475,7 +11477,7 @@
 msgstr "/Werkzeuge/Chat_räume"
 
 msgid "/Tools/System _Log"
-msgstr "/Werkzeuge/_System-Mitschnitt"
+msgstr "/Werkzeuge/_Systemmitschnitt"
 
 msgid "/Tools/Mute _Sounds"
 msgstr "/Werkzeuge/S_tummschalten"
@@ -11595,7 +11597,7 @@
 msgstr "Nach Status"
 
 msgid "By recent log activity"
-msgstr "Nach letzter Mitschnitts-Aktivität"
+msgstr "Nach letzter Mitschnittsaktivität"
 
 #, c-format
 msgid "%s disconnected"
@@ -12704,7 +12706,7 @@
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "Dateiübertragungs-_Details"
+msgstr "Dateiübertragungs_details"
 
 msgid "Paste as Plain _Text"
 msgstr "Einfügen als normaler _Text"
@@ -12759,17 +12761,17 @@
 "enthält."
 
 msgid "Action Message Name Color"
-msgstr "Farbe des Absendernamens für Aktions-Nachrichten"
+msgstr "Farbe des Absendernamens für Aktionsnachrichten"
 
 msgid "Color to draw the name of an action message."
-msgstr "Farbe, mit der der Name in einer Aktions-Nachricht dargestellt wird."
+msgstr "Farbe, mit der der Name in einer Aktionsnachricht dargestellt wird."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr "Farbe des Absendernamens für geflüsterte Aktions-Nachrichten"
+msgstr "Farbe des Absendernamens für geflüsterte Aktionsnachrichten"
 
 msgid "Color to draw the name of a whispered action message."
 msgstr ""
-"Farbe, mit der der Name in einer geflüsterten Aktions-Nachricht dargestellt "
+"Farbe, mit der der Name in einer geflüsterten Aktionsnachricht dargestellt "
 "wird."
 
 msgid "Whisper Message Name Color"
@@ -13000,8 +13002,7 @@
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr ""
-"Wollen Sie wirklich den System-Mitschnitt, gestartet am %s, permanent "
-"löschen?"
+"Wollen Sie wirklich den Systemmitschnitt, gestartet am %s, permanent löschen?"
 
 msgid "Delete Log?"
 msgstr "Mitschnitt löschen?"
@@ -13637,7 +13638,7 @@
 msgstr "Benutzer_name:"
 
 msgid "Log _format:"
-msgstr "Mitschnitt-_Format:"
+msgstr "Mitschnitt_format:"
 
 msgid "Log all _instant messages"
 msgstr "_Schneide alle Sofortnachrichten mit"
@@ -13646,7 +13647,7 @@
 msgstr "Alle C_hats mitschneiden"
 
 msgid "Log all _status changes to system log"
-msgstr "Sch_neide alle Statusveränderungen im System-Mitschnitt mit"
+msgstr "Sch_neide alle Statusveränderungen im Systemmitschnitt mit"
 
 msgid "Sound Selection"
 msgstr "Klang-Auswahl"
@@ -14144,12 +14145,12 @@
 #. *< priority
 #. *< id
 msgid "Contact Availability Prediction"
-msgstr "Kontakt-Verfügbarkeits-Vorhersage"
+msgstr "Kontakt-Verfügbarkeitsvorhersage"
 
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr "Kontakt-Verfügbarkeits-Vorhersage-Plugin."
+msgstr "Kontakt-Verfügbarkeitsvorhersage-Plugin."
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
@@ -14889,7 +14890,7 @@
 msgstr "Das angegebene Wort ist bereits in der Korrekturliste enthalten."
 
 msgid "Text Replacements"
-msgstr "Text-Ersetzung"
+msgstr "Textersetzung"
 
 msgid "You type"
 msgstr "Sie tippen"
@@ -15092,7 +15093,7 @@
 msgstr "Für verzögerte Nachrichten in Chats"
 
 msgid "_Message Logs:"
-msgstr "Nachrichten-_Mitschnitt:"
+msgstr "Nachrichten_mitschnitt:"
 
 #. *< type
 #. *< ui_requirement
--- a/po/he.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/he.po	Mon May 31 02:29:34 2010 +0900
@@ -8,8 +8,8 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-20 14:09-0700\n"
-"PO-Revision-Date: 2010-05-10 15:36+0200\n"
+"POT-Creation-Date: 2010-05-29 20:58-0400\n"
+"PO-Revision-Date: 2010-05-24 15:59+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "Language: he\n"
@@ -1325,6 +1325,7 @@
 msgid "Saved Statuses"
 msgstr "סטטוסים נשמרו"
 
+#. title
 msgid "Title"
 msgstr "תואר"
 
@@ -3104,6 +3105,9 @@
 msgstr "מספר זיהוי"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "שם פרטי"
 
@@ -3829,6 +3833,7 @@
 msgid "Postal Code"
 msgstr "מיקוד"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "מדינה"
 
@@ -3843,8 +3848,6 @@
 msgid "Organization Unit"
 msgstr "מחלקה"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "תואר"
 
@@ -3852,6 +3855,7 @@
 msgstr "תפקיד"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "יום הולדת"
 
@@ -5557,6 +5561,9 @@
 msgid "Show custom smileys"
 msgstr "הצג סמייליים שלי"
 
+msgid "Allow direct connections"
+msgstr "אפשר חיבורים ישירים"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: שלח דחיפה לאיש קשר כדי להשיג את תשומת ליבם"
 
@@ -5771,7 +5778,11 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "פרטי הפרופיל שלך עוד לא התקבלו. יש לנסות שנית מאוחר יותר."
 
+msgid "Your MXitId"
+msgstr "מזהה MXit שלך"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "מספר זיהוי"
 
@@ -5845,7 +5856,7 @@
 msgid "MXit Login Name"
 msgstr "שם משתמש MXit"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "כינוי"
 
@@ -5890,7 +5901,7 @@
 msgid "Security Code"
 msgstr "קוד אבטחה"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "הזן קוד אבטחה"
 
@@ -5916,6 +5927,10 @@
 msgid "Status Message"
 msgstr "הודעת מצב"
 
+msgid "Rejection Message"
+msgstr "הודעת דחייה"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "מספר סמוי"
 
@@ -5933,6 +5948,19 @@
 msgid "Enable splash-screen popup"
 msgstr "אפשר פתיחת חלון-הקדמה"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "נבעטת: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "כרטיס לא תקין"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_חדר:"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "החיבור אל MXit אבד. נא להתחבר בשנית."
@@ -7638,6 +7666,75 @@
 "זה דורש חיבור ישיר בין שני המחשבים, ונחוץ עבור תמונות בהודעות. מכיוון שכתובת "
 "ה-IP שלך תיחשף, ייתכן וזה ייחשב כסיכון לפרטיותך."
 
+msgid "Invalid SNAC"
+msgstr "SNAC לא תקף"
+
+msgid "Rate to host"
+msgstr "דירוג למארח"
+
+msgid "Rate to client"
+msgstr "דירוג ללקוח"
+
+msgid "Service unavailable"
+msgstr "השירות אינו זמין"
+
+msgid "Service not defined"
+msgstr "שירות אינו מוגדר"
+
+msgid "Obsolete SNAC"
+msgstr "SNAC מיושן"
+
+msgid "Not supported by host"
+msgstr "לא נתמך על-ידי השרת"
+
+msgid "Not supported by client"
+msgstr "לא נתמך על-ידי הלקוח"
+
+msgid "Refused by client"
+msgstr "החיבור נדחה על ידי הלקוח."
+
+msgid "Reply too big"
+msgstr "המענה גדול מדיי"
+
+msgid "Responses lost"
+msgstr "אבדו המשובים"
+
+msgid "Request denied"
+msgstr "הבקשה נדחית"
+
+msgid "Busted SNAC payload"
+msgstr "מידע פגום ב-SNAC"
+
+msgid "Insufficient rights"
+msgstr "אין די הרשאות"
+
+msgid "In local permit/deny"
+msgstr "באישור/שלילה מקומיים"
+
+msgid "Warning level too high (sender)"
+msgstr "רמת אזהרה גבוהה מדי (שולח("
+
+msgid "Warning level too high (receiver)"
+msgstr "רמת אזהרה גבוהה מדי (מקבל)"
+
+msgid "User temporarily unavailable"
+msgstr "המשתמש אינו זמין כרגע"
+
+msgid "No match"
+msgstr "אין התאמה"
+
+msgid "List overflow"
+msgstr "גלישת מגבולות הרשימה"
+
+msgid "Request ambiguous"
+msgstr "בקשה לא ברורה"
+
+msgid "Queue full"
+msgstr "התור מלא"
+
+msgid "Not while on AOL"
+msgstr "לא בזמן שהות ב-AOL"
+
 msgid "Aquarius"
 msgstr "דלי"
 
@@ -11722,9 +11819,8 @@
 msgid "Arabic"
 msgstr "ערבית"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "מבוייש"
+msgstr "אסאמית"
 
 msgid "Belarusian Latin"
 msgstr "לטינית בלארוסית"
@@ -11852,9 +11948,8 @@
 msgid "Macedonian"
 msgstr "מקדונית"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "מאלאית"
+msgstr "מלאיאלאם"
 
 msgid "Mongolian"
 msgstr "מונגולית"
@@ -14744,6 +14839,10 @@
 msgstr ""
 "$(^Name) .הרישיון נמצא כאן בשביל מידע בלבד .GPL משוחרר תחת רישיון $_CLICK"
 
+#. Installer Subsection Detailed Description
+msgid "A multi-platform GUI toolkit, used by Pidgin"
+msgstr "מולטי-פלטפורמי, בו נעזר פידג'ין GUI כלי"
+
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
@@ -14763,7 +14862,7 @@
 
 #. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
+msgstr "סמלי ניפוי באגים (לדיווח על שגיאות)"
 
 #. Installer Subsection Text
 msgid "Desktop"
@@ -14775,12 +14874,17 @@
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
+"שגיאה בעת הורדת סביבת הריצה של GTK+. ($R2).$\\rרכיב זה נחוץ לפעולת פידג'ין; "
+"אם ניסיון נוסף נכשל, ייתן ונאלץ להשתמש ב'התקנה לא-מקוונת'  מהאתר: from "
+"http://pidgin.im/download/windows/ ."
 
 #. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
+"שגיאה בהתקנת סמלי ניפוי באגים ($R2).$\\rאם ניסיון נוסף נכשל, ייתכן ותיאלצ/י "
+"להשתמש ב'התקנה לא-מקוונת' מהאתר  http://pidgin.im/download/windows/ ."
 
 #. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
@@ -14789,15 +14893,17 @@
 "installation instructions are at: http://developer.pidgin.im/wiki/Installing"
 "%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
+"שגיאה בעת התקנת תיקון שגיאות כתיב ($R3).$\\r אם ניסיון נוסף לא מצליח, יש "
+"למצוא הוראות התקנה ידניות באתר: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
 #. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
 msgstr "(חובה) .GTK+ סביבת"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Localizations"
-msgstr "מיקום"
+msgstr "התאמות למקום"
 
 #. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
@@ -14812,6 +14918,8 @@
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
+"לפידג'ין נחוצה סביבת הרצה של GTK+ (אשר ככל הנראה אינה מותקנת).$\\rהאם ברצונך "
+"לדלג על שלב התקנת GTK+?"
 
 #. Installer Subsection Text
 msgid "Shortcuts"
@@ -14862,9 +14970,6 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ".אין לך זכות למחוק תוכנה זאת"
 
-#~ msgid "A multi-platform GUI toolkit, used by Pidgin"
-#~ msgstr "מולטי-פלטפורמי, בו נעזר פידג'ין GUI כלי"
-
 #~ msgid "Current Mood"
 #~ msgstr "מצב הרוח הנוכחי"
 
@@ -14880,75 +14985,6 @@
 #~ msgid "Change Mood..."
 #~ msgstr "שינוי מצב-רוח..."
 
-#~ msgid "Invalid SNAC"
-#~ msgstr "SNAC לא תקף"
-
-#~ msgid "Rate to host"
-#~ msgstr "דירוג למארח"
-
-#~ msgid "Rate to client"
-#~ msgstr "דירוג ללקוח"
-
-#~ msgid "Service unavailable"
-#~ msgstr "השירות אינו זמין"
-
-#~ msgid "Service not defined"
-#~ msgstr "שירות אינו מוגדר"
-
-#~ msgid "Obsolete SNAC"
-#~ msgstr "SNAC מיושן"
-
-#~ msgid "Not supported by host"
-#~ msgstr "לא נתמך על-ידי השרת"
-
-#~ msgid "Not supported by client"
-#~ msgstr "לא נתמך על-ידי הלקוח"
-
-#~ msgid "Refused by client"
-#~ msgstr "החיבור נדחה על ידי הלקוח."
-
-#~ msgid "Reply too big"
-#~ msgstr "המענה גדול מדיי"
-
-#~ msgid "Responses lost"
-#~ msgstr "אבדו המשובים"
-
-#~ msgid "Request denied"
-#~ msgstr "הבקשה נדחית"
-
-#~ msgid "Busted SNAC payload"
-#~ msgstr "מידע פגום ב-SNAC"
-
-#~ msgid "Insufficient rights"
-#~ msgstr "אין די הרשאות"
-
-#~ msgid "In local permit/deny"
-#~ msgstr "באישור/שלילה מקומיים"
-
-#~ msgid "Warning level too high (sender)"
-#~ msgstr "רמת אזהרה גבוהה מדי (שולח("
-
-#~ msgid "Warning level too high (receiver)"
-#~ msgstr "רמת אזהרה גבוהה מדי (מקבל)"
-
-#~ msgid "User temporarily unavailable"
-#~ msgstr "המשתמש אינו זמין כרגע"
-
-#~ msgid "No match"
-#~ msgstr "אין התאמה"
-
-#~ msgid "List overflow"
-#~ msgstr "גלישת מגבולות הרשימה"
-
-#~ msgid "Request ambiguous"
-#~ msgstr "בקשה לא ברורה"
-
-#~ msgid "Queue full"
-#~ msgstr "התור מלא"
-
-#~ msgid "Not while on AOL"
-#~ msgstr "לא בזמן שהות ב-AOL"
-
 #~ msgid "Unknown reason."
 #~ msgstr "סיבה לא ידועה."
 
--- a/po/hu.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/hu.po	Mon May 31 02:29:34 2010 +0900
@@ -4,14 +4,13 @@
 # The Hungarian translation of Pidgin was sponsored by Novell Hungary, many thanks for it!
 #
 # Zoltan Sutto <suttozoltan@chello.hu>, 2003.
-# Gabor Kelemen <kelemeng@gnome.hu>, 2005, 2006, 2007, 2008, 2009.
-# Gabor Kelemen <kelemeng at gnome dot hu>, 2009, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: pidgin 2.5\n"
+# Gabor Kelemen <kelemeng at gnome dot hu>, 2005, 2006, 2007, 2008, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 23:18-0400\n"
-"PO-Revision-Date: 2010-05-08 00:52+0200\n"
+"POT-Creation-Date: 2010-05-29 02:28+0200\n"
+"PO-Revision-Date: 2010-05-29 02:36+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng at gnome dot hu>\n"
 "Language-Team: Hungarian <gnome at fsf dot hu>\n"
 "MIME-Version: 1.0\n"
@@ -27,7 +26,7 @@
 
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
-msgstr "%s. Próbálja a „%s -h” parancsot további információkért.\n"
+msgstr "%s. Adja ki a „%s -h” parancsot további információkért.\n"
 
 #, c-format
 msgid ""
@@ -148,8 +147,7 @@
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr ""
-"%s%s%s%s felhasználó szeretné %s partnert felvenni a partnerlistájára%s%s"
+msgstr "%s%s%s%s felhasználó szeretné %s partnert felvenni a partnerlistájára%s%s"
 
 msgid "Authorize buddy?"
 msgstr "Engedélyezi a partnert?"
@@ -300,8 +298,7 @@
 msgstr "A kapcsolat eltávolítása a kapcsolat partnereit is eltávolítja"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr ""
-"A csoport eltávolítása a csoportban található partnereket is eltávolítja"
+msgstr "A csoport eltávolítása a csoportban található partnereket is eltávolítja"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
@@ -374,8 +371,7 @@
 msgstr "Új azonnali üzenet"
 
 msgid "Please enter the username or alias of the person you would like to IM."
-msgstr ""
-"Adja meg azon személy felhasználónevét vagy álnevét, akinek üzenni szeretne."
+msgstr "Adja meg azon személy felhasználónevét vagy álnevét, akinek üzenni szeretne."
 
 msgid "Channel"
 msgstr "Csatorna"
@@ -601,13 +597,10 @@
 "újracsatlakozásakor automatikusan újra csatlakozni fog a csevegéshez."
 
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-"A naplózás elkezdődött. A társalgás jövőbeli üzenetei naplózva lesznek."
-
-msgid ""
-"Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-"A naplózás befejeződött. A társalgás jövőbeli üzenetei nem lesznek naplózva."
+msgstr "A naplózás elkezdődött. A társalgás jövőbeli üzenetei naplózva lesznek."
+
+msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgstr "A naplózás befejeződött. A társalgás jövőbeli üzenetei nem lesznek naplózva."
 
 msgid "Send To"
 msgstr "Küldés ennek"
@@ -669,8 +662,7 @@
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
-msgstr ""
-"%s nem érvényes szín. Az érvényes színekért lásd a „help msgcolor” kimenetét."
+msgstr "%s nem érvényes szín. Az érvényes színekért lásd a „help msgcolor” kimenetét."
 
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
@@ -844,8 +836,7 @@
 "Az azonnali üzenetek csak akkor lesznek naplózva, ha az „Összes azonnali "
 "üzenet naplózása” tulajdonság be van állítva."
 
-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 ""
 "A csevegések csak akkor lesznek naplózva, ha az „Összes csevegés naplózása” "
 "tulajdonság be van állítva."
@@ -990,8 +981,7 @@
 msgid "The selected file is not a valid plugin."
 msgstr "A kiválasztott fájl nem egy érvényes bővítmény."
 
-msgid ""
-"Please open the debug window and try again to see the exact error message."
+msgid "Please open the debug window and try again to see the exact error message."
 msgstr ""
 "Nyissa meg a hibakereső ablakot és próbálkozzon újra a pontos hibaüzenet "
 "megjelenítéséhez."
@@ -1351,6 +1341,7 @@
 msgid "Saved Statuses"
 msgstr "Mentett állapotok"
 
+#. title
 msgid "Title"
 msgstr "Beosztás"
 
@@ -1422,8 +1413,7 @@
 msgstr "Az ablak nem található"
 
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr ""
-"A bővítmény nem tölthető be, mivel X11 támogatás nélkül került lefordításra."
+msgstr "A bővítmény nem tölthető be, mivel X11 támogatás nélkül került lefordításra."
 
 msgid "GntClipboard"
 msgstr "GntClipboard"
@@ -1507,7 +1497,7 @@
 msgstr "Gnt előzmények"
 
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Legutóbb naplózott társalgások mutatása új társalgáskor."
+msgstr "Megjeleníti a nemrég naplózott társalgásokat az új társalgásokban."
 
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
@@ -1907,7 +1897,6 @@
 msgid "Thread creation failure: %s"
 msgstr "Szál-előállítási hiba: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
@@ -2162,8 +2151,7 @@
 msgstr "A megadott parancs kezelje-e az „ymsgr” URL címeket"
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
-msgstr ""
-"<b><font color=\"red\">A naplózónak nincsen olvasás funkciója</font></b>"
+msgstr "<b><font color=\"red\">A naplózónak nincsen olvasás funkciója</font></b>"
 
 msgid "HTML"
 msgstr "HTML"
@@ -2214,8 +2202,7 @@
 "Nem találhatók kodekek. Telepítsen néhány GStreamer kodeket, ezek a "
 "GStreamer bővítménycsomagokban találhatók."
 
-msgid ""
-"No codecs left. Your codec preferences in fs-codecs.conf are too strict."
+msgid "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
 "Nincs több kodek. A fs-codecs.conf fájlban megadott kodekbeállítások túl "
 "szigorúak."
@@ -2251,8 +2238,7 @@
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "Az ABI verziója nem egyezik: %d.%d.x (szükséges: %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 ""
 "A bővítmény nem valósítja meg az összes kívánt függvényt (list_icon, login "
 "és close)"
@@ -2261,8 +2247,7 @@
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
-msgstr ""
-"A szükséges %s bővítmény nem található. Kérem telepítse, majd próbálja újra."
+msgstr "A szükséges %s bővítmény nem található. Kérem telepítse, majd próbálja újra."
 
 msgid "Unable to load the plugin"
 msgstr "A bővítmény nem tölthető be"
@@ -2327,8 +2312,7 @@
 "(Teljes elérési utat adjon meg)"
 
 msgid "Automatically reject from users not in buddy list"
-msgstr ""
-"Automatikus visszautasítás a partnerlistán nem szereplő felhasználóktól"
+msgstr "Automatikus visszautasítás a partnerlistán nem szereplő felhasználóktól"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
@@ -2558,8 +2542,7 @@
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
-msgstr ""
-"Jelenleg nincs csatlakozva. Nem fogadhat üzeneteket, amíg nem jelentkezik be."
+msgstr "Jelenleg nincs csatlakozva. Nem fogadhat üzeneteket, amíg nem jelentkezik be."
 
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Az üzenet nem küldhető el, mivel a maximális hossz el lett érve."
@@ -2961,10 +2944,8 @@
 msgid "Unable to listen for incoming IM connections"
 msgstr "A bejövő azonnaliüzenő-kapcsolatok figyelése nem lehetséges"
 
-msgid ""
-"Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
-"Nem hozható létre kapcsolat a helyi mDNS kiszolgálóval. Egyáltalán fut?"
+msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr "Nem hozható létre kapcsolat a helyi mDNS kiszolgálóval. Egyáltalán fut?"
 
 msgid "First name"
 msgstr "Utónév"
@@ -3185,6 +3166,9 @@
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Utónév"
 
@@ -3682,8 +3666,7 @@
 msgstr "nickserv: parancs küldése a nickserv kiszolgálónak"
 
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr ""
-"notice &lt;cél&lt;:  Értesítés küldése egy felhasználónak vagy csatornának."
+msgstr "notice &lt;cél&lt;:  Értesítés küldése egy felhasználónak vagy csatornának."
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3767,8 +3750,7 @@
 "tudja."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr ""
-"whois [kiszolgáló] &lt;becenév&gt;:  Információk lekérése egy felhasználóról."
+msgstr "whois [kiszolgáló] &lt;becenév&gt;:  Információk lekérése egy felhasználóról."
 
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr ""
@@ -3798,8 +3780,7 @@
 msgstr "végrehajtás"
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr ""
-"A kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán"
+msgstr "A kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán"
 
 #. This should never happen!
 msgid "Invalid response from server"
@@ -3844,8 +3825,7 @@
 msgid ""
 "Unexpected response from the server.  This may indicate a possible MITM "
 "attack"
-msgstr ""
-"Váratlan válasz a kiszolgálótól. Ez közbeékelődéses (MITM) támadást jelezhet."
+msgstr "Váratlan válasz a kiszolgálótól. Ez közbeékelődéses (MITM) támadást jelezhet."
 
 msgid ""
 "The server does support channel binding, but did not appear to advertise "
@@ -3932,6 +3912,7 @@
 msgid "Postal Code"
 msgstr "Irányítószám"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Ország"
 
@@ -3946,8 +3927,6 @@
 msgid "Organization Unit"
 msgstr "Szervezeti egység"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "Beosztás"
 
@@ -3955,6 +3934,7 @@
 msgstr "Funkció"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Születésnap"
 
@@ -4074,8 +4054,7 @@
 msgstr "Kiszolgálóutasítások: %s"
 
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr ""
-"Töltsön ki legalább egy mezőt a megfelelő XMPP felhasználók kereséséhez."
+msgstr "Töltsön ki legalább egy mezőt a megfelelő XMPP felhasználók kereséséhez."
 
 msgid "Email Address"
 msgstr "E-mail cím"
@@ -4236,8 +4215,7 @@
 msgid "Unregister"
 msgstr "Regisztráció megszüntetése"
 
-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 "Adja meg a következő információkat a regisztrált fiók módosításához."
 
 msgid "Please fill out the information below to register your new account."
@@ -4586,8 +4564,7 @@
 
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr ""
-"Nem indítható multimédiás kapcsolat a következőhöz: %s, a JID érvénytelen"
+msgstr "Nem indítható multimédiás kapcsolat a következőhöz: %s, a JID érvénytelen"
 
 #, c-format
 msgid "Unable to initiate media with %s: user is not online"
@@ -4664,8 +4641,7 @@
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;felhasználó&gt; [ok]:  Felhasználó kirúgása a szobából."
 
-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;felhasználó&gt; &lt;üzenet&gt;:  Magánüzenet küldése másik "
 "felhasználónak."
@@ -5416,8 +5392,7 @@
 msgstr "Nincs tiltott szöveg ehhez a fiókhoz."
 
 #, 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 ""
 "Az MSN kiszolgálók jelenleg a következő reguláris kifejezéseket tiltják:<br/>"
 "%s"
@@ -5699,6 +5674,9 @@
 msgid "Show custom smileys"
 msgstr "Egyéni hangulatjelek megjelenítése"
 
+msgid "Allow direct connections"
+msgstr "Közvetlen kapcsolatok engedélyezése"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: felhasználó megbökése figyelemfelhívási céllal"
 
@@ -5808,8 +5786,7 @@
 msgid "Unable to authenticate: %s"
 msgstr "Nem sikerült a hitelesítés: %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 ""
 "Az Ön MSN partnerlistája átmenetileg nem érhető el. Kérem várjon és próbálja "
 "újra később."
@@ -5834,13 +5811,11 @@
 
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
-"%s meg szeretné tekinteni az Ön webkameráját, de ez még nem támogatott."
+msgstr "%s meg szeretné tekinteni az Ön webkameráját, de ez még nem támogatott."
 
 #, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
-msgstr ""
-"%s meghívta Önt a webkamerájának megnézésére, de ez még nem támogatott."
+msgstr "%s meghívta Önt a webkamerájának megnézésére, de ez még nem támogatott."
 
 msgid "Away From Computer"
 msgstr "Nem vagyok a gépnél"
@@ -5852,8 +5827,7 @@
 msgstr "Ebédelni mentem"
 
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr ""
-"Időtúllépés következett be, emiatt az üzenet lehet, hogy nem lett elküldve:"
+msgstr "Időtúllépés következett be, emiatt az üzenet lehet, hogy nem lett elküldve:"
 
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Az üzenet nem küldhető el, láthatatlan módban nem engedélyezett:"
@@ -5875,8 +5849,7 @@
 "kiszolgálóval. Ez valószínűleg kiszolgálóhiba, pár perc múlva próbálkozzon "
 "újra:"
 
-msgid ""
-"Message could not be sent because an error with the switchboard occurred:"
+msgid "Message could not be sent because an error with the switchboard occurred:"
 msgstr "Az üzenet nem küldhető el, mivel hiba lépett fel a közvetítés közben:"
 
 msgid "Message may have not been sent because an unknown error occurred:"
@@ -5906,8 +5879,7 @@
 msgid "The name you entered is invalid."
 msgstr "A megadott név érvénytelen."
 
-msgid ""
-"The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
+msgid "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr "A megadott születésnap érvénytelen. A helyes formátum: „ÉÉÉÉ-HH-NN”."
 
 #. show error to user
@@ -5922,7 +5894,11 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "A profilinformációi még nincsenek lekérve. Próbálja újra később."
 
+msgid "Your MXitId"
+msgstr "Az Ön MXitId-ja"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5972,8 +5948,7 @@
 msgid "The file you are trying to send is too large!"
 msgstr "A küldeni kívánt fájl túl nagy."
 
-msgid ""
-"Unable to connect to the MXit HTTP server. Please check your server settings."
+msgid "Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
 "Nem lehet kapcsolódni a Mxit HTTP kiszolgálóhoz. Ellenőrizze a kiszolgáló "
 "beállításait."
@@ -5981,8 +5956,7 @@
 msgid "Logging In..."
 msgstr "Bejelentkezés…"
 
-msgid ""
-"Unable to connect to the MXit server. Please check your server settings."
+msgid "Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
 "Nem lehet kapcsolódni a MXit kiszolgálóhoz. Ellenőrizze a kiszolgáló "
 "beállításait."
@@ -6000,7 +5974,7 @@
 msgid "MXit Login Name"
 msgstr "MXit bejelentkezési név"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "Becenév"
 
@@ -6017,8 +5991,7 @@
 
 #. wapserver error
 #. server could not find the user
-msgid ""
-"MXit is currently unable to process the request. Please try again later."
+msgid "MXit is currently unable to process the request. Please try again later."
 msgstr "A MXit jelenleg nem képes feldolgozni a kérést. Próbálja újra később."
 
 msgid "Wrong security code entered. Please try again later."
@@ -6034,8 +6007,7 @@
 msgstr "A felhasználónév nincs regisztrálva. Először regisztráljon."
 
 msgid "Username is already registered. Please choose another username."
-msgstr ""
-"A felhasználónév már használatban van. Válasszon másik felhasználónevet."
+msgstr "A felhasználónév már használatban van. Válasszon másik felhasználónevet."
 
 msgid "Internal error. Please try again later."
 msgstr "Belső hiba. Próbálja újra később."
@@ -6046,7 +6018,7 @@
 msgid "Security Code"
 msgstr "Biztonsági kód"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Adja meg a biztonsági kódot"
 
@@ -6072,6 +6044,10 @@
 msgid "Status Message"
 msgstr "Állapotüzenet"
 
+msgid "Rejection Message"
+msgstr "Visszautasítási üzenet"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Rejtett szám"
 
@@ -6107,8 +6083,7 @@
 msgstr "Sikeres bejelentkezés…"
 
 #, c-format
-msgid ""
-"%s sent you an encrypted message, but it is not supported on this client."
+msgid "%s sent you an encrypted message, but it is not supported on this client."
 msgstr "%s titkosított üzenetet küldött, de ez még nem támogatott."
 
 msgid "Message Error"
@@ -6642,8 +6617,7 @@
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
-msgstr ""
-"Ez a próbaverzió nem engedélyezi tíznél több felhasználó egyidejű belépését"
+msgstr "Ez a próbaverzió nem engedélyezi tíznél több felhasználó egyidejű belépését"
 
 msgid "The user is either offline or you are blocked"
 msgstr "A felhasználó kilépett, vagy Ön le van tiltva"
@@ -6683,8 +6657,7 @@
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr ""
-"Az üzenetet nem lehet elküldeni. Nem sikerült létrehozni a konferenciát (%s)."
+msgstr "Az üzenetet nem lehet elküldeni. Nem sikerült létrehozni a konferenciát (%s)."
 
 #, c-format
 msgid ""
@@ -6724,8 +6697,7 @@
 
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr ""
-"Nem lehet megváltoztatni a kiszolgálóoldali magánszféra-beállításokat (%s)."
+msgstr "Nem lehet megváltoztatni a kiszolgálóoldali magánszféra-beállításokat (%s)."
 
 #, c-format
 msgid "Unable to create conference (%s)."
@@ -6786,8 +6758,7 @@
 msgstr "Szeretne csatlakozni a társalgáshoz?"
 
 #, 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 "Úgy tűnik, %s kilépett, és nem kapta meg az utoljára küldött üzenetet."
 
 msgid ""
@@ -6860,6 +6831,63 @@
 msgid "Invalid chat room name"
 msgstr "Érvénytelen csevegőszobanév"
 
+msgid "Invalid error"
+msgstr "Érvénytelen hiba"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Nem fogadható üzenet a szülői felügyelet miatt"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Nem küldhető SMS a feltételek elfogadása nélkül"
+
+msgid "Cannot send SMS"
+msgstr "Nem küldhető SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Nem küldhető SMS ebbe az országba"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Nem küldhető SMS ismeretlen országba"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Botfiókok nem kezdeményezhetnek azonnali üzenetküldést"
+
+msgid "Bot account cannot IM this user"
+msgstr "Botfiókok nem küldhetnek azonnali üzenetet a felhasználónak"
+
+msgid "Bot account reached IM limit"
+msgstr "A botfiók elérte az azonnali üzenetek korlátját"
+
+msgid "Bot account reached daily IM limit"
+msgstr "A botfiók elérte a napi azonnali üzenetek korlátját"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "A botfiók elérte a havi azonnali üzenetek korlátját"
+
+msgid "Unable to receive offline messages"
+msgstr "Nem lehet offline üzeneteket fogadni"
+
+msgid "Offline message store full"
+msgstr "Az offline üzenetek tárolója megtelt"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Az üzenetet nem lehet elküldeni: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Az üzenetet nem lehet elküldeni: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s: %s"
+
 msgid "Thinking"
 msgstr "Gondolkozik"
 
@@ -7010,116 +7038,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "A(z) %s fájl %s, amely nagyobb, mint a legnagyobb méret (%s)."
 
-msgid "Invalid error"
-msgstr "Érvénytelen hiba"
-
-msgid "Invalid SNAC"
-msgstr "Érvénytelen SNAC"
-
-msgid "Rate to host"
-msgstr "Sebesség a kiszolgálóhoz"
-
-msgid "Rate to client"
-msgstr "Sebesség a kliens felé"
-
-msgid "Service unavailable"
-msgstr "A szolgáltatás nem érhető el"
-
-msgid "Service not defined"
-msgstr "A szolgáltatás nincs megadva"
-
-msgid "Obsolete SNAC"
-msgstr "Elavult SNAC"
-
-msgid "Not supported by host"
-msgstr "A kiszolgáló nem támogatja"
-
-msgid "Not supported by client"
-msgstr "A kliens nem támogatja"
-
-msgid "Refused by client"
-msgstr "A kliens elutasította"
-
-msgid "Reply too big"
-msgstr "A válasz túl nagy"
-
-msgid "Responses lost"
-msgstr "A válaszok elvesztek"
-
-msgid "Request denied"
-msgstr "Kérés elutasítva"
-
-msgid "Busted SNAC payload"
-msgstr "Tönkretett SNAC rakomány"
-
-msgid "Insufficient rights"
-msgstr "Elégtelen jogosultságok"
-
-msgid "In local permit/deny"
-msgstr "A helyi engedélyezés/letiltás listában"
-
-msgid "Warning level too high (sender)"
-msgstr "A figyelmeztetési szint túl magas (küldő)"
-
-msgid "Warning level too high (receiver)"
-msgstr "A figyelmeztetési szint túl magas (fogadó)"
-
-msgid "User temporarily unavailable"
-msgstr "A felhasználó átmenetileg nem érhető el"
-
-msgid "No match"
-msgstr "Nincs találat"
-
-msgid "List overflow"
-msgstr "Lista-túlcsordulás"
-
-msgid "Request ambiguous"
-msgstr "A kérés nem egyértelmű"
-
-msgid "Queue full"
-msgstr "A sor megtelt"
-
-msgid "Not while on AOL"
-msgstr "Nem, amíg az AOL-on tartózkodik"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "Nem fogadható üzenet a szülői felügyelet miatt"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Nem küldhető SMS a feltételek elfogadása nélkül"
-
-msgid "Cannot send SMS"
-msgstr "Nem küldhető SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Nem küldhető SMS ebbe az országba"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Nem küldhető SMS ismeretlen országba"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Botfiókok nem kezdeményezhetnek azonnali üzenetküldést"
-
-msgid "Bot account cannot IM this user"
-msgstr "Botfiókok nem küldhetnek azonnali üzenetet a felhasználónak"
-
-msgid "Bot account reached IM limit"
-msgstr "A botfiók elérte az azonnali üzenetek korlátját"
-
-msgid "Bot account reached daily IM limit"
-msgstr "A botfiók elérte a napi azonnali üzenetek korlátját"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "A botfiók elérte a havi azonnali üzenetek korlátját"
-
-msgid "Unable to receive offline messages"
-msgstr "Nem lehet offline üzeneteket fogadni"
-
-msgid "Offline message store full"
-msgstr "Az offline üzenetek tárolója megtelt"
-
 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 "
@@ -7371,8 +7289,7 @@
 #. Someone has granted you authorization
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr ""
-"%u felhasználó elfogadta a kérését, így felveheti őt a partnerlistájára."
+msgstr "%u felhasználó elfogadta a kérését, így felveheti őt a partnerlistájára."
 
 #, c-format
 msgid ""
@@ -7426,27 +7343,21 @@
 #, 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] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
-msgstr[1] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
+msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
+msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az érvénytelen volt."
 
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
-msgstr[0] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert az túl nagy volt."
-msgstr[1] ""
-"Nem kapott meg %hu üzenetet a következőtől: %s, mert az túl nagy volt."
+msgstr[0] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az túl nagy volt."
+msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, mert az túl nagy volt."
 
 # #: ../src/protocols/oscar/oscar.c:1605
 # #, c-format
 # msgid "You missed %d message from %s because the rate limit has been exceeded."
 #, 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] ""
 "Nem kapott meg %hu üzenetet a következőtől: %s, mert túllépte a küldés "
 "gyakoriságának a korlátját."
@@ -7455,10 +7366,8 @@
 "gyakoriságának a korlátját."
 
 #, 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] ""
 "Nem kapott meg %hu üzenetet a következőtől: %s, mert a feladó "
 "figyelmeztetési szintje túl magas volt."
@@ -7468,8 +7377,7 @@
 
 #, 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] ""
 "Nem kapott meg %hu üzenetet a következőtől: %s, mert az Ön figyelmeztetési "
 "szintje túl magas."
@@ -7484,28 +7392,9 @@
 msgstr[1] "Nem kapott meg %hu üzenetet a következőtől: %s, ismeretlen okból."
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Az üzenetet nem lehet elküldeni: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Az üzenetet nem lehet elküldeni: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Az üzenetet nem lehet elküldeni a következőnek: %s: %s"
-
-#, c-format
 msgid "User information not available: %s"
 msgstr "A felhasználó információi nem érhetőek el: %s"
 
-msgid "Unknown reason."
-msgstr "Ismeretlen ok."
-
 msgid "Online Since"
 msgstr "Kapcsolódva ezóta"
 
@@ -7636,8 +7525,7 @@
 msgid "Account Info"
 msgstr "Fiókinformációk"
 
-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 ""
 "Az Ön IM képe nem lett elküldve. IM képek küldéséhez közvetlen kapcsolatban "
 "kell lennie."
@@ -7661,10 +7549,8 @@
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] ""
-"A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
-msgstr[1] ""
-"A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
+msgstr[0] "A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
+msgstr[1] "A profil mérete túllépte a maximális %d bájtot. Ez csonkításra került."
 
 msgid "Profile too long."
 msgstr "A profil túl hosszú."
@@ -7763,8 +7649,7 @@
 msgstr "_Váltás:"
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr ""
-"Az Ön IM képe nem lett elküldve. Nem küldhet IM képeket AIM csevegésekbe."
+msgstr "Az Ön IM képe nem lett elküldve. Nem küldhet IM képeket AIM csevegésekbe."
 
 msgid "iTunes Music Store Link"
 msgstr "iTunes zenebolt hivatkozás"
@@ -7910,8 +7795,7 @@
 
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr ""
-"%s felkérése, hogy kapcsolódjon hozzánk ezen: %s:%hu közvetlen kapcsolattal."
+msgstr "%s felkérése, hogy kapcsolódjon hozzánk ezen: %s:%hu közvetlen kapcsolattal."
 
 #, c-format
 msgid "Attempting to connect to %s:%hu."
@@ -8690,8 +8574,7 @@
 msgstr "Szolgáltatások indítása"
 
 #, 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 ""
 "Egy Sametime adminisztrátor a következő bejelentést adta ki a(z) %s "
 "kiszolgálón"
@@ -9305,8 +9188,7 @@
 msgstr "Titkos csatorna beállítása"
 
 #, 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 ""
 "Mielőtt csatlakozhatna a magáncsoporthoz, csatlakoznia kell a(z) %s "
 "csatornához"
@@ -9374,8 +9256,7 @@
 
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr ""
-"<I>%s</I> átállította a(z) <I>%s</I> csatorna üzemmódjait a következőkre: %s"
+msgstr "<I>%s</I> átállította a(z) <I>%s</I> csatorna üzemmódjait a következőkre: %s"
 
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
@@ -9558,8 +9439,7 @@
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
-msgstr ""
-"%s nyilvános kulcsa megérkezett. El kívánja fogadni ezt a nyilvános kulcsot?"
+msgstr "%s nyilvános kulcsa megérkezett. El kívánja fogadni ezt a nyilvános kulcsot?"
 
 #, c-format
 msgid ""
@@ -9591,8 +9471,7 @@
 msgid "Key Exchange failed"
 msgstr "Kulcscsere sikertelen"
 
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
+msgid "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "A leválasztott folyamat folytatása sikertelen. Kattintson az Újrakapcsolódás "
 "gombra egy új kapcsolat létrehozásához."
@@ -9766,8 +9645,7 @@
 msgstr "whois &lt;becenév&gt;:  A becenévhez tartozó információk megjelenítése"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr ""
-"msg &lt;becenév&gt; &lt;message&gt;:  Magánüzenet küldése a felhasználónak"
+msgstr "msg &lt;becenév&gt; &lt;message&gt;:  Magánüzenet küldése a felhasználónak"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
@@ -9836,12 +9714,10 @@
 "csatornáról"
 
 msgid "info [server]:  View server administrative details"
-msgstr ""
-"info [kiszolgáló]:  A kiszolgáló adminisztrációs részleteinek megjelenítése"
+msgstr "info [kiszolgáló]:  A kiszolgáló adminisztrációs részleteinek megjelenítése"
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr ""
-"ban [&lt;csatorna&gt; +|-&lt;becenév&gt;]:  Kliens kitiltása a csatornáról"
+msgstr "ban [&lt;csatorna&gt; +|-&lt;becenév&gt;]:  Kliens kitiltása a csatornáról"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
@@ -10021,8 +9897,7 @@
 
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-"Hiba: A távoli fél nem bízik meg vagy nem támogatja az Ön nyilvános kulcsát"
+msgstr "Hiba: A távoli fél nem bízik meg vagy nem támogatja az Ön nyilvános kulcsát"
 
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
@@ -10460,8 +10335,7 @@
 msgid "Last Update"
 msgstr "Utolsó frissítés"
 
-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 "Ez a profil olyan nyelvű vagy formátumú, ami jelenleg nem támogatott."
 
 msgid ""
@@ -10595,8 +10469,7 @@
 "sub &lt;osztály&gt; &lt;példány&gt; &lt;címzett&gt;: Csatlakozás új "
 "csevegéshez"
 
-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;példány&gt;: Üzenet küldése a következőnek: &lt;üzenet,<i>példány</i>,"
 "*&gt;"
@@ -10942,8 +10815,7 @@
 "Hiba történt a(z) %s olvasásakor. Ez a fájl nem lett betöltve, a régi fájl %"
 "s~ néven lett elmentve."
 
-msgid ""
-"Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
+msgid "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
 "Azonnali üzenetküldés AIM, Google Talk, Jabber/XMPP, MSN, Yahoo és más "
 "protokollok támogatásával"
@@ -11197,8 +11069,7 @@
 
 #, 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] "Jelenleg %d %s nevű partnere van. Össze kívánja vonni ezeket?"
 msgstr[1] "Jelenleg %d %s nevű partnere van. Össze kívánja vonni ezeket?"
 
@@ -11312,8 +11183,7 @@
 msgid "/Tools/Mute Sounds"
 msgstr "/Eszközök/Hangok némítása"
 
-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 ""
 "Jelenleg nincs bejelentkezve olyan hálózatra, amelyen felvehetné ezt a "
 "partnert."
@@ -11565,8 +11435,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 fiók letiltva, mivel bejelentkezett egy másik helyről:"
 msgstr[1] "%d fiók letiltva, mivel bejelentkezett egy másik helyről:"
 
@@ -11700,8 +11569,7 @@
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "A partner nem ugyanazt a protokollt használja, mint ez a csevegés."
 
-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 ""
 "Jelenleg nincs bejelentkezve olyan fiókkal, mellyel meghívhatná ezt a "
 "partnert."
@@ -11845,10 +11713,10 @@
 msgstr "/Beállítások/_Hangok engedélyezése"
 
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Beállítások/_Formázás eszköztárak mutatása"
+msgstr "/Beállítások/_Formázó eszköztárak megjelenítése"
 
 msgid "/Options/Show Ti_mestamps"
-msgstr "/Beállítások/I_dőbélyegek mutatása"
+msgstr "/Beállítások/I_dőbélyegek megjelenítése"
 
 msgid "/Conversation/More"
 msgstr "/Társalgás/Több"
@@ -11919,10 +11787,10 @@
 msgstr "/Beállítások/Hangok engedélyezése"
 
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Beállítások/Formázás eszköztárak mutatása"
+msgstr "/Beállítások/Formázó eszköztárak megjelenítése"
 
 msgid "/Options/Show Timestamps"
-msgstr "/Beállítások/Időbélyegek mutatása"
+msgstr "/Beállítások/Időbélyegek megjelenítése"
 
 msgid "User is typing..."
 msgstr "A felhasználó gépel…"
@@ -12114,9 +11982,8 @@
 msgid "Arabic"
 msgstr "arab"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Megszégyenült"
+msgstr "Asszámi"
 
 msgid "Belarusian Latin"
 msgstr "Fehérorosz latin"
@@ -12244,9 +12111,8 @@
 msgid "Macedonian"
 msgstr "macedón"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Maláj"
+msgstr "Malajálam"
 
 msgid "Mongolian"
 msgstr "Mongol"
@@ -12528,8 +12394,7 @@
 msgstr "_Csoport eltávolítása"
 
 #, 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 eltávolítására készül a partnerlistájáról. Folytatni akarja?"
 
 msgid "Remove Buddy"
@@ -12542,8 +12407,7 @@
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
-msgstr ""
-"%s csevegés eltávolítására készül a partnerlistájáról. Folytatni akarja?"
+msgstr "%s csevegés eltávolítására készül a partnerlistájáról. Folytatni akarja?"
 
 msgid "Remove Chat"
 msgstr "Csevegés eltávolítása"
@@ -12558,7 +12422,7 @@
 msgstr "Álla_pot módosítása"
 
 msgid "Show Buddy _List"
-msgstr "Partnerlista m_utatása"
+msgstr "P_artnerlista megjelenítése"
 
 msgid "_Unread Messages"
 msgstr "_Olvasatlan üzenetek"
@@ -12667,8 +12531,7 @@
 msgstr "Hiperhivatkozás előfényszíne"
 
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr ""
-"Hiperhivatkozások rajzolásához használt szín, amikor az egér rájuk mutat."
+msgstr "Hiperhivatkozások rajzolásához használt szín, amikor az egér rájuk mutat."
 
 msgid "Sent Message Name Color"
 msgstr "Elküldött üzenet névszíne"
@@ -12767,8 +12630,7 @@
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
-msgstr ""
-"Adja meg a beszúrandó hivatkozás URL címét és leírását. A leírás opcionális."
+msgstr "Adja meg a beszúrandó hivatkozás URL címét és leírását. A leírás opcionális."
 
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Adja meg a beszúrandó hivatkozás URL címét."
@@ -12923,8 +12785,7 @@
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
-msgstr ""
-"Biztos, hogy törölni akarja a(z) %s időpontban kezdődött rendszernaplót?"
+msgstr "Biztos, hogy törölni akarja a(z) %s időpontban kezdődött rendszernaplót?"
 
 msgid "Delete Log?"
 msgstr "Törli a naplót?"
@@ -12938,8 +12799,7 @@
 
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr ""
-"<span size='larger' weight='bold'>Társalgás ezzel: %s, ekkor: %s</span>"
+msgstr "<span size='larger' weight='bold'>Társalgás ezzel: %s, ekkor: %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
@@ -13071,8 +12931,7 @@
 msgid "Error launching \"%s\": %s"
 msgstr "Hiba „%s” indításakor: %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 "A „Kézi” böngészőparancsot választotta, de nem adott meg parancsot."
 
 msgid "No message"
@@ -13361,7 +13220,7 @@
 msgstr "Új _társalgások:"
 
 msgid "Show _formatting on incoming messages"
-msgstr "_Formázás mutatása bejövő üzeneteknél"
+msgstr "_Formázás megjelenítése bejövő üzeneteknél"
 
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Üzenetváltások bezárása a lap bezárása után azonnal"
@@ -13798,8 +13657,7 @@
 msgstr "%s állapota"
 
 #, 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 ""
 "Már létezik egyéni hangulatjel ehhez: „%s”. Adjon meg másik "
 "billentyűparancsot."
@@ -13944,8 +13802,7 @@
 
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-"A(z) „%s” fájl túl nagy a következőhöz: %s. Próbálkozzon kisebb képpel.\n"
+msgstr "A(z) „%s” fájl túl nagy a következőhöz: %s. Próbálkozzon kisebb képpel.\n"
 
 msgid "Icon Error"
 msgstr "Ikonhiba"
@@ -14113,8 +13970,7 @@
 #. *< 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 ""
 "Lehetővé teszi a partnerek különböző állapotaihoz rendelt értékek "
 "beállítását."
@@ -14241,8 +14097,7 @@
 msgstr "Társalgások száma ablakonként"
 
 msgid "Separate IM and Chat windows when placing by number"
-msgstr ""
-"Azonnali üzenő- és csevegőablakok elkülönítése szám szerinti elhelyezésnél"
+msgstr "Azonnali üzenő- és csevegőablakok elkülönítése szám szerinti elhelyezésnél"
 
 #. *< type
 #. *< ui_requirement
@@ -14451,8 +14306,7 @@
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-"Ikonállapotba helyezi a partnerlistát és a társalgásokat, amikor távol van."
+msgstr "Ikonállapotba helyezi a partnerlistát és a társalgásokat, amikor távol van."
 
 msgid "Mail Checker"
 msgstr "Levélfigyelő"
@@ -14461,8 +14315,7 @@
 msgstr "Új helyi levél érkezését ellenőrzi."
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Kis dobozt ad a partnerlistához, amely megjelenik új levél érkezésekor."
+msgstr "Kis dobozt ad a partnerlistához, amely megjelenik új levél érkezésekor."
 
 msgid "Markerline"
 msgstr "Jelölő vonal"
@@ -14611,8 +14464,7 @@
 #. *  summary
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr ""
-"Különböző lehetőségeket nyújt az olvasatlan üzenetekre figyelmeztetésre."
+msgstr "Különböző lehetőségeket nyújt az olvasatlan üzenetekre figyelmeztetésre."
 
 #. *< type
 #. *< ui_requirement
@@ -15083,7 +14935,7 @@
 msgstr "_IM ablak átlátszósága"
 
 msgid "_Show slider bar in IM window"
-msgstr "C_súszka mutatása az IM ablakban"
+msgstr "C_súszka megjelenítése az IM ablakban"
 
 msgid "Remove IM window transparency on focus"
 msgstr "IM ablak átlátszóságának eltávolítása, ha fókuszt kap"
@@ -15156,8 +15008,7 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "A windowsos Pidginre jellemző beállítások."
 
-msgid ""
-"Provides options specific to Pidgin for Windows, such as buddy list docking."
+msgid "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
 "A windowsos Pidginre jellemző beállításokat biztosít, mint például a "
 "partnerlista dokkolása."
@@ -15192,6 +15043,7 @@
 "Ez a bővítmény XMPP kiszolgálókban vagy kliensekben végzett hibakereséshez "
 "hasznos."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15199,8 +15051,9 @@
 "A $(^Name) a GNU General Public License (GPL) alatt kerül terjesztésre. Az "
 "itt olvasható licenc csak tájékoztatási célt szolgál. $_CLICK"
 
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
-msgstr "A Pidgin által használt többplatformos grafikus eszközkészlet"
+msgstr "A Pidgin által használt, többplatformos GUI eszközkészlet"
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
@@ -15209,77 +15062,100 @@
 "Jelenleg fut a Pidgin egy példánya. Lépjen ki a Pidginból és azután próbálja "
 "újra."
 
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
 msgstr "Pidgin fájlok és dll-ek"
 
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
 msgstr "Start Menü bejegyzés létrehozása a Pidginhez"
 
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr "Parancsikon létrehozása a Pidginhez az asztalon"
 
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
+msgstr "Hibakeresési szimbólumok (összeomlások bejelentéséhez)"
+
+#. Installer Subsection Text
 msgid "Desktop"
 msgstr "Asztal"
 
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Hiba a GTK+ futtatókörnyezet ($R2) letöltésekor.$\\rEz a Pidgin működéséhez "
+"szükséges; ha az újrapróbálkozás meghiúsul, akkor használja az offline "
+"telepítőt a http://pidgin.im/download/windows/ címről."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Hiba a hibakeresési szimbólumok telepítésekor ($R2).$\\rHa az "
+"újrapróbálkozás meghiúsul, akkor használja az offline telepítőt a http://"
+"pidgin.im/download/windows/ címről."
+
+#. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
 "installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
 "20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
-
-#, fuzzy
+"Hiba a helyesírás-ellenőrző telepítésekor. ($R3).$\\rHa az újrapróbálkozás "
+"meghiúsul, akkor saját kezűleg is telepítheti a http://developer.pidgin.im/"
+"wiki/Installing%20Pidgin#manual_win32_spellcheck_installation címen "
+"található utasítások szerint."
+
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
-msgstr "GTK+ futtató környezet (szükséges)"
-
-#, fuzzy
+msgstr "GTK+ futtató környezet (szükséges, ha nincs jelen)"
+
+#. Installer Subsection Text
 msgid "Localizations"
-msgstr "Hely"
-
-#. License Page
+msgstr "Fordítások"
+
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
 msgstr "Tovább >"
 
-#. Components Page
+#. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
 msgstr "Pidgin azonnali üzenő kliens (szükséges)"
 
-#. GTK+ Section Prompts
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
-
+"A Pidgin egy kompatibilis GTK+ futtatókörnyezet meglétét igényli (úgy tűnik, "
+"ez nincs jelen).$\\rBiztos benne, hogy kihagyja a GTK+ futtatókörnyezet "
+"telepítését?"
+
+#. Installer Subsection Text
 msgid "Shortcuts"
 msgstr "Parancsikonok"
 
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
 msgstr "Parancsikonok a Pidgin indításához"
 
-#. Spellcheck Section Prompts
+#. Installer Subsection Text
 msgid "Spellchecking Support"
 msgstr "Helyesírás-ellenőrzés támogatása"
 
+#. Installer Subsection Text
 msgid "Start Menu"
 msgstr "Start Menü"
 
-msgid ""
-"Support for Spellchecking.  (Internet connection required for installation)"
+#. Installer Subsection Detailed Description
+msgid "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
 "Helyesírás-ellenőrzés támogatása. (Internetkapcsolat szükséges a "
 "telepítéshez)"
@@ -15287,7 +15163,6 @@
 msgid "The installer is already running."
 msgstr "A telepítő már fut."
 
-#. Uninstall Section Prompts
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
@@ -15295,11 +15170,10 @@
 "Az eltávolító nem találta a Pidgin registry bejegyzéseket.$\\rValószínüleg "
 "egy másik felhasználó telepítette az alkalmazást."
 
-#. URL Handler section
+#. Installer Subsection Text
 msgid "URI Handlers"
 msgstr "URI kezelők"
 
-#. Pidgin Section Prompts and Texts
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
@@ -15307,24 +15181,10 @@
 "A Pidgin jelenleg telepített változata nem távolítható el. Az új verzió a "
 "jelenleg telepített verzió eltávolítása nélkül kerül telepítésre. "
 
-#. Installer Finish Page
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
 msgstr "A Pidgin weboldalának felkeresése"
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Nincs jogosultsága az alkalmazás eltávolításához."
 
-#~ msgid "Current Mood"
-#~ msgstr "Jelenlegi hangulat"
-
-#~ msgid "New Mood"
-#~ msgstr "Új hangulat"
-
-#~ msgid "Change your Mood"
-#~ msgstr "Hangulat módosítása"
-
-#~ msgid "How do you feel right now?"
-#~ msgstr "Hogy érzi magát?"
-
-#~ msgid "Change Mood..."
-#~ msgstr "Hangulat módosítása…"
--- a/po/it.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/it.po	Mon May 31 02:29:34 2010 +0900
@@ -8,10 +8,11 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 23:18-0400\n"
-"PO-Revision-Date: 2010-05-09 17:44+0100\n"
+"POT-Creation-Date: 2010-05-29 20:58-0400\n"
+"PO-Revision-Date: 2010-05-24 12:38+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1357,6 +1358,7 @@
 msgid "Saved Statuses"
 msgstr "Messaggi di stato salvati"
 
+#. title
 msgid "Title"
 msgstr "Titolo"
 
@@ -1926,7 +1928,6 @@
 msgid "Thread creation failure: %s"
 msgstr "Creazione del thread fallita: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
@@ -3212,6 +3213,9 @@
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Nome"
 
@@ -3895,13 +3899,11 @@
 msgid "Resource Constraint"
 msgstr "Vincolo sulla risorsa"
 
-#, fuzzy
 msgid "Unable to canonicalize username"
-msgstr "Impossibile configurare"
-
-#, fuzzy
+msgstr "Impossibile rendere il nome utente in forma canonica"
+
 msgid "Unable to canonicalize password"
-msgstr "Impossibile aprire una porta in ascolto."
+msgstr "Impossibile rendere la password in forma canonica"
 
 msgid "Malicious challenge from server"
 msgstr "Challenge maligna da parte del server"
@@ -3960,6 +3962,7 @@
 msgid "Postal Code"
 msgstr "Codice postale"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Paese"
 
@@ -3974,8 +3977,6 @@
 msgid "Organization Unit"
 msgstr "Ufficio"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "Impiego"
 
@@ -3983,6 +3984,7 @@
 msgstr "Ruolo"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Compleanno"
 
@@ -5729,6 +5731,9 @@
 msgid "Show custom smileys"
 msgstr "Mostra gli smiley personalizzati"
 
+msgid "Allow direct connections"
+msgstr "Consenti connessioni dirette"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Richiama l'attenzione di un contatto con un trillo"
 
@@ -5965,7 +5970,11 @@
 "L'informazione sul tuo profilo non è stata ancora recuperata. Riprova più "
 "tardi."
 
+msgid "Your MXitId"
+msgstr "Il tuo ID MXit"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -6042,7 +6051,7 @@
 msgid "MXit Login Name"
 msgstr "Nome di login per MXit"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "Nickname"
 
@@ -6088,7 +6097,7 @@
 msgid "Security Code"
 msgstr "Codice di sicurezza"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Inserisci il codice di sicurezza"
 
@@ -6114,6 +6123,10 @@
 msgid "Status Message"
 msgstr "Messaggio di stato"
 
+msgid "Rejection Message"
+msgstr "Messaggio di rifiuto"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Numero nascosto"
 
@@ -6131,6 +6144,19 @@
 msgid "Enable splash-screen popup"
 msgstr "Abilita lo splash screen"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Sei stato cacciato: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Biglietto non valido"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Stanza:"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Connessione a MXit persa. Prova a riconnetterti."
@@ -6909,6 +6935,64 @@
 msgid "Invalid chat room name"
 msgstr "Nome della stanza di discussione non valido"
 
+msgid "Invalid error"
+msgstr "Errore non valido"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Impossibile ricevere il MI a causa dei controlli parentali"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr ""
+"Impossibile inviare SMS senza aver prima accettato le condizioni del servizio"
+
+msgid "Cannot send SMS"
+msgstr "Impossibile inviare l'SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Impossibile inviare SMS verso questo paese"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Impossibile inviare SMS ad un paese sconosciuto"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Gli account Bot non possono avviare una sessione di MI"
+
+msgid "Bot account cannot IM this user"
+msgstr "L'account Bot non può inviare MI a questo utente"
+
+msgid "Bot account reached IM limit"
+msgstr "L'account Bot ha raggiunto il limite di MI"
+
+msgid "Bot account reached daily IM limit"
+msgstr "L'account Bot ha raggiunto il limite giornaliero di MI"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "L'account Bot ha raggiunto il limite mensile di MI"
+
+msgid "Unable to receive offline messages"
+msgstr "Impossibile ricevere messaggi non in linea"
+
+msgid "Offline message store full"
+msgstr "L'archivio dei messaggi non in linea è pieno"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Impossibile inviare il messaggio: %s (%s)."
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Impossibile inviare il messaggio: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Impossibile inviare il messaggio a %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Impossibile inviare il messaggio a %s: %s"
+
 msgid "Thinking"
 msgstr "Pensando"
 
@@ -7060,117 +7144,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Il file %s è di %s. La massima dimensione possibile è di %s."
 
-msgid "Invalid error"
-msgstr "Errore non valido"
-
-msgid "Invalid SNAC"
-msgstr "SNAC non valido"
-
-msgid "Rate to host"
-msgstr "Rate verso l'host"
-
-msgid "Rate to client"
-msgstr "Rate verso il client"
-
-msgid "Service unavailable"
-msgstr "Servizio non disponibile"
-
-msgid "Service not defined"
-msgstr "Servizio non definito"
-
-msgid "Obsolete SNAC"
-msgstr "SNAC obsoleto"
-
-msgid "Not supported by host"
-msgstr "Non supportato dall'host"
-
-msgid "Not supported by client"
-msgstr "Non supportato dal client"
-
-msgid "Refused by client"
-msgstr "Rifiutato dal client"
-
-msgid "Reply too big"
-msgstr "Risposta troppo grande"
-
-msgid "Responses lost"
-msgstr "Risposte perse"
-
-msgid "Request denied"
-msgstr "Richiesta rifiutata"
-
-msgid "Busted SNAC payload"
-msgstr "Carico SNAC non corretto"
-
-msgid "Insufficient rights"
-msgstr "Permessi insufficienti"
-
-msgid "In local permit/deny"
-msgstr "Nell'autorizzazione/divieto locale"
-
-msgid "Warning level too high (sender)"
-msgstr "Livello di allerta troppo alto (mittente)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Livello di allerta troppo alto (destinatario)"
-
-msgid "User temporarily unavailable"
-msgstr "Utente temporaneamente non disponibile"
-
-msgid "No match"
-msgstr "Nessuna corrispondenza"
-
-msgid "List overflow"
-msgstr "Lista troppo grande"
-
-msgid "Request ambiguous"
-msgstr "Richiesta ambigua"
-
-msgid "Queue full"
-msgstr "Coda piena"
-
-msgid "Not while on AOL"
-msgstr "Non è possibile se connessi ad AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "Impossibile ricevere il MI a causa dei controlli parentali"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr ""
-"Impossibile inviare SMS senza aver prima accettato le condizioni del servizio"
-
-msgid "Cannot send SMS"
-msgstr "Impossibile inviare l'SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Impossibile inviare SMS verso questo paese"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Impossibile inviare SMS ad un paese sconosciuto"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Gli account Bot non possono avviare una sessione di MI"
-
-msgid "Bot account cannot IM this user"
-msgstr "L'account Bot non può inviare MI a questo utente"
-
-msgid "Bot account reached IM limit"
-msgstr "L'account Bot ha raggiunto il limite di MI"
-
-msgid "Bot account reached daily IM limit"
-msgstr "L'account Bot ha raggiunto il limite giornaliero di MI"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "L'account Bot ha raggiunto il limite mensile di MI"
-
-msgid "Unable to receive offline messages"
-msgstr "Impossibile ricevere messaggi non in linea"
-
-msgid "Offline message store full"
-msgstr "L'archivio dei messaggi non in linea è pieno"
-
 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 "
@@ -7531,28 +7504,9 @@
 msgstr[1] "Non hai ricevuto %hu messaggi da %s per un motivo sconosciuto"
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Impossibile inviare il messaggio: %s (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Impossibile inviare il messaggio: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Impossibile inviare il messaggio a %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Impossibile inviare il messaggio a %s: %s"
-
-#, c-format
 msgid "User information not available: %s"
 msgstr "Informazioni sull'utente non disponibili: %s"
 
-msgid "Unknown reason."
-msgstr "Motivo sconosciuto."
-
 msgid "Online Since"
 msgstr "Online da"
 
@@ -7987,6 +7941,88 @@
 "per le Immagini IM. Poiché verrà rivelato il tuo indirizzo IP, devi "
 "considerare la cosa come un potenziale rischio per la tua privacy."
 
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "ID non valido"
+
+#, fuzzy
+msgid "Rate to host"
+msgstr "Invita in chat"
+
+#, fuzzy
+msgid "Rate to client"
+msgstr "Ultimo client conosciuto"
+
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Servizio non disponibile"
+
+#, fuzzy
+msgid "Service not defined"
+msgstr "Conferenza non trovata"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+#, fuzzy
+msgid "Not supported by host"
+msgstr "Non supportato"
+
+#, fuzzy
+msgid "Not supported by client"
+msgstr "Non supportato"
+
+msgid "Refused by client"
+msgstr ""
+
+msgid "Reply too big"
+msgstr ""
+
+#, fuzzy
+msgid "Responses lost"
+msgstr "Probabilità di risposta:"
+
+#, fuzzy
+msgid "Request denied"
+msgstr "Richiesta in corso"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr ""
+
+msgid "In local permit/deny"
+msgstr ""
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Servizio temporaneamente non disponibile"
+
+#, fuzzy
+msgid "No match"
+msgstr "Nessuna corrispondenza"
+
+#, fuzzy
+msgid "List overflow"
+msgstr "Lista piena"
+
+#, fuzzy
+msgid "Request ambiguous"
+msgstr "Richiesta in corso"
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Acquario"
 
@@ -8843,8 +8879,8 @@
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Non è stato configurato nessun host o indirizzo IP per l'account Meanwhile %"
-"s. Per poter proseguire con il login, devi specificarne uno qui sotto."
+"Non è stato configurato nessun host o indirizzo IP per l'account Meanwhile "
+"%s. Per poter proseguire con il login, devi specificarne uno qui sotto."
 
 msgid "Meanwhile Connection Setup"
 msgstr "Impostazione della connessione Meanwhile"
@@ -10729,8 +10765,8 @@
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"Accesso negato: il server proxy HTTP non permette il tunnelling sulla porta %"
-"d"
+"Accesso negato: il server proxy HTTP non permette il tunnelling sulla porta "
+"%d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -12158,9 +12194,8 @@
 msgid "Arabic"
 msgstr "Arabo"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Vergognoso"
+msgstr "Assamese"
 
 msgid "Belarusian Latin"
 msgstr "Bielorusso latino"
@@ -12288,9 +12323,8 @@
 msgid "Macedonian"
 msgstr "Macedone"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Malese"
+msgstr "Malayam"
 
 msgid "Mongolian"
 msgstr "Mongolo"
@@ -12406,8 +12440,8 @@
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s è un client di messaggistica basato su libpurple in grado di connettersi "
 "contemporaneamente a diversi servizi di messaggistica. %s è scritto in C "
@@ -12961,16 +12995,16 @@
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
-msgstr ""
-"Sei sicuro di voler eliminare permanentemente il log della conversazione in %"
-"s iniziata il %s?"
-
-#, c-format
-msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
+msgstr ""
+"Sei sicuro di voler eliminare permanentemente il log della conversazione in "
+"%s iniziata il %s?"
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Sei sicuro di voler eliminare permanentemente il log iniziato il %s?"
 
 msgid "Delete Log?"
@@ -15250,6 +15284,7 @@
 msgstr ""
 "Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15257,6 +15292,7 @@
 "$(^Name) è distribuito sotto la GNU General Public License (GPL). La licenza "
 "è mostrata qui solamente a scopo informativo. $_CLICK"
 
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr "Un toolkit multipiattaforma per interfacce grafiche, usato da Pidgin"
 
@@ -15266,75 +15302,100 @@
 msgstr ""
 "È attualmente in esecuzione un'istanza di Pidgin. Esci da Pidgin e riprova."
 
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
 msgstr "File principali di Pidgin e dll"
 
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
 msgstr "Crea una voce per Pidgin nel Menu Avvio"
 
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr "Crea un collegamento a Pidgin sul desktop"
 
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
+msgstr "Simboli di debug (per comunicare i crash)"
+
+#. Installer Subsection Text
 msgid "Desktop"
 msgstr "Desktop"
 
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Errore nello scaricamento del runtime GTK+ ($R2).$\\rIl runtime è necessario "
+"per far funzionare Pidgin; se il problema persiste, potresti provare ad "
+"usare l'installatore \"offline\" disponibile su http://pidgin.im/download/"
+"windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Errore nell'installazione dei simboli di debug ($R2).$\\rSe il problema "
+"persiste, potresti provare ad usare l'installatore \"offline\" disponibile "
+"su http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
-msgstr ""
-
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Errore nell'installazione del correttore ortografico ($R3).$\\rSe il "
+"problema persiste, consulta le istruzioni per l'installazione manuale su: "
+"http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
 msgstr "Ambiente di Runtime GTK+ (richiesto se non presente)"
 
-#, fuzzy
+#. Installer Subsection Text
 msgid "Localizations"
-msgstr "Località"
-
-#. License Page
+msgstr "Localizzazioni"
+
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
 msgstr "Avanti >"
 
-#. Components Page
+#. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
 msgstr "Pidgin - Client per Messaggi Immediati (richiesto)"
 
-#. GTK+ Section Prompts
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
-
-#, fuzzy
+"Pidgin necessita di un runtime GTK+ compatibile (il quale non sembra essere "
+"già installato).$\\rSei sicuro di voler tralasciare l'installazione del "
+"runtime GTK+?"
+
+#. Installer Subsection Text
 msgid "Shortcuts"
-msgstr "Collegamenti"
-
+msgstr "Scorciatoie"
+
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
 msgstr "Collegamenti per avviare Pidgin"
 
-#. Spellcheck Section Prompts
+#. Installer Subsection Text
 msgid "Spellchecking Support"
 msgstr "Supporto per il correttore ortografico"
 
+#. Installer Subsection Text
 msgid "Start Menu"
 msgstr "Menu Avvio"
 
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
@@ -15344,7 +15405,6 @@
 msgid "The installer is already running."
 msgstr "Il programma di installazione è già in esecuzione"
 
-#. Uninstall Section Prompts
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
@@ -15353,11 +15413,10 @@
 "Pidgin.$\\rProbabilmente questa applicazione è stata installata da un altro "
 "utente."
 
-#. URL Handler section
+#. Installer Subsection Text
 msgid "URI Handlers"
 msgstr "Gestori degli URI"
 
-#. Pidgin Section Prompts and Texts
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
@@ -15366,24 +15425,9 @@
 "computer. La nuova versione sarà installata senza rimuovere la versione "
 "precedente."
 
-#. Installer Finish Page
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
 msgstr "Visita la pagina web di Pidgin"
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Non hai il permesso per rimuovere questa applicazione."
-
-#~ msgid "Current Mood"
-#~ msgstr "Umore attuale"
-
-#~ msgid "New Mood"
-#~ msgstr "Nuovo umore"
-
-#~ msgid "Change your Mood"
-#~ msgstr "Cambia il tuo umore"
-
-#~ msgid "How do you feel right now?"
-#~ msgstr "Come ti senti in questo preciso istante?"
-
-#~ msgid "Change Mood..."
-#~ msgstr "Cambia umore..."
--- a/po/nn.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/nn.po	Mon May 31 02:29:34 2010 +0900
@@ -1,16 +1,12 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Pidgin\n"
+msgid ""
+msgstr ""
+"Project-Id-Version: gtranslator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 23:18-0400\n"
-"PO-Revision-Date: 2010-05-01 19:08+0200\n"
+"POT-Creation-Date: 2010-05-29 21:04-0400\n"
+"PO-Revision-Date: 2010-05-27 13:33+0100\n"
 "Last-Translator: Yngve Spjeld Landro <l10n@landro.net>\n"
-"Language-Team:  <>\n"
+"Language-Team: Norwegian Nynorsk <l10n@landro.net>\n"
+"Language: nn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1356,6 +1352,7 @@
 msgid "Saved Statuses"
 msgstr "Lagra tilstandar"
 
+#. title
 msgid "Title"
 msgstr "Tittel"
 
@@ -1917,7 +1914,6 @@
 msgid "Thread creation failure: %s"
 msgstr "Klarte ikkje å laga tråd: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Ukjend årsak"
 
@@ -2409,7 +2405,7 @@
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr "DBus-tilleggdøme"
+msgstr "DBus-tilleggsdøme"
 
 #. *< type
 #. *< ui_requirement
@@ -3189,6 +3185,9 @@
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Førenamn"
 
@@ -3928,6 +3927,7 @@
 msgid "Postal Code"
 msgstr "Postnummer"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Land"
 
@@ -3942,8 +3942,6 @@
 msgid "Organization Unit"
 msgstr "Organisasjonseining"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "Jobbtittel"
 
@@ -3951,6 +3949,7 @@
 msgstr "Stilling"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Fødselsdag"
 
@@ -5685,6 +5684,9 @@
 msgid "Show custom smileys"
 msgstr "Vis eigne smilefjes"
 
+msgid "Allow direct connections"
+msgstr "Tillat direkte samband"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: dytta til ein brukar for å få merksemda hans/hennar"
 
@@ -5908,7 +5910,11 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Profilopplysningane dine er ikkje henta enno. Prøv igjen seinare."
 
+msgid "Your MXitId"
+msgstr "MXit-ID-en din"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5985,7 +5991,7 @@
 msgid "MXit Login Name"
 msgstr "Påloggingsnamn MXit"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "Kallenamn"
 
@@ -6030,7 +6036,7 @@
 msgid "Security Code"
 msgstr "Tryggleikskode"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Skriv inn tryggleikskoden"
 
@@ -6056,6 +6062,10 @@
 msgid "Status Message"
 msgstr "Statusmelding"
 
+msgid "Rejection Message"
+msgstr "Avvisingsmelding"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Skjult nummer"
 
@@ -6074,6 +6084,19 @@
 msgid "Enable splash-screen popup"
 msgstr "Bruk oppstartsvindauge"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Du er blitt sparka ut av: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Ugyldig autentiseringsmelding"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Rom:"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Det er ikkje samband med MXit. Kopla til att."
@@ -6282,8 +6305,8 @@
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Passordet ditt er på %zu teikn, som er lengre enn største lengda som er %"
-"d. Gjer passordet ditt kortare på nettsida http://profileedit.myspace.com/"
+"%s Passordet ditt er på %zu teikn, som er lengre enn største lengda som er "
+"%d. Gjer passordet ditt kortare på nettsida http://profileedit.myspace.com/"
 "index.cfm?fuseaction=accountSettings.changePassword og prøv på nytt."
 
 msgid "Incorrect username or password"
@@ -6840,6 +6863,64 @@
 msgid "Invalid chat room name"
 msgstr "Ugyldig prateromsnamn"
 
+msgid "Invalid error"
+msgstr "Ugyldig feil"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Får ikkje ta i mot lynmeldingar grunna foreldrekontrollreglar"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Kan ikkje senda teksmeldingar utan godkjenning av vilkåra"
+
+# tekstmeldinga? SMS-en?
+msgid "Cannot send SMS"
+msgstr "Klarer ikkje å senda meldinga"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Kan ikkje senda meldingar til dette landet"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Kan ikkje senda meldingar til ukjente land"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Bot-kontoar kan ikkje setja i gang lynmeldingar"
+
+msgid "Bot account cannot IM this user"
+msgstr "Bot-kontoen kan ikkje senda lynmelding til denne brukaren"
+
+msgid "Bot account reached IM limit"
+msgstr "Bot-kontoen har nådd lynmeldingsgrensa"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Bot-kontoen har nådd dagsgrensa for lynmeldingar"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Bot-kontoen har nådd månadsgrensa for lynmeldingar"
+
+msgid "Unable to receive offline messages"
+msgstr "Klarer ikkje å ta i mot fråkopla meldingar"
+
+msgid "Offline message store full"
+msgstr "Fråkopla meldingslager er fullt"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Klarer ikkje å senda meldinga: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Klarer ikkje å senda melding: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Klarer ikkje å senda meldinga til %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Klarer ikkje å senda meldinga til %s: %s"
+
 msgid "Thinking"
 msgstr "Tenkjer"
 
@@ -6991,117 +7072,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Fila %s er %s, noko som er større enn høgste storleik av %s."
 
-msgid "Invalid error"
-msgstr "Ugyldig feil"
-
-msgid "Invalid SNAC"
-msgstr "Ugyldig SNAC"
-
-msgid "Rate to host"
-msgstr "Fart mot vert"
-
-msgid "Rate to client"
-msgstr "Fart mot klient"
-
-msgid "Service unavailable"
-msgstr "Tenesta er utilgjengeleg"
-
-msgid "Service not defined"
-msgstr "Tenesta er ikkje definert"
-
-msgid "Obsolete SNAC"
-msgstr "Forelda SNAC"
-
-msgid "Not supported by host"
-msgstr "Ikkje støtta av verten"
-
-msgid "Not supported by client"
-msgstr "Ikkje støtta av klienten"
-
-msgid "Refused by client"
-msgstr "Avvist av klienten"
-
-msgid "Reply too big"
-msgstr "Svaret er for stort"
-
-msgid "Responses lost"
-msgstr "Tapte svar"
-
-msgid "Request denied"
-msgstr "Førsepurnad avvist"
-
-msgid "Busted SNAC payload"
-msgstr "Ødelagt SNAC-pakkeinnhald"
-
-msgid "Insufficient rights"
-msgstr "Ikkje nok rettar"
-
-msgid "In local permit/deny"
-msgstr "I lokal tilgangs-/forbodsliste"
-
-msgid "Warning level too high (sender)"
-msgstr "For høgt åtvaringsnivå (sendar)"
-
-msgid "Warning level too high (receiver)"
-msgstr "For høgt åtvaringsnivå (mottakar)"
-
-msgid "User temporarily unavailable"
-msgstr "Brukaren er mellombels utilgjengeleg"
-
-msgid "No match"
-msgstr "Ikkje noko samsvar"
-
-msgid "List overflow"
-msgstr "Lista er full"
-
-msgid "Request ambiguous"
-msgstr "Uklar førespurnad"
-
-msgid "Queue full"
-msgstr "Køen er full"
-
-msgid "Not while on AOL"
-msgstr "Ikkje når pålogga AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "Får ikkje ta i mot lynmeldingar grunna foreldrekontrollreglar"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Kan ikkje senda teksmeldingar utan godkjenning av vilkåra"
-
-# tekstmeldinga? SMS-en?
-msgid "Cannot send SMS"
-msgstr "Klarer ikkje å senda meldinga"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Kan ikkje senda meldingar til dette landet"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Kan ikkje senda meldingar til ukjente land"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Bot-kontoar kan ikkje setja i gang lynmeldingar"
-
-msgid "Bot account cannot IM this user"
-msgstr "Bot-kontoen kan ikkje senda lynmelding til denne brukaren"
-
-msgid "Bot account reached IM limit"
-msgstr "Bot-kontoen har nådd lynmeldingsgrensa"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Bot-kontoen har nådd dagsgrensa for lynmeldingar"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Bot-kontoen har nådd månadsgrensa for lynmeldingar"
-
-msgid "Unable to receive offline messages"
-msgstr "Klarer ikkje å ta i mot fråkopla meldingar"
-
-msgid "Offline message store full"
-msgstr "Fråkopla meldingslager er fullt"
-
 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 "
@@ -7448,28 +7418,9 @@
 msgstr[1] "Du fekk ikkje %hu meldingar frå %s av uviss årsak."
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Klarer ikkje å senda meldinga: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Klarer ikkje å senda melding: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Klarer ikkje å senda meldinga til %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Klarer ikkje å senda meldinga til %s: %s"
-
-#, c-format
 msgid "User information not available: %s"
 msgstr "Brukarinformasjon er ikkje tilgjengeleg: %s"
 
-msgid "Unknown reason."
-msgstr "Ukjend årsak."
-
 msgid "Online Since"
 msgstr "Tilkopla sidan"
 
@@ -7894,6 +7845,75 @@
 "for lynmeldingsbilete. Fordi IP-adressa vil bli avslørt, blir dette sett på "
 "som ein tryggleiksrisiko."
 
+msgid "Invalid SNAC"
+msgstr "Ugyldig SNAC"
+
+msgid "Rate to host"
+msgstr "Fart mot vert"
+
+msgid "Rate to client"
+msgstr "Fart mot klient"
+
+msgid "Service unavailable"
+msgstr "Tenesta er utilgjengeleg"
+
+msgid "Service not defined"
+msgstr "Tenesta er ikkje definert"
+
+msgid "Obsolete SNAC"
+msgstr "Forelda SNAC"
+
+msgid "Not supported by host"
+msgstr "Ikkje støtta av verten"
+
+msgid "Not supported by client"
+msgstr "Ikkje støtta av klienten"
+
+msgid "Refused by client"
+msgstr "Avvist av klienten"
+
+msgid "Reply too big"
+msgstr "Svaret er for stort"
+
+msgid "Responses lost"
+msgstr "Tapte svar"
+
+msgid "Request denied"
+msgstr "Førsepurnad avvist"
+
+msgid "Busted SNAC payload"
+msgstr "Ødelagt SNAC-pakkeinnhald"
+
+msgid "Insufficient rights"
+msgstr "Ikkje nok rettar"
+
+msgid "In local permit/deny"
+msgstr "I lokal tilgangs-/forbodsliste"
+
+msgid "Warning level too high (sender)"
+msgstr "For høgt åtvaringsnivå (sendar)"
+
+msgid "Warning level too high (receiver)"
+msgstr "For høgt åtvaringsnivå (mottakar)"
+
+msgid "User temporarily unavailable"
+msgstr "Brukaren er mellombels utilgjengeleg"
+
+msgid "No match"
+msgstr "Ikkje noko samsvar"
+
+msgid "List overflow"
+msgstr "Lista er full"
+
+msgid "Request ambiguous"
+msgstr "Uklar førespurnad"
+
+msgid "Queue full"
+msgstr "Køen er full"
+
+msgid "Not while on AOL"
+msgstr "Ikkje når pålogga AOL"
+
 msgid "Aquarius"
 msgstr "Vassmannen"
 
@@ -12056,9 +12076,8 @@
 msgid "Arabic"
 msgstr "Arabisk"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Skamfull"
+msgstr "Assamesisk"
 
 msgid "Belarusian Latin"
 msgstr "Kviterussisk latinsk"
@@ -12187,9 +12206,8 @@
 msgid "Macedonian"
 msgstr "Makedonsk"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Malayisk"
+msgstr "Malayalam"
 
 msgid "Mongolian"
 msgstr "Mongolsk"
@@ -12305,8 +12323,8 @@
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s er ein meldingsklient basert på libpurple som er i stand til å kopla seg "
 "opp mot fleire meldingstenester samstundes. %s er skriven i C ved å nytta GTK"
@@ -12859,16 +12877,16 @@
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Er du sikker på at du vil permanent sletta loggen over pratinga i %s som "
 "starta %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Er du sikker på at du for alltid vil sletta systemloggen som starta på %s?"
 
@@ -15131,125 +15149,149 @@
 msgstr ""
 "Dette programtillegget er nyttig ved feilsøking av XMPP-tenarar og -klientar."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
 msgstr ""
-"$(^Name) blir utgjeve med ein GNU General Public License (GPL). Lisensen er "
-"berre gjeven her for opplysningsformål. $_CLICK"
-
+"$(^Name) er utgjeve i samsvar med vilkåra i GNU General Public License "
+"(GPL). Lisensen blir  berre vist her for å opplysa. $_CLICK"
+
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
-"Ei grafisk brukargrensesnittverktøykasse på fleire plattformer som Pidgin "
-"nyttar"
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
-msgstr "Pidgin kjører no. Lukk programmet og prøv igjen."
-
+msgstr "Pidgin kjører allereie. Avslutt Pidgin og prøv på nytt."
+
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
-msgstr "Pidgin programfiler og DLL-ar"
-
+msgstr "Pidgin kjerne- og biblioteksfiler"
+
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr "Lag ein snarveg til Pidgin på startmenyen"
-
+msgstr "Før opp Pidgin i startmenyen"
+
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr "Lag ein snarveg til Pidgin på skrivebordet"
 
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
-#, fuzzy
+msgstr "Feilsøkingssymbol (for å rapportera krasjar)"
+
+#. Installer Subsection Text
 msgid "Desktop"
-msgstr "Skrivebordet"
-
+msgstr "Skrivebord"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Klarte ikkje å lasta ned GTK+-kjøremiljøet ($R2).$\\rUtan dette vil ikkje "
+"Pidgin verka. Om du prøver igjen og det framleis feilar, kan du kanskje "
+"nytta 'den fråkopla installasjonen' frå http://pidgin.im/download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Klarte ikkje å installera feilsøkingssymbola ($R2).$\\rOm du prøver igjen og "
+"det framleis feilar, kan du kanskje nytta 'den fråkopla installasjonen' frå "
+"http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
-msgstr ""
-
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Klarte ikkje å installera stavekontrollen ($R3).$\\rOm du prøver igjen og "
+"det framleis feilar, finn du instruksar om manuell installasjon på: http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
-msgstr "GTK+-kjøremiljø (påkravd om det ikkje er til stades no)"
-
-#, fuzzy
+msgstr "GTK+-kjøremiljø (krevst om det ikkje allereie er til stades)"
+
+#. Installer Subsection Text
 msgid "Localizations"
-msgstr "Stad"
-
-#. License Page
+msgstr "Lokaliseringar"
+
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
 msgstr "Neste >"
 
-#. Components Page
+#. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
 msgstr "Pidgin lynmeldingsklient (påkravd)"
 
-#. GTK+ Section Prompts
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
-
+"Pidgin krev eit kompatibelt GTK+-kjøremiljø som no ikkje verkar vera til "
+"stades.$\\rEr du sikker på at du ikkje vil installera GTK+-kjøremiljøet?"
+
+#. Installer Subsection Text
 msgid "Shortcuts"
 msgstr "Snarvegar"
 
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
 msgstr "Snarvegar for å starta Pidgin"
 
-#. Spellcheck Section Prompts
+#. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr "Stavekontrollhjelp"
-
+msgstr "Stavekontrollstøtte"
+
+#. Installer Subsection Text
 msgid "Start Menu"
-msgstr "Startmenyen"
-
+msgstr "Startmeny"
+
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
-msgstr "Stavekontrollhjelp (treng internettsamband for å installera)."
+msgstr "Stavekontrollstøtte (krev internettsamband under installasjonen)."
 
 msgid "The installer is already running."
 msgstr "Installasjonsprogrammet kjører allereie."
 
-#. Uninstall Section Prompts
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
-"Avinstallasjonsprogrammet fann ikkje registerpostar for Pidgin.$\\rTruleg "
-"har ein annan brukar installert denne applikasjonen."
-
-#. URL Handler section
+"Avinstalleraren fann ingen registerpostar for Pidgin.$\\rDet kan henda at "
+"ein annan brukar installerte programmet."
+
+#. Installer Subsection Text
 msgid "URI Handlers"
-msgstr "URI-referanse"
-
-#. Pidgin Section Prompts and Texts
+msgstr "Adressehandterarar"
+
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
 msgstr ""
-"Klarte ikkje å avinstallera Pidgin-utgåva som er i bruk. Den nye utgåva kjem "
-"til å bli installert utan å ta vekk den gjeldande."
-
-#. Installer Finish Page
+"Klarer ikkje å avinstallera den gjeldande utgåva av Pidgin. Den nye utgåva "
+"vil bli installert utan at den gamle blir fjerna."
+
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
-msgstr "Besøk Pidgin si nettside"
+msgstr "Besøk Pidgin sin nettstad"
 
 msgid "You do not have permission to uninstall this application."
-msgstr "Du har ikkje løyve til å kunna avinstallera denne applikasjonen."
+msgstr "Du har ikkje rettar til å avinstallera dette programmet."
+
+#~ msgid "Unknown reason."
+#~ msgstr "Ukjend årsak."
 
 #~ msgid "Current Mood"
 #~ msgstr "Sinnsstemninga no"
--- a/po/pl.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/pl.po	Mon May 31 02:29:34 2010 +0900
@@ -13,10 +13,11 @@
 msgstr ""
 "Project-Id-Version: Pidgin Polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 23:18-0400\n"
-"PO-Revision-Date: 2010-05-03 20:37+0200\n"
+"POT-Creation-Date: 2010-05-29 20:58-0400\n"
+"PO-Revision-Date: 2010-05-24 14:19+0200\n"
 "Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1366,6 +1367,7 @@
 msgid "Saved Statuses"
 msgstr "Zapisane stany"
 
+#. title
 msgid "Title"
 msgstr "Tytuł"
 
@@ -1925,7 +1927,6 @@
 msgid "Thread creation failure: %s"
 msgstr "Utworzenie wątku się nie powiodło: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Nieznany powód"
 
@@ -2729,8 +2730,8 @@
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
 "Użytkownik \"%s\" jest obecnie w trybie offline. Zapisać resztę wiadomości "
-"jako przechwytywane zdarzenie i automatycznie wysłać je, kiedy użytkownik \"%"
-"s\" zaloguje się ponownie?"
+"jako przechwytywane zdarzenie i automatycznie wysłać je, kiedy użytkownik "
+"\"%s\" zaloguje się ponownie?"
 
 msgid "Offline Message"
 msgstr "Wiadomość w trybie offline"
@@ -3209,6 +3210,9 @@
 msgstr "Identyfikator użytkownika"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Imię"
 
@@ -3955,6 +3959,7 @@
 msgid "Postal Code"
 msgstr "Kod pocztowy"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Kraj"
 
@@ -3969,8 +3974,6 @@
 msgid "Organization Unit"
 msgstr "Jednostka organizacyjna"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "Stanowisko"
 
@@ -3978,6 +3981,7 @@
 msgstr "Rola"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Data urodzenia"
 
@@ -5722,6 +5726,9 @@
 msgid "Show custom smileys"
 msgstr "Wyświetlanie własnych emotikon"
 
+msgid "Allow direct connections"
+msgstr "Zezwalanie na bezpośrednie połączenia"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: szturcha użytkownika, aby uzyskać jego uwagę"
 
@@ -5957,7 +5964,11 @@
 msgstr ""
 "Nie pobrano jeszcze informacji o profilu. Proszę spróbować ponownie później."
 
+msgid "Your MXitId"
+msgstr "MXitId użytkownika"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -6034,7 +6045,7 @@
 msgid "MXit Login Name"
 msgstr "Login MXit"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "Pseudonim"
 
@@ -6083,7 +6094,7 @@
 msgid "Security Code"
 msgstr "Kod bezpieczeństwa"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Proszę podać kod bezpieczeństwa"
 
@@ -6109,6 +6120,10 @@
 msgid "Status Message"
 msgstr "Wiadomość stanu"
 
+msgid "Rejection Message"
+msgstr "Wiadomość odrzucenia"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Ukryty numer"
 
@@ -6126,6 +6141,19 @@
 msgid "Enable splash-screen popup"
 msgstr "Włączenie wyskakującego ekranu powitalnego"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Użytkownik został wyrzucony: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Błędny bilet"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Pokój:"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Utracono połączenie z MXit. Proszę połączyć się ponownie."
@@ -6900,6 +6928,63 @@
 msgid "Invalid chat room name"
 msgstr "Nieprawidłowa nazwa pokoju konferencji"
 
+msgid "Invalid error"
+msgstr "Nieprawidłowy błąd"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Nie można odebrać wiadomości z powodu kontroli rodzicielskiej"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Nie można wysłać wiadomości SMS bez zaakceptowania warunków"
+
+msgid "Cannot send SMS"
+msgstr "Nie można wysłać wiadomości SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Nie można wysłać wiadomości SMS do tego kraju"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Nie można wysłać wiadomości SMS do nieznanego kraju"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Konta botów nie mogą inicjować wiadomości"
+
+msgid "Bot account cannot IM this user"
+msgstr "Konto bota nie może wysłać wiadomości do tego użytkownika"
+
+msgid "Bot account reached IM limit"
+msgstr "Konto bota osiągnęło ograniczenie liczby wiadomości"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Konto bota osiągnęło dzienne ograniczenie liczby wiadomości"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Konto bota osiągnęło miesięczne ograniczenie liczby wiadomości"
+
+msgid "Unable to receive offline messages"
+msgstr "Nie można odebrać wiadomości w trybie offline"
+
+msgid "Offline message store full"
+msgstr "Przechowalnia wiadomości w trybie offline jest pełna"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Nie można wysłać wiadomości: %s (%s)."
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Nie można wysłać wiadomości: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Nie można wysłać wiadomości do %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Nie można wysłać wiadomości do %s: %s"
+
 msgid "Thinking"
 msgstr "Myśli"
 
@@ -7050,116 +7135,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Plik %s ma %s, czyli więcej niż maksymalny rozmiar %s."
 
-msgid "Invalid error"
-msgstr "Nieprawidłowy błąd"
-
-msgid "Invalid SNAC"
-msgstr "Nieprawidłowe SNAC"
-
-msgid "Rate to host"
-msgstr "Prędkość do serwera"
-
-msgid "Rate to client"
-msgstr "Prędkość do klienta"
-
-msgid "Service unavailable"
-msgstr "Usługa jest niedostępna"
-
-msgid "Service not defined"
-msgstr "Usługa nie została określona"
-
-msgid "Obsolete SNAC"
-msgstr "Przestarzałe SNAC"
-
-msgid "Not supported by host"
-msgstr "Nieobsługiwane przez serwer"
-
-msgid "Not supported by client"
-msgstr "Nieobsługiwane przez klienta"
-
-msgid "Refused by client"
-msgstr "Klient odmówił"
-
-msgid "Reply too big"
-msgstr "Odpowiedź jest za duża"
-
-msgid "Responses lost"
-msgstr "Utracono odpowiedzi"
-
-msgid "Request denied"
-msgstr "Żądanie zostało odrzucone"
-
-msgid "Busted SNAC payload"
-msgstr "Uszkodzona treść SNAC"
-
-msgid "Insufficient rights"
-msgstr "Niewystarczające uprawnienia"
-
-msgid "In local permit/deny"
-msgstr "W lokalnej liście zezwoleń/blokad"
-
-msgid "Warning level too high (sender)"
-msgstr "Poziom ostrzeżenia jest za wysoki (nadawca)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Poziom ostrzeżenia jest za wysoki (odbiorca)"
-
-msgid "User temporarily unavailable"
-msgstr "Użytkownik jest tymczasowo niedostępny"
-
-msgid "No match"
-msgstr "Nie pasuje"
-
-msgid "List overflow"
-msgstr "Przepełnienie listy"
-
-msgid "Request ambiguous"
-msgstr "Niejednoznaczne żądanie"
-
-msgid "Queue full"
-msgstr "Kolejka jest pełna"
-
-msgid "Not while on AOL"
-msgstr "Niedostępne w AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "Nie można odebrać wiadomości z powodu kontroli rodzicielskiej"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Nie można wysłać wiadomości SMS bez zaakceptowania warunków"
-
-msgid "Cannot send SMS"
-msgstr "Nie można wysłać wiadomości SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Nie można wysłać wiadomości SMS do tego kraju"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Nie można wysłać wiadomości SMS do nieznanego kraju"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Konta botów nie mogą inicjować wiadomości"
-
-msgid "Bot account cannot IM this user"
-msgstr "Konto bota nie może wysłać wiadomości do tego użytkownika"
-
-msgid "Bot account reached IM limit"
-msgstr "Konto bota osiągnęło ograniczenie liczby wiadomości"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Konto bota osiągnęło dzienne ograniczenie liczby wiadomości"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Konto bota osiągnęło miesięczne ograniczenie liczby wiadomości"
-
-msgid "Unable to receive offline messages"
-msgstr "Nie można odebrać wiadomości w trybie offline"
-
-msgid "Offline message store full"
-msgstr "Przechowalnia wiadomości w trybie offline jest pełna"
-
 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 "
@@ -7531,28 +7506,9 @@
 msgstr[2] "Pominięto %hu wiadomości od użytkownika %s z nieznanego powodu."
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Nie można wysłać wiadomości: %s (%s)."
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Nie można wysłać wiadomości: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Nie można wysłać wiadomości do %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Nie można wysłać wiadomości do %s: %s"
-
-#, c-format
 msgid "User information not available: %s"
 msgstr "Informacje o użytkowniku są niedostępne: %s"
 
-msgid "Unknown reason."
-msgstr "Nieznany powód."
-
 msgid "Online Since"
 msgstr "Zalogowany od"
 
@@ -7989,6 +7945,88 @@
 "niezbędne dla obrazów komunikatora. Ponieważ adres IP zostanie ujawniony, "
 "może się to wiązać z zagrożeniem prywatności."
 
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Nieprawidłowy identyfikator"
+
+#, fuzzy
+msgid "Rate to host"
+msgstr "Zaproś do konferencji"
+
+#, fuzzy
+msgid "Rate to client"
+msgstr "Ostatni znany klient"
+
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Usługa jest niedostępna"
+
+#, fuzzy
+msgid "Service not defined"
+msgstr "Nie odnaleziono konferencji"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+#, fuzzy
+msgid "Not supported by host"
+msgstr "Nieobsługiwane"
+
+#, fuzzy
+msgid "Not supported by client"
+msgstr "Nieobsługiwane"
+
+msgid "Refused by client"
+msgstr ""
+
+msgid "Reply too big"
+msgstr ""
+
+#, fuzzy
+msgid "Responses lost"
+msgstr "Prawdopodobieństwo odpowiedzi:"
+
+#, fuzzy
+msgid "Request denied"
+msgstr "Wysyłanie prośby"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr ""
+
+msgid "In local permit/deny"
+msgstr ""
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Usługa jest tymczasowo niedostępna"
+
+#, fuzzy
+msgid "No match"
+msgstr "Brak wyników"
+
+#, fuzzy
+msgid "List overflow"
+msgstr "Lista jest pełna"
+
+#, fuzzy
+msgid "Request ambiguous"
+msgstr "Wysyłanie prośby"
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Wodnik"
 
@@ -8362,8 +8400,8 @@
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
 msgstr ""
-"<b>Dołączenie do Qun %u zostało zaakceptowane przez administratora %u dla %"
-"s</b>"
+"<b>Dołączenie do Qun %u zostało zaakceptowane przez administratora %u dla "
+"%s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
@@ -8846,8 +8884,8 @@
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Żaden komputer lub adres IP nie został skonfigurowany dla konta Meanwhile %"
-"s. Proszę podać komputer lub adres IP poniżej, aby kontynuować logowanie."
+"Żaden komputer lub adres IP nie został skonfigurowany dla konta Meanwhile "
+"%s. Proszę podać komputer lub adres IP poniżej, aby kontynuować logowanie."
 
 msgid "Meanwhile Connection Setup"
 msgstr "Ustawienia połączenia Meanwhile"
@@ -11367,7 +11405,7 @@
 msgstr "Wiadomość (opcjonalna)"
 
 msgid "Edit User Mood"
-msgstr "Zmień nastrój użytkownika"
+msgstr "Zmiana nastroju użytkownika"
 
 #. Buddies menu
 msgid "/_Buddies"
@@ -12151,9 +12189,8 @@
 msgid "Arabic"
 msgstr "arabski"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Zawstydzony"
+msgstr "asamski"
 
 msgid "Belarusian Latin"
 msgstr "białoruski (alfabet łaciński)"
@@ -12281,9 +12318,8 @@
 msgid "Macedonian"
 msgstr "macedoński"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "malajski"
+msgstr "malajalam"
 
 msgid "Mongolian"
 msgstr "mongolski"
@@ -12399,8 +12435,8 @@
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "Program %s jest komunikatorem opartym na bibliotece libpurple, mogący łączyć "
 "się z wieloma usługami za jednym razem. Program %s został napisany w języku "
@@ -12435,11 +12471,11 @@
 msgstr ""
 "<font size=\"4\"><b>Pomoc od innych użytkowników programu Pidgin</b></font>: "
 "<a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/>To jest "
-"<b>publiczna</b> lista mailingowa. (<a href=\"http://pidgin.im/pipermail/"
-"support/\">archiwum</a>)<br/>Nie jest dostarczana żadna pomoc dla protokołów "
-"lub wtyczek osób trzecich.<br/>Główny język tej listy to <b>angielski</b>. "
-"Można na nią pisać w innych językach, ale odpowiedzi mogą być mniej pomocne."
-"<br/>"
+"<b>publiczna</b> lista mailingowa (<a href=\"http://pidgin.im/pipermail/"
+"support/\">archiwum</a>).<br/>Nie jest dostarczana żadna pomoc dla "
+"protokołów lub wtyczek osób trzecich.<br/>Główny język tej listy to "
+"<b>angielski</b>. Można na nią pisać w innych językach, ale odpowiedzi mogą "
+"być mniej pomocne.<br/>"
 
 #, c-format
 msgid "About %s"
@@ -12957,14 +12993,14 @@
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "Na pewno trwale usunąć dziennik rozmowy w %s, rozpoczętej dnia %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "Na pewno trwale usunąć dziennik systemowy rozpoczęty dnia %s?"
 
 msgid "Delete Log?"
@@ -13164,13 +13200,13 @@
 "Check the plugin website for an update.</span>"
 msgstr ""
 "<span foreground=\"red\" weight=\"bold\">Błąd: %s\n"
-"Proszę sprawdzić stronę WWW wtyczki, aby uzyskać aktualizację.</span>"
+"Proszę zobaczyć stronę WWW wtyczki, aby uzyskać aktualizację.</span>"
 
 msgid "Author"
 msgstr "Autor"
 
 msgid "<b>Written by:</b>"
-msgstr "<b>Napisane przez:</b>"
+msgstr "<b>Napisana przez:</b>"
 
 msgid "<b>Web site:</b>"
 msgstr "<b>Strona WWW:</b>"
@@ -15235,6 +15271,7 @@
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Ta wtyczka jest przydatna do debugowania serwerów lub klientów XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15243,91 +15280,121 @@
 "Publicznej GNU (GPL). Licencja jest tu podana wyłącznie w celach "
 "informacyjnych. $_CLICK"
 
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
+"Wieloplatformowy zestaw narzędzi do tworzenia graficznych interfejsów "
+"użytkownika, używany przez program Pidgin"
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
 msgstr ""
-
+"Program Pidgin jest obecnie uruchomiony. Proszę zakończyć program Pidgin i "
+"spróbować ponownie."
+
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
 msgstr "Główne pliki programu Pidgin i biblioteki DLL"
 
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
 msgstr "Utworzenie wpisu w menu Start dla programu Pidgin"
 
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr "Utworzenie skrótu do programu Pidgin na pulpicie"
 
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
+msgstr "Symbole debugowania (do zgłaszania awarii)"
+
+#. Installer Subsection Text
 msgid "Desktop"
 msgstr "Pulpit"
 
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Błąd podczas pobierania biblioteki GTK+ ($R2).$\\rJest ona wymagana do "
+"działania programu Pidgin. Jeśli ponowienie się nie powiedzie, być może "
+"należy użyć \"Instalatora w trybie offline\" ze strony http://pidgin.im/"
+"download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Błąd podczas pobierania symboli debugowania ($R2).$\\rJeśli ponowienie się "
+"nie powiedzie, być może należy użyć \"Instalatora w trybie offline\" ze "
+"strony http://pidgin.im/download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
-msgstr ""
-
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Błąd podczas instalowania sprawdzania pisowni ($R3).$\\rJeśli ponowienie się "
+"nie powiedzie, instrukcje ręcznej instalacji znajdują się na stronie: http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
 msgstr "Biblioteka GTK+ (wymagana, jeśli nie jest obecna)"
 
-#, fuzzy
+#. Installer Subsection Text
 msgid "Localizations"
-msgstr "Położenie"
-
-#. License Page
+msgstr "Tłumaczenia"
+
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
 msgstr "Dalej >"
 
-#. Components Page
+#. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
-msgstr "Klient komunikatora Pidgin (wymagany)"
-
-#. GTK+ Section Prompts
+msgstr "Klient komunikatora Pidgin (wymagane)"
+
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
-
+"Program Pidgin wymaga zgodnej biblioteki GTK+ (która nie jest jeszcze "
+"obecna).$\\rNa pewno pominąć instalowanie biblioteki GTK+?"
+
+#. Installer Subsection Text
 msgid "Shortcuts"
 msgstr "Skróty"
 
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
 msgstr "Skróty do uruchamiania programu Pidgin"
 
-#. Spellcheck Section Prompts
+#. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
-
-#, fuzzy
+msgstr "Obsługa sprawdzania pisowni"
+
+#. Installer Subsection Text
 msgid "Start Menu"
 msgstr "Menu Start"
 
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
+"Obsługa sprawdzania pisowni (do instalacji wymagane jest połączenie z "
+"Internetem)."
 
 msgid "The installer is already running."
-msgstr ""
-
-#. Uninstall Section Prompts
+msgstr "Instalator jest już uruchomiony."
+
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
@@ -15335,34 +15402,20 @@
 "Instalator nie może odnaleźć wpisów w rejestrze dla programu Pidgin.$"
 "\\rMożliwe, że inny użytkownik zainstalował ten program."
 
-#. URL Handler section
+#. Installer Subsection Text
 msgid "URI Handlers"
-msgstr ""
-
-#. Pidgin Section Prompts and Texts
+msgstr "Obsługa adresów URI"
+
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
 msgstr ""
-
-#. Installer Finish Page
+"Nie można odinstalować obecnie zainstalowanej wersji programu Pidgin. Nowa "
+"wersja zostanie zainstalowana bez usuwania obecnej."
+
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
 msgstr "Odwiedź stronę WWW programu Pidgin"
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Brak uprawnień do odinstalowania tego programu."
-
-#~ msgid "Current Mood"
-#~ msgstr "Obecny nastrój"
-
-#~ msgid "New Mood"
-#~ msgstr "Nowy nastrój"
-
-#~ msgid "Change your Mood"
-#~ msgstr "Zmień nastrój"
-
-#~ msgid "How do you feel right now?"
-#~ msgstr "Jak się teraz czujesz?"
-
-#~ msgid "Change Mood..."
-#~ msgstr "Zmień nastrój..."
--- a/po/sl.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/sl.po	Mon May 31 02:29:34 2010 +0900
@@ -6,12 +6,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.6\n"
+"Project-Id-Version: Pidgin 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 23:18-0400\n"
-"PO-Revision-Date: 2010-04-30 16:02+0100\n"
+"POT-Creation-Date: 2010-05-29 20:58-0400\n"
+"PO-Revision-Date: 2010-05-22 11:26+0100\n"
 "Last-Translator: Martin Srebotnjak  <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak <miles@filmsi.net>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1360,6 +1361,7 @@
 msgid "Saved Statuses"
 msgstr "Shranjena stanja"
 
+#. title
 msgid "Title"
 msgstr "Naziv"
 
@@ -1917,7 +1919,6 @@
 msgid "Thread creation failure: %s"
 msgstr "Napaka pri ustvarjanju niti: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Neznan razlog"
 
@@ -3212,6 +3213,9 @@
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Ime"
 
@@ -3952,6 +3956,7 @@
 msgid "Postal Code"
 msgstr "Poštna številka"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Država"
 
@@ -3966,8 +3971,6 @@
 msgid "Organization Unit"
 msgstr "Enota organizacije"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "Naziv službe"
 
@@ -3975,6 +3978,7 @@
 msgstr "Funkcija"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "Rojstni dan"
 
@@ -5712,6 +5716,9 @@
 msgid "Show custom smileys"
 msgstr "Pokaži smejčke po meri ..."
 
+msgid "Allow direct connections"
+msgstr "Dovoli neposredne povezave"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Dregnite prijatelja, da vas bo opazil"
 
@@ -5943,7 +5950,11 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Podatki o vašem profilu še niso pridobljen. Poskusite znova kasneje."
 
+msgid "Your MXitId"
+msgstr "Vaš MXitId"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -6021,7 +6032,7 @@
 msgid "MXit Login Name"
 msgstr "Prijavno ime MXit"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "Vzdevek"
 
@@ -6067,7 +6078,7 @@
 msgid "Security Code"
 msgstr "Varnostna koda"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Vnesite varnostno kodo"
 
@@ -6093,6 +6104,10 @@
 msgid "Status Message"
 msgstr "Sporočilo stanja"
 
+msgid "Rejection Message"
+msgstr "Sporočilo zavrnitve"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Skrita številka"
 
@@ -6110,6 +6125,19 @@
 msgid "Enable splash-screen popup"
 msgstr "Omogoči pozdravno okno ob zagonu"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Brcnjeni ste bili: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Napačna vstopnica"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Soba:"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Povezava z MXite je izgubljena. Znova se povežite."
@@ -6882,6 +6910,64 @@
 msgid "Invalid chat room name"
 msgstr "Neveljavno ime sobe"
 
+msgid "Invalid error"
+msgstr "Neveljavna napaka"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Sporočila ne morete prejeti zaradi starševskega nadzora"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "SMS ni mogoče poslati brez sprejetja pogojev"
+
+msgid "Cannot send SMS"
+msgstr "Ni mogoče poslati SMS-a"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "SMS-a v to državo ni mogoče poslati."
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "SMS ni mogoče poslati v neznano državo"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Računi bot ne morejo začeti klepetov"
+
+msgid "Bot account cannot IM this user"
+msgstr "Račun bot ne more klepetati s tem uporabnikom"
+
+msgid "Bot account reached IM limit"
+msgstr "Račun bot je dosegel številsko omejitev sporočil"
+
+msgid "Bot account reached daily IM limit"
+msgstr "Račun bot je dosegel dnevno omejitev sporočil"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "Račun bot je dosegel mesečno omejitev sporočil"
+
+msgid "Unable to receive offline messages"
+msgstr "Sporočil stanja nepovezanosti ni mogoče prejemati."
+
+msgid "Offline message store full"
+msgstr "Shramba sporočil ob nepovezanosti je polna"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Sporočila ni mogoče poslati: %s (%s)"
+
+#  Data is assumed to be the destination sn
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Ni moč poslati sporočila: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Ni moč poslati sporočila k %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Ni moč poslati sporočila k %s: %s"
+
 msgid "Thinking"
 msgstr "Razmišlja"
 
@@ -7033,116 +7119,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Datoteka %s je %s, kar je več od največje velikosti za %s."
 
-msgid "Invalid error"
-msgstr "Neveljavna napaka"
-
-msgid "Invalid SNAC"
-msgstr "Neveljaven SNAC"
-
-msgid "Rate to host"
-msgstr "Prenos do gostitelja"
-
-msgid "Rate to client"
-msgstr "Prenos do odjemalca"
-
-msgid "Service unavailable"
-msgstr "Storitev ni dostopna"
-
-msgid "Service not defined"
-msgstr "Storitev nedefinirana"
-
-msgid "Obsolete SNAC"
-msgstr "Zastarel SNAC"
-
-msgid "Not supported by host"
-msgstr "Gostitelj ne podpira"
-
-msgid "Not supported by client"
-msgstr "Odjemalec ne podpira"
-
-msgid "Refused by client"
-msgstr "Odjemalec je zavrnil"
-
-msgid "Reply too big"
-msgstr "Odgovor prevelik"
-
-msgid "Responses lost"
-msgstr "Odgovori so se izgubili"
-
-msgid "Request denied"
-msgstr "Zahteva zavrnjena"
-
-msgid "Busted SNAC payload"
-msgstr "Odkrit SNAC podatek"
-
-msgid "Insufficient rights"
-msgstr "Premalo pravic"
-
-msgid "In local permit/deny"
-msgstr "V lokalnem dovoljenju/prepovedi"
-
-msgid "Warning level too high (sender)"
-msgstr "Raven opozoril previsoka (pošiljatelj)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Raven opozoril previsoka (prejemnik)"
-
-msgid "User temporarily unavailable"
-msgstr "Uporabnik začasno ni dostopen"
-
-msgid "No match"
-msgstr "Ni zadetka"
-
-msgid "List overflow"
-msgstr "Prekoračitev seznama"
-
-msgid "Request ambiguous"
-msgstr "Zahteva nejasna"
-
-msgid "Queue full"
-msgstr "Čakalna vrsta je polna"
-
-msgid "Not while on AOL"
-msgstr "Na omrežju AOL ni dovoljeno"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "Sporočila ne morete prejeti zaradi starševskega nadzora"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "SMS ni mogoče poslati brez sprejetja pogojev"
-
-msgid "Cannot send SMS"
-msgstr "Ni mogoče poslati SMS-a"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "SMS-a v to državo ni mogoče poslati."
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "SMS ni mogoče poslati v neznano državo"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Računi bot ne morejo začeti klepetov"
-
-msgid "Bot account cannot IM this user"
-msgstr "Račun bot ne more klepetati s tem uporabnikom"
-
-msgid "Bot account reached IM limit"
-msgstr "Račun bot je dosegel številsko omejitev sporočil"
-
-msgid "Bot account reached daily IM limit"
-msgstr "Račun bot je dosegel dnevno omejitev sporočil"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "Račun bot je dosegel mesečno omejitev sporočil"
-
-msgid "Unable to receive offline messages"
-msgstr "Sporočil stanja nepovezanosti ni mogoče prejemati."
-
-msgid "Offline message store full"
-msgstr "Shramba sporočil ob nepovezanosti je polna"
-
 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 "
@@ -7511,29 +7487,9 @@
 msgstr[3] "Spregledali ste %hu sporočila od %s, ker so bila neveljavna."
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Sporočila ni mogoče poslati: %s (%s)"
-
-#  Data is assumed to be the destination sn
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Ni moč poslati sporočila: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Ni moč poslati sporočila k %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Ni moč poslati sporočila k %s: %s"
-
-#, c-format
 msgid "User information not available: %s"
 msgstr "Podatki o uporabniku niso dostopni: %s"
 
-msgid "Unknown reason."
-msgstr "Neznan vzrok."
-
 msgid "Online Since"
 msgstr "Na zvezi od"
 
@@ -7973,6 +7929,88 @@
 "za sporočanje s slikami. Ker bo razkrit naslov IP, sodi ta povezava med "
 "tveganja zasebnosti."
 
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Neveljaven ID"
+
+#, fuzzy
+msgid "Rate to host"
+msgstr "Povabi na klepet"
+
+#, fuzzy
+msgid "Rate to client"
+msgstr "Nazadnje znani odjemalec"
+
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Storitev ni dostopna"
+
+#, fuzzy
+msgid "Service not defined"
+msgstr "Konference ni mogoče najti"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+#, fuzzy
+msgid "Not supported by host"
+msgstr "Ni podprto"
+
+#, fuzzy
+msgid "Not supported by client"
+msgstr "Ni podprto"
+
+msgid "Refused by client"
+msgstr ""
+
+msgid "Reply too big"
+msgstr ""
+
+#, fuzzy
+msgid "Responses lost"
+msgstr "Verjetnost odgovora:"
+
+#, fuzzy
+msgid "Request denied"
+msgstr "Zahteva v teku"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr ""
+
+msgid "In local permit/deny"
+msgstr ""
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Storitev trenutno ni na voljo"
+
+#, fuzzy
+msgid "No match"
+msgstr "Ni zadetkov"
+
+#, fuzzy
+msgid "List overflow"
+msgstr "Seznam poln"
+
+#, fuzzy
+msgid "Request ambiguous"
+msgstr "Zahteva v teku"
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Vodnar"
 
@@ -10301,8 +10339,8 @@
 #, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Prijatelja %s ni mogoče dodati v skupino %s na seznamu strežnikov za račun %"
-"s."
+"Prijatelja %s ni mogoče dodati v skupino %s na seznamu strežnikov za račun "
+"%s."
 
 msgid "Unable to add buddy to server list"
 msgstr "Prijatelja ni mogoče dodati ne seznam strežnikov"
@@ -10691,8 +10729,8 @@
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
 msgstr ""
-"Dostop zavrnjen: posredovalni strežnik HTTP ne dovoljuje preusmerjanja vrat %"
-"d"
+"Dostop zavrnjen: posredovalni strežnik HTTP ne dovoljuje preusmerjanja vrat "
+"%d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -12135,9 +12173,8 @@
 msgid "Arabic"
 msgstr "arabsko"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Osramočen"
+msgstr "asamsko"
 
 msgid "Belarusian Latin"
 msgstr "belorusko (latinica)"
@@ -12265,9 +12302,8 @@
 msgid "Macedonian"
 msgstr "makedonsko"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "malajsko"
+msgstr "malajalamsko"
 
 msgid "Mongolian"
 msgstr "mongolsko"
@@ -12383,8 +12419,8 @@
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s je odjemalec za neposredno sporočanje, ki se lahko hkrati povezuje z več "
 "storitvami sporočanja. %s je napisan v jeziku C s pomočjo Gtk+. %s je izdan "
@@ -12935,16 +12971,16 @@
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr ""
 "Ste prepričani, da želite povsem izbrisati dnevnik klepeta v %s, ki se je "
 "pričel ob %s?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Ste prepričani, da želite povsem izbrisati sistemski dnevnik, ki se je "
 "pričel ob %s?"
@@ -15215,6 +15251,7 @@
 msgstr ""
 "Ta vtičnik je uporaben za razhroščevanje strežnikov ali odjemalcev XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
@@ -15222,8 +15259,9 @@
 "$(^Name) je izdan pod licenco GPL. Ta licenca je tu na voljo le v "
 "informativne namene. $_CLICK"
 
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
-msgstr "Večplatformna orodjarna GUI, ki jo uporablja Pidgin"
+msgstr ""
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
@@ -15232,75 +15270,97 @@
 "Trenutno že teče ena različica Pidgina. Prosimo, zaprite aplikacijo in "
 "poskusite znova."
 
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
 msgstr "Temeljne datoteke in knjižnice za Pidgin"
 
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
 msgstr "Ustvari izbiro Pidgin v meniju Start"
 
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr "Ustvari bližnjico za Pidgin na namizju"
 
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
+msgstr "Simboli razhroščevanja (za poročanje o sesutjih)"
+
+#. Installer Subsection Text
 msgid "Desktop"
 msgstr "Namizje"
 
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Napaka pri prenašanju izvajalnega okolja GTK+ ($R2).$\\rTa je potreben za "
+"delovanje Pidgina; če ponoven poskus ne uspe, boste morali uporabiti 'polni "
+"namestitveni paket' z naslova http://pidgin.im/download/windows/"
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Napaka pri nameščanju simbolov razhroščevanja ($R2).$\\rČe ponoven poskus ne "
+"uspe, boste morali uporabiti 'polni namestitveni paket' z naslova http://"
+"pidgin.im/download/windows/"
+
+#. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
-msgstr ""
-
-#, fuzzy
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Napaka pri nameščanju preverjanja črkovanja ($R3).$\\rČe ponovni poskus ne "
+"uspe, najdete navodila za ročno namestitev na naslovu: http://developer."
+"pidgin.im/wiki/Installing%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
-msgstr "Izvajalno okolje GTK+ (zahtevano)"
-
-#, fuzzy
+msgstr "Izvajalno okolje GTK+ (obvezno, če manjka)"
+
+#. Installer Subsection Text
 msgid "Localizations"
-msgstr "Lokacija"
-
-#. License Page
+msgstr "Lokalizacije"
+
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
 msgstr "Naprej >"
 
-#. Components Page
+#. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
 msgstr "Pidgin - odjemalec za klepet (zahtevano)"
 
-#. GTK+ Section Prompts
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
-
+"Pidgin potrebuje združljivo izvajalno okolje GTK+ (ki očitno ni na voljo).$"
+"\\rSte prepričani, da želite preskočiti nameščanje izvajalnega okolja GTK+?"
+
+#. Installer Subsection Text
 msgid "Shortcuts"
 msgstr "Tipke za bližnjice"
 
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
 msgstr "Bližnjice za zagon Pidgina"
 
-#. Spellcheck Section Prompts
+#. Installer Subsection Text
 msgid "Spellchecking Support"
 msgstr "Podpora preverjanja črkovanja"
 
+#. Installer Subsection Text
 msgid "Start Menu"
 msgstr "Začetni meni"
 
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
@@ -15309,7 +15369,6 @@
 msgid "The installer is already running."
 msgstr "Nameščanje že poteka."
 
-#. Uninstall Section Prompts
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
@@ -15317,11 +15376,10 @@
 "Vnosov za Pidgin v registru ni mogoče najti.$\\rNajverjetneje je ta program "
 "namestil drug uporabnik."
 
-#. URL Handler section
+#. Installer Subsection Text
 msgid "URI Handlers"
-msgstr ""
-
-#. Pidgin Section Prompts and Texts
+msgstr "Upravljalnik URI"
+
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
@@ -15329,24 +15387,9 @@
 "Trenutno nameščene različice Pidgina ni mogoče odstraniti. Nova različica bo "
 "nameščena brez odstranitve trenutno nameščene različice."
 
-#. Installer Finish Page
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
 msgstr "Obiščite spletno stran Pidgin"
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Za odstranitev programa nimate ustreznih pravic."
-
-#~ msgid "Current Mood"
-#~ msgstr "Trenutno razpoloženje"
-
-#~ msgid "New Mood"
-#~ msgstr "Novo razpoloženje"
-
-#~ msgid "Change your Mood"
-#~ msgstr "Spremeni razpoloženje"
-
-#~ msgid "How do you feel right now?"
-#~ msgstr "Kako se počutite?"
-
-#~ msgid "Change Mood..."
-#~ msgstr "Spremeni razpoloženje ..."
--- a/po/uk.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/uk.po	Mon May 31 02:29:34 2010 +0900
@@ -9,16 +9,16 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 23:18-0400\n"
-"PO-Revision-Date: 2010-05-05 02:11+0300\n"
+"POT-Creation-Date: 2010-05-29 20:59-0400\n"
+"PO-Revision-Date: 2010-05-24 22:50+0300\n"
 "Last-Translator: Oleksandr Kovalenko <alx.kovalenko@gmail.com>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Language: uk_UA\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -1356,6 +1356,7 @@
 msgid "Saved Statuses"
 msgstr "Збережені стани"
 
+#. title
 msgid "Title"
 msgstr "Назва"
 
@@ -1381,7 +1382,7 @@
 msgstr "Невірний заголовок"
 
 msgid "Please enter a non-empty title for the status."
-msgstr "Будь ласка, введіть назву для стану."
+msgstr "Будь ласка, введіть непорожню назву для стану."
 
 msgid "Duplicate title"
 msgstr "Подвоїти назву"
@@ -1912,7 +1913,6 @@
 msgid "Thread creation failure: %s"
 msgstr "Помилка створення потоку : %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "Невідома причина"
 
@@ -3193,6 +3193,9 @@
 msgstr "UIN"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "Ім'я"
 
@@ -3935,6 +3938,7 @@
 msgid "Postal Code"
 msgstr "Поштовий індекс"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "Країна"
 
@@ -3949,8 +3953,6 @@
 msgid "Organization Unit"
 msgstr "Відділок"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "Назва роботи"
 
@@ -3958,6 +3960,7 @@
 msgstr "Посада"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "День народження"
 
@@ -4332,31 +4335,31 @@
 #. should be user_settable some day
 #. independent
 msgid "Tune Artist"
-msgstr "Налаштувати виконавця"
+msgstr "Виконавець"
 
 msgid "Tune Title"
-msgstr "Налаштувати назву"
+msgstr "Назва"
 
 msgid "Tune Album"
-msgstr "Налаштувати альбом"
+msgstr "Альбом"
 
 msgid "Tune Genre"
-msgstr "Налаштувати жанр"
+msgstr "Жанр"
 
 msgid "Tune Comment"
-msgstr "Налаштувати примітку"
+msgstr "Примітка"
 
 msgid "Tune Track"
-msgstr "Налаштувати доріжку"
+msgstr "Доріжка"
 
 msgid "Tune Time"
-msgstr "Налаштувати час "
+msgstr "Час "
 
 msgid "Tune Year"
-msgstr "Налаштувати рік"
+msgstr "Рік"
 
 msgid "Tune URL"
-msgstr "Налаштувати посилання URL"
+msgstr "Посилання URL"
 
 msgid "Password Changed"
 msgstr "Пароль змінено"
@@ -4517,7 +4520,7 @@
 msgstr "Непідтримуване кодування"
 
 msgid "Unsupported Stanza Type"
-msgstr "Непідтримуваний тип строфи"
+msgstr "Непідтримуваний тип рядка"
 
 msgid "Unsupported Version"
 msgstr "Непідтримувана версія"
@@ -5693,6 +5696,9 @@
 msgid "Show custom smileys"
 msgstr "Показати нетипові усмішки"
 
+msgid "Allow direct connections"
+msgstr "Дозволити прямі з'єднання"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: штовхнути користувача, щоб привернути його увагу"
 
@@ -5921,7 +5927,11 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Відомості про профіль ще не отримані. Будь ласка, спробуйте пізніше."
 
+msgid "Your MXitId"
+msgstr "Ваш MXitId"
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -5999,7 +6009,7 @@
 msgid "MXit Login Name"
 msgstr "Ім'я входу MXit"
 
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "Прізвисько"
 
@@ -6044,7 +6054,7 @@
 msgid "Security Code"
 msgstr "Код безпеки"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "Введіть код безпеки"
 
@@ -6070,6 +6080,10 @@
 msgid "Status Message"
 msgstr "Повідомлення стану"
 
+msgid "Rejection Message"
+msgstr "Повідомлення відмови"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "Схований номер"
 
@@ -6087,6 +6101,19 @@
 msgid "Enable splash-screen popup"
 msgstr "Увімкнути виринаючу екранну заставку"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "Вас викинули: (%s)"
+
+#, fuzzy
+msgid "was kicked"
+msgstr "Неправильний білет"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "_Кімната:"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "Втрачене з'єднання з MXit. Будь ласка, підключіться ще раз."
@@ -6743,7 +6770,7 @@
 msgstr "Номер телефон"
 
 msgid "Personal Title"
-msgstr "Особиста сторінка тенет"
+msgstr "Особиста назва"
 
 msgid "Mailstop"
 msgstr "Пошта"
@@ -6868,6 +6895,67 @@
 msgid "Invalid chat room name"
 msgstr "Неправильна назва кімнати балачки"
 
+msgid "Invalid error"
+msgstr "Недопустима помилка"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "Неможливо прийняти миттєве повідомлення із-за нагляду батьків"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "Неможливо надіслати SMS без прийняття умов"
+
+msgid "Cannot send SMS"
+msgstr "Не вдається надіслати SMS"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "Не вдається надіслати SMS до цієї країни"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "Неможливо надіслати SMS до невідомої країни"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "Обліковий запис робота не може розпочати миттєве повідомлення"
+
+msgid "Bot account cannot IM this user"
+msgstr ""
+"Обліковий запис робота не може надіслати миттєве повідомлення цьому "
+"користувачу"
+
+msgid "Bot account reached IM limit"
+msgstr "Обліковий запис робота досягнув обмеження миттєвих повідомлень"
+
+msgid "Bot account reached daily IM limit"
+msgstr ""
+"Обліковий запис робота досягнув добового обмеження миттєвих повідомлень"
+
+msgid "Bot account reached monthly IM limit"
+msgstr ""
+"Обліковий запис робота досягнув місячного обмеження миттєвих повідомлень"
+
+msgid "Unable to receive offline messages"
+msgstr "Не вдалося отримати повідомлення \"поза мережею\""
+
+msgid "Offline message store full"
+msgstr "Сховище повідомлень \"поза мережею\" заповнене"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "Не вдається надіслати повідомлення: %s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "Не вдається відправити повідомлення: %s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "Не вдається надіслати повідомлення до %s: %s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "Не вдається надіслати повідомлення до %s: %s"
+
 msgid "Thinking"
 msgstr "Думаю"
 
@@ -7019,120 +7107,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Файл %s має довжину %s, що більше ніж найбільший розмір %s."
 
-msgid "Invalid error"
-msgstr "Недопустима помилка"
-
-msgid "Invalid SNAC"
-msgstr "Неправильний SNAC"
-
-msgid "Rate to host"
-msgstr "Оцінити вузол"
-
-msgid "Rate to client"
-msgstr "Оцінити клієнта"
-
-msgid "Service unavailable"
-msgstr "Служба недоступна"
-
-msgid "Service not defined"
-msgstr "Служба не визначена"
-
-msgid "Obsolete SNAC"
-msgstr "Застарілий SNAC"
-
-msgid "Not supported by host"
-msgstr "Не підтримується вузлом"
-
-msgid "Not supported by client"
-msgstr "Не підтримується клієнтом"
-
-msgid "Refused by client"
-msgstr "Відкинуто клієнтом"
-
-msgid "Reply too big"
-msgstr "Відповідь завелика"
-
-msgid "Responses lost"
-msgstr "Відповіді загублені"
-
-msgid "Request denied"
-msgstr "Запит заборонено"
-
-msgid "Busted SNAC payload"
-msgstr "Помилкове завантаження SNAC"
-
-msgid "Insufficient rights"
-msgstr "Недостатньо прав"
-
-msgid "In local permit/deny"
-msgstr "У локальному дозволено/заборонено"
-
-msgid "Warning level too high (sender)"
-msgstr "Рівень небезпеки занадто високий (відправник)"
-
-msgid "Warning level too high (receiver)"
-msgstr "Рівень небезпеки занадто високий (отримувач)"
-
-msgid "User temporarily unavailable"
-msgstr "Користувач тимчасово недоступний"
-
-msgid "No match"
-msgstr "Немає збігів"
-
-msgid "List overflow"
-msgstr "Переповнення переліку"
-
-msgid "Request ambiguous"
-msgstr "Неоднозначний запит"
-
-msgid "Queue full"
-msgstr "Черга повна"
-
-msgid "Not while on AOL"
-msgstr "Не у AOL"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "Неможливо прийняти миттєве повідомлення із-за нагляду батьків"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "Неможливо надіслати SMS без прийняття умов"
-
-msgid "Cannot send SMS"
-msgstr "Не вдається надіслати SMS"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "Не вдається надіслати SMS до цієї країни"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "Неможливо надіслати SMS до невідомої країни"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "Обліковий запис робота не може розпочати миттєве повідомлення"
-
-msgid "Bot account cannot IM this user"
-msgstr ""
-"Обліковий запис робота не може надіслати миттєве повідомлення цьому "
-"користувачу"
-
-msgid "Bot account reached IM limit"
-msgstr "Обліковий запис робота досягнув обмеження миттєвих повідомлень"
-
-msgid "Bot account reached daily IM limit"
-msgstr ""
-"Обліковий запис робота досягнув добового обмеження миттєвих повідомлень"
-
-msgid "Bot account reached monthly IM limit"
-msgstr ""
-"Обліковий запис робота досягнув місячного обмеження миттєвих повідомлень"
-
-msgid "Unable to receive offline messages"
-msgstr "Не вдалося отримати повідомлення \"поза мережею\""
-
-msgid "Offline message store full"
-msgstr "Сховище повідомлень \"поза мережею\" заповнене"
-
 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 "
@@ -7505,28 +7479,9 @@
 msgstr[2] "Ви не отримали %hu повідомлень від %s, з невідомої причини."
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "Не вдається надіслати повідомлення: %s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "Не вдається відправити повідомлення: %s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "Не вдається надіслати повідомлення до %s: %s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "Не вдається надіслати повідомлення до %s: %s"
-
-#, c-format
 msgid "User information not available: %s"
 msgstr "Відомості про користувача недоступні: %s"
 
-msgid "Unknown reason."
-msgstr "Помилка невідома."
-
 msgid "Online Since"
 msgstr "У мережі з"
 
@@ -7552,7 +7507,7 @@
 msgstr "Вас було від'єднано від кімнати балачки %s."
 
 msgid "Mobile Phone"
-msgstr "Мобільний Телефон"
+msgstr "Мобільний телефон"
 
 msgid "Personal Web Page"
 msgstr "Особиста сторінка тенет"
@@ -7566,7 +7521,7 @@
 msgstr "Поштовий індекс"
 
 msgid "Work Information"
-msgstr "Дані про роботу"
+msgstr "Відомості про роботу"
 
 msgid "Division"
 msgstr "Відділ"
@@ -7831,7 +7786,7 @@
 msgstr "Закінчити прямий сеанс миттєвих повідомлень"
 
 msgid "Direct IM"
-msgstr "Пряме з'єднання"
+msgstr "Пряме миттєве повідомлення"
 
 msgid "Re-request Authorization"
 msgstr "Повторний запит авторизації"
@@ -7952,6 +7907,88 @@
 "та є необхідним для передавання зображень. Так як ваша ІР адреса буде "
 "розкрита, це може вважатись загрозою безпеці."
 
+#, fuzzy
+msgid "Invalid SNAC"
+msgstr "Неправильний ID"
+
+#, fuzzy
+msgid "Rate to host"
+msgstr "Запросити до балачки"
+
+#, fuzzy
+msgid "Rate to client"
+msgstr "Останній відомий клієнт"
+
+#, fuzzy
+msgid "Service unavailable"
+msgstr "Служба недоступна"
+
+#, fuzzy
+msgid "Service not defined"
+msgstr "Конференція не знайдена"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+#, fuzzy
+msgid "Not supported by host"
+msgstr "Не підтримується"
+
+#, fuzzy
+msgid "Not supported by client"
+msgstr "Не підтримується"
+
+msgid "Refused by client"
+msgstr ""
+
+msgid "Reply too big"
+msgstr ""
+
+#, fuzzy
+msgid "Responses lost"
+msgstr "Можливість відповіді:"
+
+#, fuzzy
+msgid "Request denied"
+msgstr "Запитується"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr ""
+
+msgid "In local permit/deny"
+msgstr ""
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "Послуга тимчасово недоступна"
+
+#, fuzzy
+msgid "No match"
+msgstr "Немає збігів"
+
+#, fuzzy
+msgid "List overflow"
+msgstr "Перелік переповнений"
+
+#, fuzzy
+msgid "Request ambiguous"
+msgstr "Запитується"
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "Водолій"
 
@@ -8807,8 +8844,8 @@
 "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. Будь ласка, введіть якійсь, щоб налаштувати вхід."
+"Ні вузол, ні адреса IP не були налаштовані для облікового запису Meanwhile "
+"%s. Будь ласка, введіть якійсь, щоб налаштувати вхід."
 
 msgid "Meanwhile Connection Setup"
 msgstr "Встановлення з'єднання Meanwhile"
@@ -10201,8 +10238,8 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"%s (повторно) заборонив вам додати себе у ваш перелік з наступної причини: %"
-"s."
+"%s (повторно) заборонив вам додати себе у ваш перелік з наступної причини: "
+"%s."
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
@@ -12051,7 +12088,7 @@
 msgstr "Фільтр"
 
 msgid "Right click for more options."
-msgstr "Права кнопка миші для більших опцій."
+msgstr "Права кнопка миші для ще опцій."
 
 msgid "Level "
 msgstr "Рівень"
@@ -12103,7 +12140,7 @@
 msgstr "особа, що підтримує"
 
 msgid "libfaim maintainer"
-msgstr "Особа, що підтримує libfaim"
+msgstr "особа, що підтримує libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
 msgid "hacker and designated driver [lazy bum]"
@@ -12127,9 +12164,8 @@
 msgid "Arabic"
 msgstr "Арабська"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Присоромлений"
+msgstr "Асамська"
 
 msgid "Belarusian Latin"
 msgstr "Білоруська (латиниця)"
@@ -12257,9 +12293,8 @@
 msgid "Macedonian"
 msgstr "Македонська"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Малайська"
+msgstr "Малаялам"
 
 msgid "Mongolian"
 msgstr "Монгольська"
@@ -12375,13 +12410,13 @@
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s - це клієнт обміну миттєвими повідомленнями, який оснований на libpurple, "
-"що здатна з'єднуватись з багатьма послугами миттєвих повідомлень одночасно. %"
-"s написаний на C, застосовуючи GTK+. %s виданий та може змінюватися і "
-"розповсюджуватися у відповідності з ліцензією GPL версія 2 (або новіша).  "
+"що здатна з'єднуватись з багатьма послугами миттєвих повідомлень одночасно. "
+"%s написаний на C, застосовуючи GTK+. %s виданий та може змінюватися і "
+"розповсюджуватися у відповідності з ліцензією GPL версії 2 (або новіша).  "
 "Копія GPL постачається з %s.  Авторське право на %s належить його "
 "розробникам, перелік яких теж постачається з %s. Будь-які гарантії на %s не "
 "надаються.<BR><BR>"
@@ -12923,15 +12958,15 @@
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"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?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr ""
 "Чи дійсно хочете назавжди видалити системний журнал, що розпочатий о %s?"
 
@@ -13389,7 +13424,7 @@
 msgstr "_Сповіщати користувачів, що ви їм пишете"
 
 msgid "Highlight _misspelled words"
-msgstr "Підсвітити _слова з орфографічними помилками"
+msgstr "Підсвітити _слова з помилками правопису"
 
 msgid "Use smooth-scrolling"
 msgstr "Використати плавне прокручування"
@@ -15187,308 +15222,151 @@
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr "Надіслати та отримати сирі строфи XMPP."
+msgstr "Надіслати та отримати сирі рядки XMPP."
 
 #. *  description
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Додаток корисний для зневадження серверів або клієнтів XMPP."
 
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
 msgstr ""
-
+"$(^Name) випущений під ліцензією GNU General Public License (GPL). Ліцензія "
+"подана тут тільки з метою ознайомлення. $_CLICK"
+
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
-msgstr ""
+msgstr "Багатоплатформена графічна бібліотека, що використовується Pidgin"
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
 msgstr ""
-
+"Запущений екземпляр Pidgin. Будь ласка, вийдіть з Pidgin та спробуйте знову."
+
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
-msgstr ""
-
+msgstr "Основні файли Pidgin та dll"
+
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr ""
-
+msgstr "Створити запис у меню \"Пуск\" для Pidgin"
+
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr ""
-
+msgstr "Створити значок Pidgin на стільниці"
+
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
-#, fuzzy
+msgstr "Debug Symbols (для звітування вад)"
+
+#. Installer Subsection Text
 msgid "Desktop"
-msgstr "Типовий стільниці"
-
+msgstr "Стільниця"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Помилка звантаження the GTK+ Runtime ($R2).$\\rЦе необхідно для роботи "
+"Pidgin; якщо спроби будуть марними, можливо, необхідно буде скористатися "
+"встановлювачем \"Offline Installer\" з http://pidgin.im/download/windows/ ."
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"Помилка встановлення Debug Symbols ($R2).$\\rЯкщо спроби будуть марними, "
+"можливо, потрібний буде встановлювач 'Offline Installer' з http://pidgin.im/"
+"download/windows/ ."
+
+#. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
-msgstr ""
-
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"Помилка встановлення перевірки правопису ($R3).$\\rЯкщо спроби будуть "
+"марними, дивіться довідку по ручному встановленню на http://developer.pidgin."
+"im/wiki/Installing%20Pidgin#manual_win32_spellcheck_installation"
+
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
-msgstr ""
-
-#, fuzzy
+msgstr "Бібліотека GTK+ (необхідна, якщо не вcтановлена)"
+
+#. Installer Subsection Text
 msgid "Localizations"
-msgstr "Розташування"
-
-#. License Page
+msgstr "Локалізації"
+
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
-msgstr ""
-
-#. Components Page
-#, fuzzy
+msgstr "Наступне >"
+
+#. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
-msgstr "Клієнт обміну миттєвими повідомленнями Pidgin"
-
-#. GTK+ Section Prompts
+msgstr "Клієнт обміну миттєвими повідомленнями Pidgin (необхідно)"
+
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
-
-#, fuzzy
+"Pidgin потребує сумісну бібліотеку GTK+ (яка, схоже, ще не встановлена).$"
+"\\rВИ впевнені, що хочете пропустити встановлення бібліотеки GTK+?"
+
+#. Installer Subsection Text
 msgid "Shortcuts"
-msgstr "Комбінація клавіші"
-
+msgstr "Комбінації клавіш"
+
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr ""
-
-#. Spellcheck Section Prompts
+msgstr "Значки для запуску Pidgin"
+
+#. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
-
-#, fuzzy
+msgstr "Підтримка перевірки правопису"
+
+#. Installer Subsection Text
 msgid "Start Menu"
-msgstr "Завантаження"
-
+msgstr "Меню \"Пуск\""
+
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
-
-#, fuzzy
+"Підтримка перевірки правопису. (Необхідне з'єднання з Інтернетом для "
+"встановлення)"
+
 msgid "The installer is already running."
-msgstr "Прізвисько \"%s\" вже існує."
-
-#. Uninstall Section Prompts
+msgstr "Встановлювач вже запущений."
+
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
-
-#. URL Handler section
-#, fuzzy
+"Видаляч не може знайти записів для Pidgin у реєстрі.$\\rСхоже, що цю "
+"програму встановив інший користувач."
+
+#. Installer Subsection Text
 msgid "URI Handlers"
-msgstr "Обробник URL посилань myim"
-
-#. Pidgin Section Prompts and Texts
+msgstr "Обробники посилань URI"
+
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
 msgstr ""
-
-#. Installer Finish Page
+"Неможливо видалити версію Pidgin, що зараз встановлена. Нова версія буде "
+"встановлена без видалення поточної."
+
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
-msgstr ""
+msgstr "Відвідати сторінку тенет Pidgin"
 
 msgid "You do not have permission to uninstall this application."
-msgstr ""
-
-#~ msgid "Current Mood"
-#~ msgstr "Поточний настрій"
-
-#~ msgid "New Mood"
-#~ msgstr "Новий настрій"
-
-#~ msgid "Change your Mood"
-#~ msgstr "Змінити ваш настрій"
-
-#~ msgid "How do you feel right now?"
-#~ msgstr "Як ви зараз себе почуваєте?"
-
-#~ msgid "Change Mood..."
-#~ msgstr "Змінити настрій..."
-
-#~ msgid "Orientation"
-#~ msgstr "Орієнтація"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "Орієнтація лотка."
-
-#~ msgid "Artist"
-#~ msgstr "Виконавець"
-
-#~ msgid "Album"
-#~ msgstr "Альбом"
-
-#~ msgid "Yahoo Chat server"
-#~ msgstr "Сервер Yahoo Chat"
-
-#~ msgid "Yahoo Chat port"
-#~ msgstr "Порт Yahoo Chat"
-
-#~ msgid "Pager server"
-#~ msgstr "Сервер пейджера"
-
-#~ msgid "Friendly name changes too rapidly"
-#~ msgstr "Дружнє ім'я змінюється занадто швидко"
-
-#~ msgid "This Hotmail account may not be active."
-#~ msgstr "Обліковий запис Hotmail може бути неактивним."
-
-#~ msgid "Profile URL"
-#~ msgstr "URL профілю"
-
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "Додаток протоколу MSN"
-
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s не є правильною назвою групи."
-
-#~ msgid "Unknown error."
-#~ msgstr "Невідома помилка."
-
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%s на %s (%s)"
-
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "Не вдається додати користувача %s (%s)"
-
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "Не вдається заблокувати користувача %s (%s)"
-
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "Не вдається дозволити користувача %s (%s)"
-
-#~ msgid "%s could not be added because your buddy list is full."
-#~ msgstr "Не вдається додати %s, тому що перелік контактів повний."
-
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s не є допустимим паспортним обліковим записом."
-
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "Сервіс тимчасово недоступний."
-
-#~ msgid "Unable to rename group"
-#~ msgstr "Не вдається змінити назву групи"
-
-#~ msgid "Unable to delete group"
-#~ msgstr "Не вдається видалити групу"
-
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s додав вас до своєї адресної книги."
-
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s вилучив вас зі своєї адресної книги."
-
-#~ msgid "Please select your mood from the list."
-#~ msgstr "Будь ласка, виберіть ваш настрій з переліку."
-
-#~ msgid "Set Mood..."
-#~ msgstr "Встановити настрій..."
-
-#~ msgid "In_love"
-#~ msgstr "Закоханий"
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "Не вдалося зв'язати сокет з портом: %s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "Не вдалося слухати сокет: %s"
-
-#~ msgid "Error creating conference."
-#~ msgstr "Помилка створенні конференції."
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s щойно підштовхнув вас!"
-
-#~ 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\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
-#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
-
-#~ 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>"
-
-#~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-#~ msgstr ""
-#~ "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-
-#~ msgid "Debugging Information"
-#~ msgstr "Відомості зневадження"
-
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Невідомий тип файлу\n"
-#~ "\n"
-#~ "Вважається, що PNG."
-
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Помилка збереження зображення\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Не вдається відкрити файл '%s': %s"
-
-#~ msgid ""
-#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
-#~ msgstr ""
-#~ "Помилка завантаження зображення '%s': причина невідома, можливо, "
-#~ "пошкоджений файл зображення"
-
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "Вставити строфу <iq/>."
-
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "Вставити строфу <presence/>."
-
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "Вставити строфу <message/>."
-
-#~ msgid ""
-#~ "The last action you attempted could not be performed because you are over "
-#~ "the rate limit. Please wait 10 seconds and try again.\n"
-#~ msgstr ""
-#~ "Остання дія, яку ви намагалися зробити, не могла бути виконана, тому що "
-#~ "ви перевищили поріг. Будь ласка, зачекайте 10 секунд та спробуйте знову.\n"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid ""
-#~ "Unable to find alternative XMPP connection methods after failing to "
-#~ "connect directly."
-#~ msgstr ""
-#~ "Не вдалося знайти додатковий спосіб з'єднання XMPP після невдачі з'єдання "
-#~ "безпосередньо."
-
-#~ msgid "CAPTCHA requested. Logging into the AIM/ICQ website may fix this."
-#~ msgstr "Запитана CAPTCHA. Вхід на сторінку тенет AIM/ICQ може виправити це."
+msgstr "Ви не маєте права на видалення цієї програми."
--- a/po/zh_HK.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/zh_HK.po	Mon May 31 02:29:34 2010 +0900
@@ -8,7 +8,7 @@
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.631 2010/05/10 05:49:24 acli Exp $
+# $InternalId: zh_TW.po,v 1.637 2010/05/28 19:17:20 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -60,12 +60,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.7.0\n"
+"Project-Id-Version: Pidgin 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 23:18-0400\n"
-"PO-Revision-Date: 2010-05-03 03:02-0400\n"
-"Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
+"POT-Creation-Date: 2010-05-29 20:59-0400\n"
+"PO-Revision-Date: 2010-05-29 02:50+0800\n"
+"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
+"Language: zh_HK\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1431,6 +1432,7 @@
 msgstr "狀態清單"
 
 # FIXME 原文一詞兩義,根本無法翻譯
+#. title
 msgid "Title"
 msgstr "職銜"
 
@@ -2002,7 +2004,6 @@
 msgid "Thread creation failure: %s"
 msgstr "無法建立執行緒:%s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "原因不明"
 
@@ -3280,6 +3281,9 @@
 msgstr "帳號"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "名"
 
@@ -4030,6 +4034,7 @@
 msgid "Postal Code"
 msgstr "郵遞編號"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "國家"
 
@@ -4044,8 +4049,6 @@
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "職銜"
 
@@ -4053,6 +4056,7 @@
 msgstr "職責"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "生日"
 
@@ -5633,7 +5637,7 @@
 msgstr "沒有羣組的好友"
 
 # XXX 暫譯,有待改進 - 20090226 acli
-# XXX 這可能是MSN的「基本資料連絡人」? 
+# XXX 這可能是MSN的「基本資料連絡人」?
 # XXX「Buddy」和「Contact」在中文版Pidgin無法析別;可能有改進的空間
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
@@ -5999,6 +6003,9 @@
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
+msgid "Allow direct connections"
+msgstr "允許直接連線"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:呼叫使用者,引起他們的注意"
 
@@ -6221,7 +6228,11 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "未能讀取你的個人資料,請稍後重試。"
 
+msgid "Your MXitId"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "密碼"
 
@@ -6298,7 +6309,7 @@
 msgstr "MXit 帳號"
 
 # NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "網名"
 
@@ -6343,7 +6354,7 @@
 msgid "Security Code"
 msgstr "保安碼"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "輸入保安碼"
 
@@ -6369,7 +6380,11 @@
 msgid "Status Message"
 msgstr "狀態訊息"
 
+msgid "Rejection Message"
+msgstr "拒絕訊息"
+
 # NOTE 這是「是否隱藏電話號碼?」之意 - acli 20091127
+#. hidden number
 msgid "Hidden Number"
 msgstr "隱藏電話號碼"
 
@@ -6387,6 +6402,22 @@
 msgid "Enable splash-screen popup"
 msgstr "啟用啟動畫面彈出視窗"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "你已被踢出:(%s)"
+
+#  FIXME「ticket」暫無譯文,也許可譯「通行證」或「許可證」?
+#  NOTE MSN 錯誤代號 928
+#  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
+#, fuzzy
+msgid "was kicked"
+msgstr "無效的 ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "聊天室(_R):"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "與 MXit 的連線已中斷,請重新連線。"
@@ -7173,6 +7204,64 @@
 msgid "Invalid chat room name"
 msgstr "聊天室名稱無效"
 
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
+msgid "Invalid error"
+msgstr "無效錯誤"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "被家長監控限制,無法接收即時訊息"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "未同意使用條款前無法送出短訊"
+
+msgid "Cannot send SMS"
+msgstr "無法送出短訊"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "無法送出短訊至指定的國家"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "無法送出短訊至不明的國家"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "機械人帳號無法啟動即時通訊"
+
+msgid "Bot account cannot IM this user"
+msgstr "機械人帳號無法向這個使用者送出即時通訊"
+
+msgid "Bot account reached IM limit"
+msgstr "機械人帳號進行即時通訊的次數已達到了上限"
+
+msgid "Bot account reached daily IM limit"
+msgstr "機械人帳號進行即時通訊的次數已達到了每日的上限"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "機械人帳號進行即時通訊的次數已達到了每月的上限"
+
+msgid "Unable to receive offline messages"
+msgstr "無法接收離線訊息"
+
+msgid "Offline message store full"
+msgstr "離線訊息庫已滿"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "無法送出訊息:%s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "無法送出訊息:%s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "無法送出訊息至 %s:%s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "無法送出訊息至 %s:%s"
+
 # XXX 這是什麼? - acli 20100510
 msgid "Thinking"
 msgstr "思想中"
@@ -7329,121 +7418,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "檔案「%s」大小為 %s,超過了 %s 這個上限。"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-msgid "Invalid error"
-msgstr "無效錯誤"
-
-msgid "Invalid SNAC"
-msgstr "無效的 SNAC"
-
-msgid "Rate to host"
-msgstr "到伺服器速率"
-
-msgid "Rate to client"
-msgstr "到用戶端速率"
-
-#  XXX 可能是誤譯
-msgid "Service unavailable"
-msgstr "伺服器不存在"
-
-msgid "Service not defined"
-msgstr "沒有指定服務"
-
-msgid "Obsolete SNAC"
-msgstr "過時的 SNAC"
-
-msgid "Not supported by host"
-msgstr "伺服器不支援"
-
-msgid "Not supported by client"
-msgstr "用戶端不支援"
-
-msgid "Refused by client"
-msgstr "被用戶端拒絕"
-
-msgid "Reply too big"
-msgstr "回覆太大了"
-
-msgid "Responses lost"
-msgstr "遺失回應"
-
-msgid "Request denied"
-msgstr "要求被拒"
-
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
-# NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-msgid "Busted SNAC payload"
-msgstr "SNAC負載過大"
-
-msgid "Insufficient rights"
-msgstr "權限不夠"
-
-# NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
-msgid "In local permit/deny"
-msgstr "本地端的允許/拒絕清單"
-
-msgid "Warning level too high (sender)"
-msgstr "(發訊者)警告等級過高"
-
-msgid "Warning level too high (receiver)"
-msgstr "(收訊者)警告等級過高"
-
-msgid "User temporarily unavailable"
-msgstr "使用者暫時不在"
-
-msgid "No match"
-msgstr "沒有相符合的"
-
-msgid "List overflow"
-msgstr "清單溢出"
-
-msgid "Request ambiguous"
-msgstr "要求不明確"
-
-msgid "Queue full"
-msgstr "佇列滿了"
-
-msgid "Not while on AOL"
-msgstr "在 AOL 時不允許"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "被家長監控限制,無法接收即時訊息"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "未同意使用條款前無法送出短訊"
-
-msgid "Cannot send SMS"
-msgstr "無法送出短訊"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "無法送出短訊至指定的國家"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "無法送出短訊至不明的國家"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "機械人帳號無法啟動即時通訊"
-
-msgid "Bot account cannot IM this user"
-msgstr "機械人帳號無法向這個使用者送出即時通訊"
-
-msgid "Bot account reached IM limit"
-msgstr "機械人帳號進行即時通訊的次數已達到了上限"
-
-msgid "Bot account reached daily IM limit"
-msgstr "機械人帳號進行即時通訊的次數已達到了每日的上限"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "機械人帳號進行即時通訊的次數已達到了每月的上限"
-
-msgid "Unable to receive offline messages"
-msgstr "無法接收離線訊息"
-
-msgid "Offline message store full"
-msgstr "離線訊息庫已滿"
-
 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 "
@@ -7803,28 +7777,9 @@
 msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "無法送出訊息:%s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "無法送出訊息:%s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "無法送出訊息至 %s:%s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "無法送出訊息至 %s:%s"
-
-#, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資料:%s"
 
-msgid "Unknown reason."
-msgstr "原因不明。"
-
 msgid "Online Since"
 msgstr "上線自"
 
@@ -8235,6 +8190,93 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息圖像時所必須的。"
 "這樣將會曝露你的 IP 位址,因此可能會有私隱方面的風險。"
 
+msgid "Invalid SNAC"
+msgstr "無效的 SNAC"
+
+msgid "Rate to host"
+msgstr "到伺服器速率"
+
+msgid "Rate to client"
+msgstr "到用戶端速率"
+
+#  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE 譯文更動 by Ambrose
+#, fuzzy
+msgid "Service unavailable"
+msgstr "不提供該項服務"
+
+#, fuzzy
+msgid "Service not defined"
+msgstr "找不到該會議"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+#  XXX 這個太奇怪了 (^^;)
+#, fuzzy
+msgid "Not supported by host"
+msgstr "不支援"
+
+#  XXX 這個太奇怪了 (^^;)
+#, fuzzy
+msgid "Not supported by client"
+msgstr "不支援"
+
+#, fuzzy
+msgid "Refused by client"
+msgstr "到用戶端速率"
+
+msgid "Reply too big"
+msgstr ""
+
+#, fuzzy
+msgid "Responses lost"
+msgstr "「回答」或然率:"
+
+#, fuzzy
+msgid "Request denied"
+msgstr "請求中"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr ""
+
+msgid "In local permit/deny"
+msgstr ""
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "暫時無法使用服務"
+
+#, fuzzy
+msgid "No match"
+msgstr "沒有相符合的"
+
+#, fuzzy
+msgid "List overflow"
+msgstr "好友清單已滿"
+
+#, fuzzy
+msgid "Request ambiguous"
+msgstr "請求中"
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "水秤座"
 
@@ -10546,8 +10588,8 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"使用者 %s 因為下列原因,剛剛拒絕了你先前將他(她)新增至你的好友清單的要求:%"
-"s"
+"使用者 %s 因為下列原因,剛剛拒絕了你先前將他(她)新增至你的好友清單的要求:"
+"%s"
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
@@ -12520,10 +12562,9 @@
 msgid "Arabic"
 msgstr "阿拉伯文"
 
-# NOTE XMPP 情緒值,譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
-#, fuzzy
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=Assamese&qrytype=en&x=31&y=9
 msgid "Assamese"
-msgstr "慚愧"
+msgstr "阿薩姆語"
 
 #  NOTE「Latin」係指譯文以「拉丁字母」(而非西里爾字母)書寫,中譯可以省略 - acli 20070918
 msgid "Belarusian Latin"
@@ -12674,9 +12715,9 @@
 msgid "Macedonian"
 msgstr "馬其頓文"
 
-#, fuzzy
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=malayalam&qrytype=en&x=26&y=11
 msgid "Malayalam"
-msgstr "馬來文"
+msgstr "馬拉亞拉姆語"
 
 msgid "Mongolian"
 msgstr "蒙古文"
@@ -12816,8 +12857,8 @@
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s 是一個以 C、GTK+ 和 libpurple 為基礎的 GUI 訊息程式,提供同時連線至多種訊"
 "息服務的功能。%s 以 GPL(第二版或較新版本)發放,倘若你希望修改或發佈 %s,只"
@@ -13384,14 +13425,14 @@
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "你確定你要刪除由%2$s開始記錄,在聊天室「%1$s」交談的日誌?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "你確定你要刪除由%s開始記錄的系統日誌?"
 
 msgid "Delete Log?"
@@ -13481,9 +13522,10 @@
 "%swiki/GetABacktrace\n"
 msgstr ""
 
+# XXX 要覆查譯文 - acli 20100527
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "因為已有其他 libpurple 用戶端正在執行,本程式現在結束。\n"
 
 # XXX 媒體? - acli 20090730
 msgid "/_Media"
@@ -15696,124 +15738,151 @@
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+# XXX 要覆查譯文 - acli 20100527
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
 msgstr ""
-
+"$(^Name) 以 GNU General Public License (GPL) 條款發佈。本安裝程式提供一份 "
+"GPL,只為方便參考。$_CLICK"
+
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
-msgstr ""
+msgstr "Pidgin 使用的一個跨平台 GUI 組件"
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
-msgstr ""
-
+msgstr "Pidgin 正在執行,請結束 Pidgin 後重試。"
+
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
-msgstr ""
-
+msgstr "Pidgin 核心檔案及 DLL"
+
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr ""
-
+msgstr "為 Pidgin 在開始選單建立捷徑"
+
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr ""
-
+msgstr "為 Pidgin 在桌面上建立捷徑"
+
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
-#, fuzzy
+msgstr "除錯符號(匯報當機專用)"
+
+#. Installer Subsection Text
 msgid "Desktop"
-msgstr "桌面預設值"
-
+msgstr "桌面"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"下載 GTK+ 執行環境 ($R2) 時發生錯誤。$\\r這是 Pidgin 運作的必須組件,如果重試"
+"失敗,你可能要使用離線安裝檔的方式安裝(可在 http://pidgin.im/download/"
+"windows/ 下載)。"
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"下載除錯符號 ($R2) 途中發生錯誤。$\\r如果重試失敗,你可能要使用離線安裝檔的方"
+"式安裝(可在 http://pidgin.im/download/windows/ 下載)。"
+
+#. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
-msgstr ""
-
-#, fuzzy
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"下載拼字檢查功能 ($R3) 途中發生錯誤。$\\r如果重試失敗,可按照 http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation 內的指示進行手動安裝。"
+
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
-msgstr "GTK+ Runtime 版本"
-
-#, fuzzy
+msgstr "GTK+ 執行環境(如未安裝則必須安裝)"
+
+#. Installer Subsection Text
 msgid "Localizations"
-msgstr "所在位置"
-
-#. License Page
+msgstr "本地化支援"
+
+# XXX 要覆查譯文 - acli 20100527
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
-msgstr ""
-
-#. Components Page
-#, fuzzy
+msgstr "下一頁 >"
+
+#. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
-msgstr "Pidgin 網絡即時通"
-
-#. GTK+ Section Prompts
+msgstr "Pidgin 網絡即時通(必須安裝)"
+
+# XXX 要覆查譯文 - acli 20100527
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
-
-#, fuzzy
+"Pidgin 需要兼容的 GTK+ 執行環境才能運作,但系統內似乎還沒有安裝兼容的 GTK+ 執"
+"行環境。$\\r你確定不要安裝 GTK+ 執行環境?"
+
+#. Installer Subsection Text
 msgid "Shortcuts"
 msgstr "捷徑"
 
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr ""
-
-#. Spellcheck Section Prompts
+msgstr "啟動 Pidgin 的捷徑"
+
+#. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
-
-#, fuzzy
+msgstr "拼字檢查功能支援"
+
+#. Installer Subsection Text
 msgid "Start Menu"
-msgstr "啟動"
-
+msgstr "開始選單"
+
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
-msgstr ""
-
-#, fuzzy
+msgstr "拼字檢查功能支援(需連線至互聯網才能安裝)"
+
 msgid "The installer is already running."
-msgstr "網名「%s」已在使用中。"
-
-#. Uninstall Section Prompts
+msgstr "安裝程式已在執行中。"
+
+# XXX 要覆查譯文 - acli 20100527
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
+"解除安裝程式無法找到 Pidgin 的登錄機碼。$\\r安裝 Pidgin 的很可能是另一個使用"
+"者。"
 
 #  NOTE 這似乎是視窗標題
-#. URL Handler section
-#, fuzzy
+#. Installer Subsection Text
 msgid "URI Handlers"
-msgstr "myim 網址處理器"
-
-#. Pidgin Section Prompts and Texts
+msgstr "網址處理器"
+
+# XXX 要覆查譯文 - acli 20100527
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
-msgstr ""
-
-#. Installer Finish Page
+msgstr "無法移除目前的 Pidgin 版本,新版本會在不移除舊版本的情況下被安裝。"
+
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
-msgstr ""
+msgstr "瀏覽 Pidgin 官方網站"
 
 msgid "You do not have permission to uninstall this application."
-msgstr ""
+msgstr "你沒有權限移除程式。"
 
 #~ msgid "Current Mood"
 #~ msgstr "目前的心情"
@@ -15825,976 +15894,7 @@
 #~ msgstr "修改心情"
 
 #~ msgid "How do you feel right now?"
-#~ msgstr "你現在覺得怎樣?"
+#~ msgstr "您現在覺得怎樣?"
 
 #~ msgid "Change Mood..."
 #~ msgstr "修改心情..."
-
-# FIXME 譯文有待改進 - acli 20090731
-#~ msgid "Error creating conference."
-#~ msgstr "建立會議失敗。"
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "無法連結 Socket 到通訊埠:%s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "無法監聽 Socket:%s"
-
-#~ msgid "Artist"
-#~ msgstr "樂手名稱"
-
-#~ msgid "Album"
-#~ msgstr "專輯名稱"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s 在呼叫您!"
-
-#~ msgid "Friendly name changes too rapidly"
-#~ msgstr "暱稱的變更過於急速"
-
-#~ msgid "This Hotmail account may not be active."
-#~ msgstr "這個Hotmail帳號可能尚未被啟動。"
-
-#~ msgid "Profile URL"
-#~ msgstr "個人資料網址"
-
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN 協定模組"
-
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s 不是一個有效的群組。"
-
-#~ msgid "Unknown error."
-#~ msgstr "未知錯誤。"
-
-# NOTE: 第二個 %s 為使用者名稱,第三個 %s 為通訊協定名稱
-# NOTE: 第一個 %s 似乎係錯誤訊息摘要(整個字串為視窗標題)
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%2$s (%3$s):%1$s"
-
-#  TODO 請覆查,譯文有待改進
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "%s (%s) 新增使用者失敗"
-
-#  TODO 請覆查,譯文有待改進
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "%s (%s) 拒絕使用者失敗"
-
-#  TODO 請覆查,譯文有待改進
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "%s (%s) 允許使用者失敗"
-
-#~ msgid "%s could not be added because your buddy list is full."
-#~ msgstr "因為好友清單已滿,以致無法新增 %s"
-
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s 不是一個有效的護照帳號"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "暫時無法提供服務"
-
-#~ msgid "Unable to rename group"
-#~ msgstr "無法更改群組名稱"
-
-#~ msgid "Unable to delete group"
-#~ msgstr "無法移除群組"
-
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s 將您加入他(她)的好友清單。"
-
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s 將您從他(她)的好友清單中移除。"
-
-#~ msgid "Pager server"
-#~ msgstr "傳呼伺服器"
-
-#~ msgid "Yahoo Chat server"
-#~ msgstr "Yahoo 聊天伺服器"
-
-#~ msgid "Yahoo Chat port"
-#~ msgstr "Yahoo 聊天室通訊埠"
-
-#~ msgid "Orientation"
-#~ msgstr "方向"
-
-#  NOTE: stolen from eggcups' zh_TW.po
-#~ msgid "The orientation of the tray."
-#~ msgstr "系統匣方向"
-
-#~ 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/>"
-
-#~ msgid ""
-#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-#~ msgstr ""
-#~ "<FONT SIZE=\"4\">IRC 頻道:</FONT>irc.freenode.net 上的 #pidgin 頻道"
-#~ "<BR><BR>"
-
-#~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-#~ msgstr ""
-#~ "<FONT SIZE=\"4\">XMPP 聊天室:</FONT>devel@conference.pidgin.im<BR><BR>"
-
-# NOTE 這是「關於 Pidgin」視窗中,最後出現,用來作除錯用的各種資訊,不能譯成「訊息」
-#~ msgid "Debugging Information"
-#~ msgstr "除錯專用資訊"
-
-# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "檔案類型不明\n"
-#~ "\n"
-#~ "暫且當成 PNG 檔處理。"
-
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "儲存影像錯誤\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "無法開啟檔案「%s」:%s"
-
-#~ msgid ""
-#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
-#~ msgstr "無法載入影像「%s」,原因不明,大概是影像檔已損壞"
-
-#  NOTE Jabber 的「stanza」譯「段落」,下同
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "插入 <iq/> 段落。"
-
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "插入 <presence/> 段落。"
-
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "插入 <message/> 段落。"
-
-#~ msgid ""
-#~ "Unable to find alternative XMPP connection methods after failing to "
-#~ "connect directly."
-#~ msgstr "無法直接連線,但無法找到其他的 XMPP 連線方法。"
-
-#~ msgid ""
-#~ "The last action you attempted could not be performed because you are over "
-#~ "the rate limit. Please wait 10 seconds and try again.\n"
-#~ msgstr ""
-#~ "您最近做的一個動作無法完成,因為您已經達到這個動作的速率的上限。請等待十秒"
-#~ "後再試一次。\n"
-
-#~ msgid ""
-#~ "The root certificate this one claims to be issued by is unknown to Pidgin."
-#~ msgstr "這張憑證聲稱由一所 Pidgin 不認識的根憑證機構簽發。"
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "透過多種通訊協定發送即時訊息"
-
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "如果不指定帳號,將只會啟動第一個帳號)"
-
-#  NOTE 直譯「安裝主題」好像很無棱兩可,加個「檔」字好像較好
-#~ msgid "Install Theme"
-#~ msgstr "安裝主題檔"
-
-#~ msgid "Icon"
-#~ msgstr "圖示"
-
-#  XXX 要覆查 - acli 20070614
-#~ msgid "Use document font from _theme"
-#~ msgstr "使用主題指定的文件字型(_T)"
-
-#~ msgid "_Start port:"
-#~ msgstr "啟始通訊埠(_S):"
-
-#~ msgid "_End port:"
-#~ msgstr "結束通訊埠(_E):"
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "代理伺服器及瀏覽器"
-
-#~ msgid "_User:"
-#~ msgstr "使用者(_U):"
-
-#~ msgid "Auto-away"
-#~ msgstr "自動離開"
-
-#~ msgid "Change _status to:"
-#~ msgstr "更改狀態為(_S):"
-
-#~ msgid "Calling ... "
-#~ msgstr "撥打中..."
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "無效的憑證鏈"
-
-#~ msgid ""
-#~ "The certificate chain presented by %s does not have a valid digital "
-#~ "signature from the Certificate Authority from which it claims to have a "
-#~ "signature."
-#~ msgstr ""
-#~ "「%s」出示的憑證鍊聲稱它是由某憑證機構簽發,但實際上卻沒有該憑證機構的有效"
-#~ "簽章。"
-
-#~ msgid "Invalid certificate authority signature"
-#~ msgstr "憑證機構的簽章是無效的"
-
-#  XXX 不通順
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "設定如何隱藏「加入/離開聊天室」的訊息"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "聊天室大小下限"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "閒置時間下限(分鐘)"
-
-#~ msgid "Failed to open the file"
-#~ msgstr "無法開啟檔案"
-
-# NOTE「封鎖」好像比「暫時關閉」通順? - acli 20090730
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "您的帳戶目前已被封鎖。請您登入 Yahoo! 網站。"
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "巴斯克文"
-
-#~ msgid ""
-#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
-#~ "im\">support@pidgin.im</A><BR/><BR/>"
-#~ msgstr ""
-#~ "<FONT SIZE=\"4\">電郵支援:</FONT> <A HREF=\"mailto:support@pidgin.im"
-#~ "\">support@pidgin.im</A><BR/><BR/>"
-
-#  FIXME
-#  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#~ msgid ""
-#~ "%s %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -f, --force-online  force online, regardless of network status\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ "  -m, --multiple      do not ensure single instance\n"
-#~ "  -n, --nologin       don't automatically login\n"
-#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
-#~ "NAME\n"
-#~ "                      specifies account(s) to use, separated by commas.\n"
-#~ "                      Without this only the first account will be "
-#~ "enabled).\n"
-#~ "  --display=DISPLAY   X display to use\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ msgstr ""
-#~ "%s %s\n"
-#~ "使用方法: %s [選項]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    設定檔所在目錄\n"
-#~ "  -d, --debug         在標準輸出中顯示除錯訊息\n"
-#~ "  -f, --force-online  忽略網路實際狀態,強制將狀態設為上線\n"
-#~ "  -h, --help          顯示輔助訊息並離開\n"
-#~ "  -m, --multiple      允許同時執行多個Pidgin進程\n"
-#~ "  -n, --nologin       不自動登入\n"
-#~ "  -l, --login[=NAME]  啟動指定的帳號 (透過 NAME 參數來指定啟動的\n"
-#~ "                      帳號,並使用逗號分隔) \n"
-#~ "  --display=DISPLAY   使用指定的 X display\n"
-#~ "  -v, --version       顯示版本訊息並離開\n"
-
-#  FIXME
-#  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#~ msgid ""
-#~ "%s %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -f, --force-online  force online, regardless of network status\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ "  -m, --multiple      do not ensure single instance\n"
-#~ "  -n, --nologin       don't automatically login\n"
-#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
-#~ "NAME\n"
-#~ "                      specifies account(s) to use, separated by commas.\n"
-#~ "                      Without this only the first account will be "
-#~ "enabled).\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ msgstr ""
-#~ "%s %s\n"
-#~ "使用方法: %s [選項]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    設定檔所在目錄\n"
-#~ "  -d, --debug         在標準輸出中顯示除錯訊息\n"
-#~ "  -f, --force-online  忽略網路實際狀態,強制將狀態設為上線\n"
-#~ "  -h, --help          顯示輔助訊息並離開\n"
-#~ "  -m, --multiple      允許同時執行多個Pidgin進程\n"
-#~ "  -n, --nologin       不自動登入\n"
-#~ "  -l, --login[=NAME]  啟動指定的帳號(NAME為希望啟動的帳號,如多過一個帳號"
-#~ "則\n"
-#~ "                      以逗號分隔,如不指定帳號則只會啟動第一個帳號)\n"
-#~ "  -v, --version       顯示版本訊息並離開\n"
-
-#~ msgid "_Resume"
-#~ msgstr "恢復(_R)"
-
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "無法讀取 SILC 密鑰對"
-
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "邀請被婉拒了"
-
-#~ msgid "Invite message"
-#~ msgstr "邀請訊息"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr "請輸入您想邀請的使用者名稱,以及選擇性填寫邀請的訊息。"
-
-#~ msgid "Cannot open socket"
-#~ msgstr "無法開啟Socket"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "無法監聽 Socket"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "無法讀取 Socket"
-
-#~ msgid "Connection failed."
-#~ msgstr "連線失敗。"
-
-#~ msgid "Server has disconnected"
-#~ msgstr "伺服器已停止連線"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "無法建立 Socket"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "無法連到伺服器"
-
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#~ msgid "Read error"
-#~ msgstr "讀取錯誤"
-
-# NOTE 這是功能名稱(直譯)
-#~ msgid "Last Activity"
-#~ msgstr "最近活動"
-
-#  FIXME acli 2070914
-#~ msgid "Service Discovery Items"
-#~ msgstr "服務探尋項目"
-
-# NOTE 這是功能名稱(直譯)
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "延伸段落定址"
-
-# NOTE 這是功能名稱
-#~ msgid "Multi-User Chat"
-#~ msgstr "多用戶聊天"
-
-# NOTE 這是功能名稱(直譯)
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "多用戶聊天延伸上線狀態資訊"
-
-# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "帶內位元組串流"
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "臨時指令"
-
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "SOCKS5 位元組串流"
-
-#~ msgid "Out of Band Data"
-#~ msgstr "帶外數據"
-
-#  NOTE Untranslated
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#~ msgid "In-Band Registration"
-#~ msgstr "帶內註冊"
-
-#~ msgid "User Location"
-#~ msgstr "使用者所在位置"
-
-#~ msgid "User Avatar"
-#~ msgstr "使用者化身"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "聊天狀態通知"
-
-# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#~ msgid "Software Version"
-#~ msgstr "軟體版本"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "開始串流"
-
-# XXX may be wrong
-#~ msgid "User Activity"
-#~ msgstr "使用者活動狀態"
-
-#  NOTE 直譯:個體能力
-#  FIXME 譯文有待改進 - acli 20070918
-#~ msgid "Entity Capabilities"
-#~ msgstr "個體能力"
-
-#  FIXME 這聽來不對 - acli 20070913
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "加密工作階段協商"
-
-#~ msgid "User Tune"
-#~ msgstr "使用者樂曲"
-
-#  NOTE「Roster」指「名冊」,但Open Source software似乎一般譯「好友清單」、「成員列表」等
-#  FIXME 譯文有待改進 - acli 20070918
-#~ msgid "Roster Item Exchange"
-#~ msgstr "好友清單項目交換"
-
-#  NOTE 參見 http://jabber.org/protocol/reach
-#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」(例如電話號碼)
-#  NOTE 直譯:可抵達性位址
-#  XXX 是否譯「其他通訊方法」較好?但要先看上下文 - acli 20070918
-#~ msgid "Reachability Address"
-#~ msgstr "可抵達性位址"
-
-#~ msgid "Jingle"
-#~ msgstr "Jingle"
-
-#~ msgid "Jingle Audio"
-#~ msgstr "Jingle 音訊"
-
-#~ msgid "User Nickname"
-#~ msgstr "使用者暱稱"
-
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "Jingle ICE UDP"
-
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "Jingle ICE TCP"
-
-#~ msgid "Jingle Video"
-#~ msgstr "Jingle 視訊"
-
-#~ msgid "Jingle DTMF"
-#~ msgstr "Jingle DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "收到的訊息"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "發佈公鑰"
-
-# NOTE Jabber 新功能規格
-#~ msgid "User Browsing"
-#~ msgstr "使用者瀏覽"
-
-#~ msgid "Stanza Encryption"
-#~ msgstr "段落加密"
-
-#  XXX 暫譯- acli 20070913
-#~ msgid "Delayed Delivery"
-#~ msgstr "延遲送出"
-
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "Jingle 用的 STUN 服務偵測"
-
-# FIXME 這聽來不對
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "簡化加密工作階段協商"
-
-#~ msgid "Hop Check"
-#~ msgstr "中繼段檢查"
-
-#~ msgid "Write error"
-#~ 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)。"
-
-# XXX 暫譯
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "您已經被登出,因為您已在其他電腦上登入。"
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "錯誤:沒有安裝 SSL 支援。"
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法連線到 BOS 伺服器:\n"
-#~ "%s"
-
-#~ msgid "Invalid username."
-#~ msgstr "使用者名稱無效。"
-
-#~ msgid "Incorrect password."
-#~ msgstr "密碼錯誤。"
-
-#~ msgid "Could Not Connect"
-#~ msgstr "無法連線"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
-
-#~ 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 "讀取 Socket 時發生錯誤;%s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "無法連線到主機"
-
-#~ msgid "Could not write"
-#~ msgstr "無法寫入"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "無法建立 Socket 監聽"
-
-#~ 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 目前並未登入。"
-
-#  NOTE 譯文更動 by Ambrose
-#~ 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 "需輸入更多檢索條件。"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "暫時無法使用目錄服務。"
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "禁止 E-Mail 檢查。"
-
-#~ 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 "錯誤的帳號或密碼。"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#~ 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 "
-#~ "even longer."
-#~ msgstr ""
-#~ "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-#~ "線,那麼您的等待時間將會更加的延長。"
-
-#~ 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 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
-
-#~ 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 "Activate which ID?"
-#~ msgstr "啟用哪一個 ID?"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "傳呼伺服器(日本地區)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "檔案傳輸伺服器(日本地區)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "無法解析主機"
-
-#~ msgid "%s Options"
-#~ msgstr "%s 選項"
-
-#~ msgid "Proxy Options"
-#~ msgstr "代理伺服器選項"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "隱藏即時訊息交談視窗"
-
-#~ msgid "More Data needed"
-#~ msgstr "需要進一步的資料"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "請給這個表情給定一個相關的捷徑。"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "請給這個表情選擇一個圖像。"
-
-#~ msgid "Cursor Color"
-#~ msgstr "游標顏色"
-
-#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "第二游標顏色"
-
-#~ msgid "Interface colors"
-#~ msgstr "介面顏色"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget 大小"
-
-#~ msgid "By log size"
-#~ msgstr "依照日誌大小"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "在瀏覽器中打開連結(_O)"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "表情圖像(_I)"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "表情捷徑(_H)"
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "無法讀取 MSN 通訊錄"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "收到聊天訊息後閃動視窗(_F)"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看"
-#~ "有沒有更新。"
-
-#~ 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 "Keep alive error"
-#~ msgstr "Keep Alive錯誤"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷:\n"
-#~ "%d, %s"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "送出即時訊息失敗。"
-
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "您並非群組「%s」的成員\n"
-
-# NOTE 譯文更動 by Ambrose
-#~ msgid "User information for %s unavailable"
-#~ msgstr "無法取得使用者 %s 的個人資訊"
-
-#~ msgid "Primary Information"
-#~ msgstr "基本資訊"
-
-#~ msgid "Blood Type"
-#~ msgstr "血型"
-
-#~ msgid "Update information"
-#~ 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 "連同認證要求的新增好友失敗"
-
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "加入 %d 的好友清單"
-
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ 號碼錯誤"
-
-#~ msgid "Group Description"
-#~ msgstr "群組描述"
-
-#~ msgid "Auth"
-#~ msgstr "認證"
-
-#~ msgid "Approve"
-#~ msgstr "允許"
-
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "管理人 %2$d 允許了您加入群組 %1$d"
-
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "[%d] 退出了群組「%d」"
-
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "[%d] 已經被加入群組 \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "我是成員"
-
-# NOTE 這是 QQ_ROOM_ROLE_REQUESTING,按上文下理應係指「申請成為成員中」
-#~ msgid "I am requesting"
-#~ msgstr "我正在要求加入"
-
-#~ msgid "I am the admin"
-#~ msgstr "我是管理人"
-
-#~ msgid "Unknown status"
-#~ msgstr "狀態不明"
-
-#~ msgid "Remove from Qun"
-#~ msgstr "從群組中移除"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "指定的群組 ID 在有效範圍之外"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "您確定要離開群組?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "允許這個要求?"
-
-#~ msgid "Change Qun member"
-#~ msgstr "修改群組號碼"
-
-#~ 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 "設定我的資訊"
-
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "離開這個 QQ 群 (Qun)"
-
-#~ msgid "Block this buddy"
-#~ msgstr "封鎖這個好友"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "符記回應碼「0x%02X」無效"
-
-#~ msgid "Unable login for not support Redirect_EX now"
-#~ msgstr "無法登入,暫時不支援 Redirect_EX 功能"
-
-#~ msgid "Error password: %s"
-#~ msgstr "密碼錯誤:%s"
-
-# FIXME 不知這是什麼,但我想可能是這樣 - acli 20080930
-#~ msgid "Need active: %s"
-#~ msgstr "需要啟動帳號:%s"
-
-# XXX 看不明原始碼,這是半猜 - 20080930 acli
-#~ msgid "Failed to connect all servers"
-#~ msgstr "無法連線到所有伺服器"
-
-#  XXX 20080810 acli - 原文好像有問題
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "連線伺服器 %s 中,將會嘗試 %d 次"
-
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "允許這個要求?"
-
-#~ msgid "Do you add the buddy?"
-#~ msgstr "您要加入這個使用者到好友清單中嗎?"
-
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s 將您 [%s] 加入他(她)的好友清單。"
-
-#~ msgid "QQ Budy"
-#~ msgstr "QQ 好友"
-
-#~ msgid "Requestion approved by %s"
-#~ msgstr "使用者「%s」允許了您的要求"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s 想要將您 [%s] 加入他(她)的好友清單"
-
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s 不在您的好友清單內"
-
-# FIXME fix the original string :P
-#~ msgid "Would you add?"
-#~ msgstr "您要將他(她)加入您的好友清單嗎?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "QQ Server Notice"
-#~ msgstr "QQ 伺服器通告"
-
-#~ msgid "developer"
-#~ msgstr "開發者"
-
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP 開發者"
--- a/po/zh_TW.po	Mon May 31 02:28:09 2010 +0900
+++ b/po/zh_TW.po	Mon May 31 02:29:34 2010 +0900
@@ -6,7 +6,7 @@
 # LINE NUMBERS (LINES BEGINNING WITH #:) IN THIS FILE.
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.631 2010/05/10 05:49:24 acli Exp $
+# $InternalId: zh_TW.po,v 1.634 2010/05/27 21:29:19 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -58,12 +58,13 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Pidgin 2.7.0\n"
+"Project-Id-Version: Pidgin 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 23:18-0400\n"
-"PO-Revision-Date: 2010-05-03 03:02-0400\n"
-"Last-Translator: Ambrose Li <ambrose.li@gmail.com>\n"
+"POT-Creation-Date: 2010-05-29 20:59-0400\n"
+"PO-Revision-Date: 2010-05-29 02:50+0800\n"
+"Last-Translator: Paladin R. Liu <paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -1429,6 +1430,7 @@
 msgstr "狀態清單"
 
 # FIXME 原文一詞兩義,根本無法翻譯
+#. title
 msgid "Title"
 msgstr "職銜"
 
@@ -2000,7 +2002,6 @@
 msgid "Thread creation failure: %s"
 msgstr "無法建立執行緒:%s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "原因不明"
 
@@ -3278,6 +3279,9 @@
 msgstr "帳號"
 
 #. first name
+#. purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
+#. optional information
+#. purple_notify_user_info_add_pair( info, _( "Title" ), profile->title );
 msgid "First Name"
 msgstr "名"
 
@@ -4028,6 +4032,7 @@
 msgid "Postal Code"
 msgstr "郵遞區號"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "國家"
 
@@ -4042,8 +4047,6 @@
 msgid "Organization Unit"
 msgstr "所屬部門"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "職銜"
 
@@ -4051,6 +4054,7 @@
 msgstr "職責"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "生日"
 
@@ -5631,7 +5635,7 @@
 msgstr "沒有群組的好友"
 
 # XXX 暫譯,有待改進 - 20090226 acli
-# XXX 這可能是MSN的「基本資料連絡人」? 
+# XXX 這可能是MSN的「基本資料連絡人」?
 # XXX「Buddy」和「Contact」在中文版Pidgin無法析別;可能有改進的空間
 msgid "Non-IM Contacts"
 msgstr "非即時訊息的好友"
@@ -5997,6 +6001,9 @@
 msgid "Show custom smileys"
 msgstr "顯示使用者圖示"
 
+msgid "Allow direct connections"
+msgstr "允許直接連線"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:呼叫使用者,引起他們的注意"
 
@@ -6219,7 +6226,11 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "未能讀取您的個人資料,請稍後重試。"
 
+msgid "Your MXitId"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "密碼"
 
@@ -6296,7 +6307,7 @@
 msgstr "MXit 帳號"
 
 # NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
-#. nick name
+#. nick name (required)
 msgid "Nick Name"
 msgstr "暱稱"
 
@@ -6341,7 +6352,7 @@
 msgid "Security Code"
 msgstr "保安碼"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "輸入保安碼"
 
@@ -6367,7 +6378,11 @@
 msgid "Status Message"
 msgstr "狀態訊息"
 
+msgid "Rejection Message"
+msgstr "拒絕訊息"
+
 # NOTE 這是「是否隱藏電話號碼?」之意 - acli 20091127
+#. hidden number
 msgid "Hidden Number"
 msgstr "隱藏電話號碼"
 
@@ -6385,6 +6400,22 @@
 msgid "Enable splash-screen popup"
 msgstr "啟用啟動畫面彈出視窗"
 
+#. you were kicked
+#, fuzzy
+msgid "You have been kicked from this MultiMX."
+msgstr "您已被踢出:(%s)"
+
+#  FIXME「ticket」暫無譯文,也許可譯「通行證」或「許可證」?
+#  NOTE MSN 錯誤代號 928
+#  NOTE 詳見 http://www.hypothetic.org/docs/msn/notification/authentication.php
+#, fuzzy
+msgid "was kicked"
+msgstr "無效的 ticket"
+
+#, fuzzy
+msgid "_Room Name:"
+msgstr "聊天室(_R):"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
 msgstr "與 MXit 的連線已中斷,請重新連線。"
@@ -7171,6 +7202,64 @@
 msgid "Invalid chat room name"
 msgstr "聊天室名稱無效"
 
+# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
+msgid "Invalid error"
+msgstr "無效錯誤"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "被家長監控限制,無法接收即時訊息"
+
+msgid "Cannot send SMS without accepting terms"
+msgstr "未同意使用條款前無法送出短訊"
+
+msgid "Cannot send SMS"
+msgstr "無法送出短訊"
+
+#. SMS_WITHOUT_DISCLAIMER is weird
+msgid "Cannot send SMS to this country"
+msgstr "無法送出短訊至指定的國家"
+
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "無法送出短訊至不明的國家"
+
+msgid "Bot accounts cannot initiate IMs"
+msgstr "機器人帳號無法啟動即時通訊"
+
+msgid "Bot account cannot IM this user"
+msgstr "機器人帳號無法向這個使用者送出即時通訊"
+
+msgid "Bot account reached IM limit"
+msgstr "機器人帳號進行即時通訊的次數已達到了上限"
+
+msgid "Bot account reached daily IM limit"
+msgstr "機器人帳號進行即時通訊的次數已達到了每日的上限"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "機器人帳號進行即時通訊的次數已達到了每月的上限"
+
+msgid "Unable to receive offline messages"
+msgstr "無法接收離線訊息"
+
+msgid "Offline message store full"
+msgstr "離線訊息庫已滿"
+
+#, c-format
+msgid "Unable to send message: %s (%s)"
+msgstr "無法送出訊息:%s (%s)"
+
+#, c-format
+msgid "Unable to send message: %s"
+msgstr "無法送出訊息:%s"
+
+#, c-format
+msgid "Unable to send message to %s: %s (%s)"
+msgstr "無法送出訊息至 %s:%s (%s)"
+
+#, c-format
+msgid "Unable to send message to %s: %s"
+msgstr "無法送出訊息至 %s:%s"
+
 # XXX 這是什麼? - acli 20100510
 msgid "Thinking"
 msgstr "思想中"
@@ -7327,121 +7416,6 @@
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "檔案「%s」大小為 %s,超過了 %s 這個上限。"
 
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-msgid "Invalid error"
-msgstr "無效錯誤"
-
-msgid "Invalid SNAC"
-msgstr "無效的 SNAC"
-
-msgid "Rate to host"
-msgstr "到伺服器速率"
-
-msgid "Rate to client"
-msgstr "到用戶端速率"
-
-#  XXX 可能是誤譯
-msgid "Service unavailable"
-msgstr "伺服器不存在"
-
-msgid "Service not defined"
-msgstr "沒有指定服務"
-
-msgid "Obsolete SNAC"
-msgstr "過時的 SNAC"
-
-msgid "Not supported by host"
-msgstr "伺服器不支援"
-
-msgid "Not supported by client"
-msgstr "用戶端不支援"
-
-msgid "Refused by client"
-msgstr "被用戶端拒絕"
-
-msgid "Reply too big"
-msgstr "回覆太大了"
-
-msgid "Responses lost"
-msgstr "遺失回應"
-
-msgid "Request denied"
-msgstr "要求被拒"
-
-# NOTE「Busted」與「SNAC payload」的說名由Luke Schierer在#gaim提供
-# NOTE 整句的意思其實係「您一次過傳送太多資訊了」
-msgid "Busted SNAC payload"
-msgstr "SNAC負載過大"
-
-msgid "Insufficient rights"
-msgstr "權限不夠"
-
-# NOTE Debian 譯「local」為「本地端」(Windows 舊譯「本地」,新譯「本機」)
-msgid "In local permit/deny"
-msgstr "本地端的允許/拒絕清單"
-
-msgid "Warning level too high (sender)"
-msgstr "(發訊者)警告等級過高"
-
-msgid "Warning level too high (receiver)"
-msgstr "(收訊者)警告等級過高"
-
-msgid "User temporarily unavailable"
-msgstr "使用者暫時不在"
-
-msgid "No match"
-msgstr "沒有相符合的"
-
-msgid "List overflow"
-msgstr "清單溢出"
-
-msgid "Request ambiguous"
-msgstr "要求不明確"
-
-msgid "Queue full"
-msgstr "佇列滿了"
-
-msgid "Not while on AOL"
-msgstr "在 AOL 時不允許"
-
-msgid "Cannot receive IM due to parental controls"
-msgstr "被家長監控限制,無法接收即時訊息"
-
-msgid "Cannot send SMS without accepting terms"
-msgstr "未同意使用條款前無法送出短訊"
-
-msgid "Cannot send SMS"
-msgstr "無法送出短訊"
-
-#. SMS_WITHOUT_DISCLAIMER is weird
-msgid "Cannot send SMS to this country"
-msgstr "無法送出短訊至指定的國家"
-
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "無法送出短訊至不明的國家"
-
-msgid "Bot accounts cannot initiate IMs"
-msgstr "機器人帳號無法啟動即時通訊"
-
-msgid "Bot account cannot IM this user"
-msgstr "機器人帳號無法向這個使用者送出即時通訊"
-
-msgid "Bot account reached IM limit"
-msgstr "機器人帳號進行即時通訊的次數已達到了上限"
-
-msgid "Bot account reached daily IM limit"
-msgstr "機器人帳號進行即時通訊的次數已達到了每日的上限"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "機器人帳號進行即時通訊的次數已達到了每月的上限"
-
-msgid "Unable to receive offline messages"
-msgstr "無法接收離線訊息"
-
-msgid "Offline message store full"
-msgstr "離線訊息庫已滿"
-
 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 "
@@ -7801,28 +7775,9 @@
 msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息,原因不明。"
 
 #, c-format
-msgid "Unable to send message: %s (%s)"
-msgstr "無法送出訊息:%s (%s)"
-
-#, c-format
-msgid "Unable to send message: %s"
-msgstr "無法送出訊息:%s"
-
-#, c-format
-msgid "Unable to send message to %s: %s (%s)"
-msgstr "無法送出訊息至 %s:%s (%s)"
-
-#, c-format
-msgid "Unable to send message to %s: %s"
-msgstr "無法送出訊息至 %s:%s"
-
-#, c-format
 msgid "User information not available: %s"
 msgstr "無法取得個人資訊:%s"
 
-msgid "Unknown reason."
-msgstr "原因不明。"
-
 msgid "Online Since"
 msgstr "上線自"
 
@@ -8233,6 +8188,93 @@
 "這個要求將會在兩部電腦間建立起直接連線,而這是在傳送即時訊息影像時所必須的。"
 "這樣將會曝露您的 IP 位址,因此可能會有隱私方面的風險。"
 
+msgid "Invalid SNAC"
+msgstr "無效的 SNAC"
+
+msgid "Rate to host"
+msgstr "到伺服器速率"
+
+msgid "Rate to client"
+msgstr "到用戶端速率"
+
+#  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
+#  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
+#  NOTE 譯文更動 by Ambrose
+#, fuzzy
+msgid "Service unavailable"
+msgstr "不提供該項服務"
+
+#, fuzzy
+msgid "Service not defined"
+msgstr "找不到該會議"
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+#  XXX 這個太奇怪了 (^^;)
+#, fuzzy
+msgid "Not supported by host"
+msgstr "不支援"
+
+#  XXX 這個太奇怪了 (^^;)
+#, fuzzy
+msgid "Not supported by client"
+msgstr "不支援"
+
+#, fuzzy
+msgid "Refused by client"
+msgstr "到用戶端速率"
+
+msgid "Reply too big"
+msgstr ""
+
+#, fuzzy
+msgid "Responses lost"
+msgstr "「回答」或然率:"
+
+#, fuzzy
+msgid "Request denied"
+msgstr "請求中"
+
+msgid "Busted SNAC payload"
+msgstr ""
+
+msgid "Insufficient rights"
+msgstr ""
+
+msgid "In local permit/deny"
+msgstr ""
+
+msgid "Warning level too high (sender)"
+msgstr ""
+
+msgid "Warning level too high (receiver)"
+msgstr ""
+
+#  NOTE「暫時無法使用」應該比「暫時不存在」通順
+#  NOTE 譯文更動 by Ambrose
+#, fuzzy
+msgid "User temporarily unavailable"
+msgstr "暫時無法使用服務"
+
+#, fuzzy
+msgid "No match"
+msgstr "沒有相符合的"
+
+#, fuzzy
+msgid "List overflow"
+msgstr "好友清單已滿"
+
+#, fuzzy
+msgid "Request ambiguous"
+msgstr "請求中"
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+msgstr ""
+
 msgid "Aquarius"
 msgstr "水秤座"
 
@@ -10540,8 +10582,8 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:%"
-"s"
+"使用者 %s 因為下列原因,剛剛拒絕了您先前將他(她)新增至您的好友清單的要求:"
+"%s"
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
@@ -12514,10 +12556,9 @@
 msgid "Arabic"
 msgstr "阿拉伯文"
 
-# NOTE XMPP 情緒值,譯文的準確性應以 http://xmpp.org/extensions/xep-0107.html 為準
-#, fuzzy
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=Assamese&qrytype=en&x=31&y=9
 msgid "Assamese"
-msgstr "慚愧"
+msgstr "阿薩姆語"
 
 #  NOTE「Latin」係指譯文以「拉丁字母」(而非西里爾字母)書寫,中譯可以省略 - acli 20070918
 msgid "Belarusian Latin"
@@ -12668,9 +12709,9 @@
 msgid "Macedonian"
 msgstr "馬其頓文"
 
-#, fuzzy
+# NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=malayalam&qrytype=en&x=26&y=11
 msgid "Malayalam"
-msgstr "馬來文"
+msgstr "馬拉亞拉姆語"
 
 msgid "Mongolian"
 msgstr "蒙古文"
@@ -12810,8 +12851,8 @@
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
 "is released, and may be modified and redistributed,  under the terms of the "
 "GPL version 2 (or later).  A copy of the GPL is distributed with %s.  %s is "
-"copyrighted by its contributors, a list of whom is also distributed with %"
-"s.  There is no warranty for %s.<BR><BR>"
+"copyrighted by its contributors, a list of whom is also distributed with "
+"%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s 是一個以 C、GTK+ 和 libpurple 為基礎的 GUI 訊息程式,提供同時連線至多種訊"
 "息服務的功能。%s 以 GPL(第二版或較新版本)發放,倘若您希望修改或發佈 %s,只"
@@ -13378,14 +13419,14 @@
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the log of the conversation in %"
-"s which started at %s?"
+"Are you sure you want to permanently delete the log of the conversation in "
+"%s which started at %s?"
 msgstr "您確定您要刪除由%2$s開始記錄,在聊天室「%1$s」交談的日誌?"
 
 #, c-format
 msgid ""
-"Are you sure you want to permanently delete the system log which started at %"
-"s?"
+"Are you sure you want to permanently delete the system log which started at "
+"%s?"
 msgstr "您確定您要刪除由%s開始記錄的系統日誌?"
 
 msgid "Delete Log?"
@@ -13475,9 +13516,10 @@
 "%swiki/GetABacktrace\n"
 msgstr ""
 
+# XXX 要覆查譯文 - acli 20100527
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
+msgstr "因為已有其他 libpurple 用戶端正在執行,本程式現在結束。\n"
 
 # XXX 媒體? - acli 20090730
 msgid "/_Media"
@@ -15690,123 +15732,151 @@
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 
+# XXX 要覆查譯文 - acli 20100527
+#. $(^Name) is the current Version name (e.g. Pidgin 2.7.0).  $_CLICK will become a translated version of "Click Next to continue."
 msgid ""
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
 msgstr ""
-"$(^Name) 採用 GNU General Public License (GPL) 授權發佈。在此列出授權書,僅作"
-"為參考之用。$_CLICK"
-
+"$(^Name) 以 GNU General Public License (GPL) 條款發佈。本安裝程式提供一份 "
+"GPL,只為方便參考。$_CLICK"
+
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
-msgstr "Pidgin 所使用的跨平台圖形介面函式庫"
+msgstr "Pidgin 使用的一個跨平台 GUI 組件"
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
-msgstr "Pidgin 正在執行中,請先結束這個程式後再行安裝。"
-
+msgstr "Pidgin 正在執行,請結束 Pidgin 後重試。"
+
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
-msgstr "Pidgin 核心檔案及動態函式庫"
-
+msgstr "Pidgin 核心檔案及 DLL"
+
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr "在開始功能表建立捷徑"
-
+msgstr "為 Pidgin 在開始選單建立捷徑"
+
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr "在桌面建立捷徑"
-
+msgstr "為 Pidgin 在桌面上建立捷徑"
+
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
+msgstr "除錯符號(回報當機專用)"
+
+#. Installer Subsection Text
 msgid "Desktop"
-msgstr "桌面捷徑"
-
+msgstr "桌面"
+
+#. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
 "Error Downloading the GTK+ Runtime ($R2).$\\rThis is required for Pidgin to "
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"下載 GTK+ 執行環境 ($R2) 時發生錯誤。$\\r這是 Pidgin 運作的必須組件,如果重試"
+"失敗,您可能要使用離線安裝檔的方式安裝(可在 http://pidgin.im/download/"
+"windows/ 下載)。"
+
+#. $R2 will display the URL that the Debug Symbols failed to download from
 msgid ""
 "Error Installing Debug Symbols ($R2).$\\rIf retrying fails, you may need to "
 "use the 'Offline Installer' from http://pidgin.im/download/windows/ ."
 msgstr ""
-
+"下載除錯符號 ($R2) 途中發生錯誤。$\\r如果重試失敗,您可能要使用離線安裝檔的方"
+"式安裝(可在 http://pidgin.im/download/windows/ 下載)。"
+
+#. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
 "Error Installing Spellchecking ($R3).$\\rIf retrying fails, manual "
-"installation instructions are at: http://developer.pidgin.im/wiki/Installing%"
-"20Pidgin#manual_win32_spellcheck_installation"
-msgstr ""
-
-#, fuzzy
+"installation instructions are at: http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
+msgstr ""
+"下載拼字檢查功能 ($R3) 途中發生錯誤。$\\r如果重試失敗,可按照 http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation 內的指示進行手動安裝。"
+
+# XXX 要覆查譯文 - acli 20100527
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
-msgstr "Pidgin 主程式 (必需)"
-
-#, fuzzy
+msgstr "GTK+ 執行環境(如未安裝則必須安裝)"
+
+#. Installer Subsection Text
 msgid "Localizations"
-msgstr "所在位置"
-
-#. License Page
+msgstr "本地化支援"
+
+# XXX 要覆查譯文 - acli 20100527
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
-msgstr "下一步 >"
-
-#. Components Page
+msgstr "下一頁 >"
+
+#. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
-msgstr "Pidgin 主程式 (必需)"
-
-#. GTK+ Section Prompts
+msgstr "Pidgin 網路即時通(必須安裝)"
+
+# XXX 要覆查譯文 - acli 20100527
 msgid ""
 "Pidgin requires a compatible GTK+ Runtime (which doesn't appear to be "
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
-
+"Pidgin 需要相容的 GTK+ 執行環境才能運作,但系統內似乎還沒有安裝相容的 GTK+ 執"
+"行環境。$\\r您確定不要安裝 GTK+ 執行環境?"
+
+#. Installer Subsection Text
 msgid "Shortcuts"
 msgstr "捷徑"
 
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr "建立 Pidgin 捷徑"
-
-#. Spellcheck Section Prompts
+msgstr "啟動 Pidgin 的捷徑"
+
+#. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr "拼字檢查功能"
-
+msgstr "拼字檢查功能支援"
+
+#. Installer Subsection Text
 msgid "Start Menu"
-msgstr "開始功能表"
-
+msgstr "開始選單"
+
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
-msgstr "拼字檢查支援(安裝須有網際網路連線)。"
+msgstr "拼字檢查功能支援(需連線至網際網路才能安裝)"
 
 msgid "The installer is already running."
-msgstr "安裝程式正在執行中。"
-
-#. Uninstall Section Prompts
+msgstr "安裝程式已在執行中。"
+
+# XXX 要覆查譯文 - acli 20100527
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
-"移除程式無法找到 Pidgin 的安裝資訊。$\\r這應該是有其他的使用者重新安裝了這個"
-"程式。"
+"解除安裝程式無法找到 Pidgin 的登錄機碼。$\\r安裝 Pidgin 的很可能是另一個使用"
+"者。"
 
 #  NOTE 這似乎是視窗標題
-#. URL Handler section
+#. Installer Subsection Text
 msgid "URI Handlers"
-msgstr "URI 處理程式"
-
-#. Pidgin Section Prompts and Texts
+msgstr "網址處理器"
+
+# XXX 要覆查譯文 - acli 20100527
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
-msgstr ""
-"無法移除目前已安裝的 Pidgin,新版本將在未經移除舊版本的情況下進行安裝。"
-
-#. Installer Finish Page
+msgstr "無法移除目前的 Pidgin 版本,新版本會在不移除舊版本的情況下被安裝。"
+
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
-msgstr "拜訪 Pidgin 網頁"
+msgstr "瀏覽 Pidgin 官方網站"
 
 msgid "You do not have permission to uninstall this application."
-msgstr "您目前的權限無法移除 Pidgin。"
+msgstr "您沒有權限移除程式。"
 
 #~ msgid "Current Mood"
 #~ msgstr "目前的心情"
@@ -15822,972 +15892,3 @@
 
 #~ msgid "Change Mood..."
 #~ msgstr "修改心情..."
-
-# FIXME 譯文有待改進 - acli 20090731
-#~ msgid "Error creating conference."
-#~ msgstr "建立會議失敗。"
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "無法連結 Socket 到通訊埠:%s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "無法監聽 Socket:%s"
-
-#~ msgid "Artist"
-#~ msgstr "樂手名稱"
-
-#~ msgid "Album"
-#~ msgstr "專輯名稱"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s 在呼叫您!"
-
-#~ msgid "Friendly name changes too rapidly"
-#~ msgstr "暱稱的變更過於急速"
-
-#~ msgid "This Hotmail account may not be active."
-#~ msgstr "這個Hotmail帳號可能尚未被啟動。"
-
-#~ msgid "Profile URL"
-#~ msgstr "個人資料網址"
-
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN 協定模組"
-
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s 不是一個有效的群組。"
-
-#~ msgid "Unknown error."
-#~ msgstr "未知錯誤。"
-
-# NOTE: 第二個 %s 為使用者名稱,第三個 %s 為通訊協定名稱
-# NOTE: 第一個 %s 似乎係錯誤訊息摘要(整個字串為視窗標題)
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%2$s (%3$s):%1$s"
-
-#  TODO 請覆查,譯文有待改進
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "%s (%s) 新增使用者失敗"
-
-#  TODO 請覆查,譯文有待改進
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "%s (%s) 拒絕使用者失敗"
-
-#  TODO 請覆查,譯文有待改進
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "%s (%s) 允許使用者失敗"
-
-#~ msgid "%s could not be added because your buddy list is full."
-#~ msgstr "因為好友清單已滿,以致無法新增 %s"
-
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s 不是一個有效的護照帳號"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "暫時無法提供服務"
-
-#~ msgid "Unable to rename group"
-#~ msgstr "無法更改群組名稱"
-
-#~ msgid "Unable to delete group"
-#~ msgstr "無法移除群組"
-
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s 將您加入他(她)的好友清單。"
-
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s 將您從他(她)的好友清單中移除。"
-
-#~ msgid "Pager server"
-#~ msgstr "傳呼伺服器"
-
-#~ msgid "Yahoo Chat server"
-#~ msgstr "Yahoo 聊天伺服器"
-
-#~ msgid "Yahoo Chat port"
-#~ msgstr "Yahoo 聊天室通訊埠"
-
-#~ msgid "Orientation"
-#~ msgstr "方向"
-
-#  NOTE: stolen from eggcups' zh_TW.po
-#~ msgid "The orientation of the tray."
-#~ msgstr "系統匣方向"
-
-#~ 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/>"
-
-#~ msgid ""
-#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-#~ msgstr ""
-#~ "<FONT SIZE=\"4\">IRC 頻道:</FONT>irc.freenode.net 上的 #pidgin 頻道"
-#~ "<BR><BR>"
-
-#~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-#~ msgstr ""
-#~ "<FONT SIZE=\"4\">XMPP 聊天室:</FONT>devel@conference.pidgin.im<BR><BR>"
-
-# NOTE 這是「關於 Pidgin」視窗中,最後出現,用來作除錯用的各種資訊,不能譯成「訊息」
-#~ msgid "Debugging Information"
-#~ msgstr "除錯專用資訊"
-
-# NOTE "Defaulting to PNG" 是指 gaim 在無計可施的情況下盲猜影像是 PNG 格式
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "檔案類型不明\n"
-#~ "\n"
-#~ "暫且當成 PNG 檔處理。"
-
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "儲存影像錯誤\n"
-#~ "\n"
-#~ "%s"
-
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "無法開啟檔案「%s」:%s"
-
-#~ msgid ""
-#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
-#~ msgstr "無法載入影像「%s」,原因不明,大概是影像檔已損壞"
-
-#  NOTE Jabber 的「stanza」譯「段落」,下同
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "插入 <iq/> 段落。"
-
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "插入 <presence/> 段落。"
-
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "插入 <message/> 段落。"
-
-#~ msgid ""
-#~ "Unable to find alternative XMPP connection methods after failing to "
-#~ "connect directly."
-#~ msgstr "無法直接連線,但無法找到其他的 XMPP 連線方法。"
-
-#~ msgid ""
-#~ "The last action you attempted could not be performed because you are over "
-#~ "the rate limit. Please wait 10 seconds and try again.\n"
-#~ msgstr ""
-#~ "您最近做的一個動作無法完成,因為您已經達到這個動作的速率的上限。請等待十秒"
-#~ "後再試一次。\n"
-
-#~ msgid ""
-#~ "The root certificate this one claims to be issued by is unknown to Pidgin."
-#~ msgstr "這張憑證聲稱由一所 Pidgin 不認識的根憑證機構簽發。"
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "透過多種通訊協定發送即時訊息"
-
-#~ msgid "Without this only the first account will be enabled)."
-#~ msgstr "如果不指定帳號,將只會啟動第一個帳號)"
-
-#  NOTE 直譯「安裝主題」好像很無棱兩可,加個「檔」字好像較好
-#~ msgid "Install Theme"
-#~ msgstr "安裝主題檔"
-
-#~ msgid "Icon"
-#~ msgstr "圖示"
-
-#  XXX 要覆查 - acli 20070614
-#~ msgid "Use document font from _theme"
-#~ msgstr "使用主題指定的文件字型(_T)"
-
-#~ msgid "_Start port:"
-#~ msgstr "啟始通訊埠(_S):"
-
-#~ msgid "_End port:"
-#~ msgstr "結束通訊埠(_E):"
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "代理伺服器及瀏覽器"
-
-#~ msgid "_User:"
-#~ msgstr "使用者(_U):"
-
-#~ msgid "Auto-away"
-#~ msgstr "自動離開"
-
-#~ msgid "Change _status to:"
-#~ msgstr "更改狀態為(_S):"
-
-#~ msgid "Calling ... "
-#~ msgstr "撥打中..."
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "無效的憑證鏈"
-
-#~ msgid ""
-#~ "The certificate chain presented by %s does not have a valid digital "
-#~ "signature from the Certificate Authority from which it claims to have a "
-#~ "signature."
-#~ msgstr ""
-#~ "「%s」出示的憑證鍊聲稱它是由某憑證機構簽發,但實際上卻沒有該憑證機構的有效"
-#~ "簽章。"
-
-#~ msgid "Invalid certificate authority signature"
-#~ msgstr "憑證機構的簽章是無效的"
-
-#  XXX 不通順
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "設定如何隱藏「加入/離開聊天室」的訊息"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "聊天室大小下限"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "閒置時間下限(分鐘)"
-
-#~ msgid "Failed to open the file"
-#~ msgstr "無法開啟檔案"
-
-# NOTE「封鎖」好像比「暫時關閉」通順? - acli 20090730
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "您的帳戶目前已被封鎖。請您登入 Yahoo! 網站。"
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "巴斯克文"
-
-#~ msgid ""
-#~ "<FONT SIZE=\"4\">Help via e-mail:</FONT> <A HREF=\"mailto:support@pidgin."
-#~ "im\">support@pidgin.im</A><BR/><BR/>"
-#~ msgstr ""
-#~ "<FONT SIZE=\"4\">電郵支援:</FONT> <A HREF=\"mailto:support@pidgin.im"
-#~ "\">support@pidgin.im</A><BR/><BR/>"
-
-#  FIXME
-#  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#~ msgid ""
-#~ "%s %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -f, --force-online  force online, regardless of network status\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ "  -m, --multiple      do not ensure single instance\n"
-#~ "  -n, --nologin       don't automatically login\n"
-#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
-#~ "NAME\n"
-#~ "                      specifies account(s) to use, separated by commas.\n"
-#~ "                      Without this only the first account will be "
-#~ "enabled).\n"
-#~ "  --display=DISPLAY   X display to use\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ msgstr ""
-#~ "%s %s\n"
-#~ "使用方法: %s [選項]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    設定檔所在目錄\n"
-#~ "  -d, --debug         在標準輸出中顯示除錯訊息\n"
-#~ "  -f, --force-online  忽略網路實際狀態,強制將狀態設為上線\n"
-#~ "  -h, --help          顯示輔助訊息並離開\n"
-#~ "  -m, --multiple      允許同時執行多個Pidgin進程\n"
-#~ "  -n, --nologin       不自動登入\n"
-#~ "  -l, --login[=NAME]  啟動指定的帳號 (透過 NAME 參數來指定啟動的\n"
-#~ "                      帳號,並使用逗號分隔) \n"
-#~ "  --display=DISPLAY   使用指定的 X display\n"
-#~ "  -v, --version       顯示版本訊息並離開\n"
-
-#  FIXME
-#  NOTE hard-code 了一個「Pidgin」在譯文裏,但刪掉會有點困難(令文句難明),故暫時保留,待想到怎樣刪掉才算
-#~ msgid ""
-#~ "%s %s\n"
-#~ "Usage: %s [OPTION]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    use DIR for config files\n"
-#~ "  -d, --debug         print debugging messages to stdout\n"
-#~ "  -f, --force-online  force online, regardless of network status\n"
-#~ "  -h, --help          display this help and exit\n"
-#~ "  -m, --multiple      do not ensure single instance\n"
-#~ "  -n, --nologin       don't automatically login\n"
-#~ "  -l, --login[=NAME]  enable specified account(s) (optional argument "
-#~ "NAME\n"
-#~ "                      specifies account(s) to use, separated by commas.\n"
-#~ "                      Without this only the first account will be "
-#~ "enabled).\n"
-#~ "  -v, --version       display the current version and exit\n"
-#~ msgstr ""
-#~ "%s %s\n"
-#~ "使用方法: %s [選項]...\n"
-#~ "\n"
-#~ "  -c, --config=DIR    設定檔所在目錄\n"
-#~ "  -d, --debug         在標準輸出中顯示除錯訊息\n"
-#~ "  -f, --force-online  忽略網路實際狀態,強制將狀態設為上線\n"
-#~ "  -h, --help          顯示輔助訊息並離開\n"
-#~ "  -m, --multiple      允許同時執行多個Pidgin進程\n"
-#~ "  -n, --nologin       不自動登入\n"
-#~ "  -l, --login[=NAME]  啟動指定的帳號(NAME為希望啟動的帳號,如多過一個帳號"
-#~ "則\n"
-#~ "                      以逗號分隔,如不指定帳號則只會啟動第一個帳號)\n"
-#~ "  -v, --version       顯示版本訊息並離開\n"
-
-#~ msgid "_Resume"
-#~ msgstr "恢復(_R)"
-
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "無法讀取 SILC 密鑰對"
-
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s 婉拒了你詢問他(她)到會議室「%s」的邀請,理由是「%s」。"
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "邀請被婉拒了"
-
-#~ msgid "Invite message"
-#~ msgstr "邀請訊息"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr "請輸入您想邀請的使用者名稱,以及選擇性填寫邀請的訊息。"
-
-#~ msgid "Cannot open socket"
-#~ msgstr "無法開啟Socket"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "無法監聽 Socket"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "無法讀取 Socket"
-
-#~ msgid "Connection failed."
-#~ msgstr "連線失敗。"
-
-#~ msgid "Server has disconnected"
-#~ msgstr "伺服器已停止連線"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "無法建立 Socket"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "無法連到伺服器"
-
-# NOTE OSCAR 錯誤訊息應可參閱 http://aimdoc.sourceforge.net/OSCARdoc/,但在該站很難找東西
-#~ msgid "Read error"
-#~ msgstr "讀取錯誤"
-
-# NOTE 這是功能名稱(直譯)
-#~ msgid "Last Activity"
-#~ msgstr "最近活動"
-
-#  FIXME acli 2070914
-#~ msgid "Service Discovery Items"
-#~ msgstr "服務探尋項目"
-
-# NOTE 這是功能名稱(直譯)
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "延伸段落定址"
-
-# NOTE 這是功能名稱
-#~ msgid "Multi-User Chat"
-#~ msgstr "多用戶聊天"
-
-# NOTE 這是功能名稱(直譯)
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "多用戶聊天延伸上線狀態資訊"
-
-# NOTE Cf http://host.cc.ntu.edu.tw/iicm/term/termb_I.htm
-#~ msgid "In-Band Bytestreams"
-#~ msgstr "帶內位元組串流"
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "臨時指令"
-
-#~ msgid "SOCKS5 Bytestreams"
-#~ msgstr "SOCKS5 位元組串流"
-
-#~ msgid "Out of Band Data"
-#~ msgstr "帶外數據"
-
-#  NOTE Untranslated
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#~ msgid "In-Band Registration"
-#~ msgstr "帶內註冊"
-
-#~ msgid "User Location"
-#~ msgstr "使用者所在位置"
-
-#~ msgid "User Avatar"
-#~ msgstr "使用者化身"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "聊天狀態通知"
-
-# NOTE Jabber 協定中 Stream Error 的一種,即 <unsupported-version/>
-# NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
-#~ msgid "Software Version"
-#~ msgstr "軟體版本"
-
-#~ msgid "Stream Initiation"
-#~ msgstr "開始串流"
-
-# XXX may be wrong
-#~ msgid "User Activity"
-#~ msgstr "使用者活動狀態"
-
-#  NOTE 直譯:個體能力
-#  FIXME 譯文有待改進 - acli 20070918
-#~ msgid "Entity Capabilities"
-#~ msgstr "個體能力"
-
-#  FIXME 這聽來不對 - acli 20070913
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "加密工作階段協商"
-
-#~ msgid "User Tune"
-#~ msgstr "使用者樂曲"
-
-#  NOTE「Roster」指「名冊」,但Open Source software似乎一般譯「好友清單」、「成員列表」等
-#  FIXME 譯文有待改進 - acli 20070918
-#~ msgid "Roster Item Exchange"
-#~ msgstr "好友清單項目交換"
-
-#  NOTE 參見 http://jabber.org/protocol/reach
-#  NOTE「Reachability Address」指即時通訊以外的通訊方式所用的「位址」(例如電話號碼)
-#  NOTE 直譯:可抵達性位址
-#  XXX 是否譯「其他通訊方法」較好?但要先看上下文 - acli 20070918
-#~ msgid "Reachability Address"
-#~ msgstr "可抵達性位址"
-
-#~ msgid "Jingle"
-#~ msgstr "Jingle"
-
-#~ msgid "Jingle Audio"
-#~ msgstr "Jingle 音訊"
-
-#~ msgid "User Nickname"
-#~ msgstr "使用者暱稱"
-
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "Jingle ICE UDP"
-
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "Jingle ICE TCP"
-
-#~ msgid "Jingle Video"
-#~ msgstr "Jingle 視訊"
-
-#~ msgid "Jingle DTMF"
-#~ msgstr "Jingle DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "收到的訊息"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "發佈公鑰"
-
-# NOTE Jabber 新功能規格
-#~ msgid "User Browsing"
-#~ msgstr "使用者瀏覽"
-
-#~ msgid "Stanza Encryption"
-#~ msgstr "段落加密"
-
-#  XXX 暫譯- acli 20070913
-#~ msgid "Delayed Delivery"
-#~ msgstr "延遲送出"
-
-#~ msgid "STUN Service Discovery for Jingle"
-#~ msgstr "Jingle 用的 STUN 服務偵測"
-
-# FIXME 這聽來不對
-#~ msgid "Simplified Encrypted Session Negotiation"
-#~ msgstr "簡化加密工作階段協商"
-
-#~ msgid "Hop Check"
-#~ msgstr "中繼段檢查"
-
-#~ msgid "Write error"
-#~ 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)。"
-
-# XXX 暫譯
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr "您已經被登出,因為您已在其他電腦上登入。"
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "錯誤:沒有安裝 SSL 支援。"
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法連線到 BOS 伺服器:\n"
-#~ "%s"
-
-#~ msgid "Invalid username."
-#~ msgstr "使用者名稱無效。"
-
-#~ msgid "Incorrect password."
-#~ msgstr "密碼錯誤。"
-
-#~ msgid "Could Not Connect"
-#~ msgstr "無法連線"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr "您可能會在短時間內中斷連線。請到 %s 看看有沒有更新。"
-
-#~ 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 "讀取 Socket 時發生錯誤;%s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "無法連線到主機"
-
-#~ msgid "Could not write"
-#~ msgstr "無法寫入"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "無法建立 Socket 監聽"
-
-#~ 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 目前並未登入。"
-
-#  NOTE 譯文更動 by Ambrose
-#~ 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 "需輸入更多檢索條件。"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "暫時無法使用目錄服務。"
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "禁止 E-Mail 檢查。"
-
-#~ 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 "錯誤的帳號或密碼。"
-
-#  NOTE「暫時無法使用」應該比「暫時不存在」通順
-#  NOTE 譯文更動 by Ambrose
-#~ 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 "
-#~ "even longer."
-#~ msgstr ""
-#~ "您的連線/斷線動作太過頻繁。請等待十分鐘後再行重試。如果您依然繼續嘗試著連"
-#~ "線,那麼您的等待時間將會更加的延長。"
-
-#~ 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 結束了暫停狀態。您現在可以繼續的傳送您的訊息。"
-
-#~ 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 "Activate which ID?"
-#~ msgstr "啟用哪一個 ID?"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "傳呼伺服器(日本地區)"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "檔案傳輸伺服器(日本地區)"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷\n"
-#~ "%s"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "無法解析主機"
-
-#~ msgid "%s Options"
-#~ msgstr "%s 選項"
-
-#~ msgid "Proxy Options"
-#~ msgstr "代理伺服器選項"
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "隱藏即時訊息交談視窗"
-
-#~ msgid "More Data needed"
-#~ msgstr "需要進一步的資料"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "請給這個表情給定一個相關的捷徑。"
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "請給這個表情選擇一個圖像。"
-
-#~ msgid "Cursor Color"
-#~ msgstr "游標顏色"
-
-#  XXX 只有一個軟件這樣譯,在無更好的譯文可供參考下暫且借用
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "第二游標顏色"
-
-#~ msgid "Interface colors"
-#~ msgstr "介面顏色"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Widget 大小"
-
-#~ msgid "By log size"
-#~ msgstr "依照日誌大小"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "在瀏覽器中打開連結(_O)"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "表情圖像(_I)"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "表情捷徑(_H)"
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "無法讀取 MSN 通訊錄"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "收到聊天訊息後閃動視窗(_F)"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "您可能會短時間中斷連線。您可能會想在這個問題被修正後使用 TOC。請到 %s 看看"
-#~ "有沒有更新。"
-
-#~ 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 "Keep alive error"
-#~ msgstr "Keep Alive錯誤"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "與伺服器之間的連線突然中斷:\n"
-#~ "%d, %s"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "送出即時訊息失敗。"
-
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "您並非群組「%s」的成員\n"
-
-# NOTE 譯文更動 by Ambrose
-#~ msgid "User information for %s unavailable"
-#~ msgstr "無法取得使用者 %s 的個人資訊"
-
-#~ msgid "Primary Information"
-#~ msgstr "基本資訊"
-
-#~ msgid "Blood Type"
-#~ msgstr "血型"
-
-#~ msgid "Update information"
-#~ 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 "連同認證要求的新增好友失敗"
-
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "加入 %d 的好友清單"
-
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ 號碼錯誤"
-
-#~ msgid "Group Description"
-#~ msgstr "群組描述"
-
-#~ msgid "Auth"
-#~ msgstr "認證"
-
-#~ msgid "Approve"
-#~ msgstr "允許"
-
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr "管理人 %2$d 允許了您加入群組 %1$d"
-
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "[%d] 退出了群組「%d」"
-
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "[%d] 已經被加入群組 \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "我是成員"
-
-# NOTE 這是 QQ_ROOM_ROLE_REQUESTING,按上文下理應係指「申請成為成員中」
-#~ msgid "I am requesting"
-#~ msgstr "我正在要求加入"
-
-#~ msgid "I am the admin"
-#~ msgstr "我是管理人"
-
-#~ msgid "Unknown status"
-#~ msgstr "狀態不明"
-
-#~ msgid "Remove from Qun"
-#~ msgstr "從群組中移除"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "指定的群組 ID 在有效範圍之外"
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "您確定要離開群組?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "允許這個要求?"
-
-#~ msgid "Change Qun member"
-#~ msgstr "修改群組號碼"
-
-#~ 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 "設定我的資訊"
-
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "離開這個 QQ 群 (Qun)"
-
-#~ msgid "Block this buddy"
-#~ msgstr "封鎖這個好友"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "符記回應碼「0x%02X」無效"
-
-#~ msgid "Unable login for not support Redirect_EX now"
-#~ msgstr "無法登入,暫時不支援 Redirect_EX 功能"
-
-#~ msgid "Error password: %s"
-#~ msgstr "密碼錯誤:%s"
-
-# FIXME 不知這是什麼,但我想可能是這樣 - acli 20080930
-#~ msgid "Need active: %s"
-#~ msgstr "需要啟動帳號:%s"
-
-# XXX 看不明原始碼,這是半猜 - 20080930 acli
-#~ msgid "Failed to connect all servers"
-#~ msgstr "無法連線到所有伺服器"
-
-#  XXX 20080810 acli - 原文好像有問題
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "連線伺服器 %s 中,將會嘗試 %d 次"
-
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "允許這個要求?"
-
-#~ msgid "Do you add the buddy?"
-#~ msgstr "您要加入這個使用者到好友清單中嗎?"
-
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s 將您 [%s] 加入他(她)的好友清單。"
-
-#~ msgid "QQ Budy"
-#~ msgstr "QQ 好友"
-
-#~ msgid "Requestion approved by %s"
-#~ msgstr "使用者「%s」允許了您的要求"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s 想要將您 [%s] 加入他(她)的好友清單"
-
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s 不在您的好友清單內"
-
-# FIXME fix the original string :P
-#~ msgid "Would you add?"
-#~ msgstr "您要將他(她)加入您的好友清單嗎?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#~ msgid "QQ Server Notice"
-#~ msgstr "QQ 伺服器通告"
-
-#~ msgid "developer"
-#~ msgstr "開發者"
-
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP 開發者"