changeset 31312:e53f81486d57

propagate from branch 'im.pidgin.pidgin' (head 5b9ae21a0927d9a160964bfb1cad7a43253fba0d) to branch 'im.pidgin.cpw.qulogic.msnp16' (head 49bf2f5880edfe6f07decbf14418f2032ba59ad0)
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sat, 31 Jul 2010 23:42:35 +0000
parents 562498203fe8 (current diff) 76049fde7ad2 (diff)
children c49697f075cf
files libpurple/protocols/msn/dialog.c libpurple/protocols/msn/dialog.h libpurple/protocols/msn/msn.c libpurple/protocols/msn/notification.c libpurple/protocols/msn/notification.h libpurple/protocols/msn/session.c libpurple/protocols/msn/session.h libpurple/protocols/msn/slp.c libpurple/protocols/msn/slplink.c libpurple/protocols/msn/switchboard.c libpurple/protocols/msn/sync.c libpurple/protocols/msn/sync.h libpurple/protocols/msn/user.h
diffstat 211 files changed, 13424 insertions(+), 9171 deletions(-) [+]
line wrap: on
line diff
--- a/COPYRIGHT	Wed Jun 02 20:08:53 2010 +0000
+++ b/COPYRIGHT	Sat Jul 31 23:42:35 2010 +0000
@@ -512,9 +512,11 @@
 Kyle Turman
 Jon Turney
 Junichi Uekawa
+Max Ulidtko
 Igor Vlasenko
 István Váradi
 Martijn van Beers
+Gideon van Melle
 Arjan van de Ven
 Philip Van Hoof
 Kristof Vansant
--- a/ChangeLog	Wed Jun 02 20:08:53 2010 +0000
+++ b/ChangeLog	Sat Jul 31 23:42:35 2010 +0000
@@ -1,6 +1,80 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.2 (??/??/????):
+version 2.7.3 (??/??/????):
+	General:
+	* Use silent build rules for automake >1.11. You can enable verbose
+	  builds with the --disable-silent-rules configure option, or using
+	  make V=1.
+
+	libpurple:
+	* Fix the TURN server settings (broken in 2.7.0).
+
+	Pidgin:
+	* Re-focus the input area after clicking the attention toolbar button.
+	* Re-arrange media window to make it more netbook-friendly.
+
+	Finch:
+	* Rebindable 'suggest-next-page' and 'suggest-prev-page' actions for
+	  textboxes (GntEntry) to scroll through list of suggestions.
+	* Rebindable 'dropdown' action for comboboxes (GntComboBox) to show the
+	  dropdown list of options.
+
+	IRC:
+	* Fix non-ASCII arguments to /mode et al.  (thanks to Max Ulidtko)
+
+	MSN:
+	* Support for web-based buddy icons, used when a buddy logs in to the
+	  messenger on the Live website.
+
+	MXit:
+	* Fix filename for the Shocked emoticon. (#12364)
+	* Implement the new naming conventions where possible. (MXitId, etc)
+	* Display a message in the Groupchat window when you invite somebody.
+	* Birthday field in profile cannot be edited when server says it is
+	  locked.
+	* If a buddy is offline, show in their profile when last they were online.
+	* Handle pushed profile update packets (ie, when changing your avatar via
+	  the Gallery bot).
+	* If a buddy is offline and we see from their profile that they have
+	  updated their avatar, request the new avatar image from the server.
+	* Fix a possible crash if a link is clicked while disconnected.
+	* New MXit Moods and Emoticons.
+
+	XMPP:
+	* Allow connecting to servers that only advertise GSSAPI and expect
+	  a fallback to legacy IQ authentication (broken in 2.7.0).
+	* Fix a crash when receiving custom emoticons that don't adhere to
+	  the specification.
+	* When initiating a file transfer, don't show resources that are certain
+	  to not support file transfers in the resource selection dialog.
+	* Fix connecting to servers using BOSH and authenticating with
+	  DIGEST-MD5 when libpurple was built with Cyrus SASL support.
+
+	Yahoo/Yahoo JAPAN:
+	* Renamed "Use account proxy for SSL connections" to "Use account proxy
+	  for HTTP and HTTPS requests" and tied the option to HTTP requests too.
+	* Properly detect HTTP proxy server use when the HTTP proxy is the
+	  global proxy server, an account-level non-HTTP proxy server is
+	  configured, and the "Use account proxy for HTTP and HTTPS requests"
+	  account option is turned off.  This fixes connecting for some HTTP
+	  proxy servers.
+	* Fall back to connecting to scsa.msg.yahoo.com (not configurable) if
+	  the HTTP-based connect server lookup fails.  This does not work for
+	  Yahoo JAPAN accounts.
+	* Fix file transfers that get stuck with "Waiting for transfer to
+	  begin".
+
+version 2.7.2 (07/21/2010):
+	AIM and ICQ:
+	* Fix a crash bug related to X-Status messages that can be triggered by
+	  remove users.  This is CVE-2010-2528.
+	* Fix a rare crash bug caused by certain incoming SMS messages
+	  (discovered by Jan Kaluza--thanks Jan!).
+	* Change HTML sent from ICQ accounts so that official ICQ clients
+	  hopefully display it correctly.
+
+	MSN:
+	* Fix a crash related to fast buddy icon transfers.
 
 version 2.7.1 (05/29/2010):
 	General:
--- a/ChangeLog.API	Wed Jun 02 20:08:53 2010 +0000
+++ b/ChangeLog.API	Sat Jul 31 23:42:35 2010 +0000
@@ -1,6 +1,34 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.7.2 (??/??/????):
+version 2.7.3 (??/??/????):
+	libpurple:
+		Fixed:
+		* purple_account_[gs]et_public_alias no longer crash when
+		  called for a protocol that doesn't support the underlying
+		  calls and the caller does not specify a failure callback.
+
+	Perl:
+		Added:
+		* Exposed log-subsystem signals.
+
+	Pidgin:
+		Changed:
+		* Changing the visibility (gtk_widget_hide/show) of
+		  the widgets in the GtkIMHtmlToolbar should now affect
+		  the visibility of the entries in the 'lean' view
+		  (the default toolbar view).
+
+		Deprecated:
+		* pidgin_check_if_dir
+
+	libgnt:
+		Added:
+		* gnt_tree_row_get_key, gnt_tree_row_get_next,
+		  gnt_tree_row_get_prev, gnt_tree_row_get_child and
+		  gnt_tree_row_get_parent.
+
+version 2.7.2 (07/21/2010):
+	* No changes
 
 version 2.7.1 (05/29/2010):
 	* No changes
--- a/ChangeLog.win32	Wed Jun 02 20:08:53 2010 +0000
+++ b/ChangeLog.win32	Sat Jul 31 23:42:35 2010 +0000
@@ -1,6 +1,9 @@
 Starting with Pidgin version 2.7.1, this ChangeLog file will no longer be
 updated.  It will be kept in the source tree for historical reasons only.
 
+version 2.7.1 (05/29/2010):
+	* No changes
+
 version 2.7.0 (05/12/2010):
 	* Updated GTK+ to 2.16.6
 	* Private GTK+ Runtime now used (GTK+ Installer no longer supported)
--- a/Makefile.am	Wed Jun 02 20:08:53 2010 +0000
+++ b/Makefile.am	Sat Jul 31 23:42:35 2010 +0000
@@ -100,18 +100,18 @@
 # creates, and also make sure that the shell command exits
 # successfully; the rm -f ensures both
 package_revision_raw.txt:
-	REAL_BLDDIR=$$PWD/$(top_builddir); \
+	$(AM_V_GEN)REAL_BLDDIR=$$PWD/$(top_builddir); \
 	(cd $(srcdir) && $$REAL_BLDDIR/mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
 	|| (cd $(srcdir) && mtn --root=. automate get_base_revision_id) 2>/dev/null >$@ \
 	|| rm -f $@
 package_revision.h: package_revision_raw.txt
-	if test -f $<; then \
+	$(AM_V_GEN)if test -f $<; then \
 	  echo "#define REVISION \"`cat $<`\"" > $@; \
 	fi
-	if test ! -f $@ -a -f $(srcdir)/$@; then \
+	$(AM_V_at)if test ! -f $@ -a -f $(srcdir)/$@; then \
 	  cp $(srcdir)/$@ $@; \
 	fi
-	test -f $@ || echo "#define REVISION \"unknown\"" > $@
+	$(AM_V_at)test -f $@ || echo "#define REVISION \"unknown\"" > $@
 
 # This is a magic directive copy-and-pasted, then modified, from the
 # automake 1.9 manual, section 13.4, "Checking the distribution".
@@ -136,7 +136,7 @@
 if HAVE_XSLTPROC
 	@echo "Generating devhelp index..."
 	@xsltproc $(top_srcdir)/doxy2devhelp.xsl doc/xml/index.xml > doc/html/pidgin.devhelp
-	@echo "(Symlink doc/html to ~/.local/share/gtk-doc/html/pidgin to make devhelp see the documentation)"
+	@echo "(Symlink $$(pwd)/doc/html to ~/.local/share/gtk-doc/html/pidgin to make devhelp see the documentation)"
 else
 	@echo "Not generating devhelp index: xsltproc was not found by configure"
 endif
--- a/Makefile.mingw	Wed Jun 02 20:08:53 2010 +0000
+++ b/Makefile.mingw	Sat Jul 31 23:42:35 2010 +0000
@@ -107,7 +107,7 @@
 	rm -f pidgin/win32/nsis/pidgin-translations.nsh pidgin/win32/nsis/pidgin-spellcheck.nsh pidgin/win32/nsis/pidgin-spellcheck-preselect.nsh
 	find $(STRIPPED_RELEASE_DIR)/locale -maxdepth 1 -mindepth 1 \
 	 -exec basename {} ';' \
-	 | sed -e s/^/\!insertmacro\ LANG_SECTION\ \"/ -e s/$$/\"/ \
+	 | LC_ALL=C sort | sed -e s/^/\!insertmacro\ LANG_SECTION\ \"/ -e s/$$/\"/ \
 	 > pidgin/win32/nsis/pidgin-translations.nsh
 	#Convert the available.lst lines to "!insertmacro SPELLCHECK_SECTION lang lang_name lang_file"
 	sed -e "/^#/d" -e "s/^[^,]\{1,\},[^,]\{1,\},/\"/" \
--- a/NEWS	Wed Jun 02 20:08:53 2010 +0000
+++ b/NEWS	Sat Jul 31 23:42:35 2010 +0000
@@ -2,6 +2,11 @@
 
 Our development blog is available at: http://planet.pidgin.im
 
+2.7.2 (07/21/2010):
+	Mark: We discovered a security issue in Pidgin 2.7.0 and 2.7.1 and
+	decided to release a patched version quickly.  This release contains
+	the fix for that crash, and a few other minor fixes.
+
 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
@@ -12,7 +17,7 @@
 	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!
--- a/configure.ac	Wed Jun 02 20:08:53 2010 +0000
+++ b/configure.ac	Sat Jul 31 23:42:35 2010 +0000
@@ -46,16 +46,16 @@
 m4_define([purple_lt_current], [7])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [7])
-m4_define([purple_micro_version], [2])
+m4_define([purple_micro_version], [3])
 m4_define([purple_version_suffix], [devel])
 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]))
 
-m4_define([gnt_lt_current], [7])
+m4_define([gnt_lt_current], [8])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [7])
-m4_define([gnt_micro_version], [2])
+m4_define([gnt_minor_version], [8])
+m4_define([gnt_micro_version], [0])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
@@ -75,6 +75,8 @@
 AC_CANONICAL_HOST
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([1.9 -Wno-portability dist-bzip2])
+dnl TODO: Always use AM_SILENT_RULES when we depend on automake >= 1.11
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
 PURPLE_MAJOR_VERSION=purple_major_version
 PURPLE_MINOR_VERSION=purple_minor_version
@@ -660,6 +662,10 @@
 		for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include
 		do
 			f="$location/ncurses.h"
+			orig_CFLAGS="$CFLAGS"
+			orig_CPPFLAGS="$CPPFLAGS"
+			CFLAGS="$CFLAGS -I$location"
+			CPPFLAGS="$CPPFLAGS -I$location"
 			AC_CHECK_HEADER($f,[
 				AC_MSG_CHECKING([if $f supports wide characters])
 				AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
@@ -678,9 +684,13 @@
 					fi
 
 					found_ncurses_h=yes
+					CFLAGS="$orig_CFLAGS"
+					CPPFLAGS="$orig_CPPFLAGS"
 					AC_MSG_RESULT([yes])
 					break
 				], [
+					CFLAGS="$orig_CFLAGS"
+					CPPFLAGS="$orig_CPPFLAGS"
 					AC_MSG_RESULT([no])
 				])
 			])
--- a/doc/finch.1.in	Wed Jun 02 20:08:53 2010 +0000
+++ b/doc/finch.1.in	Sat Jul 31 23:42:35 2010 +0000
@@ -59,7 +59,7 @@
 Display the version information window.
 
 .SH GNT Shortcuts
-You can use the following shortcuts (see the "\*QWidget Actions\*U" section for a more complete list):
+You can use the following shortcuts (see the "Widget Actions" section for a more complete list):
 .TP
 .B Alt \+ a
 Bring up a list of available actions. You can use this list to access the
@@ -305,6 +305,13 @@
 left = focus-prev
 
 .br
+[GntComboBox::binding]
+.br
+down = dropdown
+.br
+up = dropdown
+
+.br
 [GntEntry::binding]
 .br
 c-a = cursor-home
@@ -339,6 +346,10 @@
 .br
 up = suggest-prev
 .br
+page-down = suggest-next-page
+.br
+page-up = suggest-prev-page
+.br
 c-w = delete-prev-word
 .br
 a-b = cursor-prev-word
@@ -496,6 +507,10 @@
 .br
 a-/ = help-for-widget
 .br
+a-c-j = window-scroll-down
+.br
+a-c-k = window-scroll-up
+.br
 # The following action is still incomplete, and doesn't have a default binding
 .br
 # switch-window-n
--- a/finch/finch.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/finch.c	Sat Jul 31 23:42:35 2010 +0000
@@ -252,6 +252,7 @@
 	gboolean opt_version = FALSE;
 	char *opt_config_dir_arg = NULL;
 	gboolean debug_enabled = FALSE;
+	struct stat st;
 
 	struct option long_options[] = {
 		{"config",   required_argument, NULL, 'c'},
@@ -361,6 +362,8 @@
 	purple_idle_set_ui_ops(finch_idle_get_ui_ops());
 
 	path = g_build_filename(purple_user_dir(), "plugins", NULL);
+	if (!g_stat(path, &st))
+		g_mkdir(path, S_IRUSR | S_IWUSR | S_IXUSR);
 	purple_plugins_add_search_path(path);
 	g_free(path);
 
--- a/finch/gntaccount.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/gntaccount.c	Sat Jul 31 23:42:35 2010 +0000
@@ -125,7 +125,8 @@
 
 	if (value == NULL || *value == '\0')
 	{
-		purple_notify_error(NULL, _("Error"), _("Account was not added"),
+		purple_notify_error(NULL, _("Error"),
+				dialog->account ? _("Account was not modified") : _("Account was not added"),
 				_("Username of an account must be non-empty."));
 		return;
 	}
@@ -160,8 +161,28 @@
 		account = dialog->account;
 
 		/* Protocol */
-		purple_account_set_protocol_id(account, purple_plugin_get_id(plugin));
-		purple_account_set_username(account, username->str);
+		if (purple_account_is_disconnected(account)) {
+			purple_account_set_protocol_id(account, purple_plugin_get_id(plugin));
+			purple_account_set_username(account, username->str);
+		} else {
+			const char *old = purple_account_get_protocol_id(account);
+			char *oldprpl;
+			if (strcmp(old, purple_plugin_get_id(plugin))) {
+				purple_notify_error(NULL, _("Error"), _("Account was not modified"),
+						_("The account's protocol cannot be changed while it is connected to the server."));
+				return;
+			}
+
+			oldprpl = g_strdup(purple_normalize(account, purple_account_get_username(account)));
+			if (g_utf8_collate(oldprpl, purple_normalize(account, username->str))) {
+				purple_notify_error(NULL, _("Error"), _("Account was not modified"),
+						_("The account's username cannot be changed while it is connected to the server."));
+				g_free(oldprpl);
+				return;
+			}
+			g_free(oldprpl);
+			purple_account_set_username(account, username->str);
+		}
 	}
 	g_string_free(username, TRUE);
 
@@ -245,6 +266,17 @@
 		}
 	}
 
+	/* In case of a new account, the 'Accounts' window is updated from the account-added
+	 * callback. In case of changes in an existing account, we need to explicitly do it
+	 * here.
+	 */
+	if (dialog->account != NULL && accounts.window) {
+		gnt_tree_change_text(GNT_TREE(accounts.tree), dialog->account,
+				0, purple_account_get_username(dialog->account));
+		gnt_tree_change_text(GNT_TREE(accounts.tree), dialog->account,
+				1, purple_account_get_protocol_name(dialog->account));
+	}
+
 	gnt_widget_destroy(dialog->window);
 }
 
@@ -603,7 +635,7 @@
 	button = gnt_button_new(_("Cancel"));
 	gnt_box_add_widget(GNT_BOX(hbox), button);
 	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(gnt_widget_destroy), window);
-	
+
 	button = gnt_button_new(_("Save"));
 	gnt_box_add_widget(GNT_BOX(hbox), button);
 	g_signal_connect_swapped(G_OBJECT(button), "activate", G_CALLBACK(save_account_cb), dialog);
--- a/finch/gntdebug.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/gntdebug.c	Sat Jul 31 23:42:35 2010 +0000
@@ -77,7 +77,10 @@
 		}
 		return;
 	}
-	pipe(pipes);
+	if (pipe(pipes)) {
+		readhandle = -1;
+		return;
+	};
 	dup2(pipes[1], STDERR_FILENO);
 
 	stderrch = g_io_channel_unix_new(pipes[0]);
--- a/finch/gntrequest.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/gntrequest.c	Sat Jul 31 23:42:35 2010 +0000
@@ -349,10 +349,9 @@
 			}
 			else if (type == PURPLE_REQUEST_FIELD_LIST)
 			{
-				GList *list = NULL;
+				GList *list = NULL, *iter;
 				if (purple_request_field_list_get_multi_select(field))
 				{
-					GList *iter;
 					GntWidget *tree = FINCH_GET_DATA(field);
 
 					iter = purple_request_field_list_get_items(field);
@@ -361,14 +360,23 @@
 						const char *text = iter->data;
 						gpointer key = purple_request_field_list_get_data(field, text);
 						if (gnt_tree_get_choice(GNT_TREE(tree), key))
-							list = g_list_prepend(list, key);
+							list = g_list_prepend(list, (gpointer)text);
 					}
 				}
 				else
 				{
 					GntWidget *combo = FINCH_GET_DATA(field);
 					gpointer data = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo));
-					list = g_list_append(list, data);
+
+					iter = purple_request_field_list_get_items(field);
+					for (; iter; iter = iter->next) {
+						const char *text = iter->data;
+						gpointer key = purple_request_field_list_get_data(field, text);
+						if (key == data) {
+							list = g_list_prepend(list, (gpointer)text);
+							break;
+						}
+					}
 				}
 
 				purple_request_field_list_set_selected(field, list);
@@ -815,7 +823,7 @@
 	for (list = purple_request_fields_get_groups(allfields); list; list = list->next) {
 		PurpleRequestFieldGroup *group = list->data;
 		GList *fields = purple_request_field_group_get_fields(group);
-		
+
 		for (; fields ; fields = fields->next) {
 			PurpleRequestField *field = fields->data;
 			PurpleRequestFieldType type = purple_request_field_get_type(field);
@@ -826,6 +834,7 @@
 			switch (type) {
 				case PURPLE_REQUEST_FIELD_LIST:
 					val = purple_request_field_list_get_selected(field)->data;
+					val = purple_request_field_list_get_data(field, val);
 					break;
 				case PURPLE_REQUEST_FIELD_BOOLEAN:
 					val = GINT_TO_POINTER(purple_request_field_bool_get_value(field));
--- a/finch/gntsound.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/gntsound.c	Sat Jul 31 23:42:35 2010 +0000
@@ -104,7 +104,8 @@
 	{PURPLE_SOUND_CHAT_YOU_SAY, N_("You talk in chat"), "send_chat_msg", "send.wav", NULL},
 	{PURPLE_SOUND_CHAT_SAY,     N_("Others talk in chat"), "chat_msg_recv", "receive.wav", NULL},
 	{PURPLE_SOUND_POUNCE_DEFAULT, NULL, "pounce_default", "alert.wav", NULL},
-	{PURPLE_SOUND_CHAT_NICK,    N_("Someone says your username in chat"), "nick_said", "alert.wav", NULL}
+	{PURPLE_SOUND_CHAT_NICK,    N_("Someone says your username in chat"), "nick_said", "alert.wav", NULL},
+	{PURPLE_SOUND_GOT_ATTENTION, N_("Attention received"), "got_attention", "alert.wav", NULL}
 };
 
 const char *
@@ -273,6 +274,14 @@
 		play_conv_event(conv, event);
 }
 
+static void
+got_attention_cb(PurpleAccount *account, const char *who,
+	PurpleConversation *conv, guint type, PurpleSoundEventID event)
+{
+	play_conv_event(conv, event);
+}
+
+
 /*
  * We mute sounds for the 10 seconds after you log in so that
  * you don't get flooded with sounds when the blist shows all
@@ -300,34 +309,22 @@
 static void
 initialize_profile(const char *name, PurplePrefType type, gconstpointer val, gpointer null)
 {
+	FinchSoundEvent *event;
 	if (purple_prefs_exists(make_pref("")))
 		return;
 
 	purple_prefs_add_none(make_pref(""));
 	purple_prefs_add_none(make_pref("/enabled"));
 	purple_prefs_add_none(make_pref("/file"));
-	purple_prefs_add_bool(make_pref("/enabled/login"), FALSE);
-	purple_prefs_add_path(make_pref("/file/login"), "");
-	purple_prefs_add_bool(make_pref("/enabled/logout"), FALSE);
-	purple_prefs_add_path(make_pref("/file/logout"), "");
-	purple_prefs_add_bool(make_pref("/enabled/im_recv"), FALSE);
-	purple_prefs_add_path(make_pref("/file/im_recv"), "");
-	purple_prefs_add_bool(make_pref("/enabled/first_im_recv"), FALSE);
-	purple_prefs_add_path(make_pref("/file/first_im_recv"), "");
-	purple_prefs_add_bool(make_pref("/enabled/send_im"), FALSE);
-	purple_prefs_add_path(make_pref("/file/send_im"), "");
-	purple_prefs_add_bool(make_pref("/enabled/join_chat"), FALSE);
-	purple_prefs_add_path(make_pref("/file/join_chat"), "");
-	purple_prefs_add_bool(make_pref("/enabled/left_chat"), FALSE);
-	purple_prefs_add_path(make_pref("/file/left_chat"), "");
-	purple_prefs_add_bool(make_pref("/enabled/send_chat_msg"), FALSE);
-	purple_prefs_add_path(make_pref("/file/send_chat_msg"), "");
-	purple_prefs_add_bool(make_pref("/enabled/chat_msg_recv"), FALSE);
-	purple_prefs_add_path(make_pref("/file/chat_msg_recv"), "");
-	purple_prefs_add_bool(make_pref("/enabled/nick_said"), FALSE);
-	purple_prefs_add_path(make_pref("/file/nick_said"), "");
-	purple_prefs_add_bool(make_pref("/enabled/pounce_default"), FALSE);
-	purple_prefs_add_path(make_pref("/file/pounce_default"), "");
+
+	for (event = sounds; event - sounds < PURPLE_NUM_SOUNDS; event++) {
+		char pref[512];
+		g_snprintf(pref, sizeof(pref), "/enabled/%s", event->pref);
+		purple_prefs_add_bool(make_pref(pref), FALSE);
+		g_snprintf(pref, sizeof(pref), "/file/%s", event->pref);
+		purple_prefs_add_path(make_pref(pref), "");
+	}
+
 	purple_prefs_add_bool(make_pref("/conv_focus"), FALSE);
 	purple_prefs_add_bool(make_pref("/mute"), FALSE);
 	purple_prefs_add_path(make_pref("/command"), "");
@@ -336,6 +333,25 @@
 }
 
 static void
+update_profiles(void)
+{
+	GList *list = finch_sound_get_profiles();
+	for (; list; list = g_list_delete_link(list, list)) {
+		char pname[512];
+
+		/* got_attention was added in libpurple 2.7.0 */
+		g_snprintf(pname, sizeof(pname), FINCH_PREFS_ROOT "/sound/profiles/%s%s",
+				(char *)list->data, "/enabled/got_attention");
+		purple_prefs_add_bool(pname, FALSE);
+		g_snprintf(pname, sizeof(pname), FINCH_PREFS_ROOT "/sound/profiles/%s%s",
+				(char *)list->data, "/file/got_attention");
+		purple_prefs_add_path(pname, "");
+
+		g_free(list->data);
+	}
+}
+
+static void
 finch_sound_init(void)
 {
 	void *gnt_sound_handle = finch_sound_get_handle();
@@ -356,7 +372,7 @@
 	purple_prefs_connect_callback(gnt_sound_handle, FINCH_PREFS_ROOT "/sound/actprofile", initialize_profile, NULL);
 	purple_prefs_trigger_callback(FINCH_PREFS_ROOT "/sound/actprofile");
 
-	
+
 #ifdef USE_GSTREAMER
 	purple_debug_info("sound", "Initializing sound output drivers.\n");
 #if (GST_VERSION_MAJOR > 0 || \
@@ -399,6 +415,11 @@
 	purple_signal_connect(conv_handle, "received-chat-msg",
 						gnt_sound_handle, PURPLE_CALLBACK(chat_msg_received_cb),
 						GINT_TO_POINTER(PURPLE_SOUND_CHAT_SAY));
+	purple_signal_connect(conv_handle, "got-attention",
+						gnt_sound_handle, PURPLE_CALLBACK(got_attention_cb),
+						GINT_TO_POINTER(PURPLE_SOUND_GOT_ATTENTION));
+
+	update_profiles();
 }
 
 static void
@@ -577,7 +598,8 @@
 	if ((event == PURPLE_SOUND_BUDDY_ARRIVE) && mute_login_sounds)
 		return;
 
-	if (event >= PURPLE_NUM_SOUNDS) {
+	if (event >= PURPLE_NUM_SOUNDS ||
+			event >= G_N_ELEMENTS(sounds)) {
 		purple_debug_error("sound", "got request for unknown sound: %d\n", event);
 		return;
 	}
--- a/finch/libgnt/configure.ac	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/libgnt/configure.ac	Sat Jul 31 23:42:35 2010 +0000
@@ -24,9 +24,9 @@
 # Make sure to update ../../configure.ac with libgnt version changes.
 #
 
-m4_define([gnt_lt_current], [7])
+m4_define([gnt_lt_current], [8])
 m4_define([gnt_major_version], [2])
-m4_define([gnt_minor_version], [7])
+m4_define([gnt_minor_version], [8])
 m4_define([gnt_micro_version], [0])
 m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
@@ -265,6 +265,10 @@
 	for location in $ac_ncurses_includes /usr/include/ncursesw /usr/include
 	do
 		f="$location/ncurses.h"
+		orig_CFLAGS="$CFLAGS"
+		orig_CPPFLAGS="$CPPFLAGS"
+		CFLAGS="$CFLAGS -I$location"
+		CPPFLAGS="$CPPFLAGS -I$location"
 		AC_CHECK_HEADER($f,[
 			AC_MSG_CHECKING([if $f supports wide characters])
 			AC_TRY_COMPILE([
@@ -283,9 +287,13 @@
 				fi
 
 				found_ncurses_h=yes
+				CFLAGS="$orig_CFLAGS"
+				CPPFLAGS="$orig_CPPFLAGS"
 				AC_MSG_RESULT([yes])
 				break
 			], [
+				CFLAGS="$orig_CFLAGS"
+				CPPFLAGS="$orig_CPPFLAGS"
 				AC_MSG_RESULT([no])
 			])
 		])
--- a/finch/libgnt/gntbox.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/libgnt/gntbox.c	Sat Jul 31 23:42:35 2010 +0000
@@ -422,7 +422,9 @@
 
 		gnt_widget_get_size(wid, &w, &h);
 
-		if (wid != last && !child && w > 0 && h > 0 && gnt_widget_confirm_size(wid, w - wchange, h - hchange)) {
+		if (wid != last && !child && w > 0 && h > 0 &&
+				!GNT_WIDGET_IS_FLAG_SET(wid, GNT_WIDGET_INVISIBLE) &&
+				gnt_widget_confirm_size(wid, w - wchange, h - hchange)) {
 			child = wid;
 			break;
 		}
--- a/finch/libgnt/gntcombobox.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/libgnt/gntcombobox.c	Sat Jul 31 23:42:35 2010 +0000
@@ -25,6 +25,7 @@
 #include "gntcombobox.h"
 #include "gnttree.h"
 #include "gntmarshal.h"
+#include "gntstyle.h"
 #include "gntutils.h"
 
 #include <string.h>
@@ -149,12 +150,11 @@
 gnt_combo_box_key_pressed(GntWidget *widget, const char *text)
 {
 	GntComboBox *box = GNT_COMBO_BOX(widget);
-	if (GNT_WIDGET_IS_FLAG_SET(box->dropdown->parent, GNT_WIDGET_MAPPED))
-	{
-		if (text[1] == 0)
-		{
-			switch (text[0])
-			{
+	gboolean showing = !!GNT_WIDGET_IS_FLAG_SET(box->dropdown->parent, GNT_WIDGET_MAPPED);
+
+	if (showing) {
+		if (text[1] == 0) {
+			switch (text[0]) {
 				case '\r':
 				case '\t':
 				case '\n':
@@ -165,20 +165,42 @@
 					return TRUE;
 			}
 		}
-		if (gnt_widget_key_pressed(box->dropdown, text))
-			return TRUE;
 	}
-	else
+
+	if (gnt_widget_key_pressed(box->dropdown, text)) {
+		if (!showing)
+			popup_dropdown(box);
+		return TRUE;
+	}
+
 	{
-		if (text[0] == 27)
-		{
-			if (strcmp(text, GNT_KEY_UP) == 0 ||
-					strcmp(text, GNT_KEY_DOWN) == 0)
-			{
-				popup_dropdown(box);
-				return TRUE;
-			}
-		}
+#define SEARCH_IN_RANGE(start, end) do { \
+		GntTreeRow *row; \
+		for (row = start; row != end; \
+				row = gnt_tree_row_get_next(tree, row)) { \
+			gpointer key = gnt_tree_row_get_key(tree, row); \
+			GList *list = gnt_tree_get_row_text_list(tree, key); \
+			gboolean found = FALSE; \
+			found = (list->data && g_ascii_strncasecmp(text, list->data, len) == 0); \
+			g_list_foreach(list, (GFunc)g_free, NULL); \
+			g_list_free(list); \
+			if (found) { \
+				if (!showing) \
+					popup_dropdown(box); \
+				gnt_tree_set_selected(tree, key); \
+				return TRUE; \
+			} \
+		} \
+} while (0)
+
+		int len = strlen(text);
+		GntTree *tree = GNT_TREE(box->dropdown);
+		GntTreeRow *current = tree->current;
+
+		SEARCH_IN_RANGE(gnt_tree_row_get_next(tree, current), NULL);
+		SEARCH_IN_RANGE(tree->top, current);
+
+#undef SEARCH_IN_RANGE
 	}
 
 	return FALSE;
@@ -229,9 +251,20 @@
 	gnt_widget_set_size(box->dropdown, widget->priv.width - 1, box->dropdown->priv.height);
 }
 
+static gboolean
+dropdown_menu(GntBindable *b, GList *null)
+{
+	if (GNT_WIDGET_IS_FLAG_SET(GNT_COMBO_BOX(b)->dropdown->parent, GNT_WIDGET_MAPPED))
+		return FALSE;
+	popup_dropdown(GNT_COMBO_BOX(b));
+	return TRUE;
+}
+
 static void
 gnt_combo_box_class_init(GntComboBoxClass *klass)
 {
+	GntBindableClass *bindable = GNT_BINDABLE_CLASS(klass);
+
 	parent_class = GNT_WIDGET_CLASS(klass);
 
 	parent_class->destroy = gnt_combo_box_destroy;
@@ -245,7 +278,7 @@
 	widget_lost_focus = parent_class->lost_focus;
 	parent_class->lost_focus = gnt_combo_box_lost_focus;
 
-	signals[SIG_SELECTION_CHANGED] = 
+	signals[SIG_SELECTION_CHANGED] =
 		g_signal_new("selection-changed",
 					 G_TYPE_FROM_CLASS(klass),
 					 G_SIGNAL_RUN_LAST,
@@ -254,6 +287,12 @@
 					 gnt_closure_marshal_VOID__POINTER_POINTER,
 					 G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_POINTER);
 
+	gnt_bindable_class_register_action(bindable, "dropdown", dropdown_menu,
+			GNT_KEY_DOWN, NULL);
+	gnt_bindable_register_binding(bindable, "dropdown", GNT_KEY_UP, NULL);
+
+	gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), bindable);
+
 	GNTDEBUG;
 }
 
@@ -272,7 +311,7 @@
 	GNT_WIDGET_SET_FLAGS(box, GNT_WIDGET_NO_SHADOW | GNT_WIDGET_NO_BORDER | GNT_WIDGET_TRANSIENT);
 	gnt_box_set_pad(GNT_BOX(box), 0);
 	gnt_box_add_widget(GNT_BOX(box), combo->dropdown);
-	
+
 	widget->priv.minw = 4;
 	widget->priv.minh = 3;
 	GNTDEBUG;
--- a/finch/libgnt/gntentry.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/libgnt/gntentry.c	Sat Jul 31 23:42:35 2010 +0000
@@ -579,6 +579,28 @@
 }
 
 static gboolean
+suggest_next_page(GntBindable *bind, GList *null)
+{
+	GntEntry *entry = GNT_ENTRY(bind);
+	if (entry->ddown) {
+		gnt_bindable_perform_action_named(GNT_BINDABLE(entry->ddown), "page-down", NULL);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean
+suggest_prev_page(GntBindable *bind, GList *null)
+{
+	GntEntry *entry = GNT_ENTRY(bind);
+	if (entry->ddown) {
+		gnt_bindable_perform_action_named(GNT_BINDABLE(entry->ddown), "page-up", NULL);
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static gboolean
 del_to_home(GntBindable *bind, GList *null)
 {
 	GntEntry *entry = GNT_ENTRY(bind);
@@ -986,6 +1008,10 @@
 				GNT_KEY_DOWN, NULL);
 	gnt_bindable_class_register_action(bindable, "suggest-prev", suggest_prev,
 				GNT_KEY_UP, NULL);
+	gnt_bindable_class_register_action(bindable, "suggest-next-page", suggest_next_page,
+				GNT_KEY_PGDOWN, NULL);
+	gnt_bindable_class_register_action(bindable, "suggest-prev-page", suggest_prev_page,
+				GNT_KEY_PGUP, NULL);
 	gnt_bindable_class_register_action(bindable, "history-next", history_next,
 				GNT_KEY_CTRL_DOWN, NULL);
 	gnt_bindable_class_register_action(bindable, "history-prev", history_prev,
--- a/finch/libgnt/gnttree.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/libgnt/gnttree.c	Sat Jul 31 23:42:35 2010 +0000
@@ -1926,3 +1926,33 @@
 	return (row && row->parent) ? row->parent->key : NULL;
 }
 
+gpointer gnt_tree_row_get_key(GntTree *tree, GntTreeRow *row)
+{
+	g_return_val_if_fail(row && row->tree == tree, NULL);
+	return row->key;
+}
+
+GntTreeRow * gnt_tree_row_get_next(GntTree *tree, GntTreeRow *row)
+{
+	g_return_val_if_fail(row && row->tree == tree, NULL);
+	return row->next;
+}
+
+GntTreeRow * gnt_tree_row_get_prev(GntTree *tree, GntTreeRow *row)
+{
+	g_return_val_if_fail(row && row->tree == tree, NULL);
+	return row->prev;
+}
+
+GntTreeRow * gnt_tree_row_get_child(GntTree *tree, GntTreeRow *row)
+{
+	g_return_val_if_fail(row && row->tree == tree, NULL);
+	return row->child;
+}
+
+GntTreeRow * gnt_tree_row_get_parent(GntTree *tree, GntTreeRow *row)
+{
+	g_return_val_if_fail(row && row->tree == tree, NULL);
+	return row->parent;
+}
+
--- a/finch/libgnt/gnttree.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/libgnt/gnttree.h	Sat Jul 31 23:42:35 2010 +0000
@@ -222,6 +222,61 @@
 GList * gnt_tree_get_row_text_list(GntTree *tree, gpointer key);
 
 /**
+ * Get the key of a row.
+ *
+ * @param tree   The tree
+ * @param row    The GntTreeRow object
+ *
+ * @return The key of the row.
+ * @since 2.8.0 (gnt), 2.7.2 (pidgin)
+ */
+gpointer gnt_tree_row_get_key(GntTree *tree, GntTreeRow *row);
+
+/**
+ * Get the next row.
+ *
+ * @param tree The tree
+ * @param row  The GntTreeRow object
+ *
+ * @return The next row.
+ * @since 2.8.0 (gnt), 2.7.2 (pidgin)
+ */
+GntTreeRow * gnt_tree_row_get_next(GntTree *tree, GntTreeRow *row);
+
+/**
+ * Get the previous row.
+ *
+ * @param tree The tree
+ * @param row  The GntTreeRow object
+ *
+ * @return The previous row.
+ * @since 2.8.0 (gnt), 2.7.2 (pidgin)
+ */
+GntTreeRow * gnt_tree_row_get_prev(GntTree *tree, GntTreeRow *row);
+
+/**
+ * Get the child row.
+ *
+ * @param tree The tree
+ * @param row  The GntTreeRow object
+ *
+ * @return The child row.
+ * @since 2.8.0 (gnt), 2.7.2 (pidgin)
+ */
+GntTreeRow * gnt_tree_row_get_child(GntTree *tree, GntTreeRow *row);
+
+/**
+ * Get the parent row.
+ *
+ * @param tree The tree
+ * @param row  The GntTreeRow object
+ *
+ * @return The parent row.
+ * @since 2.8.0 (gnt), 2.7.2 (pidgin)
+ */
+GntTreeRow * gnt_tree_row_get_parent(GntTree *tree, GntTreeRow *row);
+
+/**
  * Get a list of text of the current row.
  *
  * @param tree  The tree
--- a/finch/libgnt/gntutils.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/finch/libgnt/gntutils.c	Sat Jul 31 23:42:35 2010 +0000
@@ -385,7 +385,6 @@
 	const char *name;
 	char *content;
 	xmlNode *ch;
-	gboolean processed = FALSE;
 	char *url = NULL;
 	gboolean insert_nl_s = FALSE, insert_nl_e = FALSE;
 
@@ -426,17 +425,14 @@
 
 	for (ch = node->children; ch; ch = ch->next) {
 		if (ch->type == XML_ELEMENT_NODE) {
-			processed = TRUE;
 			util_parse_html_to_tv(ch, tv, flag);
+		} else if (ch->type == XML_TEXT_NODE) {
+			content = (char*)xmlNodeGetContent(ch);
+			gnt_text_view_append_text_with_flags(tv, content, flag);
+			xmlFree(content);
 		}
 	}
 
-	if (!processed) {
-		content = (char*)xmlNodeGetContent(node);
-		gnt_text_view_append_text_with_flags(tv, content, flag);
-		xmlFree(content);
-	}
-
 	if (url) {
 		char *href = g_strdup_printf(" (%s)", url);
 		gnt_text_view_append_text_with_flags(tv, href, flag);
--- a/libpurple/Makefile.am	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/Makefile.am	Sat Jul 31 23:42:35 2010 +0000
@@ -170,13 +170,11 @@
 purple_builtheaders = purple.h version.h marshallers.h
 
 marshallers.h: marshallers.list
-	@echo "Generating marshallers.h"
-	$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --header > marshallers.h
+	$(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --header > marshallers.h
 
 marshallers.c: marshallers.list marshallers.h
-	@echo "Generating marshallers.c"
-	echo "#include \"marshallers.h\"" > marshallers.c
-	$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
+	$(AM_V_GEN)echo "#include \"marshallers.h\"" > marshallers.c
+	$(AM_V_at)$(GLIB_GENMARSHAL) --prefix=purple_smarshal $(srcdir)/marshallers.list --body >> marshallers.c
 
 if ENABLE_DBUS
 
@@ -212,16 +210,16 @@
 	$(srcdir)/protocols/jabber/libxmpp.c
 
 dbus-types.c: dbus-analyze-types.py $(purple_build_coreheaders)
-	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@
+	$(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DEFINE_TYPE\(%s\) > $@
 
 dbus-types.h: dbus-analyze-types.py $(purple_build_coreheaders)
-	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) > $@
+	$(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --pattern=PURPLE_DBUS_DECLARE_TYPE\(%s\) > $@
 
 dbus-bindings.c: dbus-analyze-functions.py $(dbus_exported)
-	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@
+	$(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py > $@
 
 dbus-signals.c: dbus-analyze-signals.py $(dbus_signals)
-	cat $(dbus_signals) | $(PYTHON) $(srcdir)/dbus-analyze-signals.py > $@
+	$(AM_V_GEN)cat $(dbus_signals) | $(PYTHON) $(srcdir)/dbus-analyze-signals.py > $@
 
 dbus-server.$(OBJEXT): dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
 dbus-server.lo: dbus-bindings.c dbus-signals.c dbus-types.c dbus-types.h
@@ -236,11 +234,11 @@
 libpurple_client_la_LIBADD = $(DBUS_LIBS)
 
 purple-client-bindings.c: dbus-analyze-functions.py $(dbus_exported)
-	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
+	$(AM_V_GEN)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client > $@
 
 purple-client-bindings.h: dbus-analyze-types.py dbus-analyze-functions.py $(purple_coreheaders) $(addprefix media/, $(purple_mediaheaders)) $(purple_builtheaders) $(dbus_exported)
-	cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
-	cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@
+	$(AM_V_GEN)cat $(purple_build_coreheaders) | $(PYTHON) $(srcdir)/dbus-analyze-types.py --keyword=enum --verbatim > $@
+	$(AM_V_at)cat $(dbus_build_exported) | $(PYTHON) $(srcdir)/dbus-analyze-functions.py --client --headers >> $@
 
 $(libpurple_client_la_OBJECTS): purple-client-bindings.h purple-client-bindings.c
 
--- a/libpurple/account.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/account.c	Sat Jul 31 23:42:35 2010 +0000
@@ -1819,7 +1819,7 @@
 
 	if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, set_public_alias))
 		prpl_info->set_public_alias(gc, alias, success_cb, failure_cb);
-	else {
+	else if (failure_cb) {
 		struct public_alias_closure *closure =
 				g_new0(struct public_alias_closure, 1);
 		closure->account = account;
@@ -1859,7 +1859,7 @@
 
 	if (PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_public_alias))
 		prpl_info->get_public_alias(gc, success_cb, failure_cb);
-	else {
+	else if (failure_cb) {
 		struct public_alias_closure *closure =
 				g_new0(struct public_alias_closure, 1);
 		closure->account = account;
--- a/libpurple/certificate.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/certificate.c	Sat Jul 31 23:42:35 2010 +0000
@@ -99,7 +99,8 @@
 			         "that can verify it is currently trusted.");
 			break;
 		case PURPLE_CERTIFICATE_NOT_ACTIVATED:
-			return _("The certificate is not valid yet.");
+			return _("The certificate is not valid yet.  Check that your "
+			         "computer's date and time are accurate.");
 			break;
 		case PURPLE_CERTIFICATE_EXPIRED:
 			return _("The certificate has expired and should not be "
--- a/libpurple/connection.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/connection.c	Sat Jul 31 23:42:35 2010 +0000
@@ -516,7 +516,8 @@
 	account = data;
 	gc = purple_account_get_connection(account);
 
-	gc->disconnect_timeout = 0;
+	if (gc != NULL)
+		gc->disconnect_timeout = 0;
 
 	password = g_strdup(purple_account_get_password(account));
 	purple_account_disconnect(account);
--- a/libpurple/media/backend-fs2.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/media/backend-fs2.c	Sat Jul 31 23:42:35 2010 +0000
@@ -1639,6 +1639,7 @@
 		g_value_set_boxed(&_params[_num_params].value,
 			relay_info);
 		g_value_array_free(relay_info);
+		_num_params++;
 	}
 
 	session = get_session(self, sess_id);
--- a/libpurple/plugins/Makefile.mingw	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/plugins/Makefile.mingw	Sat Jul 31 23:42:35 2010 +0000
@@ -55,7 +55,7 @@
 	$(MAKE) -C $(SSL_PLUGIN) -f $(MINGW_MAKEFILE) install
 	cp *.dll $(PURPLE_INSTALL_PLUGINS_DIR)
 
-.c.dll:
+%.dll: %.c $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H)
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
 	$(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
 
--- a/libpurple/plugins/perl/common/Log.xs	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/plugins/perl/common/Log.xs	Sat Jul 31 23:42:35 2010 +0000
@@ -27,6 +27,9 @@
 		newCONSTSUB(flags_stash, (char *)civ->name, newSViv(civ->iv));
 }
 
+Purple::Handle
+purple_log_get_handle()
+
 int
 purple_log_common_sizer(log)
 	Purple::Log log
--- a/libpurple/protocols/gg/lib/resolver.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/gg/lib/resolver.c	Sat Jul 31 23:42:35 2010 +0000
@@ -551,9 +551,9 @@
 		}
 
 		if (write(pipes[1], &addr, sizeof(addr)) != sizeof(addr))
-			exit(1);
+			_exit(1);
 
-		exit(0);
+		_exit(0);
 	}
 
 	close(pipes[1]);
--- a/libpurple/protocols/irc/cmds.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/irc/cmds.c	Sat Jul 31 23:42:35 2010 +0000
@@ -238,16 +238,16 @@
 		if (!args[0] && irc_ischannel(target))
 			buf = irc_format(irc, "vc", "MODE", target);
 		else if (args[0] && (*args[0] == '+' || *args[0] == '-'))
-			buf = irc_format(irc, "vcv", "MODE", target, args[0]);
+			buf = irc_format(irc, "vcn", "MODE", target, args[0]);
 		else if (args[0])
-			buf = irc_format(irc, "vv", "MODE", args[0]);
+			buf = irc_format(irc, "vn", "MODE", args[0]);
 		else
 			return 0;
 	} else if (!strcmp(cmd, "umode")) {
 		if (!args[0])
 			return 0;
 		gc = purple_account_get_connection(irc->account);
-		buf = irc_format(irc, "vnv", "MODE", purple_connection_get_display_name(gc), args[0]);
+		buf = irc_format(irc, "vnc", "MODE", purple_connection_get_display_name(gc), args[0]);
 	} else {
 		return 0;
 	}
@@ -437,7 +437,7 @@
 	if (!args || !args[0])
 		return 0;
 
-	buf = irc_format(irc, "v", args[0]);
+	buf = irc_format(irc, "n", args[0]);
 	irc_send(irc, buf);
 	g_free(buf);
 
--- a/libpurple/protocols/jabber/auth_cyrus.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/auth_cyrus.c	Sat Jul 31 23:42:35 2010 +0000
@@ -36,7 +36,7 @@
 {
 	purple_connection_error_reason(purple_account_get_connection(account),
 		PURPLE_CONNECTION_ERROR_ENCRYPTION_ERROR,
-		_("Server requires plaintext authentication over an unencrypted stream"));
+		_("Server may require plaintext authentication over an unencrypted stream"));
 }
 
 static void start_cyrus_wrapper(JabberStream *js)
@@ -240,8 +240,9 @@
 				 * it in plaintext, see if we can turn on
 				 * plaintext auth
 				 */
+				/* XXX Should we just check for PLAIN/LOGIN being offered mechanisms? */
 				} else if (!plaintext) {
-					char *msg = g_strdup_printf(_("%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
+					char *msg = g_strdup_printf(_("%s may require plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"),
 							purple_account_get_username(account));
 					purple_request_yes_no(js->gc, _("Plaintext Authentication"),
 							_("Plaintext Authentication"),
@@ -408,6 +409,12 @@
 	{
 		char *mech_name = xmlnode_get_data(mechnode);
 
+		/* Ignore blank mechanisms and EXTERNAL.  External isn't
+		 * supported, and Cyrus SASL's mechanism returns
+		 * SASL_NOMECH when the caller (us) doesn't configure it.
+		 * Except SASL_NOMECH is supposed to mean "no concordant
+		 * mechanisms"...  Easiest just to blacklist it (for now).
+		 */
 		if (!mech_name || !*mech_name ||
 				g_str_equal(mech_name, "EXTERNAL")) {
 			g_free(mech_name);
@@ -419,6 +426,10 @@
 		g_free(mech_name);
 	}
 
+	/* Strip off the trailing ' ' */
+	if (js->sasl_mechs->len > 1)
+		g_string_truncate(js->sasl_mechs, js->sasl_mechs->len - 1);
+
 	jabber_sasl_build_callbacks(js);
 	ret = jabber_auth_start_cyrus(js, reply, error);
 
--- a/libpurple/protocols/jabber/bosh.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/bosh.c	Sat Jul 31 23:42:35 2010 +0000
@@ -195,6 +195,11 @@
 	g_free(path);
 	conn->pipelining = TRUE;
 
+	if (purple_ip_address_is_valid(host))
+		js->serverFQDN = g_strdup(js->user->domain);
+	else
+		js->serverFQDN = g_strdup(host);
+
 	if ((user && user[0] != '\0') || (passwd && passwd[0] != '\0')) {
 		purple_debug_info("jabber", "Ignoring unexpected username and password "
 		                            "in BOSH URL.\n");
--- a/libpurple/protocols/jabber/caps.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/caps.c	Sat Jul 31 23:42:35 2010 +0000
@@ -29,6 +29,7 @@
 #include "iq.h"
 #include "presence.h"
 #include "util.h"
+#include "xdata.h"
 
 #define JABBER_CAPS_FILENAME "xmpp-caps.xml"
 
@@ -41,20 +42,14 @@
 static GHashTable *nodetable = NULL; /* char *node -> JabberCapsNodeExts */
 static guint       save_timer = 0;
 
-/**
- *	Processes a query-node and returns a JabberCapsClientInfo object with all relevant info.
- *
- *	@param 	query 	A query object.
- *	@return 		A JabberCapsClientInfo object.
- */
-static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query);
-
 /* Free a GList of allocated char* */
 static void
 free_string_glist(GList *list)
 {
-	g_list_foreach(list, (GFunc)g_free, NULL);
-	g_list_free(list);
+	while (list) {
+		g_free(list->data);
+		list = g_list_delete_link(list, list);
+	}
 }
 
 static JabberCapsNodeExts*
@@ -238,15 +233,15 @@
 	if(!capsdata)
 		return;
 
-	if (strcmp(capsdata->name, "capabilities") != 0) {
+	if (!g_str_equal(capsdata->name, "capabilities")) {
 		xmlnode_free(capsdata);
 		return;
 	}
 
-	for(client = capsdata->child; client; client = client->next) {
-		if(client->type != XMLNODE_TYPE_TAG)
+	for (client = capsdata->child; client; client = client->next) {
+		if (client->type != XMLNODE_TYPE_TAG)
 			continue;
-		if(!strcmp(client->name, "client")) {
+		if (g_str_equal(client->name, "client")) {
 			JabberCapsClientInfo *value = g_new0(JabberCapsClientInfo, 1);
 			JabberCapsTuple *key = (JabberCapsTuple*)&value->tuple;
 			xmlnode *child;
@@ -259,15 +254,15 @@
 			if (key->hash == NULL)
 				exts = jabber_caps_find_exts_by_node(key->node);
 
-			for(child = client->child; child; child = child->next) {
-				if(child->type != XMLNODE_TYPE_TAG)
+			for (child = client->child; child; child = child->next) {
+				if (child->type != XMLNODE_TYPE_TAG)
 					continue;
-				if(!strcmp(child->name,"feature")) {
+				if (g_str_equal(child->name, "feature")) {
 					const char *var = xmlnode_get_attrib(child, "var");
 					if(!var)
 						continue;
 					value->features = g_list_append(value->features,g_strdup(var));
-				} else if(!strcmp(child->name,"identity")) {
+				} else if (g_str_equal(child->name, "identity")) {
 					const char *category = xmlnode_get_attrib(child, "category");
 					const char *type = xmlnode_get_attrib(child, "type");
 					const char *name = xmlnode_get_attrib(child, "name");
@@ -284,15 +279,15 @@
 					id->lang = g_strdup(lang);
 
 					value->identities = g_list_append(value->identities,id);
-				} else if(!strcmp(child->name,"x")) {
+				} else if (g_str_equal(child->name, "x")) {
 					/* TODO: See #7814 -- this might cause problems if anyone
 					 * ever actually specifies forms. In fact, for this to
 					 * work properly, that bug needs to be fixed in
 					 * xmlnode_from_str, not the output version... */
 					value->forms = g_list_append(value->forms, xmlnode_copy(child));
-				} else if (!strcmp(child->name, "ext") && key->hash != NULL) {
+				} else if (g_str_equal(child->name, "ext") && key->hash != NULL) {
 					purple_debug_warning("jabber", "Ignoring exts when reading new-style caps\n");
-				} else if (!strcmp(child->name, "ext")) {
+				} else if (g_str_equal(child->name, "ext")) {
 					/* TODO: Do we care about reading in the identities listed here? */
 					const char *identifier = xmlnode_get_attrib(child, "identifier");
 					xmlnode *node;
@@ -304,7 +299,7 @@
 					for (node = child->child; node; node = node->next) {
 						if (node->type != XMLNODE_TYPE_TAG)
 							continue;
-						if (!strcmp(node->name, "feature")) {
+						if (g_str_equal(node->name, "feature")) {
 							const char *var = xmlnode_get_attrib(node, "var");
 							if (!var)
 								continue;
@@ -463,13 +458,13 @@
 		 * size in jabber_caps_calculate_hash is large enough. The cipher API
 		 * doesn't seem to offer a "Get the hash size" function(?).
 		 */
-		if (!strcmp(userdata->hash, "sha-1")) {
+		if (g_str_equal(userdata->hash, "sha-1")) {
 			hash = jabber_caps_calculate_hash(info, "sha1");
-		} else if (!strcmp(userdata->hash, "md5")) {
+		} else if (g_str_equal(userdata->hash, "md5")) {
 			hash = jabber_caps_calculate_hash(info, "md5");
 		}
 
-		if (!hash || strcmp(hash, userdata->ver)) {
+		if (!hash || !g_str_equal(hash, userdata->ver)) {
 			purple_debug_warning("jabber", "Could not validate caps info from "
 			                     "%s. Expected %s, got %s\n",
 			                     xmlnode_get_attrib(packet, "from"),
@@ -709,44 +704,6 @@
 }
 
 static gint
-jabber_identity_compare(gconstpointer a, gconstpointer b)
-{
-	const JabberIdentity *ac;
-	const JabberIdentity *bc;
-	gint cat_cmp;
-	gint typ_cmp;
-
-	ac = a;
-	bc = b;
-
-	if ((cat_cmp = strcmp(ac->category, bc->category)) == 0) {
-		if ((typ_cmp = strcmp(ac->type, bc->type)) == 0) {
-			if (!ac->lang && !bc->lang) {
-				return 0;
-			} else if (ac->lang && !bc->lang) {
-				return 1;
-			} else if (!ac->lang && bc->lang) {
-				return -1;
-			} else {
-				return strcmp(ac->lang, bc->lang);
-			}
-		} else {
-			return typ_cmp;
-		}
-	} else {
-		return cat_cmp;
-	}
-}
-
-static gchar *jabber_caps_get_formtype(const xmlnode *x) {
-	xmlnode *formtypefield;
-	formtypefield = xmlnode_get_child(x, "field");
-	while (formtypefield && strcmp(xmlnode_get_attrib(formtypefield, "var"), "FORM_TYPE")) formtypefield = xmlnode_get_next_twin(formtypefield);
-	formtypefield = xmlnode_get_child(formtypefield, "value");
-	return xmlnode_get_data(formtypefield);;
-}
-
-static gint
 jabber_xdata_compare(gconstpointer a, gconstpointer b)
 {
 	const xmlnode *aformtypefield = a;
@@ -755,8 +712,8 @@
 	char *bformtype;
 	int result;
 
-	aformtype = jabber_caps_get_formtype(aformtypefield);
-	bformtype = jabber_caps_get_formtype(bformtypefield);
+	aformtype = jabber_x_data_get_formtype(aformtypefield);
+	bformtype = jabber_x_data_get_formtype(bformtypefield);
 
 	result = strcmp(aformtype, bformtype);
 	g_free(aformtype);
@@ -764,20 +721,21 @@
 	return result;
 }
 
-static JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query)
+JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query)
 {
 	xmlnode *child;
 	JabberCapsClientInfo *info;
 
-	if (!query || strcmp(query->xmlns, NS_DISCO_INFO))
-		return 0;
+	if (!query || !g_str_equal(query->name, "query") ||
+			!purple_strequal(query->xmlns, NS_DISCO_INFO))
+		return NULL;
 
 	info = g_new0(JabberCapsClientInfo, 1);
 
 	for(child = query->child; child; child = child->next) {
 		if (child->type != XMLNODE_TYPE_TAG)
 			continue;
-		if (!strcmp(child->name,"identity")) {
+		if (g_str_equal(child->name, "identity")) {
 			/* parse identity */
 			const char *category = xmlnode_get_attrib(child, "category");
 			const char *type = xmlnode_get_attrib(child, "type");
@@ -795,13 +753,13 @@
 			id->lang = g_strdup(lang);
 
 			info->identities = g_list_append(info->identities, id);
-		} else if (!strcmp(child->name, "feature")) {
+		} else if (g_str_equal(child->name, "feature")) {
 			/* parse feature */
 			const char *var = xmlnode_get_attrib(child, "var");
 			if (var)
 				info->features = g_list_prepend(info->features, g_strdup(var));
-		} else if (!strcmp(child->name, "x")) {
-			if (child->xmlns && !strcmp(child->xmlns, "jabber:x:data")) {
+		} else if (g_str_equal(child->name, "x")) {
+			if (purple_strequal(child->xmlns, "jabber:x:data")) {
 				/* x-data form */
 				xmlnode *dataform = xmlnode_copy(child);
 				info->forms = g_list_append(info->forms, dataform);
@@ -848,9 +806,12 @@
 static void 
 append_escaped_string(PurpleCipherContext *context, const gchar *str)
 {
-	char *tmp = g_markup_escape_text(str, -1);
-	purple_cipher_context_append(context, (const guchar *)tmp, strlen(tmp));
-	g_free(tmp);
+	if (str && *str) {
+		char *tmp = g_markup_escape_text(str, -1);
+		purple_cipher_context_append(context, (const guchar *)tmp, strlen(tmp));
+		g_free(tmp);
+	}
+
 	purple_cipher_context_append(context, (const guchar *)"<", 1);
 }
 
@@ -904,7 +865,7 @@
 	/* concat x-data forms to the verification string */
 	for(node = info->forms; node; node = node->next) {
 		xmlnode *data = (xmlnode *)node->data;
-		gchar *formtype = jabber_caps_get_formtype(data);
+		gchar *formtype = jabber_x_data_get_formtype(data);
 		GList *fields = jabber_caps_xdata_get_fields(data);
 
 		/* append FORM_TYPE's field value to the verification string */
@@ -965,6 +926,10 @@
 	}
 
 	info.features = features;
+	/* TODO: This copy can go away, I think, since jabber_identities
+	 * is pre-sorted, so the sort in calculate_hash should be idempotent.
+	 * However, I want to test that. --darkrain
+	 */
 	info.identities = g_list_copy(jabber_identities);
 	info.forms = NULL;
 
@@ -989,7 +954,7 @@
 	for (node = accounts; node; node = node->next) {
 		PurpleAccount *account = node->data;
 		const char *prpl_id = purple_account_get_protocol_id(account);
-		if (!strcmp("prpl-jabber", prpl_id) && purple_account_is_connected(account)) {
+		if (g_str_equal("prpl-jabber", prpl_id) && purple_account_is_connected(account)) {
 			PurpleConnection *gc = purple_account_get_connection(account);
 			jabber_presence_send(gc->proto_data, TRUE);
 		}
--- a/libpurple/protocols/jabber/caps.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/caps.h	Sat Jul 31 23:42:35 2010 +0000
@@ -115,4 +115,15 @@
  */
 void jabber_caps_broadcast_change(void);
 
+/**
+ * Parse the <query/> element from an IQ stanza into a JabberCapsClientInfo
+ * struct.
+ *
+ * Exposed for tests
+ *
+ * @param query The 'query' element from an IQ reply stanza.
+ * @returns A JabberCapsClientInfo struct, or NULL on error
+ */
+JabberCapsClientInfo *jabber_caps_parse_client_info(xmlnode *query);
+
 #endif /* PURPLE_JABBER_CAPS_H_ */
--- a/libpurple/protocols/jabber/data.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/data.c	Sat Jul 31 23:42:35 2010 +0000
@@ -41,9 +41,16 @@
 jabber_data_create_from_data(gconstpointer rawdata, gsize size, const char *type,
 	gboolean ephemeral, JabberStream *js)
 {
-	JabberData *data = g_new0(JabberData, 1);
-	gchar *checksum = jabber_calculate_data_hash(rawdata, size, "sha1");
-	gchar cid[256];
+	JabberData *data;
+	gchar *checksum;
+	gchar cid[256]; /* "Big enough" for a SHA1 hex hash value */
+
+	g_return_val_if_fail(rawdata != NULL, NULL);
+	g_return_val_if_fail(size > 0, NULL);
+	g_return_val_if_fail(type != NULL, NULL);
+
+	data = g_new0(JabberData, 1);
+	checksum = jabber_calculate_data_hash(rawdata, size, "sha1");
 
 	g_snprintf(cid, sizeof(cid), "sha1+%s@bob.xmpp.org", checksum);
 	g_free(checksum);
@@ -62,6 +69,7 @@
 jabber_data_delete(gpointer cbdata)
 {
 	JabberData *data = cbdata;
+
 	g_free(data->cid);
 	g_free(data->type);
 	g_free(data->data);
@@ -76,6 +84,8 @@
 	gchar *raw_data = NULL;
 	const gchar *cid, *type;
 
+	g_return_val_if_fail(tag != NULL, NULL);
+
 	/* check if this is a "data" tag */
 	if (strcmp(tag->name, "data") != 0) {
 		purple_debug_error("jabber", "Invalid data element\n");
@@ -117,12 +127,16 @@
 void
 jabber_data_destroy(JabberData *data)
 {
+	g_return_if_fail(data != NULL);
+
 	jabber_data_delete(data);
 }
 
 const char *
 jabber_data_get_cid(const JabberData *data)
 {
+	g_return_val_if_fail(data != NULL, NULL);
+
 	return data->cid;
 }
 
@@ -130,26 +144,37 @@
 const char *
 jabber_data_get_type(const JabberData *data)
 {
+	g_return_val_if_fail(data != NULL, NULL);
+
 	return data->type;
 }
 
 gsize
 jabber_data_get_size(const JabberData *data)
 {
+	g_return_val_if_fail(data != NULL, 0);
+
 	return data->size;
 }
 
 gpointer
 jabber_data_get_data(const JabberData *data)
 {
+	g_return_val_if_fail(data != NULL, NULL);
+
 	return data->data;
 }
 
 xmlnode *
 jabber_data_get_xml_definition(const JabberData *data)
 {
-	xmlnode *tag = xmlnode_new("data");
-	char *base64data = purple_base64_encode(data->data, data->size);
+	xmlnode *tag;
+	char *base64data;
+
+	g_return_val_if_fail(data != NULL, NULL);
+
+	tag = xmlnode_new("data");
+	base64data = purple_base64_encode(data->data, data->size);
 
 	xmlnode_set_namespace(tag, NS_BOB);
 	xmlnode_set_attrib(tag, "cid", data->cid);
@@ -165,12 +190,18 @@
 xmlnode *
 jabber_data_get_xhtml_im(const JabberData *data, const gchar *alt)
 {
-	xmlnode *img = xmlnode_new("img");
-	char src[128];
+	xmlnode *img;
+	char *src;
+
+	g_return_val_if_fail(data != NULL, NULL);
+	g_return_val_if_fail(alt != NULL, NULL);
 
+	img = xmlnode_new("img");
 	xmlnode_set_attrib(img, "alt", alt);
-	g_snprintf(src, sizeof(src), "cid:%s", data->cid);
+
+	src = g_strconcat("cid:", data->cid, NULL);
 	xmlnode_set_attrib(img, "src", src);
+	g_free(src);
 
 	return img;
 }
@@ -260,7 +291,7 @@
 	if (data_element && type == JABBER_IQ_RESULT) {
 		JabberData *data = jabber_data_create_from_xml(data_element);
 
-		if (!ephemeral) {
+		if (data && !ephemeral) {
 			jabber_data_associate_remote(js, from, data);
 		}
 		cb(data, alt, userdata);
@@ -269,7 +300,7 @@
 			"Responder didn't recognize requested data\n");
 		cb(NULL, alt, userdata);
 	} else {
-		purple_debug_error("jabber", "Unknown response to data request\n");
+		purple_debug_warning("jabber", "Unknown response to data request\n");
 		cb(NULL, alt, userdata);
 	}
 
@@ -281,9 +312,17 @@
     gchar *alt, gboolean ephemeral, JabberDataRequestCallback cb,
     gpointer userdata)
 {
-	JabberIq *request = jabber_iq_new(js, JABBER_IQ_GET);
-	xmlnode *data_request = jabber_data_get_xml_request(cid);
-	JabberDataRequestData *data = g_new0(JabberDataRequestData, 1);
+	JabberIq *request;
+	xmlnode *data_request;
+	JabberDataRequestData *data;
+
+	g_return_if_fail(cid != NULL);
+	g_return_if_fail(who != NULL);
+	g_return_if_fail(alt != NULL);
+
+	request = jabber_iq_new(js, JABBER_IQ_GET);
+	data_request = jabber_data_get_xml_request(cid);
+	data = g_new0(JabberDataRequestData, 1);
 
 	data->userdata = userdata;
 	data->alt = alt;
@@ -333,6 +372,8 @@
 void
 jabber_data_associate_local(JabberData *data, const gchar *alt)
 {
+	g_return_if_fail(data != NULL);
+
 	purple_debug_info("jabber", "associating local data object\n alt = %s, cid = %s\n",
 		alt , jabber_data_get_cid(data));
 	if (alt)
@@ -345,7 +386,9 @@
 jabber_data_associate_remote(JabberStream *js, const gchar *who, JabberData *data)
 {
 	gchar *cid;
-	
+
+	g_return_if_fail(data != NULL);
+
 	if (jabber_data_has_valid_hash(data)) {
 		cid = g_strdup(jabber_data_get_cid(data));
 	} else {
--- a/libpurple/protocols/jabber/jabber.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Sat Jul 31 23:42:35 2010 +0000
@@ -218,22 +218,25 @@
 
 	account = purple_connection_get_account(js->gc);
 
-	if((starttls = xmlnode_get_child(packet, "starttls"))) {
-		if(purple_ssl_is_supported()) {
-			jabber_send_raw(js,
-					"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
-			return TRUE;
-		} else if(xmlnode_get_child(starttls, "required")) {
-			purple_connection_error_reason(js->gc,
+	if(purple_ssl_is_supported()) {
+		jabber_send_raw(js,
+				"<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
+		return TRUE;
+	}
+
+	starttls = xmlnode_get_child(packet, "starttls");
+	if(xmlnode_get_child(starttls, "required")) {
+		purple_connection_error_reason(js->gc,
 				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 				_("Server requires TLS/SSL, but no TLS/SSL support was found."));
-			return TRUE;
-		} else if(purple_account_get_bool(account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
-			purple_connection_error_reason(js->gc,
-				 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
+		return TRUE;
+	}
+
+	if(purple_account_get_bool(account, "require_tls", JABBER_DEFAULT_REQUIRE_TLS)) {
+		purple_connection_error_reason(js->gc,
+				PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT,
 				_("You require encryption, but no TLS/SSL support was found."));
-			return TRUE;
-		}
+		return TRUE;
 	}
 
 	return FALSE;
@@ -543,6 +546,13 @@
 int jabber_prpl_send_raw(PurpleConnection *gc, const char *buf, int len)
 {
 	JabberStream *js = purple_connection_get_protocol_data(gc);
+
+	g_return_val_if_fail(js != NULL, -1);
+	/* TODO: It's probably worthwhile to restrict this to when the account
+	 * state is CONNECTED, but I can /almost/ envision reasons for wanting
+	 * to do things during the connection process.
+	 */
+
 	jabber_send_raw(js, buf, len);
 	return len;
 }
@@ -1952,20 +1962,53 @@
 	}
 }
 
-void jabber_add_identity(const gchar *category, const gchar *type, const gchar *lang, const gchar *name) {
+gint
+jabber_identity_compare(gconstpointer a, gconstpointer b)
+{
+	const JabberIdentity *ac;
+	const JabberIdentity *bc;
+	gint cat_cmp;
+	gint typ_cmp;
+
+	ac = a;
+	bc = b;
+
+	if ((cat_cmp = strcmp(ac->category, bc->category)) == 0) {
+		if ((typ_cmp = strcmp(ac->type, bc->type)) == 0) {
+			if (!ac->lang && !bc->lang) {
+				return 0;
+			} else if (ac->lang && !bc->lang) {
+				return 1;
+			} else if (!ac->lang && bc->lang) {
+				return -1;
+			} else {
+				return strcmp(ac->lang, bc->lang);
+			}
+		} else {
+			return typ_cmp;
+		}
+	} else {
+		return cat_cmp;
+	}
+}
+
+void jabber_add_identity(const gchar *category, const gchar *type,
+                         const gchar *lang, const gchar *name)
+{
 	GList *identity;
 	JabberIdentity *ident;
+
 	/* both required according to XEP-0030 */
 	g_return_if_fail(category != NULL);
 	g_return_if_fail(type != NULL);
 
-	for(identity = jabber_identities; identity; identity = identity->next) {
-		JabberIdentity *ident = (JabberIdentity*)identity->data;
-		if (!strcmp(ident->category, category) &&
-		    !strcmp(ident->type, type) &&
-		    ((!ident->lang && !lang) || (ident->lang && lang && !strcmp(ident->lang, lang)))) {
+	/* Check if this identity is already there... */
+	for (identity = jabber_identities; identity; identity = identity->next) {
+		JabberIdentity *id = identity->data;
+		if (g_str_equal(id->category, category) &&
+			g_str_equal(id->type, type) &&
+			purple_strequal(id->lang, lang))
 			return;
-		}
 	}
 
 	ident = g_new0(JabberIdentity, 1);
@@ -1973,7 +2016,8 @@
 	ident->type = g_strdup(type);
 	ident->lang = g_strdup(lang);
 	ident->name = g_strdup(name);
-	jabber_identities = g_list_prepend(jabber_identities, ident);
+	jabber_identities = g_list_insert_sorted(jabber_identities, ident,
+	                                         jabber_identity_compare);
 }
 
 static void jabber_identities_destroy(void)
@@ -3430,8 +3474,7 @@
 			for (iter = jb->resources; iter ; iter = g_list_next(iter)) {
 				JabberBuddyResource *jbr = (JabberBuddyResource *) iter->data;
 
-				if (jabber_resource_has_capability(jbr,
-						"http://jabber.org/protocol/si/profile/file-transfer")
+				if (jabber_resource_has_capability(jbr, NS_SI_FILE_TRANSFER)
 			    	&& (jabber_resource_has_capability(jbr,
 			    			NS_BYTESTREAMS)
 			        	|| jabber_resource_has_capability(jbr, NS_IBB))) {
@@ -3733,7 +3776,7 @@
 	jabber_add_feature("http://jabber.org/protocol/muc", 0);
 	jabber_add_feature("http://jabber.org/protocol/muc#user", 0);
 	jabber_add_feature("http://jabber.org/protocol/si", 0);
-	jabber_add_feature("http://jabber.org/protocol/si/profile/file-transfer", 0);
+	jabber_add_feature(NS_SI_FILE_TRANSFER, 0);
 	jabber_add_feature(NS_XHTML_IM, 0);
 	jabber_add_feature(NS_PING, 0);
 
--- a/libpurple/protocols/jabber/jabber.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/jabber.h	Sat Jul 31 23:42:35 2010 +0000
@@ -303,6 +303,9 @@
 
 /* what kind of additional features as returned from disco#info are supported? */
 extern GList *jabber_features;
+/* A sorted list of identities advertised.  Use jabber_add_identity to add
+ * so it remains sorted.
+ */
 extern GList *jabber_identities;
 
 void jabber_stream_features_parse(JabberStream *js, xmlnode *packet);
@@ -342,6 +345,11 @@
 void jabber_add_identity(const gchar *category, const gchar *type, const gchar *lang, const gchar *name);
 
 /**
+ * GCompareFunc for JabberIdentity structs.
+ */
+gint jabber_identity_compare(gconstpointer a, gconstpointer b);
+
+/**
  * Returns true if this connection is over a secure (SSL) stream. Use this
  * instead of checking js->gsc because BOSH stores its PurpleSslConnection
  * members in its own data structure.
--- a/libpurple/protocols/jabber/jutil.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/jutil.c	Sat Jul 31 23:42:35 2010 +0000
@@ -303,8 +303,10 @@
 
 	c = (const guchar *)in;
 	for ( ; *c; ++c) {
-		if (*c > 0x7f ||
+		if (*c > 0x7f || /* Non-ASCII characters */
+				*c == 0x7f || /* ASCII Delete character */
 				(*c < 0x20 && *c != '\t' && *c != '\n' && *c != '\r'))
+					/* ASCII control characters */
 			return NULL;
 	}
 
--- a/libpurple/protocols/jabber/message.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/message.c	Sat Jul 31 23:42:35 2010 +0000
@@ -1239,14 +1239,19 @@
 
 unsigned int jabber_send_typing(PurpleConnection *gc, const char *who, PurpleTypingState state)
 {
+	JabberStream *js;
 	JabberMessage *jm;
 	JabberBuddy *jb;
 	JabberBuddyResource *jbr;
-	char *resource = jabber_get_resource(who);
+	char *resource;	
 
-	jb = jabber_buddy_find(gc->proto_data, who, TRUE);
+	js = purple_connection_get_protocol_data(gc);
+	jb = jabber_buddy_find(js, who, TRUE);
+	if (!jb)
+		return 0;
+
+	resource = jabber_get_resource(who);
 	jbr = jabber_buddy_find_resource(jb, resource);
-
 	g_free(resource);
 
 	/* We know this entity doesn't support chat states */
@@ -1261,7 +1266,7 @@
 
 	/* TODO: figure out threading */
 	jm = g_new0(JabberMessage, 1);
-	jm->js = gc->proto_data;
+	jm->js = js;
 	jm->type = JABBER_MESSAGE_CHAT;
 	jm->to = g_strdup(who);
 	jm->id = jabber_get_next_id(jm->js);
--- a/libpurple/protocols/jabber/namespaces.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/namespaces.h	Sat Jul 31 23:42:35 2010 +0000
@@ -61,6 +61,9 @@
 #define NS_AVATAR_1_1_DATA      "urn:xmpp:avatar:data"
 #define NS_AVATAR_1_1_METADATA  "urn:xmpp:avatar:metadata"
 
+/* XEP-0096 SI File Transfer */
+#define NS_SI_FILE_TRANSFER 	"http://jabber.org/protocol/si/profile/file-transfer"
+
 /* XEP-0124 Bidirectional-streams Over Synchronous HTTP (BOSH) */
 #define NS_BOSH "http://jabber.org/protocol/httpbind"
 
--- a/libpurple/protocols/jabber/si.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/si.c	Sat Jul 31 23:42:35 2010 +0000
@@ -1262,12 +1262,10 @@
 	xmlnode_set_namespace(si, "http://jabber.org/protocol/si");
 	jsx->stream_id = jabber_get_next_id(jsx->js);
 	xmlnode_set_attrib(si, "id", jsx->stream_id);
-	xmlnode_set_attrib(si, "profile",
-			"http://jabber.org/protocol/si/profile/file-transfer");
+	xmlnode_set_attrib(si, "profile", NS_SI_FILE_TRANSFER);
 
 	file = xmlnode_new_child(si, "file");
-	xmlnode_set_namespace(file,
-			"http://jabber.org/protocol/si/profile/file-transfer");
+	xmlnode_set_namespace(file, NS_SI_FILE_TRANSFER);
 	xmlnode_set_attrib(file, "name", xfer->filename);
 	g_snprintf(buf, sizeof(buf), "%" G_GSIZE_FORMAT, xfer->size);
 	xmlnode_set_attrib(file, "size", buf);
@@ -1488,7 +1486,7 @@
 
 		if (jabber_resource_has_capability(jbr, NS_IBB))
 			jsx->stream_method |= STREAM_METHOD_IBB;
-		if (jabber_resource_has_capability(jbr, "http://jabber.org/protocol/si/profile/file-transfer")) {
+		if (jabber_resource_has_capability(jbr, NS_SI_FILE_TRANSFER)) {
 			jabber_si_xfer_send_request(xfer);
 			return;
 		}
@@ -1523,7 +1521,8 @@
 		JabberBuddy *jb;
 		JabberBuddyResource *jbr = NULL;
 		char *resource;
-
+		GList *resources = NULL;
+		
 		if(NULL != (resource = jabber_get_resource(xfer->who))) {
 			/* they've specified a resource, no need to ask or
 			 * default or anything, just do it */
@@ -1535,7 +1534,22 @@
 
 		jb = jabber_buddy_find(jsx->js, xfer->who, TRUE);
 
-		if(!jb || !jb->resources) {
+		if (jb) {
+			GList *l;
+
+			for (l = jb->resources ; l ; l = g_list_next(l)) {
+				jbr = l->data;
+
+				if (!jabber_resource_know_capabilities(jbr) ||
+				    (jabber_resource_has_capability(jbr, NS_SI_FILE_TRANSFER)
+				     && (jabber_resource_has_capability(jbr, NS_BYTESTREAMS)
+				         || jabber_resource_has_capability(jbr, NS_IBB)))) {
+					resources = g_list_append(resources, jbr);
+				}
+			}
+		}
+		
+		if (!resources) {
 			/* no resources online, we're trying to send to someone
 			 * whose presence we're not subscribed to, or
 			 * someone who is offline.  Let's inform the user */
@@ -1551,13 +1565,11 @@
 
 			purple_notify_error(jsx->js->gc, _("File Send Failed"), _("File Send Failed"), msg);
 			g_free(msg);
-		} else if(!jb->resources->next) {
+		} else if (g_list_length(resources) == 1) {
 			/* only 1 resource online (probably our most common case)
 			 * so no need to ask who to send to */
-			jbr = jb->resources->data;
-
+			jbr = resources->data;
 			do_transfer_send(xfer, jbr->name);
-
 		} else {
 			/* we've got multiple resources, we need to pick one to send to */
 			GList *l;
@@ -1565,11 +1577,9 @@
 			PurpleRequestFields *fields = purple_request_fields_new();
 			PurpleRequestField *field = purple_request_field_choice_new("resource", _("Resource"), 0);
 			PurpleRequestFieldGroup *group = purple_request_field_group_new(NULL);
-
-			for(l = jb->resources; l; l = l->next)
-			{
+			
+			for(l = resources; l; l = l->next) {
 				jbr = l->data;
-
 				purple_request_field_choice_add(field, jbr->name);
 			}
 
@@ -1583,6 +1593,8 @@
 
 			g_free(msg);
 		}
+
+		g_list_free(resources);
 	} else {
 		xmlnode *si, *feature, *x, *field, *value;
 
@@ -1695,7 +1707,7 @@
 	size_t filesize = 0;
 
 	if(!(profile = xmlnode_get_attrib(si, "profile")) ||
-			strcmp(profile, "http://jabber.org/protocol/si/profile/file-transfer"))
+			strcmp(profile, NS_SI_FILE_TRANSFER))
 		return;
 
 	if(!(stream_id = xmlnode_get_attrib(si, "id")))
--- a/libpurple/protocols/jabber/xdata.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/xdata.c	Sat Jul 31 23:42:35 2010 +0000
@@ -411,4 +411,30 @@
 	return handle;
 }
 
+gchar *
+jabber_x_data_get_formtype(const xmlnode *form)
+{
+	xmlnode *field;
 
+	g_return_val_if_fail(form != NULL, NULL);
+
+	for (field = xmlnode_get_child((xmlnode *)form, "field"); field;
+			field = xmlnode_get_next_twin(field)) {
+		const char *var = xmlnode_get_attrib(field, "var");
+		if (purple_strequal(var, "FORM_TYPE")) {
+			xmlnode *value = xmlnode_get_child(field, "value");
+			if (value)
+				return xmlnode_get_data(value);
+			else
+				/* An interesting corner case... Looking for a second
+				 * FORM_TYPE would be more considerate, but I'm in favor
+				 * of not helping broken clients.
+				 */
+				return NULL;
+		}
+	}
+
+	/* Erm, none found :( */
+	return NULL;
+}
+
--- a/libpurple/protocols/jabber/xdata.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/jabber/xdata.h	Sat Jul 31 23:42:35 2010 +0000
@@ -37,4 +37,19 @@
 void *jabber_x_data_request(JabberStream *js, xmlnode *packet, jabber_x_data_cb cb, gpointer user_data);
 void *jabber_x_data_request_with_actions(JabberStream *js, xmlnode *packet, GList *actions, int defaultaction, jabber_x_data_action_cb cb, gpointer user_data);
 
+/*
+ * Return the form type (the CDATA of the value child of the FORM_TYPE
+ * field entry.
+ * E.g., for the following, "http://jabber.org/protocol/muc#roominfo".
+ * <x xmlns='jabber:x:data' type='result'>
+ *  <field var='FORM_TYPE' type='hidden'>
+ *    <value>http://jabber.org/protocol/muc#roominfo</value>
+ *  </field>
+ * </x>
+ *
+ * @param form The xmlnode for the form (the 'x' element)
+ * @returns The FORM_TYPE.  Must be freed by caller.
+ */
+gchar *jabber_x_data_get_formtype(const xmlnode *form);
+
 #endif /* PURPLE_JABBER_XDATA_H_ */
--- a/libpurple/protocols/msn/directconn.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/directconn.c	Sat Jul 31 23:42:35 2010 +0000
@@ -811,15 +811,12 @@
 static gboolean
 msn_dc_incoming_connection_timeout_cb(gpointer data) {
 	MsnDirectConn *dc = data;
-	MsnSlpCall *slpcall;
 
 	if (purple_debug_is_verbose())
 		purple_debug_info("msn", "msn_dc_incoming_connection_timeout_cb %p\n", dc);
 
 	g_return_val_if_fail(dc != NULL, FALSE);
 
-	slpcall = dc->slpcall;
-
 	if (dc->listen_data != NULL) {
 		purple_network_listen_cancel(dc->listen_data);
 		dc->listen_data = NULL;
--- a/libpurple/protocols/msn/msn.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/msn.c	Sat Jul 31 23:42:35 2010 +0000
@@ -2328,6 +2328,7 @@
 		const gchar *url_text, size_t len, const gchar *error_message)
 {
 	MsnGetInfoData *info_data = (MsnGetInfoData *)data;
+	MsnSession *session;
 	PurpleNotifyUserInfo *user_info;
 	char *stripped, *p, *q, *tmp;
 	char *user_url = NULL;
@@ -2345,15 +2346,8 @@
 
 	purple_debug_info("msn", "In msn_got_info,url_text:{%s}\n",url_text);
 
-	/* Make sure the connection is still valid */
-	/* TODO: Instead of this, we should be canceling this when we disconnect */
-	if (g_list_find(purple_connections_get_all(), info_data->gc) == NULL)
-	{
-		purple_debug_warning("msn", "invalid connection. ignoring buddy info.\n");
-		g_free(info_data->name);
-		g_free(info_data);
-		return;
-	}
+	session = purple_connection_get_protocol_data(info_data->gc);
+	session->url_datas = g_slist_remove(session->url_datas, url_data);
 
 	user_info = purple_notify_user_info_new();
 	has_tooltip_text = msn_tooltip_extract_info_text(user_info, info_data);
@@ -2738,13 +2732,14 @@
 	/* Try to put the photo in there too, if there's one */
 	if (photo_url_text)
 	{
-		purple_util_fetch_url_len(photo_url_text, FALSE, NULL, FALSE, MAX_HTTP_BUDDYICON_BYTES, msn_got_photo,
-					   info2_data);
+		url_data = purple_util_fetch_url_len(photo_url_text, FALSE, NULL, FALSE,
+		                                     MAX_HTTP_BUDDYICON_BYTES,
+		                                     msn_got_photo, info2_data);
+		session->url_datas = g_slist_prepend(session->url_datas, url_data);
 	}
 	else
 	{
-		/* Emulate a callback */
-		/* TODO: Huh? */
+		/* Finish the Get Info and show the user something */
 		msn_got_photo(NULL, info2_data, NULL, 0, NULL);
 	}
 }
@@ -2763,10 +2758,12 @@
 	PurpleNotifyUserInfo *user_info = info2_data->user_info;
 	char *photo_url_text = info2_data->photo_url_text;
 
-	/* Make sure the connection is still valid if we got here by fetching a photo url */
-	/* TODO: Instead of this, we should be canceling this when we disconnect */
-	if (url_text && (error_message != NULL ||
-					 g_list_find(purple_connections_get_all(), info_data->gc) == NULL))
+	if (url_data) {
+		MsnSession *session = purple_connection_get_protocol_data(info_data->gc);
+		session->url_datas = g_slist_remove(session->url_datas, url_data);
+	}
+
+	if (url_text && error_message)
 	{
 		purple_debug_warning("msn", "invalid connection. ignoring buddy photo info.\n");
 		g_free(stripped);
@@ -2821,8 +2818,10 @@
 static void
 msn_get_info(PurpleConnection *gc, const char *name)
 {
+	MsnSession *session = purple_connection_get_protocol_data(gc);
 	MsnGetInfoData *data;
 	char *url;
+	PurpleUtilFetchUrlData *url_data;
 
 	data       = g_new0(MsnGetInfoData, 1);
 	data->gc   = gc;
@@ -2830,9 +2829,10 @@
 
 	url = g_strdup_printf("%s%s", PROFILE_URL, name);
 
-	purple_util_fetch_url(url, FALSE,
-				   "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
-				   TRUE, msn_got_info, data);
+	url_data = purple_util_fetch_url(url, FALSE,
+	                                 "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)",
+	                                 TRUE, msn_got_info, data);
+	session->url_datas = g_slist_prepend(session->url_datas, url_data);
 
 	g_free(url);
 }
--- a/libpurple/protocols/msn/notification.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/notification.c	Sat Jul 31 23:42:35 2010 +0000
@@ -429,7 +429,7 @@
 
 /* add contact to xmlnode */
 static void
-msn_add_contact_xml(MsnSession *session, xmlnode *mlNode,const char *passport, MsnListOp list_op, MsnNetwork networkId)
+msn_add_contact_xml(xmlnode *mlNode, const char *passport, MsnListOp list_op, MsnNetwork networkId)
 {
 	xmlnode *d_node,*c_node;
 	char **tokens;
@@ -563,8 +563,8 @@
 
 		adl_node = xmlnode_new("ml");
 		xmlnode_set_attrib(adl_node, "l", "1");
-		msn_add_contact_xml(session, adl_node, passport,
-				user->list_op & MSN_LIST_OP_MASK, network);
+		msn_add_contact_xml(adl_node, passport,
+		                    user->list_op & MSN_LIST_OP_MASK, network);
 		payload = xmlnode_to_str(adl_node, &payload_len);
 		msn_notification_post_adl(session->notification->cmdproc, payload, payload_len);
 		g_free(payload);
@@ -620,8 +620,9 @@
 		}
 
 		if (user->networkid != MSN_NETWORK_UNKNOWN) {
-			msn_add_contact_xml(session, adl_node, user->passport,
-				user->list_op & MSN_LIST_OP_MASK, user->networkid);
+			msn_add_contact_xml(adl_node, user->passport,
+			                    user->list_op & MSN_LIST_OP_MASK,
+			                    user->networkid);
 
 			/* each ADL command may contain up to 150 contacts */
 			if (++adl_count % 150 == 0) {
@@ -650,8 +651,7 @@
 				purple_debug_info("msn", "Adding FQY address, count is %d\n",
 				                  session->adl_fqy);
 
-			msn_add_contact_xml(session, fqy_node, user->passport,
-				0, user->networkid);
+			msn_add_contact_xml(fqy_node, user->passport, 0, user->networkid);
 
 			/* each FQY command may contain up to 150 contacts, probably */
 			if (++fqy_count % 150 == 0) {
@@ -694,6 +694,8 @@
 	xmlnode_free(adl_node);
 	xmlnode_free(fqy_node);
 
+	msn_session_activate_login_timeout(session);
+
 	pc = purple_account_get_connection(session->account);
 	display_name = purple_connection_get_display_name(pc);
 	if (display_name
@@ -1752,11 +1754,6 @@
 		msn_user_set_statusline(user, NULL);
 	}
 
-	if (user->extinfo && user->extinfo->media_type == CURRENT_MEDIA_UNKNOWN) {
-		g_free(user->extinfo);
-		user->extinfo = NULL;
-	}
-
 	msn_user_update(user);
 }
 
@@ -2255,8 +2252,7 @@
 	node = xmlnode_new("ml");
 	node->child = NULL;
 
-	msn_add_contact_xml(session, node, passport,
-	                    addrem->list_op, network);
+	msn_add_contact_xml(node, passport, addrem->list_op, network);
 
 	payload = xmlnode_to_str(node, &payload_len);
 	xmlnode_free(node);
@@ -2286,8 +2282,7 @@
 	adl_node = xmlnode_new("ml");
 	adl_node->child = NULL;
 
-	msn_add_contact_xml(notification->session, adl_node, user->passport,
-	                    list_op, user->networkid);
+	msn_add_contact_xml(adl_node, user->passport, list_op, user->networkid);
 
 	payload = xmlnode_to_str(adl_node, &payload_len);
 	xmlnode_free(adl_node);
@@ -2325,8 +2320,7 @@
 	rml_node = xmlnode_new("ml");
 	rml_node->child = NULL;
 
-	msn_add_contact_xml(notification->session, rml_node, user->passport,
-	                    list_op, user->networkid);
+	msn_add_contact_xml(rml_node, user->passport, list_op, user->networkid);
 
 	payload = xmlnode_to_str(rml_node, &payload_len);
 	xmlnode_free(rml_node);
--- a/libpurple/protocols/msn/notification.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/notification.h	Sat Jul 31 23:42:35 2010 +0000
@@ -28,6 +28,10 @@
 
 /* MSN protocol challenge info */
 
+/* MSNP18 challenge: WLM Version 2009 (Build 14.0.8089.726) */
+#define MSNP18_WLM_PRODUCT_KEY "C1BX{V4W}Q3*10SM"
+#define MSNP18_WLM_PRODUCT_ID "PROD0120PW!CCV9@"
+
 /* MSNP15 challenge: WLM 8.5.1288.816 */
 #define MSNP15_WLM_PRODUCT_KEY "ILTXC!4IXB5FB*PX"
 #define MSNP15_WLM_PRODUCT_ID "PROD0119GSJUC$18"
--- a/libpurple/protocols/msn/object.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/object.c	Sat Jul 31 23:42:35 2010 +0000
@@ -96,15 +96,29 @@
 	GET_STRING_TAG(friendly, "Friendly");
 	GET_STRING_TAG(sha1d,    "SHA1D");
 	GET_STRING_TAG(sha1c,    "SHA1C");
+	GET_STRING_TAG(url,      "Url");
+	GET_STRING_TAG(url1,     "Url1");
 
 	/* If we are missing any of the required elements then discard the object */
-	/* SHA1C is not always sent anymore */
 	if (obj->creator == NULL || obj->size == 0 || obj->type == 0
-			|| obj->location == NULL || obj->friendly == NULL
-			|| obj->sha1d == NULL /*|| obj->sha1c == NULL*/) {
+	 || obj->sha1d == NULL) {
 		purple_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
 		msn_object_destroy(obj);
-		obj = NULL;
+		return NULL;
+	}
+
+	if (obj->location == NULL || obj->friendly == NULL) {
+		/* Location/friendly are required for non-buddyicon objects */
+		if (obj->type != MSN_OBJECT_USERTILE) {
+			purple_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
+			msn_object_destroy(obj);
+			return NULL;
+		/* Buddy icon object can contain Url/Url1 instead */
+		} else if (obj->url == NULL || obj->url1 == NULL) {
+			purple_debug_error("msn", "Discarding invalid msnobj: '%s'\n", str);
+			msn_object_destroy(obj);
+			return NULL;
+		}
 	}
 
 	return obj;
@@ -284,6 +298,24 @@
 	obj->sha1c = g_strdup(sha1c);
 }
 
+void
+msn_object_set_url(MsnObject *obj, const char *url)
+{
+	g_return_if_fail(obj != NULL);
+
+	g_free(obj->url);
+	obj->url = g_strdup(url);
+}
+
+void
+msn_object_set_url1(MsnObject *obj, const char *url)
+{
+	g_return_if_fail(obj != NULL);
+
+	g_free(obj->url1);
+	obj->url1 = g_strdup(url);
+}
+
 const char *
 msn_object_get_creator(const MsnObject *obj)
 {
@@ -352,6 +384,22 @@
 	}
 }
 
+const char *
+msn_object_get_url(const MsnObject *obj)
+{
+	g_return_val_if_fail(obj != NULL, NULL);
+
+	return obj->url;
+}
+
+const char *
+msn_object_get_url1(const MsnObject *obj)
+{
+	g_return_val_if_fail(obj != NULL, NULL);
+
+	return obj->url1;
+}
+
 static MsnObject *
 msn_object_find_local(const char *sha1)
 {
--- a/libpurple/protocols/msn/object.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/object.h	Sat Jul 31 23:42:35 2010 +0000
@@ -50,6 +50,8 @@
 	char *friendly;
 	char *sha1d;
 	char *sha1c;
+	char *url;
+	char *url1;
 } MsnObject;
 
 /**
@@ -155,6 +157,20 @@
 void msn_object_set_image(MsnObject *obj, PurpleStoredImage *img);
 
 /**
+ * Sets the url field in a MsnObject.
+ *
+ * @param url The url value.
+ */
+void msn_object_set_url(MsnObject *obj, const char *url);
+
+/**
+ * Sets the url1 field in a MsnObject.
+ *
+ * @param url1 The url1 value.
+ */
+void msn_object_set_url1(MsnObject *obj, const char *url);
+
+/**
  * Returns a MsnObject's creator value.
  *
  * @param obj The object.
@@ -235,6 +251,24 @@
  */
 PurpleStoredImage *msn_object_get_image(const MsnObject *obj);
 
+/**
+ * Returns a MsnObject's url value.
+ *
+ * @param obj The object.
+ *
+ * @return The url value.
+ */
+const char *msn_object_get_url(const MsnObject *obj);
+
+/**
+ * Returns a MsnObject's url1 value.
+ *
+ * @param obj The object.
+ *
+ * @return The url1 value.
+ */
+const char *msn_object_get_url1(const MsnObject *obj);
+
 void msn_object_set_local(MsnObject *obj);
 
 #endif /* MSN_OBJECT_H */
--- a/libpurple/protocols/msn/session.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/session.c	Sat Jul 31 23:42:35 2010 +0000
@@ -59,6 +59,11 @@
 
 	session->destroying = TRUE;
 
+	while (session->url_datas) {
+		purple_util_fetch_url_cancel(session->url_datas->data);
+		session->url_datas = g_slist_delete_link(session->url_datas, session->url_datas);
+	}
+
 	if (session->connected)
 		msn_session_disconnect(session);
 
@@ -131,6 +136,11 @@
 	if (!session->connected)
 		return;
 
+	if (session->login_timeout) {
+		purple_timeout_remove(session->login_timeout);
+		session->login_timeout = 0;
+	}
+
 	session->connected = FALSE;
 
 	while (session->switches != NULL)
@@ -258,6 +268,28 @@
 	return swboard;
 }
 
+static gboolean
+msn_login_timeout_cb(gpointer data)
+{
+	MsnSession *session = data;
+	/* This forces the login process to finish, even though we haven't heard
+	   a response for our FQY requests yet. We'll at least end up online to the
+	   people we've already added. The rest will follow later. */
+	msn_session_finish_login(session);
+	session->login_timeout = 0;
+	return FALSE;
+}
+
+void
+msn_session_activate_login_timeout(MsnSession *session)
+{
+	if (!session->logged_in) {
+		session->login_timeout =
+			purple_timeout_add_seconds(MSN_LOGIN_FQY_TIMEOUT,
+			                           msn_login_timeout_cb, session);
+	}
+}
+
 static void
 msn_session_sync_users(MsnSession *session)
 {
@@ -362,6 +394,9 @@
 			msg = g_strdup_printf(_("Unable to authenticate: %s"),
 								  (info == NULL ) ?
 								  _("Unknown error") : info);
+			/* Clear the password if it isn't being saved */
+			if (!purple_account_get_remember_password(session->account))
+				purple_account_set_password(session->account, NULL);
 			break;
 		case MSN_ERROR_BAD_BLIST:
 			reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
--- a/libpurple/protocols/msn/session.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/session.h	Sat Jul 31 23:42:35 2010 +0000
@@ -59,6 +59,8 @@
 
 #define MSN_LOGIN_STEPS MSN_LOGIN_STEP_END
 
+#define MSN_LOGIN_FQY_TIMEOUT 30
+
 #include "group.h"
 #include "httpconn.h"
 #include "nexus.h"
@@ -82,6 +84,7 @@
 	gboolean connected;
 	gboolean logged_in; /**< A temporal flag to ignore local buddy list adds. */
 	int      adl_fqy; /**< A count of ADL/FQY so status is only changed once. */
+	guint    login_timeout; /**< Timeout to force status change if ADL/FQY fail. */
 	gboolean destroying; /**< A flag that states if the session is being destroyed. */
 	gboolean http_method;
 
@@ -118,6 +121,8 @@
 	GHashTable *soap_table;
 	guint soap_cleanup_handle;
 	char *guid;
+
+	GSList *url_datas; /**< PurpleUtilFetchUrlData to be cancelled on exit */
 };
 
 /**
@@ -212,7 +217,16 @@
 						   const char *info);
 
 /**
- * Sets the current step in the login proccess.
+ * Starts a timeout to initiate finishing login. Sometimes the server ignores
+ * our FQY requests, so this forces ourselves online eventually.
+ *
+ * @param session The MSN session.
+ */
+void
+msn_session_activate_login_timeout(MsnSession *session);
+
+/**
+ * Sets the current step in the login process.
  *
  * @param session The MSN session.
  * @param step The current step.
--- a/libpurple/protocols/msn/slp.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/slp.c	Sat Jul 31 23:42:35 2010 +0000
@@ -39,6 +39,11 @@
 
 static void request_user_display(MsnUser *user);
 
+typedef struct {
+	MsnSession *session;
+	const char *remote_user;
+	const char *sha1;
+} MsnFetchUserDisplayData;
 
 /**************************************************************************
  * Util
@@ -1408,6 +1413,26 @@
 }
 
 static void
+fetched_user_display(PurpleUtilFetchUrlData *url_data, gpointer user_data,
+	const gchar *url_text, gsize len, const gchar *error_message)
+{
+	MsnFetchUserDisplayData *data = user_data;
+	MsnSession *session = data->session;
+
+	session->url_datas = g_slist_remove(session->url_datas, url_data);
+
+	if (url_text) {
+		purple_buddy_icons_set_for_user(session->account, data->remote_user,
+		                                g_memdup(url_text, len), len,
+		                                data->sha1);
+	}
+
+	end_user_display(NULL, session);
+
+	g_free(user_data);
+}
+
+static void
 request_user_display(MsnUser *user)
 {
 	PurpleAccount *account;
@@ -1428,8 +1453,20 @@
 	if (g_ascii_strcasecmp(user->passport,
 						   purple_account_get_username(account)))
 	{
-		msn_slplink_request_object(slplink, info, got_user_display,
-								   end_user_display, obj);
+		const char *url = msn_object_get_url1(obj);
+		if (url) {
+			MsnFetchUserDisplayData *data = g_new0(MsnFetchUserDisplayData, 1);
+			PurpleUtilFetchUrlData *url_data;
+			data->session = session;
+			data->remote_user = user->passport;
+			data->sha1 = info;
+			url_data = purple_util_fetch_url_len(url, TRUE, NULL, TRUE, 200*1024,
+			                                     fetched_user_display, data);
+			session->url_datas = g_slist_prepend(session->url_datas, url_data);
+		} else {
+			msn_slplink_request_object(slplink, info, got_user_display,
+			                           end_user_display, obj);
+		}
 	}
 	else
 	{
--- a/libpurple/protocols/msn/slplink.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/slplink.c	Sat Jul 31 23:42:35 2010 +0000
@@ -214,11 +214,16 @@
 		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;
+	if (slplink->dc != NULL) {
+		if ((slplink->dc->state != DC_STATE_ESTABLISHED && slplink->dc->slpcall == slpcall)
+		 || (slplink->slp_calls == NULL)) {
+			/* The DC is not established and its corresponding slpcall is dead,
+			 * or the slplink has no slpcalls in it and no longer needs the DC.
+			 */
+			slplink->dc->slplink = NULL;
+			msn_dc_destroy(slplink->dc);
+			slplink->dc = NULL;
+		}
 	}
 }
 
--- a/libpurple/protocols/msn/switchboard.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/switchboard.c	Sat Jul 31 23:42:35 2010 +0000
@@ -746,8 +746,13 @@
 	else if ((swboard->current_users > 1) ||
 			 (purple_conversation_get_type(swboard->conv) == PURPLE_CONV_TYPE_CHAT))
 	{
+		GList *passport;
 		/* This is a switchboard used for a chat */
 		purple_conv_chat_remove_user(PURPLE_CONV_CHAT(swboard->conv), user, NULL);
+
+		passport = g_list_find_custom(swboard->users, user, (GCompareFunc)strcmp);
+		g_free(passport->data);
+		swboard->users = g_list_delete_link(swboard->users, passport);
 		swboard->current_users--;
 		if (swboard->current_users == 0)
 			msn_switchboard_destroy(swboard);
--- a/libpurple/protocols/msn/user.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/msn/user.h	Sat Jul 31 23:42:35 2010 +0000
@@ -57,8 +57,8 @@
  * put this info in in a separate struct to save memory because we
  * allocate an MsnUser struct for each buddy, but we generally only
  * need this information for a small percentage of our buddies
- * (usually less than 1%).  Putting it in a separate struct saves
- * makes MsnUser smaller by the size of a few pointers.
+ * (usually less than 1%).  Putting it in a separate struct makes
+ * MsnUser smaller by the size of a few pointers.
  */
 typedef struct _MsnUserExtendedInfo
 {
--- a/libpurple/protocols/mxit/actions.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/actions.c	Sat Jul 31 23:42:35 2010 +0000
@@ -86,7 +86,7 @@
 	/* validate name */
 	name = purple_request_fields_get_string( fields, "name" );
 	if ( ( !name ) || ( strlen( name ) < 3 ) ) {
-		err = _( "The name you entered is invalid." );
+		err = _( "The Display Name you entered is invalid." );
 		goto out;
 	}
 
@@ -113,26 +113,26 @@
 
 		/* update name */
 		g_strlcpy( profile->nickname, name, sizeof( profile->nickname ) );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_FULLNAME, CP_PROF_TYPE_UTF8, profile->nickname );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_FULLNAME, CP_PROFILE_TYPE_UTF8, profile->nickname );
 		g_string_append( attributes, attrib );
 		acount++;
 
 		/* update hidden */
 		field = purple_request_fields_get_field( fields, "hidden" );
 		profile->hidden = purple_request_field_bool_get_value( field );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_HIDENUMBER, CP_PROF_TYPE_BOOL, ( profile->hidden ) ? "1" : "0" );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_HIDENUMBER, CP_PROFILE_TYPE_BOOL, ( profile->hidden ) ? "1" : "0" );
 		g_string_append( attributes, attrib );
 		acount++;
 
 		/* update birthday */
-		strcpy( profile->birthday, bday );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_BIRTHDATE, CP_PROF_TYPE_UTF8, profile->birthday );
+		g_strlcpy( profile->birthday, bday, sizeof( profile->birthday ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_BIRTHDATE, CP_PROFILE_TYPE_UTF8, profile->birthday );
 		g_string_append( attributes, attrib );
 		acount++;
 
 		/* update gender */
 		profile->male = ( purple_request_fields_get_choice( fields, "male" ) != 0 );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_GENDER, CP_PROF_TYPE_BOOL, ( profile->male ) ? "1" : "0" );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_GENDER, CP_PROFILE_TYPE_BOOL, ( profile->male ) ? "1" : "0" );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -141,8 +141,8 @@
 		if ( !name )
 			profile->title[0] = '\0';
 		else
-			strcpy( profile->title, name );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_TITLE, CP_PROF_TYPE_UTF8, profile->title );
+			g_strlcpy( profile->title, name, sizeof( profile->title ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_TITLE, CP_PROFILE_TYPE_UTF8, profile->title );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -151,8 +151,8 @@
 		if ( !name )
 			profile->firstname[0] = '\0';
 		else
-			strcpy( profile->firstname, name );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_FIRSTNAME, CP_PROF_TYPE_UTF8, profile->firstname );
+			g_strlcpy( profile->firstname, name, sizeof( profile->firstname ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_FIRSTNAME, CP_PROFILE_TYPE_UTF8, profile->firstname );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -161,8 +161,8 @@
 		if ( !name )
 			profile->lastname[0] = '\0';
 		else
-			strcpy( profile->lastname, name );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_LASTNAME, CP_PROF_TYPE_UTF8, profile->lastname );
+			g_strlcpy( profile->lastname, name, sizeof( profile->lastname ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_LASTNAME, CP_PROFILE_TYPE_UTF8, profile->lastname );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -171,8 +171,8 @@
 		if ( !name )
 			profile->email[0] = '\0';
 		else
-			strcpy( profile->email, name );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_EMAIL, CP_PROF_TYPE_UTF8, profile->email );
+			g_strlcpy( profile->email, name, sizeof( profile->email ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_EMAIL, CP_PROFILE_TYPE_UTF8, profile->email );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -181,8 +181,8 @@
 		if ( !name )
 			profile->mobilenr[0] = '\0';
 		else
-			strcpy( profile->mobilenr, name );
-		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_MOBILENR, CP_PROF_TYPE_UTF8, profile->mobilenr );
+			g_strlcpy( profile->mobilenr, name, sizeof( profile->mobilenr ) );
+		g_snprintf( attrib, sizeof( attrib ), "\01%s\01%i\01%s", CP_PROFILE_MOBILENR, CP_PROFILE_TYPE_UTF8, profile->mobilenr );
 		g_string_append( attributes, attrib );
 		acount++;
 
@@ -225,12 +225,14 @@
 	group = purple_request_field_group_new( NULL );
 	purple_request_fields_add_group( fields, group );
 
-	/* mxitId (read-only) */
-	if ( session->mxitId ) {
-		field = purple_request_field_string_new( "mxitid", _( "Your MXitId" ), session->mxitId, FALSE );
+#if	0
+	/* UID (read-only) */
+	if ( session->uid ) {
+		field = purple_request_field_string_new( "mxitid", _( "Your UID" ), session->uid, FALSE );
 		purple_request_field_string_set_editable( field, FALSE );
 		purple_request_field_group_add_field( group, field );
 	}
+#endif
 
 	/* pin */
 	field = purple_request_field_string_new( "pin", _( "PIN" ), session->acc->password, FALSE );
@@ -247,6 +249,8 @@
 	/* birthday */
 	field = purple_request_field_string_new( "bday", _( "Birthday" ), profile->birthday, FALSE );
 	purple_request_field_group_add_field( group, field );
+	if ( profile->flags & CP_PROF_DOBLOCKED )
+		purple_request_field_string_set_editable( field, FALSE );
 
 	/* gender */
 	field = purple_request_field_choice_new( "male", _( "Gender" ), ( profile->male ) ? 1 : 0 );
--- a/libpurple/protocols/mxit/http.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/http.c	Sat Jul 31 23:42:35 2010 +0000
@@ -118,7 +118,7 @@
 		/* read bytes from the socket */
 		len = read( session->fd, buf + buflen, sizeof( buf ) - buflen );
 		if ( len <= 0 ) {
-			/* connection has been terminated, or error occured */
+			/* connection has been terminated, or error occurred */
 			goto done;
 		}
 
@@ -139,7 +139,7 @@
 		}
 		buflen += len;
 
-		/* we have the header's end now skip over the http seperator to get the body offset */
+		/* we have the header's end now skip over the http separator to get the body offset */
 		ch += strlen( HTTP_11_SEPERATOR );
 		*(ch - 1) = '\0';
 		body = ch;
@@ -206,7 +206,7 @@
 		/* read bytes from the socket */
 		len = read( session->fd, &session->rx_dbuf[session->rx_i], session->rx_res );
 		if ( len <= 0 ) {
-			/* connection has been terminated, or error occured */
+			/* connection has been terminated, or error occurred */
 			goto done;
 		}
 
--- a/libpurple/protocols/mxit/login.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/login.c	Sat Jul 31 23:42:35 2010 +0000
@@ -238,7 +238,7 @@
 	/* nickname */
 	str = purple_request_fields_get_string( fields, "nickname" );
 	if ( ( !str ) || ( strlen( str ) < 3 ) ) {
-		err = _( "The nick name you entered is invalid." );
+		err = _( "The Display Name you entered is invalid." );
 		goto out;
 	}
 	g_strlcpy( profile->nickname, str, sizeof( profile->nickname ) );
@@ -329,12 +329,12 @@
 	purple_request_fields_add_group( fields, group );
 
 	/* mxit login name */
-	field = purple_request_field_string_new( "loginname", _( "MXit Login Name" ), purple_account_get_username( session->acc ), FALSE );
+	field = purple_request_field_string_new( "loginname", _( "MXit ID" ), purple_account_get_username( session->acc ), FALSE );
 	purple_request_field_string_set_editable( field, FALSE );
 	purple_request_field_group_add_field( group, field );
 
 	/* nick name (required) */
-	field = purple_request_field_string_new( "nickname", _( "Nick Name" ), profile->nickname, FALSE );
+	field = purple_request_field_string_new( "nickname", _( "Display Name" ), profile->nickname, FALSE );
 	purple_request_field_set_required( field, TRUE );
 	purple_request_field_group_add_field( group, field );
 
@@ -418,10 +418,10 @@
 				purple_connection_error( session->con, _( "Invalid country selected. Please try again." ) );
 				return;
 			case '6' :
-				purple_connection_error( session->con, _( "Username is not registered. Please register first." ) );
+				purple_connection_error( session->con, _( "The MXit ID you entered is not registered. Please register first." ) );
 				return;
 			case '7' :
-				purple_connection_error( session->con, _( "Username is already registered. Please choose another username." ) );
+				purple_connection_error( session->con, _( "The MXit ID you entered is already registered. Please choose another." ) );
 				/* this user's account already exists, so we need to change the registration login flag to be login */
 				purple_account_set_int( session->acc, MXIT_CONFIG_STATE, MXIT_STATE_LOGIN );
 				return;
@@ -637,7 +637,7 @@
 
 	/* add the captcha */
 	logindata->captcha = purple_base64_decode( parts[3], &logindata->captcha_size );
-	field = purple_request_field_image_new( "capcha", _( "Security Code" ), (gchar*) logindata->captcha, logindata->captcha_size );
+	field = purple_request_field_image_new( "captcha", _( "Security Code" ), (gchar*) logindata->captcha, logindata->captcha_size );
 	purple_request_field_group_add_field( group, field );
 
 	/* ask for input (required) */
@@ -659,7 +659,7 @@
 		}
 		purple_request_field_list_add( field, country[1], g_strdup( country[0] ) );
 		if ( strcmp( country[1], parts[6] ) == 0 ) {
-			/* based on the user's ip, this is his current country code, so we default to it */
+			/* based on the user's IP, this is his current country code, so we default to it */
 			purple_request_field_list_add_selected( field, country[1] );
 		}
 		g_strfreev( country );
--- a/libpurple/protocols/mxit/markup.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/markup.c	Sat Jul 31 23:42:35 2010 +0000
@@ -257,7 +257,7 @@
 	 * all the text as is to the conversation window. this message dump is very
 	 * confusing and makes it totally unusable. to work around this we will count
 	 * the amount of tags and if its more than the pidgin threshold, we will just
-	 * break the message up into smaller parts and send them seperately to pidgin.
+	 * break the message up into smaller parts and send them separately to pidgin.
 	 * to the user it will look like multiple messages, but at least he will be able
 	 * to use and understand it.
 	 */
@@ -662,7 +662,7 @@
  *  @param message			The message text
  *  @return					The length of the message to skip
  */
-static int mxit_extract_chatroom_nick( struct RXMsgData* mx, char* message, int len )
+static int mxit_extract_chatroom_nick( struct RXMsgData* mx, char* message, int len, int msgflags )
 {
 	int		i;
 
@@ -673,7 +673,6 @@
 		 * Search for it....
 		 */
 		gboolean	found	= FALSE;
-		gchar*		nickname;
 
 		for ( i = 1; i < len; i++ ) {
 			if ( ( message[i] == '\n' ) && ( message[i-1] == '>' ) ) {
@@ -685,12 +684,30 @@
 		}
 
 		if ( found ) {
+			gchar*		nickname;
+
 			/*
 			 * The message definitely had an embedded nickname - generate a marked-up
 			 * message to be displayed.
 			 */
 			nickname = g_markup_escape_text( &message[1], -1 );
 
+			/* Remove any MXit escaping from nickname ("\X" --> "X") */
+			if ( msgflags & CP_MSG_MARKUP ) {
+				int	nicklen = strlen( nickname );
+				int	j, k;
+
+				for ( j = 0, k = 0; j < nicklen; j++ ) {
+					if ( nickname[j] == '\\' )
+						j++;
+
+					nickname[k] = nickname[j];
+					k++;
+				}
+
+				nickname[k] = '\0';		/* terminate string */
+			}
+
 			/* add nickname within some BOLD markup to the new converted message */
 			g_string_append_printf( mx->msg, "<b>%s:</b> ", nickname );
 
@@ -747,7 +764,7 @@
 	if ( is_mxit_chatroom_contact( mx->session, mx->from ) ) {
 		/* chatroom message, so we need to extract and skip the sender's nickname
 		 * which is embedded inside the message */
-		i = mxit_extract_chatroom_nick( mx, message, len );
+		i = mxit_extract_chatroom_nick( mx, message, len, msgflags );
 	}
 
 	/* run through the message and check for custom emoticons and markup */
--- a/libpurple/protocols/mxit/multimx.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/multimx.c	Sat Jul 31 23:42:35 2010 +0000
@@ -557,6 +557,9 @@
 {
 	struct MXitSession* session = (struct MXitSession*) gc->proto_data;
 	struct multimx* multimx = NULL;
+	PurpleBuddy* buddy;
+	PurpleConversation *convo;
+	char* tmp;
 
 	purple_debug_info(MXIT_PLUGIN_ID, "Groupchat invite to '%s'\n", username);
 
@@ -569,6 +572,24 @@
 
 	/* Send invite to MXit */
 	mxit_send_groupchat_invite(session, multimx->roomid, 1, &username);
+
+	/* Find the buddy information for this contact (reference: "libpurple/blist.h") */
+	buddy = purple_find_buddy(session->acc, username);
+	if (!buddy) {
+		purple_debug_warning(MXIT_PLUGIN_ID, "mxit_chat_invite: unable to find the buddy '%s'\n", username);
+		return;
+	}
+
+	convo = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, multimx->roomname, session->acc);
+	if (convo == NULL) {
+		purple_debug_error(MXIT_PLUGIN_ID, "Conversation '%s' not found\n", multimx->roomname);
+		return;
+	}
+
+	/* Display system message in chat window */
+	tmp = g_strdup_printf("%s: %s", _("You have invited"), purple_buddy_get_alias(buddy));
+	purple_conv_chat_write(PURPLE_CONV_CHAT(convo), "MXit", tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
+	g_free(tmp);
 }
 
 
--- a/libpurple/protocols/mxit/mxit.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/mxit.c	Sat Jul 31 23:42:35 2010 +0000
@@ -91,6 +91,8 @@
 	if ( !account )
 		goto skip;
 	con = purple_account_get_connection( account );
+	if ( !con )
+		goto skip;
 
 	/* determine if it's a command-response to send */
 	is_command = g_str_has_prefix( parts[4], "::type=reply|" );
@@ -145,7 +147,7 @@
 
 
 /*------------------------------------------------------------------------
- * Unegister MXit from receiving URI click notifications from the UI
+ * Unregister MXit from receiving URI click notifications from the UI
  */
 static void mxit_unregister_uri_handler()
 {
@@ -203,7 +205,7 @@
 	if ( find_active_chat( session->active_chats, who ) )
 		return;
 
-	/* determite if this buddy is a MXit service */
+	/* determine if this buddy is a MXit service */
 	switch ( contact->type ) {
 		case MXIT_TYPE_BOT :
 		case MXIT_TYPE_CHATROOM :
@@ -559,7 +561,8 @@
 {
 	struct MXitSession*		session			= (struct MXitSession*) gc->proto_data;
 	const char*				profilelist[]	= { CP_PROFILE_BIRTHDATE, CP_PROFILE_GENDER, CP_PROFILE_FULLNAME,
-												CP_PROFILE_FIRSTNAME, CP_PROFILE_LASTNAME, CP_PROFILE_REGCOUNTRY };
+												CP_PROFILE_FIRSTNAME, CP_PROFILE_LASTNAME, CP_PROFILE_REGCOUNTRY, CP_PROFILE_LASTSEEN,
+												CP_PROFILE_STATUS, CP_PROFILE_AVATAR };
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_get_info: '%s'\n", who );
 
@@ -578,11 +581,34 @@
 
 	table = g_hash_table_new( g_str_hash, g_str_equal );
 
-	g_hash_table_insert( table, "login_label", (gpointer)_( "Your Mobile Number..." ) );
+	g_hash_table_insert( table, "login_label", (gpointer)_( "Your MXit ID..." ) );
 
 	return table;
 }
 
+
+/*------------------------------------------------------------------------
+ * Buddy list menu.
+ *
+ *  @param node		The entry in the buddy list.
+ */
+static GList* mxit_blist_menu( PurpleBlistNode *node )
+{
+	PurpleBuddy*		buddy;
+	struct contact*		contact;
+	GList*				m = NULL;
+
+	if ( !PURPLE_BLIST_NODE_IS_BUDDY( node ) )
+		return NULL;
+
+	buddy = (PurpleBuddy *) node;
+	contact = purple_buddy_get_protocol_data( buddy );
+	if ( !contact )
+		return NULL;
+
+	return m;
+}
+
 /*========================================================================================================================*/
 
 static PurplePluginProtocolInfo proto_info = {
@@ -594,7 +620,7 @@
 		32, 32,												/* min width & height */
 		MXIT_AVATAR_SIZE,									/* max width */
 		MXIT_AVATAR_SIZE,									/* max height */
-		100000,												/* max filezize */
+		100000,												/* max filesize */
 		PURPLE_ICON_SCALE_SEND | PURPLE_ICON_SCALE_DISPLAY	/* scaling rules */
 	},
 	mxit_list_icon,			/* list_icon */
@@ -602,7 +628,7 @@
 	mxit_status_text,		/* status_text */
 	mxit_tooltip,			/* tooltip_text */
 	mxit_status_types,		/* status types				[roster.c] */
-	NULL,					/* blist_node_menu */
+	mxit_blist_menu,		/* blist_node_menu */
 	mxit_chat_info,			/* chat_info				[multimx.c] */
 	NULL,					/* chat_info_defaults */
 	mxit_login,				/* login					[login.c] */
--- a/libpurple/protocols/mxit/mxit.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/mxit.h	Sat Jul 31 23:42:35 2010 +0000
@@ -105,7 +105,7 @@
 /* Client session flags */
 #define		MXIT_FLAG_CONNECTED			0x01		/* established connection to the server */
 #define		MXIT_FLAG_LOGGEDIN			0x02		/* user currently logged in */
-#define		MXIT_FLAG_FIRSTROSTER		0x04		/* set to true once the first roster update has been recevied and processed */
+#define		MXIT_FLAG_FIRSTROSTER		0x04		/* set to true once the first roster update has been received and processed */
 
 
 /* define this to enable the link clicking support */
@@ -151,7 +151,7 @@
 
 	/* personal (profile) */
 	struct MXitProfile*	profile;					/* user's profile information */
-	char*				mxitId;						/* the user's MXitId */
+	char*				uid;						/* the user's UID */
 
 	/* libpurple */
 	PurpleAccount*		acc;						/* pointer to the libpurple internal account struct */
--- a/libpurple/protocols/mxit/profile.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/profile.c	Sat Jul 31 23:42:35 2010 +0000
@@ -101,6 +101,23 @@
 
 
 /*------------------------------------------------------------------------
+ * Returns timestamp field in date & time format (DD-MM-YYYY HH:MM:SS)
+ *
+ * @param msecs		The timestamps (milliseconds since epoch)
+ * @return			Date & Time in a display'able format.
+ */
+static const char* datetime( gint64 msecs )
+{  
+    time_t secs = msecs / 1000;
+
+    struct tm t;
+    localtime_r( &secs, &t );
+
+	return purple_utf8_strftime( "%d-%m-%Y %H:%M:%S", &t );
+}
+
+
+/*------------------------------------------------------------------------
  * Display the profile information.
  *
  *  @param session		The MXit session object
@@ -120,7 +137,7 @@
 		contact = purple_buddy_get_protocol_data(buddy);
 	}
 
-	purple_notify_user_info_add_pair( info, _( "Nick Name" ), profile->nickname );
+	purple_notify_user_info_add_pair( info, _( "Display Name" ), profile->nickname );
 	purple_notify_user_info_add_pair( info, _( "Birthday" ), profile->birthday );
 	purple_notify_user_info_add_pair( info, _( "Gender" ), profile->male ? _( "Male" ) : _( "Female" ) );
 //	purple_notify_user_info_add_pair( info, _( "Hidden Number" ), profile->hidden ? _( "Yes" ) : _( "No" ) );
@@ -138,6 +155,10 @@
 		/* presence */
 		purple_notify_user_info_add_pair( info, _( "Status" ), mxit_convert_presence_to_name( contact->presence ) );
 
+		/* last online */
+		if ( contact->presence == MXIT_PRESENCE_OFFLINE )
+			purple_notify_user_info_add_pair( info, _( "Last Online" ), ( profile->lastonline == 0 ) ? _( "Unknown" ) : datetime( profile->lastonline ) );
+
 		/* mood */
 		if ( contact->mood != MXIT_MOOD_NONE )   
 			purple_notify_user_info_add_pair( info, _( "Mood" ), mxit_convert_mood_to_name( contact->mood ) );
@@ -153,7 +174,6 @@
 
 		/* hidden number */
 		purple_notify_user_info_add_pair( info, _( "Hidden Number" ), ( contact->flags & MXIT_CFLAG_HIDDEN ) ? _( "Yes" ) : _( "No" ) );
-
 	}
 
 	purple_notify_userinfo( session->con, username, info, NULL, NULL );
--- a/libpurple/protocols/mxit/profile.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/profile.h	Sat Jul 31 23:42:35 2010 +0000
@@ -44,6 +44,8 @@
 	char		email[64];							/* user's email address */
 	char		mobilenr[21];						/* user's mobile number */
 	char		regcountry[3];						/* user's registered country code */
+	gint64		flags;								/* user's profile flags */
+	gint64		lastonline;							/* user's last-online timestamp */
 
 	gboolean	hidden;								/* set if the user's msisdn should remain hidden */
 };
--- a/libpurple/protocols/mxit/protocol.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/protocol.c	Sat Jul 31 23:42:35 2010 +0000
@@ -445,7 +445,7 @@
 	packet->headerlen = 0;
 
 	/* create generic packet header */
-	hlen = sprintf( header,	"id=%s%c", session->acc->username, CP_REC_TERM );			/* client msisdn */
+	hlen = snprintf( header, sizeof( header ), "id=%s%c", session->acc->username, CP_REC_TERM );			/* client msisdn */
 
 	if ( session->http ) {
 		/* http connection only */
@@ -520,7 +520,7 @@
 		/* we are still waiting for an outstanding ACK from the MXit server */
 		if ( session->last_tx <= time( NULL ) - MXIT_ACK_TIMEOUT ) {
 			/* ack timeout! so we close the connection here */
-			purple_debug_info( MXIT_PLUGIN_ID, "mxit_manage_queue: Timeout awaiting ACK for command '%X'\n", session->outack );
+			purple_debug_info( MXIT_PLUGIN_ID, "mxit_manage_queue: Timeout awaiting ACK for command '%i'\n", session->outack );
 			purple_connection_error( session->con, _( "Timeout while waiting for a response from the MXit server." ) );
 		}
 		return TRUE;
@@ -642,7 +642,8 @@
 	locale = purple_account_get_string( session->acc, MXIT_CONFIG_LOCALE, MXIT_DEFAULT_LOCALE );
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%i%c%s%c"		/* "ms"=password\1version\1maxreplyLen\1name\1 */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%i%c%s%c"		/* "ms"=password\1version\1maxreplyLen\1name\1 */
 								"%s%c%i%c%s%c%s%c"			/* dateOfBirth\1gender\1location\1capabilities\1 */
 								"%s%c%i%c%s%c%s",			/* dc\1features\1dialingcode\1locale */
 								session->encpwd, CP_FLD_TERM, MXIT_CP_VERSION, CP_FLD_TERM, CP_MAX_FILESIZE, CP_FLD_TERM, profile->nickname, CP_FLD_TERM,
@@ -670,7 +671,8 @@
 	locale = purple_account_get_string( session->acc, MXIT_CONFIG_LOCALE, MXIT_DEFAULT_LOCALE );
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%i%c"			/* "ms"=password\1version\1getContacts\1 */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%i%c"			/* "ms"=password\1version\1getContacts\1 */
 								"%s%c%s%c%i%c"				/* capabilities\1dc\1features\1 */
 								"%s%c%s%c"					/* dialingcode\1locale\1 */
 								"%i%c%i%c%i",				/* maxReplyLen\1protocolVer\1lastRosterUpdate */
@@ -711,7 +713,8 @@
 		markuped_msg = g_strdup( msg );
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%i%c%i",		/* "ms"=jid\1msg\1type\1flags */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%i%c%i",		/* "ms"=jid\1msg\1type\1flags */
 								to, CP_FLD_TERM, markuped_msg, CP_FLD_TERM, msgtype, CP_FLD_TERM, CP_MSG_MARKUP | CP_MSG_EMOTICON
 	);
 
@@ -737,7 +740,8 @@
 	int				datalen;
 	unsigned int	i;
 
-	datalen = sprintf( data,	"ms=%s%c%i",		/* "ms="mxitid\1nr_attributes */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%i",		/* "ms="mxitid\1nr_attributes */
 								(username ? username : ""), CP_FLD_TERM, nr_attrib);
 
 	/* add attributes */
@@ -767,7 +771,8 @@
 	parts = g_strsplit( attributes, "\01", ( MXIT_MAX_ATTRIBS * 3 ) );
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%i",	/* "ms"=password\1nr_attibutes  */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%i",	/* "ms"=password\1nr_attibutes  */
 								( password ) ? password : "", CP_FLD_TERM, nr_attrib
 	);
 
@@ -797,7 +802,8 @@
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%i%c",					/* "ms"=show\1status */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%i%c",					/* "ms"=show\1status */
 								presence, CP_FLD_TERM
 	);
 
@@ -822,7 +828,8 @@
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%i",	/* "ms"=mood */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%i",	/* "ms"=mood */
 								mood
 	);
 
@@ -845,7 +852,8 @@
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%s%c%i%c%s",	/* "ms"=group\1username\1alias\1type\1msg */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%s%c%i%c%s",	/* "ms"=group\1username\1alias\1type\1msg */
 								groupname, CP_FLD_TERM, username, CP_FLD_TERM, alias,
 								CP_FLD_TERM, MXIT_TYPE_MXIT, CP_FLD_TERM, ""
 	);
@@ -867,7 +875,8 @@
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s",	/* "ms"=username */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s",	/* "ms"=username */
 								username
 	);
 
@@ -889,7 +898,8 @@
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%s",	/* "ms"=username\1group\1alias */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%s",	/* "ms"=username\1group\1alias */
 								username, CP_FLD_TERM, "", CP_FLD_TERM, alias
 	);
 
@@ -910,7 +920,8 @@
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s",	/* "ms"=username */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s",	/* "ms"=username */
 								username
 	);
 
@@ -933,7 +944,8 @@
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%s",	/* "ms"=groupname\1username\1alias */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%s",	/* "ms"=groupname\1username\1alias */
 								groupname, CP_FLD_TERM, username, CP_FLD_TERM, alias
 	);
 
@@ -954,7 +966,8 @@
 	int			datalen;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s",	/* "ms"=splashId */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s",	/* "ms"=splashId */
 								splashid
 	);
 
@@ -979,7 +992,8 @@
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_send_msgevent: to=%s id=%s event=%i\n", to, id, event );
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%s%c%i",		/* "ms"=contactAddress \1 id \1 event */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%s%c%i",		/* "ms"=contactAddress \1 id \1 event */
 								to, CP_FLD_TERM, id, CP_FLD_TERM, event
 	);
 
@@ -1003,7 +1017,8 @@
 	int			i;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%i",	/* "ms"=roomname\1nr_jids\1jid0\1..\1jidN */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%i",	/* "ms"=roomname\1nr_jids\1jid0\1..\1jidN */
 								groupname, CP_FLD_TERM, nr_usernames
 	);
 
@@ -1032,7 +1047,8 @@
 	int			i;
 
 	/* convert the packet to a byte stream */
-	datalen = sprintf( data,	"ms=%s%c%i",	/* "ms"=roomid\1nr_jids\1jid0\1..\1jidN */
+	datalen = snprintf( data, sizeof( data ),
+								"ms=%s%c%i",	/* "ms"=roomid\1nr_jids\1jid0\1..\1jidN */
 								roomid, CP_FLD_TERM, nr_usernames
 	);
 
@@ -1284,7 +1300,7 @@
 	const char*		statusmsg;
 	const char*		profilelist[] = { CP_PROFILE_BIRTHDATE, CP_PROFILE_GENDER, CP_PROFILE_HIDENUMBER, CP_PROFILE_FULLNAME,
 									CP_PROFILE_TITLE, CP_PROFILE_FIRSTNAME, CP_PROFILE_LASTNAME, CP_PROFILE_EMAIL,
-									CP_PROFILE_MOBILENR };
+									CP_PROFILE_MOBILENR, CP_PROFILE_FLAGS };
 
 	purple_account_set_int( session->acc, MXIT_CONFIG_STATE, MXIT_STATE_LOGIN );
 
@@ -1304,7 +1320,7 @@
 
 	/* extract MXitId (from protocol 5.9) */
 	if ( records[1]->fcount >= 9 )
-		session->mxitId = g_strdup( records[1]->fields[8]->data );
+		session->uid = g_strdup( records[1]->fields[8]->data );
 
 	/* display the current splash-screen */
 	if ( splash_popup_enabled( session ) )
@@ -1456,9 +1472,9 @@
 		/* build up a new contact info struct */
 		contact = g_new0( struct contact, 1 );
 
-		strcpy( contact->username, rec->fields[0]->data );
+		g_strlcpy( contact->username, rec->fields[0]->data, sizeof( contact->username ) );
 		mxit_strip_domain( contact->username );				/* remove dummy domain */
-		strcpy( contact->alias, rec->fields[1]->data );
+		g_strlcpy( contact->alias, rec->fields[1]->data, sizeof( contact->alias ) );
 		contact->type = atoi( rec->fields[2]->data );
 
 		if ( rec->fcount >= 5 ) {
@@ -1509,10 +1525,10 @@
 		/* build up a new contact info struct */
 		contact = g_new0( struct contact, 1 );
 
-		strcpy( contact->groupname, rec->fields[0]->data );
-		strcpy( contact->username, rec->fields[1]->data );
+		g_strlcpy( contact->groupname, rec->fields[0]->data, sizeof( contact->groupname ) );
+		g_strlcpy( contact->username, rec->fields[1]->data, sizeof( contact->username ) );
 		mxit_strip_domain( contact->username );				/* remove dummy domain */
-		strcpy( contact->alias, rec->fields[2]->data );
+		g_strlcpy( contact->alias, rec->fields[2]->data, sizeof( contact->alias ) );
 
 		contact->presence = atoi( rec->fields[3]->data );
 		contact->type = atoi( rec->fields[4]->data );
@@ -1566,12 +1582,13 @@
 
 		/*
 		 * The format of the record is:
-		 * contactAddressN\1presenceN\1\moodN\1customMoodN\1statusMsgN\1avatarIdN
+		 * contactAddressN\1presenceN\1moodN\1customMoodN\1statusMsgN\1avatarIdN
 		 */
 		mxit_strip_domain( rec->fields[0]->data );		/* contactAddress */
 
 		mxit_update_buddy_presence( session, rec->fields[0]->data, atoi( rec->fields[1]->data ), atoi( rec->fields[2]->data ),
-				rec->fields[3]->data, rec->fields[4]->data, rec->fields[5]->data );
+				rec->fields[3]->data, rec->fields[4]->data );
+		mxit_update_buddy_avatar( session, rec->fields[0]->data, rec->fields[5]->data );
 	}
 }
 
@@ -1589,11 +1606,13 @@
 	struct MXitProfile*		profile		= NULL;
 	int						count;
 	int						i;
+	const char*				avatarId	= NULL;
+	const char*				statusMsg	= NULL;
 
 	purple_debug_info( MXIT_PLUGIN_ID, "mxit_parse_cmd_extprofile: profile for '%s'\n", mxitId );
 
-	if ( records[0]->fields[0]->len == 0 ) {
-		/* no MXitId provided, so this must be our own profile information */
+	if ( ( records[0]->fields[0]->len == 0 ) || ( session->uid && ( strcmp( session->uid, records[0]->fields[0]->data ) == 0 ) ) ) {
+		/* No UserId or Our UserId provided, so this must be our own profile information */
 		if ( session->profile == NULL )
 			session->profile = g_new0( struct MXitProfile, 1 );
 		profile = session->profile;
@@ -1643,8 +1662,13 @@
 			/* nickname */
 			g_strlcpy( profile->nickname, fvalue, sizeof( profile->nickname ) );
 		}
+		else if ( strcmp( CP_PROFILE_STATUS, fname ) == 0 ) {
+			/* status message - just keep a reference to the value */
+			statusMsg = fvalue;
+		}
 		else if ( strcmp( CP_PROFILE_AVATAR, fname ) == 0 ) {
-			/* avatar id, we just ingore it cause we dont need it */
+			/* avatar id - just keep a reference to the value */
+			avatarId = fvalue;
 		}
 		else if ( strcmp( CP_PROFILE_TITLE, fname ) == 0 ) {
 			/* title */
@@ -1670,14 +1694,26 @@
 			/* registered country */
 			g_strlcpy( profile->regcountry, fvalue, sizeof( profile->regcountry ) );
 		}
+		else if ( strcmp( CP_PROFILE_FLAGS, fname ) == 0 ) {
+			/* profile flags */
+			profile->flags = strtoll( fvalue, NULL, 10 );
+		}
+		else if ( strcmp( CP_PROFILE_LASTSEEN, fname ) == 0 ) {
+			/* last seen online */
+			profile->lastonline = strtoll( fvalue, NULL, 10 );
+		}
 		else {
 			/* invalid profile attribute */
 			purple_debug_error( MXIT_PLUGIN_ID, "Invalid profile attribute received '%s' \n", fname );
 		}
 	}
 
-	/* if this is not our profile, just display it */
 	if ( profile != session->profile ) {
+		/* update avatar (if necessary) */
+		if ( avatarId )
+			mxit_update_buddy_avatar( session, mxitId, avatarId );
+
+		/* if this is not our profile, just display it */
 		mxit_show_profile( session, mxitId, profile );
 		g_free( profile );
 	}
@@ -2010,12 +2046,12 @@
 					return 0;
 				}
 				else {
-					sprintf( errmsg, _( "Login error: %s (%i)" ), errdesc, packet->errcode );
+					snprintf( errmsg, sizeof( errmsg ), _( "Login error: %s (%i)" ), errdesc, packet->errcode );
 					purple_connection_error( session->con, errmsg );
 					return -1;
 				}
 		case CP_CMD_LOGOUT :
-				sprintf( errmsg, _( "Logout error: %s (%i)" ), errdesc, packet->errcode );
+				snprintf( errmsg, sizeof( errmsg ), _( "Logout error: %s (%i)" ), errdesc, packet->errcode );
 				purple_connection_error_reason( session->con, PURPLE_CONNECTION_ERROR_NAME_IN_USE, _( errmsg ) );
 				return -1;
 		case CP_CMD_CONTACT :
@@ -2487,8 +2523,8 @@
 	mxit_free_emoticon_cache( session );
 
 	/* free allocated memory */
-	if ( session->mxitId )
-		g_free( session->mxitId );
+	if ( session->uid )
+		g_free( session->uid );
 	g_free( session->encpwd );
 	session->encpwd = NULL;
 
--- a/libpurple/protocols/mxit/protocol.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/protocol.h	Sat Jul 31 23:42:35 2010 +0000
@@ -190,13 +190,17 @@
 #define		CP_PROFILE_EMAIL		"email"					/* Email address (UTF8 String) */
 #define		CP_PROFILE_MOBILENR		"mobilenumber"			/* Mobile Number (UTF8 String) */
 #define		CP_PROFILE_REGCOUNTRY	"registeredcountry"		/* Registered Country Code (UTF8 String) */
+#define		CP_PROFILE_FLAGS		"flags"					/* Profile flags (Bitset) */
+#define		CP_PROFILE_LASTSEEN		"lastseen"				/* Last-Online timestamp */
 
 /* extended profile field types */
-#define		CP_PROF_TYPE_BOOL		0x02					/* boolean profile attribute type */
-#define		CP_PROF_TYPE_INT		0x05					/* integer profile attribute type */
-#define		CP_PROF_TYPE_UTF8		0x0A					/* UTF8 string profile attribute type */
-#define		CP_PROF_TYPE_DATE		0x0B					/* date-time profile attribute type */
+#define		CP_PROFILE_TYPE_BOOL	0x02					/* boolean profile attribute type */
+#define		CP_PROFILE_TYPE_INT		0x05					/* integer profile attribute type */
+#define		CP_PROFILE_TYPE_UTF8	0x0A					/* UTF8 string profile attribute type */
+#define		CP_PROFILE_TYPE_DATE	0x0B					/* date-time profile attribute type */
 
+/* profile flags */
+#define		CP_PROF_DOBLOCKED		0x40					/* date-of-birth cannot be changed */
 
 /* define this to enable protocol debugging (very verbose logging) */
 #define		DEBUG_PROTOCOL
--- a/libpurple/protocols/mxit/roster.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/roster.c	Sat Jul 31 23:42:35 2010 +0000
@@ -44,12 +44,12 @@
 /* statuses (reference: libpurple/status.h) */
 static struct status
 {
-	PurpleStatusPrimitive	primative;
+	PurpleStatusPrimitive	primitive;
 	int						mxit;
 	const char*				id;
 	const char*				name;
 } const mxit_statuses[] = {
-		/*	primative,						no,							id,			name					*/
+		/*	primitive,						no,							id,			name					*/
 		{	PURPLE_STATUS_OFFLINE,			MXIT_PRESENCE_OFFLINE,		"offline",	N_( "Offline" )			},	/* 0 */
 		{	PURPLE_STATUS_AVAILABLE,		MXIT_PRESENCE_ONLINE,		"online",	N_( "Available" )		},	/* 1 */
 		{	PURPLE_STATUS_AWAY,				MXIT_PRESENCE_AWAY,			"away",		N_( "Away" )			},	/* 2 */
@@ -74,7 +74,7 @@
 		const struct status* status = &mxit_statuses[i];
 
 		/* add mxit status (reference: "libpurple/status.h") */
-		type = purple_status_type_new_with_attrs( status->primative, status->id, _( status->name ), TRUE, TRUE, FALSE,
+		type = purple_status_type_new_with_attrs( status->primitive, status->id, _( status->name ), TRUE, TRUE, FALSE,
 					"message", _( "Message" ), purple_value_new( PURPLE_TYPE_STRING ),
 					NULL );
 
@@ -145,6 +145,11 @@
 	{"hot",			N_("Hot"),			NULL},
 	{"sick",		N_("Sick"),			NULL},
 	{"sleepy",		N_("Sleepy"),		NULL},
+	{"bored",		N_("Bored"),		NULL},
+	{"cold",		N_("Cold"),			NULL},
+	{"confused",	N_("Confused"),		NULL},
+	{"hungry",		N_("Hungry"),		NULL},
+	{"stressed",	N_("Stressed"),		NULL},
 	/* Mark the last record. */
 	{ NULL, NULL, NULL }
 };
@@ -213,6 +218,16 @@
 				return _( "Sick" );
 		case MXIT_MOOD_SLEEPY :
 				return _( "Sleepy" );
+		case MXIT_MOOD_BORED :
+				return _( "Bored" );
+		case MXIT_MOOD_COLD :
+				return _( "Cold" );
+		case MXIT_MOOD_CONFUSED :
+				return _( "Confused" );
+		case MXIT_MOOD_HUNGRY :
+				return _( "Hungry" );
+		case MXIT_MOOD_STRESSED :
+				return _( "Stressed" );
 		case MXIT_MOOD_NONE :
 		default :
 				return "";
@@ -292,7 +307,7 @@
 		 * XXX: libPurple does not currently provide an API to change or rename the group name
 		 * for a specific buddy. One option is to remove the buddy from the list and re-adding
 		 * him in the new group, but by doing that makes the buddy go offline and then online
-		 * again. This is really not ideal and very iretating, but how else then?
+		 * again. This is really not ideal and very irritating, but how else then?
 		 */
 
 		/* create new buddy */
@@ -358,7 +373,7 @@
 	 * So if this MXit contact isn't in a group, pretend it is.
 	 */
 	if ( *contact->groupname == '\0' ) {
-		strcpy( contact->groupname, MXIT_DEFAULT_GROUP );
+		g_strlcpy( contact->groupname, MXIT_DEFAULT_GROUP, sizeof( contact->groupname ) );
 	}
 
 	/* find or create a group for this contact */
@@ -428,15 +443,14 @@
  *  @param mood			The new mood for the contact
  *  @param customMood	The custom mood identifier
  *  @param statusMsg	This is the contact's status message
- *  @param avatarId		This is the contact's avatar id
  */
-void mxit_update_buddy_presence( struct MXitSession* session, const char* username, short presence, short mood, const char* customMood, const char* statusMsg, const char* avatarId )
+void mxit_update_buddy_presence( struct MXitSession* session, const char* username, short presence, short mood, const char* customMood, const char* statusMsg )
 {
 	PurpleBuddy*		buddy	= NULL;
 	struct contact*		contact	= NULL;
 
-	purple_debug_info( MXIT_PLUGIN_ID, "mxit_update_buddy_presence: user='%s' presence=%i mood=%i customMood='%s' statusMsg='%s' avatar='%s'\n",
-		username, presence, mood, customMood, statusMsg, avatarId );
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_update_buddy_presence: user='%s' presence=%i mood=%i customMood='%s' statusMsg='%s'\n",
+		username, presence, mood, customMood, statusMsg );
 
 	if ( ( presence < MXIT_PRESENCE_OFFLINE ) || ( presence > MXIT_PRESENCE_DND ) ) {
 		purple_debug_info( MXIT_PLUGIN_ID, "mxit_update_buddy_presence: invalid presence state %i\n", presence );
@@ -458,7 +472,7 @@
 	contact->mood = mood;
 
 	/* validate mood */
-	if (( contact->mood < MXIT_MOOD_NONE ) || ( contact->mood > MXIT_MOOD_SLEEPY ))
+	if (( contact->mood < MXIT_MOOD_NONE ) || ( contact->mood > MXIT_MOOD_STRESSED ))
 		contact->mood = MXIT_MOOD_NONE;
 
 	g_strlcpy( contact->customMood, customMood, sizeof( contact->customMood ) );
@@ -472,7 +486,46 @@
 	if ( statusMsg[0] != '\0' )
 		contact->statusMsg = g_markup_escape_text( statusMsg, -1 );
 
-	/* update avatarId */
+	/* update the buddy's status (reference: "libpurple/prpl.h") */
+	if ( contact->statusMsg )
+		purple_prpl_got_user_status( session->acc, username, mxit_statuses[contact->presence].id, "message", contact->statusMsg, NULL );
+	else
+		purple_prpl_got_user_status( session->acc, username, mxit_statuses[contact->presence].id, NULL );
+
+	/* update the buddy's mood */
+	if ( contact->mood == MXIT_MOOD_NONE )
+		purple_prpl_got_user_status_deactive( session->acc, username, "mood" );
+	else
+		purple_prpl_got_user_status( session->acc, username, "mood", PURPLE_MOOD_NAME, mxit_moods[contact->mood-1].mood, NULL );
+}
+
+
+/*------------------------------------------------------------------------
+ * Update the buddy's avatar.
+ * Either a presence update packet was received from the MXit server, or a profile response.
+ *
+ *  @param session		The MXit session object
+ *  @param username		The contact which presence to update
+ *  @param avatarId		This is the contact's avatar id
+ */
+void mxit_update_buddy_avatar( struct MXitSession* session, const char* username, const char* avatarId )
+{
+	PurpleBuddy*		buddy	= NULL;
+	struct contact*		contact	= NULL;
+
+	purple_debug_info( MXIT_PLUGIN_ID, "mxit_update_buddy_avatar: user='%s' avatar='%s'\n", username, avatarId );
+
+	/* find the buddy information for this contact (reference: "libpurple/blist.h") */
+	buddy = purple_find_buddy( session->acc, username );
+	if ( !buddy ) {
+		purple_debug_warning( MXIT_PLUGIN_ID, "mxit_update_buddy_presence: unable to find the buddy '%s'\n", username );
+		return;
+	}
+
+	contact = purple_buddy_get_protocol_data( buddy );
+	if ( !contact )
+		return;
+
 	if ( ( contact->avatarId ) && ( g_ascii_strcasecmp( contact->avatarId, avatarId ) == 0 ) ) {
 		/*  avatar has not changed - do nothing */
 	}
@@ -486,18 +539,6 @@
 	}
 	else		/* clear current avatar */
 		purple_buddy_icons_set_for_user( session->acc, username, NULL, 0, NULL );
-
-	/* update the buddy's status (reference: "libpurple/prpl.h") */
-	if ( contact->statusMsg )
-		purple_prpl_got_user_status( session->acc, username, mxit_statuses[contact->presence].id, "message", contact->statusMsg, NULL );
-	else
-		purple_prpl_got_user_status( session->acc, username, mxit_statuses[contact->presence].id, NULL );
-
-	/* update the buddy's mood */
-	if ( contact->mood == MXIT_MOOD_NONE )
-		purple_prpl_got_user_status_deactive( session->acc, username, "mood" );
-	else
-		purple_prpl_got_user_status( session->acc, username, "mood", PURPLE_MOOD_NAME, mxit_moods[contact->mood-1].mood, NULL );
 }
 
 
--- a/libpurple/protocols/mxit/roster.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/mxit/roster.h	Sat Jul 31 23:42:35 2010 +0000
@@ -66,6 +66,11 @@
 #define		MXIT_MOOD_HOT				0x08
 #define		MXIT_MOOD_SICK				0x09
 #define		MXIT_MOOD_SLEEPY			0x0A
+#define		MXIT_MOOD_BORED				0x0B
+#define		MXIT_MOOD_COLD				0x0C
+#define		MXIT_MOOD_CONFUSED			0x0D
+#define		MXIT_MOOD_HUNGRY			0x0E
+#define		MXIT_MOOD_STRESSED			0x0F
 
 
 /* MXit contact flags */
@@ -124,7 +129,8 @@
 
 /* MXit Protocol callbacks */
 void mxit_update_contact( struct MXitSession* session, struct contact* contact );
-void mxit_update_buddy_presence( struct MXitSession* session, const char* username, short presence, short mood, const char* customMood, const char* statusMsg, const char* avatarId );
+void mxit_update_buddy_presence( struct MXitSession* session, const char* username, short presence, short mood, const char* customMood, const char* statusMsg );
+void mxit_update_buddy_avatar( struct MXitSession* session, const char* username, const char* avatarId );
 void mxit_new_subscription( struct MXitSession* session, struct contact* contact );
 void mxit_update_blist( struct MXitSession* session );
 gboolean is_mxit_chatroom_contact( struct MXitSession* session, const char* username );
--- a/libpurple/protocols/oscar/family_icbm.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/oscar/family_icbm.c	Sat Jul 31 23:42:35 2010 +0000
@@ -249,9 +249,6 @@
 	}
 	g_free(buf);
 
-
-
-
 	g_free(snac2->data);
 	g_free(snac2);
 
@@ -2684,10 +2681,9 @@
 	guchar *cookie;
 	guint8 bnlen;
 	char *xml = NULL;
-	int hdrlen;
+	guint16 hdrlen;
 	int curpos;
-	int num1,num2;
-	char *desc, *title, *temp;
+	guint16 num1, num2;
 	PurpleAccount *account;
 	PurpleBuddy *buddy;
 	PurplePresence *presence;
@@ -2701,54 +2697,64 @@
 
 	if (channel == 0x0002)
 	{
-	 	hdrlen = byte_stream_getle16(bs);
-	 	if ( ((hdrlen == 27 ) && (bs->len > (27 + 51)))) {
-	 		byte_stream_advance(bs, 51);
-	 		num1 = byte_stream_getle16(bs); 
-	 		num2 = byte_stream_getle16(bs);
-	 		purple_debug_misc("oscar", "X-Status: Num1 %i, num2 %i\n",num1, num2);
-	 		
-	 		if(((num1 == 0x4f00)&&(num2 == 0x3b00))) {
-		 		byte_stream_advance(bs, 86);	
-		 		curpos = byte_stream_curpos(bs);
-		 		xml = byte_stream_getstr(bs, bs->len - curpos);
-		 		purple_debug_misc("oscar", "X-Status: Received XML reply\n");
-		 		if(xml) {
- 				/* purple_debug_misc("oscar", "X-Status: XML reply: %s\n", (const char*) xml); */
- 					if ((desc=strstr(xml,"&lt;desc&gt;")) != NULL) {
- 						temp=strstr(xml,"&lt;/desc&gt;");
- 						temp[0]=0;
- 						desc=desc+12;
- 					}
- 					if ((title=strstr(xml,"&lt;title&gt;")) != NULL) {
- 						temp=strstr(xml,"&lt;/title&gt;");
- 						temp[0]=0;
- 						title=title+13;
- 					} else {
- 						title="";
- 					}
- 					strcpy(xml,title);
-					if (desc) {
- 						strcat(xml, " - ");
- 						strcat(xml, desc);
+		hdrlen = byte_stream_getle16(bs);
+		if (hdrlen == 27 && bs->len > (27 + 51)) {
+			byte_stream_advance(bs, 51);
+			num1 = byte_stream_getle16(bs);
+			num2 = byte_stream_getle16(bs);
+			purple_debug_misc("oscar", "X-Status: num1 %hu, num2 %hu\n", num1, num2);
+
+			if (num1 == 0x4f00 && num2 == 0x3b00) {
+				byte_stream_advance(bs, 86);
+				curpos = byte_stream_curpos(bs);
+				xml = byte_stream_getstr(bs, bs->len - curpos);
+				purple_debug_misc("oscar", "X-Status: Received XML reply\n");
+				if (xml) {
+					GString *xstatus;
+					char *tmp1, *tmp2;
+
+					/* purple_debug_misc("oscar", "X-Status: XML reply: %s\n", xml); */
+
+					xstatus = g_string_new(NULL);
+
+					tmp1 = strstr(xml, "&lt;title&gt;");
+					if (tmp1 != NULL) {
+						tmp1 += 13;
+						tmp2 = strstr(tmp1, "&lt;/title&gt;");
+						if (tmp2 != NULL)
+							g_string_append_len(xstatus, tmp1, tmp2 - tmp1);
 					}
- 					purple_debug_misc("oscar", "X-Status reply: %s\n", (const char*)xml);
- 					account = purple_connection_get_account(od->gc);
- 					buddy = purple_find_buddy(account, bn);
- 					presence = purple_buddy_get_presence(buddy);
- 					status = purple_presence_get_active_status(presence);
- 					purple_prpl_got_user_status(account, bn,
-  					    purple_status_get_id(status), "message", xml, NULL);
-		   		} else {
-			 		purple_debug_misc("oscar", "X-Status: Can't get XML reply string\n");
+					tmp1 = strstr(xml, "&lt;desc&gt;");
+					if (tmp1 != NULL) {
+						tmp1 += 12;
+						tmp2 = strstr(tmp1, "&lt;/desc&gt;");
+						if (tmp2 != NULL) {
+							if (xstatus->len > 0)
+								g_string_append(xstatus, " - ");
+							g_string_append_len(xstatus, tmp1, tmp2 - tmp1);
+						}
+					}
+					if (xstatus->len > 0) {
+						purple_debug_misc("oscar", "X-Status reply: %s\n", xstatus->str);
+						account = purple_connection_get_account(od->gc);
+						buddy = purple_find_buddy(account, bn);
+						presence = purple_buddy_get_presence(buddy);
+						status = purple_presence_get_active_status(presence);
+						purple_prpl_got_user_status(account, bn,
+								purple_status_get_id(status),
+								"message", xstatus->str, NULL);
+					}
+					g_string_free(xstatus, TRUE);
+				} else {
+					purple_debug_misc("oscar", "X-Status: Can't get XML reply string\n");
 				}
-	 		} else {
-		 		purple_debug_misc("oscar", "X-Status: 0x0004, 0x000b not an xstatus reply\n" );
-		 /*		if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
-		 		ret = userfunc(od, conn, frame, channel, sn, reason); */
+			} else {
+				purple_debug_misc("oscar", "X-Status: 0x0004, 0x000b not an xstatus reply\n");
+				/* if ((userfunc = aim_callhandler(od, snac->family, snac->subtype)))
+					ret = userfunc(od, conn, frame, channel, sn, reason); */
 			}
-		
-	 	}
+
+		}
 
 	} else if (channel == 0x0004) { /* ICQ message */
 		switch (reason) {
@@ -2884,7 +2890,7 @@
 	if (!bn)
 		return -EINVAL;
 
-	byte_stream_new(&bs, 11+strlen(bn)+2);
+	byte_stream_new(&bs, 11 + strlen(bn) + 2);
 
 	snacid = aim_cachesnac(od, SNAC_FAMILY_ICBM, 0x0014, 0x0000, NULL, 0);
 
@@ -2930,38 +2936,36 @@
 	char *statxml;
 	int xmllen;
 
-	static const guint8 pluginid[] = 
-	{
-	0x09, 0x46, 0x13, 0x49, 0x4C, 0x7F, 0x11, 0xD1, 
-	0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00
+	static const guint8 pluginid[] = {
+		0x09, 0x46, 0x13, 0x49, 0x4C, 0x7F, 0x11, 0xD1,
+		0x82, 0x22, 0x44, 0x45, 0x53, 0x54, 0x00, 0x00
 	};
-	
-	static const guint8 c_plugindata[] =
-	{
-	0x1B, 0x00, 0x0A,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xD1, 0x0E, 0x00, 0xF9, 0xD1, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x01, 0x00,
-	0x01, 0x00, 0x00, 0x4F, 0x00, 0x3B, 0x60, 0xB3, 0xEF, 0xD8, 0x2A, 0x6C, 0x45, 0xA4, 0xE0, 0x9C,
-	0x5A, 0x5E, 0x67, 0xE8, 0x65, 0x08, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x53, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x20, 0x50, 0x6C, 0x75, 0x67, 0x2D, 0x69, 0x6E, 0x3A, 0x20, 0x52, 0x65, 0x6D, 0x6F, 0x74,
-	0x65, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x41,
-	0x72, 0x72, 0x69, 0x76, 0x65, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00
+
+	static const guint8 c_plugindata[] = {
+		0x1B, 0x00, 0x0A,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xD1, 0x0E, 0x00, 0xF9, 0xD1, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x01, 0x00,
+		0x01, 0x00, 0x00, 0x4F, 0x00, 0x3B, 0x60, 0xB3, 0xEF, 0xD8, 0x2A, 0x6C, 0x45, 0xA4, 0xE0, 0x9C,
+		0x5A, 0x5E, 0x67, 0xE8, 0x65, 0x08, 0x00, 0x2A, 0x00, 0x00, 0x00, 0x53, 0x63, 0x72, 0x69, 0x70,
+		0x74, 0x20, 0x50, 0x6C, 0x75, 0x67, 0x2D, 0x69, 0x6E, 0x3A, 0x20, 0x52, 0x65, 0x6D, 0x6F, 0x74,
+		0x65, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6F, 0x6E, 0x20, 0x41,
+		0x72, 0x72, 0x69, 0x76, 0x65, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x14, 0x01, 0x00, 0x00, 0x10, 0x01, 0x00, 0x00
 	};
-	
+
 	if (!od || !(conn = flap_connection_findbygroup(od, 0x0004)))
 		return -EINVAL;
 
 	if (!sn)
 		return -EINVAL;
 
-	fmt =  "<N><QUERY>&lt;Q&gt;&lt;PluginID&gt;srvMng&lt;/PluginID&gt;&lt;/Q&gt;</QUERY><NOTIFY>&lt;srv&gt;&lt;id&gt;cAwaySrv&lt;/id&gt;&lt;req&gt;&lt;id&gt;AwayStat&lt;/id&gt;&lt;trans&gt;2&lt;/trans&gt;&lt;senderId&gt;%s&lt;/senderId&gt;&lt;/req&gt;&lt;/srv&gt;</NOTIFY></N>\r\n";	
+	fmt = "<N><QUERY>&lt;Q&gt;&lt;PluginID&gt;srvMng&lt;/PluginID&gt;&lt;/Q&gt;</QUERY><NOTIFY>&lt;srv&gt;&lt;id&gt;cAwaySrv&lt;/id&gt;&lt;req&gt;&lt;id&gt;AwayStat&lt;/id&gt;&lt;trans&gt;2&lt;/trans&gt;&lt;senderId&gt;%s&lt;/senderId&gt;&lt;/req&gt;&lt;/srv&gt;</NOTIFY></N>\r\n";
 
 	account = purple_connection_get_account(od->gc);
 	xmllen = strlen(fmt) - 2 + strlen(account->username);
 
-	statxml = (char*) g_malloc(xmllen);
+	statxml = g_malloc(xmllen);
 	snprintf(statxml, xmllen, fmt, account->username);
 
 	aim_icbm_makecookie(cookie);
@@ -2970,38 +2974,36 @@
 					  + 2 + 2 + 8 + 16 + 2 + 2 + 2 + 2 + 2
 					  + 2 + 2 + sizeof(c_plugindata) + xmllen
 					  + 2 + 2);
- 
+
 	snacid = aim_cachesnac(od, 0x0004, 0x0006, 0x0000, NULL, 0);
 	aim_im_puticbm(&bs, cookie, 0x0002, sn);
 
 	byte_stream_new(&header, (7*2) + 16 + 8 + 2 + sizeof(c_plugindata) + xmllen); /* TLV 0x0005 Stream + Size */
-	byte_stream_new(&plugindata, (sizeof(c_plugindata) + xmllen));
-
 	byte_stream_put16(&header, 0x0000); /* Message Type: Request */
 	byte_stream_putraw(&header, cookie, sizeof(cookie)); /* Message ID */
 	byte_stream_putraw(&header, pluginid, sizeof(pluginid)); /* Plugin ID */
-	
+
 	aim_tlvlist_add_16(&inner_tlvlist, 0x000a, 0x0001);
 	aim_tlvlist_add_noval(&inner_tlvlist, 0x000f);
-	
+
 	/* Add Plugin Specific Data */
+	byte_stream_new(&plugindata, (sizeof(c_plugindata) + xmllen));
 	byte_stream_putraw(&plugindata, c_plugindata, sizeof(c_plugindata)); /* Content of TLV 0x2711 */
 	byte_stream_putstr(&plugindata, statxml);
 
 	aim_tlvlist_add_raw(&inner_tlvlist, 0x2711, (sizeof(c_plugindata) + xmllen), plugindata.data);
-	
+
 	aim_tlvlist_write(&header, &inner_tlvlist);
-	
-	
+	aim_tlvlist_free(inner_tlvlist);
+
 	aim_tlvlist_add_raw(&outer_tlvlist, 0x0005, byte_stream_curpos(&header), header.data);
-	aim_tlvlist_add_noval(&outer_tlvlist, 0x0003);		/* Empty TLV 0x0003 */
-	
+	aim_tlvlist_add_noval(&outer_tlvlist, 0x0003); /* Empty TLV 0x0003 */
+
 	aim_tlvlist_write(&bs, &outer_tlvlist);
-	
+
 	purple_debug_misc("oscar", "X-Status Request\n");
 	flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x0006, 0x0000, snacid, &bs, TRUE);
 
-	aim_tlvlist_free(inner_tlvlist);
 	aim_tlvlist_free(outer_tlvlist);
 	byte_stream_destroy(&header);
 	byte_stream_destroy(&plugindata);
@@ -3018,58 +3020,65 @@
 	aim_snacid_t snacid;
 	PurpleAccount *account;
 	PurpleStatus *status;
-   const char *fmt;
-   const char *formatted_msg;
-   char *msg;
-   char *statxml;
+	const char *fmt;
+	const char *formatted_msg;
+	char *msg;
+	char *statxml;
 	const char *title;
 	int len;
-	
+
 	static const guint8 plugindata[] = {
-	0x1B, 0x00,
-	0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
-	0x01, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xD1, 0x0E, 0x00, 0xF9, 0xD1,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x4F, 
-	0x00, 0x3B, 0x60, 0xB3, 0xEF, 0xD8, 0x2A, 0x6C, 0x45, 0xA4, 0xE0, 
-	0x9C, 0x5A, 0x5E, 0x67, 0xE8, 0x65, 0x08, 0x00, 0x2A, 0x00, 0x00, 
-	0x00, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x50, 0x6C, 0x75, 
-	0x67, 0x2D, 0x69, 0x6E, 0x3A, 0x20, 0x52, 0x65, 0x6D, 0x6F, 0x74, 
-	0x65, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
-	0x69, 0x6F, 0x6E, 0x20, 0x41, 0x72, 0x72, 0x69, 0x76, 0x65, 0x00,
-	0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0xF3, 0x01, 0x00, 0x00, 0xEF, 0x01, 0x00, 0x00
-	};	
+		0x1B, 0x00,
+		0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x01, 0x00, 0x00, 0x00, 0x00, 0xF9, 0xD1, 0x0E, 0x00, 0xF9, 0xD1,
+		0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x4F,
+		0x00, 0x3B, 0x60, 0xB3, 0xEF, 0xD8, 0x2A, 0x6C, 0x45, 0xA4, 0xE0,
+		0x9C, 0x5A, 0x5E, 0x67, 0xE8, 0x65, 0x08, 0x00, 0x2A, 0x00, 0x00,
+		0x00, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x20, 0x50, 0x6C, 0x75,
+		0x67, 0x2D, 0x69, 0x6E, 0x3A, 0x20, 0x52, 0x65, 0x6D, 0x6F, 0x74,
+		0x65, 0x20, 0x4E, 0x6F, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74,
+		0x69, 0x6F, 0x6E, 0x20, 0x41, 0x72, 0x72, 0x69, 0x76, 0x65, 0x00,
+		0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+		0x00, 0x00, 0x00, 0xF3, 0x01, 0x00, 0x00, 0xEF, 0x01, 0x00, 0x00
+	};
 
 	fmt = "<NR><RES>&lt;ret event='OnRemoteNotification'&gt;&lt;srv&gt;&lt;id&gt;cAwaySrv&lt;/id&gt;&lt;val srv_id='cAwaySrv'&gt;&lt;Root&gt;&lt;CASXtraSetAwayMessage&gt;&lt;/CASXtraSetAwayMessage&gt;&l t;uin&gt;%s&lt;/uin&gt;&lt;index&gt;1&lt;/index&gt;&lt;title&gt;%s&lt;/title&gt;&lt;desc&gt;%s&lt;/desc&gt;&lt;/Root&gt;&lt;/val&gt;&lt;/srv&gt;&lt;srv&gt;&lt;id&gt;cRandomizerSrv&lt;/id&gt;&lt;val srv_id='cRandomizerSrv'&gt;undefined&lt;/val&gt;&lt;/srv&gt;&lt;/ret&gt;</RES></NR>\r\n";
-	
-	
+
 	if (!od || !(conn = flap_connection_findbygroup(od, 0x0002)))
 		return -EINVAL;
 
 	if (!sn)
 		return -EINVAL;
-		
+
 	account = purple_connection_get_account(od->gc);
-	if(!account) return -EINVAL;
-	
-/*	if (!strcmp(account->username, sn))
+	if (!account)
+		return -EINVAL;
+
+	/* if (!strcmp(account->username, sn))
 		icq_im_xstatus_request(od, sn); */
-	
-	status  = purple_presence_get_active_status(account->presence);
-	if (!status) return -EINVAL;
-   title = purple_status_get_name(status);
-   if (!title) return -EINVAL;
+
+	status = purple_presence_get_active_status(account->presence);
+	if (!status)
+		return -EINVAL;
+
+	title = purple_status_get_name(status);
+	if (!title)
+		return -EINVAL;
+
 	formatted_msg = purple_status_get_attr_string(status, "message");
-	if (!formatted_msg) return -EINVAL;
-   msg = purple_markup_strip_html(formatted_msg);
-	if (!msg) return -EINVAL;
-	len = strlen(fmt)-6+strlen(account->username)+strlen(title)+strlen(msg);
-	statxml = (char*) g_malloc(len);
-
-	snprintf(statxml, len, fmt, 
-		account->username, title, msg);
+	if (!formatted_msg)
+		return -EINVAL;
+
+	msg = purple_markup_strip_html(formatted_msg);
+	if (!msg)
+		return -EINVAL;
+
+	len = strlen(fmt) - 6 + strlen(account->username) + strlen(title) + strlen(msg);
+	statxml = g_malloc(len);
+
+	snprintf(statxml, len, fmt, account->username, title, msg);
 
 	purple_debug_misc("oscar", "X-Status AutoReply: %s, %s\n", formatted_msg, msg);
 
@@ -3079,8 +3088,8 @@
 	aim_im_puticbm(&bs, cookie, 0x0002, sn);
 	byte_stream_put16(&bs, 0x0003);
 	byte_stream_putraw(&bs, plugindata, sizeof(plugindata));
-	byte_stream_putraw(&bs, (const guint8*)statxml, strlen(statxml));
-	
+	byte_stream_putraw(&bs, (const guint8 *)statxml, strlen(statxml));
+
 	flap_connection_send_snac_with_priority(od, conn, 0x0004, 0x000b, 0x0000, snacid, &bs, TRUE);
 
 	g_free(statxml);
--- a/libpurple/protocols/oscar/oscar.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sat Jul 31 23:42:35 2010 +0000
@@ -2667,10 +2667,10 @@
 					g_free(rtfmsg);
 				}
 			}
-		} else if (args->info.rtfmsg.msgtype == 26)
+		} else if (args->info.rtfmsg.msgtype == 26) {
 			purple_debug_info("oscar", "Sending X-Status Reply\n");
 			icq_relay_xstatus(od, userinfo->bn, args->cookie);
-
+		}
 	}
 	else
 	{
@@ -3028,12 +3028,23 @@
 			if (smstype != 0)
 				break;
 			taglen = byte_stream_getle32(&qbs);
+			if (taglen > 2000) {
+				/* Avoid trying to allocate large amounts of memory, in
+				   case we get something unexpected. */
+				break;
+			}
 			tagstr = byte_stream_getstr(&qbs, taglen);
 			if (tagstr == NULL)
 				break;
 			byte_stream_advance(&qbs, 3);
 			byte_stream_advance(&qbs, 4);
 			smslen = byte_stream_getle32(&qbs);
+			if (smslen > 2000) {
+				/* Avoid trying to allocate large amounts of memory, in
+				   case we get something unexpected. */
+				g_free(tagstr);
+				break;
+			}
 			smsmsg = byte_stream_getstr(&qbs, smslen);
 
 			/* Check if this is an SMS being sent from server */
--- a/libpurple/protocols/oscar/util.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/oscar/util.c	Sat Jul 31 23:42:35 2010 +0000
@@ -38,8 +38,8 @@
 static const char * const msgerrreason[] = {
 	N_("Invalid error"),
 	N_("Invalid SNAC"),
-	N_("Rate to host"),
-	N_("Rate to client"),
+	N_("Server rate limit exceeded"),
+	N_("Client rate limit exceeded"),
 	N_("Not logged in"),
 	N_("Service unavailable"),
 	N_("Service not defined"),
--- a/libpurple/protocols/yahoo/libyahoo.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/yahoo/libyahoo.c	Sat Jul 31 23:42:35 2010 +0000
@@ -327,7 +327,7 @@
 	option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_bool_new(_("Use account proxy for SSL connections"), "proxy_ssl", FALSE);
+	option = purple_account_option_bool_new(_("Use account proxy for HTTP and HTTPS connections"), "proxy_ssl", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 #if 0
--- a/libpurple/protocols/yahoo/libyahoojp.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/yahoo/libyahoojp.c	Sat Jul 31 23:42:35 2010 +0000
@@ -223,7 +223,7 @@
 	option = purple_account_option_bool_new(_("Ignore conference and chatroom invitations"), "ignore_invites", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_bool_new(_("Use account proxy for SSL connections"), "proxy_ssl", FALSE);
+	option = purple_account_option_bool_new(_("Use account proxy for HTTP and HTTPS connections"), "proxy_ssl", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 #if 0
--- a/libpurple/protocols/yahoo/libymsg.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/yahoo/libymsg.c	Sat Jul 31 23:42:35 2010 +0000
@@ -401,15 +401,13 @@
 	PurpleBuddy *b;
 	PurpleGroup *g;
 	GSList *list, *i;
-	gboolean onlist = 0;
+	gboolean onlist = FALSE;
 	char *oname = NULL;
-	char **oname_p = &oname;
-	GSList **list_p = &list;
-
-	if (!g_hash_table_lookup_extended(ht, purple_normalize(account, name), (gpointer *) oname_p, (gpointer *) list_p))
+
+	if (g_hash_table_lookup_extended(ht, name, (gpointer *)&oname, (gpointer *)&list))
+		g_hash_table_steal(ht, oname);
+	else
 		list = purple_find_buddies(account, name);
-	else
-		g_hash_table_steal(ht, name);
 
 	for (i = list; i; i = i->next) {
 		b = i->data;
@@ -418,7 +416,7 @@
 			purple_debug_misc("yahoo",
 				"Oh good, %s is in the right group (%s).\n", name, group);
 			list = g_slist_delete_link(list, i);
-			onlist = 1;
+			onlist = TRUE;
 			break;
 		}
 	}
@@ -436,9 +434,9 @@
 
 	if (list) {
 		if (!oname)
-			oname = g_strdup(purple_normalize(account, name));
+			oname = g_strdup(name);
 		g_hash_table_insert(ht, oname, list);
-	} else if (oname)
+	} else
 		g_free(oname);
 }
 
@@ -843,12 +841,12 @@
 			default:
 				break;
 		}
-	
+
 		if (*stat == '1')
 			serv_got_typing(gc, fed_from, 0, PURPLE_TYPING);
 		else
 			serv_got_typing_stopped(gc, fed_from);
-		
+
 		if (fed_from != from)
 			g_free(fed_from);
 	
@@ -3594,7 +3592,8 @@
 	PurpleConnection *gc = yd->gc;
 	PurpleAccount *a = purple_connection_get_account(gc);
 	gchar **strings = NULL, *cs_server = NULL;
-	int port = 0, stringslen = 0;
+	int port = purple_account_get_int(a, "port", YAHOO_PAGER_PORT);
+	int stringslen = 0;
 
 	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
 
@@ -3602,8 +3601,17 @@
 		purple_debug_error("yahoo", "Unable to retrieve server info. %"
 				G_GSIZE_FORMAT " bytes retrieved with error message: %s\n", len,
 				error_message ? error_message : "(null)");
-		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unable to connect: The server returned an empty response."));
+
+		if(yahoo_is_japan(a)) { /* We don't know fallback hosts for Yahoo Japan :( */
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+					_("Unable to connect: The server returned an empty response."));
+		} else {
+				if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port,
+							yahoo_got_connected, gc) == NULL) {
+					purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+							_("Unable to connect"));
+				}
+		}
 	} else {
 		strings = g_strsplit(url_text, "\r\n", -1);
 
@@ -3621,17 +3629,23 @@
 		}
 
 		if(cs_server) { /* got an address; get on with connecting */
-			port = purple_account_get_int(a, "port", YAHOO_PAGER_PORT);
-
 			if(purple_proxy_connect(gc, a, cs_server, port, yahoo_got_connected, gc) == NULL)
 				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 								_("Unable to connect"));
 		} else {
 			purple_debug_error("yahoo", "No CS address retrieved!  Server "
 					"response:\n%s\n", url_text ? url_text : "(null)");
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-					_("Unable to connect: The server's response did not contain "
-						"the necessary information"));
+
+			if(yahoo_is_japan(a)) { /* We don't know fallback hosts for Yahoo Japan :( */
+				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+						_("Unable to connect: The server's response did not contain "
+							"the necessary information"));
+			} else
+				if(purple_proxy_connect(gc, a, YAHOO_PAGER_HOST_FALLBACK, port,
+							yahoo_got_connected, gc) == NULL) {
+					purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+							_("Unable to connect"));
+				}
 		}
 	}
 
@@ -3644,6 +3658,7 @@
 	YahooData *yd = gc->proto_data = g_new0(YahooData, 1);
 	PurpleStatus *status = purple_account_get_active_status(account);
 	gboolean use_whole_url = yahoo_account_use_http_proxy(gc);
+	gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE);
 	PurpleUtilFetchUrlData *url_data;
 
 	gc->flags |= PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_NO_URLDESC;
@@ -3678,10 +3693,10 @@
 	/* Get the pager server.  Actually start connecting in the callback since we
 	 * must have the contents of the HTTP response to proceed. */
 	url_data = purple_util_fetch_url_request_len_with_account(
-			purple_connection_get_account(gc),
+			proxy_ssl ? purple_connection_get_account(gc) : NULL,
 			yd->jp ? YAHOOJP_PAGER_HOST_REQ_URL : YAHOO_PAGER_HOST_REQ_URL,
 			use_whole_url ? TRUE : FALSE,
-			YAHOO_CLIENT_USERAGENT, TRUE, NULL, FALSE, -1,
+			YAHOO_CLIENT_USERAGENT, FALSE, NULL, FALSE, -1,
 			yahoo_got_pager_server, yd);
 	if (url_data)
 		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
--- a/libpurple/protocols/yahoo/libymsg.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/yahoo/libymsg.h	Sat Jul 31 23:42:35 2010 +0000
@@ -30,6 +30,7 @@
 #include "prpl.h"
 
 #define YAHOO_PAGER_HOST_REQ_URL "http://vcs1.msg.yahoo.com/capacity"
+#define YAHOO_PAGER_HOST_FALLBACK "scsa.msg.yahoo.com"
 #define YAHOO_PAGER_PORT 5050
 #define YAHOO_PAGER_PORT_P2P 5101
 #define YAHOO_LOGIN_URL "https://login.yahoo.com/config/pwtoken_login?src=ymsgr&ts=&token=%s"
--- a/libpurple/protocols/yahoo/util.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/yahoo/util.c	Sat Jul 31 23:42:35 2010 +0000
@@ -33,10 +33,21 @@
 #include <string.h>
 
 gboolean
-yahoo_account_use_http_proxy(PurpleConnection *conn)
+yahoo_account_use_http_proxy(PurpleConnection *pc)
 {
-	PurpleProxyInfo *ppi = purple_proxy_get_setup(conn->account);
-	return (ppi->type == PURPLE_PROXY_HTTP || ppi->type == PURPLE_PROXY_USE_ENVVAR);
+	PurpleAccount *account = purple_connection_get_account(pc);
+	PurpleProxyInfo *ppi = NULL;
+	PurpleProxyType type = PURPLE_PROXY_NONE;
+	gboolean proxy_ssl = purple_account_get_bool(account, "proxy_ssl", FALSE);
+	
+	if(proxy_ssl)
+		ppi = purple_proxy_get_setup(account);
+	else
+		ppi = purple_global_proxy_get_info();
+
+	type = purple_proxy_info_get_type(ppi);
+
+	return (type == PURPLE_PROXY_HTTP || type == PURPLE_PROXY_USE_ENVVAR);
 }
 
 /*
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c	Sat Jul 31 23:42:35 2010 +0000
@@ -983,8 +983,8 @@
 	struct yahoo_xfer_data *xd;
 	struct sockaddr_in *addr;
 	struct yahoo_packet *pkt;
-	long actaddr;
-	long a,b,c,d;
+	unsigned long actaddr;
+	unsigned char a,b,c,d;
 	PurpleConnection *gc;
 	PurpleAccount *account;
 	YahooData *yd;
@@ -1018,19 +1018,19 @@
 	/* TODO:actually, u must try with addr no.1 , if its not working addr no.2 ..... */
 	addr = hosts->data;
 	actaddr = addr->sin_addr.s_addr;
-	d = actaddr % 256;
-	actaddr = (actaddr - d) / 256;
-	c = actaddr % 256;
-	actaddr = (actaddr - c) / 256;
-	b = actaddr % 256;
-	actaddr = (actaddr - b) / 256;
-	a = actaddr;
+	d = actaddr & 0xff;
+	actaddr >>= 8;
+	c = actaddr & 0xff;
+	actaddr >>= 8;
+	b = actaddr & 0xff;
+	actaddr >>= 8;
+	a = actaddr & 0xff;
 	if(yd->jp)
 		xd->port = YAHOOJP_XFER_RELAY_PORT;
 	else
 		xd->port = YAHOO_XFER_RELAY_PORT;
 
-	url = g_strdup_printf("%ld.%ld.%ld.%ld", d, c, b, a);
+	url = g_strdup_printf("%u.%u.%u.%u", d, c, b, a);
 
 	/* Free the address... */
 	g_free(hosts->data);
--- a/libpurple/purple-url-handler	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/purple-url-handler	Sat Jul 31 23:42:35 2010 +0000
@@ -73,7 +73,8 @@
 def findaccount(protocolname, accountname="", matcher=None):
     if matcher:
         for account in cpurple.PurpleAccountsGetAll():
-            if accountname != "" and accountname != cpurple.PurpleAccountGetUsername(a):
+            if (protocolname != cpurple.PurpleAccountGetProtocolID(account)) or \
+               (accountname != "" and accountname != cpurple.PurpleAccountGetUsername(account)):
                 continue
             if matcher(account):
                 bring_account_online(account)
@@ -182,7 +183,7 @@
 
 def irc(uri):
     protocol = "prpl-irc"
-    match = re.match(r"^irc:(//([^/]*)/)?([^?]*)(\?(.*))?", uri)
+    match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri)
     if not match:
         print "Invalid irc URI: %s" % uri
         return
@@ -207,7 +208,7 @@
 
     def correct_server(account):
         username = cpurple.PurpleAccountGetUsername(account)
-        return ("@" in username) and (server == (username.split("@"))[1])
+        return ((server == "") or ("@" in username) and (server == (username.split("@"))[1]))
 
     account = findaccount(protocol, matcher=correct_server)
 
--- a/libpurple/tests/Makefile.am	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/tests/Makefile.am	Sat Jul 31 23:42:35 2010 +0000
@@ -10,6 +10,7 @@
         check_libpurple.c \
 	    tests.h \
 		test_cipher.c \
+		test_jabber_caps.c \
 		test_jabber_jutil.c \
 		test_jabber_scram.c \
 		test_qq.c \
--- a/libpurple/tests/check_libpurple.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/tests/check_libpurple.c	Sat Jul 31 23:42:35 2010 +0000
@@ -84,6 +84,7 @@
 	sr = srunner_create (master_suite());
 
 	srunner_add_suite(sr, cipher_suite());
+	srunner_add_suite(sr, jabber_caps_suite());
 	srunner_add_suite(sr, jabber_jutil_suite());
 	srunner_add_suite(sr, jabber_scram_suite());
 	srunner_add_suite(sr, qq_suite());
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/tests/test_jabber_caps.c	Sat Jul 31 23:42:35 2010 +0000
@@ -0,0 +1,54 @@
+#include <string.h>
+
+#include "tests.h"
+#include "../xmlnode.h"
+#include "../protocols/jabber/caps.h"
+
+START_TEST(test_parse_invalid)
+{
+	xmlnode *query;
+
+	fail_unless(NULL == jabber_caps_parse_client_info(NULL));
+
+	/* Something other than a disco#info query */
+	query = xmlnode_new("foo");
+	fail_unless(NULL == jabber_caps_parse_client_info(query));
+	xmlnode_free(query);
+
+	query = xmlnode_new("query");
+	fail_unless(NULL == jabber_caps_parse_client_info(query));
+	xmlnode_set_namespace(query, "jabber:iq:last");
+	fail_unless(NULL == jabber_caps_parse_client_info(query));
+	xmlnode_free(query);
+}
+END_TEST
+
+#define assert_caps_calculate_match(hash_func, hash, str) { \
+	xmlnode *query = xmlnode_from_str((str), -1); \
+	JabberCapsClientInfo *info = jabber_caps_parse_client_info(query); \
+	gchar *got_hash = jabber_caps_calculate_hash(info, (hash_func)); \
+	assert_string_equal_free((hash), got_hash); \
+}
+
+START_TEST(test_calculate_caps)
+{
+	assert_caps_calculate_match("sha1", "GNjxthSckUNvAIoCCJFttjl6VL8=",
+	"<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='google:mail:notify'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>");
+}
+END_TEST
+
+Suite *
+jabber_caps_suite(void)
+{
+	Suite *s = suite_create("Jabber Caps Functions");
+
+	TCase *tc = tcase_create("Parsing invalid ndoes");
+	tcase_add_test(tc, test_parse_invalid);
+	suite_add_tcase(s, tc);
+
+	tc = tcase_create("Calculating from XMLnode");
+	tcase_add_test(tc, test_calculate_caps);
+	suite_add_tcase(s, tc);
+
+	return s;
+}
--- a/libpurple/tests/test_jabber_scram.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/tests/test_jabber_scram.c	Sat Jul 31 23:42:35 2010 +0000
@@ -89,11 +89,13 @@
 			"c=biws,r=H7yDYKAWBCrM2Fa5SxGa4iezFPVDPpDUcGxPkH3RzP,p=pXkak78EuwwOEwk2/h/OzD7NkEI=",
 			"v=ldX4EBNnOgDnNTOCmbSfBHAUCOs=");
 
+#ifdef USE_IDN
 	assert_successful_exchange("pass½word", "GNb2HsNI7VnTv8ABsE5AnY8W",
 			"n=paul,r=GNb2HsNI7VnTv8ABsE5AnY8W",
 			"r=GNb2HsNI7VnTv8ABsE5AnY8W/w/I3eRKM0I7jxFWOH,s=ysAriUjPzFqOXnMQ,i=4096",
 			"c=biws,r=GNb2HsNI7VnTv8ABsE5AnY8W/w/I3eRKM0I7jxFWOH,p=n/CtgdWjOYnLQ4m9Na+wPn9D2uY=",
 			"v=4TkZwKWy6JHNmrUbU2+IdAaXtos=");
+#endif
 }
 END_TEST
 
--- a/libpurple/tests/test_util.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/tests/test_util.c	Sat Jul 31 23:42:35 2010 +0000
@@ -66,17 +66,70 @@
 }
 END_TEST
 
+/*
+ * Many of the valid and invalid email addresses lised below are from
+ * http://fightingforalostcause.net/misc/2006/compare-email-regex.php
+ */
+const char *valid_emails[] = {
+	"purple-devel@lists.sf.net",
+	"l3tt3rsAndNumb3rs@domain.com",
+	"has-dash@domain.com",
+	"hasApostrophe.o'leary@domain.org",
+	"uncommonTLD@domain.museum",
+	"uncommonTLD@domain.travel",
+	"uncommonTLD@domain.mobi",
+	"countryCodeTLD@domain.uk",
+	"countryCodeTLD@domain.rw",
+	"lettersInDomain@911.com",
+	"underscore_inLocal@domain.net",
+	"IPInsteadOfDomain@127.0.0.1",
+	/* "IPAndPort@127.0.0.1:25", */
+	"subdomain@sub.domain.com",
+	"local@dash-inDomain.com",
+	"dot.inLocal@foo.com",
+	"a@singleLetterLocal.org",
+	"singleLetterDomain@x.org",
+	"&*=?^+{}'~@validCharsInLocal.net",
+	"foor@bar.newTLD"
+};
+
+const char *invalid_emails[] = {
+	"purple-devel@@lists.sf.net",
+	"purple@devel@lists.sf.net",
+	"purple-devel@list..sf.net",
+	"purple-devel",
+	"purple-devel@",
+	"@lists.sf.net",
+	"totally bogus",
+	"missingDomain@.com",
+	"@missingLocal.org",
+	"missingatSign.net",
+	"missingDot@com",
+	"two@@signs.com",
+	"colonButNoPort@127.0.0.1:",
+	""
+	/* "someone-else@127.0.0.1.26", */
+	".localStartsWithDot@domain.com",
+	/* "localEndsWithDot.@domain.com", */ /* I don't think this is invalid -- Stu */
+	/* "two..consecutiveDots@domain.com", */ /* I don't think this is invalid -- Stu */
+	"domainStartsWithDash@-domain.com",
+	"domainEndsWithDash@domain-.com",
+	/* "numbersInTLD@domain.c0m", */
+	/* "missingTLD@domain.", */ /* This certainly isn't invalid -- Stu */
+	"! \"#$%(),/;<>[]`|@invalidCharsInLocal.org",
+	"invalidCharsInDomain@! \"#$%(),/;<>_[]`|.org",
+	/* "local@SecondLevelDomainNamesAreInvalidIfTheyAreLongerThan64Charactersss.org" */
+};
+
 START_TEST(test_util_email_is_valid)
 {
-	fail_unless(purple_email_is_valid("purple-devel@lists.sf.net"));
-	fail_if(purple_email_is_valid("purple-devel@@lists.sf.net"));
-	fail_if(purple_email_is_valid("purple@devel@lists.sf.net"));
-	fail_if(purple_email_is_valid("purple-devel@list..sf.net"));
-	fail_if(purple_email_is_valid("purple-devel"));
-	fail_if(purple_email_is_valid("purple-devel@"));
-	fail_if(purple_email_is_valid("@lists.sf.net"));
-	fail_if(purple_email_is_valid(""));
-	fail_if(purple_email_is_valid("totally bogus"));
+	size_t i;
+
+	for (i = 0; i < G_N_ELEMENTS(valid_emails); i++)
+		fail_unless(purple_email_is_valid(valid_emails[i]), "Email address was: %s", valid_emails[i]);
+
+	for (i = 0; i < G_N_ELEMENTS(invalid_emails); i++)
+		fail_if(purple_email_is_valid(invalid_emails[i]), "Email address was: %s", invalid_emails[i]);
 }
 END_TEST
 
--- a/libpurple/tests/tests.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/tests/tests.h	Sat Jul 31 23:42:35 2010 +0000
@@ -9,6 +9,7 @@
 /* remember to add the suite to the runner in check_libpurple.c */
 Suite * master_suite(void);
 Suite * cipher_suite(void);
+Suite * jabber_caps_suite(void);
 Suite * jabber_jutil_suite(void);
 Suite * jabber_scram_suite(void);
 Suite * qq_suite(void);
--- a/libpurple/upnp.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/upnp.c	Sat Jul 31 23:42:35 2010 +0000
@@ -403,6 +403,11 @@
 		lookup_internal_ip();
 	}
 
+	if (dd->inpa > 0)
+		purple_input_remove(dd->inpa);
+	if (dd->tima > 0)
+		purple_timeout_remove(dd->tima);
+
 	g_free(dd);
 }
 
@@ -506,6 +511,8 @@
 
 	if (dd->inpa)
 		purple_input_remove(dd->inpa);
+	if (dd->tima > 0)
+		purple_timeout_remove(dd->tima);
 	dd->inpa = 0;
 	dd->tima = 0;
 
@@ -610,7 +617,7 @@
 
 	/* We have already done all our retries. Make sure that the callback
 	 * doesn't get called before the original function returns */
-	purple_timeout_add(10, purple_upnp_discover_timeout, dd);
+	dd->tima = purple_timeout_add(10, purple_upnp_discover_timeout, dd);
 }
 
 void
@@ -647,7 +654,7 @@
 			"purple_upnp_discover(): Failed In sock creation\n");
 		/* Short circuit the retry attempts */
 		dd->retry_count = NUM_UDP_ATTEMPTS;
-		purple_timeout_add(10, purple_upnp_discover_timeout, dd);
+		dd->tima = purple_timeout_add(10, purple_upnp_discover_timeout, dd);
 		return;
 	}
 
@@ -659,7 +666,7 @@
 			"purple_upnp_discover(): Failed In gethostbyname\n");
 		/* Short circuit the retry attempts */
 		dd->retry_count = NUM_UDP_ATTEMPTS;
-		purple_timeout_add(10, purple_upnp_discover_timeout, dd);
+		dd->tima = purple_timeout_add(10, purple_upnp_discover_timeout, dd);
 		return;
 	}
 
--- a/libpurple/util.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/util.c	Sat Jul 31 23:42:35 2010 +0000
@@ -28,6 +28,7 @@
 #include "core.h"
 #include "debug.h"
 #include "notify.h"
+#include "ntlm.h"
 #include "prpl.h"
 #include "prefs.h"
 #include "util.h"
@@ -69,6 +70,7 @@
 	unsigned long data_len;
 	gssize max_len;
 	gboolean chunked;
+	PurpleAccount *account;
 };
 
 static char *custom_user_dir = NULL;
@@ -2053,6 +2055,45 @@
 	return FALSE;
 }
 
+static const char *
+process_link(GString *ret,
+		const char *start, const char *c,
+		int matchlen,
+		const char *urlprefix,
+		int inside_paren)
+{
+	char *url_buf, *tmpurlbuf;
+	const char *t;
+
+	for (t = c;; t++) {
+		if (!badchar(*t) && !badentity(t))
+			continue;
+
+		if (t - c == matchlen)
+			break;
+
+		if (*t == ',' && *(t + 1) != ' ') {
+			continue;
+		}
+
+		if (t > start && *(t - 1) == '.')
+			t--;
+		if (t > start && *(t - 1) == ')' && inside_paren > 0)
+			t--;
+
+		url_buf = g_strndup(c, t - c);
+		tmpurlbuf = purple_unescape_html(url_buf);
+		g_string_append_printf(ret, "<A HREF=\"%s%s\">%s</A>",
+				urlprefix,
+				tmpurlbuf, url_buf);
+		g_free(tmpurlbuf);
+		g_free(url_buf);
+		return t;
+	}
+
+	return c;
+}
+
 char *
 purple_markup_linkify(const char *text)
 {
@@ -2100,129 +2141,22 @@
 						break;
 				}
 			}
-		} else if ((*c=='h') && (!g_ascii_strncasecmp(c, "http://", 7) ||
-					(!g_ascii_strncasecmp(c, "https://", 8)))) {
-			t = c;
-			while (1) {
-				if (badchar(*t) || badentity(t)) {
-
-					if ((!g_ascii_strncasecmp(c, "http://", 7) && (t - c == 7)) ||
-						(!g_ascii_strncasecmp(c, "https://", 8) && (t - c == 8))) {
-						break;
-					}
-
-					if (*(t) == ',' && (*(t + 1) != ' ')) {
-						t++;
-						continue;
-					}
-
-					if (*(t - 1) == '.')
-						t--;
-					if ((*(t - 1) == ')' && (inside_paren > 0))) {
-						t--;
-					}
-
-					url_buf = g_strndup(c, t - c);
-					tmpurlbuf = purple_unescape_html(url_buf);
-					g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
-							tmpurlbuf, url_buf);
-					g_free(url_buf);
-					g_free(tmpurlbuf);
-					c = t;
-					break;
-				}
-				t++;
-
-			}
-		} else if (!g_ascii_strncasecmp(c, "www.", 4) && (c == text || badchar(c[-1]) || badentity(c-1))) {
-			if (c[4] != '.') {
-				t = c;
-				while (1) {
-					if (badchar(*t) || badentity(t)) {
-						if (t - c == 4) {
-							break;
-						}
-
-						if (*(t) == ',' && (*(t + 1) != ' ')) {
-							t++;
-							continue;
-						}
-
-						if (*(t - 1) == '.')
-							t--;
-						if ((*(t - 1) == ')' && (inside_paren > 0))) {
-							t--;
-						}
-						url_buf = g_strndup(c, t - c);
-						tmpurlbuf = purple_unescape_html(url_buf);
-						g_string_append_printf(ret,
-								"<A HREF=\"http://%s\">%s</A>", tmpurlbuf,
-								url_buf);
-						g_free(url_buf);
-						g_free(tmpurlbuf);
-						c = t;
-						break;
-					}
-					t++;
-				}
-			}
-		} else if (!g_ascii_strncasecmp(c, "ftp://", 6) || !g_ascii_strncasecmp(c, "sftp://", 7)) {
-			t = c;
-			while (1) {
-				if (badchar(*t) || badentity(t)) {
-
-					if ((!g_ascii_strncasecmp(c, "ftp://", 6) && (t - c == 6)) ||
-						(!g_ascii_strncasecmp(c, "sftp://", 7) && (t - c == 7))) {
-						break;
-					}
-
-					if (*(t - 1) == '.')
-						t--;
-					if ((*(t - 1) == ')' && (inside_paren > 0))) {
-						t--;
-					}
-					url_buf = g_strndup(c, t - c);
-					tmpurlbuf = purple_unescape_html(url_buf);
-					g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
-							tmpurlbuf, url_buf);
-					g_free(url_buf);
-					g_free(tmpurlbuf);
-					c = t;
-					break;
-				}
-				if (!t)
-					break;
-				t++;
-
-			}
-		} else if (!g_ascii_strncasecmp(c, "ftp.", 4) && (c == text || badchar(c[-1]) || badentity(c-1))) {
-			if (c[4] != '.') {
-				t = c;
-				while (1) {
-					if (badchar(*t) || badentity(t)) {
-						if (t - c == 4) {
-							break;
-						}
-						if (*(t - 1) == '.')
-							t--;
-						if ((*(t - 1) == ')' && (inside_paren > 0))) {
-							t--;
-						}
-						url_buf = g_strndup(c, t - c);
-						tmpurlbuf = purple_unescape_html(url_buf);
-						g_string_append_printf(ret,
-								"<A HREF=\"ftp://%s\">%s</A>", tmpurlbuf,
-								url_buf);
-						g_free(url_buf);
-						g_free(tmpurlbuf);
-						c = t;
-						break;
-					}
-					if (!t)
-						break;
-					t++;
-				}
-			}
+		} else if (!g_ascii_strncasecmp(c, "http://", 7)) {
+			c = process_link(ret, text, c, 7, "", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "https://", 8)) {
+			c = process_link(ret, text, c, 8, "", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "ftp://", 6)) {
+			c = process_link(ret, text, c, 6, "", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "sftp://", 7)) {
+			c = process_link(ret, text, c, 7, "", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "file://", 7)) {
+			c = process_link(ret, text, c, 7, "", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "www.", 4) && c[4] != '.' && (c == text || badchar(c[-1]) || badentity(c-1))) {
+			c = process_link(ret, text, c, 4, "http://", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "ftp.", 4) && c[4] != '.' && (c == text || badchar(c[-1]) || badentity(c-1))) {
+			c = process_link(ret, text, c, 4, "ftp://", inside_paren);
+		} else if (!g_ascii_strncasecmp(c, "xmpp:", 5) && (c == text || badchar(c[-1]) || badentity(c-1))) {
+			c = process_link(ret, text, c, 5, "", inside_paren);
 		} else if (!g_ascii_strncasecmp(c, "mailto:", 7)) {
 			t = c;
 			while (1) {
@@ -2231,7 +2165,7 @@
 					if (t - c == 7) {
 						break;
 					}
-					if (*(t - 1) == '.')
+					if (t > text && *(t - 1) == '.')
 						t--;
 					if ((d = strstr(c + 7, "?")) != NULL && d < t)
 						url_buf = g_strndup(c + 7, d - c - 7);
@@ -2251,43 +2185,7 @@
 					c = t;
 					break;
 				}
-				if (!t)
-					break;
 				t++;
-
-			}
-		} else if ((*c=='x') && (!g_ascii_strncasecmp(c, "xmpp:", 5)) &&
-				   (c == text || badchar(c[-1]) || badentity(c-1))) {
-			t = c;
-			while (1) {
-				if (badchar(*t) || badentity(t)) {
-
-					if (t - c == 5) {
-						break;
-					}
-
-					if (*(t) == ',' && (*(t + 1) != ' ')) {
-						t++;
-						continue;
-					}
-
-					if (*(t - 1) == '.')
-						t--;
-					if ((*(t - 1) == ')' && (inside_paren > 0))) {
-						t--;
-					}
-
-					url_buf = g_strndup(c, t - c);
-					tmpurlbuf = purple_unescape_html(url_buf);
-					g_string_append_printf(ret, "<A HREF=\"%s\">%s</A>",
-							tmpurlbuf, url_buf);
-					g_free(url_buf);
-					g_free(tmpurlbuf);
-					c = t;
-					break;
-				}
-				t++;
-
 			}
 		} else if (c != text && (*c == '@')) {
 			int flag;
@@ -3525,7 +3423,7 @@
 			   char **ret_path, char **ret_user, char **ret_passwd)
 {
 	gboolean is_https = FALSE;
-	char scan_info[255];
+	const char * scan_info;
 	char port_str[6];
 	int f;
 	const char *at, *slash;
@@ -3533,11 +3431,12 @@
 	char host[256], path[256], user[256], passwd[256];
 	int port = 0;
 	/* hyphen at end includes it in control set */
-	static const char addr_ctrl[] = "A-Za-z0-9.-";
-	static const char port_ctrl[] = "0-9";
-	static const char page_ctrl[] = "A-Za-z0-9.~_/:*!@&%%?=+^-";
-	static const char user_ctrl[] = "A-Za-z0-9.~_/*!&%%?=+^-";
-	static const char passwd_ctrl[] = "A-Za-z0-9.~_/*!&%%?=+^-";
+
+#define ADDR_CTRL "A-Za-z0-9.-"
+#define PORT_CTRL "0-9"
+#define PAGE_CTRL "A-Za-z0-9.~_/:*!@&%%?=+^-"
+#define USER_CTRL "A-Za-z0-9.~_/*!&%%?=+^-"
+#define PASSWD_CTRL "A-Za-z0-9.~_/*!&%%?=+^-"
 
 	g_return_val_if_fail(url != NULL, FALSE);
 
@@ -3557,37 +3456,32 @@
 	/* Only care about @ char BEFORE the first / */
 	at = strchr(url, '@');
 	slash = strchr(url, '/');
-	if ((at != NULL) &&
-			(((slash != NULL) && (strlen(at) > strlen(slash))) ||
-			(slash == NULL))) {
-		g_snprintf(scan_info, sizeof(scan_info),
-					"%%255[%s]:%%255[%s]^@", user_ctrl, passwd_ctrl);
+	f = 0;
+	if (at && (!slash || at < slash)) {
+		scan_info = "%255[" USER_CTRL "]:%255[" PASSWD_CTRL "]^@";
 		f = sscanf(url, scan_info, user, passwd);
 
-		if (f ==1 ) {
+		if (f == 1) {
 			/* No passwd, possibly just username supplied */
-			g_snprintf(scan_info, sizeof(scan_info),
-						"%%255[%s]^@", user_ctrl);
+			scan_info = "%255[" USER_CTRL "]^@";
 			f = sscanf(url, scan_info, user);
-			*passwd = '\0';
 		}
 
 		url = at+1; /* move pointer after the @ char */
-	} else {
+	}
+
+	if (f < 1) {
 		*user = '\0';
 		*passwd = '\0';
-	}
-
-	g_snprintf(scan_info, sizeof(scan_info),
-			   "%%255[%s]:%%5[%s]/%%255[%s]", addr_ctrl, port_ctrl, page_ctrl);
-
+	} else if (f == 1)
+		*passwd = '\0';
+
+	scan_info = "%255[" ADDR_CTRL "]:%5[" PORT_CTRL "]/%255[" PAGE_CTRL "]";
 	f = sscanf(url, scan_info, host, port_str, path);
 
 	if (f == 1)
 	{
-		g_snprintf(scan_info, sizeof(scan_info),
-				   "%%255[%s]/%%255[%s]",
-				   addr_ctrl, page_ctrl);
+		scan_info = "%255[" ADDR_CTRL "]/%255[" PAGE_CTRL "]";
 		f = sscanf(url, scan_info, host, path);
 		/* Use the default port */
 		if (is_https)
@@ -3611,6 +3505,12 @@
 	if (ret_passwd != NULL) *ret_passwd = g_strdup(passwd);
 
 	return ((*host != '\0') ? TRUE : FALSE);
+
+#undef ADDR_CTRL
+#undef PORT_CTRL
+#undef PAGE_CTRL
+#undef USER_CTRL
+#undef PASSWD_CTRL
 }
 
 /**
@@ -3723,11 +3623,11 @@
 
 	if (purple_strcasestr(new_url, "https://") != NULL) {
 		gfud->is_ssl = TRUE;
-		gfud->ssl_connection = purple_ssl_connect(NULL,
+		gfud->ssl_connection = purple_ssl_connect(gfud->account,
 				gfud->website.address, gfud->website.port,
 				ssl_url_fetch_connect_cb, ssl_url_fetch_error_cb, gfud);
 	} else {
-		gfud->connect_data = purple_proxy_connect(NULL, NULL,
+		gfud->connect_data = purple_proxy_connect(NULL, gfud->account,
 				gfud->website.address, gfud->website.port,
 				url_fetch_connect_cb, gfud);
 	}
@@ -4019,36 +3919,68 @@
 
 	gfud = data;
 
-	if (gfud->request == NULL)
-	{
+	if (gfud->request == NULL) {
+
+		PurpleProxyInfo *gpi = purple_proxy_get_setup(gfud->account);
+		GString *request_str = g_string_new(NULL);
+
+		g_string_append_printf(request_str, "GET %s%s HTTP/%s\r\n"
+						    "Connection: close\r\n",
+			(gfud->full ? "" : "/"),
+			(gfud->full ? (gfud->url ? gfud->url : "") : (gfud->website.page ? gfud->website.page : "")),
+			(gfud->http11 ? "1.1" : "1.0"));
+
+		if (gfud->user_agent)
+			g_string_append_printf(request_str, "User-Agent: %s\r\n", gfud->user_agent);
+
 		/* Host header is not forbidden in HTTP/1.0 requests, and HTTP/1.1
 		 * clients must know how to handle the "chunked" transfer encoding.
 		 * Purple doesn't know how to handle "chunked", so should always send
 		 * the Host header regardless, to get around some observed problems
 		 */
-		if (gfud->user_agent) {
-			gfud->request = g_strdup_printf(
-				"GET %s%s HTTP/%s\r\n"
-				"Connection: close\r\n"
-				"User-Agent: %s\r\n"
-				"Accept: */*\r\n"
-				"Host: %s\r\n\r\n",
-				(gfud->full ? "" : "/"),
-				(gfud->full ? (gfud->url ? gfud->url : "") : (gfud->website.page ? gfud->website.page : "")),
-				(gfud->http11 ? "1.1" : "1.0"),
-				(gfud->user_agent ? gfud->user_agent : ""),
-				(gfud->website.address ? gfud->website.address : ""));
-		} else {
-			gfud->request = g_strdup_printf(
-				"GET %s%s HTTP/%s\r\n"
-				"Connection: close\r\n"
-				"Accept: */*\r\n"
-				"Host: %s\r\n\r\n",
-				(gfud->full ? "" : "/"),
-				(gfud->full ? (gfud->url ? gfud->url : "") : (gfud->website.page ? gfud->website.page : "")),
-				(gfud->http11 ? "1.1" : "1.0"),
-				(gfud->website.address ? gfud->website.address : ""));
+		g_string_append_printf(request_str, "Accept: */*\r\n"
+						    "Host: %s\r\n",
+			(gfud->website.address ? gfud->website.address : ""));
+
+		if (purple_proxy_info_get_username(gpi) != NULL
+				&& (purple_proxy_info_get_type(gpi) == PURPLE_PROXY_USE_ENVVAR
+					|| purple_proxy_info_get_type(gpi) == PURPLE_PROXY_HTTP)) {
+			/* This chunk of code was copied from proxy.c http_start_connect_tunneling()
+			 * This is really a temporary hack - we need a more complete proxy handling solution,
+			 * so I didn't think it was worthwhile to refactor for reuse
+			 */ 
+			char *t1, *t2, *ntlm_type1;
+			char hostname[256];
+			int ret;
+	
+			ret = gethostname(hostname, sizeof(hostname));
+			hostname[sizeof(hostname) - 1] = '\0';
+			if (ret < 0 || hostname[0] == '\0') {
+				purple_debug_warning("util", "proxy - gethostname() failed -- is your hostname set?");
+				strcpy(hostname, "localhost");
+			}
+	
+			t1 = g_strdup_printf("%s:%s",
+				purple_proxy_info_get_username(gpi),
+				purple_proxy_info_get_password(gpi) ?
+					purple_proxy_info_get_password(gpi) : "");
+			t2 = purple_base64_encode((const guchar *)t1, strlen(t1));
+			g_free(t1);
+	
+			ntlm_type1 = purple_ntlm_gen_type1(hostname, "");
+	
+			g_string_append_printf(request_str,
+				"Proxy-Authorization: Basic %s\r\n"
+				"Proxy-Authorization: NTLM %s\r\n"
+				"Proxy-Connection: Keep-Alive\r\n",
+				t2, ntlm_type1);
+			g_free(ntlm_type1);
+			g_free(t2);
 		}
+
+		g_string_append(request_str, "\r\n");
+
+		gfud->request = g_string_free(request_str, FALSE);
 	}
 
 	if(purple_debug_is_unsafe())
@@ -4187,6 +4119,7 @@
 	gfud->include_headers = include_headers;
 	gfud->fd = -1;
 	gfud->max_len = max_len;
+	gfud->account = account;
 
 	purple_url_parse(url, &gfud->website.address, &gfud->website.port,
 				   &gfud->website.page, &gfud->website.user, &gfud->website.passwd);
@@ -4340,6 +4273,8 @@
 
 	g_return_val_if_fail(address != NULL, FALSE);
 
+	if (*address == '.') return FALSE;
+
 	/* first we validate the name portion (name@domain) (rfc822)*/
 	for (c = address;  *c;  c++) {
 		if (*c == '\"' && (c == address || *(c - 1) == '.' || *(c - 1) == '\"')) {
@@ -4373,7 +4308,7 @@
 	do {
 		if (*c == '.' && (c == domain || *(c - 1) == '.' || *(c - 1) == '-'))
 			return FALSE;
-		if (*c == '-' && *(c - 1) == '.') return FALSE;
+		if (*c == '-' && (*(c - 1) == '.' || *(c - 1) == '@')) return FALSE;
 		if ((*c < '0' && *c != '-' && *c != '.') || (*c > '9' && *c < 'A') ||
 			(*c > 'Z' && *c < 'a') || (*c > 'z')) return FALSE;
 	} while (*++c);
@@ -4960,7 +4895,13 @@
 			}
 		}
 	}
-
+#ifdef _WIN32
+	/* File/Directory names in windows cannot end in periods/spaces.
+	 * http://msdn.microsoft.com/en-us/library/aa365247%28VS.85%29.aspx
+	 */
+	while (j > 0 && (buf[j - 1] == '.' || buf[j - 1] == ' '))
+		j--;
+#endif
 	buf[j] = '\0';
 
 	return buf;
--- a/libpurple/xmlnode.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/xmlnode.c	Sat Jul 31 23:42:35 2010 +0000
@@ -223,7 +223,7 @@
 
 
 const char *
-xmlnode_get_attrib(xmlnode *node, const char *attr)
+xmlnode_get_attrib(const xmlnode *node, const char *attr)
 {
 	xmlnode *x;
 
@@ -240,9 +240,9 @@
 }
 
 const char *
-xmlnode_get_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns)
+xmlnode_get_attrib_with_namespace(const xmlnode *node, const char *attr, const char *xmlns)
 {
-	xmlnode *x;
+	const xmlnode *x;
 
 	g_return_val_if_fail(node != NULL, NULL);
 	g_return_val_if_fail(attr != NULL, NULL);
--- a/libpurple/xmlnode.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/libpurple/xmlnode.h	Sat Jul 31 23:42:35 2010 +0000
@@ -205,7 +205,7 @@
  *
  * @return The value of the attribute.
  */
-const char *xmlnode_get_attrib(xmlnode *node, const char *attr);
+const char *xmlnode_get_attrib(const xmlnode *node, const char *attr);
 
 /**
  * Gets a namespaced attribute from a node
@@ -216,7 +216,7 @@
  *
  * @return The value of the attribute/
  */
-const char *xmlnode_get_attrib_with_namespace(xmlnode *node, const char *attr, const char *xmlns);
+const char *xmlnode_get_attrib_with_namespace(const xmlnode *node, const char *attr, const char *xmlns);
 
 /**
  * Removes an attribute from a node.
--- a/pidgin/Makefile.mingw	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/Makefile.mingw	Sat Jul 31 23:42:35 2010 +0000
@@ -162,7 +162,7 @@
 $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a: $(PURPLE_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(PIDGIN_OBJECTS)
 	$(CC) -shared $(PIDGIN_OBJECTS) $(LIB_PATHS) $(PIDGIN_LIBS) $(DLL_LD_FLAGS) -Wl,--output-def,$(PIDGIN_TARGET).def,--out-implib,$(PIDGIN_TARGET).dll.a -o $(PIDGIN_TARGET).dll
 
-$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(PIDGIN_IDLETRACK_DLL).a $(EXE_OBJECTS)
+$(EXE_TARGET).exe: $(PIDGIN_CONFIG_H) $(PIDGIN_DLL).a $(EXE_OBJECTS) $(PIDGIN_TARGET).dll
 	$(CC) $(LDFLAGS) $(EXE_OBJECTS) -o $(EXE_TARGET).exe
 
 ##
--- a/pidgin/gtkblist.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/gtkblist.c	Sat Jul 31 23:42:35 2010 +0000
@@ -3601,11 +3601,12 @@
 		purple_request_field_list_add_selected(f, _("None"));
 
 	/* TODO: rlaager wants this sorted. */
-	/* The connection is checked for PURPLE_CONNECTION_SUPPORT_MOODS flag before
-	 * this function is called for a non-null account. So using
-	 * PURPLE_PROTOCOL_PLUGIN_HAS_FUNC isn't necessary here */
-	for (mood = account ? prpl_info->get_moods(account) : global_moods;
-	     mood->mood != NULL ; mood++) {
+	/* TODO: darkrain wants it sorted post-translation */
+	if (account && PURPLE_PROTOCOL_PLUGIN_HAS_FUNC(prpl_info, get_moods))
+		mood = prpl_info->get_moods(account);
+	else
+		mood = global_moods;
+	for ( ; mood->mood != NULL ; mood++) {
 		char *path;
 
 		if (mood->mood == NULL || mood->description == NULL)
@@ -3686,7 +3687,7 @@
 	{ N_("/Tools/Plu_gins"), "<CTL>U", pidgin_plugin_dialog_show, 2, "<StockItem>", PIDGIN_STOCK_TOOLBAR_PLUGINS },
 	{ N_("/Tools/Pr_eferences"), "<CTL>P", pidgin_prefs_show, 0, "<StockItem>", GTK_STOCK_PREFERENCES },
 	{ N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL },
-	{ N_("/Tools/Set _Mood"), "<CTL>M", set_mood_show, 0, "<Item>", NULL },
+	{ N_("/Tools/Set _Mood"), "<CTL>O", set_mood_show, 0, "<Item>", NULL },
 	{ "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL },
 	{ N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER },
 	{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
@@ -4590,7 +4591,7 @@
 }
 
 static void
-plugin_changed_cb(PurplePlugin *p, gpointer *data)
+plugin_changed_cb(PurplePlugin *p, gpointer data)
 {
 	pidgin_blist_update_plugin_actions();
 }
--- a/pidgin/gtkconv.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/gtkconv.c	Sat Jul 31 23:42:35 2010 +0000
@@ -282,6 +282,15 @@
 }
 
 static void
+conversation_entry_clear(PidginConversation *gtkconv)
+{
+	GtkIMHtml *imhtml = GTK_IMHTML(gtkconv->entry);
+	gtk_source_undo_manager_begin_not_undoable_action(imhtml->undo_manager);
+	gtk_imhtml_clear(imhtml);
+	gtk_source_undo_manager_end_not_undoable_action(imhtml->undo_manager);
+}
+
+static void
 clear_formatting_cb(GtkIMHtml *imhtml, PidginConversation *gtkconv)
 {
 	default_formatize(gtkconv);
@@ -557,7 +566,7 @@
 	account = purple_conversation_get_account(conv);
 
 	if (check_for_and_do_command(conv)) {
-		gtk_imhtml_clear(GTK_IMHTML(gtkconv->entry));
+		conversation_entry_clear(gtkconv);
 		return;
 	}
 
@@ -612,7 +621,7 @@
 	g_free(clean);
 	g_free(buf);
 
-	gtk_imhtml_clear(GTK_IMHTML(gtkconv->entry));
+	conversation_entry_clear(gtkconv);
 	gtkconv_set_unseen(gtkconv, PIDGIN_UNSEEN_NONE);
 }
 
--- a/pidgin/gtkdialogs.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/gtkdialogs.c	Sat Jul 31 23:42:35 2010 +0000
@@ -206,8 +206,8 @@
 	{N_("Malay"),               "ms_MY", "Muhammad Najmi bin Ahmad Zabidi", "najmi.zabidi@gmail.com"},
 	{N_("Bokmål Norwegian"),    "nb", "Hans Fredrik Nordhaug", "hans@nordhaug.priv.no"},
 	{N_("Nepali"),              "ne", "Shyam Krishna Bal", "shyamkrishna_bal@yahoo.com"},
-	{N_("Dutch, Flemish"),      "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"},
-	{N_("Norwegian Nynorsk"),   "nn", "Yngve Spjeld Landro", "nynorsk@strilen.net"},
+	{N_("Dutch, Flemish"),      "nl", "Gideon van Melle", "translations@gvmelle.com"},
+	{N_("Norwegian Nynorsk"),   "nn", "Yngve Spjeld Landro", "l10n@landro.net"},
 	{N_("Occitan"),             "oc", "Yannig Marchegay", "yannig@marchegay.org"},
 	{N_("Oriya"),               "or", "Manoj Kumar Giri", "giri.manojkr@gmail.com"},
 	{N_("Punjabi"),             "pa", "Amanpreet Singh Alam", "aalam@users.sf.net"},
@@ -288,6 +288,7 @@
 	{N_("Bokmål Norwegian"),    "nb", "Hallvard Glad", "hallvard.glad@gmail.com"},
 	{N_("Bokmål Norwegian"),    "nb", "Petter Johan Olsen", NULL},
 	{N_("Bokmål Norwegian"),    "nb", "Espen Stefansen", "espenas@gmail.com"},
+	{N_("Dutch, Flemish"),      "nl", "Vincent van Adrighem", "V.vanAdrighem@dirck.mine.nu"},
 	{N_("Polish"),              "pl", "Emil Nowak", "emil5@go2.pl"},
 	{N_("Polish"),              "pl", "Paweł Godlewski", "pawel@bajk.pl"},
 	{N_("Polish"),              "pl", "Krzysztof Foltman", "krzysztof@foltman.com"},
@@ -430,7 +431,8 @@
 
 	/* Insert the logo */
 	logo = gtk_image_new_from_pixbuf(pixbuf);
-	g_object_unref(G_OBJECT(pixbuf));
+	if (pixbuf)
+		g_object_unref(G_OBJECT(pixbuf));
 	obj = gtk_widget_get_accessible(logo);
 	tmp = g_strconcat(PIDGIN_NAME, " " DISPLAY_VERSION, NULL);
 	atk_object_set_description(obj, tmp);
--- a/pidgin/gtkimhtml.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/gtkimhtml.c	Sat Jul 31 23:42:35 2010 +0000
@@ -1353,6 +1353,9 @@
 static void
 imhtml_paste_cb(GtkIMHtml *imhtml, const char *str)
 {
+	if (!gtk_text_view_get_editable(GTK_TEXT_VIEW(imhtml)))
+		return;
+
 	if (!str || !*str || !strcmp(str, "html"))
 		g_signal_emit_by_name(imhtml, "paste_clipboard");
 	else if (!strcmp(str, "text"))
--- a/pidgin/gtkimhtmltoolbar.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Sat Jul 31 23:42:35 2010 +0000
@@ -49,6 +49,9 @@
 										   gboolean is_active,
 										   GtkIMHtmlToolbar *toolbar);
 
+static gboolean
+gtk_imhtmltoolbar_popup_menu(GtkWidget *widget,
+		GdkEventButton *event, GtkIMHtmlToolbar *toolbar);
 
 static void do_bold(GtkWidget *bold, GtkIMHtmlToolbar *toolbar)
 {
@@ -908,6 +911,7 @@
 
 	toggle_button_set_active_block(GTK_TOGGLE_BUTTON(attention), FALSE, toolbar);
 	purple_prpl_send_attention(gc, who, 0);
+	gtk_widget_grab_focus(toolbar->imhtml);
 }
 
 static void update_buttons_cb(GtkIMHtml *imhtml, GtkIMHtmlButtons buttons, GtkIMHtmlToolbar *toolbar)
@@ -1098,6 +1102,16 @@
 		*y -= widget->allocation.height;
 }
 
+static gboolean
+button_activate_on_click(GtkWidget *button, GdkEventButton *event, GtkIMHtmlToolbar *toolbar)
+{
+	if (event->button == 1 && GTK_IS_TOGGLE_BUTTON(button))
+		gtk_widget_activate(button);
+	else if (event->button == 3)
+		return gtk_imhtmltoolbar_popup_menu(button, event, toolbar);
+	return FALSE;
+}
+
 static void pidgin_menu_clicked(GtkWidget *button, GtkMenu *menu)
 {
 	gtk_widget_show_all(GTK_WIDGET(menu));
@@ -1230,8 +1244,6 @@
 		{PIDGIN_STOCK_TOOLBAR_INSERT_LINK, insert_link_cb, &toolbar->link, _("Insert Link")},
 		{"", NULL, NULL, NULL},
 		{PIDGIN_STOCK_TOOLBAR_SMILEY, insert_smiley_cb, &toolbar->smiley, _("Insert Smiley")},
-		/*{PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION, send_attention_cb, 
-			g_object_get_data(G_OBJECT(toolbar->imhtml), "attention"), _("Send Attention")},*/
 		{NULL, NULL, NULL, NULL}
 	};
 	int iter;
@@ -1241,6 +1253,7 @@
 	for (iter = 0; buttons[iter].stock; iter++) {
 		if (buttons[iter].stock[0]) {
 			button = pidgin_pixbuf_toolbar_button_from_stock(buttons[iter].stock);
+			g_signal_connect(G_OBJECT(button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
 			g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(buttons[iter].callback), toolbar);
 			*(buttons[iter].button) = button;
@@ -1251,6 +1264,7 @@
 	}
 	/* create the attention button (this is a bit hacky to not break ABI) */
 	button = pidgin_pixbuf_toolbar_button_from_stock(PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION);
+	g_signal_connect(G_OBJECT(button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
 	g_signal_connect(G_OBJECT(button), "clicked",
 		G_CALLBACK(send_attention_cb), toolbar);
 	g_object_set_data(G_OBJECT(toolbar), "attention", button);
@@ -1262,6 +1276,15 @@
 }
 
 static void
+button_visibility_changed(GtkWidget *button, gpointer dontcare, GtkWidget *item)
+{
+	if (GTK_WIDGET_VISIBLE(button))
+		gtk_widget_hide(item);
+	else
+		gtk_widget_show(item);
+}
+
+static void
 button_sensitiveness_changed(GtkWidget *button, gpointer dontcare, GtkWidget *item)
 {
 	gtk_widget_set_sensitive(item, GTK_WIDGET_IS_SENSITIVE(button));
@@ -1309,6 +1332,7 @@
 	GtkWidget *insert_menu;
 	GtkWidget *menuitem;
 	GtkWidget *sep;
+	GObject *wide_attention_button;
 	int i;
 	struct {
 		const char *label;
@@ -1379,10 +1403,12 @@
 		gtk_menu_shell_append(GTK_MENU_SHELL(font_menu), menuitem);
 		g_signal_connect(G_OBJECT(old), "notify::sensitive",
 				G_CALLBACK(button_sensitiveness_changed), menuitem);
+		g_signal_connect(G_OBJECT(old), "notify::visible",
+				G_CALLBACK(button_visibility_changed), menuitem);
 		gtk_container_foreach(GTK_CONTAINER(menuitem), (GtkCallback)enable_markup, NULL);
 	}
 
-	g_signal_connect_swapped(G_OBJECT(font_button), "button-press-event", G_CALLBACK(gtk_widget_activate), font_button);
+	g_signal_connect(G_OBJECT(font_button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
 	g_signal_connect(G_OBJECT(font_button), "activate", G_CALLBACK(pidgin_menu_clicked), font_menu);
 	g_signal_connect(G_OBJECT(font_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), font_button);
 
@@ -1411,19 +1437,23 @@
 	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem);
 	g_signal_connect(G_OBJECT(toolbar->image), "notify::sensitive",
 			G_CALLBACK(button_sensitiveness_changed), menuitem);
+	g_signal_connect(G_OBJECT(toolbar->image), "notify::visible",
+			G_CALLBACK(button_visibility_changed), menuitem);
 
 	menuitem = gtk_menu_item_new_with_mnemonic(_("_Link"));
 	g_signal_connect_swapped(G_OBJECT(menuitem), "activate", G_CALLBACK(gtk_button_clicked), toolbar->link);
 	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem);
 	g_signal_connect(G_OBJECT(toolbar->link), "notify::sensitive",
 			G_CALLBACK(button_sensitiveness_changed), menuitem);
+	g_signal_connect(G_OBJECT(toolbar->link), "notify::visible",
+			G_CALLBACK(button_visibility_changed), menuitem);
 
 	menuitem = gtk_menu_item_new_with_mnemonic(_("_Horizontal rule"));
 	g_signal_connect(G_OBJECT(menuitem), "activate"	, G_CALLBACK(insert_hr_cb), toolbar);
 	gtk_menu_shell_append(GTK_MENU_SHELL(insert_menu), menuitem);
 	toolbar->insert_hr = menuitem;
 
-	g_signal_connect_swapped(G_OBJECT(insert_button), "button-press-event", G_CALLBACK(gtk_widget_activate), insert_button);
+	g_signal_connect(G_OBJECT(insert_button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
 	g_signal_connect(G_OBJECT(insert_button), "activate", G_CALLBACK(pidgin_menu_clicked), insert_menu);
 	g_signal_connect(G_OBJECT(insert_menu), "deactivate", G_CALLBACK(pidgin_menu_deactivate), insert_button);
 	toolbar->sml = NULL;
@@ -1443,6 +1473,7 @@
 	label = gtk_label_new_with_mnemonic(_("_Smile!"));
 	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), smiley_button, FALSE, FALSE, 0);
+	g_signal_connect(G_OBJECT(smiley_button), "button-press-event", G_CALLBACK(button_activate_on_click), toolbar);
 	g_signal_connect_swapped(G_OBJECT(smiley_button), "clicked", G_CALLBACK(gtk_button_clicked), toolbar->smiley);
 	gtk_widget_show_all(smiley_button);
 
@@ -1452,29 +1483,30 @@
 	gtk_widget_show_all(sep);
 
 	/* Attention */
+	wide_attention_button = g_object_get_data(G_OBJECT(toolbar), "attention");
+
 	attention_button = gtk_button_new();
 	gtk_button_set_relief(GTK_BUTTON(attention_button), GTK_RELIEF_NONE);
 	bbox = gtk_hbox_new(FALSE, 3);
 	gtk_container_add(GTK_CONTAINER(attention_button), bbox);
-	image = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION, 
+	image = gtk_image_new_from_stock(PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION,
 		gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL));
 	gtk_box_pack_start(GTK_BOX(bbox), image, FALSE, FALSE, 0);
 	label = gtk_label_new_with_mnemonic(_("_Attention!"));
 	gtk_box_pack_start(GTK_BOX(bbox), label, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(box), attention_button, FALSE, FALSE, 0);
-	g_signal_connect_swapped(G_OBJECT(attention_button), "clicked", 
-		G_CALLBACK(gtk_button_clicked),
-	    g_object_get_data(G_OBJECT(toolbar), "attention"));
+	g_signal_connect_swapped(G_OBJECT(attention_button), "clicked",
+		G_CALLBACK(gtk_button_clicked), wide_attention_button);
 	gtk_widget_show_all(attention_button);
-	
-	g_signal_connect(G_OBJECT(g_object_get_data(G_OBJECT(toolbar), "attention")),
-	        "notify::sensitive",
+
+	g_signal_connect(wide_attention_button, "notify::sensitive",
 			G_CALLBACK(button_sensitiveness_changed), attention_button);
+	g_signal_connect(wide_attention_button, "notify::visible",
+			G_CALLBACK(button_visibility_changed), attention_button);
 
 	/* set attention button to be greyed out until we get a conversation */
-	gtk_widget_set_sensitive(g_object_get_data(G_OBJECT(toolbar), "attention"),
-		FALSE);
-	
+	gtk_widget_set_sensitive(GTK_WIDGET(wide_attention_button), FALSE);
+
 	gtk_box_pack_start(GTK_BOX(hbox), box, FALSE, FALSE, 0);
 	g_object_set_data(G_OBJECT(hbox), "lean-view", box);
 	gtk_widget_show(box);
--- a/pidgin/gtkmain.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/gtkmain.c	Sat Jul 31 23:42:35 2010 +0000
@@ -97,7 +97,6 @@
  */
 static const int catch_sig_list[] = {
 	SIGSEGV,
-	SIGHUP,
 	SIGINT,
 	SIGTERM,
 	SIGQUIT,
@@ -223,9 +222,6 @@
 	}
 
 	switch (sig) {
-	case SIGHUP:
-		purple_debug_warning("sighandler", "Caught signal %d\n", sig);
-		break;
 #if defined(USE_GSTREAMER) && !defined(GST_CAN_DISABLE_FORKING)
 /* By default, gstreamer forks when you initialize it, and waitpids for the
  * child.  But if libpurple reaps the child rather than leaving it to
@@ -550,6 +546,7 @@
 	gboolean debug_enabled;
 	gboolean migration_failed = FALSE;
 	GList *active_accounts;
+	struct stat st;
 
 	struct option long_options[] = {
 		{"config",       required_argument, NULL, 'c'},
@@ -853,6 +850,8 @@
 	 * in user's home directory.
 	 */
 	search_path = g_build_filename(purple_user_dir(), "plugins", NULL);
+	if (!g_stat(search_path, &st))
+		g_mkdir(search_path, S_IRUSR | S_IWUSR | S_IXUSR);
 	purple_plugins_add_search_path(search_path);
 	g_free(search_path);
 	purple_plugins_add_search_path(LIBDIR);
--- a/pidgin/gtkmedia.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/gtkmedia.c	Sat Jul 31 23:42:35 2010 +0000
@@ -84,7 +84,7 @@
 	gchar *screenname;
 	gulong level_handler_id;
 
-	GtkItemFactory *item_factory;
+	GtkUIManager *ui;
 	GtkWidget *menubar;
 	GtkWidget *statusbar;
 
@@ -260,50 +260,60 @@
 #endif
 
 static void
-menu_hangup(gpointer data, guint action, GtkWidget *item)
+menu_hangup(GtkAction *action, gpointer data)
 {
 	PidginMedia *gtkmedia = PIDGIN_MEDIA(data);
 	purple_media_stream_info(gtkmedia->priv->media,
 			PURPLE_MEDIA_INFO_HANGUP, NULL, NULL, TRUE);
 }
 
-static GtkItemFactoryEntry menu_items[] = {
-	{ N_("/_Media"), NULL, NULL, 0, "<Branch>", NULL },
-	{ N_("/Media/_Hangup"), NULL, menu_hangup, 0, "<Item>", NULL },
+static const GtkActionEntry menu_entries[] = {
+	{ "MediaMenu", NULL, N_("_Media"), NULL, NULL, NULL },
+	{ "Hangup", NULL, N_("_Hangup"), NULL, NULL, G_CALLBACK(menu_hangup) },
 };
 
-static gint menu_item_count = sizeof(menu_items) / sizeof(menu_items[0]);
-
-static const char *
-item_factory_translate_func (const char *path, gpointer func_data)
-{
-	return _(path);
-}
+static const char *media_menu =
+"<ui>"
+	"<menubar name='Media'>"
+		"<menu action='MediaMenu'>"
+			"<menuitem action='Hangup'/>"
+		"</menu>"
+	"</menubar>"
+"</ui>";
 
 static GtkWidget *
 setup_menubar(PidginMedia *window)
 {
+	GtkActionGroup *action_group;
+	GError *error;
 	GtkAccelGroup *accel_group;
 	GtkWidget *menu;
 
-	accel_group = gtk_accel_group_new ();
-	gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
-	g_object_unref(accel_group);
+	action_group = gtk_action_group_new("MediaActions");
+	gtk_action_group_add_actions(action_group,
+	                             menu_entries,
+	                             G_N_ELEMENTS(menu_entries),
+	                             GTK_WINDOW(window));
+#ifdef ENABLE_NLS
+	gtk_action_group_set_translation_domain(action_group,
+	                                        PACKAGE);
+#endif
 
-	window->priv->item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR,
-			"<main>", accel_group);
+	window->priv->ui = gtk_ui_manager_new();
+	gtk_ui_manager_insert_action_group(window->priv->ui, action_group, 0);
 
-	gtk_item_factory_set_translate_func(window->priv->item_factory,
-			(GtkTranslateFunc)item_factory_translate_func,
-			NULL, NULL);
+	accel_group = gtk_ui_manager_get_accel_group(window->priv->ui);
+	gtk_window_add_accel_group(GTK_WINDOW(window), accel_group);
 
-	gtk_item_factory_create_items(window->priv->item_factory,
-			menu_item_count, menu_items, window);
-	g_signal_connect(G_OBJECT(accel_group), "accel-changed",
-			G_CALLBACK(pidgin_save_accels_cb), NULL);
+	error = NULL;
+	if (!gtk_ui_manager_add_ui_from_string(window->priv->ui, media_menu, -1, &error))
+	{
+		g_message("building menus failed: %s", error->message);
+		g_error_free(error);
+		exit(EXIT_FAILURE);
+	}
 
-	menu = gtk_item_factory_get_widget(
-			window->priv->item_factory, "<main>");
+	menu = gtk_ui_manager_get_widget(window->priv->ui, "/Media");
 
 	gtk_widget_show(menu);
 	return menu;
@@ -333,7 +343,7 @@
 	gtk_box_pack_start(GTK_BOX(vbox), media->priv->menubar,
 			FALSE, TRUE, 0);
 
-	media->priv->display = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
+	media->priv->display = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 	gtk_container_set_border_width(GTK_CONTAINER(media->priv->display),
 			PIDGIN_HIG_BOX_SPACE);
 	gtk_box_pack_start(GTK_BOX(vbox), media->priv->display,
@@ -384,9 +394,9 @@
 		gtkmedia->priv->media = NULL;
 	}
 
-	if (gtkmedia->priv->item_factory) {
-		g_object_unref(gtkmedia->priv->item_factory);
-		gtkmedia->priv->item_factory = NULL;
+	if (gtkmedia->priv->ui) {
+		g_object_unref(gtkmedia->priv->ui);
+		gtkmedia->priv->ui = NULL;
 	}
 
 	G_OBJECT_CLASS(parent_class)->dispose(media);
@@ -629,29 +639,29 @@
 		gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
 				recv_widget, TRUE, TRUE, 0);
 		gtk_widget_show(recv_widget);
-	} else
+	} else {
 		recv_widget = gtkmedia->priv->recv_widget;
+	}
 	if (gtkmedia->priv->send_widget == NULL
 			&& type & (PURPLE_MEDIA_SEND_VIDEO |
 			PURPLE_MEDIA_SEND_AUDIO)) {
 		send_widget = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 		gtk_box_pack_start(GTK_BOX(gtkmedia->priv->display),
-				send_widget, TRUE, TRUE, 0);
+				send_widget, FALSE, TRUE, 0);
 		button_widget = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
-		gtk_box_pack_end(GTK_BOX(send_widget), button_widget,
-				FALSE, FALSE, 0);
-		gtk_widget_show(GTK_WIDGET(button_widget));
+		gtk_box_pack_end(GTK_BOX(recv_widget), button_widget,
+				FALSE, TRUE, 0);
 		gtk_widget_show(send_widget);
 
 		/* Hold button */
 		gtkmedia->priv->hold =
 				gtk_toggle_button_new_with_mnemonic("_Hold");
+		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->hold,
+				FALSE, FALSE, 0);
+		gtk_widget_show(gtkmedia->priv->hold);
 		g_signal_connect(gtkmedia->priv->hold, "toggled",
 				G_CALLBACK(pidgin_media_hold_toggled),
 				gtkmedia);
-		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->hold,
-				FALSE, FALSE, 0);
-		gtk_widget_show(gtkmedia->priv->hold);
 	} else {
 		send_widget = gtkmedia->priv->send_widget;
 		button_widget = gtkmedia->priv->button_widget;
@@ -663,7 +673,7 @@
 		GtkWidget *remote_video;
 		GdkColor color = {0, 0, 0, 0};
 
-		aspect = gtk_aspect_frame_new(NULL, 0.5, 0.5, 4.0/3.0, FALSE);
+		aspect = gtk_aspect_frame_new(NULL, 0, 0, 4.0/3.0, FALSE);
 		gtk_frame_set_shadow_type(GTK_FRAME(aspect), GTK_SHADOW_IN);
 		gtk_box_pack_start(GTK_BOX(recv_widget), aspect, TRUE, TRUE, 0);
 
@@ -683,15 +693,16 @@
 
 		gtkmedia->priv->remote_video = remote_video;
 	}
+
 	if (type & PURPLE_MEDIA_SEND_VIDEO) {
 		PidginMediaRealizeData *data;
 		GtkWidget *aspect;
 		GtkWidget *local_video;
 		GdkColor color = {0, 0, 0, 0};
 
-		aspect = gtk_aspect_frame_new(NULL, 0.5, 0.5, 4.0/3.0, FALSE);
+		aspect = gtk_aspect_frame_new(NULL, 0, 0, 4.0/3.0, TRUE);
 		gtk_frame_set_shadow_type(GTK_FRAME(aspect), GTK_SHADOW_IN);
-		gtk_box_pack_start(GTK_BOX(send_widget), aspect, TRUE, TRUE, 0);
+		gtk_box_pack_start(GTK_BOX(send_widget), aspect, FALSE, TRUE, 0);
 
 		data = g_new0(PidginMediaRealizeData, 1);
 		data->gtkmedia = gtkmedia;
@@ -703,44 +714,43 @@
 		g_signal_connect(G_OBJECT(local_video), "realize",
 				G_CALLBACK(realize_cb), data);
 		gtk_container_add(GTK_CONTAINER(aspect), local_video);
-		gtk_widget_set_size_request (GTK_WIDGET(local_video), 160, 120);
+		gtk_widget_set_size_request (GTK_WIDGET(local_video), 80, 60);
 
 		gtk_widget_show(local_video);
 		gtk_widget_show(aspect);
 
 		gtkmedia->priv->pause =
 				gtk_toggle_button_new_with_mnemonic(_("_Pause"));
+		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->pause,
+				FALSE, FALSE, 0);
+		gtk_widget_show(gtkmedia->priv->pause);
 		g_signal_connect(gtkmedia->priv->pause, "toggled",
 				G_CALLBACK(pidgin_media_pause_toggled),
 				gtkmedia);
-		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->pause,
-				FALSE, FALSE, 0);
-		gtk_widget_show(gtkmedia->priv->pause);
 
 		gtkmedia->priv->local_video = local_video;
 	}
-
 	if (type & PURPLE_MEDIA_RECV_AUDIO) {
 		gtk_box_pack_end(GTK_BOX(recv_widget),
 				pidgin_media_add_audio_widget(gtkmedia,
 				PURPLE_MEDIA_RECV_AUDIO), FALSE, FALSE, 0);
 	}
+
 	if (type & PURPLE_MEDIA_SEND_AUDIO) {
 		gtkmedia->priv->mute =
 				gtk_toggle_button_new_with_mnemonic("_Mute");
+		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->mute,
+				FALSE, FALSE, 0);
+		gtk_widget_show(gtkmedia->priv->mute);
 		g_signal_connect(gtkmedia->priv->mute, "toggled",
 				G_CALLBACK(pidgin_media_mute_toggled),
 				gtkmedia);
-		gtk_box_pack_end(GTK_BOX(button_widget), gtkmedia->priv->mute,
-				FALSE, FALSE, 0);
-		gtk_widget_show(gtkmedia->priv->mute);
 
-		gtk_box_pack_end(GTK_BOX(send_widget),
+		gtk_box_pack_end(GTK_BOX(recv_widget),
 				pidgin_media_add_audio_widget(gtkmedia,
 				PURPLE_MEDIA_SEND_AUDIO), FALSE, FALSE, 0);
 	}
 
-
 	if (type & PURPLE_MEDIA_AUDIO &&
 			gtkmedia->priv->level_handler_id == 0) {
 		gtkmedia->priv->level_handler_id = g_signal_connect(
@@ -752,8 +762,10 @@
 		gtkmedia->priv->send_widget = send_widget;
 	if (recv_widget != NULL)
 		gtkmedia->priv->recv_widget = recv_widget;
-	if (button_widget != NULL)
+	if (button_widget != NULL) {
 		gtkmedia->priv->button_widget = button_widget;
+		gtk_widget_show(GTK_WIDGET(button_widget));
+	}
 
 	if (purple_media_is_initiator(media, sid, NULL) == FALSE) {
 		if (gtkmedia->priv->timeout_id != 0)
--- a/pidgin/gtkprefs.c	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/gtkprefs.c	Sat Jul 31 23:42:35 2010 +0000
@@ -2223,6 +2223,7 @@
 
 	gtk_widget_set_sensitive(hbox,
 			!strcmp(method, "automatic") ||
+			!strcmp(method, "alsa") ||
 			!strcmp(method, "esd"));
 }
 #endif /* USE_GSTREAMER */
--- a/pidgin/gtkutils.h	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/gtkutils.h	Sat Jul 31 23:42:35 2010 +0000
@@ -410,6 +410,9 @@
  * @param filesel The file selection window.
  *
  * @return TRUE if given path is a directory, FALSE otherwise.
+ * @deprecated Pidgin no longer uses GtkFileSelection internally. It has also
+ *             been deprecated by GTK+. Use GtkFileChooser instead and ignore
+ *             this function.
  */
 gboolean pidgin_check_if_dir(const char *path, GtkFileSelection *filesel);
 
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am	Sat Jul 31 23:42:35 2010 +0000
@@ -14,6 +14,7 @@
     beer.png \
     blowkiss.png \
     bomb.png \
+    bored.png \
     bowl.png \
     boy.png \
     brb.png \
@@ -36,6 +37,7 @@
     clown.png \
     coffee.png \
     coins.png \
+    cold.png \
     computer.png \
     confused.png \
     console.png \
@@ -168,6 +170,7 @@
     star.png \
     starving.png \
     stop.png \
+    stressed.png \
     struggle.png \
     sun.png \
     hot.png \
Binary file pidgin/pixmaps/emotes/default/24/bored.png has changed
Binary file pidgin/pixmaps/emotes/default/24/cold.png has changed
--- a/pidgin/pixmaps/emotes/default/24/default.theme.in	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/pixmaps/emotes/default/24/default.theme.in	Sat Jul 31 23:42:35 2010 +0000
@@ -459,7 +459,7 @@
 wink.png            ;-)     ;)
 excited.png         :-D     :D     :->      :>
 neutral.png         :-|     :|
-shock.png           :-O     :O
+shocked.png         :-O     :O
 tongue.png          :-P     :P
 embarrassed.png     :-$     :$
 glasses-cool.png    8-)
@@ -489,3 +489,9 @@
 lying.png           :L)
 glasses-nerdy.png   8-|     8|
 pirate.png          P-)
+### Added in v5.9.7
+bored.png           :-[     :[
+cold.png            :-<     :<
+confused.png        :-,     :,
+hungry.png          :-C     :C
+stressed.png        :-s     :s
Binary file pidgin/pixmaps/emotes/default/24/stressed.png has changed
--- a/pidgin/pixmaps/emotes/small/16/Makefile.am	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/pixmaps/emotes/small/16/Makefile.am	Sat Jul 31 23:42:35 2010 +0000
@@ -25,39 +25,57 @@
     angel.png \
     angry.png \
     beer.png \
+    bored.png \
+    boy.png \
     camera.png \
+    chilli.png \
     cigarette.png \
     coffee.png \
     confused.png \
     console.png \
+    cold.png \
     cool.png \
     cross.png \
     crying.png \
     devil.png \
     dont-know.png \
+    drool.png \
     excited.png \
+    excruciating.png \
+    eyeroll.png \
+    girl.png \
     grin.png \
     happy.png \
     hug-left.png \
     hug-right.png \
+    hungry.png \
     in_love.png \
     kiss.png \
+    lamp.png \
+    lying.png \
     meeting.png \
     mobile.png \
+    mrgreen.png \
     musical-note.png \
     nerdy.png \
     neutral.png \
     party.png \
     phone.png \
+    pirate.png \
+    pissed-off.png \
     plate.png \
     question.png \
+    rose.png \
     sad.png \
     shame.png \
     shocked.png \
+    shut-mouth.png  \
     sick.png \
     silent.png \
     sleeping.png \
     sleepy.png \
+    star.png \
+    stressed.png \
     thinking.png \
     tongue.png \
     tv.png \
Binary file pidgin/pixmaps/emotes/small/16/amorous.png has changed
Binary file pidgin/pixmaps/emotes/small/16/bored.png has changed
Binary file pidgin/pixmaps/emotes/small/16/boy.png has changed
Binary file pidgin/pixmaps/emotes/small/16/chilli.png has changed
Binary file pidgin/pixmaps/emotes/small/16/cold.png has changed
Binary file pidgin/pixmaps/emotes/small/16/drool.png has changed
Binary file pidgin/pixmaps/emotes/small/16/embarrassed.png has changed
Binary file pidgin/pixmaps/emotes/small/16/excited.png has changed
Binary file pidgin/pixmaps/emotes/small/16/excruciating.png has changed
Binary file pidgin/pixmaps/emotes/small/16/eyeroll.png has changed
Binary file pidgin/pixmaps/emotes/small/16/girl.png has changed
Binary file pidgin/pixmaps/emotes/small/16/hungry.png has changed
Binary file pidgin/pixmaps/emotes/small/16/lamp.png has changed
Binary file pidgin/pixmaps/emotes/small/16/lying.png has changed
Binary file pidgin/pixmaps/emotes/small/16/mrgreen.png has changed
Binary file pidgin/pixmaps/emotes/small/16/pirate.png has changed
Binary file pidgin/pixmaps/emotes/small/16/pissed-off.png has changed
Binary file pidgin/pixmaps/emotes/small/16/rose.png has changed
Binary file pidgin/pixmaps/emotes/small/16/shut-mouth.png has changed
Binary file pidgin/pixmaps/emotes/small/16/sleeping.png has changed
--- a/pidgin/pixmaps/emotes/small/16/small.theme.in	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/pixmaps/emotes/small/16/small.theme.in	Sat Jul 31 23:42:35 2010 +0000
@@ -230,3 +230,46 @@
 sad.png		    :[
 kiss.png            :x
 
+# MXit standard emoticons
+[MXit]
+happy.png           :-)     :)
+sad.png             :-(     :(
+wink.png            ;-)     ;)
+excited.png         :-D     :D     :->      :>
+neutral.png         :-|     :|
+shocked.png         :-O     :O
+tongue.png          :-P     :P
+embarrassed.png     :-$     :$
+cool.png            8-)
+in_love.png         (H)
+rose.png            (F)
+### Added in v3.0
+boy.png             (m)
+girl.png            (f)
+star.png            (*)
+chilli.png          (c)
+kiss.png            (x)
+lamp.png            (i)
+pissed-off.png      :e      :-e
+shut-mouth.png      :-x     :x
+grumpy.png          (z)
+coffee.png          (U)
+mrgreen.png         (G)
+### Added in v5.0
+sick.png            :o(
+excruciating.png    :-{     :{
+amorous.png         :-}     :}
+eyeroll.png         8-o     8o
+crying.png          :'(
+thinking.png        :-?     :?
+drool.png           :-~     :~
+sleeping.png        :-z     :z
+lying.png           :L)
+nerdy.png           8-|     8|
+pirate.png          P-)
+### Added in v5.9.7
+bored.png           :-[     :[
+cold.png            :-<     :<
+confused.png        :-,     :,
+hungry.png          :-C     :C
+stressed.png        :-s     :s
Binary file pidgin/pixmaps/emotes/small/16/star.png has changed
Binary file pidgin/pixmaps/emotes/small/16/stressed.png has changed
--- a/pidgin/plugins/Makefile.mingw	Wed Jun 02 20:08:53 2010 +0000
+++ b/pidgin/plugins/Makefile.mingw	Sat Jul 31 23:42:35 2010 +0000
@@ -73,7 +73,7 @@
 	$(MAKE) -C $(WINPREFS_PLUGIN) -f $(MINGW_MAKEFILE) install
 	cp *.dll $(PIDGIN_INSTALL_PLUGINS_DIR)
 
-.c.dll:
+%.dll: %.c $(PURPLE_CONFIG_H) $(PURPLE_VERSION_H)
 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDE_PATHS) -o $@.o -c $<
 	$(CC) -shared $@.o $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $@
 
--- a/po/ChangeLog	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ChangeLog	Sat Jul 31 23:42:35 2010 +0000
@@ -1,5 +1,16 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.7.3
+	* Bengali translation updated (Jamil Ahmed)
+	* Chinese (Simplified) translation updated (Aron Xu)
+	* Dutch translation updated (Gideon van Melle)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Russian translation updated (Антон Самохвалов)
+	* Spanish translation updated (Javier Fernández-Sanguino Peña)
+
+version 2.7.2
+	* No changes
+
 version 2.7.1
 	* Chinese (Hong Kong) translation updated (Ambrose C. Li, Paladin R.
 	  Liu)
--- a/po/af.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/af.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: 2.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2010-05-11 00:19+0200\n"
 "Last-Translator: F Wolff <friedel@translate.org.za>\n"
 "Language-Team: translate-discuss-af@lists.sourceforge.net\n"
@@ -61,12 +61,24 @@
 msgid "Error"
 msgstr "Fout"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Rekening is nie bygevoeg nie"
+
 msgid "Account was not added"
 msgstr "Rekening is nie bygevoeg nie"
 
 msgid "Username of an account must be non-empty."
 msgstr "Gebruikeraam van rekening kan nie leeg wees nie."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Kennisgewings vir nuwe pos"
 
@@ -1259,6 +1271,9 @@
 msgid "Someone says your username in chat"
 msgstr "Iemand sê u gebruikernaam in 'n geselsie"
 
+msgid "Attention received"
+msgstr "Aandag gekry"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer-mislukking"
 
@@ -1553,7 +1568,7 @@
 msgid "Online"
 msgstr "Aanlyn"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Vanlyn"
 
@@ -1674,8 +1689,10 @@
 "Die sertifikaat word nie vertrou nie omdat geen sertifikaat wat dit kan "
 "verifieer tans vertrou word nie."
 
-msgid "The certificate is not valid yet."
-msgstr "Die sertifikaat is nog nie geldig nie."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Die sertifikaat het verval en moet nié as geldig beskou word nie."
@@ -3826,6 +3843,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Bediener vereis skoonteksstawing oor 'n ongeënkripteerde stroom"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vereis skoonteksstawing oor 'n ongeënkripteerde koppeling.  Laat dit toe "
+"en gaan voort met stawing?"
+
 msgid "SASL authentication failed"
 msgstr "SASL-stawing het misluk"
 
@@ -5914,7 +5943,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "U profielinligting is nog nie bekom nie. Probeer gerus later weer."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5926,6 +5955,7 @@
 msgstr "Verifieer PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Vertoonnaam"
 
@@ -5985,19 +6015,16 @@
 msgid "Connecting..."
 msgstr "Koppel tans..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Die bynaam wat gegee is, is ongeldig."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Die naam wat gegee is, is ongeldig."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Die PIN wat gegee is, het 'n ongeldige lengte [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit-aanmeldnaam"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Bynaam"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6025,10 +6052,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Ongeldige land is gekies. Probeer gerus weer."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Gebruikernaam is nie geregistreer nie. Registreer asb. eers."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Gebruikernaam is reeds geregistreer. Kies asb. 'n ander gebruikernaam."
 
 msgid "Internal error. Please try again later."
@@ -6074,8 +6103,9 @@
 msgid "Hidden Number"
 msgstr "Versteekte nommer"
 
-msgid "Your Mobile Number..."
-msgstr "U selfoonnommer..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo-ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6101,6 +6131,15 @@
 msgid "_Room Name:"
 msgstr "_Kamer:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Daar is pos!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Aanlyn"
+
 #. 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 "Verbinding met MXit is verloor. Herkoppel asseblief."
@@ -7863,11 +7902,11 @@
 msgid "Invalid SNAC"
 msgstr "Ongeldige SNAC"
 
-msgid "Rate to host"
-msgstr "Koers na gasheer"
-
-msgid "Rate to client"
-msgstr "Koers na kliënt"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Diens nie beskikbaar nie"
@@ -10165,7 +10204,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoreer konferensie- en geselsiekamer-uitnodigings"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Gebruik rekening se instaanbediener vir SSL-koppelings"
 
 msgid "Chat room list URL"
@@ -13020,11 +13060,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Sluit af omdat 'n ander libpurple-kliënt reeds loop.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "_Media"
 
-msgid "/Media/_Hangup"
-msgstr "Sit _neer"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Sit neer"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13833,9 +13875,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Bestuurder van eie gesiggies"
 
-msgid "Attention received"
-msgstr "Aandag gekry"
-
 msgid "Select Buddy Icon"
 msgstr "Kies vriendikoon"
 
@@ -15318,6 +15357,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "U het nie toestemming om hierdie toepassing te verwyder nie."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Die sertifikaat is nog nie geldig nie."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Die bynaam wat gegee is, is ongeldig."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit-aanmeldnaam"
+
+#~ msgid "Nick Name"
+#~ msgstr "Bynaam"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "U selfoonnommer..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Koers na gasheer"
+
+#~ msgid "Rate to client"
+#~ msgstr "Koers na kliënt"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "Sit _neer"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Onbekende rede."
 
--- a/po/am.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/am.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 0.60 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2003-04-08 09:23:11+EDT\n"
 "Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
 "Language-Team: Amharic <locales@geez.org>\n"
@@ -50,12 +50,23 @@
 msgid "Error"
 msgstr "የIRC ስህተት"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr ""
 
@@ -1292,6 +1303,9 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1593,7 +1607,7 @@
 msgid "Online"
 msgstr "ኦንላይን"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 #, fuzzy
 msgid "Offline"
 msgstr "ኦንላይን"
@@ -1725,7 +1739,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3826,6 +3842,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "መድረክን አስወግድ"
@@ -6046,7 +6071,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6059,6 +6084,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "አሳይ"
@@ -6126,20 +6152,15 @@
 msgid "Connecting..."
 msgstr "ተገናኝቷል"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "ቅጽል ስም"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6170,10 +6191,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -6228,8 +6249,8 @@
 msgstr "የሞቢል ስልክ፦"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "የሞቢል ስልክ፦"
+msgid "Your MXit ID..."
+msgstr "ምረጡ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6255,6 +6276,14 @@
 msgid "_Room Name:"
 msgstr "ቤት፦"
 
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8001,10 +8030,10 @@
 msgid "Invalid SNAC"
 msgstr ""
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10364,7 +10393,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
@@ -13347,10 +13376,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14221,9 +14250,6 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 #, fuzzy
 msgid "Select Buddy Icon"
 msgstr "የፊደል ቅርጽ ምረጡ"
@@ -15740,6 +15766,14 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "ቅጽል ስም"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "የሞቢል ስልክ፦"
+
+#, fuzzy
 #~ msgid "Unknown reason."
 #~ msgstr "ያልታወቀ ስህተት"
 
--- a/po/ar.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ar.po	Sat Jul 31 23:42:35 2010 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: ar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2008-11-01 17:41+0200\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -67,12 +67,24 @@
 msgid "Error"
 msgstr "عُطل"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "لم يُضَف الحساب"
+
 msgid "Account was not added"
 msgstr "لم يُضَف الحساب"
 
 msgid "Username of an account must be non-empty."
 msgstr "اسم مستخدم الحساب يجب ألا يكون خاليا."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "تنبيهات بريديّة جديدة"
 
@@ -1249,6 +1261,10 @@
 msgid "Someone says your username in chat"
 msgstr "أحدهم يذكر اسمك في دردشة"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "تتطلب التسجيل"
+
 msgid "GStreamer Failure"
 msgstr "فشل GStreamer"
 
@@ -1535,7 +1551,7 @@
 msgid "Online"
 msgstr "متصل"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "غير متصل"
 
@@ -1654,9 +1670,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "سلسلة الشهادة المقدّمة ل‍ %s غير صحيحة."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3833,6 +3850,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "يتطلب الخادوم التوثيق بالنص الصريح عبر قناة غير معمّاة"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"يتطلب %s الاستيثاق بالنص الصريح عبر اتصال غير معمّى. أأسمح بهذا وأكمل "
+"الاستيثاق؟ "
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "فشل الاستيثاق"
 
@@ -6039,7 +6068,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6052,6 +6081,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "اسم العائلة"
@@ -6121,7 +6151,7 @@
 msgstr "يتّصل"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "مفتاح SecurID المدخل غير صالح."
 
 #, fuzzy
@@ -6129,13 +6159,8 @@
 msgstr "مفتاح SecurID المدخل غير صالح."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "الاسم المستعار"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6165,10 +6190,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6225,8 +6250,8 @@
 msgstr "الاسم الأوسط"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "أدخل رقم الهاتف المحمول..."
+msgid "Your MXit ID..."
+msgstr "هويّة ياهو..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6254,6 +6279,15 @@
 msgid "_Room Name:"
 msgstr "_غرفة:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "لديك بريد"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8066,11 +8100,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC غير صالح"
 
-msgid "Rate to host"
-msgstr "المنسوب إلى الخادوم"
-
-msgid "Rate to client"
-msgstr "المنسوب إلى العميل"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "الخدمة غير متاحة"
@@ -10403,7 +10437,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "تجاهل دعوات الاجتماعات و غرف الدردشة"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13340,10 +13374,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14195,10 +14229,6 @@
 msgstr "مدير الشّهادات"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "تتطلب التسجيل"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "اختر صديقا"
 
@@ -15716,6 +15746,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "لا تملك الصلاحيات لتثبيت هذا التطبيق."
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "سلسلة الشهادة المقدّمة ل‍ %s غير صحيحة."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "مفتاح SecurID المدخل غير صالح."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "الاسم المستعار"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "أدخل رقم الهاتف المحمول..."
+
+#~ msgid "Rate to host"
+#~ msgstr "المنسوب إلى الخادوم"
+
+#~ msgid "Rate to client"
+#~ msgstr "المنسوب إلى العميل"
+
 #~ msgid "Unknown reason."
 #~ msgstr "سبب مجهول"
 
--- a/po/as.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/as.po	Sat Jul 31 23:42:35 2010 +0000
@@ -9,10 +9,11 @@
 msgstr ""
 "Project-Id-Version: el 6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 20:54-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2010-04-16 12:58+0530\n"
 "Last-Translator: Amitakhya Phukan <aphukan@fedoraproject.org>\n"
 "Language-Team: American English <fedora-trans-as@redhat.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -62,12 +63,24 @@
 msgid "Error"
 msgstr "ত্ৰুটি"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "হিচাপ যোগ কৰা নহয়"
+
 msgid "Account was not added"
 msgstr "হিচাপ যোগ কৰা নহয়"
 
 msgid "Username of an account must be non-empty."
 msgstr "হিচাপৰ ক্ষেত্ৰত ব্যৱহাৰকৰ্তাৰ নাম ৰিক্ত ৰখা নচলিব ।"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "নতুন সম্বাদৰ বিজ্ঞপ্তি"
 
@@ -1243,6 +1256,11 @@
 msgid "Someone says your username in chat"
 msgstr "সম্বাদত আপোনাৰ নাম উল্লেখ কৰিলে"
 
+#
+#, fuzzy
+msgid "Attention received"
+msgstr "সক্ৰিয়কৰণ আৱশ্যক"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer ৰ বিফলতা"
 
@@ -1335,6 +1353,7 @@
 msgid "Saved Statuses"
 msgstr "সংৰক্ষিত অৱস্থা"
 
+#. title
 msgid "Title"
 msgstr "শিৰোনাম"
 
@@ -1532,7 +1551,7 @@
 msgid "Online"
 msgstr "অন লাইন"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "অফ লাইন"
 
@@ -1654,8 +1673,10 @@
 "চিহ্নিত প্ৰমাণপত্ৰ পৰীক্ষাকৰ্তাই এই প্ৰমাণপত্ৰ বিশ্বস্ত নকৰাৰ ফলত এই প্ৰমাণপত্ৰ বিশ্বাস "
 "কৰা সম্ভৱ নহয় ।"
 
-msgid "The certificate is not valid yet."
-msgstr "প্ৰমাণপত্ৰ বৰ্তমানে বৈধ নহয় ।"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "প্ৰমাণপত্ৰৰ সময় পূৰ্ণ হৈছে আৰু বৰ্তমানে বৈধ নহয় ।"
@@ -1914,7 +1935,6 @@
 msgstr "থ্ৰেড নিৰ্মাণ কৰিবলৈ ব্যৰ্থ: %s"
 
 #
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "অজ্ঞাত কাৰণ"
 
@@ -3427,6 +3447,9 @@
 
 #
 #. 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 "নাম"
 
@@ -3941,8 +3964,8 @@
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;nick1&gt; [nick2] ...:  ব্যবহাৰকৰ্তাৰ voice অধিকাৰ বাতিল কৰা হয় "
-"।ইয়াৰ ফলত, চেনেল মডাৰেটেড (+m) অৱস্থায় থাকিলে, সংশ্লিষ্ট ব্যবহাৰকৰ্তাক এই চেনেলত "
+"devoice &lt;nick1&gt; [nick2] ...:  ব্যবহাৰকৰ্তাৰ voice অধিকাৰ বাতিল কৰা হয় ।"
+"ইয়াৰ ফলত, চেনেল মডাৰেটেড (+m) অৱস্থায় থাকিলে, সংশ্লিষ্ট ব্যবহাৰকৰ্তাক এই চেনেলত "
 "কথা পাতিবলৈ প্ৰতিৰোধ কৰা হ'ব । এই কাৰ্য্যৰ বাবে চেনেল অপাৰেটৰ হোৱা আৱশ্যক।"
 
 #
@@ -4195,6 +4218,19 @@
 "সেৱক দ্বাৰা অনুমোদন সমাপ্ত কৰা ইঙ্গিত দিয়া হৈছে, কিন্তু ক্লায়েন্ট দ্বাৰা দিয়া নহয়"
 
 #
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "সেৱকেৰ ক্ষেত্ৰত এনক্ৰিপশনবিহীন স্ট্ৰিমৰ মাধ্যমে প্লেইন টেক্সট অনুমোদন প্ৰয়োজন"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ৰ ক্ষেত্ৰত এনক্ৰিপশন বিহীন সংযোগৰ মাধ্যমে প্লেইন টেক্সট অনুমোদন ব্যৱস্থা আৱশ্যক ।  "
+"এই কামৰ অনুমতি প্ৰদান কৰি অনুমোদন প্ৰক্ৰিয়া এগিয়ে নেওয়া হ'বনেকি ?"
+
+#
 msgid "SASL authentication failed"
 msgstr "SASL অনুমোদন ব্যৰ্থ"
 
@@ -4326,6 +4362,7 @@
 msgstr "পোস্টাল কোড"
 
 #
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "দেশ"
 
@@ -4344,8 +4381,6 @@
 msgstr "প্ৰাতিষ্ঠানিক বিভাগ"
 
 #
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "কামৰ শিৰোনাম"
 
@@ -4355,6 +4390,7 @@
 
 #
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "生日"
 
@@ -6509,6 +6545,11 @@
 msgstr "স্বনিৰ্ধাৰিত হাসিমুখেৰ সংকেত প্ৰদৰ্শন কৰা হ'ব"
 
 #
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "সংযোগ নিৰ্মাণ কৰিবলৈ ব্যৰ্থ"
+
+#
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: কোনো ব্যৱহাৰকৰ্তাৰ নজৰ কাঁড়াৰ বাবে তাকে খোঁচা মাৰুন"
 
@@ -6779,8 +6820,12 @@
 "পাৰ্শ্বৰূপ সংক্ৰান্ত তথ্য এখনো উদ্ধাৰ কৰা সম্ভৱ নহয় । অনুগ্ৰহ কৰি পিছত পুনঃ প্ৰচেষ্টা কৰক "
 "।"
 
+msgid "Your UID"
+msgstr ""
+
 #
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "PIN"
 
@@ -6790,6 +6835,7 @@
 
 #
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "নাম প্ৰদৰ্শন কৰা হ'ব"
 
@@ -6866,22 +6912,17 @@
 msgstr "সংযোগ কৰা হৈছে..."
 
 #
-msgid "The nick name you entered is invalid."
-msgstr "উল্লিখিত উপনাম বৈধ নহয় ।"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "উল্লিখিত নাম বৈধ নহয় ।"
 
 #
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "উল্লিখিত PIN ৰ দৈৰ্ঘ্য বৈধ নহয় [7 10] ।"
 
-#
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit প্ৰৱেশৰ নাম"
-
-#
-#. nick name
-msgid "Nick Name"
-msgstr "উপনাম"
+msgid "MXit ID"
+msgstr ""
 
 #
 #. show the form to the user to complete
@@ -6921,11 +6962,13 @@
 msgstr "নিৰ্বাচিত দেশৰ মান বৈধ নহয় । অনুগ্ৰহ কৰি পুনঃ প্ৰচেষ্টা কৰক ।"
 
 #
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "ব্যৱহাৰকৰ্তাৰ নাম নিবন্ধিত নহয় । অনুগ্ৰহ কৰি প্ৰথমে নিবন্ধন কৰক ।"
 
 #
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "ব্যৱহাৰকৰ্তাৰ নাম আগতেই নিবন্ধিত হৈছে । অনুগ্ৰহ কৰি এটা ভিন্ন নাম নিৰ্বাচন কৰক ।"
 
@@ -6942,7 +6985,7 @@
 msgstr "নিৰাপত্তামূলক কোড"
 
 #
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "নিৰাপত্তামূলক কোড লিখক"
 
@@ -6976,12 +7019,19 @@
 msgstr "অৱস্থাসূচক সম্বাদ"
 
 #
+#, fuzzy
+msgid "Rejection Message"
+msgstr "প্ৰাপ্ত সম্বাদ"
+
+#
+#. hidden number
 msgid "Hidden Number"
 msgstr "আড়াল কৰা সংখ্যা"
 
 #
-msgid "Your Mobile Number..."
-msgstr "আপোনাৰ মোবাইল ফোনৰ সংখ্যা..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #
 #. Configuration options
@@ -6997,6 +7047,29 @@
 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 "ৰুম: (_R)"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "আপোনাৰ বাবে ডাক!"
+
+#, fuzzy
+msgid "Last Online"
+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."
@@ -7911,6 +7984,76 @@
 msgid "Invalid chat room name"
 msgstr "সম্বাদ ৰুমৰ নাম বৈধ নয়"
 
+#
+msgid "Invalid error"
+msgstr "অবৈধ ত্ৰুটি"
+
+#
+msgid "Cannot receive IM due to parental controls"
+msgstr "অভিভাবকৰ দ্বাৰা ধাৰ্য সীমাৰেখাৰ কাৰণে IM প্ৰাপ্ত কৰা সম্ভৱ নয়"
+
+#
+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পঠিওৱা সম্ভৱ নয়y"
+
+#
+#. Undocumented
+msgid "Cannot send SMS to unknown country"
+msgstr "অজ্ঞাত দেশে SMS পঠিওৱা সম্ভৱ নয়"
+
+#
+msgid "Bot accounts cannot initiate IMs"
+msgstr "বট (bot) হিচাপ দ্বাৰা IM আৰম্ভ কৰা সম্ভৱ নয়"
+
+#
+msgid "Bot account cannot IM this user"
+msgstr "বট (bot) হিচাপ দ্বাৰা এই ব্যৱহাৰকৰ্তাৰ উদ্দেশ্যে IM কৰা সম্ভৱ নয়"
+
+#
+msgid "Bot account reached IM limit"
+msgstr "বট (bot) হিচাপৰ বাবে ধাৰ্য IM ৰ সীমা ছোঁয়া হৈছে"
+
+#
+msgid "Bot account reached daily IM limit"
+msgstr "বট (bot) হিচাপৰ বাবে ধাৰ্য দৈনিক IM ৰ সীমা ছোঁয়া হৈছে"
+
+#
+msgid "Bot account reached monthly IM limit"
+msgstr "বট (bot) হিচাপৰ বাবে ধাৰ্য মাসিক IM ৰ সীমা ছোঁয়া হৈছে"
+
+#
+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 ""
 
@@ -8104,152 +8247,6 @@
 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 "অভিভাবকৰ দ্বাৰা ধাৰ্য সীমাৰেখাৰ কাৰণে IM প্ৰাপ্ত কৰা সম্ভৱ নয়"
-
-#
-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পঠিওৱা সম্ভৱ নয়y"
-
-#
-#. Undocumented
-msgid "Cannot send SMS to unknown country"
-msgstr "অজ্ঞাত দেশে SMS পঠিওৱা সম্ভৱ নয়"
-
-#
-msgid "Bot accounts cannot initiate IMs"
-msgstr "বট (bot) হিচাপ দ্বাৰা IM আৰম্ভ কৰা সম্ভৱ নয়"
-
-#
-msgid "Bot account cannot IM this user"
-msgstr "বট (bot) হিচাপ দ্বাৰা এই ব্যৱহাৰকৰ্তাৰ উদ্দেশ্যে IM কৰা সম্ভৱ নয়"
-
-#
-msgid "Bot account reached IM limit"
-msgstr "বট (bot) হিচাপৰ বাবে ধাৰ্য IM ৰ সীমা ছোঁয়া হৈছে"
-
-#
-msgid "Bot account reached daily IM limit"
-msgstr "বট (bot) হিচাপৰ বাবে ধাৰ্য দৈনিক IM ৰ সীমা ছোঁয়া হৈছে"
-
-#
-msgid "Bot account reached monthly IM limit"
-msgstr "বট (bot) হিচাপৰ বাবে ধাৰ্য মাসিক IM ৰ সীমা ছোঁয়া হৈছে"
-
-#
-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 "
@@ -8675,30 +8672,10 @@
 "%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 "অনলাইন অৱস্থাৰ সময়"
 
@@ -9195,6 +9172,96 @@
 "দিয়াৰ সম্ভাবনা আছে ।"
 
 #
+msgid "Invalid SNAC"
+msgstr "অবৈধ SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 "কুম্ভ"
 
@@ -11872,7 +11939,8 @@
 msgstr "কনফাৰেন্স আৰু সম্বাদ ৰুমৰ আমন্ত্ৰণ উপেক্ষা কৰা হ'ব"
 
 #
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL সংযোগৰ বাবে প্ৰক্সি হিচাপ ব্যৱহাৰ কৰা হ'ব"
 
 #
@@ -14598,8 +14666,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 এটা গ্ৰাফিক্যাল মডিউলাৰ মেসেজিং ক্লায়েন্ট । এটি libpurple ৰ ওপৰত ভিত্তি কৰি "
 "নিৰ্মিত আৰু AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
@@ -15280,14 +15348,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 "%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 এ আৰম্ভ কৰা প্ৰণালী লগ কি আপুনি নিশ্চিতৰূপে বৰ্জন কৰিবলৈ ইচ্ছুক?"
 
 #
@@ -15408,12 +15476,13 @@
 "এটা ভিন্ন libpurple ক্লায়েন্ট বৰ্তমানে চলিছে । এই কাৰণে প্ৰস্থান কৰা হৈছে ।\n"
 
 #
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/মিডিয়া (_M)"
 
-#
-msgid "/Media/_Hangup"
-msgstr "/মিডিয়া/কল সমাপ্ত কৰক (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "কল সমাপ্ত কৰক"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -16435,11 +16504,6 @@
 msgstr "স্বনিৰ্ধাৰিত হাসিমুখ পৰিচালন ব্যৱস্থা"
 
 #
-#, fuzzy
-msgid "Attention received"
-msgstr "সক্ৰিয়কৰণ আৱশ্যক"
-
-#
 msgid "Select Buddy Icon"
 msgstr "বন্ধুৰ আইকন নিৰ্বাচন কৰক"
 
@@ -18101,11 +18165,13 @@
 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 ""
 
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
@@ -18114,53 +18180,69 @@
 "again."
 msgstr ""
 
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
 msgstr ""
 
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
 msgstr ""
 
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr ""
 
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
 msgstr ""
 
 #
+#. Installer Subsection Text
 #, fuzzy
 msgid "Desktop"
 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 ""
 
+#. $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 ""
 
+#. $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 ""
+
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
 msgstr ""
 
 #
+#. Installer Subsection Text
 #, fuzzy
 msgid "Localizations"
 msgstr "স্থান"
 
-#. License Page
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
 msgstr ""
 
 #
-#. Components Page
+#. Installer Subsection Text
 #, fuzzy
 msgid "Pidgin Instant Messaging Client (required)"
 msgstr "Pidgin ইন্টাৰনেট মেসেঞ্জাৰ"
 
-#. 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+ "
@@ -18168,22 +18250,26 @@
 msgstr ""
 
 #
+#. Installer Subsection Text
 #, fuzzy
 msgid "Shortcuts"
 msgstr "চৰ্টকাট"
 
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
 msgstr ""
 
-#. Spellcheck Section Prompts
+#. Installer Subsection Text
 msgid "Spellchecking Support"
 msgstr ""
 
 #
+#. Installer Subsection Text
 #, fuzzy
 msgid "Start Menu"
 msgstr "Startup"
 
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
@@ -18192,33 +18278,63 @@
 msgid "The installer is already running."
 msgstr "\"%s\" উপনাম বৰ্তমানে ব্যৱহৃত হৈছে ।"
 
-#. Uninstall Section Prompts
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
 
 #
-#. URL Handler section
+#. Installer Subsection Text
 #, fuzzy
 msgid "URI Handlers"
 msgstr "myim URL হ্যান্ডলাৰ"
 
-#. 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."
 msgstr ""
 
-#. Installer Finish Page
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
 msgstr ""
 
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
-msgid "spellcheck_faq"
-msgstr ""
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "প্ৰমাণপত্ৰ বৰ্তমানে বৈধ নহয় ।"
+
+#
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "উল্লিখিত উপনাম বৈধ নহয় ।"
+
+#
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit প্ৰৱেশৰ নাম"
+
+#
+#~ msgid "Nick Name"
+#~ msgstr "উপনাম"
+
+#
+#~ msgid "Your Mobile Number..."
+#~ msgstr "আপোনাৰ মোবাইল ফোনৰ সংখ্যা..."
+
+#
+#~ msgid "Rate to host"
+#~ msgstr "গৃহস্থ অবধি হাৰ"
+
+#
+#~ msgid "Rate to client"
+#~ msgstr "ক্লায়েন্ট অবধি হাৰ"
+
+#
+#~ msgid "Unknown reason."
+#~ msgstr "অজ্ঞাত কাৰণ ।"
+
+#
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/মিডিয়া/কল সমাপ্ত কৰক (_H)"
 
 #
 #~ msgid "Error creating conference."
--- a/po/az.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/az.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2004-06-28 14:03+0300\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -51,12 +51,23 @@
 msgid "Error"
 msgstr "Xəta"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Yeni məktub bildirişləri"
 
@@ -1298,6 +1309,9 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1603,7 +1617,7 @@
 msgid "Online"
 msgstr "Xətdə"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1728,7 +1742,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3837,6 +3853,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Bağlantı bacarılmadı"
@@ -5998,7 +6023,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6010,6 +6035,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Göstər"
@@ -6076,20 +6102,15 @@
 msgid "Connecting..."
 msgstr "_Yenidən bağlan"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "_İstifadəçi Adı:"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6118,10 +6139,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -6175,8 +6196,8 @@
 msgstr "Orta Ad"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Telefon"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID-si"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6203,6 +6224,14 @@
 msgid "_Room Name:"
 msgstr "Orta Ad"
 
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Xətdə"
+
 #. 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 ""
@@ -7925,10 +7954,10 @@
 msgid "Invalid SNAC"
 msgstr ""
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10246,7 +10275,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
@@ -13219,10 +13248,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14107,9 +14136,6 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 #, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Əlaqəni Seç"
@@ -15656,6 +15682,14 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "_İstifadəçi Adı:"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Telefon"
+
+#, fuzzy
 #~ msgid "Unknown reason."
 #~ msgstr "Naməlum xəta"
 
--- a/po/be@latin.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/be@latin.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pidgin 2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2008-03-29 21:08+0200\n"
 "Last-Translator: YOUR NAME <E-MAIL@ADDRESS>\n"
 "Language-Team: Belarusian Latin <be-latin.open-tran.eu>\n"
@@ -62,12 +62,24 @@
 msgid "Error"
 msgstr "Pamyłka"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Kont nie dadadzieny"
+
 msgid "Account was not added"
 msgstr "Kont nie dadadzieny"
 
 msgid "Username of an account must be non-empty."
 msgstr "Nazva karystalnika kontu musić być niepustoj."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Novyja paštovyja nahadvańni"
 
@@ -1262,6 +1274,10 @@
 msgid "Someone says your username in chat"
 msgstr "Chtości pramaŭlaje tvajo imia ŭ hutarcy"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Vymahaje rehistracyi"
+
 msgid "GStreamer Failure"
 msgstr "Pamyłka GStreamera"
 
@@ -1552,7 +1568,7 @@
 msgid "Online"
 msgstr "Spałučany"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Adłučany"
 
@@ -1673,9 +1689,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Łancuh sertyfikatu, padadzienaha dla %s, niapravilny."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3851,6 +3868,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server vymahaje aŭtaryzacyju prostym tekstam praz niešyfravany kanał"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vymahaje aŭtaryzacyju prostym tekstam praz niešyfravany kanał. Dazvolić "
+"heta j praciahvać aŭtaryzacyju?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Pamyłka aŭtaryzacyi"
 
@@ -6060,7 +6089,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6073,6 +6102,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Proźvišča"
@@ -6146,7 +6176,7 @@
 msgstr "Spałučeńnie"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Akreśleny kluč SecurID niapravilny."
 
 #, fuzzy
@@ -6154,13 +6184,8 @@
 msgstr "Akreśleny kluč SecurID niapravilny."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Mianuška"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6190,10 +6215,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6250,8 +6275,8 @@
 msgstr "Siaredniaje imia"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Akreśl mabilny telefonny numar..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6279,6 +6304,15 @@
 msgid "_Room Name:"
 msgstr "_Pakoj:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Novaja pošta!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Spałučany"
+
 #. 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 ""
@@ -8112,11 +8146,11 @@
 msgid "Invalid SNAC"
 msgstr "Niapravilny SNAC"
 
-msgid "Rate to host"
-msgstr "Chutkaść hostu"
-
-msgid "Rate to client"
-msgstr "Chutkaść klijenta"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Servis niedastupny"
@@ -10473,7 +10507,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ihnaruj zaprašeńni na kanferencyi i ŭ pakoi hutarak"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13430,10 +13464,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14291,10 +14325,6 @@
 msgstr "Kiraŭnik sertyfikataŭ"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Vymahaje rehistracyi"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Abiary siabra"
 
@@ -15837,6 +15867,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Łancuh sertyfikatu, padadzienaha dla %s, niapravilny."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Akreśleny kluč SecurID niapravilny."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Mianuška"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Akreśl mabilny telefonny numar..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Chutkaść hostu"
+
+#~ msgid "Rate to client"
+#~ msgstr "Chutkaść klijenta"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Nieviadomaja pryčyna."
 
--- a/po/bg.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/bg.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin-1.30\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2007-02-12 00:46+0200\n"
 "Last-Translator: Vladimir \"Kaladan\" Petkov <kaladan@gmail.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -51,12 +51,24 @@
 msgstr "Грешка"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Акаунтът е деактивиран"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Акаунтът е деактивиран"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Известяване за нова е-поща"
 
@@ -1320,6 +1332,10 @@
 msgid "Someone says your username in chat"
 msgstr "Някой споменава името ви в чат"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Изисква се регистрация"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1628,7 +1644,7 @@
 msgid "Online"
 msgstr "Включен"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Изключен"
 
@@ -1750,9 +1766,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Новото форматиране е неправилно."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3862,6 +3879,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Сървърът изисква парола в чист текст през некодирана връзка"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Този сървър изисква парола в чист текст през некриптирана връзка. Да се "
+"разреши ли това и да се продължи с влизането?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Неуспешна идентификация"
 
@@ -6075,7 +6104,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6088,6 +6117,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Фамилия"
@@ -6159,7 +6189,7 @@
 msgstr "Свързване"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Новото форматиране е неправилно."
 
 #, fuzzy
@@ -6167,13 +6197,8 @@
 msgstr "Новото форматиране е неправилно."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Псевдоним"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6203,10 +6228,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -6262,8 +6287,8 @@
 msgstr "Второ име"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Задаване номер на мобилен телефон..."
+msgid "Your MXit ID..."
+msgstr "Име в Yahoo!"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6291,6 +6316,15 @@
 msgid "_Room Name:"
 msgstr "_Стая:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "%s ви изрита: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8109,10 +8143,10 @@
 msgid "Invalid SNAC"
 msgstr ""
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10468,7 +10502,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
@@ -13485,10 +13519,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14367,10 +14401,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Изисква се регистрация"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Избор на приятел"
 
@@ -15934,6 +15964,22 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Нямате права да деинсталирате тази програма."
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Новото форматиране е неправилно."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Новото форматиране е неправилно."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Псевдоним"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Задаване номер на мобилен телефон..."
+
 #~ msgid "Unknown reason."
 #~ msgstr "Причината е неизвестна."
 
--- a/po/bn.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/bn.po	Sat Jul 31 23:42:35 2010 +0000
@@ -13,15 +13,19 @@
 msgstr ""
 "Project-Id-Version: bn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
-"PO-Revision-Date: 2010-05-02 02:20+0600\n"
-"Last-Translator: Israt Jahan <israt@ankur.org.bd>\n"
+"POT-Creation-Date: 2010-07-27 02:34-0400\n"
+"PO-Revision-Date: 2010-07-25 13:37+0600\n"
+"Last-Translator: israt <israt@ankur.org.bd>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
 "Language: bn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Poedit-Language: Bengali\n"
+"X-Poedit-Country: BANGLADESH\n"
+"X-Poedit-SourceCharset: utf-8\n"
+"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,213,212,-1\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -68,6 +72,9 @@
 msgid "Error"
 msgstr "ত্রুটি"
 
+msgid "Account was not modified"
+msgstr "অ্যাকাউন্ট পরিবর্তন করা হয়নি"
+
 msgid "Account was not added"
 msgstr "অ্যাকাউন্ট যোগ করা হয়নি"
 
@@ -75,6 +82,15 @@
 msgid "Username of an account must be non-empty."
 msgstr "অ্যাকাউন্টের ব্যবহারকারীর নাম ফাঁকা রাখা যাবে না।"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "সার্ভারে সংযুক্ত থাকা অবস্থায় অ্যাকাউন্টের প্রোটোকল পরিবর্তন করা যায় না।"
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"সার্ভারে সংযুক্ত থাকা অবস্থায় অ্যাকাউন্টের ব্যবহারকারী নাম পরিবর্তন করা যায় না।"
+
 msgid "New mail notifications"
 msgstr "নতুন মেইলের ঘোষনা"
 
@@ -305,6 +321,7 @@
 msgstr "ডাকনাম নির্ধারণ"
 
 # tithi
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Enter empty string to reset the name."
 msgstr "নামটি পুনঃনির্ধারণ করতে ফাঁকা স্ট্রিং দিন।"
 
@@ -982,7 +999,7 @@
 msgstr "আমন্ত্রণ জানান"
 
 msgid "(none)"
-msgstr "(কোনটি না)"
+msgstr "(কোনোটি নয়)"
 
 #. XXX: The following expects that finch_notify_message gets called. This
 #. * may not always happen, e.g. when another plugin sets its own
@@ -1249,7 +1266,7 @@
 msgstr "কথোপকথন"
 
 msgid "Logging"
-msgstr "কথোপকথন সংরক্ষন"
+msgstr "কথোপকথন সংরক্ষণ"
 
 msgid "You must fill all the required fields."
 msgstr "আপনাকে সব আবশ্যকীয় ক্ষেত্র পূরণ করতে হবে।"
@@ -1312,6 +1329,10 @@
 msgid "Someone says your username in chat"
 msgstr "কেউ আড্ডায় আপনার নাম উল্লেখ করে"
 
+# snigdha
+msgid "Attention received"
+msgstr "সতর্কতা গ্রহন"
+
 # tithi
 msgid "GStreamer Failure"
 msgstr "GStreamer ব্যর্থতা"
@@ -1394,8 +1415,9 @@
 msgid "Test"
 msgstr "পরীক্ষা"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset"
-msgstr "রিসেট"
+msgstr "পুনঃনির্ধারণ"
 
 msgid "Choose..."
 msgstr "বাছাই করুন..."
@@ -1570,7 +1592,7 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"টুল -> পছন্দসমূহ -> কথোপকথন সংরক্ষন থেকে কথোপকথন প্রদর্শন প্রক্রিয়া সক্রিয় করা যাবে।\n"
+"টুল -> পছন্দসমূহ -> কথোপকথন সংরক্ষণ থেকে কথোপকথন প্রদর্শন প্রক্রিয়া সক্রিয় করা যাবে।\n"
 "\n"
 "তাৎক্ষণিক বার্তা বা আড্ডার রেকর্ড শুরু করা হলে আড্ডা ইতিহাস সক্রিয় করা হবে।"
 
@@ -1626,7 +1648,7 @@
 msgid "Online"
 msgstr "অনলাইন"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "অফলাইন "
 
@@ -1753,9 +1775,12 @@
 "সার্টিফিকেটটি বিশ্বাসযোগ্য নয় কারণ যাচাই করার মত কোন বিশ্বাসযোগ্য সার্টিফিকেট "
 "বর্তমানে নেই।"
 
-# Translated by sadia
-msgid "The certificate is not valid yet."
-msgstr "সার্টিফিকেটটি এখনও কার্যকর করা হয়নি।"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"সার্টিফিকেটটি এখনও কার্যকর নয়। আপনার কম্পিউটারের সময় এবং তারিখ ঠিক আছে কিনা "
+"পরীক্ষা করুন।"
 
 # Translated by sadia
 msgid "The certificate has expired and should not be considered valid."
@@ -4028,6 +4053,17 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "প্রমাণীকরণ সম্পন্ন হয়েছে বলে সার্ভার মনে করছে, কিন্তু ক্লায়েন্ট মনে করছে না"
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "একটি এনক্রিপশনবিহীন স্ট্রীমে সার্ভারের সরল টেক্সট প্রমাণীকরণ প্রয়োজন হতে পারে"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"একটি এনক্রিপশনবিহীন সংযোগে %s এর সরলটেক্সট প্রমাণীকরণ প্রয়োজন হতে পারে। এটি "
+"অনুমোদন করে প্রমাণীকরণ অব্যাহত রাখতে চান?"
+
 # tithi
 msgid "SASL authentication failed"
 msgstr "SASL প্রমাণীকরণ ব্যর্থ"
@@ -4404,7 +4440,7 @@
 
 # snigdha
 msgid "Invalid XMPP ID. Username portion must be set."
-msgstr "অকার্যকর XMPP ID। অবশ্যই ব্যবহারকারীর নাম নির্ধারণ করতে হবে।"
+msgstr "অকার্যকর XMPP ID। ব্যবহারকারীর নামের অংশটি অবশ্যই নির্ধারণ করে দিতে হবে।"
 
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "অকার্যকর XMPP ID। অবশ্যই ডোমেইন নির্ধারণ করতে হবে।"
@@ -4528,10 +4564,10 @@
 
 # tithi
 msgid "None (To pending)"
-msgstr "কোনটি নয় (প্রাপক অমীমাংসিত)"
+msgstr "কোনোটি নয় (প্রাপক অমীমাংসিত)"
 
 msgid "None"
-msgstr "কোনটি নয়"
+msgstr "কোনোটি নয়"
 
 #. subscription type
 msgid "Subscription"
@@ -4541,7 +4577,7 @@
 msgstr "মনমেজাজের টেক্সট"
 
 msgid "Allow Buzz"
-msgstr "বাজ! অনুমোদন করা হবে"
+msgstr "দৃষ্টি আকর্ষন অনুমোদন করা হবে"
 
 # snigdha
 msgid "Mood Name"
@@ -4812,33 +4848,34 @@
 
 #, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "বাজ! করতে ব্যর্থ, কারণ %s  সম্পর্কে কোনো কিছু জানা নেই।"
+msgstr "দৃষ্টি আকর্ষন করতে ব্যর্থ, কারণ %s  সম্পর্কে কোনো কিছু জানা নেই।"
 
 # tithi
 #, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "বাজ! করতে ব্যর্থ, কারণ %s সম্ভবত অফলাইন।"
+msgstr "দৃষ্টি আকর্ষন করতে ব্যর্থ, কারণ %s সম্ভবত অফলাইন।"
 
 # tithi
 #, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "বাজ! করতে ব্যর্থ, কারণ %s এটি সমর্থন করেন না বা এখন তা গ্রহন করতে ইচ্ছুক নন।"
+msgstr ""
+"দৃষ্টি আকর্ষন করতে ব্যর্থ, কারণ %s এটি সমর্থন করেন না বা এখন তা গ্রহন করতে ইচ্ছুক নন।"
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr "বাজ!"
+msgstr "দৃষ্টি আকর্ষন"
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr "%s আপনাকে বাজ দিয়েছেন!"
+msgstr "%s আপনার দৃষ্টি আকর্ষন করেছেন!"
 
 # tithi
 #, c-format
 msgid "Buzzing %s..."
-msgstr "%s কে বাজ! দেয়া হচ্ছে..."
+msgstr "দৃষ্টি আকর্ষন করা হচ্ছে %s..."
 
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4871,7 +4908,7 @@
 msgid "Initiate Media"
 msgstr "মিডিয়া শুরু করুন"
 
-# snigdha
+# snigdhaসেট এর জায়গায় নির্ধারণ
 msgid "Account does not support PEP, can't set mood"
 msgstr "অ্যাকাউন্টটি PEP সমর্থন করেনা, মুড নির্ধারন করতে পারছেনা"
 
@@ -4937,9 +4974,9 @@
 
 # tithi
 msgid "buzz: Buzz a user to get their attention"
-msgstr "বাজ: ব্যবহারকারীর মনযোগ পেতে বাজ! ব্যবহার করুন"
-
-# snigdha
+msgstr "দৃষ্টি আকর্ষন: ব্যবহারকারীর মনোযোগ পেতে \"দৃষ্টি আকর্ষন\" ব্যবহার করুন"
+
+# snigdha সেট এর জায়গায় নির্ধারণ
 msgid "mood: Set current user mood"
 msgstr "মুড: বর্তমান ব্যবহারকারীর মুড নির্ধারণ করুন"
 
@@ -5301,7 +5338,7 @@
 msgid "Indignant"
 msgstr "রাগান্বিত"
 
-# সনিগডহা
+# snigdha
 msgid "Interested"
 msgstr "আগ্রহী"
 
@@ -6054,7 +6091,7 @@
 msgstr "সর্বশেষ হালনাগাদ করা"
 
 msgid "Homepage"
-msgstr "হোমপেইজ"
+msgstr "প্রধান পাতা"
 
 msgid "The user has not created a public profile."
 msgstr "ব্যবহারকারী কোনো পাবলিক প্রোফাইল তৈরী করেনি।"
@@ -6100,9 +6137,9 @@
 msgid "Show custom smileys"
 msgstr "স্বনির্বাচিত স্মাইলি দেখানো হবে"
 
-#, fuzzy
+# snighda
 msgid "Allow direct connections"
-msgstr "সংযোগ তৈরী করতে ব্যর্থ"
+msgstr "সরাসরি সংযোগ অনুমোদন করুন"
 
 # fix -me tithi
 msgid "nudge: nudge a user to get their attention"
@@ -6361,8 +6398,9 @@
 msgstr ""
 "আপনার প্রোফাইলের তথ্য এখনও খুঁজে পাওয়া যায়নি। অনুগ্রহ করে কিছুক্ষণ পর আবার চেষ্টা করুন।"
 
-msgid "Your MXitId"
-msgstr ""
+# snigdha
+msgid "Your UID"
+msgstr "আপনার UID"
 
 # Translated by sadia
 #. pin
@@ -6376,6 +6414,7 @@
 
 # Translated by sadia
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "নাম প্রদর্শন করা হবে"
 
@@ -6453,10 +6492,9 @@
 # tithi
 #
 #
-#
-# Translated by sadia
-msgid "The nick name you entered is invalid."
-msgstr "আপনি যে ডাকনামটি প্রবেশ করিয়েছেন তা অকার্যকর।"
+# Translated by sadia
+msgid "The Display Name you entered is invalid."
+msgstr "আপনি যে নাম প্রবেশ করেছেন তা অকার্যকর।"
 
 # tithi
 #
@@ -6467,15 +6505,9 @@
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "আপনি যে PIN প্রবেশ করিয়েছেন তার দৈর্ঘ্য অকার্যকর [৭-১০]।"
 
-# Translated by sadia
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit-এ লগ ইন করার নাম"
-
-# Translated by sadia
-#. nick name (required)
-msgid "Nick Name"
-msgstr "ডাকনাম "
+msgid "MXit ID"
+msgstr "MXit ID"
 
 # Translated by sadia
 #. show the form to the user to complete
@@ -6512,14 +6544,14 @@
 msgstr "অকার্যকর দেশ নির্বাচন করা হয়েছে। অনুগ্রহ করে আবার চেষ্টা করুন।"
 
 # Translated by sadia
-msgid "Username is not registered. Please register first."
-msgstr "ব্যবহারকারীর নাম নিবন্ধন করা নেই। অনুগ্রহ করে প্রথমে নিবন্ধন করুন।"
-
-# Translated by sadia
-msgid "Username is already registered. Please choose another username."
-msgstr ""
-"ব্যবহারকারীর নাম ইতিমধ্যেই নিবন্ধন করা হয়েছে। অনুগ্রহ করে অন্য ব্যবহারকারী নাম "
-"নির্বাচন করুন।"
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr "আপনি যে MXit ID দিয়েছেন তা নিবন্ধন করা নেই। অনুগ্রহ করে প্রথমে নিবন্ধন করুন।"
+
+# Translated by sadia
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr ""
+"আপনার দেয়া MXit ID ইতিমধ্যেই নিবন্ধন করা হয়েছে। অনুগ্রহ করে অন্য একটি নাম নির্বাচন "
+"করুন।"
 
 # tithi
 #
@@ -6575,18 +6607,18 @@
 msgid "Status Message"
 msgstr "স্ট্যাটাস বার্তা"
 
-#, fuzzy
+# snigdha
 msgid "Rejection Message"
-msgstr "গৃহীত বার্তা"
+msgstr "প্রত্যাখ্যান বার্তা"
 
 # Translated by sadia
 #. hidden number
 msgid "Hidden Number"
 msgstr "লুকানো সংখ্যা"
 
-# Translated by sadia
-msgid "Your Mobile Number..."
-msgstr "আপনার মোবাইল নাম্বার..."
+# snigdha
+msgid "Your MXit ID..."
+msgstr "আপনার MXit ID..."
 
 # Translated by sadia
 #. Configuration options
@@ -6605,17 +6637,21 @@
 # Kick =  তিরস্কার
 # OR  পদাঘাত
 #. you were kicked
-#, fuzzy
 msgid "You have been kicked from this MultiMX."
-msgstr "আপনাকে তিরস্কার করা হয়েছে: (%s)"
-
-#, fuzzy
+msgstr "MultiMX হতে আপনাকে তিরস্কার করা হয়েছে।"
+
 msgid "was kicked"
-msgstr "ত্রুটিযুক্ত টিকেট"
-
-#, fuzzy
+msgstr "তিরস্কার করা হয়েছে"
+
 msgid "_Room Name:"
-msgstr "আসর (_R):"
+msgstr "আসরের নাম (_R):"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "আপনাকে আমন্ত্রণ জানানো হয়েছে"
+
+msgid "Last Online"
+msgstr "শেষ যখন অনলাইনে"
 
 # Translated by sadia
 #. we must have lost the connection, so terminate it so that we can reconnect
@@ -7341,9 +7377,10 @@
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "%s কে ব্যক্তিগত তালিকা (%s) থেকে মুছে ফেলা সম্ভব হয়নি।"
 
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr "সার্ভার প্রান্তের গোপনতা সেটিং (%s) পরিবর্তন করা সম্ভব হয়নি।"
+msgstr "সার্ভার প্রান্তের গোপনীয়তা সেটিং (%s) পরিবর্তন করা সম্ভব হয়নি।"
 
 #, c-format
 msgid "Unable to create conference (%s)."
@@ -7610,15 +7647,15 @@
 
 # snigdha
 msgid "Meeting friends"
-msgstr " বন্ধুদের সাথে দেখা করছে"
+msgstr "বন্ধুদের সাথে দেখা করছে"
 
 # snigdha
 msgid "On the phone"
-msgstr "ফোনে কথা বলছি"
+msgstr "ফোনে কথা বলছে"
 
 # snigdha
 msgid "Surfing"
-msgstr "খোঁজ করছি"
+msgstr "খোঁজ করছে"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
@@ -8504,8 +8541,9 @@
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "ওয়েব সচেতন (এটি সক্রিয় করলে আপনি SPAM গ্রহণ করবেন!)"
 
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "ICQ Privacy Options"
-msgstr "ICQ গোপনতার অপশন"
+msgstr "ICQ গোপনীয়তার অপশন"
 
 msgid "The new formatting is invalid."
 msgstr "নতুন বিন্যাসটি অকার্যকর।"
@@ -8560,9 +8598,10 @@
 msgid "Configure IM Forwarding (web)"
 msgstr "IM ফরওয়ার্ডিং কনফিগারেশন (ওয়েব)"
 
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 #. ICQ actions
 msgid "Set Privacy Options..."
-msgstr "গোপনতার অপশন নির্ধারণ ..."
+msgstr "গোপনীয়তার অপশন নির্ধারণ ..."
 
 #. AIM actions
 msgid "Confirm Account"
@@ -8623,24 +8662,23 @@
 msgid "%s has just asked to directly connect to %s"
 msgstr "%1$s এইমাত্র %2$s এর সাথে সরাসরি সংযোগ করতে বলেছে"
 
+# Snigdha গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
 "এটির জন্য দুটি কম্পিউটারের মধ্যে সরাসরি সংযোগ প্রয়োজন যা কিনা IM এর ছবির জন্য "
-"আবশ্যক। যেহেতু আপনার IP ঠিকানা প্রকাশিত হবে, তাই এতে গোপনীয়তার ঝুঁকি থাকতে পারে।"
+"আবশ্যক। যেহেতু আপনার IP ঠিকানা প্রকাশিত হবে, তাই এতে গোপনীয়তায় ঝুঁকি থাকতে পারে।"
 
 msgid "Invalid SNAC"
 msgstr "অকার্যকর SNAC"
 
-# tithi
-msgid "Rate to host"
-msgstr "হোস্টে পাঠানোর হার"
-
-# tithi
-msgid "Rate to client"
-msgstr "ক্লায়েন্টে পাঠানোর হার"
+msgid "Server rate limit exceeded"
+msgstr "সার্ভার হারের সীমা পেরিয়ে গেছে"
+
+msgid "Client rate limit exceeded"
+msgstr "ক্লায়েন্ট হারের সীমা পেরিয়ে গেছে"
 
 msgid "Service unavailable"
 msgstr "সার্ভিস বিদ্যমান নয়"
@@ -10086,8 +10124,9 @@
 msgstr "ভৌগলিক-অবস্থান"
 
 # tithi
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset IM Key"
-msgstr "IM কী রিসেট করা হবে"
+msgstr "IM কী পুনঃনির্ধারণ করা হবে"
 
 # tithi
 msgid "IM with Key Exchange"
@@ -10237,8 +10276,9 @@
 msgstr "ব্যক্তিগত দল যোগ"
 
 # tithi
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Permanent"
-msgstr "স্থায়ীভাবে রিসেট"
+msgstr "স্থায়ীভাবে পুনঃনির্ধারণ"
 
 # tithi
 msgid "Set Permanent"
@@ -10247,14 +10287,15 @@
 msgid "Set User Limit"
 msgstr "ব্যবহারকারীর সীমা নির্ধারণ"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Topic Restriction"
-msgstr "বিষয়বস্তু সীমিতকরণ রিসেট"
+msgstr "বিষয়বস্তু সীমিতকরণ পুনঃনির্ধারণ"
 
 # tithi
 msgid "Set Topic Restriction"
 msgstr "বিষয়বস্তু সীমিতকরণ নির্ধারণ"
 
-# tithi
+# tithiরিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Private Channel"
 msgstr "ব্যক্তিগত চ্যানেল পুনঃনির্ধারণ করুন"
 
@@ -10262,7 +10303,7 @@
 msgid "Set Private Channel"
 msgstr "ব্যক্তিগত চ্যানেল নির্ধারণ"
 
-# tithi
+# tithiরিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Secret Channel"
 msgstr "গোপন চ্যানেল পুনঃনির্ধারণ"
 
@@ -11208,8 +11249,8 @@
 msgstr "অধিবেশন এবং আড্ডার আসরের আমন্ত্রন অগ্রাহ্য করা হবে"
 
 # Translated by sadia
-msgid "Use account proxy for SSL connections"
-msgstr "SSL সংযোগের ক্ষেত্রে অ্যাকাউন্টের প্রক্সি ব্যবহার করা হবে"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "HTTP এবং HTTPS সংযোগের জন্য অ্যাকাউন্ট প্রক্সি ব্যবহার করুন"
 
 msgid "Chat room list URL"
 msgstr "আড্ডার আসরের তালিকার URL"
@@ -11516,7 +11557,7 @@
 msgstr "সর্বশেষ খবর"
 
 msgid "Home Page"
-msgstr "হোম পেইজ"
+msgstr "প্রধান পাতা"
 
 msgid "Cool Link 1"
 msgstr "দারুন লিংক ১"
@@ -11787,7 +11828,7 @@
 # tithi
 #, c-format
 msgid "%s has requested your attention!"
-msgstr "%s আপনার মনযোগ কামনা করেছে!"
+msgstr "%s আপনার মনোযোগ কামনা করেছে!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
@@ -12519,8 +12560,9 @@
 msgid "/Tools/Pr_eferences"
 msgstr "/টুল/পছন্দসমূহ (_E)"
 
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "/Tools/Pr_ivacy"
-msgstr "/টুল/গোপনতা (_I)"
+msgstr "/টুল/গোপনীয়তা (_I)"
 
 # snigdha
 msgid "/Tools/Set _Mood"
@@ -12639,8 +12681,9 @@
 msgid "/Buddies/Add Group..."
 msgstr "/বন্ধুগণ/দল যোগ..."
 
+# Snigdha গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "/Tools/Privacy"
-msgstr "/টুল/গোপনতা"
+msgstr "/টুল/গোপনীয়তা"
 
 msgid "/Tools/Room List"
 msgstr "/টুল/আসরের তালিকা"
@@ -12797,7 +12840,7 @@
 msgid "_Edit Account"
 msgstr "অ্যাকাউন্ট সম্পাদনা (_E)"
 
-# snigdha
+# snigdhaসেট এর জায়গায় নির্ধারণ
 msgid "Set _Mood..."
 msgstr "মুড নির্ধারণ...(_M)"
 
@@ -12925,7 +12968,7 @@
 
 # snigdha
 msgid "/Conversation/Get _Attention"
-msgstr "/কথোপকথন/ মনযোগ আকর্ষন (_A)"
+msgstr "/কথোপকথন/ মনোযোগ আকর্ষন (_A)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/কথোপকথন/বন্ধু পাউন্স যোগ... (_P)"
@@ -13010,7 +13053,7 @@
 
 # snigdha
 msgid "/Conversation/Get Attention"
-msgstr "/কথোপকথন/মনযোগ আকর্ষন"
+msgstr "/কথোপকথন/মনোযোগ আকর্ষন"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/কথোপকথন/বন্ধু পাউন্স যোগ..."
@@ -13254,9 +13297,8 @@
 msgstr "আরবী"
 
 # snigdha
-#, fuzzy
 msgid "Assamese"
-msgstr "লজ্জিত"
+msgstr "আসামীয়"
 
 # tithi
 msgid "Belarusian Latin"
@@ -13396,9 +13438,9 @@
 msgstr "ম্যাসেডনিয়"
 
 # Translated by sadia
-#, fuzzy
+# corrected by Snigdha
 msgid "Malayalam"
-msgstr "মালয় (মালয়শিয়া)"
+msgstr "মালায়ালাম"
 
 msgid "Mongolian"
 msgstr "মঙ্গোলীয়"
@@ -13528,10 +13570,10 @@
 "%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
 "%s একটি লিবপারপেল ভিত্তিক বার্তা ক্লায়েন্ট যা একই সাথে বার্তা সেবার সাথে যুক্ত হতে "
-"পারে। %s GTK+ব্যবহার করে C তে লেখা হয়। %s মুক্তি পেয়েছে, GPLসংস্করণ 2 (অথবা "
-"পরবর্তী) অনুসারে সংস্করণ এবং পুনর্বন্টন করা যেতে পারে। GPL এর একটি অনুলিপি %s এর "
-"সাথে পুনর্বন্টন করা হয়েছে। %s অনুদানকারী দ্বারা কপিরাইট করা হয়েছে, যাদের একটি "
-"তালিকা %s এর সাথে বন্টন করা হয়েছে। %s এর জন্য কোনো নিশ্চয়তা নাই।<BR><BR>"
+"পারে।  %s GTK+ব্যবহার করে C তে লেখা হয়।  %s মুক্তি পেয়েছে, GPL সংস্করণ 2 (অথবা "
+"পরবর্তী) অনুসারে, সংস্করণ এবং পুনর্বন্টন করা যেতে পারে। GPL এর একটি অনুলিপি %s এর "
+"সাথে পুনর্বন্টন করা হয়েছে।  %s অনুদানকারী দ্বারা কপিরাইট করা হয়েছে, যাদের একটি  "
+"তালিকা %s এর সাথে বন্টন করা হয়েছে। %s এর জন্য কোন ওয়ারেন্টি নেই।<BR><BR>"
 
 # snigdha
 #, c-format
@@ -13558,7 +13600,7 @@
 "welcome to post in another language, but the responses may be less helpful."
 "<br/>"
 msgstr ""
-"<font size=\"4\">অন্যান্য পিজিন ব্যবহারকারীর </b></font>কাছ থেকে <a href="
+"<font size=\"4\">অন্যান্য পিজিন ব্যবহারকারীর</b></font>কাছ থেকে <a href="
 "\"mailto:support@pidgin.im\">support@pidgin.im এ মেইল করে সহায়তা নিতে পারেন</"
 "a><br/>এটি একটি <b>সর্বজনীন</b> মেইলের তালিকা! (<a href=\"http://pidgin.im/"
 "pipermail/support/\">আর্কাইভ</a>)<br/>আমরা কোন ৩য় পক্ষের প্রোটোকল বা প্লাগইন "
@@ -13812,8 +13854,9 @@
 msgid "Paste as Plain _Text"
 msgstr "সরল টেক্সট হিসেবে প্রতিলেপন (_T)"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "_Reset formatting"
-msgstr "বিন্যাস রিসেট (_R)"
+msgstr "বিন্যাস পুনঃনির্ধারণ (_R)"
 
 # tithi
 msgid "Disable _smileys in selected text"
@@ -13868,19 +13911,24 @@
 msgid "Color to draw the name of an action message."
 msgstr "একটি প্রতিক্রিয়া বার্তার নামের রং।"
 
-# fix me tithi
+# fix me tithi গোপনতার জায়গায় গোপনীয়তা
 msgid "Action Message Name Color for Whispered Message"
 msgstr "গোপনীয় বার্তার জন্য প্রতিক্রিয়া বার্তার নামের রং"
 
 # tithi
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
+#
+#
 msgid "Color to draw the name of a whispered action message."
 msgstr "একটি গোপনীয় প্রতিক্রিয়া বার্তার নাম আঁকার রং।"
 
 # fix- me tithi
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "Whisper Message Name Color"
 msgstr "গোপনীয় বার্তার নামের রং"
 
 # tithi
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "Color to draw the name of a whispered message."
 msgstr "একটি গোপনীয় বার্তার নাম আঁকার রং।"
 
@@ -14026,8 +14074,9 @@
 msgstr "পুরোভাগের রং"
 
 # tithi
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "Reset Formatting"
-msgstr "বিন্যাস রিসেট"
+msgstr "বিন্যাস নির্ধারন করা হচ্ছে"
 
 msgid "Insert IM Image"
 msgstr "IM চিত্র প্রবেশ করান"
@@ -14037,7 +14086,7 @@
 
 # snigdha
 msgid "Send Attention"
-msgstr "মনযোগ দিন"
+msgstr "মনোযোগ দিন"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>মোটা (_B)</b>"
@@ -14089,7 +14138,7 @@
 
 # snigdha
 msgid "_Attention!"
-msgstr "সাবধান! (_A)"
+msgstr "দৃষ্টিআকর্ষন! (_A)"
 
 msgid "Log Deletion Failed"
 msgstr "লগ অপসারণ ব্যর্থ"
@@ -14239,11 +14288,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "প্রস্থান করছে কারণ আরেকটি libpurple ক্লায়েন্ট ইতিমধ্যে চলছে।\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/মিডিয়া (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/মিডিয়া/কল শেষ করুন (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "কল শেষ করুন"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14900,8 +14951,9 @@
 msgid "_Browse..."
 msgstr "ব্রাউজ... (_B)"
 
+# রিসেট এর জায়গায় পুনঃনির্ধারণ
 msgid "_Reset"
-msgstr "রিসেট (_R)"
+msgstr "পুনঃনির্ধারণ (_R)"
 
 msgid "_Report idle time:"
 msgstr "নিষ্ক্রিয় সময় দেখানো হবে (_R):"
@@ -14964,14 +15016,17 @@
 msgid "Block only the users below"
 msgstr "শুধুমাত্র নিম্নলিখিত ব্যবহারকারীদের ব্লক করা হবে"
 
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "Privacy"
-msgstr "গোপনতা"
-
+msgstr "গোপনীয়তা"
+
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "Changes to privacy settings take effect immediately."
-msgstr "গোপনতার বিন্যাসের পরিবর্তনগুলো তাৎ‍ক্ষণিকভাবে কার্যকর হবে।"
-
+msgstr "গোপনীয়তার বিন্যাসের পরিবর্তনগুলো তাৎ‍ক্ষণিকভাবে কার্যকর হবে।"
+
+# গোপনতার এর জায়গায় গোপনীয়তা হবে
 msgid "Set privacy for:"
-msgstr "এর জন্য গোপনতা নির্ধারণ করুন:"
+msgstr "এর জন্য গোপনীয়তা নির্ধারণ করুন:"
 
 #. Remove All button
 msgid "Remove Al_l"
@@ -15110,10 +15165,6 @@
 msgid "Custom Smiley Manager"
 msgstr "স্বনির্বাচিত স্মাইলি ব্যবস্থাপক"
 
-# snigdha
-msgid "Attention received"
-msgstr "সতর্কতা গ্রহন"
-
 msgid "Select Buddy Icon"
 msgstr "বন্ধু আইকন নির্বাচন"
 
@@ -15306,7 +15357,7 @@
 msgstr "এটি নির্বাচন করলে গ্রাফিকাল অনুভূতিচিহ্ন নিষ্ক্রিয় হবে।"
 
 msgid "none"
-msgstr "কোনটি নয়"
+msgstr "কোনোটি নয়"
 
 # mark50
 msgid "Small"
@@ -16498,7 +16549,7 @@
 msgstr "উইন্ডোজ পিজিনের অপশন"
 
 msgid "Options specific to Pidgin for Windows."
-msgstr "উইন্ডোজ পিজিনের জন্য সুনির্দিষ্ট অপশন।"
+msgstr "উইন্ডোজ পিজিনের জন্য সুনির্দিষ্"
 
 # fix me
 msgid ""
@@ -16515,7 +16566,7 @@
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr "XMPP কনসোল"
+msgstr "XMPP কন"
 
 msgid "Account: "
 msgstr "অ্যাকাউন্ট:"
@@ -16528,62 +16579,81 @@
 #. *< version
 #. *  summary
 msgid "Send and receive raw XMPP stanzas."
-msgstr "নতুন XMPP স্তবক পাঠান এবং গ্রহণ করুন।"
+msgstr "অশোধিত XMPP স্তবক পাঠান এবং গ্রহন করুন।"
 
 # snigdha
 #. *  description
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "এই প্লাগইনটি XMPP সার্ভার বা ক্লায়েন্ট ডিবাগ করার জন্য কার্যকর।"
 
+# snigdha
 #. $(^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 ""
-
+"GNU সাধারণ পাবলিক লাইসেন্সের (GPL) আওতায় $(^Name) প্রকাশিত হয়। এখানে শুধুমাত্র "
+"তথ্যের জন্য লাইসেন্সটি প্রদান করা হয়। $_CLICK"
+
+# snigdha
 #. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
-msgstr ""
-
+msgstr "পিজিন GUI টুলকিট ব্যবহার করে যা একটি মাল্টি-প্ল্যাটফর্ম টুলকিট "
+
+# snigdha
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
 msgstr ""
-
+"পিজিনের একটি ইন্সটেন্স বর্তমানে চালু আছে। অনুগ্রহ করে পিজিন বন্ধ করুন এবং পুনরায় "
+"চালান।"
+
+# snigdha
 #. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
-msgstr ""
-
+msgstr "মূল পিজিন ফাইল এবং dlls"
+
+# snigdha
 #. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr ""
-
+msgstr "পিজিনের জন্য প্রারম্ভিক মেনু ভুক্তি তৈরি করুন"
+
+# snigdha
 #. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr ""
-
+msgstr "ডেক্সটপে পিজিনের জন্য একটি শর্টকাট তৈরি করুন"
+
+# snigdha
 #. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
-
+msgstr "চিহ্নগুলোকে ডিবাগ করা হবে (ক্র্যাশের রিপোর্ট করার জন্য)"
+
+# snigdha
 #. Installer Subsection Text
-#, fuzzy
 msgid "Desktop"
-msgstr "পূর্বনির্ধারিত ডেস্কটপ "
-
+msgstr "ডেস্কটপ"
+
+# snigdha
 #. $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পিজিনের কাজ করার জন্য "
+"আবশ্যকীয়; যদি বার বার চেষ্টাও ব্যর্থ হয় তবে আপনি http://pidgin.im/download/"
+"windows/ হতে 'অফলাইন ইনস্টলার' ব্যবহার  করুন।"
+
+# snigdha
 #. $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/ হতে 'অফলাইন ইনস্টলার' ব্যবহার করুন।"
+
+# snigdha
 #. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
 msgid ""
@@ -16591,80 +16661,133 @@
 "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 তে স্বনির্ধারিত ইনস্টলেশনের "
+"নির্দেশনা দেয়া আছে।"
+
+# snigdha
 #. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
-msgstr ""
-
+msgstr "GTK+ রানটাইম (যদি অনুপস্থিত থাকে তবে আবশ্যকীয়)"
+
+# snigdha
 #. Installer Subsection Text
-#, fuzzy
 msgid "Localizations"
-msgstr "স্থান"
+msgstr "লোকালাইজেশন"
 
 #. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
-msgstr ""
-
+msgstr "পরবর্তী >"
+
+# snigdha
 #. Installer Subsection Text
-#, fuzzy
 msgid "Pidgin Instant Messaging Client (required)"
-msgstr "পিজিন ইন্টারনেট বার্তাবাহক"
-
+msgstr "পিজিন তাৎক্ষণিক বার্তা ক্লায়েন্ট (আবশ্যকীয়)"
+
+# snigdha
 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 ""
-
+"পিজিনের জন্য একটি সঙ্গতিপূর্ন GTK+রানটাইম (যা ইতোমধ্যে উপস্থিত আছে বলে মনে হয়না) "
+"অত্যাবশ্যকীয়।$\\r আপনি কি নিশ্চিত যে আপনি GTK+রানটাইম ইনস্টল বাদ দিয়ে যেতে চান?"
+
+# snigdha
 #. Installer Subsection Text
-#, fuzzy
 msgid "Shortcuts"
-msgstr "শর্টকাট"
-
+msgstr "শর্টকাটসমূহ"
+
+# snigdha
 #. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr ""
-
+msgstr "পিজিন আরম্ভ করার শর্টকাট"
+
+# snigdha
 #. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
+msgstr "বানান পরীক্ষা সমর্থন"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Start Menu"
-msgstr "আরম্ভ"
-
+msgstr "প্রারম্ভিক মেনু"
+
+# snigdha
 #. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
-msgstr ""
-
-#, fuzzy
+msgstr "বানান পরীক্ষার জন্য সমর্থন।  (ইনস্টলেশন এর জন্য ইন্টারনেট সংযোগ)"
+
+# snigdha
 msgid "The installer is already running."
-msgstr "\"%s\" ডাকনামটি ইতোমধ্যেই ব্যবহৃত হয়েছে।"
-
+msgstr "ইনস্টলারটি ইতোমধ্যে চালু হয়ে গিয়েছে।"
+
+# snigdha
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
-
-# tithi
+"আনইন্সটলার পিজিনের জন্য রেজিস্ট্র ভুক্তি খুঁজে পায়নি।$\\rআরেকজন ব্যবহারকারী এই "
+"অ্যাপ্লিকেশনটি ইন্সটল করে ফেলার সম্ভাবনা রয়েছে।"
+
+# tithi
+# snigdha
 #. Installer Subsection Text
-#, fuzzy
 msgid "URI Handlers"
-msgstr "myim URL হ্যান্ডলার"
-
+msgstr "URL হ্যান্ডলার"
+
+# snigdha
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
 msgstr ""
-
+"পিজিনে বিদ্যমান ইন্সটল করা সংস্করণটি আনইন্সটল করা যাচ্ছে না। বর্তমানে ইন্সটল করা "
+"সংস্করণটি অপসারন না করেই নতুন সংস্করণটি ইন্সটল করতে হবে।"
+
+# snigdha
 #. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
-msgstr ""
-
+msgstr "পিজিনের ওয়েব পেজ দেখুন"
+
+# snigdha
 msgid "You do not have permission to uninstall this application."
-msgstr ""
+msgstr "আপনার এই অ্যাপ্লিকেশনটি আনইন্সটল করার অনুমতি নেই।"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/মিডিয়া/কল শেষ করুন (_H)"
+
+# Translated by sadia
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "সার্টিফিকেটটি এখনও কার্যকর করা হয়নি।"
+
+# tithi
+#
+#
+#
+# Translated by sadia
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "আপনি যে ডাকনামটি প্রবেশ করিয়েছেন তা অকার্যকর।"
+
+# Translated by sadia
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit-এ লগ ইন করার নাম"
+
+# Translated by sadia
+#~ msgid "Nick Name"
+#~ msgstr "ডাকনাম "
+
+# Translated by sadia
+#~ msgid "Your Mobile Number..."
+#~ msgstr "আপনার মোবাইল নাম্বার..."
+
+# tithi
+#~ msgid "Rate to host"
+#~ msgstr "হোস্টে পাঠানোর হার"
+
+# tithi
+#~ msgid "Rate to client"
+#~ msgstr "ক্লায়েন্টে পাঠানোর হার"
 
 #~ msgid "Unknown reason."
 #~ msgstr "অজ্ঞাত কারণ।"
@@ -16688,3 +16811,211 @@
 # Translated by sadia
 #~ msgid "Change Mood..."
 #~ msgstr "মেজাজ পরিবর্তন করা হবে..."
+
+# page orientation
+#~ msgid "Orientation"
+#~ msgstr "পরিস্থিতি"
+
+#~ msgid "The orientation of the tray."
+#~ msgstr "ট্রের পরিস্থিতি।"
+
+# tithi
+#~ msgid "Error creating conference."
+#~ msgstr "অধিবেশন তৈরিতে ত্রুটি"
+
+#~ msgid "Unable to bind socket to port: %s"
+#~ msgstr "পোর্টের সাথে সকেট সংযুক্ত করতে ব্যর্থ: %s"
+
+#~ msgid "Unable to listen on socket: %s"
+#~ msgstr "সকেটে লিসেন করতে ব্যর্থ: %s"
+
+# Translated by sadia
+#~ msgid "%s"
+#~ msgstr "%s"
+
+#~ msgid ""
+#~ "Unable to find alternative XMPP connection methods after failing to "
+#~ "connect directly."
+#~ msgstr ""
+#~ "সরাসরি সংযোগ স্থাপনে ব্যর্থ হওয়ার পর বিকল্প XMPP সংযোগ প্রক্রিয়া খুঁজে পাওয়া "
+#~ "যায়নি।"
+
+#~ msgid "Artist"
+#~ msgstr "শিল্পী"
+
+#~ msgid "Album"
+#~ msgstr "এ্যালবাম"
+
+#~ msgid "%s just sent you a Nudge!"
+#~ msgstr "%s আপনাকে ধাক্কা দিয়েছে!"
+
+# tithi
+#~ msgid "Friendly name changes too rapidly"
+#~ msgstr "বন্ধুসুলভ নাম খুব দ্রুত পরিবর্তিত হয়"
+
+# tithi
+#~ msgid "This Hotmail account may not be active."
+#~ msgstr "এই হটমেইল অ্যাকাউন্টটি সক্রিয় নাও থাকতে পারে।"
+
+# tithi
+#~ 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 "%2$s (%3$s) এ %1$s"
+
+#~ msgid "Unable to add user on %s (%s)"
+#~ msgstr "%1$s (%2$s) এ ব্যবহারকারী যোগ করতে ব্যর্থ"
+
+#~ msgid "Unable to block user on %s (%s)"
+#~ msgstr "%1$s (%2$s) এ ব্যবহারকারী ব্লক করতে ব্যর্থ"
+
+#~ msgid "Unable to permit user on %s (%s)"
+#~ msgstr "%1$s (%2$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 আপনাকে তার বন্ধু তালিকা থেকে অপসারণ করেছেন।"
+
+# tithi
+#
+#
+#
+# Translated by sadia
+#~ msgid "CAPTCHA requested. Logging into the AIM/ICQ website may fix this."
+#~ msgstr ""
+#~ "ক্যাপচা অনুরোধ করা হয়েছে। AIM/ICQ ওয়েবসাইটে লগ ইন করা হলে হয়ত এটা নির্দিষ্ট "
+#~ "করা যেতে পারে।"
+
+# Translated by sadia
+#~ 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 "Pager server"
+#~ msgstr "পেইজার সার্ভার"
+
+#~ msgid "Yahoo Chat server"
+#~ msgstr "ইয়াহু আড্ডা সার্ভার"
+
+#~ msgid "Yahoo Chat port"
+#~ 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\">FAQ:</FONT> <A HREF=\"http://developer.pidgin.im/wiki/FAQ"
+#~ "\">http://developer.pidgin.im/wiki/FAQ</A><BR/><BR/>"
+
+# fix me
+#~ msgid ""
+#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+#~ msgstr ""
+#~ "<FONT SIZE=\"4\">IRC চ্যানেল:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+
+# fix me
+#~ 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 "'%1$s' ফাইলটি খুলতে ব্যর্থ: %2$s"
+
+# tithi
+#~ msgid ""
+#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
+#~ msgstr ""
+#~ "'%s' চিত্রটি লোড করতে ব্যর্থ হয়েছে। কারণ জানা নেই, সম্ভবত চিত্রের ফাইলটি বিকৃত"
+
+# tithi
+#~ msgid "Insert an <iq/> stanza."
+#~ msgstr "একটি <iq/> স্তবক প্রবেশ করান।"
+
+# tithi
+#~ msgid "Insert a <presence/> stanza."
+#~ msgstr "একটি <presence/> স্তবক প্রবেশ করান।"
+
+#~ msgid "Insert a <message/> stanza."
+#~ msgstr "একটি <message/> স্তবক প্রবেশ করান।"
+
+# tithi mark
+#, fuzzy
+#~ msgid "(Default)"
+#~ msgstr "(ডিফল্ট)"
+
+# tithi
+#~ msgid "Install Theme"
+#~ msgstr "থীম ইনস্টল করুন"
+
+#~ msgid "Icon"
+#~ msgstr "আইকন"
+
+# tithi
+#~ msgid "Use document font from _theme"
+#~ msgstr "থীম থেকে নথির ফন্ট ব্যবহার করা হবে (_t)"
+
+#~ msgid "Proxy Server &amp; Browser"
+#~ msgstr "প্রক্সি সার্ভার &amp; ব্রাউজার"
+
+#~ msgid "Auto-away"
+#~ msgstr "স্বয়ংক্রিয়ভাবে অন্যত্র"
+
+#~ msgid "Change _status to:"
+#~ msgstr "অবস্থা পরিবর্তন (_s):"
+
+# tithi
+#, fuzzy
+#~ msgid "The root certificate this one claims to be issued by is unknown."
+#~ msgstr "মূল সার্টিফিকেটটি যার দ্বারা প্রদান করা হয়েছে তা পিজিনের কাছে অপরিচিত।"
--- a/po/bn_IN.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/bn_IN.po	Sat Jul 31 23:42:35 2010 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2010-02-18 11:24+0530\n"
 "Last-Translator: Runa Bhattacharjee <runab@redhat.com>\n"
 "Language-Team: Bengali INDIA <anubad@lists.ankur.org.in>\n"
@@ -65,12 +65,24 @@
 msgid "Error"
 msgstr "ত্রুটি"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "অ্যাকাউন্ট যোগ করা হয়নি"
+
 msgid "Account was not added"
 msgstr "অ্যাকাউন্ট যোগ করা হয়নি"
 
 msgid "Username of an account must be non-empty."
 msgstr "অ্যাকাউন্টের ক্ষেত্রে ব্যবহারকারীরনাম ফাঁকা রাখা চলবে না।"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "নতুন বার্তার বিজ্ঞপ্তি"
 
@@ -1249,6 +1261,10 @@
 msgid "Someone says your username in chat"
 msgstr "আলাপনের মধ্যে আপনার নাম উল্লেখ করা হলে"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "সক্রিয়করণ আবশ্যক"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer-র বিফলতা"
 
@@ -1540,7 +1556,7 @@
 msgid "Online"
 msgstr "অন-লাইন"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "অফ-লাইন"
 
@@ -1660,8 +1676,10 @@
 "চিহ্নিত সার্টিফিকেটটি পরীক্ষাকারী কোনো সার্টিফিকেট বিশ্বস্ত না হওয়ার ফলে এই "
 "সার্টিফিকেটটি বিশ্বাস করা সম্ভব নয়।"
 
-msgid "The certificate is not valid yet."
-msgstr "সার্টিফিকেট বর্তমানে বৈধ নয়।"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "সার্টিফিকেটের মেয়াদ পূর্ণ হয়েছে ও বর্তমানে বৈধ নয়।"
@@ -3813,6 +3831,18 @@
 "সার্ভার দ্বারা অনুমোদন সমাপ্ত করা ইঙ্গিত দেওয়া হয়েছে, কিন্তু ক্লায়েন্ট দ্বারা দেওয়া "
 "হয়নি"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "সার্ভারের ক্ষেত্রে এনক্রিপশনবিহীন স্ট্রিমের মাধ্যমে প্লেইন-টেক্সট অনুমোদন প্রয়োজন"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s-র ক্ষেত্রে এনক্রিপশন বিহীন সংযোগের মাধ্যমে প্লেইন-টেক্সট অনুমোদন ব্যবস্থা আবশ্যক।  "
+"এই কাজের অনুমতি প্রদান করে অনুমোদন প্রক্রিয়া এগিয়ে নেওয়া হবে কি?"
+
 msgid "SASL authentication failed"
 msgstr "SASL অনুমোদন ব্যর্থ"
 
@@ -5957,7 +5987,7 @@
 "প্রোফাইল সংক্রান্ত তথ্য এখনো উদ্ধার করা সম্ভব হয়নি। অনুগ্রহ করে পরে পুনরায় প্রচেষ্টা "
 "করুন।"
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5969,6 +5999,7 @@
 msgstr "PIN যাচাই করুন"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "নাম প্রদর্শন করা হবে"
 
@@ -6030,19 +6061,16 @@
 msgid "Connecting..."
 msgstr "সংযোগ করা হচ্ছে..."
 
-msgid "The nick name you entered is invalid."
-msgstr "উল্লিখিত উপনাম বৈধ নয়।"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "উল্লিখিত নাম বৈধ নয়।"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "উল্লিখিত PIN-র দৈর্ঘ্য বৈধ নয় [7-10]।"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit লগ-ইনের নাম"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "উপনাম"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6073,10 +6101,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "নির্বাচিত দেশের মান বৈধ নয়। অনুগ্রহ করে পুনরায় প্রচেষ্টা করুন।"
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "ব্যবহারকারীর নাম নিবন্ধিত নয়। অনুগ্রহ করে প্রথমে নিবন্ধন করুন।"
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "ব্যবহারকারীর নাম পূর্বেই নিবন্ধিত হয়েছে। অনুগ্রহ করে একটি ভিন্ন নাম নির্বাচন করুন।"
 
@@ -6123,8 +6153,9 @@
 msgid "Hidden Number"
 msgstr "আড়াল করা সংখ্যা"
 
-msgid "Your Mobile Number..."
-msgstr "আপনার মোবাইল ফোনের সংখ্যা..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6150,6 +6181,15 @@
 msgid "_Room Name:"
 msgstr "রুম: (_R)"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "আপনি একটি বার্তা পেয়েছেন!"
+
+#, fuzzy
+msgid "Last Online"
+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-র সাথে সংযোগ বিচ্ছিন্ন হয়েছে। অনুগ্রহ করে পুনরায় সংযোগ করুন।"
@@ -7941,11 +7981,11 @@
 msgid "Invalid SNAC"
 msgstr "অবৈধ SNAC"
 
-msgid "Rate to host"
-msgstr "হোস্ট অবধি হার"
-
-msgid "Rate to client"
-msgstr "ক্লায়েন্ট অবধি হার"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "পরিসেবা উপলব্ধ নয়"
@@ -10216,7 +10256,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "কনফারেন্স ও চ্যাট-রুমের আমন্ত্রণ উপেক্ষা করা হবে"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL সংযোগের জন্য প্রক্সি অ্যাকাউন্ট ব্যবহার করা হবে"
 
 msgid "Chat room list URL"
@@ -13091,11 +13132,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "একটি ভিন্ন libpurple ক্লায়েন্ট বর্তমানে চলছে। এই কারণে প্রস্থান করা হচ্ছে।\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/মিডিয়া (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/মিডিয়া/কল সমাপ্ত করুন (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "কল সমাপ্ত করুন"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13898,10 +13941,6 @@
 msgid "Custom Smiley Manager"
 msgstr "স্বনির্ধারিত হাসিমুখ পরিচালন ব্যবস্থা"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "সক্রিয়করণ আবশ্যক"
-
 msgid "Select Buddy Icon"
 msgstr "বন্ধুর আইকন নির্বাচন করুন"
 
@@ -15385,6 +15424,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "সার্টিফিকেট বর্তমানে বৈধ নয়।"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "উল্লিখিত উপনাম বৈধ নয়।"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit লগ-ইনের নাম"
+
+#~ msgid "Nick Name"
+#~ msgstr "উপনাম"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "আপনার মোবাইল ফোনের সংখ্যা..."
+
+#~ msgid "Rate to host"
+#~ msgstr "হোস্ট অবধি হার"
+
+#~ msgid "Rate to client"
+#~ msgstr "ক্লায়েন্ট অবধি হার"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/মিডিয়া/কল সমাপ্ত করুন (_H)"
+
 #~ msgid "Unknown reason."
 #~ msgstr "অজানা কারণ।"
 
--- a/po/bs.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/bs.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2005-10-27 16:55-0400\n"
 "Last-Translator: Lejla Hadialic <lejlah@gmail.com>\n"
 "Language-Team: bs <LL@li.org>\n"
@@ -51,12 +51,24 @@
 msgstr "Greška"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Account je iskljucen"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Account je iskljucen"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Obavještenje o novom mail-u"
 
@@ -1321,6 +1333,10 @@
 msgid "Someone says your username in chat"
 msgstr "Neko je spomenuo vaše ime na chat-u"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Potrebna registracija"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1632,7 +1648,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1760,9 +1776,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Ukucani SecurID je pogrešan."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3969,6 +3986,19 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Serveru je potrebna (tekstualna) autentikacija preko nekriptovanog toka"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Ovom serveru je potrebna tekstualna autentikacija preko nekriptovane "
+"konekcije. Dozvolite ovo i nastavite autentikaciju?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Autentikacija neuspjela"
 
@@ -6248,7 +6278,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6261,6 +6291,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Prikaz"
@@ -6335,7 +6366,7 @@
 msgstr "Spajanje"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Ukucani SecurID je pogrešan."
 
 #, fuzzy
@@ -6343,13 +6374,8 @@
 msgstr "Ukucani SecurID je pogrešan."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nadimak"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6387,10 +6413,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6447,8 +6473,8 @@
 msgstr "Srednje ime"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Postavi broj mobilnog telefona"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6476,6 +6502,15 @@
 msgid "_Room Name:"
 msgstr "Soba:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Izbaceni ste od %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. 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 ""
@@ -8326,11 +8361,11 @@
 msgid "Invalid SNAC"
 msgstr "Pogrešan SNAC"
 
-msgid "Rate to host"
-msgstr "Preporuci hostu"
-
-msgid "Rate to client"
-msgstr "Preporuci klijentu"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Servis nedostupan"
@@ -10762,7 +10797,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
@@ -13836,10 +13871,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14759,10 +14794,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Potrebna registracija"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Izaberite prijatelja"
 
@@ -16352,6 +16383,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Ukucani SecurID je pogrešan."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Ukucani SecurID je pogrešan."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nadimak"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Postavi broj mobilnog telefona"
+
+#~ msgid "Rate to host"
+#~ msgstr "Preporuci hostu"
+
+#~ msgid "Rate to client"
+#~ msgstr "Preporuci klijentu"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Nepoznat razlog."
 
--- a/po/ca.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ca.po	Sat Jul 31 23:42:35 2010 +0000
@@ -33,7 +33,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\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"
@@ -87,12 +87,24 @@
 msgid "Error"
 msgstr "Error"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "No s'ha afegit el compte"
+
 msgid "Account was not added"
 msgstr "No s'ha afegit el compte"
 
 msgid "Username of an account must be non-empty."
 msgstr "El nom d'usuari d'un compte no pot ser buit."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Notifica si hi ha correu nou"
 
@@ -1294,6 +1306,9 @@
 msgid "Someone says your username in chat"
 msgstr "Algú digui el vostre nom d'usuari en un xat"
 
+msgid "Attention received"
+msgstr "S'ha rebut una alerta"
+
 msgid "GStreamer Failure"
 msgstr "Fallada del GStreamer"
 
@@ -1587,7 +1602,7 @@
 msgid "Online"
 msgstr "En línia"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Fora de línia"
 
@@ -1705,8 +1720,10 @@
 "No es pot confiar en el certificat atès que no hi hi ha cap altre certificat "
 "de confiança que el pugui verificar."
 
-msgid "The certificate is not valid yet."
-msgstr "El certificat encara no és vàlid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "El certificat ha expirat i no s'hauria de considerar vàlid."
@@ -3863,6 +3880,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "El servidor creu que s'ha completat l'autenticació, però el client no"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "El servidor requereix autenticació de text sobre un flux no xifrat"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s requereix autenticació de text sobre un flux no xifrat. Voleu permetre-ho "
+"i continuar amb l'autenticació?"
+
 msgid "SASL authentication failed"
 msgstr "Ha fallat l'autenticació SASL"
 
@@ -5983,7 +6012,8 @@
 "Encara no s'ha pogut recuperar la informació del vostre perfil. Torneu-ho a "
 "intentar més tard."
 
-msgid "Your MXitId"
+#, fuzzy
+msgid "Your UID"
 msgstr "El vostre MXitID"
 
 #. pin
@@ -5995,6 +6025,7 @@
 msgstr "Verifiqueu el PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Nom que es mostrarà"
 
@@ -6053,19 +6084,16 @@
 msgid "Connecting..."
 msgstr "S'està connectant..."
 
-msgid "The nick name you entered is invalid."
-msgstr "El sobrenom que heu introduït no és vàlid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "El nom que heu introduït no és vàlid."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "La llargada del PIN que heu introduït no és vàlida [4-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Nom d'usuari de MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Sobrenom"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6097,10 +6125,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "El país seleccionat no és vàlid. Intenteu-ho de nou."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "El nom d'usuari no està registrat, cal que primer el registreu."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Aquest nom d'usuari ja està registrat, escolliu-ne un altre."
 
 msgid "Internal error. Please try again later."
@@ -6146,8 +6176,9 @@
 msgid "Hidden Number"
 msgstr "Nombre ocult"
 
-msgid "Your Mobile Number..."
-msgstr "El vostre telèfon mòbil..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "El vostre MXitID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6170,6 +6201,15 @@
 msgid "_Room Name:"
 msgstr "Nom de la _Sala:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Teniu correu!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "En línia"
+
 #. 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."
@@ -7951,11 +7991,11 @@
 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 "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Servei no disponible"
@@ -10237,7 +10277,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Bloca invitacions a conferències i sales de xat"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Empra un compte per al servidor intermediari per a connexions SSL"
 
 msgid "Chat room list URL"
@@ -13139,11 +13180,13 @@
 "Ara se sortirà atès que ja hi ha un altre client del libpurple executant-"
 "se.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Medi"
 
-msgid "/Media/_Hangup"
-msgstr "/Medi/_Penja"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Penja"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13957,9 +14000,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Gestor d'emoticones personalitzades"
 
-msgid "Attention received"
-msgstr "S'ha rebut una alerta"
-
 msgid "Select Buddy Icon"
 msgstr "Seleccioneu una icona per a l'amic"
 
@@ -15472,6 +15512,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "No tens permís per desinstal.lar aquesta aplicació."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "El certificat encara no és vàlid."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "El sobrenom que heu introduït no és vàlid."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Nom d'usuari de MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Sobrenom"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "El vostre telèfon mòbil..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Velocitat cap a l'ordinador"
+
+#~ msgid "Rate to client"
+#~ msgstr "Velocitat cap al client"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Medi/_Penja"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Motiu desconegut."
 
--- a/po/ca@valencia.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ca@valencia.po	Sat Jul 31 23:42:35 2010 +0000
@@ -33,7 +33,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
@@ -87,12 +87,24 @@
 msgid "Error"
 msgstr "Error"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "No s'ha afegit el compte"
+
 msgid "Account was not added"
 msgstr "No s'ha afegit el compte"
 
 msgid "Username of an account must be non-empty."
 msgstr "El nom d'usuari d'un compte no pot ser buit."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Notifica si hi ha correu nou"
 
@@ -1292,6 +1304,9 @@
 msgid "Someone says your username in chat"
 msgstr "Algú diga el vostre nom d'usuari en un xat"
 
+msgid "Attention received"
+msgstr "S'ha rebut una alerta"
+
 msgid "GStreamer Failure"
 msgstr "Fallada del GStreamer"
 
@@ -1585,7 +1600,7 @@
 msgid "Online"
 msgstr "En línia"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Fora de línia"
 
@@ -1703,8 +1718,10 @@
 "No es pot confiar en el certificat atès que no hi hi ha cap altre certificat "
 "de confiança que el puga verificar."
 
-msgid "The certificate is not valid yet."
-msgstr "El certificat encara no és vàlid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "El certificat ha expirat i no s'hauria de considerar vàlid."
@@ -3859,6 +3876,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "El servidor creu que s'ha completat l'autenticació, però el client no"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "El servidor requereix autenticació de text sobre un flux no xifrat"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s requereix autenticació de text sobre un flux no xifrat. Voleu permetre-ho "
+"i continuar amb l'autenticació?"
+
 msgid "SASL authentication failed"
 msgstr "Ha fallat l'autenticació SASL"
 
@@ -5978,7 +6007,8 @@
 "Encara no s'ha pogut recuperar la informació del vostre perfil. Torneu-ho a "
 "intentar més tard."
 
-msgid "Your MXitId"
+#, fuzzy
+msgid "Your UID"
 msgstr "El vostre MXitID"
 
 #. pin
@@ -5990,6 +6020,7 @@
 msgstr "Verifiqueu el PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Nom que es mostrarà"
 
@@ -6048,19 +6079,16 @@
 msgid "Connecting..."
 msgstr "S'està connectant..."
 
-msgid "The nick name you entered is invalid."
-msgstr "El sobrenom que heu introduït no és vàlid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "El nom que heu introduït no és vàlid."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "La llargada del PIN que heu introduït no és vàlida [4-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Nom d'usuari de MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Sobrenom"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6092,10 +6120,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "El país seleccionat no és vàlid. Intenteu-ho de nou."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "El nom d'usuari no està registrat, cal que primer el registreu."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Este nom d'usuari ja està registrat, escolliu-ne un altre."
 
 msgid "Internal error. Please try again later."
@@ -6141,8 +6171,9 @@
 msgid "Hidden Number"
 msgstr "Nombre ocult"
 
-msgid "Your Mobile Number..."
-msgstr "El vostre telèfon mòbil..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "El vostre MXitID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6168,6 +6199,15 @@
 msgid "_Room Name:"
 msgstr "_Sala:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Teniu correu!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "En línia"
+
 #. 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."
@@ -7947,11 +7987,11 @@
 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 "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Servei no disponible"
@@ -10234,7 +10274,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Bloca invitacions a conferències i sales de xat"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Empra un compte per al servidor intermediari per a connexions SSL"
 
 msgid "Chat room list URL"
@@ -13133,11 +13174,13 @@
 msgstr ""
 "Ara s'eixirà atès que ja hi ha un altre client del libpurple executant-se.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Medi"
 
-msgid "/Media/_Hangup"
-msgstr "/Medi/_Penja"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Penja"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13950,9 +13993,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Gestor d'emoticones personalitzades"
 
-msgid "Attention received"
-msgstr "S'ha rebut una alerta"
-
 msgid "Select Buddy Icon"
 msgstr "Seleccioneu una icona per a l'amic"
 
@@ -15466,6 +15506,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "No tens permís per desinstal.lar esta aplicació."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "El certificat encara no és vàlid."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "El sobrenom que heu introduït no és vàlid."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Nom d'usuari de MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Sobrenom"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "El vostre telèfon mòbil..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Velocitat cap a l'ordinador"
+
+#~ msgid "Rate to client"
+#~ msgstr "Velocitat cap al client"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Medi/_Penja"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Motiu desconegut."
 
--- a/po/cs.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/cs.po	Sat Jul 31 23:42:35 2010 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
@@ -63,12 +63,24 @@
 msgid "Error"
 msgstr "Chyba"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Účet nebyl přidán"
+
 msgid "Account was not added"
 msgstr "Účet nebyl přidán"
 
 msgid "Username of an account must be non-empty."
 msgstr "Jméno uživatele účtu nesmí být prázdné."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Upozornění na nové zprávy"
 
@@ -1252,6 +1264,9 @@
 msgid "Someone says your username in chat"
 msgstr "Někdo v chatu řekne vaše jméno"
 
+msgid "Attention received"
+msgstr "Požadavek na pozornost"
+
 msgid "GStreamer Failure"
 msgstr "Selhání GStreameru"
 
@@ -1542,7 +1557,7 @@
 msgid "Online"
 msgstr "Připojen"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Odpojen"
 
@@ -1662,8 +1677,10 @@
 "Certifikát není důvěryhodný, protože v současnosti není k dispozici "
 "důvěryhodný certifikát pro jeho ověření."
 
-msgid "The certificate is not valid yet."
-msgstr "Certifikát je neplatný."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Certifikát vypršel a neměl by být považován za platný."
@@ -3801,6 +3818,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Server považuje ověření za kompletní, ale klient ne"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server vyžaduje textovou autentizaci v nešifrovaném proudu"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vyžaduje textovou autentizaci přes nešifrované spojení. Povolit to a "
+"pokračovat v autentizaci?"
+
 msgid "SASL authentication failed"
 msgstr "SASL autentizace selhala"
 
@@ -5872,7 +5901,8 @@
 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"
+#, fuzzy
+msgid "Your UID"
 msgstr "Tvoje MXitId"
 
 #. pin
@@ -5884,6 +5914,7 @@
 msgstr "Ověření PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
@@ -5940,19 +5971,16 @@
 msgid "Connecting..."
 msgstr "Připojování..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Zadaná přezdívka není platná"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Zadaný jméno není platné"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Zadaný PIN má neplatnou délku [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Přihlašovací jméno MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Přezdívka"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5980,10 +6008,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Vybrána neplatná země, zkuste to prosím později."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Uživatelské jméno není registrováno. Nejdřív se registrujte."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Uživatelské jméno už je registrované, zkuste jiné."
 
 msgid "Internal error. Please try again later."
@@ -6028,8 +6058,9 @@
 msgid "Hidden Number"
 msgstr "Skryté číslo"
 
-msgid "Your Mobile Number..."
-msgstr "Vaše mobilní telefonní číslo..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Tvoje MXitId"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6055,6 +6086,15 @@
 msgid "_Room Name:"
 msgstr "_Místnost:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Přišla vám pošta!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Připojen"
+
 #. 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."
@@ -7824,11 +7864,11 @@
 msgid "Invalid SNAC"
 msgstr "Neplatné SNAC"
 
-msgid "Rate to host"
-msgstr "Rychlost k hostiteli"
-
-msgid "Rate to client"
-msgstr "Rychlost ke klientovi"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Služba nedostupná"
@@ -10083,7 +10123,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorovat pozvání do konferencí a místností chatu"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Použít proxy pro SSL připojení"
 
 msgid "Chat room list URL"
@@ -12935,11 +12976,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Exiting because another libpurple client is already running.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Multimédia"
 
-msgid "/Media/_Hangup"
-msgstr "/Multimédia/_Zavěsit"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Zavěsit"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13738,9 +13781,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Správce smajlíků"
 
-msgid "Attention received"
-msgstr "Požadavek na pozornost"
-
 msgid "Select Buddy Icon"
 msgstr "Vybrat ikonu kamaráda"
 
@@ -15216,6 +15256,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Nemáte oprávnění k odinstalaci této aplikace."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Certifikát je neplatný."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Zadaná přezdívka není platná"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Přihlašovací jméno MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Přezdívka"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Vaše mobilní telefonní číslo..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Rychlost k hostiteli"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rychlost ke klientovi"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Multimédia/_Zavěsit"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Neznámý důvod."
 
--- a/po/da.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/da.po	Sat Jul 31 23:42:35 2010 +0000
@@ -25,7 +25,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2009-02-23 18:17+0100\n"
 "Last-Translator: Peter Bach <bach.peter@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -78,12 +78,24 @@
 msgid "Error"
 msgstr "Fejl"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Konto blev ikke tilføjet"
+
 msgid "Account was not added"
 msgstr "Konto blev ikke tilføjet"
 
 msgid "Username of an account must be non-empty."
 msgstr "Brugernavn på en konto må ikke være tom."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Påmindelse om ny post"
 
@@ -1270,6 +1282,10 @@
 msgid "Someone says your username in chat"
 msgstr "Nogle siger dit brugernavn i en samtale"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Aktivering krævet"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer fejl"
 
@@ -1561,7 +1577,7 @@
 msgid "Online"
 msgstr "Tilkoblet"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Afkoblet"
 
@@ -1682,9 +1698,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Den præsenterede certifikatkæde for %s er ikke gyldig."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3847,6 +3864,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server kræver godkendelse i klartekst over en ukrypteret strøm"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s kræver godkendelse i klartekst over en ukrypteret forbindelse. Tillad "
+"dette og fortsæt godkendelse?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Godkendelse fejlede"
 
@@ -6028,7 +6057,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6041,6 +6070,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Efternavn"
@@ -6115,7 +6145,7 @@
 msgstr "Tilslutter"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "SecurID-nøglen du indtastede er ugyldig."
 
 #, fuzzy
@@ -6123,13 +6153,8 @@
 msgstr "SecurID-nøglen du indtastede er ugyldig."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Kælenavn"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6159,10 +6184,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6219,8 +6244,8 @@
 msgstr "Mellemnavn"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Sæt mobiltelefonnummer..."
+msgid "Your MXit ID..."
+msgstr "Yahoo-id..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6248,6 +6273,15 @@
 msgid "_Room Name:"
 msgstr "_Rum:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Du har modtaget post!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Tilkoblet"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -8063,11 +8097,11 @@
 msgid "Invalid SNAC"
 msgstr "Ugyldig SNAC"
 
-msgid "Rate to host"
-msgstr "Grænse til vært"
-
-msgid "Rate to client"
-msgstr "Grænse til klient"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Tjeneste ikke tilgængelig"
@@ -10338,7 +10372,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorér konference og samtalerum invitationer"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13256,10 +13290,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Afslutter fordi en anden libpurple-klient allerede kører.\n"
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14109,10 +14143,6 @@
 msgstr "Brugertilpasset håndtering af smiley"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Aktivering krævet"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Vælg ven"
 
@@ -15652,6 +15682,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Du har ikke tilladelse til at afinstallere dette program."
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Den præsenterede certifikatkæde for %s er ikke gyldig."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "SecurID-nøglen du indtastede er ugyldig."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Kælenavn"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Sæt mobiltelefonnummer..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Grænse til vært"
+
+#~ msgid "Rate to client"
+#~ msgstr "Grænse til klient"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Ukendt fejl."
 
--- a/po/de.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/de.po	Sat Jul 31 23:42:35 2010 +0000
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
-"PO-Revision-Date: 2010-05-29 17:30+0200\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
+"PO-Revision-Date: 2010-07-20 18:52+0200\n"
 "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "Language: de\n"
@@ -65,12 +65,27 @@
 msgid "Error"
 msgstr "Fehler"
 
+msgid "Account was not modified"
+msgstr "Konto wurde nicht modifiziert"
+
 msgid "Account was not added"
 msgstr "Konto wurde nicht hinzugefügt"
 
 msgid "Username of an account must be non-empty."
 msgstr "Benutzername eines Kontos darf nicht leer sein."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Das Protokoll des Kontos kann nicht geändert werden solange das Konto mit "
+"dem Server verbunden ist."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Der Benutzername des Kontos kann nicht geändert werden solange das Konto mit "
+"dem Server verbunden ist."
+
 msgid "New mail notifications"
 msgstr "Benachrichtigung über neue Mails"
 
@@ -1269,6 +1284,9 @@
 msgid "Someone says your username in chat"
 msgstr "Jemand nennt Ihren Benutzernamen im Chat"
 
+msgid "Attention received"
+msgstr "Aufmerksamkeitsgesuch erhalten"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer-Fehler"
 
@@ -1564,7 +1582,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1685,8 +1703,12 @@
 "Diesem Zertifikat wird nicht vertraut, da kein Zertifikat bestätigen kann, "
 "dass ihm aktuell vertraut wird."
 
-msgid "The certificate is not valid yet."
-msgstr "Das Zertifikat ist noch nicht gültig."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Das Zertifikat ist nicht mehr gültig.  Überprüfen Sie, ob Datum und Zeit "
+"Ihres Computers stimmen."
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3857,6 +3879,19 @@
 "Der Server ist der Meinung, dass die Authentifizierung vollständig ist, der "
 "Client aber nicht"
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Der Server könnte eine Klartext-Authentifizierung über einen "
+"unverschlüsselten Kanal anfordern"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s könnte eine Klartext-Authentifizierung über einen unverschlüsselten Kanal "
+"anfordern.  Wollen Sie dies erlauben und mit der Authentifikation fortfahren?"
+
 msgid "SASL authentication failed"
 msgstr "SASL-Authentifizierung fehlgeschlagen"
 
@@ -5990,7 +6025,8 @@
 "Ihre Profil-Informationen wurden noch nicht abgerufen. Bitte versuchen Sie "
 "es später noch einmal."
 
-msgid "Your MXitId"
+#, fuzzy
+msgid "Your UID"
 msgstr "Ihre MXit-ID"
 
 #. pin
@@ -6002,6 +6038,7 @@
 msgstr "PIN bestätigen"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Anzeigename"
 
@@ -6062,19 +6099,16 @@
 msgid "Connecting..."
 msgstr "Verbinde..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Der eingegebene Spitzname ist ungültig."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Der eingegebene Name ist ungültig."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Die eingegebene PIN hat eine ungültige Länge [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit-Login-Name"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Spitzname"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6109,11 +6143,13 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Ungültiges Land gewählt. Bitte versuchen Sie es noch einmal."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 "Benutzername ist nicht registriert. Bitte registrieren Sie Sich zuerst."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "Der Benutzername ist bereits registriert. Bitte wählen Sie einen anderen "
 "Benutzernamen."
@@ -6160,8 +6196,9 @@
 msgid "Hidden Number"
 msgstr "Versteckte Nummer"
 
-msgid "Your Mobile Number..."
-msgstr "Ihre Handynummer..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Ihre MXit-ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6175,17 +6212,23 @@
 msgstr "Startbildschirm-Popup aktivieren"
 
 #. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Sie wurden von MultiMX hinausgeworfen."
+
+msgid "was kicked"
+msgstr "wurde hinausgeworfen"
+
+msgid "_Room Name:"
+msgstr "_Raumname:"
+
+#. Display system message in chat window
 #, fuzzy
-msgid "You have been kicked from this MultiMX."
-msgstr "Sie wurden hinausgeworfen: (%s)"
+msgid "You have invited"
+msgstr "Sie haben Post!"
 
 #, fuzzy
-msgid "was kicked"
-msgstr "Falsches Ticket"
-
-#, fuzzy
-msgid "_Room Name:"
-msgstr "_Raum:"
+msgid "Last Online"
+msgstr "Online"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -7512,10 +7555,10 @@
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
-"Sie haben %hu Nachricht von %s nicht erhalten, da die Senderate "
+"Sie haben %hu Nachricht von %s nicht erhalten, da die Datenrate "
 "überschritten wurde."
 msgstr[1] ""
-"Sie haben %hu Nachrichten von %s nicht erhalten, da die Senderate "
+"Sie haben %hu Nachrichten von %s nicht erhalten, da die Datenrate "
 "überschritten wurde."
 
 #, c-format
@@ -7989,11 +8032,11 @@
 msgid "Invalid SNAC"
 msgstr "Ungültiger SNAC"
 
-msgid "Rate to host"
-msgstr "Bewertung zum Host"
-
-msgid "Rate to client"
-msgstr "Bewertung zum Client"
+msgid "Server rate limit exceeded"
+msgstr "Server-Datenrate überschritten"
+
+msgid "Client rate limit exceeded"
+msgstr "Client-Datenrate überschritten"
 
 msgid "Service unavailable"
 msgstr "Dienst nicht verfügbar"
@@ -10283,8 +10326,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferenz- und Chateinladungen ignorieren"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Proxy-Zugang für SSL-Verbindungen benutzen"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Proxy-Zugang für HTTP- und HTTPS-Verbindungen benutzen"
 
 msgid "Chat room list URL"
 msgstr "Chatraumliste (URL)"
@@ -13191,11 +13234,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Wird geschlossen, da bereits ein anderer libpurple-Client läuft\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Medien"
 
-msgid "/Media/_Hangup"
-msgstr "/Medien/_Auflegen"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Auflegen"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14003,9 +14048,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Verwaltung für benutzerdefinierte Smileys"
 
-msgid "Attention received"
-msgstr "Aufmerksamkeitsgesuch erhalten"
-
 msgid "Select Buddy Icon"
 msgstr "Buddy-Icon auswählen"
 
@@ -15515,6 +15557,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
 
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Der eingegebene Spitzname ist ungültig."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit-Login-Name"
+
+#~ msgid "Nick Name"
+#~ msgstr "Spitzname"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Ihre Handynummer..."
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Medien/_Auflegen"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Das Zertifikat ist noch nicht gültig."
+
+#~ msgid "Rate to host"
+#~ msgstr "Bewertung zum Host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Bewertung zum Client"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Unbekannter Grund."
 
--- a/po/dz.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/dz.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2006-11-09 17:11+0530\n"
 "Last-Translator: wangmo sherpa <rinwanshe@yahoo.com>\n"
 "Language-Team:  <pgeygel@dit.gov.bt>\n"
@@ -63,6 +63,10 @@
 msgid "Error"
 msgstr "འཛོལ་བ།"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "རྩིས་ཐོ་འདི་ ཁ་སྐོང་མ་བརྐྱབ་པས།"
+
 msgid "Account was not added"
 msgstr "རྩིས་ཐོ་འདི་ ཁ་སྐོང་མ་བརྐྱབ་པས།"
 
@@ -70,6 +74,14 @@
 msgid "Username of an account must be non-empty."
 msgstr "རྩིས་ཐོ་གི་ གསལ་གཞི་མིང་འདི་ སྟོང་པ་མེན་མི་ཅིག་དགོ།"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ཡིག་འཕྲིན་གསརཔ་གི་བརྡ་བསྐུལ།"
 
@@ -1317,6 +1329,10 @@
 msgid "Someone says your username in chat"
 msgstr "མི་ཅིག་གིས་ ཁ་སླབ་ནང་ ཁྱོད་ཀྱི་མིང་སླབ་མས།"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ཐོ་བཀོད་དགོཔ།"
+
 msgid "GStreamer Failure"
 msgstr "ཇི་སི་ཊི་མར་ འཐུས་ཤོར་འབྱུང་།"
 
@@ -1619,7 +1635,7 @@
 msgid "Online"
 msgstr "གློག་ཐོག"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ཨོཕ་ལ་ཡིན།"
 
@@ -1743,9 +1759,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "གསལ་བཀོད་འབད་འབདཝ་གི་གསལ་གཞི་མིང་འདི་ ནུས་མེད་ཨིན་པས།"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3929,6 +3946,19 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"སར་བརའདི་ལུ་ གསང་བ་མ་བཟོ་བའི་རྒྱུན་རིམ་ལྟག་ལས་ ཚིག་ཡིག་ཉག་རྐྱང་གི་བདེན་བཤད་ དགོས་མཁོ་ཡོདཔ་ཨིན།"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"སར་བར་འདི་ལུ་ གསང་བ་མ་བཟོ་བའི་མཐུད་ལམ་ལྟག་ལས་ཚིག་ཡིག་ཉག་རྐྱང་གི་བདེན་བཤད་ དགོས་མཁོ་ཡོདཔ་ཨིན། "
+"འདི་འབད་བཅུག་ཞིན་ན་ བདེན་བཤད་འཕྲོ་མཐུད་དེ་འབད་ནི་ཨིན་ན?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "བདེན་བཤད་འཐུས་ཤོར་བྱུང་ཡོདཔ།"
 
@@ -6176,7 +6206,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6189,6 +6219,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "བཀྲམ་སྟོན།"
@@ -6259,7 +6290,7 @@
 msgstr "མཐུད་དོ།"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
 
 #, fuzzy
@@ -6267,13 +6298,8 @@
 msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "སྐྱོན་མིང་།"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6306,10 +6332,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6366,8 +6392,8 @@
 msgstr "བར་མའི་མིང་།"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "འགྲུལ་འཕྲིན་ཨང་ གཞི་སྒྲིག་འབད།..."
+msgid "Your MXit ID..."
+msgstr "ཡ་ཧུ!ཨའི་ཌི།"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6395,6 +6421,15 @@
 msgid "_Room Name:"
 msgstr "ཁང་མིག:(_R)"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "ཁྱོད་ལུ་ ཡིག་འཕྲིན་འདུག!"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8250,11 +8285,11 @@
 msgid "Invalid SNAC"
 msgstr "ནུས་མེད་ ཨེསི་ཨེན་ཨེ་སི།"
 
-msgid "Rate to host"
-msgstr "ཧོསཊི་ལུ་ མགྱོགས་ཚད།"
-
-msgid "Rate to client"
-msgstr "ཞབས་ཏོག་སྤྱོད་མི་ལུ་མགྱོགས་ཚད།"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "ཞབས་ཏོག་ཐོབ་མ་ཚུགས།"
@@ -10616,7 +10651,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "གྲོས་ཚོགས་དང་ ཁ་སླབ་ཁང་མིག་མགྲོན་བརྡ་ཚུ་སྣང་མེད་སྦེ་བཞག"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13637,10 +13672,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14518,10 +14553,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "ཐོ་བཀོད་དགོཔ།"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "ཆ་རོགས་སེལ་འཐུ་འབད།"
 
@@ -16088,6 +16119,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "གསལ་བཀོད་འབད་འབདཝ་གི་གསལ་གཞི་མིང་འདི་ ནུས་མེད་ཨིན་པས།"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "མཐའ་བཙན་གྱི་ ཨའི་ཌི་ ལྡེ་མིག་བཙུགས་མི་འདི་ ནུས་མེད་ཨིན་པས།"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "སྐྱོན་མིང་།"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "འགྲུལ་འཕྲིན་ཨང་ གཞི་སྒྲིག་འབད།..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ཧོསཊི་ལུ་ མགྱོགས་ཚད།"
+
+#~ msgid "Rate to client"
+#~ msgstr "ཞབས་ཏོག་སྤྱོད་མི་ལུ་མགྱོགས་ཚད།"
+
 #~ msgid "Unknown reason."
 #~ msgstr "ངོ་མ་ཤེས་པའི་རྒྱུ་མཚན།"
 
--- a/po/el.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/el.po	Sat Jul 31 23:42:35 2010 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: pidgin[el]\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2009-07-16 16:48+0300\n"
 "Last-Translator: Bouklis Panos <panos@echidna-band.com>\n"
 "Language-Team: Greek <i18ngr@lists.hellug.gr>\n"
@@ -64,12 +64,24 @@
 msgid "Error"
 msgstr "Σφάλμα"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Ο λογαριασμός δεν προστέθηκε"
+
 msgid "Account was not added"
 msgstr "Ο λογαριασμός δεν προστέθηκε"
 
 msgid "Username of an account must be non-empty."
 msgstr "Το εμφανιζόμενο όνομα ενός λογαριασμού δεν πρέπει να είναι κενό."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Ειδοποιήσεις νέας αλληλογραφίας"
 
@@ -1266,6 +1278,10 @@
 msgid "Someone says your username in chat"
 msgstr "Κάποιος είπε το όνομά σας σε μια συζήτηση"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Απαιτείται ενεργοποίηση"
+
 msgid "GStreamer Failure"
 msgstr "Αποτυχία GStreamer"
 
@@ -1563,7 +1579,7 @@
 msgid "Online"
 msgstr "Συνδεδεμένος"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Χωρίς σύνδεση"
 
@@ -1684,9 +1700,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Η αλυσίδα πιστοποιητικού που παρουσιάστηκε για %s δεν είναι έγκυρη."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3854,6 +3871,20 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Ο εξυπηρετητής απαιτεί έγκριση με σκέτο κείμενο μέσω μιας μη κωδικοποιημένης "
+"ροής"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Το %s απαιτεί έγκριση με σκέτο κείμενο μέσω μιας μη κρυπτογραφημένης "
+"σύνδεσης.  Να επιτραπεί και να συνεχιστεί η επικύρωση;"
+
 msgid "SASL authentication failed"
 msgstr "Αποτυχία έγκρισης SASL"
 
@@ -6017,7 +6048,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6030,6 +6061,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Επώνυμο"
@@ -6103,7 +6135,7 @@
 msgstr "Γίνεται σύνδεση"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
 
 #, fuzzy
@@ -6111,13 +6143,8 @@
 msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Ψευδώνυμο"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6147,10 +6174,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6207,8 +6234,8 @@
 msgstr "Πατρώνυμο"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Ορισ�ός κινητού τηλεφώνου..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6236,6 +6263,15 @@
 msgid "_Room Name:"
 msgstr "_Δωμάτιο:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Έχετε νέα αλληλογραφία!"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8069,11 +8105,11 @@
 msgid "Invalid SNAC"
 msgstr "Μη έγκυρο SNAC"
 
-msgid "Rate to host"
-msgstr "Βαθμολόγηση συστήματος"
-
-msgid "Rate to client"
-msgstr "Βαθμολόγηση χρήστη"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Υπηρεσία μη διαθέσιμη"
@@ -10342,7 +10378,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Παράβλεψη προσκλήσεων συζητήσεων και δωματίων συζητήσεων"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13212,10 +13248,11 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Έξοδος επειδή ήδη τρέχει ένας άλλος πελάτης της libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Πολυμέσα"
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14053,10 +14090,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Διαχειριστής προσαρμοσμένων φατσουλών"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Απαιτείται ενεργοποίηση"
-
 msgid "Select Buddy Icon"
 msgstr "Επιλογή εικονιδίου φίλου"
 
@@ -15569,6 +15602,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Η αλυσίδα πιστοποιητικού που παρουσιάστηκε για %s δεν είναι έγκυρη."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Το SecurID που πληκτρολογήθηκε είναι λανθασμένο"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Ψευδώνυμο"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Ορισ�ός κινητού τηλεφώνου..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Βαθμολόγηση συστήματος"
+
+#~ msgid "Rate to client"
+#~ msgstr "Βαθμολόγηση χρήστη"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Άγνωστη αιτία."
 
--- a/po/en_AU.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/en_AU.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2005-01-19 07:55+1100\n"
 "Last-Translator: Peter (Bleeter) Lawler <trans@six-by-nine.com.au>\n"
 "Language-Team: English/AU <trans@six-by-nine.com.au>\n"
@@ -52,12 +52,24 @@
 msgstr "Error"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Account has been disabled"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Account has been disabled"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
@@ -1333,6 +1345,10 @@
 msgid "Someone says your username in chat"
 msgstr "Someone says your name in chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registration Required"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1647,7 +1663,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1775,9 +1791,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "The SecurID key entered is invalid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3988,6 +4005,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Authentication failed"
 
@@ -6266,7 +6295,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6279,6 +6308,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Display"
@@ -6353,7 +6383,7 @@
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
 #, fuzzy
@@ -6361,13 +6391,8 @@
 msgstr "The SecurID key entered is invalid."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nickname"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6405,10 +6430,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6465,8 +6490,8 @@
 msgstr "Middle Name"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Set Mobile Phone Number"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6494,6 +6519,15 @@
 msgid "_Room Name:"
 msgstr "_Room:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -8348,11 +8382,11 @@
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-msgid "Rate to host"
-msgstr "Rate to host"
-
-msgid "Rate to client"
-msgstr "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Service unavailable"
@@ -10785,7 +10819,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
@@ -13860,10 +13894,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14774,10 +14808,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Registration Required"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Select Buddy"
 
@@ -16369,6 +16399,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Set Mobile Phone Number"
+
+#~ msgid "Rate to host"
+#~ msgstr "Rate to host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rate to client"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Unknown reason."
 
--- a/po/en_CA.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/en_CA.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2005-03-17 19:45-0400\n"
 "Last-Translator: Adam Weinberger <adamw@gnome.org>\n"
 "Language-Team: Canadian English <adamw@gnome.org>\n"
@@ -52,12 +52,24 @@
 msgstr "Error"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Account has been disabled"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Account has been disabled"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
@@ -1333,6 +1345,10 @@
 msgid "Someone says your username in chat"
 msgstr "Someone says your name in chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registration Required"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1647,7 +1663,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1775,9 +1791,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "The SecurID key entered is invalid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3990,6 +4007,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Authentication failed"
 
@@ -6257,7 +6286,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6270,6 +6299,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Display"
@@ -6344,7 +6374,7 @@
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The SecurID key entered is invalid."
 
 #, fuzzy
@@ -6352,13 +6382,8 @@
 msgstr "The SecurID key entered is invalid."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nickname"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6396,10 +6421,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6456,8 +6481,8 @@
 msgstr "Middle Name"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Set Mobile Phone Number"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6485,6 +6510,15 @@
 msgid "_Room Name:"
 msgstr "_Room:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -8337,11 +8371,11 @@
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-msgid "Rate to host"
-msgstr "Rate to host"
-
-msgid "Rate to client"
-msgstr "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Service unavailable"
@@ -10774,7 +10808,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
@@ -13849,10 +13883,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14763,10 +14797,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Registration Required"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Select Buddy"
 
@@ -16358,6 +16388,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Set Mobile Phone Number"
+
+#~ msgid "Rate to host"
+#~ msgstr "Rate to host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rate to client"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Unknown reason."
 
--- a/po/en_GB.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/en_GB.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2006-02-07 13:57+0000\n"
 "Last-Translator: Luke Ross <luke@lukeross.name>\n"
 "Language-Team:  <en_GB@li.org>\n"
@@ -60,12 +60,24 @@
 msgid "Error"
 msgstr "Error"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Account was not added"
+
 msgid "Account was not added"
 msgstr "Account was not added"
 
 msgid "Username of an account must be non-empty."
 msgstr "Username of an account must be non-empty."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "New mail notifications"
 
@@ -1248,6 +1260,10 @@
 msgid "Someone says your username in chat"
 msgstr "Someone says your username in chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Activation required"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer Failure"
 
@@ -1541,7 +1557,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1662,9 +1678,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "The certificate chain presented for %s is not valid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3808,6 +3825,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+
 msgid "SASL authentication failed"
 msgstr "SASL Authentication failed"
 
@@ -5961,7 +5990,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5974,6 +6003,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Family Name"
@@ -6047,7 +6077,7 @@
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The SecurID key entered is invalid"
 
 #, fuzzy
@@ -6055,13 +6085,8 @@
 msgstr "The SecurID key entered is invalid"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nickname"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6091,10 +6116,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6151,8 +6176,8 @@
 msgstr "Middle Name"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Set Mobile Phone Number..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6180,6 +6205,15 @@
 msgid "_Room Name:"
 msgstr "_Room:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "You have email!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. 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 ""
@@ -7975,11 +8009,11 @@
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-msgid "Rate to host"
-msgstr "Rate to host"
-
-msgid "Rate to client"
-msgstr "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Service unavailable"
@@ -10233,7 +10267,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignore conference and chatroom invitations"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13102,11 +13136,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Exiting because another libpurple client is already running.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Hangup"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Hangup"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13930,10 +13966,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Custom Smiley Manager"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Activation required"
-
 msgid "Select Buddy Icon"
 msgstr "Select Buddy Icon"
 
@@ -15417,6 +15449,31 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "The certificate chain presented for %s is not valid."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "The SecurID key entered is invalid"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Set Mobile Phone Number..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Rate to host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rate to client"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Hangup"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Unknown reason."
 
--- a/po/eo.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/eo.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: eo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2009-08-16 20:26+0200\n"
 "Last-Translator: Stéphane Fillod <fillods@users.sourceforge.net>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
@@ -59,12 +59,24 @@
 msgid "Error"
 msgstr "Eraro"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Konto ne estis aldonita"
+
 msgid "Account was not added"
 msgstr "Konto ne estis aldonita"
 
 msgid "Username of an account must be non-empty."
 msgstr "Uzantonomo de konto ne devas esti malplena."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Nova retpoŝt-avizoj"
 
@@ -1217,6 +1229,10 @@
 msgid "Someone says your username in chat"
 msgstr "Iun diras vian uzantnomon en babilejo"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registrado postulita"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer Malsukceso"
 
@@ -1499,7 +1515,7 @@
 msgid "Online"
 msgstr "Enrete"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Senkonekta"
 
@@ -1615,9 +1631,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "La enigita uzantnomo malvalidas."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3661,6 +3678,16 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Permesi plattekstan permeson tra malĉifritaj datumstrioj"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 msgid "SASL authentication failed"
 msgstr "SASL aŭtentokontrolo malsukcesis"
 
@@ -5749,7 +5776,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5762,6 +5789,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Familia Nomo"
@@ -5829,7 +5857,7 @@
 msgstr "Konektante"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "La enigita SecurID malvalidas."
 
 #, fuzzy
@@ -5837,13 +5865,8 @@
 msgstr "La enigita SecurID malvalidas."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Karesnomo"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5872,10 +5895,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5930,8 +5953,8 @@
 msgstr "Meza Nomo"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Difiniu Poŝtelefonan Numeron..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5959,6 +5982,15 @@
 msgid "_Room Name:"
 msgstr "_Ĉambro:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Vi ricevis retmesaĝon!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Enrete"
+
 #. 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 ""
@@ -7652,10 +7684,10 @@
 msgid "Invalid SNAC"
 msgstr "Malvalida SNAC"
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -9809,7 +9841,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoru konferencajn kaj babilejan invitojn"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12586,10 +12618,12 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Medio"
 
-msgid "/Media/_Hangup"
+#, fuzzy
+msgid "_Hangup"
 msgstr "/Medio/_Rekroĉi"
 
 #, c-format
@@ -13402,10 +13436,6 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Registrado postulita"
-
 msgid "Select Buddy Icon"
 msgstr "Elektu Kunulan Piktogramon"
 
@@ -14850,6 +14880,22 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "La enigita uzantnomo malvalidas."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "La enigita SecurID malvalidas."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Karesnomo"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Difiniu Poŝtelefonan Numeron..."
+
 #~ msgid "Unknown reason."
 #~ msgstr "Nekonata kialo."
 
--- a/po/es.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/es.po	Sat Jul 31 23:42:35 2010 +0000
@@ -1,4 +1,4 @@
-# Pidgin (formerly known as Pidgin) Spanish translation
+# Pidgin (formerly known as Gaim) Spanish translation
 # Copyright (C) March 2002, Amaya Rodrigo <amaya@debian.org>
 # Copyright (C) April 2002, Alejandro G Villar <alx5000@terra.es>
 # Copyright (C) November 2002-January 2003, Nicolás Lichtmaier <nick@technisys.com.ar>
@@ -6,7 +6,7 @@
 # Copyright (c) December 2003, Francisco Javier F. Serrador
 #               <franciscojavier.fernandez.serrador@hispalinux.es>, 2003.
 # Copyright (C) June 2002, April 2003, January 2004, March 2004, September 2004,
-# 	      January 2005, 2006-2008, July 2009
+# 	      January 2005, 2006-2008, July 2009, July 2010
 # 		Javier Fernández-Sanguino Peña  <jfs@debian.org>
 # Copyright (C) February 2010, Francisco Javier F. Serrador <fserrador@gmail.com>
 #
@@ -53,8 +53,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
-"PO-Revision-Date: 2009-08-05 01:47+0200\n"
+"POT-Creation-Date: 2010-07-27 02:07-0400\n"
+"PO-Revision-Date: 2010-07-25 16:41+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "Language: \n"
@@ -62,7 +62,63 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-POFile-SpellExtra: gt cian PUFs gg SIP changePassword\n"
+"X-POFile-SpellExtra: gt cian PUFs gg SIP changePassword query libpurple\n"
+"X-POFile-SpellExtra: YCHT Pidgin send mDNS GNOME GG hiperenlaces VERSION\n"
+"X-POFile-SpellExtra: Maratí moderator CTCP list leave Captcha Jabber zl\n"
+"X-POFile-SpellExtra: cfm zi core CMD nickserv zc notifíquelo plugins\n"
+"X-POFile-SpellExtra: Kannada ActiveTCL index sub operwall version Sálvese\n"
+"X-POFile-SpellExtra: activestate net Qun PKCS Amhárico hash Gnome pidgin\n"
+"X-POFile-SpellExtra: codecs Gadu Galeon receive items bot Za action Oriya\n"
+"X-POFile-SpellExtra: SMS Previsualizar myim openserv names vd Status zir\n"
+"X-POFile-SpellExtra: deop doodle perl call msj msg libfaim Konqueror Quns\n"
+"X-POFile-SpellExtra: Meebo webmaster none join MMS install MOTD Surfeando\n"
+"X-POFile-SpellExtra: JID topic captcha MITM Encaminadores magenta\n"
+"X-POFile-SpellExtra: sip hoc ping config profile fs savedstatuses Url ABI\n"
+"X-POFile-SpellExtra: inst HTTPS Hiptop envíenos UDP MySpace CAPTCHA PNG\n"
+"X-POFile-SpellExtra: Swahili Seamonkey help Telugu Purple xmpp\n"
+"X-POFile-SpellExtra: PortapapelesGnt Re FND developer jid Trillian AOL lt\n"
+"X-POFile-SpellExtra: lu MIs Tamil URL timestamp CHL URI devel detach\n"
+"X-POFile-SpellExtra: register IPC chanserv SNAC SERVER VIP msgcolor mode\n"
+"X-POFile-SpellExtra: debug buddylist Perl Live SOCKS Passport http\n"
+"X-POFile-SpellExtra: autoaceptada hacker RTF inténtelo Urdu Netscape\n"
+"X-POFile-SpellExtra: deregistrar SHA TinyURL cookie proxy org debugwinInt\n"
+"X-POFile-SpellExtra: SecurID SSL Chat swiki puny fuseaction oper Mozilla\n"
+"X-POFile-SpellExtra: Authzid MUC owner myspace anyone SASL TLS GTK zlocate\n"
+"X-POFile-SpellExtra: iChat part msnim lazy zcir PDA SPAM reconectarse\n"
+"X-POFile-SpellExtra: Sinhala PubSub pre iTunes cmode DD voices say\n"
+"X-POFile-SpellExtra: desregistro KiB Middle encaminador instance\n"
+"X-POFile-SpellExtra: modosusuario Ticket resetear quote ssimpleticket\n"
+"X-POFile-SpellExtra: alpha QQ webcam Google clear QA autoaceptación\n"
+"X-POFile-SpellExtra: GStreamer visitor bum encaminadores Desuscribir\n"
+"X-POFile-SpellExtra: deregistrado GNUTLS Meanwhile Audiollamada stanza\n"
+"X-POFile-SpellExtra: info dh babble dd BOSH dx getkey Display AAAA\n"
+"X-POFile-SpellExtra: Afrikaans Autoaceptar remove Kong ban Butaní wiki\n"
+"X-POFile-SpellExtra: aMSN malformada Doodle malformado Inténtelo Sametime\n"
+"X-POFile-SpellExtra: close stats DBus TCU TCP TCL Thai irc Info notice\n"
+"X-POFile-SpellExtra: Siéntase Server subs highlight UbicaciónExt cumode\n"
+"X-POFile-SpellExtra: ircop Firefox admin portapapeles CLIENT buzz com dm\n"
+"X-POFile-SpellExtra: PEP HistóricoGnt PEM devoice away UIN ad conference\n"
+"X-POFile-SpellExtra: quit Khmer Relay bieloruso Yahoo swf Laosiano ctcp\n"
+"X-POFile-SpellExtra: Switchboard username Epiphany WAP gnt Reconectar\n"
+"X-POFile-SpellExtra: OpenQ GntLastlog aim voice Nepalís Album motd stdout\n"
+"X-POFile-SpellExtra: XMPP CVR umode AIM tzc im conf in PONG VCard DIR\n"
+"X-POFile-SpellExtra: participant whois make toaster Tcl member Mobile Bokm\n"
+"X-POFile-SpellExtra: NSS status UTC UTF wallops Asamís outcast IM Punjabí\n"
+"X-POFile-SpellExtra: Reconectarse IC IRC Vd Xtraz Nynorsk PING Babble\n"
+"X-POFile-SpellExtra: command the fué Despiértame Thanh BOS Ping\n"
+"X-POFile-SpellExtra: Autorechazar kill Hotmail nudge UID freenode ésto\n"
+"X-POFile-SpellExtra: TURN contribuído BonjourWindows pubkey QIP kick\n"
+"X-POFile-SpellExtra: editprofile ops stunserver zephyr Farsight desh\n"
+"X-POFile-SpellExtra: Malayalam Talk hiperenlace Cheung www Sub zci\n"
+"X-POFile-SpellExtra: Messenger Finch halfops MySpaceIM mood Fire Zephyr\n"
+"X-POFile-SpellExtra: Deregistrar affiliate icq Chats Adium Bot Novell\n"
+"X-POFile-SpellExtra: socket whowas op Hong URLs MXit Gujarati SILC\n"
+"X-POFile-SpellExtra: accounts CAPTCHAs NET log support Cookie Ubuntu\n"
+"X-POFile-SpellExtra: Bonjour chats Firebird hu deregistro DNS switchboard\n"
+"X-POFile-SpellExtra: count prefs default gstreamer Vídeollamada GntFg\n"
+"X-POFile-SpellExtra: mDNSResponder RedirectEX GroupWise MSN Hing chat\n"
+"X-POFile-SpellExtra: nologin PINes nick Proxy Man users AP memoserv AV ICQ\n"
+"X-POFile-SpellExtra: roleando HMAC clientLogin vCard GetABacktrace\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -101,7 +157,7 @@
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s se encontró con errors al migrar su configuración de %s a %s. Investigue "
+"%s se encontró con errores al migrar su configuración de %s a %s. Investigue "
 "el problema y complete la migración de forma manual. Por favor, informe de "
 "este error en http://developer.pidgin.im"
 
@@ -109,12 +165,27 @@
 msgid "Error"
 msgstr "Error"
 
+msgid "Account was not modified"
+msgstr "No se ha modificado la cuenta"
+
 msgid "Account was not added"
 msgstr "No se ha añadido la cuenta"
 
 msgid "Username of an account must be non-empty."
 msgstr "El nombre de usuario de una cuenta no puede estar vacío."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"El protocolo de la cuenta no puede modificarse mientras se está conectado al "
+"servidor."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"La cuenta de usuario no puede modificarse mientras está conectado al "
+"servidor."
+
 msgid "New mail notifications"
 msgstr "Notificaciones de correo nuevo"
 
@@ -647,7 +718,7 @@
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
 "Se ha desconectado la cuenta y ya no está en el chat. Se unirá "
-"automáticamenet al chat cuando se vuelva a conectar la cuenta."
+"automáticamente al chat cuando se vuelva a conectar la cuenta."
 
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
@@ -780,7 +851,7 @@
 "color para distintas clases de mensajes en la ventana de conversación."
 "<br>    &lt;clase&gt;: send (enviar), receive (recibir), highlight (marcar), "
 "action (acción), timestamp (marca de tiempo)<br>    &lt;primer plano/segundo "
-"plano&gt;: negro, rojo, verde, azúl, blanco, gris, gris oscuro, magenta, "
+"plano&gt;: negro, rojo, verde, azul, blanco, gris, gris oscuro, magenta, "
 "cian, «default» (por omisión)<br><br>EJEMPLO:<br>    msgcolor send cian "
 "default"
 
@@ -1274,10 +1345,10 @@
 msgstr "Abrir archivo..."
 
 msgid "Choose Location..."
-msgstr "Escojer ubicación..."
+msgstr "Escoger ubicación..."
 
 msgid "Hit 'Enter' to find more rooms of this category."
-msgstr "Pulse «Intro» para buscar más salas en esta categoría."
+msgstr "Pulse «Enter» para buscar más salas en esta categoría."
 
 msgid "Get"
 msgstr "Obtener"
@@ -1316,6 +1387,9 @@
 msgid "Someone says your username in chat"
 msgstr "Alguien dice su nombre en el chat"
 
+msgid "Attention received"
+msgstr "Recibida atención"
+
 msgid "GStreamer Failure"
 msgstr "Fallo de gstreamer"
 
@@ -1471,7 +1545,7 @@
 msgstr "Estados"
 
 msgid "Error loading the plugin."
-msgstr "Erro al cargar el complemento."
+msgstr "Error al cargar el complemento."
 
 msgid "Couldn't find X display"
 msgstr "No se pudo encontrar la pantalla X"
@@ -1586,13 +1660,13 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL para lo anterior: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
+msgstr "Por favor espere mientras TinyURL genera una URL más corta ..."
 
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "Sólo crear TinyURL para URLs de esta longitudo o superior"
+msgstr "Sólo crear TinyURL para URLs de esta longitud o superior"
 
 msgid "TinyURL (or other) address prefix"
 msgstr "Prefijo de dirección de TinyURL (u otro)"
@@ -1610,7 +1684,7 @@
 msgid "Online"
 msgstr "Conectado"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -1703,13 +1777,11 @@
 msgid "Set User Info"
 msgstr "Establecer su información de usuario"
 
-#, fuzzy
 msgid "This protocol does not support setting a public alias."
-msgstr "Este protocolo no está soportado en las habitaciones de chats."
-
-#, fuzzy
+msgstr "Este protocolo no permite definir un apodo público."
+
 msgid "This protocol does not support fetching the public alias."
-msgstr "Este protocolo no está soportado en las habitaciones de chats."
+msgstr "Este protocolo no permite obtener los apodos públicos."
 
 msgid "Unknown"
 msgstr "Desconocido"
@@ -1730,8 +1802,12 @@
 "El certificado no es confiado porque no certifica que puede verificarlo es "
 "actualmente confiado"
 
-msgid "The certificate is not valid yet."
-msgstr "El certificado no es aún válido."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"El certificado no es válido aún. Compruebe que la fecha y hora de su "
+"ordenador son correctas."
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "El certificado ha expirado y no sería considerado válido."
@@ -1771,7 +1847,7 @@
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
-"Nombre comú: %s %s\n"
+"Nombre común: %s %s\n"
 "Huella (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
@@ -2277,7 +2353,7 @@
 "packages."
 msgstr ""
 "No se encontró ningún código. Instale algunos códigos que se encuentran en "
-"los paquetes de los plugings de GStreamer."
+"los paquetes de complementos de GStreamer."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
@@ -2574,7 +2650,7 @@
 msgstr "Para habitaciones con más de toda esta gente excesiva"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Si el usuario no ha hablado en estos minutos"
 
 msgid "Apply hiding rules to buddies"
 msgstr "Aplicar las reglas de ocultación a los amigos"
@@ -2723,7 +2799,7 @@
 "Trillian.\n"
 "\n"
 "AVISO: Este complemento aún es código en estado «alpha» y puede bloquearse "
-"con frecuencia. ¡Uselo bajo su propia responsabilidad!"
+"con frecuencia. ¡Úselo bajo su propia responsabilidad!"
 
 msgid "Mono Plugin Loader"
 msgstr "Cargador de complementos Mono"
@@ -3159,7 +3235,7 @@
 msgstr "Introducir texto del captcha"
 
 msgid "Captcha"
-msgstr ""
+msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrando cuenta nueva de Gadu-Gadu"
@@ -3492,7 +3568,7 @@
 
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
-msgstr "Explusado de %s por %s, hace %s"
+msgstr "Expulsado de %s por %s, hace %s"
 
 #, c-format
 msgid "Ban on %s"
@@ -3901,6 +3977,20 @@
 
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
+"El servidor piensa que la autenticación ha terminado, pero el cliente no "
+"piensa lo mismo"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"El servidor puede solicitar autenticación en claro sobre un canal no cifrado"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s puede solicitar autenticación en claro sobre un canal no cifrado. ¿Desea "
+"permitir ésto y continuar con el proceso de autenticación?"
 
 msgid "SASL authentication failed"
 msgstr "Falló la autenticación SASL"
@@ -3909,57 +3999,54 @@
 msgid "SASL error: %s"
 msgstr "Error de SASL: %s"
 
-#, fuzzy
 msgid "Invalid Encoding"
-msgstr "Condición de entrada inválida"
-
-#, fuzzy
+msgstr "Codificación inválida"
+
 msgid "Unsupported Extension"
-msgstr "Versión no soportada"
+msgstr "Extensión no soportada"
 
 msgid ""
 "Unexpected response from the server.  This may indicate a possible MITM "
 "attack"
 msgstr ""
+"Respuesta inesperada del servidor. Esto puede indicar un posible ataque de "
+"tercero interpuesto («MITM», o «Man in the Middle»)"
 
 msgid ""
 "The server does support channel binding, but did not appear to advertise "
 "it.  This indicates a likely MITM attack"
 msgstr ""
-
-#, fuzzy
+"El servidor no permite la asociación a un canal, pero no parece indicarlo. "
+"Esto puede indicar un ataque de tercero interpuesto («MITM», o «Man in the "
+"Middle»)"
+
 msgid "Server does not support channel binding"
-msgstr "El servidor no soporta bloqueos"
-
-#, fuzzy
+msgstr "El servidor no soporta la asociación al canal"
+
 msgid "Unsupported channel binding method"
-msgstr "Codificación no soportada"
+msgstr "Método de asociación al canal no soportada"
 
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#, fuzzy
 msgid "Invalid Username Encoding"
-msgstr "Nombre de usuario no válido"
+msgstr "Codificación del nombre de usuario inválida"
 
 msgid "Resource Constraint"
 msgstr "Restricción de recursos"
 
-#, fuzzy
 msgid "Unable to canonicalize username"
-msgstr "No se pudo configurar"
-
-#, fuzzy
+msgstr "No se pudo convertir el nombre de usuario"
+
+# No se pudo convertir la contraseña a forma canónica
 msgid "Unable to canonicalize password"
-msgstr "No se pudo enviar la contraseña"
-
-#, fuzzy
+msgstr "No se pudo convertir la contraseña a forma canónica"
+
 msgid "Malicious challenge from server"
-msgstr "Desafío inválido del servidor"
-
-#, fuzzy
+msgstr "Desafío malicioso del servidor"
+
 msgid "Unexpected response from server"
-msgstr "Se recibió una respuesta HTTP del servidor que no se esperaba"
+msgstr "Respuesta no esperada del servidor"
 
 msgid "The BOSH connection manager terminated your session."
 msgstr "El gestor de conexiones BOSH terminó su sesión."
@@ -4092,11 +4179,11 @@
 msgid "Logo"
 msgstr "Logotipo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
-msgstr "Está a punto eliminar a %s de su lista de amigos. ¿Desea continuar?"
+msgstr "%s no podrá ver sus actualizaciones de estado. ¿Desea continuar?"
 
 msgid "Cancel Presence Notification"
 msgstr "Cancelar notificación de presencia"
@@ -4266,9 +4353,8 @@
 msgid "Invalid XMPP ID"
 msgstr "XMPP ID no válido"
 
-#, fuzzy
 msgid "Invalid XMPP ID. Username portion must be set."
-msgstr "XMPP ID inválido. Debe establecerse el dominio."
+msgstr "XMPP ID inválido. Debe establecerse la porción de usuario."
 
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "XMPP ID inválido. Debe establecerse el dominio."
@@ -4404,13 +4490,11 @@
 msgid "Allow Buzz"
 msgstr "Permitir codazos"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Nombre medio"
-
-#, fuzzy
+msgstr "Nombre de estado de ánimo"
+
 msgid "Mood Comment"
-msgstr "Comentario de amigo"
+msgstr "Comentario de estado de ánimo"
 
 #. primitive
 #. ID
@@ -4701,9 +4785,8 @@
 msgid "Initiate Media"
 msgstr "Iniciar medio"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Este protocolo no está soportado en las habitaciones de chats."
+msgstr "La cuenta no soporta PEP, no se puede establecer el estado de ánimo."
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Configurar una sala de chat."
@@ -4711,9 +4794,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Configurar una sala de chat"
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [habitación]:  Abandonar la habitación."
+msgstr "part [mensaje]:  Abandonar la habitación."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Registrarse en una sala de chat."
@@ -4732,7 +4814,6 @@
 "Obtener los usuarios con una afiliación o fijar la afiliación de un usuario "
 "a la sala."
 
-#, fuzzy
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
@@ -4762,9 +4843,8 @@
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Dar un codazo a un usuario para llamar su atención"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Seleccione el usuario correcto"
+msgstr "mood: Establecer el estado de ánimo del usuario"
 
 msgid "Extended Away"
 msgstr "Ausencia extendida"
@@ -4842,18 +4922,18 @@
 msgid "(Code %s)"
 msgstr "(Código %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "No se pudo enviar el mensaje: es demasiado grande."
+msgstr ""
+"Hay un emoticono en el mensaje que es demasiado grande para poder enviarlo."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Falta la cabecera del flujo XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "La versión XMPP no coincide"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "Falta el ID del flujo XMPP"
 
 msgid "XML Parse error"
 msgstr "Error de tratamiento XML"
@@ -4933,31 +5013,26 @@
 msgstr "Elija el recurso de %s al que quiera enviar un archivo"
 
 # Amhario
-#, fuzzy
 msgid "Afraid"
-msgstr "Árabe"
-
-#, fuzzy
+msgstr "Asustado"
+
 msgid "Amazed"
-msgstr "Avergonzado"
-
-#, fuzzy
+msgstr "Sorprendido"
+
 msgid "Amorous"
-msgstr "Glorioso"
+msgstr "Amoroso"
 
 msgid "Angry"
 msgstr "Furioso"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Expulsado"
+msgstr "Molesto"
 
 msgid "Anxious"
 msgstr "Ansioso"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Usted envía"
+msgstr "Excitado"
 
 msgid "Ashamed"
 msgstr "Avergonzado"
@@ -4965,153 +5040,125 @@
 msgid "Bored"
 msgstr "Aburrido"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Guardar"
-
-#, fuzzy
+msgstr "Bravo"
+
 msgid "Calm"
-msgstr "Dominio"
-
-#, fuzzy
+msgstr "Tranquilo"
+
 msgid "Cautious"
-msgstr "Chats"
-
-#, fuzzy
+msgstr "Cauteloso"
+
 msgid "Cold"
-msgstr "Negrita"
-
-#, fuzzy
+msgstr "Frío"
+
 msgid "Confident"
-msgstr "Conflicto"
-
-#, fuzzy
+msgstr "Confiado"
+
 msgid "Confused"
-msgstr "Continuar"
-
-#, fuzzy
+msgstr "Confuso"
+
 msgid "Contemplative"
-msgstr "Contacto"
-
-#, fuzzy
+msgstr "Contemplativo"
+
 msgid "Contented"
-msgstr "Conectado"
-
-#, fuzzy
+msgstr "Contento"
+
 msgid "Cranky"
-msgstr "Compañía"
+msgstr "Antipático"
 
 msgid "Crazy"
-msgstr ""
-
-#, fuzzy
+msgstr "Loco"
+
 msgid "Creative"
-msgstr "Crear"
-
-#, fuzzy
+msgstr "Creativo"
+
 msgid "Curious"
-msgstr "Glorioso"
-
-#, fuzzy
+msgstr "Curioso"
+
 msgid "Dejected"
-msgstr "Rechazar"
-
-#, fuzzy
+msgstr "Hundido"
+
 msgid "Depressed"
-msgstr "Borrar"
-
-#, fuzzy
+msgstr "Deprimido"
+
 msgid "Disappointed"
-msgstr "Desconectado."
+msgstr "Decepcionado"
 
 msgid "Disgusted"
-msgstr ""
-
-#, fuzzy
+msgstr "Disgustado"
+
 msgid "Dismayed"
-msgstr "_Deshabilitar"
-
-#, fuzzy
+msgstr "Consternado"
+
 msgid "Distracted"
-msgstr "Desligado"
+msgstr "Distraído"
 
 msgid "Embarrassed"
-msgstr ""
-
-#, fuzzy
+msgstr "Avergonzado"
+
 msgid "Envious"
-msgstr "Ansioso"
+msgstr "Envidioso"
 
 msgid "Excited"
 msgstr "Excitado"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Glorioso"
-
-#, fuzzy
+msgstr "Coqueta"
+
 msgid "Frustrated"
-msgstr "Nombre:"
+msgstr "Frustrado"
 
 msgid "Grateful"
-msgstr ""
-
-#, fuzzy
+msgstr "Agradecido"
+
 msgid "Grieving"
-msgstr "Obteniendo..."
-
-#, fuzzy
+msgstr "Triste"
+
 msgid "Grumpy"
-msgstr "Grupo"
-
-#, fuzzy
+msgstr "Quejica"
+
 msgid "Guilty"
-msgstr "Ciudad"
+msgstr "Culpable"
 
 msgid "Happy"
 msgstr "Feliz"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Esperanzado"
 
 msgid "Hot"
-msgstr "Calor"
+msgstr "Acalorado"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Humilde"
 
 msgid "Humiliated"
-msgstr ""
-
-#, fuzzy
+msgstr "Humillado"
+
 msgid "Hungry"
-msgstr "Furioso"
-
-#, fuzzy
+msgstr "Hambriento"
+
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Herido"
 
 msgid "Impressed"
-msgstr ""
-
-#, fuzzy
+msgstr "Impresionado"
+
 msgid "In awe"
-msgstr "Enamorado"
+msgstr "Extasiado"
 
 msgid "In love"
 msgstr "Enamorado"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonesio"
-
-#, fuzzy
+msgstr "Indignado"
+
 msgid "Interested"
-msgstr "Aficiones"
-
-#, fuzzy
+msgstr "Interesado"
+
 msgid "Intoxicated"
-msgstr "Invitar"
+msgstr "Intoxicado"
 
 msgid "Invincible"
 msgstr "Invencible"
@@ -5119,83 +5166,68 @@
 msgid "Jealous"
 msgstr "Celoso"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Mono"
-
-#, fuzzy
+msgstr "Sólo"
+
 msgid "Lost"
-msgstr "El más ruidoso"
+msgstr "Perdido"
 
 msgid "Lucky"
-msgstr ""
-
-#, fuzzy
+msgstr "Afortunado"
+
 msgid "Mean"
-msgstr "Alemán"
-
-#, fuzzy
+msgstr "Malvado"
+
 msgid "Moody"
-msgstr "Estado de ánimo"
+msgstr "Triste"
 
 msgid "Nervous"
-msgstr ""
-
-#, fuzzy
+msgstr "Nervioso"
+
 msgid "Neutral"
-msgstr "Detalle"
-
-#, fuzzy
+msgstr "Neutral"
+
 msgid "Offended"
-msgstr "Desconectado"
+msgstr "Ofendido"
 
 msgid "Outraged"
-msgstr ""
-
-#, fuzzy
+msgstr "Asombrado"
+
 msgid "Playful"
-msgstr "Reproducir"
-
-#, fuzzy
+msgstr "Juguetón"
+
 msgid "Proud"
-msgstr "Ruidoso"
-
-#, fuzzy
+msgstr "Orgulloso"
+
 msgid "Relaxed"
-msgstr "Nombre real"
-
-#, fuzzy
+msgstr "Relajado"
+
 msgid "Relieved"
-msgstr "Recibido"
-
-#, fuzzy
+msgstr "Aliviado"
+
 msgid "Remorseful"
-msgstr "Quitar"
-
-#, fuzzy
+msgstr "Arrepentido"
+
 msgid "Restless"
-msgstr "Registrar"
+msgstr "Incansable"
 
 msgid "Sad"
 msgstr "Triste"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Gujarati"
+msgstr "Sarcástico"
 
 msgid "Satisfied"
-msgstr ""
-
-#, fuzzy
+msgstr "Satisfecho"
+
 msgid "Serious"
-msgstr "Glorioso"
-
-#, fuzzy
+msgstr "Serio"
+
 msgid "Shocked"
-msgstr "Bloqueado"
+msgstr "Alucinado"
 
 msgid "Shy"
-msgstr ""
+msgstr "Tímido"
 
 msgid "Sick"
 msgstr "Enfermo"
@@ -5205,40 +5237,34 @@
 msgstr "Dormido"
 
 msgid "Spontaneous"
-msgstr ""
-
-#, fuzzy
+msgstr "Espontáneo"
+
 msgid "Stressed"
-msgstr "Velocidad"
-
-#, fuzzy
+msgstr "Estresado"
+
 msgid "Strong"
-msgstr "Canción"
+msgstr "Fuerte"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Sorprendido"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Agradecido"
 
 msgid "Thirsty"
-msgstr ""
-
-#, fuzzy
+msgstr "Sediento"
+
 msgid "Tired"
-msgstr "Fire"
-
-#, fuzzy
+msgstr "Cansado"
+
 msgid "Undefined"
-msgstr "Subrayado"
-
-#, fuzzy
+msgstr "Indefinido"
+
 msgid "Weak"
-msgstr "Golpear"
-
-#, fuzzy
+msgstr "Débil"
+
 msgid "Worried"
-msgstr "Aburrido"
+msgstr "Preocupado"
 
 msgid "Set User Nickname"
 msgstr "Establecer apodo de usuario"
@@ -5437,9 +5463,8 @@
 msgid "Not expected"
 msgstr "No se esperaba"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
-msgstr "Los nombres de amigos cambian demasiado rápido"
+msgstr "El nombre de amigo cambia demasiado rápido"
 
 msgid "Server too busy"
 msgstr "Servidor muy ocupado"
@@ -5502,8 +5527,8 @@
 #, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s le ha enviado una invitación de chat de voz, pero no está aún no "
-"soportado."
+"%s le ha enviado una invitación de chat de voz, pero ésto no está soportado "
+"aún."
 
 msgid "Nudge"
 msgstr "Codazo"
@@ -5522,9 +5547,9 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "El nuevo nombre de amigo MSN es demasiado largo."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Set friendly name for %s."
-msgstr "Establecer su nombre de amigo."
+msgstr "Establecer  nombre de amigo para %s."
 
 msgid "Set your friendly name."
 msgstr "Establecer su nombre de amigo."
@@ -5648,7 +5673,7 @@
 "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
 "soportada."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
@@ -5848,9 +5873,8 @@
 msgid "Show custom smileys"
 msgstr "Mostrar emoticonos a medida"
 
-#, fuzzy
 msgid "Allow direct connections"
-msgstr "No se pudo crear la conexión"
+msgstr "Permitir conexiones directas"
 
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para llamar su atención"
@@ -5876,9 +5900,8 @@
 msgid "Unknown error (%d)"
 msgstr "Error desconocido (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "No puede añadir al usuario"
+msgstr "No puede eliminar el usuario"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "No se pudo enviar el mensaje al móvil porque es demasiado largo."
@@ -5957,7 +5980,7 @@
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
-"Su lista de amigos MSN está indisponible temporalmente. Por favor, espere y "
+"Los servidores MSN no están disponibles temporalmente. Por favor, espere y "
 "vuelva a intentarlo más tarde."
 
 msgid "The MSN servers are going down temporarily"
@@ -5994,14 +6017,13 @@
 #, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
 msgstr ""
-"%s le ha enviado una invitación para utilizar la webcam, algo aún no "
-"soportado"
-
-#, fuzzy, c-format
+"%s le ha enviado una invitación para utilizar la webcam, pero esta solicitud "
+"no está aún soportada."
+
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
-"%s le ha enviado una invitación para utilizar la webcam, algo aún no "
-"soportado"
+"%s le ha enviado para que vea su webcam, pero ésto no está aún soportado."
 
 msgid "Away From Computer"
 msgstr "Ausente"
@@ -6064,19 +6086,20 @@
 msgstr "El PIN es inválido. Debería sólo consistir dígitos [0-9]."
 
 msgid "The two PINs you entered do not match."
-msgstr "Las dos PINes que entró no coincide."
+msgstr "Las dos PINes que introdujo no coinciden."
 
 msgid "The name you entered is invalid."
-msgstr "El nombre que entró es inválido."
+msgstr "El nombre que introdujo es inválido."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
+"El cumpleaños que ha introducido es inválido. El formato correcto es: 'AAAA-"
+"MM-DD'."
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Error de escritura"
+msgstr "Error de actualización de perfil"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -6087,8 +6110,8 @@
 msgstr ""
 "Su información del perfil no es aún recuperable. Intente otra vez más tarde."
 
-msgid "Your MXitId"
-msgstr ""
+msgid "Your UID"
+msgstr "Su UID"
 
 #. pin
 #. pin (required)
@@ -6099,370 +6122,313 @@
 msgstr "Verifique el PIN"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Mostrar"
+msgstr "Mostrar nombre"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Ocultar mi número"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
 msgstr "Número de teléfono móvil"
 
-#, fuzzy
 msgid "Update your Profile"
-msgstr "Perfil de usuario"
+msgstr "Actualizar su perfil"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Donde quieres actualizar el perfil MXit"
 
 msgid "View Splash"
-msgstr ""
-
-#, fuzzy
+msgstr "Mostrar pantalla de bienvenida"
+
 msgid "There is no splash-screen currently available"
-msgstr "El chat no está disponible"
-
-#, fuzzy
+msgstr "No hay ninguna pantalla de bienvenida disponible"
+
 msgid "About"
-msgstr "Sobre mí"
+msgstr "Sobre"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Cambiar su contraseña..."
+msgstr "Cambiar perfil..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Ver..."
+msgstr "Ver pantalla..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Cuentas..."
+msgstr "Sobre..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "El mensaje es demasiado largo"
-
-#, fuzzy
+msgstr "¡El fichero que intenta enviar es demasiado grande!"
+
 msgid ""
 "Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
-"No se pudo conectar con el servidor. Por favor, indique la dirección del "
-"servidor con el que desea conectarse."
-
-#, fuzzy
+"No se pudo conectar con el servidor HTTP MXit. Por favor, revise su "
+"configuración de servidor."
+
 msgid "Logging In..."
-msgstr "Accediendo"
-
-#, fuzzy
+msgstr "Accediendo..."
+
 msgid ""
 "Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"No se pudo conectar con el servidor. Por favor, indique la dirección del "
-"servidor con el que desea conectarse."
-
-#, fuzzy
+"No se pudo conectar con el servidor MXit. Por favor, revise su configuración "
+"de servidor."
+
 msgid "Connecting..."
-msgstr "Conectando"
-
-#, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "La clave SecurID introducida no es válida"
-
-#, fuzzy
+msgstr "Conectando..."
+
+msgid "The Display Name you entered is invalid."
+msgstr "El nombre que introdujo es inválido."
+
 msgid "The PIN you entered has an invalid length [7-10]."
-msgstr "La clave SecurID introducida no es válida"
+msgstr "El PIN que ha introducido no tiene una longitud válida [7-10]."
 
 #. mxit login name
-#, fuzzy
-msgid "MXit Login Name"
-msgstr "Apellido de soltera"
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Apodo"
+msgid "MXit ID"
+msgstr "ID MXit"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registrando cuenta nueva de XMPP"
-
-#, fuzzy
+msgstr "Registrar nueva cuenta MXit"
+
 msgid "Please fill in the following fields:"
-msgstr "Por favor, rellene los siguientes campos"
+msgstr "Por favor, rellene los siguientes campos:"
 
 #. no reply from the WAP site
-#, fuzzy
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
-"Pidgin encontró un error mientras se comunicaba con el servidor MSN de "
-"'switchboard'.  Por favor, vuelva a intentar más tarde."
+"Error al contactar el sitio WAP MXit. Por favor, vuelva a intentarlo más "
+"tarde."
 
 #. wapserver error
 #. server could not find the user
-#, fuzzy
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
-"Pidgin no pudo conectarse con el servidor de listas de amigos.  Por favor, "
-"inténtelo más tarde."
-
-#, fuzzy
+"MXit no puede procesar la solicitud actualmente. Por favor, inténtelo más "
+"tarde."
+
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
-"Pidgin no pudo conectarse con el servidor de listas de amigos.  Por favor, "
-"inténtelo más tarde."
+msgstr "Código de seguridad incorrecto. Por favor, inténtelo más tarde."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Su sesión ha expirado. Por favor, inténtelo de nuevo más tarde.<"
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
-
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "País inválido seleccionado. Por favor, inténtelo de nuevo más tarde.<"
+
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+"El ID de MXit que introdujo no está registrado. Pruebe a registrarlo primero."
+
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr ""
+"El ID de MXit que introdujo ya está registrado. Por favor, escoja otro "
+"nombre de usuario."
+
 msgid "Internal error. Please try again later."
-msgstr "El servidor no está disponible, inténtelo de nuevo más tarde"
+msgstr "Error interno. Por favor, inténtelo de nuevo más tarde"
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "No introdujo el código de seguridad."
+
 msgid "Security Code"
-msgstr "Seguridad activada"
+msgstr "Código de seguridad"
 
 #. ask for input (required)
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Introduzca el código"
-
-#, fuzzy
+msgstr "Introduzca el código de seguridad"
+
 msgid "Your Country"
-msgstr "País"
-
-#, fuzzy
+msgstr "Su país"
+
 msgid "Your Language"
-msgstr "Idioma preferido"
+msgstr "Su idioma"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Pedir autorización"
+msgstr "Autorización MXit"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "Validación de cuenta MXit"
+
 msgid "Retrieving User Information..."
-msgstr "Información del servidor"
-
-#, fuzzy
+msgstr "Obteniendo la información del usuario..."
+
 msgid "Loading menu..."
-msgstr "Accediendo"
-
-#, fuzzy
+msgstr "Cargando el menú..."
+
 msgid "Status Message"
 msgstr "Mensaje de estado"
 
-#, fuzzy
 msgid "Rejection Message"
-msgstr "Mensajes recibidos"
+msgstr "Mensajes de rechazo"
 
 #. hidden number
-#, fuzzy
 msgid "Hidden Number"
-msgstr "Nombre medio"
-
-#, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Establecer su número de teléfono móvil..."
+msgstr "Número oculto"
+
+msgid "Your MXit ID..."
+msgstr "Su MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Servidor"
-
-#, fuzzy
+msgstr "Servidor WAP"
+
 msgid "Connect via HTTP"
-msgstr "Conectar por TCP"
+msgstr "Conectar vía HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "Activar la pantalla de bienvenida"
 
 #. you were kicked
-#, fuzzy
 msgid "You have been kicked from this MultiMX."
-msgstr "Ha sido expulsado: (%s)"
-
-#, fuzzy
+msgstr "Ha sido expulsado de este MultiMX."
+
 msgid "was kicked"
-msgstr "Ticket erróneo"
-
-#, fuzzy
+msgstr "fue expulsado"
+
 msgid "_Room Name:"
-msgstr "_Sala:"
+msgstr "Nombre de _Sala:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "Ha sido invitado"
+
+msgid "Last Online"
+msgstr "Última conexión"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
-#, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
-msgstr "Ha perdido su conexión a la sala de chat %s."
+msgstr "Se ha perdido la conexión a MXit. Por favor, conéctese de nuevo."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "Mensaje de error de XMPP"
-
-#, fuzzy
+msgstr "Error al enviar mensaje"
+
 msgid "Unable to process your request at this time"
-msgstr "No se pudo resolver el nombre del sistema"
+msgstr "No se pudo procesar su solicitud en este momento"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "Se esperó demasiado tiempo una respuesta del servidor MXit."
+
 msgid "Successfully Logged In..."
-msgstr "Se ha unido a Qun con éxito"
-
-#, fuzzy, c-format
+msgstr "Se ha conectado con éxito..."
+
+#, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
 msgstr ""
-"%s le ha enviado una invitación de chat de voz, pero no está aún no "
-"soportado."
-
-#, fuzzy
+"%s le ha enviado un mensaje cifrado, pero ésto no está soportado aún por "
+"este cliente."
+
 msgid "Message Error"
-msgstr "Mensaje de error de XMPP"
+msgstr "Error de mensaje"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "No se puede hacer la redirección con el protocolo especificado."
+
 msgid "An internal MXit server error occurred."
-msgstr "Error interno del servidor"
-
-#, fuzzy, c-format
+msgstr "Se produjo un error interno en el servidor MXit."
+
+#, c-format
 msgid "Login error: %s (%i)"
-msgstr "Error de SASL: %s"
-
-#, fuzzy, c-format
+msgstr "Error de conexión: %s (%i)"
+
+#, c-format
 msgid "Logout error: %s (%i)"
-msgstr "Error de SASL: %s"
-
-#, fuzzy
+msgstr "Error de desconexión: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Error de conexión"
-
-#, fuzzy
+msgstr "Error de contacto"
+
 msgid "Message Sending Error"
-msgstr "Mensaje de error de XMPP"
-
-#, fuzzy
+msgstr "Error de envío de mensaje"
+
 msgid "Status Error"
-msgstr "Error de flujo"
-
-#, fuzzy
+msgstr "Error de estado"
+
 msgid "Mood Error"
-msgstr "Error en icono"
-
-#, fuzzy
+msgstr "Error de estado de ánimo"
+
 msgid "Invitation Error"
-msgstr "Error de deregistro"
-
-#, fuzzy
+msgstr "Error de invitación"
+
 msgid "Contact Removal Error"
-msgstr "Error de conexión"
-
-#, fuzzy
+msgstr "Error de eliminación de contacto"
+
 msgid "Subscription Error"
-msgstr "Subscripción"
-
-#, fuzzy
+msgstr "Error de subscripción"
+
 msgid "Contact Update Error"
-msgstr "Error de conexión"
-
-#, fuzzy
+msgstr "Error de actualización de contactos"
+
 msgid "File Transfer Error"
-msgstr "Transferencia de archivo"
-
-#, fuzzy
+msgstr "Error de transferencia de archivo"
+
 msgid "Cannot create MultiMx room"
-msgstr "No se puede crear el aviso"
-
-#, fuzzy
+msgstr "No se pudo crear la habitación MultiMX"
+
 msgid "MultiMx Invitation Error"
-msgstr "Error de deregistro"
-
-#, fuzzy
+msgstr "Error de la invitación MultiMX"
+
 msgid "Profile Error"
-msgstr "Error de escritura"
+msgstr "Error de perfil"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "MXit envío un paquete inválido."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x02)<"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x03)<"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x04)<"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x05)<"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
+msgstr "Se produjo un error de conexión con MXit. (fase de lectura 0x05)"
 
 msgid "In Love"
 msgstr "Enamorado"
 
-#, fuzzy
 msgid "Pending"
-msgstr "Enviando"
-
-#, fuzzy
+msgstr "Pendiente"
+
 msgid "Invited"
-msgstr "Invitar"
-
-#, fuzzy
+msgstr "Invitado"
+
 msgid "Rejected"
-msgstr "Rechazar"
-
-#, fuzzy
+msgstr "Rechazada"
+
 msgid "Deleted"
-msgstr "Borrar"
+msgstr "Borrada"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "Anuncios MXit"
+
 msgid "More Information"
-msgstr "Información de trabajo"
+msgstr "Más información"
 
 #, c-format
 msgid "No such user: %s"
@@ -6850,7 +6816,7 @@
 msgstr "El servidor no pudo acceder al directorio"
 
 msgid "Your system administrator has disabled this operation"
-msgstr "Esta opción ha sido deshabilitada por su administrado"
+msgstr "Esta opción ha sido deshabilitada por su administrador"
 
 msgid "The server is unavailable; try again later"
 msgstr "El servidor no está disponible, inténtelo de nuevo más tarde"
@@ -7072,13 +7038,13 @@
 msgid "Server port"
 msgstr "Puerto del servidor"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "Se recibió una respuesta que no se esperaba de "
-
-#, fuzzy, c-format
+msgstr "Se recibió una respuesta que no se esperaba de %s: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "Se recibió una respuesta que no se esperaba de "
+msgstr "Se recibió una respuesta que no se esperaba de %s"
 
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
@@ -7090,21 +7056,23 @@
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "Error al solicitar "
+msgstr "Error al solicitar %s: %s"
 
 msgid ""
 "Server requested that you fill out a CAPTCHA in order to sign in, but this "
 "client does not currently support CAPTCHAs."
 msgstr ""
+"El servidor solicitó que rellene un CAPTCHA para poder conectarse, pero este "
+"cliente no puede mostrar aún los CAPTCHAs."
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL no permite que su nombre de usuario se autentique aquí"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s"
-msgstr "Error al solicitar "
+msgstr "Error al solicitar %s"
 
 msgid "Could not join chat room"
 msgstr "No se pudo conectar a la sala de chat"
@@ -7116,117 +7084,103 @@
 msgstr "Error inválido"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "No se pudo recibir un MI debido a los controles parentales"
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "No se pueden enviar SMS sin aceptar los términos del servicio"
+
 msgid "Cannot send SMS"
-msgstr "No se puede enviar el archivo."
+msgstr "No se puede enviar el SMS"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "No se puede enviar un directorio."
+msgstr "No se pueden enviar SMS a este país"
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "No se pueden enviar SMS a un país desconocido"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Las cuentas Bot no pueden iniciar MIs"
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "La cuenta Bot no puede MI a este usuario"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "La cuenta Bot llegó al límite de MI"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "La cuenta Bot llegó al límite de MI diarios"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "La cuenta Bot llegó al límite de MIs mensuales"
+
 msgid "Unable to receive offline messages"
-msgstr "No se pudo enviar el mensaje."
-
-#, fuzzy
+msgstr "No se pueden recibir mensajes fuera de línea"
+
 msgid "Offline message store full"
-msgstr "Mensaje desconectado"
-
-#, fuzzy, c-format
+msgstr "El almacenamiento de mensajes fuera de línea está lleno"
+
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "No se pudo enviar el mensaje (%s)."
+msgstr "No se pudo enviar el mensaje: %s (%s)."
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "No se pudo enviar el mensaje: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "No se pudo enviar el mensaje a %s:"
-
-#, fuzzy, c-format
+msgstr "No se pudo enviar el mensaje a %s: %s (%s)"
+
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "No se pudo enviar el mensaje a %s:"
+msgstr "No se pudo enviar el mensaje a %s: %s"
 
 msgid "Thinking"
-msgstr ""
-
-#, fuzzy
+msgstr "Pensando"
+
 msgid "Shopping"
-msgstr "Deja de escribir"
-
-#, fuzzy
+msgstr "Comprando"
+
 msgid "Questioning"
-msgstr "Diálogo de pregunta"
-
-#, fuzzy
+msgstr "Preguntando"
+
 msgid "Eating"
-msgstr "Enviar"
-
-#, fuzzy
+msgstr "Comiendo"
+
 msgid "Watching a movie"
-msgstr "Jugando un juego"
+msgstr "Viendo una película"
 
 msgid "Typing"
 msgstr "Tecleando"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Fuera de la oficina"
+msgstr "En la oficina"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Bañandome"
 
 msgid "Watching TV"
-msgstr ""
-
-#, fuzzy
+msgstr "Viendo la televisión"
+
 msgid "Having fun"
-msgstr "Colgar"
-
-#, fuzzy
+msgstr "Disfrutando"
+
 msgid "Sleeping"
-msgstr "Dormido"
+msgstr "Durmiendo"
 
 msgid "Using a PDA"
-msgstr ""
-
-#, fuzzy
+msgstr "Utilizando una PDA"
+
 msgid "Meeting friends"
-msgstr "Amigos MI"
-
-#, fuzzy
+msgstr "Visitando a amigos"
+
 msgid "On the phone"
 msgstr "Al teléfono"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Recurrente"
+msgstr "Surfeando"
 
 # El latinoamérica se prefiere 'Celular', creo, jfs
 #. "I am mobile." / "John is mobile."
@@ -7234,45 +7188,39 @@
 msgstr "Móvil"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Buscando en la web"
 
 msgid "At a party"
-msgstr ""
+msgstr "En una fiesta"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Tomando café"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Géminis"
+msgstr "Jugando a videojuegos"
 
 msgid "Browsing the web"
-msgstr ""
-
-#, fuzzy
+msgstr "Navegando la web"
+
 msgid "Smoking"
-msgstr "Canción"
-
-#, fuzzy
+msgstr "Fumando"
+
 msgid "Writing"
-msgstr "Trabajando"
+msgstr "Escribiendo"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Trabajando"
+msgstr "Bebiendo"
 
 msgid "Listening to music"
 msgstr "Escuchando música"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Enviando"
-
-#, fuzzy
+msgstr "Estudiando"
+
 msgid "In the restroom"
-msgstr "Aficiones"
+msgstr "En el baño"
 
 msgid "Received invalid data on connection with server"
 msgstr "Se recibieron datos inválidos al conectarse al servidor"
@@ -7378,7 +7326,7 @@
 msgstr "Juegos"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Extensiones"
@@ -7446,25 +7394,20 @@
 msgid "Invisible"
 msgstr "Invisible"
 
-#, fuzzy
 msgid "Evil"
-msgstr "Correo-e"
-
-#, fuzzy
+msgstr "Malvado"
+
 msgid "Depression"
-msgstr "Profesión"
-
-#, fuzzy
+msgstr "Depresión"
+
 msgid "At home"
-msgstr "Sobre mí"
-
-#, fuzzy
+msgstr "En casa"
+
 msgid "At work"
-msgstr "Red"
-
-#, fuzzy
+msgstr "En el trabajo"
+
 msgid "At lunch"
-msgstr "Salí a comer"
+msgstr "En la hora de la comida"
 
 msgid "IP Address"
 msgstr "Dirección IP"
@@ -7535,15 +7478,14 @@
 "El servicio de Mensajería Instantáneo AOL está temporalmente no disponible."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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 ""
-"Se ha conectado y desconectado demasiadas veces. Espere diez minutos e "
-"inténtelo de nuevo. Si sigue intentándolo, necesitará esperar incluso más "
-"tiempo."
+"Su nombre de usuario ha conectado y desconectado demasiadas veces. Espere "
+"diez minutos e inténtelo de nuevo. Si sigue intentándolo, necesitará esperar "
+"incluso más tiempo."
 
 #. client too old
 #, c-format
@@ -7553,15 +7495,14 @@
 "en %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"Se ha conectado y desconectado demasiadas veces. Espere un minuto e "
-"inténtelo de nuevo. Si sigue intentándolo ahora, necesitará esperar incluso "
-"más tiempo."
+"Su dirección IP se ha conectado y desconectado demasiadas veces. Espere un "
+"minuto e inténtelo de nuevo. Si sigue intentándolo ahora, necesitará esperar "
+"incluso más tiempo."
 
 msgid "The SecurID key entered is invalid"
 msgstr "La clave SecurID introducida no es válida"
@@ -7970,9 +7911,8 @@
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de música de iTunes"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Comida"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7995,9 +7935,8 @@
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "El servidor ha cerrado la conexión"
+msgstr "Vd. cerró la conexión."
 
 # TBD - comprobar si esto afecta al botón en pantalla
 msgid "Get AIM Info"
@@ -8007,13 +7946,11 @@
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Obtener msj de estado"
-
-#, fuzzy
+msgstr "Obtener msj X-Status"
+
 msgid "End Direct IM Session"
-msgstr "MI directo establecido"
+msgstr "Terminar la sesión MI directa"
 
 msgid "Direct IM"
 msgstr "MI directo"
@@ -8143,11 +8080,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-msgid "Rate to host"
-msgstr "Tasa de mensajes al servidor"
-
-msgid "Rate to client"
-msgstr "Tasa de mensajes al cliente"
+msgid "Server rate limit exceeded"
+msgstr "Se excedió el límite de tasa del servidor"
+
+msgid "Client rate limit exceeded"
+msgstr "Se excedió el límite de tasa del cliente"
 
 msgid "Service unavailable"
 msgstr "Servicio no disponible"
@@ -8348,7 +8285,7 @@
 msgstr "Modificar la cuenta"
 
 msgid "Modify Address"
-msgstr "Modiciar el domicilio"
+msgstr "Modificar el domicilio"
 
 msgid "Modify Extended Information"
 msgstr "Modificar la información extendida"
@@ -8492,9 +8429,8 @@
 msgstr "Administrador"
 
 #. XXX: Should this be "Topic"?
-#, fuzzy
 msgid "Room Title"
-msgstr "Lista de salas"
+msgstr "Título de la sala"
 
 msgid "Notice"
 msgstr "Nota"
@@ -8610,7 +8546,7 @@
 msgstr " DeMóvil"
 
 msgid " BindMobile"
-msgstr " BindMóvil"
+msgstr " AsociarMóvil"
 
 msgid " Video"
 msgstr " Vídeo"
@@ -8770,7 +8706,7 @@
 msgstr "Mostrar notas del servidor"
 
 msgid "Show server news"
-msgstr "Mostrar noticas del servidor"
+msgstr "Mostrar noticias del servidor"
 
 msgid "Show chat room when msg comes"
 msgstr "Mostrar la sala de chat cuando venga un mensaje"
@@ -8846,7 +8782,7 @@
 msgstr "Obteniendo el servidor"
 
 msgid "Requesting token"
-msgstr "Solicitando testingo"
+msgstr "Solicitando testigo"
 
 msgid "Unable to resolve hostname"
 msgstr "No se pudo resolver el nombre del sistema"
@@ -8918,7 +8854,7 @@
 msgid "File Send"
 msgstr "Archivo enviado"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%d cancelled the transfer of %s"
 msgstr "%d canceló la transferencia de %s"
 
@@ -9641,10 +9577,10 @@
 "archivos."
 
 msgid "Could not start the file transfer"
-msgstr "No se pudo comenzar la transferencia de archivos."
+msgstr "No se pudo comenzar la transferencia de archivos"
 
 msgid "Cannot send file"
-msgstr "No se puede enviar el archivo."
+msgstr "No se puede enviar el archivo"
 
 msgid "Error occurred"
 msgstr "Se produjo un error"
@@ -10427,8 +10363,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar las invitaciones a salas de conferencias o chat"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Utilizar cuenta de pasarela para las conexiones HTTP y HTTPS"
 
 msgid "Chat room list URL"
 msgstr "Url de lista de salas de chat"
@@ -10452,8 +10388,8 @@
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
-"%s le ha enviado una invitación para utilizar la webcam, algo aún no "
-"soportado."
+"%s le ha enviado una invitación para utilizar la webcam, pero ésto no está "
+"soportado aún."
 
 msgid "Your SMS was not delivered"
 msgstr "Se ha enviado su SMS"
@@ -10503,13 +10439,13 @@
 "Yahoo! es posible que ésto se arregle."
 
 #. indicates a lock due to logging in too frequently
-#, fuzzy
 msgid ""
 "Account locked: You have been logging in too frequently.  Wait a few minutes "
 "before trying to connect again.  Logging into the Yahoo! website may help."
 msgstr ""
-"Cuenta bloqueada: demasiados intentos de conexión fallidos. Si se conecta al "
-"servidor de web de Yahoo! es posible que ésto se arregle."
+"Cuenta bloqueada: Se ha conectado con demasiada frecuencia. Espere unos "
+"minutos antes de volverse a conectar. Si se conecta al servidor de web de "
+"Yahoo! es posible que ésto se arregle."
 
 #. username or password missing
 msgid "Username or password missing"
@@ -10539,26 +10475,27 @@
 msgid "Ignore buddy?"
 msgstr "¿Ignorar amigo?"
 
-#, fuzzy
 msgid "Invalid username or password"
 msgstr "Nombre de usuario o contraseña incorrecta"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"Cuenta bloqueada: demasiados intentos de conexión fallidos. Si se conecta al "
-"servidor de web de Yahoo! es posible que ésto se arregle."
+"Su cuenta bloqueada porque se han producido demasiados intentos de conexión "
+"fallidos. Intente conectarse al sitio web de Yahoo!."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
-msgstr ""
+msgstr "Error desconocido 52. Debería arreglarse si se vuele a conectar."
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"Error 1013: El usuario que introdujo no es válido. La causa más habitual de "
+"este error es que haya introducido su dirección de correo en lugar de su ID "
+"de Yahoo!"
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10590,16 +10527,15 @@
 msgid "Unable to establish a connection with %s: %s"
 msgstr "No se pudo establecer una conexión con %s: %s"
 
-#, fuzzy
 msgid "Unable to connect: The server returned an empty response."
-msgstr ""
-"No se pudo conectar con el servidor. Por favor, indique la dirección del "
-"servidor con el que desea conectarse."
+msgstr "No se pudo conectar: el servidor devolvió una respuesta vacía."
 
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
 "information"
 msgstr ""
+"No se pudo conectar: la respuesta del servidor no contiene la información "
+"necesaria"
 
 msgid "Not at Home"
 msgstr "Fuera de casa"
@@ -10644,7 +10580,7 @@
 msgstr "Usar configuración del entorno"
 
 msgid "Start Doodling"
-msgstr "Comenzar una sesión de Doodle"
+msgstr "Iniciar una sesión de Doodle"
 
 msgid "Select the ID you want to activate"
 msgstr "Seleccione el ID que quiere activar"
@@ -10663,12 +10599,13 @@
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
 msgstr ""
+"No se pudo enviar un SMS. No se puede obtener el operador de red móvil."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "No se pudo enviar un SMS. Red de proveedor móvil desconocida."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Obteniendo el operador de red móvil a utilizar para enviar el SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
@@ -11051,9 +10988,8 @@
 msgid "Extended away"
 msgstr "Ausencia extendida"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Recibiendo"
+msgstr "Sintiendo"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11216,6 +11152,8 @@
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Chat sobre MI. Ofrece soporte para AMI, Google Talk, Jabber/XMPP, MSN, "
+"Yahoo! y más"
 
 msgid "Internet Messenger"
 msgstr "Cliente de mensajería de Internet"
@@ -11354,9 +11292,8 @@
 msgid "Layout"
 msgstr "Distribución"
 
-#, fuzzy
 msgid "The layout of icons, name, and status of the buddy list"
-msgstr "La distribución de iconos, nombres y estados en la blist"
+msgstr "La distribución de iconos, nombres y estados en la lista de amigos"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
@@ -11386,7 +11323,7 @@
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
 msgid "Collapsed Text"
-msgstr "Texto contraido"
+msgstr "Texto contraído"
 
 msgid "The text information for when a group is collapsed"
 msgstr "La información de texto para cuando un grupo se contrae"
@@ -11410,35 +11347,32 @@
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "Texto conectado"
+msgstr "Texto cuando está disponible"
 
 msgid "The text information for when a buddy is online"
-msgstr "La información en texto cuando un amigo está en línea"
+msgstr "La información de texto cuando un amigo está conectado"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
 msgid "Away Text"
-msgstr "Texto de ausencia"
+msgstr "Texto cuando está ausente"
 
 msgid "The text information for when a buddy is away"
-msgstr "La información de texto cuando un amigo está austen"
+msgstr "La información de texto cuando un amigo está ausente"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "Texto desconectado"
-
-#, fuzzy
+msgstr "Texto cuando está desconectado"
+
 msgid "The text information for when a buddy is offline"
 msgstr "La información de texto cuando un amigo está desconectado"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
 msgid "Idle Text"
-msgstr "Texto de inactividad"
+msgstr "Texto cuando está inactivo"
 
 msgid "The text information for when a buddy is idle"
 msgstr "La información de texto cuando un amigo está inactivo"
@@ -11454,9 +11388,8 @@
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr "Texto de nensaje («apodo dijo»)"
-
-#, fuzzy
+msgstr "Texto de mensaje («apodo dijo»)"
+
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
@@ -11592,13 +11525,11 @@
 msgid "Unknown node type"
 msgstr "Tipo de nodo desconocido"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Escoja un estado de ánimo de la lista."
-
-#, fuzzy
+msgstr "Escoja un estado de ánimo de la lista"
+
 msgid "Message (optional)"
-msgstr "Apodo (opcional)"
+msgstr "Mensaje (opcional)"
 
 msgid "Edit User Mood"
 msgstr "Editar estados de ánimo del usuario"
@@ -11681,9 +11612,8 @@
 msgid "/Tools/Pr_ivacy"
 msgstr "/Herramientas/Pri_vacidad"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Herramientas/_Registro del sistema"
+msgstr "/Herramientas/Fijar estado de á_nimo"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Herramientas/_Transferencias de archivos"
@@ -11704,20 +11634,17 @@
 msgid "/Help/Online _Help"
 msgstr "/Ayuda/Ayuda en _línea"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Información de amigos"
+msgstr "/Ayuda/Información de _compilación"
 
 msgid "/Help/_Debug Window"
 msgstr "/Ayuda/Ventana de _depuración"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Información del servidor"
-
-#, fuzzy
+msgstr "/Ayuda/Información de desa_rrollador"
+
 msgid "/Help/_Translator Information"
-msgstr "Información personal"
+msgstr "/Ayuda/Información de _traducción"
 
 msgid "/Help/_About"
 msgstr "/Ayuda/_Acerca de"
@@ -11927,9 +11854,8 @@
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "Reconec_tarse cuando la cuenta se pone en línea."
+msgstr "Reconec_tarse cuando la cuenta se conecta."
 
 msgid "_Remain in chat after window is closed."
 msgstr "_Permanecer en el chat cuando se cierra la ventana."
@@ -11949,9 +11875,8 @@
 msgid "_Edit Account"
 msgstr "_Editar cuenta"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Fijar estado de ánimo..."
+msgstr "Fijar estado de áni_mo..."
 
 msgid "No actions available"
 msgstr "No hay acciones disponibles"
@@ -12042,9 +11967,8 @@
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversación/Mensaje _instantáneo nuevo..."
 
-#, fuzzy
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Conversación/In_vitar..."
+msgstr "/Conversación/Unirse a _Chat..."
 
 msgid "/Conversation/_Find..."
 msgstr "/Conversación/_Buscar..."
@@ -12073,9 +11997,8 @@
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversación/E_nviar archivo..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Conversación/Obtener información"
+msgstr "/Conversación/Obtener _atención"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversación/Añadir a_viso de amigo..."
@@ -12158,9 +12081,8 @@
 msgid "/Conversation/Send File..."
 msgstr "/Conversación/Enviar archivo..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Conversación/Obtener información"
+msgstr "/Conversación/Obtener atención"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversación/Añadir aviso de amigo..."
@@ -12226,13 +12148,11 @@
 msgid "0 people in room"
 msgstr "0 personas en la conversación"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Cerrar esta solapa"
-
-#, fuzzy
+msgstr "Cerrar la barra de búsqueda"
+
 msgid "Find:"
-msgstr "Buscar"
+msgstr "Buscar:"
 
 #, c-format
 msgid "%d person in room"
@@ -12396,9 +12316,8 @@
 msgid "Arabic"
 msgstr "Árabe"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Avergonzado"
+msgstr "Asamés"
 
 msgid "Belarusian Latin"
 msgstr "Latín bieloruso"
@@ -12409,9 +12328,8 @@
 msgid "Bengali"
 msgstr "Bengalí"
 
-#, fuzzy
 msgid "Bengali-India"
-msgstr "Bengalí"
+msgstr "Bengalí-India"
 
 msgid "Bosnian"
 msgstr "Bosnio"
@@ -12456,7 +12374,7 @@
 msgstr "Estonio"
 
 msgid "Basque"
-msgstr ""
+msgstr "Vasco"
 
 msgid "Persian"
 msgstr "Persa"
@@ -12527,20 +12445,17 @@
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Hombre"
+msgstr "Malayalam"
 
 msgid "Mongolian"
 msgstr "Mongol"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "Gujarati"
-
-#, fuzzy
+msgstr "Maratí"
+
 msgid "Malay"
-msgstr "Hombre"
+msgstr "Malayo"
 
 msgid "Bokmål Norwegian"
 msgstr "Noruego Bokmål"
@@ -12557,9 +12472,8 @@
 msgid "Occitan"
 msgstr "Occitano"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "Oriya"
 
 msgid "Punjabi"
 msgstr "Punjabí"
@@ -12615,7 +12529,6 @@
 msgid "Turkish"
 msgstr "Turco"
 
-#, fuzzy
 msgid "Ukranian"
 msgstr "Ucraniano"
 
@@ -12644,7 +12557,7 @@
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s is a messaging client based on libpurple which is capable of connecting "
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
@@ -12653,16 +12566,13 @@
 "copyrighted by its contributors, a list of whom is also distributed with "
 "%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s es un cliente gráfico y modular de mensajería basado en libpurple capaz "
-"de conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu y QQ todos "
-"al mismo tiempo. Está escrito utilizando GTK+.<BR><BR>Puede modificar y "
-"redistribuir este programa bajo los términos de la GPL (versión 2 o "
-"posterior). Se incluye una copia de la licencia GPL en el archivo «COPYING» "
-"que se distribuye con %s. Las personas que han contribuido a %s tienen los "
-"derechos de copia. Lea el archivo «COPYRIGHT» si desea consultar la lista "
-"completa de personas que han contribuido. Este programa se distribuye sin "
-"ninguna garantía.<BR><BR>"
+"%s es un cliente de mensajería basado en libpurple capaz de conectarse a "
+"múltiples sistemas de mensajería al mismo tiempo. %s está programado en C "
+"utilizando GTK+. %s se distribuye, y puede modificarse y redistribuirse, "
+"bajo los términos de la GPL versión 2 (o posterior). Se incluye una copia de "
+"la licencia GPL con %s. Las personas que han contribuido a %s tienen los "
+"derechos de copia. Se incluye también una lista de los que han contribuido "
+"en %s. %s se distribuye sin ninguna garantía.<BR><BR>"
 
 #, c-format
 msgid ""
@@ -12671,6 +12581,9 @@
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<FONT SIZE=\"4\"><B>Recursos útiles</B></FONT><BR>\t<A HREF=\"%s\">Sitio "
+"web</A><BR>\t<A HREF=\"%s\">Preguntas frecuentes</A><BR>\tCanal IRC: #pidgin "
+"en irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
@@ -12682,19 +12595,26 @@
 "welcome to post in another language, but the responses may be less helpful."
 "<br/>"
 msgstr ""
+"<font size=\"4\">Puede obtener <b>ayuda de otros usuarios de Pidgin</b></"
+"font> enviando un correo a <a href=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</a><br/>¡Se trata de una lista <b>pública</b> de "
+"correo! (<a href=\"http://pidgin.im/pipermail/support/\">archivo de la "
+"lista</a>)<br/>¡No podemos proporcionar ayuda de protocolos o complementos "
+"de terceros!<br/>El idioma principal de esta lista es el <b>inglés</b>. "
+"Puede, si lo desea, escribir correos en otro idioma, pero las respuestas "
+"serán menos útiles.<br/>"
 
 #, c-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Información de amigos"
+msgstr "Información de compilación"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Información de amigos"
+msgstr "Información de compilación de %s"
 
 msgid "Current Developers"
 msgstr "Desarrolladores actuales"
@@ -12708,9 +12628,9 @@
 msgid "Retired Crazy Patch Writers"
 msgstr "Locos escritores de parches retirados"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Información del servidor"
+msgstr "Información de desarrollo de %s"
 
 msgid "Current Translators"
 msgstr "Traductores actuales"
@@ -12718,9 +12638,9 @@
 msgid "Past Translators"
 msgstr "Traductores anteriores"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Información de trabajo"
+msgstr "Información de traducción de %s"
 
 msgid "_Name"
 msgstr "_Nombre"
@@ -12979,7 +12899,7 @@
 msgstr "Color con el que dibujar el nombre de un mensaje de acción."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr "Nombre de color de mensajes de accción para mensajes susurrados"
+msgstr "Nombre de color de mensajes de acción para mensajes susurrados"
 
 msgid "Color to draw the name of a whispered action message."
 msgstr "Color con el que dibujar el nombre de un mensaje de acción susurrado."
@@ -13133,9 +13053,8 @@
 msgid "Insert Smiley"
 msgstr "Insertar emoticono"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "Botón «enviar»"
+msgstr "Enviar atención"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negrita</b>"
@@ -13183,7 +13102,7 @@
 msgstr "¡_Sonría!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Atención!"
 
 msgid "Log Deletion Failed"
 msgstr "Falló el borrado del registro"
@@ -13213,7 +13132,7 @@
 "%s?"
 msgstr ""
 "¿Está seguro que desea borrar de forma permanente el registro del sistema "
-"que comezó en %s?"
+"que comenzó en %s?"
 
 msgid "Delete Log?"
 msgstr "¿Borrar el registro?"
@@ -13242,44 +13161,48 @@
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Modo de uso: %s [OPCIÓN]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
-
-#, fuzzy
+msgstr "DIR"
+
 msgid "use DIR for config files"
-msgstr "No se pudo abrir el archivo de configuración %s."
+msgstr "utilizar DIR para los archivos de configuración"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "escribir mensajes de depuración a «stdout»"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "fijar el estado como conectado, independientemente del estado de red"
 
 msgid "display this help and exit"
-msgstr ""
-
-#, fuzzy
+msgstr "mostrar esta ayuda y salir"
+
 msgid "allow multiple instances"
-msgstr "Permitir múltiples conexiones simultáneas"
+msgstr "Permitir múltiples instancias"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "no conectarse de forma automática"
 
 msgid "NAME"
-msgstr ""
+msgstr "NOMBRE"
 
 msgid ""
 "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)."
 msgstr ""
+"habilitar la/s cuenta/s especificada/s (el argumento \n"
+"                       opcional NOMBRE especifica la/s cuenta/s\n"
+"                       a utilizar, separadas por comas. Si no se \n"
+"                       utiliza sólo se activará la primera cuenta)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "Display X a utilizar"
 
 msgid "display the current version and exit"
-msgstr ""
+msgstr "mostrar la versión actual y salir"
 
 #, c-format
 msgid ""
@@ -13313,11 +13236,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Saliendo porque está ejecutándose otro cliente de libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Colgar"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Colgar"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13325,10 +13250,10 @@
 
 #, c-format
 msgid "%s wishes to start a video session with you."
-msgstr "%s desea comenzor una sesión de vídeo con vd."
+msgstr "%s desea iniciar una sesión de vídeo con vd."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Llamada entrante"
 
 msgid "_Pause"
 msgstr "_Pausar"
@@ -13540,20 +13465,19 @@
 msgstr "Desconocido..... ¡Por favor, informe de esto! "
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(A medida)"
 
 msgid "Penguin Pimps"
-msgstr "Pinguinos bonitos"
+msgstr "Pingüinos bonitos"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "El tema de sonido de Pidgin por omisión"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Editor de temas de la lista de amigos de Pidgin"
+msgstr "El tema para por omisión para lista de amigos de Pidgin"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "El tema de estado de Pidgin por omisión<"
 
 msgid "Theme failed to unpack."
 msgstr "No se pudo desempaquetar el tema."
@@ -13564,35 +13488,30 @@
 msgid "Theme failed to copy."
 msgstr "No se pudo copiar el tema."
 
-#, fuzzy
 msgid "Theme Selections"
-msgstr "Selección de navegador"
+msgstr "Selección de tema"
 
 #. Instructions
-#, fuzzy
 msgid ""
 "Select a theme that you would like to use from the lists below.\n"
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
 msgstr ""
-"Seleccione de la lista inferior el tema de emoticonos que desee. Puede "
-"instalar temas nuevos arrastrándolos y soltándolos sobre esta lista de temas."
-
-#, fuzzy
+"Seleccione el tema que desee utilizar de la lista mostrada a continuación\n"
+"Puede instalar temas nuevos arrastrándolos y soltándolos sobre esta lista de "
+"temas."
+
 msgid "Buddy List Theme:"
-msgstr "Tema de la lista de amigos"
-
-#, fuzzy
+msgstr "Tema de la lista de amigos:"
+
 msgid "Status Icon Theme:"
-msgstr "Iconos de estado"
-
-#, fuzzy
+msgstr "Tema de iconos de estado:"
+
 msgid "Sound Theme:"
-msgstr "Apellido"
-
-#, fuzzy
+msgstr "Tema de sonidos:"
+
 msgid "Smiley Theme:"
-msgstr "Temas de emoticonos"
+msgstr "Temas de emoticonos:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
@@ -13708,15 +13627,13 @@
 msgid "Cannot start browser configuration program."
 msgstr "No se pudo iniciar el programa de configuración del navegador."
 
-#, fuzzy
 msgid "Disabled"
-msgstr "_Deshabilitar"
+msgstr "Deshabilitado"
 
 #, c-format
 msgid "Use _automatically detected IP address: %s"
 msgstr "Utilizar la dirección IP detectada _automáticamente: %s"
 
-#, fuzzy
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
@@ -13732,34 +13649,28 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_Activar reenvío de puertos automático"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Especificar _manualmente el rango de puertos en el que se escuchará"
-
-# JFS: Is this complete? REVIEW
-#, fuzzy
+msgstr "Especificar _manualmente el rango de puertos en el que se escuchará:"
+
+#
 msgid "_Start:"
-msgstr "_Inicial "
-
-#, fuzzy
+msgstr "_Inicial:"
+
 msgid "_End:"
-msgstr "_Expandir"
+msgstr "_Final:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Servidor de reenvío (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "Servidor ST_UN:"
-
-#, fuzzy
+msgstr "Servidor _TURN:"
+
 msgid "Use_rname:"
-msgstr "Nombre de usuario:"
-
-#, fuzzy
+msgstr "Nombre de usua_rio:"
+
 msgid "Pass_word:"
-msgstr "Contraseña:"
+msgstr "_Contraseña:"
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13800,11 +13711,9 @@
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#, fuzzy
 msgid "Browser preferences are configured in GNOME preferences"
 msgstr ""
-"Puede configurar las preferencias del proxy y del navegador\n"
-"en las preferencias de GNOME."
+"Las preferencias del navegador se configuran en las preferencias de GNOME"
 
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>No se encontró el programa de configuración del navegador.</b>"
@@ -13838,11 +13747,9 @@
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#, fuzzy
 msgid "Proxy preferences are configured in GNOME preferences"
 msgstr ""
-"Puede configurar las preferencias del proxy y del navegador\n"
-"en las preferencias de GNOME."
+"Las preferencias del navegador se configuran en las preferencias de GNOME"
 
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>No se encontró el programa de configuración del proxy.</b>"
@@ -13852,24 +13759,20 @@
 
 #. This is a global option that affects SOCKS4 usage even with
 #. * account-specific proxy settings
-#, fuzzy
 msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr "Utilizar un DNS remoto con pasarelas SOCKS4"
-
-#, fuzzy
+msgstr "Utilizar un _DNS remoto con pasarelas SOCKS4"
+
 msgid "Proxy t_ype:"
 msgstr "_Tipo de proxy:"
 
 msgid "No proxy"
 msgstr "Sin proxy"
 
-#, fuzzy
 msgid "P_ort:"
-msgstr "_Puerto:"
-
-#, fuzzy
+msgstr "Puert_o:"
+
 msgid "User_name:"
-msgstr "Nombre de usuario:"
+msgstr "_Nombre de usuario:"
 
 msgid "Log _format:"
 msgstr "Formato de _registro:"
@@ -13958,9 +13861,8 @@
 msgid "_Minutes before becoming idle:"
 msgstr "_Minutos antes de pasar a inactivo:"
 
-#, fuzzy
 msgid "Change to this status when _idle:"
-msgstr "Cambiar el estado cuando esté _inactivo"
+msgstr "Cambiar el estado cuando esté _inactivo:"
 
 msgid "_Auto-reply:"
 msgstr "Respuesta _automática:"
@@ -13987,9 +13889,8 @@
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
-#, fuzzy
 msgid "Themes"
-msgstr "Temas de emoticonos"
+msgstr "Temas"
 
 msgid "Allow all users to contact me"
 msgstr "Permitir que todos los usuarios me contacten"
@@ -14151,10 +14052,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Gestor de emoticonos a medida"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Es necesaria la activación"
-
 msgid "Select Buddy Icon"
 msgstr "Seleccionar icono de amigo"
 
@@ -14298,9 +14195,8 @@
 msgid "_Save File"
 msgstr "_Guardar archivo"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "¿Seguro que quiere borrar a %s?"
+msgstr "¿Seguro que quiere borrar?"
 
 msgid "Select color"
 msgstr "Seleccionar el color"
@@ -14507,7 +14403,7 @@
 msgstr "Directorio"
 
 msgid "PubSub Collection"
-msgstr "Collección PubSub"
+msgstr "Colección PubSub"
 
 msgid "PubSub Leaf"
 msgstr "Rama PubSub"
@@ -14628,9 +14524,9 @@
 "Añade soporte de gestos del ratón en las ventanas de conversación.\n"
 "Arrastre con el botón central del ratón para realizar las siguientes "
 "acciones:\n"
-" • Abajo y después a la derecha para cerrar una ventana de conversación.\n"
-" • Arriba y después a la izquierda para cambiar a la conversación anterior.\n"
-" • Arriba y después a la derecha para cambiar a la siguiente conversación."
+" - Abajo y después a la derecha para cerrar una ventana de conversación.\n"
+" - Arriba y después a la izquierda para cambiar a la conversación anterior.\n"
+" - Arriba y después a la derecha para cambiar a la siguiente conversación."
 
 msgid "Instant Messaging"
 msgstr "Mensajería Instantáneos"
@@ -15059,7 +14955,7 @@
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
 "Le permite enviar datos en bruto a protocolos basados en texto (XMPP, MSN, "
-"IRC,  TOC). Pulse «Intro» en la caja de entrada para enviarlo. Observe la "
+"IRC,  TOC). Pulse «Enter» en la caja de entrada para enviarlo. Observe la "
 "ventana de depuración."
 
 #, c-format
@@ -15309,23 +15205,20 @@
 msgstr "Opciones de formato de marca de tiempo"
 
 # JFS: Is this complete? REVIEW
-#, fuzzy, c-format
+#, c-format
 msgid "_Force timestamp format:"
-msgstr "_Forzar formato de tiempo de 24 horas"
-
-#, fuzzy
+msgstr "_Forzar formato de marca de tiempo:"
+
 msgid "Use system default"
-msgstr "Valores por omisión del escritorio"
+msgstr "Utilizar valores por omisión del sistema"
 
 # JFS: Is this complete? REVIEW
-#, fuzzy
 msgid "12 hour time format"
-msgstr "_Forzar formato de tiempo de 24 horas"
+msgstr "formato de tiempo de 12 horas"
 
 # JFS: Is this complete? REVIEW
-#, fuzzy
 msgid "24 hour time format"
-msgstr "_Forzar formato de tiempo de 24 horas"
+msgstr "formato de tiempo de 24 horas"
 
 msgid "Show dates in..."
 msgstr "Mostrar las fechas en..."
@@ -15527,7 +15420,6 @@
 msgstr "Enviar y recibir entradas XMPP en crudo."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
@@ -15547,6 +15439,8 @@
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
 "again."
 msgstr ""
+"Ya hay una instancia de Pidgin ejecutándose. Por favor, salga de Pidgin e "
+"inténtelo de nuevo."
 
 #. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
@@ -15554,19 +15448,19 @@
 
 #. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr ""
+msgstr "Crear una entrada en el Menú de Inicio para Pidgin"
 
 #. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr ""
+msgstr "Crear un icono para Pidgin en el Escritorio"
 
 #. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
+msgstr "Símbolos de depuración (para reportar caídas)"
 
 #. Installer Subsection Text
 msgid "Desktop"
-msgstr ""
+msgstr "Escritorio"
 
 #. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
@@ -15574,12 +15468,19 @@
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
+"Se produjo un error al descargar el entorno de ejecución de GTK+ ($R2).$"
+"\\rESte entorno es necesario para que funcione Pidgin, si falla el reintento "
+"tendrá que utilizar el «Instalador fuera de línea» disponible en 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 ""
+"Se produjo un error al instalar los símbolos de depuración ($R2).$\\rPuede "
+"que tenga que utilizar el «Instalador fuera de línea» si falla el reintento. "
+"Puede conseguirlo de http://pidgin.im/download/windows/ ."
 
 #. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
@@ -15588,16 +15489,18 @@
 "installation instructions are at: http://developer.pidgin.im/wiki/Installing"
 "%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
+"Error al instalar el corrector ortográfico ($R3).\\rSi falla el reintento, "
+"puede seguir las instrucciones de instalación manual disponibles en: http://"
+"developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "GTK+ Runtime (required if not present)"
-msgstr "Entorno de ejecución de GTK+ (necesario)"
+msgstr "Entorno de ejecución de GTK+ (necesario si no está instalado)"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Localizations"
-msgstr "Ubicación"
+msgstr "Ubicaciones"
 
 #. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
@@ -15612,33 +15515,35 @@
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
+"Pidgin necesita un entorno de ejecución compatible GTK+ (que no parece que "
+"esté disponible).$\\r¿Está seguro que quiere omitir el paso de instalacio "
+"del entorno de ejecución de GTK+?"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Atajo de teclado"
+msgstr "Atajos"
 
 #. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr ""
+msgstr "Atajos para ejecutar Pidgin"
 
 #. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
+msgstr "Soporte de corrector ortográfico"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Start Menu"
-msgstr "Inicio"
+msgstr "Menú de inicio"
 
 #. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
-
-#, fuzzy
+"Soporte para corrección ortográfica (necesita una conexión a Internet para "
+"la instalación)"
+
 msgid "The installer is already running."
-msgstr "Ya se está utilizando el apodo \"%s\"."
+msgstr "El instalador ya se está ejecutando."
 
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
@@ -15648,14 +15553,16 @@
 "\\rEs probable que otro usuario instalara la aplicación."
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "URI Handlers"
-msgstr "gestor de URL myim"
+msgstr "Gestores de URI"
 
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
 msgstr ""
+"No se puede desinstalar con la versión que actualmente está instalada de "
+"Pidgin. La nueva versión se instalará sin eliminar la versión actualmente "
+"instalada."
 
 #. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
@@ -15664,6 +15571,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "No tiene permisos para desinstalar esta aplicación."
 
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Colgar"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "El apado que introdujo no es válido."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Nombre de usuario MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Apodo"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Su número de teléfono móvil..."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "El certificado no es aún válido."
+
+#~ msgid "Rate to host"
+#~ msgstr "Tasa de mensajes al servidor"
+
+#~ msgid "Rate to client"
+#~ msgstr "Tasa de mensajes al cliente"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Razón desconocida."
 
--- a/po/et.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/et.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: pidgin 2.5.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2008-09-30 08:10+0300\n"
 "Last-Translator: Ivar Smolin <okul@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -63,12 +63,24 @@
 msgid "Error"
 msgstr "Viga"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Konto jäi lisamata"
+
 msgid "Account was not added"
 msgstr "Konto jäi lisamata"
 
 msgid "Username of an account must be non-empty."
 msgstr "Konto kasutajanimi ei tohi tühi olla."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Uutest sõnumitest antakse teada"
 
@@ -1252,6 +1264,10 @@
 msgid "Someone says your username in chat"
 msgstr "Keegi ütleb jututoas sinu nime"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Volituste andmine katkestati"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer'i tõrge"
 
@@ -1541,7 +1557,7 @@
 msgid "Online"
 msgstr "Ühendatud"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Ühendamata"
 
@@ -1662,9 +1678,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Subjekti \"%s\" jaoks esitatud sertifikaadi on vigane."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3810,6 +3827,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server vajab avatekstiautentimist üle krüptimata andmevoo"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vajab avatekstiautentimist üle krüptimata andmevoo. Kas lubada see ja "
+"jätkata autentimist?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Tõrge autentimisel"
 
@@ -5970,7 +5999,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5983,6 +6012,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Perekonnanimi"
@@ -6056,7 +6086,7 @@
 msgstr "Ühendumine"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Sisestatud SecurID võti on vigane."
 
 #, fuzzy
@@ -6064,13 +6094,8 @@
 msgstr "Sisestatud SecurID võti on vigane."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Hüüdnimi"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6100,10 +6125,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6160,8 +6185,8 @@
 msgstr "Keskmine nimi"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Määra mobiiltelefoni number..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6189,6 +6214,15 @@
 msgid "_Room Name:"
 msgstr "_Tuba:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Sulle on e-sõnum!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Ühendatud"
+
 #. 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 ""
@@ -7947,10 +7981,10 @@
 msgid "Invalid SNAC"
 msgstr "Vigane SNAC"
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10226,7 +10260,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konverentside ja jututubade kutseid eiratakse"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13084,10 +13118,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13931,10 +13965,6 @@
 msgstr "Kohandatud tujunägude haldur"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Volituste andmine katkestati"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Vali sõber"
 
@@ -15440,6 +15470,22 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Subjekti \"%s\" jaoks esitatud sertifikaadi on vigane."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Sisestatud SecurID võti on vigane."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Hüüdnimi"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Määra mobiiltelefoni number..."
+
 #~ msgid "Unknown reason."
 #~ msgstr "Tundmatu põhjus."
 
--- a/po/eu.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/eu.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2009-08-29 23:23+0200\n"
 "Last-Translator: Mikel Pascual Aldabaldetreku <mikel.paskual@gmail.com>\n"
 "Language-Team:  <en@li.org>\n"
@@ -61,12 +61,24 @@
 msgid "Error"
 msgstr "Errorea"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Ez da kontua gehitu"
+
 msgid "Account was not added"
 msgstr "Ez da kontua gehitu"
 
 msgid "Username of an account must be non-empty."
 msgstr "Kontuaren erabiltzaile-izena ezin da hutsik egon."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Mezu berrien jakinarazpenak"
 
@@ -1259,6 +1271,10 @@
 msgid "Someone says your username in chat"
 msgstr "Norbaitek zure erabiltzaile-izena dio solasaldian"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Aktibazioa beharrezkoa"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer Errorea"
 
@@ -1549,7 +1565,7 @@
 msgid "Online"
 msgstr "Konektatuta"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Deskonektatuta"
 
@@ -1667,8 +1683,10 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
-msgstr "Zertifikatua ez da baliozkoa oraindik."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Iraungi egin da zertifikatua, eta ezin da baliozkotzat hartu."
@@ -3820,6 +3838,19 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Zerbitzariak testu-arrunt balioztatzea behar du, enkriptatu gabeko jarioan"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s(e)k testu-arrunt balioztatzea behar du, enkriptatu gabeko jarioan.   Hau "
+"baimendu eta balioztatzearekin jarraitu?"
+
 msgid "SASL authentication failed"
 msgstr "Errorea SASL balioztatzean"
 
@@ -5988,7 +6019,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6001,6 +6032,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Deitura"
@@ -6075,7 +6107,7 @@
 msgstr "Konektatzen"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Baliogabea da sartutako SecurID-gakoa"
 
 #, fuzzy
@@ -6083,13 +6115,8 @@
 msgstr "Baliogabea da sartutako SecurID-gakoa"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Goitizena"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6119,10 +6146,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6179,8 +6206,8 @@
 msgstr "Bigarren Izena"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Telefono Mugikorra ezarri..."
+msgid "Your MXit ID..."
+msgstr "Yahoo IDa..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6208,6 +6235,15 @@
 msgid "_Room Name:"
 msgstr "_Gela:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Posta daukazu!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Konektatuta"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -8012,11 +8048,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC baliogabea"
 
-msgid "Rate to host"
-msgstr "Ostalariarekiko tasa"
-
-msgid "Rate to client"
-msgstr "Bezeroarekiko tasa"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Zerbitzua eskuragaitz"
@@ -10294,7 +10330,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferentzia eta berriketa-geletarako gonbidapenak ezikusi"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Kontuaren proxy-a erabili SSL konexioetarako"
 
 msgid "Chat room list URL"
@@ -13157,11 +13194,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Ixten, beste libpurple-bezero bat martxan dagoelako jadanik.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Multimedia"
 
-msgid "/Media/_Hangup"
-msgstr "/Multimedia/E_skegi"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Eskegi"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13987,10 +14026,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Smiley Pertsonalizatuen Kudeatzailea"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Aktibazioa beharrezkoa"
-
 msgid "Select Buddy Icon"
 msgstr "Lagun-Ikonoa Hautatu"
 
@@ -15488,6 +15523,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Ez daukazu aplikazio hau kentzeko baimenik."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Zertifikatua ez da baliozkoa oraindik."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Baliogabea da sartutako SecurID-gakoa"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Goitizena"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Telefono Mugikorra ezarri..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Ostalariarekiko tasa"
+
+#~ msgid "Rate to client"
+#~ msgstr "Bezeroarekiko tasa"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Multimedia/E_skegi"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Arrazoi ezezaguna."
 
--- a/po/fa.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/fa.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 1.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2007-04-10 20:37+0330\n"
 "Last-Translator: Elnaz Sarbar <elnaz@farsiweb.info>\n"
 "Language-Team: Persian\n"
@@ -59,6 +59,10 @@
 msgid "Error"
 msgstr "خطا"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "حساب اضافه نشد"
+
 msgid "Account was not added"
 msgstr "حساب اضافه نشد"
 
@@ -66,6 +70,14 @@
 msgid "Username of an account must be non-empty."
 msgstr "نام کاربری حساب نمی‌تواند خالی باشد"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "اطلاع‌های نامهٔ جدید"
 
@@ -1287,6 +1299,10 @@
 msgid "Someone says your username in chat"
 msgstr "کسی نام شما را در گپ می‌گوید"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ثبت نام لازم است"
+
 msgid "GStreamer Failure"
 msgstr "شکست GStreamer"
 
@@ -1588,7 +1604,7 @@
 msgid "Online"
 msgstr "برخط"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "برون‌خط"
 
@@ -1711,9 +1727,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "نام کاربری مشخص شده نامعتبر است."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3851,6 +3868,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "کارگزار به تأیید هویت متنی ساده روی جریان رمزنگاری نشده نیاز دارد"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"این کارگزار به تأیید هویت متنی ساده روی اتصال رمزنگاری نشده نیاز دارد. این "
+"اجازه داده شده و تأیید هویت ادامه پیدا کند؟"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "تأیید هویت شکست خورد"
 
@@ -6078,7 +6107,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6091,6 +6120,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "نمایش"
@@ -6165,7 +6195,7 @@
 msgstr "در حال اتصال"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "کلید SecurID وارد شده نامعتبر است."
 
 #, fuzzy
@@ -6173,13 +6203,8 @@
 msgstr "کلید SecurID وارد شده نامعتبر است."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "لقب"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6215,10 +6240,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6275,8 +6300,8 @@
 msgstr "نام وسط"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "تنظیم شمارهٔ تلفن همراه..."
+msgid "Your MXit ID..."
+msgstr "شناسهٔ Yahoo!‎"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6304,6 +6329,15 @@
 msgid "_Room Name:"
 msgstr "_اتاق:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "نامه دارید!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "برخط"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -8130,10 +8164,10 @@
 msgid "Invalid SNAC"
 msgstr "SNAC نامعتبر"
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10482,7 +10516,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "نادیده گرفتن دعوت به کنفرانس‌ها و اتاق‌های گپ"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13468,10 +13502,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14340,10 +14374,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "ثبت نام لازم است"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "انتخاب رفیق"
 
@@ -15902,6 +15932,22 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "شما اجازه لازم براى حذف اين برنامه را نداريد."
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "نام کاربری مشخص شده نامعتبر است."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "کلید SecurID وارد شده نامعتبر است."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "لقب"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "تنظیم شمارهٔ تلفن همراه..."
+
 #~ msgid "Unknown reason."
 #~ msgstr "دلیل نامعلوم."
 
--- a/po/fi.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/fi.po	Sat Jul 31 23:42:35 2010 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2010-02-18 15:01+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
@@ -63,12 +63,24 @@
 msgid "Error"
 msgstr "Virhe"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Käyttäjätiliä ei lisätty"
+
 msgid "Account was not added"
 msgstr "Käyttäjätiliä ei lisätty"
 
 msgid "Username of an account must be non-empty."
 msgstr "Käyttäjätilin käyttäjänimi ei voi olla tyhjä."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Ilmoita uudesta sähköpostista"
 
@@ -1261,6 +1273,9 @@
 msgid "Someone says your username in chat"
 msgstr "Joku sanoo käyttäjänimesi ryhmäkeskustelussa"
 
+msgid "Attention received"
+msgstr "Huomio vastanotettu"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer-virhe"
 
@@ -1554,7 +1569,7 @@
 msgid "Online"
 msgstr "Linjoilla"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
@@ -1673,8 +1688,10 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
-msgstr "Varmenne ei ole vielä kelvollinen."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Varmenne on vanhentunut eikä sitä tulisi pitää kelvollisena."
@@ -3823,6 +3840,19 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden yli. "
+"Sallitaanko tämä ja jatketaan?"
+
 msgid "SASL authentication failed"
 msgstr "SASL-todennus epäonnistui"
 
@@ -5973,7 +6003,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5985,6 +6015,7 @@
 msgstr "Varmista PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Näyttönimi"
 
@@ -6052,7 +6083,7 @@
 msgstr "Yhdistetään..."
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen"
 
 #, fuzzy
@@ -6060,12 +6091,8 @@
 msgstr "Syötetty SecurID-avain on virheellinen"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Kutsumanimi"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6103,10 +6130,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6164,8 +6191,8 @@
 msgstr "Muut etunimet"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Aseta matkapuhelinnumero..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6193,6 +6220,15 @@
 msgid "_Room Name:"
 msgstr "_Huone:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Sinulle on postia."
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Linjoilla"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -7994,11 +8030,11 @@
 msgid "Invalid SNAC"
 msgstr "Epäkelpo SNAC"
 
-msgid "Rate to host"
-msgstr "Nopeus isäntään"
-
-msgid "Rate to client"
-msgstr "Nopeus asiakasohjelmaan"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Palvelu ei ole käytettävissä"
@@ -10255,7 +10291,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Käytä tilin välipalvelinta SSL-yhteyksissä"
 
 msgid "Chat room list URL"
@@ -13119,11 +13156,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Poistutaan, koska toinen libpurple-asiakas on jo käynnissä.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Katkaise"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Katkaise"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13928,9 +13967,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Omien hymiöiden hallinta"
 
-msgid "Attention received"
-msgstr "Huomio vastanotettu"
-
 msgid "Select Buddy Icon"
 msgstr "Valitse tuttavakuvake"
 
@@ -15421,6 +15457,29 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Sinulla ei ole valtuuksia poistaa ohjelmaa."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Varmenne ei ole vielä kelvollinen."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Syötetty SecurID-avain on virheellinen"
+
+#~ msgid "Nick Name"
+#~ msgstr "Kutsumanimi"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Aseta matkapuhelinnumero..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Nopeus isäntään"
+
+#~ msgid "Rate to client"
+#~ msgstr "Nopeus asiakasohjelmaan"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Katkaise"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Tuntematon syy."
 
--- a/po/fr.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/fr.po	Sat Jul 31 23:42:35 2010 +0000
@@ -21,7 +21,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2010-02-22 17:08+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -75,12 +75,24 @@
 msgid "Error"
 msgstr "Erreur"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Le compte n'a pas été ajouté."
+
 msgid "Account was not added"
 msgstr "Le compte n'a pas été ajouté."
 
 msgid "Username of an account must be non-empty."
 msgstr "Le nom d'utilisateur d'un compte ne doit pas être vide."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Avertir des nouveaux courriers"
 
@@ -1275,6 +1287,9 @@
 msgid "Someone says your username in chat"
 msgstr "Quelqu'un écrit votre nom dans une discussion"
 
+msgid "Attention received"
+msgstr "Demande d'attention reçue"
+
 msgid "GStreamer Failure"
 msgstr "Erreur GStreamer"
 
@@ -1568,7 +1583,7 @@
 msgid "Online"
 msgstr "En ligne"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Déconnecté"
 
@@ -1686,8 +1701,10 @@
 "Il n'y a pas de confiance dans ce certificat parce qu'il n'y a pas de "
 "confiance dans aucun des certificats qui le vérifient."
 
-msgid "The certificate is not valid yet."
-msgstr "Le certificat n'est pas encore valide."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Le certificat a expiré et ne devrait pas être considéré valide."
@@ -3863,6 +3880,20 @@
 msgstr ""
 "Le serveur pense que l'authentification est terminée, et le client non."
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Le serveur demande une authentification en texte non chiffré au travers d'un "
+"flux crypté."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s demande une authentification en texte clair au travers d'une connexion "
+"non cryptée. Voulez-vous autoriser ceci et continuer l'authentification ?"
+
 msgid "SASL authentication failed"
 msgstr "Échec de l'authentification SASL"
 
@@ -5975,7 +6006,8 @@
 "Les informations de votre profil n'ont pu être récupérées. Veuillez "
 "réessayer plus tard."
 
-msgid "Your MXitId"
+#, fuzzy
+msgid "Your UID"
 msgstr "Votre MXitId"
 
 #. pin
@@ -5987,6 +6019,7 @@
 msgstr "Vérification code"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Nom affiché"
 
@@ -6047,19 +6080,16 @@
 msgid "Connecting..."
 msgstr "Connexion..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Le pseudo saisi est non valide."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Le nom saisi est non valide."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Le code d'accès saisi n'a pas la bonne taille [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Nom d'utilisateur MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Pseudonyme"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6090,11 +6120,13 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Pays choisi non valide. Veuillez réessayer plus tard."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 "Le nom d'utilisateur n'est pas enregistré. Veuillez l'enregistrer d'abord."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "Le nom d'utilisateur est déjà enregistré. Veuillez en choisir un autre."
 
@@ -6140,8 +6172,9 @@
 msgid "Hidden Number"
 msgstr "Numéro caché"
 
-msgid "Your Mobile Number..."
-msgstr "Votre numéro de téléphone portable..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Votre MXitId"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6167,6 +6200,15 @@
 msgid "_Room Name:"
 msgstr "_Salon :"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Vous avez du courrier !"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "En ligne"
+
 #. 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 "Connexion perdue avec MXit. Veuillez vous reconnecter."
@@ -7945,11 +7987,11 @@
 msgid "Invalid SNAC"
 msgstr "Identifiant non valide"
 
-msgid "Rate to host"
-msgstr "Fréquence vers l'hôte"
-
-msgid "Rate to client"
-msgstr "Fréquence vers le client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Service non disponible"
@@ -10218,7 +10260,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer les invitations aux conférences et salons de discussions"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Utiliser le proxy du compte pour les connexions SSL"
 
 msgid "Chat room list URL"
@@ -13100,11 +13143,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Arrêt à cause d'un autre client libpurple existant.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Média"
 
-msgid "/Media/_Hangup"
-msgstr "/Média/_Raccrocher"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Raccrocher"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13905,9 +13950,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Gestionnaire de frimousses personnalisées"
 
-msgid "Attention received"
-msgstr "Demande d'attention reçue"
-
 msgid "Select Buddy Icon"
 msgstr "Choisir l'icône de contact"
 
@@ -15421,6 +15463,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Vous n'avez pas les permissions pour supprimer cette application."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Le certificat n'est pas encore valide."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Le pseudo saisi est non valide."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Nom d'utilisateur MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Pseudonyme"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Votre numéro de téléphone portable..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Fréquence vers l'hôte"
+
+#~ msgid "Rate to client"
+#~ msgstr "Fréquence vers le client"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Média/_Raccrocher"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Erreur inconnue"
 
--- a/po/ga.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ga.po	Sat Jul 31 23:42:35 2010 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2008-08-27 16:26-0800\n"
 "Last-Translator: Aaron Kearns <ajkearns6@gmail.com>\n"
 "Language-Team: \n"
@@ -51,12 +51,23 @@
 msgid "Error"
 msgstr "Earráid"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr ""
 
@@ -1203,6 +1214,9 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1492,7 +1506,7 @@
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1610,7 +1624,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3637,6 +3653,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 msgid "SASL authentication failed"
 msgstr ""
 
@@ -5748,7 +5773,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5761,6 +5786,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Sloinne"
@@ -5825,20 +5851,15 @@
 msgid "Connecting..."
 msgstr "Nasctha"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "_Leasainm:"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5867,10 +5888,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5922,8 +5943,9 @@
 msgid "Hidden Number"
 msgstr "Uimhir Guthán"
 
-msgid "Your Mobile Number..."
-msgstr ""
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5949,6 +5971,15 @@
 msgid "_Room Name:"
 msgstr "_Seomra:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Tá ríomhphost agat!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Sloinne"
+
 #. 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 ""
@@ -7620,10 +7651,10 @@
 msgid "Invalid SNAC"
 msgstr "SNAC Neamhbhailí"
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -9856,7 +9887,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12640,10 +12671,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13464,9 +13495,6 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 #, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Roghnaigh Cló..."
@@ -14917,6 +14945,10 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "_Leasainm:"
+
+#, fuzzy
 #~ msgid "Unknown reason."
 #~ msgstr "níl fhios an fáth"
 
--- a/po/gl.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/gl.po	Sat Jul 31 23:42:35 2010 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2009-07-15 15:15+0200\n"
 "Last-Translator: Antón Méixome <meixome@mancomun.org>\n"
 "Language-Team: Galician <g11n@mancomun.org>\n"
@@ -64,12 +64,24 @@
 msgid "Error"
 msgstr "Erro"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Non se engadiu a conta"
+
 msgid "Account was not added"
 msgstr "Non se engadiu a conta"
 
 msgid "Username of an account must be non-empty."
 msgstr "O nome de usuario dunha conta non pode estar baleiro."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Notificacións de correo novo"
 
@@ -1265,6 +1277,10 @@
 msgid "Someone says your username in chat"
 msgstr "Alguén dixo o seu nome na conversa"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Requírese activación"
+
 msgid "GStreamer Failure"
 msgstr "Fallo de GStreamer"
 
@@ -1560,7 +1576,7 @@
 msgid "Online"
 msgstr "Conectado"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -1681,9 +1697,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "A cadea de certificación presentada para %s non é válida."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3854,6 +3871,19 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"O servidor require a autenticación con texto plano sobre un fluxo non cifrado"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s require a autenticación con texto plano sobre unha conexión no cifrada. "
+"Quere permitir isto e continuar coa autenticación?"
+
 msgid "SASL authentication failed"
 msgstr "Fallou a autenticación SASL"
 
@@ -6031,7 +6061,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6044,6 +6074,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Apelidos"
@@ -6117,7 +6148,7 @@
 msgstr "Conectando"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "A chave SecurID que se introduciu non é válida"
 
 #, fuzzy
@@ -6125,13 +6156,8 @@
 msgstr "A chave SecurID que se introduciu non é válida"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Alcume"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6161,10 +6187,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6221,8 +6247,8 @@
 msgstr "Segundo nome"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Establecer o número do teléfono móbil..."
+msgid "Your MXit ID..."
+msgstr "ID de Yahoo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6250,6 +6276,15 @@
 msgid "_Room Name:"
 msgstr "_Sala:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Ten correo!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Conectado"
+
 #. 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 ""
@@ -8065,11 +8100,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC non válido"
 
-msgid "Rate to host"
-msgstr "Taxa de mensaxes para o host"
-
-msgid "Rate to client"
-msgstr "Taxa de mensaxes para o cliente"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Servizo non dispoñíbel"
@@ -10338,7 +10373,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar os convites a salas de conferencias ou de conversa"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13223,11 +13258,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Saíndo porque xa está executándose outro cliente libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Colgar"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Colgar"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14056,10 +14093,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Xestor de emoticonas personalizadas"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Requírese activación"
-
 msgid "Select Buddy Icon"
 msgstr "Seleccionar icona de contacto"
 
@@ -15559,6 +15592,31 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Non ten permisos para desinstalar esta aplicación."
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "A cadea de certificación presentada para %s non é válida."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "A chave SecurID que se introduciu non é válida"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Alcume"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Establecer o número do teléfono móbil..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Taxa de mensaxes para o host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Taxa de mensaxes para o cliente"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Colgar"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Razón descoñecida."
 
--- a/po/gu.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/gu.po	Sat Jul 31 23:42:35 2010 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: pidgin.gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2010-04-07 12:00+0530\n"
 "Last-Translator: Sweta Kothari <swkothar@redhat.com>\n"
 "Language-Team: Gujarati\n"
@@ -63,12 +63,24 @@
 msgid "Error"
 msgstr "ક્ષતિ"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ખાતું ઉમેરાયેલ ન હતુ"
+
 msgid "Account was not added"
 msgstr "ખાતું ઉમેરાયેલ ન હતુ"
 
 msgid "Username of an account must be non-empty."
 msgstr "ખાતાનું વપરાશકર્તાનામ ખાલી ન જ હોવુ જોઇએ."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "નવા મેઈલ સૂચનો"
 
@@ -1245,6 +1257,9 @@
 msgid "Someone says your username in chat"
 msgstr "કોઈ તમારું વપરાશકર્તાનામ વાતચીતમાં કહે છે"
 
+msgid "Attention received"
+msgstr "ધ્યાન મળ્યુ"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer નિષ્ફળતા"
 
@@ -1535,7 +1550,7 @@
 msgid "Online"
 msgstr "ઓનલાઈન"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ઓફલાઈન"
 
@@ -1655,8 +1670,10 @@
 "પ્રમાણપત્ર વિશ્ર્વાસપાત્ર નથી કારણ કે તે હાલમાં વિશ્ર્વાસુ છે તેવું કોઇ પ્રમાણપત્ર નથી કે "
 "ચકાસી શકાય."
 
-msgid "The certificate is not valid yet."
-msgstr "હજુ પ્રમાણપત્ર યોગ્ય નથી."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "પ્રમાણપત્રની તારીખ જતી રહી છે અને પ્રમાણિત નક્કી કરવુ જોઇએ નહિં."
@@ -3767,6 +3784,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "સર્વર વિચારે છે કે સત્તાધિકરણ સમાપ્ત છે, પરંતુ ક્લાયન્ટ નથી વિચારતુ"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "એનક્રિપ્ટ નહિં એવી સ્ટ્રીમ પર સર્વર માટે સાદુલખાણ સત્તાધિકરણ જરૂરી છે"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s માટે એનક્રિપ્ટ નહિં એવા જોડાણ પર સાદું લખાણ સત્તાધિકરણ જરૂરી છે.  શું આને પરવાનગી "
+"આપવી છે અને સત્તાધિકરણ ચાલુ રાખવું છે?"
+
 msgid "SASL authentication failed"
 msgstr "SASL સત્તાધિકરણ નિષ્ફળ"
 
@@ -5837,7 +5866,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "તમારી રૂપરેખા જાણકારી ને પુન:પ્રાપ્ત થયેલ નથી. મહેરબાની કરીને પછીથી પ્રયત્ન કરો."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5849,6 +5878,7 @@
 msgstr "PIN ને ચકાસો"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "દર્શાવ નામ"
 
@@ -5906,19 +5936,16 @@
 msgid "Connecting..."
 msgstr "જોડાઈ રહ્યા છીએ..."
 
-msgid "The nick name you entered is invalid."
-msgstr "લાડકું નામ જે તમે દાખલ કરેલ છે તે અયોગ્ય છે."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "તમે દાખલ થયેલ નામ એ અયોગ્ય છે."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "તમે દાખલ કરેલ છે તે PIN પાસે અયોગ્ય લંબાઇ છે [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit પ્રવેશ નામ"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "લાડકું નામ"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5948,10 +5975,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "અયોગ્ય દેશ પસંદ થયેલ. મહેરબાની કરીને ફરીથી પ્રયત્ન કરો."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "વપરાશકર્તા રજીસ્ટર થયેલ નથી. મહેરબાની કરીને પહેલાં રજીસ્ટર કરો."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "વપરાશકર્તા પહેલેથી જ રજીસ્ટર થયેલ છે. મહેરબાની કરીને બીજો વપરાશકર્તાનામ પસંદ કરો."
 
@@ -5998,8 +6027,9 @@
 msgid "Hidden Number"
 msgstr "છુપાયેલ નંબર"
 
-msgid "Your Mobile Number..."
-msgstr "તમારો મોબાઇલ નંબર..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6025,6 +6055,15 @@
 msgid "_Room Name:"
 msgstr "કક્ષ (_R):"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "તમારી પાસે મેલ છે!"
+
+#, fuzzy
+msgid "Last Online"
+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 માં જોડાણ ગુમાવી દીધુ. મહેરબાની કરીને ફરીથી જોડો."
@@ -7747,11 +7786,11 @@
 msgid "Invalid SNAC"
 msgstr "અયોગ્ય SNAC"
 
-msgid "Rate to host"
-msgstr "યજમાનનો ક્રમ"
-
-msgid "Rate to client"
-msgstr "ક્લાઈન્ટનો ક્રમ"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "સેવા ઉપલબ્ધ નથી"
@@ -9995,7 +10034,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "કૉન્ફરન્સ અને વાતચીત રુમ આમંત્રણોને અવગણો"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL જોડાણો માટે ખાતાની પ્રોક્સીને વાપરો"
 
 msgid "Chat room list URL"
@@ -12822,11 +12862,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ઉત્સાહી થઇ રહ્યા છે કારણ કે બીજા libpurple ક્લાયન્ટ એ પહેલેથી જ ચાલી રહ્યા છે.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/મીડિયા (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/મીડિયા/હેંગઅપ (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "સ્તબ્ધ"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13622,9 +13664,6 @@
 msgid "Custom Smiley Manager"
 msgstr "વૈવિધ્યપૂર્ણ હસ્તો ચહેરો સંચાલક"
 
-msgid "Attention received"
-msgstr "ધ્યાન મળ્યુ"
-
 msgid "Select Buddy Icon"
 msgstr "મિત્ર આઇકનને પસંદ કરો"
 
@@ -15084,6 +15123,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "હજુ પ્રમાણપત્ર યોગ્ય નથી."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "લાડકું નામ જે તમે દાખલ કરેલ છે તે અયોગ્ય છે."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit પ્રવેશ નામ"
+
+#~ msgid "Nick Name"
+#~ msgstr "લાડકું નામ"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "તમારો મોબાઇલ નંબર..."
+
+#~ msgid "Rate to host"
+#~ msgstr "યજમાનનો ક્રમ"
+
+#~ msgid "Rate to client"
+#~ msgstr "ક્લાઈન્ટનો ક્રમ"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/મીડિયા/હેંગઅપ (_H)"
+
 #~ msgid "Unknown reason."
 #~ msgstr "અજ્ઞાત કારણ."
 
--- a/po/he.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/he.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
@@ -60,12 +60,24 @@
 msgid "Error"
 msgstr "שגיאה"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "החשבון לא נוסף"
+
 msgid "Account was not added"
 msgstr "החשבון לא נוסף"
 
 msgid "Username of an account must be non-empty."
 msgstr "שם המשתמש של החשבון חייב להיות לא-ריק."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "הודעה על דואר חדש"
 
@@ -1233,6 +1245,9 @@
 msgid "Someone says your username in chat"
 msgstr "מישהו מזכיר את שם המשתמש שלך בשיחה"
 
+msgid "Attention received"
+msgstr "תשומת-לב התקבלה"
+
 msgid "GStreamer Failure"
 msgstr "תקלת GStreamer"
 
@@ -1518,7 +1533,7 @@
 msgid "Online"
 msgstr "מחובר"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "מנותק"
 
@@ -1634,8 +1649,10 @@
 "currently trusted."
 msgstr "לא ניתן לבטוח בתעודה כיוון שאין תעודה מאושרת שיכולה לאמת אותה."
 
-msgid "The certificate is not valid yet."
-msgstr "התעודה עדיין אינה תקפה."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "תוקף התעודה פג, ולכן אין להחשיבה כתקפה."
@@ -3730,6 +3747,16 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "השרת סבור שהאימות הסתיים בהצלחה, אבל תוכנת הלקוח לא מסכימה"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "השרת דורש אימות לא מוצפן מעל תקשורת לא מוצפנת"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr "%s דורש אימות לא מוצפן מעל תקשורת לא מוצפנת. לאפשר ולהמשיך בכל זאת?"
+
 msgid "SASL authentication failed"
 msgstr "אימות SASL נכשל"
 
@@ -5778,7 +5805,8 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "פרטי הפרופיל שלך עוד לא התקבלו. יש לנסות שנית מאוחר יותר."
 
-msgid "Your MXitId"
+#, fuzzy
+msgid "Your UID"
 msgstr "מזהה MXit שלך"
 
 #. pin
@@ -5790,6 +5818,7 @@
 msgstr "וידוא מספר מזהה"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "שם תצוגה"
 
@@ -5846,19 +5875,16 @@
 msgid "Connecting..."
 msgstr "מתחבר..."
 
-msgid "The nick name you entered is invalid."
-msgstr "שם-הכינוי שהזנת אינו חוקי."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "השם שהזנת אינו חוקי."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "ה-PIN שהזנת בעל אורך לא-חוקי [7-10[."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "שם משתמש MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "כינוי"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5886,10 +5912,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "נבחרה ארץ לא-חוקית. יש לנסות שנית."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "שם המשתמש אינו רשום. חובה להירשם קודם."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "שם המשתמש כבר רשום. יש לבחור שם משתמש אחר."
 
 msgid "Internal error. Please try again later."
@@ -5934,8 +5962,9 @@
 msgid "Hidden Number"
 msgstr "מספר סמוי"
 
-msgid "Your Mobile Number..."
-msgstr "מספר הנייד שלך..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "מזהה MXit שלך"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5961,6 +5990,15 @@
 msgid "_Room Name:"
 msgstr "_חדר:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "יש לך דואר!"
+
+#, fuzzy
+msgid "Last Online"
+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 אבד. נא להתחבר בשנית."
@@ -7669,11 +7707,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC לא תקף"
 
-msgid "Rate to host"
-msgstr "דירוג למארח"
-
-msgid "Rate to client"
-msgstr "דירוג ללקוח"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "השירות אינו זמין"
@@ -9907,7 +9945,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "התעלם מהזמנות לשיחות-ועידה ולחדרי-צ'אט"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "השתמש בחשבון שרת-תיווך עבור חיבורי SSL"
 
 msgid "Chat room list URL"
@@ -12710,11 +12749,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "מסיים מכיוון שכבר רצה תוכנה אחרת שהמשתמש בספריית libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_מדיה"
 
-msgid "/Media/_Hangup"
-msgstr "/מדיה/_ניתוק"
+#, fuzzy
+msgid "_Hangup"
+msgstr "התנתק"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13508,9 +13549,6 @@
 msgid "Custom Smiley Manager"
 msgstr "מנהל החייכנים שלך"
 
-msgid "Attention received"
-msgstr "תשומת-לב התקבלה"
-
 msgid "Select Buddy Icon"
 msgstr "בחירת תמונה עבור חבר"
 
@@ -14970,6 +15008,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ".אין לך זכות למחוק תוכנה זאת"
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "התעודה עדיין אינה תקפה."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "שם-הכינוי שהזנת אינו חוקי."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "שם משתמש MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "כינוי"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "מספר הנייד שלך..."
+
+#~ msgid "Rate to host"
+#~ msgstr "דירוג למארח"
+
+#~ msgid "Rate to client"
+#~ msgstr "דירוג ללקוח"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/מדיה/_ניתוק"
+
 #~ msgid "Current Mood"
 #~ msgstr "מצב הרוח הנוכחי"
 
--- a/po/hi.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/hi.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2010-02-19 15:12+0530\n"
 "Last-Translator: Rajesh Ranjan <rajeshkajha@yahoo.com>\n"
 "Language-Team: Hindi <Indlinux>\n"
@@ -61,12 +61,24 @@
 msgid "Error"
 msgstr "त्रुटि"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "खाता जोड़ा हुआ नहीं था"
+
 msgid "Account was not added"
 msgstr "खाता जोड़ा हुआ नहीं था"
 
 msgid "Username of an account must be non-empty."
 msgstr "किसी खाता का उपयोक्तानाम जरूर गैर रिक्त होना चाहिए."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "नयी डाक सूचना"
 
@@ -1231,6 +1243,10 @@
 msgid "Someone says your username in chat"
 msgstr "किसी ने चैट में आपका नाम पुकारा"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "सक्रियन आवशयक"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer विफलता"
 
@@ -1522,7 +1538,7 @@
 msgid "Online"
 msgstr "ऑनलाइन"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ऑफ़लाइन"
 
@@ -1642,8 +1658,10 @@
 "प्रमाणपत्र भरोसेमंद नहीं है क्योंकि कोई प्रमाणपत्र जो कि इसे जाँच सकता है अभी भरोसा किया "
 "जा सकता है."
 
-msgid "The certificate is not valid yet."
-msgstr "प्रमाणपत्र अबतक वैध नहीं है."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "प्रमाणपत्र समाप्त हो गया है और इसे वैध नहीं माना जा सकता है."
@@ -3763,6 +3781,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "सर्वर सोचता है कि सत्यापन पूर्ण है, लेकिन क्लाइंट नहीं"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "विगोपित स्ट्रीम पर सादा पाठ प्रमाणीकरण सर्वर के लिए जरूरी है "
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"एक विगोपित संबंधन पर सादा पाठ प्रमाणीकरण को %s सर्वर के लिए आवश्यक है. आप इसे अनुमति "
+"दें और प्रमाणीकरण जारी रखें?"
+
 msgid "SASL authentication failed"
 msgstr "SASL प्रमाणीकरण असफल"
 
@@ -5882,7 +5912,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "आपकी प्रोफ़ाइल अभी तक नहीं पाई गई. कृपया फिर कोशिश करें."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5894,6 +5924,7 @@
 msgstr "पिन जाँचें"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "नाम प्रदर्शित करें"
 
@@ -5950,19 +5981,16 @@
 msgid "Connecting..."
 msgstr "जुड़ रहा है..."
 
-msgid "The nick name you entered is invalid."
-msgstr "डाली गयी उपनाम अवैध है।"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "दर्ज़ नाम अवैध है।"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "दर्ज़ किया गया आपके पिन की लंबाई अवैध है [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit लॉगिन नाम"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "उप नाम"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5990,10 +6018,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "अवैध देश चुना गया. फिर कोशिश करें."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "उपयोक्तानाम पंजीकृत नहीं है. पहले पंजीकृत करें."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "उपयोक्तानाम पहले से पंजीकृत है. दूसरा उपयोक्तानाम चुनें."
 
 msgid "Internal error. Please try again later."
@@ -6039,8 +6069,9 @@
 msgid "Hidden Number"
 msgstr "छिपी संख्या"
 
-msgid "Your Mobile Number..."
-msgstr "आपका मोबाइल नंबर..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "याहू! आइ डी"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6066,6 +6097,15 @@
 msgid "_Room Name:"
 msgstr "कक्ष (_R):"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "आपके लिए मेल है!"
+
+#, fuzzy
+msgid "Last Online"
+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 के साथ आपका कनेक्शन खत्म हो गया. कृपया फिर कोशिश करें."
@@ -7805,11 +7845,11 @@
 msgid "Invalid SNAC"
 msgstr "अवैध SNAC"
 
-msgid "Rate to host"
-msgstr "मेजबान तक दर"
-
-msgid "Rate to client"
-msgstr "क्लायंट तक दर"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "सेवा अनुपलब्ध"
@@ -10046,7 +10086,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "कॉन्फेरेंस व बातचीत कक्ष आमंत्रण अनदेखा करें"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL कनेक्शन के लिए खाता प्रॉक्सी उपयोग करें"
 
 msgid "Chat room list URL"
@@ -12884,11 +12925,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "बाहर निकल रहा है क्योंकि libpurple क्लाइंट पहले से चल रहा है.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Hangup"
+#, fuzzy
+msgid "_Hangup"
+msgstr "हैंगअप"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13682,10 +13725,6 @@
 msgid "Custom Smiley Manager"
 msgstr "पसंदीदा स्माइली प्रबंधक"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "सक्रियन आवशयक"
-
 msgid "Select Buddy Icon"
 msgstr "दोस्त प्रतीक चुनें"
 
@@ -15148,6 +15187,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "प्रमाणपत्र अबतक वैध नहीं है."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "डाली गयी उपनाम अवैध है।"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit लॉगिन नाम"
+
+#~ msgid "Nick Name"
+#~ msgstr "उप नाम"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "आपका मोबाइल नंबर..."
+
+#~ msgid "Rate to host"
+#~ msgstr "मेजबान तक दर"
+
+#~ msgid "Rate to client"
+#~ msgstr "क्लायंट तक दर"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Hangup"
+
 #~ msgid "Unknown reason."
 #~ msgstr "अनजान कारण"
 
--- a/po/hu.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/hu.po	Sat Jul 31 23:42:35 2010 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: pidgin 2.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:15-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\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"
@@ -64,12 +64,24 @@
 msgid "Error"
 msgstr "Hiba"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "A fiók nem lett felvéve"
+
 msgid "Account was not added"
 msgstr "A fiók nem lett felvéve"
 
 msgid "Username of an account must be non-empty."
 msgstr "A fiók felhasználóneve nem lehet üres."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Értesítések új levélre"
 
@@ -1259,6 +1271,9 @@
 msgid "Someone says your username in chat"
 msgstr "Valaki csevegés közben leírja az Ön felhasználónevét"
 
+msgid "Attention received"
+msgstr "Figyelemkérés érkezett"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer hiba"
 
@@ -1552,7 +1567,7 @@
 msgid "Online"
 msgstr "Elérhető"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Kilépett"
 
@@ -1670,8 +1685,10 @@
 "A tanúsítvány nem megbízható, mivel az ellenőrzésére képes egyik tanúsítvány "
 "sem megbízható."
 
-msgid "The certificate is not valid yet."
-msgstr "A tanúsítvány még nem érvényes."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "A tanúsítvány lejárt és nem tekinthető érvényesnek."
@@ -3831,6 +3848,19 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "A kiszolgáló szerint a hitelesítés kész, a kliens szerint nem"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"A kiszolgáló szöveges hitelesítést követel meg egy nem titkosított csatornán"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s szöveges hitelesítést követel meg egy nem titkosított csatornán. "
+"Engedélyezi ezt és folytatja a hitelesítést?"
+
 msgid "SASL authentication failed"
 msgstr "A SASL hitelesítés meghiúsult"
 
@@ -5928,7 +5958,8 @@
 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"
+#, fuzzy
+msgid "Your UID"
 msgstr "Az Ön MXitId-ja"
 
 #. pin
@@ -5940,6 +5971,7 @@
 msgstr "PIN ellenőrzése"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Megjelenő név"
 
@@ -6000,19 +6032,16 @@
 msgid "Connecting..."
 msgstr "Kapcsolódás…"
 
-msgid "The nick name you entered is invalid."
-msgstr "A megadott becenév érvénytelen."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "A megadott név érvénytelen."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "A megadott PIN érvénytelen hosszúságú [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit bejelentkezési név"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Becenév"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6040,10 +6069,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Érvénytelen országot választott. Próbálja újra később."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "A felhasználónév nincs regisztrálva. Először regisztráljon."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "A felhasználónév már használatban van. Válasszon másik felhasználónevet."
 
@@ -6089,8 +6120,9 @@
 msgid "Hidden Number"
 msgstr "Rejtett szám"
 
-msgid "Your Mobile Number..."
-msgstr "Az Ön mobiltelefonszáma…"
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Az Ön MXitId-ja"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6116,6 +6148,15 @@
 msgid "_Room Name:"
 msgstr "Sz_oba:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Levele érkezett!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Elérhető"
+
 #. 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 "A kapcsolat elveszett a MXithez. Csatlakozzon újra."
@@ -7892,13 +7933,11 @@
 msgid "Invalid SNAC"
 msgstr "Érvénytelen azonosító"
 
-#, fuzzy
-msgid "Rate to host"
-msgstr "Meghívás csevegésre"
-
-#, fuzzy
-msgid "Rate to client"
-msgstr "Utolsó ismert kliens"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 #, fuzzy
 msgid "Service unavailable"
@@ -10193,7 +10232,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferencia- és csevegőszoba-meghívások figyelmen kívül hagyása"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Fiókproxy használata SSL kapcsolatokhoz"
 
 msgid "Chat room list URL"
@@ -13063,11 +13103,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Kilépés, mert már fut egy másik libpurple kliens.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Média"
 
-msgid "/Media/_Hangup"
-msgstr "/Média/_Lerakás"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Lerakás"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13867,9 +13909,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Egyénihangulatjel-kezelő"
 
-msgid "Attention received"
-msgstr "Figyelemkérés érkezett"
-
 msgid "Select Buddy Icon"
 msgstr "Válasszon partnerikont"
 
@@ -15372,3 +15411,29 @@
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Nincs jogosultsága az alkalmazás eltávolításához."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "A tanúsítvány még nem érvényes."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "A megadott becenév érvénytelen."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit bejelentkezési név"
+
+#~ msgid "Nick Name"
+#~ msgstr "Becenév"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Az Ön mobiltelefonszáma…"
+
+#, fuzzy
+#~ msgid "Rate to host"
+#~ msgstr "Meghívás csevegésre"
+
+#, fuzzy
+#~ msgid "Rate to client"
+#~ msgstr "Utolsó ismert kliens"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Média/_Lerakás"
--- a/po/hy.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/hy.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: am\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2009-05-20 17:37+0400\n"
 "Last-Translator: David Avsharyan <avsharyan@gmail.com>\n"
 "Language-Team: \n"
@@ -60,12 +60,23 @@
 msgid "Error"
 msgstr "Սխալներզ"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr "Օգտագործողի անունը  ..."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Նոր նամակի ծանուցումներ"
 
@@ -1199,6 +1210,9 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1477,7 +1491,7 @@
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1593,7 +1607,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3600,6 +3616,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 msgid "SASL authentication failed"
 msgstr ""
 
@@ -5621,7 +5646,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5633,6 +5658,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr ""
 
@@ -5691,18 +5717,14 @@
 msgid "Connecting..."
 msgstr ""
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-msgid "Nick Name"
+msgid "MXit ID"
 msgstr ""
 
 #. show the form to the user to complete
@@ -5732,10 +5754,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5780,7 +5802,7 @@
 msgid "Hidden Number"
 msgstr ""
 
-msgid "Your Mobile Number..."
+msgid "Your MXit ID..."
 msgstr ""
 
 #. Configuration options
@@ -5804,6 +5826,13 @@
 msgid "_Room Name:"
 msgstr ""
 
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+msgid "Last Online"
+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 ""
@@ -7439,10 +7468,10 @@
 msgid "Invalid SNAC"
 msgstr ""
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -9595,7 +9624,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12301,10 +12330,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13093,9 +13122,6 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 msgid "Select Buddy Icon"
 msgstr ""
 
--- a/po/id.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/id.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.2.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2007-10-28 02:39+0800\n"
 "Last-Translator: Rai S. Regawa <raireg@yahoo.com>\n"
 "Language-Team: Rai S. Regawa <raireg@yahoo.com>\n"
@@ -63,6 +63,10 @@
 msgid "Error"
 msgstr "Kesalahan"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Akun tidak ditambahkan"
+
 msgid "Account was not added"
 msgstr "Akun tidak ditambahkan"
 
@@ -70,6 +74,14 @@
 msgid "Username of an account must be non-empty."
 msgstr "Nama layar dari sebuah akun tidak boleh kosong."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Pemberitahuan email baru"
 
@@ -1288,6 +1300,10 @@
 msgid "Someone says your username in chat"
 msgstr "Seseorang menyebut nama anda dalam percakapan"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Disyaratkan Pendaftaran"
+
 msgid "GStreamer Failure"
 msgstr "Kegagalan GStreamer"
 
@@ -1577,7 +1593,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1703,9 +1719,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Rantai sertifikat yang ditampilkan untuk %s tidak berlaku."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3885,6 +3902,20 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Server memerlukan otentifikasi teks biasa melalui aliran yang tidak "
+"dienkripsi"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s memerlukan otentifikasi teks biasa melalui sambungan yang tidak "
+"dienkripsi.  Ijinkan ini dan lanjutkan otentifikasi?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Otentikasi gagal"
 
@@ -6092,7 +6123,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6105,6 +6136,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Nama Keluarga"
@@ -6178,7 +6210,7 @@
 msgstr "Menyambungkan"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Kunci SecurID yang dimasukkan tidak valid."
 
 #, fuzzy
@@ -6186,13 +6218,8 @@
 msgstr "Kunci SecurID yang dimasukkan tidak valid."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nama Panggilan"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6222,10 +6249,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6282,8 +6309,8 @@
 msgstr "Nama Tengah"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Atur Nomor Telepon Seluler..."
+msgid "Your MXit ID..."
+msgstr "ID Yahoo!"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6311,6 +6338,15 @@
 msgid "_Room Name:"
 msgstr "_Kamar:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Anda mendapatkan email"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. 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 ""
@@ -8141,11 +8177,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC tidak valid"
 
-msgid "Rate to host"
-msgstr "Nilai pada host"
-
-msgid "Rate to client"
-msgstr "Nilai pada client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Layanan tidak tersedia"
@@ -10500,7 +10536,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Abaikan undangan konferensi dan kamar percakapan"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13474,10 +13510,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14339,10 +14375,6 @@
 msgstr "Manajer Sertifikat"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Disyaratkan Pendaftaran"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Pilih Teman"
 
@@ -15899,6 +15931,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Rantai sertifikat yang ditampilkan untuk %s tidak berlaku."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Kunci SecurID yang dimasukkan tidak valid."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nama Panggilan"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Atur Nomor Telepon Seluler..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Nilai pada host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Nilai pada client"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Alasan tidak jelas."
 
--- a/po/it.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/it.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-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"
@@ -61,12 +61,24 @@
 msgid "Error"
 msgstr "Errore"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "L'account non è stato aggiunto"
+
 msgid "Account was not added"
 msgstr "L'account non è stato aggiunto"
 
 msgid "Username of an account must be non-empty."
 msgstr "Il nome utente per un account non può essere vuoto."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Notifica i nuovi messaggi di posta"
 
@@ -1265,6 +1277,9 @@
 msgid "Someone says your username in chat"
 msgstr "Qualcuno pronuncia il tuo nome in una chat"
 
+msgid "Attention received"
+msgstr "Ricevuta una richiesta di attenzione"
+
 msgid "GStreamer Failure"
 msgstr "Errore di GStreamer"
 
@@ -1565,7 +1580,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Non connesso"
 
@@ -1686,8 +1701,10 @@
 "Il certificato non è fidato poiché non può essere verificato da nessun altro "
 "certificato fidato."
 
-msgid "The certificate is not valid yet."
-msgstr "Il certificato non è ancora valido."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3857,6 +3874,20 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Il server ritiene che l'autenticazione sia completa; il client no "
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Il server richiede l'autenticazione sotto forma di testo semplice su uno "
+"stream non criptato"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s richiede l'autenticazione sotto forma di testo semplice su una "
+"connessione non criptata. Procedere con l'autenticazione?"
+
 msgid "SASL authentication failed"
 msgstr "Autenticazione SASL fallita"
 
@@ -5970,7 +6001,8 @@
 "L'informazione sul tuo profilo non è stata ancora recuperata. Riprova più "
 "tardi."
 
-msgid "Your MXitId"
+#, fuzzy
+msgid "Your UID"
 msgstr "Il tuo ID MXit"
 
 #. pin
@@ -5982,6 +6014,7 @@
 msgstr "Verifica PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Nome utente"
 
@@ -6041,19 +6074,16 @@
 msgid "Connecting..."
 msgstr "Connessione in corso..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Il nickname immesso non è valido"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Il nome immesso non è valido."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Il PIN immesso ha una lunghezza non valida [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Nome di login per MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Nickname"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6082,10 +6112,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Paese selezionato non valido. Riprova più tardi."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Il nome utente non è registrato. Registrati prima."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Il nome utente è già registrato. Scegli un altro nome utente."
 
 msgid "Internal error. Please try again later."
@@ -6130,8 +6162,9 @@
 msgid "Hidden Number"
 msgstr "Numero nascosto"
 
-msgid "Your Mobile Number..."
-msgstr "Il tuo numero di cellulare..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Il tuo ID MXit"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6157,6 +6190,15 @@
 msgid "_Room Name:"
 msgstr "_Stanza:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "C'è posta per te!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. 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."
@@ -7945,13 +7987,11 @@
 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"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 #, fuzzy
 msgid "Service unavailable"
@@ -10234,7 +10274,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignora gli inviti a conferenze e a stanze di discussione"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Usa un account proxy per le connessioni SSL"
 
 msgid "Chat room list URL"
@@ -13109,11 +13150,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Uscita in corso, poiché è in esecuzione un altro client libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Riaggancia"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Riaggancia"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13917,9 +13960,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Gestione degli smiley personalizzati"
 
-msgid "Attention received"
-msgstr "Ricevuta una richiesta di attenzione"
-
 msgid "Select Buddy Icon"
 msgstr "Seleziona l'icona per il contatto"
 
@@ -15339,8 +15379,8 @@
 "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/ ."
+"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
@@ -15431,3 +15471,29 @@
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Non hai il permesso per rimuovere questa applicazione."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Il certificato non è ancora valido."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Il nickname immesso non è valido"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Nome di login per MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Il tuo numero di cellulare..."
+
+#, fuzzy
+#~ msgid "Rate to host"
+#~ msgstr "Invita in chat"
+
+#, fuzzy
+#~ msgid "Rate to client"
+#~ msgstr "Ultimo client conosciuto"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Riaggancia"
--- a/po/ja.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ja.po	Sat Jul 31 23:42:35 2010 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: pidgin trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2007-06-30 14:57+0900\n"
 "Last-Translator: Takeshi AIHANA <takeshi.aihana@gmail.com>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -63,6 +63,10 @@
 msgid "Error"
 msgstr "エラー"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "アカウントが追加されませんでした"
+
 msgid "Account was not added"
 msgstr "アカウントが追加されませんでした"
 
@@ -70,6 +74,14 @@
 msgid "Username of an account must be non-empty."
 msgstr "アカウントのスクリーン名は空にしないで下さい。"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "新着メールを通知する"
 
@@ -1288,6 +1300,10 @@
 msgid "Someone says your username in chat"
 msgstr "チャットで誰かがあなたの名前を入力した時"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "登録が必要です"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer のエラー"
 
@@ -1587,7 +1603,7 @@
 msgid "Online"
 msgstr "オンライン"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "オフライン"
 
@@ -1710,9 +1726,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "選択したアカウントはオフラインです"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3873,6 +3890,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "暗号化されていないストリームを介したプレーンテキスト認証が必要です"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s が暗号化されていないストリーム接続を介したプレーンテキスト認証を要求してい"
+"ます。これを許可し認証を続行しますか?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "認証に失敗しました"
 
@@ -6112,7 +6141,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6125,6 +6154,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "苗字"
@@ -6194,7 +6224,7 @@
 msgstr "接続中です"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "入力したセキュア ID 鍵は不正です。"
 
 #, fuzzy
@@ -6202,13 +6232,8 @@
 msgstr "入力したセキュア ID 鍵は不正です。"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "ニックネーム"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6238,10 +6263,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6298,8 +6323,8 @@
 msgstr "ミドル・ネーム"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "携帯の電話番号の設定..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6327,6 +6352,15 @@
 msgid "_Room Name:"
 msgstr "ルーム(_R):"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "メールが届きました!"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8165,11 +8199,11 @@
 msgid "Invalid SNAC"
 msgstr "不正な SNAC"
 
-msgid "Rate to host"
-msgstr "ホストの速度"
-
-msgid "Rate to client"
-msgstr "クライアントの速度"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "サービスが利用できません"
@@ -10524,7 +10558,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "会議とチャットルームの招待を無視する"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13533,10 +13567,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14401,10 +14435,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "登録が必要です"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "仲間の選択"
 
@@ -15944,6 +15974,28 @@
 msgstr ""
 "あなたはこのアプリケーションをアンインストールする権限を持っていません。"
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "選択したアカウントはオフラインです"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "入力したセキュア ID 鍵は不正です。"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "ニックネーム"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "携帯の電話番号の設定..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ホストの速度"
+
+#~ msgid "Rate to client"
+#~ msgstr "クライアントの速度"
+
 #~ msgid "Unknown reason."
 #~ msgstr "原因は不明です"
 
--- a/po/ka.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ka.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.0 CVS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2006-02-05 23:19+0100\n"
 "Last-Translator: Ubuntu Georgian Translators <>\n"
 "Language-Team: Georgian <ka@li.org>\n"
@@ -51,12 +51,24 @@
 msgstr "შეცდომა"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "ანგარიში გამორთულია"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "ანგარიში გამორთულია"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ახალი ელ.ფოსტის შეტყობინებები"
 
@@ -1295,6 +1307,10 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "საჭიროა რეგისტრაცია"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1597,7 +1613,7 @@
 msgid "Online"
 msgstr "ხაზზე"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "გასული ქსელიდან"
 
@@ -1720,7 +1736,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3801,6 +3819,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "აუტენტიფიკაცია ვერ მოხერხდა"
@@ -5990,7 +6017,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6002,6 +6029,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "ოჯახური სახელი"
@@ -6069,20 +6097,15 @@
 msgid "Connecting..."
 msgstr "დაკავშირება"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "მეტსახელი"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6111,10 +6134,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -6169,8 +6192,8 @@
 msgstr "ოჯახური სახელი"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "შეიტანე მობილური ტელეფონის ნომერი..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6197,6 +6220,15 @@
 msgid "_Room Name:"
 msgstr "_ოთახი:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "%s გახდა უმოქმედო (%s)"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -7921,10 +7953,10 @@
 msgid "Invalid SNAC"
 msgstr "არასწორი SNAC"
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10220,7 +10252,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13136,10 +13168,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13999,10 +14031,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "საჭიროა რეგისტრაცია"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "ფონტის არჩევა"
 
@@ -15519,6 +15547,14 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "მეტსახელი"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "შეიტანე მობილური ტელეფონის ნომერი..."
+
 #~ msgid "Unknown reason."
 #~ msgstr "უცნობი მიზეზი."
 
--- a/po/km.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/km.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: km\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2010-02-25 15:29+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -61,12 +61,24 @@
 msgid "Error"
 msgstr "កំហុស"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "គណនី​មិន​ត្រូវ​បាន​បន្ថែម​ទេ"
+
 msgid "Account was not added"
 msgstr "គណនី​មិន​ត្រូវ​បាន​បន្ថែម​ទេ"
 
 msgid "Username of an account must be non-empty."
 msgstr "ឈ្មោះអ្នក​ប្រើ​របស់​គណនី​​មិនអាច​ទទេ​​នោះទេ ។"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ការ​ជូនដំណឹង​សំបុត្រ​ថ្មី"
 
@@ -1229,6 +1241,10 @@
 msgid "Someone says your username in chat"
 msgstr "មាន​មនុស្ស​ម្នាក់​និយាយ​អំពី​ឈ្មោះអ្នកប្រើ​របស់​អ្នក​នៅ​ក្នុង​ការជជែក"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ត្រូវការ​ធ្វើ​ឲ្យ​សកម្ម"
+
 msgid "GStreamer Failure"
 msgstr "ភាព​បរាជ័យ​របស់ GStreamer"
 
@@ -1517,7 +1533,7 @@
 msgid "Online"
 msgstr "លើ​បណ្ដាញ"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ក្រៅ​បណ្តាញ"
 
@@ -1638,8 +1654,10 @@
 "វិញ្ញាបនបត្រ​មិន​ត្រូវ​បានជឿទុក​ចិត្តទេ ដោយ​សារ​តែ​មិន​មាន​វិញ្ញាបនបត្រ ​ដែល​​អាច​ផ្ទៀងផ្ទាត់ថា ​វា​​ត្រូវ​បាន​"
 "ជឿទុក​ចិត្ត​ពេល ​បច្ចុប្បន្ន ។"
 
-msgid "The certificate is not valid yet."
-msgstr "​វិញ្ញាបនបត្រ​មិន​ត្រឹម​ត្រូវ​នៅ​ឡើយទេ ។"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "វិញ្ញាបនបត្រ​បានផុត​កំណត់ ហើយ​​មិនគួរ​​ត្រូវ​បាន​ចាក់ទុកថា​ត្រឹមត្រូវ​នោះ​ទេ ។"
@@ -3748,6 +3766,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "ម៉ាស៊ីន​បម្រើ​គិត​ថា ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ចប់​ហើយ ប៉ុន្តែ​ម៉ាស៊ីន​ភ្ញៀវ​មិន​គិត​ដូច្នេះ​ទេ"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "ម៉ាស៊ីន​បម្រើ​ត្រូវការ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ជា​អត្ថបទ​ធម្មតា​លើ​ស្ទ្រីម​ដែល​មិនបានអ៊ិនគ្រីប"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ត្រូវការ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ធម្មតា​លើកា​រតភ្ជាប់​ដែល​មិនបានអ៊ិនគ្រីប ។ អនុញ្ញាត​វា​ ហើយ​បន្ត​"
+"ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ?"
+
 msgid "SASL authentication failed"
 msgstr "បាន​បរាជ័យ​ក្នុង​​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​របស់​ SASL"
 
@@ -5859,7 +5889,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "ទម្រង់​ព័ត៌មាន​របស់​អ្នក​មិន​ត្រូវបាន​​ទៅយក​នៅ​​ឡើយ​ទេ ។ សូម​ព្យាយាម​​ម្តងទៀត នៅ​ពេល​ក្រោយ ។"
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5871,6 +5901,7 @@
 msgstr "ផ្ទៀងផ្ទាត់ PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "បង្ហាញ​ឈ្មោះ​"
 
@@ -5927,19 +5958,16 @@
 msgid "Connecting..."
 msgstr "កំពុង​តភ្ជាប់..."
 
-msgid "The nick name you entered is invalid."
-msgstr "សម្មតិនាម​ ដែល​អ្នក​បាន​បញ្ចូលមិន​ត្រឹមត្រូវ​ទេ ។"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "ឈ្មោះ​ដែល​អ្នក​​បាន​បញ្ចូល​មិនត្រឹមត្រូវ​ទេ ។"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "PIN ដែល​អ្នក​បាន​បញ្ចូល​​មាន​ប្រវែង​មិន​ត្រឹមត្រូវ [៧-១០] ។"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "ឈ្មោះ​ចូល​របស់ MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "សម្មតិនាម"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5967,10 +5995,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "ប្រទេស​ដែល​បាន​ជ្រើសមិន​ត្រឹមត្រូវទេ ។ សូម​ព្យាយាម​ម្តង​ទៀត ។"
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "ឈ្មោះ​អ្នក​ប្រើ​​មិន​ត្រូវ​បាន​ចុះឈ្មោះ​នៅ​​ឡើយ​ទេ ។ ដំបូង ​សូម​ចុះ​ឈ្មោះ​សិន​ ។"
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "ឈ្មោះ​អ្នក​ប្រើ ត្រូវ​បាន​ចុះឈ្មោះ​រួច​ហើយ ។ សូម​ជ្រើស​ឈ្មោះ​អ្នក​ប្រើ​ផ្សេង​ពី​នេះ ។"
 
 msgid "Internal error. Please try again later."
@@ -6016,8 +6046,9 @@
 msgid "Hidden Number"
 msgstr "លេខ​ដែល​លាក់​"
 
-msgid "Your Mobile Number..."
-msgstr "លេខ​ទូរស័ព្ទ​ចល័ត​របស់​អ្នក..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "លេខ​សម្គាល់​របស់​យ៉ាហ៊ូ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6043,6 +6074,15 @@
 msgid "_Room Name:"
 msgstr "បន្ទប់ ៖"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "អ្នកមាន​សំបុត្រ !"
+
+#, fuzzy
+msgid "Last Online"
+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 ។ សូម​តភ្ជាប់​​ឡើង​វិញ ។"
@@ -7765,11 +7805,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC មិន​ត្រឹមត្រូវ"
 
-msgid "Rate to host"
-msgstr "វាយតម្លៃ​ម៉ាស៊ីន"
-
-msgid "Rate to client"
-msgstr "វាយតម្លៃ​ម៉ាស៊ីន​ភ្ញៀវ"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "សេវា​មិនអាច​ប្រើបាន"
@@ -10004,7 +10044,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "មិនអើពើ​សន្និសីទ និង​ការ​អញ្ជើញ​របស់​បន្ទប់​ជជែក"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "ប្រើ​ប្រូកស៊ី​គណនី​សម្រាប់​ការ​តភ្ជាប់ SSL"
 
 msgid "Chat room list URL"
@@ -12814,11 +12855,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ចេញ ដោយ​សារ​តែ​ម៉ាស៊ីន​ភ្ញើ libpurple ផ្សេង​ទៀត​កំពុង​រត់​រួច​ហើយ ។\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/មេឌៀ"
 
-msgid "/Media/_Hangup"
-msgstr "/មេឌៀ/រង់ចាំ"
+#, fuzzy
+msgid "_Hangup"
+msgstr "រង់ចាំ"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13609,10 +13652,6 @@
 msgid "Custom Smiley Manager"
 msgstr "កម្មវិធី​គ្រប់គ្រង​សញ្ញាអារម្មណ៍​ផ្ទាល់ខ្លួន"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "ត្រូវការ​ធ្វើ​ឲ្យ​សកម្ម"
-
 msgid "Select Buddy Icon"
 msgstr "ជ្រើស​រូបតំណាង​មិត្តភក្ដិ"
 
@@ -15061,6 +15100,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "​វិញ្ញាបនបត្រ​មិន​ត្រឹម​ត្រូវ​នៅ​ឡើយទេ ។"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "សម្មតិនាម​ ដែល​អ្នក​បាន​បញ្ចូលមិន​ត្រឹមត្រូវ​ទេ ។"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "ឈ្មោះ​ចូល​របស់ MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "សម្មតិនាម"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "លេខ​ទូរស័ព្ទ​ចល័ត​របស់​អ្នក..."
+
+#~ msgid "Rate to host"
+#~ msgstr "វាយតម្លៃ​ម៉ាស៊ីន"
+
+#~ msgid "Rate to client"
+#~ msgstr "វាយតម្លៃ​ម៉ាស៊ីន​ភ្ញៀវ"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/មេឌៀ/រង់ចាំ"
+
 #~ msgid "Unknown reason."
 #~ msgstr "មិន​ស្គាល់​ហេតុផល ។"
 
--- a/po/kn.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/kn.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: kn\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2010-02-26 12:08+0530\n"
 "Last-Translator: Shankar Prasad <svenkate@redhat.com>\n"
 "Language-Team: American English <>\n"
@@ -62,12 +62,24 @@
 msgid "Error"
 msgstr "ದೋಷ"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ಖಾತೆ ಸೇರಿಸಲಾಗಲಿಲ್ಲ "
+
 msgid "Account was not added"
 msgstr "ಖಾತೆ ಸೇರಿಸಲಾಗಲಿಲ್ಲ "
 
 msgid "Username of an account must be non-empty."
 msgstr "ಖಾತೆಯೊಂದರ ಬಳಕೆದಾರ ಹೆಸರು ಖಾಲಿ ಇರಕೂಡದು. "
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ಹೊಸ ಸಂದೇಶದ ಸೂಚನೆ"
 
@@ -1265,6 +1277,9 @@
 msgid "Someone says your username in chat"
 msgstr "ಯಾರೋ ಒಬ್ಬರು ಒಂದು ಮಾತುಕತೆಯಲ್ಲಿ ನಿಮ್ಮ ಹೆಸರನ್ನು ಹೇಳುತ್ತಿದ್ದಾರೆ"
 
+msgid "Attention received"
+msgstr "ಗಮನವನ್ನು ಸ್ವೀಕರಿಸಲಾದ"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer ವಿಫಲತೆ"
 
@@ -1558,7 +1573,7 @@
 msgid "Online"
 msgstr "ಆನ್‍ಲೈನ್"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ಆಫ್‍ಲೈನ್"
 
@@ -1678,8 +1693,10 @@
 "ಪ್ರಮಾಣಪತ್ರವನ್ನು ನಂಬಲು ಸಾಧ್ಯವಾಗಿಲ್ಲ ಏಕೆಂದರೆ ಇದನ್ನು ನಂಬಬಹುದೆ ಎಂದು ಪರಿಶೀಲಿಸಲು ಯಾವುದೆ "
 "ಪ್ರಮಾಣಪತ್ರಗಳಿಲ್ಲ."
 
-msgid "The certificate is not valid yet."
-msgstr "ಪ್ರಮಾಣಪತ್ರವು ಸರಿಯಾಗಿದೆ ಎಂದು ಇನ್ನೂ ಸಹ ಗುರುತಿಸಲಾಗಿಲ್ಲ."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "ಪ್ರಮಾಣಪತ್ರದ ವಾಯಿದೆ ತೀರಿದೆ ಹಾಗು ಅದನ್ನು ಮಾನ್ಯವಾದುದು ಎಂದು ಪರಿಗಣಿಸುವಂತಿಲ್ಲ."
@@ -3849,6 +3866,19 @@
 msgstr ""
 "ದೃಢೀಕರಣವು ಪೂರ್ಣಗೊಂಡಿದೆ ಎಂದು ಪರಿಚಾರಕ ಭಾವಿಸುತ್ತದೆ ಆದರೆ ಕ್ಲೈಂಟ್ ಹಾಗೆ ಅಂದುಕೊಳ್ಳುವುದಿಲ್ಲ"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"ಪರಿಚಾರಕಕ್ಕಾಗಿ ಒಂದು ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರುವ ಸ್ಟ್ರೀಮ್‌ನ ಮೂಲಕ ಸರಳಪಠ್ಯ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ಗೆ ಒಂದು ಗೂಢಲಿಪೀಕರಿಸದೆ ಇರುವ ಸಂಪರ್ಕದ ಮೂಲಕ ಸರಳಪಠ್ಯ ದೃಢೀಕರಣದ ಅಗತ್ಯವಿದೆ.  ಇದನ್ನು "
+"ಅನುಮತಿಸಿ ನಂತರ ದೃಢೀಕರಣದೊಂದಿಗೆ ಮುಂದುವರೆಯುವುದೆ ?"
+
 msgid "SASL authentication failed"
 msgstr "SASL ಧೃಡೀಕರಣ ವಿಫಲಗೊಂಡಿದೆ"
 
@@ -5965,7 +5995,7 @@
 "ನಿಮ್ಮ ವ್ಯಕ್ತಿಪರಿಚಯ ಮಾಹಿತಿಯನ್ನು ಇನ್ನೂ ಸಹ ಪಡೆಯಲಾಗಲಿಲ್ಲ. ದಯವಿಟ್ಟು ಸ್ವಲ್ಪ ಸಮಯದ ನಂತರ "
 "ಪ್ರಯತ್ನಿಸಿ."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5977,6 +6007,7 @@
 msgstr "PIN ಅನ್ನು ಪರಿಶೀಲಿಸಿ"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "ತೋರಿಸುವ ಹೆಸರು"
 
@@ -6037,19 +6068,16 @@
 msgid "Connecting..."
 msgstr "ಸಂಪರ್ಕಿಸಲಾಗುತ್ತಿದೆ..."
 
-msgid "The nick name you entered is invalid."
-msgstr "ನೀವು ನಮೂದಿಸಿದ ಅಡ್ಡ ಹೆಸರು ಸರಿಯಾಗಿಲ್ಲ."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "ನೀವು ನಮೂದಿಸಿದ ಹೆಸರು ತಪ್ಪಾಗಿದೆ."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "ನೀವು ನಮೂದಿಸಿದ PIN ಸರಿಯಲ್ಲದ ಉದ್ದವನ್ನು ಹೊಂದಿದೆ [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit ಪ್ರವೇಶದ ಹೆಸರು"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "ಅಡ್ಡಹೆಸರು"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6082,10 +6110,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "ಆಯ್ಕೆ ಮಾಡಲಾದ ದೇಶವು ತಪ್ಪಾಗಿದೆ. ದಯವಿಟ್ಟು ಇನ್ನೊಮ್ಮೆ ಆರಿಸಿ."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "ಬಳಕೆದಾರ ಹೆಸರನ್ನು ನೋಂದಾಯಿಸಲಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ಮೊದಲು ನೋಂದಾಯಿಸಿ."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಈಗಾಗಲೆ ನೋಂದಾಯಿಸಲಾಗಿದೆ. ದಯವಿಟ್ಟು ಬೇರೊಂದು ಬಳಕೆದಾರ ಹೆಸರನ್ನು ಆರಿಸಿ."
 
@@ -6132,8 +6162,9 @@
 msgid "Hidden Number"
 msgstr "ಅಡಗಿಸಲಾದ ಸಂಖ್ಯೆ"
 
-msgid "Your Mobile Number..."
-msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ದೂರವಾಣಿ ಸಂಖ್ಯೆ..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6159,6 +6190,15 @@
 msgid "_Room Name:"
 msgstr "ಕೋಣೆ(_R):"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "ನಿಮಗೆ ಇ-ಮೇಯ್ಲ್ ಬಂದಿದೆ!"
+
+#, fuzzy
+msgid "Last Online"
+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 ನೊಂದಿಗಿನ ಸಂಪರ್ಕವು ಕಡಿದು ಹೋಗಿದೆ. ದಯವಿಟ್ಟು ಮರಳಿ ಸಂಪರ್ಕಿಸು."
@@ -7938,11 +7978,11 @@
 msgid "Invalid SNAC"
 msgstr "ಅಮಾನ್ಯವಾದ SNAC"
 
-msgid "Rate to host"
-msgstr "ಆತಿಥೇಯದೊಂದಿಗಿನ ದರ"
-
-msgid "Rate to client"
-msgstr "ಕ್ಲೈಂಟಿನೊಂದಿಗಿನ ದರ"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "ಸೇವೆ ಲಭ್ಯವಿಲ್ಲ"
@@ -10217,7 +10257,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "ಸಮ್ಮೇಳನ ಹಾಗು ಮಾತುಕತೆಕೋಣೆಗಳ ಆಮಂತ್ರಣಗಳನ್ನು ಆಲಕ್ಷಿಸು"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL ಸಂಪರ್ಕಗಳಿಗೆ ಖಾತೆ ಪ್ರಾಕ್ಸಿಯನ್ನು ಬಳಸಿ"
 
 msgid "Chat room list URL"
@@ -13086,11 +13127,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ಬೇರೊಂದು libpurple ಕ್ಲೈಂಟ್ ಚಾಲನೆಯಲ್ಲಿರುವುದರಿಂದ ನಿರ್ಗಮಿಸಲಾಗುತ್ತಿದೆ.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/ಮಾಧ್ಯಮ(_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/ಮಾಧ್ಯಮ/ಹ್ಯಾಂಗ್‌ಅಪ್(_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "ಹ್ಯಾಂಗ್ಅಪ್"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13888,9 +13931,6 @@
 msgid "Custom Smiley Manager"
 msgstr "ಇಚ್ಛೆಯ ಸ್ಮೈಲಿ ವ್ಯವಸ್ಥಾಪಕ"
 
-msgid "Attention received"
-msgstr "ಗಮನವನ್ನು ಸ್ವೀಕರಿಸಲಾದ"
-
 msgid "Select Buddy Icon"
 msgstr "ಗೆಳೆಯ ಚಿಹ್ನೆಯನ್ನು ಆಯ್ದುಕೊಳ್ಳಿ"
 
@@ -15384,6 +15424,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "ಪ್ರಮಾಣಪತ್ರವು ಸರಿಯಾಗಿದೆ ಎಂದು ಇನ್ನೂ ಸಹ ಗುರುತಿಸಲಾಗಿಲ್ಲ."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "ನೀವು ನಮೂದಿಸಿದ ಅಡ್ಡ ಹೆಸರು ಸರಿಯಾಗಿಲ್ಲ."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit ಪ್ರವೇಶದ ಹೆಸರು"
+
+#~ msgid "Nick Name"
+#~ msgstr "ಅಡ್ಡಹೆಸರು"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "ನಿಮ್ಮ ಮೊಬೈಲ್ ದೂರವಾಣಿ ಸಂಖ್ಯೆ..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ಆತಿಥೇಯದೊಂದಿಗಿನ ದರ"
+
+#~ msgid "Rate to client"
+#~ msgstr "ಕ್ಲೈಂಟಿನೊಂದಿಗಿನ ದರ"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/ಮಾಧ್ಯಮ/ಹ್ಯಾಂಗ್‌ಅಪ್(_H)"
+
 #~ msgid "Unknown reason."
 #~ msgstr "ಗೊತ್ತಿಲ್ಲದ ಕಾರಣ:"
 
--- a/po/ko.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ko.po	Sat Jul 31 23:42:35 2010 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2007-10-01 16:15+0900\n"
 "Last-Translator: sushizang <sushizang@empal.com>\n"
 "Language-Team: GTP Korean <gnome-kr-translation@gnome.or.kr>\n"
@@ -63,6 +63,10 @@
 msgid "Error"
 msgstr "오류"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "계정이 추가되지 않았습니다."
+
 msgid "Account was not added"
 msgstr "계정이 추가되지 않았습니다."
 
@@ -70,6 +74,14 @@
 msgid "Username of an account must be non-empty."
 msgstr "계정의 아이디를 입력해야 합니다."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "새 메일 알림"
 
@@ -1311,6 +1323,10 @@
 msgid "Someone says your username in chat"
 msgstr "대화에서 누군가가 내 이름을 입력했을 때"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "등록이 필요합니다."
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 오류"
 
@@ -1609,7 +1625,7 @@
 msgid "Online"
 msgstr "온라인"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "오프라인"
 
@@ -1733,9 +1749,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "지정한 아이디가 잘못되었습니다."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3893,6 +3910,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "암호화 되어 있지 않은 스트림을 통한 문자열은 인증이 필요합니다."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"서버가 암호화 되어 있지 않은 스트림을 통한 문자열 인증을 요구하고 있습니다. "
+"이를 허가하고 인증을 계속 하시겠습니까?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "인증에 실패했습니다."
 
@@ -6128,7 +6157,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6141,6 +6170,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "성"
@@ -6210,7 +6240,7 @@
 msgstr "접속 중입니다."
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "입력한 보안 ID 키는 잘못되었습니다."
 
 #, fuzzy
@@ -6218,13 +6248,8 @@
 msgstr "입력한 보안 ID 키는 잘못되었습니다."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "별명"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6254,10 +6279,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6314,8 +6339,8 @@
 msgstr "가운데 이름"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "휴대 전화번호 설정..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6343,6 +6368,15 @@
 msgid "_Room Name:"
 msgstr "대화실(_R):"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "새로운 메일이 도착했습니다!"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8153,11 +8187,11 @@
 msgid "Invalid SNAC"
 msgstr "잘못된 SNAC"
 
-msgid "Rate to host"
-msgstr "호스트 속도"
-
-msgid "Rate to client"
-msgstr "클라이언트 속도"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "서비스를 이용할 수 없습니다."
@@ -10515,7 +10549,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "회의 및 대화실 초대 무시"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13484,10 +13518,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14349,10 +14383,6 @@
 msgstr "인증 관리자"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "등록이 필요합니다."
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "친구 선택"
 
@@ -15893,6 +15923,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "이 프로그램을 제거할 수 있는 권한이 없습니다."
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "지정한 아이디가 잘못되었습니다."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "입력한 보안 ID 키는 잘못되었습니다."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "별명"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "휴대 전화번호 설정..."
+
+#~ msgid "Rate to host"
+#~ msgstr "호스트 속도"
+
+#~ msgid "Rate to client"
+#~ msgstr "클라이언트 속도"
+
 #~ msgid "Unknown reason."
 #~ msgstr "원인을 알 수 없습니다."
 
--- a/po/ku.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ku.po	Sat Jul 31 23:42:35 2010 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2007-02-26 09:48+0000\n"
 "Last-Translator: Erdal Ronahi <erdal.ronahi@gmail.com>\n"
 "Language-Team: Kurdish <gnu-ku-wergerandin@lists.sourceforge.net>\n"
@@ -55,12 +55,24 @@
 msgstr "Çewtî"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Hesab hatiye girtin"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Hesab hatiye girtin"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Danezankarê peyamên nû"
 
@@ -1327,6 +1339,10 @@
 msgstr "Hin kes di chatê de navê tê dibêjin"
 
 #, fuzzy
+msgid "Attention received"
+msgstr "Tomarbûn Divê"
+
+#, fuzzy
 msgid "GStreamer Failure"
 msgstr "Pelgehê Tomar Bike"
 
@@ -1645,7 +1661,7 @@
 msgid "Online"
 msgstr "Girêdayî"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Negirêdayî"
 
@@ -1768,9 +1784,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3915,6 +3932,20 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Pêwistiya pêşkêşker bi pelgekirina nivîseke zelal heye li ser herikandina "
+"neşifrekirî."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Pêwistiya pêşkêşker bi pelgekirina nivîseke zelal heye li ser têkiliyeke "
+"neşifrekirî . Vê çalak bike û here pelgekirineke din?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Têketin serneket"
 
@@ -6169,7 +6200,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6182,6 +6213,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Dîmen"
@@ -6256,7 +6288,7 @@
 msgstr "Girêdide"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
 #, fuzzy
@@ -6264,13 +6296,8 @@
 msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Leqeb"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6309,10 +6336,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6369,8 +6396,8 @@
 msgstr "Navê navîn"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Hejmara Telefona Destan Mîheng Bike"
+msgid "Your MXit ID..."
+msgstr "ID ya Yahoo!"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6398,6 +6425,15 @@
 msgid "_Room Name:"
 msgstr "_Ode:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Ji hêla %s ve hatî dakirin: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Girêdayî"
+
 #. 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 ""
@@ -8195,10 +8231,10 @@
 msgid "Invalid SNAC"
 msgstr "SNACa nederbasdar"
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10518,7 +10554,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13484,10 +13520,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14371,10 +14407,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Tomarbûn Divê"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Heval hilbijêre"
 
@@ -15932,6 +15964,22 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Destûra te ji bo rakirina vê bernameyê tune."
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Navê dîmenê yê hatiye diyarkirin ne derbasdar e."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Leqeb"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Hejmara Telefona Destan Mîheng Bike"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Sedema nenas."
 
--- a/po/lo.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/lo.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lo\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2009-04-29 09:28+0700\n"
 "Last-Translator: Anousak Souphavanh <anousak@gmail.com>\n"
 "Language-Team: Lao <lo@li.org>\n"
@@ -50,12 +50,24 @@
 msgid "Error"
 msgstr "ຜິດພາດ"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ບໍ່ໃດ້ເພີ້ມບັນຊີ "
+
 msgid "Account was not added"
 msgstr "ບໍ່ໃດ້ເພີ້ມບັນຊີ "
 
 msgid "Username of an account must be non-empty."
 msgstr "ລະຫັດຜູ້ໃຊ້ຕ້ອງໃຫ້ມີຂໍ້ມູນ"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ອີເເມວລ໌ໃຫ່ມເຕືອນ"
 
@@ -1187,6 +1199,9 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1465,7 +1480,7 @@
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1581,7 +1596,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3587,6 +3604,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 msgid "SASL authentication failed"
 msgstr ""
 
@@ -5609,7 +5635,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5621,6 +5647,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr ""
 
@@ -5678,18 +5705,14 @@
 msgid "Connecting..."
 msgstr ""
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-msgid "Nick Name"
+msgid "MXit ID"
 msgstr ""
 
 #. show the form to the user to complete
@@ -5719,10 +5742,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5767,7 +5790,7 @@
 msgid "Hidden Number"
 msgstr ""
 
-msgid "Your Mobile Number..."
+msgid "Your MXit ID..."
 msgstr ""
 
 #. Configuration options
@@ -5791,6 +5814,13 @@
 msgid "_Room Name:"
 msgstr ""
 
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+msgid "Last Online"
+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 ""
@@ -7428,10 +7458,10 @@
 msgid "Invalid SNAC"
 msgstr ""
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -9585,7 +9615,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12294,10 +12324,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13085,9 +13115,6 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 msgid "Select Buddy Icon"
 msgstr ""
 
--- a/po/lt.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/lt.po	Sat Jul 31 23:42:35 2010 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2009-08-30 15:07+0200\n"
 "Last-Translator: Laurynas Biveinis <laurynas.biveinis@gmail.com>\n"
 "Language-Team:\n"
@@ -64,12 +64,24 @@
 msgid "Error"
 msgstr "Klaida"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Paskyra nebuvo sukurta"
+
 msgid "Account was not added"
 msgstr "Paskyra nebuvo sukurta"
 
 msgid "Username of an account must be non-empty."
 msgstr "Paskyros vardas negali būti tuščias"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Pranešimai apie naujus laiškus"
 
@@ -1297,6 +1309,10 @@
 msgid "Someone says your username in chat"
 msgstr "Kas nors pokalbyje pasako Jūsų vardą"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Būtinas aktyvavimas"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer klaida"
 
@@ -1588,7 +1604,7 @@
 msgid "Online"
 msgstr "Prisijungęs"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Atsijungęs"
 
@@ -1712,8 +1728,10 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
-msgstr "Liudijimas dar neįsigaliojęs."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3940,6 +3958,20 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Serveris reikalauja tapatybės nustatymo grynu tekstu nekoduojamame duomenų "
+"sraute"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s reikalauja tapatybės nustatymo grynu tekstu nekoduojamame duomenu "
+"kanale.  Ar leisti tai ir tęsti tapatybės nustatymą?"
+
 msgid "SASL authentication failed"
 msgstr "SASL atpažinimas nepavyko"
 
@@ -6122,7 +6154,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6135,6 +6167,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Pavardė"
@@ -6208,7 +6241,7 @@
 msgstr "Jungiamasi"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Įvestas SecurID raktas yra neteisingas."
 
 #, fuzzy
@@ -6216,13 +6249,8 @@
 msgstr "Įvestas SecurID raktas yra neteisingas."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Vardas"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6252,10 +6280,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6313,8 +6341,8 @@
 msgstr "Antras vardas"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Nustatyti mobilaus telefono numerį..."
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6342,6 +6370,15 @@
 msgid "_Room Name:"
 msgstr "Kamba_rys:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Jūs turite pašto!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Prisijungęs"
+
 #. 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 ""
@@ -8211,11 +8248,11 @@
 msgid "Invalid SNAC"
 msgstr "Neteisingas SNAC"
 
-msgid "Rate to host"
-msgstr "Sparta į mazgą"
-
-msgid "Rate to client"
-msgstr "Sparta į klientą"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Tarnyba neprieinama"
@@ -10535,7 +10572,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoruoti kvietimus į konferencijas ir pokalbių kambarius"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Naudoti paskyros tarpininko serverį SSL jungtims"
 
 msgid "Chat room list URL"
@@ -13469,11 +13507,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Programa uždaroma, nes jau yra paleistas kitas libpurple klientas.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Terpė"
 
-msgid "/Media/_Hangup"
-msgstr "/Terpė/_Baigti skambutį"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Padėti ragelį"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14331,10 +14371,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Nuosavų šypsenėlių tvarkytuvė"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Būtinas aktyvavimas"
-
 msgid "Select Buddy Icon"
 msgstr "Pasirinkti bičiulio paveiksliuką"
 
@@ -15968,6 +16004,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Jūs neturite teisių išdiegti šios programos."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Liudijimas dar neįsigaliojęs."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Įvestas SecurID raktas yra neteisingas."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Vardas"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Nustatyti mobilaus telefono numerį..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Sparta į mazgą"
+
+#~ msgid "Rate to client"
+#~ msgstr "Sparta į klientą"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Terpė/_Baigti skambutį"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Nežinoma priežastis."
 
--- a/po/mk.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/mk.po	Sat Jul 31 23:42:35 2010 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: mk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:17-0400\n"
 "PO-Revision-Date: 2008-05-07 12:24+0200\n"
 "Last-Translator: Arangel Angov <ufo@linux.net.mk>\n"
 "Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -65,12 +65,24 @@
 msgid "Error"
 msgstr "Грешка"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Сметката не е додадена"
+
 msgid "Account was not added"
 msgstr "Сметката не е додадена"
 
 msgid "Username of an account must be non-empty."
 msgstr "Корисничкото име не смее да биде празно."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Известувања за нова пошта"
 
@@ -1267,6 +1279,10 @@
 msgid "Someone says your username in chat"
 msgstr "Некој го напишал Вашето име во разговорот"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Потребна е регистрација"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer не успеа"
 
@@ -1557,7 +1573,7 @@
 msgid "Online"
 msgstr "Поврзано"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Офлајн"
 
@@ -1678,9 +1694,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Ланецот за сертификатот презентиран за %s не е валиден."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3856,6 +3873,19 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Серверот бара проверка на автентичност со чист текст преку неенкриптиран тек"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s има потреба од проверка со обичен текст преку некодирана врска.  Да го "
+"дозволам ова и да продолжам со проверката?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Проверката не успеа"
 
@@ -6067,7 +6097,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6080,6 +6110,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Презиме"
@@ -6153,7 +6184,7 @@
 msgstr "Поврзување"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "SecurID клучот кој го внесовте е невалиден."
 
 #, fuzzy
@@ -6161,13 +6192,8 @@
 msgstr "SecurID клучот кој го внесовте е невалиден."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Прекар"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6197,10 +6223,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6257,8 +6283,8 @@
 msgstr "Средно име"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Постави мобилен број..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! Ид."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6286,6 +6312,15 @@
 msgid "_Room Name:"
 msgstr "_Соба:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Имате пошта!"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8111,11 +8146,11 @@
 msgid "Invalid SNAC"
 msgstr "Невалиден SNAC"
 
-msgid "Rate to host"
-msgstr "Брзина до хостот"
-
-msgid "Rate to client"
-msgstr "Брзина до клиентот"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Сервисот е недостапен "
@@ -10475,7 +10510,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Игнорирај покани за разговори и конференции"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13439,10 +13474,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14302,10 +14337,6 @@
 msgstr "Менаџер за сертификати"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Потребна е регистрација"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Избери пријател"
 
@@ -15851,6 +15882,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Ланецот за сертификатот презентиран за %s не е валиден."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "SecurID клучот кој го внесовте е невалиден."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Прекар"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Постави мобилен број..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Брзина до хостот"
+
+#~ msgid "Rate to client"
+#~ msgstr "Брзина до клиентот"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Непозната причина."
 
--- a/po/ml.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ml.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,10 +7,11 @@
 msgstr ""
 "Project-Id-Version: pidgin.ml\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-17 20:53-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-04-09 11:28+0530\n"
 "Last-Translator: \n"
 "Language-Team:  <en@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -60,12 +61,24 @@
 msgid "Error"
 msgstr "പിശക്"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "അക്കൌണ്ട് ചേര്‍ത്തിട്ടില്ല"
+
 msgid "Account was not added"
 msgstr "അക്കൌണ്ട് ചേര്‍ത്തിട്ടില്ല"
 
 msgid "Username of an account must be non-empty."
 msgstr "ഒരു അക്കൌണ്ടിന്റെ ഉപയോക്തൃനാമം ശൂന്യമായിരിക്കരുതു്."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "പുതിയ മെയില്‍ അറിയിപ്പുകള്‍"
 
@@ -1242,6 +1255,10 @@
 msgid "Someone says your username in chat"
 msgstr "ആരോ നിങ്ങളുടെ ഉപയോക്തൃനാമം ചാറ്റില്‍ പറയുന്നു"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ആക്ടിവേഷന്‍ ആവശ്യമുണ്ടു്"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer പരാജയം"
 
@@ -1334,6 +1351,7 @@
 msgid "Saved Statuses"
 msgstr "സൂക്ഷിച്ചിട്ടുള്ള അവസ്ഥകള്‍"
 
+#. title
 msgid "Title"
 msgstr "തലക്കെട്ട്"
 
@@ -1529,7 +1547,7 @@
 msgid "Online"
 msgstr "ഓണ്‍ലൈന്‍"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ഓഫ്‌ലൈന്‍"
 
@@ -1649,8 +1667,10 @@
 "സര്‍ട്ടിഫിക്കേറ്റ് വിശ്വസനീയമല്ല, കാരണം ഇതുറപ്പാക്കുന്ന ഒരു സര്‍ട്ടിഫിക്കേറ്റും ഇപ്പോള്‍ "
 "വിശ്വസനീയമല്ല."
 
-msgid "The certificate is not valid yet."
-msgstr "സര്‍ട്ടിഫിക്കേറ്റ് ഇതു് വരെ സാധുതയുള്ളതല്ല."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "സര്‍ട്ടിഫിക്കേറ്റിന്റെ കാലാവധി കഴിഞ്ഞിരിക്കുന്നു, അതുകൊണ്ടു് സാധുതയുമില്ല."
@@ -1888,7 +1908,6 @@
 msgid "Thread creation failure: %s"
 msgstr "ത്രെഡ് ഉണ്ടാക്കുന്നതില്‍ പരാജയപ്പെട്ടു: %s"
 
-#. Data is assumed to be the destination bn
 msgid "Unknown reason"
 msgstr "അപരിചിതമായ കാരണം"
 
@@ -3153,6 +3172,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 "ആദ്യ പേരു്"
 
@@ -3788,6 +3810,20 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "ആധികാരികത ഉറപ്പാക്കല്‍ പൂര്‍ത്തിയായതായി സര്‍വര്‍ കരുതുന്നു, പക്ഷേ ക്ലയന്റ് എതിരാണു്"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"എന്‍ക്രിപ്റ്റ് ചെയ്തിട്ടില്ലാത്ത ഒരു സ്ട്രീമില്‍ സര്‍വറിനു് പ്ലെയിന്‍ടെക്സ്റ്റ് ആധികാരികത ഉറപ്പാക്കല്‍ "
+"ആവശ്യമുണ്ടു്"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"എന്‍ക്രിപ്റ്റ് ചെയ്യാത്ത ഒരു കണക്ഷനില്‍ %s-നു് പ്ലെയിന്‍ടെക്സ്റ്റ് ആധികാരികത ഉറപ്പാക്കല്‍ മാര്‍ഗ്ഗം "
+"ആവശ്യമുണ്ടു്. ഇതു് അനുവദിച്ചു് മുന്നോട്ട് തുടരണമോ?"
+
 msgid "SASL authentication failed"
 msgstr "SASL ആധികാരികത ഉറപ്പാക്കല്‍ പരാജയപ്പെട്ടു"
 
@@ -3894,6 +3930,7 @@
 msgid "Postal Code"
 msgstr "പോസ്റ്റല്‍ കോഡ്"
 
+#. purple_notify_user_info_add_pair( info, _( "Email" ), profile->email );
 msgid "Country"
 msgstr "രാജ്യം"
 
@@ -3908,8 +3945,6 @@
 msgid "Organization Unit"
 msgstr "ഓര്‍ഗൈനേസേഷന്‍ യൂണിറ്റ്"
 
-#. title
-#. optional information
 msgid "Job Title"
 msgstr "ജോലിയുടെ പേരു്"
 
@@ -3917,6 +3952,7 @@
 msgstr "നിയമനം"
 
 #. birthday
+#. birthday (required)
 msgid "Birthday"
 msgstr "പിറന്നാള്‍"
 
@@ -5699,6 +5735,10 @@
 msgid "Show custom smileys"
 msgstr "ഇഷ്ടമുള്ള സ്മൈലികള്‍ കാണിക്കുക"
 
+#, fuzzy
+msgid "Allow direct connections"
+msgstr "കണക്ഷന്‍ ഉണ്ടാക്കുവാന്‍ സാധ്യമല്ല"
+
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: nudge a user to get their attention"
 
@@ -5912,7 +5952,11 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "നിങ്ങളുടെ പ്രൊഫൈല്‍ വിവരം ഇതു് വരെ ലഭ്യമായിട്ടില്ല. ദയവായി പിന്നീടു് വീണ്ടും ശ്രമിക്കുക."
 
+msgid "Your UID"
+msgstr ""
+
 #. pin
+#. pin (required)
 msgid "PIN"
 msgstr "പിന്‍"
 
@@ -5920,6 +5964,7 @@
 msgstr "പിന്‍ ഉറപ്പാക്കുക"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "കാണിക്കേണ്ട പേരു്"
 
@@ -5980,19 +6025,16 @@
 msgid "Connecting..."
 msgstr "കണക്ട് ചെയ്യുന്നു..."
 
-msgid "The nick name you entered is invalid."
-msgstr "നിങ്ങള്‍ നല്‍കിയ വിളിപ്പേരു് തെറ്റാണു്."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "നിങ്ങള്‍ നല്‍കിയ പേരു് തെറ്റാണു്."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "നിങ്ങള്‍ നല്‍കിയ പിന്‍ വ്യാപ്തി തെറ്റാണു് [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit ലോഗിന്‍ നാമം"
-
-#. nick name
-msgid "Nick Name"
-msgstr "വിളിപ്പേരു്"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6020,10 +6062,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "തെറ്റായ രാജ്യം തെരഞ്ഞെടുത്തിരിക്കുന്നു. ദയവായി പിന്നീടു് ശ്രമിക്കുക."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "ഉപയോക്തൃനാമം രജിസ്ടര്‍ ചെയ്തിട്ടില്ല. ദയവായി ആദ്യം രജിസ്ടര്‍ ചെയ്യുക."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "ഉപയോക്തൃനാമം നിലവില്‍ രജിസ്ടര്‍ ചെയ്തിരിക്കുന്നു. ദയവായി മറ്റൊരെണ്ണം തെരഞ്ഞെടുക്കുക."
 
 msgid "Internal error. Please try again later."
@@ -6035,7 +6079,7 @@
 msgid "Security Code"
 msgstr "സെക്യൂരിറ്റി കോഡ്"
 
-#. ask for input
+#. ask for input (required)
 msgid "Enter Security Code"
 msgstr "സെക്യൂരിറ്റി കോഡ് നല്‍കുക"
 
@@ -6061,11 +6105,17 @@
 msgid "Status Message"
 msgstr "അവസ്ഥ സന്ദേശം"
 
+#, fuzzy
+msgid "Rejection Message"
+msgstr "ലഭിച്ച സന്ദേശങ്ങള്‍"
+
+#. hidden number
 msgid "Hidden Number"
 msgstr "അദൃശ്യമായ നംബര്‍"
 
-msgid "Your Mobile Number..."
-msgstr "നിങ്ങളുടെ മൊബൈല്‍ നംബര്‍..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "യാഹൂ വിലാസം..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6078,6 +6128,28 @@
 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 "_റൂം:"
+
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "നിങ്ങള്‍ക്കു് മെയിലുണ്ടു്!"
+
+#, fuzzy
+msgid "Last Online"
+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-ലേക്കുള്ള കണക്ഷന്‍ നഷ്ടപ്പെട്ടു. ദയവായി വീണ്ടും കണക്ട് ചെയ്യുക."
@@ -6836,6 +6908,63 @@
 msgid "Invalid chat room name"
 msgstr "ചാറ്റ് റൂമിനു് തെറ്റായ പേരു്"
 
+msgid "Invalid error"
+msgstr "തെറ്റായ പിശക്"
+
+msgid "Cannot receive IM due to parental controls"
+msgstr "ചില നിയന്ത്രണങ്ങള്‍ കാരണം IM ലഭിക്കുവാന്‍ സാധ്യമായില്ല"
+
+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 "ബോട്ട് അക്കൌണ്ടുകള്‍ക്കു് IM ആരംഭിക്കുവാന്‍ സാധ്യമല്ല"
+
+msgid "Bot account cannot IM this user"
+msgstr "ബോട്ട് അക്കൌണ്ടിനു് ഈ ഉപയോക്താവുമായി ചാറ്റ് ചെയ്യുവാന്‍ സാധ്യമല്ല"
+
+msgid "Bot account reached IM limit"
+msgstr "ബോട്ട് അക്കൌണ്ട് IM പരിധി എത്തിയിരിക്കുന്നു"
+
+msgid "Bot account reached daily IM limit"
+msgstr "ബോട്ട് അക്കൌണ്ട് IM-ന്റെ ഓരോ ദിവസമുള്ള പരിധി എത്തിയിരിക്കുന്നു"
+
+msgid "Bot account reached monthly IM limit"
+msgstr "ബോട്ട് അക്കൌണ്ട് IM-ന്റെ ഓരോ മാസമുള്ള പരിധി എത്തിയിരിക്കുന്നു"
+
+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 ""
 
@@ -7002,116 +7131,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 "ലോക്കല്‍ permit/deny"
-
-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 "ചില നിയന്ത്രണങ്ങള്‍ കാരണം IM ലഭിക്കുവാന്‍ സാധ്യമായില്ല"
-
-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 "ബോട്ട് അക്കൌണ്ടുകള്‍ക്കു് IM ആരംഭിക്കുവാന്‍ സാധ്യമല്ല"
-
-msgid "Bot account cannot IM this user"
-msgstr "ബോട്ട് അക്കൌണ്ടിനു് ഈ ഉപയോക്താവുമായി ചാറ്റ് ചെയ്യുവാന്‍ സാധ്യമല്ല"
-
-msgid "Bot account reached IM limit"
-msgstr "ബോട്ട് അക്കൌണ്ട് IM പരിധി എത്തിയിരിക്കുന്നു"
-
-msgid "Bot account reached daily IM limit"
-msgstr "ബോട്ട് അക്കൌണ്ട് IM-ന്റെ ഓരോ ദിവസമുള്ള പരിധി എത്തിയിരിക്കുന്നു"
-
-msgid "Bot account reached monthly IM limit"
-msgstr "ബോട്ട് അക്കൌണ്ട് IM-ന്റെ ഓരോ മാസമുള്ള പരിധി എത്തിയിരിക്കുന്നു"
-
-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 "
@@ -7459,8 +7478,8 @@
 "നിങ്ങള്‍ക്കു് %hu സന്ദേശം നഷ്ടമായി, കാരണം നിങ്ങളുടെ മുന്നറിയിപ്പു് പരിധി വളരെ കൂടുതലാണു്. അതു് %s-"
 "ല്‍ നിന്നുള്ളതാണു്."
 msgstr[1] ""
-"നിങ്ങള്‍ക്കു് %hu സന്ദേശങ്ങള്‍ നഷ്ടമായി, കാരണം നിങ്ങളുടെ മുന്നറിയിപ്പു് പരിധി വളരെ കൂടുതലാണു്. അതു് %"
-"s-ല്‍ നിന്നുള്ളതാണു്."
+"നിങ്ങള്‍ക്കു് %hu സന്ദേശങ്ങള്‍ നഷ്ടമായി, കാരണം നിങ്ങളുടെ മുന്നറിയിപ്പു് പരിധി വളരെ കൂടുതലാണു്. അതു് "
+"%s-ല്‍ നിന്നുള്ളതാണു്."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -7469,28 +7488,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 "എപ്പോള്‍ മുതല്‍ ഓണ്‍ലൈന്‍"
 
@@ -7908,6 +7908,75 @@
 "ഇതിനു് രണ്ടു കമ്പ്യൂട്ടറുകള്‍ തമ്മില്‍ നേരിട്ടുള്ള കണക്ഷന്‍ ആവശ്യമുണ്ടു്, കൂടാതെ IM ചിത്രങ്ങള്‍ക്കും "
 "ആവശ്യമാണു്. നിങ്ങളുടെ IP വിലാസം കാണിക്കുന്നതാണു്, അതിനാല്‍ പ്രത്യേകം ശ്രദ്ധിക്കുക."
 
+msgid "Invalid SNAC"
+msgstr "തെറ്റായ SNAC"
+
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+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 "ലോക്കല്‍ permit/deny"
+
+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 "അക്വേറിയസ്"
 
@@ -10103,7 +10172,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "കോണ്‍ഫറന്‍സും ചാറ്റ് റൂം ക്ഷണങ്ങളും അവഗണിക്കുക"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL കണക്ഷനുള്ള അക്കൌണ്ട് പ്രോക്സി ഉപയോഗിക്കുക"
 
 msgid "Chat room list URL"
@@ -12297,8 +12367,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 is a graphical modular messaging client based on libpurple which is "
 "capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
@@ -12845,15 +12915,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-ല്‍ ആരംഭിച്ച സിസ്റ്റം ലോഗ് എന്നേക്കുമായി വെട്ടി നീക്കണമെന്നുറപ്പാണോ?"
 
 msgid "Delete Log?"
@@ -12958,11 +13028,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "മറ്റൊരു libpurple ക്ലയന്റ് പ്രവര്‍ത്തിക്കുന്നുണ്ടു്, അതിനാല്‍ പുറത്തു് കടക്കുന്നു.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_മീഡിയാ"
 
-msgid "/Media/_Hangup"
-msgstr "/മീഡിയാ/_വിഛേദിക്കുക"
+#, fuzzy
+msgid "_Hangup"
+msgstr "വിഛേദിക്കുക"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13758,10 +13830,6 @@
 msgid "Custom Smiley Manager"
 msgstr "ഇഷ്ടമുള്ള സ്മൈലി നിരീക്ഷകന്‍"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "ആക്ടിവേഷന്‍ ആവശ്യമുണ്ടു്"
-
 msgid "Select Buddy Icon"
 msgstr "സുഹൃത്തിനുള്ള ചിഹ്നം തെരഞ്ഞെടുക്കുക"
 
@@ -15108,11 +15176,13 @@
 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 ""
 
+#. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
 
@@ -15121,71 +15191,91 @@
 "again."
 msgstr ""
 
+#. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
 msgstr ""
 
+#. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
 msgstr ""
 
+#. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
 msgstr ""
 
+#. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
 msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
 msgid "Desktop"
 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 ""
 
+#. $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 ""
 
+#. $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 ""
+
+#. Installer Subsection Text
 msgid "GTK+ Runtime (required if not present)"
 msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
 msgid "Localizations"
 msgstr "സ്ഥലം"
 
-#. License Page
+#. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
 msgstr ""
 
-#. Components Page
+#. Installer Subsection Text
 #, fuzzy
 msgid "Pidgin Instant Messaging Client (required)"
 msgstr "പിഡ്ഗിന്‍ ഇന്റര്‍നെറ്റ് മെസഞ്ചര്‍"
 
-#. 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 ""
 
+#. Installer Subsection Text
 #, fuzzy
 msgid "Shortcuts"
 msgstr "എളുപ്പവഴി"
 
+#. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
 msgstr ""
 
-#. Spellcheck Section Prompts
+#. Installer Subsection Text
 msgid "Spellchecking Support"
 msgstr ""
 
+#. Installer Subsection Text
 #, fuzzy
 msgid "Start Menu"
 msgstr "ആരംഭം"
 
+#. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
@@ -15194,32 +15284,54 @@
 msgid "The installer is already running."
 msgstr "\"%s\" എന്ന ചെല്ലപ്പേരു് നിലവില്‍ ഉപയോഗത്തിലുണ്ടു്."
 
-#. Uninstall Section Prompts
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
 
-#. URL Handler section
+#. Installer Subsection Text
 #, fuzzy
 msgid "URI Handlers"
 msgstr "myim URL ഹാന്‍ഡിലര്‍"
 
-#. 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."
 msgstr ""
 
-#. Installer Finish Page
+#. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
 msgstr ""
 
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
-msgid "spellcheck_faq"
-msgstr ""
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "സര്‍ട്ടിഫിക്കേറ്റ് ഇതു് വരെ സാധുതയുള്ളതല്ല."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "നിങ്ങള്‍ നല്‍കിയ വിളിപ്പേരു് തെറ്റാണു്."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit ലോഗിന്‍ നാമം"
+
+#~ msgid "Nick Name"
+#~ msgstr "വിളിപ്പേരു്"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "നിങ്ങളുടെ മൊബൈല്‍ നംബര്‍..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ഹോസ്റ്റിലേക്കുള്ള റേറ്റ്"
+
+#~ msgid "Rate to client"
+#~ msgstr "ക്ലയന്റിലേക്കുള്ള റേറ്റ്"
+
+#~ msgid "Unknown reason."
+#~ msgstr "അപരിചിതമായ കാരണം"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/മീഡിയാ/_വിഛേദിക്കുക"
 
 #~ msgid "Error creating conference."
 #~ msgstr "കോണ്‍ഫറന്‍സ് തയ്യാറാക്കുന്നതില്‍ പിശക്."
--- a/po/mn.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/mn.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2005-06-17 23:22-0800\n"
 "Last-Translator: \n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -57,12 +57,24 @@
 msgid "Error"
 msgstr "Алдаа"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Бүртгэл нэмэгдсэнгүй"
+
 msgid "Account was not added"
 msgstr "Бүртгэл нэмэгдсэнгүй"
 
 msgid "Username of an account must be non-empty."
 msgstr "Бүртгэлийн нэр хоосон байх ёсгүй."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Шинэ мэйлийн сануулга"
 
@@ -1230,6 +1242,9 @@
 msgid "Someone says your username in chat"
 msgstr "Хэн нэгэн чатад таны хэрэглэгчийн нэрийг хэлэхэд"
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1511,7 +1526,7 @@
 msgid "Online"
 msgstr "Онлайн"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Оффлайн"
 
@@ -1629,9 +1644,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "X.509 сертификат импортлолт амжилтгүй боллоо"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3687,6 +3703,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "SSL Холболт амжилтгүй болсон"
@@ -5830,7 +5855,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5842,6 +5867,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Гэрийн нэр"
@@ -5911,7 +5937,7 @@
 msgstr "Серверт холбогдох"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Оруулсан SecurID түлхүүр буруу байна."
 
 #, fuzzy
@@ -5919,13 +5945,8 @@
 msgstr "Оруулсан SecurID түлхүүр буруу байна."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Хоч нэр"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5955,10 +5976,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6015,8 +6036,8 @@
 msgstr "Гэрийн утасны дугаар"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Гар утасны дугаараа оруул..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6043,6 +6064,15 @@
 msgid "_Room Name:"
 msgstr "Өрөө:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Танд мэйл ирсэн байна!"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -7766,10 +7796,10 @@
 msgid "Invalid SNAC"
 msgstr "Буруу SNAC"
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10026,7 +10056,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Зөвлөгөөн, чат өрөөний урилгыг татгалзах"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12850,10 +12880,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13685,9 +13715,6 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 #, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Харилцагч Сонгох"
@@ -15154,6 +15181,22 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "X.509 сертификат импортлолт амжилтгүй боллоо"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Оруулсан SecurID түлхүүр буруу байна."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Хоч нэр"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Гар утасны дугаараа оруул..."
+
 #~ msgid "Unknown reason."
 #~ msgstr "Үл мэдэгдэх шалтгаан."
 
--- a/po/mr.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/mr.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-05-03 14:42+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak@redhat.com>\n"
 "Language-Team: Marathi <maajhe-sanganak@freelists.org>\n"
@@ -61,12 +61,24 @@
 msgid "Error"
 msgstr "त्रुटी"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "खाते समाविष्ट केले नव्हते"
+
 msgid "Account was not added"
 msgstr "खाते समाविष्ट केले नव्हते"
 
 msgid "Username of an account must be non-empty."
 msgstr "खात्याचे वापरकर्तानाव रिकामे नसायला हवे."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "नवीन मेल/टपाल सूचना"
 
@@ -1232,6 +1244,9 @@
 msgid "Someone says your username in chat"
 msgstr "कुणितरी संभाषणमध्ये तुमचे वापरकर्तानाव घेत आहे"
 
+msgid "Attention received"
+msgstr "सावधानता प्राप्त"
+
 msgid "GStreamer Failure"
 msgstr "Gस्ट्रीमर अपयशी"
 
@@ -1519,7 +1534,7 @@
 msgid "Online"
 msgstr "ऑनलाइन"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ऑफलाईन"
 
@@ -1637,8 +1652,10 @@
 "प्रमाणपत्र विश्वासर्ह नाही कारण खात्री पटवण्याजोगी कुठलेही प्रमाणपत्र सध्या विश्वासर्ह "
 "नाही."
 
-msgid "The certificate is not valid yet."
-msgstr "प्रमाणपत्र अजूनही वैध नाही."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "प्रमाणपत्राची वेळ समाप्त झाली आहे व त्यामुळे त्यांस वैध समझणे अशक्य आहे."
@@ -3763,6 +3780,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "सर्व्हरला ओळख पटली असे वाटते, परंतु क्लाएंटला असे वाटत नाही"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr " सर्व्हरला अनक्रिप्टेड स्ट्रिम वर प्लेन मजकूर प्रमाणिकी करण्याची आवश्यकता आहे"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ला विना एनक्रिप्टेड जोडणीवरली मजकूनर ओळख पटवणे आवश्यक आहे.  यांस स्वीकारा व ओळख "
+"पटवणे सुरू ठेवा?"
+
 msgid "SASL authentication failed"
 msgstr "SASL ओळख पटवणे अपयशी"
 
@@ -5819,7 +5848,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "प्रोफाइल माहिती अजूनही प्राप्त झाली नाही. कृपया पुढे पुनः प्रयत्न करा."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5831,6 +5860,7 @@
 msgstr "PIN तपासा"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "दिस्पलेचे नाव"
 
@@ -5887,19 +5917,16 @@
 msgid "Connecting..."
 msgstr "जोडणी करत आहे..."
 
-msgid "The nick name you entered is invalid."
-msgstr "दिलेले टोपणनाव अवैध आहे."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "दिलेले नाव अवैध आहे."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "दिलेल्या PIN ची लांबी अवैध आहे [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit प्रवेश नाव"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "टोपणनाव"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5927,10 +5954,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "अवैध देश नीवडा. कृपया पुनः प्रयत्न करा."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "वापरकर्त्याचेनाव नोंदणीकृत नाही. कृपया प्रथम नोंदणी करा."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "वापरकर्त्याचेनाव आधिपासूनच नोंदणीकृत आहे. कृपया इतर वापरकर्तानाव नीवडा."
 
 msgid "Internal error. Please try again later."
@@ -5976,8 +6005,9 @@
 msgid "Hidden Number"
 msgstr "लपलेले क्रमांक"
 
-msgid "Your Mobile Number..."
-msgstr "आपला मोबाइल क्रमांक..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6003,6 +6033,15 @@
 msgid "_Room Name:"
 msgstr "कक्ष (_R):"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "आपल्याकडे मेल/टपाल आहे!"
+
+#, fuzzy
+msgid "Last Online"
+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 सह जोडणी खंडीत झाली. कृपया पुनः जोडणी करा."
@@ -7727,11 +7766,11 @@
 msgid "Invalid SNAC"
 msgstr "अवैध SNAC"
 
-msgid "Rate to host"
-msgstr "आयोजकाचे प्रमाण"
-
-msgid "Rate to client"
-msgstr "ग्राहकाचे प्रमाण"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "सेवा अनुपलब्ध"
@@ -9977,7 +10016,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr " संभाषण आणि खोलीतील संभाषण आमंत्रणास दुर्लक्षित करा"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL जोडणीसाठी खाते प्रॉक्सीचा वापर करा"
 
 msgid "Chat room list URL"
@@ -12805,11 +12845,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "इतर libpurple क्लाएंट आधिपासूनच कार्यरत असल्यामुळे बाहेर पडत आहे.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/मिडिया (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/मिडीया/हँगअप (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "स्तब्ध"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13604,9 +13646,6 @@
 msgid "Custom Smiley Manager"
 msgstr "पसंतीच्या स्माईलीचे व्यवस्थापक"
 
-msgid "Attention received"
-msgstr "सावधानता प्राप्त"
-
 msgid "Select Buddy Icon"
 msgstr "बड्डी चिन्ह नीवडा"
 
@@ -15066,6 +15105,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "प्रमाणपत्र अजूनही वैध नाही."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "दिलेले टोपणनाव अवैध आहे."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit प्रवेश नाव"
+
+#~ msgid "Nick Name"
+#~ msgstr "टोपणनाव"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "आपला मोबाइल क्रमांक..."
+
+#~ msgid "Rate to host"
+#~ msgstr "आयोजकाचे प्रमाण"
+
+#~ msgid "Rate to client"
+#~ msgstr "ग्राहकाचे प्रमाण"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/मिडीया/हँगअप (_H)"
+
 #~ msgid "Unknown reason."
 #~ msgstr "अज्ञात कारण."
 
--- a/po/ms_MY.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ms_MY.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2009-10-23 19:50+0800\n"
 "Last-Translator: Muhammad Najmi bin Ahmad Zabidi <najmi.zabidi@gmail.com>\n"
 "Language-Team: Malay <kedidiemas@yahoogroups.com>\n"
@@ -50,12 +50,23 @@
 msgid "Error"
 msgstr "Ralat"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Pemberitahuan emel baru"
 
@@ -1185,6 +1196,9 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1463,7 +1477,7 @@
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1579,7 +1593,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3585,6 +3601,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 msgid "SASL authentication failed"
 msgstr ""
 
@@ -5600,7 +5625,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5612,6 +5637,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr ""
 
@@ -5668,18 +5694,14 @@
 msgid "Connecting..."
 msgstr ""
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-msgid "Nick Name"
+msgid "MXit ID"
 msgstr ""
 
 #. show the form to the user to complete
@@ -5708,10 +5730,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5756,7 +5778,7 @@
 msgid "Hidden Number"
 msgstr ""
 
-msgid "Your Mobile Number..."
+msgid "Your MXit ID..."
 msgstr ""
 
 #. Configuration options
@@ -5780,6 +5802,13 @@
 msgid "_Room Name:"
 msgstr ""
 
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+msgid "Last Online"
+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 ""
@@ -7413,10 +7442,10 @@
 msgid "Invalid SNAC"
 msgstr ""
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -9569,7 +9598,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12275,10 +12304,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13063,9 +13092,6 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 msgid "Select Buddy Icon"
 msgstr ""
 
--- a/po/my_MM.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/my_MM.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2004-01-14 12:26+0000\n"
 "Last-Translator: Minn Myat Soe <mmyatsoe@gmail.com>\n"
 "Language-Team: \n"
@@ -51,12 +51,24 @@
 msgstr "Error"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "Account has been disabled"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "Account has been disabled"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Mail အသစ္‌ အခ္ယက္‌ေပးခ္ရင္း"
 
@@ -1333,6 +1345,10 @@
 msgid "Someone says your username in chat"
 msgstr "Someone says your name in chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registration Required"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1647,7 +1663,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1775,9 +1791,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "The new formatting is invalid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3991,6 +4008,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server requires plaintext authentication over an unencrypted stream"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Authentication failed"
 
@@ -6261,7 +6290,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6274,6 +6303,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Display"
@@ -6348,7 +6378,7 @@
 msgstr "Connecting"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "The new formatting is invalid."
 
 #, fuzzy
@@ -6356,13 +6386,8 @@
 msgstr "The new formatting is invalid."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nickname"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6400,10 +6425,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6460,8 +6485,8 @@
 msgstr "Middle Name"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Set Mobile Phone Number"
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6489,6 +6514,15 @@
 msgid "_Room Name:"
 msgstr "_Room:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "You have been kicked by %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -8342,11 +8376,11 @@
 msgid "Invalid SNAC"
 msgstr "Invalid SNAC"
 
-msgid "Rate to host"
-msgstr "Rate to host"
-
-msgid "Rate to client"
-msgstr "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Service unavailable"
@@ -10778,7 +10812,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
@@ -13847,10 +13881,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14761,10 +14795,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Registration Required"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "ေဘာ္ဒာ ရ္ဝေးမယ္‌"
 
@@ -16357,6 +16387,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "The new formatting is invalid."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "The new formatting is invalid."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nickname"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Set Mobile Phone Number"
+
+#~ msgid "Rate to host"
+#~ msgstr "Rate to host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Rate to client"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Unknown reason."
 
--- a/po/nb.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/nb.po	Sat Jul 31 23:42:35 2010 +0000
@@ -14,7 +14,7 @@
 msgstr ""
 "Project-Id-Version: nb\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-02-11 12:17+0100\n"
 "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.ui.no>\n"
@@ -67,12 +67,24 @@
 msgid "Error"
 msgstr "Feil"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Kontoen ble ikke lagt til"
+
 msgid "Account was not added"
 msgstr "Kontoen ble ikke lagt til"
 
 msgid "Username of an account must be non-empty."
 msgstr "Brukernavnet for en konto kan ikke være tomt."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Varsling om nye e-poster"
 
@@ -1258,6 +1270,10 @@
 msgid "Someone says your username in chat"
 msgstr "Noen sa brukernavnet ditt i en samtale"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Aktivering kreves"
+
 msgid "GStreamer Failure"
 msgstr "Feil i GStreamer"
 
@@ -1550,7 +1566,7 @@
 msgid "Online"
 msgstr "Pålogget"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Avlogget"
 
@@ -1671,8 +1687,10 @@
 "Dette sertifikatet er ikke betrodd fordi det ikke fins noe sertifikat som "
 "kan verfisere at det er betrodd for tiden."
 
-msgid "The certificate is not valid yet."
-msgstr "Sertifikatet er ikke gyldig enda."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Sertifikatet har utgått og bør ikke regnes som gyldig."
@@ -3817,6 +3835,20 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Tjeneren tror autentiseringen er ferdig, men det gjør ikke klienten"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Tjeneren forlanger identitetsbekreftelse i ren tekst over en ukryptert "
+"forbindelse"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s krever autentisering i klartekst over eit ukryptert samband. Vil du "
+"tillate dette og fortsett med autentiseringen?"
+
 msgid "SASL authentication failed"
 msgstr "SASL-autentisering feilet"
 
@@ -5962,7 +5994,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Klarte ikke hente profilinformasjonen din. Prøv igjen seinere."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5974,6 +6006,7 @@
 msgstr "Kontrollere PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Visningsnavn"
 
@@ -6033,19 +6066,16 @@
 msgid "Connecting..."
 msgstr "Kobler til ..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Det inntastede kallenavnet er ugyldig."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Navnet du skrev er ugyldig."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Den inntastede PIN-koden har feil lengde [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit brukernavn"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Kallenavn"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6073,10 +6103,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Ugyldig land valgt. Prøv igjen seinere."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Brukernavnet er ikke registrert. Du må registrere det først."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Brukernavnet er allerede registrert. Du må velge et annet brukernavn."
 
 msgid "Internal error. Please try again later."
@@ -6122,8 +6154,9 @@
 msgid "Hidden Number"
 msgstr "Skjult nummer"
 
-msgid "Your Mobile Number..."
-msgstr "Ditt mobilnummer ..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6149,6 +6182,15 @@
 msgid "_Room Name:"
 msgstr "_Rom:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Du har e-post!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Pålogget"
+
 #. 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 "Vi har mistet forbindelsen til MXit. Du må koble til på nytt."
@@ -7932,11 +7974,11 @@
 msgid "Invalid SNAC"
 msgstr "Ugyldig SNAC"
 
-msgid "Rate to host"
-msgstr "Hastighet til maskin"
-
-msgid "Rate to client"
-msgstr "Hastighet til klient"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Tjenesten er ikke tilgjengelig"
@@ -10205,7 +10247,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer konferanse og samtalerom invitasjoner"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Bruk kontoens mellomtjener for SSL-forbindelser"
 
 msgid "Chat room list URL"
@@ -13073,11 +13116,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Avslutter fordi en annen libpurple-klient allerede kjører.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Legg på"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Legg på"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13874,10 +13919,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Tilpassede smilefjes"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Aktivering kreves"
-
 msgid "Select Buddy Icon"
 msgstr "Velg kontaktikon"
 
@@ -15365,6 +15406,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Du har ikke rettigheter til å avinstallere denne applikasjonen."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Sertifikatet er ikke gyldig enda."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Det inntastede kallenavnet er ugyldig."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit brukernavn"
+
+#~ msgid "Nick Name"
+#~ msgstr "Kallenavn"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Ditt mobilnummer ..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Hastighet til maskin"
+
+#~ msgid "Rate to client"
+#~ msgstr "Hastighet til klient"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Legg på"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Ukjent grunn."
 
--- a/po/ne.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ne.po	Sat Jul 31 23:42:35 2010 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin.ne\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2006-06-27 21:08+0545\n"
 "Last-Translator: Shyam Krishna Bal <shyamkrishna_bal@yahoo.com>\n"
 "Language-Team: Nepali <info@mpp.org.np>\n"
@@ -54,12 +54,24 @@
 msgstr "त्रुटि"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "खाता निस्क्रिय भइसेको छ"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "खाता निस्क्रिय भइसेको छ"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "नयाँ प्रत्र सूचनाहरू"
 
@@ -1323,6 +1335,10 @@
 msgid "Someone says your username in chat"
 msgstr "कुराकानीमा तपाईँको नाम कसैले भन्दा"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "आवश्यक दर्ता "
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1632,7 +1648,7 @@
 msgid "Online"
 msgstr "अनलाइन"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "अफलाइन"
 
@@ -1760,9 +1776,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "निर्दिष्ट गरिएको पर्दा नाम अवैध हो।"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3970,6 +3987,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "एउटा गुप्तीकरण नभएको स्ट्रिममा सर्भरले सादा पाठ प्रमाणीकरण आवश्यक गर्दछ"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"यो सर्भरलाई गुप्तिकृत नभएको जडान माथि खाली पाठ प्रमाणीकरणको आवश्यकता पर्दछ । यसलाई "
+"अनुमति दिनुहुन्छ र प्रमाणीकरण गर्न निरन्तरता दिनुहुन्छ ?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "प्रमाणीकरण असफल भयो"
 
@@ -6246,7 +6275,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6259,6 +6288,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "प्रदर्शन"
@@ -6333,7 +6363,7 @@
 msgstr "जडान"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
 
 #, fuzzy
@@ -6341,13 +6371,8 @@
 msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "उपनाम"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6379,10 +6404,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6439,8 +6464,8 @@
 msgstr "बिचको नाम"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "मोवाइल नम्बर सेट गर्नुहोस्"
+msgid "Your MXit ID..."
+msgstr "याहू! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6468,6 +6493,15 @@
 msgid "_Room Name:"
 msgstr "कोठा"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "तपाईँ %s द्वारा बाहिरिनु भएको छ : (%s)"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8308,11 +8342,11 @@
 msgid "Invalid SNAC"
 msgstr "अवैध SNAC"
 
-msgid "Rate to host"
-msgstr "होस्टलाई दर"
-
-msgid "Rate to client"
-msgstr "ग्राहकलाई दर"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "सेवा उपलब्ध छैन"
@@ -10744,7 +10778,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
@@ -13811,10 +13845,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14733,10 +14767,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "आवश्यक दर्ता "
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "साथी चयन गर्नुहोस्"
 
@@ -16320,6 +16350,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "निर्दिष्ट गरिएको पर्दा नाम अवैध हो।"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "प्रविष्ट गरिएको सुरक्षित ID कुञ्जी अवैध छ ।"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "उपनाम"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "मोवाइल नम्बर सेट गर्नुहोस्"
+
+#~ msgid "Rate to host"
+#~ msgstr "होस्टलाई दर"
+
+#~ msgid "Rate to client"
+#~ msgstr "ग्राहकलाई दर"
+
 #~ msgid "Unknown reason."
 #~ msgstr "अज्ञात कारण ।"
 
--- a/po/nl.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/nl.po	Sat Jul 31 23:42:35 2010 +0000
@@ -1,25 +1,25 @@
-# plugin of nl.po to
-# Pidgin Dutch translation
-# Copyright (C) 2008, Daniël Heres <danielheres@gmail.com>
 # This file is distributed under the same license as the Pidgin package.
-#
+# Gideon van Melle <translations@gvmelle.com>
 # Daniël Heres <danielheres@gmail.com>, 2008
 # Vincent van Adrighem <adrighem@gnome.org>, 2004, 2005, 2006.
 # Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>, 2004.
-msgid ""
-msgstr ""
-"Project-Id-Version: pidgin\n"
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
-"PO-Revision-Date: 2009-07-20 12:53+0100\n"
-"Last-Translator: Daniël Heres <danielheres@gmail.com>\n"
-"Language-Team: Dutch <nl@li.org>\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"PO-Revision-Date: 2010-07-25 14:26+0100\n"
+"Last-Translator: Gideon van Melle <translations@gvmelle.com>\n"
+"Language-Team: Dutch <translations@gmvelle.com>\n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: Dutch\n"
+"X-Poedit-Country: NETHERLANDS\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -30,7 +30,7 @@
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Probeer '%s -h' voor meer informatie.\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s\n"
 "Usage: %s [OPTION]...\n"
@@ -44,8 +44,8 @@
 "%s\n"
 "Gebruik: %s [OPTIE]...\n"
 "\n"
-"  -c, --config=MAP    MAP gebruiken voor opslaan configuratie\n"
-"  -d, --debug         debugberichten naar stdout sturen\n"
+"  -c, --config=DIR    DIR gebruiken voor opslaan configuratie\n"
+"  -d, --debug         foutoplossingsberichten naar stdout sturen\n"
 "  -h, --help          deze hulptekst weergeven\n"
 "  -n, --nologin       niet automatisch aanmelden\n"
 "  -v, --version       versie-info weergeven\n"
@@ -56,7 +56,7 @@
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s zorgde voor fouten tijdens het verplaatsen van je instellingen van %s "
+"%s zorgde voor fouten tijdens het verplaatsen van uw instellingen van %s "
 "naar %s. Verplaats het handmatig. Rapporteer deze fout alstublieft op http://"
 "developer.pidgin.im"
 
@@ -64,11 +64,26 @@
 msgid "Error"
 msgstr "Fout"
 
+msgid "Account was not modified"
+msgstr "Account werd niet gewijzigd"
+
 msgid "Account was not added"
 msgstr "Account niet toegevoegd"
 
 msgid "Username of an account must be non-empty."
-msgstr "Gebruikersnaam van een acount mag niet leeg zijn."
+msgstr "Gebruikersnaam van een account mag niet leeg zijn."
+
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Het protocol van dit account kan niet worden veranderd terwijl het verbonden "
+"is met de server."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"De gebruikersnaam van dit account kan niet worden veranderd terwijl het "
+"verbonden is met de server."
 
 msgid "New mail notifications"
 msgstr "Nieuwe e-mailmeldingen"
@@ -77,16 +92,16 @@
 msgstr "Wachtwoord onthouden"
 
 msgid "There are no protocol plugins installed."
-msgstr "Er zijn geen protocol-plug-ins geïnstalleerd"
+msgstr "Er zijn geen protocol plug-ins geïnstalleerd"
 
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(Je bent waarschijnlijk 'make install' vergeten.)"
+msgstr "(U bent waarschijnlijk 'make install' vergeten.)"
 
 msgid "Modify Account"
 msgstr "Account bewerken"
 
 msgid "New Account"
-msgstr "Nieuw account"
+msgstr "Nieuw Account"
 
 msgid "Protocol:"
 msgstr "Protocol:"
@@ -116,7 +131,7 @@
 
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Wil je %s echt verwijderen?"
+msgstr "Wilt u %s echt verwijderen?"
 
 msgid "Delete Account"
 msgstr "Account verwijderen"
@@ -129,7 +144,7 @@
 msgstr "Accounts"
 
 msgid "You can enable/disable accounts from the following list."
-msgstr "Je kunt accounts inschakelen/uitschakelen in de volgende lijst."
+msgstr "U kunt accounts inschakelen/uitschakelen in de volgende lijst."
 
 #. Add button
 msgid "Add"
@@ -137,28 +152,27 @@
 
 #. Modify button
 msgid "Modify"
-msgstr "Bewerken"
+msgstr "Wijzigen"
 
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s heeft %s in zijn/haar contactenlijst gezet%s%s"
+msgstr "%s%s%s%s heeft %s in zijn/haar vriendt gemaakt%s%s"
 
 msgid "Add buddy to your list?"
-msgstr "Gebruiker toevoegen aan je lijst?"
+msgstr "Vriend toevoegen aan uw lijst?"
 
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr ""
-"De gebruiker %s%s%s%s wil %s toevoegen aan zijn/haar contactenlijst%s%s."
+msgstr "%s%s%s%s wil %s toevoegen aan zijn/haar vriendenlijst%s%s."
 
 msgid "Authorize buddy?"
-msgstr "Gebruiker toestaan?"
+msgstr "Vriend Machtigen?"
 
 msgid "Authorize"
-msgstr "Toestaan"
+msgstr "Machtigen"
 
 msgid "Deny"
-msgstr "Blokkeren"
+msgstr "Weigeren"
 
 #, c-format
 msgid ""
@@ -184,19 +198,19 @@
 msgstr "Standaard"
 
 msgid "You must provide a username for the buddy."
-msgstr "Geef een gebruikersnaam voor het contactpersoon."
+msgstr "U moet een gebruikersnaam opgeven voor de vriend."
 
 msgid "You must provide a group."
-msgstr "Je moet een groep aangeven."
+msgstr "U moet een groep opgeven."
 
 msgid "You must select an account."
-msgstr "Selecteer een account."
+msgstr "U moet een account selecteren."
 
 msgid "The selected account is not online."
 msgstr "Het geselecteerde account is niet online"
 
 msgid "Error adding buddy"
-msgstr "Fout bij toevoegen van contact"
+msgstr "Fout bij toevoegen vriend"
 
 msgid "Username"
 msgstr "Gebruikersnaam"
@@ -205,16 +219,16 @@
 msgstr "Alias (optioneel)"
 
 msgid "Add in group"
-msgstr "In groep toevoegen"
+msgstr "Aan groep toevoegen"
 
 msgid "Account"
 msgstr "Account"
 
 msgid "Add Buddy"
-msgstr "Contact toevoegen"
+msgstr "Vriend toevoegen"
 
 msgid "Please enter buddy information."
-msgstr "Geef contactinformatie."
+msgstr "Vul informatie over vriend in."
 
 msgid "Chats"
 msgstr "Chats"
@@ -236,7 +250,7 @@
 msgstr "Chat toevoegen"
 
 msgid "You can edit more information from the context menu later."
-msgstr "Je kan meer informatie van het context-menu later veranderen"
+msgstr "U kunt later meer informatie bewerken vanaf het contextmenu."
 
 msgid "Error adding group"
 msgstr "Fout bij toevoegen van groep"
@@ -254,7 +268,7 @@
 msgstr "Chat bewerken"
 
 msgid "Please Update the necessary fields."
-msgstr "Update de belangrijke velden"
+msgstr "Update de benodigde velden"
 
 msgid "Edit"
 msgstr "Bewerken"
@@ -269,19 +283,19 @@
 msgstr "Ophalen..."
 
 msgid "Get Info"
-msgstr "Meer informatie"
+msgstr "Informatie"
 
 msgid "Add Buddy Pounce"
-msgstr "Contactalarm toevoegen"
+msgstr "Alarm toevoegen"
 
 msgid "Send File"
-msgstr "Bestanden verzenden"
+msgstr "Bestand verzenden"
 
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
 msgid "Show when offline"
-msgstr "Weergeven tijdens offline zijn"
+msgstr "Weergeven wanneer offline"
 
 #, c-format
 msgid "Please enter the new name for %s"
@@ -294,18 +308,19 @@
 msgstr "Alias instellen"
 
 msgid "Enter empty string to reset the name."
-msgstr "Niets invullen om de naam te herstellen."
+msgstr "Vul niets in om de naam te herstellen."
 
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
-"Verwijderen van dit contact verwijdert ook de gebruikers in het contact"
+"Verwijderen van dit contactpersoon verwijdert ook alle vrienden van dat "
+"contactpersoon"
 
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Verwijderen van deze groep verwijdert ook de gebruikers in deze groep"
+msgstr "Verwijderen van deze groep verwijdert ook alle vrienden in deze groep"
 
 #, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "Wil je %s echt verwijderen?"
+msgstr "Wilt u %s echt verwijderen?"
 
 #. XXX: anything to do with the returned ui-handle?
 msgid "Confirm Remove"
@@ -316,16 +331,16 @@
 
 #. Buddy List
 msgid "Buddy List"
-msgstr "Contactenlijst"
+msgstr "Vriendenlijst"
 
 msgid "Place tagged"
-msgstr "Tag aan bladwijzer toegevoegd"
+msgstr "Plaats getagged"
 
 msgid "Toggle Tag"
 msgstr "Tag wisselen"
 
 msgid "View Log"
-msgstr "Logboek"
+msgstr "Bekijk Log"
 
 #. General
 msgid "Nickname"
@@ -337,7 +352,7 @@
 msgstr "Inactief"
 
 msgid "On Mobile"
-msgstr "Op mobieltje"
+msgstr "Op mobiel"
 
 msgid "New..."
 msgstr "Nieuw..."
@@ -361,7 +376,7 @@
 "Please enter the username or alias of the person you would like to Block/"
 "Unblock."
 msgstr ""
-"Geef de gebruikersnaam of bijnaam van de persoon wie je wilt Blokkeren/"
+"Geef de gebruikersnaam of bijnaam van de persoon wie u wilt Blokkeren/"
 "deblokkeren."
 
 #. Not multiline
@@ -375,17 +390,17 @@
 
 msgid "Please enter the username or alias of the person you would like to IM."
 msgstr ""
-"Geef de gebruikersnaam van de persoon aan wie je een bericht zou willen "
+"Geef de gebruikersnaam van de persoon aan wie u een IM-bericht zou willen "
 "sturen."
 
 msgid "Channel"
-msgstr "Ruimte"
+msgstr "Kanaal"
 
 msgid "Join a Chat"
-msgstr "Chat openen"
+msgstr "Deelnemen aan Chat"
 
 msgid "Please enter the name of the chat you want to join."
-msgstr "Voer de naam in van het gesprek die je wilt openen."
+msgstr "Voer de naam in van de chat waaraan u wilt deelnemen."
 
 msgid "Join"
 msgstr "Deelnemen"
@@ -394,7 +409,7 @@
 "Please enter the username or alias of the person whose log you would like to "
 "view."
 msgstr ""
-"Geef de gebruikersnaam of bijnaam van de persoon waarvan je het logboek wilt "
+"Geef de gebruikersnaam of bijnaam van de persoon waarvan u het logboek wilt "
 "bekijken."
 
 #. Create the "Options" frame.
@@ -408,7 +423,7 @@
 msgstr "Blokkeren/deblokkeren..."
 
 msgid "Join Chat..."
-msgstr "Chat openen..."
+msgstr "Deelnemen aan Chat..."
 
 msgid "View Log..."
 msgstr "Logboek bekijken..."
@@ -423,7 +438,7 @@
 msgstr "Lege groepen"
 
 msgid "Offline buddies"
-msgstr "Offline contacten"
+msgstr "Offline vrienden"
 
 msgid "Sort"
 msgstr "Sorteren"
@@ -438,7 +453,7 @@
 msgstr "Op logboekgrootte"
 
 msgid "Buddy"
-msgstr "Contact"
+msgstr "Vriend"
 
 msgid "Chat"
 msgstr "Chat"
@@ -447,7 +462,7 @@
 msgstr "Groeperen"
 
 msgid "Certificate Import"
-msgstr "Import certificaat"
+msgstr "Certificaat Import"
 
 msgid "Specify a hostname"
 msgstr "Geef een computernaam"
@@ -461,14 +476,14 @@
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
 "Bestand %s kon niet worden geïmporteerd.\n"
-"Ben er zeker van dat het bestand leesbaar is en in PEM-formaat is "
+"Wees er zeker van dat het bestand leesbaar is en in PEM-formaat is "
 "gecodeerd.\n"
 
 msgid "Certificate Import Error"
 msgstr "Fout bij importeren van certificaat"
 
 msgid "X.509 certificate import failed"
-msgstr "Importeren van X.509-certificaat mislukt"
+msgstr "Import X.509-certificaat mislukt"
 
 msgid "Select a PEM certificate"
 msgstr "Selecteer een PEM-certificaat"
@@ -479,16 +494,16 @@
 "Check that you have write permission to the target path\n"
 msgstr ""
 "Exporteren naar bestand %s mislukt.\n"
-"Controleer of je schrijf-toegang tot de doelmap hebt\n"
+"Controleer of u schrijfrechten op de doelmap heeft\n"
 
 msgid "Certificate Export Error"
-msgstr "Fout bij exporteren van certificaat"
+msgstr "Exportfout van Certificaat"
 
 msgid "X.509 certificate export failed"
-msgstr "Exporteren can X.509-certificaat mislukt."
+msgstr "Export X.509-certificaat mislukt"
 
 msgid "PEM X.509 Certificate Export"
-msgstr "Export vvan PEM-X.509-certificaat "
+msgstr "Export van PEM-X.509-certificaat "
 
 #, c-format
 msgid "Certificate for %s"
@@ -501,27 +516,27 @@
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
-"Gemeenschappelijke naam: %s\n"
-"\n"
-"SHA1 vingerafdruk:\n"
+"Algemene naam: %s\n"
+"\n"
+"SHA1 handtekening:\n"
 "%s"
 
 msgid "SSL Host Certificate"
-msgstr "SSL-computer-certificaat"
+msgstr "SSL Computer certificaat"
 
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr "Ben je er zeker van om het certificaat voor %s te verwijderen?"
+msgstr "Weet u zeker dat u het certificaat voor %s  wilt verwijderen?"
 
 msgid "Confirm certificate delete"
 msgstr "Verwijderen van het certificaat bevestigen."
 
 msgid "Certificate Manager"
-msgstr "Certificaat beheer"
+msgstr "Certificaatbeheer"
 
 #. Creating the user splits
 msgid "Hostname"
-msgstr "Hostnaam"
+msgstr "Computernaam"
 
 msgid "Info"
 msgstr "Info"
@@ -547,8 +562,8 @@
 msgstr ""
 "%s\n"
 "\n"
-"Finch zal geen verbinding meer proberen te maken tot je de fout verhelpt en "
-"het account weer inschakeld wordt."
+"Finch zal geen verbinding meer proberen te maken tot u de fout verhelpt en "
+"het account weer inschakelt."
 
 msgid "Re-enable Account"
 msgstr "Account opnieuw inschakelen"
@@ -558,22 +573,22 @@
 
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Syntax-fout:  Je gaf de verkeerde hoeveelheid argumenten bij die opdracht."
+"Syntax Fout:  U gaf de verkeerde hoeveelheid argumenten bij die opdracht."
 
 msgid "Your command failed for an unknown reason."
 msgstr "Uw opdracht mislukte om een onbekende reden."
 
 msgid "That command only works in chats, not IMs."
-msgstr "Die opdracht werkt alleen in chats, niet in gewone gesprekken."
+msgstr "Die opdracht werkt alleen in chats, niet in IM's"
 
 msgid "That command only works in IMs, not chats."
-msgstr "Die opdracht werkt alleen in gewone gesprekken, niet in chats."
+msgstr "Die opdracht werkt alleen in IM's, niet in chats."
 
 msgid "That command doesn't work on this protocol."
 msgstr "Die opdracht werkt niet met dit protocol."
 
 msgid "Message was not sent, because you are not signed on."
-msgstr "Kan bericht niet versturen omdat je niet aangemeld bent."
+msgstr "Kan bericht niet versturen omdat u niet aangemeld bent."
 
 #, c-format
 msgid "%s (%s -- %s)"
@@ -592,14 +607,14 @@
 "%s typt..."
 
 msgid "You have left this chat."
-msgstr "Je hebt dit gesprek verlaten."
+msgstr "U heeft dit gesprek verlaten."
 
 msgid ""
 "The account has disconnected and you are no longer in this chat. You will be "
 "automatically rejoined in the chat when the account reconnects."
 msgstr ""
-"Het account is niet meer verbonden en je neemt niet meer deel aan dit "
-"gesprek. Je komt automatisch weer in het gesprek als de verbinding van het "
+"Het account is niet meer verbonden en u neemt niet meer deel aan dit "
+"gesprek. U komt automatisch weer in het gesprek als de verbinding van het "
 "account hersteld wordt."
 
 msgid "Logging started. Future messages in this conversation will be logged."
@@ -616,13 +631,13 @@
 msgstr "Gesprek"
 
 msgid "Clear Scrollback"
-msgstr "Gesprek opschonen"
+msgstr "Gesprekgeschiedenis opschonen"
 
 msgid "Show Timestamps"
-msgstr "Tijd in gesprek"
+msgstr "Weergeven Tijdstempels"
 
 msgid "Add Buddy Pounce..."
-msgstr "Contactalarm toevoegen..."
+msgstr "Alarm toevoegen..."
 
 msgid "Invite..."
 msgstr "Uitnodigen.."
@@ -633,9 +648,8 @@
 msgid "Enable Sounds"
 msgstr "Geluiden inschakelen"
 
-#, fuzzy
 msgid "You are not connected."
-msgstr "Kon geen verbinding maken"
+msgstr "U heeft geen verbinding."
 
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-ANTWOORD>"
@@ -646,9 +660,8 @@
 msgstr[0] "Lijst van %d gebruiker:\n"
 msgstr[1] "Lijst van %d gebruikers:\n"
 
-#, fuzzy
 msgid "Supported debug options are: plugins version"
-msgstr "Ondersteunde debug-opties zijn:  version"
+msgstr "Ondersteunde debug-opties zijn: plugin versie"
 
 msgid "No such command (in this context)."
 msgstr "Opdracht onbekend (in deze context)."
@@ -665,7 +678,8 @@
 "%s is not a valid message class. See '/help msgcolor' for valid message "
 "classes."
 msgstr ""
-"%s is geen geldig bericht-soort. Bekijk '/help msgcolor' voor geldigesoorten."
+"%s is geen geldig berichten class. Bekijk '/help msgcolor' voor geldige "
+"classes."
 
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
@@ -676,20 +690,20 @@
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;bericht&gt;:  Stuur een bericht alsof je geen opdracht hiervoor "
+"zeg &lt;bericht&gt;:  Stuur een bericht alsof u geen opdracht hiervoor "
 "gebruikt."
 
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;actie&gt;:  Een IRC-achtige actie naar persoon of chat sturen."
+msgstr "ik &lt;actie&gt;:  Een IRC-achtige actie naar vriend of chat sturen."
 
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug &lt;optie&gt;:  Diverse debug-gegevens naar het huidige gesprek sturen."
+"debug &lt;optie&gt;:  Stuur diverse debuginformatie naar het huidige gesprek."
 
 msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Maakt het gespreksvenster schoon."
+msgstr "clear: wist de gespreksgeschiedenis."
 
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;opdracht&gt;:  Hulp bij een specifieke opdracht."
@@ -701,10 +715,10 @@
 msgstr "plug-ins: Plug-ins-venster weergeven."
 
 msgid "buddylist: Show the buddylist."
-msgstr "buddylist: Contactenlijst weergeven."
+msgstr "vriendenlijst: Vriendenlijst weergeven."
 
 msgid "accounts: Show the accounts window."
-msgstr "accounts: Accounts-venster weergeven."
+msgstr "accounts: Accounts venster weergeven."
 
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Debugvenster weergeven."
@@ -713,7 +727,7 @@
 msgstr "prefs: Voorkeuren weergeven."
 
 msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Venster met opgeslagen statussen weergeven."
+msgstr "statussen: Venster met opgeslagen statussen weergeven."
 
 msgid ""
 "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
@@ -726,8 +740,8 @@
 "in voor verschillende soorten berichten in het gespreksvenster.<br>    &lt;"
 "class&gt;: ontvang, verzend, benadruk, activeer, geef een tijdstempel "
 "mee<br>    &lt;foreground/background&gt;: zwart, rood, groen, blauw, wit, "
-"grijs, donkergrijs, magenta, turquoise, standaard<br><br>VOORBEELD:<br>    "
-"msgcolor verzend turquoise standaard"
+"grijs, donkergrijs, magenta, turkoois, standaard<br><br>VOORBEELD:<br>    "
+"msgcolor verzend turkoois standaard"
 
 msgid "Unable to open file."
 msgstr "Kan bestand niet openen."
@@ -791,7 +805,7 @@
 msgstr "Wacht op starten van overdracht"
 
 msgid "Canceled"
-msgstr "Afgebroken"
+msgstr "Geannuleerd"
 
 msgid "Failed"
 msgstr "Mislukt"
@@ -807,17 +821,17 @@
 msgstr "Ontvangen"
 
 msgid "Finished"
-msgstr "Klaar"
+msgstr "Voltooid"
 
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Het bestand werd opgeslagen als %s."
 
 msgid "Sending"
-msgstr "Verzenden"
+msgstr "Aan 't Verzenden"
 
 msgid "Receiving"
-msgstr "Ontvangen"
+msgstr "Aan 't Ontvangen"
 
 #, c-format
 msgid "Conversation in %s on %s"
@@ -847,7 +861,7 @@
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
-"Chats worden alleen bijgehoudenn als \"Alle chats opslaan\" is aangevinkt."
+"Chats worden alleen bijgehouden als \"Alle chats opslaan\" is aangevinkt."
 
 msgid "No logs were found"
 msgstr "Geen logboek gevonden"
@@ -874,7 +888,7 @@
 msgstr "Systeemlogboek"
 
 msgid "Calling..."
-msgstr "Bellen..."
+msgstr "Aan 't Bellen..."
 
 msgid "Hangup"
 msgstr "Ophangen"
@@ -884,13 +898,13 @@
 msgstr "Accepteren"
 
 msgid "Reject"
-msgstr "Weigeren"
+msgstr "Afwijzen"
 
 msgid "Call in progress."
-msgstr "Gesprek bezig"
+msgstr "In gesprek"
 
 msgid "The call has been terminated."
-msgstr "Het gesprek is stopgezet"
+msgstr "Het gesprek is beëindigd"
 
 #, c-format
 msgid "%s wishes to start an audio session with you."
@@ -898,10 +912,10 @@
 
 #, c-format
 msgid "%s is trying to start an unsupported media session type with you."
-msgstr "%s probeert een niet ondersteund mediagesprek te starten."
+msgstr "%s probeert een niet-ondersteund mediagesprek te starten."
 
 msgid "You have rejected the call."
-msgstr "Het telefoontje is genegeerd."
+msgstr "U heeft het gesprek afgewezen."
 
 msgid "call: Make an audio call."
 msgstr "gesprek: Bel op."
@@ -910,10 +924,10 @@
 msgstr "E-mails"
 
 msgid "You have mail!"
-msgstr "Je hebt post!"
+msgstr "U hebt post!"
 
 msgid "Sender"
-msgstr "Verzender"
+msgstr "Afzender"
 
 msgid "Subject"
 msgstr "Onderwerp"
@@ -932,13 +946,13 @@
 msgstr "Informatie voor %s"
 
 msgid "Buddy Information"
-msgstr "Contactinformatie"
+msgstr "Vrienden informatie"
 
 msgid "Continue"
 msgstr "Doorgaan"
 
 msgid "IM"
-msgstr "Bericht"
+msgstr "IM-Bericht"
 
 msgid "Invite"
 msgstr "Uitnodigen"
@@ -978,13 +992,13 @@
 "Bestand: %s\n"
 
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "Plug-ins moeten geladen zijn voordat u deze kunt configureren."
+msgstr "Plug-in moeten geladen zijn voordat u deze kunt configureren."
 
 msgid "No configuration options for this plugin."
 msgstr "Geen configuratie voor deze plug-in."
 
 msgid "Error loading plugin"
-msgstr "Fout opgetreden bij het laden van de plug-in"
+msgstr "Fout opgetreden bij het laden van plug-in"
 
 msgid "The selected file is not a valid plugin."
 msgstr "Het geselecteerde bestand is geen geldige plug-in."
@@ -992,20 +1006,20 @@
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
-"Open het debug-venster en probeer opnieuw om de exacte fout-melding te "
+"Open het debugvenster en probeer opnieuw om de exacte foutmelding te "
 "bekijken."
 
 msgid "Select plugin to install"
-msgstr "Selecteer plug-in om te installeren"
+msgstr "Selecteer de te installeren plug-in"
 
 msgid "You can (un)load plugins from the following list."
-msgstr "U kunt plug-ins aan-/uitzetten in de volgende lijst."
+msgstr "U kunt plug-ins aan/uitzetten in de volgende lijst."
 
 msgid "Install Plugin..."
 msgstr "Plug-in installeren..."
 
 msgid "Configure Plugin"
-msgstr "Plug-in instellen"
+msgstr "Plug-in configureren"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
@@ -1016,70 +1030,70 @@
 msgstr "Voorkeuren"
 
 msgid "Please enter a buddy to pounce."
-msgstr "Vul een contact in om een alarm voor in te stellen."
+msgstr "Geef een vriend om te alarmeren."
 
 msgid "New Buddy Pounce"
-msgstr "Nieuw contactalarm"
+msgstr "Nieuw Alarm"
 
 msgid "Edit Buddy Pounce"
-msgstr "Contactalarm bewerken"
+msgstr "Alarm Bewerken"
 
 msgid "Pounce Who"
-msgstr "Wie alarmeren"
+msgstr "Wie Alarmeren?"
 
 #. Account:
 msgid "Account:"
 msgstr "Account:"
 
 msgid "Buddy name:"
-msgstr "Contactnaam:"
+msgstr "Vriendennaam:"
 
 #. Create the "Pounce When Buddy..." frame.
 msgid "Pounce When Buddy..."
-msgstr "Alarmeren als contactpersoon..."
+msgstr "Alarmeren wanneer Vriend..."
 
 msgid "Signs on"
-msgstr "...zich aanmeldt"
+msgstr "zich aanmeldt"
 
 msgid "Signs off"
-msgstr "...zich afmeldt"
+msgstr "zich afmeldt"
 
 msgid "Goes away"
-msgstr "...weggaat"
+msgstr "Weggaat"
 
 msgid "Returns from away"
-msgstr "...van afwezigheid terugkeert "
+msgstr "Van afwezigheid terugkeert "
 
 msgid "Becomes idle"
-msgstr "...inactief wordt"
+msgstr "Inactief wordt"
 
 msgid "Is no longer idle"
-msgstr "...weer actief wordt"
+msgstr "Weer actief wordt"
 
 msgid "Starts typing"
-msgstr "...start met typen"
+msgstr "Start met typen"
 
 msgid "Pauses while typing"
-msgstr "...pauzeert tijdens het typen"
+msgstr "Pauzeert tijdens het typen"
 
 msgid "Stops typing"
-msgstr "...stopt met typen"
+msgstr "stopt met typen"
 
 msgid "Sends a message"
-msgstr "...een bericht verstuurt"
+msgstr "Een bericht verstuurt"
 
 #. Create the "Action" frame.
 msgid "Action"
 msgstr "Actie"
 
 msgid "Open an IM window"
-msgstr "Berichtvenster openen"
+msgstr "IM venster openen"
 
 msgid "Pop up a notification"
 msgstr "Melding weergeven"
 
 msgid "Send a message"
-msgstr "Een bericht versturen"
+msgstr "Bericht versturen"
 
 msgid "Execute a command"
 msgstr "Opdracht uitvoeren"
@@ -1088,30 +1102,30 @@
 msgstr "Een geluidje afspelen"
 
 msgid "Pounce only when my status is not Available"
-msgstr "Contactalarm alleen actief wanneer mijn status niet beschikbaar is"
+msgstr "Alleen alarmeren wanneer mijn status 'Niet Beschikbaar' is"
 
 msgid "Recurring"
-msgstr "Herhalend"
+msgstr "Terugkerend"
 
 msgid "Cannot create pounce"
-msgstr "Kan contactalarm niet aanmaken"
+msgstr "Kan Alarm niet aanmaken"
 
 msgid "You do not have any accounts."
-msgstr "Je hebt geen accounts."
+msgstr "U heeft geen accounts."
 
 msgid "You must create an account first before you can create a pounce."
-msgstr "Je moet eerst een account aanmaken voordat je een alarm kan instellen"
+msgstr "U moet eerst een account aanmaken voordat u een alarm kan instellen"
 
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Wil je het contactalarm van %s op %s echt verwijderen?"
+msgstr "Wilt u het Alarm van %s voor %s echt verwijderen?"
 
 msgid "Buddy Pounces"
-msgstr "Contactalarmen"
+msgstr "Alarmeringen"
 
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s typt een bericht aan jou (%s)"
+msgstr "%s begint met typen  (%s)"
 
 #, c-format
 msgid "%s has paused while typing to you (%s)"
@@ -1119,77 +1133,77 @@
 
 #, c-format
 msgid "%s has signed on (%s)"
-msgstr "%s heeft zich aangemeld (%s)"
+msgstr "%s zich heeft aangemeld (%s)"
 
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s is weer actief (%s)"
+msgstr "%s terug is na inactief geweest te zijn (%s)"
 
 #, c-format
 msgid "%s has returned from being away (%s)"
-msgstr "%s is weer actief (%s)"
+msgstr "%s terug is na weggeweest te zijn (%s)"
 
 #, c-format
 msgid "%s has stopped typing to you (%s)"
-msgstr "%s is gestopt met tikken (%s)"
+msgstr "%s is gestopt met typen (%s)"
 
 #, c-format
 msgid "%s has signed off (%s)"
-msgstr "%s heeft zich afgemeld (%s)"
+msgstr "%s zich heeft afgemeld (%s)"
 
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s is inactief (%s)"
+msgstr "%s inactief is geworden (%s)"
 
 #, c-format
 msgid "%s has gone away. (%s)"
-msgstr "%s is weggegaan. (%s)"
+msgstr "%s weggegaan is. (%s)"
 
 #, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s heeft u een bericht toegestuurd. (%s)"
+msgstr "%s u een bericht heeft toegestuurd. (%s)"
 
 msgid "Unknown pounce event. Please report this!"
-msgstr "Onbekend contactalarm. Rapporteer dit alstublieft!"
+msgstr "Onbekende alarmering. Rapporteer dit alstublieft!"
 
 msgid "Based on keyboard use"
-msgstr "Afhankelijk van gebruik van toetsenbord en muis"
+msgstr "Afhankelijk van gebruik van toetsenbord"
 
 msgid "From last sent message"
-msgstr "Laatst verstuurde bericht"
+msgstr "gebaseerd op laatst verstuurde bericht"
 
 msgid "Never"
 msgstr "Nooit"
 
 msgid "Show Idle Time"
-msgstr "Tijd van inactiviteit weergeven"
+msgstr "Inactiviteitsduur weergeven"
 
 msgid "Show Offline Buddies"
-msgstr "Off-line contacten weergeven"
+msgstr "offline Vrienden weergeven"
 
 msgid "Notify buddies when you are typing"
-msgstr "Laat anderen weten wanneer je typt"
+msgstr "Laat anderen weten wanneer u typt"
 
 msgid "Log format"
-msgstr "Logboekopmaak"
+msgstr "Logboekformaat"
 
 msgid "Log IMs"
-msgstr "Gesprekken bijhouden"
+msgstr "IM gesprekken bijhouden"
 
 msgid "Log chats"
-msgstr "Chats bijhouden"
+msgstr "Chats log bijhouden"
 
 msgid "Log status change events"
 msgstr "Statusveranderingen opslaan"
 
 msgid "Report Idle time"
-msgstr "Bijhouden van inactiviteit"
+msgstr "Bijhouden van inactiviteitsduur"
 
 msgid "Change status when idle"
 msgstr "Status veranderen wanneer ik niets doe"
 
 msgid "Minutes before changing status"
-msgstr "Minuten voor wijzigen van status"
+msgstr "Minuten alvorens wijziging van status"
 
 msgid "Change status to"
 msgstr "Status veranderen in "
@@ -1201,7 +1215,7 @@
 msgstr "Logboek bijhouden"
 
 msgid "You must fill all the required fields."
-msgstr "Je moet al de benodigde velden invullen."
+msgstr "U moet al de benodigde velden invullen."
 
 msgid "The required fields are underlined."
 msgstr "De benodigde velden zijn onderstreept."
@@ -1229,10 +1243,10 @@
 msgstr "Lijst van ruimtes"
 
 msgid "Buddy logs in"
-msgstr "Contact meldt zich aan"
+msgstr "Vriend meldt zich aan"
 
 msgid "Buddy logs out"
-msgstr "Contact meldt zich af"
+msgstr "Vriend meldt zich af"
 
 msgid "Message received"
 msgstr "Bericht ontvangen"
@@ -1258,8 +1272,11 @@
 msgid "Someone says your username in chat"
 msgstr "Iemand zegt uw gebruikersnaam in de chatruimte"
 
+msgid "Attention received"
+msgstr "Attendering ontvangen"
+
 msgid "GStreamer Failure"
-msgstr "GStreamer-probleem"
+msgstr "GStreamer Probleem"
 
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer kan niet starten."
@@ -1268,7 +1285,7 @@
 msgstr "(standaard)"
 
 msgid "Select Sound File ..."
-msgstr "Selecteer geluids-bestand..."
+msgstr "Selecteer geluidsbestand..."
 
 msgid "Sound Preferences"
 msgstr "Geluidsvoorkeuren"
@@ -1280,7 +1297,7 @@
 msgstr "Automatisch"
 
 msgid "Console Beep"
-msgstr "Console-pieptoon"
+msgstr "Console pieptoon"
 
 msgid "Command"
 msgstr "Opdracht"
@@ -1289,7 +1306,7 @@
 msgstr "Geen geluid"
 
 msgid "Sound Method"
-msgstr "Geluids-methode"
+msgstr "Geluidsmethode"
 
 msgid "Method: "
 msgstr "Methode:"
@@ -1299,7 +1316,7 @@
 "Sound Command\n"
 "(%s for filename)"
 msgstr ""
-"Geluids opdracht:\n"
+"Geluidscommando:\n"
 "(%s voor bestandsnaam)"
 
 #. Sound options
@@ -1307,7 +1324,7 @@
 msgstr "Geluidsinstellingen"
 
 msgid "Sounds when conversation has focus"
-msgstr "Geluiden wanneer gesprek de aandacht heeft"
+msgstr "Geluiden wanneer het gespreksvenster de focus heeft"
 
 msgid "Always"
 msgstr "Altijd"
@@ -1342,7 +1359,7 @@
 
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Wil je \"%s\" echt verwijderen?"
+msgstr "Wilt u \"%s\" echt verwijderen?"
 
 msgid "Delete Status"
 msgstr "Status verwijderen"
@@ -1429,10 +1446,10 @@
 "ondersteuning."
 
 msgid "GntClipboard"
-msgstr "GntClipboard"
+msgstr "GntKlembord"
 
 msgid "Clipboard plugin"
-msgstr "Klembord-plug-in"
+msgstr "Klembord plug-in"
 
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
@@ -1443,57 +1460,57 @@
 
 #, c-format
 msgid "%s just signed on"
-msgstr "%s heeft zich aangemeld"
+msgstr "%s heeft zich net aangemeld"
 
 #, c-format
 msgid "%s just signed off"
-msgstr "%s heeft zich afgemeld"
+msgstr "%s heeft zich net afgemeld"
 
 #, c-format
 msgid "%s sent you a message"
-msgstr "%s heeft je een bericht gestuurd"
+msgstr "%s heeft u een bericht gestuurd"
 
 #, c-format
 msgid "%s said your nick in %s"
-msgstr "%s heeft jouw naam gezegd in %s"
+msgstr "%s heeft jouw nick gezegd in %s"
 
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s heeft een bericht gestuurd in %s"
 
 msgid "Buddy signs on/off"
-msgstr "Contact meldt zich aan/af"
+msgstr "Vriend meldt zich aan/af"
 
 msgid "You receive an IM"
-msgstr "Je ontvangt een bericht"
+msgstr "U ontvangt een IM-bericht"
 
 msgid "Someone speaks in a chat"
-msgstr "Iemand spreekt in een chatgesprek"
+msgstr "Iemand spreekt in een chat"
 
 msgid "Someone says your name in a chat"
-msgstr "Iemand zegt je naam in het chatgesprek"
+msgstr "Iemand zegt u naam in een chat"
 
 msgid "Notify with a toaster when"
-msgstr "Notificatievenster weergeven wanneer"
+msgstr "Waarschuwen met een toaster wanneer"
 
 msgid "Beep too!"
-msgstr "Ook een piep geven!"
+msgstr "Ook piepen!"
 
 msgid "Set URGENT for the terminal window."
-msgstr "Stel URGENT in in het terminal-venster"
+msgstr "Stel URGENT in in het terminalvenster"
 
 msgid "GntGf"
 msgstr "GntGf"
 
 msgid "Toaster plugin"
-msgstr "Toaster-plug-in"
+msgstr "Toaster plug-in"
 
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Gesprek met %s op %s:</b><br>"
 
 msgid "History Plugin Requires Logging"
-msgstr "De geschiedenis-plug-in vereist bijhouden van logboek"
+msgstr "De geschiedenis plug-in vereist loggen"
 
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
@@ -1501,8 +1518,7 @@
 "Enabling logs for instant messages and/or chats will activate history for "
 "the same conversation type(s)."
 msgstr ""
-"Logboek bijhouden kan worden ingeschakeld via Extra -> Voorkeuren -> "
-"Logboek.\n"
+"Loggen kan worden ingeschakeld via Extra -> Voorkeuren -> Logboek.\n"
 "\n"
 "Het inschakelen hiervan zal u de mogelijkheid geven om geschiedenis op te "
 "vragen."
@@ -1530,17 +1546,16 @@
 
 #, c-format
 msgid "TinyURL for above: %s"
-msgstr ""
+msgstr "TinyURL voor hierboven: %s"
 
 msgid "Please wait while TinyURL fetches a shorter URL ..."
-msgstr ""
-
-#, fuzzy
+msgstr "Even wachten terwijl TinyURL een kortere URL ophaalt..."
+
 msgid "Only create TinyURL for URLs of this length or greater"
-msgstr "Alleen TinyURL aanmaken voor koppelingen van deze lengte of langer"
+msgstr "Alleen TinyURL aanmaken voor URL's van deze lengte of langer"
 
 msgid "TinyURL (or other) address prefix"
-msgstr ""
+msgstr "TinyURL (of een ander) adres voorvoegsel"
 
 msgid "TinyURL"
 msgstr "TinyURL"
@@ -1550,19 +1565,21 @@
 
 msgid "When receiving a message with URL(s), use TinyURL for easier copying"
 msgstr ""
+"Wanneer u een bericht ontvangt met URL's, gebruik dan TinyURL voor "
+"gemakkelijker kopiëren"
 
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline "
 
 msgid "Online Buddies"
-msgstr "Online contacten"
+msgstr "Online Vrienden"
 
 msgid "Offline Buddies"
-msgstr "Offline contacten"
+msgstr "Offline Vrienden"
 
 msgid "Online/Offline"
 msgstr "Online/offline"
@@ -1577,10 +1594,10 @@
 msgstr "Geneste subgroep"
 
 msgid "Nested Grouping (experimental)"
-msgstr "Genest groeperen (expirementeel)"
+msgstr "Geneste groeperen (experimenteel)"
 
 msgid "Provides alternate buddylist grouping options."
-msgstr "Levert alternatieve groepeer-opties voor contactenlijst."
+msgstr "Levert alternatieve groepeeropties voor vriendenlijst."
 
 msgid "Lastlog"
 msgstr "Geschiedenis"
@@ -1588,13 +1605,13 @@
 #. Translator Note: The "backlog" is the conversation buffer/history.
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
-"geschiedenis: Zoekt voor een deeltekenreeks in het geschiedenis-logboek."
+"geschiedenis: Zoekt voor een deeltekenreeks in het geschiedenislogboek."
 
 msgid "GntLastlog"
 msgstr "GntGeschiedenis"
 
 msgid "Lastlog plugin."
-msgstr "Geschiedenis-plug-in."
+msgstr "Geschiedenis plug-in."
 
 msgid "accounts"
 msgstr "accounts"
@@ -1615,7 +1632,7 @@
 
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "Protocolplug-in voor %s niet gevonden"
+msgstr "Protocol plug-in voor %s niet gevonden"
 
 msgid "Connection Error"
 msgstr "Verbindingsfout"
@@ -1649,97 +1666,92 @@
 msgid "Set User Info"
 msgstr "Gebruikersinfo instellen"
 
-#, fuzzy
 msgid "This protocol does not support setting a public alias."
-msgstr "Dit protocol heeft geen ondersteuning voor chatruimtes."
-
-#, fuzzy
+msgstr "Dit protocol ondersteunt het instellen van een publieke alias niet."
+
 msgid "This protocol does not support fetching the public alias."
-msgstr "Dit protocol heeft geen ondersteuning voor chatruimtes."
+msgstr "Dit protocol ondersteunt het ophalen van een publieke alias niet."
 
 msgid "Unknown"
 msgstr "Onbekend"
 
 msgid "Buddies"
-msgstr "Contacten"
+msgstr "Vrienden"
 
 msgid "buddy list"
-msgstr "contactenlijst"
-
-#, fuzzy
+msgstr "vriendenlijst"
+
 msgid "The certificate is self-signed and cannot be automatically checked."
 msgstr ""
-"Het certificaat van \"%s\" is zelf-gesigneerd. Het kan niet automatisch "
-"gecontroleerd worden."
+"Het certificaat is zelfgesigneerd en kan niet automatisch gecontroleerd "
+"worden."
 
 msgid ""
 "The certificate is not trusted because no certificate that can verify it is "
 "currently trusted."
 msgstr ""
-
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "De certificaat-keten van %s is niet geldig."
-
-#, fuzzy
+"Het certificaat wordt niet vertrouwd omdat geen certificaat die dit kan "
+"verifiëren op het moment vertrouwd wordt."
+
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Het certificaat is niet geldig. Controleer of uw computer's datum en tijd "
+"goed is ingesteld."
+
 msgid "The certificate has expired and should not be considered valid."
-msgstr "De certificaat-keten van %s is niet geldig."
+msgstr "Het certificaat is verlopen en moet niet als geldig worden beschouwd."
 
 #. Translators: "domain" refers to a DNS domain (e.g. talk.google.com)
-#, fuzzy
 msgid "The certificate presented is not issued to this domain."
-msgstr "De certificaat-keten van %s is niet geldig."
+msgstr "Het aangeboden certificaat is niet uitgegeven voor dit domein."
 
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
-"Je hebt geen databank van belangrijke certificaten, dus deze kan niet worden "
+"U heeft geen database van belangrijke certificaten, dus deze kan niet worden "
 "gecontroleerd."
 
-#, fuzzy
 msgid "The certificate chain presented is invalid."
-msgstr "De certificaat-keten van %s is niet geldig."
-
-#, fuzzy
+msgstr "De aangeboden certificaatketen is niet geldig."
+
 msgid "The certificate has been revoked."
-msgstr "Het gesprek is stopgezet"
-
-#, fuzzy
+msgstr "Het certificaat is ingetrokken."
+
 msgid "An unknown certificate error occurred."
-msgstr "Onbekende aanmeldingsfout: %s."
+msgstr "Een onbekende fout van het certificaat is opgetreden"
 
 msgid "(DOES NOT MATCH)"
-msgstr "(KOMEN NIET OVEREEN)"
+msgstr "(KOMT NIET OVEREEN)"
 
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
-"% s heeft het volgende certificaat voor alleen-deze-keer gebruik "
-"gepresenteerd:"
+msgstr "%s heeft het volgende certificaat aangeboden voor eenmalig gebruik:"
 
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
-"Gemeenschappelijke naam: %s %s\n"
-"Vingerafdruk (SHA1): %s"
+"Algemene naam: %s %s\n"
+"Algoritme van vingerafdruk (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
 msgid "Single-use Certificate Verification"
-msgstr "Eenmalige certificaat-controle"
+msgstr "Verificatie Certificaat voor eenmalig gebruik"
 
 #. Scheme name
 #. Pool name
 msgid "Certificate Authorities"
-msgstr "Certificaat-identiteit"
+msgstr "Certificaat Autoriteiten"
 
 #. Scheme name
 #. Pool name
 msgid "SSL Peers Cache"
-msgstr "SSL peer cache"
+msgstr "SSL Peers Cache"
 
 #. Make messages
 #, c-format
@@ -1748,31 +1760,30 @@
 
 #. TODO: Find what the handle ought to be
 msgid "SSL Certificate Verification"
-msgstr "SSL-certificaat-controle"
+msgstr "SSL Certificaat Verificatie"
 
 msgid "_View Certificate..."
 msgstr "_Bekijk certificaat..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "The certificate for %s could not be validated."
-msgstr "De certificaat-keten van %s is niet geldig."
+msgstr "Het certificaat voor %s kon niet worden gevalideerd."
 
 #. TODO: Probably wrong.
 msgid "SSL Certificate Error"
-msgstr "SSL-certificaat fout"
-
-#, fuzzy
+msgstr "SSL certificaatfout"
+
 msgid "Unable to validate certificate"
-msgstr "Kan niet authentificeren: %s"
-
-#, fuzzy, c-format
+msgstr "Kan certificaat valideren"
+
+#, c-format
 msgid ""
 "The certificate claims to be from \"%s\" instead. This could mean that you "
 "are not connecting to the service you believe you are."
 msgstr ""
-"Het certificaat dat komt van \"%s\" zegt in plaats van dat  van \"%s\" te "
-"zijn.  Dit kan betekenen dat je niet verbonden bent met de dienst welke je "
-"zou denken."
+"In plaats hiervan claimt het certificaat van \"%s\" te zijn. Dit kan "
+"betekenen dat u niet verbonden bent met de dienst waarmee u denkt verbonden "
+"te zijn."
 
 #. Make messages
 #, c-format
@@ -1784,31 +1795,31 @@
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
-"Gemeenschappelijke naam: %s\n"
-"\n"
-"Vingerafdruk (SHA1): %s\n"
-"\n"
-"Datum activitatie: %s\n"
-"Vervaldatum: %s\n"
+"Algemene naam: %s\n"
+"\n"
+"Algoritme van vingerafdruk (SHA1): %s\n"
+"\n"
+"Geldig van: %s\n"
+"Geldig tot: %s\n"
 
 #. TODO: Find what the handle ought to be
 msgid "Certificate Information"
-msgstr "Informatie over certificaat"
+msgstr "Certificaatinformatie"
 
 #. show error to user
 msgid "Registration Error"
 msgstr "Registratiefout"
 
 msgid "Unregistration Error"
-msgstr "Fout met het ongedaan maken van het  registeren"
+msgstr "Fout met het ongedaan maken van het registeren"
 
 #, c-format
 msgid "+++ %s signed on"
-msgstr "+++ %s heeft zich aangemeld"
+msgstr "+++ %s is aangemeld"
 
 #, c-format
 msgid "+++ %s signed off"
-msgstr "+++ %s heeft zich afgemeld"
+msgstr "+++ %s is afgemeld"
 
 #. Undocumented
 #. Unknown error
@@ -1816,14 +1827,14 @@
 msgstr "Onbekende fout"
 
 msgid "Unable to send message: The message is too large."
-msgstr "Kan het bericht niet verzenden. Het bericht is te groot."
+msgstr "Kan het bericht niet verzenden: Het bericht is te groot."
 
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kan het bericht niet verzenden aan %s."
 
 msgid "The message is too large."
-msgstr "Afwezigheidsbericht te groot."
+msgstr "Het bericht is te groot."
 
 msgid "Unable to send message."
 msgstr "Kan het bericht niet verzenden."
@@ -1844,34 +1855,34 @@
 
 #, c-format
 msgid "You are now known as %s"
-msgstr "Je heet nu %s"
+msgstr "U staat bekend als %s"
 
 #, c-format
 msgid "%s is now known as %s"
-msgstr "%s heet nu %s"
+msgstr "%s staat nu bekend als %s"
 
 #, c-format
 msgid "%s left the room."
-msgstr "%s is weggegaan."
+msgstr "%s verliet de ruimte."
 
 #, c-format
 msgid "%s left the room (%s)."
-msgstr "%s is weggegaan (%s)."
+msgstr "%s verliet de ruimte (%s)."
 
 msgid "Invite to chat"
-msgstr "Uitnodigen voor gesprek"
+msgstr "Uitnodigen voor chat"
 
 #. Put our happy label in it.
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
-"Geef de bijnaam van de persoon die u wilt uitnodigen, eventueel met een "
-"uitnodigende tekst"
+"Geef de naam van de gebruiker die u wilt uitnodigen, eventueel met een "
+"begeleidend uitnodigingsbericht."
 
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "Kan geen nieuwe verbinding maken: %s"
+msgstr "Kan geen verbinding krijgen: %s"
 
 #, c-format
 msgid "Failed to get name: %s"
@@ -1879,7 +1890,7 @@
 
 #, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Kan servernaam niet ophalen: %s"
+msgstr "Kan serv naam niet ophalen: %s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple's D-BUS server is niet actief vanwege de volgende reden"
@@ -1888,48 +1899,46 @@
 msgid "No name"
 msgstr "Geen naam"
 
-#
 msgid "Unable to create new resolver process\n"
-msgstr "Kan geen nieuw opzoek-proces maken \n"
-
-#
+msgstr "Kan geen nieuw oplossingsproces aanmaken \n"
+
 msgid "Unable to send request to resolver process\n"
-msgstr "Niet mogelijk om opzoek-proces te versturen\n"
+msgstr "Niet mogelijk om verzoek om oplossingsproces te versturen\n"
 
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Fout bij oplossen van %s:\n"
+"Fout bij oplossing van %s:\n"
 "%s"
 
 #, c-format
 msgid "Error resolving %s: %d"
-msgstr "Fout bij opzoeken van %s: %d"
+msgstr "Fout bij oplossing van %s: %d"
 
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
-"Er is een fout opgetreden bij het lezen van opzoek-proces:\n"
+"Leesfout van oplossingsproces:\n"
 "%s"
 
 #, c-format
 msgid "Resolver process exited without answering our request"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Oplossingsproces verlaten zonder ons verzoek te beantwoorden"
+
+#, c-format
 msgid "Error converting %s to punycode: %d"
-msgstr "Fout bij opzoeken van %s: %d"
+msgstr "Fout bij converteren van %s naar punycode: %d"
 
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Aanmaken thread mislukt: %s"
 
 msgid "Unknown reason"
-msgstr "Reden onbekend"
+msgstr "Onbekende reden"
 
 #, c-format
 msgid ""
@@ -1956,26 +1965,24 @@
 "%s.\n"
 
 msgid "Directory is not writable."
-msgstr "Map is niet beschrijfbaar."
+msgstr "Map heeft geen schrijfrechten."
 
 msgid "Cannot send a file of 0 bytes."
-msgstr "Kan geen bestand sturen van 0 bytes groot."
+msgstr "Kan geen bestand sturen van 0 bytes."
 
 msgid "Cannot send a directory."
 msgstr "Kan geen map sturen."
 
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr ""
-"%s is geen normaal bestand. Het wordt geweigerd dit te overschrijven.\n"
-
-#, fuzzy
+msgstr "%s is geen normaal bestand. Beter niet overschrijven.\n"
+
 msgid "File is not readable."
-msgstr "Map is niet beschrijfbaar."
+msgstr "Map heeft geen leesrechten."
 
 #, c-format
 msgid "%s wants to send you %s (%s)"
-msgstr "%s wil je %s toesturen (%s)"
+msgstr "%s wil u %s toesturen (%s)"
 
 #, c-format
 msgid "%s wants to send you a file"
@@ -1991,9 +1998,9 @@
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"Er is een bestand voor downloaden beschikbaar van:\n"
-"Computer: %s\n"
-"Poort: %d"
+"Een bestand kan opgehaald worden van:\n"
+"Remote Host: %s\n"
+"Remote Poort: %d"
 
 #, c-format
 msgid "%s is offering to send file %s"
@@ -2011,9 +2018,9 @@
 msgid "Starting transfer of %s from %s"
 msgstr "Overdracht van %s van %s wordt gestart"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Transfer of file <A HREF=\"file://%s\">%s</A> complete"
-msgstr "Bestandsoverdracht van %s voltooid"
+msgstr "Bestandsoverdracht van <A HREF=\"file://%s\">%s</A> voltooid"
 
 #, c-format
 msgid "Transfer of file %s complete"
@@ -2022,20 +2029,20 @@
 msgid "File transfer complete"
 msgstr "Bestandsoverdracht voltooid"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You cancelled the transfer of %s"
-msgstr "Je de overdracht van %s afgebroken"
+msgstr "U annuleerde de overdracht van %s"
 
 msgid "File transfer cancelled"
-msgstr "Bestandsoverdracht afgebroken"
-
-#, fuzzy, c-format
+msgstr "Bestandsoverdracht geannuleerd"
+
+#, c-format
 msgid "%s cancelled the transfer of %s"
-msgstr "%s heeft de overdracht van %s afgebroken"
-
-#, fuzzy, c-format
+msgstr "%s heeft de overdracht van %s geannuleerd"
+
+#, c-format
 msgid "%s cancelled the file transfer"
-msgstr "%s heeft de overdracht afgebroken"
+msgstr "%s annuleerde de bestandsoverdracht"
 
 #, c-format
 msgid "File transfer to %s failed."
@@ -2046,158 +2053,150 @@
 msgstr "Bestandsoverdracht van %s mislukt."
 
 msgid "Run the command in a terminal"
-msgstr "Voer het commando uit in een terminal"
+msgstr "Voer het commando uit in een terminal venster"
 
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"aim\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"aim\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"gg\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"gg\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"icq\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"icq\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"irc\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"irc\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"msnim\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"msnim\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"sip\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"sip\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"xmpp\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"xmpp\" URLs af te handelen, indien ingeschakeld."
 
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr ""
-"De opdracht die gebruikt wordt om \"ymsgr\" URLs af te handelen, indien "
-"ingeschakeld."
+"Het commando gebruikt om \"ymsgr\" URL's af te handelen, indien ingeschakeld."
 
 msgid "The handler for \"aim\" URLs"
-msgstr "De afhandelaar voor \"aim\" URLs"
+msgstr "De handler voor \"aim\" URL's"
 
 msgid "The handler for \"gg\" URLs"
-msgstr "De afhandelaar voor \"gg\" URLs"
+msgstr "De handler voor \"gg\" URL's"
 
 msgid "The handler for \"icq\" URLs"
-msgstr "De afhandelaar voor \"icq\" URLs"
+msgstr "De handler voor \"icq\" URL's"
 
 msgid "The handler for \"irc\" URLs"
-msgstr "De afhandelaar voor \"irc\" URLs"
+msgstr "De handler voor \"irc\" URL's"
 
 msgid "The handler for \"msnim\" URLs"
-msgstr "De afhandelaar voor \"msnim\" URLs"
+msgstr "De handler voor \"msnim\" URL's"
 
 msgid "The handler for \"sip\" URLs"
-msgstr "De afhandelaar voor \"sip\" URLs"
+msgstr "De handler voor \"sip\" URL's"
 
 msgid "The handler for \"xmpp\" URLs"
-msgstr "De afhandelaar voor \"xmpp\" URLs"
+msgstr "De handler voor \"xmpp\" URL's"
 
 msgid "The handler for \"ymsgr\" URLs"
-msgstr "De afhandelaar voor \"ymsgr\" URLs"
+msgstr "De handler voor \"ymsgr\" URL's"
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"aim\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"aim\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"gg\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"gg\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"icq\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"icq\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"irc\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"irc\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"msnim\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"msnim\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"sip\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"sip\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"xmpp\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"xmpp\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"Waar indien de opdracht in de \"command\" sleutel \"ymsgr\" URLs moet "
+"Waar indien de opdracht in de \"command\" sleutel \"ymsgr\" URL's moet "
 "afhandelen."
 
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Waar indien de opdracht die gebruikt wordt om dit type URLs af te handelen "
+"Waar indien de opdracht die gebruikt wordt om dit type URL's af te handelen "
 "moet uitgevoerd worden in een terminal."
 
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Wanneer de opdracht \"aim\" URLs moet afhandelen"
+msgstr "Of de opdracht \"aim\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Wanneer de opdracht \"gg\" URLs moet afhandelen"
+msgstr "Of de opdracht \"gg\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Wanneer de opdracht \"icq\" URLs moet afhandelen"
+msgstr "Of de opdracht \"icq\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Wanneer de opdracht \"irc\" URLs moet afhandelen"
+msgstr "Of de opdracht \"irc\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Wanneer de opdracht \"msnim\" URLs moet afhandelen"
+msgstr "Of de opdracht \"msnim\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Wanneer de opdracht \"sip\" URLs moet afhandelen"
+msgstr "Of de opdracht \"sip\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Wanneer de opdracht \"xmpp\" URLs moet afhandelen"
+msgstr "Of de opdracht \"xmpp\" URL's moet afhandelen"
 
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "Wanneer de opdracht \"ymsgr\" URLs moet afhandelen"
+msgstr "Of de opdracht \"ymsgr\" URL's moet afhandelen"
 
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">De logger heeft geen leesfunctie</font></b>"
@@ -2206,7 +2205,7 @@
 msgstr "HTML"
 
 msgid "Plain text"
-msgstr "Tekst"
+msgstr "Platte Tekst"
 
 msgid "Old flat format"
 msgstr "Oud plat formaat"
@@ -2248,56 +2247,57 @@
 "No codecs found. Install some GStreamer codecs found in GStreamer plugins "
 "packages."
 msgstr ""
+"Geen codes gevonden. Installeer enkele GStreamer codecs die in de GStreamer "
+"plug-in pakketten zitten."
 
 msgid ""
 "No codecs left. Your codec preferences in fs-codecs.conf are too strict."
 msgstr ""
-
-#, fuzzy
+"Geen codecs over. Uw codec voorkeuren in fs.codecs.conf zijn te strikt. "
+
 msgid "A non-recoverable Farsight2 error has occurred."
-msgstr "Onbekende aanmeldingsfout: %s."
+msgstr "een onherstelbare Farsight2 fout is opgetreden."
 
 msgid "Error with your microphone"
-msgstr ""
+msgstr "Fout opgetreden bij uw microfoon"
 
 msgid "Error with your webcam"
-msgstr ""
-
-#, fuzzy
+msgstr "Fout opgetreden bij uw webcam"
+
 msgid "Conference error"
-msgstr "Conferentie afgesloten"
-
-#, fuzzy, c-format
+msgstr "Conferentie fout"
+
+#, c-format
 msgid "Error creating session: %s"
-msgstr "Fout bij maken verbinding"
+msgstr "Fout bij maken sessie: %s"
 
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr "je gebruikt %s, maar de plug-in heeft %s nodig."
+msgstr "U gebruikt %s, maar de plug-in heeft %s nodig."
 
 msgid "This plugin has not defined an ID."
 msgstr "Deze plug-in heeft nog geen ID gedefinieerd."
 
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "Plug-in-probleem %d (nodig: %d)"
+msgstr "Plug-in magie komt niet overeen %d (nodig: %d)"
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr "ABI-versie komt niet overeen %d.%d.x (nodig: %d.%d.x)"
+msgstr "ABI versie komt niet overeen %d.%d.x (nodig: %d.%d.x)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
 msgstr ""
 "Plug-in implementeert niet alle vereiste functies (iconenlijst, inloggen en "
-"afsluiten)"
+"sluiten)"
 
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"De vereiste plug-in %s is niet gevonden. Installeer de plug-in en probeer "
+"De vereiste plug-in %s is niet gevonden. Installeer deze plug-in en probeer "
 "opnieuw."
 
 msgid "Unable to load the plugin"
@@ -2308,7 +2308,7 @@
 msgstr "De vereiste plug-in %s kan niet geladen worden."
 
 msgid "Unable to load your plugin."
-msgstr "Kan jouw plug-in niet laden."
+msgstr "Kan uw plug-in niet laden."
 
 #, c-format
 msgid "%s requires %s, but it failed to unload."
@@ -2324,14 +2324,14 @@
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
-"Automatische geaccepteerde bestands-overdracht van \"%s\" van \"%s\" klaar."
+"Automatisch geaccepteerde bestandsoverdracht van \"%s\" van \"%s\" gereed."
 
 msgid "Autoaccept complete"
-msgstr "Autoaccepteren compleet"
+msgstr "Automatisch accepteren compleet"
 
 #, c-format
 msgid "When a file-transfer request arrives from %s"
-msgstr "Als een bestands-overdracht aanvraag komt van %s"
+msgstr "Als een bestandsoverdracht aanvraag komt van %s"
 
 msgid "Set Autoaccept Setting"
 msgstr "Automatisch accepteren instellen"
@@ -2343,7 +2343,7 @@
 msgstr "_Annuleren"
 
 msgid "Ask"
-msgstr "Vraag"
+msgstr "Vragen"
 
 msgid "Auto Accept"
 msgstr "Automatisch accepteren"
@@ -2359,30 +2359,31 @@
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
-"Path to save the files in\n"
-"(Please provide the full path)"
+"Pad voor opslaan bestanden\n"
+"(Geef spv het volledige pad)"
 
 msgid "Automatically reject from users not in buddy list"
-msgstr "Automatisch verwerpen van gebruikers die niet in contactenlijst staan"
+msgstr "Automatisch verwerpen van gebruikers die niet in vriendenlijst staan"
 
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Meld met een pop-up wanneer een automatisch geaccepteerde\n"
-"bestandsoverdracht compleet is"
+"Pop-up melding wanneer een automatisch geaccepteerd bestandsoverdracht "
+"gereed is\n"
+"(alleen als er geen conversatie is met de verzender)"
 
 msgid "Create a new directory for each user"
 msgstr "Een nieuwe map voor elke gebruiker aanmaken"
 
 msgid "Notes"
-msgstr "Opmerkingen"
+msgstr "Notities"
 
 msgid "Enter your notes below..."
-msgstr "Voeg je opmerkingen hieronder toe..."
+msgstr "Voeg uw notities hieronder toe..."
 
 msgid "Edit Notes..."
-msgstr "Bewerk opmerkingen..."
+msgstr "Bewerk notities..."
 
 #. *< major version
 #. *< minor version
@@ -2393,16 +2394,18 @@
 #. *< priority
 #. *< id
 msgid "Buddy Notes"
-msgstr "Contact-opmerkingen"
+msgstr "Vrienden Notities"
 
 #. *< name
 #. *< version
 msgid "Store notes on particular buddies."
-msgstr "Sla opmerkingen op bij bepaalde vrienden."
+msgstr "Sla notities op van bepaalde vrienden."
 
 #. *< summary
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Contacten toevoegen aan de lijst"
+msgstr ""
+"Voegt de mogelijkheid toe om notities voor vrienden op te slaan op uw "
+"vriendenlijst"
 
 #  *< type
 #  *< ui_requirement
@@ -2441,7 +2444,7 @@
 #. *< priority
 #. *< id
 msgid "DBus Example"
-msgstr "DBus-voorbeeld"
+msgstr "DBus voorbeeld"
 
 #  *< name
 #  *< version
@@ -2452,7 +2455,7 @@
 #. *  summary
 #. *  description
 msgid "DBus Plugin Example"
-msgstr "DBus voorbeeldplug-in"
+msgstr "DBus plug-in voorbeeld"
 
 #. *< type
 #. *< ui_requirement
@@ -2461,14 +2464,14 @@
 #. *< priority
 #. *< id
 msgid "File Control"
-msgstr "Bestands-controle"
+msgstr "Bestandscontrole"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "Allows control by entering commands in a file."
-msgstr "Besturing inschakelen door opdrachten in een bestand te zetten."
+msgstr "Staat contorle toe door commando's in een bestand te zetten."
 
 msgid "Minutes"
 msgstr "Minuten"
@@ -2476,28 +2479,28 @@
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
 msgid "I'dle Mak'er"
-msgstr "'k ben d'r eventjes nie"
+msgstr "Inactiviteit"
 
 msgid "Set Account Idle Time"
-msgstr "Afwezigheidstijd instellen"
+msgstr "Inactiviteitsduur instellen"
 
 msgid "_Set"
-msgstr "_Activeren"
+msgstr "_Instellen"
 
 msgid "None of your accounts are idle."
 msgstr "Geen van uw accounts is inactief."
 
 msgid "Unset Account Idle Time"
-msgstr "Afwezigheid uitschakelen"
+msgstr "Inactiviteitsduur uitschakelen"
 
 msgid "_Unset"
 msgstr "_Uitschakelen"
 
 msgid "Set Idle Time for All Accounts"
-msgstr "Inactiviteit instellen voor alle accounts"
+msgstr "Inactiviteitsduur instellen voor alle accounts"
 
 msgid "Unset Idle Time for All Idled Accounts"
-msgstr "Inactiviteit uitzetten voor alle accounts"
+msgstr "Inactiviteitsduur uitzetten voor alle inactieve Accounts"
 
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Stelt u in staat om zelf in te stellen hoe lang u afwezig bent"
@@ -2509,20 +2512,20 @@
 #. *< priority
 #. *< id
 msgid "IPC Test Client"
-msgstr "IPC test client"
+msgstr "IPC test cliënt"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a client."
-msgstr "Test-plug-in IPC-ondersteuning, als een client."
+msgstr "Test plug-in IPC ondersteuning, als een cliënt."
 
 #. *  description
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Test plug-in IPC-ondersteuning, als een client. Deze zoekt de server-plug-in "
+"Test plug-in IPC ondersteuning, als een cliënt. Deze zoekt de server plug-in "
 "en start de geregistreerde opdrachten."
 
 #. *< type
@@ -2538,26 +2541,26 @@
 #. *< version
 #. *  summary
 msgid "Test plugin IPC support, as a server."
-msgstr "Test plug-in IPC-ondersteuning, als een server."
+msgstr "Test plug-in IPC ondersteuning, als een server."
 
 #. *  description
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"Test plug-in PIC-ondersteuning, als een server. Deze registreert de IPC-"
+"Test plug-in PIC ondersteuning, als een server. Deze registreert de IPC "
 "opdrachten."
 
 msgid "Hide Joins/Parts"
-msgstr ""
+msgstr "Verberg Deelnemen/verlaten meldingen"
 
 #. Translators: Followed by an input request a number of people
 msgid "For rooms with more than this many people"
-msgstr ""
+msgstr "Voor kamers met meer dan zoveel mensen"
 
 msgid "If user has not spoken in this many minutes"
-msgstr ""
+msgstr "Als gebruiker niet meer dan zoveel minuten heeft gesproken."
 
 msgid "Apply hiding rules to buddies"
-msgstr ""
+msgstr "Regels voor verbergen toepassen voor vrienden"
 
 #. *< type
 #. *< ui_requirement
@@ -2580,7 +2583,7 @@
 "actively taking part in a conversation."
 msgstr ""
 "Deze plug-in verbergt deelnemen/verlaten meldingen, behalve voor de "
-"gebruikerd die actief deelnemen aan een gesprek."
+"gebruikers die actief deelnemen aan een gesprek."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2590,17 +2593,17 @@
 msgstr "(UTC)"
 
 msgid "User is offline."
-msgstr "Gebruiker is off-line."
+msgstr "Gebruiker is offline."
 
 msgid "Auto-response sent:"
-msgstr "Automatische reactie verstuurd:"
+msgstr "Automatisch antwoord verstuurd:"
 
 #, c-format
 msgid "%s has signed off."
 msgstr "%s heeft zich afgemeld."
 
 msgid "One or more messages may have been undeliverable."
-msgstr "Enkele berichten zijn mogelijk niet aangekomen."
+msgstr "Enkele berichten zijn mogelijk onbestelbaar."
 
 msgid "You were disconnected from the server."
 msgstr "De verbinding met de server is verbroken."
@@ -2609,14 +2612,14 @@
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"U bent op dit moment niet aangemeld. U kunt geen berichten ontvangen totdat "
-"u zich aanmeld."
+"U bent op dit moment niet losgekoppeld. U kunt geen berichten ontvangen "
+"tenzij u aangemeld bent."
 
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Kan bericht niet versturen omdat de maximumlengte is overschreden."
+msgstr "Kan bericht niet versturen omdat de maximum lengte is overschreden."
 
 msgid "Message could not be sent."
-msgstr "Kan bericht niet versturen."
+msgstr "Bericht kon niet verzonden worden."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -2628,7 +2631,7 @@
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "Fire"
-msgstr "Brand"
+msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -2665,7 +2668,7 @@
 msgstr "Instellingen voor algemene logboekweergave"
 
 msgid "Fast size calculations"
-msgstr "Snelle berekening grootte"
+msgstr "Snelle grootteberekening"
 
 msgid "Use name heuristics"
 msgstr "Heuristiek gebruiken voor namen"
@@ -2681,7 +2684,7 @@
 #. *< priority
 #. *< id
 msgid "Log Reader"
-msgstr "Logboekweergave"
+msgstr "Log Lezer"
 
 #  *< name
 #  *< version
@@ -2690,11 +2693,10 @@
 #. *< version
 #. * summary
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Logboeken van andere clients tonen in ons logboek."
+msgstr "Logboeken van andere IM-cliënten tonen in de logviewer."
 
 #  * description
 #. * description
-#, fuzzy
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, aMSN, and Trillian.\n"
@@ -2702,24 +2704,23 @@
 "WARNING: This plugin is still alpha code and may crash frequently.  Use it "
 "at your own risk!"
 msgstr ""
-"Bij het weergeven van logboeken zal deze plug-in ook de logboeken van andere "
-"clients voor berichten tonen. Op dit moment kunnen we dit doen voor Adium, "
-"MSN Messenger en Trillian.\n"
-"\n"
-"WAARSCHUWING: Deze plug-in is testcode en kan (regelmatig) crashen. Op eigen "
-"risico dus!"
+"Bij bekijken van logs zal deze plug-in ook logs van andere IM cliënten "
+"toevoegen. Dit geldt voor Adium, MSN Messenger en Trillian.\n"
+"\n"
+"WAARSCHUWING: Deze plug-in is nog in de alpha testfase en kan regelmatig "
+"crashen. Op eigen risico dus!"
 
 msgid "Mono Plugin Loader"
-msgstr "Mono-plug-in-lader"
+msgstr "Mono plug-in lader"
 
 msgid "Loads .NET plugins with Mono."
-msgstr ".NET-plug-ins laden met Mono."
+msgstr ".NET plug-ins laden met Mono."
 
 msgid "Add new line in IMs"
-msgstr "Voeg een enter toe in berichten"
+msgstr "Voeg een regel toe in IM-berichten"
 
 msgid "Add new line in Chats"
-msgstr "Voeg nieuwe lijn in gesprek toe"
+msgstr "Voeg nieuwe regel in Chats toe"
 
 #. *< magic
 #. *< major version
@@ -2731,46 +2732,48 @@
 #. *< priority
 #. *< id
 msgid "New Line"
-msgstr "Nieuwe lijn"
+msgstr "Nieuwe regel"
 
 #. *< name
 #. *< version
 msgid "Prepends a newline to displayed message."
-msgstr "Maakt een enter aan in weergegeven bericht"
+msgstr "Voegt een nieuwe regel toe aan weergegeven bericht"
 
 #. *< summary
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the username in the conversation window."
 msgstr ""
-"Voegt een enter toe in berichten zodat de rest van het bericht in het "
-"gespreksvenster onder de naam komt te staan."
+"Voegt een nieuwe regel toe aan berichten zodat de rest van het bericht in "
+"het gespreksvenster onder de naam komt te staan."
 
 msgid "Offline Message Emulation"
 msgstr "Offline berichten emulatie"
 
 msgid "Save messages sent to an offline user as pounce."
-msgstr "Berichten aan een offline gebruiker opslaan in alarm"
-
-#, fuzzy
+msgstr "Berichten aan een offline gebruiker opslaan als alarm."
+
 msgid ""
 "The rest of the messages will be saved as pounces. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
-msgstr "De rest van de berichten zal in het alarm worden opgeslagen. Je kan"
+msgstr ""
+"De rest van de berichten zal worden opgeslagen als alarmeringen. U kunt het "
+"alarm bewerken/Verwijderen vanaf het 'Alarmeringen' dialoogvenster."
 
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
-"\"%s\" is nu offline. Wil je de rest van de berichten in een alarm opslaan "
-"en het automatisch versturen wanneer \"%s\" opnieuw inlogt?"
+"\"%s\" is nu offline. Wilt u de rest van de berichten in een alarm opslaan "
+"en het automatisch versturen wanneer \"%s\" zich opnieuw aanmeldt?"
 
 msgid "Offline Message"
-msgstr "Off-line bericht"
+msgstr "Offline bericht"
 
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
-msgstr "Je kan de alarmen bewerken/verwijderen uit het 'Contactalarm'-venster."
+msgstr ""
+"U kunt het alarm bewerken/verwijderen in het 'Alarmeringen' dialoogvenster."
 
 msgid "Yes"
 msgstr "Ja"
@@ -2782,7 +2785,7 @@
 msgstr "Offline berichten in alarm opslaan."
 
 msgid "Do not ask. Always save in pounce."
-msgstr "Vraag niet. Altijd in alarm opslaan."
+msgstr "Niet vragen. Altijd in alarm opslaan."
 
 # wachtwoord invoeren
 msgid "One Time Password"
@@ -2801,7 +2804,7 @@
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "Inschakelen dat wachtwoorden slechts eenmaal gebruikt kunnen worden. "
 
 #. *  description
 msgid ""
@@ -2809,6 +2812,10 @@
 "are only used in a single successful connection.\n"
 "Note: The account password must not be saved for this to work."
 msgstr ""
+"Staat u toe dat per account wachtwoorden niet opgeslagen kunnen worden en "
+"slechts gebruikt kunnen worden in een eenmalig totstandgekomen verbinding.\n"
+"N.B.:Het accountwachtwoord moet niet opgeslagen worden om dit te laten "
+"werken."
 
 #. *< type
 #. *< ui_requirement
@@ -2817,19 +2824,19 @@
 #. *< priority
 #. *< id
 msgid "Perl Plugin Loader"
-msgstr "Perl-plug-in lader"
+msgstr "Perl plug-in lader"
 
 #. *< name
 #. *< version
 #. *< summary
 msgid "Provides support for loading perl plugins."
-msgstr "Geeft de mogelijkheid om perl-plug-ins te laden."
+msgstr "Geeft de mogelijkheid om perl plug-ins te laden."
 
 msgid "Psychic Mode"
-msgstr "Paragnost-stand"
+msgstr "Helderziende modus"
 
 msgid "Psychic mode for incoming conversation"
-msgstr "Paragnost-stand voor inkomend gesprek"
+msgstr "Helderziende modus voor inkomend gesprek"
 
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
@@ -2839,10 +2846,10 @@
 "sturen. Dit werkt met AIM, ICQ, XMPP, Sametime, en Yahoo!"
 
 msgid "You feel a disturbance in the force..."
-msgstr "Je krijgt het gevoel dat iemand contact met je zoekt..."
+msgstr "U krijgt het gevoel dat iemand contact met u zoekt..."
 
 msgid "Only enable for users on the buddy list"
-msgstr "Alleen inschakelen voor gebruikers uit mijn contactenlijst"
+msgstr "Alleen inschakelen voor gebruikers uit mijn Vriendenlijst"
 
 msgid "Disable when away"
 msgstr "Uitschakelen bij afwezigheid"
@@ -2850,9 +2857,8 @@
 msgid "Display notification message in conversations"
 msgstr "Mededelingen in het gesprek weergeven."
 
-#, fuzzy
 msgid "Raise psychic conversations"
-msgstr "In verborgen gesprekken"
+msgstr "Helderziend modus gesprekken op voorgrond"
 
 #. *< type
 #. *< ui_requirement
@@ -2962,13 +2968,13 @@
 msgstr "Melding geven voor"
 
 msgid "Buddy Goes _Away"
-msgstr "Contact _weggaat"
+msgstr "Vriend _Vertrekt"
 
 msgid "Buddy Goes _Idle"
-msgstr "Contact inactief wordt"
+msgstr "Vriend Wordt  _Inactief"
 
 msgid "Buddy _Signs On/Off"
-msgstr "Contact _meldt zich aan/af"
+msgstr "Vriend _Meldt zich aan/af"
 
 #. *< type
 #. *< ui_requirement
@@ -2977,7 +2983,7 @@
 #. *< priority
 #. *< id
 msgid "Buddy State Notification"
-msgstr "Contactstatusmelding"
+msgstr "Vriendenstatusmelding"
 
 #. *< name
 #. *< version
@@ -2987,34 +2993,32 @@
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
 msgstr ""
-"Geeft in een venster weer wanneer de status van een contact verandert naar "
-"of van afwezig."
+"Geeft in een venster weer wanneer de status van een Vriend verandert naar of "
+"van afwezig."
 
 msgid "Tcl Plugin Loader"
-msgstr "Tcl-plug-in lader"
+msgstr "Tcl plug-in lader"
 
 msgid "Provides support for loading Tcl plugins"
-msgstr "Geeft de mogelijkheid om tcl-plug-ins te laden"
+msgstr "Geeft de mogelijkheid om tcl plug-ins te laden"
 
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
-"Niet mogelijk om ActiveTCL installatie te detecteren. Als je wenst gebruik "
-"te maken van TCL-plug-ins, installeer ActiveTCL vanaf http://www.activestate."
+"Niet mogelijk om ActiveTCL installatie te detecteren. Als u wenst gebruik te "
+"maken van TCL plug-ins, installeer ActiveTCL vanaf http://www.activestate."
 "com\n"
 
-#, fuzzy
 msgid ""
 "Unable to find Apple's \"Bonjour for Windows\" toolkit, see http://d.pidgin."
 "im/BonjourWindows for more information."
 msgstr ""
-"De Apple Bonjour For Windows toolkit is niet geconden, bekijk de FAQ op "
-"http://d.pidgin.im/BonjourWindow voor meer informatie."
-
-#, fuzzy
+"Niet in staat  de Apple's \"Bonjour voor Windows\" toolkit te vinden, zie "
+"http://d.pidgin.im/BonjourWindows voor meer informatie."
+
 msgid "Unable to listen for incoming IM connections"
-msgstr "Kan niet luisteren naar binnenkomende gespreksverzoeken\n"
+msgstr "Kan niet luisteren naar binnenkomende IM verbindingen"
 
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
@@ -3048,10 +3052,10 @@
 #. *  summary
 #. *  description
 msgid "Bonjour Protocol Plugin"
-msgstr "Bonjour-protocol plug-in"
+msgstr "Bonjour protocol plug-in"
 
 msgid "Purple Person"
-msgstr "Purple mens"
+msgstr "Purple Persoon"
 
 #. Creating the options for the protocol
 msgid "Local Port"
@@ -3085,32 +3089,32 @@
 msgstr "Kan teken niet ophalen.\n"
 
 msgid "Save Buddylist..."
-msgstr "Contactenlijst opslaan..."
+msgstr "Vriendenlijst opslaan..."
 
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "Uw lijst is leeg, niets weggeschreven naar het bestand."
+msgstr "Uw vriendenlijst is leeg, niets weggeschreven naar het bestand."
 
 msgid "Buddylist saved successfully!"
-msgstr "Contactenlijst opgeslagen."
+msgstr "Vriendenlijst succesvol opgeslagen!"
 
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
-msgstr "Kan contactenlijst niet beschrijven van %s naar %s"
+msgstr "Kan Vriendenlijst niet schrijven van %s naar %s"
 
 msgid "Couldn't load buddylist"
-msgstr "kan contactenlijst niet laden"
+msgstr "Kan Vriendenlijst niet laden"
 
 msgid "Load Buddylist..."
-msgstr "Contactenlijst laden..."
+msgstr "Vriendenlijst laden..."
 
 msgid "Buddylist loaded successfully!"
-msgstr "Contactenlijst geladen."
+msgstr "Vriendenlijst geladen."
 
 msgid "Save buddylist..."
-msgstr "Contactenlijst opslaan..."
+msgstr "Vriendenlijst opslaan..."
 
 msgid "Load buddylist from file..."
-msgstr "Contactenlijst laden uit bestand..."
+msgstr "Vriendenlijst laden uit bestand..."
 
 msgid "You must fill in all registration fields"
 msgstr "Alle registratievelden moeten ingevuld worden"
@@ -3120,10 +3124,10 @@
 
 msgid "Unable to register new account.  An unknown error occurred."
 msgstr ""
-"Kan geen nieuw account registreren. Er is eenonbekende fout opgetreden."
+"Kan geen nieuw account registreren. Er is een onbekende fout opgetreden."
 
 msgid "New Gadu-Gadu Account Registered"
-msgstr "Nieuw Gadu-Gadu account geregistreerd"
+msgstr "Nieuw Gadu-Gadu Account Geregistreerd"
 
 msgid "Registration completed successfully!"
 msgstr "Registratie voltooid."
@@ -3141,7 +3145,7 @@
 msgstr "Captcha"
 
 msgid "Register New Gadu-Gadu Account"
-msgstr "Nieuw Gadu-gadu-account registreren"
+msgstr "Nieuw Gadu-Gadu Account Registreren"
 
 msgid "Please, fill in the following fields"
 msgstr "Vul de volgende velden in"
@@ -3170,7 +3174,7 @@
 msgstr "Alleen online"
 
 msgid "Find buddies"
-msgstr "Contacten zoeken"
+msgstr "Vrienden zoeken"
 
 msgid "Please, enter your search criteria below"
 msgstr "Geef hieronder uw zoekcriteria"
@@ -3179,13 +3183,13 @@
 msgstr "Vul de velden in."
 
 msgid "Your current password is different from the one that you specified."
-msgstr "Je  huidige wachtwoord wijkt af van het door u gegeven wachtwoord."
+msgstr "Uw  huidige wachtwoord wijkt af van het door u gegeven wachtwoord."
 
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Kan wachtwoord niet wijzigen. Er is een fout opgetreden.\n"
 
 msgid "Change password for the Gadu-Gadu account"
-msgstr "Wachtwoord wijzigen voor het gadu-gadu-account"
+msgstr "Wachtwoord wijzigen voor het gadu-gadu account"
 
 msgid "Password was changed successfully!"
 msgstr "Wachtwoord gewijzigd."
@@ -3203,17 +3207,17 @@
 msgstr "Huidige teken"
 
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Geef je huidige wachtwoord en nieuwe wachtwoord voor UIN: "
+msgstr "Geef uw huidige wachtwoord en nieuwe wachtwoord voor UIN: "
 
 msgid "Change Gadu-Gadu Password"
-msgstr "Gadu-gadu-wachtwoord wijzigen"
+msgstr "Gadu-gadu wachtwoord wijzigen"
 
 #, c-format
 msgid "Select a chat for buddy: %s"
-msgstr "Kies een chatgesprek voor het contact: %s"
+msgstr "Kies een chat voor vriend: %s"
 
 msgid "Add to chat..."
-msgstr "Toevoegen aan chatgesprek..."
+msgstr "Toevoegen aan chat..."
 
 #. 0
 #. Global
@@ -3222,7 +3226,7 @@
 
 #. 2
 msgid "Chatty"
-msgstr "Chatgraag"
+msgstr "Babbelziek"
 
 #. 3
 msgid "Do Not Disturb"
@@ -3252,13 +3256,13 @@
 msgstr "kan zoekresultaten niet weergeven."
 
 msgid "Gadu-Gadu Public Directory"
-msgstr "Gadu-Gadu-adresboek"
+msgstr "Gadu-Gadu Publiek Adresboek"
 
 msgid "Search results"
 msgstr "Zoekresultaten"
 
 msgid "No matching users found"
-msgstr "Niet overeenkomende gebruikers gevonden"
+msgstr "Geen overeenkomende gebruikers gevonden"
 
 msgid "There are no users matching your search criteria."
 msgstr "Er zijn geen overeenkomende gebruikers voor uw zoekcriteria"
@@ -3267,16 +3271,16 @@
 msgstr "Kan niet lezen van socket"
 
 msgid "Buddy list downloaded"
-msgstr "Contactenlijst gedownload"
+msgstr "Vriendenlijst gedownload"
 
 msgid "Your buddy list was downloaded from the server."
-msgstr "Uw contactenlijst is gedownload van de server."
+msgstr "Uw vriendenlijst is gedownload van de server."
 
 msgid "Buddy list uploaded"
-msgstr "Contactenlijst verzonden"
+msgstr "Vriendenlijst verzonden"
 
 msgid "Your buddy list was stored on the server."
-msgstr "Uw contactenlijst is opgeslagen op de server."
+msgstr "Uw vriendenlijst is opgeslagen op de server."
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
@@ -3288,14 +3292,14 @@
 msgstr "Verbinding mislukt"
 
 msgid "Add to chat"
-msgstr "Toevoegen aan chatgesprek"
+msgstr "Toevoegen aan chat"
 
 msgid "Chat _name:"
-msgstr "_Naam chatgesprek:"
-
-#, fuzzy, c-format
+msgstr "_Naam chat:"
+
+#, c-format
 msgid "Unable to resolve hostname '%s': %s"
-msgstr "Kan geen verbinding maken met de computer."
+msgstr "Kan computernaam '%s': %s  niet ontbinden"
 
 #. 1. connect to server
 #. connect to the server
@@ -3312,22 +3316,22 @@
 msgstr "Niet verbonden met de server"
 
 msgid "Find buddies..."
-msgstr "Contacten zoeken..."
+msgstr "Vrienden zoeken..."
 
 msgid "Change password..."
 msgstr "Wachtwoord wijzigen..."
 
 msgid "Upload buddylist to Server"
-msgstr "Contactenlijst opslaan op de server"
+msgstr "Vriendenlijst opslaan op de server"
 
 msgid "Download buddylist from Server"
-msgstr "Contactenlijst van server downloaden"
+msgstr "Vriendenlijst van server downloaden"
 
 msgid "Delete buddylist from Server"
-msgstr "Contactenlijst verwijderen van server"
+msgstr "Vriendenlijst verwijderen van server"
 
 msgid "Save buddylist to file..."
-msgstr "Contactenlijst opslaan in bestand..."
+msgstr "Vriendenlijst opslaan in bestand..."
 
 #. magic
 #. major_version
@@ -3341,15 +3345,15 @@
 #. name
 #. version
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu-protocol-plug-in"
+msgstr "Gadu-Gadu Protocol plug-in"
 
 #  summary
 #. summary
 msgid "Polish popular IM"
-msgstr "Populaire Poolse client voor berichten"
+msgstr "Populaire Poolse IM-cliënt"
 
 msgid "Gadu-Gadu User"
-msgstr "Gadu-gadu-gebruiker"
+msgstr "Gadu-gadu Gebruiker"
 
 msgid "GG server"
 msgstr "GG-server"
@@ -3404,9 +3408,8 @@
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#, fuzzy
 msgid "IRC nick and server may not contain whitespace"
-msgstr "IRC-bijnamen mogen geen spaties bevatten"
+msgstr "IRC nick en servernaam mogen geen spaties bevatten"
 
 msgid "SSL support unavailable"
 msgstr "SSL niet beschikbaar"
@@ -3415,13 +3418,13 @@
 msgstr "Kan geen verbinding maken"
 
 #. this is a regular connect, error out
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect: %s"
 msgstr "Kan geen verbinding maken met %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Server closed the connection"
-msgstr "Server heeft de verbinding verbroken."
+msgstr "Server heeft de verbinding verbroken"
 
 msgid "Users"
 msgstr "Gebruikers"
@@ -3484,14 +3487,14 @@
 
 #, c-format
 msgid "You are banned from %s."
-msgstr "Je bent uit %s verbannen."
+msgstr "U bent uit %s verbannen."
 
 msgid "Banned"
 msgstr "Verbannen"
 
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "Kan %s niet verbannen. De lijst is vol"
+msgstr "Kan %s niet verbannen. De banlijst is vol"
 
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
@@ -3500,7 +3503,7 @@
 msgstr " <i>(geïdentificeerd)</i>"
 
 msgid "Nick"
-msgstr "Bijnaam"
+msgstr "Nick"
 
 msgid "Currently on"
 msgstr "Nu aanwezig"
@@ -3560,7 +3563,7 @@
 msgstr "Gebruiker is niet aangemeld"
 
 msgid "No such nick or channel"
-msgstr "Bijnaam/ruimte bestaat niet"
+msgstr "Nick/Kanaal bestaat niet"
 
 msgid "Could not send"
 msgstr "Kan niet verzenden"
@@ -3574,7 +3577,7 @@
 
 #, c-format
 msgid "You have been kicked by %s: (%s)"
-msgstr "Je bent weggeschopt door %s: (%s)"
+msgstr "U bent weggeschopt door %s: (%s)"
 
 #. Remove user from channel
 #, c-format
@@ -3613,14 +3616,14 @@
 msgstr "Bijnaam in gebruik"
 
 msgid "Cannot change nick"
-msgstr "Kan bijnaam niet veranderen"
+msgstr "Kan nick niet veranderen"
 
 msgid "Could not change nick"
-msgstr "Kan bijnaam niet veranderen"
+msgstr "Kan nick niet veranderen"
 
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "Je hebt het kanaal%s%s verlaten"
+msgstr "U heeft het kanaal%s%s verlaten"
 
 msgid "Error: invalid PONG from server"
 msgstr "Fout: ongeldige PONG van server"
@@ -3634,27 +3637,27 @@
 msgstr "Kan niet deelnemen aan %s: Registratie vereist."
 
 msgid "Cannot join channel"
-msgstr "Kan niet deelnemen aan ruimte"
+msgstr "Kan niet deelnemen aan kanaal"
 
 msgid "Nick or channel is temporarily unavailable."
-msgstr "Bijnaam of chatgesprek is momenteel niet bereikbaar."
+msgstr "Nick of Kanaal is tijdelijk niet bereikbaar."
 
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops van %s"
 
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
+msgstr "actie &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
 
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [bericht]:  Een afwezigheidsbericht instellen, of afwezigheid "
+"afwezig [bericht]:  Een afwezigheidbericht instellen, of afwezigheid "
 "uitschakelen door geen bericht te gebruiken."
 
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr "ctcp <nick> <msg>: verzend ctcp msg aan contact."
+msgstr "ctcp <nick> <msg>: verzend ctcp msg aan nick."
 
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Een opdracht naar chanserv sturen"
@@ -3663,24 +3666,24 @@
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
-"deop &lt;bijnaam1&gt; [bijnaam2] ...:  Operator-status uitschakelen van "
-"iemand. U moet wel zelf operator zijn hiervoor."
+"deop &lt;nick&gt; [bijnaam2] ...:  Operator-status uitschakelen van iemand. "
+"U moet wel zelf operator zijn hiervoor."
 
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
-"devoice &lt;bijnaam1&gt; [bijnaam2] ...:  Spreekstatus van iemand "
-"verwijderen, zodat deze niet meer kan praten in een gemodereerd kanaal (+m). "
-"U moet wel zelf operator zijn hiervoor."
+"devoice &lt;nick1&gt; [nick2] ...:  Spreekstatus van iemand verwijderen, "
+"zodat deze niet meer kan praten in een gemodereerd kanaal (+m). U moet wel "
+"zelf operator zijn hiervoor."
 
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;bijnaam&gt; [ruimte]:  Iemand uitnodigen in een bepaalde kanaal, "
-"of het huidige kanaal."
+"invite &lt;nick&gt; [room]:  Iemand uitnodigen in een bepaalde kanaal, of "
+"het huidige kanaal."
 
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
@@ -3693,14 +3696,14 @@
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
-"j &lt;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere "
+"join &lt;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere "
 "ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
 
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;bijnaam&gt; [bericht]:  Iemand uit een ruimte schoppen. U moet wel "
+"kick &lt;nick&gt; [bericht]:  Iemand uit een ruimte schoppen. U moet wel "
 "zelf operator zijn hiervoor."
 
 msgid ""
@@ -3708,7 +3711,7 @@
 "may disconnect you upon doing this.</i>"
 msgstr ""
 "list:  Een lijst van alle beschikbare ruimtes weergeven. <i>Waarschuwing: "
-"sommige servers verbreken de verbinding als je dit doet.</i>"
+"sommige servers verbreken de verbinding als u dit doet.</i>"
 
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
@@ -3720,18 +3723,18 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
-"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;bijnaam|kanaal&gt;:  Kanaal- / "
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Kanaal- / "
 "gebruikersmodus aan of uitschakelen."
 
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
-"gebruiker (in plaats van naar een ruimte)."
+"msg &lt;nick&gt; &lt;message&gt;:  Een privébericht sturen aan een gebruiker "
+"(in plaats van naar een ruimte)."
 
 msgid "names [channel]:  List the users currently in a channel."
-msgstr "names [ruimte]:  De gebruikers in het kanaal opsommen."
+msgstr "names [channel]:  De gebruikers in het kanaal opsommen."
 
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nieuwe bijnaam&gt;:  Uw eigen bijnaam veranderen."
@@ -3747,14 +3750,14 @@
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;bijnaam1&gt; [bijnaam2] ...:  Iemand benoemen tot operator voor het "
-"huidige kanaal. U moet wel zelf operator zijn hiervoor."
+"op &lt;nick1&gt; [nick2] ...:  Iemand benoemen tot kanaaloperator. U moet "
+"wel zelf kanaaloperator zijn hiervoor."
 
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &lt;bericht&gt;:  Als je niet weet wat dit is, kun je het "
+"operwall &lt;message&gt;:  Als u niet weet wat dit is, kun u het "
 "waarschijnlijk niet gebruiken."
 
 msgid "operserv: Send a command to operserv"
@@ -3764,22 +3767,21 @@
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
-"part [ruimte] [bericht]:  Huidige (of gegeven) kanaal verlaten met een "
+"part [ruimte] [message]:  Huidige (of gegeven) kanaal verlaten met een "
 "optioneel afscheidsbericht."
 
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
-"ping [bijnaam]:  Vraagt de vertragingstijd op van een gebruiker (of de "
-"server als geen naam wordt gegeven)."
+"ping [nick]:  Vraagt de vertragingstijd op van een gebruiker (of de server "
+"als geen naam wordt gegeven)."
 
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
-"query &lt;bijnaam&gt; &lt;bericht&gt;:  Informatie opvragen van een "
-"gebruiker."
+"query &lt;nick&gt; &lt;message&gt;:  Informatie opvragen van een gebruiker."
 
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
@@ -3793,7 +3795,7 @@
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
-"remove &lt;bijnaam&gt; [bericht]:  Iemand uit een ruimte verwijderen. U moet "
+"remove &lt;nick&gt; [bericht]:  Iemand uit een ruimte verwijderen. U moet "
 "wel zelf operator zijn hiervoor."
 
 msgid "time: Displays the current local time at the IRC server."
@@ -3808,28 +3810,27 @@
 "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Een gebruikersmodus aan- of uitzetten."
 
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [bijnaam]: CTCP VERSION sturen aan een gebruiker"
+msgstr "version [nick]: CTCP VERSION sturen aan een gebruiker"
 
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;bijnaam1&gt; [bijnaam2] ...:  Iemand spreekstatus geven. U moet "
-"wel zelf operator zijn hiervoor."
+"voice &lt;nick1&gt; [nick2] ...:  Iemand spreekstatus geven. U moet wel zelf "
+"operator zijn hiervoor."
 
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
-"wallops &lt;bericht&gt;:  Als u niet weet wat dit is, kunt u het "
+"wallops &lt;message&gt;:  Als u niet weet wat dit is, kunt u het "
 "waarschijnlijk niet gebruiken."
 
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr ""
-"whois [server] &lt;bijnaam&gt;:  Informatie over een gebruiker opvragen."
+msgstr "whois [server] &lt;nick&gt;:  Informatie over een gebruiker."
 
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whowas &lt;nick&gt;:  Informatie over een gebruiker opvragen."
+msgstr "whowas &lt;nick&gt;:  Informatie over een afgemelde gebruiker."
 
 #, c-format
 msgid "Reply time from %s: %lu seconds"
@@ -3855,7 +3856,7 @@
 
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"Server vereist een identificatie via tekstaanmelding via een ongecodeerde "
+"Server vereist een waarmerking via tekstaanmelding via een ongecodeerde "
 "datastroom"
 
 #. This should never happen!
@@ -3863,90 +3864,98 @@
 msgstr "Ongeldig antwoord van server"
 
 msgid "Server does not use any supported authentication method"
-msgstr "Server gebruikt geen van de ondersteunde identificatiemethoden"
+msgstr "Server gebruikt geen van de ondersteunde waarmerkingmethoden"
 
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s vereist een identificatie via tekstaanmelding via een ongecodeerde "
+"%s vereist een waarmerking via tekstaanmelding via een ongecodeerde "
 "datastroom. Wilt u hiermee doorgaan?"
 
 msgid "Plaintext Authentication"
-msgstr "Tekstaanmelding"
+msgstr "Platte tekst waarmerking"
 
 msgid "You require encryption, but it is not available on this server."
-msgstr "Je hebt encryptie nodig, maar het is niet mogelijk op deze server."
+msgstr "U heeft encryptie nodig, maar het is niet mogelijk op deze server."
 
 msgid "Invalid challenge from server"
 msgstr "Ongeldige vraag van server"
 
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
-
-#, fuzzy
+"De server denkt dat de waarmerking compleet is, maar de cliënt denkt van niet"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Server kan een platte tekst waarmerking via een ongecodeerde datastroom "
+"verlangen"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s kan een platte tekst waarmerking via een ongecodeerde verbinding "
+"verlangen. Staat u dit toe en gaat u door met waarmerken?"
+
 msgid "SASL authentication failed"
-msgstr "Identificatie mislukt"
+msgstr "SASL waarmerking mislukt"
 
 #, c-format
 msgid "SASL error: %s"
 msgstr "SASL-fout: %s"
 
-#, fuzzy
 msgid "Invalid Encoding"
-msgstr "Ongeldige invoer voorwaarde"
-
-#, fuzzy
+msgstr "Ongeldige versleuteling"
+
 msgid "Unsupported Extension"
-msgstr "Versie niet ondersteund"
+msgstr "Extensie niet ondersteund"
 
 msgid ""
 "Unexpected response from the server.  This may indicate a possible MITM "
 "attack"
 msgstr ""
+"Een onverwacht antwoord van de server.  Dit kan op een mogelijk MITM aanval "
+"duiden"
 
 msgid ""
 "The server does support channel binding, but did not appear to advertise "
 "it.  This indicates a likely MITM attack"
 msgstr ""
-
-#, fuzzy
+"De server ondersteunt geen kanaalbinding, maar waarschuwt daar kennelijk "
+"niet voor. Dit duidt op een mogelijke MITM aanval"
+
 msgid "Server does not support channel binding"
-msgstr "Server ondersteunt blokkeren niet"
-
-#, fuzzy
+msgstr "Server ondersteunt geen channel binding"
+
 msgid "Unsupported channel binding method"
-msgstr "Codering niet ondersteund"
+msgstr "Niet ondersteunde kanaalbinding methode"
 
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
-#, fuzzy
 msgid "Invalid Username Encoding"
-msgstr "Ongeldige gebruikersnaam."
+msgstr "Ongeldige gebruikersnaam versleuteling"
 
 msgid "Resource Constraint"
 msgstr "Beperkte bronnen beschikbaar"
 
-#, fuzzy
 msgid "Unable to canonicalize username"
-msgstr "Kan niet configureren"
-
-#, fuzzy
+msgstr "Kan gebruikersnaam niet canonicaliseren"
+
 msgid "Unable to canonicalize password"
-msgstr "Kon geen poort openen om te luisteren."
-
-#, fuzzy
+msgstr "Kan wachtwoord niet canonicaliseren"
+
 msgid "Malicious challenge from server"
-msgstr "Ongeldige vraag van server"
-
-#, fuzzy
+msgstr "Kwaardaardige Challenge van server"
+
 msgid "Unexpected response from server"
-msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
+msgstr "Onverwacht antwoord van server"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
+msgstr "De BOSH connectie manager heeft uw sessie afgebroken."
 
 msgid "No session ID given"
 msgstr "Geen sessie-ID gegeven"
@@ -3954,21 +3963,15 @@
 msgid "Unsupported version of BOSH protocol"
 msgstr "Versie van BOSH niet ondersteund"
 
-#, fuzzy
 msgid "Unable to establish a connection with the server"
-msgstr ""
-"Kan geen verbinding maken met de server:\n"
-"%s"
-
-#, fuzzy, c-format
+msgstr "Kan geen verbinding maken met de server"
+
+#, c-format
 msgid "Unable to establish a connection with the server: %s"
-msgstr ""
-"Kan geen verbinding maken met de server:\n"
-"%s"
-
-#, fuzzy
+msgstr "Kan geen verbinding maken met de server: %s"
+
 msgid "Unable to establish SSL connection"
-msgstr "Kan verbinding niet initialiseren"
+msgstr "Kan geen SSL verbinding maken"
 
 msgid "Full Name"
 msgstr "Volledige naam"
@@ -3977,13 +3980,13 @@
 msgstr "Achternaam"
 
 msgid "Given Name"
-msgstr "Gegeven naam"
+msgstr "Voornaam"
 
 msgid "URL"
 msgstr "URL"
 
 msgid "Street Address"
-msgstr "Adres"
+msgstr "Straatadres"
 
 #.
 #. * EXTADD is correct, EXTADR is generated by other
@@ -3991,13 +3994,13 @@
 #. * EXTADR.
 #.
 msgid "Extended Address"
-msgstr "Adresbijvoeging"
+msgstr "Adrestoevoeging"
 
 msgid "Locality"
-msgstr "Localiteit"
+msgstr "Woonplaats"
 
 msgid "Region"
-msgstr "Regio"
+msgstr "Streek/Provincie"
 
 msgid "Postal Code"
 msgstr "Postcode"
@@ -4042,7 +4045,7 @@
 "openbaar wilt maken."
 
 msgid "Client"
-msgstr "Client"
+msgstr "Cliënt"
 
 msgid "Operating System"
 msgstr "Besturingssysteem"
@@ -4054,14 +4057,13 @@
 msgstr "Prioriteit"
 
 msgid "Resource"
-msgstr "Hulpmiddel"
-
-#, fuzzy
+msgstr "Hulpbron"
+
 msgid "Uptime"
-msgstr "Bijwerken"
+msgstr "Tijd in de lucht"
 
 msgid "Logged Off"
-msgstr "UItgelogd"
+msgstr "Afgemeld"
 
 #, c-format
 msgid "%s ago"
@@ -4082,13 +4084,12 @@
 msgid "Logo"
 msgstr "Logo"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s will no longer be able to see your status updates.  Do you want to "
 "continue?"
 msgstr ""
-"U staat op het punt om %s van uw contactenlijst te verwijderen. Wilt u "
-"doorgaan?"
+"%s zal niet langer in staat zijn uw status updates te zien.  Wilt u doorgaan?"
 
 msgid "Cancel Presence Notification"
 msgstr "Aanwezigheidsmelding annuleren"
@@ -4111,7 +4112,7 @@
 msgstr "_Chat starten"
 
 msgid "Log In"
-msgstr "Inloggen"
+msgstr "Aanmelden"
 
 msgid "Log Out"
 msgstr "Afmelden"
@@ -4131,23 +4132,23 @@
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"Zoek een persoon door de zoekcriteria in de gegeven velden in te vullen. "
-"Opmerking: Ieder veld heeft ondersteuning voor zgn. jokertekens (%)."
+"Vind een contactpersoon door de zoekcriteria in de gegeven velden in te "
+"vullen. NB: Ieder veld ondersteunt zoeken met jokertekens (%)"
 
 msgid "Directory Query Failed"
-msgstr "Aanvraag mislukt"
+msgstr "Doorzoeken adressenlijst mislukt"
 
 msgid "Could not query the directory server."
-msgstr "Kan de adressenserver niet benaderen."
+msgstr "Kan de adressenserver niet doorzoeken."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
 #, c-format
 msgid "Server Instructions: %s"
-msgstr "Server-instructies: %s"
+msgstr "Server instructies: %s"
 
 msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "Vul een of meer velden in om te zoeken naar XMMP-gebruikers"
+msgstr "Vul één of meer velden in om te zoeken naar XMMP-gebruikers"
 
 msgid "Email Address"
 msgstr "E-mailadres"
@@ -4163,13 +4164,13 @@
 msgstr "Ongeldig adresboek"
 
 msgid "Enter a User Directory"
-msgstr "Geef een adressenserver"
+msgstr "Geef een Gebuikersadresboek"
 
 msgid "Select a user directory to search"
-msgstr "Kies een te raadplegen adressenserver"
+msgstr "Kies een te raadplegen gebruikersadresboek"
 
 msgid "Search Directory"
-msgstr "Adressenserver doorzoeken"
+msgstr "Adresboek doorzoeken"
 
 msgid "_Room:"
 msgstr "_Ruimte:"
@@ -4178,7 +4179,7 @@
 msgstr "_Server:"
 
 msgid "_Handle:"
-msgstr "Bij_naam:"
+msgstr "_Handle:"
 
 #, c-format
 msgid "%s is not a valid room name"
@@ -4217,7 +4218,7 @@
 msgstr "Registratiefout"
 
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "Verandering van bijnaam niet toegestaan in non-chatruimte"
+msgstr "Verandering van nick niet toegestaan in non-MUC chatruimtes"
 
 msgid "Error retrieving room list"
 msgstr "Fout bij het inlezen van de lijst van ruimtes"
@@ -4243,17 +4244,13 @@
 msgid "Roles:"
 msgstr "Rollen:"
 
-#, fuzzy
 msgid "Server requires TLS/SSL, but no TLS/SSL support was found."
 msgstr ""
-"Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL "
-"gevonden."
-
-#, fuzzy
+"Server vereist TLS/SSL, maar geen ondersteuning voor TLS/SSL werd gevonden."
+
 msgid "You require encryption, but no TLS/SSL support was found."
 msgstr ""
-"Server vereist versleuteling, maar er is geen ondersteuning voor TLS/SSL "
-"gevonden."
+"Versleuteling vereist, maar er is geen ondersteuning voor TLS/SSL gevonden."
 
 msgid "Ping timed out"
 msgstr "Ping verlopen"
@@ -4261,27 +4258,25 @@
 msgid "Invalid XMPP ID"
 msgstr "Ongeldig XMPP-ID"
 
-#, fuzzy
 msgid "Invalid XMPP ID. Username portion must be set."
-msgstr "Ongeldige XMPP ID. Domein moet ingesteld worden"
+msgstr "Ongeldige XMPP ID. Gebruikersnaam deel moet ingesteld worden."
 
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ongeldige XMPP ID. Domein moet ingesteld worden"
 
-#, fuzzy
 msgid "Malformed BOSH URL"
-msgstr "Kan geen verbinding maken met de server."
+msgstr "Misvormde BOSH URL"
 
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "Registratie van %s@%s voltooid"
+msgstr "Registratie van %s@%s succesvol"
 
 #, c-format
 msgid "Registration to %s successful"
-msgstr "Registratie van %s voltooid"
+msgstr "Registratie van %s succesvol"
 
 msgid "Registration Successful"
-msgstr "Registratie voltooid"
+msgstr "Registratie succesvol"
 
 msgid "Registration Failed"
 msgstr "Registratie mislukt"
@@ -4291,7 +4286,7 @@
 msgstr "Registratie van %s succesvol verwijderd"
 
 msgid "Unregistration Successful"
-msgstr "Registratie Ongedaan Maken Voltooid"
+msgstr "Registratie Ongedaan Maken Succesvol"
 
 msgid "Unregistration Failed"
 msgstr "Registratie Ongedaan Maken Mislukt"
@@ -4309,14 +4304,14 @@
 msgstr "Datum"
 
 msgid "Already Registered"
-msgstr "Al geregistreerd"
+msgstr "Al Geregistreerd"
 
 msgid "Unregister"
-msgstr "Registratie ongedaan maken"
+msgstr "Uitschrijven"
 
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Vul onderstaand formulier in om je account te veranderen."
+msgstr "Vul onderstaand formulier in om uw account te veranderen."
 
 msgid "Please fill out the information below to register your new account."
 msgstr "Vul onderstaand formulier in om uw nieuwe account te registreren."
@@ -4336,25 +4331,25 @@
 msgstr "Nieuw Account op %s registreren"
 
 msgid "Change Registration"
-msgstr "Verander Registratie: "
+msgstr "Verander Registratie"
 
 msgid "Error unregistering account"
-msgstr "Fout bij het ongedaan maken van de registratie"
+msgstr "Fout bij account uitschrijven"
 
 msgid "Account successfully unregistered"
-msgstr "Het registreren van het account is succesvol ongedaan gemaakt"
+msgstr "Account uitschrijven succesvol"
 
 msgid "Initializing Stream"
-msgstr "Starten van datastroom"
+msgstr "Starten datastroom"
 
 msgid "Initializing SSL/TLS"
 msgstr "SSL/TLS Initialiseren"
 
 msgid "Authenticating"
-msgstr "Naam en wachtwoord worden gecontroleerd"
+msgstr "Waarmerking"
 
 msgid "Re-initializing Stream"
-msgstr "Herstarten van datastroom"
+msgstr "Herstarten Datastroom"
 
 msgid "Server doesn't support blocking"
 msgstr "Server ondersteunt blokkeren niet"
@@ -4372,7 +4367,7 @@
 msgstr "Beide"
 
 msgid "From (To pending)"
-msgstr "Van"
+msgstr "Van (Aan wachtrij)"
 
 msgid "From"
 msgstr "Van"
@@ -4381,28 +4376,26 @@
 msgstr "Aan"
 
 msgid "None (To pending)"
-msgstr "Geen"
+msgstr "Geen (aan wachtrij)"
 
 msgid "None"
-msgstr "Niet"
+msgstr "Geen"
 
 #. subscription type
 msgid "Subscription"
 msgstr "Abonnement"
 
 msgid "Mood Text"
-msgstr "Humeur-tekst"
+msgstr "Stemmingstekst"
 
 msgid "Allow Buzz"
 msgstr "Trillen Toestaan"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Tweede naam"
-
-#, fuzzy
+msgstr "Stemmingsnaam"
+
 msgid "Mood Comment"
-msgstr "Contactopmerking"
+msgstr "Stemmingsreactie"
 
 #. primitive
 #. ID
@@ -4411,31 +4404,31 @@
 #. should be user_settable some day
 #. independent
 msgid "Tune Artist"
-msgstr "Artiest"
+msgstr "Tune Artiest"
 
 msgid "Tune Title"
-msgstr "Titel"
+msgstr "Tune Titel"
 
 msgid "Tune Album"
-msgstr "Album"
+msgstr "Tune Album"
 
 msgid "Tune Genre"
-msgstr "Genre"
+msgstr "Tune Genre"
 
 msgid "Tune Comment"
-msgstr "Opmerking"
+msgstr "Tune Opmerking"
 
 msgid "Tune Track"
-msgstr "Track"
+msgstr "Tune Track"
 
 msgid "Tune Time"
-msgstr "Tijd"
+msgstr "Tune Tijd"
 
 msgid "Tune Year"
-msgstr "Jaar"
+msgstr "Tune Jaar"
 
 msgid "Tune URL"
-msgstr "URL"
+msgstr "Tune URL"
 
 msgid "Password Changed"
 msgstr "Wachtwoord veranderd"
@@ -4470,7 +4463,7 @@
 msgstr "Conflict"
 
 msgid "Feature Not Implemented"
-msgstr "Feature niet geïmplementeerd"
+msgstr "Functie niet geïmplementeerd"
 
 msgid "Forbidden"
 msgstr "Verboden"
@@ -4521,25 +4514,25 @@
 msgstr "Onverwachte aanvraag"
 
 msgid "Authorization Aborted"
-msgstr "Aanmelding afgebroken"
+msgstr "Autorisatie Afgebroken"
 
 msgid "Incorrect encoding in authorization"
-msgstr "Onjuiste codering bij aanmelding"
+msgstr "Onjuiste codering bij Autorisatie"
 
 msgid "Invalid authzid"
 msgstr "Ongeldige authzid"
 
 msgid "Invalid Authorization Mechanism"
-msgstr "Ongeldig mechanisme"
+msgstr "Ongeldig Autorisatiemechanisme"
 
 msgid "Authorization mechanism too weak"
-msgstr "Mechanisme te onveilig"
+msgstr "Autorisatiemechanisme te onveilig"
 
 msgid "Temporary Authentication Failure"
-msgstr "Tijdelijk identificatieprobleem"
+msgstr "Tijdelijk Waarmerkingprobleem"
 
 msgid "Authentication Failure"
-msgstr "Identificatie mislukt"
+msgstr "Waarmerking mislukt"
 
 msgid "Bad Format"
 msgstr "Slecht formaat"
@@ -4575,7 +4568,7 @@
 msgstr "Niet overeenkomende computers"
 
 msgid "Policy Violation"
-msgstr "Schending van beleid"
+msgstr "Schending van Beleid"
 
 msgid "Remote Connection Failed"
 msgstr "Verbinding mislukt"
@@ -4590,7 +4583,7 @@
 msgstr "Systeem wordt uitgeschakeld"
 
 msgid "Undefined Condition"
-msgstr "Ongedefnieerde voorwaarde"
+msgstr "Ongedefinieerde voorwaarde"
 
 msgid "Unsupported Encoding"
 msgstr "Codering niet ondersteund"
@@ -4605,7 +4598,7 @@
 msgstr "XML niet goed van structuur"
 
 msgid "Stream Error"
-msgstr "Stream-fout"
+msgstr "Datastroomfout"
 
 #, c-format
 msgid "Unable to ban user %s"
@@ -4629,61 +4622,62 @@
 
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "Kan gebruiker %s niet schoppen"
+msgstr "Kan gebruiker %s niet eruit schoppen"
 
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Kan gebruiker %s niet pingen"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
 msgstr "Trillen niet mogelijk, omdat er niets bekend is over gebruiker %s."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
 msgstr "Trillen niet mogelijk, omdar gebruiker %s offline zou kunnen zijn."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
-msgstr "Trillen niet mogelijk, omdat de gebruiker %s het niet ondersteund."
+msgstr ""
+"Trillen niet mogelijk, omdat de gebruiker %s het niet ondersteund of geen "
+"tril wil ontvangen."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr "Trill"
+msgstr "Trillen"
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr "%s heeft je laten trillen!"
+msgstr "%s heeft u laten trillen!"
 
 #, c-format
 msgid "Buzzing %s..."
 msgstr "%s trillen..."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to initiate media with %s: invalid JID"
-msgstr "Kan bestand niet verzenden naar %s, ongeldige JID"
-
-#, fuzzy, c-format
+msgstr "Kan media niet opstarten met %s, ongeldige JID"
+
+#, c-format
 msgid "Unable to initiate media with %s: user is not online"
-msgstr "Kan bestand niet verzenden naar %s, gebruiker is niet online"
-
-#, fuzzy, c-format
+msgstr "Kan media niet opstarten met %s, gebruiker is niet online"
+
+#, c-format
 msgid "Unable to initiate media with %s: not subscribed to user presence"
 msgstr ""
-"Kan bestand niet verzenden naar %s, niet aangemeld bij gebruikers-"
-"aanwezigheid."
+"Kan media niet opstarten met %s, niet geabonneerd op gebruikersaanwezigheid."
 
 msgid "Media Initiation Failed"
 msgstr "Opstarten media mislukt"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr "Geef de bron van %s naar degene wie je een bestand wil sturen"
+msgstr "Geef svp de bron van %s met wie u een media sessie wilt starten."
 
 msgid "Select a Resource"
 msgstr "Kies een bron"
@@ -4691,9 +4685,8 @@
 msgid "Initiate Media"
 msgstr "Media opstarten"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Dit protocol heeft geen ondersteuning voor chatruimtes."
+msgstr "Account ondersteunt geen PEP, kan stemming niet instellen"
 
 msgid "config:  Configure a chat room."
 msgstr "config:  Chatruimte instellen"
@@ -4701,9 +4694,8 @@
 msgid "configure:  Configure a chat room."
 msgstr "configure: Chatruimte instellen."
 
-#, fuzzy
 msgid "part [message]:  Leave the room."
-msgstr "part [ruimte]:  Ruimte verlaten."
+msgstr "part [bericht]:  Ruimte verlaten."
 
 msgid "register:  Register with a chat room."
 msgstr "register:  Registreren bij een chatruimte."
@@ -4715,21 +4707,20 @@
 msgstr ""
 "ban &lt;gebruiker&gt; [reden]:  Een gebruiker uit een ruimte verbannen."
 
-#, fuzzy
 msgid ""
 "affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Get "
 "the users with an affiliation or set users' affiliation with the room."
 msgstr ""
-"affiliate &lt;naam&gt; &lt;owner|admin|member|outcast|none&gt;:Relatie tot "
-"een ruimte/kanaal instellen."
-
-#, fuzzy
+"affiliate &lt;owner|admin|member|outcast|none&gt; [nick1] [nick2] ...: Zoek "
+"gebruikers met een aansluiting of pas gebruikers' aansluiting aan aan de "
+"ruimte."
+
 msgid ""
 "role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Get the "
 "users with a role or set users' role with the room."
 msgstr ""
-"role &lt;naam&gt; &lt;moderator|participant|visitor|none&gt;:Rol van "
-"gebruiker in de ruimte instellen"
+"role &lt;moderator|participant|visitor|none&gt; [nick1] [nick2] ...: Haal de "
+"gebruikers met een rol op of stel de gebruikers' rol inbij dezeruimte."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
@@ -4746,7 +4737,7 @@
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
+"msg &lt;bijnaam&gt; &lt;message&gt;:  Een privébericht sturen aan een "
 "gebruiker."
 
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
@@ -4755,9 +4746,8 @@
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Een contact buzzen om de aandacht te krijgen"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Kies juiste gebruiker"
+msgstr "Stemming: instellen huidige gebruikersstemming"
 
 msgid "Extended Away"
 msgstr "Lang weg"
@@ -4798,7 +4788,7 @@
 msgstr "Verbinden met server"
 
 msgid "File transfer proxies"
-msgstr "Bestandsoverdracht proxy"
+msgstr "Bestandsoverdracht proxies"
 
 msgid "BOSH URL"
 msgstr "BOSH koppeling"
@@ -4806,7 +4796,7 @@
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
 msgid "Show Custom Smileys"
-msgstr "Eigen smileys weergeven"
+msgstr "Eigen emoticons weergeven"
 
 #, c-format
 msgid "%s has left the conversation."
@@ -4829,31 +4819,30 @@
 msgstr "Bericht aan %s niet aangekomen: %s"
 
 msgid "XMPP Message Error"
-msgstr "XMPP Bericht-fout"
+msgstr "XMPP Berichtfout"
 
 #, c-format
 msgid "(Code %s)"
 msgstr "(Code %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "Kan het bericht niet verzenden. Het bericht is te groot."
+msgstr "Een aangepast emoticon in het bericht  is te groot om te verzenden."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP datastroom koptekst mist"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP Versie ongelijkheid"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP datastroom ID mist"
 
 msgid "XML Parse error"
-msgstr "XML analysefout"
+msgstr "XML ontleedfout"
 
 #, c-format
 msgid "Error joining chat %s"
-msgstr "Fout bij meedoen aan chat: %s"
+msgstr "Fout bij deelnemen aan chat: %s"
 
 #, c-format
 msgid "Error in chat %s"
@@ -4866,8 +4855,8 @@
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
 msgstr ""
-"Je maakt een nieuwe ruimte. Wil je deze instellen, of de "
-"standaardinstellingen gebruiken?"
+"U maakt een nieuwe ruimte. Wil u deze configureren, of de "
+"standaardinstellingen accepteren?"
 
 msgid "_Configure Room"
 msgstr "Ruimte _instellen"
@@ -4880,7 +4869,7 @@
 
 #, c-format
 msgid "You have been kicked: (%s)"
-msgstr "Je bent eruit gegooid:(%s)"
+msgstr "U bent eruit gegooid:(%s)"
 
 #, c-format
 msgid "Kicked (%s)"
@@ -4889,15 +4878,14 @@
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in aanwezigheid"
 
-#, fuzzy
 msgid "An error occurred on the in-band bytestream transfer\n"
-msgstr "Er is een fout opgetreden bij het openen van het bestand."
+msgstr "Er is een fout op de in-band bytestream overdracht\n"
 
 msgid "Transfer was closed."
 msgstr "Bestandsoverdracht gesloten."
 
 msgid "Failed to open in-band bytestream"
-msgstr ""
+msgstr "Kan geen in-band bytestream openen"
 
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
@@ -4924,33 +4912,28 @@
 
 #, c-format
 msgid "Please select the resource of %s to which you would like to send a file"
-msgstr "Geef de bron van %s naar degene wie je een bestand wil sturen"
-
-#, fuzzy
+msgstr "Geef de bron van %s naar degene die u een bestand wilt sturen"
+
 msgid "Afraid"
-msgstr "Arabisch"
-
-#, fuzzy
+msgstr "Bang"
+
 msgid "Amazed"
-msgstr "Beschaamd"
-
-#, fuzzy
+msgstr "Verbaasd"
+
 msgid "Amorous"
-msgstr "Glorieus"
+msgstr "Verliefd"
 
 msgid "Angry"
 msgstr "Boos"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Verbannen"
+msgstr "Geërgerd"
 
 msgid "Anxious"
 msgstr "Angstig"
 
-#, fuzzy
 msgid "Aroused"
-msgstr "Je stuurt"
+msgstr "Opgewonden"
 
 msgid "Ashamed"
 msgstr "Beschaamd"
@@ -4958,154 +4941,125 @@
 msgid "Bored"
 msgstr "Verveeld"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Opslaan"
-
-#, fuzzy
+msgstr "Dapper"
+
 msgid "Calm"
-msgstr "Gebied"
-
-#, fuzzy
+msgstr "Kalm"
+
 msgid "Cautious"
-msgstr "Chats"
-
-#, fuzzy
+msgstr "Voorzichtig"
+
 msgid "Cold"
-msgstr "Vet"
-
-#, fuzzy
+msgstr "Koud"
+
 msgid "Confident"
-msgstr "Conflict"
-
-#, fuzzy
+msgstr "zelfverzekerd"
+
 msgid "Confused"
-msgstr "Doorgaan"
-
-#, fuzzy
+msgstr "Verward"
+
 msgid "Contemplative"
-msgstr "Contact"
-
-#, fuzzy
+msgstr "Beschouwend"
+
 msgid "Contented"
-msgstr "Verbonden"
-
-#, fuzzy
+msgstr "Tevreden"
+
 msgid "Cranky"
-msgstr "Bedrijf"
+msgstr "Humeurig"
 
 msgid "Crazy"
-msgstr ""
-
-#, fuzzy
+msgstr "Gek"
+
 msgid "Creative"
-msgstr "Aanmaken"
-
-#, fuzzy
+msgstr "Creatief"
+
 msgid "Curious"
-msgstr "Glorieus"
-
-#, fuzzy
+msgstr "Nieuwsgierig"
+
 msgid "Dejected"
-msgstr "Weigeren"
-
-#, fuzzy
+msgstr "Neerslachtig"
+
 msgid "Depressed"
-msgstr "Verwijderen"
-
-#, fuzzy
+msgstr "Terneergeslagen"
+
 msgid "Disappointed"
-msgstr "Verbinding verbroken"
+msgstr "Teleurgesteld"
 
 msgid "Disgusted"
-msgstr ""
-
-#, fuzzy
+msgstr "Walgend"
+
 msgid "Dismayed"
-msgstr "_Uitzetten"
-
-#, fuzzy
+msgstr "Onthutst"
+
 msgid "Distracted"
-msgstr "Losgekoppeld"
+msgstr "Afgeleid"
 
 msgid "Embarrassed"
-msgstr ""
-
-#, fuzzy
+msgstr "Bedremmeld"
+
 msgid "Envious"
-msgstr "Angstig"
+msgstr "Jaloers"
 
 msgid "Excited"
 msgstr "Opgewonden"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Glorieus"
-
-#, fuzzy
+msgstr "Flirterig"
+
 msgid "Frustrated"
-msgstr "Voornaam"
+msgstr "Gefrustreerd"
 
 msgid "Grateful"
-msgstr ""
-
-#, fuzzy
+msgstr "Dankbaar"
+
 msgid "Grieving"
-msgstr "Ophalen..."
-
-#, fuzzy
+msgstr "Rouwend"
+
 msgid "Grumpy"
-msgstr "Groep"
-
-#, fuzzy
+msgstr "Knorrig"
+
 msgid "Guilty"
-msgstr "Stad"
+msgstr "Schuldig"
 
 msgid "Happy"
 msgstr "Blij"
 
 msgid "Hopeful"
-msgstr ""
-
-#, fuzzy
+msgstr "Hoopvol"
+
 msgid "Hot"
-msgstr "_Host:"
+msgstr "Heet"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Nederig"
 
 msgid "Humiliated"
-msgstr ""
-
-#, fuzzy
+msgstr "Vernederd"
+
 msgid "Hungry"
-msgstr "Boos"
-
-#, fuzzy
+msgstr "Hongerig"
+
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Gegriefd"
 
 msgid "Impressed"
-msgstr ""
-
-#, fuzzy
+msgstr "Onder de indruk"
+
 msgid "In awe"
-msgstr "Verliefd"
+msgstr "ontzagvol"
 
 msgid "In love"
 msgstr "Verliefd"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Indonesisch"
-
-#, fuzzy
+msgstr "Verontwaardigd"
+
 msgid "Interested"
-msgstr "Interesses"
-
-#, fuzzy
+msgstr "Geïnteresseerd"
+
 msgid "Intoxicated"
-msgstr "Uitnodigen"
+msgstr "Dronken"
 
 msgid "Invincible"
 msgstr "Onoverwinnelijk"
@@ -5113,139 +5067,118 @@
 msgid "Jealous"
 msgstr "Jaloers"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Aap"
-
-#, fuzzy
+msgstr "Eenzaam"
+
 msgid "Lost"
-msgstr "Hardst"
+msgstr "Verloren"
 
 msgid "Lucky"
-msgstr ""
-
-#, fuzzy
+msgstr "heb geluk"
+
 msgid "Mean"
-msgstr "Duits"
-
-#, fuzzy
+msgstr "Gemeen"
+
 msgid "Moody"
-msgstr "Stemming"
+msgstr "Humeurig"
 
 msgid "Nervous"
-msgstr ""
-
-#, fuzzy
+msgstr "Zenuwachtig"
+
 msgid "Neutral"
-msgstr "Detail"
-
-#, fuzzy
+msgstr "Neutraal"
+
 msgid "Offended"
-msgstr "Offline "
+msgstr "Beledigd"
 
 msgid "Outraged"
-msgstr ""
-
-#, fuzzy
+msgstr "Woedend"
+
 msgid "Playful"
-msgstr "Afspelen"
-
-#, fuzzy
+msgstr "Speels"
+
 msgid "Proud"
-msgstr "Hard"
-
-#, fuzzy
+msgstr "Trots"
+
 msgid "Relaxed"
-msgstr "Echte naam"
-
-#, fuzzy
+msgstr "Ontspannen"
+
 msgid "Relieved"
-msgstr "Ontvangen"
-
-#, fuzzy
+msgstr "Opgelucht"
+
 msgid "Remorseful"
-msgstr "Verwijderen"
-
-#, fuzzy
+msgstr "Berouwvol"
+
 msgid "Restless"
-msgstr "Registreren"
+msgstr "Rusteloos"
 
 msgid "Sad"
 msgstr "Verdrietig"
 
 msgid "Sarcastic"
-msgstr ""
+msgstr "Sarcastisch"
 
 msgid "Satisfied"
-msgstr ""
-
-#, fuzzy
+msgstr "Tevreden"
+
 msgid "Serious"
-msgstr "Glorieus"
-
-#, fuzzy
+msgstr "Ernstig"
+
 msgid "Shocked"
-msgstr "Geblokkeerd"
+msgstr "Geschokt"
 
 msgid "Shy"
-msgstr ""
-
-#, fuzzy
+msgstr "Verlegen"
+
 msgid "Sick"
-msgstr "Bijnaam"
+msgstr "Misselijk"
 
 #. Sleepy / Tired
 msgid "Sleepy"
 msgstr "Slaperig"
 
 msgid "Spontaneous"
-msgstr ""
-
-#, fuzzy
+msgstr "Spontaan"
+
 msgid "Stressed"
-msgstr "Geslaagd:"
-
-#, fuzzy
+msgstr "Gestrest"
+
 msgid "Strong"
-msgstr "Liedje"
+msgstr "Sterk"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Verbaasd"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Dankbaar"
 
 msgid "Thirsty"
-msgstr ""
-
-#, fuzzy
+msgstr "Dorstig"
+
 msgid "Tired"
-msgstr "Brand"
-
-#, fuzzy
+msgstr "Moe"
+
 msgid "Undefined"
-msgstr "Onderstrepen"
-
-#, fuzzy
+msgstr "Onbepaald"
+
 msgid "Weak"
-msgstr "Afranselen"
-
-#, fuzzy
+msgstr "Zwak"
+
 msgid "Worried"
-msgstr "Verveeld"
+msgstr "Zorgelijk"
 
 msgid "Set User Nickname"
-msgstr "Bijnaam instellen"
+msgstr "Bijnaam gebruiker instellen"
 
 msgid "Please specify a new nickname for you."
-msgstr "Voer een nieuwe bijnaam in."
+msgstr "Voer uw nieuwe bijnaam in."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
-"Deze informatie is zichtbaar voor alle contacten in je contactenlijst, dus "
-"kies iets passends."
+"Deze informatie is zichtbaar voor alle contactpersonen in uw "
+"contactpersonenlijst, dus kies iets passends."
 
 msgid "Set"
 msgstr "Instellen"
@@ -5267,14 +5200,14 @@
 msgstr "Kan \"%s\" niet toevoegen."
 
 msgid "Buddy Add error"
-msgstr "Fout bij het toevoegen van het contact"
+msgstr "Fout bij het toevoegen vriend"
 
 msgid "The username specified does not exist."
 msgstr "Ingevoerde gebruikersnaam bestaat niet."
 
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Synchronisatieprobleem in contactenlijst van %s (%s)"
+msgstr "Synchronisatieprobleem in vriendenlijst van %s (%s)"
 
 #, c-format
 msgid ""
@@ -5292,10 +5225,10 @@
 "%s is op de lokale lijst, maar niet op de serverlijst. Wilt u deze toevoegen?"
 
 msgid "Unable to parse message"
-msgstr "Kan het bericht niet analyseren"
+msgstr "Kan het bericht niet ontleden"
 
 msgid "Syntax Error (probably a client bug)"
-msgstr "Syntaxfout (waarschijnlijk een client-bug)"
+msgstr "Syntaxfout (waarschijnlijk een cliënt-bug)"
 
 msgid "Invalid email address"
 msgstr "Ongeldig e-mailadres"
@@ -5325,7 +5258,7 @@
 msgstr "Niet in de lijst"
 
 msgid "User is offline"
-msgstr "Gebruiker is off-line"
+msgstr "Gebruiker is offline"
 
 msgid "Already in the mode"
 msgstr "Reeds in die modus"
@@ -5349,7 +5282,7 @@
 msgstr "Kan groep nul niet verwijderen"
 
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "Probeerde een contact aan een niet bestaande groep toe te voegen"
+msgstr "Probeerde een vriend aan een niet bestaande groep toe te voegen"
 
 msgid "Switchboard failed"
 msgstr "Schakelserver fout"
@@ -5361,25 +5294,25 @@
 msgstr "Niet alle verplichte velden zijn ingevuld"
 
 msgid "Too many hits to a FND"
-msgstr "Te veel resultaten bij zoekopdracht"
+msgstr "Te veel resultaten bij een FND"
 
 msgid "Not logged in"
 msgstr "Niet aangemeld"
 
 msgid "Service temporarily unavailable"
-msgstr "Service momenteel niet toegankelijk"
+msgstr "Dienst tijdelijk niet toegankelijk"
 
 msgid "Database server error"
-msgstr "Database-server fout"
+msgstr "Databaseserver fout"
 
 msgid "Command disabled"
 msgstr "Opdracht uitgeschakeld"
 
 msgid "File operation error"
-msgstr "Bestandsfout"
+msgstr "Bestandsbewerkingsfout"
 
 msgid "Memory allocation error"
-msgstr "Geheugenfout"
+msgstr "Geheugentoewijzingsfout"
 
 msgid "Wrong CHL value sent to server"
 msgstr "Verkeerde CHL-waarde naar server gestuurd"
@@ -5391,7 +5324,7 @@
 msgstr "Server niet beschikbaar"
 
 msgid "Peer notification server down"
-msgstr "Meldingsserver is off-line"
+msgstr "Peer meldingsserver is offline"
 
 msgid "Database connect error"
 msgstr "Database verbindingsprobleem"
@@ -5409,7 +5342,7 @@
 msgstr "Kan niet schrijven"
 
 msgid "Session overload"
-msgstr "Sessie-overload"
+msgstr "Sessie overbelasting"
 
 msgid "User is too active"
 msgstr "Gebruiker is te actief"
@@ -5421,12 +5354,11 @@
 msgstr "Passport niet geverifieerd"
 
 msgid "Bad friend file"
-msgstr "Onbegrijpelijk contactenbestand"
+msgstr "Slechte vrienden bestand"
 
 msgid "Not expected"
 msgstr "Niet verwacht"
 
-#, fuzzy
 msgid "Friendly name is changing too rapidly"
 msgstr "Bijnaam verandert te snel"
 
@@ -5434,19 +5366,19 @@
 msgstr "Server te druk bezig"
 
 msgid "Authentication failed"
-msgstr "Identificatie mislukt"
+msgstr "Waarmerking mislukt"
 
 msgid "Not allowed when offline"
-msgstr "Niet toegestaan tijdens off-line-status"
+msgstr "Niet toegestaan tijdens offline-status"
 
 msgid "Not accepting new users"
 msgstr "Nieuwe gebruikers worden niet geaccepteerd"
 
 msgid "Kids Passport without parental consent"
-msgstr "Kinderpaspoort zonder toezegging van ouder"
+msgstr "Kinderpaspoort zonder ouderlijke goedkeuring"
 
 msgid "Passport account not yet verified"
-msgstr "Passport-account nog niet geverifieerd"
+msgstr "Passport account nog niet geverifieerd"
 
 msgid "Passport account suspended"
 msgstr "Passport-account onderbroken"
@@ -5463,10 +5395,10 @@
 msgstr "MSN-fout: %s\n"
 
 msgid "Other Contacts"
-msgstr "Andere contacten"
+msgstr "Andere Contactpersonen"
 
 msgid "Non-IM Contacts"
-msgstr "Niet-chat contacten"
+msgstr "Niet-IM contactpersonen"
 
 #, c-format
 msgid "%s sent a wink. <a href='msn-wink://%s'>Click here to play it</a>"
@@ -5482,28 +5414,26 @@
 msgstr ""
 "%s verzond een voice-clip. <a href='audio://%s'>Klik hier om af te spelen</a>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent a voice clip, but it could not be saved"
-msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
-"ondersteund."
-
-#, fuzzy, c-format
+msgstr "%s stuurde een stem clip, maar het kan niet worden opgeslagen."
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"%s verzond u een uitnodiging voor een voice chat, wat nog niet wordt "
 "ondersteund."
 
 msgid "Nudge"
-msgstr "Aanstoten"
+msgstr "Nudge"
 
 #, c-format
 msgid "%s has nudged you!"
-msgstr "%s heeft je aangestoten!"
+msgstr "%s heeft u genudged!"
 
 #, c-format
 msgid "Nudging %s..."
-msgstr "%s Aanstoten..."
+msgstr "Nudging %s..."
 
 msgid "Email Address..."
 msgstr "E-mailadres ..."
@@ -5511,15 +5441,15 @@
 msgid "Your new MSN friendly name is too long."
 msgstr "Uw nieuwe MSN-bijnaam is te lang."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Set friendly name for %s."
-msgstr "Bijnaam instellen."
+msgstr "Geef een bijnaam voor %s."
 
 msgid "Set your friendly name."
 msgstr "Bijnaam instellen."
 
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "Dit is de naam die uw contacten zullen zien."
+msgstr "Dit is de naam die andere MSN vrienden van u zullen zien."
 
 msgid "Set your home phone number."
 msgstr "Telefoonnummer voor thuis instellen."
@@ -5531,14 +5461,14 @@
 msgstr "Mobiel telefoonnummer instellen."
 
 msgid "Allow MSN Mobile pages?"
-msgstr "MSN-mobile oproepen toestaan?"
+msgstr "MSN-mobiel oproepen toestaan?"
 
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
-"Wilt u dat mensen op uw contactenlijst MSN-mobile oproepen kunnen sturen "
-"naar uw mobiele telefoon of ander mobiel apparaat?"
+"Wilt u dat mensen op uw vriendenlijst MSN-mobiel oproepen kunnen sturen naar "
+"uw mobiele telefoon of ander mobiel apparaat?"
 
 msgid "Allow"
 msgstr "Toestaan"
@@ -5557,16 +5487,16 @@
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
 msgstr ""
-"MSN-servers blokkeren momenteel de volgende reguliere expressies: <br/>%s"
+"MSN servers blokkeren momenteel de volgende reguliere expressies: <br/>%s"
 
 msgid "This account does not have email enabled."
-msgstr "Dit hotmailaccount heeft geen ingeschakelde e-mail."
+msgstr "Dit hotmail account heeft geen ingeschakelde e-mail."
 
 msgid "Send a mobile message."
 msgstr "Een mobiel bericht versturen."
 
 msgid "Page"
-msgstr "Versturen (mobiel)"
+msgstr "Page"
 
 msgid "Playing a game"
 msgstr "Speelt een spelletje"
@@ -5575,7 +5505,7 @@
 msgstr "Werken"
 
 msgid "Has you"
-msgstr "Heeft je"
+msgstr "Heeft u"
 
 msgid "Home Phone Number"
 msgstr "Telefoonnummer thuis"
@@ -5596,13 +5526,13 @@
 msgstr "Aan de telefoon"
 
 msgid "Out to Lunch"
-msgstr "Lunchen"
+msgstr "Weg voor Lunch"
 
 msgid "Game Title"
-msgstr "Game-titel"
+msgstr "Game Titel"
 
 msgid "Office Title"
-msgstr "Bureau-titel"
+msgstr "Kantoor Titel"
 
 msgid "Set Friendly Name..."
 msgstr "Bijnaam instellen..."
@@ -5626,22 +5556,21 @@
 msgstr "Geblokkeerde tekst bekijken"
 
 msgid "Open Hotmail Inbox"
-msgstr "Hotmail-inbox openen"
+msgstr "Hotmail Inbox openen"
 
 msgid "Send to Mobile"
 msgstr "Verzenden naar mobiel"
 
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "SSL-ondersteuning is vereist voor MSN. Installeer een SSL-bibliotheek."
-
-#, fuzzy, c-format
+msgstr "SSL ondersteuning is vereist voor MSN. Installeer een SSL bibliotheek."
+
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"Kan het contact %s niet toevoegen omdat de gebruikersnaam ongeldig is. "
-"Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een "
-"letter en slechts cijfers en letters bevatten, of slechts nummers bevatten."
+"Kan de vriend %s niet toevoegen omdat de gebruikersnaam ongeldig is. "
+"Gebruikersnamen moeten een geldig e-mailadres zijn."
 
 msgid "Unable to Add"
 msgstr "Kan niet toevoegen"
@@ -5674,7 +5603,7 @@
 msgstr "Locatie"
 
 msgid "Hobbies and Interests"
-msgstr "Hobbies en interesses"
+msgstr "Hobby's en interesses"
 
 msgid "A Little About Me"
 msgstr "Enige info over mij"
@@ -5710,7 +5639,7 @@
 msgstr "Favoriete citaat"
 
 msgid "Contact Info"
-msgstr "Accountinformatie"
+msgstr "Contactpersoon informatie"
 
 msgid "Personal"
 msgstr "Persoonlijk"
@@ -5753,7 +5682,7 @@
 msgstr "Afdeling"
 
 msgid "Profession"
-msgstr "Baan"
+msgstr "Beroep"
 
 msgid "Work Phone"
 msgstr "Telefoon werk"
@@ -5768,7 +5697,7 @@
 msgstr "Gsm werk"
 
 msgid "Work Pager"
-msgstr "Semafoon werk"
+msgstr "pager werk"
 
 msgid "Work Fax"
 msgstr "Fax werk"
@@ -5777,7 +5706,7 @@
 msgstr "E-mail werk"
 
 msgid "Work IM"
-msgstr "Chat werk"
+msgstr "IM  werk"
 
 msgid "Start Date"
 msgstr "Begindatum"
@@ -5823,7 +5752,7 @@
 #. *< version
 #. *< summary
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Windows Live Messenger protocol-plug-in"
+msgstr "Windows Live Messenger protocol plug-in"
 
 msgid "Use HTTP Method"
 msgstr "HTTP-methode gebruiken"
@@ -5832,24 +5761,22 @@
 msgstr "HTTP-methode server"
 
 msgid "Show custom smileys"
-msgstr "Eigen smiley's weergeven"
-
-#, fuzzy
+msgstr "Eigen emoticon's weergeven"
+
 msgid "Allow direct connections"
-msgstr "Kan geen nieuwe verbinding maken"
+msgstr "Sta directe verbindingen toe"
 
 msgid "nudge: nudge a user to get their attention"
-msgstr "nudge: Een contact een duwtje geven om de aandacht te krijgen"
+msgstr "nudge: Een gebruiker virtueel aanstoten om de aandacht te krijgen"
 
 msgid "Windows Live ID authentication:Unable to connect"
-msgstr "Windows Live ID authentication: Aanmelden niet mogelijk"
+msgstr "Windows Live ID Waarmerking: verbinding maken niet mogelijk"
 
 msgid "Windows Live ID authentication:Invalid response"
-msgstr "Windows Live ID autenticatie: ongeldig antwoord."
-
-#, fuzzy
+msgstr "Windows Live ID Waarmerking: ongeldig antwoord."
+
 msgid "The following users are missing from your addressbook"
-msgstr "Resultaten van uw zoekopdracht"
+msgstr "De volgende gebruikers komen niet voor in uw adresboek"
 
 #, c-format
 msgid "Unknown error (%d): %s"
@@ -5863,9 +5790,8 @@
 msgid "Unknown error (%d)"
 msgstr "Onbekende fout (%d)"
 
-#, fuzzy
 msgid "Unable to remove user"
-msgstr "Kan gebruiker niet toevoegen"
+msgstr "Kan gebruiker niet verwijderen"
 
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiel bericht is niet verstuurd omdat het te lang is."
@@ -5927,34 +5853,30 @@
 "Verbindingsfout van %s-server: \n"
 "%s"
 
-#, fuzzy
 msgid "Our protocol is not supported by the server"
 msgstr "Ons protocol wordt niet ondersteund door de server."
 
 msgid "Error parsing HTTP"
-msgstr "Fout bij parsen HTTP"
-
-#, fuzzy
+msgstr "Fout bij ontleden HTTP"
+
 msgid "You have signed on from another location"
-msgstr "Je hebt jezelf aangemeld vanaf een andere locatie."
+msgstr "U heeft uzelf aangemeld vanaf een andere locatie."
 
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
-"De MSN-servers zijn op dit moment niet beschikbaar. Probeer het later nog "
-"eens."
+"De MSN servers zijn tijdelijk niet beschikbaar. Probeer het later nog eens."
 
 msgid "The MSN servers are going down temporarily"
-msgstr "De MSN-servers worden tijdelijk uitgeschakeld"
+msgstr "De MSN servers worden tijdelijk uitgeschakeld"
 
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "Kan niet authentificeren: %s"
+msgstr "Kan niet waarmerken: %s"
 
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"Uw MSN contactenlijst is op dit moment niet beschikbaar. Probeer het later "
-"nog eens."
+"Uw MSN vriend is tijdelijk niet beschikbaar. Probeer het later nog eens."
 
 msgid "Handshaking"
 msgstr "Verbinding opzetten"
@@ -5963,7 +5885,7 @@
 msgstr "Bezig met transport"
 
 msgid "Starting authentication"
-msgstr "Starten van authentificatie"
+msgstr "Waarmerking starten"
 
 msgid "Getting cookie"
 msgstr "Cookie opvragen"
@@ -5972,18 +5894,16 @@
 msgstr "Verzenden van cookie"
 
 msgid "Retrieving buddy list"
-msgstr "Opvragen van contactenlijst"
-
-#, fuzzy, c-format
+msgstr "Opvragen van vriendenlijst"
+
+#, c-format
 msgid "%s requests to view your webcam, but this request is not yet supported."
-msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
-"ondersteund."
-
-#, fuzzy, c-format
+msgstr "%s verzoekt uw webcam te zien, wat nog niet wordt ondersteund."
+
+#, c-format
 msgid "%s invited you to view his/her webcam, but this is not yet supported."
 msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"%s verzond u een uitnodiging voor zijn/haar webcam, wat nog niet wordt "
 "ondersteund."
 
 msgid "Away From Computer"
@@ -5993,7 +5913,7 @@
 msgstr "Aan de telefoon"
 
 msgid "Out To Lunch"
-msgstr "Lunchen"
+msgstr "Weg om te Lunchen"
 
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
@@ -6004,7 +5924,7 @@
 "Kan bericht niet versturen. Niet toegestaan wanneer u onzichtbaar bent:"
 
 msgid "Message could not be sent because the user is offline:"
-msgstr "Kan bericht niet versturen omdat de ander off-line is:"
+msgstr "Kan bericht niet versturen omdat de ander offline is:"
 
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Kan bericht niet versturen omdat er een verbindingsfout is opgetreden:"
@@ -6017,7 +5937,7 @@
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 "Het bericht kon niet verzonden worden omdat we niet een sessie konden "
-"opzetten met de server. Dit ligtt waarschijnlijk aan de server, probeer het "
+"opzetten met de server. Dit ligt waarschijnlijk aan de server, probeer het "
 "opnieuw over een paar minuten:"
 
 msgid ""
@@ -6030,41 +5950,38 @@
 msgstr "Bericht is misschien niet verstuurd wegens een onbekende fout:"
 
 msgid "Delete Buddy from Address Book?"
-msgstr "Contact verwijderen uit adresboek?"
+msgstr "Vriend verwijderen uit adresboek?"
 
 msgid "Do you want to delete this buddy from your address book as well?"
-msgstr "Dit contact ook verwijderen uit adresboek?"
+msgstr "Deze vriend ook verwijderen uit adresboek?"
 
 msgid "The username specified is invalid."
 msgstr "Ingevoerde gebruikersnaam is ongeldig."
 
-#, fuzzy
 msgid "The PIN you entered is invalid."
-msgstr "Ingevoerde SecurID sleutel is ongeldig."
-
-#, fuzzy
+msgstr "De PINcode die u invulde is ongeldig."
+
 msgid "The PIN you entered has an invalid length [4-10]."
-msgstr "Ingevoerde SecurID sleutel is ongeldig."
+msgstr "De PINcode die u invulde heeft een ongeldige lengte [4-10]."
 
 msgid "The PIN is invalid. It should only consist of digits [0-9]."
-msgstr ""
-
-#, fuzzy
+msgstr "De PINcode is ongeldig. Het kan uitsluiten cijfers bevatten [0-9]."
+
 msgid "The two PINs you entered do not match."
-msgstr "Nieuwe wachtwoorden zijn niet gelijk."
-
-#, fuzzy
+msgstr "De twee PINcodes die u invulde zijn niet gelijk."
+
 msgid "The name you entered is invalid."
-msgstr "Ingevoerde SecurID sleutel is ongeldig."
+msgstr "De naam die u invoerde is ongeldig."
 
 msgid ""
 "The birthday you entered is invalid. The correct format is: 'YYYY-MM-DD'."
 msgstr ""
+"De geboortedatum die u invulde is ongeldig. Het correcte formaat is: 'YYY-MM-"
+"DD'"
 
 #. show error to user
-#, fuzzy
 msgid "Profile Update Error"
-msgstr "Schrijffout"
+msgstr "Fout Bijwerken Profiel"
 
 #. no profile information yet, so we cannot update
 #. (reference: "libpurple/request.h")
@@ -6073,388 +5990,339 @@
 
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
-
-msgid "Your MXitId"
-msgstr ""
+"Uw profiel informatie is nog niet opgehaald. Probeer het later nog eens."
+
+msgid "Your UID"
+msgstr "Uw UID"
 
 #. pin
 #. pin (required)
-#, fuzzy
 msgid "PIN"
-msgstr "UIN"
+msgstr "PIN"
 
 msgid "Verify PIN"
-msgstr ""
+msgstr "PINcode verifiëren"
 
 #. display name
-#, fuzzy
+#. nick name (required)
 msgid "Display Name"
-msgstr "Achternaam"
+msgstr "Schermnaam"
 
 #. hidden
 msgid "Hide my number"
-msgstr ""
+msgstr "Verberg mijn nummer"
 
 #. mobile number
-#, fuzzy
 msgid "Mobile Number"
-msgstr "Telefoonnummer mobiel"
-
-#, fuzzy
+msgstr "Mobiele Nummer"
+
 msgid "Update your Profile"
-msgstr "Profiel"
+msgstr "Werk uw Profiel  bij"
 
 msgid "Here you can update your MXit profile"
-msgstr ""
+msgstr "Hier kunt u uw MXit profiel bijwerken"
 
 msgid "View Splash"
-msgstr ""
+msgstr "Bekijk Splash"
 
 msgid "There is no splash-screen currently available"
-msgstr ""
-
-#, fuzzy
+msgstr "Er is op het ogenblik geen splashscreen beschikbaar"
+
 msgid "About"
-msgstr "Over mij"
+msgstr "Over"
 
 #. display / change profile
-#, fuzzy
 msgid "Change Profile..."
-msgstr "Wachtwoord veranderen..."
+msgstr "Profiel veranderen..."
 
 #. display splash-screen
-#, fuzzy
 msgid "View Splash..."
-msgstr "Logboek bekijken..."
+msgstr "Bekijk Splash..."
 
 #. display plugin version
-#, fuzzy
 msgid "About..."
-msgstr "Over mij"
+msgstr "Over..."
 
 #. the file is too big
-#, fuzzy
 msgid "The file you are trying to send is too large!"
-msgstr "Afwezigheidsbericht te groot."
-
-#, fuzzy
+msgstr "Het bestand dat u tracht te verzenden is te groot!"
+
 msgid ""
 "Unable to connect to the MXit HTTP server. Please check your server settings."
 msgstr ""
-"Kan geen verbinding makenmet server. Geef de naam op van de server waarmee u "
-"contact wilt maken."
-
-#, fuzzy
+"Kan geen contact meer maken met de MXit HTTP server. Controleer uw server "
+"instellingen."
+
 msgid "Logging In..."
-msgstr "Aanmelden"
-
-#, fuzzy
+msgstr "Bezig met Aanmelden..."
+
 msgid ""
 "Unable to connect to the MXit server. Please check your server settings."
 msgstr ""
-"Kan geen verbinding makenmet server. Geef de naam op van de server waarmee u "
-"contact wilt maken."
-
-#, fuzzy
+"Kan geen verbinding maken met de MXit server. . Controleer uw server "
+"instellingen."
+
 msgid "Connecting..."
-msgstr "Verbinding wordt gemaakt"
-
-#, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "Ingevoerde SecurID sleutel is ongeldig."
-
-#, fuzzy
+msgstr "Bezig met Verbinden..."
+
+msgid "The Display Name you entered is invalid."
+msgstr "De schermnaam die u invoerde is ongeldig."
+
 msgid "The PIN you entered has an invalid length [7-10]."
-msgstr "Ingevoerde SecurID sleutel is ongeldig."
+msgstr "De PINcode die u invulde heeft een ongeldige lengte [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Bijnaam"
+msgid "MXit ID"
+msgstr "MXit ID"
 
 #. show the form to the user to complete
-#, fuzzy
 msgid "Register New MXit Account"
-msgstr "Registreer Nieuw XMPP-account"
-
-#, fuzzy
+msgstr "Registreer Nieuw MXit account"
+
 msgid "Please fill in the following fields:"
-msgstr "Vul de volgende velden in"
+msgstr "Vul de volgende velden in:"
 
 #. no reply from the WAP site
 msgid "Error contacting the MXit WAP site. Please try again later."
 msgstr ""
+"Fout tijdens contact maken met de MXit WAP site. Probeer het later nog eens."
 
 #. wapserver error
 #. server could not find the user
 msgid ""
 "MXit is currently unable to process the request. Please try again later."
 msgstr ""
+"MXit is op het moment niet in staat aan uw verzoek te voldoen. Probeer het "
+"later nog eens."
 
 msgid "Wrong security code entered. Please try again later."
-msgstr ""
+msgstr "Verkeerde beveiligingscode ingevuld. Probeer het later nog eens."
 
 msgid "Your session has expired. Please try again later."
-msgstr ""
+msgstr "Uw sessie is verlopen. Probeer het later nog eens."
 
 msgid "Invalid country selected. Please try again."
-msgstr ""
-
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
-msgstr ""
-
-#, fuzzy
+msgstr "Ongeldig land geselecteerd. Probeer het nog eens."
+
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+"De  MXit ID die u invoerde is niet geregistreerd. Eerst graag registreren."
+
+msgid "The MXit ID you entered is already registered. Please choose another."
+msgstr "Deze  MXit ID is al geregistreerd. Kies svp een andere gebruikersnaam."
+
 msgid "Internal error. Please try again later."
-msgstr "De server is niet beschikbaar. Probeer het later nog eens"
+msgstr "Interen fout. Probeer het later nog eens."
 
 msgid "You did not enter the security code"
-msgstr ""
-
-#, fuzzy
+msgstr "U heeft geen beveiligingscode ingevuld"
+
 msgid "Security Code"
-msgstr "Beveiliging ingeschakeld"
+msgstr "Beveiligingscode"
 
 # wachtwoord invoeren
 #. ask for input (required)
-#, fuzzy
 msgid "Enter Security Code"
-msgstr "Voer code in"
-
-#, fuzzy
+msgstr "Vul beveiligingscode in"
+
 msgid "Your Country"
-msgstr "Land"
-
-#, fuzzy
+msgstr "Uw Land"
+
 msgid "Your Language"
-msgstr "Voorkeurstaal"
+msgstr "Uw Taal"
 
 #. display the form to the user and wait for his/her input
-#, fuzzy
 msgid "MXit Authorization"
-msgstr "Identificatie nodig"
+msgstr "MXit Autorisatie"
 
 msgid "MXit account validation"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit account validatie"
+
 msgid "Retrieving User Information..."
-msgstr "Server-informatie"
-
-#, fuzzy
+msgstr "Ophalen Gebruikersinformatie..."
+
 msgid "Loading menu..."
-msgstr "Aanmelden"
-
-#, fuzzy
+msgstr "Menu aan 't laden..."
+
 msgid "Status Message"
-msgstr "Verzonden berichten"
-
-#, fuzzy
+msgstr "Status Bericht"
+
 msgid "Rejection Message"
-msgstr "Ontvangen berichten"
+msgstr "Afgewezen bericht"
 
 #. hidden number
-#, fuzzy
 msgid "Hidden Number"
-msgstr "Tweede naam"
-
-#, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Mobiel nummer instellen..."
+msgstr "Verborgen nummer"
+
+msgid "Your MXit ID..."
+msgstr "Uw MXit ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
-#, fuzzy
 msgid "WAP Server"
-msgstr "Server"
-
-#, fuzzy
+msgstr "WAP Server"
+
 msgid "Connect via HTTP"
-msgstr "Verbinding met behulp van TCP"
+msgstr "Verbinden via HTTP"
 
 msgid "Enable splash-screen popup"
-msgstr ""
+msgstr "inschakelen splashscreen pop-up"
 
 #. you were kicked
-#, fuzzy
 msgid "You have been kicked from this MultiMX."
-msgstr "Je bent eruit gegooid:(%s)"
-
-#, fuzzy
+msgstr "U bent uit deze MultiMX gegooid."
+
 msgid "was kicked"
-msgstr "Slecht ticket"
-
-#, fuzzy
+msgstr "eruit gegooid"
+
 msgid "_Room Name:"
-msgstr "_Ruimte:"
+msgstr "_Ruimtenaam:"
+
+#. Display system message in chat window
+msgid "You have invited"
+msgstr "U heeft uitgenodigd"
+
+msgid "Last Online"
+msgstr "Laatste Online"
 
 #. 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 ""
+"We hebben de verbinding met MXit verloren. Graag opnieuw verbinding maken."
 
 #. packet could not be queued for transmission
-#, fuzzy
 msgid "Message Send Error"
-msgstr "XMPP Bericht-fout"
-
-#, fuzzy
+msgstr "Bericht verzendingsfout"
+
 msgid "Unable to process your request at this time"
-msgstr "Kan geen verbinding maken met de computer."
+msgstr "Kan nu niet aan uw verzoek voldoen"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
-
-#, fuzzy
+msgstr "De tijd is verlopen bij het wachten op antwoord van de MXit server."
+
 msgid "Successfully Logged In..."
-msgstr "Succesvol aan Qun deelgenmen"
-
-#, fuzzy, c-format
+msgstr "Succesvol aangemeld bij..."
+
+#, c-format
 msgid ""
 "%s sent you an encrypted message, but it is not supported on this client."
 msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
-"ondersteund."
-
-#, fuzzy
+"%s verzond u een versleuteld bericht, wat nog niet wordt ondersteund voor "
+"deze cliënt."
+
 msgid "Message Error"
-msgstr "XMPP Bericht-fout"
+msgstr "Berichtenfout"
 
 msgid "Cannot perform redirect using the specified protocol"
-msgstr ""
-
-#, fuzzy
+msgstr "Kan geen omleiding maken met het gebruikte protocol"
+
 msgid "An internal MXit server error occurred."
-msgstr "Onbekende aanmeldingsfout: %s."
-
-#, fuzzy, c-format
+msgstr "Een interne MXit serverfout opgetreden."
+
+#, c-format
 msgid "Login error: %s (%i)"
-msgstr "SASL-fout: %s"
-
-#, fuzzy, c-format
+msgstr "Aanmeldingsfout: %s (%i)"
+
+#, c-format
 msgid "Logout error: %s (%i)"
-msgstr "SASL-fout: %s"
-
-#, fuzzy
+msgstr "Afmeldingsfout: %s (%i)"
+
 msgid "Contact Error"
-msgstr "Verbindingsfout"
-
-#, fuzzy
+msgstr "Contactpersoonsfout"
+
 msgid "Message Sending Error"
-msgstr "XMPP Bericht-fout"
-
-#, fuzzy
+msgstr "Bericht verzendingsfout"
+
 msgid "Status Error"
-msgstr "Stream-fout"
-
-#, fuzzy
+msgstr "Status Fout"
+
 msgid "Mood Error"
-msgstr "Pictogramfout"
-
-#, fuzzy
+msgstr "Stemmingsfout"
+
 msgid "Invitation Error"
-msgstr "Fout met het ongedaan maken van het  registeren"
-
-#, fuzzy
+msgstr "Invitatiefout"
+
 msgid "Contact Removal Error"
-msgstr "Verbindingsfout"
-
-#, fuzzy
+msgstr "Contactpersoon verwijderingsfout"
+
 msgid "Subscription Error"
-msgstr "Abonnement"
-
-#, fuzzy
+msgstr "Abonnementsfout"
+
 msgid "Contact Update Error"
-msgstr "Verbindingsfout"
-
-#, fuzzy
+msgstr "Contactpersoon bijwerkfout"
+
 msgid "File Transfer Error"
-msgstr "Bestandsoverdracht"
-
-#, fuzzy
+msgstr "Bestandsoverdrachtsfout"
+
 msgid "Cannot create MultiMx room"
-msgstr "Kan contactalarm niet aanmaken"
-
-#, fuzzy
+msgstr "Kan MultiMx ruimte niet maken"
+
 msgid "MultiMx Invitation Error"
-msgstr "Fout met het ongedaan maken van het  registeren"
-
-#, fuzzy
+msgstr "MultiMx Uitnodigingsfout"
+
 msgid "Profile Error"
-msgstr "Schrijffout"
+msgstr "Profielfout"
 
 #. bad packet
 msgid "Invalid packet received from MXit."
-msgstr ""
+msgstr "Ongeldig datapakketje ontvangen van MXit."
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x01)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x01)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x02)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x02)"
 
 msgid "A connection error occurred to MXit. (read stage 0x03)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x03)"
 
 #. malformed packet length record (too long)
 msgid "A connection error occurred to MXit. (read stage 0x04)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x04)"
 
 #. connection error
 msgid "A connection error occurred to MXit. (read stage 0x05)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x05)"
 
 #. connection closed
 msgid "A connection error occurred to MXit. (read stage 0x06)"
-msgstr ""
+msgstr "Er is een verbindingsfout opgetreden met MXit. (uitlees stadium 0x06)"
 
 msgid "In Love"
 msgstr "Verliefd"
 
-#, fuzzy
 msgid "Pending"
-msgstr "Verzenden"
-
-#, fuzzy
+msgstr "In de wacht"
+
 msgid "Invited"
-msgstr "Uitnodigen"
-
-#, fuzzy
+msgstr "Uitgenodigd"
+
 msgid "Rejected"
-msgstr "Weigeren"
-
-#, fuzzy
+msgstr "Afgewezen"
+
 msgid "Deleted"
-msgstr "Verwijderen"
+msgstr "Verwijderd"
 
 msgid "MXit Advertising"
-msgstr ""
-
-#, fuzzy
+msgstr "MXit Advertenties"
+
 msgid "More Information"
-msgstr "Werkinformatie"
+msgstr "Meer Informatie"
 
 #, c-format
 msgid "No such user: %s"
-msgstr "Onbekende gerbuiker: %s"
+msgstr "Onbekende gebruiker: %s"
 
 msgid "User lookup"
 msgstr "Gebruiker opzoeken"
 
-#, fuzzy
 msgid "Reading challenge"
-msgstr "Data wordt gelezen"
-
-#, fuzzy
+msgstr "Challence aan 't inlezen"
+
 msgid "Unexpected challenge length from server"
-msgstr "Ongeldige vraag van server"
+msgstr "Onverwachte challence lengte van server"
 
 msgid "Logging in"
 msgstr "Aanmelden"
@@ -6463,11 +6331,11 @@
 msgstr "MySpaceIM - geen naam ingesteld"
 
 msgid "You appear to have no MySpace username."
-msgstr "Je lijkt geen MySpace gebruikersnaam te hebben."
+msgstr "U lijkt geen MySpace gebruikersnaam te hebben."
 
 msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
 msgstr ""
-"Wil je er nu een instellen? (Opmerking: DIT KAN NIET VERANDERD WORDEN!)"
+"Wilt u er nu een instellen? (Opmerking: DIT KAN NIET VERANDERD WORDEN!)"
 
 msgid "Lost connection with server"
 msgstr "Verbinding met de server verloren"
@@ -6494,7 +6362,7 @@
 msgstr "MySpace"
 
 msgid "IM Friends"
-msgstr "Chat-vrienden"
+msgstr "IM Vrienden"
 
 #, c-format
 msgid ""
@@ -6504,29 +6372,29 @@
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
 msgstr[0] ""
-"%d contacten zijn toegevoeged of geüpdate van de server (inclusief buddies "
-"die al op de server stinden)"
+"%d vriend is toegevoegd of bijgewerkt vanaf de server (inclusief vrienden "
+"die al op de lijst van de server stonden)"
 msgstr[1] ""
-"%d contacten zijn toegevoeged of geüpdate van de server (inclusief buddies "
-"die al op de server stinden)"
+"%d vrienden zijn toegevoegd of  bijgewerkt vanaf de server (inclusief "
+"vrienden die al op de lijst van de server stonden)"
 
 msgid "Add contacts from server"
-msgstr "Contacten toevoegen van de server"
+msgstr "Contactpersonen toevoegen van de server"
 
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol fout, code %d: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s Your password is %zu characters, which is longer than the maximum length "
 "of %d.  Please shorten your password at http://profileedit.myspace.com/index."
 "cfm?fuseaction=accountSettings.changePassword and try again."
 msgstr ""
-"%s Je wachtwoord bestaat uit %d characters, groter dan de verwachte maximum "
-"waarde van %d voor MySpaceIM. Verkort je wachtwoord op http://profileedit."
-"myspace.com/index.cfm?fuseaction=accountSettings.changePassword en probeer "
-"het opnieuw."
+"%s Uw wachtwoord heeft %zu lettertekens. Dat is langer dan de toegestane "
+"lengte van %d.  Maak uw wachtwoord spv korter op http://profileedit.myspace."
+"com/index.cfm?fuseaction=accountSettings.changePassword en probeer het nog "
+"eens."
 
 msgid "Incorrect username or password"
 msgstr "Ongeldige gebruikersnaam of wachtwoord"
@@ -6538,23 +6406,22 @@
 msgstr "Ongeldige invoer voorwaarde"
 
 msgid "Failed to add buddy"
-msgstr "Contact toevoegen mislukt"
+msgstr "Vriend toevoegen mislukt"
 
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy' opdracht mislukt."
 
-#, fuzzy
 msgid "persist command failed"
-msgstr "Schakelserver fout"
+msgstr "aanhouden opdracht is mislukt"
 
 msgid "Failed to remove buddy"
-msgstr "Verwijderen buddy mislukt"
+msgstr "Verwijderen vriend mislukt"
 
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy' opdracht mislukt"
 
 msgid "blocklist command failed"
-msgstr "blokkeerlijst-opdracht mislukt"
+msgstr "blokkeerlijst opdracht mislukt"
 
 msgid "Missing Cipher"
 msgstr "Missende coderingsinformatie"
@@ -6580,21 +6447,21 @@
 msgstr "Mensen zoeken..."
 
 msgid "Change IM name..."
-msgstr "Chatnaam veranderen..."
+msgstr "IM naam veranderen..."
 
 msgid "myim URL handler"
-msgstr "myim URL afhandelaar"
+msgstr "myim URL handler"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
-"Geen bijpassend MySpaceIM-account kon gevonden worden om deze myim URL te "
+"Geen bijpassend MySpaceIM account kon gevonden worden om deze myim URL te "
 "openen."
 
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr "Schakel de goede MySpaceIM-account in en probeer het opnieuw."
+msgstr "Schakel de goede MySpaceIM account in en probeer het opnieuw."
 
 msgid "Show display name in status text"
-msgstr "Laat display-naam zien in status-tekst."
+msgstr "Laat schermnaam zien in status-tekst."
 
 msgid "Show headline in status text"
 msgstr "Kop in status-tekst weergeven"
@@ -6621,19 +6488,22 @@
 msgstr "Totaal aantal vrienden"
 
 msgid "Client Version"
-msgstr "Client-versie"
+msgstr "Cliëntversie"
 
 msgid ""
 "An error occurred while trying to set the username.  Please try again, or "
 "visit http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
 "to set your username."
 msgstr ""
+"Er is een fout opgetreden tijdens het instellen van de gebruikersnaam. "
+"Probeer het nog eens of bezoek http://editprofile.myspace.com/index.cfm?"
+"fuseaction=profile.username om uw gebruikersnaam in te stellen."
 
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Gebruikersnaam Beschikbaar"
 
 msgid "This username is available. Would you like to set it?"
-msgstr "Deze gebruikersnaam is beschikbaar. Wil je het gebruiken?"
+msgstr "Deze gebruikersnaam is beschikbaar. Wilt u deze gebruiken?"
 
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "EENMAAL INGESTELD KAN HET NIET VERANDERD WORDEN!"
@@ -6642,14 +6512,14 @@
 msgstr "MySpaceIM - Stel een gebruikersnaam in"
 
 msgid "This username is unavailable."
-msgstr "Deze gebruikersnaam is onbeschikbaar."
+msgstr "Deze gebruikersnaam is niet beschikbaar."
 
 msgid "Please try another username:"
 msgstr "Probeer een andere gebruikersnaam:"
 
 #. Protocol won't log in now without a username set.. Disconnect
 msgid "No username set"
-msgstr "Geen naam ingesteld"
+msgstr "Geen Gebruikersnaam ingesteld"
 
 msgid "Please enter a username to check its availability:"
 msgstr "Geef een gebruikersnaam om de beschikbaarheid te controleren"
@@ -6661,104 +6531,104 @@
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
 msgid "Zap"
-msgstr "Schrikken"
+msgstr "Zap"
 
 #, c-format
 msgid "%s has zapped you!"
-msgstr "%s heeft je laten schrikken!"
+msgstr "%s heeft u gezapt!"
 
 #, c-format
 msgid "Zapping %s..."
-msgstr "%s laten schrikken..."
+msgstr "Zapping %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr "Afranselen"
+msgstr "Whack"
 
 #, c-format
 msgid "%s has whacked you!"
-msgstr "%s heeft je afgeranseld!"
+msgstr "%s u bent whacked!"
 
 #, c-format
 msgid "Whacking %s..."
-msgstr "%s afranselen..."
+msgstr "Whacking %s..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
 msgid "Torch"
-msgstr "Huis laten fikken"
+msgstr "Torch"
 
 #, c-format
 msgid "%s has torched you!"
-msgstr "%s heeft je huis in de fik gezet!"
+msgstr "%s u bent torched!"
 
 # msgstr "De gebruiker heeft u befakkeld"
 #, c-format
 msgid "Torching %s..."
-msgstr "Het huis van %s in de fik zetten..."
+msgstr "Torching %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr "Zoenen"
+msgstr "Smooch"
 
 #, c-format
 msgid "%s has smooched you!"
-msgstr "%s heeft je gezoend!"
+msgstr "%s u bent smooched!"
 
 #, c-format
 msgid "Smooching %s..."
-msgstr "%s zoenen..."
+msgstr "Smooching %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr "Knuffel"
+msgstr "Hug"
 
 #, c-format
 msgid "%s has hugged you!"
-msgstr "%s heeft je omarmd!"
+msgstr "%s u bent hugged!"
 
 #, c-format
 msgid "Hugging %s..."
-msgstr "%s Knuffelen..."
+msgstr "Hugging %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
 msgid "Slap"
-msgstr "Meppen"
+msgstr "Slap"
 
 #, c-format
 msgid "%s has slapped you!"
-msgstr "%s heeft je gemept!"
+msgstr "%s u bent slapped!"
 
 #, c-format
 msgid "Slapping %s..."
-msgstr "%s meppen..."
+msgstr "Slapping %s..."
 
 #. Goose means "to pinch someone on their butt"
 msgid "Goose"
-msgstr "Bilknijpen"
+msgstr "Goose"
 
 #, c-format
 msgid "%s has goosed you!"
-msgstr "%s heeft in je billen geknepen!"
+msgstr "%s u bent goosed!"
 
 #, c-format
 msgid "Goosing %s..."
-msgstr "%s billenknijpen..."
+msgstr "Goosing %s..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
 msgid "High-five"
-msgstr "High-fiven"
+msgstr "High-five"
 
 #, c-format
 msgid "%s has high-fived you!"
-msgstr "%s heeft je gehigh-fived!"
+msgstr "%s u bent high-fived!"
 
 #, c-format
 msgid "High-fiving %s..."
-msgstr "%s high-fiven..."
+msgstr "High-fiving %s..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
@@ -6768,11 +6638,11 @@
 
 #, c-format
 msgid "%s has punk'd you!"
-msgstr "%s heeft je gepunk'd!"
+msgstr "%s u bent punk'd!"
 
 #, c-format
 msgid "Punking %s..."
-msgstr "%s punken..."
+msgstr "Punking %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -6782,15 +6652,15 @@
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
 msgid "Raspberry"
-msgstr "Bespetteren"
+msgstr "Raspberry"
 
 #, c-format
 msgid "%s has raspberried you!"
-msgstr "%s heeft je bespetterd!"
+msgstr "%s u bent raspberried!"
 
 #, c-format
 msgid "Raspberrying %s..."
-msgstr "%s bespetteren..."
+msgstr "Raspberrying %s..."
 
 msgid "Required parameters not passed in"
 msgstr "Vereiste parameters niet bijgevoegd"
@@ -6805,10 +6675,10 @@
 msgstr "Fout opgetreden bij communicatie met de server"
 
 msgid "Conference not found"
-msgstr "Bijeenkomst niet gevonden"
+msgstr "Conferentie niet gevonden"
 
 msgid "Conference does not exist"
-msgstr "Bijeenkomst bestaat niet"
+msgstr "Conferentie bestaat niet"
 
 msgid "A folder with that name already exists"
 msgstr "Die map bestaat al"
@@ -6835,7 +6705,7 @@
 msgstr "De server is niet beschikbaar. Probeer het later nog eens"
 
 msgid "Cannot add a contact to the same folder twice"
-msgstr "Kan een contact niet tweemaal toevoegen aan dezelfde map"
+msgstr "Kan een contactpersoon niet tweemaal toevoegen in dezelfde map"
 
 msgid "Cannot add yourself"
 msgstr "Kan eigen account niet toevoegen"
@@ -6844,7 +6714,8 @@
 msgstr "Hoofdarchief onjuist geconfigureerd"
 
 msgid "Could not recognize the host of the username you entered"
-msgstr "Kan de host van de gebruikersnaam die je hebt ingevoerd niet vinden"
+msgstr ""
+"Kan de computer van de gebruikersnaam die u heeft ingevoerd niet vinden"
 
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
@@ -6857,10 +6728,10 @@
 msgstr "U kunt een persoon slechts eenmaal toevoegen aan een gesprek"
 
 msgid "You have reached your limit for the number of contacts allowed"
-msgstr "Je hebt je maximale hoeveelheid contacten bereikt"
+msgstr "U heeft uw maximale hoeveelheid contactpersonen bereikt"
 
 msgid "You have entered an incorrect username"
-msgstr "Je hebt een ongeldige gebruikersnaam ingevuld"
+msgstr "U heeft een ongeldige gebruikersnaam ingevuld"
 
 msgid "An error occurred while updating the directory"
 msgstr "Er is een fout opgetreden bij het bijwerken van het adresboek"
@@ -6879,7 +6750,7 @@
 "gebruikers"
 
 msgid "The user is either offline or you are blocked"
-msgstr "De gebruiker is off-line of heeft u geblokkeerd"
+msgstr "De gebruiker is offline of heeft u geblokkeerd"
 
 #, c-format
 msgid "Unknown error: 0x%X"
@@ -6897,7 +6768,7 @@
 
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Kan %s niet toevoegen aan uw contactenlijst (%s)."
+msgstr "Kan %s niet toevoegen aan uw vriendenlijst (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
 #, c-format
@@ -6911,11 +6782,11 @@
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"Kan bericht naar %s niet versturen. Kan geen bijeenkomst aanmaken (%s)."
+"Kan bericht naar %s niet versturen. Kan geen conferentie aanmaken (%s)."
 
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "Kan het bericht niet versturen. Kan geen bijeenkomst aanmaken (%s)."
+msgstr "Kan het bericht niet versturen. Kan geen conferentie aanmaken (%s)."
 
 #, c-format
 msgid ""
@@ -6930,7 +6801,7 @@
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"Kan %s niet toevoegen aan uw contactenlijst. Fout bij aanmaken van map op de "
+"Kan %s niet toevoegen aan uw vriendenlijst. Fout bij aanmaken van map op de "
 "server (%s)."
 
 #, c-format
@@ -6939,7 +6810,7 @@
 
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr "Kan de gebruiker niet toevoegen aan uw privacy-lijst (%s)."
+msgstr "Kan de gebruiker niet toevoegen aan uw privacylijst (%s)."
 
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
@@ -6951,7 +6822,7 @@
 
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr "Kan %s niet verwijderen van uw privacy-lijst (%s)."
+msgstr "Kan %s niet verwijderen van uw privacylijst (%s)."
 
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
@@ -6959,7 +6830,7 @@
 
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr "Kan geen bijeenkomst aanmaken (%s)."
+msgstr "Kan geen conferentie aanmaken (%s)."
 
 msgid "Error communicating with server. Closing connection."
 msgstr ""
@@ -6972,7 +6843,7 @@
 msgstr "Persoonlijke titel"
 
 msgid "Mailstop"
-msgstr "Post-stop"
+msgstr "Mailstop"
 
 msgid "User ID"
 msgstr "Gebruikers-ID"
@@ -6988,10 +6859,10 @@
 
 #, c-format
 msgid "GroupWise Conference %d"
-msgstr "Groupwise bijeenkomst %d"
+msgstr "Groupwise conferentie %d"
 
 msgid "Authenticating..."
-msgstr "Identificatie..."
+msgstr "Waarmerken..."
 
 msgid "Waiting for response..."
 msgstr "Wacht op antwoord..."
@@ -7014,24 +6885,23 @@
 "Verzonden: %s"
 
 msgid "Would you like to join the conversation?"
-msgstr "Wilt u het gesprek bijwonen?"
+msgstr "Wilt u aan het gesprek deelnemen?"
 
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s lijkt niet aangemeld te zijn en heeft uw bericht niet ontvangen."
 
-#, fuzzy
 msgid ""
 "Unable to connect to server. Please enter the address of the server to which "
 "you wish to connect."
 msgstr ""
-"Kan geen verbinding makenmet server. Geef de naam op van de server waarmee u "
-"contact wilt maken."
+"Kan geen verbinding maken met de server. Geef het adres op van de server "
+"waarmee u contact wilt maken."
 
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
-"Deze bijeenkomst is afgesloten. Er kunnen geen nieuwe berichten verzonden "
+"Deze conferentie is afgesloten. Er kunnen geen nieuwe berichten verzonden "
 "worden."
 
 #. *< type
@@ -7045,49 +6915,51 @@
 #. *  summary
 #. *  description
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Novell GroupWise Messenger protocol-plug-in"
+msgstr "Novell GroupWise Messenger protocol plug-in"
 
 msgid "Server address"
-msgstr "Server-adres"
+msgstr "Serveradres"
 
 msgid "Server port"
-msgstr "Server-poort"
-
-#, fuzzy, c-format
+msgstr "Serverpoort"
+
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
-
-#, fuzzy, c-format
+msgstr "Onverwacht antwoord ontvangen van %s: %s"
+
+#, c-format
 msgid "Received unexpected response from %s"
-msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
+msgstr "Onverwacht antwoord ontvangen van %s"
 
 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 ""
-"Je hebt je te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
-"keer. Als je verdergaat moet je nog langer wachten "
+"U heeft u te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
+"keer. Als u verder gaat moet u nog langer wachten."
 
 #. Note to translators: The first %s is a URL, the second is an
 #. error message.
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s: %s"
-msgstr "Fout oplossing %s"
+msgstr "Fout opvragen %s: %s"
 
 msgid ""
 "Server requested that you fill out a CAPTCHA in order to sign in, but this "
 "client does not currently support CAPTCHAs."
 msgstr ""
+"De server verzoekt u een CAPTCHA in te vullen om u aan te kunnen melden, "
+"maar deze cliëënt ondersteund op dit moment geen CAPTCHA's."
 
 msgid "AOL does not allow your screen name to authenticate here"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "AOL laat niet toe uw schermnaam hier te waarmerken"
+
+#, c-format
 msgid "Error requesting %s"
-msgstr "Fout oplossing %s"
+msgstr "Fout opvragen  %s"
 
 msgid "Could not join chat room"
-msgstr "Kon gesprek-ruimte niet binnenkomen"
+msgstr "Kon chatruimte niet binnenkomen"
 
 msgid "Invalid chat room name"
 msgstr "Ongeldige naam voor ruimte"
@@ -7096,166 +6968,145 @@
 msgstr "Ongeldige fout"
 
 msgid "Cannot receive IM due to parental controls"
-msgstr ""
+msgstr "Kan geen IM ontvangen door ouderlijk toezicht "
 
 msgid "Cannot send SMS without accepting terms"
-msgstr ""
-
-#, fuzzy
+msgstr "Kan geen SMS zenden zonder de voorwaarden te accepteren"
+
 msgid "Cannot send SMS"
-msgstr "Kan bestand niet verzenden"
+msgstr "Kan SMS niet verzenden"
 
 #. SMS_WITHOUT_DISCLAIMER is weird
-#, fuzzy
 msgid "Cannot send SMS to this country"
-msgstr "Kan geen map sturen."
+msgstr "Kan geen SMS zenden naar dit land."
 
 #. Undocumented
 msgid "Cannot send SMS to unknown country"
-msgstr ""
+msgstr "Kan geen SMS zenden naar onbekend land"
 
 msgid "Bot accounts cannot initiate IMs"
-msgstr ""
+msgstr "Bot accounts kunnen geen IM's initiëren "
 
 msgid "Bot account cannot IM this user"
-msgstr ""
+msgstr "Bot account kan geen IM sturen naar deze gebruiker"
 
 msgid "Bot account reached IM limit"
-msgstr ""
+msgstr "Bot account heeft de IM limiet bereikt"
 
 msgid "Bot account reached daily IM limit"
-msgstr ""
+msgstr "Bot account heeft dagelijks IM limiet bereikt"
 
 msgid "Bot account reached monthly IM limit"
-msgstr ""
-
-#, fuzzy
+msgstr "Bot account heeft maandelijks IM limiet bereikt"
+
 msgid "Unable to receive offline messages"
-msgstr "Kan het bericht niet verzenden."
-
-#, fuzzy
+msgstr "Kan geen offline berichten ontvangen"
+
 msgid "Offline message store full"
-msgstr "Off-line bericht"
-
-#, fuzzy, c-format
+msgstr "offline berichten opslag vol "
+
+#, c-format
 msgid "Unable to send message: %s (%s)"
-msgstr "Kan het bericht niet verzenden (%s)."
+msgstr "Kan bericht niet verzenden: %s (%s)"
 
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan het bericht niet verzenden: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to send message to %s: %s (%s)"
-msgstr "Kan het bericht niet verzenden aan %s:"
-
-#, fuzzy, c-format
+msgstr "Kan bericht niet verzenden naar %s: %s (%s)"
+
+#, c-format
 msgid "Unable to send message to %s: %s"
-msgstr "Kan het bericht niet verzenden aan %s:"
+msgstr "Kan bericht niet verzenden naar %s: %s"
 
 msgid "Thinking"
-msgstr ""
-
-#, fuzzy
+msgstr "Aan het nadenken"
+
 msgid "Shopping"
-msgstr "...stopt met typen"
-
-#, fuzzy
+msgstr "Winkelen"
+
 msgid "Questioning"
-msgstr "Dialoogvenster voor vragen"
-
-#, fuzzy
+msgstr "Vragenstellen"
+
 msgid "Eating"
-msgstr "Semafoon"
-
-#, fuzzy
+msgstr "Eten"
+
 msgid "Watching a movie"
-msgstr "Speelt een spelletje"
+msgstr "Film kijken"
 
 msgid "Typing"
 msgstr "Typen"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Niet op kantoor"
+msgstr "Op kantoor"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Aan 't Baden"
 
 msgid "Watching TV"
-msgstr ""
-
-#, fuzzy
+msgstr "aan 't TV kijken"
+
 msgid "Having fun"
-msgstr "Ophangen"
-
-#, fuzzy
+msgstr "Pret hebben"
+
 msgid "Sleeping"
-msgstr "Slaperig"
+msgstr "Slapen"
 
 msgid "Using a PDA"
-msgstr ""
-
-#, fuzzy
+msgstr "Een PDA aan 't gebruiken"
+
 msgid "Meeting friends"
-msgstr "Chat-vrienden"
-
-#, fuzzy
+msgstr "vrienden bezoeken"
+
 msgid "On the phone"
 msgstr "Aan de telefoon"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Herhalend"
+msgstr "Surfen"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mobiel"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Iets op het web zoeken"
 
 msgid "At a party"
-msgstr ""
+msgstr "Op een feestje"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Koffie drinken"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Gamende gebruiker"
+msgstr "Gamen"
 
 msgid "Browsing the web"
-msgstr ""
-
-#, fuzzy
+msgstr "Surfen op het web"
+
 msgid "Smoking"
-msgstr "Liedje"
-
-#, fuzzy
+msgstr "Roken"
+
 msgid "Writing"
-msgstr "Werken"
+msgstr "Schrijven"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Werken"
+msgstr "Drinken"
 
 msgid "Listening to music"
-msgstr "Luisteren naar muziek"
-
-#, fuzzy
+msgstr "naar muziek aan 't luisteren"
+
 msgid "Studying"
-msgstr "Verzenden"
-
-#, fuzzy
+msgstr "Studeren"
+
 msgid "In the restroom"
-msgstr "Interesses"
-
-#, fuzzy
+msgstr "Op de WC"
+
 msgid "Received invalid data on connection with server"
-msgstr "Ongeldige data ontvangen van server."
+msgstr "Ongeldige data ontvangen bij verbinding met server"
 
 #. *< type
 #. *< ui_requirement
@@ -7302,9 +7153,8 @@
 msgid "Received invalid data on connection with remote user."
 msgstr "Ongeldige data ontvangen via directe verbinding."
 
-#, fuzzy
 msgid "Unable to establish a connection with the remote user."
-msgstr "Kan geen verbinding maken met de andere gebruiker."
+msgstr "Kan geen verbinding maken met gebruiker op afstand."
 
 msgid "Direct IM established"
 msgstr "Directe verbinding opgezet"
@@ -7314,8 +7164,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 probeerde je een bestand te sturen %s file, maar we stemmen alleen tot %s "
-"toe op Direct IM.  Probeer bestandsoverdracht.\n"
+"%s probeerde u een %s bestand te sturen, maar we staan bestanden tot %s toe "
+"op Direct IM.  Probeer in plaats hiervan bestandsoverdracht.\n"
 
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
@@ -7338,8 +7188,7 @@
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
 "(Er was een fout tijdens het ontvangen van het bericht. Of jij en %s hebben "
-"verschillende codering-methoden ingesteld, of %s heeft een instabiele "
-"cliënt.)"
+"verschillende coderingmethoden ingesteld, of %s heeft een instabiele cliënt.)"
 
 # msgstr ""
 # "(Er is een fout opgetreden bij het ontvangen van het bericht. Of jij en %s "
@@ -7362,13 +7211,13 @@
 msgstr "Spelletjes"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Extra's"
 
 msgid "Send Buddy List"
-msgstr "Contactenlijst verzenden"
+msgstr "Vriendenlijst verzenden"
 
 msgid "ICQ Direct Connect"
 msgstr "ICQ Directe verbinding"
@@ -7430,25 +7279,20 @@
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#, fuzzy
 msgid "Evil"
-msgstr "E-mail"
-
-#, fuzzy
+msgstr "Kwaadaardig"
+
 msgid "Depression"
-msgstr "Baan"
-
-#, fuzzy
+msgstr "Depressie"
+
 msgid "At home"
-msgstr "Over mij"
-
-#, fuzzy
+msgstr "Thuis"
+
 msgid "At work"
-msgstr "Netwerk"
-
-#, fuzzy
+msgstr "Op het werk"
+
 msgid "At lunch"
-msgstr "Lunchen"
+msgstr "Aan 't Lunchen"
 
 msgid "IP Address"
 msgstr "IP-adres"
@@ -7457,17 +7301,17 @@
 msgstr "Waarschuwingsniveau"
 
 msgid "Buddy Comment"
-msgstr "Contactopmerking"
-
-#, fuzzy, c-format
+msgstr "Opmerking bij Vriend"
+
+#, c-format
 msgid "Unable to connect to authentication server: %s"
 msgstr ""
-"Kan niet verbinden met identificatieserver:\n"
+"Kan niet verbinden met waarmerkingserver:\n"
 "%s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to connect to BOS server: %s"
-msgstr "Kan geen verbinding maken met de computer."
+msgstr "Kan geen verbinding maken met BOS server: %s"
 
 msgid "Username sent"
 msgstr "Gebruikersnaam verzonden"
@@ -7479,7 +7323,7 @@
 msgid "Finalizing connection"
 msgstr "Afronden van verbinding"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to sign on as %s because the username is invalid.  Usernames must be "
 "a valid email address, or start with a letter and contain only letters, "
@@ -7490,10 +7334,11 @@
 "met een letter en slechts cijfers, letters en spaties bevatten, of slechts "
 "nummers bevatten."
 
-#, fuzzy, c-format
+#, c-format
 msgid "You may be disconnected shortly.  If so, check %s for updates."
 msgstr ""
-"U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
+"U wordt misschien zo binnenkort losgekoppeld. Als dat zo is, kijk dan op %s "
+"voor updates."
 
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kon geen geldige AIM aanmeld-hash krijgen."
@@ -7507,28 +7352,25 @@
 #. Unregistered username
 #. uid is not exist
 #. the username does not exist
-#, fuzzy
 msgid "Username does not exist"
-msgstr "Gebruiker bestaat niet"
+msgstr "Gebruikersnaam bestaat niet"
 
 #. Suspended account
-#, fuzzy
 msgid "Your account is currently suspended"
-msgstr "Uw Account is momenteel afgesloten"
+msgstr "Uw account is momenteel opgeschort"
 
 #. service temporarily unavailable
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "De AOL service is momenteel niet bereikbaar."
 
 #. username connecting too frequently
-#, fuzzy
 msgid ""
 "Your username has 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 ""
-"Je hebt je te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
-"keer. Als je verdergaat moet je nog langer wachten "
+"Uw gebruikersnaam is te vaak aan- en afgemeld. Wacht 10 minuten en probeer "
+"het nog een keer. Als u door met proberen, moet u nog langer wachten. "
 
 #. client too old
 #, c-format
@@ -7537,16 +7379,14 @@
 "Het programma wat u gebruikt is te oud. Haal een nieuwe versie op bij %s"
 
 #. IP address connecting too frequently
-#, fuzzy
 msgid ""
 "Your IP address has been connecting and disconnecting too frequently. Wait a "
 "minute and try again. If you continue to try, you will need to wait even "
 "longer."
 msgstr ""
-"Je hebt je te snel aan en afgemeld. Wacht 10 minuten en probeer het nog een "
-"keer. Als je verdergaat moet je nog langer wachten "
-
-#, fuzzy
+"Uw IP adres is te vaak  aan en afgemeld. Wacht een minuut en probeer het nog "
+"een keer. Als u verdergaat moet u nog langer wachten."
+
 msgid "The SecurID key entered is invalid"
 msgstr "Ingevoerde SecurID sleutel is ongeldig."
 
@@ -7563,7 +7403,7 @@
 msgstr "Kan verbinding niet initialiseren"
 
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Geef mij toestemming zodat ik u kan toevoegen aan mijn contactenlijst."
+msgstr "Geef mij toestemming zodat ik u kan toevoegen aan mijn vriendenlijst."
 
 msgid "No reason given."
 msgstr "Geen reden gegeven."
@@ -7577,19 +7417,19 @@
 "following reason:\n"
 "%s"
 msgstr ""
-"De gebruiker %u heeft je aanvraag om hem/haar toe te voegen aan je lijst "
+"De gebruiker %u heeft u aanvraag om hem/haar toe te voegen aan uw lijst "
 "geweigerd met de volgende reden:\n"
 "%s"
 
 msgid "ICQ authorization denied."
-msgstr "ICQ identificatie geweigerd."
+msgstr "ICQ Autorisatie geweigerd."
 
 #. Someone has granted you authorization
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
-"De gebruiker %u heeft toestemming gegeven. Hij/zij wordt toegevoegd aan je "
-"contactenlijst."
+"De gebruiker %u heeft u toestemming gegeven. Hij/zij wordt toegevoegd aan uw "
+"vriendenlijst."
 
 #, c-format
 msgid ""
@@ -7598,7 +7438,7 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"Je hebt een speciaal bericht ontvangen\n"
+"U heeft een speciaal bericht ontvangen\n"
 "\n"
 "Afzender: %s [%s]\n"
 "%s"
@@ -7610,7 +7450,7 @@
 "From: %s [%s]\n"
 "%s"
 msgstr ""
-"Je hebt een ICQ semafoonbericht ontvangen\n"
+"U heeft een ICQ semafoonbericht ontvangen\n"
 "\n"
 "Afzender: %s [%s]\n"
 "%s"
@@ -7622,17 +7462,17 @@
 "Message is:\n"
 "%s"
 msgstr ""
-"Je hebt een ICQ e-mail ontvangen van %s [%s]\n"
+"U heeft een ICQ e-mail ontvangen van %s [%s]\n"
 "\n"
 "Bericht:\n"
 "%s"
 
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
-msgstr "ICQ-gebruiker %u heeft je een contact toegestuurd: %s (%s)"
+msgstr "ICQ-gebruiker %u heeft u een vriend toegestuurd: %s (%s)"
 
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Wilt u deze persoon toevoegen aan uw contactenlijst?"
+msgstr "Wilt u deze persoon toevoegen aan uw vriendenlijst?"
 
 msgid "_Add"
 msgstr "Toe_voegen"
@@ -7672,10 +7512,10 @@
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] ""
-"Je hebt %hu bericht van %s gemist omdat zijn/haar waarschuwingsniveau te "
+"U heeft %hu bericht van %s gemist omdat zijn/haar waarschuwingsniveau te "
 "hoog is."
 msgstr[1] ""
-"Je hebt %hu berichten van %s gemist omdat zijn/haar waarschuwingsniveau te "
+"U heeft %hu berichten van %s gemist omdat zijn/haar waarschuwingsniveau te "
 "hoog is."
 
 #, c-format
@@ -7683,9 +7523,9 @@
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
 msgstr[0] ""
-"Je hebt %hu bericht van %s gemist omdat het waarschuwingsniveau te hoog is."
+"U heeft %hu bericht van %s gemist omdat het waarschuwingsniveau te hoog is."
 msgstr[1] ""
-"Je hebt %hu berichten van %s gemist omdat het waarschuwingsniveau te hoog is."
+"U heeft %hu berichten van %s gemist omdat het waarschuwingsniveau te hoog is."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -7760,7 +7600,7 @@
 
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "Je zou een e-mail moeten ontvangen met de vraag om %s te bevestigen."
+msgstr "U zou een e-mail moeten ontvangen met de vraag om %s te bevestigen."
 
 msgid "Account Confirmation Requested"
 msgstr "Accountbevestiging aangevraagd"
@@ -7826,8 +7666,8 @@
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Uw chat-afbeelding is niet verstuurd. u moet een directe verbinding hebben "
-"om IM-afbeeldingen te sturen."
+"Uw IM afbeelding is niet verstuurd. u moet een directe verbinding hebben om "
+"IM afbeeldingen te sturen."
 
 msgid "Unable to set AIM profile."
 msgstr "Kan AIM-profiel niet instellen."
@@ -7837,8 +7677,8 @@
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"Je hebt waarschijnlijk je profiel aangepast voordat je volledig aangemeld "
-"was. Je profiel is niet ingesteld. Probeer het nogmaals wanneer je volledig "
+"U heeft waarschijnlijk u profiel aangepast voordat u volledig aangemeld was. "
+"Uw profiel is niet ingesteld. Probeer het nogmaals wanneer u volledig "
 "aangemeld bent."
 
 #, c-format
@@ -7849,11 +7689,11 @@
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"De maximale profielgrootte van %d byte is overschreden. Het is voor je "
-"afgebroken."
+"De maximale profielgrootte van %d byte is overschreden. Het is voor u "
+"afgekapt."
 msgstr[1] ""
-"De maximale profielgrootte van %d bytes is overschreden. Het is voor je "
-"afgebroken."
+"De maximale profielgrootte van %d bytes is overschreden. Het is voor u "
+"afgekapt."
 
 msgid "Profile too long."
 msgstr "Profiel is te lang."
@@ -7866,53 +7706,53 @@
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
 msgstr[0] ""
-"De maximale grootte voor afwezigheidsberichten van %d byte is overschreden. "
-"Het is voor je afgebroken."
+"De maximale grootte voor afwezigheidberichten van %d byte is overschreden. "
+"Het is voor u afgekapt."
 msgstr[1] ""
-"De maximale grootte van afwezigheidsberichten van %d bytes is overschreden. "
-"het is voor je afgebroken."
+"De maximale grootte van afwezigheidberichten van %d bytes is overschreden. "
+"het is voor u afgekapt."
 
 msgid "Away message too long."
 msgstr "Afwezigheidsbericht te lang."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be a valid email address, or start with a letter and contain only letters, "
 "numbers and spaces, or contain only numbers."
 msgstr ""
-"Kan het contact %s niet toevoegen omdat de gebruikersnaam ongeldig is. "
+"Kan het vriend %s niet toevoegen omdat de gebruikersnaam ongeldig is. "
 "Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een "
-"letter en slechts cijfers en letters bevatten, of slechts nummers bevatten."
-
-#, fuzzy
+"letter en slechts cijfers, letters of spaties bevatten, of slechts nummers "
+"bevatten."
+
 msgid "Unable to Retrieve Buddy List"
-msgstr "Kan contactenlijst niet ophalen"
+msgstr "Kan vriendenlijst niet ophalen"
 
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few minutes."
 msgstr ""
-"De AIM-servers kunnen tijdelijk je contactenlijst versturen. De lijst is "
-"niet verdwenen, je kan deze waarschijnlijk over enkele uren weer benaderen."
+"De AIM-servers kunnen tijdelijk uw vriendenlijst versturen. De lijst is niet "
+"verdwenen, u kunt deze waarschijnlijk over enkele uren weer benaderen."
 
 msgid "Orphans"
 msgstr "Wezen"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
-"Kon %s niet als contact toevoegen omdat u te veel contacten in uw lijst "
-"heeft. Verwijder eerst een ander en probeer opnieuw."
+"Kon %s niet als vriend toevoegen omdat u te veel vrienden in uw "
+"vriendenlijst heeft. Verwijder eerst een en probeer opnieuw."
 
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add the buddy %s for an unknown reason."
-msgstr "Kan contact %s niet toevoegen voor een onbekende reden."
+msgstr "Kan vriend %s niet toevoegen door een onbekende reden."
 
 #, c-format
 msgid ""
@@ -7920,7 +7760,7 @@
 "Do you want to add this user?"
 msgstr ""
 "De gebruiker %s heeft u toestemming gegeven om u toe te voegen aan zijn of "
-"haar contactenlijst. Wilt u deze gebruiker toevoegen?"
+"haar vriendenlijst. Wilt u deze gebruiker toevoegen?"
 
 msgid "Authorization Given"
 msgstr "Toestemming gegeven"
@@ -7930,7 +7770,7 @@
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "De gebruiker %s heeft toestemming gegeven. Hij/zij wordt toegevoegd aan uw "
-"contactenlijst."
+"vriendenlijst."
 
 msgid "Authorization Granted"
 msgstr "Toestemming gegeven"
@@ -7943,7 +7783,7 @@
 "%s"
 msgstr ""
 "De gebruiker %s heeft uw aanvraag om hem/haar toe te voegen aan uw "
-"contactenlijst geweigerd met de volgende reden:\n"
+"vriendenlijst geweigerd met de volgende reden:\n"
 "%s"
 
 msgid "Authorization Denied"
@@ -7954,22 +7794,21 @@
 
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Uw chat-afbeelding is niet verstuurd. U kunt geen IM-afbeeldingen versturen "
-"in een AIM-chat."
+"Uw IM afbeelding is niet verstuurd. U kunt geen IM-afbeeldingen versturen in "
+"een AIM-chat."
 
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store-link"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Lunch"
 
 #, c-format
 msgid "Buddy Comment for %s"
-msgstr "Contactopmerking voor %s"
+msgstr "Opmerking over Vriend voor %s"
 
 msgid "Buddy Comment:"
-msgstr "Contactopmerking:"
+msgstr "Opmerking over Vriend:"
 
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
@@ -7985,24 +7824,21 @@
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#, fuzzy
 msgid "You closed the connection."
-msgstr "Server heeft de verbinding verbroken."
+msgstr "U  heeft de verbinding verbroken."
 
 msgid "Get AIM Info"
 msgstr "AIM-info ophalen"
 
 #. We only do this if the user is in our buddy list
 msgid "Edit Buddy Comment"
-msgstr "Opmerking bewerken"
-
-#, fuzzy
+msgstr "Vrienden opmerking bewerken"
+
 msgid "Get X-Status Msg"
-msgstr "Statusbericht tonen"
-
-#, fuzzy
+msgstr "Verkrijg X-Status Msg"
+
 msgid "End Direct IM Session"
-msgstr "Directe verbinding opgezet"
+msgstr "Beëindig Direct IM sessie"
 
 msgid "Direct IM"
 msgstr "Direct bericht"
@@ -8011,7 +7847,7 @@
 msgstr "Opnieuw toestemming vragen"
 
 msgid "Require authorization"
-msgstr "Identificatie nodig"
+msgstr "Autorisatie nodig"
 
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Webaanwezig (u kunt SPAM ontvangen als gevolg hiervan)"
@@ -8024,8 +7860,8 @@
 
 msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
-"Kan alleen alleen hoofdletter en spaties veranderen aan de formattering van "
-"de gebruikersnaam."
+"Kan alleen hoofdletter en spaties veranderen aan de formattering van de "
+"gebruikersnaam."
 
 msgid "Change Address To:"
 msgstr "Adres veranderen in: "
@@ -8034,23 +7870,23 @@
 msgstr "<i>u wacht niet op toestemming</i>"
 
 msgid "You are awaiting authorization from the following buddies"
-msgstr "U wacht op toestemming van de volgende contacten"
+msgstr "U wacht op toestemming van de volgende vrienden"
 
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
 "U kunt opnieuw toestemming aanvragen door met de rechter muisknop op de "
-"contacten te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
+"vrienden te klikken en de optie \"Opnieuw toestemming vragen.\" te kiezen."
 
 msgid "Find Buddy by Email"
-msgstr "Contact zoeken op e-mailadres"
+msgstr "Vriend zoeken op e-mailadres"
 
 msgid "Search for a buddy by email address"
-msgstr "Contact zoeken op e-mailadres"
+msgstr "Vriend zoeken op e-mailadres"
 
 msgid "Type the email address of the buddy you are searching for."
-msgstr "Geef het e-mail adres van de persoon waarnaar je zoekt."
+msgstr "Geef het e-mail adres van de persoon waarnaar u zoekt."
 
 msgid "_Search"
 msgstr "_Zoeken"
@@ -8080,17 +7916,16 @@
 msgstr "Huidige geregistreerde e-mailadres veranderen..."
 
 msgid "Show Buddies Awaiting Authorization"
-msgstr "Contacten weergeven die op toestemming wachten"
+msgstr "Vrienden weergeven die op toestemming wachten"
 
 msgid "Search for Buddy by Email Address..."
-msgstr "Contact zoeken door middel van e-mail..."
+msgstr "Vriend zoeken door middel van e-mail..."
 
 msgid "Search for Buddy by Information"
-msgstr "Contact zoeken via informatie"
-
-#, fuzzy
+msgstr "Vriend zoeken via informatie"
+
 msgid "Use clientLogin"
-msgstr "Gebruiker is niet aangemeld"
+msgstr "Gebruik clientLogin"
 
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
@@ -8098,8 +7933,8 @@
 "but does not reveal your IP address)"
 msgstr ""
 "Altijd AIM/ICQ proxy gebruiken voor\n"
-"bestandsoverdrachten en directe gesprekken(langzaam, maar verbergt uw IP-"
-"adres)"
+"bestandsoverdrachten en direct IM\n"
+"(langzaam, maar verbergt uw IP-adres)"
 
 msgid "Allow multiple simultaneous logins"
 msgstr "Meerdere keren gelijk inloggen toestaan"
@@ -8132,11 +7967,11 @@
 msgid "Invalid SNAC"
 msgstr "Ongeldige SNAC"
 
-msgid "Rate to host"
-msgstr "Frequentie naar host"
-
-msgid "Rate to client"
-msgstr "Frequentie naar cliënt"
+msgid "Server rate limit exceeded"
+msgstr "Server snelheidslimiet overschreden"
+
+msgid "Client rate limit exceeded"
+msgstr "Cliënt snelheidslimiet overschreden"
 
 msgid "Service unavailable"
 msgstr "Service niet beschikbaar"
@@ -8148,7 +7983,7 @@
 msgstr "Verouderde SNAC"
 
 msgid "Not supported by host"
-msgstr "Niet ondersteund door host"
+msgstr "Niet ondersteund door computer"
 
 msgid "Not supported by client"
 msgstr "Niet ondersteund door cliënt"
@@ -8297,9 +8132,8 @@
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
-#, fuzzy
 msgid "Authorize adding"
-msgstr "Gebruiker toestaan?"
+msgstr "Toevoegen toestaan"
 
 msgid "Cellphone Number"
 msgstr "Mobiele nummer"
@@ -8314,7 +8148,7 @@
 msgstr "Mobiel publiceren"
 
 msgid "Publish Contact"
-msgstr "Contact publiceren"
+msgstr "Contactpersoon publiceren"
 
 msgid "College"
 msgstr "School"
@@ -8335,14 +8169,13 @@
 msgstr "Onjuist"
 
 msgid "Modify Contact"
-msgstr "Contact bewerken"
+msgstr "Contactpersoon bewerken"
 
 msgid "Modify Address"
 msgstr "Adres bewerken"
 
-#, fuzzy
 msgid "Modify Extended Information"
-msgstr "Informatie wijzigen"
+msgstr "Uitgebreide Informatie wijzigen"
 
 msgid "Modify Information"
 msgstr "Informatie wijzigen"
@@ -8350,24 +8183,18 @@
 msgid "Update"
 msgstr "Bijwerken"
 
-#, fuzzy
 msgid "Could not change buddy information."
-msgstr "Contactinformatie veranderen."
+msgstr "Kon informatie over Vriend niet veranderen."
 
 msgid "Note"
-msgstr "Opmerking"
-
-# msgstr ""
-# "(Er is een fout opgetreden bij het ontvangen van het bericht. Of jij en %s "
-# "hebben verschillende coderingen geselecteerd of de andere persoon gebruikt "
-# "een chatprogramma met fouten.)"
+msgstr "Notitie"
+
 #. callback
-#, fuzzy
 msgid "Buddy Memo"
-msgstr "pictogram"
+msgstr "Vriend Memo"
 
 msgid "Change his/her memo as you like"
-msgstr ""
+msgstr "Verander zijn/haar memo naar believen"
 
 msgid "_Modify"
 msgstr "_Bewerken"
@@ -8389,7 +8216,7 @@
 msgstr "%u vereist identificatie"
 
 msgid "Add buddy question"
-msgstr "Contactvraag toevoegen"
+msgstr "Vraag van Vriend toevoegen"
 
 msgid "Enter answer here"
 msgstr "Voer hier antwoord in"
@@ -8401,17 +8228,17 @@
 msgstr "Ongeldig antwoord."
 
 msgid "Authorization denied message:"
-msgstr "Identificatie van weigeringsbericht:"
+msgstr "Weigeringsbericht:"
 
 msgid "Sorry, you're not my style."
-msgstr "Sorry, je bent niet mijn type."
+msgstr "Sorry, u bent niet mijn type."
 
 #, c-format
 msgid "%u needs authorization"
-msgstr "%u vereist authentificatie"
+msgstr "%u vereist Autorisatie"
 
 msgid "Add buddy authorize"
-msgstr "Contact-authentificatie toevoegen"
+msgstr "Vriend-Autorisatie toevoegen"
 
 msgid "Enter request here"
 msgstr "Geef hier uw verzoek"
@@ -8420,25 +8247,24 @@
 msgstr "Wilt u mijn vriend zijn?"
 
 msgid "QQ Buddy"
-msgstr "QQ-contact"
+msgstr "QQ-Vriend"
 
 msgid "Add buddy"
-msgstr "Contact toevoegen"
+msgstr "Vriend toevoegen"
 
 msgid "Invalid QQ Number"
-msgstr "Ongeldige QQ-number"
-
-#, fuzzy
+msgstr "Ongeldige QQ nummer"
+
 msgid "Failed sending authorize"
-msgstr "Geef mij toestemming, alstublieft!"
+msgstr "Verzenden autorisatie mislukt"
 
 #, c-format
 msgid "Failed removing buddy %u"
-msgstr "Verwijderen contact %u mislukt"
+msgstr "Verwijderen vriend %u mislukt"
 
 #, c-format
 msgid "Failed removing me from %d's buddy list"
-msgstr "Verwijderen van %d's contactenlijst mislukt"
+msgstr "Verwijderen van %d's vriendenlijst mislukt"
 
 msgid "No reason given"
 msgstr "Geen reden gegeven"
@@ -8471,9 +8297,8 @@
 msgid "Please enter Qun number"
 msgstr "Voer Qun-nummer in"
 
-#, fuzzy
 msgid "You can only search for permanent Qun\n"
-msgstr "U kunt alleen naar permanente QQ-groepen zoeken\n"
+msgstr "U kunt alleen naar permanente Qun zoeken\n"
 
 msgid "(Invalid UTF-8 string)"
 msgstr "(Ongeldige UTF-8 tekenreeks)"
@@ -8491,9 +8316,8 @@
 msgstr "Beheerder"
 
 #. XXX: Should this be "Topic"?
-#, fuzzy
 msgid "Room Title"
-msgstr "Lijst van ruimtes"
+msgstr "Ruimte titel"
 
 msgid "Notice"
 msgstr "Opmerking"
@@ -8510,22 +8334,21 @@
 msgid "Category"
 msgstr "Categorie"
 
-#, fuzzy
 msgid "The Qun does not allow others to join"
-msgstr "Deze groep laat geen nieuwe deelnemers toe"
+msgstr "De Qun laat geen andere deelnemers toe"
 
 msgid "Join QQ Qun"
-msgstr "Deelnemen aan QQ Qun"
+msgstr "Aansluiten bij QQ Qun"
 
 msgid "Input request here"
 msgstr "Geef hier uw verzoek"
 
 #, c-format
 msgid "Successfully joined Qun %s (%u)"
-msgstr "Succesvolle deelname Qun %s (%u)"
+msgstr "Succesvol aangesloten bij Qun %s (%u)"
 
 msgid "Successfully joined Qun"
-msgstr "Succesvol aan Qun deelgenmen"
+msgstr "Succesvol aangesloten bij Qun"
 
 #, c-format
 msgid "Qun %u denied from joining"
@@ -8538,7 +8361,7 @@
 msgstr "Mislukt:"
 
 msgid "Join Qun, Unknown Reply"
-msgstr "Deelnemenen aan Qun, onbekend antwoord"
+msgstr "Deelnemen aan Qun, onbekend antwoord"
 
 msgid "Quit Qun"
 msgstr "Qun Afsluiten"
@@ -8551,7 +8374,7 @@
 "deze opdracht verwijdert deze Qun uiteindelijk."
 
 msgid "Sorry, you are not our style"
-msgstr "Sorry, je bent niet ons type"
+msgstr "Sorry, u bent niet ons type"
 
 msgid "Successfully changed Qun members"
 msgstr "Qun-leden met succes veranderd"
@@ -8560,38 +8383,37 @@
 msgstr "Qun-informatie met succes veranderd"
 
 msgid "You have successfully created a Qun"
-msgstr "Je hebt een Qun aangemaakt"
-
-#, fuzzy
+msgstr "U heeft een Qun aangemaakt"
+
 msgid "Would you like to set up detailed information now?"
-msgstr "Wilt u de Qundetails nu instellen?"
+msgstr "Wilt u de gedetailleerde informatie nu instellen?"
 
 msgid "Setup"
 msgstr "Instellen"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%u requested to join Qun %u for %s"
-msgstr "Gebruiker %d wil deelnemen aan de groep %d"
-
-#, fuzzy, c-format
+msgstr "%u wilde zich aansluiten bij Qun %u voor %s"
+
+#, c-format
 msgid "%u request to join Qun %u"
-msgstr "Gebruiker %d wil deelnemen aan de groep %d"
+msgstr "%u verzoekt zich aan te sluiten bij Qun %u"
 
 #, c-format
 msgid "Failed to join Qun %u, operated by admin %u"
-msgstr ""
+msgstr "Niet gelukt aan te sluiten bij Qun %u, uitgevoerd door admin %u "
 
 #, c-format
 msgid "<b>Joining Qun %u is approved by admin %u for %s</b>"
-msgstr ""
+msgstr "<b>aansluiten bij Qun %u is goedgekeurd door admin %u voor %s</b>"
 
 #, c-format
 msgid "<b>Removed buddy %u.</b>"
-msgstr "<b>Contact verwijderd %u.</b>"
+msgstr "<b>Vriend verwijderd %u.</b>"
 
 #, c-format
 msgid "<b>New buddy %u joined.</b>"
-msgstr "<b>Nieuw contact %u nam deel.</b>"
+msgstr "<b>Nieuw vriend %u heeft zich aangesloten.</b>"
 
 #, c-format
 msgid "Unknown-%d"
@@ -8610,7 +8432,7 @@
 msgstr " Vanaf mobiel"
 
 msgid " BindMobile"
-msgstr "BindMobile"
+msgstr "BiNDMobile"
 
 msgid " Video"
 msgstr "Video"
@@ -8636,7 +8458,7 @@
 
 #, c-format
 msgid "<b>Total Online Buddies</b>: %d<br>\n"
-msgstr "<b>Totaal beschikbare contacten</b>: %d<br>\n"
+msgstr "<b>Totaal online vrienden</b>: %d<br>\n"
 
 #, c-format
 msgid "<b>Last Refresh</b>: %d-%d-%d, %d:%d:%d<br>\n"
@@ -8646,9 +8468,9 @@
 msgid "<b>Server</b>: %s<br>\n"
 msgstr "<b>Server</b>: %s<br>\n"
 
-#, fuzzy, c-format
+#, c-format
 msgid "<b>Client Tag</b>: %s<br>\n"
-msgstr "<b>Aanmeldtijd</b>: %s<br>\n"
+msgstr "<b>Client Tag</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
@@ -8656,7 +8478,7 @@
 
 #, c-format
 msgid "<b>My Internet IP</b>: %s:%d<br>\n"
-msgstr "<b>Mijn IP-adres</b>: %s<br>\n"
+msgstr "<b>Mijn IP-adres</b>: %s:%d<br>\n"
 
 #, c-format
 msgid "<b>Sent</b>: %lu<br>\n"
@@ -8689,7 +8511,7 @@
 msgstr "<b>IP</b>: %s<br>\n"
 
 msgid "Login Information"
-msgstr "Aanmeldinformatie"
+msgstr "Aanmeldingsinformatie"
 
 msgid "<p><b>Original Author</b>:<br>\n"
 msgstr "<p><b>Oorspronkelijke auteur</b>:<br>\n"
@@ -8700,22 +8522,20 @@
 msgid "<p><b>Lovely Patch Writers</b>:<br>\n"
 msgstr "<p><b>Geweldige patchschrijvers</b>:<br>\n"
 
-#, fuzzy
 msgid "<p><b>Acknowledgement</b>:<br>\n"
-msgstr "<b>Verzonden</b>: %lu<br>\n"
-
-#, fuzzy
+msgstr "<p><b>dankbetuiging</b>:<br>\n"
+
 msgid "<p><b>Scrupulous Testers</b>:<br>\n"
-msgstr "<p><b>Oorspronkelijke auteur</b>:<br>\n"
+msgstr "<p><b>Rigoureuze Testers</b>:<br>\n"
 
 msgid "and more, please let me know... thank you!))"
-msgstr ""
+msgstr "en meer, laat het me svp weten... Dank u!))"
 
 msgid "<p><i>And, all the boys in the backroom...</i><br>\n"
 msgstr "<p><i>En, alle jongens in de achterkamer...</i><br>\n"
 
 msgid "<i>Feel free to join us!</i> :)"
-msgstr "<i>Neem zonder aarzelen deel aan dit project!</i> :)"
+msgstr "<i>Het staat u vrij zich bij ons aan te sluiten!</i> :)"
 
 #, c-format
 msgid "About OpenQ %s"
@@ -8737,7 +8557,7 @@
 msgstr "Over OpenQ"
 
 msgid "Modify Buddy Memo"
-msgstr "Contactmemo wijzigen"
+msgstr "Vriendmemo wijzigen"
 
 #. *< type
 #. *< ui_requirement
@@ -8750,13 +8570,13 @@
 #. *  summary
 #. *  description
 msgid "QQ Protocol Plugin"
-msgstr "QQ protocol-plug-in"
+msgstr "QQ protocol plug-in"
 
 msgid "Auto"
 msgstr "Automatisch"
 
 msgid "Select Server"
-msgstr "Server selecteren"
+msgstr "Selecteer Server"
 
 msgid "QQ2005"
 msgstr "QQ2005"
@@ -8768,48 +8588,47 @@
 msgstr "QQ2008"
 
 msgid "Connect by TCP"
-msgstr "Verbinding met behulp van TCP"
+msgstr "Verbinden via TCP"
 
 msgid "Show server notice"
-msgstr "Server-notificatie weergeven"
+msgstr "Weergeven Serverberichten"
 
 msgid "Show server news"
-msgstr "Server-nieuwe weergeven"
+msgstr "Weergeven Servernieuws"
 
 msgid "Show chat room when msg comes"
-msgstr ""
+msgstr "Toon chatruimte wanneer msg binnenkomt"
 
 msgid "Keep alive interval (seconds)"
-msgstr "Behoud-interval (in seconden)"
+msgstr "Keepalive-interval (seconden)"
 
 msgid "Update interval (seconds)"
-msgstr "Vernieuw-interval (in seconden)"
-
-#, fuzzy
+msgstr "Update-interval (in seconden)"
+
 msgid "Unable to decrypt server reply"
-msgstr "Kan login-antwoord niet decoderen"
+msgstr "Kan server antwoord niet decoderen"
 
 #, c-format
 msgid "Failed requesting token, 0x%02X"
-msgstr ""
+msgstr "Niet gelukt om een token te vragen, 0x%02X"
 
 #, c-format
 msgid "Invalid token len, %d"
-msgstr "Ongeldige tekenreekslengte, %d"
+msgstr "Ongeldig token len, %d"
 
 #. extend redirect used in QQ2006
 msgid "Redirect_EX is not currently supported"
-msgstr ""
+msgstr "Redirect_EX wordt nu niet ondersteund"
 
 #. need activation
 #. need activation
 #. need activation
 msgid "Activation required"
-msgstr "Activatie vereist"
-
-#, fuzzy, c-format
+msgstr "Activering vereist"
+
+#, c-format
 msgid "Unknown reply code when logging in (0x%02X)"
-msgstr "Ongeldig antwoord-code, 0x%02X"
+msgstr "Onbekende antwoordcode bij aanmelden (0x%02X)"
 
 msgid "Requesting captcha"
 msgstr "Captcha aanvragen"
@@ -8831,17 +8650,19 @@
 msgstr "QQ captcha-controle"
 
 msgid "Enter the text from the image"
-msgstr "Geef de naam van de afbeelding"
-
-#, fuzzy, c-format
+msgstr "Geef de tekst van de afbeelding"
+
+#, c-format
 msgid "Unknown reply when checking password (0x%02X)"
-msgstr "Ongeldig antwoord-code, 0x%02X"
-
-#, fuzzy, c-format
+msgstr "Onbekend antwoordcode bij verifiëren wachtwoord (0x%02X)"
+
+#, c-format
 msgid ""
 "Unknown reply code when logging in (0x%02X):\n"
 "%s"
-msgstr "Ongeldig antwoord-code, 0x%02X"
+msgstr ""
+"Onbekend antwoordcode bij aanmelden (0x%02X):\n"
+"%s"
 
 msgid "Socket error"
 msgstr "Socketfout"
@@ -8850,11 +8671,10 @@
 msgstr "Server verkrijgen"
 
 msgid "Requesting token"
-msgstr "Tekenreeks aanvragen"
-
-#, fuzzy
+msgstr "Token aanvragen"
+
 msgid "Unable to resolve hostname"
-msgstr "Kan geen verbinding maken met de computer."
+msgstr "Kan computernaam niet oplossen"
 
 msgid "Invalid server or port"
 msgstr "Ongeldige server of poort"
@@ -8863,7 +8683,7 @@
 msgstr "Verbinden met server"
 
 msgid "QQ Error"
-msgstr "QQ-fout"
+msgstr "QQ Fout"
 
 #, c-format
 msgid ""
@@ -8872,7 +8692,7 @@
 "%s\n"
 "%s"
 msgstr ""
-"Server-nieuws:\n"
+"Server Nieuws:\n"
 "%s\n"
 "%s\n"
 "%s"
@@ -8890,43 +8710,42 @@
 "Server notice From %s: \n"
 "%s"
 msgstr ""
-"Server-instructies van %s: \n"
+"Server Notitie %s: \n"
 "%s"
 
 msgid "Unknown SERVER CMD"
-msgstr "Onbekende server-cmd"
+msgstr "Onbekende SERVER CMD"
 
 #, c-format
 msgid ""
 "Error reply of %s(0x%02X)\n"
 "Room %u, reply 0x%02X"
 msgstr ""
+"Fout by antwoorden van %s(0x%02X)\n"
+"Ruimte %u, antwoord 0x%02X"
 
 msgid "QQ Qun Command"
-msgstr "QQ Qun-opdracht"
-
-#, fuzzy
+msgstr "QQ Qun Commando"
+
 msgid "Unable to decrypt login reply"
-msgstr "Kan login-antwoord niet decoderen"
-
-#, fuzzy
+msgstr "Kan login antwoord niet decoderen"
+
 msgid "Unknown LOGIN CMD"
-msgstr "Unknow reply CMD"
-
-#, fuzzy
+msgstr "onbekend LOGIN CMD"
+
 msgid "Unknown CLIENT CMD"
-msgstr "Onbekend server cmd"
+msgstr "Onbekend CLIENT CMD"
 
 #, c-format
 msgid "%d has declined the file %s"
-msgstr "%d heeft het onderwerp veranderd naar: %s"
+msgstr "%d heeft het bestand %s afgewezen"
 
 msgid "File Send"
-msgstr "Bestanden sturen"
-
-#, fuzzy, c-format
+msgstr "Bestand Versturen"
+
+#, c-format
 msgid "%d cancelled the transfer of %s"
-msgstr "%d heeft de overdracht van %s afgebroken"
+msgstr "%d heeft de overdracht van %s geannuleerd"
 
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
@@ -8934,14 +8753,14 @@
 
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
-msgstr "<b>Notes groeps-ID:</b> %s<br>"
+msgstr "<b>Notes Groep ID:</b> %s<br>"
 
 #, c-format
 msgid "Info for Group %s"
-msgstr "Info voor groep %s"
+msgstr "Info voor Groep %s"
 
 msgid "Notes Address Book Information"
-msgstr "Notes adresboekinformatie"
+msgstr "Notes Adresboekinformatie"
 
 msgid "Invite Group to Conference..."
 msgstr "Groep uitnodigen voor conferentie..."
@@ -8950,19 +8769,19 @@
 msgstr "Notes Adresboekinformatie ophalen"
 
 msgid "Sending Handshake"
-msgstr "Sturen van handshake"
+msgstr "Sturen van Handshake"
 
 msgid "Waiting for Handshake Acknowledgement"
-msgstr "Wacht op antwoord"
+msgstr "Wacht op Handshake bevestiging"
 
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Contact gelegd. Bezig met aanmelding"
+msgstr "Handshake bevestigd. Bezig met Aanmelden"
 
 msgid "Waiting for Login Acknowledgement"
 msgstr "Wacht op bevestiging aanmelding"
 
 msgid "Login Redirected"
-msgstr "Aanmelding doorgestuurd"
+msgstr "Aanmelding omgeleid"
 
 msgid "Forcing Login"
 msgstr "Aanmelden forceren"
@@ -9003,7 +8822,7 @@
 msgstr "Microfoon"
 
 msgid "Speakers"
-msgstr "Speakers"
+msgstr "Luidsprekers"
 
 msgid "Video Camera"
 msgstr "Videocamera"
@@ -9012,7 +8831,7 @@
 msgstr "Bestandsoverdracht"
 
 msgid "Supports"
-msgstr "Ondersteuning"
+msgstr "Ondersteunt"
 
 msgid "External User"
 msgstr "Externe gebruiker"
@@ -9025,7 +8844,7 @@
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
-"Geef een onderwerp voor deze bijeenkomst, en een uitnodiging om naar %s te "
+"Geef een onderwerp voor deze conferentie en een uitnodiging om naar %s te "
 "sturen"
 
 msgid "New Conference"
@@ -9035,13 +8854,13 @@
 msgstr "Aanmaken"
 
 msgid "Available Conferences"
-msgstr "Beschikbare bijeenkomsten"
+msgstr "Beschikbare Conferenties"
 
 msgid "Create New Conference..."
-msgstr "Nieuwe bijeenkomst..."
+msgstr "Aanmaken Nieuwe Conferentie..."
 
 msgid "Invite user to a conference"
-msgstr "Gebruiker uitnodigen voor een bijeenkomst"
+msgstr "Gebruiker uitnodigen voor een conferentie"
 
 #, c-format
 msgid ""
@@ -9049,15 +8868,15 @@
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Kies een bijeenkomst uit onderstaande lijst om een uitnodiging naar %s te "
-"sturen. Kies \"Nieuwe bijeenkomst\" als u een nieuwe bijeenkomst wilt "
+"Kies een conferentie uit onderstaande lijst om een uitnodiging naar %s te "
+"sturen. Kies \"Nieuwe conferentie\" als u een nieuwe conferentie wilt "
 "aanmaken."
 
 msgid "Invite to Conference"
-msgstr "Uitnodigen voor bijeenkomst"
+msgstr "Uitnodigen voor conferentie"
 
 msgid "Invite to Conference..."
-msgstr "Uitnodigen voor bijeenkomst..."
+msgstr "Uitnodigen voor conferentie..."
 
 msgid "Send TEST Announcement"
 msgstr "TEST-aankondiging versturen"
@@ -9073,7 +8892,7 @@
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Er is geen computernaam of IP-adres inegsteld in Meanwhile-account %s. Vul "
+"Er is geen computernaam of IP-adres ingesteld in Meanwhile-account %s. Vul "
 "hieronder één in om door te gaan met de aanmelding."
 
 msgid "Meanwhile Connection Setup"
@@ -9108,8 +8927,9 @@
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
-"Er zijn meerdere gebruikers gevonden die overeenkomen met '%s'. Kies de "
-"juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+"Identificatie '%s' kan betrekking hebben op elk van de volgende gebruikers. "
+"Selecteer de correcte gebruiker uit de lijst hieronder om toe te voegen aan "
+"uw vriendenlijst."
 
 msgid "Select User"
 msgstr "Gebruiker selecteren"
@@ -9134,13 +8954,13 @@
 "%s.\n"
 
 msgid "Remotely Stored Buddy List"
-msgstr "Op server opgeslagen contactenlijst"
+msgstr "Op server opgeslagen vriendenlijst"
 
 msgid "Buddy List Storage Mode"
-msgstr "Opslaan van contactenlijst"
+msgstr "Vriendenlijst opslag modus"
 
 msgid "Local Buddy List Only"
-msgstr "Alleen lokale contactenlijst"
+msgstr "Alleen lokale vriendenlijst"
 
 msgid "Merge List from Server"
 msgstr "Lijst downloaden van server en samenvoegen"
@@ -9181,8 +9001,9 @@
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"De identificatie '%s' kan naar ieder van de volgende groepen verwijzen. Kies "
-"de juiste uit de lijst hieronder."
+"De identificatie '%s' kan naar ieder van de volgende Notes Adresboek groepen "
+"verwijzen. Kies de juiste uit de lijst hieronder om aan uw vriendenlijst toe "
+"te voegen."
 
 msgid "Select Notes Address Book"
 msgstr "Notes adresboek selecteren"
@@ -9194,17 +9015,19 @@
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
-msgstr "De identificatie '%s' gaf geen overeenkomende resultaten."
+msgstr ""
+"De identificatie '%s' gaf geen overeenkomende Notes Adresboek groups "
+"resultaten in uw Sametime gemeenschap."
 
 msgid "Notes Address Book Group"
-msgstr "Notes adresboekgroep"
+msgstr "Notes Adresboek Groep"
 
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
-"Geef de groepsnaam in het veld hieronder om de groep en de leden toe te "
-"voegen aan uw contactenlijst."
+"Vul de naam in van een Notes Adresboek groep in het veld hieronder om de "
+"groep met zijn leden toe te voegen aan uw vriendenlijst."
 
 #, c-format
 msgid "Search results for '%s'"
@@ -9259,7 +9082,7 @@
 msgstr "Gebruiker zoeken..."
 
 msgid "Force login (ignore server redirects)"
-msgstr "Aanmelding forceren (server redirect negeren)"
+msgstr "Aanmelding forceren (server omleiding negeren)"
 
 #  pretend to be Sametime Connect
 #. pretend to be Sametime Connect
@@ -9353,8 +9176,8 @@
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
-"Je kan geen meldingen krijgen totdat u de openbare sleutel van deze "
-"gebruiker importeert.  Je kan de opdracht \"Openbare sleutel ophalen\" "
+"U kunt geen meldingen krijgen totdat u de openbare sleutel van deze "
+"gebruiker importeert.  U kunt de opdracht \"Openbare sleutel ophalen\" "
 "gebruiken om de openbare sleutel te importeren."
 
 #. Open file selector to select the public key.
@@ -9363,7 +9186,7 @@
 
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr "De %s contactpersoon is niet aanwezig op het netwerk"
+msgstr "De %s vriend is niet aanwezig op het netwerk"
 
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
@@ -9383,14 +9206,14 @@
 "user from the list to add to the buddy list."
 msgstr ""
 "Er zijn meerdere gebruikers gevonden met dezelfde openbare sleutel. Kies de "
-"juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+"juiste gebruiker uit de lijst om deze toe te voegen aan de vriendenlijst."
 
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 "Er zijn meerdere gebruikers gevonden met dezelfde naam. Kies de juiste "
-"gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+"gebruiker uit de lijst om deze toe te voegen aan de vriendenlijst."
 
 msgid "Detached"
 msgstr "Losgekoppeld"
@@ -9411,7 +9234,7 @@
 msgstr "Gebruikersmodi"
 
 msgid "Preferred Contact"
-msgstr "Voorkeurscontact"
+msgstr "Voorkeurscontactpersoon"
 
 msgid "Preferred Language"
 msgstr "Voorkeurstaal"
@@ -9423,7 +9246,7 @@
 msgstr "Tijdzone"
 
 msgid "Geolocation"
-msgstr "Geo-locatie"
+msgstr "Geolocatie"
 
 msgid "Reset IM Key"
 msgstr "IM-sleutel resetten"
@@ -9491,7 +9314,7 @@
 
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>Babbleprint van oprichter:</b><br>%s"
+msgstr "<br><b>Kanaalstichter Sleutel Babbleprint:</b><br>%s"
 
 msgid "Add Channel Public Key"
 msgstr "Openbare kanaalsleutel toevoegen"
@@ -9514,14 +9337,14 @@
 "channel public keys are set then only users whose public keys are listed are "
 "able to join."
 msgstr ""
-"Kanaalidentificatie wordt gebruikt om het kanaal te beveiligen tegen "
-"ongewenste personen. De identificaite kan op basis van wachtwoorden of "
+"Kanaal waarmerking wordt gebruikt om het kanaal te beveiligen tegen "
+"ongewenste personen. De waarmerking kan op basis van wachtwoorden of "
 "digitale handtekeningen (sleutels). Alleen gebruikers die het juiste "
 "wachtwoord weten of waarvan de openbare sleutel in de lijst voorkomt kunnen "
 "deelnemen aan het kanaal."
 
 msgid "Channel Authentication"
-msgstr "Kanaalidentificatie"
+msgstr "Kanaal Waarmerking"
 
 msgid "Add / Remove"
 msgstr "Toevoegen / verwijderen"
@@ -9585,7 +9408,7 @@
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr ""
-"U moet lid zijn van het %s-kanaal voordat u mag deelnemen aan de privé-groep"
+"U moet lid zijn van het kanaal %s voordat u mag deelnemen aan de privé-groep"
 
 msgid "Join Private Group"
 msgstr "Deelnemen aan privégroep"
@@ -9594,7 +9417,7 @@
 msgstr "Kan niet deelnamen aan privégroep"
 
 msgid "Call Command"
-msgstr "Oproep-opdracht"
+msgstr "Oproepopdracht"
 
 msgid "Cannot call command"
 msgstr "Kan opdracht niet starten"
@@ -9603,7 +9426,7 @@
 msgstr "Onbekende opdracht"
 
 msgid "Secure File Transfer"
-msgstr "Beveiligde bestandsoverdrachten"
+msgstr "Beveiligde bestandsoverdracht"
 
 msgid "Error during file transfer"
 msgstr "Fout bij bestandsoverdracht"
@@ -9697,7 +9520,7 @@
 msgstr "Afdeling"
 
 msgid "Join Chat"
-msgstr "Chat openen"
+msgstr "Aan Chat deelnemen"
 
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
@@ -9714,7 +9537,7 @@
 msgstr "Statustekst"
 
 msgid "Public Key Fingerprint"
-msgstr "Vingerafdruk van openbare sleutel"
+msgstr "Handtekening van openbare sleutel"
 
 msgid "Public Key Babbleprint"
 msgstr "Openbare babbleprint"
@@ -9747,7 +9570,7 @@
 msgstr "Geen publieke sleutel ontvangen"
 
 msgid "Server Information"
-msgstr "Server-informatie"
+msgstr "Serverinformatie"
 
 msgid "Cannot get server information"
 msgstr "Kan geen serverinformatie vinden"
@@ -9817,7 +9640,7 @@
 msgstr "Herstellen van sessie"
 
 msgid "Authenticating connection"
-msgstr "Certificeren van verbinding"
+msgstr "Waarmerking van de verbinding"
 
 msgid "Verifying server public key"
 msgstr "Verificatie van serversleutel"
@@ -9831,12 +9654,12 @@
 "still like to accept this public key?"
 msgstr ""
 "%s's openbare sleutel ontvangen. Deze komt niet overeen met de opgeslagen "
-"sleutel. Wil je de publieke sleutel nog steeds accepteren?"
+"sleutel. Wilt u de publieke sleutel nog steeds accepteren?"
 
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
-"%s's openbare sleutel ontvangen. Wil je de publieke sleutel accepteren?"
+"%s's openbare sleutel ontvangen. Wilt u de publieke sleutel accepteren?"
 
 #, c-format
 msgid ""
@@ -9862,9 +9685,8 @@
 msgid "Disconnected by server"
 msgstr "Verbinding verbroken door server"
 
-#, fuzzy
 msgid "Error connecting to SILC Server"
-msgstr "Fout bij verbinden met SILC-server"
+msgstr "Fout bij verbinden met SILC server"
 
 msgid "Key Exchange failed"
 msgstr "Sleuteluitwisseling mislukt"
@@ -9878,7 +9700,6 @@
 msgid "Performing key exchange"
 msgstr "Bezig met sleuteluitwisseling"
 
-#, fuzzy
 msgid "Unable to load SILC key pair"
 msgstr "Kan SILC sleutelpaar niet laden"
 
@@ -9889,7 +9710,6 @@
 msgid "Out of memory"
 msgstr "Te weinig geheugen"
 
-#, fuzzy
 msgid "Unable to initialize SILC protocol"
 msgstr "Kan SILC-protocol niet starten"
 
@@ -9933,7 +9753,7 @@
 msgstr "Anderen uw gebruikte diensten laten zien"
 
 msgid "Let others see what computer you are using"
-msgstr "Anderen door u gebruiket computer laten zien"
+msgstr "Anderen door u gebruikte computer laten zien"
 
 msgid "Your VCard File"
 msgstr "Uw VCard-bestand"
@@ -10002,7 +9822,7 @@
 msgstr "Onderwerp te lang"
 
 msgid "You must specify a nick"
-msgstr "U moet een bijnaam aangeven"
+msgstr "U moet een nick specificeren"
 
 #, c-format
 msgid "channel %s not found"
@@ -10022,36 +9842,35 @@
 
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
-msgstr "Onbekende opdracht: %s, (zou een client-bug kunnen zijn)"
+msgstr "Onbekende opdracht: %s, (zou een cliënt bug kunnen zijn)"
 
 msgid "part [channel]:  Leave the chat"
-msgstr "part [kanaal]:  Kanaal verlaten"
+msgstr "part [channel]:  Kanaal verlaten"
 
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [kanaal]:  Kanaal verlaten"
+msgstr "leave [channel]:  Kanaal verlaten"
 
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
-msgstr "topic [&lt;nieuw onderwerp&gt;]:  Onderwerp weergeven / veranderen"
+msgstr "topic [&lt;new topic&gt;]:  Onderwerp weergeven / veranderen"
 
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
-"join &lt;kanaal&gt; [&lt;wachtwoord&gt;]:  Deelnemen aan een kanaal op dit "
+"join &lt;channel&gt; [&lt;wachtwoord&gt;]:  Deelnemen aan een kanaal op dit "
 "netwerk"
 
 msgid "list:  List channels on this network"
 msgstr "list:  Lijst van kanalen op dit netwerk"
 
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;bijnaam&gt;:  Informatie over bijnaam weergeven"
+msgstr "whois &lt;nick&gt;:  Informatie over nick weergeven"
 
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
-"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
-"gebruiker"
+"msg &lt;nick&gt; &lt;message&gt;:  Een privébericht sturen aan een gebruiker"
 
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
-"query &lt;bijnaam&gt; [&lt;bericht&gt;]:  Een privébercith sturen aan een "
+"query &lt;nick&gt; [&lt;message&gt;]:  Een privébericht sturen aan een "
 "gebruiker"
 
 msgid "motd:  View the server's Message Of The Day"
@@ -10066,30 +9885,29 @@
 "afscheidsbericht"
 
 msgid "call &lt;command&gt;:  Call any silc client command"
-msgstr "call &lt;opdracht&gt;:  Een willekeurige SILC-client-opdracht starten"
+msgstr "call &lt;opdracht&gt;:  Een willekeurige SILC cliëntopdracht starten"
 
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
-msgstr ""
-"kill &lt;bijnaam&gt; [-openbsleutel|&lt;reden&gt;]:  bijnaam vernietigen"
+msgstr "kill &lt;nick&gt; [-openbsleutel|&lt;reden&gt;]:  nick vernietigen"
 
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;nieuwebijnaam&gt;:  Uw bijnaam veranderen"
+msgstr "nick &lt;newnick&gt;:  Verander uw bijnaam"
 
 msgid "whowas &lt;nick&gt;:  View nick's information"
-msgstr "whowas &lt;bijnaam&gt;:  Bijnaam's informatie weergeven"
+msgstr "whowas &lt;nick&gt;:  Nick's informatie weergeven"
 
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
-"cmode &lt;kanaal&gt; [+|-&lt;instellingen&gt;] [argumenten]:  "
+"cmode &lt;channel&gt; [+|-&lt;instellingen&gt;] [argumenten]:  "
 "Kanaalinstellingen weergeven of wijzigen"
 
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
-"cumode &lt;kanaal&gt; +|-&lt;instellingen&gt; &lt;bijnaam&gt;:  Instellingen "
+"cumode &lt;channel&gt; +|-&lt;instellingen&gt; &lt;nick&gt;:  Instellingen "
 "voor gebruiker wijzigen op het kanaal"
 
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
@@ -10098,18 +9916,18 @@
 "netwerk instellen"
 
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;bijnaam&gt; [-pubkey]:  Operator-status instellen"
+msgstr "oper &lt;nick&gt; [-pubkey]:  Operator-status instellen"
 
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
-"invite &lt;kanaal&gt; [-|+]&lt;bijnaam&gt;:  Iemand uitnodigen of toevoegen/"
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  Iemand uitnodigen of toevoegen/"
 "verwijderen van de lijst met genodigden"
 
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
-"kick &lt;kanaal&gt; &lt;bijnaam&gt; [commentaar]:  Iemand uit het kanaal "
+"kick &lt;channel&gt; &lt;nick&gt; [commentaar]:  Iemand uit het kanaal "
 "schoppen"
 
 msgid "info [server]:  View server administrative details"
@@ -10117,11 +9935,11 @@
 
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
-"ban [&lt;kanaal&gt; +|-&lt;bijnaam&gt;]:  Bepaalde gebruikers uit kanaal "
+"ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Bepaalde gebruikers uit kanaal "
 "verbannen"
 
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;bijnaam|server&gt;:  iemand openbare sleutel opvragen"
+msgstr "getkey &lt;nick|server&gt;:  iemand openbare sleutel opvragen"
 
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Server- en netwerkstatistieken weergeven"
@@ -10131,7 +9949,7 @@
 
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
-"users &lt;kanaal&gt;:  Lijst van gebruikers in huidige kanaal weergeven"
+"users &lt;channel&gt;:  Lijst van gebruikers in huidige kanaal weergeven"
 
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
@@ -10175,7 +9993,7 @@
 msgstr "Perfecte doorstuur-secretie gebruiken"
 
 msgid "Public key authentication"
-msgstr "Certificering met openbare sleutel"
+msgstr "Waarmerking met openbare sleutel"
 
 msgid "Block IMs without Key Exchange"
 msgstr "Berichten zonder sleuteluitwisseling blokkeren"
@@ -10192,9 +10010,8 @@
 msgid "Creating SILC key pair..."
 msgstr "Aanmaken van SILC sleutelpaar..."
 
-#, fuzzy
 msgid "Unable to create SILC key pair"
-msgstr "Kan geen SILC sleutelpaar aanmaken\n"
+msgstr "Kan geen SILC sleutelpaar aanmaken"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
@@ -10269,19 +10086,19 @@
 msgstr "PDA"
 
 msgid "Terminal"
-msgstr "Terminalvenster"
+msgstr "Terminal"
 
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
-"%s verzond een bericht naar het whiteboard. Wil je het whiteboard openen?"
+"%s verzond een bericht naar het whiteboard. Wilt u het whiteboard openen?"
 
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
-"%s verzond een bericht naar het whiteboard in kanaal %s. Wil je het "
+"%s verzond een bericht naar het whiteboard in kanaal %s. Wilt u het "
 "whiteboard openen?"
 
 msgid "Whiteboard"
@@ -10333,36 +10150,32 @@
 
 #, c-format
 msgid "Failure: Authentication failed"
-msgstr "Mislukt: Certificering mislukt"
-
-#, fuzzy
+msgstr "Mislukt: Waarmerking mislukt"
+
 msgid "Unable to initialize SILC Client connection"
-msgstr "Kan SILC-verbinding niet starten"
+msgstr "Kan SILC cliëntverbinding niet starten"
 
 msgid "John Noname"
 msgstr "John Zondernaam"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to load SILC key pair: %s"
 msgstr "kan SILC sleutelpaar niet laden: %s"
 
 msgid "Unable to create connection"
 msgstr "Kan geen nieuwe verbinding maken"
 
-#, fuzzy
 msgid "Unknown server response"
-msgstr "Onbekend server-antwoord."
-
-#, fuzzy
+msgstr "Onbekend serverantwoord."
+
 msgid "Unable to create listen socket"
-msgstr "Kan geen socket aanmaken"
+msgstr "Kan geen luistersocket aanmaken"
 
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-bijnamen mogen geen spaties of @-tekens bevatten"
 
-#, fuzzy
 msgid "SIP connect server not specified"
-msgstr "Server-notificatie weergeven"
+msgstr "SIP verbindingsserver niet gespecificeerd"
 
 #. *< type
 #. *< ui_requirement
@@ -10380,7 +10193,7 @@
 msgstr "De plug-in voor het SIP/SIMPLE-protocol"
 
 msgid "Publish status (note: everyone may watch you)"
-msgstr "Publieke status (opmerking: iedereen kan je zien)"
+msgstr "Publieke status (opmerking: iedereen kan u zien)"
 
 msgid "Use UDP"
 msgstr "UDP gebruiken"
@@ -10399,13 +10212,13 @@
 
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
-"join: &lt;ruimte&gt;:  Meedoen aan een chatruimte op het Yahoo-netwerk."
+"join: &lt;ruimte&gt;:  Deelnemen aan een chatruimte op het Yahoo-netwerk."
 
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Lijst van kanalen op dit netwerk"
 
 msgid "doodle: Request user to start a Doodle session"
-msgstr ""
+msgstr "Schets: Verzoek gebruiker een Schetssessie te starten "
 
 msgid "Yahoo ID..."
 msgstr "Yahoo! ID..."
@@ -10420,9 +10233,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#, fuzzy
 msgid "Yahoo! Protocol Plugin"
-msgstr "Yahoo-protocol-plug-in"
+msgstr "Yahoo! Protocol Plug-in"
 
 msgid "Pager port"
 msgstr "Semafoon-poort"
@@ -10439,8 +10251,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Conferentie- en chatruimteverzoeken negeren"
 
-msgid "Use account proxy for SSL connections"
-msgstr ""
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Gebruik account proxy voor HTTP en HTTPS verbindingen"
 
 msgid "Chat room list URL"
 msgstr "URL voor lijst van ruimtes"
@@ -10459,13 +10271,12 @@
 #. *  summary
 #. *  description
 msgid "Yahoo! JAPAN Protocol Plugin"
-msgstr "Yahoo! JAPAN protocol-plug-in"
+msgstr "Yahoo! JAPAN protocol plug-in"
 
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr ""
-"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
-"ondersteund."
+"%s verzond u een uitnodiging voor een webcam, wat nog niet wordt ondersteund."
 
 msgid "Your SMS was not delivered"
 msgstr "De SMS werd niet afgeleverd"
@@ -10482,53 +10293,49 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"De gebruiker %s heeft uw aanvraag om hem/haar toe te voegen aan uw "
-"contactenlijst met terugwerkende kracht geweigerd met de volgende reden: %s"
+"%s heeft (achteraf) uw aanvraag hen toe te voegen aan uw lijst geweigerd met "
+"de volgende reden: %s"
 
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"De gebruiker %s heeft geen toestemming gegeven. Hij/zij wordt NIET "
-"toegevoegd aan uw contactenlijst."
+"%s heeft (achteraf) geen toestemming gegeven hen toe te voegen aan uw lijst."
 
 msgid "Add buddy rejected"
-msgstr "Contact toevoegen geweigerd"
+msgstr "Vriend toevoegen geweigerd"
 
 #. Some error in the received stream
 msgid "Received invalid data"
 msgstr "Ongeldige data ontvangen"
 
 #. security lock from too many failed login attempts
-#, fuzzy
 msgid ""
 "Account locked: Too many failed login attempts.  Logging into the Yahoo! "
 "website may fix this."
 msgstr ""
-"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
-"kunnen lossen."
+"Account geblokkeerd: Te veel mislukte aanmeldpogingen.  aanmelden bij de "
+"Yahoo! website kan dit misschien oplossen."
 
 #. indicates a lock of some description
-#, fuzzy
 msgid ""
 "Account locked: Unknown reason.  Logging into the Yahoo! website may fix "
 "this."
 msgstr ""
-"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
-"kunnen lossen."
+"Account geblokkeerd: onbekende reden. Aanmelden bij de Yahoo! website zou "
+"dit probleem op kunnen lossen."
 
 #. indicates a lock due to logging in too frequently
-#, fuzzy
 msgid ""
 "Account locked: You have been logging in too frequently.  Wait a few minutes "
 "before trying to connect again.  Logging into the Yahoo! website may help."
 msgstr ""
-"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
-"kunnen lossen."
+"Account geblokkeerd: u heeft u te vaak aangemeld. Wacht een aantal minuten "
+"voordat u het weer probeert. Aanmelden bij de Yahoo! website zou dit "
+"probleem op kunnen lossen."
 
 #. username or password missing
-#, fuzzy
 msgid "Username or password missing"
-msgstr "Ongeldige gebruikersnaam of wachtwoord"
+msgstr "gebruikersnaam of wachtwoord afwezig"
 
 #, c-format
 msgid ""
@@ -10536,45 +10343,45 @@
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
 msgstr ""
-"De Yahoo-server heeft een niet herkende identificatiemethode aangevraagd. Je "
-"kan waarschijnlijk niet succesvol inloggen bij Yahoo. Kijk op %s voor "
-"updates."
+"De Yahoo-server heeft een niet herkende waarmerkingsmethode aangevraagd. U "
+"kunt u waarschijnlijk niet goed aanmelden bij Yahoo. Kijk op %s voor updates."
 
 msgid "Failed Yahoo! Authentication"
-msgstr "Yahoo! identificatie mislukt"
+msgstr "Yahoo! waarmerking mislukt"
 
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-"U probeert %s te negeren, maar de gebruiker staat in uw contactenlijst.  "
-"Klik op \"Ja\" om de gebruiker uit uw lijst te verwijderen en deze te "
-"negeren."
+"U probeert %s te negeren, maar de gebruiker staat op uw vriendenlijst.  Klik "
+"op \"Ja\" om de vriend uit uw lijst te verwijderen en verder te negeren."
 
 msgid "Ignore buddy?"
-msgstr "Contact negeren?"
-
-#, fuzzy
+msgstr "Vriend negeren?"
+
 msgid "Invalid username or password"
 msgstr "Ongeldige gebruikersnaam of wachtwoord"
 
-#, fuzzy
 msgid ""
 "Your account has been locked due to too many failed login attempts.  Please "
 "try logging into the Yahoo! website."
 msgstr ""
-"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
-"kunnen lossen."
+"Uw account is geblokkeerd ten gevolge van te veel mislukte aanmeldpogingen. "
+"Probeer u aan te melden bij de Yahoo! website."
 
 #, c-format
 msgid "Unknown error 52.  Reconnecting should fix this."
 msgstr ""
+"Onbekende fout 52. Opnieuw verbinding maken zou dit moeten herstellen. "
 
 msgid ""
 "Error 1013: The username you have entered is invalid.  The most common cause "
 "of this error is entering your email address instead of your Yahoo! ID."
 msgstr ""
+"Fout 1013:De gebruikersnaam die u heeft ingevuld is ongeldig. De meest "
+"voorkomende oorzaak van deze fout is het invullen van uw e-mailadres in "
+"plaats van uw Yahoo! ID."
 
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
@@ -10582,46 +10389,39 @@
 "Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
 "kunnen lossen."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Kan contact %s niet toevoegen aan de groep %s in de server-lijst van account "
+"Kan vriend %s niet toevoegen aan de groep %s in de server-lijst van account "
 "%s."
 
-#, fuzzy
 msgid "Unable to add buddy to server list"
-msgstr "Kan contact niet toevoegen aan serverlijst"
+msgstr "Kan vriend niet toevoegen aan serverlijst"
 
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
-
-#, fuzzy, c-format
+msgstr "Onverwacht HTTP antwoord van de server ontvangen"
+
+#, c-format
 msgid "Lost connection with %s: %s"
-msgstr ""
-"Verbinding met %s:\n"
-"%s verloren"
-
-#, fuzzy, c-format
+msgstr "Verbinding verloren met %s: %s"
+
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
-msgstr ""
-"Kan geen verbinding maken met de server:\n"
-"%s"
-
-#, fuzzy
+msgstr "Kan geen verbinding maken met %s: %s"
+
 msgid "Unable to connect: The server returned an empty response."
-msgstr ""
-"Kan geen verbinding makenmet server. Geef de naam op van de server waarmee u "
-"contact wilt maken."
+msgstr "Kan geen verbinding maken: De server gaf een leeg antwoordbericht."
 
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
 "information"
 msgstr ""
+"Kan geen verbinding maken: de response van de server bevatte niet de "
+"benodigde informatie "
 
 msgid "Not at Home"
 msgstr "Niet thuis"
@@ -10645,31 +10445,31 @@
 msgstr "Online weergeven"
 
 msgid "Appear Permanently Offline"
-msgstr "Altijd off-line weergeven"
+msgstr "Altijd offline weergeven"
 
 msgid "Presence"
 msgstr "Aanwezigheid"
 
 msgid "Appear Offline"
-msgstr "Off-line weergeven"
+msgstr "offline weergeven"
 
 msgid "Don't Appear Permanently Offline"
-msgstr "Niet altijd off-line weergeven"
+msgstr "Niet altijd offline weergeven"
 
 msgid "Join in Chat"
 msgstr "Deelnemen aan Chat"
 
 msgid "Initiate Conference"
-msgstr "Groepsgesprek openen"
+msgstr "Conferentie Starten"
 
 msgid "Presence Settings"
 msgstr "Aanwezigheidsinstellingen"
 
 msgid "Start Doodling"
-msgstr "Wakker schudden"
+msgstr "Begin met Schetsen"
 
 msgid "Select the ID you want to activate"
-msgstr ""
+msgstr "Selecteer de ID die u wilt activeren"
 
 msgid "Join whom in chat?"
 msgstr "Deelnemen aan wiens chat?"
@@ -10681,22 +10481,22 @@
 msgstr "Deelnemen aan chat van gebruiker..."
 
 msgid "Open Inbox"
-msgstr "Iinbox Openen"
+msgstr "Inbox openen"
 
 msgid "Can't send SMS. Unable to obtain mobile carrier."
-msgstr ""
+msgstr "Kan geen SMS versturen. Kan mobiele-telefonieaanbieder niet vinden."
 
 msgid "Can't send SMS. Unknown mobile carrier."
-msgstr ""
+msgstr "Kan geen SMS versturen. Onbekende mobiele-telefonieaanbieder."
 
 msgid "Getting mobile carrier to send the SMS."
-msgstr ""
+msgstr "Opzoeken mobiele-telefonieaanbieder voor verzenden van de SMS."
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
 msgid "Sent Doodle request."
-msgstr ""
+msgstr "Verzoek om te schetsen gestuurd"
 
 msgid "Unable to connect."
 msgstr "Kan geen verbinding maken."
@@ -10728,14 +10528,13 @@
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
-"Als u dit profiel wilt zien, zult u deze verwijzing moeten openen in uw web-"
-"browser"
+"Als u dit profiel wilt zien, zult u deze link moeten openen in uw web-browser"
 
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
 msgid "Hobbies"
-msgstr "Hobbies"
+msgstr "Hobby's"
 
 msgid "Latest News"
 msgstr "Laatste nieuws"
@@ -10744,22 +10543,22 @@
 msgstr "Startpagina"
 
 msgid "Cool Link 1"
-msgstr "Toffe verwijding 1"
+msgstr "Toffe link 1"
 
 msgid "Cool Link 2"
-msgstr "Toffe verwijzing 2"
+msgstr "Toffe link 2"
 
 msgid "Cool Link 3"
-msgstr "Toffe verwijzing 3"
+msgstr "Toffe link 3"
 
 msgid "Last Update"
 msgstr "Laatst bijgewerkt"
 
-#, fuzzy
 msgid ""
 "This profile is in a language or format that is not supported at this time."
 msgstr ""
-"Helaas worden profielen in deze taal op dit moment nog niet ondersteund."
+"Helaas worden profielen in deze taal of formaat op dit moment nog niet "
+"ondersteund."
 
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
@@ -10775,15 +10574,15 @@
 msgstr ""
 "Kan gebruikersprofiel niet ophalen. Dit betekent waarschijnlijk dat de "
 "gebruiker niet bestaat. Soms kan Yahoo! ten onrechte een gebruiker niet "
-"vinde. Als u er zeker van bent dat de gebruiker bestaat, probeert u het dan "
+"vinden. Als u er zeker van bent dat de gebruiker bestaat, probeert u het dan "
 "later nogmaals."
 
 msgid "The user's profile is empty."
 msgstr "Gebruikersprofiel is leeg."
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has declined to join."
-msgstr "%s heeft zich aangemeld."
+msgstr "%s heeft afgeslagen deel te nemen."
 
 msgid "Failed to join chat"
 msgstr "Kan niet deelnemen aan chat"
@@ -10805,12 +10604,12 @@
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
-"Onbekende fout. U kunt misschien het beste afmelden en vijf minuten wachten "
-"voordta u dit weer probeert"
+"Onbekende fout. U kunt zich misschien het beste afmelden en vijf minuten "
+"wachten voordat u zich weer bij de chatruimte kan voegen"
 
 #, c-format
 msgid "You are now chatting in %s."
-msgstr "Je chat nu in %s."
+msgstr "U chat nu in %s."
 
 msgid "Failed to join buddy in chat"
 msgstr "Kan niet deelnemen aan chat"
@@ -10836,9 +10635,8 @@
 msgid "User Rooms"
 msgstr "Ruimtes van gebruiker"
 
-#, fuzzy
 msgid "Connection problem with the YCHT server"
-msgstr "Verbindingprobleem met de YCHT-server."
+msgstr "Verbindingprobleem met de YCHT server"
 
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
@@ -10875,10 +10673,10 @@
 msgstr "Poging om te abonneren op %s,%s,%s mislukt"
 
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;bijnaam&gt;: Gebruiker zoeken"
+msgstr "zlocate &lt;nick&gt;: Gebruiker zoeken"
 
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;bijnaam&gt;: Gebruiker zoeken"
+msgstr "zl &lt;nick&gt;: Gebruiker zoeken"
 
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "instance &lt;instantie&gt;: Te gebruiken instantie voor deze klasse"
@@ -10890,33 +10688,36 @@
 msgstr "topic &lt;instantie&gt;: Te gebruiken instantie voor deze klasse"
 
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;klasse&gt; &lt;instantie&gt; &lt;ontvanger&gt;: Chat openen"
+msgstr ""
+"sub &lt;klasse&gt; &lt;instantie&gt; &lt;ontvanger&gt;: Aan een nieuwe Chat "
+"deelnemen"
 
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
-"zi·&lt;instance&gt;:·Een bericht sturen aan·&lt;bericht,<i>instance</i>,*&gt;"
+"zi  ·&lt;instance&gt;:  ·Een bericht sturen aan  ·&lt;bericht,<i>instance</"
+"i>,*&gt;"
 
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
-"zci·&lt;class&gt;·&lt;instance&gt;:·Een bericht sturen aan·&lt;<i>class</i>,"
-"<i>instance</i>,*&gt;"
+"zci  ·&lt;class&gt;  ·&lt;instance&gt;:  ·Een bericht sturen aan  ·&lt;"
+"<i>class</i>,<i>instance</i>,*&gt;"
 
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zcir·&lt;class&gt;·&lt;instance&gt;·&lt;ontvanger&gt;:·Een bericht sturen "
-"aan·&lt;<i>class</i>,<i>instance</i>,<i>ontvanger</i>&gt;"
+"zcir  ·&lt;class&gt;  ·&lt;instance&gt;  ·&lt;ontvanger&gt;:  ·Een bericht "
+"sturen aan  ·&lt;<i>class</i>,<i>instance</i>,<i>ontvanger</i>&gt;"
 
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
-"zir·&lt;instance&gt;·&lt;recipient&gt;:·Een bericht sturen aan·&lt;MESSAGE,"
-"<i>instance</i>,<i>recipient</i>&gt;"
+"zir  ·&lt;instance&gt;  ·&lt;recipient&gt;:  ·Een bericht sturen aan  ·&lt;"
+"MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
 
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
@@ -10969,17 +10770,17 @@
 msgid "Unable to create socket: %s"
 msgstr "Kan geen socket aanmaken: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "Kan antwoord van HTTP-proxy niet parsen: %s\n"
+msgstr "Kan antwoord van HTTP-proxy niet ontleden: %s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxy verbindingsfout %d"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling"
-msgstr "Toegang geweigerd: HTTP-proxy-server verbied tunnelen op poort %d."
+msgstr "Toegang geweigerd: HTTP-proxy server verbiedt tunnelen op poort %d"
 
 #, c-format
 msgid "Error resolving %s"
@@ -10987,7 +10788,7 @@
 
 #, c-format
 msgid "Requesting %s's attention..."
-msgstr "%s's aandacht vragen..."
+msgstr "Aandacht van %s vragen..."
 
 #, c-format
 msgid "%s has requested your attention!"
@@ -11016,7 +10817,7 @@
 #. * The default message to use when the user becomes auto-away.
 #.
 msgid "I'm not here right now"
-msgstr "Ik ben er even niet"
+msgstr "Even weg"
 
 msgid "saved statuses"
 msgstr "opgeslagen statussen"
@@ -11045,7 +10846,7 @@
 msgstr "Snelkoppeling"
 
 msgid "The text-shortcut for the smiley"
-msgstr "De tekst-snelkoppeling voor de smiley"
+msgstr "De tekst-snelkoppeling voor de emoticon"
 
 #. Stored Image
 msgid "Stored Image"
@@ -11058,7 +10859,7 @@
 msgstr "SSL Verbinding Mislukt"
 
 msgid "SSL Handshake Failed"
-msgstr "Contact leggen via SSL mislukt"
+msgstr "Handshake via SSL mislukt"
 
 msgid "SSL peer presented an invalid certificate"
 msgstr "SSL peer gaf een ongeldig certificaat"
@@ -11073,11 +10874,10 @@
 msgstr "Niet storen"
 
 msgid "Extended away"
-msgstr "Uitgebreide weg"
-
-#, fuzzy
+msgstr "Voor langere tijd weg"
+
 msgid "Feeling"
-msgstr "Ontvangen"
+msgstr "Gevoel"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11167,9 +10967,9 @@
 msgid "Unable to connect to %s"
 msgstr "Kan geen verbinding maken met %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error reading from %s: response too long (%d bytes limit)"
-msgstr "Er is een fout opgetreden bij het lezen van%s: %s"
+msgstr "Leesfout van %s: antwoord te lang (%d bytes limiet)"
 
 #, c-format
 msgid ""
@@ -11202,7 +11002,7 @@
 #. 10053
 #, c-format
 msgid "Connection interrupted by other software on your computer."
-msgstr "Verbinding verbroken door andere software op je computer."
+msgstr "Verbinding verbroken door andere software op uw computer."
 
 #. 10054
 #, c-format
@@ -11228,20 +11028,21 @@
 msgid "Error Reading %s"
 msgstr "Fout bij lezen van %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "An error was encountered reading your %s.  The file has not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"Er is een fout opgetreden bij lezen van uw %s. Deze is niet geladen. Het "
-"oude bestand is verplaatst naar %s~."
+"Er is een fout opgetreden bij lezen van uw %s. Het bestand is niet geladen "
+"en het oude bestand is hernoemd tot %s~."
 
 msgid ""
 "Chat over IM.  Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more"
 msgstr ""
+"Chat over IM. Ondersteunt AIM, Google Talk, Jabber/XMPP, MSN, Yahoo en meer"
 
 msgid "Internet Messenger"
-msgstr "Expresberichten"
+msgstr "Internet Messenger"
 
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Messenger"
@@ -11254,7 +11055,7 @@
 msgstr "Pro_tocol:"
 
 msgid "_Username:"
-msgstr "_Gebruiker:"
+msgstr "_Gebruikersnaam:"
 
 msgid "Remember pass_word"
 msgstr "_Wachtwoord onthouden"
@@ -11264,14 +11065,14 @@
 msgstr "Gebruikersopties"
 
 msgid "_Local alias:"
-msgstr "_Lokale bijnaam:"
+msgstr "_Lokale alias:"
 
 msgid "New _mail notifications"
 msgstr "Nieuwe e-_mail-meldingen"
 
 #. Buddy icon
 msgid "Use this buddy _icon for this account:"
-msgstr "Dit contact_plaatje gebruiken voor dit account:"
+msgstr "Dit _pictogram gebruiken voor dit account:"
 
 msgid "Ad_vanced"
 msgstr "Gea_vanceerd"
@@ -11303,11 +11104,11 @@
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
 msgid "If you look real closely"
-msgstr "Als je zeer aandachtig kijkt"
+msgstr "Als u zeer aandachtig kijkt"
 
 #. This is an easter egg. See the comment on the previous line in the source.
 msgid "you can see the butterflies mating"
-msgstr "kun je de vlinders zien paren"
+msgstr "kun u de vlinders zien paren"
 
 msgid "Proxy _type:"
 msgstr "Proxy_type:"
@@ -11345,7 +11146,7 @@
 msgid "Protocol"
 msgstr "Protocol"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -11359,71 +11160,70 @@
 msgstr ""
 "<span size='larger' weight='bold'>Welkom bij %s!</span>\n"
 "\n"
-"Je hebt geen accounts ingeschakeld. Om een verbinding te starten met %s druk "
-"op de <b>Toevoegen</b>-knop hieronder en stel je eerste account in. Als je "
-"%s meerdere accounts wil laten onthouden, druk opnieuw op <b>Toevoegen</b>om "
-"ze allemaal in te stellen.\n"
-"\n"
-"Je kan dit venster opnieuw gebruiken om accounts toe te voegen, te bewerken "
-"of te verwijderen ui <b>Accounts->Toevoegen/bewerken</b> in het "
-"contactenlijst-venser."
+"U heeft geen IM accounts geconfigureerd. Om een verbinding te starten met %s "
+"klik op de <b>Toevoegen</b> knop hieronder en stel uw eerste account in. Als "
+"u %s met meerdere accounts wil laten verbinden, klik dan opnieuw op "
+"<b>Toevoegen</b> om ze allemaal in te stellen.\n"
+"\n"
+"U kunt dit venster opnieuw gebruiken om accounts toe te voegen, te bewerken "
+"of te verwijderen uit <b>Accounts->Accountbeheer</b> in het Vriendennlijst "
+"venster."
 
 #. Buddy List
 msgid "Background Color"
 msgstr "Achtergrondkleur"
 
 msgid "The background color for the buddy list"
-msgstr ""
+msgstr "De achtergrondskleur voor de online vriendenlijst"
 
 msgid "Layout"
 msgstr "Lay-out"
 
 msgid "The layout of icons, name, and status of the buddy list"
 msgstr ""
+"De indeling van pictogrammen, namen en status van de online vriendenlijst"
 
 #. Group
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its expanded state
-#, fuzzy
 msgid "Expanded Background Color"
-msgstr "Achtergrondkleur"
+msgstr "Achtergrondkleur uitgevouwen"
 
 msgid "The background color of an expanded group"
-msgstr ""
+msgstr "De achtergrondkleur Uitgevouwen groep"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its expanded state
 msgid "Expanded Text"
-msgstr "Uitgevouwde tekst"
+msgstr "Uitgevouwen tekst"
 
 msgid "The text information for when a group is expanded"
-msgstr ""
+msgstr "De tekstinformatie uitgevouwen groep"
 
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list group when in its collapsed state
-#, fuzzy
 msgid "Collapsed Background Color"
-msgstr "Achtergrondkleur selecteren"
+msgstr "Achtergrondkleur samengevouwen venster"
 
 msgid "The background color of a collapsed group"
-msgstr ""
+msgstr "De achtergrondkleur samengevouwen groep"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list group when in its collapsed state
 msgid "Collapsed Text"
-msgstr "Samengevoegde tekst"
+msgstr "samengevouwen tekst"
 
 msgid "The text information for when a group is collapsed"
-msgstr ""
+msgstr "De tekstinformatie samengevouwen groep."
 
 #. Buddy
 #. Note to translators: These two strings refer to the background color
 #. of a buddy list contact or chat room
 msgid "Contact/Chat Background Color"
-msgstr "Contact/Achtergrondkleur gesprek"
+msgstr "Contact/Chat Achtergrondkleur"
 
 msgid "The background color of a contact or chat"
-msgstr "De achtergrond voor een contact of gesprek"
+msgstr "De achtergrondkleur voor een contactpersoon of chat"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list contact when in its expanded state
@@ -11431,16 +11231,15 @@
 msgstr "Contact tekst"
 
 msgid "The text information for when a contact is expanded"
-msgstr ""
+msgstr "De tekstinformatie als een contactpersoon is uitgevouwen"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is online
-#, fuzzy
 msgid "Online Text"
-msgstr "Offline tejst"
+msgstr "Online Tekst"
 
 msgid "The text information for when a buddy is online"
-msgstr ""
+msgstr "De tekstinformatie als een vriend online is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is away
@@ -11448,17 +11247,15 @@
 msgstr "Afwezig tekst"
 
 msgid "The text information for when a buddy is away"
-msgstr ""
+msgstr "De tekstinformatie als een vriend weg is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is offline
-#, fuzzy
 msgid "Offline Text"
-msgstr "Offline tejst"
-
-#, fuzzy
+msgstr "Offline Tekst"
+
 msgid "The text information for when a buddy is offline"
-msgstr "Gebruikersinformatie aanpassen voor %s"
+msgstr "De tekstinformatie als een vriend offline is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when it is idle
@@ -11466,48 +11263,50 @@
 msgstr "Tekst inactief"
 
 msgid "The text information for when a buddy is idle"
-msgstr ""
+msgstr "De tekstinformatie als een vriend inactief is"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message Text"
-msgstr "Berichttekst"
+msgstr "Bericht tekst"
 
 msgid "The text information for when a buddy has an unread message"
-msgstr ""
+msgstr "De tekstinformatie als een vriend een ongelezen bericht heeft"
 
 #. Note to translators: These two strings refer to the font and color
 #. of a buddy list buddy when they have sent you a new message
 msgid "Message (Nick Said) Text"
-msgstr ""
+msgstr "Bericht (Nick zei) Tekst"
 
 msgid ""
 "The text information for when a chat has an unread message that mentions "
 "your nickname"
 msgstr ""
-
-#, fuzzy
+"De tekstinformatie als een chat een ongelezen bericht bevat die uw bijnaam "
+"vermeldt"
+
 msgid "The text information for a buddy's status"
-msgstr "Gebruikersinformatie aanpassen voor %s"
+msgstr "De tekst informatie voor de status van een vriend"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
 "You currently have %d contacts named %s. Would you like to merge them?"
-msgstr[0] "Je hebt %d contact genaamd %s. Wil je deze samenvoegen?"
-msgstr[1] "Je hebt %d contacten genaamd %s. Wil je deze samenvoegen?"
+msgstr[0] "U heeft %d contactpersoon genaamd %s. Wilt u deze samenvoegen?"
+msgstr[1] "U heeft %d contactpersonen genaamd %s. Wilt u deze samenvoegen?"
 
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
-"Samenvoeging van deze contacten zullen ze over een item verdelen bij de "
-"contactenlijst en gebruiken een enkel gespreks-venster. U kunt ze weer "
-"scheiden door weer te kiezen voor 'Uitvouwen' in het contact-menu"
+"Door samenvoegen van deze contactpersonen zullen ze één regel laten delen op "
+"de vriendenlijst en één gespreksvenster laten gebruiken. U kunt ze weer "
+"scheiden door weer te kiezen voor 'Uitvouwen' in het contextmenu van de "
+"contactpersoon"
 
 msgid "Please update the necessary fields."
-msgstr "Update de belangrijke velden."
+msgstr "Werk svp de benodigde velden bij."
 
 msgid "A_ccount"
 msgstr "A_ccount"
@@ -11515,7 +11314,7 @@
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
-msgstr "Geef de benodigde informatie van de chat die u wilt openen.\n"
+msgstr "Geef de juiste informatie over de chat waaraan u wilt deelnemen.\n"
 
 msgid "Room _List"
 msgstr "_Lijst Van Ruimtes"
@@ -11536,19 +11335,19 @@
 msgstr "_Bericht sturen"
 
 msgid "_Audio Call"
-msgstr "_Audio-gesprek"
+msgstr "_Audiogesprek"
 
 msgid "Audio/_Video Call"
 msgstr "Audio/_Videogesprek"
 
 msgid "_Video Call"
-msgstr "Video-gesprek"
+msgstr "Videogesprek"
 
 msgid "_Send File..."
 msgstr "Bestand _sturen"
 
 msgid "Add Buddy _Pounce..."
-msgstr "_Contactalarm toevoegen"
+msgstr "_Alarm toevoegen..."
 
 msgid "View _Log"
 msgstr "_Logboek"
@@ -11617,65 +11416,63 @@
 msgid "Unknown node type"
 msgstr "Onbekende node-type"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Selecteer je humeur uit de lijst"
-
-#, fuzzy
+msgstr "Selecteer uw stemming uit de lijst"
+
 msgid "Message (optional)"
-msgstr "Alias (optioneel)"
+msgstr "Bericht (optioneel)"
 
 msgid "Edit User Mood"
-msgstr "Humeur instellen"
+msgstr "Stemming instellen"
 
 #. Buddies menu
 msgid "/_Buddies"
-msgstr "/_Contacten"
+msgstr "/_Vrienden"
 
 msgid "/Buddies/New Instant _Message..."
-msgstr "/Contacten/Nieuw _bericht..."
+msgstr "/Vrienden/Nieuw _bericht..."
 
 msgid "/Buddies/Join a _Chat..."
-msgstr "/Contacten/Chat _openen..."
+msgstr "/Vrienden/Chat _openen..."
 
 msgid "/Buddies/Get User _Info..."
-msgstr "/Contacten/_Gebruikersinfo..."
+msgstr "/Vrienden/_Gebruikersinfo..."
 
 msgid "/Buddies/View User _Log..."
-msgstr "/Contacten/_Logboek bekijken..."
+msgstr "/Vrienden/_Logboek bekijken..."
 
 msgid "/Buddies/Sh_ow"
-msgstr "/Contacten/_Weergave"
+msgstr "/Vrienden/_Weergave"
 
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Contacten/Weergave/_Offline contacten"
+msgstr "/Vrienden/Weergave/_Offline Vrienden"
 
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Contacten/Weergave/_Lege groepen"
+msgstr "/Vrienden/Weergave/_Lege groepen"
 
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Contacten/Weergave/Contact_details"
+msgstr "/Vrienden/Weergave/Contact_details"
 
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Contacten/Weergave/Inactieve _tijden"
+msgstr "/Vrienden/Weergave/Inactiviteits _tijden"
 
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Contacten/Weergave/_Protocol pictogrammen"
+msgstr "/Vrienden/Weergave/_Protocol pictogrammen"
 
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Contacten/Contacten _sorteren"
+msgstr "/Vrienden/Vrienden _sorteren"
 
 msgid "/Buddies/_Add Buddy..."
-msgstr "/Contacten/Contact _toevoegen..."
+msgstr "/Vrienden/Vriend _toevoegen..."
 
 msgid "/Buddies/Add C_hat..."
-msgstr "/Contacten/_Chat toevoegen..."
+msgstr "/Vrienden/_Chat toevoegen..."
 
 msgid "/Buddies/Add _Group..."
-msgstr "/Contacten/Groep toe_voegen..."
+msgstr "/Vrienden/Groep toe_voegen..."
 
 msgid "/Buddies/_Quit"
-msgstr "/Contacten/_Afsluiten"
+msgstr "/Vrienden/_Afsluiten"
 
 #. Accounts menu
 msgid "/_Accounts"
@@ -11689,13 +11486,13 @@
 msgstr "/E_xtra"
 
 msgid "/Tools/Buddy _Pounces"
-msgstr "/Extra/_Contactalarm"
+msgstr "/Extra/_Alarmeringen"
 
 msgid "/Tools/_Certificates"
 msgstr "/Extra/_Certificaten"
 
 msgid "/Tools/Custom Smile_ys"
-msgstr "/Extra/Eigen smiley_s"
+msgstr "/Extra/Eigen emoticon_s"
 
 msgid "/Tools/Plu_gins"
 msgstr "/Extra/_Plug-ins"
@@ -11706,9 +11503,8 @@
 msgid "/Tools/Pr_ivacy"
 msgstr "/Extra/Pr_ivacy"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Extra/_Systeemlogboek"
+msgstr "/Extra/_Stemming instellen "
 
 msgid "/Tools/_File Transfers"
 msgstr "/Extra/_Bestandsoverdrachten"
@@ -11729,23 +11525,20 @@
 msgid "/Help/Online _Help"
 msgstr "/Hulp/Online _hulp"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "Contactinformatie"
+msgstr "/Help/_Build Informatie"
 
 msgid "/Help/_Debug Window"
 msgstr "/Hulp/_Debugvenster"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "Server-informatie"
-
-#, fuzzy
+msgstr "/Hulp/Ont_wikkelaarsinformatie"
+
 msgid "/Help/_Translator Information"
-msgstr "Persoonlijke informatie"
+msgstr "/Hulp/_Vertalersinformatie"
 
 msgid "/Help/_About"
-msgstr "/Hulp/_Info"
+msgstr "/Hulp/_Over"
 
 #, c-format
 msgid "<b>Account:</b> %s"
@@ -11771,7 +11564,7 @@
 msgstr "(geen onderwerp ingesteld)"
 
 msgid "Buddy Alias"
-msgstr "Contact-alias"
+msgstr "Vriend-alias"
 
 msgid "Logged In"
 msgstr "Ingelogd"
@@ -11789,7 +11582,7 @@
 msgstr "Rocken"
 
 msgid "Total Buddies"
-msgstr "Aantal contacten"
+msgstr "Aantal Vrienden"
 
 #, c-format
 msgid "Idle %dd %dh %02dm"
@@ -11804,22 +11597,22 @@
 msgstr "Inactief %dm"
 
 msgid "/Buddies/New Instant Message..."
-msgstr "/Contacten/Nieuw bericht..."
+msgstr "/Vrienden/Nieuw bericht..."
 
 msgid "/Buddies/Join a Chat..."
-msgstr "/Contacten/Chat _openen..."
+msgstr "/Vrienden/Chat _openen..."
 
 msgid "/Buddies/Get User Info..."
-msgstr "/Contacten/_Gebruikersinfo..."
+msgstr "/Vrienden/_Gebruikersinfo..."
 
 msgid "/Buddies/Add Buddy..."
-msgstr "/Contacten/Contact _toevoegen..."
+msgstr "/Vrienden/Vriend _toevoegen..."
 
 msgid "/Buddies/Add Chat..."
-msgstr "/Contacten/_Chat toevoegen..."
+msgstr "/Vrienden/_Chat toevoegen..."
 
 msgid "/Buddies/Add Group..."
-msgstr "/Contacten/Groep toe_voegen..."
+msgstr "/Vrienden/Groep toe_voegen..."
 
 msgid "/Tools/Privacy"
 msgstr "/Extra/Privacy"
@@ -11840,7 +11633,7 @@
 msgstr "Op status"
 
 msgid "By recent log activity"
-msgstr ""
+msgstr "Volgens recente log activiteit"
 
 #, c-format
 msgid "%s disconnected"
@@ -11857,7 +11650,7 @@
 msgstr "Weer aanzetten"
 
 msgid "SSL FAQs"
-msgstr ""
+msgstr "SSL FAQs"
 
 msgid "Welcome back!"
 msgstr "Welkom terug!"
@@ -11867,9 +11660,11 @@
 msgid_plural ""
 "%d accounts were disabled because you signed on from another location:"
 msgstr[0] ""
-"%d account werd uitgeschakeld omdat je inlogde van een andere locatie"
+"%d account werd uitgeschakeld omdat u zich aanmeldde vanaf een andere "
+"locatie:"
 msgstr[1] ""
-"%d account werden uitgeschakeld omdat je inlogde van een andere locatie"
+"%d account werden uitgeschakeld omdat u zich aanmeldde vanaf een andere "
+"locatie:"
 
 msgid "<b>Username:</b>"
 msgstr "<b>Gebruikersnaam:</b>"
@@ -11903,25 +11698,25 @@
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Contacten/Weergave/Offline contacten"
+msgstr "/Vrienden/Weergave/Offline Vrienden"
 
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Contacten/Weergave/Lege groepen"
+msgstr "/Vrienden/Weergave/Lege groepen"
 
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Contacten/Weergave/Contactdetails"
+msgstr "/Vrienden/Weergave/Vrienddetails"
 
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Contacten/Weergave/Inactieve tijden"
+msgstr "/Vrienden/Weergave/Inactiviteitstijden"
 
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Contacten/Weergave/Protocol pictogrammen"
+msgstr "/Vrienden/Weergave/Protocol pictogrammen"
 
 msgid "Add a buddy.\n"
-msgstr "Contact toevoegen.\n"
+msgstr "Vriend toevoegen.\n"
 
 msgid "Buddy's _username:"
-msgstr "_Gebruikersnaam contact"
+msgstr "_Gebruikersnaam Vriend"
 
 msgid "(Optional) A_lias:"
 msgstr "(Optionele) A_lias:"
@@ -11944,7 +11739,7 @@
 "would like to add to your buddy list.\n"
 msgstr ""
 "Geef de bijnaam en andere informatie van de chat die u wilt toevoegen aan de "
-"contactlijst.\n"
+"Vriendenlijst.\n"
 
 msgid "A_lias:"
 msgstr "A_lias:"
@@ -11952,13 +11747,11 @@
 msgid "_Group:"
 msgstr "_Groep:"
 
-#, fuzzy
 msgid "Auto_join when account connects."
-msgstr "Automatisch deelnemen wanneer account online komt."
-
-#, fuzzy
+msgstr "Automatisch _deelnemen wanneer account online komt."
+
 msgid "_Remain in chat after window is closed."
-msgstr "Verberg c_hat wanneer de verbinding verbroken wordt."
+msgstr "_Blijf in chat nadat venster is gesloten."
 
 msgid "Please enter the name of the group to be added."
 msgstr "Geef de naam van de toe te voegen groep."
@@ -11975,25 +11768,23 @@
 msgid "_Edit Account"
 msgstr "_Account bewerken"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Humeur instellen..."
+msgstr "_Stemming instellen..."
 
 msgid "No actions available"
 msgstr "Geen acties beschikbaar"
 
 msgid "_Disable"
-msgstr "_Uitzetten"
+msgstr "_Uitschakelen"
 
 msgid "/Tools"
 msgstr "/Extra"
 
 msgid "/Buddies/Sort Buddies"
-msgstr "/Contacten/Sorteren"
-
-#, fuzzy
+msgstr "/Vrienden/Sorteren"
+
 msgid "Type the host name for this certificate."
-msgstr "Geef de computernaam waar dit certificaat voor is."
+msgstr "Geef de naam waar dit certificaat voor is."
 
 #. Widget creation function
 msgid "SSL Servers"
@@ -12003,8 +11794,7 @@
 msgstr "Onbekende opdracht."
 
 msgid "That buddy is not on the same protocol as this chat."
-msgstr ""
-"Die gebruiker is niet online met hetzelfde protocol als het chatgesprek"
+msgstr "Die gebruiker is niet online met hetzelfde protocol als het chat"
 
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
@@ -12013,10 +11803,10 @@
 "uitnodigen."
 
 msgid "Invite Buddy Into Chat Room"
-msgstr "Contact uitnodigen in chatruimte"
+msgstr "Vriend uitnodigen in chatruimte"
 
 msgid "_Buddy:"
-msgstr "_Contact:"
+msgstr "_Vriend:"
 
 msgid "_Message:"
 msgstr "Be_richt"
@@ -12069,11 +11859,10 @@
 msgstr "/_Gesprek"
 
 msgid "/Conversation/New Instant _Message..."
-msgstr "/Gesprek/Nieuw _bericht..."
-
-#, fuzzy
+msgstr "/Gesprek/Nieuw Instant _Message..."
+
 msgid "/Conversation/Join a _Chat..."
-msgstr "/Gesprek/_Uitnodigen..."
+msgstr "/Gesprek/_Deelnemen aan Chat..."
 
 msgid "/Conversation/_Find..."
 msgstr "/Gesprek/_Zoeken..."
@@ -12102,15 +11891,14 @@
 msgid "/Conversation/Se_nd File..."
 msgstr "/Gesprek/Bestand ver_zenden..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/Gesprek/Info opvragen"
+msgstr "/Gesprek/_Attentie vragen"
 
 msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Gesprek/_Contactalarm toevoegen..."
+msgstr "/Gesprek/_Alarm toevoegen..."
 
 msgid "/Conversation/_Get Info"
-msgstr "/Gesprek/Info _opvragen"
+msgstr "/Gesprek/_Informatie"
 
 msgid "/Conversation/In_vite..."
 msgstr "/Gesprek/_Uitnodigen..."
@@ -12134,7 +11922,7 @@
 msgstr "/Gesprek/Ver_wijderen..."
 
 msgid "/Conversation/Insert Lin_k..."
-msgstr "/Gesprek/_URL invoegen..."
+msgstr "/Gesprek/Lin_k invoegen..."
 
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Gesprek/_Afbeelding invoegen..."
@@ -12187,15 +11975,14 @@
 msgid "/Conversation/Send File..."
 msgstr "/Gesprek/Bestand verzenden..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Gesprek/Info opvragen"
+msgstr "/Gesprek/Aandacht vragen"
 
 msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Gesprek/Contactalarm toevoegen..."
+msgstr "/Gesprek/Alarm toevoegen..."
 
 msgid "/Conversation/Get Info"
-msgstr "/Gesprek/Info opvragen"
+msgstr "/Gesprek/Informatie"
 
 msgid "/Conversation/Invite..."
 msgstr "/Gesprek/Uitnodigen..."
@@ -12216,7 +12003,7 @@
 msgstr "/Gesprek/Verwijderen..."
 
 msgid "/Conversation/Insert Link..."
-msgstr "/Gesprek/URL invoegen..."
+msgstr "/Gesprek/Link invoegen..."
 
 msgid "/Conversation/Insert Image..."
 msgstr "/Gesprek/Afbeelding invoegen..."
@@ -12258,13 +12045,11 @@
 
 # src/bookmarks_editor.c:945
 # src/menubar.c:91
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Dit tabblad sluiten"
-
-#, fuzzy
+msgstr "Sluit Zoekbalk"
+
 msgid "Find:"
-msgstr "Zoeken"
+msgstr "Zoek:"
 
 #, c-format
 msgid "%d person in room"
@@ -12276,7 +12061,7 @@
 msgstr "Gestopt met typen"
 
 msgid "Nick Said"
-msgstr "Bijnaam gezegd"
+msgstr "Nick gezegd"
 
 msgid "Unread Messages"
 msgstr "Ongelezen berichten"
@@ -12285,13 +12070,13 @@
 msgstr "Nieuwe gebeurtenis"
 
 msgid "clear: Clears all conversation scrollbacks."
-msgstr "clear: Maakt alle gespreksvensterers schoon."
+msgstr "clear: Maakt alle gespreksvensters schoon."
 
 msgid "Confirm close"
 msgstr "Sluiten bevestigen"
 
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Je hebt ongelezen berichten. Wil je het venster echt sluiten?"
+msgstr "U heeft ongelezen berichten. Wilt u het venster echt sluiten?"
 
 msgid "Close other tabs"
 msgstr "Andere tabbladen sluiten"
@@ -12314,7 +12099,7 @@
 msgstr "Laatst aangemaakte venster"
 
 msgid "Separate IM and Chat windows"
-msgstr "Gewone gesprekken en chats in gescheiden vensters"
+msgstr "IM's en chats in gescheiden vensters"
 
 msgid "New window"
 msgstr "Nieuw venster"
@@ -12338,7 +12123,7 @@
 msgstr "Omkeren"
 
 msgid "Highlight matches"
-msgstr "Overeenkomsten aangeven"
+msgstr "Overeenkomsten markeren"
 
 msgid "_Icon Only"
 msgstr "Alleen _plaatje"
@@ -12378,7 +12163,7 @@
 msgstr "Fatale fout"
 
 msgid "bug master"
-msgstr ""
+msgstr "bug master"
 
 msgid "artist"
 msgstr "artiest"
@@ -12430,9 +12215,8 @@
 msgid "Arabic"
 msgstr "Arabisch"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "Beschaamd"
+msgstr "Assamese"
 
 msgid "Belarusian Latin"
 msgstr "Witrussisch Latijn"
@@ -12443,9 +12227,8 @@
 msgid "Bengali"
 msgstr "Bengaals"
 
-#, fuzzy
 msgid "Bengali-India"
-msgstr "Bengaals"
+msgstr "Bengaals-Indiaas"
 
 msgid "Bosnian"
 msgstr "Bosnisch"
@@ -12481,7 +12264,7 @@
 msgstr "Brits Engels"
 
 msgid "Esperanto"
-msgstr "Spaans"
+msgstr "Esperanto"
 
 msgid "Spanish"
 msgstr "Spaans"
@@ -12490,7 +12273,7 @@
 msgstr "Estlands"
 
 msgid "Basque"
-msgstr ""
+msgstr "Baskisch"
 
 msgid "Persian"
 msgstr "Perzisch"
@@ -12505,7 +12288,7 @@
 msgstr "Iers"
 
 msgid "Galician"
-msgstr "Galiciaans"
+msgstr "Gallicisch"
 
 msgid "Gujarati"
 msgstr "Gujarati"
@@ -12547,7 +12330,7 @@
 msgstr "Kannada"
 
 msgid "Kannada Translation team"
-msgstr "Canadees vertaalteam"
+msgstr "Kannada vertaalteam"
 
 msgid "Korean"
 msgstr "Koreaans"
@@ -12561,26 +12344,23 @@
 msgid "Macedonian"
 msgstr "Macedonisch"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "Man"
+msgstr "Malayalam"
 
 msgid "Mongolian"
 msgstr "Mongools"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "Gujarati"
-
-#, fuzzy
+msgstr "Marathi"
+
 msgid "Malay"
-msgstr "Man"
+msgstr "Maleis"
 
 msgid "Bokmål Norwegian"
-msgstr "Noors"
+msgstr "Bokmål Noors"
 
 msgid "Nepali"
-msgstr "Nepals"
+msgstr "Nepalees"
 
 msgid "Dutch, Flemish"
 msgstr "Nederlands & Vlaams"
@@ -12591,9 +12371,8 @@
 msgid "Occitan"
 msgstr "Occitaans"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "Oriya"
 
 msgid "Punjabi"
 msgstr "Punjabi"
@@ -12651,9 +12430,8 @@
 msgid "Turkish"
 msgstr "Turks"
 
-#, fuzzy
 msgid "Ukranian"
-msgstr "Armeens"
+msgstr "Ukranian"
 
 msgid "Urdu"
 msgstr "Urdu"
@@ -12679,7 +12457,7 @@
 msgid "Lithuanian"
 msgstr "Litouws"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s is a messaging client based on libpurple which is capable of connecting "
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
@@ -12688,16 +12466,13 @@
 "copyrighted by its contributors, a list of whom is also distributed with "
 "%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s is een grafisch modulair programma voor chatberichten en kan "
-"tegelijkertijd gebruik maken van de netwerken: AIM, MSN, Yahoo!, XMPP, ICQ, "
-"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
-"MySpaceIM, Gadu-Gadu, en QQ. Pidgin is geschreven met behulp van GTK+. "
-"<BR><BR>U mag het programma aanpassen en verspreiden als u zich houdt aan de "
-"GPL (versie 2 of nieuwer). Er is een kopie van deze licentie meegeleverd in "
-"het bestand 'COPYING' geleverd met %s. Het copyright van %s ligt bij de "
-"mensen die hier aan hebben meegewerkt. Zie voor een volledige lijst van de "
-"bijdragers het bestand 'COPYRIGHT'. Dit programma wordt geleverd zonder "
-"enige garantie.<BR><BR>"
+"%s is een IM cliënt gebaseerd op libpurple, welke verbinding kan maken met "
+"meerdere IM programma's tegelijk.  %s is geschreven in C met behulp van GTK"
+"+.  %s is vrijgegeven en mag gemodificeerd en opnieuw gedistribueerd worden "
+"onder de voorwaarden van de GPL versie 2 (of later).  Een kopie van de GPL "
+"is toegevoegd aan %s.  %s is auteursrechtelijk beschermd door zijn "
+"bijdragers van welke een lijst toegevoegd is bij %s.  Er bestaat geen "
+"garantie voor %s.<BR><BR>"
 
 #, c-format
 msgid ""
@@ -12706,6 +12481,9 @@
 "Channel: #pidgin on irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin."
 "im<BR><BR>"
 msgstr ""
+"<FONT SIZE=\"4\"><B>Behulpzame Bronnen</B></FONT><BR>\t<A HREF=\"%s"
+"\">Website</A><BR>\t<A HREF=\"%s\">Veelgestelde Vragen</A><BR>\tIRC kanaal: "
+"#pidgin op irc.freenode.net<BR>\tXMPP MUC: devel@conference.pidgin.im<BR><BR>"
 
 #, c-format
 msgid ""
@@ -12717,45 +12495,51 @@
 "welcome to post in another language, but the responses may be less helpful."
 "<br/>"
 msgstr ""
+"<font size=\"4\"><b>Hulp van andere Pidgin gebruikers</b></font> is "
+"beschikbaar via e-mail <a href=\"mailto:support@pidgin.im\">support@pidgin."
+"im</a><br/>Dit is een <b>openbare</b> mailing lijst! (<a href=\"http://"
+"pidgin.im/pipermail/support/\">archief</a>)<br/>We kunnen geen hulp verlenen "
+"voor protocols of plug-ins van derden!<br/>De hoofdtaal van deze lijst is "
+"<b>Engels</b>.  U bent welkom in een andere taal te schrijven, maar de "
+"antwoorden kunnen dan minder behulpzaam zijn.<br/>"
 
 #, c-format
 msgid "About %s"
 msgstr "Over %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Contactinformatie"
+msgstr "Build Informatie"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Contactinformatie"
+msgstr "%s Build informatie"
 
 msgid "Current Developers"
 msgstr "Huidige ontwikkelaars"
 
 msgid "Crazy Patch Writers"
-msgstr "Gestoorde patch-schrijvers"
+msgstr "Crazy Patch Schrijvers"
 
 msgid "Retired Developers"
-msgstr "Gestopte ontwikkelaars"
+msgstr "Gestopte Ontwikkelaars"
 
 msgid "Retired Crazy Patch Writers"
-msgstr "Gestoorde Patch-schrijvers"
-
-#, fuzzy, c-format
+msgstr "Gestopte Crazy Patch Schrijvers"
+
+#, c-format
 msgid "%s Developer Information"
-msgstr "Server-informatie"
+msgstr "%s Info over Ontwikkelaars"
 
 msgid "Current Translators"
-msgstr "Huidige vertalers"
+msgstr "Huidige Vertalers"
 
 msgid "Past Translators"
-msgstr "Gestopte vertalers"
-
-#, fuzzy, c-format
+msgstr "Gestopte Vertalers"
+
+#, c-format
 msgid "%s Translator Information"
-msgstr "Werkinformatie"
+msgstr "%s Info over Vertalers"
 
 msgid "_Name"
 msgstr "_Naam"
@@ -12764,30 +12548,30 @@
 msgstr "_Account"
 
 msgid "Get User Info"
-msgstr "Gebruikersinfo"
+msgstr "Haal Gebruikersinfo op"
 
 msgid ""
 "Please enter the username or alias of the person whose info you would like "
 "to view."
 msgstr ""
-"Geef de gebruikersnaam of bijnaamvan de persoon waarvan u de informatie wilt "
-"opvragen."
+"Geef de gebruikersnaam of bijnaam van de persoon waarvan u de informatie "
+"wilt opvragen."
 
 msgid "View User Log"
 msgstr "Gebruikerslogboek opvragen"
 
 msgid "Alias Contact"
-msgstr "Alias contact"
+msgstr "Alias contactpersoon"
 
 msgid "Enter an alias for this contact."
-msgstr "Geef een alias voor deze persoon."
+msgstr "Geef een alias voor dit contactpersoon."
 
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geef een alias voor %s."
 
 msgid "Alias Buddy"
-msgstr "Alias voor contact"
+msgstr "Alias voor vriend"
 
 msgid "Alias Chat"
 msgstr "Alias chat"
@@ -12803,17 +12587,17 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"Je gaat het contact met %s en %d ander contact van je contactenlijst "
-"wissen.  Wil je doorgaan?"
+"U gaat het contactpersoon met %s en %d ander vrienden van uw vriendenlijst "
+"wissen.  Wilt u doorgaan?"
 msgstr[1] ""
-"Je gaat het contact met %s en %d ander contacten van je contactenlijst "
-"wissen.  Wil je doorgaan?"
+"U gaat het contactpersoon met %s en %d ander vrienden van uw vriendenlijst "
+"wissen.  Wilt u doorgaan?"
 
 msgid "Remove Contact"
-msgstr "Contact verwijderen"
+msgstr "Contactpersoon verwijderen"
 
 msgid "_Remove Contact"
-msgstr "_Contact verwijderen"
+msgstr "_Contactpersoon verwijderen"
 
 #, c-format
 msgid ""
@@ -12834,8 +12618,8 @@
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"U staat op het punt om de groep %s en alle contacten in die groep van uw "
-"contactenlijst te verwijderen. Wilt u doorgaan?"
+"U staat op het punt om de groep %s en alle Vrienden in die groep van uw "
+"Vriendenlijst te verwijderen. Wilt u doorgaan?"
 
 msgid "Remove Group"
 msgstr "Groep verwijderen"
@@ -12847,22 +12631,22 @@
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
-"U staat op het punt om %s van uw contactenlijst te verwijderen. Wilt u "
+"U staat op het punt om %s van uw Vriendenlijst te verwijderen. Wilt u "
 "doorgaan?"
 
 msgid "Remove Buddy"
-msgstr "Contact verwijderen"
+msgstr "Vriend verwijderen"
 
 msgid "_Remove Buddy"
-msgstr "Contact ver_wijderen"
+msgstr "Vriend ver_wijderen"
 
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
-"U staat op het punt om de chatruimte %s van uw contactenlijst te "
-"verwijderen. Wilt u doorgaan?"
+"U staat op het punt om de chatruimte %s van uw Vriendenlijst te verwijderen. "
+"Wilt u doorgaan?"
 
 msgid "Remove Chat"
 msgstr "Chat verwijderen"
@@ -12877,7 +12661,7 @@
 msgstr "Status _wijzigen"
 
 msgid "Show Buddy _List"
-msgstr "Contactenlijst _weergeven"
+msgstr "Vriendenlijst _weergeven"
 
 msgid "_Unread Messages"
 msgstr "_Ongelezen berichten"
@@ -12889,7 +12673,7 @@
 msgstr "_Accounts"
 
 msgid "Plu_gins"
-msgstr "Plu_gins"
+msgstr "Plu_g-ins"
 
 msgid "Pr_eferences"
 msgstr "Voork_euren"
@@ -12946,10 +12730,10 @@
 msgstr "Snelheid:"
 
 msgid "Time Elapsed:"
-msgstr "Tijd:"
+msgstr "Tijd Verlopen:"
 
 msgid "Time Remaining:"
-msgstr "Schatting:"
+msgstr "Schatting Resttijd:"
 
 msgid "Close this window when all transfers _finish"
 msgstr "Venster sluiten nadat alles is _voltooid"
@@ -12959,81 +12743,77 @@
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "Details bestand"
+msgstr "Details bestandsoverdracht"
 
 msgid "Paste as Plain _Text"
-msgstr "_Plakken als tekst"
+msgstr "_Plakken als platte tekst"
 
 msgid "_Reset formatting"
-msgstr "Opmaak _verwijderen"
+msgstr "Opmaak _herstellen"
 
 msgid "Disable _smileys in selected text"
-msgstr "Smileys in geselecteerde tekst inschakelen"
+msgstr "Emoticons in geselecteerde tekst uitschakelen"
 
 msgid "Hyperlink color"
-msgstr "Kleur van verwijzing"
+msgstr "Hyperlink Kleur"
 
 msgid "Color to draw hyperlinks."
-msgstr "Kleur van de verwijzingen"
+msgstr "Kleur om hyperlinks te tekenen"
 
 msgid "Hyperlink visited color"
-msgstr "Kleur van reeds bezochte verwijzing"
-
-#, fuzzy
+msgstr "Kleur van bezochte hyperlinks"
+
 msgid "Color to draw hyperlink after it has been visited (or activated)."
-msgstr "Kleur van de verwijzingen wanneer muis erboven hangt"
+msgstr "Kleur van de hyperlink nadat die bezocht is (of geactiveerd)."
 
 msgid "Hyperlink prelight color"
-msgstr "Kleur van verwijzing"
+msgstr "Kleur van hyperlink"
 
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Kleur van de verwijzingen wanneer muis erboven hangt"
+msgstr "Kleur van de hyperlinks wanneer muis erboven hangt"
 
 msgid "Sent Message Name Color"
-msgstr "Verzonden bericht-kleur"
+msgstr "Kleur Verzonden bericht"
 
 msgid "Color to draw the name of a message you sent."
 msgstr "De kleur die de naam van bericht met zich mee draagt"
 
 msgid "Received Message Name Color"
-msgstr "Ontvangen bericht-kleur"
+msgstr "Kleur Ontvangen bericht"
 
 msgid "Color to draw the name of a message you received."
-msgstr "De kleur die weergegeven wordt van het bericht dat je ontvangt."
+msgstr "De kleur die weergegeven wordt van het bericht dat u ontvangt."
 
 msgid "\"Attention\" Name Color"
-msgstr "\"Attentie\" -kleur"
+msgstr "\"Attentie\" kleur Naam"
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
-"De kleur van de naam van een bericht dat je hebt ontvangen inclusief je naam"
+"De kleur van de naam van een bericht dat u heeft ontvangen inclusief u naam"
 
 msgid "Action Message Name Color"
-msgstr "Actie-bericht-kleur"
+msgstr "Kleur Actiebericht"
 
 msgid "Color to draw the name of an action message."
 msgstr "De kleur van een naam van een melding."
 
 msgid "Action Message Name Color for Whispered Message"
-msgstr ""
-
-#, fuzzy
+msgstr "Kleur Actieberichtennaam voor Gefluisterd Bericht"
+
 msgid "Color to draw the name of a whispered action message."
-msgstr "De kleur van een naam van een melding."
+msgstr "Kleur van een naam van een gefluisterd actiebericht."
 
 msgid "Whisper Message Name Color"
-msgstr "Fluisterend berichtkleur"
-
-#, fuzzy
+msgstr "Kleur Fluisterbericht"
+
 msgid "Color to draw the name of a whispered message."
-msgstr "De kleur van een naam van een melding."
+msgstr "Kleur van de naam van een fluisterbericht."
 
 msgid "Typing notification color"
 msgstr "Kleur van melding van typen"
 
-#, fuzzy
 msgid "The color to use for the typing notification"
-msgstr "De kleur die gebruikt wordt voor het lettertype van de typmelding"
+msgstr "De kleur voor het typen van een notitie"
 
 msgid "Typing notification font"
 msgstr "Lettertype van melding van typen"
@@ -13070,7 +12850,7 @@
 msgstr "Afbeelding _opslaan..."
 
 msgid "_Add Custom Smiley..."
-msgstr "_Eigen smiley toevoegen"
+msgstr "_Eigen emoticon toevoegen"
 
 msgid "Select Font"
 msgstr "Lettertype selecteren"
@@ -13091,14 +12871,14 @@
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
 msgstr ""
-"Geef de URL en de beschrijving van de verwijzing die u wilt invoegen. De "
+"Geef de URL en de beschrijving van de link die u wilt invoegen. De "
 "beschrijving is optioneel."
 
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Geef de URL van de verwijzing die u wilt invoegen."
+msgstr "Geef de URL van de link die u wilt invoegen."
 
 msgid "Insert Link"
-msgstr "Verwijzing invoegen"
+msgstr "Link invoegen"
 
 msgid "_Insert"
 msgstr "_Invoegen"
@@ -13115,18 +12895,18 @@
 "This smiley is disabled because a custom smiley exists for this shortcut:\n"
 " %s"
 msgstr ""
-"Deze smiley is uitgeschakeld omdat een aangepaste smiley al bestaat voor "
+"Deze emoticon is uitgeschakeld omdat een aangepaste emoticon al bestaat voor "
 "deze snelkoppeling:\n"
 "%s"
 
 msgid "Smile!"
-msgstr "Lachen!"
+msgstr "Emotions!"
 
 msgid "_Manage custom smileys"
-msgstr "Eigen smileys _beheren"
+msgstr "Eigen emoticons _beheren"
 
 msgid "This theme has no available smileys."
-msgstr "Dit thema heeft geen smileys beschikbaar."
+msgstr "Dit thema heeft geen emoticons beschikbaar."
 
 msgid "_Font"
 msgstr "_Lettertype"
@@ -13168,11 +12948,10 @@
 msgstr "Afbeelding invoegen"
 
 msgid "Insert Smiley"
-msgstr "Smiley invoegen"
-
-#, fuzzy
+msgstr "Emoticon invoegen"
+
 msgid "Send Attention"
-msgstr "Verzendknop"
+msgstr "Verzend attentie"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>_Vet: </b>"
@@ -13217,10 +12996,10 @@
 msgstr "_Horizontale streep"
 
 msgid "_Smile!"
-msgstr "L_achen!"
+msgstr "E_moticons!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Attentie!"
 
 msgid "Log Deletion Failed"
 msgstr "Logboek verwijderen mislukt"
@@ -13233,15 +13012,15 @@
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Weet je zeker dat je het logboek van het gesprek in met %s  dat startte op "
-"%s permanent wilt verwijderen?"
+"Weet u zeker dat u het logboek van het gesprek in met %s  dat startte op %s "
+"permanent wilt verwijderen?"
 
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in "
 "%s which started at %s?"
 msgstr ""
-"Weet je zeker dat je het logboek van het gesprek in %s  dat startte op %s "
+"Weet u zeker dat u het logboek van het gesprek in %s  dat startte op %s "
 "permanent wilt verwijderen?"
 
 #, c-format
@@ -13249,7 +13028,7 @@
 "Are you sure you want to permanently delete the system log which started at "
 "%s?"
 msgstr ""
-"Weet je zeker dat je het systeem-logboek dat startte op %s permanent wilt "
+"Weet u zeker dat u het systeem-logboek dat startte op %s permanent wilt "
 "verwijderen?"
 
 msgid "Delete Log?"
@@ -13268,7 +13047,7 @@
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
 msgid "_Browse logs folder"
-msgstr "_Bekijk logboek-folder"
+msgstr "_Bekijk logboekmap"
 
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
@@ -13279,45 +13058,51 @@
 "Usage: %s [OPTION]...\n"
 "\n"
 msgstr ""
+"Gebruik: %s [OPTIE]...\n"
+"\n"
 
 msgid "DIR"
-msgstr ""
+msgstr "DIR"
 
 msgid "use DIR for config files"
-msgstr ""
+msgstr "gebruik DIR voor config bestanden"
 
 msgid "print debugging messages to stdout"
-msgstr ""
+msgstr "afdrukken van debugberichten naar stdout"
 
 msgid "force online, regardless of network status"
-msgstr ""
+msgstr "Forceer inline, onafhankelijk van de netwerk status"
 
 msgid "display this help and exit"
-msgstr ""
-
-#, fuzzy
+msgstr "Toon dit helpvenster en sluit af"
+
 msgid "allow multiple instances"
-msgstr "Meerdere keren gelijk inloggen toestaan"
+msgstr "Meerdere instanties toestaan"
 
 msgid "don't automatically login"
-msgstr ""
+msgstr "Meldt niet automatisch aan"
 
 msgid "NAME"
-msgstr ""
+msgstr "NAAM"
 
 msgid ""
 "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)."
 msgstr ""
+"inschakelen van gespecificeerde account(s) (optioneel argument NAAM\n"
+"                      specificeert te gebruiken account(s), gescheiden door "
+"commas.\n"
+"                      Zonder dit wordt alleen het eerste account "
+"ingeschakeld)."
 
 msgid "X display to use"
-msgstr ""
+msgstr "te gebruiken X-display"
 
 msgid "display the current version and exit"
-msgstr ""
-
-#, fuzzy, c-format
+msgstr "Geef de huidige versie weer en sluit af"
+
+#, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
@@ -13332,33 +13117,29 @@
 "how to get the backtrace, please read the instructions at\n"
 "%swiki/GetABacktrace\n"
 msgstr ""
-"%s %s is gecrashed en heeft geprobeerd een core-bestand te dumpen.\n"
-"Dit is een fout in de software is gebeurd zonder dat u er\n"
-"iets aan kon doen.\n"
-"\n"
-"Als u deze crash kunt reproduceren, meld dit dan bij de makers\n"
-"door een bugreport in te sturen via\n"
-"%sbug.php\n"
-"\n"
-"Geef (in het Engels) duidelijk aan wat u deed op het moment\n"
-"van de crash en haal de backtrace uit de coredump.  Als u niet weet\n"
-"hoe u de backtracemoet achterhalen, kijk dan op\n"
-"%sgdb.php.\n"
-"\n"
-"Als u verdere assistentie nodig heeft\n"
-" kunt u SeanEgn of LSchiere (via AIM) benaderen.\n"
-"Verdere contactinformatie is te vinden via\n"
-"%scontactinfo.php.\n"
+"%s %s is vastgelopen en heeft geprobeerd een kernelbestand te dumpen.\n"
+"dit is een bug in de software en is niet gebeurd door een fout van uzelf.\n"
+"\n"
+"Als u de crash kunt reproduceren, licht dan de ontwikkleaars in\n"
+"door de bug te rapporteren bij:\n"
+"%ssimpleticket/\n"
+"\n"
+"Graag specificeren wat u op dat moment deed\n"
+"en een backtrace van het core bestand meezenden. Als u niet weet\n"
+"hoe u een backtrace verkrijgt, lees dan de instructies op\n"
+"%swiki/GetABacktrace\n"
 
 #, c-format
 msgid "Exiting because another libpurple client is already running.\n"
-msgstr ""
-
-msgid "/_Media"
+msgstr "We sluiten af, omdat een andere libpurple cliënt al actief is.\n"
+
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/Op_hangen"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Ophangen"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13369,7 +13150,7 @@
 msgstr "%s wil een videogesprek starten."
 
 msgid "Incoming Call"
-msgstr ""
+msgstr "Binnenkomende Gesprek"
 
 msgid "_Pause"
 msgstr "_Pauzeren"
@@ -13410,18 +13191,17 @@
 msgstr "Alle berichten openen"
 
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Je hebt postl!</span>"
-
-#, fuzzy
+msgstr "<span weight=\"bold\" size=\"larger\">U heeft e-maill!</span>"
+
 msgid "New Pounces"
-msgstr "Nieuw contactalarm"
+msgstr "Nieuwe Alarmeringen"
 
 msgid "Dismiss"
 msgstr "Afwijzen"
 
-#, fuzzy
 msgid "<span weight=\"bold\" size=\"larger\">You have pounced!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Je hebt postl!</span>"
+msgstr ""
+"<span weight=\"bold\" size=\"larger\">U heeft een alarm verzonden!</span>"
 
 msgid "The following plugins will be unloaded."
 msgstr "De volgende plug-ins zullen uitgeschakeld worden"
@@ -13471,34 +13251,33 @@
 msgid "Select a file"
 msgstr "Kies een bestand"
 
-#, fuzzy
 msgid "Modify Buddy Pounce"
-msgstr "Contactalarm bewerken"
+msgstr "Alarm Veranderen"
 
 #. Create the "Pounce on Whom" frame.
 msgid "Pounce on Whom"
-msgstr "Wie alarmeren"
+msgstr "Wie Alarmeren"
 
 msgid "_Account:"
 msgstr "_Account:"
 
 msgid "_Buddy name:"
-msgstr "_Contactnaam:"
+msgstr "_Vriendennaam:"
 
 msgid "Si_gns on"
-msgstr "_Aanmelden"
+msgstr "Zi_ch Aanmeldt"
 
 msgid "Signs o_ff"
-msgstr "Af_melden"
+msgstr "Zich Af_meldt"
 
 msgid "Goes a_way"
-msgstr "_Weggaan"
+msgstr "_Weggaat"
 
 msgid "Ret_urns from away"
-msgstr "_Terugkeren van afwezigheid"
+msgstr "_Terugkeer van weggeweest"
 
 msgid "Becomes _idle"
-msgstr "_Inactief is"
+msgstr "_Inactief wordt"
 
 msgid "Is no longer i_dle"
 msgstr "Weer _actief is"
@@ -13540,13 +13319,13 @@
 msgstr "_Voorbeeld"
 
 msgid "P_ounce only when my status is not Available"
-msgstr "_Contactalarm alleen wanneer mijn status niet beschikbaar is"
+msgstr "_Alleen alarmeren wanneer mijn status 'Niet Beschikbaar' is"
 
 msgid "_Recurring"
-msgstr "_Herhalend"
+msgstr "_Terugkerend"
 
 msgid "Pounce Target"
-msgstr "Alarmdoel"
+msgstr "Doel"
 
 msgid "Started typing"
 msgstr "Gestart met typen"
@@ -13570,7 +13349,7 @@
 msgstr "Afgemeld"
 
 msgid "Became idle"
-msgstr "Werd incatief"
+msgstr "Werd inactief"
 
 msgid "Went away"
 msgstr "Ging weg"
@@ -13582,20 +13361,19 @@
 msgstr "Onbekend... Rapporteer dit alsjeblieft!"
 
 msgid "(Custom)"
-msgstr ""
+msgstr "(Aangepast)"
 
 msgid "Penguin Pimps"
 msgstr "Pinguin-pimper"
 
 msgid "The default Pidgin sound theme"
-msgstr ""
-
-#, fuzzy
+msgstr "Het standaard Pidgin geluidsthema"
+
 msgid "The default Pidgin buddy list theme"
-msgstr "Thema bewerken contactenlijst Pidgin"
+msgstr "Het standaard Pidgin vriendenlijst thema"
 
 msgid "The default Pidgin status icon theme"
-msgstr ""
+msgstr "Het standaard Pidgin status pictogram thema"
 
 msgid "Theme failed to unpack."
 msgstr "Kan thema niet uitpakken."
@@ -13606,34 +13384,29 @@
 msgid "Theme failed to copy."
 msgstr "Kan thema niet kopiëren."
 
-#, fuzzy
 msgid "Theme Selections"
-msgstr "Browser-selectie"
+msgstr "Thema Selecties"
 
 #. Instructions
-#, fuzzy
 msgid ""
 "Select a theme that you would like to use from the lists below.\n"
 "New themes can be installed by dragging and dropping them onto the theme "
 "list."
 msgstr ""
-"Kies een smileythema uit de lijst. U kunt nieuwe thema's installeren door "
-"deze naar de lijst te slepen."
-
-#, fuzzy
+"Kies een thema die u wilt gebruiken uit de lijst hieronder.\n"
+"Nieuwe thema's kunnen worden geïnstalleerd door deze naar de lijst te slepen."
+
 msgid "Buddy List Theme:"
-msgstr "Thema contactenlijst"
-
-#, fuzzy
+msgstr "Thema Vriendenlijst:"
+
 msgid "Status Icon Theme:"
-msgstr "Status-pictogrammen"
+msgstr "Statuspictogrammen thema:"
 
 msgid "Sound Theme:"
-msgstr ""
-
-#, fuzzy
+msgstr "Geluidsthema:"
+
 msgid "Smiley Theme:"
-msgstr "Smiley-thema's"
+msgstr "Emoticon thema:"
 
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
@@ -13655,20 +13428,20 @@
 msgstr "Gespreksvenster"
 
 msgid "_Hide new IM conversations:"
-msgstr "_Nieuwe gesprekken verbergen:"
+msgstr "_Nieuwe IM gesprekken verbergen:"
 
 msgid "When away"
 msgstr "Bij afwezigheid"
 
 msgid "Minimi_ze new conversation windows"
-msgstr "Minimalizeer nieuwe gespreksvensters "
+msgstr "Minimaliseer nieuwe gespreksvensters "
 
 #. All the tab options!
 msgid "Tabs"
 msgstr "Tabs"
 
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Gesprekken en chats in venster met _tabbaden plaatsen"
+msgstr "IM's en chats in venster met _tabs plaatsen"
 
 msgid "Show close b_utton on tabs"
 msgstr "_Sluitknoppen weergeven op tabbladen"
@@ -13701,25 +13474,25 @@
 msgstr "_Opmaak weergeven bij ontvangen berichten"
 
 msgid "Close IMs immediately when the tab is closed"
-msgstr "Chat direct sluiten wanneer de tab gesloten wordt"
+msgstr "IM direct sluiten wanneer de tab gesloten wordt"
 
 msgid "Show _detailed information"
-msgstr "Laat ge_detaileerde informatie zien"
+msgstr "Laat ge_detailleerde informatie zien"
 
 msgid "Enable buddy ic_on animation"
-msgstr "Bewegende _pictogrammen weergeven"
+msgstr "Inschakelen animatie van pict_ogrammen"
 
 msgid "_Notify buddies that you are typing to them"
-msgstr "Laat anderen weten dat je iets naar ze typt"
+msgstr "Laat vrienden weten dat u iets naar ze typt"
 
 msgid "Highlight _misspelled words"
-msgstr "Verkeerd gespelde woorden _oplichten"
+msgstr "Verkeerd gespelde woorden _markeren"
 
 msgid "Use smooth-scrolling"
 msgstr "Vloeiend schuiven"
 
 msgid "F_lash window when IMs are received"
-msgstr "Venster laten _knipperen wanneer gespreksberichten worden ontvangen"
+msgstr "Venster laten _knipperen wanneer IM's worden ontvangen"
 
 msgid "Minimum input area height in lines:"
 msgstr "Minimale invoerhoogte in regels:"
@@ -13747,19 +13520,17 @@
 msgstr "Kan het programma voor proxy-instellingen niet starten."
 
 msgid "Cannot start browser configuration program."
-msgstr "Kan het programma voor browser-instellingen niet starten."
-
-#, fuzzy
+msgstr "Kan het programma voor browserinstellingen niet starten."
+
 msgid "Disabled"
-msgstr "_Uitzetten"
-
-#, fuzzy, c-format
+msgstr "Uitgeschakeld"
+
+#, c-format
 msgid "Use _automatically detected IP address: %s"
-msgstr "IP-adres _automatisch bepalen"
-
-#, fuzzy
+msgstr "Gebruik _automatisch ontdekt IP-adres: %s"
+
 msgid "ST_UN server:"
-msgstr "ST_UN-server:"
+msgstr "ST_UN server:"
 
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Bijvoorbeeld: stunserver.org</span>"
@@ -13773,33 +13544,27 @@
 msgid "_Enable automatic router port forwarding"
 msgstr "_Automatisch router port forwarding inschakelen"
 
-#, fuzzy
 msgid "_Manually specify range of ports to listen on:"
-msgstr "Poortbereik _handmatig aangeven"
-
-#, fuzzy
+msgstr "Poortbereik _handmatig aangeven:"
+
 msgid "_Start:"
-msgstr "_Status:"
-
-#, fuzzy
+msgstr "_Start:"
+
 msgid "_End:"
-msgstr "_Uitvouwen"
+msgstr "_Eind:"
 
 #. TURN server
 msgid "Relay Server (TURN)"
 msgstr "Relay Server (TURN)"
 
-#, fuzzy
 msgid "_TURN server:"
-msgstr "ST_UN-server:"
-
-#, fuzzy
+msgstr "_TURN server:"
+
 msgid "Use_rname:"
-msgstr "Gebruikersnaam:"
-
-#, fuzzy
+msgstr "Gebruike_rsnaam:"
+
 msgid "Pass_word:"
-msgstr "Wachtwoord: "
+msgstr "Wacht_woord: "
 
 msgid "Seamonkey"
 msgstr "Seamonkey"
@@ -13838,13 +13603,10 @@
 msgstr "Handmatig"
 
 msgid "Browser Selection"
-msgstr "Browser-selectie"
-
-#, fuzzy
+msgstr "Browser selectie"
+
 msgid "Browser preferences are configured in GNOME preferences"
-msgstr ""
-"Proxy- en browser-voorkeuren zijn ingesteld\n"
-"in GNOME-instellingen"
+msgstr "Browser voorkeuren zijn ingesteld in GNOME-instellingen"
 
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Programma voor browser-instellingen werd niet gevonden.</b>"
@@ -13856,10 +13618,10 @@
 msgstr "_Browser:"
 
 msgid "_Open link in:"
-msgstr "Verwijzing _openen met:"
+msgstr "Link _openen met:"
 
 msgid "Browser default"
-msgstr "Standaard-browser"
+msgstr "Standaard browser"
 
 msgid "Existing window"
 msgstr "Bestaand venster"
@@ -13878,11 +13640,8 @@
 msgid "Proxy Server"
 msgstr "Proxy-server"
 
-#, fuzzy
 msgid "Proxy preferences are configured in GNOME preferences"
-msgstr ""
-"Proxy- en browser-voorkeuren zijn ingesteld\n"
-"in GNOME-instellingen"
+msgstr "Proxy voorkeuren zijn ingesteld in GNOME voorkeuren"
 
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Proxy-configuratie programma werd niet gevonden.</b>"
@@ -13893,34 +13652,31 @@
 #. This is a global option that affects SOCKS4 usage even with
 #. * account-specific proxy settings
 msgid "Use remote _DNS with SOCKS4 proxies"
-msgstr ""
-
-#, fuzzy
+msgstr "Gebruik remote _DNS met SOCKS4 proxies"
+
 msgid "Proxy t_ype:"
-msgstr "Proxy_type:"
+msgstr "Proxyt_ype:"
 
 msgid "No proxy"
 msgstr "Geen proxy"
 
-#, fuzzy
 msgid "P_ort:"
-msgstr "_Poort:"
-
-#, fuzzy
+msgstr "P_oort:"
+
 msgid "User_name:"
-msgstr "Gebruikersnaam:"
+msgstr "Gebruikers_naam:"
 
 msgid "Log _format:"
 msgstr "Logboekop_maak:"
 
 msgid "Log all _instant messages"
-msgstr "Alle gesprekken _opslaan"
+msgstr "Log alle _instant messages"
 
 msgid "Log all c_hats"
-msgstr "Alle _chats opslaan"
+msgstr "Log Alle _chats"
 
 msgid "Log all _status changes to system log"
-msgstr "_Statusveranderingen opslaan in systeemlogboek"
+msgstr "Log alle _statusveranderingen in systeemlogboek"
 
 msgid "Sound Selection"
 msgstr "Geluid selecteren"
@@ -13970,7 +13726,7 @@
 msgstr "Geluiden _dempen"
 
 msgid "Sounds when conversation has _focus"
-msgstr "Geluiden wanneer gesprek de _aandacht heeft"
+msgstr "Geluiden wanneer het gesprekvenster de _focus heeft"
 
 msgid "_Enable sounds:"
 msgstr "G_eluiden inschakelen:"
@@ -13988,17 +13744,16 @@
 msgstr "_Herstellen"
 
 msgid "_Report idle time:"
-msgstr "Bijhouden van activiteit:"
+msgstr "Bijhouden van inactiviteitsduur:"
 
 msgid "Based on keyboard or mouse use"
-msgstr "Activiteit van toetsenbord en muis"
+msgstr "Gebaseerd op gebruik van toetsenbord of muis"
 
 msgid "_Minutes before becoming idle:"
-msgstr "_Minuten voor inactief worden:"
-
-#, fuzzy
+msgstr "_Minuten alvorens inactief te worden:"
+
 msgid "Change to this status when _idle:"
-msgstr "Status op afwezig zetten _wanneer ik inactief ben"
+msgstr "_Wanneer ik inactief ben zetten op status"
 
 msgid "_Auto-reply:"
 msgstr "_Automatisch antwoord:"
@@ -14008,10 +13763,10 @@
 
 #. Signon status stuff
 msgid "Status at Startup"
-msgstr "Status bij starten"
+msgstr "Status bij Opstarten"
 
 msgid "Use status from last _exit at startup"
-msgstr "_Laatst gebruikte status herstellen bij opstarten"
+msgstr "_Laatst Status herstellen bij opstarten"
 
 msgid "Status to a_pply at startup:"
 msgstr "Te gebruiken _status bij opstarten:"
@@ -14025,18 +13780,17 @@
 msgid "Status / Idle"
 msgstr "Status / inactief"
 
-#, fuzzy
 msgid "Themes"
-msgstr "Smiley-thema's"
+msgstr "Thema's"
 
 msgid "Allow all users to contact me"
-msgstr "Alle gebruikers mogen contact met mij leggen"
+msgstr "Alle gebruikers mogen contact met mij maken"
 
 msgid "Allow only the users on my buddy list"
-msgstr "Alleen gebruikers uit mijn contactenlijst mogen contact met mij leggen"
+msgstr "Alleen gebruikers uit mijn Vriendenlijst mogen contact met mij maken"
 
 msgid "Allow only the users below"
-msgstr "Alleen onderstaande gebruikers mogen contact met mij leggen"
+msgstr "Alleen onderstaande gebruikers mogen contact met mij maken"
 
 msgid "Block all users"
 msgstr "Alle gebruikers blokkeren"
@@ -14048,7 +13802,7 @@
 msgstr "Privacy"
 
 msgid "Changes to privacy settings take effect immediately."
-msgstr "Veranderingen aan privacy-instellingen worden direct actief."
+msgstr "Veranderingen aan privacy-instellingen worden direct doorgevoerd."
 
 msgid "Set privacy for:"
 msgstr "Privacy instellen voor:"
@@ -14061,21 +13815,21 @@
 msgstr "Gebruiker toestaan"
 
 msgid "Type a user you permit to contact you."
-msgstr "Geef een gebruiker die contact met u mag leggen."
+msgstr "Geef een gebruiker die contact met u mag msken."
 
 msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Geef de naam van de gebruiker die contact met u mag leggen."
+msgstr "Geef de naam van de gebruiker die contact met u mag maken."
 
 msgid "_Permit"
 msgstr "_Toestaan"
 
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "%s toestaan contact met u te leggen?"
+msgstr "%s toestaan contact met u te maken?"
 
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Weet u zeker dat u %s toestemming wilt geven?"
+msgstr "Weet u zeker dat u %s toestemming wilt geven contact met u te maken?"
 
 msgid "Block User"
 msgstr "Gebruiker blokkeren"
@@ -14122,7 +13876,7 @@
 
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr ""
-"Weet je zeker dat je de geselecteerde opgeslagen statussen wilt veranderen?"
+"Weet u zeker dat u de geselecteerde opgeslagen statussen wilt veranderen?"
 
 #. Use button
 msgid "_Use"
@@ -14153,24 +13907,23 @@
 msgid "Status for %s"
 msgstr "Status van %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "A custom smiley for '%s' already exists.  Please use a different shortcut."
 msgstr ""
-"Een eigen smiley voor de geselecteerde snelkoppeling bestaat al reeds. Geef "
-"alsjeblieft een andere snelkoppeling."
+"Een eigen emoticon voor de '%s' bestaat al. Gebruik een andere snelkoppeling."
 
 msgid "Custom Smiley"
-msgstr "Eigen smiley"
+msgstr "Eigen Emoticon"
 
 msgid "Duplicate Shortcut"
 msgstr "Dubbele snelkoppeling"
 
 msgid "Edit Smiley"
-msgstr "Smiley bewerken"
+msgstr "Emoticon bewerken"
 
 msgid "Add Smiley"
-msgstr "Smiley toevoegen"
+msgstr "Emoticon toevoegen"
 
 msgid "_Image:"
 msgstr "_Afbeelding:"
@@ -14180,26 +13933,22 @@
 msgstr "_Tekst snelkoppeling"
 
 msgid "Smiley"
-msgstr "Eigen smileys"
+msgstr "Emoticon"
 
 msgid "Shortcut Text"
 msgstr "Tekst snelkoppeling"
 
 msgid "Custom Smiley Manager"
-msgstr "Eigen smileys beheren"
-
-#, fuzzy
-msgid "Attention received"
-msgstr "Activatie vereist"
+msgstr "Eigen emoticons beheren"
 
 msgid "Select Buddy Icon"
-msgstr "Pictogram contact selecteren"
+msgstr "Vriendenpictogram selecteren"
 
 msgid "Click to change your buddyicon for this account."
-msgstr "Klik om het contactplaatje voor dit account te veranderen."
+msgstr "Klik om het Vriendpictogram voor dit account te veranderen."
 
 msgid "Click to change your buddyicon for all accounts."
-msgstr "Klik om het contactplaatje voor alle accounts te veranderen."
+msgstr "Klik om het Vriendpictogram voor alle accounts te veranderen."
 
 msgid "Waiting for network connection"
 msgstr "Wachten op netwerk-verbinding"
@@ -14211,7 +13960,7 @@
 msgstr "Opgeslagen statussen..."
 
 msgid "Status Selector"
-msgstr "Statusselectie"
+msgstr "Statusselector"
 
 msgid "Google Talk"
 msgstr "Google talk"
@@ -14236,23 +13985,23 @@
 "selecteren."
 
 msgid "You have dragged an image"
-msgstr "Je hebt een afbeelding hierheen gesleept"
+msgstr "U heeft een afbeelding hierheen gesleept"
 
 msgid ""
 "You can send this image as a file transfer, embed it into this message, or "
 "use it as the buddy icon for this user."
 msgstr ""
-"Je kunt deze afbeelding overzenden, in dit gesprek invoegen, of als "
-"pictogram gebruiken voor deze gebruiker."
+"U kunt deze afbeelding overzenden, in dit gesprek invoegen, of als pictogram "
+"gebruiken voor deze gebruiker."
 
 msgid "Set as buddy icon"
-msgstr "Instellen als pictogram"
+msgstr "Instellen als pictogram bij vriend"
 
 msgid "Send image file"
 msgstr "Afbeelding sturen"
 
 msgid "Insert in message"
-msgstr "Invoegen in gesprek"
+msgstr "Invoegen in bericht"
 
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Wilt u het instellen als het pictogram van deze gebruiker?"
@@ -14261,8 +14010,8 @@
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
-"U kunt deze afbeelding verzenden via bestandsoverdracht, in dit gesprek "
-"invoegen, of als pictogram gebruiken voor deze gebruiker."
+"U kunt deze afbeelding verzenden via bestandsoverdracht, of als pictogram "
+"gebruiken voor deze gebruiker."
 
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
@@ -14286,7 +14035,7 @@
 "You dragged a desktop launcher. Most likely you wanted to send the target of "
 "this launcher instead of this launcher itself."
 msgstr ""
-"Je hebt een starter hierheen gesleept. Waarschijnlijk wil je het waar deze "
+"U heeft een starter hierheen gesleept. Waarschijnlijk wilt u het waar deze "
 "starter naar verwijst sturen in plaats van de starter zelf."
 
 #, c-format
@@ -14314,7 +14063,7 @@
 msgstr "Koppeling _openen"
 
 msgid "_Copy Link Location"
-msgstr "Verwijzing _kopiëren"
+msgstr "Link locatie  _kopiëren"
 
 msgid "_Copy Email Address"
 msgstr "E-mailadres _kopiëren"
@@ -14334,9 +14083,8 @@
 msgid "_Save File"
 msgstr "Bestand op_slaan"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "Wil je %s echt verwijderen?"
+msgstr "Wilt u het werkelijk wissen?"
 
 msgid "Select color"
 msgstr "Selecteer kleur"
@@ -14353,7 +14101,7 @@
 msgstr "tabs sluiten"
 
 msgid "_Get Info"
-msgstr "Info ophalen"
+msgstr "_Informatie"
 
 msgid "_Invite"
 msgstr "_Uitnodigen"
@@ -14374,10 +14122,10 @@
 msgstr "Pidgin-tooltip"
 
 msgid "Pidgin smileys"
-msgstr "Pidgin-smileys"
+msgstr "Pidgin emoticons"
 
 msgid "Selecting this disables graphical emoticons."
-msgstr "Als je dit selecteert, schakel je graphische emoticons uit."
+msgstr "Als u dit selecteert, schakel u graphische emoticons uit."
 
 msgid "none"
 msgstr "geen"
@@ -14386,7 +14134,7 @@
 msgstr "Klein"
 
 msgid "Smaller versions of the default smilies"
-msgstr "Kleinere versies van de standaard smileys"
+msgstr "Kleinere versies van de standaard emoticons"
 
 msgid "Response Probability:"
 msgstr "Reactiewaarschijnlijkheid:"
@@ -14421,27 +14169,27 @@
 #. *< name
 #. *< version
 msgid "Contact Availability Prediction plugin."
-msgstr "Contact-beschikbaarheids-voorspellings-plug-in"
+msgstr "Contact beschikbaarheidvoorspelling plug-in"
 
 #. *  summary
 msgid "Displays statistical information about your buddies' availability"
-msgstr "Geeft statististieke informatie over de beschikbaarheid van je contact"
+msgstr "Geeft statistische informatie over de beschikbaarheid van uw vriend"
 
 msgid "Buddy is idle"
-msgstr "Contact is inactief"
+msgstr "Vriend is inactief"
 
 msgid "Buddy is away"
-msgstr "Contact is weg"
+msgstr "Vriend is weg"
 
 msgid "Buddy is \"extended\" away"
-msgstr "Contact is lang weg"
+msgstr "Vriend is lang weg"
 
 #. Not used yet.
 msgid "Buddy is mobile"
-msgstr "Contact is mobiel"
+msgstr "Vriend is mobiel"
 
 msgid "Buddy is offline"
-msgstr "Contact is off-line"
+msgstr "Vriend is offline"
 
 msgid "Point values to use when..."
 msgstr "Te gebruiken puntentelling bij..."
@@ -14450,11 +14198,11 @@
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
 msgstr ""
-"Het contact met de <i>hoogste score</i> is het contact met de hoogste "
+"Het Vriend met de <i>hoogste score</i> is het Vriend met de hoogste "
 "prioriteit in de contactgroep.\n"
 
 msgid "Use last buddy when scores are equal"
-msgstr "Laatstgebruikte contact gebruiken als scores gelijk zijn"
+msgstr "Laatst gebruikte Vriend gebruiken als scores gelijk zijn"
 
 msgid "Point values to use for account..."
 msgstr "Puntentelling voor account..."
@@ -14474,7 +14222,7 @@
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
-"Geeft de mogelijkheid om waardes toe te kennen aan de status van het contact."
+"Geeft de mogelijkheid om waardes toe te kennen aan de status van het Vriend."
 
 #. *< description
 msgid ""
@@ -14482,13 +14230,13 @@
 "in contact priority computations."
 msgstr ""
 "Geeft de mogelijkheid om de waardes te veranderen van de diverse "
-"contactstatussen bij berekening van de prioriteit."
+"Vriendenstatussen bij berekening van de prioriteit."
 
 msgid "Conversation Colors"
 msgstr "Gesprekskleuren"
 
 msgid "Customize colors in the conversation window"
-msgstr "Verander kleuren in het gesprek-venster"
+msgstr "Verander kleuren in het gespreksvenster"
 
 msgid "Error Messages"
 msgstr "Foutmeldingen"
@@ -14510,58 +14258,53 @@
 msgstr "Kies kleur voor %s"
 
 msgid "Ignore incoming format"
-msgstr "Inkomende opmaak negeren"
+msgstr "Opmaak Inkomendeberichten negeren"
 
 msgid "Apply in Chats"
-msgstr "Toepassen in de gesprekken"
+msgstr "Toepassen in Chat-berichten"
 
 msgid "Apply in IMs"
-msgstr "Toepassen in gesprekken."
+msgstr "Toepassen in Instant Messages"
 
 #. Note to translators: The string "Enter an XMPP Server" is asking the
 #. user to type the name of an XMPP server which will then be queried
-#, fuzzy
 msgid "Server name request"
-msgstr "Server-adres"
-
-#, fuzzy
+msgstr "Servernaam verzocht"
+
 msgid "Enter an XMPP Server"
-msgstr "Verbinden met server voor groepsgesprekken"
-
-#, fuzzy
+msgstr "Geef een XMPP Server"
+
 msgid "Select an XMPP server to query"
-msgstr "Kies een te raadplegen conferentieserver"
+msgstr "Selecteer een XMPP server om te doorzoeken"
 
 msgid "Find Services"
 msgstr "Diensten zoeken"
 
 msgid "Add to Buddy List"
-msgstr "Aan contactenlijst toevoegen"
+msgstr "Aan Vriendenlijst toevoegen"
 
 msgid "Gateway"
-msgstr "Poort"
+msgstr "Gateway"
 
 msgid "Directory"
 msgstr "Map"
 
-#, fuzzy
 msgid "PubSub Collection"
-msgstr "Geluid selecteren"
-
-#, fuzzy
+msgstr "PubSub Collectie"
+
 msgid "PubSub Leaf"
-msgstr "PubSub dienst"
-
-#, fuzzy
+msgstr "PubSub Leaf"
+
 msgid ""
 "\n"
 "<b>Description:</b> "
-msgstr "Beschrijving"
+msgstr ""
+"\n"
+"<b>Beschrijving:</b>"
 
 #. Create the window.
-#, fuzzy
 msgid "Service Discovery"
-msgstr "Directory info instellen"
+msgstr "Service Discovery"
 
 msgid "_Browse"
 msgstr "_Bladeren"
@@ -14569,22 +14312,21 @@
 msgid "Server does not exist"
 msgstr "Server bestaat niet"
 
-#, fuzzy
 msgid "Server does not support service discovery"
-msgstr "Server gebruikt geen van de ondersteunde identificatiemethoden"
-
-#, fuzzy
+msgstr "Server ondersteunt geen service discovery"
+
 msgid "XMPP Service Discovery"
-msgstr "Directory info instellen"
+msgstr "XMPP Service Discovery"
 
 msgid "Allows browsing and registering services."
-msgstr ""
-
-#, fuzzy
+msgstr "Toestaan van browse en registatie services."
+
 msgid ""
 "This plugin is useful for registering with legacy transports or other XMPP "
 "services."
-msgstr "Deze plug-in is handig voor het debuggen van XMPP servers of clienten."
+msgstr ""
+"Deze plug-in is nuttig voor het registreren met verouderde transportmethodes "
+"of andere XMPP services."
 
 msgid "By conversation count"
 msgstr "Op hoeveelheid gesprekken"
@@ -14598,13 +14340,13 @@
 "conversation count\"."
 msgstr ""
 "Opmerking: The voorkeur voor \"Nieuwe gesprekken\" moet veranderd worden "
-"naar \"By conversation count\"."
+"naar \"Op hoeveelheid gesprekken\"."
 
 msgid "Number of conversations per window"
 msgstr "Aantal gesprekken per venster"
 
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Gescheiden vensters voor gesprekken en chats bij plaatsen op nummer"
+msgstr "Vensters scheiden voor IM's en Chats bij plaatsen op nummer"
 
 #. *< type
 #. *< ui_requirement
@@ -14627,7 +14369,7 @@
 "and Chats"
 msgstr ""
 "Het aantal gesprekken per venster beperken, al of niet met splitsing van "
-"chats en gewone gesprekken."
+"chats en IM's."
 
 #. Configuration frame
 msgid "Mouse Gestures Configuration"
@@ -14679,7 +14421,7 @@
 "• Sleep naar boven en dan naar rechts om naar het volgende gesprek te gaan."
 
 msgid "Instant Messaging"
-msgstr "Expresberichten"
+msgstr "Instant Messaging"
 
 #. Add the label.
 msgid "Select a person from your address book below, or add a new person."
@@ -14696,14 +14438,14 @@
 
 #. "Select Buddy" button
 msgid "Select Buddy"
-msgstr "Contact selecteren"
+msgstr "Vriend selecteren"
 
 #. Add the label.
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
 msgstr ""
-"Kies een persoon uit uw adresboek om dit contact aan toe te voegen, of maak "
+"Kies een persoon uit uw adresboek om dit Vriend aan toe te voegen, of maak "
 "een nieuw persoon aan."
 
 #. Add the expander
@@ -14712,7 +14454,7 @@
 
 #. "Associate Buddy" button
 msgid "_Associate Buddy"
-msgstr "Contact _associëren"
+msgstr "Vriend _associëren"
 
 msgid "Unable to send email"
 msgstr "Kan geen e-mail verzenden"
@@ -14721,7 +14463,7 @@
 msgstr "Kan het uitvoerbaar bestand van Evolution niet vinden in het PATH."
 
 msgid "An email address was not found for this buddy."
-msgstr "Er is geen e-mailadres gevonden van dit contact"
+msgstr "Er is geen e-mailadres gevonden van dit Vriend"
 
 msgid "Add to Address Book"
 msgstr "Toevoegen aan adresboek"
@@ -14731,13 +14473,12 @@
 
 #. Configuration frame
 msgid "Evolution Integration Configuration"
-msgstr "Evolution integratie-opties"
+msgstr "Evolution integratieopties"
 
 #. Label
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
-"Selecteer de accounts waar contacten automatisch aan toegevoegd moeten "
-"worden."
+"Selecteer de accounts waar Vrienden automatisch aan toegevoegd moeten worden."
 
 #. *< type
 #. *< ui_requirement
@@ -14799,7 +14540,7 @@
 "<b>Buddy Note</b>: %s"
 msgstr ""
 "\n"
-"<b>Contact opmerking:</b> %s"
+"<b>Vriend opmerking:</b> %s"
 
 msgid "History"
 msgstr "Geschiedenis"
@@ -14818,8 +14559,7 @@
 #. *  summary
 #. *  description
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr ""
-"Minimaliseert het gespreksvenster en de contactenlijst bij afwezigheid."
+msgstr "Minimaliseert het gespreksvenster en de Vriendenlijst bij afwezigheid."
 
 msgid "Mail Checker"
 msgstr "E-mailcontrole"
@@ -14829,8 +14569,8 @@
 
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
-"Voegt een klein vak toe aan de contactenlijst die aangeeft of u nieuwe e-"
-"mail heeft."
+"Voegt een klein vak toe aan de Vriendenlijst die aangeeft of u nieuwe e-mail "
+"heeft."
 
 msgid "Markerline"
 msgstr "Markeerlijn"
@@ -14842,13 +14582,13 @@
 msgstr "Ga naar markeerlijn"
 
 msgid "Draw Markerline in "
-msgstr "Teken Markeerlijn in"
+msgstr "Teken Markeerlijn in:"
 
 msgid "_IM windows"
-msgstr "_Berichtvensters"
+msgstr "_IM-Berichtvensters"
 
 msgid "C_hat windows"
-msgstr "C_hatvensters"
+msgstr "C_hat-berichtvensters"
 
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
@@ -14899,17 +14639,16 @@
 #. *< name
 #. *< version
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Muzieksessie-plug-in voor gezamenlijk componeren."
+msgstr "Muziek Messaging plug-in voor gezamenlijk componeren."
 
 #  *  summary
 #. *  summary
-#, fuzzy
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editing a common score in real-time."
 msgstr ""
-"De muzieksessie-plug-in geeft enkele gebruikers de mogelijkheid om "
-"tegelijkertijd gezamenlijk aan een muziekstuk te werken."
+"De Muziek Messaging plug-in geeft enkele gebruikers de mogelijkheid "
+"gezamenlijk aan een muziekstuk te werken in real-time."
 
 #. ---------- "Notify For" ----------
 msgid "Notify For"
@@ -14919,7 +14658,7 @@
 msgstr "\t _Alleen wanneer iemand uw gebruikersnaam vermeldt"
 
 msgid "_Focused windows"
-msgstr "Vensters met invoer_aandacht"
+msgstr "Vensters met de _focus"
 
 #. ---------- "Notification Methods" ----------
 msgid "Notification Methods"
@@ -14933,9 +14672,8 @@
 msgstr "Aantal _nieuwe berichten weergeven in venstertitel"
 
 #. Count xprop method button
-#, fuzzy
 msgid "Insert count of new message into _X property"
-msgstr "Aantal _nieuwe berichten weergeven in venstertitel"
+msgstr "Invoegen van aantal van nieuwe berichten in _X eigenschap"
 
 #. Urgent method button
 msgid "Set window manager \"_URGENT\" hint"
@@ -14946,7 +14684,7 @@
 
 #. Raise window method button
 msgid "R_aise conversation window"
-msgstr "Gespreksvenster _optillen"
+msgstr "Gespreksvenster _op voorgrond brengen"
 
 #. Present conversation method button
 msgid "_Present conversation window"
@@ -14958,7 +14696,7 @@
 
 #. Remove on focus button
 msgid "Remove when conversation window _gains focus"
-msgstr "Verwijderen wanneer het gespreksvenster de _aandacht krijgt"
+msgstr "Verwijderen wanneer het gespreksvenster de _focus krijgt"
 
 #. Remove on click button
 msgid "Remove when conversation window _receives click"
@@ -14990,7 +14728,7 @@
 #. *  summary
 #. *  description
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Geeft je een aantal manieren om u te attenderen op nieuwe berichten."
+msgstr "Geeft u een aantal manieren om u te attenderen op nieuwe berichten."
 
 #. *< type
 #. *< ui_requirement
@@ -15015,22 +14753,21 @@
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
 "Dit is een erg gave plug-in die een hoop dingen doet:\n"
-"- Het vertelt je wie het programma geschreven heeft bij aanmelden\n"
+"- Het vertelt u wie het programma geschreven heeft bij aanmelden\n"
 "- Het keert alle binnenkomende tekst om\n"
 "- Het stuurt direct een bericht naar mensen wanneer ze online komen"
 
 msgid "Hyperlink Color"
-msgstr "Kleur van verwijzing"
+msgstr "Kleur van hyperlink"
 
 msgid "Visited Hyperlink Color"
-msgstr "Kleur van reeds bezochte verwijzing"
+msgstr "Kleur van reeds bezochte hyperlink"
 
 msgid "Highlighted Message Name Color"
-msgstr "Gemarkeerde bericht-kleur"
-
-#, fuzzy
+msgstr "Kleur gemarkeerde berichtennaam"
+
 msgid "Typing Notification Color"
-msgstr "Kleur van melding van typen"
+msgstr "Kleur typmeldingen"
 
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horizontale scheiding"
@@ -15038,9 +14775,8 @@
 msgid "Conversation Entry"
 msgstr "Tekstinvoer gesprek"
 
-#, fuzzy
 msgid "Conversation History"
-msgstr "Tekstinvoer gesprek"
+msgstr "Gespreksgeschiedenis"
 
 msgid "Request Dialog"
 msgstr "Vraag"
@@ -15066,9 +14802,8 @@
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ snelkoppelingtekst-thema"
 
-#, fuzzy
 msgid "Disable Typing Notification Text"
-msgstr "Schakel typmelding in"
+msgstr "Schakel typmelding uit"
 
 msgid "GTK+ Theme Control Settings"
 msgstr "Instellingen GTK+ themabeheer"
@@ -15103,14 +14838,14 @@
 
 msgid "Lets you send raw input to text-based protocols."
 msgstr ""
-"Geeft je de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
+"Geeft u de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
 "protocollen."
 
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Geeft je de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
+"Geeft u de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
 "protocollen (XMPP, MSN, IRC, TOC). Druk op 'Enter' om te sturen en houd het "
 "debugvenster in de gaten."
 
@@ -15164,10 +14899,9 @@
 #. *< name
 #. *< version
 msgid "Conversation Window Send Button."
-msgstr "Gespreksvenser verzendknop"
+msgstr "Gespreksvenster verzendknop"
 
 #. *< summary
-#, fuzzy
 msgid ""
 "Adds a Send button to the entry area of the conversation window. Intended "
 "for use when no physical keyboard is present."
@@ -15176,7 +14910,7 @@
 "is bedoeld wanneer er geen fysiek keyboard aanwezig is."
 
 msgid "Duplicate Correction"
-msgstr "Dubbele correctie"
+msgstr "Duplikaat correctie"
 
 msgid "The specified word already exists in the correction list."
 msgstr "Het aangegeven woord bestaat reeds in de correctielijst."
@@ -15185,10 +14919,10 @@
 msgstr "Actieve tekstvervangingen"
 
 msgid "You type"
-msgstr "Je tikt"
+msgstr "U typt"
 
 msgid "You send"
-msgstr "Je stuurt"
+msgstr "U zendt"
 
 msgid "Whole words only"
 msgstr "Alleen hele woorden"
@@ -15200,21 +14934,21 @@
 msgstr "Nieuwe tekstvervanging toevoegen"
 
 msgid "You _type:"
-msgstr "Je _tikt:"
+msgstr "U _typt:"
 
 msgid "You _send:"
-msgstr "Je _stuurt:"
+msgstr "U _zendt:"
 
 #  Created here so it can be passed to whole_words_button_toggled.
 #. Created here so it can be passed to whole_words_button_toggled.
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Hoofdlettergevoelig (uitzetten voor voor automatisch afhandelen)"
+msgstr "_Hoofdlettergevoelig (uitzetten voor automatisch afhandelen)"
 
 msgid "Only replace _whole words"
 msgstr "Alleen _hele woorden vervangen"
 
 msgid "General Text Replacement Options"
-msgstr "Instellingen voor tekstvervanging"
+msgstr "Instellingen voor algemene tekstvervanging"
 
 msgid "Enable replacement of last word on send"
 msgstr "Laatste woord vervangen bij versturen"
@@ -15226,20 +14960,20 @@
 msgstr "Vervangt tekst in uitgaande berichten volgens uw eigen regels."
 
 msgid "Just logged in"
-msgstr "Aangemeld"
+msgstr "Net Aangemeld"
 
 msgid "Just logged out"
-msgstr "Afgemeld"
+msgstr "Net Afgemeld"
 
 msgid ""
 "Icon for Contact/\n"
 "Icon for Unknown person"
 msgstr ""
-"Pictogram voor contact/\n"
+"Pictogram voor contactpersoon/\n"
 "Pictograam voor onbekend persoon"
 
 msgid "Icon for Chat"
-msgstr "Pictgram voor gesprek"
+msgstr "Pictogram voor Chat"
 
 msgid "Ignored"
 msgstr "Genegeerd"
@@ -15254,14 +14988,13 @@
 #. A half operator is someone who has a subset of the privileges
 #. that an operator has.
 msgid "Half Operator"
-msgstr ""
-
-#, fuzzy
+msgstr "Half Operator"
+
 msgid "Authorization dialog"
-msgstr "Toestemming gegeven"
+msgstr "Autorisatiedialoog"
 
 msgid "Error dialog"
-msgstr "Foutdialoogvenster"
+msgstr "Foutendialoogvenster"
 
 msgid "Information dialog"
 msgstr "Informatiedialoogvenster"
@@ -15282,22 +15015,22 @@
 msgstr "Status-pictogrammen"
 
 msgid "Chatroom Emblems"
-msgstr "Symbolen gespreksruimte"
+msgstr "Chatruimte Emblemen"
 
 msgid "Dialog Icons"
 msgstr "Pictogrammen voor dialoogvensters"
 
 msgid "Pidgin Icon Theme Editor"
-msgstr "Pidgin pictogram themabeheer"
+msgstr "Pidgin pictogram thema Bewerker"
 
 msgid "Contact"
 msgstr "Contact"
 
 msgid "Pidgin Buddylist Theme Editor"
-msgstr "Thema bewerken contactenlijst Pidgin"
+msgstr "Thema bewerken Vriendenlijst Pidgin"
 
 msgid "Edit Buddylist Theme"
-msgstr "Thema contactenlijst bewerken"
+msgstr "Thema Vriendenlijst bewerken"
 
 msgid "Edit Icon Theme"
 msgstr "Pictogram-thema bewerken"
@@ -15325,17 +15058,17 @@
 #. *< priority
 #. *< id
 msgid "Buddy Ticker"
-msgstr "Contacten-ticker"
+msgstr "Lichtkrant"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "Een horizontale schuivende versie van de contactenlijst."
+msgstr "Een horizontale schuivende versie van de Vriendenlijst."
 
 msgid "Display Timestamps Every"
-msgstr "Gesprekstijd altijd weergeven"
+msgstr "Tijdstempels altijd weergeven"
 
 #. *< type
 #. *< ui_requirement
@@ -15344,13 +15077,13 @@
 #. *< priority
 #. *< id
 msgid "Timestamp"
-msgstr "Tijd in gesprek"
+msgstr "Tijdstempel"
 
 #. *< name
 #. *< version
 #. *  summary
 msgid "Display iChat-style timestamps"
-msgstr "iChat gesprekstijd weergeven"
+msgstr "iChat tijdstempel weergeven"
 
 #. *  description
 msgid "Display iChat-style timestamps every N minutes."
@@ -15359,36 +15092,33 @@
 msgid "Timestamp Format Options"
 msgstr "Instellingen tijdsweergave"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Force timestamp format:"
-msgstr "24-uurs weergave _gebruiken"
-
-#, fuzzy
+msgstr "_Forceer tijdstempel formaat:"
+
 msgid "Use system default"
-msgstr "Desktop standaard"
-
-#, fuzzy
+msgstr "Gebruik systeem standaard"
+
 msgid "12 hour time format"
-msgstr "24-uurs weergave _gebruiken"
-
-#, fuzzy
+msgstr "12-uurs tijdformaat"
+
 msgid "24 hour time format"
-msgstr "24-uurs weergave _gebruiken"
+msgstr "24-uur tijdsformaat"
 
 msgid "Show dates in..."
-msgstr "Datum weergeven in..."
+msgstr "Datums weergeven in..."
 
 msgid "Co_nversations:"
 msgstr "_Gesprekken:"
 
 msgid "For delayed messages"
-msgstr "Bij vertraagde berichten"
+msgstr "Voor vertraagde berichten"
 
 msgid "For delayed messages and in chats"
 msgstr "Voor vertraagde berichten en in chatsessies"
 
 msgid "_Message Logs:"
-msgstr "_Gesprekslogboeken:"
+msgstr "_Berichten Logs:"
 
 #  *< type
 #  *< ui_requirement
@@ -15403,7 +15133,7 @@
 #. *< priority
 #. *< id
 msgid "Message Timestamp Formats"
-msgstr "Opmaak tijdsaanduiding berichten"
+msgstr "Berichtentijdstempel Formaat"
 
 #  *< name
 #  *< version
@@ -15412,7 +15142,7 @@
 #. *< version
 #. *  summary
 msgid "Customizes the message timestamp formats."
-msgstr "Opmaak aanpassen van tijdsaanduiding."
+msgstr "Aanpassen formaat van berichtentijdstempels."
 
 #  *  description
 #. *  description
@@ -15420,38 +15150,32 @@
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"Deze plug-in geeft de gebruiker de mogelijkheid om de opmaak van de "
-"tijdsaanduiding aante passen."
-
-#, fuzzy
+"Deze plug-in staat de gebruiker toe het formaat van logboek- en "
+"gesprekstijdstempels aan te passen."
+
 msgid "Audio"
-msgstr "Automatisch"
-
-#, fuzzy
+msgstr "Audio"
+
 msgid "Video"
 msgstr "Video"
 
 msgid "Output"
-msgstr ""
-
-#, fuzzy
+msgstr "Output"
+
 msgid "_Plugin"
-msgstr "Plug-ins"
-
-#, fuzzy
+msgstr "_Plug-in"
+
 msgid "_Device"
-msgstr "Apparaat"
+msgstr "_Apparaat"
 
 msgid "Input"
-msgstr ""
-
-#, fuzzy
+msgstr "Input"
+
 msgid "P_lugin"
-msgstr "Plug-ins"
-
-#, fuzzy
+msgstr "P_lug-in"
+
 msgid "D_evice"
-msgstr "Apparaat"
+msgstr "A_pparaat"
 
 #. *< magic
 #. *< major version
@@ -15462,47 +15186,47 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Instellingen bewerken"
+msgstr "Voice/Video Instellingen"
 
 #. *< name
 #. *< version
 msgid "Configure your microphone and webcam."
-msgstr ""
+msgstr "Configureer uw microfoon en webcam."
 
 #. *< summary
 msgid "Configure microphone and webcam settings for voice/video calls."
 msgstr ""
+"Configureer de microfoon en webcam instellingen voor  voice/video gesprekken."
 
 msgid "Opacity:"
-msgstr "Doorschijnendheid:"
+msgstr "Ondoorschijnendheid:"
 
 #. IM Convo trans options
 msgid "IM Conversation Windows"
-msgstr "IM gespreksvensters"
+msgstr "IM-gespreksvensters"
 
 msgid "_IM window transparency"
-msgstr "_IM-vensterdoorschijnendheid"
+msgstr "_IM-berichtvenster transparantie"
 
 msgid "_Show slider bar in IM window"
 msgstr "_Schuifbalk weergeven in IM-venster"
 
 msgid "Remove IM window transparency on focus"
-msgstr "IM-vensterdoorschijnendheid uitschakelen bij aandacht"
+msgstr "IM-venstertransparantie uitschakelen bij focus"
 
 msgid "Always on top"
 msgstr "Altijd bovenop"
 
 #. Buddy List trans options
 msgid "Buddy List Window"
-msgstr "Contactenlijst"
+msgstr "Vriendenlijstvenster"
 
 msgid "_Buddy List window transparency"
-msgstr "_Contactenlijst doorschijnendheid"
+msgstr "_Vriendenlijst transparantie"
 
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Doorschijnendheid contactenlijst uitschakelen bij aandacht"
+msgstr "transparantie Vriendenlijst uitschakelen bij focus"
 
 #. *< type
 #. *< ui_requirement
@@ -15517,7 +15241,7 @@
 #. *< version
 #. *  summary
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Variabele doorschijnendheid voor de contactenlijst en gesprekken."
+msgstr "Variabele Transparantie voor Vriendenlijst en gesprekken."
 
 #. *  description
 msgid ""
@@ -15526,8 +15250,8 @@
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Deze plug-in zorgt voor variabele doorschijnendheid in gespreksvensters en "
-"de contactenlijst.\n"
+"Deze plug-in zorgt voor variabele transparantie in gespreksvensters en de "
+"Vriendenlijst.\n"
 "\n"
 "* Opmerking: Deze plug-in vereist Windows 2000 of nieuwer."
 
@@ -15539,35 +15263,35 @@
 msgid "_Start %s on Windows startup"
 msgstr "%s _starten bij het opstarten van Windows"
 
-#, fuzzy
 msgid "Allow multiple instances"
-msgstr "Meerdere keren gelijk inloggen toestaan"
+msgstr "Meerdere instanties toestaan"
 
 msgid "_Dockable Buddy List"
-msgstr "Koppelbare contactenlijst"
+msgstr "_Dokbare vriendenlijst"
 
 #. Blist On Top
 msgid "_Keep Buddy List window on top:"
-msgstr "Contactenlijst bovenop _houden:"
+msgstr "Vriendenlijst bovenop _houden:"
 
 #  XXX: Did this ever work?
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "Alleen wanneer aangekoppeld"
+msgstr "Alleen wanneer gedokt"
 
 msgid "Windows Pidgin Options"
-msgstr "Windows pidgin opties"
+msgstr "Windows Pidgin Opties"
 
 msgid "Options specific to Pidgin for Windows."
-msgstr "Opties van Pidgin voor Windows."
-
-#, fuzzy
+msgstr "Specifieke Opties van Pidgin voor Windows."
+
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
-msgstr "Specifieke Windows-opties voor Pidgin, zoals contactenlijst."
+msgstr ""
+"Geeft de mogelijkheid voor specifieke Pidgin voor Windows opties, zoals "
+"dokken van vriendenlijst."
 
 msgid "<font color='#777777'>Logged out.</font>"
-msgstr "<font color='#777777'>Uitgelogd.</font>"
+msgstr "<font color='#777777'>Afgemeld.</font>"
 
 #. *< type
 #. *< ui_requirement
@@ -15576,7 +15300,7 @@
 #. *< priority
 #. *< id
 msgid "XMPP Console"
-msgstr "XMPP-console"
+msgstr "XMPP-Console"
 
 msgid "Account: "
 msgstr "Account:"
@@ -15591,15 +15315,17 @@
 msgstr "Verstuur en ontvang ruwe XMPP stanza's."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
-msgstr "Deze plug-in is handig voor het debuggen van XMPP servers of clienten."
+msgstr ""
+"Deze plug-in is handig voor het fouten oplossen van XMPP servers of cliënten."
 
 #. $(^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 ""
+"$(^Naam) is uitgegeven onder de GNU Generale Publieke Licentie (GPL). De "
+"licentie wordt hier slechts gegeven voor informatieve doeleinden. $_KLIK"
 
 #. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
@@ -15614,24 +15340,23 @@
 
 #. Installer Subsection Detailed Description
 msgid "Core Pidgin files and dlls"
-msgstr "Pidgin hoofdbestanden en dlls"
+msgstr "Pidgin hoofdbestanden en dll's"
 
 #. Installer Subsection Detailed Description
 msgid "Create a Start Menu entry for Pidgin"
-msgstr ""
+msgstr "Maak een Start Menu item voor Pidgin"
 
 #. Installer Subsection Detailed Description
 msgid "Create a shortcut to Pidgin on the Desktop"
-msgstr ""
+msgstr "Maak een snelkoppeling naar Pidgin op het bureaublad"
 
 #. Installer Subsection Text
 msgid "Debug Symbols (for reporting crashes)"
-msgstr ""
+msgstr "Debug Symbolen (voor herhaalde crashes)"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Desktop"
-msgstr "Desktop standaard"
+msgstr "Bureaublad"
 
 #. $R2 will display the URL that the GTK+ Runtime failed to download from
 msgid ""
@@ -15639,12 +15364,18 @@
 "function; if retrying fails, you may need to use the 'Offline Installer' "
 "from http://pidgin.im/download/windows/ ."
 msgstr ""
+"Fout bij ophalen van GTK+ Runtime ($R2).$\\rDit is vereist voor het "
+"functioneren van Pidgin. Indien een herhaalde poging mislukt kunt u de "
+"'Offline Installer' van http://pidgin.im/download/windows/  gebruiken."
 
 #. $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 ""
+"Fout bij installeren van debug symbolen ($R2).$\\rIndien een herhaalde "
+"poging mislukt, kunt u de  'Offline Installer' van http://pidgin.im/download/"
+"windows/  gebruiken."
 
 #. $R3 will display the URL that the Dictionary failed to download from
 #, no-c-format
@@ -15653,16 +15384,18 @@
 "installation instructions are at: http://developer.pidgin.im/wiki/Installing"
 "%20Pidgin#manual_win32_spellcheck_installation"
 msgstr ""
+"Fout bij het installeren van de spellingscontrole ($R3).$\\rIndien een "
+"herhaalde poging mislukt, vindt u instructie voor handmatige installatie op: "
+"http://developer.pidgin.im/wiki/Installing"
+"%20Pidgin#manual_win32_spellcheck_installation"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "GTK+ Runtime (required if not present)"
-msgstr "GTK+ runtime-omgeving (vereist)"
+msgstr "GTK+ runtime (vereist indien niet aanwezig)"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Localizations"
-msgstr "Locatie"
+msgstr "Localisaties"
 
 #. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
@@ -15670,22 +15403,24 @@
 
 #. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
-msgstr "Pidgin Instant Messaging Client (vereist)"
+msgstr "Pidgin Instant Messaging Cliënt (vereist)"
 
 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 vereist een compatibele versie van GTK+ Runtime (die niet aanwezig "
+"lijkt te zijn).$\\rWeet u zeker dat u de installatie van GTK+ Runtime wilt "
+"overslaan?"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Snelkoppeling"
+msgstr "Snelkoppelingen"
 
 #. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr ""
+msgstr "Snelkoppelingen voor Pidgin"
 
 #. Installer Subsection Text
 msgid "Spellchecking Support"
@@ -15693,7 +15428,7 @@
 
 #. Installer Subsection Text
 msgid "Start Menu"
-msgstr ""
+msgstr "Start Menu"
 
 #. Installer Subsection Detailed Description
 msgid ""
@@ -15709,18 +15444,21 @@
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
-"Het verwijderingsprogramma voor Pidgin kon geen register-ingangen voor "
+"Het verwijderingsprogramma voor Pidgin kon geen registervermeldingen voor "
 "Pidgin vinden.$\\rWaarschijnlijk heeft een andere gebruiker het programma "
 "geïnstalleerd."
 
 #. Installer Subsection Text
 msgid "URI Handlers"
-msgstr ""
+msgstr "URI Handlers"
 
 msgid ""
 "Unable to uninstall the currently installed version of Pidgin. The new "
 "version will be installed without removing the currently installed version."
 msgstr ""
+"Kan de huidige geïnstalleerde versie van Pidgin niet de-installeren. De "
+"nieuwe versie zal geïnstalleerd worden zonder de huidige versie te "
+"verwijderen."
 
 #. Text displayed on Installer Finish Page
 msgid "Visit the Pidgin Web Page"
@@ -15729,1011 +15467,17 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "U mag dit programma niet verwijderen."
 
-#~ msgid "Unknown reason."
-#~ msgstr "Onbekende reden."
-
-#~ msgid "Artist"
-#~ msgstr "Artiest"
-
-#~ msgid "Album"
-#~ msgstr "Album"
-
-#, fuzzy
-#~ msgid "Current Mood"
-#~ msgstr "Uw huidige stemming"
-
-#, fuzzy
-#~ msgid "New Mood"
-#~ msgstr "Humeur gebruiker"
-
-#, fuzzy
-#~ msgid "Change your Mood"
-#~ msgstr "Wachtwoord veranderen"
-
-#, fuzzy
-#~ msgid "How do you feel right now?"
-#~ msgstr "Ik ben er even niet"
-
-#, fuzzy
-#~ msgid "Change Mood..."
-#~ msgstr "Wachtwoord wijzigen..."
-
-#~ msgid "Pager server"
-#~ msgstr "Semafoonserver"
-
-#~ msgid "Yahoo Chat server"
-#~ msgstr "Yahoo chatserver"
-
-#~ msgid "Yahoo Chat port"
-#~ msgstr "Chatpoort Yahoo"
-
-#~ msgid "Orientation"
-#~ msgstr "Oriëntatie"
-
-#~ msgid "The orientation of the tray."
-#~ msgstr "De oriëntatie van het systeemvak."
-
-#, fuzzy
-#~ msgid "Error creating conference."
-#~ msgstr "Fout bij maken verbinding"
-
-#~ msgid "Unable to bind socket to port: %s"
-#~ msgstr "Kan socket niet koppelen aan poort: %s"
-
-#~ msgid "Unable to listen on socket: %s"
-#~ msgstr "Kan niet aan socket luisteren: %s"
-
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s heeft u zojuist een duwtje gegeven!"
-
-#~ msgid "Friendly name changes too rapidly"
-#~ msgstr "Bijnaam verandert te snel"
-
-#~ msgid "This Hotmail account may not be active."
-#~ msgstr "Dit Hotmail-account is misschien niet in gebruik."
-
-#~ msgid "Profile URL"
-#~ msgstr "Profiel-URL"
-
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN-protocol-plug-in"
-
-#~ msgid "%s is not a valid group."
-#~ msgstr "%s is geen geldige groep."
-
-#~ msgid "Unknown error."
-#~ msgstr "Onbekende fout."
-
-#~ msgid "%s on %s (%s)"
-#~ msgstr "%s op %s (%s)"
-
-#~ msgid "Unable to add user on %s (%s)"
-#~ msgstr "Kan gebruiker niet toevoegen op %s (%s)"
-
-#~ msgid "Unable to block user on %s (%s)"
-#~ msgstr "Kan gebruiker niet blokkeren op %s (%s)"
-
-#~ msgid "Unable to permit user on %s (%s)"
-#~ msgstr "Kan gebruiker geen toestemming geven op %s (%s)"
-
-#~ msgid "%s could not be added because your buddy list is full."
-#~ msgstr "Kan %s niet toevoegen omdat uw contactenlijst vol is."
-
-#~ msgid "%s is not a valid passport account."
-#~ msgstr "%s is geen geldig passport-account."
-
-#~ msgid "Service Temporarily Unavailable."
-#~ msgstr "Service momenteel niet beschikbaar."
-
-#~ msgid "Unable to rename group"
-#~ msgstr "Kan groep niet hernoemen"
-
-#~ msgid "Unable to delete group"
-#~ msgstr "Kan groep niet verwijderen"
-
-#~ msgid "%s has added you to his or her buddy list."
-#~ msgstr "%s heeft u aan zijn/haar contactenlijst toegevoegd."
-
-#~ msgid "%s has removed you from his or her buddy list."
-#~ msgstr "%s heeft u van zijn/haar contactenlijst verwijderd."
-
-#, fuzzy
-#~ 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 ""
-#~ "Uw laatste actie is niet gebeurd omdat uw snelheid te hoog ligt. Wacht 10 "
-#~ "seconden en probeer het dan nogmaals."
-
-#, fuzzy
-#~ msgid ""
-#~ "<FONT SIZE=\"4\">IRC Channel:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin op irc.freenode.net<BR><BR>"
-
-#, fuzzy
-#~ msgid "<FONT SIZE=\"4\">XMPP MUC:</FONT> devel@conference.pidgin.im<BR><BR>"
-#~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin op irc.freenode.net<BR><BR>"
-
-#~ msgid "Debugging Information"
-#~ msgstr "Debuginformatie"
-
-#~ msgid ""
-#~ "Unrecognized file type\n"
-#~ "\n"
-#~ "Defaulting to PNG."
-#~ msgstr ""
-#~ "Onbekend bestandstype\n"
-#~ "\n"
-#~ "PNG wordt gebruikt."
-
-#~ msgid ""
-#~ "Error saving image\n"
-#~ "\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fout bij opslaan afbeelding\n"
-#~ "\n"
-#~ "%s"
-
-#, fuzzy
-#~ msgid "(Default)"
-#~ msgstr "(standaard)"
-
-#~ msgid "Install Theme"
-#~ msgstr "Installeer thema"
-
-#~ msgid "Icon"
-#~ msgstr "Pictogram"
-
-#~ msgid "Use document font from _theme"
-#~ msgstr "Gebruik lettertype uit _thema"
-
-#~ msgid "Proxy Server &amp; Browser"
-#~ msgstr "Proxy-server &amp; browser"
-
-#~ msgid "Auto-away"
-#~ msgstr "Automatisch afwezig"
-
-#~ msgid "Change _status to:"
-#~ msgstr "_Status veranderen in: "
-
-#~ msgid "Failed to open file '%s': %s"
-#~ msgstr "Kan bestand '%s' niet openen: %s"
-
-#~ msgid ""
-#~ "Failed to load image '%s': reason not known, probably a corrupt image file"
-#~ msgstr ""
-#~ "kan afbeelding '%s' niet laden: reden onbekend, waarschijnlijk een "
-#~ "kapotte afbeelding"
-
-#~ msgid "Insert an <iq/> stanza."
-#~ msgstr "Voeg een <iq/> stanza toe."
-
-#~ msgid "Insert a <presence/> stanza."
-#~ msgstr "Voeg een <presence/> stanza toe."
-
-#~ msgid "Insert a <message/> stanza."
-#~ msgstr "Voeg een <message/> stanza in."
-
-#~ msgid "Send instant messages over multiple protocols"
-#~ msgstr "Stuur chatberichten over verschillende diensten."
-
-#~ msgid "_Start port:"
-#~ msgstr "_Beginpoort:"
-
-#~ msgid "_End port:"
-#~ msgstr "_Eindpoort:"
-
-#~ msgid "_User:"
-#~ msgstr "_Gebruiker:"
-
-#~ msgid "Calling ... "
-#~ msgstr "Bellen..."
-
-#~ msgid "Invalid certificate chain"
-#~ msgstr "Dit is een ongeldige certificaat-keten"
-
-#~ 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 ""
-#~ "De certificaat-keten die door %s wordt gegeven heeft geen geldige "
-#~ "digitale handtekening van de certificaat-identiteit van wie het een "
-#~ "handtekening zegt te hebben"
-
-#~ msgid "Invalid certificate authority signature"
-#~ msgstr "Ongeldige certificaat-identiteit handtekening"
-
-#~ msgid "Join/Part Hiding Configuration"
-#~ msgstr "Instellingen om notificaties over deelnemen/verlaten te verbergen"
-
-#~ msgid "Minimum Room Size"
-#~ msgstr "Minimale grootte van gespreksruimte"
-
-#~ msgid "User Inactivity Timeout (in minutes)"
-#~ msgstr "Gebruikers-activiteit verlopen (in minuten)"
-
-#~ msgid "Failed to open the file"
-#~ msgstr "Bestand openen mislukt"
-
-#~ msgid "Your account is locked, please log in to the Yahoo! website."
-#~ msgstr "Uw account is afgesloten. Meld u aan via de Yahoo website."
-
-#~ msgid "Euskera(Basque)"
-#~ msgstr "Baskisch"
-
-#~ msgid "_Resume"
-#~ msgstr "_Doorgaan"
-
-#, fuzzy
-#~ 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"
-#~ "Gebruik: %s [OPTIE]...\n"
-#~ "\n"
-#~ "  -c, --config=MAP    MAP gebruiken voor opslaan configuratie\n"
-#~ "  -d, --debug         debugberichten naar stdout sturen\n"
-#~ "  -h, --help          deze hulptekst weergeven\n"
-#~ "  -m, --multiple      niet voor enkele instantie zorgen\n"
-#~ "  -n, --nologin       niet automatisch aanmelden\n"
-#~ "  -l, --login[=NAAM]  automatisch aanmelden (optioneel argument NAAM "
-#~ "geeft\n"
-#~ "                      (kommagescheiden)te gebruiken account(s) aan)\n"
-#~ "  -v, --version       versie-info weergeven\n"
-
-#, fuzzy
-#~ 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"
-#~ "Gebruik: %s [OPTIE]...\n"
-#~ "\n"
-#~ "  -c, --config=MAP    MAP gebruiken voor opslaan configuratie\n"
-#~ "  -d, --debug         debugberichten naar stdout sturen\n"
-#~ "  -h, --help          deze hulptekst weergeven\n"
-#~ "  -m, --multiple      niet voor enkele instantie zorgen\n"
-#~ "  -n, --nologin       niet automatisch aanmelden\n"
-#~ "  -l, --login[=NAAM]  automatisch aanmelden (optioneel argument NAAM "
-#~ "geeft\n"
-#~ "                      (kommagescheiden)te gebruiken account(s) aan)\n"
-#~ "  -v, --version       versie-info weergeven\n"
-
-#, fuzzy
-#~ msgid "Malformed BOSH Connect Server"
-#~ msgstr "Kan geen verbinding maken met de server."
-
-#, fuzzy
-#~ msgid "Unable to not load SILC key pair"
-#~ msgstr "Kan SILC sleutelpaar niet laden"
-
-#~ msgid ""
-#~ "%s declined your conference invitation to room \"%s\" because \"%s\"."
-#~ msgstr "%s heeft uw uitnodiging voor ruimte \"%s\" afgeslagen omdat \"%s\"."
-
-#~ msgid "Invitation Rejected"
-#~ msgstr "Uitnodiging geweigerd"
-
-#, fuzzy
-#~ msgid "_Proxy"
-#~ msgstr "Proxy"
-
-#~ msgid "Cannot open socket"
-#~ msgstr "Kan socket niet openen"
-
-#~ msgid "Could not listen on socket"
-#~ msgstr "Kan niet luisteren naar socket"
-
-#~ msgid "Unable to read socket"
-#~ msgstr "Kan niet lezen van socket."
-
-#~ msgid "Connection failed."
-#~ msgstr "Verbinding mislukt."
-
-#~ msgid "Server has disconnected"
-#~ msgstr "Server heeft verbinding verbroken"
-
-#~ msgid "Couldn't create socket"
-#~ msgstr "Kan geen socket aanmaken"
-
-#~ msgid "Couldn't connect to host"
-#~ msgstr "Kan geen verbinding maken met host"
-
-#~ msgid "Read error"
-#~ msgstr "Leesfout"
-
-#~ msgid ""
-#~ "Could not establish a connection with the server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan geen verbinding maken met de server:\n"
-#~ "%s"
-
-#~ msgid "Write error"
-#~ msgstr "Schrijffout"
-
-#~ msgid "Last Activity"
-#~ msgstr "Laatste activiteit"
-
-#~ msgid "Service Discovery Info"
-#~ msgstr "Directory info instellen"
-
-#~ msgid "Extended Stanza Addressing"
-#~ msgstr "Stanza adresbijvoeging"
-
-#~ msgid "Multi-User Chat"
-#~ msgstr "Groepsgesprek"
-
-#, fuzzy
-#~ msgid "Multi-User Chat Extended Presence Information"
-#~ msgstr "Deze gebruiker heeft geen profiel."
-
-#~ msgid "Ad-Hoc Commands"
-#~ msgstr "Ad-Hoc opdrachten"
-
-#~ msgid "PubSub Service"
-#~ msgstr "PubSub dienst"
-
-#~ msgid "XHTML-IM"
-#~ msgstr "XHTML-IM"
-
-#, fuzzy
-#~ msgid "In-Band Registration"
-#~ msgstr "Registratiefout"
-
-#~ msgid "User Location"
-#~ msgstr "Gebruikerslocatie"
-
-#~ msgid "User Avatar"
-#~ msgstr "Avatar"
-
-#~ msgid "Chat State Notifications"
-#~ msgstr "Contactstatusmelding"
-
-#~ msgid "Software Version"
-#~ msgstr "Software versie"
-
-#, fuzzy
-#~ msgid "Stream Initiation"
-#~ msgstr "Oriëntatie"
-
-#~ msgid "User Activity"
-#~ msgstr "Activiteit gebruiker"
-
-#~ msgid "Entity Capabilities"
-#~ msgstr "Entiteit mogelijkheden"
-
-#~ msgid "Encrypted Session Negotiations"
-#~ msgstr "Gecodeerde sessie onderhandelingen"
-
-#~ msgid "User Tune"
-#~ msgstr "Gebruikers tune"
-
-#, fuzzy
-#~ msgid "Roster Item Exchange"
-#~ msgstr "IM met sleuteluitwisseling"
-
-#~ msgid "Reachability Address"
-#~ msgstr "Beschikbaarheid adres"
-
-#~ msgid "Jingle"
-#~ msgstr "Jingle"
-
-#~ msgid "Jingle Audio"
-#~ msgstr "Geluid jingle"
-
-#~ msgid "User Nickname"
-#~ msgstr "Gebruikersnaam"
-
-#~ msgid "Jingle ICE UDP"
-#~ msgstr "ICE UDP Jingle"
-
-#~ msgid "Jingle ICE TCP"
-#~ msgstr "ICE TCP Jingle"
-
-#~ msgid "Jingle Raw UDP"
-#~ msgstr "Raw UDP Raw UDP"
-
-#~ msgid "Jingle Video"
-#~ msgstr "Jingle Video"
-
-#~ msgid "Jingle DTMF"
-#~ msgstr "DTMF DTMF"
-
-#~ msgid "Message Receipts"
-#~ msgstr "Bericht ontvangen"
-
-#~ msgid "Public Key Publishing"
-#~ msgstr "Openbare sleutel openbaren"
-
-#~ msgid "User Chatting"
-#~ msgstr "Chattende gebruiker"
-
-#~ msgid "User Browsing"
-#~ msgstr "Browsende gebruiker"
-
-#~ msgid "User Viewing"
-#~ msgstr "Kijkende gebruiker"
-
-#~ msgid "Stanza Encryption"
-#~ msgstr "Stanza codering"
-
-#~ msgid "Delayed Delivery"
-#~ msgstr "Vertraagde afgifte"
-
-#~ msgid "Collaborative Data Objects"
-#~ msgstr "Samenwerkende data-objecten"
-
-#~ msgid "File Repository and Sharing"
-#~ msgstr "Bestandsbronnen en delen"
-
-#~ msgid "Hop Check"
-#~ msgstr "Hop-controle"
-
-#~ msgid "Read Error"
-#~ msgstr "Leesfout"
-
-#~ msgid "Failed to connect to server."
-#~ msgstr "Kan geen verbinding maken met de server."
-
-#~ msgid "Read buffer full (2)"
-#~ msgstr "Wachtrij vol (2)"
-
-#~ msgid "Unparseable message"
-#~ msgstr "Kan het bericht niet analyseren"
-
-#~ msgid "Couldn't connect to host: %s (%d)"
-#~ msgstr "Kan geen verbinding maken met host: %s (%d)"
-
-#~ msgid "Login failed (%s)."
-#~ msgstr "Aanmelden mislukt (%s)."
-
-#~ msgid ""
-#~ "You have been logged out because you logged in at another workstation."
-#~ msgstr ""
-#~ "De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
-#~ "computer."
-
-#~ msgid "Error. SSL support is not installed."
-#~ msgstr "Fout! Geen SSL-ondersteuning geïnstalleerd."
-
-#~ msgid "Incorrect password."
-#~ msgstr "Ongeldig wachtwoord."
-
-#~ msgid ""
-#~ "Could not connect to BOS server:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan niet verbinden met BOS-server:\n"
-#~ "%s"
-
-#~ msgid "You may be disconnected shortly.  Check %s for updates."
-#~ msgstr ""
-#~ "U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe "
-#~ "versies."
-
-#~ msgid "Could Not Connect"
-#~ msgstr "Kan geen verbinding maken"
-
-#~ msgid "Invalid username."
-#~ msgstr "Ongeldige gebruikersnaam."
-
-#, fuzzy
-#~ msgid "Could not decrypt server reply"
-#~ msgstr "Kan login-antwoord niet decoderen"
-
-#~ msgid "Connection lost"
-#~ msgstr "Verbinding verbroken"
-
-#~ msgid "Couldn't resolve host"
-#~ msgstr "Kan host niet vinden"
-
-#~ msgid "Connection closed (writing)"
-#~ msgstr "Verbinding verbroken (schrijven)"
-
-#~ msgid "Connection reset"
-#~ msgstr "Verbindingsfout"
-
-#~ msgid "Error reading from socket: %s"
-#~ msgstr "Er is een fout opgetreden bij het lezen van de socket: %s"
-
-#~ msgid "Unable to connect to host"
-#~ msgstr "Kan geen verbinding maken met de computer"
-
-#~ msgid "Could not write"
-#~ msgstr "Kan niet schrijven"
-
-#~ msgid "Could not create listen socket"
-#~ msgstr "Kan geen socket aanmaken om te luisteren"
-
-#~ msgid "Could not resolve hostname"
-#~ msgstr "Kan hostnaam niet vinden"
-
-#, fuzzy
-#~ msgid "Incorrect Password"
-#~ msgstr "Ongeldig wachtwoord"
-
-#~ msgid ""
-#~ "Could not establish a connection with %s:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan geen verbinding maken met %s:\n"
-#~ "%s"
-
-#~ msgid "Yahoo Japan"
-#~ msgstr "Yahoo Japan"
-
-#~ msgid "Japan Pager server"
-#~ msgstr "Japanse semafoonserver"
-
-#~ msgid "Japan file transfer server"
-#~ msgstr "Japanse server voor bestandsoverdrachten"
-
-#~ msgid ""
-#~ "Lost connection with server\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Verbinding met de server \n"
-#~ "%s verloren"
-
-#~ msgid "Could not resolve host name"
-#~ msgstr "Kan host niet vinden"
-
-#, fuzzy
-#~ msgid ""
-#~ "Unable to connect to %s: Server requires TLS/SSL, but no TLS/SSL support "
-#~ "was found."
-#~ msgstr ""
-#~ "Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL "
-#~ "gevonden."
-
-#~ msgid "Conversation Window Hiding"
-#~ msgstr "Gespreksvenster verbergen"
-
-#~ msgid "More Data needed"
-#~ msgstr "Meer gegevens vereist"
-
-#~ msgid "Please provide a shortcut to associate with the smiley."
-#~ msgstr "Geef een snelkoppeling om te associëren met de smiley."
-
-#~ msgid "Please select an image for the smiley."
-#~ msgstr "Selecteer een afbeelding uit de lijst voor de smiley"
-
-#~ msgid "Activate which ID?"
-#~ msgstr "Welk ID activeren?"
-
-#~ msgid "Cursor Color"
-#~ msgstr "Cursorkleur"
-
-#~ msgid "Secondary Cursor Color"
-#~ msgstr "Secundaire cursorkleur"
-
-#~ msgid "Interface colors"
-#~ msgstr "Kleuren van interface"
-
-#~ msgid "Widget Sizes"
-#~ msgstr "Elementgrootte"
-
-#~ msgid "Invite message"
-#~ msgstr "Uitnodiging"
-
-#~ msgid ""
-#~ "Please enter the name of the user you wish to invite,\n"
-#~ "along with an optional invite message."
-#~ msgstr ""
-#~ "Geef de naam van de persoon die u wilt uitnodigen,\n"
-#~ "eventueel met een uitnodigende tekst."
-
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Ophalen MSN Adressenlijst niet mogelijk"
-
-#~ msgid "Looking up %s"
-#~ msgstr "%s wordt opgezocht"
-
-#~ msgid "Connect to %s failed"
-#~ msgstr "Verbinding met %s verbroken"
-
-#~ msgid "Signon: %s"
-#~ msgstr "Aanmelding: %s"
-
-#~ msgid "Unable to write file %s."
-#~ msgstr "Kan niet naar bestand %s schrijven."
-
-#~ msgid "Unable to read file %s."
-#~ msgstr "Kan het bestand %s niet lezen."
-
-#~ msgid "Message too long, last %s bytes truncated."
-#~ msgstr "Bericht te lang, laatste %s Bytes afgekort."
-
-#~ msgid "%s not currently logged in."
-#~ msgstr "%s is niet aangemeld."
-
-#~ msgid "Warning of %s not allowed."
-#~ msgstr "Waarschuwing van %s is niet toegestaan."
-
-#~ msgid ""
-#~ "A message has been dropped, you are exceeding the server speed limit."
-#~ msgstr ""
-#~ "Een bericht is verloren gegaan. U overschreidt de snelheid van de server."
-
-#~ msgid "Chat in %s is not available."
-#~ msgstr "Chatruimte in %s is niet beschikbaar."
-
-#~ msgid "You are sending messages too fast to %s."
-#~ msgstr "U verzend te snel berichten naar %s."
-
-#~ msgid "You missed an IM from %s because it was too big."
-#~ msgstr "Een Bericht van %s is niet overgekomen omdat het te groot was."
-
-#~ msgid "You missed an IM from %s because it was sent too fast."
-#~ msgstr ""
-#~ "Een Bericht van %s is niet overgekomen omdat het te snel verzonden werd."
-
-#~ msgid "Failure."
-#~ msgstr "Fout."
-
-#~ msgid "Too many matches."
-#~ msgstr "Te veel overeenkomsten."
-
-#~ msgid "Need more qualifiers."
-#~ msgstr "Meer gegevens nodig."
-
-#~ msgid "Dir service temporarily unavailable."
-#~ msgstr "Profielen service is momenteel niet toegankelijk."
-
-#~ msgid "Email lookup restricted."
-#~ msgstr "Zoekfunctie e-mail beperkt."
-
-#~ msgid "Keyword ignored."
-#~ msgstr "Sleutelwoord genegeerd."
-
-#~ msgid "No keywords."
-#~ msgstr "Geen sleutelwoorden."
-
-#~ msgid "User has no directory information."
-#~ msgstr "Deze gebruiker heeft geen profiel."
-
-#~ msgid "Country not supported."
-#~ msgstr "Land wordt niet ondersteund."
-
-#~ msgid "Failure unknown: %s."
-#~ msgstr "Onbekende Fout: %s."
-
-#~ msgid "Incorrect username or password."
-#~ msgstr "Ongeldige gebruikersnaam of wachtwoord."
-
-#~ msgid "The service is temporarily unavailable."
-#~ msgstr "De service is momenteel niet bereikbaar."
-
-#~ msgid "Your warning level is currently too high to log in."
-#~ msgstr "Uw waarschuwingsniveau is momenteel te hoog om in te loggen."
-
-#~ 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 ""
-#~ "U hebt zich te snel aan en afgemeld. Wacht 10 Minuten en probeer het nog "
-#~ "een keer."
-
-#~ msgid "An unknown error, %d, has occurred.  Info: %s"
-#~ msgstr "Onbekende fout %d opgetreden. Info: %s"
-
-#~ msgid "Invalid Groupname"
-#~ msgstr "Ongeldige groep"
-
-#~ msgid "Connection Closed"
-#~ msgstr "Verbinding verbroken"
-
-#~ msgid "Waiting for reply..."
-#~ msgstr "Wacht op antwoord..."
-
-#~ msgid "TOC has come back from its pause. You may now send messages again."
-#~ msgstr "TOC werkt weer. U kunt nu weer berichten versturen."
-
-#~ msgid "Password Change Successful"
-#~ msgstr "Wachtwoord succesvol veranderd"
-
-#~ msgid "Get Dir Info"
-#~ msgstr "Directory info ophalen"
-
-#~ msgid "Set Dir Info"
-#~ msgstr "Directory info instellen"
-
-#~ msgid "Could not open %s for writing!"
-#~ msgstr "Kon %s niet openen om naar te schrijven!"
-
-#~ msgid "File transfer failed; other side probably canceled."
-#~ msgstr ""
-#~ "Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk "
-#~ "afgebroken."
-
-#~ msgid "Could not connect for transfer."
-#~ msgstr "Kan niet verbinden voor overdracht."
-
-#~ msgid "Could not write file header.  The file will not be transferred."
-#~ msgstr ""
-#~ "Kon koptekst van bestand niet instellen. Het bestand zal niet verzonden "
-#~ "worden."
-
-#~ msgid "Save As..."
-#~ msgstr "Opslaan als..."
-
-#~ 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 vraagt aan %s om %d bestand te accepteren: %s (%.2f %s)%s%s"
-#~ msgstr[1] "%s vraagt aan %s om %d bestanden te accepteren: %s (%.2f %s)%s%s"
-
-#~ msgid "%s requests you to send them a file"
-#~ msgstr "%s vraagt u om een bestand te verzenden"
-
-#~ msgid "TOC Protocol Plugin"
-#~ msgstr "TOC-protocol plug-in"
-
-#~ msgid "%s Options"
-#~ msgstr "%s Opties"
-
-#~ msgid "Proxy Options"
-#~ msgstr "Proxy-opties"
-
-#~ msgid "By log size"
-#~ msgstr "Op logboekgrootte"
-
-#~ msgid "_Open Link in Browser"
-#~ msgstr "Verwijzing _openen met webbrowser"
-
-#~ msgid "Smiley _Image"
-#~ msgstr "_Smiley-afbeelding"
-
-#~ msgid "Smiley S_hortcut"
-#~ msgstr "Sneltoets smiley"
-
-#~ msgid "_Flash window when chat messages are received"
-#~ msgstr "Venster laten _knipperen wanneer chatberichten worden ontvangen"
-
-#~ msgid ""
-#~ "You may be disconnected shortly.  You may want to use TOC until this is "
-#~ "fixed.  Check %s for updates."
-#~ msgstr ""
-#~ "U wordt waarschijnlijk binnenkort afgemeld. U kunt misschien beter TOC "
-#~ "gebruiken tot dit probleem is opgelost. Kijk op %s voor nieuwe versies."
-
-#~ 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] ""
-#~ "Verbinding met server verloren (geen data ontvangen binnen %d seconde)"
-#~ msgstr[1] ""
-#~ "Verbinding met server verloren (geen data ontvangen binnen %d seconden)"
-
-#, fuzzy
-#~ msgid "Add buddy Q&A"
-#~ msgstr "Contact toevoegen"
-
-#, fuzzy
-#~ msgid "Can not decrypt get server reply"
-#~ msgstr "Kan login-antwoord niet decoderen"
-
-#~ msgid "Keep alive error"
-#~ msgstr "Interval(len) om verbinding te behouden fout"
-
-#~ msgid ""
-#~ "Lost connection with server:\n"
-#~ "%d, %s"
-#~ msgstr ""
-#~ "Verbinding verloren met server:\n"
-#~ "%d, %s"
-
-#, fuzzy
-#~ msgid "Connecting server ..."
-#~ msgstr "Verbinden met server"
-
-#~ msgid "Failed to send IM."
-#~ msgstr "Kan bericht niet verzenden"
-
-#, fuzzy
-#~ msgid "Not a member of room \"%s\"\n"
-#~ msgstr "Je bent niet langer lid van groep \"%s\"\n"
-
-#~ msgid "User information for %s unavailable"
-#~ msgstr "Gebruikersinformatie voor %s niet beschikbaar"
-
-#~ msgid "Primary Information"
-#~ msgstr "Belangrijke Informatie"
-
-#~ msgid "Blood Type"
-#~ msgstr "Bloedgroep"
-
-#~ msgid "Update information"
-#~ msgstr "Informatie bijwerken"
-
-#~ msgid ""
-#~ "Setting custom faces is not currently supported. Please choose an image "
-#~ "from %s."
-#~ msgstr ""
-#~ "Eigen gezichten instellen wordt nog niet ondersteund. Kies een afbeelding "
-#~ "van %s"
-
-#~ msgid "Invalid QQ Face"
-#~ msgstr "Ongeldige QQ-gezicht"
-
-#~ msgid "You rejected %d's request"
-#~ msgstr "U heeft %d's verzoek geweigerd"
-
-#~ msgid "Reject request"
-#~ msgstr "Verzoek weigeren"
-
-#~ msgid "Add buddy with auth request failed"
-#~ msgstr "Toevoegen van gebruiker met autenticifatieverzoeken mislukt"
-
-#~ msgid "Add into %d's buddy list"
-#~ msgstr "Toevoegen aan %d's contactenlijst"
-
-#, fuzzy
-#~ msgid "QQ Number Error"
-#~ msgstr "QQ Nummer"
-
-#~ msgid "Group Description"
-#~ msgstr "Groepsbeschrijving"
-
-#~ msgid "Auth"
-#~ msgstr "Auth"
-
-#~ msgid "Approve"
-#~ msgstr "Goedkeuren"
-
-#, fuzzy
-#~ msgid "Successed to join Qun %d, operated by admin %d"
-#~ msgstr ""
-#~ "Uw aanvraag om lid te worden van groep %d is geweigerd door admin %d"
-
-#, fuzzy
-#~ msgid "[%d] removed from Qun \"%d\""
-#~ msgstr "U [%d] heeft groep \"%d\" verlaten"
-
-#, fuzzy
-#~ msgid "[%d] added to Qun \"%d\""
-#~ msgstr "U [%d] bent toegevoegd aan groep \"%d\""
-
-#~ msgid "I am a member"
-#~ msgstr "Ik ben lid"
-
-#~ msgid "I am requesting"
-#~ msgstr "Ik doe een aanvraag"
-
-#~ msgid "I am the admin"
-#~ msgstr "Ik ben de admin"
-
-#~ msgid "Unknown status"
-#~ msgstr "Onbekende status"
-
-#, fuzzy
-#~ msgid "Remove from Qun"
-#~ msgstr "Groep verwijderen"
-
-#~ msgid "You entered a group ID outside the acceptable range"
-#~ msgstr "Je bent een groep ID binnengekomen buiten de accepteerbare grootte."
-
-#~ msgid "Are you sure you want to leave this Qun?"
-#~ msgstr "Wilt u deze Qun echt verlaten?"
-
-#~ msgid "Do you want to approve the request?"
-#~ msgstr "Wilt u de aanvraag goedkeuren?"
-
-#~ msgid "System Message"
-#~ msgstr "Systeembericht"
-
-#~ msgid "<b>Last Login IP</b>: %s<br>\n"
-#~ msgstr "<b>IP laatste aanmelding</b>: %s<br>\n"
-
-#~ msgid "<b>Last Login Time</b>: %s\n"
-#~ msgstr "<b>Laatst aangemald</b>: %s\n"
-
-#~ msgid "Set My Information"
-#~ msgstr "Mijn informatie instellen"
-
-#~ msgid "Leave the QQ Qun"
-#~ msgstr "QQ Qun verlaten"
-
-#~ msgid "Block this buddy"
-#~ msgstr "Contact blokkeren"
-
-#~ msgid "Invalid token reply code, 0x%02X"
-#~ msgstr "Ongeldig antwoord-code, 0x%02X"
-
-#~ msgid "Error password: %s"
-#~ msgstr "Wachtwoord-fout: %s"
-
-#, fuzzy
-#~ msgid "Failed to connect all servers"
-#~ msgstr "Kan geen verbinding maken met de server"
-
-#~ msgid "Connecting server %s, retries %d"
-#~ msgstr "Verbonden server %s, probeert over %d opnieuw"
-
-#~ msgid "Do you approve the requestion?"
-#~ msgstr "Keur je de aanvraag goed?"
-
-#~ msgid "Do you add the buddy?"
-#~ msgstr "Voeg je het contact toe?"
-
-#~ msgid "%s added you [%s] to buddy list"
-#~ msgstr "%s heeft jou [%s] toegevoegd naar de contactenlijst"
-
-#~ msgid "QQ Budy"
-#~ msgstr "QQ-contact"
-
-#~ msgid "Requestion approved by %s"
-#~ msgstr "Aanvraag goedgekeurd door %s"
-
-#~ msgid "%s wants to add you [%s] as a friend"
-#~ msgstr "%s wil jou [%s] als vriend toevoegen"
-
-#~ msgid "%s is not in buddy list"
-#~ msgstr "%s staat niet in uw contactenlijst"
-
-#~ msgid "Would you add?"
-#~ msgstr "Wil je toevoegen?"
-
-#~ msgid "%s"
-#~ msgstr "%s"
-
-#, fuzzy
-#~ msgid "QQ Server Notice"
-#~ msgstr "QQ Server"
-
-#, fuzzy
-#~ msgid "Network disconnected"
-#~ msgstr "Computer verbroken"
-
-#~ msgid "developer"
-#~ msgstr "ontwikkelaar"
-
-#~ msgid "XMPP developer"
-#~ msgstr "XMPP-ontwikkelaar"
-
-#~ msgid "Artists"
-#~ msgstr "Artiesten"
-
-#~ msgid ""
-#~ "You are using %s version %s.  The current version is %s.  You can get it "
-#~ "from <a href=\"%s\">%s</a><hr>"
-#~ msgstr ""
-#~ "Je maakt gebruik van %s versie %s. De huidige versie is echter %s. Je kan "
-#~ "het krijgen via <a href=\"%s\">%s</a><hr>"
-
-#~ msgid "<b>ChangeLog:</b><br>%s"
-#~ msgstr "<b>Veranderingen:</b><br>%s"
-
-#~ msgid "A group with the name already exists."
-#~ msgstr "Die groep bestaat al."
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/Op_hangen"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "De bijnaam die u invulde is ongeldig."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit Login Naam"
+
+#~ msgid "Nick Name"
+#~ msgstr "Bijnaam"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Uw Mobile nummer..."
--- a/po/nn.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/nn.po	Sat Jul 31 23:42:35 2010 +0000
@@ -1,9 +1,11 @@
-msgid ""
+#
+# Yngve Spjeld Landro <l10n@landro.net>, 2010.
+msgid ""
 msgstr ""
 "Project-Id-Version: gtranslator\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
-"PO-Revision-Date: 2010-05-27 13:33+0100\n"
+"POT-Creation-Date: 2010-07-27 02:06-0400\n"
+"PO-Revision-Date: 2010-07-21 23:06+0100\n"
 "Last-Translator: Yngve Spjeld Landro <l10n@landro.net>\n"
 "Language-Team: Norwegian Nynorsk <l10n@landro.net>\n"
 "Language: nn\n"
@@ -55,12 +57,25 @@
 msgid "Error"
 msgstr "Feil"
 
+msgid "Account was not modified"
+msgstr "Kontoen blei ikkje endra"
+
 msgid "Account was not added"
 msgstr "Kontoen blei ikkje lagt til"
 
 msgid "Username of an account must be non-empty."
 msgstr "Brukarnamnet til ein konto kan ikkje vera tomt."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+"Protokollen til kontoen kan ikkje endrast så lenge han er kopla til tenaren."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Brukarnamnet til kontoen kan ikkje endrast så lenge han er kopla til tenaren."
+
 msgid "New mail notifications"
 msgstr "Varsling om ny e-post"
 
@@ -1260,6 +1275,9 @@
 msgid "Someone says your username in chat"
 msgstr "Nokon seier namnet ditt i eit praterom"
 
+msgid "Attention received"
+msgstr "Motteke merksemd"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer-feil"
 
@@ -1555,7 +1573,7 @@
 msgid "Online"
 msgstr "Tilkopla"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Fråkopla"
 
@@ -1674,8 +1692,12 @@
 "Ein kan ikkje stola på sertifikatet sidan det ikkje finst tiltrudde "
 "sertifikat som kan stadfesta det."
 
-msgid "The certificate is not valid yet."
-msgstr "Sertifikatet er ikkje gyldig enno."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Sertifikatet er enno ikkje gyldig. Sjå til at tenaren nyttar rette dato- og "
+"tidsinnstillingar."
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Sertifikatet har gått ut og kan ikkje reknast for å vera gyldig."
@@ -3823,6 +3845,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Tenaren meiner autentiseringa er ferdig, men det gjer ikkje klienten"
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Tenaren krev kanskje autentisering i klartekst over ein ukryptert straum"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s krev kanskje autentisering i klartekst over eit ukryptert samband. Vil du "
+"tillata dette og halda fram med autentiseringa?"
+
 msgid "SASL authentication failed"
 msgstr "SASL-autentiseringa feila"
 
@@ -4662,7 +4696,7 @@
 msgstr "ping &lt;jid&gt;:\tPing ein brukar/komponent/tenar."
 
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: send ein alarm til ein brukar for å merksemda hans"
+msgstr "buzz: send ein alarm til ein brukar for å få merksemda hans"
 
 msgid "mood: Set current user mood"
 msgstr "mood: lagra den noverande brukarsinnsstemninga"
@@ -5910,7 +5944,8 @@
 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"
+#, fuzzy
+msgid "Your UID"
 msgstr "MXit-ID-en din"
 
 #. pin
@@ -5922,6 +5957,7 @@
 msgstr "Stadfest PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Visingsnamn"
 
@@ -5981,19 +6017,16 @@
 msgid "Connecting..."
 msgstr "Koplar til…"
 
-msgid "The nick name you entered is invalid."
-msgstr "Kallenamnet du skreiv er ugyldig."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Namnet du skreiv er ugyldig."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "PIN-en du skreiv nyttar ei ulovleg lengd [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Påloggingsnamn MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Kallenamn"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6021,10 +6054,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Du valde eit ugyldig land. Prøv igjen seinare."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Brukarnamnet er ikkje registrert. Registrer deg først."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Brukarnamnet er allereie registrert. Vel eit anna brukarnamn."
 
 msgid "Internal error. Please try again later."
@@ -6069,8 +6104,9 @@
 msgid "Hidden Number"
 msgstr "Skjult nummer"
 
-msgid "Your Mobile Number..."
-msgstr "Mobiltelefonnummeret ditt…"
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "MXit-ID-en din"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6085,17 +6121,23 @@
 msgstr "Bruk oppstartsvindauge"
 
 #. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Du er blitt sparka ut frå denne MultiMX-en."
+
+msgid "was kicked"
+msgstr "blei sparka ut"
+
+msgid "_Room Name:"
+msgstr "Rom_namn:"
+
+#. Display system message in chat window
 #, fuzzy
-msgid "You have been kicked from this MultiMX."
-msgstr "Du er blitt sparka ut av: (%s)"
+msgid "You have invited"
+msgstr "Du har fått e-post."
 
 #, fuzzy
-msgid "was kicked"
-msgstr "Ugyldig autentiseringsmelding"
-
-#, fuzzy
-msgid "_Room Name:"
-msgstr "_Rom:"
+msgid "Last Online"
+msgstr "Tilkopla"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -7848,11 +7890,11 @@
 msgid "Invalid SNAC"
 msgstr "Ugyldig SNAC"
 
-msgid "Rate to host"
-msgstr "Fart mot vert"
-
-msgid "Rate to client"
-msgstr "Fart mot klient"
+msgid "Server rate limit exceeded"
+msgstr "Overskriden tenargrense"
+
+msgid "Client rate limit exceeded"
+msgstr "Overskriden klientgrense"
 
 msgid "Service unavailable"
 msgstr "Tenesta er utilgjengeleg"
@@ -10124,8 +10166,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorer konferanse- og prateromsinvitasjonar"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Bruk kontomellomtenar for SSL-sambanda"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Bruk kontomellomtenar for HTTP- og HTTPS-tilkoplingar"
 
 msgid "Chat room list URL"
 msgstr "Prateromslisteadresse"
@@ -10662,7 +10704,7 @@
 
 #, c-format
 msgid "%s has requested your attention!"
-msgstr "%s har bede om merksemda di!"
+msgstr "%s har bede om å få merksemda di"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
@@ -11406,7 +11448,7 @@
 msgstr "/Hjelp/Ut_viklaropplysningar"
 
 msgid "/Help/_Translator Information"
-msgstr "/Hjelp/_Omsetjaropplysningar"
+msgstr "/Hjelp/Om_setjaropplysningar"
 
 msgid "/Help/_About"
 msgstr "/Hjelp/_Om"
@@ -12359,8 +12401,8 @@
 "å senda ei e-postmelding til <a href=\"mailto:support@pidgin.im"
 "\">support@pidgin.im</a><br/>Dette er ei <b>open</b> postliste (<a href="
 "\"http://pidgin.im/pipermail/support/\">archive</a>).<br/>Vi kan ikkje "
-"hjelpa med tredjepart-protokollar eller -programtillegg.<br/>Lista sitt "
-"primærspråk er  <b>engelsk</b>. Du kan skriva på eit anna språk, men då vil "
+"hjelpa med tredjepartsprotokollar eller -programtillegg.<br/>Lista sitt "
+"primærspråk er <b>engelsk</b>. Du kan skriva på eit anna språk, men då vil "
 "du kanskje ikkje få den hjelpa du treng.<br/>"
 
 #, c-format
@@ -12600,7 +12642,7 @@
 
 #. "Download Details" arrow
 msgid "File transfer _details"
-msgstr "_Filoverføringsdetaljar"
+msgstr "Filoverførings_detaljar"
 
 msgid "Paste as Plain _Text"
 msgstr "_Lim inn som rein tekst"
@@ -12858,8 +12900,9 @@
 msgid "_Smile!"
 msgstr "Smile_fjes"
 
+# var: _NB!
 msgid "_Attention!"
-msgstr "_NB!"
+msgstr "_Merksemd"
 
 msgid "Log Deletion Failed"
 msgstr "Klarte ikkje å sletta loggen"
@@ -12992,11 +13035,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Avsluttar sidan en annan libpurple-klient allereie kjører.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Legg på"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Legg på"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13800,9 +13845,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Smilefjesbehandling"
 
-msgid "Attention received"
-msgstr "Motteke merksemd"
-
 msgid "Select Buddy Icon"
 msgstr "Vel venneikon"
 
@@ -15160,6 +15202,8 @@
 #. Installer Subsection Detailed Description
 msgid "A multi-platform GUI toolkit, used by Pidgin"
 msgstr ""
+"Ei fleirplattform verktøysamling for grafiske brukargrensesnitt,  nytta av "
+"Pidgin"
 
 msgid ""
 "An instance of Pidgin is currently running.  Please exit Pidgin and try "
@@ -15290,6 +15334,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Du har ikkje rettar til å avinstallera dette programmet."
 
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Kallenamnet du skreiv er ugyldig."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Påloggingsnamn MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Kallenamn"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Mobiltelefonnummeret ditt…"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Legg på"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Sertifikatet er ikkje gyldig enno."
+
+#~ msgid "Rate to host"
+#~ msgstr "Fart mot vert"
+
+#~ msgid "Rate to client"
+#~ msgstr "Fart mot klient"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Ukjend årsak."
 
--- a/po/oc.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/oc.po	Sat Jul 31 23:42:35 2010 +0000
@@ -17,7 +17,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2008-05-09 01:31+0200\n"
 "Last-Translator: Éric Boumaour <zongo_fr@users.sourceforge.net>\n"
 "Language-Team: fr <fr@li.org>\n"
@@ -59,12 +59,23 @@
 msgid "Error"
 msgstr "Error"
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr ""
 
@@ -1202,6 +1213,10 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "L'autentificacion a abocat"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1481,7 +1496,7 @@
 msgid "Online"
 msgstr "En linha"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconnectat"
 
@@ -1597,7 +1612,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3612,6 +3629,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "L'autentificacion a abocat"
@@ -5691,7 +5717,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5703,6 +5729,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Nom d'ostal"
@@ -5764,20 +5791,15 @@
 msgid "Connecting..."
 msgstr "Connexion"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Escais"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5805,10 +5827,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5860,7 +5882,7 @@
 msgid "Hidden Number"
 msgstr "L'expression es pas valida"
 
-msgid "Your Mobile Number..."
+msgid "Your MXit ID..."
 msgstr ""
 
 #. Configuration options
@@ -5887,6 +5909,14 @@
 msgid "_Room Name:"
 msgstr "_Sala :"
 
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+#, fuzzy
+msgid "Last Online"
+msgstr "En linha"
+
 #. 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 ""
@@ -7554,10 +7584,10 @@
 msgid "Invalid SNAC"
 msgstr ""
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -9771,7 +9801,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12531,10 +12561,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13352,10 +13382,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "L'autentificacion a abocat"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Seleccionar una poliça"
 
@@ -14797,6 +14823,10 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Escais"
+
 #~ msgid "Artist"
 #~ msgstr "Artista"
 
--- a/po/or.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/or.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: or\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-03-05 12:37+0530\n"
 "Last-Translator: Manoj Kumar Giri <mgiri@redhat.com>\n"
 "Language-Team: Oriya <oriya-it@googlegroups.com>\n"
@@ -77,12 +77,24 @@
 msgid "Error"
 msgstr "ତ୍ରୁଟି"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ଆକାଉଣ୍ଟକୁ ଯୋଗ କରାଯାଇ ନଥିଲା"
+
 msgid "Account was not added"
 msgstr "ଆକାଉଣ୍ଟକୁ ଯୋଗ କରାଯାଇ ନଥିଲା"
 
 msgid "Username of an account must be non-empty."
 msgstr "ଗୋଟିଏ ଆକାଉଣ୍ଟର ଚାଳକନାମ ନିଶ୍ଚିତଭାବରେ ଖାଲିନଥିବା ଉଚିତ।"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ନୂଆ ମେଲ ବିଜ୍ଞାପନଗୁଡିକ"
 
@@ -1253,6 +1265,9 @@
 msgid "Someone says your username in chat"
 msgstr "କେହିଜଣେ ଚାର୍ଟରେ ଆପଣଙ୍କର ଚାଳକନାମ କହିଛି"
 
+msgid "Attention received"
+msgstr "ଧ୍ୟାନ ପ୍ରାପ୍ତ ହୋଇଛି"
+
 msgid "GStreamer Failure"
 msgstr "Gଷ୍ଟ୍ରିମର ବିଫଳ"
 
@@ -1545,7 +1560,7 @@
 msgid "Online"
 msgstr "ଅନ ଲାଇନ"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ଅଫଲାଇନ"
 
@@ -1664,8 +1679,10 @@
 msgstr ""
 "ପ୍ରମାଣପତ୍ରଟି ବିଶ୍ୱସ୍ତ ନୁହଁ କାରଣ ଏହା ଯାଞ୍ଚ କରିପାରୁଥିବା କୌଣସି ପ୍ରମାଣପତ୍ର ବର୍ତ୍ତମାନ ବିଶ୍ୱସ୍ତ ନୁହଁନ୍ତି।"
 
-msgid "The certificate is not valid yet."
-msgstr "ପ୍ରମାଣପତ୍ରଟି ଏପର୍ଯ୍ୟନ୍ତ ବୈଧ ହୌଇନାହିଁ।"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "ପ୍ରମାଣପତ୍ରର ସମୟ ସମାପ୍ତ ହୋଇଛି ଏବଂ ଏହାକୁ ବୈଧ ଭାବରେ ଗ୍ରହଣ କରିବା ଉଚିତ ନୁହଁ।"
@@ -3779,6 +3796,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "ସର୍ଭର ଭାବିଥାଏ ଯେ ବୈଧିକରଣ ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଛି, କିନ୍ତୁ କ୍ଲାଏଣ୍ଟ ଭାବିନଥାଏ"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "ସରଭର ଏକ ଅନଇନକ୍ରିପଟେଡ ସ୍ରୋତ ବଦଳରେ ପ୍ରମାଣିତ ସରଳ ଟେକ୍ସଟ ଆବଶ୍ଯକ କରେ ୤"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"ଗୋଟିଏ ଅସଂଗୁପ୍ତ ସଂଯୋଗ ଉପରେ %s ସରଳ ପାଠ୍ୟ ବୈଧିକରଣ ଆବଶ୍ୟକ କରିଥାଏ।  ଏହାକୁ ଅନୁମତି ଦେବେକି ଏବଂ "
+"ବୈଧିକରଣକୁ ଅଗ୍ରସର କରିବେ କି?"
+
 msgid "SASL authentication failed"
 msgstr "SASL ବୈଧିକରଣ ବିଫଳ ହୋଇଛି"
 
@@ -5855,7 +5884,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "ଆପଣଙ୍କର ରୂପରେଖା ସୂଚନା ଏପର୍ଯ୍ୟନ୍ତ କଢ଼ାଯାଇନାହିଁ। ଦୟାକରି ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5867,6 +5896,7 @@
 msgstr "PIN କୁ ଯାଞ୍ଚ କରନ୍ତୁ"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "ନାମ ଦର୍ଶାଅ"
 
@@ -5924,19 +5954,16 @@
 msgid "Connecting..."
 msgstr "ସଂଯୋଗ କରୁଅଛି..."
 
-msgid "The nick name you entered is invalid."
-msgstr "ଆପଣ ଭରଣ କରିଥିବା ଉପନାମଟି ଅବୈଧ ଅଟେ।"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "ଆପଣ ଭରଣ କରିଥିବା ନାମଟି ଅବୈଧ ଅଟେ।"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "ଆପଣ ଭରଣ କରିଥିବା PIN ଟି ଅବୈଧ ଲମ୍ବ ବିଶିଷ୍ଟ [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit ଲଗଇନ ନାମ"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "ଉପନାମ"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5965,10 +5992,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "ଅବୈଧ ଦେଶ ବଛାହୋଇଛି। ଦୟାକରି ପୁଣିଥରେ ଚେଷ୍ଟାକରନ୍ତୁ।"
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "ଚାଳକନାମ ପଞ୍ଜିକୃତ ହୋଇନାହିଁ। ଦୟାକରି ପ୍ରଥମେ ପଞ୍ଜିକରଣ କରନ୍ତୁ।"
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "ଚାଳକନାମ ପୂର୍ବରୁ ପଞ୍ଜିକୃତ ହୋଇଛି। ଦୟାକରି ଅନ୍ୟଏକ ଚାଳକନାମ ବାଛନ୍ତୁ।"
 
 msgid "Internal error. Please try again later."
@@ -6014,8 +6043,9 @@
 msgid "Hidden Number"
 msgstr "ଲୁକ୍କାଇତ କ୍ରମସଂଖ୍ୟା"
 
-msgid "Your Mobile Number..."
-msgstr "ଆପଣଙ୍କର ମୋବାଇଲ କ୍ରମସଂଖ୍ୟା..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6041,6 +6071,15 @@
 msgid "_Room Name:"
 msgstr "କଠୋରି (_R):"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "ତୁମର ମେଲ ଅଛି !"
+
+#, fuzzy
+msgid "Last Online"
+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 ରେ ସଂଯୋଗକୁ ହରାଇଛୁ। ଦୟାକରି ପୁଣି ସଂଯୋଗକରନ୍ତୁ।"
@@ -7767,11 +7806,11 @@
 msgid "Invalid SNAC"
 msgstr "ଅମାନ୍ଯ SNAC"
 
-msgid "Rate to host"
-msgstr "ହୋଷ୍ଟ ପାଇଁ ଦର"
-
-msgid "Rate to client"
-msgstr "ଗ୍ରାହକ ପାଇଁ ଦର"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "ସେବା ଅନୁପଲବ୍ଧ"
@@ -10016,7 +10055,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "ସଭା ଏବଂ ଚାଟକକ୍ଷ ନିମନ୍ତ୍ରଣଗୁଡିକୁ ଅବହେଳା କର"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL ସଂଯୋଗଗୁଡ଼ିକ ପାଇଁ ଖାତା ପ୍ରକ୍ସିକୁ ବ୍ୟବହାର କରନ୍ତୁ"
 
 msgid "Chat room list URL"
@@ -12848,11 +12888,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ପ୍ରସ୍ଥାନ କରୁଅଛି କାରଣ ଅନ୍ୟ ଏକ libpurple କ୍ଲାଏଣ୍ଟ ପୂର୍ବରୁ ଚାଲୁଅଛି।\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/ମେଡିଆ (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/ମେଡିଆ/ଝୁଲିବା (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "ସଂଯୋଗ ଛିନ୍ନ କରନ୍ତୁ"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13648,9 +13690,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Smiley ପରିଚାଳକଙ୍କୁ ଇଚ୍ଛାରୂପଣ କରନ୍ତୁ"
 
-msgid "Attention received"
-msgstr "ଧ୍ୟାନ ପ୍ରାପ୍ତ ହୋଇଛି"
-
 msgid "Select Buddy Icon"
 msgstr "ସାଥୀ ଚିତ୍ର ସଂକେତ ଚୟନ କରନ୍ତୁ"
 
@@ -15121,6 +15160,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "ପ୍ରମାଣପତ୍ରଟି ଏପର୍ଯ୍ୟନ୍ତ ବୈଧ ହୌଇନାହିଁ।"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "ଆପଣ ଭରଣ କରିଥିବା ଉପନାମଟି ଅବୈଧ ଅଟେ।"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit ଲଗଇନ ନାମ"
+
+#~ msgid "Nick Name"
+#~ msgstr "ଉପନାମ"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "ଆପଣଙ୍କର ମୋବାଇଲ କ୍ରମସଂଖ୍ୟା..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ହୋଷ୍ଟ ପାଇଁ ଦର"
+
+#~ msgid "Rate to client"
+#~ msgstr "ଗ୍ରାହକ ପାଇଁ ଦର"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/ମେଡିଆ/ଝୁଲିବା (_H)"
+
 #~ msgid "Unknown reason."
 #~ msgstr "ଅଜ୍ଞାତ କାରଣ୤"
 
--- a/po/pa.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/pa.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: pa\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-01-26 05:27+0530\n"
 "Last-Translator: A S Alam <aalam@users.sf.net>\n"
 "Language-Team: ਪੰਜਾਬੀ <punjabi-users@lists.sf.net>\n"
@@ -64,12 +64,24 @@
 msgid "Error"
 msgstr "ਗਲਤੀ"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"
+
 msgid "Account was not added"
 msgstr "ਅਕਾਊਂਟ ਸ਼ਾਮਲ ਨਹੀਂ ਕੀਤਾ ਗਿਆ"
 
 msgid "Username of an account must be non-empty."
 msgstr "ਇੱਕ ਅਕਾਊਂਟ ਦਾ ਯੂਜ਼ਰ ਨਾਂ ਖਾਲੀ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "ਨਵੀਂ ਮੇਲ ਨੋਟੀਫਿਕੇਸ਼ਨ"
 
@@ -1239,6 +1251,10 @@
 msgid "Someone says your username in chat"
 msgstr "ਕਿਸੇ ਨੇ ਤੁਹਾਡਾ ਨਾਂ ਗੱਲਬਾਤ ਦੌਰਾਨ ਲਿਆ ਹੈ"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "ਐਕਟੀਵੇਸ਼ਨ ਲੋੜੀਦੀ"
+
 msgid "GStreamer Failure"
 msgstr "ਜੀਸਟਰੀਮਰ ਫੇਲ੍ਹ"
 
@@ -1527,7 +1543,7 @@
 msgid "Online"
 msgstr "ਆਨਲਾਈਨ"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ਆਫਲਾਈਨ"
 
@@ -1645,8 +1661,10 @@
 "currently trusted."
 msgstr "ਸਰਟੀਫਿਕੇਟ ਉੱਤੇ ਭਰੋਸੇ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ ਕਿਉਂਕਿ ਇਹ ਕੇਵਲ ਆਪਣੇ ਆਪ ਹੀ ਟਰੱਸਟ ਹੈ।"
 
-msgid "The certificate is not valid yet."
-msgstr "ਸਰਟੀਫਿਕੇਟ ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ।"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "ਸਰਟੀਫਿਕੇਟ ਦੀ ਮਿਆਦ ਪੁੱਗ ਚੁੱਕੀ ਹੈ ਅਤੇ ਜਾਇਜ਼ ਨਹੀਂ ਮੰਨਿਆ ਜਾ ਸਕਦਾ ਹੈ।"
@@ -3757,6 +3775,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "ਸਰਵਰ ਸੋਚਦਾ ਹੈ ਕਿ ਪਰਮਾਣਕਿਤਾ ਪੂਰੀ ਹੋ ਗਈ ਹੈ, ਪਰ ਕਲਾਇਟ ਨਹੀਂ"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "ਸਰਵਰ ਨੂੰ ਇੱਕ ਗ਼ੈਰ-ਇੰਕ੍ਰਿਪਟਡ ਸਟਰੀਮ ਲਈ ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ।"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ਲਈ ਗ਼ੈਰ-ਇੰਕ੍ਰਿਪਟਡ ਕੁਨੈਕਸ਼ਨ ਉੱਤੇ ਪਲੇਨ-ਟੈਕਸਟ ਪਰਮਾਣਕਿਤਾ ਲੋੜੀਦੀ ਹੈ। ਕੀ ਇਹ ਪਰਮਾਣਿਕਤਾ ਮਨਜ਼ੂਰ "
+"ਕਰਕੇ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
+
 msgid "SASL authentication failed"
 msgstr "SASL ਪ੍ਰਮਾਣਿਕਤਾ ਅਸਫਲ"
 
@@ -5891,7 +5921,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "ਤੁਹਾਡੀ ਪਰੋਫਾਇਲ ਜਾਣਕਾਰੀ ਹਾਲੇ ਲਈ ਨਹੀਂ ਗਈ ਹੈ। ਬਾਅਦ ਵਿੱਚ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5903,6 +5933,7 @@
 msgstr "PIN ਜਾਂਚ"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "ਵੇਖਾਉਣ ਲਈ ਨਾਂ"
 
@@ -5959,19 +5990,16 @@
 msgid "Connecting..."
 msgstr "ਕੁਨੈਕਟ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
 
-msgid "The nick name you entered is invalid."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
 msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਨਾਂ ਗਲਤ ਹੈ।"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤੇ PIN ਦੀ ਲੰਬਾਈ ਗਲਤ ਹੈ [7-10]"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit ਲਾਗਇਨ ਨਾਂ"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "ਆਮ ਨਾਂ"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5999,10 +6027,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "ਗਲਤ ਦੇਸ਼ ਚੁਣਿਆ। ਫੇਰ ਕੋਸ਼ਿਸ਼ ਕਰੋ ਜੀ।"
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "ਯੂਜ਼ਰ-ਨਾਂ ਰਜਿਸਟਰ ਨਹੀਂ ਹੈ। ਪਹਿਲਾਂ ਰਜਿਸਟਰ ਕਰੋ ਜੀ।"
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "ਯੂਜ਼ਰ-ਨਾਂ ਪਹਿਲਾਂ ਹੀ ਰਜਿਸਟਰ ਹੈ। ਵੱਖਰਾ ਯੂਜ਼ਰ ਨਾਂ ਚੁਣੋ ਜੀ।"
 
 msgid "Internal error. Please try again later."
@@ -6048,8 +6078,9 @@
 msgid "Hidden Number"
 msgstr "ਨੰਬਰ ਓਹਲੇ"
 
-msgid "Your Mobile Number..."
-msgstr "ਤੁਹਾਡਾ ਮੋਬਾਇਲ ਨੰਬਰ..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6076,6 +6107,15 @@
 msgid "_Room Name:"
 msgstr "ਰੂਮ(_R):"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "ਤੁਹਾਨੂੰ ਮੇਲ ਆਈ ਹੈ!"
+
+#, fuzzy
+msgid "Last Online"
+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 ਨਾਲ ਕੁਨੈਕਸ਼ਨ ਗੁਆ ਲਿਆ ਹੈ। ਫੇਰ ਕੁਨੈਕਟ ਕਰੋ ਜੀ।"
@@ -7829,11 +7869,11 @@
 msgid "Invalid SNAC"
 msgstr "ਗਲਤ SNAC"
 
-msgid "Rate to host"
-msgstr "ਹੋਸਟ ਦੀ ਦਰ"
-
-msgid "Rate to client"
-msgstr "ਕਲਾਇਟ ਦੀ ਦਰ"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "ਸਰਵਿਸ ਉਪਲੱਬਧ ਨਹੀਂ"
@@ -10069,7 +10109,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "ਕਨਫਰੰਸ ਅਤੇ ਚੈਟ-ਰੂਮ ਸੱਦੇ ਅਣਡਿੱਠੇ ਕਰੋ"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL ਕੁਨੈਕਸ਼ਨਾਂ ਲਈ ਅਕਾਊਂਟ ਪਰਾਕਸੀ ਵਰਤੋਂ"
 
 msgid "Chat room list URL"
@@ -12907,11 +12948,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "ਬੰਦ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ, ਕਿਉਂਕਿ ਇੱਕ ਹੋਰ libpurple ਕਲਾਇਟ ਪਹਿਲਾਂ ਹੀ ਚੱਲ ਰਿਹਾ ਹੈ।\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/ਮੀਡਿਆ(_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/ਮੀਡਿਆ/ਹੈਂਗਅੱਪ(_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "ਹੈਂਡ ਅੱਪ"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13719,10 +13762,6 @@
 msgid "Custom Smiley Manager"
 msgstr "ਪਸੰਦੀਦਾ ਸਮਾਈਲੀ ਮੈਨੇਜਰ"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "ਐਕਟੀਵੇਸ਼ਨ ਲੋੜੀਦੀ"
-
 msgid "Select Buddy Icon"
 msgstr "ਬੱਡੀ ਆਈਕਾਨ ਚੁਣੋ"
 
@@ -15174,6 +15213,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "ਸਰਟੀਫਿਕੇਟ ਢੁੱਕਵਾਂ ਨਹੀਂ ਹੈ।"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "ਤੁਹਾਡੇ ਵਲੋਂ ਦਿੱਤਾ ਨਾਂ ਗਲਤ ਹੈ।"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit ਲਾਗਇਨ ਨਾਂ"
+
+#~ msgid "Nick Name"
+#~ msgstr "ਆਮ ਨਾਂ"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "ਤੁਹਾਡਾ ਮੋਬਾਇਲ ਨੰਬਰ..."
+
+#~ msgid "Rate to host"
+#~ msgstr "ਹੋਸਟ ਦੀ ਦਰ"
+
+#~ msgid "Rate to client"
+#~ msgstr "ਕਲਾਇਟ ਦੀ ਦਰ"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/ਮੀਡਿਆ/ਹੈਂਗਅੱਪ(_H)"
+
 #~ msgid "Unknown reason."
 #~ msgstr "ਅਣਜਾਣ ਕਾਰਨ"
 
--- a/po/pl.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/pl.po	Sat Jul 31 23:42:35 2010 +0000
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin Polish translation\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
@@ -68,12 +68,24 @@
 msgid "Error"
 msgstr "Błąd"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Nie dodano konta"
+
 msgid "Account was not added"
 msgstr "Nie dodano konta"
 
 msgid "Username of an account must be non-empty."
 msgstr "Nazwa użytkownika konta nie może być pusta."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Powiadomienia o nowej poczcie"
 
@@ -1275,6 +1287,9 @@
 msgid "Someone says your username in chat"
 msgstr "Ktoś wymawia nazwę użytkownika na konferencji"
 
+msgid "Attention received"
+msgstr "odebrano uwagę"
+
 msgid "GStreamer Failure"
 msgstr "Niepowodzenie biblioteki GStreamer"
 
@@ -1568,7 +1583,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1688,8 +1703,10 @@
 "Certyfikat nie jest zaufany, ponieważ żaden certyfikat, który może go "
 "sprawdzić, nie jest obecnie zaufany."
 
-msgid "The certificate is not valid yet."
-msgstr "Certyfikat nie jest jeszcze prawidłowy."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Certyfikat wygasł i nie powinien już być uważany za prawidłowy."
@@ -3855,6 +3872,20 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Serwer uważa, że uwierzytelnienie zostało ukończone, a klient nie"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Serwer wymaga uwierzytelnienia w zwykłym tekście za pośrednictwem "
+"niezaszyfrowanego strumienia"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s wymaga uwierzytelnienia w zwykłym tekście za pośrednictwem "
+"niezaszyfrowanego strumienia. Pozwolić i kontynuować uwierzytelnianie?"
+
 msgid "SASL authentication failed"
 msgstr "Uwierzytelnienie SASL się nie powiodło"
 
@@ -5964,7 +5995,8 @@
 msgstr ""
 "Nie pobrano jeszcze informacji o profilu. Proszę spróbować ponownie później."
 
-msgid "Your MXitId"
+#, fuzzy
+msgid "Your UID"
 msgstr "MXitId użytkownika"
 
 #. pin
@@ -5976,6 +6008,7 @@
 msgstr "Sprawdź kod PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Wyświetl nazwę"
 
@@ -6035,19 +6068,16 @@
 msgid "Connecting..."
 msgstr "Łączenie..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Podany pseudonim jest nieprawidłowy."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Podana nazwa jest nieprawidłowa."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Podany kod PIN ma nieprawidłową długość [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Login MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Pseudonim"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6078,11 +6108,13 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Wybrano nieprawidłowy kraj. Proszę spróbować ponownie."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 "Nie zarejestrowano nazwy użytkownika. Proszę najpierw się zarejestrować."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Nazwa użytkownika jest już zarejestrowana. Proszę wybrać inną nazwę."
 
 msgid "Internal error. Please try again later."
@@ -6127,8 +6159,9 @@
 msgid "Hidden Number"
 msgstr "Ukryty numer"
 
-msgid "Your Mobile Number..."
-msgstr "Numer telefonu komórkowego..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "MXitId użytkownika"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6154,6 +6187,15 @@
 msgid "_Room Name:"
 msgstr "_Pokój:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Nowa wiadomość."
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. 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."
@@ -7949,13 +7991,11 @@
 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"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 #, fuzzy
 msgid "Service unavailable"
@@ -10230,7 +10270,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorowanie zaproszeń do konferencji"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Użycie pośrednika konta dla połączeń SSL"
 
 msgid "Chat room list URL"
@@ -13106,11 +13147,13 @@
 "Kończenie pracy, ponieważ inny klient biblioteki libpurple jest już "
 "uruchomiony.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Multimedia"
 
-msgid "/Media/_Hangup"
-msgstr "/Multimedia/_Rozłącz się"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Rozłącz się"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13913,9 +13956,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Menadżer własnych emotikon"
 
-msgid "Attention received"
-msgstr "odebrano uwagę"
-
 msgid "Select Buddy Icon"
 msgstr "Wybór ikony znajomego"
 
@@ -15330,8 +15370,8 @@
 "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/ ."
+"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
@@ -15419,3 +15459,29 @@
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Brak uprawnień do odinstalowania tego programu."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Certyfikat nie jest jeszcze prawidłowy."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Podany pseudonim jest nieprawidłowy."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Login MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Pseudonim"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Numer telefonu komórkowego..."
+
+#, fuzzy
+#~ msgid "Rate to host"
+#~ msgstr "Zaproś do konferencji"
+
+#, fuzzy
+#~ msgid "Rate to client"
+#~ msgstr "Ostatni znany klient"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Multimedia/_Rozłącz się"
--- a/po/ps.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ps.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.0beta6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2007-03-14 13:08+0500\n"
 "Last-Translator: Kashif Masood <masudmails@yahoo.com>\n"
 "Language-Team: Pashto\n"
@@ -51,12 +51,24 @@
 msgid "Error"
 msgstr "خطا"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "شمېرل زیات نه شو"
+
 msgid "Account was not added"
 msgstr "شمېرل زیات نه شو"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "د نوی برېشناليک خبرتيا"
 
@@ -1259,6 +1271,10 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "کره کول ناکام شو"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1544,7 +1560,7 @@
 msgid "Online"
 msgstr "په ليکه"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ليکه نه لرې"
 
@@ -1664,7 +1680,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3702,6 +3720,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "کره کول ناکام شو"
@@ -5843,7 +5870,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5856,6 +5883,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "لومړی نوم"
@@ -5925,20 +5953,15 @@
 msgid "Connecting..."
 msgstr "رابطه"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "کمکی نوم"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5967,10 +5990,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -6025,8 +6048,8 @@
 msgstr "د کور تلفون شمېره مقررول..."
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "د ګرځنده پون شمېره مقررول..."
+msgid "Your MXit ID..."
+msgstr "د یاهو هویت"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6053,6 +6076,15 @@
 msgid "_Room Name:"
 msgstr "کوټه:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "تا ته برېښناليک راغلي دي!"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -7768,10 +7800,10 @@
 msgid "Invalid SNAC"
 msgstr ""
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10011,7 +10043,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12870,10 +12902,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13716,10 +13748,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "کره کول ناکام شو"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "ملګری خواښ که"
 
@@ -15188,6 +15216,14 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "کمکی نوم"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "د ګرځنده پون شمېره مقررول..."
+
+#, fuzzy
 #~ msgid "Artist"
 #~ msgstr "حمل"
 
--- a/po/pt.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/pt.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2005-03-14 17:23+0000\n"
 "Last-Translator: Duarte Henriques <duarte.henriques@gmail.com>\n"
 "Language-Team: \n"
@@ -61,12 +61,24 @@
 msgstr "Erro"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "A conta foi desactivada"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "A conta foi desactivada"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Novas notificações de email"
 
@@ -1347,6 +1359,10 @@
 msgid "Someone says your username in chat"
 msgstr "Alguém diz o seu nome no chat"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registar Obrigatório"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1665,7 +1681,7 @@
 msgid "Online"
 msgstr "Ligado"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desligado"
 
@@ -1788,9 +1804,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "O nome de utilizador especificado é inválido."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3956,6 +3973,20 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"O Servidor requer autenticação em texto simples sobre uma ligação que não "
+"seja encriptada"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"O Servidor requer autenticação em texto simples sobre uma ligação que não é "
+"encriptada. Permitir isto e continuar autenticação?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Autenticação falhada"
 
@@ -6246,7 +6277,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6259,6 +6290,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Apelido"
@@ -6333,7 +6365,7 @@
 msgstr "Ligando"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "A chave SecurID inserida é inválida."
 
 #, fuzzy
@@ -6341,13 +6373,8 @@
 msgstr "A chave SecurID inserida é inválida."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nome remoto"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6377,10 +6404,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6437,8 +6464,8 @@
 msgstr "Nome do meio"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Definir Número de Telemóvel..."
+msgid "Your MXit ID..."
+msgstr "ID do Yahoo!"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6466,6 +6493,15 @@
 msgid "_Room Name:"
 msgstr "_Sala:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Foi expulso por %s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Ligado"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -8320,11 +8356,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-msgid "Rate to host"
-msgstr "Taxa para host"
-
-msgid "Rate to client"
-msgstr "Taxa para cliente"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Serviço indisponível"
@@ -10725,7 +10761,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para conferências e salas de chat"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13760,10 +13796,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14645,10 +14681,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Registar Obrigatório"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Escolher Contacto"
 
@@ -16242,6 +16274,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Não tem permissão para desinstalar este programa."
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "O nome de utilizador especificado é inválido."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "A chave SecurID inserida é inválida."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nome remoto"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Definir Número de Telemóvel..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Taxa para host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Taxa para cliente"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Razão desconhecida."
 
--- a/po/pt_BR.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/pt_BR.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2009-08-29 14:35-0300\n"
 "Last-Translator: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
 "Language-Team: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
@@ -61,12 +61,24 @@
 msgid "Error"
 msgstr "Erro"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "A conta não foi adicionada"
+
 msgid "Account was not added"
 msgstr "A conta não foi adicionada"
 
 msgid "Username of an account must be non-empty."
 msgstr "O nome de usuário de uma conta não pode ser vazio."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Notificar ao receber novos emails"
 
@@ -1262,6 +1274,10 @@
 msgid "Someone says your username in chat"
 msgstr "Alguém diz seu nome num bate-papo"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Ativação necessária"
+
 msgid "GStreamer Failure"
 msgstr "Falha no GStreamer"
 
@@ -1557,7 +1573,7 @@
 msgid "Online"
 msgstr "Conectado"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Desconectado"
 
@@ -1677,8 +1693,10 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
-msgstr "O certificado ainda não é válido."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "O certificado expirou e não deve ser considerado válido."
@@ -3851,6 +3869,19 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"O servidor requer autenticação em texto puro sobre um fluxo não-criptografado"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s requer autenticação via texto puro sobre uma conexão não criptografada. "
+"Deseja permitir isso e continuar a autenticação?"
+
 msgid "SASL authentication failed"
 msgstr "Autenticação SASL mal sucedida"
 
@@ -6034,7 +6065,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6047,6 +6078,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Sobrenome"
@@ -6120,7 +6152,7 @@
 msgstr "Conectando"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "A chave SecurID digitada é inválida"
 
 #, fuzzy
@@ -6128,13 +6160,8 @@
 msgstr "A chave SecurID digitada é inválida"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Apelido"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6164,10 +6191,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6224,8 +6251,8 @@
 msgstr "Nome do meio"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Definir número de telefone móvel..."
+msgid "Your MXit ID..."
+msgstr "ID do Yahoo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6253,6 +6280,15 @@
 msgid "_Room Name:"
 msgstr "Sa_la:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Você tem email!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Conectado"
+
 #. 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 ""
@@ -8074,11 +8110,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC inválido"
 
-msgid "Rate to host"
-msgstr "Taxa para host"
-
-msgid "Rate to client"
-msgstr "Taxa para cliente"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Serviço indisponível"
@@ -10347,7 +10383,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar convites para bate-papos e conferências"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Use proxy da conta para conexões SSL"
 
 msgid "Chat room list URL"
@@ -13239,11 +13276,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Saindo porque outro cliente libpurple já está sendo executado.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Mídia"
 
-msgid "/Media/_Hangup"
-msgstr "/Mídia/Colocar no gancho"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Colocar no gancho"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14073,10 +14112,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Gerenciador de emoticons personalizados"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Ativação necessária"
-
 msgid "Select Buddy Icon"
 msgstr "Selecionar Ícone do amigo"
 
@@ -15583,6 +15618,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Você não tem permissão para desinstalar essa aplicação."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "O certificado ainda não é válido."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "A chave SecurID digitada é inválida"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Apelido"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Definir número de telefone móvel..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Taxa para host"
+
+#~ msgid "Rate to client"
+#~ msgstr "Taxa para cliente"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Mídia/Colocar no gancho"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Motivo desconhecido."
 
--- a/po/ro.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ro.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: pidgin-2.7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-05-11 00:25+0300\n"
 "Last-Translator: Mișu Moldovan <dumol@gnome.org>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -62,12 +62,24 @@
 msgid "Error"
 msgstr "Eroare"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Contul nu a fost adăugat"
+
 msgid "Account was not added"
 msgstr "Contul nu a fost adăugat"
 
 msgid "Username of an account must be non-empty."
 msgstr "Numele de utilizator al unui cont nu poate fi gol."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Notificare la mail nou"
 
@@ -1265,6 +1277,9 @@
 msgid "Someone says your username in chat"
 msgstr "Cineva v-a scris numele de utilizator într-un chat"
 
+msgid "Attention received"
+msgstr "S-a primit o atenționare"
+
 msgid "GStreamer Failure"
 msgstr "Eroare GStreamer"
 
@@ -1559,7 +1574,7 @@
 msgid "Online"
 msgstr "Online"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Offline"
 
@@ -1678,8 +1693,10 @@
 "Certificatul nu este de încredere pentru nu există un certificat de "
 "încredere cu care să poată fi verificat."
 
-msgid "The certificate is not valid yet."
-msgstr "Certificatul nu este încă valid."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Certificatul a expirat și nu ar trebui considerat valid."
@@ -3838,6 +3855,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Serverul consideră autentificarea completă, dar clientul nu"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Serverul necesită autentificare în clar printr-o conexiune necriptată"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s necesită autentificare în clar printr-o conexiune necriptată. Permiteți "
+"autentificarea în aceste condiții?"
+
 msgid "SASL authentication failed"
 msgstr "Autentificare SASL eșuată"
 
@@ -5941,7 +5970,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5954,6 +5983,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Nume de familie"
@@ -6027,21 +6057,16 @@
 msgstr "Autentificare"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "Cheia SecurID introdusă este nevalidă."
+msgid "The Display Name you entered is invalid."
+msgstr "Numele introdus este nevalid."
 
 #, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Cheia SecurID introdusă este nevalidă."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Pseudonim"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6071,10 +6096,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6131,8 +6156,8 @@
 msgstr "Inițială"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Introducere număr telefon mobil..."
+msgid "Your MXit ID..."
+msgstr "Identitate Yahoo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6160,6 +6185,15 @@
 msgid "_Room Name:"
 msgstr "Ca_meră:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Aveți mail nou!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Online"
+
 #. 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 ""
@@ -7970,11 +8004,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC nevalid"
 
-msgid "Rate to host"
-msgstr "Limitare către server"
-
-msgid "Rate to client"
-msgstr "Limitare către client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Serviciu indisponibil"
@@ -10245,7 +10279,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoră invitațiile la conferințe și chat"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Utilizează proxy-ul contului pentru conexiuni SSL"
 
 msgid "Chat room list URL"
@@ -13129,11 +13164,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Se iese pentru că un alt client libpurple este deja pornit.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/Înc_hide"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Închide"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13935,9 +13972,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Administrator de iconițe personalizate"
 
-msgid "Attention received"
-msgstr "S-a primit o atenționare"
-
 msgid "Select Buddy Icon"
 msgstr "Selectare iconiță contact"
 
@@ -15416,6 +15450,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Nu aveţi drepturile de acces necesare dezinstalării acestei aplicaţii."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Certificatul nu este încă valid."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Cheia SecurID introdusă este nevalidă."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Pseudonim"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Introducere număr telefon mobil..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Limitare către server"
+
+#~ msgid "Rate to client"
+#~ msgstr "Limitare către client"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/Înc_hide"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Motiv necunoscut."
 
--- a/po/ru.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ru.po	Sat Jul 31 23:42:35 2010 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 02:16-0400\n"
 "PO-Revision-Date: 2008-05-14 15:00+0400\n"
 "Last-Translator: Антон Самохвалов <samant.ua@mail.ru>\n"
 "Language-Team: \n"
@@ -64,12 +64,25 @@
 msgid "Error"
 msgstr "Ошибка"
 
+msgid "Account was not modified"
+msgstr "Учётная запись не была изменена"
+
 msgid "Account was not added"
 msgstr "Учётная запись не была добавлена"
 
 msgid "Username of an account must be non-empty."
 msgstr "Имя учётной записи должно быть непустым."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "Протокол учётной записи нельзя изменить, пока вы соединены с сервером."
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+"Имя пользователя учётной записи нельзя изменить, пока вы соединены с "
+"сервером."
+
 msgid "New mail notifications"
 msgstr "Уведомления о новой почте"
 
@@ -1265,6 +1278,10 @@
 msgid "Someone says your username in chat"
 msgstr "Кто-то произносит ваше имя пользователя в чате"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Требуется активация"
+
 msgid "GStreamer Failure"
 msgstr "Ошибка GStreamer"
 
@@ -1558,7 +1575,7 @@
 msgid "Online"
 msgstr "В сети"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Не в сети"
 
@@ -1679,8 +1696,12 @@
 "Сертификат не является доверенным, потому что сейчас нет других доверенных "
 "сертификатов, которые могли бы подтвердить этот"
 
-msgid "The certificate is not valid yet."
-msgstr "Сертификат ещё не заверен."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
+"Сертификат ещё не подтверждён.  Проверьте правильность даты и времени на "
+"вашем компьютере."
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3841,6 +3862,19 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Сервер думает, что аутентификация завершена, но клиент так не считает"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Сервер требует аутентификацию простым текстом через нешифрованный поток"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s требует аутентификацию простым текстом через нешифрованное соединение. "
+"Позволить это и продолжить аутентификацию?"
+
 msgid "SASL authentication failed"
 msgstr "Аутентификация SASL провалилась"
 
@@ -3848,18 +3882,16 @@
 msgid "SASL error: %s"
 msgstr "Ошибка SASL: %s"
 
-#, fuzzy
 msgid "Invalid Encoding"
-msgstr "Неверное состояние ввода"
-
-#, fuzzy
+msgstr "Неверная кодировка"
+
 msgid "Unsupported Extension"
-msgstr "Неподдерживаемая версия"
+msgstr "Неподдерживаемое расширение"
 
 msgid ""
 "Unexpected response from the server.  This may indicate a possible MITM "
 "attack"
-msgstr ""
+msgstr "Неожиданный ответ от сервера.  Это может говорить об MITM атаке"
 
 msgid ""
 "The server does support channel binding, but did not appear to advertise "
@@ -4575,32 +4607,32 @@
 
 #, c-format
 msgid "Unable to buzz, because there is nothing known about %s."
-msgstr "Не могу сплетничать, потому что про %s ничего неизвестно."
-
-#, fuzzy, c-format
+msgstr "Не могу позвать, потому что про %s ничего неизвестно."
+
+#, c-format
 msgid "Unable to buzz, because %s might be offline."
-msgstr "Не могу сплетничать, потому что %s, возможно, не в сети."
-
-#, fuzzy, c-format
+msgstr "Не могу позвать, потому что %s может быть не в сети."
+
+#, c-format
 msgid ""
 "Unable to buzz, because %s does not support it or does not wish to receive "
 "buzzes now."
 msgstr ""
-"Не могу сплетничать, потому что %s не поддерживает это или не желает сейчас "
-"сплетничать."
+"Не могу позвать, потому что %s не поддерживает это или не желает сейчас "
+"принимать вызовы."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
 msgid "Buzz"
-msgstr "Сплетни"
+msgstr "Звать"
 
 #, c-format
 msgid "%s has buzzed you!"
-msgstr "%s натрепал про вас!"
+msgstr "%s позвал вас!"
 
 #, c-format
 msgid "Buzzing %s..."
-msgstr "Треплю про %s..."
+msgstr "Зову %s..."
 
 #, c-format
 msgid "Unable to initiate media with %s: invalid JID"
@@ -4770,18 +4802,17 @@
 msgid "(Code %s)"
 msgstr "(Код %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "Не удаётся отправить сообщение: Сообщение слишком велико."
+msgstr "Ваш смайлик в сообщении очень большой для отправки."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "Пропущен заголовок потока XMPP"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "Несовпадение версии XMPP"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "ID пропуска потока XMPP"
 
 msgid "XML Parse error"
 msgstr "Ошибка разбора XML"
@@ -4971,74 +5002,62 @@
 msgid "Excited"
 msgstr "Возбуждённый"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "Великолепный"
-
-#, fuzzy
+msgstr "Кокетливый"
+
 msgid "Frustrated"
-msgstr "Имя"
+msgstr "Разочарованный"
 
 msgid "Grateful"
-msgstr ""
-
-#, fuzzy
+msgstr "Признательный"
+
 msgid "Grieving"
-msgstr "Загрузка..."
-
-#, fuzzy
+msgstr "Скорбящий"
+
 msgid "Grumpy"
-msgstr "Группа"
-
-#, fuzzy
+msgstr "Сварливый"
+
 msgid "Guilty"
-msgstr "Город"
+msgstr "Повинный"
 
 msgid "Happy"
 msgstr "Счастливый"
 
 msgid "Hopeful"
-msgstr ""
-
-#, fuzzy
+msgstr "Надеящийся"
+
 msgid "Hot"
-msgstr "_Узел:"
+msgstr "Горячий"
 
 msgid "Humbled"
-msgstr ""
+msgstr "Приниженный"
 
 msgid "Humiliated"
-msgstr ""
-
-#, fuzzy
+msgstr "Униженный"
+
 msgid "Hungry"
-msgstr "Рассерженный"
-
-#, fuzzy
+msgstr "Голодный"
+
 msgid "Hurt"
-msgstr "Юмор"
+msgstr "Раненый"
 
 msgid "Impressed"
-msgstr ""
-
-#, fuzzy
+msgstr "Впечатлённый"
+
 msgid "In awe"
-msgstr "Влюблённый"
+msgstr "В страхе"
 
 msgid "In love"
 msgstr "Влюблённый"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "Индонезийский"
-
-#, fuzzy
+msgstr "Возмущённый"
+
 msgid "Interested"
-msgstr "Интересы"
-
-#, fuzzy
+msgstr "Интересующийся"
+
 msgid "Intoxicated"
-msgstr "Приглашено"
+msgstr "Пьяный"
 
 msgid "Invincible"
 msgstr "Непобедимый"
@@ -5046,85 +5065,69 @@
 msgid "Jealous"
 msgstr "Ревнующий"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Обезьяна"
-
-#, fuzzy
+msgstr "Одинокий"
+
 msgid "Lost"
-msgstr "Очень громко"
+msgstr "Потерянный"
 
 msgid "Lucky"
-msgstr ""
-
-#, fuzzy
+msgstr "Удачливый"
+
 msgid "Mean"
-msgstr "Немецкий"
-
-#, fuzzy
+msgstr "Скромный"
+
 msgid "Moody"
-msgstr "Настроение"
+msgstr "Угрюмый"
 
 msgid "Nervous"
-msgstr ""
-
-#, fuzzy
+msgstr "Нервный"
+
 msgid "Neutral"
-msgstr "Подробности"
-
-#, fuzzy
+msgstr "Нейтральный"
+
 msgid "Offended"
-msgstr "Не в сети"
+msgstr "Обиженный"
 
 msgid "Outraged"
-msgstr ""
-
-#, fuzzy
+msgstr "Возмущённый"
+
 msgid "Playful"
-msgstr "Воспроизводить"
-
-#, fuzzy
+msgstr "Игривый"
+
 msgid "Proud"
-msgstr "Выше среднего"
-
-#, fuzzy
+msgstr "Гордый"
+
 msgid "Relaxed"
-msgstr "Настоящее имя"
-
-#, fuzzy
+msgstr "Расслабленный"
+
 msgid "Relieved"
-msgstr "Получено"
-
-#, fuzzy
+msgstr "Облегчённый"
+
 msgid "Remorseful"
-msgstr "Удалить"
-
-#, fuzzy
+msgstr "Угрызаемый совестью"
+
 msgid "Restless"
-msgstr "Зарегистрировать"
+msgstr "Беспокойный"
 
 msgid "Sad"
 msgstr "Печальный"
 
-#, fuzzy
 msgid "Sarcastic"
-msgstr "Маратхи"
+msgstr "Саркастический"
 
 msgid "Satisfied"
-msgstr ""
-
-#, fuzzy
+msgstr "Удовлетворённый"
+
 msgid "Serious"
-msgstr "Великолепный"
-
-#, fuzzy
+msgstr "Серьёзный"
+
 msgid "Shocked"
-msgstr "Заблокирован"
+msgstr "Шокированный"
 
 msgid "Shy"
-msgstr ""
-
-#, fuzzy
+msgstr "Застенчивый"
+
 msgid "Sick"
 msgstr "Больной"
 
@@ -5133,47 +5136,40 @@
 msgstr "Сонный"
 
 msgid "Spontaneous"
-msgstr ""
-
-#, fuzzy
+msgstr "Спонтанный"
+
 msgid "Stressed"
-msgstr "Успешно:"
-
-#, fuzzy
+msgstr "В стрессе"
+
 msgid "Strong"
-msgstr "Песня"
+msgstr "Сильный"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Удивлённый"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Благодарный"
 
 msgid "Thirsty"
-msgstr ""
-
-#, fuzzy
+msgstr "Жаждущий"
+
 msgid "Tired"
-msgstr "Fire"
-
-#, fuzzy
+msgstr "Усталый"
+
 msgid "Undefined"
-msgstr "Подчёркнутый"
-
-#, fuzzy
+msgstr "Неопределённый"
+
 msgid "Weak"
-msgstr "Тюкнуть по бошке"
-
-#, fuzzy
+msgstr "Слабый"
+
 msgid "Worried"
-msgstr "Скучающий"
+msgstr "Волнующийся"
 
 msgid "Set User Nickname"
 msgstr "Установить псевдоним пользователя"
 
-#, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Введите новое имя для %s"
+msgstr "Пожалуйста, укажите для себя новый псевдоним."
 
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
@@ -5422,14 +5418,14 @@
 "%s послал голосовую запись. <a href='audio://%s'>Щёлкните здесь для "
 "воспроизведения</a>"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s sent a voice clip, but it could not be saved"
-msgstr "%s послал вам голосовую запись, но его нельзя сохранить"
-
-#, fuzzy, c-format
+msgstr "%s послал вам голосовую запись, но её не удалось сохранить"
+
+#, c-format
 msgid "%s sent you a voice chat invite, which is not yet supported."
 msgstr ""
-"%s прислал вам приглашение к голосовому общению, что ещё не поддерживается."
+"%s послал вам приглашение к голосовому общению, что ещё не поддерживается."
 
 msgid "Nudge"
 msgstr "Подтолкнуть"
@@ -5442,14 +5438,13 @@
 msgid "Nudging %s..."
 msgstr "Подталкивание %s..."
 
-#, fuzzy
 msgid "Email Address..."
 msgstr "Адрес эл.почты..."
 
 msgid "Your new MSN friendly name is too long."
 msgstr "Ваше новое дружеское имя MSN слишком велико."
 
-#, fuzzy, c-format
+#, c-format
 msgid "Set friendly name for %s."
 msgstr "Установите дружеское имя для %s."
 
@@ -5535,7 +5530,6 @@
 msgid "Out to Lunch"
 msgstr "Пошёл перекусить"
 
-#, fuzzy
 msgid "Game Title"
 msgstr "Название игры"
 
@@ -5573,12 +5567,12 @@
 msgstr ""
 "Поддержка SSL необходима для MSN. Установите поддерживаемую библиотеку SSL."
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to add the buddy %s because the username is invalid.  Usernames must "
 "be valid email addresses."
 msgstr ""
-"Не могу добавить собеседника %s, потому что имя пользователя некорректрое.  "
+"Не могу добавить собеседника %s, потому что имя пользователя некорректное.  "
 "Имена пользователей должны быть действительными адресами эл.почты."
 
 msgid "Unable to Add"
@@ -6020,7 +6014,7 @@
 msgstr ""
 "Информация о вашем профиле ещё не получена. Пожалуйста, попробуйте позже."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6032,6 +6026,7 @@
 msgstr "Проверьте PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Показать имя"
 
@@ -6094,20 +6089,16 @@
 msgstr "Соединение..."
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
-msgstr "Введённый вами псевдоним некорректен."
+msgid "The Display Name you entered is invalid."
+msgstr "Введённое имя неправильное."
 
 #, fuzzy
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Введённый ключ SecurID неверный."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Имя входа MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Псевдоним"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6136,11 +6127,13 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Выбрана неправильная страна. Пожалуйста, попробуйте ещё раз."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 "Имя пользователя не зарегистрировано. Пожалуйста, сначала зарегистрируйтесь."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "Имя пользователя уже зарегистрировано. Пожалуйста, выберите другое имя."
 
@@ -6187,8 +6180,9 @@
 msgid "Hidden Number"
 msgstr "Скрытый номер"
 
-msgid "Your Mobile Number..."
-msgstr "Номер мобильного телефона..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6214,6 +6208,15 @@
 msgid "_Room Name:"
 msgstr "_Комната:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Вам пришла почта!"
+
+#, fuzzy
+msgid "Last Online"
+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. Пожалуйста, пересоединитесь."
@@ -6993,13 +6996,15 @@
 "Server requested that you fill out a CAPTCHA in order to sign in, but this "
 "client does not currently support CAPTCHAs."
 msgstr ""
+"Сервер запросил заполнить код CAPTCHA для того, чтобы войти, но этот клиент "
+"на данный момент не поддерживает коды CAPTCHA."
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL не позволяет вашему экранному имени аутентифицироваться здесь"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s"
-msgstr "Ошибка запроса %s: %s"
+msgstr "Ошибка запроса %s"
 
 msgid "Could not join chat room"
 msgstr "Не удалось присоединиться к комнате чата"
@@ -7008,7 +7013,7 @@
 msgstr "Неверное имя комнаты чата"
 
 msgid "Invalid error"
-msgstr "Недопустимая ошибка"
+msgstr "Неверная ошибка"
 
 msgid "Cannot receive IM due to parental controls"
 msgstr "Не могу принять сообщение из-за родительского контроля"
@@ -7253,7 +7258,7 @@
 msgstr "Игры"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Дополнения"
@@ -8031,11 +8036,11 @@
 msgid "Invalid SNAC"
 msgstr "Неверный SNAC"
 
-msgid "Rate to host"
-msgstr "Оценить узел"
-
-msgid "Rate to client"
-msgstr "Оценить клиент"
+msgid "Server rate limit exceeded"
+msgstr "Превышен предел скорости сервера"
+
+msgid "Client rate limit exceeded"
+msgstr "Превышен предел скорости клиента"
 
 msgid "Service unavailable"
 msgstr "Служба недоступна"
@@ -10377,7 +10382,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Игнорировать приглашения в конференции и чаты"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Используйте прокси учётной записи для SSL-соединений"
 
 msgid "Chat room list URL"
@@ -10533,28 +10539,24 @@
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Слышимый %s/%s/%s.swf ] %s"
 
-#, fuzzy
 msgid "Received unexpected HTTP response from server"
-msgstr "Получен непредвиденный HTTP-ответ от сервера"
-
-#, fuzzy, c-format
+msgstr "Получен неожиданный HTTP ответ от сервера"
+
+#, c-format
 msgid "Lost connection with %s: %s"
 msgstr "Соединение с %s потеряно: %s"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Не удаётся установить соединение с %s: %s"
 
-#, fuzzy
 msgid "Unable to connect: The server returned an empty response."
-msgstr ""
-"Не удаётся соединиться с сервером MXit. Пожалуйста, проверьте ваши настройки "
-"сервера."
+msgstr "Не удаётся соединиться: сервер вернул пустой ответ."
 
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
 "information"
-msgstr ""
+msgstr "Не удаётся соединиться: в ответе сервера нет нужной информации"
 
 msgid "Not at Home"
 msgstr "Не дома"
@@ -12050,7 +12052,7 @@
 msgstr "/Беседа/Отправить _файл..."
 
 msgid "/Conversation/Get _Attention"
-msgstr "/Беседа/Обрести _внимание"
+msgstr "/Беседа/Привлечь _внимание"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Беседа/Добавить п_равило..."
@@ -12133,9 +12135,8 @@
 msgid "/Conversation/Send File..."
 msgstr "/Беседа/Отправить файл..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/Беседа/Получить информацию"
+msgstr "/Беседа/Привлечь внимание"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Беседа/Добавить правило..."
@@ -13162,7 +13163,7 @@
 msgstr "_Смайлик!"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "_Внимание!"
 
 msgid "Log Deletion Failed"
 msgstr "Удаление журнала не удалось"
@@ -13293,11 +13294,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Выхожу, потому что уже запущен другой клиент libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Медиа"
 
-msgid "/Media/_Hangup"
-msgstr "/Медиа/_Повесить трубку"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Приостановить разговор"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14102,10 +14105,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Управление своими смайликами"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Требуется активация"
-
 msgid "Select Buddy Icon"
 msgstr "Выбрать иконку собеседника"
 
@@ -15327,22 +15326,18 @@
 msgid "Output"
 msgstr "Вывод"
 
-#, fuzzy
 msgid "_Plugin"
-msgstr "_Модули"
-
-#, fuzzy
+msgstr "_Модуль"
+
 msgid "_Device"
 msgstr "_Устройство"
 
 msgid "Input"
 msgstr "Ввод"
 
-#, fuzzy
 msgid "P_lugin"
-msgstr "М_одули"
-
-#, fuzzy
+msgstr "М_одуль"
+
 msgid "D_evice"
 msgstr "У_стройство"
 
@@ -15355,9 +15350,8 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#, fuzzy
 msgid "Voice/Video Settings"
-msgstr "Голосовые/видео настройки"
+msgstr "Голосовые/Видео настройки"
 
 #. *< name
 #. *< version
@@ -15444,7 +15438,7 @@
 
 #. XXX: Did this ever work?
 msgid "Only when docked"
-msgstr "Только тогда, когда закреплено"
+msgstr "Только когда закреплено"
 
 msgid "Windows Pidgin Options"
 msgstr "Параметры Pidgin для Windows"
@@ -15452,12 +15446,11 @@
 msgid "Options specific to Pidgin for Windows."
 msgstr "Параметры, специфичные для Pidgin для Windows."
 
-#, fuzzy
 msgid ""
 "Provides options specific to Pidgin for Windows, such as buddy list docking."
 msgstr ""
-"Параметры, специфичные для Pidgin для Windows, такие как закрепление списка "
-"собеседников."
+"Реализует особенности, специфичные для Pidgin в Windows, такие как "
+"прирепление списка собеседников."
 
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Вышел из сети.</font>"
@@ -15484,7 +15477,6 @@
 msgstr "Отправлять и получать прямые XMPP строфы."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Этот модуль полезен для отладки XMPP серверов или клиентов."
 
@@ -15493,7 +15485,7 @@
 "$(^Name) is released under the GNU General Public License (GPL). The license "
 "is provided here for information purposes only. $_CLICK"
 msgstr ""
-"$(^Name) выпущено под лицензией GPL. Лицензия приведена здесь для "
+"$(^Name) выпущен под лицензией GPL. Лицензия приведена здесь сугубо для "
 "ознакомительных целей. $_CLICK"
 
 #. Installer Subsection Detailed Description
@@ -15503,27 +15495,27 @@
 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 "Основная часть Pidgin и библиотеки."
+msgstr "Основные файлы Pidgin и библиотеки"
 
 #. 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 ""
@@ -15531,12 +15523,18 @@
 "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
@@ -15545,97 +15543,120 @@
 "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
-#, fuzzy
 msgid "GTK+ Runtime (required if not present)"
-msgstr "GTK+ окружение для запуска (необходимо)."
+msgstr "Среда GTK+ (необходима, если отсутствует)"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Localizations"
-msgstr "Местоположение"
+msgstr "Локализации"
 
 #. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
-msgstr "Следующее >"
+msgstr "Далее >"
 
 #. Installer Subsection Text
 msgid "Pidgin Instant Messaging Client (required)"
-msgstr ""
-"Pidgin - Клиент для мгновенного обмена сообщениями по различным протоколам "
-"(необходимо)."
+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 ""
+"Pidgin требует совместимой среды GTK+ (которая, по-видимому, не установлена)."
+"$\\rВы уверены, что хотите пропустить установку среды GTK+?"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Shortcuts"
-msgstr "Сочетание клавиш"
+msgstr "Ярлыки"
 
 #. Installer Subsection Detailed Description
 msgid "Shortcuts for starting Pidgin"
-msgstr ""
+msgstr "Ярлыки для запуска Pidgin"
 
 #. Installer Subsection Text
 msgid "Spellchecking Support"
-msgstr ""
+msgstr "Поддержка проверки орфографии"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Start Menu"
-msgstr "Загрузка"
+msgstr "Меню кнопки ''Пуск''"
 
 #. Installer Subsection Detailed Description
 msgid ""
 "Support for Spellchecking.  (Internet connection required for installation)"
 msgstr ""
+"Поддержка проверки орфографии.  (Для установки требуется Интернет-соединение)"
 
 msgid "The installer is already running."
-msgstr ""
+msgstr "Установщик уже запущен."
 
 msgid ""
 "The uninstaller could not find registry entries for Pidgin.$\\rIt is likely "
 "that another user installed this application."
 msgstr ""
-"Программа удаления не может найти данные Pidgin в регистре.$\\rВероятно это "
+"Программа удаления не может найти данные Pidgin в реестре.$\\Похоже, это "
 "приложение установил другой пользователь."
 
 #. Installer Subsection Text
 msgid "URI Handlers"
-msgstr ""
+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 ""
+"Не удается удалить текущую установленную версию Pidgin. Новая версия будет "
+"установлена без удаления текущей."
 
 #. Text displayed on Installer Finish Page
-#, fuzzy
 msgid "Visit the Pidgin Web Page"
-msgstr "Посетите веб-страницу Pidgin для пользователей Windows."
+msgstr "Посетите веб-страницу Pidgin"
 
 msgid "You do not have permission to uninstall this application."
 msgstr "У Вас нет прав на удаление этого приложения."
 
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Введённый вами псевдоним некорректен."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Имя входа MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Псевдоним"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Номер мобильного телефона..."
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Медиа/_Повесить трубку"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Сертификат ещё не заверен."
+
+#~ msgid "Rate to host"
+#~ msgstr "Оценить узел"
+
+#~ msgid "Rate to client"
+#~ msgstr "Оценить клиент"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Причина неизвестна."
 
-#, fuzzy
 #~ msgid "Require STARTTLS"
-#~ msgstr "Требовать SSL/TLS"
-
-#, fuzzy
+#~ msgstr "Требуется STARTTLS"
+
 #~ msgid "Require old (port 5223) SSL"
-#~ msgstr "Принудительно использовать старый (порт 5223) SSL"
-
-#, fuzzy
+#~ msgstr "Требуется старый (порт 5223) SSL"
+
 #~ msgid "SSL/TLS"
-#~ msgstr "Требовать SSL/TLS"
+#~ msgstr "SSL/TLS"
 
 #~ msgid "Current Mood"
 #~ msgstr "Настроение сейчас"
--- a/po/si.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/si.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: si\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2008-05-17 11:08+0530\n"
 "Last-Translator: Yajith Ajantha Dayarathna <yajith@gmail.com>\n"
 "Language-Team: Sinhala <sinhala@linux.lk>\n"
@@ -51,12 +51,24 @@
 msgid "Error"
 msgstr "දෝෂය"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ගිණුම එක් නොවුනි"
+
 msgid "Account was not added"
 msgstr "ගිණුම එක් නොවුනි"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "නව තැපැල් දැන්වීම"
 
@@ -1214,6 +1226,10 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "සත්‍යාපනය අසමත් විය"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1493,7 +1509,7 @@
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "නොබැඳි"
 
@@ -1613,7 +1629,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3630,6 +3648,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "සත්‍යාපනය අසමත් විය"
@@ -5718,7 +5745,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5731,6 +5758,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "පෙලපත් නාමය"
@@ -5795,20 +5823,15 @@
 msgid "Connecting..."
 msgstr "සම්බන්ධ (_o)"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "අනුර්ත නම"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -5837,10 +5860,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -5895,8 +5918,8 @@
 msgstr "ගෘහස්ථ දුරකථනය 2"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "ජංගම දුරකථනය"
+msgid "Your MXit ID..."
+msgstr "තෝරන්න..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5923,6 +5946,15 @@
 msgid "_Room Name:"
 msgstr "කාමරය (_R):"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "ඔබට තැපෑලක් ඇත!"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -7594,10 +7626,10 @@
 msgid "Invalid SNAC"
 msgstr ""
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -9821,7 +9853,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12608,10 +12640,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13439,10 +13471,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "සත්‍යාපනය අසමත් විය"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "මිතුරෙකු තෝරන්න"
 
@@ -14908,6 +14936,14 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "අනුර්ත නම"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "ජංගම දුරකථනය"
+
 #~ msgid "Artist"
 #~ msgstr "ශිල්පියා"
 
--- a/po/sk.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/sk.po	Sat Jul 31 23:42:35 2010 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.6.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-05-05 19:21+0100\n"
 "Last-Translator: loptosko <loptosko@gmail.com>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -64,12 +64,24 @@
 msgid "Error"
 msgstr "Chyba"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Účet sa nepridal do zoznamu"
+
 msgid "Account was not added"
 msgstr "Účet sa nepridal do zoznamu"
 
 msgid "Username of an account must be non-empty."
 msgstr "Používateľské meno účtu nesmie byť prázdne."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Upozornenia na novú poštu"
 
@@ -1261,6 +1273,9 @@
 msgid "Someone says your username in chat"
 msgstr "Niekto napísal vaše používateľské meno v chate"
 
+msgid "Attention received"
+msgstr "Bola prijatá pozornosť"
+
 msgid "GStreamer Failure"
 msgstr "Zlyhanie rozhrania GStreamer"
 
@@ -1550,7 +1565,7 @@
 msgid "Online"
 msgstr "Prihlásený"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Odhlásený"
 
@@ -1669,8 +1684,10 @@
 "Certifikát nie je dôverihodný, pretože žiadny z certifikátov, ktoré ho môžu "
 "overiť, momentálne nie je dôverihodný.  "
 
-msgid "The certificate is not valid yet."
-msgstr "Certifikát zatiaľ nie je platný."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Certifikát vypršal a nie je platný."
@@ -3804,6 +3821,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Server považuje autentizáciu za dokončenú, ale klient nie"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Server vyžaduje textovú autentifikáciu cez nezašifrovaný prúd"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s vyžaduje plaintextovú autentifikáciu cez nezašifrované pripojenie.  "
+"Chcete ju povoliť a pokračovať v autentifikácii?"
+
 msgid "SASL authentication failed"
 msgstr "SASL autentifikácia zlyhala"
 
@@ -5887,7 +5916,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Údaje z vášho profilu nie sú načítané. Prosím, skúste to znovu neskôr."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5899,6 +5928,7 @@
 msgstr "Overiť PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Používateľské meno"
 
@@ -5959,19 +5989,16 @@
 msgid "Connecting..."
 msgstr "Pripája sa..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Zadaná prezývka je neplatná."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Zadané meno je neplatné"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Zadaný PIN má neplatnú dĺžku [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit prihlasovacie meno"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Prezývka"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6001,11 +6028,13 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Vybraná chybná krajina. Prosím, skúste to znovu neskôr."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 "Používateľské meno nie je registrované. Prosím, najskôr sa zaregistrujte."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Používateľské meno už je registrované. Prosím, vyberte si iné."
 
 msgid "Internal error. Please try again later."
@@ -6051,8 +6080,9 @@
 msgid "Hidden Number"
 msgstr "Skryté číslo"
 
-msgid "Your Mobile Number..."
-msgstr "Vaše mobilné číslo..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6078,6 +6108,15 @@
 msgid "_Room Name:"
 msgstr "_Miestnosť:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Máte poštu!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Prihlásený"
+
 #. 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 "Stratili sme pripojenie na MXit. Prosím, pripojte sa znovu."
@@ -7853,11 +7892,11 @@
 msgid "Invalid SNAC"
 msgstr "Chybné SNAC"
 
-msgid "Rate to host"
-msgstr "Hodnotiť hostiteľa"
-
-msgid "Rate to client"
-msgstr "Hodnotiť klienta"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Služba nedostupná"
@@ -10118,7 +10157,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorovať pozvánky na konferencie a chatovacie miestnosti"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Používať proxy účtu pre SSL pripojenia"
 
 msgid "Chat room list URL"
@@ -12987,11 +13027,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Je spustený iný klient libpurple, ukončuje sa.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Médiá"
 
-msgid "/Media/_Hangup"
-msgstr "/Médiá/_Zložiť"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Zložiť"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13789,9 +13831,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Správca vlastných smajlíkov"
 
-msgid "Attention received"
-msgstr "Bola prijatá pozornosť"
-
 msgid "Select Buddy Icon"
 msgstr "Vybrať ikonu priateľa"
 
@@ -15267,6 +15306,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Nemáte oprávnenie na odinštaláciu tejto aplikácie."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Certifikát zatiaľ nie je platný."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Zadaná prezývka je neplatná."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit prihlasovacie meno"
+
+#~ msgid "Nick Name"
+#~ msgstr "Prezývka"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Vaše mobilné číslo..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Hodnotiť hostiteľa"
+
+#~ msgid "Rate to client"
+#~ msgstr "Hodnotiť klienta"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Médiá/_Zložiť"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Neznámy dôvod."
 
--- a/po/sl.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/sl.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
@@ -65,12 +65,24 @@
 msgid "Error"
 msgstr "Napaka"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Račun ni bil dodan"
+
 msgid "Account was not added"
 msgstr "Račun ni bil dodan"
 
 msgid "Username of an account must be non-empty."
 msgstr "Uporabniško ime računa ne sme biti prazno."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Obveščanje o prispeli pošti"
 
@@ -1269,6 +1281,9 @@
 msgid "Someone says your username in chat"
 msgstr "Nekdo omeni vaše uporabniško ime v klepetu"
 
+msgid "Attention received"
+msgstr "Pozornost prejeta"
+
 msgid "GStreamer Failure"
 msgstr "Napaka GStreamer"
 
@@ -1559,7 +1574,7 @@
 msgid "Online"
 msgstr "Prisoten"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Brez povezave"
 
@@ -1679,8 +1694,10 @@
 "Njihovo potrdilo ni zaupanja vredno, ker ni nobeno potrdilo, ki ga potrjuje, "
 "zaupanja vredno."
 
-msgid "The certificate is not valid yet."
-msgstr "Digitalno potrdilo še ni veljavno."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3853,6 +3870,19 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Strežnik meni, da je overovitev dokončana, odjemalec pa ne"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Strežnik zahteva overovitev z navadnim besedilom preko nešifriranega toka"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s zahteva overovitev z navadnim besedilom preko nešifrirane povezave. Se "
+"strinjate s tem in želite nadaljevati z overovitvijo?"
+
 msgid "SASL authentication failed"
 msgstr "Overovitev SASL ni uspela"
 
@@ -5950,7 +5980,8 @@
 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"
+#, fuzzy
+msgid "Your UID"
 msgstr "Vaš MXitId"
 
 #. pin
@@ -5962,6 +5993,7 @@
 msgstr "Preveri PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Pojavno ime"
 
@@ -6022,19 +6054,16 @@
 msgid "Connecting..."
 msgstr "Povezovanje ..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Vneseni vzdevek ni veljaven."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Vneseno ime ni veljavno."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Vneseni PIN ni veljavne dolžine [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Prijavno ime MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Vzdevek"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6063,10 +6092,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Izbrana neveljavna država. Poskusite znova kasneje."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Uporabniško ime ni registrirano. Najprej se registrirajte."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Uporabniško ime je že registrirano. Izberite drugo ime."
 
 msgid "Internal error. Please try again later."
@@ -6111,8 +6142,9 @@
 msgid "Hidden Number"
 msgstr "Skrita številka"
 
-msgid "Your Mobile Number..."
-msgstr "Vaša mobilna številka ..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Vaš MXitId"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6138,6 +6170,15 @@
 msgid "_Room Name:"
 msgstr "_Soba:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Dobili ste pošto!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Prisoten"
+
 #. 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."
@@ -7933,13 +7974,11 @@
 msgid "Invalid SNAC"
 msgstr "Neveljaven ID"
 
-#, fuzzy
-msgid "Rate to host"
-msgstr "Povabi na klepet"
-
-#, fuzzy
-msgid "Rate to client"
-msgstr "Nazadnje znani odjemalec"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 #, fuzzy
 msgid "Service unavailable"
@@ -10202,7 +10241,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Prezri povabila na konference in v klepetalnice"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Pri povezavah SSL uporabi posredovalni strežnik za račune"
 
 msgid "Chat room list URL"
@@ -13086,11 +13126,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Program se bo zaprl, ker je že zagnan drug odjemalec libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Mediji"
 
-msgid "/Media/_Hangup"
-msgstr "/Mediji/_Odloži"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Odloži"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13895,9 +13937,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Upravitelj smejčkov po meri"
 
-msgid "Attention received"
-msgstr "Pozornost prejeta"
-
 msgid "Select Buddy Icon"
 msgstr "Izberite ikono prijatelja"
 
@@ -15393,3 +15432,29 @@
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Za odstranitev programa nimate ustreznih pravic."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Digitalno potrdilo še ni veljavno."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Vneseni vzdevek ni veljaven."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Prijavno ime MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Vzdevek"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Vaša mobilna številka ..."
+
+#, fuzzy
+#~ msgid "Rate to host"
+#~ msgstr "Povabi na klepet"
+
+#, fuzzy
+#~ msgid "Rate to client"
+#~ msgstr "Nazadnje znani odjemalec"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Mediji/_Odloži"
--- a/po/sq.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/sq.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-05-03 11:41+0200\n"
 "Last-Translator: Besnik Bleta <besnik@programeshqip.org>\n"
 "Language-Team: Albanian <besnik@programeshqip.org>\n"
@@ -65,12 +65,24 @@
 msgid "Error"
 msgstr "Gabim"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Nuk u shtua llogaria"
+
 msgid "Account was not added"
 msgstr "Nuk u shtua llogaria"
 
 msgid "Username of an account must be non-empty."
 msgstr "Emri i përdoruesit për një llogari nuk mund të jetë bosh."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Njoftime poste të re"
 
@@ -1287,6 +1299,9 @@
 msgid "Someone says your username in chat"
 msgstr "Dikush thotë emrin tuaj në fjalosje"
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr "Dështim i GStreamer-it"
 
@@ -1584,7 +1599,7 @@
 msgid "Online"
 msgstr "I lidhur"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Jo i lidhur"
 
@@ -1708,8 +1723,10 @@
 "Dëshmia nuk besohet, ngaqë nuk besohet hëpërhë ndonjë dëshmi që do të mund "
 "ta verifikonte."
 
-msgid "The certificate is not valid yet."
-msgstr "Dëshmia nuk është ende e vlefshme."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Dëshmia ka skaduar dhe nuk duhet marrë si e vlefshme."
@@ -4054,6 +4071,20 @@
 "Shërbyesi mendon se mirëfilltësimi është i plotë, por klienti nuk mendon "
 "kështu."
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"karshi një rrjedhe të pakoduar shërbyesi lyp mirëfilltësim me bazë tekst të "
+"thjeshtë"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s lyp mirëfilltësim në trajtë teksti të thjeshtë përmes një lidhjeje të "
+"pakoduar. Ta lejojë këtë dhe të vazhdojë me mirëfilltësimin? "
+
 msgid "SASL authentication failed"
 msgstr "Mirëfilltësimi SASL dështoi"
 
@@ -6205,7 +6236,7 @@
 msgstr ""
 "Të dhënat e profilit tuaj nuk janë marrë ende. Ju lutem,, riprovoni më vonë."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6217,6 +6248,7 @@
 msgstr "Verifikoni PIN-in"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Emër në Ekran"
 
@@ -6284,19 +6316,16 @@
 msgid "Connecting..."
 msgstr "Po lidhet..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Nofka që dhatë është e mangët."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Emri që dhatë është i pavlefshëm."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "PIN-i që dhatë ka gjatë të pavlefshme [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Emër Hyrjeje MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Nofkë"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6326,12 +6355,14 @@
 msgid "Invalid country selected. Please try again."
 msgstr "U përzgjodh vend i pavlefshëm. Ju lutem,, riprovoni."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr ""
 "Emri i përdoruesit nuk është i regjistruar. Ju lutem,, së pari  "
 "regjistrohuni."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "Ky emër përdoruesi është i regjistruar tashmë. Ju lutem,, zgjidhni një emër "
 "tjetër përdoruesi."
@@ -6381,8 +6412,9 @@
 msgid "Hidden Number"
 msgstr "Numër i Fshehur"
 
-msgid "Your Mobile Number..."
-msgstr "Numri i Celularit Tuaj..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "ID Yahoo..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6409,6 +6441,15 @@
 msgid "_Room Name:"
 msgstr "_Dhomë:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Ju ka ardhur postë!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "I lidhur"
+
 #. 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 "E kemi humbur lidhjen me MXit. Ju lutem,, rilidhuni."
@@ -8231,11 +8272,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC i pavlefshëm"
 
-msgid "Rate to host"
-msgstr "Klasifiko sipas strehe"
-
-msgid "Rate to client"
-msgstr "Klasifiko sipas klienti"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Shërbim i pamundur"
@@ -10566,7 +10607,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Shpërfill ftesa konferencash dhe dhomash fjalosjeje"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Përdor ndërmjetës llogarie për lidhje SSL"
 
 msgid "Chat room list URL"
@@ -13495,10 +13537,11 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Po dilet, ngaqë ka një tjetër klient libpurple në xhirim e sipër.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14309,9 +14352,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Përgjegjës Emotikonesh Vetjake"
 
-msgid "Attention received"
-msgstr ""
-
 msgid "Select Buddy Icon"
 msgstr "Përzgjidhni Ikonë Shoku"
 
@@ -15973,6 +16013,27 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Nuk keni leje të çinstaloni këtë zbatim."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Dëshmia nuk është ende e vlefshme."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Nofka që dhatë është e mangët."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Emër Hyrjeje MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Nofkë"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Numri i Celularit Tuaj..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Klasifiko sipas strehe"
+
+#~ msgid "Rate to client"
+#~ msgstr "Klasifiko sipas klienti"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Arsye e panjohur."
 
--- a/po/sr.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/sr.po	Sat Jul 31 23:42:35 2010 +0000
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: Милош Поповић <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
@@ -67,12 +67,24 @@
 msgid "Error"
 msgstr "Грешка"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Налог није додат"
+
 msgid "Account was not added"
 msgstr "Налог није додат"
 
 msgid "Username of an account must be non-empty."
 msgstr "Корисничко име за налог не сме бити празно."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Обавештења о новој е-пошти"
 
@@ -1249,6 +1261,10 @@
 msgid "Someone says your username in chat"
 msgstr "Неко је рекао ваше име у ћаскању"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Потребна је активација"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer пад"
 
@@ -1535,7 +1551,7 @@
 msgid "Online"
 msgstr "На вези"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Неповезан"
 
@@ -1655,9 +1671,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Ланац сертификата дао за %s није исправан."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3808,6 +3825,19 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Сервер захтева слање лозинке у обичном тексту преко везе која није шифрована."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s захтева текстуалну пријаву преко везе која није шифрована. Да ли да "
+"наставим са пријавом?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Неуспешна идентификација"
 
@@ -6014,7 +6044,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6027,6 +6057,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Презиме"
@@ -6100,7 +6131,7 @@
 msgstr "Успостављање везе"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Унети SecurID кључ је неисправан."
 
 #, fuzzy
@@ -6108,13 +6139,8 @@
 msgstr "Унети SecurID кључ је неисправан."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Надимак"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6144,10 +6170,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6209,8 +6235,8 @@
 msgstr "Средње име"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Постави број мобилног телефона..."
+msgid "Your MXit ID..."
+msgstr "Јаху ИБ..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6238,6 +6264,15 @@
 msgid "_Room Name:"
 msgstr "_Соба:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Имате е-пошту!"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8067,11 +8102,11 @@
 msgid "Invalid SNAC"
 msgstr "Неисправан SNAC"
 
-msgid "Rate to host"
-msgstr "Брзина према серверу"
-
-msgid "Rate to client"
-msgstr "Брзина према клијенту"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Услуга је недоступна"
@@ -10346,7 +10381,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Занемари позиве причаонице и конференције"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13267,10 +13302,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Излазим јер је већ покренут још један libpurple клијент.\n"
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14112,10 +14147,6 @@
 msgstr "Уређивање произвољних смешака"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Потребна је активација"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Изабери другара"
 
@@ -15641,6 +15672,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Ланац сертификата дао за %s није исправан."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Унети SecurID кључ је неисправан."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Надимак"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Постави број мобилног телефона..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Брзина према серверу"
+
+#~ msgid "Rate to client"
+#~ msgstr "Брзина према клијенту"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Непознат разлог."
 
--- a/po/sr@latin.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/sr@latin.po	Sat Jul 31 23:42:35 2010 +0000
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2007-09-09 11:54+0100\n"
 "Last-Translator: Miloš Popović <gpopac@gmail.com>\n"
 "Language-Team: Serbian <gnome@prevod.org>\n"
@@ -67,12 +67,24 @@
 msgid "Error"
 msgstr "Greška"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Nalog nije dodat"
+
 msgid "Account was not added"
 msgstr "Nalog nije dodat"
 
 msgid "Username of an account must be non-empty."
 msgstr "Korisničko ime za nalog ne sme biti prazno."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Obaveštenja o novoj e-pošti"
 
@@ -1251,6 +1263,10 @@
 msgid "Someone says your username in chat"
 msgstr "Neko je rekao vaše ime u ćaskanju"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Potrebna je aktivacija"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer pad"
 
@@ -1537,7 +1553,7 @@
 msgid "Online"
 msgstr "Na vezi"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Nepovezan"
 
@@ -1657,9 +1673,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Lanac sertifikata dao za %s nije ispravan."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 #, fuzzy
 msgid "The certificate has expired and should not be considered valid."
@@ -3813,6 +3830,20 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Server zahteva slanje lozinke u običnom tekstu preko veze koja nije "
+"šifrovana."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s zahteva tekstualnu prijavu preko veze koja nije šifrovana. Da li da "
+"nastavim sa prijavom?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Neuspešna identifikacija"
 
@@ -6021,7 +6052,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6034,6 +6065,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Prezime"
@@ -6107,7 +6139,7 @@
 msgstr "Uspostavljanje veze"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Uneti SecurID ključ je neispravan."
 
 #, fuzzy
@@ -6115,13 +6147,8 @@
 msgstr "Uneti SecurID ključ je neispravan."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Nadimak"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6151,10 +6178,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6216,8 +6243,8 @@
 msgstr "Srednje ime"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Postavi broj mobilnog telefona..."
+msgid "Your MXit ID..."
+msgstr "Jahu IB..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6245,6 +6272,15 @@
 msgid "_Room Name:"
 msgstr "_Soba:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Imate e-poštu!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Na vezi"
+
 #. 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 ""
@@ -8079,11 +8115,11 @@
 msgid "Invalid SNAC"
 msgstr "Neispravan SNAC"
 
-msgid "Rate to host"
-msgstr "Brzina prema serveru"
-
-msgid "Rate to client"
-msgstr "Brzina prema klijentu"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Usluga je nedostupna"
@@ -10360,7 +10396,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Zanemari pozive pričaonice i konferencije"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13282,10 +13318,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Izlazim jer je već pokrenut još jedan libpurple klijent.\n"
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14127,10 +14163,6 @@
 msgstr "Uređivanje proizvoljnih smešaka"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Potrebna je aktivacija"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Izaberi drugara"
 
@@ -15658,6 +15690,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Nemate ovlašćenja za deinstalaciju ove aplikacije."
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Lanac sertifikata dao za %s nije ispravan."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Uneti SecurID ključ je neispravan."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Nadimak"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Postavi broj mobilnog telefona..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Brzina prema serveru"
+
+#~ msgid "Rate to client"
+#~ msgstr "Brzina prema klijentu"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Nepoznat razlog."
 
--- a/po/sv.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/sv.po	Sat Jul 31 23:42:35 2010 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
-"PO-Revision-Date: 2010-01-13 13:48+0100\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
+"PO-Revision-Date: 2010-06-20 19:50+0100\n"
 "Last-Translator: Peter Hjalmarsson <xake@rymdraket.net>\n"
 "Language-Team: \n"
 "Language: \n"
@@ -62,12 +62,24 @@
 msgid "Error"
 msgstr "Fel"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Kontot lades inte till"
+
 msgid "Account was not added"
 msgstr "Kontot lades inte till"
 
 msgid "Username of an account must be non-empty."
 msgstr "Användarnamnet för ett konto får inte vara tomt."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Rapportering av ny e-post"
 
@@ -1254,6 +1266,10 @@
 msgid "Someone says your username in chat"
 msgstr "Någon nämner ditt användarnamn i en chatt"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Registrering krävs"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer fel"
 
@@ -1547,7 +1563,7 @@
 msgid "Online"
 msgstr "Ansluten"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Frånkopplad"
 
@@ -1640,13 +1656,11 @@
 msgid "Set User Info"
 msgstr "Ange användarinformation"
 
-#, fuzzy
 msgid "This protocol does not support setting a public alias."
-msgstr "Protokollet stödjer inte chattrum."
-
-#, fuzzy
+msgstr "Protokollet stödjer inte att ange ett publikt alias."
+
 msgid "This protocol does not support fetching the public alias."
-msgstr "Protokollet stödjer inte chattrum."
+msgstr "Protokollet stödjer inte att hämta publikt alias."
 
 msgid "Unknown"
 msgstr "Okänd"
@@ -1668,8 +1682,10 @@
 "Detta certifikat är inte betrott eftersom inget certifikat som kan verifiera "
 "det är betrott."
 
-msgid "The certificate is not valid yet."
-msgstr "Certifikatet är inte giltigt än."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Certifikatet är för gammalt och bör inte anses giltigt."
@@ -3815,6 +3831,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Servern tror autentikationen är färdig, men det tycker inte klienten"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Servern kräver klartextautentisering över en okrypterad ström"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s kräver klartextautentisering över en okrypterad anslutning. Tillåt detta "
+"och fortsätt?"
+
 msgid "SASL authentication failed"
 msgstr "SASL Autentisering misslyckades"
 
@@ -3826,34 +3854,32 @@
 msgid "Invalid Encoding"
 msgstr "Ogiltigt inmatningsvillkor"
 
-#, fuzzy
 msgid "Unsupported Extension"
-msgstr "Ej stöd version"
+msgstr "Ej stödd utökning"
 
 msgid ""
 "Unexpected response from the server.  This may indicate a possible MITM "
 "attack"
-msgstr ""
+msgstr "Oväntat svar från server. Detta kan indikera en MITM attack"
 
 msgid ""
 "The server does support channel binding, but did not appear to advertise "
 "it.  This indicates a likely MITM attack"
 msgstr ""
-
-#, fuzzy
+"Servern stödjer kanalbindningar, men verkar inte annonsera det.  Detta "
+"indikerar en trolig MITM attack"
+
 msgid "Server does not support channel binding"
-msgstr "Servern stödjer inte blockering"
-
-#, fuzzy
+msgstr "Servern stödjer inte kanalbindning"
+
 msgid "Unsupported channel binding method"
-msgstr "Stödjer ej kodningen"
+msgstr "Ej stödd kanalbindningsmetod"
 
 msgid "User not found"
 msgstr "Användaren hittades inte"
 
-#, fuzzy
 msgid "Invalid Username Encoding"
-msgstr "Ogiltigt användarnamn"
+msgstr "Ogiltigt format på användarnamn"
 
 msgid "Resource Constraint"
 msgstr "Resursbegränsning"
@@ -4181,9 +4207,8 @@
 msgid "Invalid XMPP ID"
 msgstr "Ogiltigt XMPP ID"
 
-#, fuzzy
 msgid "Invalid XMPP ID. Username portion must be set."
-msgstr "Ogiltigt XMPP IP. Domän måste anges."
+msgstr "Ogiltigt XMPP ID. Användarnamnsdelen måste anges."
 
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ogiltigt XMPP IP. Domän måste anges."
@@ -4315,13 +4340,11 @@
 msgid "Allow Buzz"
 msgstr "Tillåt Surr"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "Andranamn"
-
-#, fuzzy
+msgstr "Humörsnamn"
+
 msgid "Mood Comment"
-msgstr "Kompiskommentar"
+msgstr "Humörskommentar"
 
 #. primitive
 #. ID
@@ -4613,9 +4636,8 @@
 msgid "Initiate Media"
 msgstr "Påbörja Media"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "Protokollet stödjer inte chattrum."
+msgstr "Kontot stödjer inte PEP, kan inte ange ett humör"
 
 msgid "config:  Configure a chat room."
 msgstr "config: Konfigurera ett chattrum."
@@ -4673,9 +4695,8 @@
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Stör en användare för att få dennes uppmärksamhet"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "Välj rätt användare"
+msgstr "mood: anger användarens nuvarande humör"
 
 msgid "Extended Away"
 msgstr "Utökad frånvaro"
@@ -4753,18 +4774,17 @@
 msgid "(Code %s)"
 msgstr "(Kod %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "Kan inte skicka meddelandet: Det är för stort."
+msgstr "En egenvald smilie i meddelandet var för stor för att skickas."
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP-strömhuvud saknas"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP-versioner matchar inte"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP-strömmen saknar ID"
 
 msgid "XML Parse error"
 msgstr "XML-tolkningsfel"
@@ -4840,9 +4860,8 @@
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Var god välj vilken tillflykt för %s du vill sända filen till"
 
-#, fuzzy
 msgid "Afraid"
-msgstr "Arabiska"
+msgstr "Rädd"
 
 #, fuzzy
 msgid "Amazed"
@@ -4855,9 +4874,8 @@
 msgid "Angry"
 msgstr "Arg"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "Bannlyst"
+msgstr "Irriterad"
 
 msgid "Anxious"
 msgstr "Orolig"
@@ -4872,29 +4890,23 @@
 msgid "Bored"
 msgstr "Uttråkad"
 
-#, fuzzy
 msgid "Brave"
-msgstr "Spara"
-
-#, fuzzy
+msgstr "Modig"
+
 msgid "Calm"
-msgstr "Kungarike"
-
-#, fuzzy
+msgstr "Lugn"
+
 msgid "Cautious"
-msgstr "Chattar"
-
-#, fuzzy
+msgstr "Försiktig"
+
 msgid "Cold"
-msgstr "Fet"
-
-#, fuzzy
+msgstr "Kall"
+
 msgid "Confident"
-msgstr "Konflikt"
-
-#, fuzzy
+msgstr "Självsäker"
+
 msgid "Confused"
-msgstr "Fortsätt"
+msgstr "Förvirrad"
 
 #, fuzzy
 msgid "Contemplative"
@@ -4904,50 +4916,43 @@
 msgid "Contented"
 msgstr "Ansluten"
 
-#, fuzzy
 msgid "Cranky"
-msgstr "Företag"
+msgstr "Grinig"
 
 msgid "Crazy"
-msgstr ""
-
-#, fuzzy
+msgstr "Galen"
+
 msgid "Creative"
-msgstr "Skapa"
-
-#, fuzzy
+msgstr "Kreativ"
+
 msgid "Curious"
-msgstr "Strålande"
+msgstr "Nyfiken"
 
 #, fuzzy
 msgid "Dejected"
 msgstr "Avslagen"
 
-#, fuzzy
 msgid "Depressed"
-msgstr "Borttagen"
-
-#, fuzzy
+msgstr "Deprimerad"
+
 msgid "Disappointed"
-msgstr "Frånkopplad."
+msgstr "Besviken"
 
 msgid "Disgusted"
-msgstr ""
+msgstr "Äcklad"
 
 #, fuzzy
 msgid "Dismayed"
 msgstr "Avaktiverad"
 
-#, fuzzy
 msgid "Distracted"
-msgstr "Frånskild"
+msgstr "Distraherad"
 
 msgid "Embarrassed"
 msgstr ""
 
-#, fuzzy
 msgid "Envious"
-msgstr "Orolig"
+msgstr "Avundsjuk"
 
 msgid "Excited"
 msgstr "Upphetsad"
@@ -4956,29 +4961,26 @@
 msgid "Flirtatious"
 msgstr "Strålande"
 
-#, fuzzy
 msgid "Frustrated"
-msgstr "Förnamn"
+msgstr "Frustrerad"
 
 msgid "Grateful"
-msgstr ""
-
-#, fuzzy
+msgstr "Tacksam"
+
 msgid "Grieving"
-msgstr "Hämtar..."
+msgstr "Sörjer"
 
 msgid "Grumpy"
 msgstr "Tjurig"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "Stad"
+msgstr "Skyldig"
 
 msgid "Happy"
 msgstr "Glad"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "Hoppfull"
 
 msgid "Hot"
 msgstr "Het"
@@ -4987,18 +4989,16 @@
 msgstr ""
 
 msgid "Humiliated"
-msgstr ""
-
-#, fuzzy
+msgstr "Förnedrad"
+
 msgid "Hungry"
-msgstr "Arg"
-
-#, fuzzy
+msgstr "Hungrig"
+
 msgid "Hurt"
-msgstr "Humor"
+msgstr "Sårad"
 
 msgid "Impressed"
-msgstr ""
+msgstr "Imponerad"
 
 #, fuzzy
 msgid "In awe"
@@ -5011,13 +5011,11 @@
 msgid "Indignant"
 msgstr "Indonesiska"
 
-#, fuzzy
 msgid "Interested"
-msgstr "Intressen"
-
-#, fuzzy
+msgstr "Intresserad"
+
 msgid "Intoxicated"
-msgstr "Inbjuden"
+msgstr "Full"
 
 msgid "Invincible"
 msgstr "Osårbar"
@@ -5025,82 +5023,69 @@
 msgid "Jealous"
 msgstr "Avundsjuk"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "Apa"
-
-#, fuzzy
+msgstr "Ensam"
+
 msgid "Lost"
-msgstr "Högst"
+msgstr "Förlorad"
 
 msgid "Lucky"
-msgstr ""
-
-#, fuzzy
+msgstr "Tursam"
+
 msgid "Mean"
-msgstr "Tyska"
+msgstr "Elak"
 
 #, fuzzy
 msgid "Moody"
 msgstr "Humör"
 
 msgid "Nervous"
-msgstr ""
-
-#, fuzzy
+msgstr "Nevös"
+
 msgid "Neutral"
-msgstr "Detaljer"
-
-#, fuzzy
+msgstr "Neutral"
+
 msgid "Offended"
-msgstr "Frånkopplad"
+msgstr "Stött"
 
 msgid "Outraged"
 msgstr ""
 
-#, fuzzy
 msgid "Playful"
-msgstr "Spela upp"
-
-#, fuzzy
+msgstr "Lekfull"
+
 msgid "Proud"
-msgstr "Högt"
-
-#, fuzzy
+msgstr "Stolt"
+
 msgid "Relaxed"
-msgstr "Fullständigt namn"
-
-#, fuzzy
+msgstr "Avslappnad"
+
 msgid "Relieved"
-msgstr "Mottaget"
-
-#, fuzzy
+msgstr "Lättad"
+
 msgid "Remorseful"
-msgstr "Ta bort"
-
-#, fuzzy
+msgstr "Ångerfull"
+
 msgid "Restless"
-msgstr "Registrera"
+msgstr "Rastlös"
 
 msgid "Sad"
 msgstr "Ledsen"
 
 msgid "Sarcastic"
-msgstr ""
+msgstr "Sarkastisk"
 
 msgid "Satisfied"
-msgstr ""
-
-#, fuzzy
+msgstr "Tillfreds"
+
 msgid "Serious"
-msgstr "Strålande"
-
-#, fuzzy
+msgstr "Seriös"
+
 msgid "Shocked"
-msgstr "Blockerad"
+msgstr "Shockad"
 
 msgid "Shy"
-msgstr ""
+msgstr "Blyg"
 
 msgid "Sick"
 msgstr "Sjuk"
@@ -5110,40 +5095,34 @@
 msgstr "Sömnig"
 
 msgid "Spontaneous"
-msgstr ""
-
-#, fuzzy
+msgstr "Spontan"
+
 msgid "Stressed"
-msgstr "Hastighet:"
-
-#, fuzzy
+msgstr "Stressad"
+
 msgid "Strong"
-msgstr "Sång"
+msgstr "Stark"
 
 msgid "Surprised"
-msgstr ""
+msgstr "Överraskad"
 
 msgid "Thankful"
-msgstr ""
+msgstr "Tacksam"
 
 msgid "Thirsty"
-msgstr ""
-
-#, fuzzy
+msgstr "Törstig"
+
 msgid "Tired"
-msgstr "Fire"
-
-#, fuzzy
+msgstr "Trött"
+
 msgid "Undefined"
-msgstr "Understruken"
-
-#, fuzzy
+msgstr "Odefenierad"
+
 msgid "Weak"
-msgstr "Banka på"
-
-#, fuzzy
+msgstr "Svag"
+
 msgid "Worried"
-msgstr "Uttråkad"
+msgstr "Oroad"
 
 msgid "Set User Nickname"
 msgstr "Sätt användarsmeknamn"
@@ -5746,9 +5725,8 @@
 msgid "Show custom smileys"
 msgstr "Visa egna smileys"
 
-#, fuzzy
 msgid "Allow direct connections"
-msgstr "Kan inte skapa anslutning"
+msgstr "Tillåt direktanslutningar"
 
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Knuffa till en kontakt för att få dennes uppmärksamhet"
@@ -5975,8 +5953,9 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Din profilinformation har inte hämtats än. Var god försök igen senare."
 
-msgid "Your MXitId"
-msgstr ""
+#, fuzzy
+msgid "Your UID"
+msgstr "Din MXitID"
 
 #. pin
 #. pin (required)
@@ -5987,6 +5966,7 @@
 msgstr "Verifiera PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Visningsnamn"
 
@@ -6047,19 +6027,16 @@
 msgid "Connecting..."
 msgstr "Ansluter..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Smeknamnet du uppgav är ogiltigt."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Namnet är ogiltigt."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Det PIN du uppgav har ogiltig längd [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit loginnamn"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Smeknamn"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6088,10 +6065,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Ogiltigt land uppgivet. Försök igen senare."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Användarnamnet är inte registrerat. Registrera dig först."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Användarnamn redan registrerat. Var god välj ett annat användarnamn."
 
 msgid "Internal error. Please try again later."
@@ -6129,16 +6108,16 @@
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#, fuzzy
 msgid "Rejection Message"
-msgstr "Mottagna meddelande"
+msgstr "Avslagsmeddelande"
 
 #. hidden number
 msgid "Hidden Number"
 msgstr "Dolt nummer"
 
-msgid "Your Mobile Number..."
-msgstr "Ditt mobilnummer..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Din MXitID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6152,17 +6131,23 @@
 msgstr "Tillåt Splash-skärm popup"
 
 #. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "Du har sparkats ut från denna MultiMX."
+
+msgid "was kicked"
+msgstr "kickades"
+
+msgid "_Room Name:"
+msgstr "_Rumnamn:"
+
+#. Display system message in chat window
 #, fuzzy
-msgid "You have been kicked from this MultiMX."
-msgstr "Du har sparkats ut: (%s)"
+msgid "You have invited"
+msgstr "Du har fått mejl!"
 
 #, fuzzy
-msgid "was kicked"
-msgstr "Ogiltig biljett"
-
-#, fuzzy
-msgid "_Room Name:"
-msgstr "_Rum:"
+msgid "Last Online"
+msgstr "Ansluten"
 
 #. we must have lost the connection, so terminate it so that we can reconnect
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -6898,9 +6883,9 @@
 msgid "Server port"
 msgstr "Serverport"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "Mottog oväntat svar från %s"
+msgstr "Mottog oväntat svar från %s; %s"
 
 #, c-format
 msgid "Received unexpected response from %s"
@@ -6923,13 +6908,15 @@
 "Server requested that you fill out a CAPTCHA in order to sign in, but this "
 "client does not currently support CAPTCHAs."
 msgstr ""
+"Servern kräver att du fyller i e CAPTCHA för att registrera dig, men denna "
+"klient stödjer inte CAPTCHAs."
 
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL tillåter inte ditt skärmnamn att autentisera här"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s"
-msgstr "Fel vid efterfrågan av %s: %s"
+msgstr "Fel vid efterfrågan av %s"
 
 msgid "Could not join chat room"
 msgstr "Kunde inte ansluta till chatrummet"
@@ -6995,104 +6982,88 @@
 msgstr "Kan inte skicka meddelandet till %s: %s"
 
 msgid "Thinking"
-msgstr ""
-
-#, fuzzy
+msgstr "Tänker"
+
 msgid "Shopping"
-msgstr "Slutar skriva"
-
-#, fuzzy
+msgstr "Handlar"
+
 msgid "Questioning"
-msgstr "Förfrågningsdialog"
-
-#, fuzzy
+msgstr "Ifrågasätter"
+
 msgid "Eating"
-msgstr "Sökare"
-
-#, fuzzy
+msgstr "Äter"
+
 msgid "Watching a movie"
-msgstr "Spelar ett spel"
+msgstr "Tittar på film"
 
 msgid "Typing"
 msgstr "Skriver"
 
-#, fuzzy
 msgid "At the office"
-msgstr "Inte på kontoret"
+msgstr "På kontoret"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "Tar ett bad"
 
 msgid "Watching TV"
-msgstr ""
-
-#, fuzzy
+msgstr "Tittar på TV"
+
 msgid "Having fun"
-msgstr "La på"
-
-#, fuzzy
+msgstr "Har roligt"
+
 msgid "Sleeping"
-msgstr "Sömnig"
+msgstr "Sover"
 
 msgid "Using a PDA"
-msgstr ""
-
-#, fuzzy
+msgstr "Använder en PDA"
+
 msgid "Meeting friends"
-msgstr "Snabbmeddelandevänner"
-
-#, fuzzy
+msgstr "Möter vänner"
+
 msgid "On the phone"
 msgstr "Pratar i telefon"
 
-#, fuzzy
 msgid "Surfing"
-msgstr "Återkommande"
+msgstr "Surfar"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "Mobil"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "Söker på webben"
 
 msgid "At a party"
-msgstr ""
+msgstr "På fest"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "Dricker kaffe"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "Användarspelning"
+msgstr "Spelar"
 
 msgid "Browsing the web"
-msgstr ""
-
-#, fuzzy
+msgstr "Surfar på webben"
+
 msgid "Smoking"
-msgstr "Sång"
-
-#, fuzzy
+msgstr "Röker"
+
 msgid "Writing"
-msgstr "Arbetar"
+msgstr "Skriver"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "Arbetar"
+msgstr "Dricker"
 
 msgid "Listening to music"
 msgstr "Lyssnar på musik"
 
-#, fuzzy
 msgid "Studying"
-msgstr "Skickar"
-
-#, fuzzy
+msgstr "Studerar"
+
 msgid "In the restroom"
-msgstr "Intressen"
+msgstr "På toa"
 
 msgid "Received invalid data on connection with server"
 msgstr "Tog emot felaktig data vid anslutning till server"
@@ -7197,7 +7168,7 @@
 msgstr "Spel"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
 msgstr "Lägg till"
@@ -7265,23 +7236,18 @@
 msgid "Invisible"
 msgstr "Osynlig"
 
-#, fuzzy
 msgid "Evil"
-msgstr "E-post"
-
-#, fuzzy
+msgstr "Ond"
+
 msgid "Depression"
-msgstr "Yrke"
-
-#, fuzzy
+msgstr "Depression"
+
 msgid "At home"
-msgstr "Om mig"
-
-#, fuzzy
+msgstr "Hemma"
+
 msgid "At work"
-msgstr "Nätverk"
-
-#, fuzzy
+msgstr "På jobbet"
+
 msgid "At lunch"
 msgstr "På lunch"
 
@@ -7789,9 +7755,8 @@
 msgid "iTunes Music Store Link"
 msgstr "Länk till iTunes Musikaffär"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr "Lunch"
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7825,9 +7790,8 @@
 msgid "Edit Buddy Comment"
 msgstr "Ändra kompiskommentar"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "Hämta statusmeddelande"
+msgstr "Hämta X-statusmeddelande"
 
 msgid "End Direct IM Session"
 msgstr "Avsluta direkt-IM session"
@@ -7958,11 +7922,11 @@
 msgid "Invalid SNAC"
 msgstr "Ogiltig SNAC"
 
-msgid "Rate to host"
-msgstr "Hastighet till värd"
-
-msgid "Rate to client"
-msgstr "Hastighet till klient"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Tjänsten är otillgänglig"
@@ -8307,9 +8271,8 @@
 msgstr "Admin"
 
 #. XXX: Should this be "Topic"?
-#, fuzzy
 msgid "Room Title"
-msgstr "Rumslista"
+msgstr "Rumstitel"
 
 msgid "Notice"
 msgstr "Notering"
@@ -10227,8 +10190,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorera inbjudningar till konferenser och chatrum"
 
-msgid "Use account proxy for SSL connections"
-msgstr "Använd kontoproxy för SSL-anslutningar"
+msgid "Use account proxy for HTTP and HTTPS connections"
+msgstr "Använd kontoproxy för HTTP och HTTPS-anslutningar"
 
 msgid "Chat room list URL"
 msgstr "URL för chattrumlista"
@@ -10300,13 +10263,12 @@
 "Kontot låst: Okänd anledning.  Logga in på Yahoo!s hemsida kan fixa detta."
 
 #. indicates a lock due to logging in too frequently
-#, fuzzy
 msgid ""
 "Account locked: You have been logging in too frequently.  Wait a few minutes "
 "before trying to connect again.  Logging into the Yahoo! website may help."
 msgstr ""
-"Kontot låst: För många inloggningsförsök.  Logga in på Yahoo!s hemsida kan "
-"fixa detta."
+"Kontot låst: För många inloggningsförsök på för kort tid.  Vänta några "
+"minuter innan du försöker igen.  Logga in på Yahoo!s hemsida kan fixa detta."
 
 #. username or password missing
 msgid "Username or password missing"
@@ -10384,16 +10346,14 @@
 msgid "Unable to establish a connection with %s: %s"
 msgstr "Kunde inte skapa en anslutning med %s: %s"
 
-#, fuzzy
 msgid "Unable to connect: The server returned an empty response."
-msgstr ""
-"Kunde inte ansluta till MXit-servern. Var god undersök dina "
-"serverinställningar."
+msgstr "Kunde inte ansluta: Servern angav ett tomt svar."
 
 msgid ""
 "Unable to connect: The server's response did not contain the necessary "
 "information"
 msgstr ""
+"Kunde inte ansluta: Serversvaret innehöll inte den nödvändiga informationen"
 
 msgid "Not at Home"
 msgstr "Inte hemma"
@@ -10841,9 +10801,8 @@
 msgid "Extended away"
 msgstr "Utökad frånvaro"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "Tar emot"
+msgstr "Mår"
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -11382,13 +11341,11 @@
 msgid "Unknown node type"
 msgstr "Okänd nodtyp"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "Ange ditt humör från listan."
-
-#, fuzzy
+msgstr "Ange ditt humör från listan"
+
 msgid "Message (optional)"
-msgstr "Alias (valfritt)"
+msgstr "Meddelande (valfritt)"
 
 msgid "Edit User Mood"
 msgstr "Redigera användarhumör"
@@ -11471,9 +11428,8 @@
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktyg/_Spärrlista"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/Verktyg/Visa _systemlogg"
+msgstr "/Verktyg/Ange Hu_mör"
 
 msgid "/Tools/_File Transfers"
 msgstr "/Verktyg/_Filöverföringar"
@@ -11737,9 +11693,8 @@
 msgid "_Edit Account"
 msgstr "_Ändra konto"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "Ange humör..."
+msgstr "Ange hu_mör..."
 
 msgid "No actions available"
 msgstr "Inga åtgärder tillgängliga"
@@ -12016,13 +11971,11 @@
 msgid "0 people in room"
 msgstr "0 personer i rummet"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "Stäng denna flik"
-
-#, fuzzy
+msgstr "Stäng sökfält"
+
 msgid "Find:"
-msgstr "Sök"
+msgstr "Sök:"
 
 #, c-format
 msgid "%d person in room"
@@ -12437,7 +12390,7 @@
 msgid "Lithuanian"
 msgstr "Lettländska"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s is a messaging client based on libpurple which is capable of connecting "
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
@@ -12446,14 +12399,12 @@
 "copyrighted by its contributors, a list of whom is also distributed with "
 "%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s är en grafisk modulär meddelandeklient baserad på libpurple som kan "
-"ansluta till AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
-"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu och QQ "
-"samtidigt.  Det är skrivet för GTK+.<BR><BR>Du kan ändra och distribuera "
-"programmet enligt GPL (version 2 eller senare).  En kopia av GPL finns i "
-"filen 'COPYING' som kommer med %s.  %s är kopieringsskyddad av dess "
-"bidragsgivare.  Se filen 'COPYRIGHT' för en komplett lista av "
-"bidragsgivare.  Vi ger inga garantier för detta program.<BR><BR>"
+"%s är en meddelandeklient baserad på libpurple som kan ansluta till flera "
+"meddelande-protokoll samtidigt.  %s är skriveti C och använder GTK+. %s är "
+"släppt under, kan ändras och distrubieras enligt GPL version 2 (eller "
+"senare).  En kopia av GPL kommer med %s.  %s är kopieringsskyddad av dess "
+"bidragsgivare, en lista av dessa är distrubierad med %s.  Det finns inga "
+"garantier för %s.<BR><BR>"
 
 #, c-format
 msgid ""
@@ -12463,7 +12414,7 @@
 "im<BR><BR>"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
 "e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
@@ -12473,25 +12424,25 @@
 "welcome to post in another language, but the responses may be less helpful."
 "<br/>"
 msgstr ""
-"<font size=\"4\">Hjälp från andra Pidgin-användare:</font> <a href=\"mailto:"
-"support@pidgin.im\">support@pidgin.im</a><br/>Detta är en <b>publik</b> "
-"epostlista! (<a href=\"http://pidgin.im/pipermail/support/\">arkiv</a>)<br/"
-">Vi kan inte hjälpa dig med 3:djepartsmoduler och protokoll!<br/>Listans "
-"huvudspråk är <b>Engelska</b>.  Du är välkommen att skriva i ett annat "
-"språk, men svaren kan vara mindre hjälpsamma.<br/><br/>"
+"<font size=\"4\"><b>Hjälp från andra Pidgin-användare</b></font> finns "
+"tillgänglig genom att eposta <a href=\"mailto:support@pidgin.im"
+"\">support@pidgin.im</a><br/>Detta är en <b>publik</b> epostlista! (<a href="
+"\"http://pidgin.im/pipermail/support/\">arkiv</a>)<br/>Vi kan inte hjälpa "
+"dig med 3:djepartsmoduler och protokoll!<br/>Listans huvudspråk är "
+"<b>Engelska</b>.  Du är välkommen att skriva i ett annat språk, men svaren "
+"kan vara mindre hjälpsamma.<br/><br/>"
 
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "Information om kompis"
+msgstr "Bygg-information"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "Information om kompis"
+msgstr "%s Bygg-information"
 
 msgid "Current Developers"
 msgstr "Nuvarande utvecklare"
@@ -12505,9 +12456,9 @@
 msgid "Retired Crazy Patch Writers"
 msgstr "Före detta galna patchskrivare"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "Serverinformation"
+msgstr "%s utvecklarinformation"
 
 msgid "Current Translators"
 msgstr "Nuvarande översättare"
@@ -12515,9 +12466,9 @@
 msgid "Past Translators"
 msgstr "Före detta översättare"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "Mer information"
+msgstr "%s översättarinformation"
 
 msgid "_Name"
 msgstr "_Namn"
@@ -13112,11 +13063,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Avslutar på grund av att en annan libpurple-klient redan körs.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Media"
 
-msgid "/Media/_Hangup"
-msgstr "/Media/_Lägg på"
+#, fuzzy
+msgid "_Hangup"
+msgstr "La på"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13915,10 +13868,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Hanterare för egna smileys"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "Registrering krävs"
-
 msgid "Select Buddy Icon"
 msgstr "Välj kompisikon"
 
@@ -14059,9 +14008,8 @@
 msgid "_Save File"
 msgstr "_Spara fil"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "Är du säker på att du vill ta bort %s?"
+msgstr "Är du säker på att du vill rensa?"
 
 msgid "Select color"
 msgstr "Välj färg"
@@ -15054,21 +15002,18 @@
 msgid "Timestamp Format Options"
 msgstr "Val för tidsstämpelformat"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Force timestamp format:"
-msgstr "Tvinga 24-timmars tids_format"
-
-#, fuzzy
+msgstr "Tvinga tids_format:"
+
 msgid "Use system default"
-msgstr "Skrivbordets förval"
-
-#, fuzzy
+msgstr "Används systemets förval"
+
 msgid "12 hour time format"
-msgstr "Tvinga 24-timmars tids_format"
-
-#, fuzzy
+msgstr "12-timmars tidsformat"
+
 msgid "24 hour time format"
-msgstr "Tvinga 24-timmars tids_format"
+msgstr "24-timmars tidsformat"
 
 msgid "Show dates in..."
 msgstr "Visa datum i..."
@@ -15269,7 +15214,6 @@
 msgstr "Skicka och ta emot råa XMPP strofer."
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter."
 
@@ -15333,14 +15277,12 @@
 msgstr ""
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "GTK+ Runtime (required if not present)"
 msgstr "GTK+-körmiljö (obligatorisk)"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Localizations"
-msgstr "Plats"
+msgstr "Platser"
 
 #. "Next >" appears on a button on the License Page of the Installer
 msgid "Next >"
@@ -15355,6 +15297,9 @@
 "already present).$\\rAre you sure you want to skip installing the GTK+ "
 "Runtime?"
 msgstr ""
+"Pidgin kräver en kompatibel version av GTK+ biblioteken (vilka inte verkar "
+"vara installerade).$\\rÄr du säker på att du vill hoppa över installationen "
+"av dem?"
 
 #. Installer Subsection Text
 msgid "Shortcuts"
@@ -15406,6 +15351,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "Du har inte rättigheter att avinstallera den här applikationen."
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Certifikatet är inte giltigt än."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Smeknamnet du uppgav är ogiltigt."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit loginnamn"
+
+#~ msgid "Nick Name"
+#~ msgstr "Smeknamn"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Ditt mobilnummer..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Hastighet till värd"
+
+#~ msgid "Rate to client"
+#~ msgstr "Hastighet till klient"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Media/_Lägg på"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Okänd anledning."
 
--- a/po/sw.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/sw.po	Sat Jul 31 23:42:35 2010 +0000
@@ -5,7 +5,7 @@
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2009-04-16 22:24+0300\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@lists.kde.org>\n"
@@ -49,12 +49,23 @@
 msgid "Error"
 msgstr "Hitikafu "
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr "Jina la mtumiaji haliwezi kuwa wazi "
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 #, fuzzy
 msgid "New mail notifications"
 msgstr "Arifisho la Jumla"
@@ -1250,6 +1261,10 @@
 msgid "Someone says your username in chat"
 msgstr ""
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Uthibitisho unatakiwa"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1545,7 +1560,7 @@
 msgid "Online"
 msgstr "Nenda mkondoni"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr ""
 
@@ -1667,9 +1682,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Nambari mstari iliyoingizwa ni batili."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3742,6 +3758,15 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr ""
 
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
 #, fuzzy
 msgid "SASL authentication failed"
 msgstr "Uthibitisho unatakiwa"
@@ -5936,7 +5961,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5949,6 +5974,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Ukurasa wa kwanza"
@@ -6015,7 +6041,7 @@
 msgstr "Inaunganisha…"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Nambari mstari iliyoingizwa ni batili."
 
 #, fuzzy
@@ -6023,13 +6049,8 @@
 msgstr "Nambari mstari iliyoingizwa ni batili."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Jina la mtumiaji"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6057,10 +6078,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -6113,7 +6134,7 @@
 msgid "Hidden Number"
 msgstr "Jina la Moduli:"
 
-msgid "Your Mobile Number..."
+msgid "Your MXit ID..."
 msgstr ""
 
 #. Configuration options
@@ -6140,6 +6161,14 @@
 msgid "_Room Name:"
 msgstr "Jina la Moduli:"
 
+#. Display system message in chat window
+msgid "You have invited"
+msgstr ""
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Nenda mkondoni"
+
 #. 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 ""
@@ -7859,10 +7888,10 @@
 msgid "Invalid SNAC"
 msgstr "Kizuizi batili"
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10132,7 +10161,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12984,10 +13013,10 @@
 msgstr ""
 
 #, fuzzy
-msgid "/_Media"
+msgid "_Media"
 msgstr "Media"
 
-msgid "/Media/_Hangup"
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13832,10 +13861,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Uthibitisho unatakiwa"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "&Uchanguzi"
 
@@ -15317,6 +15342,18 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Nambari mstari iliyoingizwa ni batili."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Nambari mstari iliyoingizwa ni batili."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Jina la mtumiaji"
+
+#, fuzzy
 #~ msgid "Unknown reason."
 #~ msgstr "Hitilafu isiyojulikana"
 
--- a/po/ta.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ta.po	Sat Jul 31 23:42:35 2010 +0000
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: ta\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-01-05 14:58+0530\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
@@ -66,12 +66,24 @@
 msgid "Error"
 msgstr "பிழை"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "கணக்கு சேர்க்கப்படவில்லை"
+
 msgid "Account was not added"
 msgstr "கணக்கு சேர்க்கப்படவில்லை"
 
 msgid "Username of an account must be non-empty."
 msgstr "ஒரு கணக்கிற்கான பயனர்பெயர் காலி-இல்லாமல் இருக்கும்."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "புதிய அஞ்சல் அறவிப்புகள்"
 
@@ -1251,6 +1263,10 @@
 msgid "Someone says your username in chat"
 msgstr "அரட்டையில் உங்கள் பயனர்பெயரை யாரோ சொல்கிறார்கள்"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "செயல்பாடு தேவைப்படுகிறது"
+
 msgid "GStreamer Failure"
 msgstr "Gஸ்ட்டீமர் தோல்வியுற்றது"
 
@@ -1543,7 +1559,7 @@
 msgid "Online"
 msgstr "இணைப்புடன்"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "இணைப்பு விலகி"
 
@@ -1663,8 +1679,10 @@
 "இந்த சான்றிதழ் நம்பக்கூடியதாக இல்லை ஏனெனில் தற்போது நம்ப தகுந்ததை சரிபார்க்கும் சான்றிதழ் "
 "இல்லை."
 
-msgid "The certificate is not valid yet."
-msgstr "சான்றிதழ் இதுவரை செல்லாதது."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "இந்த சான்றிதழ் முடிவடைந்தது மற்றும் இதை மதிப்புடையதாக ஏற்றுக் கொள்ள முடியவில்லை."
@@ -3805,6 +3823,19 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "சேவையகம் அங்கீகாரத்தை முடிப்ப நினைக்கிறது, ஆனால் க்ளையன்ட் இல்லை"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"குறியீடு செய்யப்படாத ஒடையில் சாதாரண வாக்கிய அனுமதியாக்கலை சேவையகம் விரும்புகிறது"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s ஆனது வெற்று உரை அங்கீகாரத்தை ஒரு மறைகுறிநீக்கப்பட்ட இணைப்பிற்கு கோருகிறது.  இதை "
+"அனுமதித்து அங்கீகாரத்தை தொடரவா?"
+
 msgid "SASL authentication failed"
 msgstr "SASL அங்கீகரிக்க முடியவில்லை"
 
@@ -5941,7 +5972,7 @@
 "உங்கள் விவரக்குறிப்பு தகவல் இன்னும் திருப்பி எடுக்க முடியவில்லை. மீண்டும் பின்னர் "
 "முயற்சிக்கவும்."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5953,6 +5984,7 @@
 msgstr "PINஐ சரிபார்"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "பெயரை காட்டு"
 
@@ -6009,19 +6041,16 @@
 msgid "Connecting..."
 msgstr "இணைக்கிறது..."
 
-msgid "The nick name you entered is invalid."
-msgstr "நீங்கள் உள்ளிட்ட புனைப்பெயர் தவறானது."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "நீங்கள் உள்ளிட்ட பெயர் தவறானது."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "நீங்கள் உள்ளிட்ட PIN ஒரு தவறான நீளமாகும் [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit உட்புகு பெயர் "
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "புனைப் பெயர்"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6050,10 +6079,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "தவறான நாடு தேர்ந்தெடுக்கப்பட்டது. மீண்டும் முயற்சிக்கவும்."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "பயனர்பெயர் பதிவு செய்யப்படவில்லை. முதலில் பதிவு செய்யவும்."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "பயனர்பெயர் ஏற்கனவே பதிவு செய்யப்பட்டுவிட்டது. மற்றொரு பயனர்பெயரை தேர்ந்தெடு."
 
 msgid "Internal error. Please try again later."
@@ -6099,8 +6130,9 @@
 msgid "Hidden Number"
 msgstr "மறைக்கப்பட்ட எண்"
 
-msgid "Your Mobile Number..."
-msgstr "உங்களது மொபைல் எண்..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6126,6 +6158,15 @@
 msgid "_Room Name:"
 msgstr "அறை:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "உங்களுக்கு அஞ்சல் உள்ளது!"
+
+#, fuzzy
+msgid "Last Online"
+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க்கு நாம் இணைப்பை தொலைத்துவிட்டோம். மீண்டும் இணை."
@@ -7890,11 +7931,11 @@
 msgid "Invalid SNAC"
 msgstr "செல்லுபடியாகாத எஸ்என்ஏசி"
 
-msgid "Rate to host"
-msgstr "புரவலருக்கு விகிதம்"
-
-msgid "Rate to client"
-msgstr "பயனருக்கு விகிதம்"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "சேவை இல்லை"
@@ -10148,7 +10189,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "கூட்டங்கள் மற்றும் அரட்டை அறை அழைப்புகளை உதாசீனப்படுத்தவும்"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL இணைப்புகளுக்கான ப்ராக்ஸி கணக்கை பயன்படுத்து"
 
 msgid "Chat room list URL"
@@ -13009,11 +13051,13 @@
 msgstr ""
 "மற்றொரு libpurple வாடிக்கையாளர் ஏற்கனவே இயங்கிக் கொண்டிருப்பபதால் வெளியேறுகிறது.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/ஊடகம் (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/ஊடகம்/தொங்குதல் (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "துணிடித்தல்"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13810,10 +13854,6 @@
 msgid "Custom Smiley Manager"
 msgstr "தனிபயன் ஸ்மைலி மேலாளர்"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "செயல்பாடு தேவைப்படுகிறது"
-
 msgid "Select Buddy Icon"
 msgstr "நண்பரை சின்னத்தை தேர்ந்தெடு"
 
@@ -15294,6 +15334,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "சான்றிதழ் இதுவரை செல்லாதது."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "நீங்கள் உள்ளிட்ட புனைப்பெயர் தவறானது."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit உட்புகு பெயர் "
+
+#~ msgid "Nick Name"
+#~ msgstr "புனைப் பெயர்"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "உங்களது மொபைல் எண்..."
+
+#~ msgid "Rate to host"
+#~ msgstr "புரவலருக்கு விகிதம்"
+
+#~ msgid "Rate to client"
+#~ msgstr "பயனருக்கு விகிதம்"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/ஊடகம்/தொங்குதல் (_H)"
+
 #~ msgid "Unknown reason."
 #~ msgstr "தெரியாத காரணம்."
 
--- a/po/te.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/te.po	Sat Jul 31 23:42:35 2010 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-03-25 15:56+0530\n"
 "Last-Translator: Krishna Babu K <kkrothap@redhat.com>\n"
 "Language-Team: Telugu <en@li.org>\n"
@@ -62,12 +62,24 @@
 msgid "Error"
 msgstr "దోషము"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "ఖాతా చేర్చబడలేదు"
+
 msgid "Account was not added"
 msgstr "ఖాతా చేర్చబడలేదు"
 
 msgid "Username of an account must be non-empty."
 msgstr "ఖాతాకు సంబంధించిన వినియోగదారి పేరు ఖాళీగా ఉండకూడదు."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "కొత్త మెయిల్ నోటిఫికేషన్లు "
 
@@ -1238,6 +1250,9 @@
 msgid "Someone says your username in chat"
 msgstr "మీ వినియోగదారిపేరు చాట్‌నందు వున్నదని యేవరో అనుచున్నారు"
 
+msgid "Attention received"
+msgstr ""
+
 msgid "GStreamer Failure"
 msgstr "Gస్ట్రీమర్ వైఫల్యం"
 
@@ -1526,7 +1541,7 @@
 msgid "Online"
 msgstr "ఆన్‌లైన్ "
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "లైనువెలుపల"
 
@@ -1646,8 +1661,10 @@
 "ఈ ధృవీకరణపత్రము నమ్మదగినది కాదు యెంచేతంటే ప్రస్తుతం నమ్మదగునటువంటి యే ధృవీకరణపత్రము దానిని "
 "నిర్ధారించలేదు."
 
-msgid "The certificate is not valid yet."
-msgstr "ధృవీకరణపత్రము యింకా చెల్లునది కాలేదు."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "ధృవీకరణపత్రము కాలముమించినది మరియు చెల్లునదిగా పరిగణించబడకూడదు."
@@ -3742,6 +3759,18 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "ధృవీకరణము పూర్తైనట్లుగా సేవిక అనుకొనుచున్నది, అయితే క్లైంట్ అనుకోవుడం లేదు."
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "సర్వర్‌కు సంకేతభాషకన్నా సరళమైన భాషతోకూడిన పదాలు అవసరం."
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"అన్ఎన్క్రిప్టెడ్ అనుసంధానము నందు %sకు సాదాపాఠ్య ధృవీకరణము అవసరమైంది.  దీనిని అనుమతించి మరియు "
+"ధృవీకరణము కొనసాగించాలా?"
+
 msgid "SASL authentication failed"
 msgstr "SASL ధృవీకరణ విఫలమైంది"
 
@@ -5796,7 +5825,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "మీ ప్రొఫైల్ సమాచారము యింకా పొందలేదు. దయచేసి మరలా తర్వాత ప్రయత్నించండి."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5808,6 +5837,7 @@
 msgstr "PIN నిర్ధారించుము"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "నామ ప్రదర్శన"
 
@@ -5864,19 +5894,16 @@
 msgid "Connecting..."
 msgstr "అనుసంధానించబడుతున్నది ..."
 
-msgid "The nick name you entered is invalid."
-msgstr "మీరు ప్రవేశపెట్టిన ముద్దుపేరు చెల్లనిది."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "మీరు ప్రవేశపెట్టిన పేరు చెల్లనిది."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "మీరు ప్రవేశపెట్టిన PIN చెల్లని పొడవు [7-10] కలిగివుంది."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit లాగిన్ పేరు"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "ముద్దుపేరు"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5904,10 +5931,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "చెల్లని దేశము యెంపికకాబడినది. దయచేసి తర్వాత ప్రయత్నించండి."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "వినియోగదారిపేరు నమోదుకాలేదు. దయచేసి ముందు నమోదుచేయండి."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "వినియోగదారిపేరు యిప్పటికే నమోదైంది. దయచేసి వేరొక వినియోగదారిపేరును యెంచుకొనుము."
 
 msgid "Internal error. Please try again later."
@@ -5953,8 +5982,9 @@
 msgid "Hidden Number"
 msgstr "మరుగునవున్న నంబర్"
 
-msgid "Your Mobile Number..."
-msgstr "మీ మొబైల్ నెంబర్..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "యాహూ ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5980,6 +6010,15 @@
 msgid "_Room Name:"
 msgstr "గది (_R):"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "మీకు మెయిలు వచ్చింది!"
+
+#, fuzzy
+msgid "Last Online"
+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కు అనుసంధానమును పోగొట్టుకున్నాము. దయచేసి అనుసంధానమవ్వు."
@@ -7695,11 +7734,11 @@
 msgid "Invalid SNAC"
 msgstr "విలువలేని SNAC"
 
-msgid "Rate to host"
-msgstr "హోస్ట్‌కు రేటు "
-
-msgid "Rate to client"
-msgstr "ఖాతాదారునికి రేటు"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "సేవ అందుబాటులోలేదు"
@@ -9931,7 +9970,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "చాట్ రూమ్ మరియు గోష్టులను పట్టించుకోవద్దు"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "SSL అనుసంధానముల కొరకు ఖాతా ప్రోక్సీను వుపయోగించుము"
 
 msgid "Chat room list URL"
@@ -12728,11 +12768,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "వేరొక libpurple క్లైంట్ యిప్పటికే నడుచుచున్నది కావున నిష్క్రమించుచున్నది.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/మాధ్యమం (_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/మాధ్యమం/హాంగప్ (_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "హెంగ్ అప్"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13529,9 +13571,6 @@
 msgid "Custom Smiley Manager"
 msgstr "మలచుకొనిన స్మైలీ నిర్వాహిక"
 
-msgid "Attention received"
-msgstr ""
-
 msgid "Select Buddy Icon"
 msgstr "మిత్రుని ప్రతిమను యెంపికచేయి"
 
@@ -14985,6 +15024,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "ధృవీకరణపత్రము యింకా చెల్లునది కాలేదు."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "మీరు ప్రవేశపెట్టిన ముద్దుపేరు చెల్లనిది."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit లాగిన్ పేరు"
+
+#~ msgid "Nick Name"
+#~ msgstr "ముద్దుపేరు"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "మీ మొబైల్ నెంబర్..."
+
+#~ msgid "Rate to host"
+#~ msgstr "హోస్ట్‌కు రేటు "
+
+#~ msgid "Rate to client"
+#~ msgstr "ఖాతాదారునికి రేటు"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/మాధ్యమం/హాంగప్ (_H)"
+
 #~ msgid "Unknown reason."
 #~ msgstr "కారణం తెలియదు. "
 
--- a/po/th.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/th.po	Sat Jul 31 23:42:35 2010 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2006-04-04 15:35+0700\n"
 "Last-Translator: Isriya Paireepairit <markpeak@gmail.com>\n"
 "Language-Team: Thai <l10n@opentle.org>\n"
@@ -52,12 +52,23 @@
 msgid "Error"
 msgstr ""
 
+msgid "Account was not modified"
+msgstr ""
+
 msgid "Account was not added"
 msgstr ""
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "แจ้งเตือนเมลใหม่"
 
@@ -1297,6 +1308,9 @@
 msgid "Someone says your username in chat"
 msgstr "มีคนเอ่ยถึงชื่อคุณในการสนทนากลุ่ม"
 
+msgid "Attention received"
+msgstr ""
+
 #, fuzzy
 msgid "GStreamer Failure"
 msgstr "บันทึกแฟ้ม"
@@ -1604,7 +1618,7 @@
 msgid "Online"
 msgstr ""
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "ออฟไลน์"
 
@@ -1724,7 +1738,9 @@
 "currently trusted."
 msgstr ""
 
-msgid "The certificate is not valid yet."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
 msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
@@ -3781,6 +3797,16 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "อนุญาตให้ล็อกอินผ่านการเชื่อมต่อที่ไม่เข้ารหัส"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "เชื่อมต่อล้มเหลว"
 
@@ -5915,7 +5941,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5927,6 +5953,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "นามสกุล"
@@ -5994,20 +6021,15 @@
 msgid "Connecting..."
 msgstr "กำลังเชื่อมต่อ"
 
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr ""
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr ""
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "ชื่อเล่น"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6036,10 +6058,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 msgid "Internal error. Please try again later."
@@ -6093,8 +6115,8 @@
 msgstr "ชื่อกลาง"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "ตั้งหมายเลขโทรศัพท์มือถือ"
+msgid "Your MXit ID..."
+msgstr "เลือก..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6121,6 +6143,15 @@
 msgid "_Room Name:"
 msgstr "_ห้อง:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "%s เปลี่ยนสถานะเป็นไม่ได้ใช้งาน (%s)"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -7828,10 +7859,10 @@
 msgid "Invalid SNAC"
 msgstr ""
 
-msgid "Rate to host"
-msgstr ""
-
-msgid "Rate to client"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
 msgstr ""
 
 msgid "Service unavailable"
@@ -10102,7 +10133,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "ไม่สนใจคำเชิญร่วมสนทนากลุ่มหรือประชุม"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -12999,10 +13030,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -13861,9 +13892,6 @@
 msgid "Custom Smiley Manager"
 msgstr ""
 
-msgid "Attention received"
-msgstr ""
-
 #, fuzzy
 msgid "Select Buddy Icon"
 msgstr "ไอคอนในการสนทนา"
@@ -15350,6 +15378,14 @@
 msgstr ""
 
 #, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "ชื่อเล่น"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "ตั้งหมายเลขโทรศัพท์มือถือ"
+
+#, fuzzy
 #~ msgid "Artist"
 #~ msgstr "ที่อยู่"
 
--- a/po/tr.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/tr.po	Sat Jul 31 23:42:35 2010 +0000
@@ -13,7 +13,7 @@
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2007-11-09 00:33+0200\n"
 "Last-Translator: Serdar Soytetir <tulliana@gmail.com>\n"
 "Language-Team:  <tr@li.org>\n"
@@ -69,6 +69,10 @@
 msgid "Error"
 msgstr "Hata"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Hesap eklenmedi"
+
 msgid "Account was not added"
 msgstr "Hesap eklenmedi"
 
@@ -76,6 +80,14 @@
 msgid "Username of an account must be non-empty."
 msgstr "Bir hesabın kayıtlı isim kısmı boş olmamalıdır."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Yeni e-posta bildirimleri"
 
@@ -1271,6 +1283,10 @@
 msgid "Someone says your username in chat"
 msgstr "Biri sohbette takma adınızı söyledi"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Kayıt Gerekli"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer Başarısız"
 
@@ -1559,7 +1575,7 @@
 msgid "Online"
 msgstr "Çevrimiçi"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Çevrimdışı"
 
@@ -1682,9 +1698,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Seçilen dosya geçerli bir eklenti değil."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3809,6 +3826,21 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Sunucu şifrelenmemiş bir bağlantı üzerinden normal metin ile kimlik "
+"doğrulama istiyor"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Sunucu şifrelenmemiş bir bağlantı üzerinden normal metin ile kimlik "
+"doğrulama istiyor.  Buna izin vererek kimlik doğrulamaya devam etmek istiyor "
+"musunuz?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Kimlik denetimi başarısız"
 
@@ -5992,7 +6024,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6005,6 +6037,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Soyad"
@@ -6074,7 +6107,7 @@
 msgstr "Bağlanılıyor"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Girilen SecurID anahtarı geçersiz."
 
 #, fuzzy
@@ -6082,13 +6115,8 @@
 msgstr "Girilen SecurID anahtarı geçersiz."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Takma ad"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6118,10 +6146,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6178,8 +6206,8 @@
 msgstr "İkinci İsim"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Cep Telefonu Numarası Ayarla..."
+msgid "Your MXit ID..."
+msgstr "Yahoo! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6207,6 +6235,15 @@
 msgid "_Room Name:"
 msgstr "_Oda:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "E-postanız var!"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Çevrimiçi"
+
 #. 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 ""
@@ -7982,11 +8019,11 @@
 msgid "Invalid SNAC"
 msgstr "Geçersiz SNAC"
 
-msgid "Rate to host"
-msgstr "Hostu değerlendir"
-
-msgid "Rate to client"
-msgstr "İstemciyi değerlendir"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Bu servis hizmet dışı"
@@ -10294,7 +10331,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferans ve sohbet odası davetlerini yok say"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13198,10 +13235,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14059,10 +14096,6 @@
 msgstr "Sertifika Yöneticisi"
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Kayıt Gerekli"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Kişi Seçin"
 
@@ -15603,6 +15636,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Seçilen dosya geçerli bir eklenti değil."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Girilen SecurID anahtarı geçersiz."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Takma ad"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Cep Telefonu Numarası Ayarla..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Hostu değerlendir"
+
+#~ msgid "Rate to client"
+#~ msgstr "İstemciyi değerlendir"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Bilinmeyen Sebep."
 
@@ -16542,14 +16597,6 @@
 #~ msgid "Couldn't open file"
 #~ msgstr "Dosya açılamadı"
 
-#~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "Sunucu şifrelenmemiş bir bağlantı üzerinden normal metin ile kimlik "
-#~ "doğrulama istiyor.  Buna izin vererek kimlik doğrulamaya devam etmek "
-#~ "istiyor musunuz?"
-
 #~ msgid "Error initializing session"
 #~ msgstr "Oturum başlatma hatası"
 
--- a/po/uk.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/uk.po	Sat Jul 31 23:42:35 2010 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
@@ -63,12 +63,24 @@
 msgid "Error"
 msgstr "Помилка"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Обліковий запис не був доданий"
+
 msgid "Account was not added"
 msgstr "Обліковий запис не був доданий"
 
 msgid "Username of an account must be non-empty."
 msgstr "Ім'я користувача облікового запису не має бути порожнім."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Сповіщення про нову пошту"
 
@@ -1264,6 +1276,9 @@
 msgid "Someone says your username in chat"
 msgstr "Хтось назвав ваше ім'я у балачці"
 
+msgid "Attention received"
+msgstr "Отриманий сигнал уваги"
+
 msgid "GStreamer Failure"
 msgstr "Помилка GStreamer"
 
@@ -1556,7 +1571,7 @@
 msgid "Online"
 msgstr "У мережі"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Поза мережею"
 
@@ -1675,8 +1690,10 @@
 "Сертифікат не є довіреним, тому що немає жодного довіреного сертифікату, "
 "який може перевірити його."
 
-msgid "The certificate is not valid yet."
-msgstr "Сертифікат ще не дійсний."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "Термін дії сертифікату закінчився і його не слід вважати дійсним."
@@ -3834,6 +3851,19 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Сервер вважає, що автентифікація завершена, але клієнт ні"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Сервер вимагає автентифікацію звичайним текстом через нешифрований потік"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s потребує автентифікації відкритим текстом через нешифроване з'єднання. "
+"Дозволити це та продовжити автентифікацію?"
+
 msgid "SASL authentication failed"
 msgstr "Помилка автентифікації SASL"
 
@@ -5927,7 +5957,8 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Відомості про профіль ще не отримані. Будь ласка, спробуйте пізніше."
 
-msgid "Your MXitId"
+#, fuzzy
+msgid "Your UID"
 msgstr "Ваш MXitId"
 
 #. pin
@@ -5939,6 +5970,7 @@
 msgstr "Перевірити PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Відображуване ім'я"
 
@@ -5999,19 +6031,16 @@
 msgid "Connecting..."
 msgstr "З'єднання..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Введене прізвисько неправильне."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Введене ім'я неправильне."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Введений PIN має неправильну довжину [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Ім'я входу MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Прізвисько"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6039,10 +6068,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Вибрана неправильна країна. Будь ласка, спробуйте ще раз."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Ім'я користувача не зареєстроване. Будь ласка, спершу зареєструйтеся."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "Ім'я користувача вже зареєстроване. Будь ласка, виберіть інше."
 
 msgid "Internal error. Please try again later."
@@ -6087,8 +6118,9 @@
 msgid "Hidden Number"
 msgstr "Схований номер"
 
-msgid "Your Mobile Number..."
-msgstr "Номер мобільного телефону..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Ваш MXitId"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6114,6 +6146,15 @@
 msgid "_Room Name:"
 msgstr "_Кімната:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Ви маєте лист!"
+
+#, fuzzy
+msgid "Last Online"
+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. Будь ласка, підключіться ще раз."
@@ -7911,13 +7952,11 @@
 msgid "Invalid SNAC"
 msgstr "Неправильний ID"
 
-#, fuzzy
-msgid "Rate to host"
-msgstr "Запросити до балачки"
-
-#, fuzzy
-msgid "Rate to client"
-msgstr "Останній відомий клієнт"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 #, fuzzy
 msgid "Service unavailable"
@@ -10197,7 +10236,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Нехтувати запрошеннями у конференції та кімнати балачок"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Використовувати проксі облікового запису для з'єднань SSL"
 
 msgid "Chat room list URL"
@@ -13072,11 +13112,13 @@
 msgstr ""
 "Вихід, тому що вже запущений інший клієнт, який використовує libpurple.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Медіа"
 
-msgid "/Media/_Hangup"
-msgstr "/Медіа/_Завершити"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Завершити"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13878,9 +13920,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Керування нетиповими усмішками"
 
-msgid "Attention received"
-msgstr "Отриманий сигнал уваги"
-
 msgid "Select Buddy Icon"
 msgstr "Виберіть значок контакту"
 
@@ -15370,3 +15409,29 @@
 
 msgid "You do not have permission to uninstall this application."
 msgstr "Ви не маєте права на видалення цієї програми."
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Сертифікат ще не дійсний."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Введене прізвисько неправильне."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Ім'я входу MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Прізвисько"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Номер мобільного телефону..."
+
+#, fuzzy
+#~ msgid "Rate to host"
+#~ msgstr "Запросити до балачки"
+
+#, fuzzy
+#~ msgid "Rate to client"
+#~ msgstr "Останній відомий клієнт"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Медіа/_Завершити"
--- a/po/ur.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/ur.po	Sat Jul 31 23:42:35 2010 +0000
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin Urdu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2007-11-14 14:00+0530\n"
 "Last-Translator: RKVS Raman <raman@cdacbangalore.in>\n"
 "Language-Team: C-DAC,Gist,Urdu Team / BharateeyaOO.o <info.gist@cdac.in / "
@@ -62,6 +62,10 @@
 msgid "Error"
 msgstr "خامی"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "اكاؤنٹ  ملایا نہیں  گیا تھا"
+
 msgid "Account was not added"
 msgstr "اكاؤنٹ  ملایا نہیں  گیا تھا"
 
@@ -69,6 +73,14 @@
 msgid "Username of an account must be non-empty."
 msgstr "ایك اكاؤنٹ كا اسكرین نام خالی ہونا  چاہیے۔"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "نئی میل اطلاعات"
 
@@ -1309,6 +1321,10 @@
 msgid "Someone says your username in chat"
 msgstr " كسی نے آپ كا نام چیٹ میں كہا ہے"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "رجسٹریشن کی ضروت تھی"
+
 msgid "GStreamer Failure"
 msgstr "GSٹریمر نا كامیاب"
 
@@ -1611,7 +1627,7 @@
 msgid "Online"
 msgstr "آن لائن"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr " آف لائن  "
 
@@ -1735,9 +1751,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "مخصوص کیا گيا اسکرین نام معتبرنہیں ہے۔"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3904,6 +3921,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "سرور کو ان اینکریپٹیڈ اسٹریم پر سادہ متن تصدیق کی ضرورت ہے "
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"اس سرور کو ان اینکریپٹیڈ کنیکشن پر سادہ متن تصدیق کی ضرورت ہے ۔ اس کو اجازت  "
+"ہے اور تصدیق جاری رکھنا ہے؟"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "تصدیق نا کام"
 
@@ -6142,7 +6171,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6155,6 +6184,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "خاندان کا نام"
@@ -6228,7 +6258,7 @@
 msgstr "کنیکٹ کررہا ہے"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
 
 #, fuzzy
@@ -6236,13 +6266,8 @@
 msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "عرفیتی نام"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6272,10 +6297,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6332,8 +6357,8 @@
 msgstr "درمیانی نام"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "موبائل فون نمبر سیٹ كریں۔۔۔"
+msgid "Your MXit ID..."
+msgstr "یا ہو! ID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6361,6 +6386,15 @@
 msgid "_Room Name:"
 msgstr "کمرہ:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "آپ میل ركھتے ہیں !"
+
+#, fuzzy
+msgid "Last Online"
+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 ""
@@ -8200,11 +8234,11 @@
 msgid "Invalid SNAC"
 msgstr "غیر معتبر SNAC"
 
-msgid "Rate to host"
-msgstr "ہوسٹ کے لئے قیمت"
-
-msgid "Rate to client"
-msgstr "کلائنٹ کے لئے قیمت"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "سرو س غیر دستیاب "
@@ -10556,7 +10590,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "كانفرنس اورچیٹ روم دعوتیں نظراندازكریں"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -13545,10 +13579,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14419,10 +14453,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "رجسٹریشن کی ضروت تھی"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "بڈی منتخب کرو"
 
@@ -16027,6 +16057,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "مخصوص کیا گيا اسکرین نام معتبرنہیں ہے۔"
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "داخل کی گئی سیکیور IDکلید غیر معتبر ہے۔"
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "عرفیتی نام"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "موبائل فون نمبر سیٹ كریں۔۔۔"
+
+#~ msgid "Rate to host"
+#~ msgstr "ہوسٹ کے لئے قیمت"
+
+#~ msgid "Rate to client"
+#~ msgstr "کلائنٹ کے لئے قیمت"
+
 #~ msgid "Unknown reason."
 #~ msgstr "نامعلوم وجہ۔"
 
@@ -16984,13 +17036,6 @@
 #~ msgid "Error setting socket options"
 #~ msgstr "خامی ساكیٹ آپشنس سیٹ كررہی ہے"
 
-#~ msgid ""
-#~ "This server requires plaintext authentication over an unencrypted "
-#~ "connection.  Allow this and continue authentication?"
-#~ msgstr ""
-#~ "اس سرور کو ان اینکریپٹیڈ کنیکشن پر سادہ متن تصدیق کی ضرورت ہے ۔ اس کو "
-#~ "اجازت  ہے اور تصدیق جاری رکھنا ہے؟"
-
 #, fuzzy
 #~ msgid "Current media"
 #~ msgstr "خالیہ ٹوکن"
--- a/po/vi.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/vi.po	Sat Jul 31 23:42:35 2010 +0000
@@ -12,7 +12,7 @@
 msgstr ""
 "Project-Id-Version: CVS Version of Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2010-03-12 17:32+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -66,12 +66,24 @@
 msgid "Error"
 msgstr "Lỗi"
 
+#, fuzzy
+msgid "Account was not modified"
+msgstr "Tài khoản chưa được thêm"
+
 msgid "Account was not added"
 msgstr "Tài khoản chưa được thêm"
 
 msgid "Username of an account must be non-empty."
 msgstr "Tên người dùng của tài khoản không thể là rỗng."
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Thông báo thư mới"
 
@@ -1259,6 +1271,9 @@
 msgid "Someone says your username in chat"
 msgstr "Ai đó nói tên bạn trong chát"
 
+msgid "Attention received"
+msgstr "Nhận được sự chú ý"
+
 msgid "GStreamer Failure"
 msgstr "Lỗi GStreamer"
 
@@ -1553,7 +1568,7 @@
 msgid "Online"
 msgstr "Trực tuyến"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Ngoại tuyến"
 
@@ -1675,8 +1690,10 @@
 "Chứng nhận này không đáng tin vì hiện thời không đáng tin chứng nhận nào có "
 "khả năng thẩm tra nó."
 
-msgid "The certificate is not valid yet."
-msgstr "Chứng nhận này chưa hợp lệ."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -3837,6 +3854,19 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "Máy phục vụ thấy rằng hoàn tất xác thực, còn trình khách không phải"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr ""
+"Máy phục vụ yêu cầu xác thực bằng nhập thô qua luồng dữ liệu không mật mã"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"%s yêu cầu xác thực bằng nhập thô qua kết nối không mật mã. Cho phép điều "
+"này và tiếp tục xác thực không? (KHÔNG BẢO MẬT)"
+
 msgid "SASL authentication failed"
 msgstr "Lỗi xác thực SASL"
 
@@ -5930,7 +5960,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "Thông tin về hồ sơ của bạn chưa được lấy. Hãy thử lại về sau."
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -5942,6 +5972,7 @@
 msgstr "Thẩm tra PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
@@ -6002,19 +6033,16 @@
 msgid "Connecting..."
 msgstr "Đang kết nối..."
 
-msgid "The nick name you entered is invalid."
-msgstr "Bạn đã gõ một tên hiệu không đúng."
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "Bạn đã gõ một tên không đúng."
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "Bạn đã gõ một mã PIN có chiều dài không đúng [7-10]."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "Tên đăng nhập MXit"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "Tên hiệu"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6042,10 +6070,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "Bạn đã chọn sai một quốc gia. Hãy thử lại về sau."
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "Tên người dùng chưa được đăng ký. Hãy đăng ký trước hết."
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 "Tên người dùng này đã được đăng ký về trước. Hãy chọn một tên người dùng "
 "khác."
@@ -6093,8 +6123,9 @@
 msgid "Hidden Number"
 msgstr "Con số bị ẩn"
 
-msgid "Your Mobile Number..."
-msgstr "Số điện thoại di động của bạn..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo ID..."
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6120,6 +6151,15 @@
 msgid "_Room Name:"
 msgstr "_Phòng:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Bạn có thư mới !"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Trực tuyến"
+
 #. 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 "Kết nối tới MXit bị mất. Hãy tái kết nối."
@@ -7853,11 +7893,11 @@
 msgid "Invalid SNAC"
 msgstr "SNAC không hợp lệ"
 
-msgid "Rate to host"
-msgstr "Tốc độ tới máy phục vụ"
-
-msgid "Rate to client"
-msgstr "Tốc độ tới trình khách"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Dịch vụ không sẵn sàng"
@@ -10134,7 +10174,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "Lời đi các lời mời vào hội thảo hay phòng chát"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "Dùng ủy nhiệm tài khoản cho kết nối SSL"
 
 msgid "Chat room list URL"
@@ -12984,11 +13025,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "Đang thoát do một ứng dụng khách libpurple đang chạy.\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/_Phương tiện"
 
-msgid "/Media/_Hangup"
-msgstr "/Phương tiện/_Ngừng nói"
+#, fuzzy
+msgid "_Hangup"
+msgstr "Ngừng nói"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13793,9 +13836,6 @@
 msgid "Custom Smiley Manager"
 msgstr "Bộ Quản lý Hình cười Riêng"
 
-msgid "Attention received"
-msgstr "Nhận được sự chú ý"
-
 msgid "Select Buddy Icon"
 msgstr "Chọn biểu tượng bạn chát"
 
@@ -15279,6 +15319,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Chứng nhận này chưa hợp lệ."
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Bạn đã gõ một tên hiệu không đúng."
+
+#~ msgid "MXit Login Name"
+#~ msgstr "Tên đăng nhập MXit"
+
+#~ msgid "Nick Name"
+#~ msgstr "Tên hiệu"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Số điện thoại di động của bạn..."
+
+#~ msgid "Rate to host"
+#~ msgstr "Tốc độ tới máy phục vụ"
+
+#~ msgid "Rate to client"
+#~ msgstr "Tốc độ tới trình khách"
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/Phương tiện/_Ngừng nói"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Không biết sao."
 
--- a/po/xh.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/xh.po	Sat Jul 31 23:42:35 2010 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-0400\n"
 "PO-Revision-Date: 2005-03-23 12:21+0200\n"
 "Last-Translator: Canonical Ltd <translations@canonical.com>\n"
 "Language-Team: Xhosa <xh-translate@ubuntu.com>\n"
@@ -52,12 +52,24 @@
 msgstr "Impazamo"
 
 #, fuzzy
+msgid "Account was not modified"
+msgstr "I-akhawunti ivaliwe"
+
+#, fuzzy
 msgid "Account was not added"
 msgstr "I-akhawunti ivaliwe"
 
 msgid "Username of an account must be non-empty."
 msgstr ""
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "Izaziso ngemeyile entsha"
 
@@ -1342,6 +1354,10 @@
 msgid "Someone says your username in chat"
 msgstr "Umntu othile ubiza igama lakho kwincoko"
 
+#, fuzzy
+msgid "Attention received"
+msgstr "Kufuneka uBhaliso"
+
 msgid "GStreamer Failure"
 msgstr ""
 
@@ -1656,7 +1672,7 @@
 msgid "Online"
 msgstr "Lukhona unxibelelwano"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "Akukho lunxibelelwano"
 
@@ -1784,9 +1800,10 @@
 "currently trusted."
 msgstr ""
 
-#, fuzzy
-msgid "The certificate is not valid yet."
-msgstr "Ulungiselelo olutsha alusebenzi."
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr ""
@@ -4017,6 +4034,18 @@
 msgstr ""
 
 #, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "Iseva ifuna uqinisekiso lombhalo ocacileyo kunohlobo oluntsonkothileyo"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr ""
+"Iseva ifuna uqinisekiso lombhalo ocacileyo kunonxibelelwano "
+"oluntsonkothileyo. Uvumela oku ze uqhubeke nokuqinisekisa?"
+
+#, fuzzy
 msgid "SASL authentication failed"
 msgstr "Ukuqinisekisa akuphumelelanga"
 
@@ -6316,7 +6345,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr ""
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6329,6 +6358,7 @@
 msgstr ""
 
 #. display name
+#. nick name (required)
 #, fuzzy
 msgid "Display Name"
 msgstr "Okuseskrinini"
@@ -6403,7 +6433,7 @@
 msgstr "Ukunxulumana"
 
 #, fuzzy
-msgid "The nick name you entered is invalid."
+msgid "The Display Name you entered is invalid."
 msgstr "Ulungiselelo olutsha alusebenzi."
 
 #, fuzzy
@@ -6411,13 +6441,8 @@
 msgstr "Ulungiselelo olutsha alusebenzi."
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr ""
-
-#. nick name (required)
-#, fuzzy
-msgid "Nick Name"
-msgstr "Igama lesiqhulo"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 #, fuzzy
@@ -6455,10 +6480,10 @@
 msgid "Invalid country selected. Please try again."
 msgstr ""
 
-msgid "Username is not registered. Please register first."
-msgstr ""
-
-msgid "Username is already registered. Please choose another username."
+msgid "The MXit ID you entered is not registered. Please register first."
+msgstr ""
+
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr ""
 
 #, fuzzy
@@ -6515,8 +6540,8 @@
 msgstr "iGama eliPhakathi"
 
 #, fuzzy
-msgid "Your Mobile Number..."
-msgstr "Misela iNombolo yeFowuni oHamba nayo"
+msgid "Your MXit ID..."
+msgstr "Isazisi seYahoo!"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6544,6 +6569,15 @@
 msgid "_Room Name:"
 msgstr "_iGumbi:"
 
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "Ukhatyiwe yi-%s: (%s)"
+
+#, fuzzy
+msgid "Last Online"
+msgstr "Lukhona unxibelelwano"
+
 #. we must have lost the connection, so terminate it so that we can reconnect
 #, fuzzy
 msgid "We have lost the connection to MXit. Please reconnect."
@@ -8413,11 +8447,11 @@
 msgid "Invalid SNAC"
 msgstr "iSNAC engaSebenziyo"
 
-msgid "Rate to host"
-msgstr "Umqangatho womququzeleli"
-
-msgid "Rate to client"
-msgstr "Umgangatho weMsebenzisi"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "Inkonzo ayifumaneki"
@@ -10879,7 +10913,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr ""
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 #, fuzzy
@@ -13962,10 +13996,10 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr ""
 
-msgid "/_Media"
-msgstr ""
-
-msgid "/Media/_Hangup"
+msgid "_Media"
+msgstr ""
+
+msgid "_Hangup"
 msgstr ""
 
 #, c-format
@@ -14879,10 +14913,6 @@
 msgstr ""
 
 #, fuzzy
-msgid "Attention received"
-msgstr "Kufuneka uBhaliso"
-
-#, fuzzy
 msgid "Select Buddy Icon"
 msgstr "Khetha umHlobo"
 
@@ -16485,6 +16515,28 @@
 msgid "You do not have permission to uninstall this application."
 msgstr ""
 
+#, fuzzy
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "Ulungiselelo olutsha alusebenzi."
+
+#, fuzzy
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "Ulungiselelo olutsha alusebenzi."
+
+#, fuzzy
+#~ msgid "Nick Name"
+#~ msgstr "Igama lesiqhulo"
+
+#, fuzzy
+#~ msgid "Your Mobile Number..."
+#~ msgstr "Misela iNombolo yeFowuni oHamba nayo"
+
+#~ msgid "Rate to host"
+#~ msgstr "Umqangatho womququzeleli"
+
+#~ msgid "Rate to client"
+#~ msgstr "Umgangatho weMsebenzisi"
+
 #~ msgid "Unknown reason."
 #~ msgstr "Isizathu esingaziwayo."
 
--- a/po/zh_CN.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/zh_CN.po	Sat Jul 31 23:42:35 2010 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: pidgin HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
-"PO-Revision-Date: 2010-01-13 01:15+0800\n"
+"POT-Creation-Date: 2010-07-27 02:13-0400\n"
+"PO-Revision-Date: 2010-07-19 19:31+0800\n"
 "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -62,12 +62,23 @@
 msgid "Error"
 msgstr "出错"
 
+msgid "Account was not modified"
+msgstr "帐号已更改"
+
 msgid "Account was not added"
 msgstr "帐号未添加"
 
 msgid "Username of an account must be non-empty."
 msgstr "帐号的用户名必须非空。"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr "已连接到服务器时不能改变帐号协议。"
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr "已连接到服务器时不能改变帐号名。"
+
 msgid "New mail notifications"
 msgstr "新邮件通知"
 
@@ -829,7 +840,7 @@
 
 #. Search box *********
 msgid "Scroll/Search: "
-msgstr ""
+msgstr "搜索:"
 
 #, c-format
 msgid "Conversations in %s"
@@ -1227,6 +1238,9 @@
 msgid "Someone says your username in chat"
 msgstr "有人在聊天中提到您的名字"
 
+msgid "Attention received"
+msgstr "收到提示"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 错误"
 
@@ -1394,7 +1408,7 @@
 msgstr "无法载入此插件,因为它没有加入 X11 支持。"
 
 msgid "GntClipboard"
-msgstr ""
+msgstr "GntClipboard"
 
 msgid "Clipboard plugin"
 msgstr "剪贴板插件"
@@ -1443,7 +1457,7 @@
 msgstr "同时发出声音!"
 
 msgid "Set URGENT for the terminal window."
-msgstr ""
+msgstr "为终端窗口设置 URGENT。"
 
 msgid "GntGf"
 msgstr "GntGf"
@@ -1512,7 +1526,7 @@
 msgid "Online"
 msgstr "在线"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "离线"
 
@@ -1605,13 +1619,11 @@
 msgid "Set User Info"
 msgstr "设置用户信息"
 
-#, fuzzy
 msgid "This protocol does not support setting a public alias."
-msgstr "此协议不支持聊天室。"
-
-#, fuzzy
+msgstr "此协议不支持设置公共别名。"
+
 msgid "This protocol does not support fetching the public alias."
-msgstr "此协议不支持聊天室。"
+msgstr "此协议不支持获取公共别名。"
 
 msgid "Unknown"
 msgstr "未知"
@@ -1630,8 +1642,10 @@
 "currently trusted."
 msgstr "此证书不被信任,当前没有其他证书可用于验证它已被信任。"
 
-msgid "The certificate is not valid yet."
-msgstr "此证书无效。"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr "证书无效,请检查您计算机的日期和时间。"
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "此证书已过期,故不被认为有效。"
@@ -1660,7 +1674,7 @@
 #. Make messages
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s 已办法了以下一次性证书:"
 
 #, c-format
 msgid ""
@@ -1821,7 +1835,7 @@
 msgstr "获取服务器名称失败:%s"
 
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr ""
+msgstr "Purple 的 D-BUS 服务器因列出的原因未能运行"
 
 msgid "No name"
 msgstr "无名称"
@@ -2182,11 +2196,11 @@
 
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
-msgstr ""
+msgstr "ABI 版本不匹配 %d.%d.x (需要 %d.%d.x)"
 
 msgid ""
 "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr ""
+msgstr "插件没有实现所有必须的功能(列出图标、登录和关闭)"
 
 #, c-format
 msgid ""
@@ -2261,6 +2275,8 @@
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
+"当自动接受的文件传输完成时弹出提示\n"
+"(仅当没有与发送者进行聊天时)"
 
 msgid "Create a new directory for each user"
 msgstr "为每个用户创建新目录"
@@ -2466,7 +2482,7 @@
 msgstr "%s 已退出。"
 
 msgid "One or more messages may have been undeliverable."
-msgstr ""
+msgstr "一个或更多消息可能无法送达对方。"
 
 msgid "You were disconnected from the server."
 msgstr "您已经断开与服务器的连接。"
@@ -2652,7 +2668,7 @@
 #. *< version
 #. *  summary
 msgid "Enforce that passwords are used only once."
-msgstr ""
+msgstr "强制密码仅能使用一次。"
 
 #. *  description
 msgid ""
@@ -3679,7 +3695,16 @@
 msgstr "服务器的挑战无效"
 
 msgid "Server thinks authentication is complete, but client does not"
-msgstr ""
+msgstr "服务器认为认证已完成,但客户端没有"
+
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "服务器需要在不加密流上使用纯文本验证"
+
+#, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr "%s 需要在不加密流上使用纯文本验证。允许这么做并继续验证吗?"
 
 msgid "SASL authentication failed"
 msgstr "认证失败"
@@ -3688,38 +3713,33 @@
 msgid "SASL error: %s"
 msgstr "SASL 错误:%s"
 
-#, fuzzy
 msgid "Invalid Encoding"
-msgstr "无效的输入条件"
-
-#, fuzzy
+msgstr "无效编码"
+
 msgid "Unsupported Extension"
-msgstr "不支持的版本"
+msgstr "不支持的扩展"
 
 msgid ""
 "Unexpected response from the server.  This may indicate a possible MITM "
 "attack"
-msgstr ""
+msgstr "收到服务器的意外响应。这可能意味着一个中间人(MITM)攻击"
 
 msgid ""
 "The server does support channel binding, but did not appear to advertise "
 "it.  This indicates a likely MITM attack"
-msgstr ""
-
-#, fuzzy
+msgstr "此服务器确实支持频道绑定,但并没有说明支持。这可能是中间人(MITM)攻击"
+
 msgid "Server does not support channel binding"
-msgstr "服务器未使用任何支持的身份验证方法"
-
-#, fuzzy
+msgstr "服务器未不支持频道绑定"
+
 msgid "Unsupported channel binding method"
-msgstr "不支持的编码"
+msgstr "不支持的频道绑定方式"
 
 msgid "User not found"
 msgstr "用户未找到"
 
-#, fuzzy
 msgid "Invalid Username Encoding"
-msgstr "无效用户名"
+msgstr "无效的用户名编码"
 
 msgid "Resource Constraint"
 msgstr "资源约束"
@@ -3738,7 +3758,7 @@
 msgstr "从服务器收到了意外的响应"
 
 msgid "The BOSH connection manager terminated your session."
-msgstr ""
+msgstr "BOSH 连接管理器终止了您的会话。"
 
 msgid "No session ID given"
 msgstr "没有给出会话 ID"
@@ -4044,7 +4064,7 @@
 msgstr "无效的 XMPP ID。您必须设置有效的域名。"
 
 msgid "Malformed BOSH URL"
-msgstr ""
+msgstr "畸形的 BOSH URL"
 
 #, c-format
 msgid "Registration of %s@%s successful"
@@ -4170,13 +4190,11 @@
 msgid "Allow Buzz"
 msgstr "允许屏幕振动"
 
-#, fuzzy
 msgid "Mood Name"
-msgstr "教名"
-
-#, fuzzy
+msgstr "心情名称"
+
 msgid "Mood Comment"
-msgstr "好友注释"
+msgstr "心情注释"
 
 #. primitive
 #. ID
@@ -4455,7 +4473,7 @@
 msgid ""
 "Please select the resource of %s with which you would like to start a media "
 "session."
-msgstr ""
+msgstr "请选择 %s 的资源以便开始多媒体会话。"
 
 msgid "Select a Resource"
 msgstr "选择资源"
@@ -4463,9 +4481,8 @@
 msgid "Initiate Media"
 msgstr "创建多媒体会话"
 
-#, fuzzy
 msgid "Account does not support PEP, can't set mood"
-msgstr "此协议不支持聊天室。"
+msgstr "此帐号不支持 PEP,无法发送心情"
 
 msgid "config:  Configure a chat room."
 msgstr "配置:配置聊天室。"
@@ -4516,9 +4533,8 @@
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: 向联系人发送闪屏震动,以便引起他的注意"
 
-#, fuzzy
 msgid "mood: Set current user mood"
-msgstr "选择正确用户"
+msgstr "mood:设置当前用户心情"
 
 msgid "Extended Away"
 msgstr "离开"
@@ -4562,7 +4578,7 @@
 msgstr "文件传送代理"
 
 msgid "BOSH URL"
-msgstr ""
+msgstr "BOSH URL"
 
 #. this should probably be part of global smiley theme settings later on,
 #. shared with MSN
@@ -4596,21 +4612,20 @@
 msgid "(Code %s)"
 msgstr "(代码 %s)"
 
-#, fuzzy
 msgid "A custom smiley in the message is too large to send."
-msgstr "无法发送消息:消息太大。"
+msgstr "消息中的自定义表情太大,无法发送。"
 
 msgid "XMPP stream header missing"
-msgstr ""
+msgstr "XMPP 流头部缺失"
 
 msgid "XMPP Version Mismatch"
-msgstr ""
+msgstr "XMPP 版本不匹配"
 
 msgid "XMPP stream missing ID"
-msgstr ""
+msgstr "XMPP 流 ID 缺失"
 
 msgid "XML Parse error"
-msgstr "XML 分析错误"
+msgstr "XML 解析错误"
 
 #, c-format
 msgid "Error joining chat %s"
@@ -4680,184 +4695,153 @@
 msgid "Please select the resource of %s to which you would like to send a file"
 msgstr ""
 
-#, fuzzy
 msgid "Afraid"
-msgstr "阿拉伯语"
-
-#, fuzzy
+msgstr "害怕"
+
 msgid "Amazed"
-msgstr "害羞"
-
-#, fuzzy
+msgstr "惊讶"
+
 msgid "Amorous"
-msgstr "显赫"
+msgstr "恋爱"
 
 msgid "Angry"
 msgstr "生气"
 
-#, fuzzy
 msgid "Annoyed"
-msgstr "已封禁"
+msgstr "烦闷"
 
 msgid "Anxious"
-msgstr "饥渴"
-
-#, fuzzy
+msgstr "忧虑"
+
 msgid "Aroused"
-msgstr "送出文字"
+msgstr "刚醒"
 
 msgid "Ashamed"
 msgstr "害羞"
 
 msgid "Bored"
-msgstr "枯燥"
-
-#, fuzzy
+msgstr "无聊"
+
 msgid "Brave"
-msgstr "保存"
-
-#, fuzzy
+msgstr "勇敢"
+
 msgid "Calm"
-msgstr "域"
-
-#, fuzzy
+msgstr "冷静"
+
 msgid "Cautious"
-msgstr "聊天"
-
-#, fuzzy
+msgstr "警惕"
+
 msgid "Cold"
-msgstr "粗体"
-
-#, fuzzy
+msgstr "感冒"
+
 msgid "Confident"
-msgstr "冲突"
-
-#, fuzzy
+msgstr "自信"
+
 msgid "Confused"
-msgstr "继续"
-
-#, fuzzy
+msgstr "困惑"
+
 msgid "Contemplative"
-msgstr "联系信息"
-
-#, fuzzy
+msgstr "沉思"
+
 msgid "Contented"
-msgstr "已连接"
-
-#, fuzzy
+msgstr "满足"
+
 msgid "Cranky"
-msgstr "公司"
+msgstr "怪癖"
 
 msgid "Crazy"
-msgstr ""
-
-#, fuzzy
+msgstr "疯狂"
+
 msgid "Creative"
-msgstr "创建"
-
-#, fuzzy
+msgstr "创造"
+
 msgid "Curious"
-msgstr "显赫"
-
-#, fuzzy
+msgstr "好奇"
+
 msgid "Dejected"
-msgstr "已拒绝"
-
-#, fuzzy
+msgstr "灰心"
+
 msgid "Depressed"
-msgstr "已删除"
-
-#, fuzzy
+msgstr "沮丧"
+
 msgid "Disappointed"
-msgstr "已断开连接。"
+msgstr "失望"
 
 msgid "Disgusted"
-msgstr ""
-
-#, fuzzy
+msgstr "讨厌"
+
 msgid "Dismayed"
-msgstr "禁用"
-
-#, fuzzy
+msgstr "惊愕"
+
 msgid "Distracted"
-msgstr "已脱离"
+msgstr "烦躁"
 
 msgid "Embarrassed"
-msgstr ""
-
-#, fuzzy
+msgstr "尴尬"
+
 msgid "Envious"
-msgstr "饥渴"
+msgstr "羡慕"
 
 msgid "Excited"
 msgstr "激动"
 
-#, fuzzy
 msgid "Flirtatious"
-msgstr "显赫"
-
-#, fuzzy
+msgstr "挑逗"
+
 msgid "Frustrated"
-msgstr "名"
+msgstr "失望"
 
 msgid "Grateful"
-msgstr ""
-
-#, fuzzy
+msgstr "感激"
+
 msgid "Grieving"
-msgstr "正在获取..."
+msgstr "伤心"
 
 msgid "Grumpy"
 msgstr "暴躁"
 
-#, fuzzy
 msgid "Guilty"
-msgstr "城市"
+msgstr "罪恶"
 
 msgid "Happy"
 msgstr "高兴"
 
 msgid "Hopeful"
-msgstr ""
+msgstr "希望"
 
 msgid "Hot"
 msgstr "热情"
 
 msgid "Humbled"
-msgstr ""
+msgstr "谦卑"
 
 msgid "Humiliated"
-msgstr ""
-
-#, fuzzy
+msgstr "屈辱"
+
 msgid "Hungry"
-msgstr "生气"
-
-#, fuzzy
+msgstr "饥饿"
+
 msgid "Hurt"
-msgstr "心情"
+msgstr "伤心"
 
 msgid "Impressed"
-msgstr ""
-
-#, fuzzy
+msgstr "印象深刻"
+
 msgid "In awe"
-msgstr "热恋"
+msgstr "敬畏"
 
 msgid "In love"
 msgstr "热恋"
 
-#, fuzzy
 msgid "Indignant"
-msgstr "印度尼西亚语"
+msgstr "愤慨"
 
 #, fuzzy
 msgid "Interested"
 msgstr "兴趣"
 
-#, fuzzy
 msgid "Intoxicated"
-msgstr "已邀请"
+msgstr "醉酒"
 
 msgid "Invincible"
 msgstr "无敌"
@@ -4865,82 +4849,68 @@
 msgid "Jealous"
 msgstr "警惕"
 
-#, fuzzy
 msgid "Lonely"
-msgstr "猴"
-
-#, fuzzy
+msgstr "孤单"
+
 msgid "Lost"
-msgstr "最大"
+msgstr "迷失"
 
 msgid "Lucky"
-msgstr ""
-
-#, fuzzy
+msgstr "幸运"
+
 msgid "Mean"
-msgstr "德语"
-
-#, fuzzy
+msgstr "卑鄙"
+
 msgid "Moody"
-msgstr "心情"
+msgstr "喜怒无常"
 
 msgid "Nervous"
-msgstr ""
-
-#, fuzzy
+msgstr "紧张"
+
 msgid "Neutral"
-msgstr "详细信息"
-
-#, fuzzy
+msgstr "中立"
+
 msgid "Offended"
-msgstr "离线"
+msgstr "生气"
 
 msgid "Outraged"
-msgstr ""
-
-#, fuzzy
+msgstr "震怒"
+
 msgid "Playful"
-msgstr "播放"
-
-#, fuzzy
+msgstr "爱玩"
+
 msgid "Proud"
-msgstr "大"
-
-#, fuzzy
+msgstr "自豪"
+
 msgid "Relaxed"
-msgstr "真名"
-
-#, fuzzy
+msgstr "放松"
+
 msgid "Relieved"
-msgstr "已接收"
-
-#, fuzzy
+msgstr "解雇"
+
 msgid "Remorseful"
-msgstr "删除"
-
-#, fuzzy
+msgstr "悔恨"
+
 msgid "Restless"
-msgstr "注册"
+msgstr "焦躁"
 
 msgid "Sad"
 msgstr "郁闷"
 
 msgid "Sarcastic"
-msgstr ""
+msgstr "讽刺"
 
 msgid "Satisfied"
-msgstr ""
-
-#, fuzzy
+msgstr "满足"
+
 msgid "Serious"
-msgstr "显赫"
-
-#, fuzzy
+msgstr "严肃"
+
 msgid "Shocked"
-msgstr "被屏蔽"
+msgstr "震惊"
 
 msgid "Shy"
-msgstr ""
+msgstr "害羞"
 
 msgid "Sick"
 msgstr "生病"
@@ -4952,37 +4922,32 @@
 msgid "Spontaneous"
 msgstr ""
 
-#, fuzzy
 msgid "Stressed"
-msgstr "速度:"
-
-#, fuzzy
+msgstr "压力"
+
 msgid "Strong"
-msgstr "声音"
+msgstr "坚强"
 
 msgid "Surprised"
-msgstr ""
+msgstr "惊讶"
 
 msgid "Thankful"
-msgstr ""
+msgstr "感激"
 
 msgid "Thirsty"
-msgstr ""
-
-#, fuzzy
+msgstr "渴望"
+
 msgid "Tired"
-msgstr "Fire"
-
-#, fuzzy
+msgstr "疲劳"
+
 msgid "Undefined"
-msgstr "下划线"
+msgstr "点此修改心情"
 
 msgid "Weak"
-msgstr ""
-
-#, fuzzy
+msgstr "虚弱"
+
 msgid "Worried"
-msgstr "枯燥"
+msgstr "担忧"
 
 msgid "Set User Nickname"
 msgstr "设置用户昵称"
@@ -4993,7 +4958,7 @@
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
-msgstr ""
+msgstr "此信息对您的所有联系人可见,请选择合适的内容。"
 
 msgid "Set"
 msgstr "设置"
@@ -5295,7 +5260,7 @@
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr ""
+msgstr "MSN 服务器屏蔽了以下正则表达式:<br/>%s"
 
 msgid "This account does not have email enabled."
 msgstr "此帐号没有启用电子邮件。"
@@ -5566,9 +5531,8 @@
 msgid "Show custom smileys"
 msgstr "显示自定义如下:"
 
-#, fuzzy
 msgid "Allow direct connections"
-msgstr "无法创建连接"
+msgstr "允许直连"
 
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge:向用户发送闪屏振动,以便引起他的注意"
@@ -5653,7 +5617,7 @@
 msgstr "服务器不支持此协议。"
 
 msgid "Error parsing HTTP"
-msgstr "分析 HTTP 出错。"
+msgstr "解析 HTTP 出错。"
 
 msgid "You have signed on from another location"
 msgstr "您在其它位置用此用户名登录了。"
@@ -5776,8 +5740,9 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "尚未检索到您的个人资料信息,请稍后重试。"
 
-msgid "Your MXitId"
-msgstr ""
+#, fuzzy
+msgid "Your UID"
+msgstr "您的 MXitID"
 
 #. pin
 #. pin (required)
@@ -5788,6 +5753,7 @@
 msgstr "验证 PIN"
 
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "显示名称"
 
@@ -5844,19 +5810,16 @@
 msgid "Connecting..."
 msgstr "正在连接..."
 
-msgid "The nick name you entered is invalid."
-msgstr "您输入的昵称无效。"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "您输入的姓名密钥无效。"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "您输入的 PIN 长度无效 [7-10]。"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit 登录名称"
-
-#. nick name (required)
-msgid "Nick Name"
-msgstr "昵称"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -5884,10 +5847,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "您选择了无效的国家,请重试。"
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "用户名未注册,请先进行注册。"
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "用户名已被注册,请选择其他用户名。"
 
 msgid "Internal error. Please try again later."
@@ -5925,16 +5890,16 @@
 msgid "Status Message"
 msgstr "状态消息"
 
-#, fuzzy
 msgid "Rejection Message"
-msgstr "收到的消息"
+msgstr "拒绝消息"
 
 #. hidden number
 msgid "Hidden Number"
 msgstr "隐藏号码"
 
-msgid "Your Mobile Number..."
-msgstr "您的手机号码..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "您的 MXitID"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -5948,17 +5913,23 @@
 msgstr "启用飞溅屏幕"
 
 #. you were kicked
+msgid "You have been kicked from this MultiMX."
+msgstr "您已被踢出此 MultiMX。"
+
+msgid "was kicked"
+msgstr "被踢出"
+
+msgid "_Room Name:"
+msgstr "聊天室名称(_R):"
+
+#. Display system message in chat window
 #, fuzzy
-msgid "You have been kicked from this MultiMX."
-msgstr "您已被踢出 (%s)"
+msgid "You have invited"
+msgstr "来邮件了!"
 
 #, fuzzy
-msgid "was kicked"
-msgstr "无效的票证"
-
-#, fuzzy
-msgid "_Room Name:"
-msgstr "聊天室(_R):"
+msgid "Last Online"
+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."
@@ -5972,7 +5943,7 @@
 msgstr "当前无法处理您的请求"
 
 msgid "Timeout while waiting for a response from the MXit server."
-msgstr ""
+msgstr "等待 MXit 服务器回应超时。"
 
 msgid "Successfully Logged In..."
 msgstr "登录成功..."
@@ -6078,7 +6049,7 @@
 msgstr "已删除"
 
 msgid "MXit Advertising"
-msgstr ""
+msgstr "MXit 广告"
 
 msgid "More Information"
 msgstr "更多信息"
@@ -6121,10 +6092,10 @@
 msgstr "新博客评论"
 
 msgid "New profile comments"
-msgstr ""
+msgstr "新个人资料评论"
 
 msgid "New friend requests!"
-msgstr "好友请求!"
+msgstr "新好友请求!"
 
 msgid "New picture comments"
 msgstr "新图片评论"
@@ -6182,7 +6153,7 @@
 msgstr "移除好友失败"
 
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "delbuddy 命令失败"
 
 msgid "blocklist command failed"
 msgstr "切换板失败"
@@ -6196,7 +6167,7 @@
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
-msgstr ""
+msgstr "升级到带有 RC4 支持的 libpurple (>= 2.0.1),MySpaceIM 插件未载入。"
 
 msgid "Add friends from MySpace.com"
 msgstr "从 MySpace.com 添加好友"
@@ -6206,16 +6177,16 @@
 
 #. TODO: find out how
 msgid "Find people..."
-msgstr "查找..."
+msgstr "找人..."
 
 msgid "Change IM name..."
 msgstr "更改 IM 名称..."
 
 msgid "myim URL handler"
-msgstr ""
+msgstr "myim URL 处理器"
 
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr ""
+msgstr "没有找到适合打开此 myim URL 的帐号。"
 
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "请启用正确的 MySpaceIM 帐户并重试。"
@@ -6662,9 +6633,9 @@
 msgid "Server port"
 msgstr "服务器端口"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Received unexpected response from %s: %s"
-msgstr "从服务器收到了意外的 HTTP 响应 %s。"
+msgstr "从 %s 收到了意外的响应:%s"
 
 #, c-format
 msgid "Received unexpected response from %s"
@@ -6691,9 +6662,9 @@
 msgid "AOL does not allow your screen name to authenticate here"
 msgstr "AOL 不允许通过此站点认证您的屏幕名称。"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Error requesting %s"
-msgstr "请求 %s 时出错:%s"
+msgstr "请求 %s 时出错"
 
 msgid "Could not join chat room"
 msgstr "无法进入聊天室"
@@ -6759,104 +6730,88 @@
 msgstr "无法给 %s 发送消息:%s"
 
 msgid "Thinking"
-msgstr ""
-
-#, fuzzy
+msgstr "思考中"
+
 msgid "Shopping"
-msgstr "停止打字"
-
-#, fuzzy
+msgstr "购物中"
+
 msgid "Questioning"
-msgstr "请求对话框"
-
-#, fuzzy
+msgstr "问问题"
+
 msgid "Eating"
-msgstr "寻呼"
-
-#, fuzzy
+msgstr "正吃饭"
+
 msgid "Watching a movie"
-msgstr "正在玩游戏"
+msgstr "看电影"
 
 msgid "Typing"
-msgstr "正在打字"
-
-#, fuzzy
+msgstr "在打字"
+
 msgid "At the office"
-msgstr "不在办公室"
+msgstr "办公室"
 
 msgid "Taking a bath"
-msgstr ""
+msgstr "在洗澡"
 
 msgid "Watching TV"
-msgstr ""
-
-#, fuzzy
+msgstr "看电视"
+
 msgid "Having fun"
-msgstr "挂断"
-
-#, fuzzy
+msgstr "正开心"
+
 msgid "Sleeping"
-msgstr "困倦"
+msgstr "在睡觉"
 
 msgid "Using a PDA"
-msgstr ""
-
-#, fuzzy
+msgstr "使用 PDA"
+
 msgid "Meeting friends"
-msgstr "即时消息朋友"
-
-#, fuzzy
+msgstr "会见朋友"
+
 msgid "On the phone"
-msgstr "接听电话"
-
-#, fuzzy
+msgstr "接电话"
+
 msgid "Surfing"
-msgstr "重复"
+msgstr "冲浪中"
 
 #. "I am mobile." / "John is mobile."
 msgid "Mobile"
 msgstr "手机"
 
 msgid "Searching the web"
-msgstr ""
+msgstr "搜索网络"
 
 msgid "At a party"
-msgstr ""
+msgstr "在晚会"
 
 msgid "Having Coffee"
-msgstr ""
+msgstr "喝咖啡"
 
 #. Playing video games
-#, fuzzy
 msgid "Gaming"
-msgstr "用户名"
+msgstr "打游戏"
 
 msgid "Browsing the web"
-msgstr ""
-
-#, fuzzy
+msgstr "浏览网页"
+
 msgid "Smoking"
-msgstr "声音"
-
-#, fuzzy
+msgstr "吸烟中"
+
 msgid "Writing"
-msgstr "正在工作"
+msgstr "在写作"
 
 #. Drinking [Alcohol]
-#, fuzzy
 msgid "Drinking"
-msgstr "正在工作"
+msgstr "在喝酒"
 
 msgid "Listening to music"
-msgstr "正在听音乐"
-
-#, fuzzy
+msgstr "听音乐"
+
 msgid "Studying"
-msgstr "正在发送"
-
-#, fuzzy
+msgstr "学习中"
+
 msgid "In the restroom"
-msgstr "兴趣"
+msgstr "在洗手间"
 
 msgid "Received invalid data on connection with server"
 msgstr "在与服务器的连接中收到了无效的数据。"
@@ -6875,7 +6830,7 @@
 msgstr "AIM 协议插件"
 
 msgid "ICQ UIN..."
-msgstr ""
+msgstr "ICQ UIN..."
 
 #. *< type
 #. *< ui_requirement
@@ -6954,10 +6909,10 @@
 msgstr "游戏"
 
 msgid "ICQ Xtraz"
-msgstr ""
+msgstr "ICQ Xtraz"
 
 msgid "Add-Ins"
-msgstr "外挂"
+msgstr "插件"
 
 msgid "Send Buddy List"
 msgstr "发送好友列表"
@@ -7022,25 +6977,20 @@
 msgid "Invisible"
 msgstr "隐身"
 
-#, fuzzy
 msgid "Evil"
-msgstr "电子邮件"
-
-#, fuzzy
+msgstr ""
+
 msgid "Depression"
-msgstr "职业"
-
-#, fuzzy
+msgstr "沮丧"
+
 msgid "At home"
-msgstr "关于我"
-
-#, fuzzy
+msgstr "在家"
+
 msgid "At work"
-msgstr "网络"
-
-#, fuzzy
+msgstr "在上班"
+
 msgid "At lunch"
-msgstr "外出就餐"
+msgstr "吃午餐"
 
 msgid "IP Address"
 msgstr "IP 地址"
@@ -7488,9 +7438,8 @@
 msgid "iTunes Music Store Link"
 msgstr "iTunes 音乐商店链接"
 
-#, fuzzy
 msgid "Lunch"
-msgstr "Finch"
+msgstr ""
 
 #, c-format
 msgid "Buddy Comment for %s"
@@ -7522,9 +7471,8 @@
 msgid "Edit Buddy Comment"
 msgstr "编辑好友注释"
 
-#, fuzzy
 msgid "Get X-Status Msg"
-msgstr "获取状态消息"
+msgstr "获取 X-状态消息"
 
 msgid "End Direct IM Session"
 msgstr "结束二人世界直连聊天"
@@ -7652,11 +7600,11 @@
 msgid "Invalid SNAC"
 msgstr "无效 SNAC"
 
-msgid "Rate to host"
-msgstr "主机等级"
-
-msgid "Rate to client"
-msgstr "客户等级"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 msgid "Service unavailable"
 msgstr "服务不可用"
@@ -8001,9 +7949,8 @@
 msgstr "管理员"
 
 #. XXX: Should this be "Topic"?
-#, fuzzy
 msgid "Room Title"
-msgstr "聊天室列表"
+msgstr "聊天室标题"
 
 msgid "Notice"
 msgstr "公告"
@@ -9863,7 +9810,7 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略会议和聊天室邀请"
 
-msgid "Use account proxy for SSL connections"
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr ""
 
 msgid "Chat room list URL"
@@ -10346,7 +10293,7 @@
 
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s"
-msgstr "无法从 HTTP 代理分析响应:%s"
+msgstr "无法从 HTTP 代理解析响应:%s"
 
 #, c-format
 msgid "HTTP proxy connection error %d"
@@ -10450,9 +10397,8 @@
 msgid "Extended away"
 msgstr "远远离开"
 
-#, fuzzy
 msgid "Feeling"
-msgstr "正在接收"
+msgstr ""
 
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
@@ -10970,13 +10916,11 @@
 msgid "Unknown node type"
 msgstr "未知的错误代码 %d"
 
-#, fuzzy
 msgid "Please select your mood from the list"
-msgstr "请从列表中选择您的心情。"
-
-#, fuzzy
+msgstr "请从列表中选择您的心情"
+
 msgid "Message (optional)"
-msgstr "别名(可选)"
+msgstr "消息(可选)"
 
 msgid "Edit User Mood"
 msgstr "编辑用户心情"
@@ -11059,9 +11003,8 @@
 msgid "/Tools/Pr_ivacy"
 msgstr "/工具/隐私(_I)"
 
-#, fuzzy
 msgid "/Tools/Set _Mood"
-msgstr "/工具/系统日志(_L)"
+msgstr "/工具/设置心情(_M)"
 
 msgid "/Tools/_File Transfers"
 msgstr "/工具/文件传送(_F)"
@@ -11082,20 +11025,17 @@
 msgid "/Help/Online _Help"
 msgstr "/帮助/在线帮助(_H)"
 
-#, fuzzy
 msgid "/Help/_Build Information"
-msgstr "好友信息"
+msgstr "/帮助/编译信息(_B)"
 
 msgid "/Help/_Debug Window"
 msgstr "/帮助/调试窗口(_D)"
 
-#, fuzzy
 msgid "/Help/De_veloper Information"
-msgstr "服务器信息"
-
-#, fuzzy
+msgstr "/帮助/开发者信息(_V)"
+
 msgid "/Help/_Translator Information"
-msgstr "个人信息"
+msgstr "/帮助/翻译者信息(_T)"
 
 msgid "/Help/_About"
 msgstr "/帮助/关于(_A)"
@@ -11316,9 +11256,8 @@
 msgid "_Edit Account"
 msgstr "编辑帐号(_E)"
 
-#, fuzzy
 msgid "Set _Mood..."
-msgstr "设置心情..."
+msgstr "设置心情(_M)..."
 
 msgid "No actions available"
 msgstr "没有可用的操作"
@@ -11438,9 +11377,8 @@
 msgid "/Conversation/Se_nd File..."
 msgstr "/对话(C)/发送文件(_N)..."
 
-#, fuzzy
 msgid "/Conversation/Get _Attention"
-msgstr "/对话/获取信息"
+msgstr "/对话/获取注意(_A)"
 
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/对话(C)/添加好友千里眼(_P)..."
@@ -11523,9 +11461,8 @@
 msgid "/Conversation/Send File..."
 msgstr "/对话/发送文件..."
 
-#, fuzzy
 msgid "/Conversation/Get Attention"
-msgstr "/对话/获取信息"
+msgstr "/对话/获得注意"
 
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/对话/添加好友千里眼..."
@@ -11591,13 +11528,11 @@
 msgid "0 people in room"
 msgstr "聊天室里没有人"
 
-#, fuzzy
 msgid "Close Find bar"
-msgstr "关闭此标签"
-
-#, fuzzy
+msgstr "关闭查找栏"
+
 msgid "Find:"
-msgstr "查找"
+msgstr "查找:"
 
 #, c-format
 msgid "%d person in room"
@@ -11759,9 +11694,8 @@
 msgid "Arabic"
 msgstr "阿拉伯语"
 
-#, fuzzy
 msgid "Assamese"
-msgstr "害羞"
+msgstr "阿萨姆语"
 
 msgid "Belarusian Latin"
 msgstr "白俄罗斯拉丁语"
@@ -11772,9 +11706,8 @@
 msgid "Bengali"
 msgstr "孟加拉语"
 
-#, fuzzy
 msgid "Bengali-India"
-msgstr "孟加拉语"
+msgstr "孟加拉印地语"
 
 msgid "Bosnian"
 msgstr "波斯尼亚语"
@@ -11890,16 +11823,14 @@
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#, fuzzy
 msgid "Malayalam"
-msgstr "马来语"
+msgstr ""
 
 msgid "Mongolian"
 msgstr "蒙古语"
 
-#, fuzzy
 msgid "Marathi"
-msgstr "古吉拉特语"
+msgstr "马拉地语"
 
 msgid "Malay"
 msgstr "马来语"
@@ -11919,9 +11850,8 @@
 msgid "Occitan"
 msgstr "奥克西唐语"
 
-#, fuzzy
 msgid "Oriya"
-msgstr "Opera"
+msgstr "奥里雅语"
 
 msgid "Punjabi"
 msgstr "旁遮普语"
@@ -12004,7 +11934,7 @@
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "%s is a messaging client based on libpurple which is capable of connecting "
 "to multiple messaging services at once.  %s is written in C using GTK+.  %s "
@@ -12013,12 +11943,10 @@
 "copyrighted by its contributors, a list of whom is also distributed with "
 "%s.  There is no warranty for %s.<BR><BR>"
 msgstr ""
-"%s 是一个基于 libpurple 的图形化模块消息客户端,支持同时连接到 AIM、MSN、"
-"Yahoo!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell GroupWise、Lotus Sametime、"
-"Bonjour、Zephyr、MySpaceIM、Gadu-Gadu 以及 QQ。它使用 GTK+ 编写。<BR><BR>您可"
-"以在 GNU 通用公共许可证第二版或任意更高版本的许可下修改并重新发布此软件。在发"
-"行的 %s 中应有一个“COPYING”文件包含 GPL 正文。%s 的版权由其贡献者所有,在 "
-"“COPYRIGHT”文件中给出了所有贡献者的列表。我们不对此软件提供任何担保。<BR><BR>"
+"%s 是一个基于 libpurple 的可同时连接到多种消息服务的即使消息客户端。%s 通过 "
+"GTK+ 使用 C 语言编写。%s 在 GPL2 或更高版本许可下发布,允许在此许可下自由地使"
+"用、更改和再发布,许可证文本已随 %s 一起发布。%s 的版权属于其贡献者,该列表也"
+"随 %s 一起发布。%s 及其贡献者不对其提供任何担保。<BR><BR>"
 
 #, c-format
 msgid ""
@@ -12028,7 +11956,7 @@
 "im<BR><BR>"
 msgstr ""
 
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "<font size=\"4\"><b>Help from other Pidgin users</b></font> is available by "
 "e-mailing <a href=\"mailto:support@pidgin.im\">support@pidgin.im</a><br/"
@@ -12042,20 +11970,19 @@
 "\">support@pidgin.im</a><br/>这是一个公开的邮件列表,您还可以查看该列表的历史"
 "<a href=\"http://pidgin.im/pipermail/support/\">存档</a>。<br/>我们无法为第三"
 "方的协议或者插件提供支持。该邮件列表的基本交流语言是<b>英语</b>,虽然您可以使"
-"用其他语言进行求助,但响应的人数以及所能提供的帮助会因此而减少。<br/><br/>"
+"用其他语言进行求助,但响应的人数以及所能提供的帮助会因此而减少。<br/>"
 
 #, c-format
 msgid "About %s"
 msgstr "关于 %s"
 
-#, fuzzy
 msgid "Build Information"
-msgstr "好友信息"
+msgstr "编译信息"
 
 #. End of not to be translated section
-#, fuzzy, c-format
+#, c-format
 msgid "%s Build Information"
-msgstr "好友信息"
+msgstr "%s 编译信息"
 
 msgid "Current Developers"
 msgstr "当前开发者"
@@ -12069,9 +11996,9 @@
 msgid "Retired Crazy Patch Writers"
 msgstr "退休的疯狂补丁编写者"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Developer Information"
-msgstr "服务器信息"
+msgstr "%s 开放者信息"
 
 msgid "Current Translators"
 msgstr "当前翻译者"
@@ -12079,9 +12006,9 @@
 msgid "Past Translators"
 msgstr "先前翻译者"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s Translator Information"
-msgstr "更多信息"
+msgstr "%s 翻译者信息"
 
 msgid "_Name"
 msgstr "名称(_N)"
@@ -12471,9 +12398,8 @@
 msgid "Insert Smiley"
 msgstr "插入表情"
 
-#, fuzzy
 msgid "Send Attention"
-msgstr "发送按钮"
+msgstr "发送提示"
 
 msgid "<b>_Bold</b>"
 msgstr "<b>粗体(_B)</b>"
@@ -12521,7 +12447,7 @@
 msgstr "表情(_S)"
 
 msgid "_Attention!"
-msgstr ""
+msgstr "注意(_A)!"
 
 msgid "Log Deletion Failed"
 msgstr "删除日志失败"
@@ -12633,11 +12559,13 @@
 msgid "Exiting because another libpurple client is already running.\n"
 msgstr "退出,因为另一个 libpurple 客户端已运行。\n"
 
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/媒体(_M)"
 
-msgid "/Media/_Hangup"
-msgstr "/媒体/挂起(_H)"
+#, fuzzy
+msgid "_Hangup"
+msgstr "挂断"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -13425,10 +13353,6 @@
 msgid "Custom Smiley Manager"
 msgstr "自定义表情管理器"
 
-#, fuzzy
-msgid "Attention received"
-msgstr "需要激活"
-
 msgid "Select Buddy Icon"
 msgstr "选择好友图标"
 
@@ -13563,9 +13487,8 @@
 msgid "_Save File"
 msgstr "保存文件"
 
-#, fuzzy
 msgid "Do you really want to clear?"
-msgstr "您真的想要删除 %s 吗?"
+msgstr "您真的想要清屏吗?"
 
 msgid "Select color"
 msgstr "选择颜色"
@@ -14527,21 +14450,18 @@
 msgid "Timestamp Format Options"
 msgstr "时间戳格式选项"
 
-#, fuzzy, c-format
+#, c-format
 msgid "_Force timestamp format:"
-msgstr "强制24小时制时间格式(_F)"
-
-#, fuzzy
+msgstr "强制时间戳格式(_F)"
+
 msgid "Use system default"
-msgstr "桌面默认值"
-
-#, fuzzy
+msgstr "使用系统默认值"
+
 msgid "12 hour time format"
-msgstr "强制24小时制时间格式(_F)"
-
-#, fuzzy
+msgstr "12小时制时间格式"
+
 msgid "24 hour time format"
-msgstr "强制24小时制时间格式(_F)"
+msgstr "24小时制时间格式"
 
 msgid "Show dates in..."
 msgstr "显示日期于..."
@@ -14736,7 +14656,6 @@
 msgstr "发送和接受原始 XMPP 节。"
 
 #. *  description
-#, fuzzy
 msgid "This plugin is useful for debugging XMPP servers or clients."
 msgstr "此插件用于调试 XMPP 服务器或客户端。"
 
@@ -14797,14 +14716,12 @@
 msgstr ""
 
 #. Installer Subsection Text
-#, fuzzy
 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 >"
@@ -14833,9 +14750,8 @@
 msgstr "拼写检查支持"
 
 #. Installer Subsection Text
-#, fuzzy
 msgid "Start Menu"
-msgstr "启动"
+msgstr "开始菜单"
 
 #. Installer Subsection Detailed Description
 msgid ""
@@ -14866,6 +14782,30 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "您没有权限卸载此程序。"
 
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "您输入的昵称无效。"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit 登录名称"
+
+#~ msgid "Nick Name"
+#~ msgstr "昵称"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "您的手机号码..."
+
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/媒体/挂起(_H)"
+
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "此证书无效。"
+
+#~ msgid "Rate to host"
+#~ msgstr "主机等级"
+
+#~ msgid "Rate to client"
+#~ msgstr "客户等级"
+
 #~ msgid "Unknown reason."
 #~ msgstr "未知原因。"
 
--- a/po/zh_HK.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/zh_HK.po	Sat Jul 31 23:42:35 2010 +0000
@@ -62,7 +62,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
@@ -117,12 +117,25 @@
 msgstr "錯誤"
 
 # FIXME 譯文有待改進 - 20061028
+#, fuzzy
+msgid "Account was not modified"
+msgstr "帳號未被新增"
+
+# FIXME 譯文有待改進 - 20061028
 msgid "Account was not added"
 msgstr "帳號未被新增"
 
 msgid "Username of an account must be non-empty."
 msgstr "帳號不可留空。"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
@@ -1333,6 +1346,10 @@
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到你的帳號"
 
+# XXX 譯文有待改進 acli 20100509
+msgid "Attention received"
+msgstr "對方要求注意"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 錯誤"
 
@@ -1633,7 +1650,7 @@
 msgid "Online"
 msgstr "上線"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "離線"
 
@@ -1762,8 +1779,10 @@
 "currently trusted."
 msgstr "無法信賴這張證書,因為目前沒有可信賴的證書可以驗證這張證書。"
 
-msgid "The certificate is not valid yet."
-msgstr "這張證書尚未生效。"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "這張證書已逾期,應視作無效。"
@@ -3927,6 +3946,16 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "伺服器認為驗證程序已經完畢,但用戶端不認同"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "伺服器需要經由未經加密的串流進行明文認證"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
+
 msgid "SASL authentication failed"
 msgstr "SASL 認證失敗"
 
@@ -6228,7 +6257,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "未能讀取你的個人資料,請稍後重試。"
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6241,6 +6270,7 @@
 
 # NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "網名"
 
@@ -6298,20 +6328,16 @@
 msgid "Connecting..."
 msgstr "連線中..."
 
-msgid "The nick name you entered is invalid."
-msgstr "你所輸入的網名無效。"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "你所輸入的名稱無效。"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "你所輸入的密碼過短或過長(長度應為 7 至 10 個數字)。"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit 帳號"
-
-# NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
-#. nick name (required)
-msgid "Nick Name"
-msgstr "網名"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6339,10 +6365,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "指定的國家是無效的,請重試。"
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "帳號未有註冊,請先註冊。"
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "帳號已註冊,請選擇另一個帳號。"
 
 msgid "Internal error. Please try again later."
@@ -6388,8 +6416,9 @@
 msgid "Hidden Number"
 msgstr "隱藏電話號碼"
 
-msgid "Your Mobile Number..."
-msgstr "流動電話號碼..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo 帳號"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6418,6 +6447,16 @@
 msgid "_Room Name:"
 msgstr "聊天室(_R):"
 
+# XXX 要覆查
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "你收到郵件!"
+
+#, fuzzy
+msgid "Last Online"
+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 的連線已中斷,請重新連線。"
@@ -8193,11 +8232,11 @@
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-msgid "Rate to host"
-msgstr "到伺服器速率"
-
-msgid "Rate to client"
-msgstr "到用戶端速率"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 #  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
@@ -10544,7 +10583,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "使用 SSL 連線時,使用帳號的代理伺服器"
 
 msgid "Chat room list URL"
@@ -13528,12 +13568,14 @@
 msgstr "因為已有其他 libpurple 用戶端正在執行,本程式現在結束。\n"
 
 # XXX 媒體? - acli 20090730
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/媒體(_M)"
 
-# XXX 暫譯 - acli 20090730
-msgid "/Media/_Hangup"
-msgstr "/媒體/掛斷(_H)"
+# NOTE 這是按鈕上的標籤
+#, fuzzy
+msgid "_Hangup"
+msgstr "掛斷"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14343,10 +14385,6 @@
 msgid "Custom Smiley Manager"
 msgstr "自選表情管理"
 
-# XXX 譯文有待改進 acli 20100509
-msgid "Attention received"
-msgstr "對方要求注意"
-
 msgid "Select Buddy Icon"
 msgstr "選擇好友圖示"
 
@@ -15884,6 +15922,32 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "你沒有權限移除程式。"
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "這張證書尚未生效。"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "你所輸入的網名無效。"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit 帳號"
+
+# NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
+#~ msgid "Nick Name"
+#~ msgstr "網名"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "流動電話號碼..."
+
+#~ msgid "Rate to host"
+#~ msgstr "到伺服器速率"
+
+#~ msgid "Rate to client"
+#~ msgstr "到用戶端速率"
+
+# XXX 暫譯 - acli 20090730
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/媒體/掛斷(_H)"
+
 #~ msgid "Current Mood"
 #~ msgstr "目前的心情"
 
--- a/po/zh_TW.po	Wed Jun 02 20:08:53 2010 +0000
+++ b/po/zh_TW.po	Sat Jul 31 23:42:35 2010 +0000
@@ -60,7 +60,7 @@
 msgstr ""
 "Project-Id-Version: Pidgin 2.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-30 23:16-0400\n"
+"POT-Creation-Date: 2010-07-27 01:18-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"
@@ -115,12 +115,25 @@
 msgstr "錯誤"
 
 # FIXME 譯文有待改進 - 20061028
+#, fuzzy
+msgid "Account was not modified"
+msgstr "帳號未被新增"
+
+# FIXME 譯文有待改進 - 20061028
 msgid "Account was not added"
 msgstr "帳號未被新增"
 
 msgid "Username of an account must be non-empty."
 msgstr "帳號不可留空。"
 
+msgid ""
+"The account's protocol cannot be changed while it is connected to the server."
+msgstr ""
+
+msgid ""
+"The account's username cannot be changed while it is connected to the server."
+msgstr ""
+
 msgid "New mail notifications"
 msgstr "新郵件通知"
 
@@ -1331,6 +1344,10 @@
 msgid "Someone says your username in chat"
 msgstr "有人在聊天室中提到您的帳號"
 
+# XXX 譯文有待改進 acli 20100509
+msgid "Attention received"
+msgstr "對方要求注意"
+
 msgid "GStreamer Failure"
 msgstr "GStreamer 錯誤"
 
@@ -1631,7 +1648,7 @@
 msgid "Online"
 msgstr "上線"
 
-#. primative,						no,							id,			name
+#. primitive,						no,							id,			name
 msgid "Offline"
 msgstr "離線"
 
@@ -1760,8 +1777,10 @@
 "currently trusted."
 msgstr "無法信賴這張憑證,因為目前沒有可信賴的憑證可以驗證這張憑證。"
 
-msgid "The certificate is not valid yet."
-msgstr "這張憑證尚未生效。"
+msgid ""
+"The certificate is not valid yet.  Check that your computer's date and time "
+"are accurate."
+msgstr ""
 
 msgid "The certificate has expired and should not be considered valid."
 msgstr "這張憑證已逾期,應視作無效。"
@@ -3925,6 +3944,16 @@
 msgid "Server thinks authentication is complete, but client does not"
 msgstr "伺服器認為驗證程序已經完畢,但用戶端不認同"
 
+#, fuzzy
+msgid "Server may require plaintext authentication over an unencrypted stream"
+msgstr "伺服器需要經由未經加密的串流進行明文認證"
+
+#, fuzzy, c-format
+msgid ""
+"%s may require plaintext authentication over an unencrypted connection.  "
+"Allow this and continue authentication?"
+msgstr "%s 需要經由未經加密的串流進行明文認證。允許並繼續進行認證?"
+
 msgid "SASL authentication failed"
 msgstr "SASL 認證失敗"
 
@@ -6226,7 +6255,7 @@
 msgid "Your profile information is not yet retrieved. Please try again later."
 msgstr "未能讀取您的個人資料,請稍後重試。"
 
-msgid "Your MXitId"
+msgid "Your UID"
 msgstr ""
 
 #. pin
@@ -6239,6 +6268,7 @@
 
 # NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
 #. display name
+#. nick name (required)
 msgid "Display Name"
 msgstr "暱稱"
 
@@ -6296,20 +6326,16 @@
 msgid "Connecting..."
 msgstr "連線中..."
 
-msgid "The nick name you entered is invalid."
-msgstr "您所輸入的暱稱無效。"
+#, fuzzy
+msgid "The Display Name you entered is invalid."
+msgstr "您所輸入的名稱無效。"
 
 msgid "The PIN you entered has an invalid length [7-10]."
 msgstr "您所輸入的密碼過短或過長(長度應為 7 至 10 個數字)。"
 
 #. mxit login name
-msgid "MXit Login Name"
-msgstr "MXit 帳號"
-
-# NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
-#. nick name (required)
-msgid "Nick Name"
-msgstr "暱稱"
+msgid "MXit ID"
+msgstr ""
 
 #. show the form to the user to complete
 msgid "Register New MXit Account"
@@ -6337,10 +6363,12 @@
 msgid "Invalid country selected. Please try again."
 msgstr "指定的國家是無效的,請重試。"
 
-msgid "Username is not registered. Please register first."
+#, fuzzy
+msgid "The MXit ID you entered is not registered. Please register first."
 msgstr "帳號未有註冊,請先註冊。"
 
-msgid "Username is already registered. Please choose another username."
+#, fuzzy
+msgid "The MXit ID you entered is already registered. Please choose another."
 msgstr "帳號已註冊,請選擇另一個帳號。"
 
 msgid "Internal error. Please try again later."
@@ -6386,8 +6414,9 @@
 msgid "Hidden Number"
 msgstr "隱藏電話號碼"
 
-msgid "Your Mobile Number..."
-msgstr "行動電話號碼..."
+#, fuzzy
+msgid "Your MXit ID..."
+msgstr "Yahoo 帳號"
 
 #. Configuration options
 #. WAP server (reference: "libpurple/accountopt.h")
@@ -6416,6 +6445,16 @@
 msgid "_Room Name:"
 msgstr "聊天室(_R):"
 
+# XXX 要覆查
+#. Display system message in chat window
+#, fuzzy
+msgid "You have invited"
+msgstr "您收到郵件!"
+
+#, fuzzy
+msgid "Last Online"
+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 的連線已中斷,請重新連線。"
@@ -8191,11 +8230,11 @@
 msgid "Invalid SNAC"
 msgstr "無效的 SNAC"
 
-msgid "Rate to host"
-msgstr "到伺服器速率"
-
-msgid "Rate to client"
-msgstr "到用戶端速率"
+msgid "Server rate limit exceeded"
+msgstr ""
+
+msgid "Client rate limit exceeded"
+msgstr ""
 
 #  NOTE Jabber 錯誤 <service-unavailable/>,表示伺服器收到一個意義不明的指令
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
@@ -10538,7 +10577,8 @@
 msgid "Ignore conference and chatroom invitations"
 msgstr "忽略會議室與聊天室邀請"
 
-msgid "Use account proxy for SSL connections"
+#, fuzzy
+msgid "Use account proxy for HTTP and HTTPS connections"
 msgstr "使用 SSL 連線時,使用帳號的代理伺服器"
 
 msgid "Chat room list URL"
@@ -13522,12 +13562,14 @@
 msgstr "因為已有其他 libpurple 用戶端正在執行,本程式現在結束。\n"
 
 # XXX 媒體? - acli 20090730
-msgid "/_Media"
+#, fuzzy
+msgid "_Media"
 msgstr "/媒體(_M)"
 
-# XXX 暫譯 - acli 20090730
-msgid "/Media/_Hangup"
-msgstr "/媒體/掛斷(_H)"
+# NOTE 這是按鈕上的標籤
+#, fuzzy
+msgid "_Hangup"
+msgstr "掛斷"
 
 #, c-format
 msgid "%s wishes to start an audio/video session with you."
@@ -14337,10 +14379,6 @@
 msgid "Custom Smiley Manager"
 msgstr "自訂表情管理"
 
-# XXX 譯文有待改進 acli 20100509
-msgid "Attention received"
-msgstr "對方要求注意"
-
 msgid "Select Buddy Icon"
 msgstr "選擇好友圖示"
 
@@ -15878,6 +15916,32 @@
 msgid "You do not have permission to uninstall this application."
 msgstr "您沒有權限移除程式。"
 
+#~ msgid "The certificate is not valid yet."
+#~ msgstr "這張憑證尚未生效。"
+
+#~ msgid "The nick name you entered is invalid."
+#~ msgstr "您所輸入的暱稱無效。"
+
+#~ msgid "MXit Login Name"
+#~ msgstr "MXit 帳號"
+
+# NOTE「Display Name」和「Nick Name」都是指同一個欄位,就是 profile->nickname
+#~ msgid "Nick Name"
+#~ msgstr "暱稱"
+
+#~ msgid "Your Mobile Number..."
+#~ msgstr "行動電話號碼..."
+
+#~ msgid "Rate to host"
+#~ msgstr "到伺服器速率"
+
+#~ msgid "Rate to client"
+#~ msgstr "到用戶端速率"
+
+# XXX 暫譯 - acli 20090730
+#~ msgid "/Media/_Hangup"
+#~ msgstr "/媒體/掛斷(_H)"
+
 #~ msgid "Current Mood"
 #~ msgstr "目前的心情"