merge of '673b6665624da7d9a6ff97a3a15b5c5c5002636f'

     and '20ed0b89282920d9b512932732b7a75056b89b8c'

253 files changed, 24928 insertions, 16633 deletions

diff --git a/.mtn-ignore b/.mtn-ignore
index ae4a3660fa..186a871a06 100644
--- a/.mtn-ignore
+++ b/.mtn-ignore
@@ -58,6 +58,7 @@ libpurple/purple-client-bindings.c
 libpurple/purple-client-bindings.h
 libpurple/purple-client-example
 libpurple/tests/check_libpurple
+libpurple/tests/libpurple..
 libpurple/version.h$
 libpurple/win32/libpurplerc.rc$
 libtool
diff --git a/AUTHORS b/AUTHORS
index 4eec1be2f5..e5cdb825e0 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -36,6 +36,7 @@ Nathan 'faceprint' Walp - Developer
 Crazy Patch Writers:
 -------------------
 Felipe 'shx' Contreras
+Marcus 'malu' Lundblad
 Dennis 'EvilDennisR' Ristuccia
 Peter 'Fmoo' Ruibal
 Gabriel 'Nix' Schulhof
diff --git a/COPYRIGHT b/COPYRIGHT
index d71546c74c..d087e79f7f 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -320,6 +320,7 @@ Nathan Poznick
 Jory A. Pratt
 Brent Priddy
 Justin Pryzby
+Florian Qu�ze
 Ignacio Casal Quinteiro
 Federicco Mena Quintero
 Yosef Radchenko
@@ -354,6 +355,7 @@ Laurent Sansonetti
 Andrew Sayman
 Alceste Scalas
 Carsten Schaar
+Toby Schaffer
 Jonathan Schleifer <js-pidgin@webkeks.org>
 Matteo Settenvini
 Colin Seymour
@@ -423,6 +425,7 @@ Bill Tompkins
 Gal Topper
 Chris Toshok
 Ken Tossell
+Marcus Trautwig
 Tom Tromey
 Todd Troxell
 Brad Turcotte
diff --git a/ChangeLog b/ChangeLog
index 9395e12f81..ff8f14aed9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,57 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.5.1 (??/??/????):
+version 2.5.2 (??/??/????):
+	libpurple:
+	* Restored the "Has You" feature to the MSN protocol tooltips.
+	* Fixed a crash on removing a custom buddy icon on a buddy.
+	* Fixed a crash caused by certain self-signed SSL certificates.
+	* Enable a number of strong ciphers which were previously disabled
+	  when using NSS.  (Thanks to Marcus Trautwig.)
+
+	Pidgin:
+	* The status selector now saves your message when changing status.
+	* Fix a case where a conversation window could close unexpectedly.
+	* A mute sounds option has been added to the preferences window to
+	  help with discoverability.  CTRL+S is no longer bound to mute.
+	* Added ability to change the color of visited links (using the theme
+	  control plugin, or setting the color in ~/.gtkrc-2.0)
+	* Fix a crash occuring when a custom smiley is deleted and re-added and
+	  used in an open conversation after being re-added
+
+	Finch:
+	* A new 'Nested Grouping' option in the 'Grouping' plugin. Group
+	  hierarchies are defined by the '/' character in the group names
+	* A bug was fixed where some key-bindings wouldn't work with some TERMs
+	  (e.g. xterm-color, screen-linux etc.)
+
+	XMPP:
+	* Sending and receiving custom smileys using the specification in
+	  XEP-0231 (bits of binary) and XHTML-IM
+
+	Yahoo:
+	* Only send a Ping once every hour.  This prevents the account from
+	  being disconnected from the server periodically.
+
+version 2.5.1 (08/30/2008):
 	libpurple:
 	* In the Join/Part plugin, add the ability to apply the rules to
 	  buddies.  By default, joins and parts for buddies are still shown.
+	* Support SOCKS proxies specified in GNOME or Windows proxy settings.
+	* Fix some possible crashes in MSNP15.
+	* Enable a default SSL trust relationship for MSN servers.
+	* Avoid disconnecting from XMPP servers on parse errors that are
+	  non-fatal.
+	* Include some perl files that were mistakenly omitted in 2.5.0.
+
+	Pidgin:
+	* Prevent use of custom smilies without "shortcuts."
+	* Fix a crash that could appear with AIM buddy tooltips.
+
+	Artwork:
+	* General refresh of many icons in the interface.
+	* Many cleanups to artwork source are now included in the distribution.
+	* A new "throbber" animation has been added to indicate when accounts
+	  are connecting.
 
 version 2.5.0 (08/18/2008):
 	libpurple:
diff --git a/ChangeLog.win32 b/ChangeLog.win32
index 5d525758c5..f80d4272f6 100644
--- a/ChangeLog.win32
+++ b/ChangeLog.win32
@@ -1,3 +1,8 @@
+version 2.5.2 (??/??/????):
+
+version 2.5.1 (08/30/2008):
+	* No changes
+
 version 2.5.0 (08/18/2008):
 	* Don't install the GSSAPI SASL plugin on NT4 to avoid an error popup.
 	* Use the Kerberos for Windows libraries installed on the system (if
diff --git a/Makefile.mingw b/Makefile.mingw
index 7ba501e4bd..b5acdbad66 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -124,6 +124,7 @@ clean:
 	$(MAKE) -C $(PURPLE_PO_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PIDGIN_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PURPLE_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C share/ca-certs -f $(MINGW_MAKEFILE) clean
 	rm -f $(PIDGIN_CONFIG_H) ./VERSION pidgin-$(PIDGIN_VERSION)*.exe pidgin-$(PIDGIN_VERSION)-win32-bin.zip
 	rm -rf doc/html Doxyfile.mingw
 
diff --git a/NEWS b/NEWS
index b4fcb7d385..f61ed374cb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,20 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+2.5.1 (08/30/2008):
+	Kevin: This release is mainly a bug-fix release.  It solves a few
+	known crashes and updates some of our artwork.  Google's Summer of
+	code recently finished up.  Some of our students are still working
+	on their branches and none have been merged into released code yet.
+	Look for some of those results to show up in Pidgin releases over the
+	coming months.
+
+	Elliott: I'm just commenting so Kevin wouldn't be the only one in NEWS
+	and no-one else seems to want to. Anyway, there's a couple MSN login
+	fixes, so try it out. The contact list problems might still be around,
+	but you can probably find a workaround in trac. And there's a tooltip
+	fix for our AIM friends, not that I had anything to do with it (except
+	closing many many duplicate tickets).
+
 2.5.0 (08/17/2008):
 	Daniel: Lots of good stuff in this release.  Lots of people have worked
 	very hard on the updated MSN protocol, and it's finally time to bring
diff --git a/configure.ac b/configure.ac
index 9f8965c3ac..71d4ed19f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,7 @@ AC_PREREQ([2.50])
 m4_define([purple_lt_current], [5])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [5])
-m4_define([purple_micro_version], [1])
+m4_define([purple_micro_version], [2])
 m4_define([purple_version_suffix], [vv-devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -55,7 +55,7 @@ m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suf
 m4_define([gnt_lt_current], [5])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [5])
-m4_define([gnt_micro_version], [1])
+m4_define([gnt_micro_version], [2])
 m4_define([gnt_version_suffix], [vv-devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
@@ -144,7 +144,7 @@ darwin*)
 	;;
 esac
 
-ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr gl gu he hi hu id it ja ka kn ko ku lo lt mk my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
+ALL_LINGUAS="af am ar az be@latin bg bn bs ca ca@valencia cs da de dz el en_AU en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hu id it ja ka kn ko ku lo lt mk my_MM nb ne nl nn oc pa pl pt_BR pt ps ro ru si sk sl sq sr sr@latin sv ta te th tr uk ur vi xh zh_CN zh_HK zh_TW"
 AM_GLIB_GNU_GETTEXT
 
 dnl If we don't have msgfmt, then po/ is going to fail -- ensure that
@@ -1293,20 +1293,24 @@ if test "x$enable_dbus" = "xyes" ; then
 		AC_SUBST(DBUS_LIBS)
 		enable_dbus=yes
 	], [
+	enable_dbus=no
 	if test "x$force_deps" = "xyes" ; then
 		AC_MSG_ERROR([
 D-Bus development headers not found.
 Use --disable-dbus if you do not need D-Bus support.
 ])
 	fi])
+fi
 
 dnl Check for NetworkManager.h; if we don't have it, oh well
+if test "x$enable_dbus" = "xyes" ; then
 	if test "x$enable_nm" = "xyes" ; then
-		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager], [
+		PKG_CHECK_MODULES(NETWORKMANAGER, [NetworkManager >= 0.5.0], [
 			AC_SUBST(NETWORKMANAGER_CFLAGS)
 			AC_SUBST(NETWORKMANAGER_LIBS)
 			AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
 		], [
+			enable_nm=no
 			if test "x$force_deps" = "xyes" ; then
 				AC_MSG_ERROR([
 NetworkManager development headers not found.
@@ -2430,7 +2434,6 @@ AC_OUTPUT([Makefile
 		   pidgin/pidgin.pc
 		   pidgin/pidgin-uninstalled.pc
 		   pidgin/pixmaps/Makefile
-		   pidgin/pixmaps/buddy_icons/qq/Makefile
 		   pidgin/pixmaps/emotes/default/24/Makefile
 		   pidgin/pixmaps/emotes/none/Makefile
 		   pidgin/plugins/Makefile
diff --git a/doc/funniest_home_convos.txt b/doc/funniest_home_convos.txt
index 3daab31eb3..5979bb6fbd 100644
--- a/doc/funniest_home_convos.txt
+++ b/doc/funniest_home_convos.txt
@@ -398,6 +398,8 @@ considered ambiguous.  Why use a large word when a dimunitve one will suffice?
 (17:49:25) elb: awesome, thanks
 (17:49:28) elb: Kanon in D
 
+--
+
 edited for brevity, and name changed.
 (13:51:31) l33t_h4x0r: Is there such thing as a gaim ip sniffer for linux?
 (13:51:40) LSchiere: no
@@ -417,6 +419,8 @@ edited for brevity, and name changed.
 (13:58:58) LSchiere: *amused* that's the first time in a while that the requester has *agreed* that there is no legit reason to want the feature
 (13:59:19) Err: he was not the sharpest knife in the drawer
 
+--
+
 14:57 <itchypants> [blah blah blah simple question]
       [other traffic]
 14:57 <itchypants> [retransmit simple question]
@@ -424,6 +428,8 @@ edited for brevity, and name changed.
 14:59 <itchypants> seanegan, ah okay thanks
 15:00 <seanegan> no problem
 
+--
+
 (15:57:11) sadrul: the files (at least a couple) in the tar.bz2 are different
 (15:57:23) datallah: right.. that is the problem - the code in svn is fine
 (15:57:31) seanegan: oh, what the hell?
@@ -440,6 +446,8 @@ funniest and the spec.in?
 (15:59:06) SimGuy: seanegan: by experience, I think we've determined you do
 not :)
 
+--
+
 (07:52:07 PM) clueless21: are you one of the gaim makers?
 (07:52:14 PM) Nathan Walp: yes
 (07:52:24 PM) clueless21:  cool
@@ -452,6 +460,8 @@ not :)
 (07:54:25 PM) Nathan Walp: it lets you chat with other people, like we are chatting now
 (07:54:45 PM) clueless21:  oooooooooo... thanks
 
+--
+
 23:58 -!- seanegan is now known as beta7
 23:58 <beta7> Hey, guys, remember me?
 23:59 <beta7> We were all supposed to be working on getting me out.
@@ -461,6 +471,8 @@ not :)
 23:59 -!- mode/#pidgin [-o elb] by ChanServ
 23:59 <marv> elb: good job getting beta7 out
 
+--
+
 14:07 <elb> rizzo: I actually prefer elb, and used it for a long time -- but 
             switched to Paco-Paco because people kept asking me what an 'elb'
             was
@@ -472,8 +484,12 @@ not :)
 14:08 <elb> I mean, what do you say
 14:08 <Robot101> elb: was their nick "idi"?
 
+--
+
 19:23 <-- elb has quit (K-lined)
 
+--
+
 19:01 <user> whoa
 19:01 <user> okay
 19:01 <user> now when i try to go into the left over files after the 
@@ -506,16 +522,19 @@ not :)
 17:16 <sadrul> I think blocking in pidgin not working is not your biggest
                problem here.
 
+--
 
 12:58 <staggered_ranks> why hasn't support for napster been removed?
 12:58 <deryni> It has.
 12:59 <staggered_ranks> oh.. ok
 
+--
 
 14:39 <rrobbertt> Does anyone know a way to get text to speech with pidgin?
 14:41 <elb> do you want to be rooted sooner, or later?
 14:42 <seanegan> good question"; rm -rf ~
 
+--
 
 (11:55:03) *** elb cuts seanegn for taunting the masses with adium
                    message styles and then dropping it
@@ -523,3 +542,17 @@ not :)
 (11:56:04) *** elb waits to see if this is an additive, fibbonaci, or
                    exponential cutting
 (11:56:16) *** seanegn hopes for additive.
+
+--
+
+/* explaining the behavior of g_list_delete_link */
+(13:15:04) elb: if the item is not part of the list, it will be
+           removed from whatever list it *was* in
+(13:15:20) elb: and if it was the head of that list, and the caller is
+           holding onto the head someplace, Bad Things happen
+(13:15:55) elb: don't do that
+(13:15:57) elb: is my advice on the matter
+/* more than 3 hours later */
+(16:58:10) elb: I just spent literally a couple of HOURS trying to
+           debug a problem where I was using g_list_delete_link with a
+           list item which wasn't in the list
diff --git a/doc/pidgin.1.in b/doc/pidgin.1.in
index 45f2d1dc37..11eba9c2e7 100644
--- a/doc/pidgin.1.in
+++ b/doc/pidgin.1.in
@@ -643,6 +643,8 @@ Our crazy patch writers include:
 .br
   Felipe 'shx' Contreras
 .br
+  Marcus 'malu' Lundblad
+.br
   Dennis 'EvilDennisR' Ristuccia
 .br
   Peter 'fmoo' Ruibal
diff --git a/finch/gntaccount.c b/finch/gntaccount.c
index e96fb9267f..e6b27efb4f 100644
--- a/finch/gntaccount.c
+++ b/finch/gntaccount.c
@@ -503,7 +503,7 @@ edit_account(PurpleAccount *account)
 	list = purple_plugins_get_protocols();
 	if (list == NULL) {
 		purple_notify_error(NULL, _("Error"),
-				_("There's no protocol plugins installed."),
+				_("There are no protocol plugins installed."),
 				_("(You probably forgot to 'make install'.)"));
 		return;
 	}
@@ -673,6 +673,45 @@ account_toggled(GntWidget *widget, void *key, gpointer null)
 	purple_account_set_enabled(account, FINCH_UI, gnt_tree_get_choice(GNT_TREE(widget), key));
 }
 
+static gboolean
+account_list_key_pressed_cb(GntWidget *widget, const char *text, gpointer null)
+{
+	GntTree *tree = GNT_TREE(widget);
+	PurpleAccount *account = gnt_tree_get_selection_data(tree);
+	int move, pos, count;
+	GList *accounts;
+
+	if (!account)
+		return FALSE;
+
+	switch (text[0]) {
+		case '-':
+			move = -1;
+			break;
+		case '=':
+			move = 2;  /* XXX: This seems to be a bug in libpurple */
+			break;
+		default:
+			return FALSE;
+	}
+
+	accounts = purple_accounts_get_all();
+	count = g_list_length(accounts);
+	pos = g_list_index(accounts, account);
+	pos = (move + pos + count + 1) % (count + 1);
+	purple_accounts_reorder(account, pos);
+
+	/* I don't like this, but recreating the entire list seems to be
+	 * the easiest way of doing it */
+	gnt_tree_remove_all(tree);
+	accounts = purple_accounts_get_all();
+	for (; accounts; accounts = accounts->next)
+		account_add(accounts->data);
+	gnt_tree_set_selected(tree, account);
+
+	return TRUE;
+}
+
 static void
 reset_accounts_win(GntWidget *widget, gpointer null)
 {
@@ -712,6 +751,7 @@ void finch_accounts_show_all()
 	}
 
 	g_signal_connect(G_OBJECT(accounts.tree), "toggled", G_CALLBACK(account_toggled), NULL);
+	g_signal_connect(G_OBJECT(accounts.tree), "key_pressed", G_CALLBACK(account_list_key_pressed_cb), NULL);
 
 	gnt_tree_set_col_width(GNT_TREE(accounts.tree), 0, 40);
 	gnt_tree_set_col_width(GNT_TREE(accounts.tree), 1, 10);
diff --git a/finch/gntblist.c b/finch/gntblist.c
index 101e5fd069..fd23e1459f 100644
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -554,6 +554,9 @@ node_update(PurpleBuddyList *list, PurpleBlistNode *node)
 		else
 			add_node(node, FINCH_GET_DATA(list));
 	}
+	if (ggblist->tnode == node) {
+		draw_tooltip(ggblist);
+	}
 }
 
 static void
diff --git a/finch/gntnotify.c b/finch/gntnotify.c
index 55a7261e37..e00f470cab 100644
--- a/finch/gntnotify.c
+++ b/finch/gntnotify.c
@@ -37,6 +37,7 @@
 
 
 #include "gntnotify.h"
+#include "debug.h"
 
 static struct
 {
@@ -84,12 +85,23 @@ finch_notify_message(PurpleNotifyMsgType type, const char *title,
 		GntWidget *msg;
 		if (type == PURPLE_NOTIFY_FORMATTED) {
 			int width = -1, height = -1;
+			char *plain = (char*)secondary;
 			msg = gnt_text_view_new();
-			gnt_text_view_set_flag(GNT_TEXT_VIEW(msg), GNT_TEXT_VIEW_TOP_ALIGN);
-			gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(msg), secondary, sf);
+			gnt_text_view_set_flag(GNT_TEXT_VIEW(msg), GNT_TEXT_VIEW_TOP_ALIGN | GNT_TEXT_VIEW_NO_SCROLL);
+			switch (type) {
+				case PURPLE_NOTIFY_FORMATTED:
+					plain = purple_markup_strip_html(secondary);
+					if (gnt_util_parse_xhtml_to_textview(secondary, GNT_TEXT_VIEW(msg)))
+						break;
+					/* Fallthrough */
+				default:
+					gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(msg), plain, sf);
+			}
 			gnt_text_view_attach_scroll_widget(GNT_TEXT_VIEW(msg), button);
-			gnt_util_get_text_bound(secondary, &width, &height);
+			gnt_util_get_text_bound(plain, &width, &height);
 			gnt_widget_set_size(msg, width + 3, height + 1);
+			if (plain != secondary)
+				g_free(plain);
 		} else {
 			msg = gnt_label_new_with_format(secondary, sf);
 		}
@@ -131,18 +143,18 @@ static void finch_close_notify(PurpleNotifyType type, void *handle)
 static void *finch_notify_formatted(const char *title, const char *primary,
 		const char *secondary, const char *text)
 {
-	/* XXX: For now, simply strip the html and use _notify_message. For future use,
-	 * there should be some way of parsing the makrups from GntTextView */
-	char *unformat = purple_markup_strip_html(text);
-	char *t = g_strdup_printf("%s%s%s",
+	char *xhtml = NULL;
+	char *t = g_strdup_printf("<span>%s%s%s</span>",
 			secondary ? secondary : "",
 			secondary ? "\n" : "",
-			unformat ? unformat : "");
+			text ? text : "");
+	void *ret;
 
-	void *ret = finch_notify_message(PURPLE_NOTIFY_FORMATTED, title, primary, t);
+	purple_markup_html_to_xhtml(t, &xhtml, NULL);
+	ret = finch_notify_message(PURPLE_NOTIFY_FORMATTED, title, primary, xhtml);
 
 	g_free(t);
-	g_free(unformat);
+	g_free(xhtml);
 
 	return ret;
 }
@@ -262,6 +274,46 @@ remove_userinfo(GntWidget *widget, gpointer key)
 	g_hash_table_remove(userinfo, key);
 }
 
+static char *
+purple_notify_user_info_get_xhtml(PurpleNotifyUserInfo *user_info)
+{
+	GList *l;
+	GString *text;
+
+	text = g_string_new("<span>");
+
+	for (l = purple_notify_user_info_get_entries(user_info); l != NULL;
+			l = l->next) {
+		PurpleNotifyUserInfoEntry *user_info_entry = l->data;
+		PurpleNotifyUserInfoEntryType type = purple_notify_user_info_entry_get_type(user_info_entry);
+		const char *label = purple_notify_user_info_entry_get_label(user_info_entry);
+		const char *value = purple_notify_user_info_entry_get_value(user_info_entry);
+
+		/* Handle the label/value pair itself */
+		if (type == PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER)
+			g_string_append(text, "<u>");
+		if (label)
+			g_string_append_printf(text, "<b>%s</b>", label);
+		g_string_append(text, "<span>");
+		if (label && value)
+			g_string_append(text, ": ");
+		if (value) {
+			char *strip = purple_markup_strip_html(value);
+			g_string_append(text, strip);
+			g_free(strip);
+		}
+		g_string_append(text, "</span>");
+		if (type == PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_HEADER)
+			g_string_append(text, "</u>");
+		else if (type == PURPLE_NOTIFY_USER_INFO_ENTRY_SECTION_BREAK)
+			g_string_append(text, "<HR/>");
+		g_string_append(text, "<BR/>");
+	}
+	g_string_append(text, "</span>");
+
+	return g_string_free(text, FALSE);
+}
+
 static void *
 finch_notify_userinfo(PurpleConnection *gc, const char *who, PurpleNotifyUserInfo *user_info)
 {
@@ -270,7 +322,7 @@ finch_notify_userinfo(PurpleConnection *gc, const char *who, PurpleNotifyUserInf
 	void *ui_handle;
 	char *key = userinfo_hash(purple_connection_get_account(gc), who);
 
-	info = purple_notify_user_info_get_text_with_newline(user_info, "<BR>");
+	info = purple_notify_user_info_get_xhtml(user_info);
 
 	ui_handle = g_hash_table_lookup(userinfo, key);
 	if (ui_handle != NULL) {
@@ -284,7 +336,8 @@ finch_notify_userinfo(PurpleConnection *gc, const char *who, PurpleNotifyUserInf
 		gnt_widget_get_size(GNT_WIDGET(msg), &tvw, &tvh);
 
 		gnt_text_view_clear(msg);
-		gnt_text_view_append_text_with_flags(msg, strip, GNT_TEXT_FLAG_NORMAL);
+		if (!gnt_util_parse_xhtml_to_textview(info, msg))
+			gnt_text_view_append_text_with_flags(msg, strip, GNT_TEXT_FLAG_NORMAL);
 		gnt_text_view_scroll(msg, 0);
 		gnt_util_get_text_bound(strip, &ntvw, &ntvh);
 		ntvw += 3;
diff --git a/finch/gntpounce.c b/finch/gntpounce.c
index 2316ab17a3..799829eacb 100644
--- a/finch/gntpounce.c
+++ b/finch/gntpounce.c
@@ -980,15 +980,10 @@ finch_pounces_init(void)
 						PURPLE_CALLBACK(signed_on_off_cb), NULL);
 }
 
-static void
-dummy_pounce_cb(PurplePounce *pounce, PurplePounceEvent events, void *data)
-{
-}
-
 /* XXX: There's no such thing in pidgin. Perhaps there should be? */
 void finch_pounces_uninit()
 {
-	purple_pounces_register_handler(FINCH_UI, dummy_pounce_cb, NULL, NULL);
+	purple_pounces_unregister_handler(FINCH_UI);
 
 	purple_signals_disconnect_by_handle(finch_pounces_get_handle());
 }
diff --git a/finch/libgnt/gntkeys.c b/finch/libgnt/gntkeys.c
index 80523d19f1..b669bcc1e4 100644
--- a/finch/libgnt/gntkeys.c
+++ b/finch/libgnt/gntkeys.c
@@ -47,12 +47,12 @@ void gnt_init_keys()
 			term = "";  /* Just in case */
 	}
 
-	if (strcmp(term, "xterm") == 0 || strcmp(term, "rxvt") == 0) {
+	if (strstr(term, "xterm") == term || strcmp(term, "rxvt") == 0) {
 		gnt_key_cup    = "\033" "[1;5A";
 		gnt_key_cdown  = "\033" "[1;5B";
 		gnt_key_cright = "\033" "[1;5C";
 		gnt_key_cleft  = "\033" "[1;5D";
-	} else if (strcmp(term, "screen") == 0 || strcmp(term, "rxvt-unicode") == 0) {
+	} else if (strstr(term, "screen") == term || strcmp(term, "rxvt-unicode") == 0) {
 		gnt_key_cup    = "\033" "Oa";
 		gnt_key_cdown  = "\033" "Ob";
 		gnt_key_cright = "\033" "Oc";
@@ -147,11 +147,11 @@ void gnt_keys_refine(char *text)
 	if (*text == 27 && *(text + 1) == '[' &&
 			(*(text + 2) >= 'A' && *(text + 2) <= 'D')) {
 		/* Apparently this is necessary for urxvt and screen and xterm */
-		if (strcmp(term, "screen") == 0 || strcmp(term, "rxvt-unicode") == 0 ||
-				strcmp(term, "xterm") == 0)
+		if (strstr(term, "screen") == term || strcmp(term, "rxvt-unicode") == 0 ||
+				strstr(term, "xterm") == term)
 			*(text + 1) = 'O';
 	} else if (*(unsigned char*)text == 195) {
-		if (*(text + 2) == 0 && strcmp(term, "xterm") == 0) {
+		if (*(text + 2) == 0 && strstr(term, "xterm") == term) {
 			*(text) = 27;
 			*(text + 1) -= 64;  /* Say wha? */
 		}
diff --git a/finch/libgnt/gntmenu.c b/finch/libgnt/gntmenu.c
index 0d4ab0181c..aaa71ece7a 100644
--- a/finch/libgnt/gntmenu.c
+++ b/finch/libgnt/gntmenu.c
@@ -399,9 +399,11 @@ gnt_menu_hide(GntWidget *widget)
 static gboolean
 gnt_menu_clicked(GntWidget *widget, GntMouseEvent event, int x, int y)
 {
-	if (!org_clicked || !org_clicked(widget, event, x, y) ||
-			!GNT_MENU(widget)->type == GNT_MENU_TOPLEVEL)
-			return FALSE;
+	if (GNT_MENU(widget)->type != GNT_MENU_POPUP)
+		return FALSE;
+
+	if (org_clicked && org_clicked(widget, event, x, y))
+		return TRUE;
 	gnt_widget_activate(widget);
 	return TRUE;
 }
diff --git a/finch/libgnt/wms/Makefile.am b/finch/libgnt/wms/Makefile.am
index 78a6a023c5..17b8352ddc 100644
--- a/finch/libgnt/wms/Makefile.am
+++ b/finch/libgnt/wms/Makefile.am
@@ -1,6 +1,7 @@
+wms = irssi.la
 if PURPLE_AVAILABLE
 # These custom wms depend on libpurple
-purple_wms = s.la irssi.la
+purple_wms = s.la
 else
 purple_wms =
 endif
@@ -9,6 +10,7 @@ s_la_LDFLAGS             = -module -avoid-version
 irssi_la_LDFLAGS         = -module -avoid-version
 
 plugin_LTLIBRARIES = \
+	$(wms) \
 	$(purple_wms)
  
 plugindir = $(libdir)/gnt
@@ -16,12 +18,12 @@ plugindir = $(libdir)/gnt
 irssi_la_SOURCES = irssi.c
 irssi_la_LIBADD =  \
   $(GLIB_LIBS) \
-  $(top_builddir)/finch/libgnt/libgnt.la
+  ../libgnt.la
 
 s_la_SOURCES = s.c
 s_la_LIBADD =  \
   $(GLIB_LIBS) \
-  $(top_builddir)/finch/libgnt/libgnt.la \
+  ../libgnt.la \
   $(top_builddir)/libpurple/libpurple.la
 
 EXTRA_DIST = 
diff --git a/finch/plugins/Makefile.am b/finch/plugins/Makefile.am
index 071ab15caa..902a333ef7 100644
--- a/finch/plugins/Makefile.am
+++ b/finch/plugins/Makefile.am
@@ -53,7 +53,7 @@ AM_CPPFLAGS = \
 #
 SUFFIXES = .c .so
 .c.so:
-	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_srcdir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
+	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
 	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
 	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
 	@cp .libs/libtmp$@.so* $@
diff --git a/finch/plugins/grouping.c b/finch/plugins/grouping.c
index dcc1eceff0..6e6d88bd30 100644
--- a/finch/plugins/grouping.c
+++ b/finch/plugins/grouping.c
@@ -28,6 +28,8 @@
 
 #include "gnttree.h"
 
+static FinchBlistManager *default_manager;
+
 /**
  * Online/Offline
  */
@@ -103,12 +105,8 @@ static gpointer on_offline_find_parent(PurpleBlistNode *node)
 
 static gboolean on_offline_create_tooltip(gpointer selected_row, GString **body, char **tool_title)
 {
-	static FinchBlistManager *def = NULL;
 	PurpleBlistNode *node = selected_row;
 
-	if (def == NULL)
-		def = finch_blist_manager_find("default");
-
 	if (purple_blist_node_get_type(node) == PURPLE_BLIST_OTHER_NODE) {
 		/* There should be some easy way of getting the total online count,
 		 * or total number of chats. Doing a loop here will probably be pretty
@@ -117,7 +115,7 @@ static gboolean on_offline_create_tooltip(gpointer selected_row, GString **body,
 			*body = g_string_new(node == &online ? _("Online Buddies") : _("Offline Buddies"));
 		return TRUE;
 	} else {
-		return def ? def->create_tooltip(selected_row, body, tool_title) : FALSE;
+		return default_manager ? default_manager->create_tooltip(selected_row, body, tool_title) : FALSE;
 	}
 }
 
@@ -149,17 +147,13 @@ static gboolean meebo_init()
 
 static gpointer meebo_find_parent(PurpleBlistNode *node)
 {
-	static FinchBlistManager *def = NULL;
-	if (def == NULL)
-		def = finch_blist_manager_find("default");
-
 	if (PURPLE_BLIST_NODE_IS_CONTACT(node)) {
 		PurpleBuddy *buddy = purple_contact_get_priority_buddy((PurpleContact*)node);
 		if (buddy && !PURPLE_BUDDY_IS_ONLINE(buddy)) {
 			return &meebo;
 		}
 	}
-	return def->find_parent(node);
+	return default_manager->find_parent(node);
 }
 
 static FinchBlistManager meebo_group =
@@ -223,12 +217,127 @@ static FinchBlistManager no_group =
 	{NULL, NULL, NULL, NULL}
 };
 
+/**
+ * Nested Grouping
+ */
+static GHashTable *groups;
+
+static gboolean
+nested_group_init(void)
+{
+	groups = g_hash_table_new_full(g_str_hash, g_str_equal,
+			g_free, g_free);
+	return TRUE;
+}
+
+static gboolean
+nested_group_uninit(void)
+{
+	g_hash_table_destroy(groups);
+	groups = NULL;
+	return TRUE;
+}
+
+static gpointer
+nested_group_find_parent(PurpleBlistNode *node)
+{
+	char *name;
+	PurpleGroup *group;
+	char *sep;
+	PurpleBlistNode *ret, *parent;
+	GntTree *tree;
+
+	if (!PURPLE_BLIST_NODE_IS_GROUP(node))
+		return default_manager->find_parent(node);
+
+	group = (PurpleGroup *)node;
+	name = g_strdup(purple_group_get_name(group));
+	if (!(sep = strchr(name, '/'))) {
+		g_free(name);
+		return default_manager->find_parent(node);
+	}
+
+	tree = finch_blist_get_tree();
+	parent = NULL;
+
+	while (sep) {
+		*sep = 0;
+		if (*(sep + 1) && (ret = (PurpleBlistNode *)purple_find_group(name))) {
+			finch_blist_manager_add_node(ret);
+			parent = ret;
+		} else if (!(ret = g_hash_table_lookup(groups, name))) {
+			ret = g_new0(PurpleBlistNode, 1);
+			g_hash_table_insert(groups, g_strdup(name), ret);
+			ret->type = PURPLE_BLIST_OTHER_NODE;
+			gnt_tree_add_row_last(tree, ret,
+					gnt_tree_create_row(tree, name), parent);
+			parent = ret;
+		}
+		*sep = '/';
+		sep = strchr(sep + 1, '/');
+	}
+
+	g_free(name);
+	return ret;
+}
+
+static gboolean
+nested_group_create_tooltip(gpointer selected_row, GString **body, char **title)
+{
+	PurpleBlistNode *node = selected_row;
+	if (!node ||
+			purple_blist_node_get_type(node) != PURPLE_BLIST_OTHER_NODE)
+		return default_manager->create_tooltip(selected_row, body, title);
+	if (body)
+		*body = g_string_new(_("Nested Subgroup"));  /* Perhaps list the child groups/subgroups? */
+	return TRUE;
+}
+
+static gboolean
+nested_group_can_add_node(PurpleBlistNode *node)
+{
+	PurpleBlistNode *group;
+	int len;
+
+	if (!PURPLE_BLIST_NODE_IS_GROUP(node))
+		return default_manager->can_add_node(node);
+
+	if (default_manager->can_add_node(node))
+		return TRUE;
+
+	len = strlen(purple_group_get_name((PurpleGroup*)node));
+	group = purple_blist_get_root();
+	for (; group; group = purple_blist_node_get_sibling_next(group)) {
+		if (group == node)
+			continue;
+		if (strncmp(purple_group_get_name((PurpleGroup *)node),
+					purple_group_get_name((PurpleGroup *)group), len) == 0 &&
+				default_manager->can_add_node(group))
+			return TRUE;
+	}
+	return FALSE;
+}
+
+static FinchBlistManager nested_group =
+{
+	"nested",
+	N_("Nested Grouping (experimental)"),
+	.init = nested_group_init,
+	.uninit = nested_group_uninit,
+	.find_parent = nested_group_find_parent,
+	.create_tooltip = nested_group_create_tooltip,
+	.can_add_node = nested_group_can_add_node,
+};
+
 static gboolean
 plugin_load(PurplePlugin *plugin)
 {
+	default_manager = finch_blist_manager_find("default");
+
 	finch_blist_install_manager(&on_offline);
 	finch_blist_install_manager(&meebo_group);
 	finch_blist_install_manager(&no_group);
+	finch_blist_install_manager(&nested_group);
 	return TRUE;
 }
 
@@ -238,6 +347,7 @@ plugin_unload(PurplePlugin *plugin)
 	finch_blist_uninstall_manager(&on_offline);
 	finch_blist_uninstall_manager(&meebo_group);
 	finch_blist_uninstall_manager(&no_group);
+	finch_blist_uninstall_manager(&nested_group);
 	return TRUE;
 }
 
diff --git a/libpurple/account.c b/libpurple/account.c
index a5d356ca5a..ee2c9a8223 100644
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -2614,18 +2614,18 @@ purple_accounts_find(const char *name, const char *protocol_id)
 
 	for (l = purple_accounts_get_all(); l != NULL; l = l->next) {
 		account = (PurpleAccount *)l->data;
+		if (protocol_id && strcmp(account->protocol_id, protocol_id))
+		  continue;
 
 		who = g_strdup(purple_normalize(account, name));
-		if (!strcmp(purple_normalize(account, purple_account_get_username(account)), who) &&
-			(!protocol_id || !strcmp(account->protocol_id, protocol_id))) {
+		if (!strcmp(purple_normalize(account, purple_account_get_username(account)), who)) {
 			g_free(who);
-			break;
+			return account;
 		}
 		g_free(who);
-		account = NULL;
 	}
 
-	return account;
+	return NULL;
 }
 
 void
diff --git a/libpurple/buddyicon.c b/libpurple/buddyicon.c
index 3125592d43..617d01944a 100644
--- a/libpurple/buddyicon.c
+++ b/libpurple/buddyicon.c
@@ -934,8 +934,8 @@ PurpleStoredImage *
 purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
                                                   const gchar *filename)
 {
-	size_t len;
-	guchar *data;
+	size_t len = 0;
+	guchar *data = NULL;
 
 	g_return_val_if_fail(node != NULL, NULL);
 
@@ -945,8 +945,10 @@ purple_buddy_icons_node_set_custom_icon_from_file(PurpleBlistNode *node,
 		return NULL;
 	}
 
-	if (!read_icon_file(filename, &data, &len)) {
-		return NULL;
+	if (filename != NULL) {
+		if (!read_icon_file(filename, &data, &len)) {
+			return NULL;
+		}
 	}
 
 	return purple_buddy_icons_node_set_custom_icon(node, data, len);
diff --git a/libpurple/buddyicon.h b/libpurple/buddyicon.h
index 581f31e879..4800d3c9fe 100644
--- a/libpurple/buddyicon.h
+++ b/libpurple/buddyicon.h
@@ -308,7 +308,7 @@ purple_buddy_icons_node_find_custom_icon(PurpleBlistNode *node);
  *
  * @param node      The blist node for which to set a custom icon.
  * @param icon_data The image data of the icon, which the buddy icon code will
- *                  free.
+ *                  free. Use NULL to unset the icon.
  * @param icon_len  The length of the data in @a icon_data.
  *
  * @return The icon that was set. The caller does NOT own a reference to this,
@@ -326,7 +326,8 @@ purple_buddy_icons_node_set_custom_icon(PurpleBlistNode *node,
  * @see purple_buddy_icons_node_set_custom_icon()
  *
  * @param node      The blist node for which to set a custom icon.
- * @param filename  The path to the icon to set for the blist node.
+ * @param filename  The path to the icon to set for the blist node. Use NULL
+ *                  to unset the custom icon.
  *
  * @return The icon that was set. The caller does NOT own a reference to this,
  *         and must call purple_imgstore_ref() if it wants one.
diff --git a/libpurple/dbus-maybe.h b/libpurple/dbus-maybe.h
index d454dc7e7c..6f4c8cbc3f 100644
--- a/libpurple/dbus-maybe.h
+++ b/libpurple/dbus-maybe.h
@@ -23,7 +23,10 @@
 
 #else  /* !HAVE_DBUS */
 
-#define PURPLE_DBUS_REGISTER_POINTER(ptr, type) 
+#define PURPLE_DBUS_REGISTER_POINTER(ptr, type) { \
+    if (ptr) {} \
+}
+
 #define PURPLE_DBUS_UNREGISTER_POINTER(ptr)
 #define DBUS_EXPORT
 
diff --git a/libpurple/dnsquery.c b/libpurple/dnsquery.c
index 8a3ee84409..39ce702674 100644
--- a/libpurple/dnsquery.c
+++ b/libpurple/dnsquery.c
@@ -85,7 +85,7 @@ typedef struct {
 	char hostname[512];
 	int port;
 } dns_params_t;
-#endif
+#endif /* end PURPLE_DNSQUERY_USE_FORK */
 
 static void
 purple_dnsquery_resolved(PurpleDnsQueryData *query_data, GSList *hosts)
@@ -108,6 +108,15 @@ purple_dnsquery_resolved(PurpleDnsQueryData *query_data, GSList *hosts)
 		}
 	}
 
+#ifdef PURPLE_DNSQUERY_USE_FORK
+	/*
+	 * Add the resolver to the list of available resolvers, and set it
+	 * to NULL so that it doesn't get destroyed along with the query_data
+	 */
+	free_dns_children = g_slist_prepend(free_dns_children, query_data->resolver);
+	query_data->resolver = NULL;
+#endif /* PURPLE_DNSQUERY_USE_FORK */
+
 	purple_dnsquery_destroy(query_data);
 }
 
@@ -126,10 +135,7 @@ purple_dnsquery_ui_resolve(PurpleDnsQueryData *query_data)
 	PurpleDnsQueryUiOps *ops = purple_dnsquery_get_ui_ops();
 
 	if (ops && ops->resolve_host)
-	{
-		if (ops->resolve_host(query_data, purple_dnsquery_resolved, purple_dnsquery_failed))
-			return TRUE;
-	}
+		return ops->resolve_host(query_data, purple_dnsquery_resolved, purple_dnsquery_failed);
 
 	return FALSE;
 }
@@ -209,9 +215,8 @@ purple_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug)
 	 * the result back to our parent, when finished.
 	 */
 	while (1) {
-		const char ch = 'Y';
 		fd_set fds;
-		struct timeval tv = { .tv_sec = 40 , .tv_usec = 0 };
+		struct timeval tv = { .tv_sec = 20, .tv_usec = 0 };
 		FD_ZERO(&fds);
 		FD_SET(child_in, &fds);
 		rc = select(child_in + 1, &fds, NULL, NULL, &tv);
@@ -237,8 +242,6 @@ purple_dnsquery_resolver_run(int child_out, int child_in, gboolean show_debug)
 					dns_params.port);
 			_exit(1);
 		}
-		/* Tell our parent that we read the data successfully */
-		write_to_parent(child_out, &ch, sizeof(ch));
 
 		/* We have the hostname and port, now resolve the IP */
 
@@ -415,9 +418,9 @@ purple_dnsquery_resolver_new(gboolean show_debug)
 
 /**
  * @return TRUE if the request was sent succesfully.  FALSE
- * 		if the request could not be sent.  This isn't
- * 		necessarily an error.  If the child has expired,
- * 		for example, we won't be able to send the message.
+ *         if the request could not be sent.  This isn't
+ *         necessarily an error.  If the child has expired,
+ *         for example, we won't be able to send the message.
  */
 static gboolean
 send_dns_request_to_child(PurpleDnsQueryData *query_data,
@@ -425,8 +428,7 @@ send_dns_request_to_child(PurpleDnsQueryData *query_data,
 {
 	pid_t pid;
 	dns_params_t dns_params;
-	int rc;
-	char ch;
+	ssize_t rc;
 
 	/* This waitpid might return the child's PID if it has recently
 	 * exited, or it might return an error if it exited "long
@@ -458,16 +460,10 @@ send_dns_request_to_child(PurpleDnsQueryData *query_data,
 		purple_dnsquery_resolver_destroy(resolver);
 		return FALSE;
 	}
-
-	g_return_val_if_fail(rc == sizeof(dns_params), -1);
-
-	/* Did you hear me? (This avoids some race conditions) */
-	rc = read(resolver->fd_out, &ch, sizeof(ch));
-	if (rc != 1 || ch != 'Y')
-	{
-		purple_debug_warning("dns",
-				"DNS child %d not responding. Killing it!\n",
-				resolver->dns_pid);
+	if (rc < sizeof(dns_params)) {
+		purple_debug_error("dns", "Tried to write %" G_GSSIZE_FORMAT
+				" bytes to child but only wrote %" G_GSSIZE_FORMAT "\n",
+				sizeof(dns_params), rc);
 		purple_dnsquery_resolver_destroy(resolver);
 		return FALSE;
 	}
@@ -496,13 +492,6 @@ handle_next_queued_request(void)
 	query_data = queued_requests->data;
 	queued_requests = g_slist_delete_link(queued_requests, queued_requests);
 
-	if (purple_dnsquery_ui_resolve(query_data))
-	{
-		/* The UI is handling the resolve; we're done */
-		handle_next_queued_request();
-		return;
-	}
-
 	/*
 	 * If we have any children, attempt to have them perform the DNS
 	 * query.  If we're able to send the query then resolver will be
@@ -599,7 +588,7 @@ host_resolved(gpointer data, gint source, PurpleInputCondition cond)
 		purple_dnsquery_failed(query_data, message);
 
 	} else if (rc == 0) {
-		g_snprintf(message, sizeof(message), _("EOF while reading from resolver process"));
+		g_snprintf(message, sizeof(message), _("Resolver process exited without answering our request"));
 		purple_dnsquery_failed(query_data, message);
 	}
 
@@ -614,6 +603,12 @@ resolve_host(gpointer data)
 	query_data = data;
 	query_data->timeout = 0;
 
+	if (purple_dnsquery_ui_resolve(query_data))
+	{
+		/* The UI is handling the resolve; we're done */
+		return FALSE;
+	}
+
 	handle_next_queued_request();
 
 	return FALSE;
@@ -637,7 +632,7 @@ purple_dnsquery_a(const char *hostname, int port,
 	query_data->data = data;
 	query_data->resolver = NULL;
 
-	if (strlen(query_data->hostname) == 0)
+	if (*query_data->hostname == '\0')
 	{
 		purple_dnsquery_destroy(query_data);
 		g_return_val_if_reached(NULL);
@@ -915,10 +910,13 @@ purple_dnsquery_destroy(PurpleDnsQueryData *query_data)
 
 	if (query_data->resolver != NULL)
 		/*
-		 * Ideally we would tell our resolver child to stop resolving
-		 * shit and then we would add it back to the free_dns_children
-		 * linked list.  However, it's hard to tell children stuff,
-		 * they just don't listen.
+		 * This is only non-NULL when we're cancelling an in-progress
+		 * query.  Ideally we would tell our resolver child to stop
+		 * resolving shit and then we would add it back to the
+		 * free_dns_children linked list.  However, it's hard to tell
+		 * children stuff, they just don't listen.  So we'll just
+		 * kill the process and allow a new child to be started if we
+		 * have more stuff to resolve.
 		 */
 		purple_dnsquery_resolver_destroy(query_data->resolver);
 #elif defined _WIN32 /* end PURPLE_DNSQUERY_USE_FORK */
@@ -942,7 +940,7 @@ purple_dnsquery_destroy(PurpleDnsQueryData *query_data)
 		query_data->hosts = g_slist_remove(query_data->hosts, query_data->hosts->data);
 	}
 	g_free(query_data->error_message);
-#endif
+#endif /* end _WIN32 */
 
 	if (query_data->timeout > 0)
 		purple_timeout_remove(query_data->timeout);
@@ -996,5 +994,5 @@ purple_dnsquery_uninit(void)
 		purple_dnsquery_resolver_destroy(free_dns_children->data);
 		free_dns_children = g_slist_remove(free_dns_children, free_dns_children->data);
 	}
-#endif
+#endif /* end PURPLE_DNSQUERY_USE_FORK */
 }
diff --git a/libpurple/plugins/Makefile.am b/libpurple/plugins/Makefile.am
index e1685d9dd3..5d84aa8506 100644
--- a/libpurple/plugins/Makefile.am
+++ b/libpurple/plugins/Makefile.am
@@ -153,7 +153,7 @@ AM_CPPFLAGS = \
 #
 SUFFIXES = .c .so
 .c.so:
-	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_srcdir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
+	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
 	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
 	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
 	@cp .libs/libtmp$@.so* $@
diff --git a/libpurple/plugins/autoaccept.c b/libpurple/plugins/autoaccept.c
index e167ee0429..b6bf451872 100644
--- a/libpurple/plugins/autoaccept.c
+++ b/libpurple/plugins/autoaccept.c
@@ -117,6 +117,9 @@ file_recv_request_cb(PurpleXfer *xfer, gpointer handle)
 			{
 				int count = 1;
 				const char *escape;
+				gchar **name_and_ext;
+				const gchar *name;
+				gchar *ext;
 
 				if (purple_prefs_get_bool(PREF_NEWDIR))
 					dirname = g_build_filename(pref, purple_normalize(account, xfer->who), NULL);
@@ -132,9 +135,24 @@ file_recv_request_cb(PurpleXfer *xfer, gpointer handle)
 				escape = purple_escape_filename(xfer->filename);
 				filename = g_build_filename(dirname, escape, NULL);
 
+				/* Split at the first dot, to avoid uniquifying "foo.tar.gz" to "foo.tar-2.gz" */
+				name_and_ext = g_strsplit(escape, ".", 2);
+				name = name_and_ext[0];
+				g_return_if_fail(name != NULL);
+				if (name_and_ext[1] != NULL) {
+					/* g_strsplit does not include the separator in each chunk. */
+					ext = g_strdup_printf(".%s", name_and_ext[1]);
+				} else {
+					ext = g_strdup("");
+				}
+
 				/* Make sure the file doesn't exist. Do we want some better checking than this? */
+				/* FIXME: There is a race here: if the newly uniquified file name gets created between
+				 *        this g_file_test and the transfer starting, the file created in the meantime
+				 *        will be clobbered. But it's not at all straightforward to fix.
+				 */
 				while (g_file_test(filename, G_FILE_TEST_EXISTS)) {
-					char *file = g_strdup_printf("%s-%d", escape, count++);
+					char *file = g_strdup_printf("%s-%d%s", name, count++, ext);
 					g_free(filename);
 					filename = g_build_filename(dirname, file, NULL);
 					g_free(file);
@@ -142,6 +160,8 @@ file_recv_request_cb(PurpleXfer *xfer, gpointer handle)
 
 				purple_xfer_request_accepted(xfer, filename);
 
+				g_strfreev(name_and_ext);
+				g_free(ext);
 				g_free(dirname);
 				g_free(filename);
 			}
diff --git a/libpurple/plugins/log_reader.c b/libpurple/plugins/log_reader.c
index 9663a27037..492b253707 100644
--- a/libpurple/plugins/log_reader.c
+++ b/libpurple/plugins/log_reader.c
@@ -1749,7 +1749,7 @@ static GList *qip_logger_list(PurpleLogType type, const char *sn, PurpleAccount
 	gboolean main_cycle = TRUE;
 	char *c;
 	char *start_log;
-	char *new_line;
+	char *new_line = NULL;
 	int offset = 0;
 	GError *error;
 
diff --git a/libpurple/plugins/perl/perl.c b/libpurple/plugins/perl/perl.c
index 37c967cb8b..cba35647e2 100644
--- a/libpurple/plugins/perl/perl.c
+++ b/libpurple/plugins/perl/perl.c
@@ -466,6 +466,7 @@ static gboolean
 load_perl_plugin(PurplePlugin *plugin)
 {
 	PurplePerlScript *gps = (PurplePerlScript *)plugin->info->extra_info;
+	gboolean loaded = TRUE;
 	char *atmp[3] = { plugin->path, NULL, NULL };
 
 	if (gps == NULL || gps->load_sub == NULL)
@@ -501,6 +502,7 @@ load_perl_plugin(PurplePlugin *plugin)
 			purple_debug(PURPLE_DEBUG_ERROR, "perl",
 			           "Perl function %s exited abnormally: %s\n",
 			           gps->load_sub, SvPVutf8_nolen(ERRSV));
+			loaded = FALSE;
 		}
 
 		PUTBACK;
@@ -508,7 +510,7 @@ load_perl_plugin(PurplePlugin *plugin)
 		LEAVE;
 	}
 
-	return TRUE;
+	return loaded;
 }
 
 static void
diff --git a/libpurple/plugins/ssl/ssl-nss.c b/libpurple/plugins/ssl/ssl-nss.c
index a62f6b9f8f..01469a96f7 100644
--- a/libpurple/plugins/ssl/ssl-nss.c
+++ b/libpurple/plugins/ssl/ssl-nss.c
@@ -141,6 +141,19 @@ ssl_nss_init_nss(void)
 	g_free(lib);
 	NSS_SetDomesticPolicy();
 
+	SSL_CipherPrefSetDefault(TLS_DHE_RSA_WITH_AES_256_CBC_SHA, 1);
+	SSL_CipherPrefSetDefault(TLS_DHE_DSS_WITH_AES_256_CBC_SHA, 1);
+	SSL_CipherPrefSetDefault(TLS_RSA_WITH_AES_256_CBC_SHA, 1);
+	SSL_CipherPrefSetDefault(TLS_DHE_DSS_WITH_RC4_128_SHA, 1);
+	SSL_CipherPrefSetDefault(TLS_DHE_RSA_WITH_AES_128_CBC_SHA, 1);
+	SSL_CipherPrefSetDefault(TLS_DHE_DSS_WITH_AES_128_CBC_SHA, 1);
+	SSL_CipherPrefSetDefault(SSL_RSA_WITH_RC4_128_SHA, 1);
+	SSL_CipherPrefSetDefault(TLS_RSA_WITH_AES_128_CBC_SHA, 1);
+	SSL_CipherPrefSetDefault(SSL_DHE_RSA_WITH_3DES_EDE_CBC_SHA, 1);
+	SSL_CipherPrefSetDefault(SSL_DHE_DSS_WITH_3DES_EDE_CBC_SHA, 1);
+	SSL_CipherPrefSetDefault(SSL_DHE_RSA_WITH_DES_CBC_SHA, 1);
+	SSL_CipherPrefSetDefault(SSL_DHE_DSS_WITH_DES_CBC_SHA, 1);
+
 	_identity = PR_GetUniqueIdentity("Purple");
 	_nss_methods = PR_GetDefaultIOMethods();
 }
@@ -285,7 +298,8 @@ ssl_nss_get_peer_certificates(PRFileDesc *socket, PurpleSslConnection * gsc)
 	}
 	
 	for (count = 0 ; count < CERT_MAX_CERT_CHAIN ; count++) {
-		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName, curcert->issuerName);
+		purple_debug_info("nss", "subject=%s issuer=%s\n", curcert->subjectName,
+						  curcert->issuerName  ? curcert->issuerName : "(null)");
 		newcrt = x509_import_from_nss(curcert);
 		peer_certs = g_list_append(peer_certs, newcrt);
 
@@ -676,7 +690,8 @@ x509_signed_by(PurpleCertificate * crt,
 	subjectCert = X509_NSS_DATA(crt);
 	g_return_val_if_fail(subjectCert, FALSE);
 
-	if ( PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0 )
+	if (subjectCert->issuerName == NULL
+			|| PORT_Strcmp(subjectCert->issuerName, issuerCert->subjectName) != 0)
 		return FALSE;
 	st = CERT_VerifySignedData(&subjectCert->signatureWrap, issuerCert, PR_Now(), NULL);
 	return st == SECSuccess;
diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c
index fce9d025ee..769aed0b53 100644
--- a/libpurple/protocols/bonjour/jabber.c
+++ b/libpurple/protocols/bonjour/jabber.c
@@ -171,19 +171,13 @@ _jabber_parse_and_write_message_to_ui(xmlnode *message_node, PurpleBuddy *pb)
 		html_body_node = xmlnode_get_child(html_node, "body");
 		if (html_body_node != NULL) {
 			xmlnode *html_body_font_node;
-			const char *ichat_balloon_color = NULL;
-			const char *ichat_text_color = NULL;
-			const char *font_face = NULL;
-			const char *font_size = NULL;
-			const char *font_color = NULL;
-
-			ichat_balloon_color = xmlnode_get_attrib(html_body_node, "ichatballooncolor");
-			ichat_text_color = xmlnode_get_attrib(html_body_node, "ichattextcolor");
-			html_body_font_node = xmlnode_get_child(html_body_node, "font");
 
+			html_body_font_node = xmlnode_get_child(html_body_node, "font");
 			/* Types of messages sent by iChat */
 			if (html_body_font_node != NULL) {
 				gchar *html_body;
+				const char *font_face, *font_size, *font_color,
+					*ichat_balloon_color, *ichat_text_color;
 
 				font_face = xmlnode_get_attrib(html_body_font_node, "face");
 				/* The absolute iChat font sizes should be converted to 1..7 range */
@@ -191,22 +185,29 @@ _jabber_parse_and_write_message_to_ui(xmlnode *message_node, PurpleBuddy *pb)
 				if (font_size != NULL)
 					font_size = _font_size_ichat_to_purple(atoi(font_size));
 				font_color = xmlnode_get_attrib(html_body_font_node, "color");
+				ichat_balloon_color = xmlnode_get_attrib(html_body_node, "ichatballooncolor");
+				ichat_text_color = xmlnode_get_attrib(html_body_node, "ichattextcolor");
+
 				html_body = get_xmlnode_contents(html_body_font_node);
 
 				if (html_body == NULL)
-					/* This is the kind of formated messages that Purple creates */
+					/* This is the kind of formatted messages that Purple creates */
 					html_body = xmlnode_to_str(html_body_font_node, NULL);
 
 				if (html_body != NULL) {
-					/* Use some sane defaults */
-					if (font_face == NULL) font_face = "Helvetica";
-					if (font_size == NULL) font_size = "3";
-					if (ichat_text_color == NULL) ichat_text_color = "#000000";
-					if (ichat_balloon_color == NULL) ichat_balloon_color = "#FFFFFF";
+					GString *str = g_string_new("<font");
 
-					body = g_strdup_printf("<font face='%s' size='%s' color='%s' back='%s'>%s</font>",
-								   font_face, font_size, ichat_text_color, ichat_balloon_color,
-								   html_body);
+					if (font_face)
+						g_string_append_printf(str, " face='%s'", font_face);
+					if (font_size)
+						g_string_append_printf(str, " size='%s'", font_size);
+					if (ichat_text_color)
+						g_string_append_printf(str, " color='%s'", ichat_text_color);
+					if (ichat_balloon_color)
+						g_string_append_printf(str, " back='%s'", ichat_balloon_color);
+					g_string_append_printf(str, ">%s</font>", html_body);
+
+					body = g_string_free(str, FALSE);
 
 					g_free(html_body);
 				}
@@ -945,7 +946,7 @@ int
 bonjour_jabber_send_message(BonjourJabber *jdata, const gchar *to, const gchar *body)
 {
 	xmlnode *message_node, *node, *node2;
-	gchar *message;
+	gchar *message, *xhtml;
 	PurpleBuddy *pb;
 	BonjourBuddy *bb;
 	int ret;
@@ -957,6 +958,8 @@ bonjour_jabber_send_message(BonjourJabber *jdata, const gchar *to, const gchar *
 		return -10000;
 	}
 
+	purple_markup_html_to_xhtml(body, &xhtml, &message);
+
 	bb = pb->proto_data;
 
 	message_node = xmlnode_new("message");
@@ -966,7 +969,6 @@ bonjour_jabber_send_message(BonjourJabber *jdata, const gchar *to, const gchar *
 
 	/* Enclose the message from the UI within a "font" node */
 	node = xmlnode_new_child(message_node, "body");
-	message = purple_markup_strip_html(body);
 	xmlnode_insert_data(node, message, strlen(message));
 	g_free(message);
 
@@ -974,8 +976,9 @@ bonjour_jabber_send_message(BonjourJabber *jdata, const gchar *to, const gchar *
 	xmlnode_set_namespace(node, "http://www.w3.org/1999/xhtml");
 
 	node = xmlnode_new_child(node, "body");
-	message = g_strdup_printf("<font>%s</font>", body);
+	message = g_strdup_printf("<font>%s</font>", xhtml);
 	node2 = xmlnode_from_str(message, strlen(message));
+	g_free(xhtml);
 	g_free(message);
 	xmlnode_insert_child(node, node2);
 
diff --git a/libpurple/protocols/jabber/Makefile.am b/libpurple/protocols/jabber/Makefile.am
index 8d0942bb1f..dbf7603a64 100644
--- a/libpurple/protocols/jabber/Makefile.am
+++ b/libpurple/protocols/jabber/Makefile.am
@@ -11,6 +11,8 @@ JABBERSOURCES = auth.c \
 			  buddy.h \
 			  chat.c \
 			  chat.h \
+			  data.c \
+			  data.h \
 			  disco.c \
 			  disco.h \
 			  google.c \
diff --git a/libpurple/protocols/jabber/Makefile.mingw b/libpurple/protocols/jabber/Makefile.mingw
index a0fd70931a..72878e0177 100644
--- a/libpurple/protocols/jabber/Makefile.mingw
+++ b/libpurple/protocols/jabber/Makefile.mingw
@@ -48,6 +48,7 @@ C_SRC =	\
 			buddy.c \
 			caps.c \
 			chat.c \
+			data.c \
 			disco.c \
 			google.c \
 			iq.c \
diff --git a/libpurple/protocols/jabber/buddy.c b/libpurple/protocols/jabber/buddy.c
index 0d9ed7afe9..55b783c958 100644
--- a/libpurple/protocols/jabber/buddy.c
+++ b/libpurple/protocols/jabber/buddy.c
@@ -1251,7 +1251,6 @@ static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data)
 
 			text = xmlnode_get_data(child);
 			if(text && !strcmp(child->name, "FN")) {
-				/* If we havne't found a name yet, use this one as the serverside name */
 				if (!serverside_alias)
 					serverside_alias = g_strdup(text);
 
@@ -1275,11 +1274,14 @@ static void jabber_vcard_parse(JabberStream *js, xmlnode *packet, gpointer data)
 					g_free(text2);
 				}
 			} else if(text && !strcmp(child->name, "NICKNAME")) {				
-				/* Prefer the Nickcname to the Full Name as the serverside alias */
-				g_free(serverside_alias);
-				serverside_alias = g_strdup(text);
-
-				purple_notify_user_info_add_pair(user_info, _("Nickname"), text);
+				/* Prefer the Nickcname to the Full Name as the serverside alias if it's not just part of the jid.
+				 * Ignore it if it's part of the jid. */
+				if (strstr(bare_jid, text) == NULL) {
+					g_free(serverside_alias);
+					serverside_alias = g_strdup(text);
+					
+					purple_notify_user_info_add_pair(user_info, _("Nickname"), text);
+				}
 			} else if(text && !strcmp(child->name, "BDAY")) {
 				purple_notify_user_info_add_pair(user_info, _("Birthday"), text);
 			} else if(!strcmp(child->name, "ADR")) {
@@ -2497,29 +2499,37 @@ void jabber_user_search_begin(PurplePluginAction *action)
 }
 
 gboolean
-jabber_buddy_has_capability(JabberBuddy *jb, const gchar *cap)
+jabber_resource_has_capability(const JabberBuddyResource *jbr, const gchar *cap)
 {
-	JabberBuddyResource *jbr = jabber_buddy_find_resource(jb, NULL);
 	const GList *iter = NULL;
-	
-	if (!jbr) {
-		purple_debug_error("jabber", 
-				   "Unable to find caps: buddy might be offline\n");
-		return FALSE;
-	}
-	
+
 	if (!jbr->caps) {
 		purple_debug_error("jabber",
-				   "Unable to find caps: nothing known about buddy\n");
+			"Unable to find caps: nothing known about buddy\n");
 		return FALSE;
 	}
-	
+
 	for (iter = jbr->caps->features ; iter ; iter = g_list_next(iter)) {
-		if (strcmp(iter->data, cap) == 0)
+		purple_debug_info("jabber", "Found cap: %s\n", (char *)iter->data);
+		if (strcmp(iter->data, cap) == 0) {
 			return TRUE;
+		}
 	}
-	
+
 	return FALSE;
 }
 
+gboolean
+jabber_buddy_has_capability(const JabberBuddy *jb, const gchar *cap)
+{
+	JabberBuddyResource *jbr = jabber_buddy_find_resource((JabberBuddy*)jb, NULL);
+
+	if (!jbr) {
+		purple_debug_error("jabber",
+			"Unable to find caps: buddy might be offline\n");
+		return FALSE;
+	}
+
+	return jabber_resource_has_capability(jbr, cap);
+}
 
diff --git a/libpurple/protocols/jabber/buddy.h b/libpurple/protocols/jabber/buddy.h
index 6a88a86f22..ef49ea1f22 100644
--- a/libpurple/protocols/jabber/buddy.h
+++ b/libpurple/protocols/jabber/buddy.h
@@ -119,4 +119,8 @@ void jabber_buddy_remove_all_pending_buddy_info_requests(JabberStream *js);
 
 void jabber_vcard_fetch_mine(JabberStream *js);
 
+gboolean jabber_resource_has_capability(const JabberBuddyResource *jbr,
+										const gchar *cap);
+gboolean jabber_buddy_has_capability(const JabberBuddy *jb, const gchar *cap);
+
 #endif /* _PURPLE_JABBER_BUDDY_H_ */
diff --git a/libpurple/protocols/jabber/chat.c b/libpurple/protocols/jabber/chat.c
index 97988ceaf2..46c9f96ed3 100644
--- a/libpurple/protocols/jabber/chat.c
+++ b/libpurple/protocols/jabber/chat.c
@@ -31,6 +31,7 @@
 #include "message.h"
 #include "presence.h"
 #include "xdata.h"
+#include "data.h"
 
 GList *jabber_chat_info(PurpleConnection *gc)
 {
@@ -684,6 +685,7 @@ void jabber_chat_part(JabberChat *chat, const char *msg)
 		xmlnode_insert_data(status, msg, -1);
 	}
 	jabber_send(chat->js, presence);
+	
 	xmlnode_free(presence);
 	g_free(room_jid);
 }
diff --git a/libpurple/protocols/jabber/data.c b/libpurple/protocols/jabber/data.c
new file mode 100644
index 0000000000..2064f0a1b8
--- /dev/null
+++ b/libpurple/protocols/jabber/data.c
@@ -0,0 +1,247 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
+ 
+#include <stdlib.h>
+#include <glib.h>
+#include <string.h>
+
+#include "internal.h"
+#include "data.h"
+#include "debug.h"
+#include "xmlnode.h"
+#include "util.h"
+#include "iq.h"
+
+static GHashTable *local_data_by_alt = NULL;
+static GHashTable *local_data_by_cid = NULL;
+static GHashTable *remote_data_by_cid = NULL;
+
+JabberData *
+jabber_data_create_from_data(gconstpointer rawdata, gsize size, const char *type,
+	JabberStream *js)
+{
+	JabberData *data = g_new0(JabberData, 1);
+	gchar *checksum = purple_util_get_image_checksum(rawdata, size);
+	gchar cid[256];
+
+	g_snprintf(cid, sizeof(cid), "sha1+%s@bob.xmpp.org", checksum);
+	g_free(checksum);
+
+	data->cid = g_strdup(cid);
+	data->type = g_strdup(type);
+	data->size = size;
+
+	data->data = g_memdup(rawdata, size);
+
+	return data;
+}
+
+JabberData *
+jabber_data_create_from_xml(xmlnode *tag)
+{
+	JabberData *data = g_new0(JabberData, 1);
+	gsize size;
+	gpointer raw_data = NULL;
+
+	if (data == NULL) {
+		purple_debug_error("jabber", "Could not allocate data object\n");
+		g_free(data);
+		return NULL;
+	}
+
+	/* check if this is a "data" tag */
+	if (strcmp(tag->name, "data") != 0) {
+		purple_debug_error("jabber", "Invalid data element");
+		g_free(data);
+		return NULL;
+	}
+
+	data->cid = g_strdup(xmlnode_get_attrib(tag, "cid"));
+	data->type = g_strdup(xmlnode_get_attrib(tag, "type"));
+	
+	raw_data = xmlnode_get_data(tag);
+	data->data = purple_base64_decode(raw_data, &size);
+	data->size = size;
+
+	g_free(raw_data);
+
+	return data;
+}
+
+
+static void
+jabber_data_delete(gpointer cbdata)
+{
+	JabberData *data = cbdata;
+	g_free(data->cid);
+	g_free(data->type);
+	g_free(data->data);
+	g_free(data);
+}
+
+const char *
+jabber_data_get_cid(const JabberData *data)
+{
+	return data->cid;
+}
+
+
+const char *
+jabber_data_get_type(const JabberData *data)
+{
+	return data->type;
+}
+
+gsize
+jabber_data_get_size(const JabberData *data)
+{
+	return data->size;
+}
+
+gpointer
+jabber_data_get_data(const JabberData *data)
+{
+	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_set_namespace(tag, XEP_0231_NAMESPACE);
+	xmlnode_set_attrib(tag, "cid", data->cid);
+	xmlnode_set_attrib(tag, "type", data->type);
+
+	xmlnode_insert_data(tag, base64data, -1);
+
+	g_free(base64data);
+
+	return tag;
+}
+
+xmlnode *
+jabber_data_get_xhtml_im(const JabberData *data, const gchar *alt)
+{
+	xmlnode *img = xmlnode_new("img");
+	char src[128];
+
+	xmlnode_set_attrib(img, "alt", alt);
+	g_snprintf(src, sizeof(src), "cid:%s", data->cid);
+	xmlnode_set_attrib(img, "src", src);
+
+	return img;
+}
+
+xmlnode *
+jabber_data_get_xml_request(const gchar *cid)
+{
+	xmlnode *tag = xmlnode_new("data");
+
+	xmlnode_set_namespace(tag, XEP_0231_NAMESPACE);
+	xmlnode_set_attrib(tag, "cid", cid);
+
+	return tag;
+}
+
+const JabberData *
+jabber_data_find_local_by_alt(const gchar *alt)
+{
+	purple_debug_info("jabber", "looking up local smiley with alt = %s\n", alt);
+	return g_hash_table_lookup(local_data_by_alt, alt);
+}
+
+const JabberData *
+jabber_data_find_local_by_cid(const gchar *cid)
+{
+	purple_debug_info("jabber", "lookup local smiley with cid = %s\n", cid);
+	return g_hash_table_lookup(local_data_by_cid, cid);
+}
+
+const JabberData *
+jabber_data_find_remote_by_cid(const gchar *cid)
+{
+	purple_debug_info("jabber", "lookup remote smiley with cid = %s\n", cid);
+	
+	return g_hash_table_lookup(remote_data_by_cid, cid);
+}
+
+void
+jabber_data_associate_local(JabberData *data, const gchar *alt)
+{
+	purple_debug_info("jabber", "associating local smiley\n alt = %s, cid = %s\n",
+		alt, jabber_data_get_cid(data));
+	g_hash_table_insert(local_data_by_alt, g_strdup(alt), data);
+	g_hash_table_insert(local_data_by_cid, g_strdup(jabber_data_get_cid(data)), 
+		data);
+}
+
+void
+jabber_data_associate_remote(JabberData *data)
+{
+	purple_debug_info("jabber", "associating remote smiley, cid = %s\n",
+		jabber_data_get_cid(data));
+	g_hash_table_insert(remote_data_by_cid, g_strdup(jabber_data_get_cid(data)), 
+		data);
+}
+
+void
+jabber_data_parse(JabberStream *js, xmlnode *packet)
+{
+	JabberIq *result = NULL;
+	const char *who = xmlnode_get_attrib(packet, "from");
+	xmlnode *data_node = xmlnode_get_child(packet, "data");
+	const JabberData *data =
+		jabber_data_find_local_by_cid(xmlnode_get_attrib(data_node, "cid"));
+
+	if (!data) {
+		xmlnode *item_not_found = xmlnode_new("item-not-found");
+
+		result = jabber_iq_new(js, JABBER_IQ_ERROR);
+		xmlnode_set_attrib(result->node, "to", who);
+		xmlnode_set_attrib(result->node, "id", xmlnode_get_attrib(packet, "id"));
+		xmlnode_insert_child(result->node, item_not_found);
+	} else {
+		result = jabber_iq_new(js, JABBER_IQ_RESULT);
+		xmlnode_set_attrib(result->node, "to", who);
+		xmlnode_set_attrib(result->node, "id", xmlnode_get_attrib(packet, "id"));
+		xmlnode_insert_child(result->node,
+							 jabber_data_get_xml_definition(data));
+	}
+	jabber_iq_send(result);
+}
+
+void
+jabber_data_init(void)
+{
+	purple_debug_info("jabber", "creating hash tables for data objects\n");
+	local_data_by_alt = g_hash_table_new_full(g_str_hash, g_str_equal,
+		g_free, NULL);
+	local_data_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal,
+		g_free, jabber_data_delete);
+	remote_data_by_cid = g_hash_table_new_full(g_str_hash, g_str_equal,
+		g_free, jabber_data_delete);
+}
+
+void
+jabber_data_uninit(void)
+{
+	purple_debug_info("jabber", "destroying hash tables for data objects\n");
+	g_hash_table_destroy(local_data_by_alt);
+	g_hash_table_destroy(local_data_by_cid);
+	g_hash_table_destroy(remote_data_by_cid);
+}
diff --git a/libpurple/protocols/jabber/data.h b/libpurple/protocols/jabber/data.h
new file mode 100644
index 0000000000..40698de730
--- /dev/null
+++ b/libpurple/protocols/jabber/data.h
@@ -0,0 +1,73 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor Boston, MA 02110-1301,  USA
+ */
+ 
+#ifndef JABBER_DATA_H
+#define JABBER_DATA_H
+
+#include "xmlnode.h"
+#include "jabber.h"
+
+#define XEP_0231_NAMESPACE "urn:xmpp:bob"
+
+#include <glib.h>
+
+typedef struct {
+	char *cid;
+	char *type;
+	gsize size;
+	gpointer data;
+} JabberData;
+
+/* creates a JabberData instance from raw data */
+JabberData *jabber_data_create_from_data(gconstpointer data, gsize size,
+										 const char *type, JabberStream *js);
+
+/* create a JabberData instance from an XML "data" element (as defined by
+  XEP 0231 */
+JabberData *jabber_data_create_from_xml(xmlnode *tag);
+
+const char *jabber_data_get_cid(const JabberData *data);
+const char *jabber_data_get_type(const JabberData *data);
+
+gsize jabber_data_get_size(const JabberData *data);
+gpointer jabber_data_get_data(const JabberData *data);
+
+/* returns the XML definition for the data element */
+xmlnode *jabber_data_get_xml_definition(const JabberData *data);
+
+/* returns an XHTML-IM "img" tag given a data instance */
+xmlnode *jabber_data_get_xhtml_im(const JabberData *data, const gchar *alt);
+
+/* returns a data request element (to be included in an iq stanza) for requesting
+  data */
+xmlnode *jabber_data_get_xml_request(const gchar *cid);
+
+/* lookup functions */
+const JabberData *jabber_data_find_local_by_alt(const gchar *alt);
+const JabberData *jabber_data_find_local_by_cid(const gchar *cid);
+const JabberData *jabber_data_find_remote_by_cid(const gchar *cid);
+
+/* store data objects */
+void jabber_data_associate_local(JabberData *data, const gchar *alt);
+void jabber_data_associate_remote(JabberData *data);
+
+/* handles iq requests */
+void jabber_data_parse(JabberStream *js, xmlnode *packet);
+
+void jabber_data_init(void);
+void jabber_data_uninit(void);
+
+#endif /* JABBER_DATA_H */
diff --git a/libpurple/protocols/jabber/iq.c b/libpurple/protocols/jabber/iq.c
index ac8da9a04a..ee5808a7ae 100644
--- a/libpurple/protocols/jabber/iq.c
+++ b/libpurple/protocols/jabber/iq.c
@@ -34,6 +34,7 @@
 #include "si.h"
 #include "ping.h"
 #include "adhoccommands.h"
+#include "data.h"
 
 #ifdef _WIN32
 #include "utsname.h"
@@ -314,7 +315,7 @@ void jabber_iq_parse(JabberStream *js, xmlnode *packet)
 	const char *xmlns;
 	const char *type, *id, *from;
 	JabberIqHandler *jih;
-	
+
 	query = xmlnode_get_child(packet, "query");
 	type = xmlnode_get_attrib(packet, "type");
 	from = xmlnode_get_attrib(packet, "from");
@@ -354,10 +355,17 @@ void jabber_iq_parse(JabberStream *js, xmlnode *packet)
 		return;
 	}
 	
+	purple_debug_info("jabber", "jabber_iq_parse\n");
+
 	if(xmlnode_get_child_with_namespace(packet, "ping", "urn:xmpp:ping")) {
 		jabber_ping_parse(js, packet);
 		return;
 	}
+
+	if (xmlnode_get_child_with_namespace(packet, "data", XEP_0231_NAMESPACE)) {
+		jabber_data_parse(js, packet);
+		return;
+	}
 	
 #ifdef USE_VV
 	if (xmlnode_get_child_with_namespace(packet, "jingle", JINGLE)) {
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
index 738a0acdb3..2d08b45089 100644
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -42,6 +42,7 @@
 #include "auth.h"
 #include "buddy.h"
 #include "chat.h"
+#include "data.h"
 #include "disco.h"
 #include "google.h"
 #include "iq.h"
@@ -650,7 +651,8 @@ jabber_login(PurpleAccount *account)
 	JabberStream *js;
 	JabberBuddy *my_jb = NULL;
 
-	gc->flags |= PURPLE_CONNECTION_HTML;
+	gc->flags |= PURPLE_CONNECTION_HTML |
+		PURPLE_CONNECTION_ALLOW_CUSTOM_SMILEY;
 	js = gc->proto_data = g_new0(JabberStream, 1);
 	js->gc = gc;
 	js->fd = -1;
@@ -668,7 +670,6 @@ jabber_login(PurpleAccount *account)
 	js->old_length = 0;
 	js->keepalive_timeout = -1;
 	js->certificate_CN = g_strdup(connect_server[0] ? connect_server : js->user ? js->user->domain : NULL);
-
 #ifdef USE_VV
 	js->sessions = NULL;
 #endif
@@ -2401,7 +2402,6 @@ gboolean jabber_offline_message(const PurpleBuddy *buddy)
 {
 	return TRUE;
 }
-
 #ifdef USE_VV
 
 PurpleMedia *
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
index c32bfde494..c7ac36f9f3 100644
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -43,6 +43,7 @@
 #include "pep.h"
 #include "usertune.h"
 #include "caps.h"
+#include "data.h"
 
 static PurplePluginProtocolInfo prpl_info =
 {
@@ -142,8 +143,7 @@ static gboolean load_plugin(PurplePlugin *plugin)
 			     purple_marshal_VOID__POINTER_POINTER, NULL, 2,
 			     purple_value_new(PURPLE_TYPE_SUBTYPE, PURPLE_SUBTYPE_CONNECTION),
 			     purple_value_new_outgoing(PURPLE_TYPE_STRING));
-			   
-
+	
 	return TRUE;
 }
 
@@ -155,6 +155,8 @@ static gboolean unload_plugin(PurplePlugin *plugin)
 	
 	purple_signal_unregister(plugin, "jabber-sending-text");
 	
+	jabber_data_uninit();
+	
 	return TRUE;
 }
 
@@ -247,6 +249,13 @@ init_plugin(PurplePlugin *plugin)
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
 						  option);
 
+	/* this should probably be part of global smiley theme settings later on,
+	  shared with MSN */
+	option = purple_account_option_bool_new(_("Show Custom Smileys"),
+		"custom_smileys", TRUE);
+	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options,
+		option);
+
 	jabber_init_plugin(plugin);
 
 	purple_prefs_remove("/plugins/prpl/jabber");
@@ -275,11 +284,16 @@ init_plugin(PurplePlugin *plugin)
 	
 	jabber_tune_init();
 	jabber_caps_init();
-
+	
+	jabber_data_init();
+	
 	jabber_add_feature("avatarmeta", AVATARNAMESPACEMETA, jabber_pep_namespace_only_when_pep_enabled_cb);
 	jabber_add_feature("avatardata", AVATARNAMESPACEDATA, jabber_pep_namespace_only_when_pep_enabled_cb);
-	jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns", jabber_buzz_isenabled);
-	
+	jabber_add_feature("buzz", "http://www.xmpp.org/extensions/xep-0224.html#ns",
+					   jabber_buzz_isenabled);
+	jabber_add_feature("bob", XEP_0231_NAMESPACE,
+					   jabber_custom_smileys_isenabled);
+
 	jabber_pep_register_handler("avatar", AVATARNAMESPACEMETA, jabber_buddy_avatar_update_metadata);
 #ifdef USE_VV
 	jabber_add_feature("voice-v1", "http://www.xmpp.org/extensions/xep-0167.html#ns", NULL);
diff --git a/libpurple/protocols/jabber/message.c b/libpurple/protocols/jabber/message.c
index 944cbda1cd..ffd9c18e86 100644
--- a/libpurple/protocols/jabber/message.c
+++ b/libpurple/protocols/jabber/message.c
@@ -24,13 +24,17 @@
 #include "notify.h"
 #include "server.h"
 #include "util.h"
-
 #include "buddy.h"
 #include "chat.h"
+#include "data.h"
 #include "google.h"
 #include "message.h"
 #include "xmlnode.h"
 #include "pep.h"
+#include "smiley.h"
+#include "iq.h"
+
+#include <string.h>
 
 void jabber_message_free(JabberMessage *jm)
 {
@@ -312,6 +316,225 @@ static void handle_buzz(JabberMessage *jm) {
 	g_free(str);
 }
 
+/* used internally by the functions below */
+typedef struct {
+	gchar *cid;
+	gchar *alt;
+} JabberSmileyRef;
+
+
+static void
+jabber_message_get_refs_from_xmlnode_internal(const xmlnode *message,
+	GHashTable *table)
+{
+	xmlnode *child;
+	
+	for (child = xmlnode_get_child(message, "img") ; child ;
+		 child = xmlnode_get_next_twin(child)) {
+		const gchar *src = xmlnode_get_attrib(child, "src");
+		
+		if (g_str_has_prefix(src, "cid:")) {
+			const gchar *cid = src + 4;
+			
+			/* if we haven't "fetched" this yet... */
+			if (!g_hash_table_lookup(table, cid)) {
+				/* take a copy of the cid and let the SmileyRef own it... */
+				gchar *temp_cid = g_strdup(cid);
+				JabberSmileyRef *ref = g_new0(JabberSmileyRef, 1);
+				const gchar *alt = xmlnode_get_attrib(child, "alt");
+				ref->cid = temp_cid;
+				/* if there is no "alt" string, use the cid... 
+				 include the entire src, eg. "cid:.." to avoid linkification */
+				if (alt && alt[0] != '\0') {
+					/* workaround for when "alt" is set to the value of the
+					 CID (which Jabbim seems to do), to avoid it showing up
+						 as an mailto: link */
+					if (purple_email_is_valid(alt)) {
+						ref->alt = g_strdup_printf("smiley:%s", alt); 
+					} else {
+						ref->alt = g_strdup(alt);
+					}
+				} else {
+					ref->alt = g_strdup(src);
+				}
+				g_hash_table_insert(table, temp_cid, ref);
+			}
+		}
+	}
+		
+	for (child = message->child ; child ; child = child->next) {
+		jabber_message_get_refs_from_xmlnode_internal(child, table);
+	}
+}
+
+static gboolean
+jabber_message_get_refs_steal(gpointer key, gpointer value, gpointer user_data)
+{
+	GList **refs = (GList **) user_data;
+	JabberSmileyRef *ref = (JabberSmileyRef *) value;
+	
+	*refs = g_list_append(*refs, ref);
+	
+	return TRUE;
+}
+
+static GList *
+jabber_message_get_refs_from_xmlnode(const xmlnode *message)
+{
+	GList *refs = NULL;
+	GHashTable *unique_refs = g_hash_table_new(g_str_hash, g_str_equal);
+	
+	jabber_message_get_refs_from_xmlnode_internal(message, unique_refs);
+	(void) g_hash_table_foreach_steal(unique_refs, 
+		jabber_message_get_refs_steal, (gpointer) &refs);
+	g_hash_table_destroy(unique_refs);
+	return refs;
+}
+
+static gchar *
+jabber_message_xml_to_string_strip_img_smileys(xmlnode *xhtml)
+{
+	gchar *markup = xmlnode_to_str(xhtml, NULL);
+	int len = strlen(markup);
+	int pos = 0;
+	GString *out = g_string_new(NULL);
+
+	while (pos < len) {
+		/* this is a bit cludgy, maybe there is a better way to do this...
+		  we need to find all <img> tags within the XHTML and replace those
+			tags with the value of their "alt" attributes */
+		if (g_str_has_prefix(&(markup[pos]), "<img")) {
+			xmlnode *img = NULL;
+			int pos2 = pos;
+			const gchar *src;
+
+			for (; pos2 < len ; pos2++) {
+				if (g_str_has_prefix(&(markup[pos2]), "/>")) {
+					pos2 += 2;
+					break;
+				} else if (g_str_has_prefix(&(markup[pos2]), "</img>")) {
+					pos2 += 5;
+					break;
+				}
+			}
+
+			/* note, if the above loop didn't find the end of the <img> tag,
+			  it the parsed string will be until the end of the input string,
+			  in which case xmlnode_from_str will bail out and return NULL,
+			  in this case the "if" statement below doesn't trigger and the
+			  text is copied unchanged */
+			img = xmlnode_from_str(&(markup[pos]), pos2 - pos);
+			src = xmlnode_get_attrib(img, "src");
+
+			if (g_str_has_prefix(src, "cid:")) {
+				const gchar *alt = xmlnode_get_attrib(img, "alt");
+				/* if the "alt" attribute is empty, put the cid as smiley string */
+				if (alt && alt[0] != '\0') {
+					/* if the "alt" is the same as the CID, as Jabbim does,
+					 this prevents linkification... */
+					if (purple_email_is_valid(alt)) {
+						gchar *safe_alt = g_strdup_printf("smiley:%s", alt);
+						out = g_string_append(out, safe_alt);
+						g_free(safe_alt);
+					} else {
+						out = g_string_append(out, alt);
+					}
+				} else {
+					out = g_string_append(out, src);
+				}
+				pos += pos2 - pos;
+			} else {
+				out = g_string_append_c(out, markup[pos]);
+				pos++;
+			}
+
+			xmlnode_free(img);
+
+		} else {
+			out = g_string_append_c(out, markup[pos]);
+			pos++;
+		}
+	}
+
+	g_free(markup);
+	return g_string_free(out, FALSE);
+}
+
+static void
+jabber_message_add_remote_smileys(const xmlnode *message)
+{
+	xmlnode *data_tag;
+	for (data_tag = xmlnode_get_child_with_namespace(message, "data", XEP_0231_NAMESPACE) ;
+		 data_tag ;
+		 data_tag = xmlnode_get_next_twin(data_tag)) {
+		const gchar *cid = xmlnode_get_attrib(data_tag, "cid");
+		const JabberData *data = jabber_data_find_remote_by_cid(cid);
+
+		if (!data && cid != NULL) {
+			/* we haven't cached this already, let's add it */
+			JabberData *new_data = jabber_data_create_from_xml(data_tag);
+			jabber_data_associate_remote(new_data);
+		}
+	}
+}
+
+/* used in the function below to supply a conversation and shortcut for a
+ smiley */
+typedef struct {
+	PurpleConversation *conv;
+	gchar *alt;
+} JabberDataRef;
+
+static void
+jabber_message_get_data_cb(JabberStream *js, xmlnode *packet, gpointer data)
+{
+	JabberDataRef *ref = (JabberDataRef *) data;
+	PurpleConversation *conv = ref->conv;
+	const gchar *alt = ref->alt;
+	xmlnode *data_element = xmlnode_get_child(packet, "data");
+	xmlnode *item_not_found = xmlnode_get_child(packet, "item-not-found");
+
+	/* did we get a data element as result? */
+	if (data_element) {
+		JabberData *data = jabber_data_create_from_xml(data_element);
+
+		if (data) {
+			jabber_data_associate_remote(data);
+			purple_conv_custom_smiley_write(conv, alt,
+											jabber_data_get_data(data),
+											jabber_data_get_size(data));
+			purple_conv_custom_smiley_close(conv, alt);
+		}
+
+	} else if (item_not_found) {
+		purple_debug_info("jabber",
+			"Responder didn't recognize requested data\n");
+	} else {
+		purple_debug_error("jabber", "Unknown response to data request\n");
+	}
+	g_free(ref->alt);
+	g_free(ref);
+}
+
+static void
+jabber_message_send_data_request(JabberStream *js, PurpleConversation *conv,
+								 const gchar *cid, const gchar *who, 
+								 const gchar *alt)
+{
+	JabberIq *request = jabber_iq_new(js, JABBER_IQ_GET);
+	JabberDataRef *ref = g_new0(JabberDataRef, 1);
+	xmlnode *data_request = jabber_data_get_xml_request(cid);
+
+	xmlnode_set_attrib(request->node, "to", who);
+	ref->conv = conv;
+	ref->alt = g_strdup(alt);
+	jabber_iq_set_callback(request, jabber_message_get_data_cb, ref);
+	xmlnode_insert_child(request->node, data_request);
+
+	jabber_iq_send(request);
+}
+
+
 void jabber_message_parse(JabberStream *js, xmlnode *packet)
 {
 	JabberMessage *jm;
@@ -368,12 +591,96 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 		} else if(!strcmp(child->name, "html") && !strcmp(xmlns,"http://jabber.org/protocol/xhtml-im")) {
 			if(!jm->xhtml && xmlnode_get_child(child, "body")) {
 				char *c;
-				jm->xhtml = xmlnode_to_str(child, NULL);
-			        /* Convert all newlines to whitespace. Technically, even regular, non-XML HTML is supposed to ignore newlines, but Pidgin has, as convention
-			 	 * treated \n as a newline for compatibility with other protocols
+
+				const PurpleConnection *gc = js->gc;
+				const gchar *who = xmlnode_get_attrib(packet, "from");
+				PurpleAccount *account = purple_connection_get_account(gc);
+				PurpleConversation *conv = NULL;
+				GList *smiley_refs = NULL;
+				gchar *reformatted_xhtml;
+
+				if (purple_account_get_bool(account, "custom_smileys", TRUE)) {
+					/* find a list of smileys ("cid" and "alt" text pairs)
+					  occuring in the message */
+					smiley_refs = jabber_message_get_refs_from_xmlnode(child);
+					purple_debug_info("jabber", "found %d smileys\n",
+						g_list_length(smiley_refs));
+					
+					if (jm->type == JABBER_MESSAGE_GROUPCHAT) {
+						JabberID *jid = jabber_id_new(jm->from);
+						JabberChat *chat = NULL;
+
+						if (jid) {
+							chat = jabber_chat_find(js, jid->node, jid->domain);
+							conv = chat->conv;
+						}
+
+						jabber_id_free(jid);
+					} else {
+						conv =
+							purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY,
+								who, account);
+						if (!conv) {
+							/* we need to create the conversation here */
+							conv = purple_conversation_new(PURPLE_CONV_TYPE_IM,
+								account, who);
+						}
+					}
+
+					/* process any newly provided smileys */
+					jabber_message_add_remote_smileys(packet);
+				}
+
+				/* reformat xhtml so that img tags with a "cid:" src gets
+				  translated to the bare text of the emoticon (the "alt" attrib) */
+				/* this is done also when custom smiley retrieval is turned off,
+				  this way the receiver always sees the shortcut instead */
+				reformatted_xhtml =
+					jabber_message_xml_to_string_strip_img_smileys(child);
+
+				jm->xhtml = reformatted_xhtml;
+
+				/* add known custom emoticons to the conversation */
+				/* note: if there were no smileys in the incoming message, or
+				  	if receiving custom smileys is turned off, smiley_refs will
+					be NULL */
+				for (; smiley_refs ; smiley_refs = g_list_delete_link(smiley_refs, smiley_refs)) {
+					JabberSmileyRef *ref = (JabberSmileyRef *) smiley_refs->data;
+					const gchar *cid = ref->cid;
+					const gchar *alt = ref->alt;
+
+					purple_debug_info("jabber", 
+						"about to add custom smiley %s to the conv\n", alt);
+					if (purple_conv_custom_smiley_add(conv, alt, "cid", cid,
+						    TRUE)) {
+						const JabberData *data =
+								jabber_data_find_remote_by_cid(cid);
+						/* if data is already known, we add write it immediatly */
+						if (data) {
+							purple_debug_info("jabber", 
+								"data is already known\n"); 
+							purple_conv_custom_smiley_write(conv, alt,
+								jabber_data_get_data(data),
+								jabber_data_get_size(data));
+							purple_conv_custom_smiley_close(conv, alt);
+						} else {
+							/* we need to request the smiley (data) */
+							purple_debug_info("jabber",
+								"data is unknown, need to request it\n");
+							jabber_message_send_data_request(js, conv, cid, who,
+								alt);
+						}
+					}
+					g_free(ref->cid);
+					g_free(ref->alt);
+					g_free(ref);
+				}
+
+			    /* Convert all newlines to whitespace. Technically, even regular, non-XML HTML is supposed to ignore newlines, but Pidgin has, as convention
+				 * treated \n as a newline for compatibility with other protocols
 				 */
 				for (c = jm->xhtml; *c != '\0'; c++) {
-					if (*c == '\n') 
+					if (*c == '\n')
 						*c = ' ';
 				}
 			}
@@ -503,6 +810,129 @@ void jabber_message_parse(JabberStream *js, xmlnode *packet)
 	jabber_message_free(jm);
 }
 
+static const gchar *
+jabber_message_get_mimetype_from_ext(const gchar *ext)
+{
+	if (strcmp(ext, "png") == 0) {
+		return "image/png";
+	} else if (strcmp(ext, "gif") == 0) {
+		return "image/gif";
+	} else if (strcmp(ext, "jpg") == 0) {
+		return "image/jpeg";
+	} else if (strcmp(ext, "tif") == 0) {
+		return "image/tif";
+	} else {
+		return "image/x-icon"; /* or something... */
+	}
+}
+
+static GList *
+jabber_message_xhtml_find_smileys(const char *xhtml)
+{
+	GList *smileys = purple_smileys_get_all();
+	GList *found_smileys = NULL;
+
+	for (; smileys ; smileys = g_list_delete_link(smileys, smileys)) {
+		PurpleSmiley *smiley = (PurpleSmiley *) smileys->data;
+		const gchar *shortcut = purple_smiley_get_shortcut(smiley);
+		const gssize len = strlen(shortcut);
+
+		gchar *escaped = g_markup_escape_text(shortcut, len);
+		const char *pos = strstr(xhtml, escaped);
+
+		if (pos) {
+			found_smileys = g_list_append(found_smileys, smiley);
+		}
+
+		g_free(escaped);
+	}
+
+	return found_smileys;
+}
+
+static gchar *
+jabber_message_get_smileyfied_xhtml(const gchar *xhtml, const GList *smileys)
+{
+	/* create XML element for all smileys (img tags) */
+	GString *result = g_string_new(NULL);
+	int pos = 0;
+	int length = strlen(xhtml);
+
+	while (pos < length) {
+		const GList *iterator;
+		gboolean found_smiley = FALSE;
+
+		for (iterator = smileys ; iterator ;
+			iterator = g_list_next(iterator)) {
+			const PurpleSmiley *smiley = (PurpleSmiley *) iterator->data;
+			const gchar *shortcut = purple_smiley_get_shortcut(smiley);
+			const gssize len = strlen(shortcut);
+			gchar *escaped = g_markup_escape_text(shortcut, len);
+
+			if (g_str_has_prefix(&(xhtml[pos]), escaped)) {
+				/* we found the current smiley at this position */
+				const JabberData *data =
+					jabber_data_find_local_by_alt(shortcut);
+				xmlnode *img = jabber_data_get_xhtml_im(data, shortcut);
+				int len;
+				gchar *img_text = xmlnode_to_str(img, &len);
+
+				found_smiley = TRUE;
+				result = g_string_append(result, img_text);
+				g_free(img_text);
+				pos += strlen(escaped);
+				g_free(escaped);
+				xmlnode_free(img);
+				break;
+			} else {
+				/* cleanup from the before the next round... */
+				g_free(escaped);
+			}
+		}
+		if (!found_smiley) {
+			/* there was no smiley here, just copy one byte */
+			result = g_string_append_c(result, xhtml[pos]);
+			pos++;
+		}
+	}
+
+	return g_string_free(result, FALSE);
+}
+
+static gboolean
+jabber_conv_support_custom_smileys(const PurpleConnection *gc,
+								   const PurpleConversation *conv,
+								   const gchar *who)
+{
+	JabberStream *js = (JabberStream *) gc->proto_data;
+	JabberBuddy *jb;
+	
+	if (!js) {
+		purple_debug_error("jabber", 
+			"jabber_conv_support_custom_smileys: could not find stream\n");
+		return FALSE;
+	}
+
+	jb = jabber_buddy_find(js, who, FALSE);
+	if (!jb) {
+		purple_debug_error("jabber",
+			"jabber_conv_support_custom smileys: could not find buddy\n");
+		return FALSE;
+	}
+	
+	
+
+	switch (purple_conversation_get_type(conv)) {
+		/* for the time being, we will not support custom smileys in MUCs */
+		case PURPLE_CONV_TYPE_IM:
+			return jabber_buddy_has_capability(jb, XEP_0231_NAMESPACE);
+			break;
+		default:
+			return FALSE;
+			break;
+	}
+}
+
 void jabber_message_send(JabberMessage *jm)
 {
 	xmlnode *message, *child;
@@ -588,7 +1018,55 @@ void jabber_message_send(JabberMessage *jm)
 	}
 
 	if(jm->xhtml) {
-		child = xmlnode_from_str(jm->xhtml, -1);
+		PurpleAccount *account = purple_connection_get_account(jm->js->gc);
+		PurpleConversation *conv =
+			purple_find_conversation_with_account(PURPLE_CONV_TYPE_ANY, jm->to,
+				account);
+ 
+		if (jabber_conv_support_custom_smileys(jm->js->gc, conv, jm->to)) {
+			GList *found_smileys = jabber_message_xhtml_find_smileys(jm->xhtml);
+
+			if (found_smileys) {
+				gchar *smileyfied_xhtml = NULL;
+				const GList *iterator;
+
+				for (iterator = found_smileys; iterator ;
+					iterator = g_list_next(iterator)) {
+					const PurpleSmiley *smiley =
+							(PurpleSmiley *) iterator->data;
+					const gchar *shortcut = purple_smiley_get_shortcut(smiley);
+					const JabberData *data =
+						jabber_data_find_local_by_alt(shortcut);
+							
+					/* the object has not been sent before */
+					if (!data) {
+						PurpleStoredImage *image =
+								purple_smiley_get_stored_image(smiley);
+						const gchar *ext = purple_imgstore_get_extension(image);
+						JabberStream *js = jm->js;
+						
+						JabberData *new_data =
+							jabber_data_create_from_data(purple_imgstore_get_data(image),
+								purple_imgstore_get_size(image),
+								jabber_message_get_mimetype_from_ext(ext), js);
+						purple_debug_info("jabber", 
+							"cache local smiley alt = %s, cid = %s\n",
+							shortcut, jabber_data_get_cid(new_data));
+						jabber_data_associate_local(new_data, shortcut);
+					}
+				}
+
+				smileyfied_xhtml =
+					jabber_message_get_smileyfied_xhtml(jm->xhtml, found_smileys);
+				child = xmlnode_from_str(smileyfied_xhtml, -1);
+				g_free(smileyfied_xhtml);
+				g_list_free(found_smileys);
+			} else {
+				child = xmlnode_from_str(jm->xhtml, -1);
+			}
+		} else {
+			child = xmlnode_from_str(jm->xhtml, -1);
+		}
 		if(child) {
 			xmlnode_insert_child(message, child);
 		} else {
@@ -762,3 +1240,11 @@ gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *shortname, const g
 	return js->allowBuzz;
 }
 
+gboolean jabber_custom_smileys_isenabled(JabberStream *js, const gchar *shortname,
+										 const gchar *namespace)
+{
+	const PurpleConnection *gc = js->gc;
+	PurpleAccount *account = purple_connection_get_account(gc);
+
+	return purple_account_get_bool(account, "custom_smileys", TRUE);
+}
diff --git a/libpurple/protocols/jabber/message.h b/libpurple/protocols/jabber/message.h
index 56c89819b1..550dd1fe5a 100644
--- a/libpurple/protocols/jabber/message.h
+++ b/libpurple/protocols/jabber/message.h
@@ -80,4 +80,7 @@ void jabber_message_conv_closed(JabberStream *js, const char *who);
 
 gboolean jabber_buzz_isenabled(JabberStream *js, const gchar *shortname, const gchar *namespace);
 
+gboolean jabber_custom_smileys_isenabled(JabberStream *js, const gchar *shortname,
+										 const gchar *namespace);
+
 #endif /* _PURPLE_JABBER_MESSAGE_H_ */
diff --git a/libpurple/protocols/jabber/roster.c b/libpurple/protocols/jabber/roster.c
index b51b209d2c..cab8df2942 100644
--- a/libpurple/protocols/jabber/roster.c
+++ b/libpurple/protocols/jabber/roster.c
@@ -83,11 +83,13 @@ static void add_purple_buddies_to_groups(JabberStream *js, const char *jid,
 		if((l = g_slist_find_custom(g2, g->name, (GCompareFunc)strcmp))) {
 			const char *servernick;
 
+			/* Previously stored serverside / buddy-supplied alias */
 			if((servernick = purple_blist_node_get_string((PurpleBlistNode*)b, "servernick")))
 				serv_got_alias(js->gc, jid, servernick);
 
+			/* Alias from our roster retrieval */
 			if(alias && (!b->alias || strcmp(b->alias, alias)))
-				purple_blist_alias_buddy(b, alias);
+				purple_serv_got_private_alias(js->gc, jid, alias);
 			g_free(l->data);
 			g2 = g_slist_delete_link(g2, l);
 		} else {
diff --git a/libpurple/protocols/msn/error.c b/libpurple/protocols/msn/error.c
index 5cb401bf76..03310b43a9 100644
--- a/libpurple/protocols/msn/error.c
+++ b/libpurple/protocols/msn/error.c
@@ -33,24 +33,24 @@ msn_error_get_text(unsigned int type, gboolean *debug)
 	switch (type) {
 		case 0:
 			g_snprintf(msg, sizeof(msg),
-					   _("Unable to parse message"));
+			           _("Unable to parse message"));
 			*debug = TRUE;
 			break;
 		case 200:
 			g_snprintf(msg, sizeof(msg),
-					   _("Syntax Error (probably a client bug)"));
+			           _("Syntax Error (probably a client bug)"));
 			*debug = TRUE;
 			break;
 		case 201:
 			g_snprintf(msg, sizeof(msg),
-					   _("Invalid email address"));
+			           _("Invalid email address"));
 			break;
 		case 205:
 			g_snprintf(msg, sizeof(msg), _("User does not exist"));
 			break;
 		case 206:
 			g_snprintf(msg, sizeof(msg),
-					   _("Fully qualified domain name missing"));
+			           _("Fully qualified domain name missing"));
 			break;
 		case 207:
 			g_snprintf(msg, sizeof(msg), _("Already logged in"));
@@ -100,8 +100,8 @@ msn_error_get_text(unsigned int type, gboolean *debug)
 			break;
 		case 231:
 			g_snprintf(msg, sizeof(msg),
-					   _("Tried to add a user to a group "
-						 "that doesn't exist"));
+			           _("Tried to add a user to a group "
+			             "that doesn't exist"));
 			break;
 		case 280:
 			g_snprintf(msg, sizeof(msg), _("Switchboard failed"));
@@ -125,7 +125,8 @@ msn_error_get_text(unsigned int type, gboolean *debug)
 			break;
 
 		case 500:
-			g_snprintf(msg, sizeof(msg), _("Service temporarily unavailable"));
+			g_snprintf(msg, sizeof(msg),
+			           _("Service temporarily unavailable"));
 			break;
 		case 501:
 			g_snprintf(msg, sizeof(msg), _("Database server error"));
@@ -144,7 +145,8 @@ msn_error_get_text(unsigned int type, gboolean *debug)
 			*debug = TRUE;
 			break;
 		case 540:
-			g_snprintf(msg, sizeof(msg), _("Wrong CHL value sent to server"));
+			g_snprintf(msg, sizeof(msg),
+			           _("Wrong CHL value sent to server"));
 			*debug = TRUE;
 			break;
 
@@ -155,7 +157,8 @@ msn_error_get_text(unsigned int type, gboolean *debug)
 			g_snprintf(msg, sizeof(msg), _("Server unavailable"));
 			break;
 		case 602:
-			g_snprintf(msg, sizeof(msg), _("Peer notification server down"));
+			g_snprintf(msg, sizeof(msg),
+			           _("Peer notification server down"));
 			*debug = TRUE;
 			break;
 		case 603:
@@ -171,12 +174,14 @@ msn_error_get_text(unsigned int type, gboolean *debug)
 			break;
 
 		case 707:
-			g_snprintf(msg, sizeof(msg), _("Error creating connection"));
+			g_snprintf(msg, sizeof(msg),
+			           _("Error creating connection"));
 			*debug = TRUE;
 			break;
 		case 710:
 			g_snprintf(msg, sizeof(msg),
-					   _("CVR parameters are either unknown or not allowed"));
+			           _("CVR parameters are either unknown "
+			             "or not allowed"));
 			*debug = TRUE;
 			break;
 		case 711:
@@ -206,7 +211,7 @@ msn_error_get_text(unsigned int type, gboolean *debug)
 
 		case 800:
 			g_snprintf(msg, sizeof(msg),
-					   _("Friendly name changes too rapidly"));
+			           _("Friendly name changes too rapidly"));
 			break;
 
 		case 910:
@@ -234,11 +239,15 @@ msn_error_get_text(unsigned int type, gboolean *debug)
 			break;
 		case 923:
 			g_snprintf(msg, sizeof(msg),
-					   _("Kids Passport without parental consent"));
+			           _("Kids Passport without parental consent"));
 			break;
 		case 924:
 			g_snprintf(msg, sizeof(msg),
-					   _("Passport account not yet verified"));
+			           _("Passport account not yet verified"));
+			break;
+		case 927:
+			g_snprintf(msg, sizeof(msg),
+			           _("Passport account suspended"));
 			break;
 		case 928:
 			g_snprintf(msg, sizeof(msg), _("Bad ticket"));
@@ -246,7 +255,8 @@ msn_error_get_text(unsigned int type, gboolean *debug)
 			break;
 
 		default:
-			g_snprintf(msg, sizeof(msg), _("Unknown Error Code %d"), type);
+			g_snprintf(msg, sizeof(msg),
+			           _("Unknown Error Code %d"), type);
 			*debug = TRUE;
 			break;
 	}
@@ -261,9 +271,10 @@ msn_error_handle(MsnSession *session, unsigned int type)
 	gboolean debug;
 
 	g_snprintf(buf, sizeof(buf), _("MSN Error: %s\n"),
-			   msn_error_get_text(type, &debug));
+	           msn_error_get_text(type, &debug));
 	if (debug)
 		purple_debug_warning("msn", "error %d: %s\n", type, buf);
 	else
 		purple_notify_error(session->account->gc, NULL, buf, NULL);
 }
+
diff --git a/libpurple/protocols/msn/group.h b/libpurple/protocols/msn/group.h
index 0d1510474b..4fd7348349 100644
--- a/libpurple/protocols/msn/group.h
+++ b/libpurple/protocols/msn/group.h
@@ -33,10 +33,10 @@ typedef struct _MsnGroup  MsnGroup;
 #include "userlist.h"
 
 #define MSN_INDIVIDUALS_GROUP_ID	"1983"
-#define MSN_INDIVIDUALS_GROUP_NAME	"Other Contacts"
+#define MSN_INDIVIDUALS_GROUP_NAME	_("Other Contacts")
 
 #define MSN_NON_IM_GROUP_ID		"email"
-#define MSN_NON_IM_GROUP_NAME	"Non-IM Contacts"
+#define MSN_NON_IM_GROUP_NAME	_("Non-IM Contacts")
 
 /**
  * A group.
diff --git a/libpurple/protocols/msn/msn.c b/libpurple/protocols/msn/msn.c
index 007821a3d5..5e1c2c4edd 100644
--- a/libpurple/protocols/msn/msn.c
+++ b/libpurple/protocols/msn/msn.c
@@ -769,6 +769,9 @@ msn_tooltip_text(PurpleBuddy *buddy, PurpleNotifyUserInfo *user_info, gboolean f
 	{
 		const char *phone;
 
+		purple_notify_user_info_add_pair(user_info, _("Has you"),
+									   ((user->list_op & (1 << MSN_LIST_RL)) ? _("Yes") : _("No")));
+
 		purple_notify_user_info_add_pair(user_info, _("Blocked"),
 									   ((user->list_op & (1 << MSN_LIST_BL)) ? _("Yes") : _("No")));
 
diff --git a/libpurple/protocols/msn/notification.c b/libpurple/protocols/msn/notification.c
index 9e2ba27d2a..f02cda5cd0 100644
--- a/libpurple/protocols/msn/notification.c
+++ b/libpurple/protocols/msn/notification.c
@@ -613,16 +613,13 @@ msn_notification_dump_contact(MsnSession *session)
 	xmlnode_set_attrib(adl_node, "l", "1");
 
 	/*get the userlist*/
-	for (l = session->userlist->users; l != NULL; l = l->next) {
+	for (l = session->userlist->users; l != NULL; l = l->next){
 		user = l->data;
 
 		/* skip RL & PL during initial dump */
 		if (!(user->list_op & MSN_LIST_OP_MASK))
 			continue;
 
-		if (!strcmp(user->passport, "messenger@microsoft.com"))
-			continue;
-
 		msn_add_contact_xml(session, adl_node, user->passport,
 			user->list_op & MSN_LIST_OP_MASK, user->networkid);
 
@@ -774,6 +771,53 @@ adl_error(MsnCmdProc *cmdproc, MsnTransaction *trans, int error)
 }
 
 static void
+adl_241_error_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
+	size_t len)
+{
+	/* khc: some googling suggests that error 241 means the buddy is somehow
+	   in the local list, but not the server list, and that we should add
+	   those buddies to the addressbook. For now I will just notify the user
+	   about the raw payload, because I am lazy */
+	MsnSession *session;
+	PurpleAccount *account;
+	PurpleConnection *gc;
+	xmlnode *adl;
+	xmlnode *domain;
+	GString *emails;
+
+	session = cmdproc->session;
+	account = session->account;
+	gc = purple_account_get_connection(account);
+
+	adl = xmlnode_from_str(payload, len);
+	emails = g_string_new(NULL);
+
+	domain = xmlnode_get_child(adl, "d");
+	while (domain) {
+		const char *domain_str = xmlnode_get_attrib(domain, "n");
+		xmlnode *contact = xmlnode_get_child(domain, "c");
+		while (contact) {
+			g_string_append_printf(emails, "%s@%s\n",
+				xmlnode_get_attrib(contact, "n"), domain_str);
+			contact = xmlnode_get_next_twin(contact);
+		}
+		domain = xmlnode_get_next_twin(domain);
+	}
+
+	purple_notify_error(gc, NULL,
+		_("The following users are missing from your addressbook"), emails->str);
+	g_string_free(emails, TRUE);
+	xmlnode_free(adl);
+}
+
+static void
+adl_241_error_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
+{
+	cmdproc->last_cmd->payload_cb = adl_241_error_cmd_post;
+	cmd->payload_len = atoi(cmd->params[1]);
+}
+
+static void
 fqy_cmd_post(MsnCmdProc *cmdproc, MsnCommand *cmd, char *payload,
 			 size_t len)
 {
@@ -1132,6 +1176,7 @@ nln_cmd(MsnCmdProc *cmdproc, MsnCommand *cmd)
 	friendly = purple_url_decode(cmd->params[3]);
 
 	user = msn_userlist_find_user(session->userlist, passport);
+	if (user == NULL) return;
 
 	old_friendly = msn_user_get_friendly_name(user);
 	if (!old_friendly || (old_friendly && (!friendly || strcmp(old_friendly, friendly))))
@@ -1961,6 +2006,8 @@ msn_notification_init(void)
 
 	msn_table_add_cmd(cbs_table, "fallback", "XFR", xfr_cmd);
 
+	msn_table_add_cmd(cbs_table, NULL, "241", adl_241_error_cmd);
+
 	msn_table_add_error(cbs_table, "ADD", add_error);
 	msn_table_add_error(cbs_table, "ADL", adl_error);
 	msn_table_add_error(cbs_table, "REG", reg_error);
diff --git a/libpurple/protocols/msn/session.c b/libpurple/protocols/msn/session.c
index 35fb93563d..f1ffe4aa77 100644
--- a/libpurple/protocols/msn/session.c
+++ b/libpurple/protocols/msn/session.c
@@ -453,6 +453,8 @@ msn_session_finish_login(MsnSession *session)
 	PurpleConnection *gc;
 	PurpleStoredImage *img;
 
+	msn_change_status(session);
+
 	if (session->logged_in)
 		return;
 
@@ -465,8 +467,6 @@ msn_session_finish_login(MsnSession *session)
 
 	session->logged_in = TRUE;
 
-	msn_change_status(session);
-
 	purple_connection_set_state(gc, PURPLE_CONNECTED);
 
 	/* Sync users */
diff --git a/libpurple/protocols/msn/soap.c b/libpurple/protocols/msn/soap.c
index f4fa5372b2..55384c060c 100644
--- a/libpurple/protocols/msn/soap.c
+++ b/libpurple/protocols/msn/soap.c
@@ -268,6 +268,7 @@ msn_soap_read_cb(gpointer data, gint fd, PurpleInputCondition cond)
 		(something weird with the login.live.com server). With NSS it works
 		fine, so I believe it's some bug with OS X */ 
 	char buf[16 * 1024];
+	gsize cursor;
 
 	if (conn->message == NULL) {
 		conn->message = msn_soap_message_new(NULL, NULL);
@@ -276,13 +277,26 @@ msn_soap_read_cb(gpointer data, gint fd, PurpleInputCondition cond)
 	if (conn->buf == NULL) {
 		conn->buf = g_string_new_len(buf, 0);
 	}
-	
+
+	cursor = conn->buf->len;
 	while ((cnt = purple_ssl_read(conn->ssl, buf, sizeof(buf))) > 0) {
 		purple_debug_info("soap", "read %d bytes\n", cnt);
 		count += cnt;
 		g_string_append_len(conn->buf, buf, cnt);
 	}
 
+	perrno = errno;
+	if (cnt < 0 && perrno != EAGAIN)
+		purple_debug_info("soap", "read: %s\n", g_strerror(perrno));
+
+#ifndef MSN_UNSAFE_DEBUG
+	if (conn->current_request->secure)
+		purple_debug_misc("soap", "Received secure request.\n");
+	else
+#endif
+	if (count != 0)
+		purple_debug_misc("soap", "current %s\n", conn->buf->str + cursor);
+
 	/* && count is necessary for Adium, on OS X the last read always
 	   return an error, so we want to proceed anyway. See #5212 for
 	   discussion on this and the above buffer size issues */
@@ -290,11 +304,9 @@ msn_soap_read_cb(gpointer data, gint fd, PurpleInputCondition cond)
 		return;
 
 	/* msn_soap_process could alter errno */
-	perrno = errno;
 	msn_soap_process(conn);
 	
 	if (cnt < 0 && perrno != EAGAIN) {
-		purple_debug_info("soap", "read: %s\n", g_strerror(perrno));
 		/* It's possible msn_soap_process closed the ssl connection */
 		if (conn->ssl) {
 			purple_ssl_close(conn->ssl);
@@ -310,13 +322,6 @@ msn_soap_process(MsnSoapConnection *conn) {
 	char *cursor;
 	char *linebreak;
 
-#ifndef MSN_UNSAFE_DEBUG
-	if (conn->current_request->secure)
-		purple_debug_misc("soap", "Received secure request.\n");
-	else
-#endif
-	purple_debug_misc("soap", "current %s\n", conn->buf->str);
-
 	cursor = conn->buf->str + conn->handled_len;
 
 	if (!conn->headers_done) {
diff --git a/libpurple/protocols/msn/switchboard.c b/libpurple/protocols/msn/switchboard.c
index 78c6d35410..2883fe948d 100644
--- a/libpurple/protocols/msn/switchboard.c
+++ b/libpurple/protocols/msn/switchboard.c
@@ -58,7 +58,7 @@ msn_switchboard_new(MsnSession *session)
 	swboard->cmdproc->data = swboard;
 	swboard->cmdproc->cbs_table = cbs_table;
 
-	session->switches = g_list_append(session->switches, swboard);
+	session->switches = g_list_prepend(session->switches, swboard);
 
 	return swboard;
 }
diff --git a/libpurple/protocols/null/nullprpl.c b/libpurple/protocols/null/nullprpl.c
index b41bf1758f..03f4c4a558 100644
--- a/libpurple/protocols/null/nullprpl.c
+++ b/libpurple/protocols/null/nullprpl.c
@@ -46,8 +46,12 @@
 
 #include <glib.h>
 
+/* If you're using this as the basis of a prpl that will be distributed
+ * separately from libpurple, remove the internal.h include below and replace
+ * it with code to include your own config.h or similar.  If you're going to
+ * provide for translation, you'll also need to setup the gettext macros. */
 #include "internal.h"
-#include "config.h"
+
 #include "account.h"
 #include "accountopt.h"
 #include "blist.h"
@@ -1126,6 +1130,7 @@ static PurplePluginProtocolInfo prpl_info =
   NULL,                                /* send_attention */
   NULL,                                /* get_attention_types */
   sizeof(PurplePluginProtocolInfo),    /* struct_size */
+  NULL,
   NULL,                                 /* initiate_media */
   NULL                                  /* can_do_media */	
 };
diff --git a/libpurple/protocols/oscar/flap_connection.c b/libpurple/protocols/oscar/flap_connection.c
index 3e8ffeaa49..74054bd55e 100644
--- a/libpurple/protocols/oscar/flap_connection.c
+++ b/libpurple/protocols/oscar/flap_connection.c
@@ -158,8 +158,8 @@ static gboolean flap_connection_send_queued(gpointer data)
 	gettimeofday(&now, NULL);
 
 	purple_debug_info("oscar", "Attempting to send %u queued SNACs and %u queued low-priority SNACs for %p\n",
-					  (conn->queued_snacs ? g_queue_get_length(conn->queued_snacs) : 0),
-					  (conn->queued_lowpriority_snacs ? g_queue_get_length(conn->queued_lowpriority_snacs) : 0),
+					  (conn->queued_snacs ? conn->queued_snacs->length : 0),
+					  (conn->queued_lowpriority_snacs ? conn->queued_lowpriority_snacs->length : 0),
 					  conn);
 	if (!conn->queued_snacs || flap_connection_send_snac_queue(conn, now, conn->queued_snacs)) {
 		if (!conn->queued_lowpriority_snacs || flap_connection_send_snac_queue(conn, now, conn->queued_lowpriority_snacs)) {
diff --git a/libpurple/protocols/oscar/libicq.c b/libpurple/protocols/oscar/libicq.c
index 2c3a7afafe..ed69d86aa9 100644
--- a/libpurple/protocols/oscar/libicq.c
+++ b/libpurple/protocols/oscar/libicq.c
@@ -26,6 +26,14 @@
 
 
 #include "oscarcommon.h"
+static GHashTable *
+icq_get_account_text_table(PurpleAccount *account)
+{
+	GHashTable *table;
+	table = g_hash_table_new(g_str_hash, g_str_equal);
+	g_hash_table_insert(table, "login_label", (gpointer)_("ICQ UIN..."));
+	return table;
+}
 
 static PurplePluginProtocolInfo prpl_info =
 {
@@ -95,8 +103,9 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,					/* unregister_user */
 	NULL,					/* send_attention */
 	NULL,					/* get_attention_types */
+
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL,					/* get_account_text_table */
+	icq_get_account_text_table, /* get_account_text_table */
 	NULL,					/* initiate_media */
 	NULL					/* can_do_media */
 };
diff --git a/libpurple/protocols/oscar/oscar.c b/libpurple/protocols/oscar/oscar.c
index 15d0900a7b..541e1dc8e6 100644
--- a/libpurple/protocols/oscar/oscar.c
+++ b/libpurple/protocols/oscar/oscar.c
@@ -1539,14 +1539,16 @@ purple_parse_auth_resp(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 			break;
 		}
 		purple_debug_info("oscar", "Login Error Code 0x%04hx\n", info->errorcode);
-		purple_debug_info("oscar", "Error URL: %s\n", info->errorurl);
+		purple_debug_info("oscar", "Error URL: %s\n", info->errorurl ? info->errorurl : "");
 		return 1;
 	}
 
-	purple_debug_misc("oscar", "Reg status: %hu\n", info->regstatus);
-	purple_debug_misc("oscar", "Email: %s\n",
-					(info->email != NULL) ? info->email : "null");
-	purple_debug_misc("oscar", "BOSIP: %s\n", info->bosip);
+	purple_debug_misc("oscar", "Reg status: %hu\n"
+							   "Email: %s\n"
+							   "BOSIP: %s\n",
+							   info->regstatus,
+							   info->email ? info->email : "null",
+							   info->bosip ? info->bosip : "null");
 	purple_debug_info("oscar", "Closing auth connection...\n");
 	flap_connection_schedule_destroy(conn, OSCAR_DISCONNECT_DONE, NULL);
 
@@ -1833,7 +1835,7 @@ purple_parse_login(OscarData *od, FlapConnection *conn, FlapFrame *fr, ...)
 	aim_send_login(od, conn, purple_account_get_username(account),
 			purple_connection_get_password(gc), truncate_pass,
 			od->icq ? &icqinfo : &aiminfo, key,
-			/* allow multple logins? */ purple_account_get_bool(account, "allow_multiple_logins", OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS));
+			purple_account_get_bool(account, "allow_multiple_logins", OSCAR_DEFAULT_ALLOW_MULTIPLE_LOGINS));
 
 	purple_connection_update_progress(gc, _("Password sent"), 2, OSCAR_CONNECT_STEPS);
 	ck[2] = 0x6c;
diff --git a/libpurple/protocols/qq/AUTHORS b/libpurple/protocols/qq/AUTHORS
index 5cb48830dd..0ec81447b9 100644
--- a/libpurple/protocols/qq/AUTHORS
+++ b/libpurple/protocols/qq/AUTHORS
@@ -1,35 +1,38 @@
 Code Contributors
-=====
-puzzlebird  : original author
-gfhuang     : patches for libpurple 2.0.0beta2, maintainer
-henryouly   : file transfer, udp sock5 proxy and qq_show, maintainer
-hzhr        : maintainer
-joymarquis  : maintainer
-arfankai    : fixed bugs in char_conv.c
-rakescar    : provided filter for HTML tag
-yyw         : improved performance on PPC linux
-lvxiang     : provided ip to location original code
-markhuetsch : OpenQ merge into libpurple, maintainer 2006-2007
-ccpaging    : maintainer since 2007
-icesky      : maintainer since 2007
-csyfek      : faces, maintainer since 2007
+=========
+puzzlebird	: original author
+gfhuang		: patches for libpurple 2.0.0beta2, maintainer
+Yuan Qingyun	: patches for libpurple 1.5.0, maintainer
+henryouly	: file transfer, udp sock5 proxy and qq_show, maintainer
+hzhr		: maintainer
+joymarquis	: maintainer
+arfankai	: fixed bugs in char_conv.c
+rakescar	: provided filter for HTML tag
+yyw		: improved performance on PPC linux
+lvxiang		: provided ip to location original code
+markhuetsch	: OpenQ merge into libpurple, maintainer 2006-2007
+ccpaging	: maintainer since 2007
+icesky		: maintainer since 2007
+csyfek		: faces, maintainer since 2007
 
 Lovely Patch Writers
-=====
-gnap        : message displaying, documentation
-manphiz     : qun processing
-moo         : qun processing
-Coly Li     : qun processing
+=========
+gnap		: message displaying, documentation
+manphiz		: qun processing
+moo		: qun processing
+Coly Li		: qun processing
+Emil Alexiev	: captcha verification on login based on LumaQQ for MAC (2007), 
+		  login, add buddy, remove buddy, message exchange and logout
 
 Acknowledgement
-=====
-Shufeng Tan : http://sf.net/projects/perl-oicq
-Jeff Ye     : http://www.sinomac.com
-Hu Zheng    : http://forlinux.yeah.net
-yunfan      : http://www.myswear.net
+=========
+Shufeng Tan	: http://sf.net/projects/perl-oicq
+Jeff Ye		: http://www.sinomac.com
+Hu Zheng	: http://forlinux.yeah.net
+yunfan		: http://www.myswear.net
+OpenQ Team	: http://openq.linuxsir.org
+LumaQQ Team	: http://lumaqq.linuxsir.org
 khc@pidgin.im
 qulogic@pidgin.im
 rlaager@pidgin.im
-OpenQ Team
-LumaQQ Team
-OpenQ Google Group
+OpenQ Google Group	: http://groups.google.com/group/openq
diff --git a/libpurple/protocols/qq/ChangeLog b/libpurple/protocols/qq/ChangeLog
index b60517a9b1..4b97d0aed6 100644
--- a/libpurple/protocols/qq/ChangeLog
+++ b/libpurple/protocols/qq/ChangeLog
@@ -1,6 +1,36 @@
+2008.09.05 - ccpaging <ccpaging(at)gmail.com>
+	* Filter chars 0x01-0x20 in nickname
+
+2008.09.05 - ccpaging <ccpaging(at)gmail.com>
+	* Fixed compilation even pidgin-udp-patch not applied
+	* Place and analysis 'before login packet' after login. packages will be updated slowly and server may send lots of 'server command packet', while 'before login packet' is placed after 'finished update'
+
+2008.09.02 - ccpaging <ccpaging(at)gmail.com>
+	* Bugfix: can not send message to the QUN blocked adding
+	* Tickets:
+		Fixes #6957
+
+2008.09.02 - ccpaging <ccpaging(at)gmail.com>
+	* Use new tactics of information update:
+		1. send next package till the previous package received
+		2. fix duplicated get_room_info and get_room_buddies commands
+
+2008.08.16 - ccpaging <ecc_hy(at)hotmail.com>
+	* Rename group to room. If you used pidginqq before, this may create a new room with same title, you may delete old one
+	* Replace purple_debug with purple_debug_info, purple_debug_warning, purple_debug_error
+	* Add server notice and server new, and two options to turn on/off
+	* Minor modify for reducing transaction's debug infor
+	* Minor modifies for system notice and QQ news.
+	* Add 4 new strings need translate compare with p10.
+	* Tickets:
+		Fixes #6990
+
 2008.08.10 - csyfek <csyfek(at)gmail.com>
 	* Commit to Pidgin
 
+2008.08.07 - ccpaging <ecc_hy(at)hotmail.com>
+	* Support managing multi-connections according to simple.c
+
 2008.08.06 - ccpaging <ecc_hy(at)hotmail.com>
 	* Rename names of variables, Group, to Room
 	* Functions of group_network merged into qq_network and qq_process
diff --git a/libpurple/protocols/qq/buddy_info.c b/libpurple/protocols/qq/buddy_info.c
index 85be58b884..40071df7cc 100644
--- a/libpurple/protocols/qq/buddy_info.c
+++ b/libpurple/protocols/qq/buddy_info.c
@@ -284,7 +284,7 @@ void qq_send_packet_get_info(PurpleConnection *gc, guint32 uid, gboolean show_wi
 
 	qd = (qq_data *) gc->proto_data;
 	g_snprintf(uid_str, sizeof(uid_str), "%d", uid);
-	qq_send_cmd(qd, QQ_CMD_GET_USER_INFO, (guint8 *) uid_str, strlen(uid_str));
+	qq_send_cmd(gc, QQ_CMD_GET_BUDDY_INFO, (guint8 *) uid_str, strlen(uid_str));
 
 	query = g_new0(qq_info_query, 1);
 	query->uid = uid;
@@ -293,6 +293,20 @@ void qq_send_packet_get_info(PurpleConnection *gc, guint32 uid, gboolean show_wi
 	qd->info_query = g_list_append(qd->info_query, query);
 }
 
+void qq_request_buddy_info(PurpleConnection *gc, guint32 uid,
+		gint update_class, guint32 ship32)
+{
+	qq_data *qd;
+	gchar raw_data[16] = {0};
+
+	g_return_if_fail(uid != 0);
+
+	qd = (qq_data *) gc->proto_data;
+	g_snprintf(raw_data, sizeof(raw_data), "%d", uid);
+	qq_send_cmd_mess(gc, QQ_CMD_GET_BUDDY_INFO, (guint8 *) raw_data, strlen(raw_data),
+			update_class, ship32);
+}
+
 /* set up the fields requesting personal information and send a get_info packet
  * for myself */
 void qq_prepare_modify_info(PurpleConnection *gc)
@@ -314,7 +328,6 @@ void qq_prepare_modify_info(PurpleConnection *gc)
 /* send packet to modify personal information */
 static void qq_send_packet_modify_info(PurpleConnection *gc, contact_info *info)
 {
-	qq_data *qd = (qq_data *) gc->proto_data;
 	gint bytes = 0;
 	guint8 raw_data[MAX_PACKET_SIZE - 128] = {0};
 	guint8 bar;
@@ -446,7 +459,7 @@ static void qq_send_packet_modify_info(PurpleConnection *gc, contact_info *info)
 
 	bytes += qq_put8(raw_data + bytes, bar);
 
-	qq_send_cmd(qd, QQ_CMD_UPDATE_INFO, raw_data, bytes);
+	qq_send_cmd(gc, QQ_CMD_UPDATE_INFO, raw_data, bytes);
 
 }
 
@@ -677,9 +690,9 @@ static void create_modify_info_dialogue(PurpleConnection *gc, const contact_info
 		mid->info->qq_show = g_strdup(info->qq_show);
 		mid->info->unknown6 = g_strdup(info->unknown6);
 
-		purple_request_fields(gc, _("Modify my information"),
-				_("Modify my information"), NULL, fields,
-				_("Update my information"), G_CALLBACK(modify_info_ok_cb),
+		purple_request_fields(gc, _("Modify information"),
+				_("Modify information"), NULL, fields,
+				_("Update information"), G_CALLBACK(modify_info_ok_cb),
 				_("Cancel"), G_CALLBACK(modify_info_cancel_cb),
 				purple_connection_get_account(gc), NULL, NULL,
 				mid);
@@ -697,8 +710,8 @@ void qq_process_modify_info_reply(guint8 *data, gint data_len, PurpleConnection
 
 	data[data_len] = '\0';
 	if (qd->uid == atoi((gchar *) data)) {	/* return should be my uid */
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Update info ACK OK\n");
-		purple_notify_info(gc, NULL, _("Your information has been updated"), NULL);
+		purple_debug_info("QQ", "Update info ACK OK\n");
+		purple_notify_info(gc, _("QQ Buddy"), _("Successed:"), _("Change buddy information."));
 	}
 }
 
@@ -746,8 +759,8 @@ void qq_set_my_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
 	const gchar *buddy_icon_dir = qq_buddy_icon_dir();
 	gint prefix_len = strlen(QQ_ICON_PREFIX);
 	gint suffix_len = strlen(QQ_ICON_SUFFIX);
-	gint dir_len = strlen(buddy_icon_dir);
-	gchar *errmsg = g_strdup_printf(_("Setting custom faces is not currently supported. Please choose an image from %s."), buddy_icon_dir);
+	gint dir_len = buddy_icon_dir ? strlen(buddy_icon_dir) : 0;
+	gchar *errmsg = g_strdup_printf(_("Setting custom faces is not currently supported. Please choose an image from %s."), buddy_icon_dir ? buddy_icon_dir : "(null)");
 	gboolean icon_global = purple_account_get_bool(gc->account, "use-global-buddyicon", TRUE);
 
 	if (!icon_path)
@@ -756,13 +769,13 @@ void qq_set_my_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
 	icon_len = strlen(icon_path) - dir_len - 1 - prefix_len - suffix_len;
 
 	/* make sure we're using an appropriate icon */
-	if (!(g_ascii_strncasecmp(icon_path, buddy_icon_dir, dir_len) == 0
+	if (buddy_icon_dir && !(g_ascii_strncasecmp(icon_path, buddy_icon_dir, dir_len) == 0
 				&& icon_path[dir_len] == G_DIR_SEPARATOR
 				&& g_ascii_strncasecmp(icon_path + dir_len + 1, QQ_ICON_PREFIX, prefix_len) == 0
 				&& g_ascii_strncasecmp(icon_path + dir_len + 1 + prefix_len + icon_len, QQ_ICON_SUFFIX, suffix_len) == 0
 				&& icon_len <= 3)) {
 		if (icon_global)
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ", "%s\n", errmsg);
+			purple_debug_error("QQ", "%s\n", errmsg);
 		else
 			purple_notify_error(gc, _("Invalid QQ Face"), errmsg, NULL);
 		g_free(errmsg);
@@ -775,7 +788,7 @@ void qq_set_my_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img)
 	/* ensure face number in proper range */
 	if (icon_num > QQ_FACES) {
 		if (icon_global)
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ", "%s\n", errmsg);
+			purple_debug_error("QQ", "%s\n", errmsg);
 		else
 			purple_notify_error(gc, _("Invalid QQ Face"), errmsg, NULL);
 		g_free(errmsg);
@@ -798,8 +811,8 @@ static void _qq_update_buddy_icon(PurpleAccount *account, const gchar *name, gin
 	if ((buddy = purple_find_buddy(account, name)))
 		old_icon_num = purple_buddy_icons_get_checksum_for_user(buddy);
 
-	if (old_icon_num == NULL ||
-			strcmp(icon_num_str, old_icon_num))
+	if ((old_icon_num == NULL ||
+			strcmp(icon_num_str, old_icon_num)) && (qq_buddy_icon_dir() != NULL))
 	{
 		gchar *icon_path;
 
@@ -849,7 +862,7 @@ static void qq_refresh_buddy_and_myself(contact_info *info, PurpleConnection *gc
 }
 
 /* process reply to get_info packet */
-void qq_process_get_info_reply(guint8 *data, gint data_len, PurpleConnection *gc)
+void qq_process_get_buddy_info(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	gchar **segments;
 	qq_info_query *query;
@@ -902,22 +915,24 @@ void qq_process_get_info_reply(guint8 *data, gint data_len, PurpleConnection *gc
 
 void qq_info_query_free(qq_data *qd)
 {
-	gint i;
+	gint count;
 	qq_info_query *p;
 
 	g_return_if_fail(qd != NULL);
 
-	i = 0;
+	count = 0;
 	while (qd->info_query != NULL) {
 		p = (qq_info_query *) (qd->info_query->data);
 		qd->info_query = g_list_remove(qd->info_query, p);
 		g_free(p);
-		i++;
+		count++;
+	}
+	if (count > 0) {
+		purple_debug_info("QQ", "%d info queries are freed!\n", count);
 	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "%d info queries are freed!\n", i);
 }
 
-void qq_send_packet_get_level(PurpleConnection *gc, guint32 uid)
+void qq_request_get_level(PurpleConnection *gc, guint32 uid)
 {
 	qq_data *qd = (qq_data *) gc->proto_data;
 	guint8 buf[16] = {0};
@@ -927,10 +942,10 @@ void qq_send_packet_get_level(PurpleConnection *gc, guint32 uid)
 	bytes += qq_put32(buf + bytes, uid);
 
 	qd = (qq_data *) gc->proto_data;
-	qq_send_cmd(qd, QQ_CMD_GET_LEVEL, buf, bytes);
+	qq_send_cmd(gc, QQ_CMD_GET_LEVEL, buf, bytes);
 }
 
-void qq_send_packet_get_buddies_levels(PurpleConnection *gc)
+void qq_request_get_buddies_level(PurpleConnection *gc, gint update_class)
 {
 	guint8 *buf;
 	guint16 size;
@@ -942,12 +957,11 @@ void qq_send_packet_get_buddies_levels(PurpleConnection *gc)
 	if ( qd->buddies == NULL) {
 		return;
 	}
-	/* server only sends back levels for online buddies, no point
-	 * in asking for anyone else */
-	size = 4 * g_list_length(qd->buddies) + 1;
+	/* server only reply levels for online buddies */
+	size = 4 * g_list_length(qd->buddies) + 1 + 4;
 	buf = g_newa(guint8, size);
 	bytes += qq_put8(buf + bytes, 0x00);
-	
+
 	while (NULL != node) {
 		q_bud = (qq_buddy *) node->data;
 		if (NULL != q_bud) {
@@ -955,7 +969,10 @@ void qq_send_packet_get_buddies_levels(PurpleConnection *gc)
 		}
 		node = node->next;
 	}
-	qq_send_cmd(qd, QQ_CMD_GET_LEVEL, buf, size);
+
+	/* my id should be the end if included */
+	bytes += qq_put32(buf + bytes, qd->uid);
+	qq_send_cmd_mess(gc, QQ_CMD_GET_LEVEL, buf, size, update_class, 0);
 }
 
 void qq_process_get_level_reply(guint8 *decr_buf, gint decr_len, PurpleConnection *gc)
@@ -970,9 +987,9 @@ void qq_process_get_level_reply(guint8 *decr_buf, gint decr_len, PurpleConnectio
 	qq_data *qd = (qq_data *) gc->proto_data;
 	gint bytes = 0;
 
-	decr_len--; 
+	decr_len--;
 	if (decr_len % 12 != 0) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
+		purple_debug_error("QQ",
 				"Get levels list of abnormal length. Truncating last %d bytes.\n", decr_len % 12);
 		decr_len -= (decr_len % 12);
 	}
@@ -980,19 +997,18 @@ void qq_process_get_level_reply(guint8 *decr_buf, gint decr_len, PurpleConnectio
 	bytes += 1;
 	/* this byte seems random */
 	/*
-	   purple_debug(PURPLE_DEBUG_INFO, "QQ", "Byte one of get_level packet: %d\n", buf[0]);
+	   purple_debug_info("QQ", "Byte one of get_level packet: %d\n", buf[0]);
 	   */
 	for (i = 0; i < decr_len; i += 12) {
 		bytes += qq_get32(&uid, decr_buf + bytes);
 		bytes += qq_get32(&onlineTime, decr_buf + bytes);
 		bytes += qq_get16(&level, decr_buf + bytes);
 		bytes += qq_get16(&timeRemainder, decr_buf + bytes);
-		purple_debug(PURPLE_DEBUG_INFO, "QQ_LEVEL", 
-				"%d, tmOnline: %d, level: %d, tmRemainder: %d\n", 
+		purple_debug_info("QQ_LEVEL", "%d, tmOnline: %d, level: %d, tmRemainder: %d\n",
 				uid, onlineTime, level, timeRemainder);
 		if (uid == qd->uid) {
 			qd->my_level = level;
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Got my levels as %d\n", qd->my_level);
+			purple_debug_warning("QQ", "Got my levels as %d\n", qd->my_level);
 			continue;
 		}
 
@@ -1000,7 +1016,7 @@ void qq_process_get_level_reply(guint8 *decr_buf, gint decr_len, PurpleConnectio
 		if (purple_name == NULL) {
 			continue;
 		}
-		
+
 		b = purple_find_buddy(account, purple_name);
 		g_free(purple_name);
 
@@ -1008,10 +1024,9 @@ void qq_process_get_level_reply(guint8 *decr_buf, gint decr_len, PurpleConnectio
 		if (b != NULL) {
 			q_bud = (qq_buddy *) b->proto_data;
 		}
-		
+
 		if (q_bud == NULL) {
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
-					"Got levels of %d not in my buddy list\n", uid);
+			purple_debug_error("QQ", "Got levels of %d not in my buddy list\n", uid);
 			continue;
 		}
 
diff --git a/libpurple/protocols/qq/buddy_info.h b/libpurple/protocols/qq/buddy_info.h
index 853741fc0d..8fd4edafe1 100644
--- a/libpurple/protocols/qq/buddy_info.h
+++ b/libpurple/protocols/qq/buddy_info.h
@@ -51,14 +51,14 @@
 #define QQ_FRIEND_FLAG_MOBILE           0x10
 #define QQ_FRIEND_FLAG_BIND_MOBILE  0x20
 */
-#define QQ_COMM_FLAG_QQ_MEMBER		0x02
-#define QQ_COMM_FLAG_QQ_VIP			0x04
+#define QQ_COMM_FLAG_QQ_VIP			0x02
+#define QQ_COMM_FLAG_QQ_MEMBER		0x04
 #define QQ_COMM_FLAG_TCP_MODE    	0x10
 #define QQ_COMM_FLAG_MOBILE       	0x20
 #define QQ_COMM_FLAG_BIND_MOBILE	0x40
 #define QQ_COMM_FLAG_VIDEO          	0x80
 
-#define QQ_EXT_FLAG_SPACE				0x02
+#define QQ_EXT_FLAG_ZONE				0x02
 
 #define QQ_BUDDY_GENDER_GG          0x00
 #define QQ_BUDDY_GENDER_MM          0x01
@@ -67,14 +67,22 @@
 #define QQ_ICON_PREFIX "qq_"
 #define QQ_ICON_SUFFIX ".png"
 
+enum {
+	QQ_BUDDY_INFO_UPDATE_ONLY = 0,
+	QQ_BUDDY_INFO_DISPLAY,
+	QQ_BUDDY_INFO_MODIFY,
+};
+
 void qq_send_packet_get_info(PurpleConnection *gc, guint32 uid, gboolean show_window);
+void qq_request_buddy_info(PurpleConnection *gc, guint32 uid,
+		gint update_class, guint32 ship32);
 void qq_set_my_buddy_icon(PurpleConnection *gc, PurpleStoredImage *img);
 void qq_set_buddy_icon_for_user(PurpleAccount *account, const gchar *who, const gchar *icon_num, const gchar *iconfile);
 void qq_prepare_modify_info(PurpleConnection *gc);
 void qq_process_modify_info_reply(guint8 *data, gint data_len, PurpleConnection *gc);
-void qq_process_get_info_reply(guint8 *data, gint data_len, PurpleConnection *gc);
+void qq_process_get_buddy_info(guint8 *data, gint data_len, PurpleConnection *gc);
 void qq_info_query_free(qq_data *qd);
-void qq_send_packet_get_level(PurpleConnection *gc, guint32 uid);
-void qq_send_packet_get_buddies_levels(PurpleConnection *gc);
+void qq_request_get_level(PurpleConnection *gc, guint32 uid);
+void qq_request_get_buddies_level(PurpleConnection *gc, gint update_class);
 void qq_process_get_level_reply(guint8 *buf, gint buf_len, PurpleConnection *gc);
 #endif
diff --git a/libpurple/protocols/qq/buddy_list.c b/libpurple/protocols/qq/buddy_list.c
index 437fd1bff9..8a41970f81 100644
--- a/libpurple/protocols/qq/buddy_list.c
+++ b/libpurple/protocols/qq/buddy_list.c
@@ -56,7 +56,7 @@ typedef struct _qq_buddy_online {
 } qq_buddy_online;
 
 /* get a list of online_buddies */
-void qq_send_packet_get_buddies_online(PurpleConnection *gc, guint8 position)
+void qq_request_get_buddies_online(PurpleConnection *gc, guint8 position, gint update_class)
 {
 	qq_data *qd;
 	guint8 *raw_data;
@@ -77,15 +77,14 @@ void qq_send_packet_get_buddies_online(PurpleConnection *gc, guint8 position)
 	/* 003-004 */
 	bytes += qq_put16(raw_data + bytes, 0x0000);
 
-	qq_send_cmd(qd, QQ_CMD_GET_BUDDIES_ONLINE, raw_data, 5);
+	qq_send_cmd_mess(gc, QQ_CMD_GET_BUDDIES_ONLINE, raw_data, 5, update_class, 0);
 	qd->last_get_online = time(NULL);
 }
 
-/* position starts with 0x0000, 
+/* position starts with 0x0000,
  * server may return a position tag if list is too long for one packet */
-void qq_send_packet_get_buddies_list(PurpleConnection *gc, guint16 position)
+void qq_request_get_buddies_list(PurpleConnection *gc, guint16 position, gint update_class)
 {
-	qq_data *qd = (qq_data *) gc->proto_data;
 	guint8 raw_data[16] = {0};
 	gint bytes = 0;
 
@@ -98,13 +97,12 @@ void qq_send_packet_get_buddies_list(PurpleConnection *gc, guint16 position)
 	 * March 22, found the 00,00,00 starts to work as well */
 	bytes += qq_put8(raw_data + bytes, 0x00);
 
-	qq_send_cmd(qd, QQ_CMD_GET_BUDDIES_LIST, raw_data, bytes);
+	qq_send_cmd_mess(gc, QQ_CMD_GET_BUDDIES_LIST, raw_data, bytes, update_class, 0);
 }
 
 /* get all list, buddies & Quns with groupsid support */
-void qq_send_packet_get_buddies_and_rooms(PurpleConnection *gc, guint32 position)
+void qq_request_get_buddies_and_rooms(PurpleConnection *gc, guint32 position, gint update_class)
 {
-	qq_data *qd = (qq_data *) gc->proto_data;
 	guint8 raw_data[16] = {0};
 	gint bytes = 0;
 
@@ -116,7 +114,7 @@ void qq_send_packet_get_buddies_and_rooms(PurpleConnection *gc, guint32 position
 	bytes += qq_put32(raw_data + bytes, 0x00000000);
 	bytes += qq_put32(raw_data + bytes, position);
 
-	qq_send_cmd(qd, QQ_CMD_GET_BUDDIES_AND_ROOMS, raw_data, bytes);
+	qq_send_cmd_mess(gc, QQ_CMD_GET_BUDDIES_AND_ROOMS, raw_data, bytes, update_class, 0);
 }
 
 /* parse the data into qq_buddy_status */
@@ -146,8 +144,8 @@ static gint get_buddy_status(qq_buddy_status *bs, guint8 *data)
 	/* 015-030: unknown key */
 	bytes += qq_getdata(&(bs->unknown_key[0]), QQ_KEY_LENGTH, data + bytes);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_STATUS", 
-			"uid: %d, U1: %d, ip: %s:%d, U2:%d, status:%d, U3:%04X\n", 
+	purple_debug_info("QQ_STATUS",
+			"uid: %d, U1: %d, ip: %s:%d, U2:%d, status:%d, U3:%04X\n",
 			bs->uid, bs->unknown1, inet_ntoa(bs->ip), bs->port,
 			bs->unknown2, bs->status, bs->unknown3);
 
@@ -180,13 +178,12 @@ guint8 qq_process_get_buddies_online_reply(guint8 *data, gint data_len, PurpleCo
 	count = 0;
 	while (bytes < data_len) {
 		if (data_len - bytes < QQ_ONLINE_BUDDY_ENTRY_LEN) {
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
-					"[buddies online] only %d, need %d", 
+			purple_debug_error("QQ", "[buddies online] only %d, need %d",
 					(data_len - bytes), QQ_ONLINE_BUDDY_ENTRY_LEN);
 			break;
 		}
 		memset(&bo, 0 ,sizeof(bo));
-		
+
 		/* set flag */
 		bytes_buddy = bytes;
 		/* based on one online buddy entry */
@@ -204,31 +201,29 @@ guint8 qq_process_get_buddies_online_reply(guint8 *data, gint data_len, PurpleCo
 		bytes += qq_get8(&bo.ending, data + bytes);	/* 0x00 */
 
 		if (bo.bs.uid == 0 || (bytes - bytes_buddy) != QQ_ONLINE_BUDDY_ENTRY_LEN) {
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
-					"uid=0 or entry complete len(%d) != %d", 
+			purple_debug_error("QQ", "uid=0 or entry complete len(%d) != %d",
 					(bytes - bytes_buddy), QQ_ONLINE_BUDDY_ENTRY_LEN);
 			continue;
 		}	/* check if it is a valid entry */
 
 		if (bo.bs.uid == qd->uid) {
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", 
-					"I am in online list %d\n", bo.bs.uid);
+			purple_debug_warning("QQ", "I am in online list %d\n", bo.bs.uid);
 			continue;
 		}
 
 		/* update buddy information */
 		purple_name = uid_to_purple_name(bo.bs.uid);
 		if (purple_name == NULL) {
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
+			purple_debug_error("QQ",
 					"Got an online buddy %d, but not find purple name\n", bo.bs.uid);
 			continue;
 		}
 		b = purple_find_buddy(purple_connection_get_account(gc), purple_name);
 		g_free(purple_name);
-		
+
 		q_bud = (b == NULL) ? NULL : (qq_buddy *) b->proto_data;
 		if (q_bud == NULL) {
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
+			purple_debug_error("QQ",
 					"Got an online buddy %d, but not in my buddy list\n", bo.bs.uid);
 			continue;
 		}
@@ -247,11 +242,11 @@ guint8 qq_process_get_buddies_online_reply(guint8 *data, gint data_len, PurpleCo
 	}
 
 	if(bytes > data_len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
+		purple_debug_error("QQ",
 				"qq_process_get_buddies_online_reply: Dangerous error! maybe protocol changed, notify developers!\n");
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Received %d online buddies, nextposition=%u\n",
+	purple_debug_info("QQ", "Received %d online buddies, nextposition=%u\n",
 							count, (guint) position);
 	return position;
 }
@@ -274,7 +269,7 @@ guint16 qq_process_get_buddies_list_reply(guint8 *data, gint data_len, PurpleCon
 	qd = (qq_data *) gc->proto_data;
 
 	if (data_len <= 2) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "empty buddies list");
+		purple_debug_error("QQ", "empty buddies list");
 		return -1;
 	}
 	/* qq_show_packet("QQ get buddies list", data, data_len); */
@@ -297,6 +292,7 @@ guint16 qq_process_get_buddies_list_reply(guint8 *data, gint data_len, PurpleCon
 
 		pascal_len = convert_as_pascal_string(data + bytes, &q_bud->nickname, QQ_CHARSET_DEFAULT);
 		bytes += pascal_len;
+		qq_filter_str(q_bud->nickname);
 
 		bytes += qq_get16(&unknown, data + bytes);
 		bytes += qq_get8(&q_bud->ext_flag, data + bytes);
@@ -305,7 +301,7 @@ guint16 qq_process_get_buddies_list_reply(guint8 *data, gint data_len, PurpleCon
 		bytes_expected = 12 + pascal_len;
 
 		if (q_bud->uid == 0 || (bytes - buddy_bytes) != bytes_expected) {
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
+			purple_debug_info("QQ",
 					"Buddy entry, expect %d bytes, read %d bytes\n", bytes_expected, bytes - buddy_bytes);
 			g_free(q_bud->nickname);
 			g_free(q_bud);
@@ -315,7 +311,7 @@ guint16 qq_process_get_buddies_list_reply(guint8 *data, gint data_len, PurpleCon
 		}
 
 #if 1
-		purple_debug(PURPLE_DEBUG_INFO, "QQ",
+		purple_debug_info("QQ",
 				"buddy [%09d]: ext_flag=0x%02x, comm_flag=0x%02x, nick=%s\n",
 				q_bud->uid, q_bud->ext_flag, q_bud->comm_flag, q_bud->nickname);
 #endif
@@ -334,11 +330,11 @@ guint16 qq_process_get_buddies_list_reply(guint8 *data, gint data_len, PurpleCon
 	}
 
 	if(bytes > data_len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
+		purple_debug_error("QQ",
 				"qq_process_get_buddies_list_reply: Dangerous error! maybe protocol changed, notify developers!");
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Received %d buddies, nextposition=%u\n",
+	purple_debug_info("QQ", "Received %d buddies, nextposition=%u\n",
 		count, (guint) position);
 	return position;
 }
@@ -364,8 +360,7 @@ guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConn
 
 	bytes += qq_get8(&reply_code, data + bytes);
 	if(0 != reply_code) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", 
-				"qq_process_get_buddies_and_rooms, %d", reply_code);
+		purple_debug_warning("QQ", "qq_process_get_buddies_and_rooms, %d", reply_code);
 	}
 
 	bytes += qq_get32(&unknown, data + bytes);
@@ -381,48 +376,45 @@ guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConn
 		/* 05: groupid*4 */ /* seems to always be 0 */
 		bytes += qq_get8(&groupid, data + bytes);
 		/*
-		   purple_debug(PURPLE_DEBUG_INFO, "QQ", "groupid: %i\n", groupid);
+		   purple_debug_info("QQ", "groupid: %i\n", groupid);
 		   groupid >>= 2;
 		   */
 		if (uid == 0 || (type != 0x1 && type != 0x4)) {
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"Buddy entry, uid=%d, type=%d", uid, type);
+			purple_debug_info("QQ", "Buddy entry, uid=%d, type=%d", uid, type);
 			continue;
-		} 
+		}
 		if(0x1 == type) { /* a buddy */
-			/* don't do anything but count - buddies are handled by 
-			 * qq_send_packet_get_buddies_list */
+			/* don't do anything but count - buddies are handled by
+			 * qq_request_get_buddies_list */
 			++i;
 		} else { /* a group */
 			group = qq_room_search_id(gc, uid);
 			if(group == NULL) {
-				purple_debug(PURPLE_DEBUG_INFO, "QQ",
+				purple_debug_info("QQ",
 					"Not find room id %d in qq_process_get_buddies_and_rooms\n", uid);
 				qq_set_pending_id(&qd->adding_groups_from_server, uid, TRUE);
-				qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, uid);
 			} else {
-				group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
+				group->my_role = QQ_ROOM_ROLE_YES;
 				qq_group_refresh(gc, group);
-				qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
 			}
 			++j;
 		}
 	}
 
 	if(bytes > data_len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
+		purple_debug_error("QQ",
 				"qq_process_get_buddies_and_rooms: Dangerous error! maybe protocol changed, notify developers!");
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Received %d buddies and %d groups, nextposition=%u\n", i, j, (guint) position);
+	purple_debug_info("QQ", "Received %d buddies and %d groups, nextposition=%u\n", i, j, (guint) position);
 	return position;
 }
 
 #define QQ_MISC_STATUS_HAVING_VIIDEO      0x00000001
 #define QQ_CHANGE_ONLINE_STATUS_REPLY_OK 	0x30	/* ASCII value of "0" */
 
-/* TODO: figure out what's going on with the IP region. Sometimes I get valid IP addresses, 
- * but the port number's weird, other times I get 0s. I get these simultaneously on the same buddy, 
+/* TODO: figure out what's going on with the IP region. Sometimes I get valid IP addresses,
+ * but the port number's weird, other times I get 0s. I get these simultaneously on the same buddy,
  * using different accounts to get info. */
 
 /* check if status means online or offline */
@@ -433,7 +425,7 @@ gboolean is_online(guint8 status)
 		case QQ_BUDDY_ONLINE_AWAY:
 		case QQ_BUDDY_ONLINE_INVISIBLE:
 			return TRUE;
-		case QQ_BUDDY_ONLINE_OFFLINE:
+		case QQ_BUDDY_CHANGE_TO_OFFLINE:
 			return FALSE;
 	}
 	return FALSE;
@@ -441,9 +433,9 @@ gboolean is_online(guint8 status)
 
 /* Help calculate the correct icon index to tell the server. */
 gint get_icon_offset(PurpleConnection *gc)
-{ 
+{
 	PurpleAccount *account;
-	PurplePresence *presence; 
+	PurplePresence *presence;
 
 	account = purple_connection_get_account(gc);
 	presence = purple_account_get_presence(account);
@@ -460,7 +452,7 @@ gint get_icon_offset(PurpleConnection *gc)
 }
 
 /* send a packet to change my online status */
-void qq_send_packet_change_status(PurpleConnection *gc)
+void qq_request_change_status(PurpleConnection *gc, gint update_class)
 {
 	qq_data *qd;
 	guint8 raw_data[16] = {0};
@@ -469,13 +461,13 @@ void qq_send_packet_change_status(PurpleConnection *gc)
 	guint32 misc_status;
 	gboolean fake_video;
 	PurpleAccount *account;
-	PurplePresence *presence; 
+	PurplePresence *presence;
 
 	account = purple_connection_get_account(gc);
 	presence = purple_account_get_presence(account);
 
 	qd = (qq_data *) gc->proto_data;
-	if (!qd->logged_in)
+	if (!qd->is_login)
 		return;
 
 	if (purple_presence_is_status_primitive_active(presence, PURPLE_STATUS_INVISIBLE)) {
@@ -497,7 +489,7 @@ void qq_send_packet_change_status(PurpleConnection *gc)
 	bytes += qq_put8(raw_data + bytes, away_cmd);
 	bytes += qq_put32(raw_data + bytes, misc_status);
 
-	qq_send_cmd(qd, QQ_CMD_CHANGE_ONLINE_STATUS, raw_data, bytes);
+	qq_send_cmd_mess(gc, QQ_CMD_CHANGE_STATUS, raw_data, bytes, update_class, 0);
 }
 
 /* parse the reply packet for change_status */
@@ -513,15 +505,15 @@ void qq_process_change_status_reply(guint8 *data, gint data_len, PurpleConnectio
 	g_return_if_fail(data != NULL && data_len != 0);
 
 	qd = (qq_data *) gc->proto_data;
-	
+
 	bytes = 0;
 	bytes = qq_get8(&reply, data + bytes);
 	if (reply != QQ_CHANGE_ONLINE_STATUS_REPLY_OK) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Change status fail 0x%02X\n", reply);
+		purple_debug_warning("QQ", "Change status fail 0x%02X\n", reply);
 		return;
 	}
 
-	/* purple_debug(PURPLE_DEBUG_INFO, "QQ", "Change status OK\n"); */
+	/* purple_debug_info("QQ", "Change status OK\n"); */
 	name = uid_to_purple_name(qd->uid);
 	b = purple_find_buddy(gc->account, name);
 	g_free(name);
@@ -532,7 +524,7 @@ void qq_process_change_status_reply(guint8 *data, gint data_len, PurpleConnectio
 }
 
 /* it is a server message indicating that one of my buddies has changed its status */
-void qq_process_buddy_change_status(guint8 *data, gint data_len, PurpleConnection *gc) 
+void qq_process_buddy_change_status(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
 	gint bytes;
@@ -547,16 +539,16 @@ void qq_process_buddy_change_status(guint8 *data, gint data_len, PurpleConnectio
 	qd = (qq_data *) gc->proto_data;
 
 	if (data_len < 35) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "[buddy status change] only %d, need 35 bytes\n", data_len);
+		purple_debug_error("QQ", "[buddy status change] only %d, need 35 bytes\n", data_len);
 		return;
 	}
-	
+
 	memset(&bs, 0, sizeof(bs));
 	bytes = 0;
 	/* 000-030: qq_buddy_status */
 	bytes += get_buddy_status(&bs, data + bytes);
-	/* 031-034:  Unknow, maybe my uid */ 
-	/* This has a value of 0 when we've changed our status to 
+	/* 031-034:  Unknow, maybe my uid */
+	/* This has a value of 0 when we've changed our status to
 	 * QQ_BUDDY_ONLINE_INVISIBLE */
 	bytes += qq_get32(&my_uid, data + bytes);
 
@@ -565,20 +557,18 @@ void qq_process_buddy_change_status(guint8 *data, gint data_len, PurpleConnectio
 	g_free(name);
 	q_bud = (b == NULL) ? NULL : (qq_buddy *) b->proto_data;
 	if (q_bud == NULL) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
-				"got information of unknown buddy %d\n", bs.uid);
+		purple_debug_warning("QQ", "Get status of unknown buddy %d\n", bs.uid);
 		return;
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "status:.uid = %d, q_bud->uid = %d\n", bs.uid , q_bud->uid);
-	if(bs.ip.s_addr != 0) { 
+	if(bs.ip.s_addr != 0) {
 		q_bud->ip.s_addr = bs.ip.s_addr;
 		q_bud->port = bs.port;
 	}
 	q_bud->status =bs.status;
 
-	if (q_bud->status == QQ_BUDDY_ONLINE_NORMAL) {
-		qq_send_packet_get_level(gc, q_bud->uid);
+	if (q_bud->status == QQ_BUDDY_ONLINE_NORMAL && q_bud->level <= 0) {
+		qq_request_get_level(gc, q_bud->uid);
 	}
 	qq_update_buddy_contact(gc, q_bud);
 }
@@ -589,24 +579,24 @@ void qq_update_buddy_contact(PurpleConnection *gc, qq_buddy *q_bud)
 	gchar *purple_name;
 	PurpleBuddy *bud;
 	gchar *status_id;
-	
+
 	g_return_if_fail(q_bud != NULL);
 
 	purple_name = uid_to_purple_name(q_bud->uid);
 	if (purple_name == NULL) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Not find purple name: %d\n", q_bud->uid);
+		purple_debug_error("QQ", "Not find purple name: %d\n", q_bud->uid);
 		return;
 	}
 
 	bud = purple_find_buddy(gc->account, purple_name);
 	if (bud == NULL) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Not find buddy: %d\n", q_bud->uid);
+		purple_debug_error("QQ", "Not find buddy: %d\n", q_bud->uid);
 		g_free(purple_name);
 		return;
 	}
-	
+
 	purple_blist_server_alias_buddy(bud, q_bud->nickname); /* server */
-	q_bud->last_refresh = time(NULL);
+	q_bud->last_update = time(NULL);
 
 	/* purple supports signon and idle time
 	 * but it is not much use for QQ, I do not use them */
@@ -619,7 +609,7 @@ void qq_update_buddy_contact(PurpleConnection *gc, qq_buddy *q_bud)
 	case QQ_BUDDY_ONLINE_NORMAL:
 		status_id = "available";
 		break;
-	case QQ_BUDDY_ONLINE_OFFLINE:
+	case QQ_BUDDY_CHANGE_TO_OFFLINE:
 		status_id = "offline";
 		break;
 	case QQ_BUDDY_ONLINE_AWAY:
@@ -630,10 +620,10 @@ void qq_update_buddy_contact(PurpleConnection *gc, qq_buddy *q_bud)
 		break;
 	default:
 		status_id = "invisible";
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "unknown status: %x\n", q_bud->status);
+		purple_debug_error("QQ", "unknown status: %x\n", q_bud->status);
 		break;
 	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "buddy %d %s\n", q_bud->uid, status_id);
+	purple_debug_info("QQ", "buddy %d %s\n", q_bud->uid, status_id);
 	purple_prpl_got_user_status(gc->account, purple_name, status_id, NULL);
 
 	if (q_bud->comm_flag & QQ_COMM_FLAG_MOBILE && q_bud->status != QQ_BUDDY_OFFLINE)
@@ -641,11 +631,6 @@ void qq_update_buddy_contact(PurpleConnection *gc, qq_buddy *q_bud)
 	else
 		purple_prpl_got_user_status_deactive(gc->account, purple_name, "mobile");
 
-	if (q_bud->comm_flag & QQ_COMM_FLAG_VIDEO && q_bud->status != QQ_BUDDY_OFFLINE)
-		purple_prpl_got_user_status(gc->account, purple_name, "video", NULL);
-	else
-		purple_prpl_got_user_status_deactive(gc->account, purple_name, "video");
-
 	g_free(purple_name);
 }
 
@@ -664,9 +649,9 @@ void qq_refresh_all_buddy_status(PurpleConnection *gc)
 
 	while (list != NULL) {
 		q_bud = (qq_buddy *) list->data;
-		if (q_bud != NULL && now > q_bud->last_refresh + QQ_UPDATE_ONLINE_INTERVAL
+		if (q_bud != NULL && now > q_bud->last_update + QQ_UPDATE_ONLINE_INTERVAL
 				&& q_bud->status != QQ_BUDDY_ONLINE_INVISIBLE) {
-			q_bud->status = QQ_BUDDY_ONLINE_OFFLINE;
+			q_bud->status = QQ_BUDDY_CHANGE_TO_OFFLINE;
 			qq_update_buddy_contact(gc, q_bud);
 		}
 		list = list->next;
diff --git a/libpurple/protocols/qq/buddy_list.h b/libpurple/protocols/qq/buddy_list.h
index e1655757f0..8226bacf74 100644
--- a/libpurple/protocols/qq/buddy_list.h
+++ b/libpurple/protocols/qq/buddy_list.h
@@ -42,19 +42,19 @@ typedef struct _qq_buddy_status {
 
 enum {
 	QQ_BUDDY_OFFLINE = 0x00,
-	QQ_BUDDY_ONLINE_NORMAL = 0x0a,
-	QQ_BUDDY_ONLINE_OFFLINE = 0x14,
-	QQ_BUDDY_ONLINE_AWAY = 0x1e,
-	QQ_BUDDY_ONLINE_INVISIBLE = 0x28
+	QQ_BUDDY_ONLINE_NORMAL = 10,
+	QQ_BUDDY_CHANGE_TO_OFFLINE = 20,
+	QQ_BUDDY_ONLINE_AWAY = 30,
+	QQ_BUDDY_ONLINE_INVISIBLE = 40
 };
 
-void qq_send_packet_get_buddies_online(PurpleConnection *gc, guint8 position);
+void qq_request_get_buddies_online(PurpleConnection *gc, guint8 position, gint update_class);
 guint8 qq_process_get_buddies_online_reply(guint8 *data, gint data_len, PurpleConnection *gc);
 
-void qq_send_packet_get_buddies_list(PurpleConnection *gc, guint16 position);
+void qq_request_get_buddies_list(PurpleConnection *gc, guint16 position, gint update_class);
 guint16 qq_process_get_buddies_list_reply(guint8 *data, gint data_len, PurpleConnection *gc);
 
-void qq_send_packet_get_buddies_and_rooms(PurpleConnection *gc, guint32 position);
+void qq_request_get_buddies_and_rooms(PurpleConnection *gc, guint32 position, gint update_class);
 guint32 qq_process_get_buddies_and_rooms(guint8 *data, gint data_len, PurpleConnection *gc);
 
 void qq_refresh_all_buddy_status(PurpleConnection *gc);
@@ -63,7 +63,7 @@ gboolean is_online(guint8 status);
 
 gint get_icon_offset(PurpleConnection *gc);
 
-void qq_send_packet_change_status(PurpleConnection *gc);
+void qq_request_change_status(PurpleConnection *gc, gint update_class);
 void qq_process_change_status_reply(guint8 *data, gint data_len, PurpleConnection *gc);
 void qq_process_buddy_change_status(guint8 *data, gint data_len, PurpleConnection *gc);
 
diff --git a/libpurple/protocols/qq/buddy_opt.c b/libpurple/protocols/qq/buddy_opt.c
index 85356ca187..b77081b821 100644
--- a/libpurple/protocols/qq/buddy_opt.c
+++ b/libpurple/protocols/qq/buddy_opt.c
@@ -60,19 +60,17 @@ typedef struct _qq_add_buddy_request {
 /* send packet to remove a buddy from my buddy list */
 static void _qq_send_packet_remove_buddy(PurpleConnection *gc, guint32 uid)
 {
-	qq_data *qd = (qq_data *) gc->proto_data;
 	gchar uid_str[11];
 
 	g_return_if_fail(uid > 0);
 
 	g_snprintf(uid_str, sizeof(uid_str), "%d", uid);
-	qq_send_cmd(qd, QQ_CMD_DEL_BUDDY, (guint8 *) uid_str, strlen(uid_str));
+	qq_send_cmd(gc, QQ_CMD_DEL_BUDDY, (guint8 *) uid_str, strlen(uid_str));
 }
 
 /* try to remove myself from someone's buddy list */
 static void _qq_send_packet_remove_self_from(PurpleConnection *gc, guint32 uid)
 {
-	qq_data *qd = (qq_data *) gc->proto_data;
 	guint8 raw_data[16] = {0};
 	gint bytes = 0;
 
@@ -80,7 +78,7 @@ static void _qq_send_packet_remove_self_from(PurpleConnection *gc, guint32 uid)
 
 	bytes += qq_put32(raw_data + bytes, uid);
 
-	qq_send_cmd(qd, QQ_CMD_REMOVE_SELF, raw_data, bytes);
+	qq_send_cmd(gc, QQ_CMD_REMOVE_SELF, raw_data, bytes);
 }
 
 /* try to add a buddy without authentication */
@@ -94,7 +92,7 @@ static void _qq_send_packet_add_buddy(PurpleConnection *gc, guint32 uid)
 
 	/* we need to send the ascii code of this uid to qq server */
 	g_snprintf(uid_str, sizeof(uid_str), "%d", uid);
-	qq_send_cmd(qd, QQ_CMD_ADD_BUDDY_WO_AUTH, (guint8 *) uid_str, strlen(uid_str));
+	qq_send_cmd(gc, QQ_CMD_ADD_BUDDY_WO_AUTH, (guint8 *) uid_str, strlen(uid_str));
 
 	/* must be set after sending packet to get the correct send_seq */
 	req = g_new0(qq_add_buddy_request, 1);
@@ -106,7 +104,6 @@ static void _qq_send_packet_add_buddy(PurpleConnection *gc, guint32 uid)
 /* this buddy needs authentication, text conversion is done at lowest level */
 static void _qq_send_packet_buddy_auth(PurpleConnection *gc, guint32 uid, const gchar response, const gchar *text)
 {
-	qq_data *qd = (qq_data *) gc->proto_data;
 	gchar *text_qq, uid_str[11];
 	guint8 bar, *raw_data;
 	gint bytes = 0;
@@ -128,7 +125,7 @@ static void _qq_send_packet_buddy_auth(PurpleConnection *gc, guint32 uid, const
 		g_free(text_qq);
 	}
 
-	qq_send_cmd(qd, QQ_CMD_BUDDY_AUTH, raw_data, bytes);
+	qq_send_cmd(gc, QQ_CMD_BUDDY_AUTH, raw_data, bytes);
 }
 
 static void _qq_send_packet_add_buddy_auth_with_gc_and_uid(gc_and_uid *g, const gchar *text)
@@ -204,11 +201,11 @@ void qq_reject_add_request_with_gc_and_uid(gc_and_uid *g)
 	g2->uid = uid;
 
 	msg1 = g_strdup_printf(_("You rejected %d's request"), uid);
-	msg2 = g_strdup(_("Input your reason:"));
+	msg2 = g_strdup(_("Message:"));
 
 	nombre = uid_to_purple_name(uid);
 	purple_request_input(gc, _("Reject request"), msg1, msg2,
-			_("Sorry, you are not my type..."), TRUE, FALSE,
+			_("Sorry, you are not my style..."), TRUE, FALSE,
 			NULL, _("Reject"), G_CALLBACK(_qq_reject_add_request_real), _("Cancel"), NULL,
 			purple_connection_get_account(gc), nombre, NULL,
 			g2);
@@ -261,7 +258,7 @@ void qq_process_add_buddy_auth_reply(guint8 *data, gint data_len, PurpleConnecti
 	qd = (qq_data *) gc->proto_data;
 
 	if (data[0] != QQ_ADD_BUDDY_AUTH_REPLY_OK) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Add buddy with auth request failed\n");
+		purple_debug_warning("QQ", "Add buddy with auth request failed\n");
 		if (NULL == (segments = split_data(data, data_len, "\x1f", 2))) {
 			return;
 		}
@@ -269,7 +266,7 @@ void qq_process_add_buddy_auth_reply(guint8 *data, gint data_len, PurpleConnecti
 		purple_notify_error(gc, NULL, _("Add buddy with auth request failed"), msg_utf8);
 		g_free(msg_utf8);
 	} else {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Add buddy with auth request OK\n");
+		purple_debug_info("QQ", "Add buddy with auth request OK\n");
 	}
 }
 
@@ -284,16 +281,17 @@ void qq_process_remove_buddy_reply(guint8 *data, gint data_len, PurpleConnection
 
 	if (data[0] != QQ_REMOVE_BUDDY_REPLY_OK) {
 		/* there is no reason return from server */
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Remove buddy fails\n");
+		purple_debug_warning("QQ", "Remove buddy fails\n");
+		purple_notify_info(gc, _("QQ Buddy"), _("Failed:"),  _("Remove buddy"));
 	} else {		/* if reply */
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Remove buddy OK\n");
+		purple_debug_info("QQ", "Remove buddy OK\n");
 		/* TODO: We don't really need to notify the user about this, do we? */
-		purple_notify_info(gc, NULL, _("You have successfully removed a buddy"), NULL);
+		purple_notify_info(gc, _("QQ Buddy"), _("Successed:"),  _("Remove buddy"));
 	}
 }
 
 /* process the server reply for my request to remove myself from a buddy */
-void qq_process_remove_self_reply(guint8 *data, gint data_len, PurpleConnection *gc) 
+void qq_process_remove_self_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
 
@@ -303,11 +301,12 @@ void qq_process_remove_self_reply(guint8 *data, gint data_len, PurpleConnection
 
 	if (data[0] != QQ_REMOVE_SELF_REPLY_OK) {
 		/* there is no reason return from server */
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Remove self fails\n");
+		purple_debug_warning("QQ", "Remove self fails\n");
+		purple_notify_info(gc, _("QQ Buddy"), _("Failed:"), _("Remove from other's buddy list"));
 	} else {		/* if reply */
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Remove self from a buddy OK\n");
+		purple_debug_info("QQ", "Remove from a buddy OK\n");
 		/* TODO: Does the user really need to be notified about this? */
-		purple_notify_info(gc, NULL, _("You have successfully removed yourself from your friend's buddy list"), NULL);
+		purple_notify_info(gc, _("QQ Buddy"), _("Successed:"), _("Remove from other's buddy list"));
 	}
 }
 
@@ -340,25 +339,25 @@ void qq_process_add_buddy_reply(guint8 *data, gint data_len, guint16 seq, Purple
 	}
 
 	if (for_uid == 0) {	/* we have no record for this */
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "We have no record for add buddy reply [%d], discard\n", seq);
+		purple_debug_error("QQ", "We have no record for add buddy reply [%d], discard\n", seq);
 		return;
 	} else {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Add buddy reply [%d] is for id [%d]\n", seq, for_uid);
+		purple_debug_info("QQ", "Add buddy reply [%d] is for id [%d]\n", seq, for_uid);
 	}
 
 	if (NULL == (segments = split_data(data, data_len, "\x1f", 2)))
 		return;
-		
+
 	uid = segments[0];
 	reply = segments[1];
 	if (strtol(uid, NULL, 10) != qd->uid) {	/* should not happen */
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Add buddy reply is to [%s], not me!", uid);
+		purple_debug_error("QQ", "Add buddy reply is to [%s], not me!", uid);
 		g_strfreev(segments);
 		return;
 	}
 
 	if (strtol(reply, NULL, 10) > 0) {	/* need auth */
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Add buddy attempt fails, need authentication\n");
+		purple_debug_warning("QQ", "Add buddy attempt fails, need authentication\n");
 		nombre = uid_to_purple_name(for_uid);
 		b = purple_find_buddy(gc->account, nombre);
 		if (b != NULL)
@@ -366,7 +365,7 @@ void qq_process_add_buddy_reply(guint8 *data, gint data_len, guint16 seq, Purple
 		g = g_new0(gc_and_uid, 1);
 		g->gc = gc;
 		g->uid = for_uid;
-		msg = g_strdup_printf(_("User %d needs authentication"), for_uid);
+		msg = g_strdup_printf(_("%d needs authentication"), for_uid);
 		purple_request_input(gc, NULL, msg,
 				_("Input request here"), /* TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands */
 				_("Would you be my friend?"),
@@ -380,8 +379,8 @@ void qq_process_add_buddy_reply(guint8 *data, gint data_len, guint16 seq, Purple
 		g_free(nombre);
 	} else {	/* add OK */
 		qq_add_buddy_by_recv_packet(gc, for_uid, TRUE, TRUE);
-		msg = g_strdup_printf(_("You have added %d to buddy list"), for_uid);
-		purple_notify_info(gc, NULL, msg, NULL);
+		msg = g_strdup_printf(_("Add into %d's buddy list"), for_uid);
+		purple_notify_info(gc, _("QQ Buddy"), _("Successed:"), msg);
 		g_free(msg);
 	}
 	g_strfreev(segments);
@@ -397,7 +396,7 @@ PurpleGroup *qq_get_purple_group(const gchar *group_name)
 	if (g == NULL) {
 		g = purple_group_new(group_name);
 		purple_blist_add_group(g, NULL);
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Add new group: %s\n", group_name);
+		purple_debug_warning("QQ", "Add new group: %s\n", group_name);
 	}
 
 	return g;
@@ -440,11 +439,11 @@ PurpleBuddy *qq_add_buddy_by_recv_packet(PurpleConnection *gc, guint32 uid, gboo
 		b->proto_data = q_bud;
 		qd->buddies = g_list_append(qd->buddies, q_bud);
 		qq_send_packet_get_info(gc, q_bud->uid, FALSE);
-		qq_send_packet_get_buddies_online(gc, 0);
+		qq_request_get_buddies_online(gc, 0, 0);
 	}
 
 	purple_blist_add_buddy(b, NULL, g, NULL);
-	purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Add new buddy: [%s]\n", name);
+	purple_debug_warning("QQ", "Add new buddy: [%s]\n", name);
 
 	g_free(name);
 	g_free(group_name);
@@ -454,8 +453,8 @@ PurpleBuddy *qq_add_buddy_by_recv_packet(PurpleConnection *gc, guint32 uid, gboo
 
 /* add a buddy and send packet to QQ server
  * note that when purple load local cached buddy list into its blist
- * it also calls this funtion, so we have to 
- * define qd->logged_in=TRUE AFTER serv_finish_login(gc) */
+ * it also calls this funtion, so we have to
+ * define qd->is_login=TRUE AFTER serv_finish_login(gc) */
 void qq_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 {
 	qq_data *qd;
@@ -463,7 +462,7 @@ void qq_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 	PurpleBuddy *b;
 
 	qd = (qq_data *) gc->proto_data;
-	if (!qd->logged_in)
+	if (!qd->is_login)
 		return;		/* IMPORTANT ! */
 
 	uid = purple_name_to_uid(buddy->name);
@@ -474,8 +473,8 @@ void qq_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *group)
 		if (b != NULL)
 			purple_blist_remove_buddy(b);
 		purple_notify_error(gc, NULL,
-				_("QQid Error"),
-				_("Invalid QQid"));
+				_("QQ Number Error"),
+				_("Invalid QQ Number"));
 	}
 }
 
@@ -490,7 +489,7 @@ void qq_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *grou
 	qd = (qq_data *) gc->proto_data;
 	uid = purple_name_to_uid(buddy->name);
 
-	if (!qd->logged_in)
+	if (!qd->is_login)
 		return;
 
 	if (uid > 0)
@@ -502,7 +501,7 @@ void qq_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *grou
 		if (q_bud != NULL)
 			qd->buddies = g_list_remove(qd->buddies, q_bud);
 		else
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "We have no qq_buddy record for %s\n", buddy->name);
+			purple_debug_warning("QQ", "We have no qq_buddy record for %s\n", buddy->name);
 		/* remove buddy on blist, this does not trigger qq_remove_buddy again
 		 * do this only if the request comes from block request,
 		 * otherwise purple segmentation fault */
@@ -514,41 +513,45 @@ void qq_remove_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *grou
 /* free add buddy request queue */
 void qq_add_buddy_request_free(qq_data *qd)
 {
-	gint i;
+	gint count;
 	qq_add_buddy_request *p;
 
-	i = 0;
-	while (qd->add_buddy_request) {
+	count = 0;
+	while (qd->add_buddy_request != NULL) {
 		p = (qq_add_buddy_request *) (qd->add_buddy_request->data);
 		qd->add_buddy_request = g_list_remove(qd->add_buddy_request, p);
 		g_free(p);
-		i++;
+		count++;
+	}
+	if (count > 0) {
+		purple_debug_info("QQ", "%d add buddy requests are freed!\n", count);
 	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "%d add buddy requests are freed!\n", i);
 }
 
 /* free up all qq_buddy */
 void qq_buddies_list_free(PurpleAccount *account, qq_data *qd)
 {
-	gint i;
+	gint count;
 	qq_buddy *p;
 	gchar *name;
 	PurpleBuddy *b;
 
-	i = 0;
+	count = 0;
 	while (qd->buddies) {
 		p = (qq_buddy *) (qd->buddies->data);
 		qd->buddies = g_list_remove(qd->buddies, p);
 		name = uid_to_purple_name(p->uid);
-		b = purple_find_buddy(account, name);   	
-		if(b != NULL) 
+		b = purple_find_buddy(account, name);
+		if(b != NULL)
 			b->proto_data = NULL;
 		else
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "qq_buddy %s not found in purple proto_data\n", name);
+			purple_debug_info("QQ", "qq_buddy %s not found in purple proto_data\n", name);
 		g_free(name);
 
 		g_free(p);
-		i++;
+		count++;
+	}
+	if (count > 0) {
+		purple_debug_info("QQ", "%d qq_buddy structures are freed!\n", count);
 	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "%d qq_buddy structures are freed!\n", i);
 }
diff --git a/libpurple/protocols/qq/char_conv.c b/libpurple/protocols/qq/char_conv.c
index 4c0d0a451f..c29a273a5e 100644
--- a/libpurple/protocols/qq/char_conv.c
+++ b/libpurple/protocols/qq/char_conv.c
@@ -98,7 +98,7 @@ static gboolean _check_underline(gchar font_attr)
 }
 
 /* convert a string from from_charset to to_charset, using g_convert */
-static gchar *_my_convert(const gchar *str, gssize len, const gchar *to_charset, const gchar *from_charset) 
+static gchar *_my_convert(const gchar *str, gssize len, const gchar *to_charset, const gchar *from_charset)
 {
 	GError *error = NULL;
 	gchar *ret;
@@ -111,9 +111,9 @@ static gchar *_my_convert(const gchar *str, gssize len, const gchar *to_charset,
 	if (error == NULL) {
 		return ret;	/* conversion is OK */
 	}
-	
+
 	/* conversion error */
-	purple_debug(PURPLE_DEBUG_ERROR, "QQ_CONVERT", "%s\n", error->message);
+	purple_debug_error("QQ_CONVERT", "%s\n", error->message);
 
 	qq_hex_dump(PURPLE_DEBUG_WARNING, "QQ_CONVERT",
 		(guint8 *) str, (len == -1) ? strlen(str) : len,
@@ -127,8 +127,8 @@ static gchar *_my_convert(const gchar *str, gssize len, const gchar *to_charset,
  * take the input as a pascal string and return a converted c-string in UTF-8
  * returns the number of bytes read, return -1 if fatal error
  * the converted UTF-8 will be saved in ret
- */ 
-gint convert_as_pascal_string(guint8 *data, gchar **ret, const gchar *from_charset) 
+ */
+gint convert_as_pascal_string(guint8 *data, gchar **ret, const gchar *from_charset)
 {
 	guint8 len;
 
@@ -182,7 +182,7 @@ gchar *qq_encode_to_purple(guint8 *data, gint len, const gchar *msg)
 	g_string_append_printf(encoded,
 			"<font color=\"%s\"><font face=\"%s\"><font size=\"%d\">",
 			color_code, font_name, font_size / 3);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_MESG",
+	purple_debug_info("QQ_MESG",
 			"recv <font color=\"%s\"><font face=\"%s\"><font size=\"%d\">\n",
 			color_code, font_name, font_size / 3);
 	g_string_append(encoded, msg_utf8);
@@ -222,7 +222,7 @@ gchar *qq_to_utf8(const gchar *str, const gchar *from_charset)
 	return _my_convert(str, -1, UTF8, from_charset);
 }
 
-/* QQ uses binary code for smiley, while purple uses strings. 
+/* QQ uses binary code for smiley, while purple uses strings.
  * There is a mapping relation between these two. */
 gchar *qq_smiley_to_purple(gchar *text)
 {
@@ -286,7 +286,8 @@ void qq_filter_str(gchar *str) {
 	}
 
 	for (temp = str; *temp != 0; temp++) {
-		if (*temp == '\r' || *temp == '\n')  *temp = ' ';
+		/*if (*temp == '\r' || *temp == '\n')  *temp = ' ';*/
+		if (*temp > 0 && *temp < 0x20)  *temp = ' ';
 	}
 	g_strstrip(str);
 }
diff --git a/libpurple/protocols/qq/file_trans.c b/libpurple/protocols/qq/file_trans.c
index 1a08e25522..5f0993ca5c 100644
--- a/libpurple/protocols/qq/file_trans.c
+++ b/libpurple/protocols/qq/file_trans.c
@@ -22,10 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#ifdef _WIN32
-#define random rand
-#endif
-
 #include "internal.h"
 
 #include "debug.h"
@@ -62,7 +58,7 @@ static guint32 _gen_file_key(void)
 {
 	guint8 seed;
 
-	seed = random();
+	seed = rand() & 0xFF;
 	return _get_file_key(seed);
 }
 
@@ -261,7 +257,7 @@ static gint _qq_send_file(PurpleConnection *gc, guint8 *data, gint len, guint16
 	if (bytes == len + 12) {
 		_qq_xfer_write(raw_data, bytes, qd->xfer);
 	} else
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "send_file: want %d but got %d\n", len + 12, bytes);
+		purple_debug_info("QQ", "send_file: want %d but got %d\n", len + 12, bytes);
 	return bytes;
 }
 
@@ -323,13 +319,13 @@ void qq_send_file_ctl_packet(PurpleConnection *gc, guint16 packet_type, guint32
 			bytes_expected = 61;
 			break;
 		default:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "qq_send_file_ctl_packet: Unknown packet type[%d]\n",
+			purple_debug_info("QQ", "qq_send_file_ctl_packet: Unknown packet type[%d]\n",
 					packet_type);
 			bytes_expected = 0;
 	}
 
 	if (bytes != bytes_expected) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "qq_send_file_ctl_packet: Expected to get %d bytes, but get %d",
+		purple_debug_error("QQ", "qq_send_file_ctl_packet: Expected to get %d bytes, but get %d",
 				bytes_expected, bytes);
 		return;
 	}
@@ -346,24 +342,24 @@ void qq_send_file_ctl_packet(PurpleConnection *gc, guint16 packet_type, guint32
 	guint8 *buf;
 	int buflen;
 	hex_dump = hex_dump_to_str(encrypted_data, encrypted_len);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "encrypted packet: \n%s", hex_dump);
+	purple_debug_info("QQ", "encrypted packet: \n%s", hex_dump);
 	g_free(hex_dump);
 	buf = g_newa(guint8, MAX_PACKET_SIZE);
 	buflen = encrypted_len;
 	if (qq_crypt(DECRYPT, encrypted_data, encrypted_len, info->file_session_key, buf, &buflen)) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "decrypt success\n");
+		purple_debug_info("QQ", "decrypt success\n");
 	   if (buflen == bytes && memcmp(raw_data, buf, buflen) == 0)
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "checksum ok\n");
+			purple_debug_info("QQ", "checksum ok\n");
 
 		hex_dump = hex_dump_to_str(buf, buflen);
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "decrypted packet: \n%s", hex_dump);
+		purple_debug_info("QQ", "decrypted packet: \n%s", hex_dump);
 		g_free(hex_dump);
 	 } else {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "decrypt fail\n");
+		purple_debug_info("QQ", "decrypt fail\n");
 	}
 #endif
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "<== send %s packet\n", qq_get_file_cmd_desc(packet_type));
+	purple_debug_info("QQ", "<== send %s packet\n", qq_get_file_cmd_desc(packet_type));
 	_qq_send_file(gc, encrypted_data, encrypted_len, QQ_FILE_CONTROL_PACKET_TAG, info->to_uid);
 }
 
@@ -410,7 +406,7 @@ static void _qq_send_file_data_packet(PurpleConnection *gc, guint16 packet_type,
 					info->fragment_num = (filesize - 1) / QQ_FILE_FRAGMENT_MAXLEN + 1;
 					info->fragment_len = QQ_FILE_FRAGMENT_MAXLEN;
 
-					purple_debug(PURPLE_DEBUG_INFO, "QQ", 
+					purple_debug_info("QQ", 
 							"start transfering data, %d fragments with %d length each\n",
 							info->fragment_num, info->fragment_len);
 					/* Unknown */
@@ -435,7 +431,7 @@ static void _qq_send_file_data_packet(PurpleConnection *gc, guint16 packet_type,
 							filename_len);
 					break;
 				case QQ_FILE_DATA_INFO:
-					purple_debug(PURPLE_DEBUG_INFO, "QQ", 
+					purple_debug_info("QQ", 
 							"sending %dth fragment with length %d, offset %d\n",
 							fragment_index, len, (fragment_index-1)*fragment_size);
 					/* bytes += qq_put16(raw_data + bytes, ++(qd->send_seq)); */
@@ -448,7 +444,7 @@ static void _qq_send_file_data_packet(PurpleConnection *gc, guint16 packet_type,
 					bytes += qq_putdata(raw_data + bytes, data, len);
 					break;
 				case QQ_FILE_EOF:
-					purple_debug(PURPLE_DEBUG_INFO, "QQ", "end of sending data\n");
+					purple_debug_info("QQ", "end of sending data\n");
 					/* bytes += qq_put16(raw_data + bytes, info->fragment_num + 1); */
 					bytes += qq_put16(raw_data + bytes, info->fragment_num);
 					bytes += qq_put8(raw_data + bytes, sub_type);
@@ -474,7 +470,7 @@ static void _qq_send_file_data_packet(PurpleConnection *gc, guint16 packet_type,
 					break;
 			}
 	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "<== send %s packet\n", qq_get_file_cmd_desc(packet_type));
+	purple_debug_info("QQ", "<== send %s packet\n", qq_get_file_cmd_desc(packet_type));
 	_qq_send_file(gc, raw_data, bytes, QQ_FILE_DATA_PACKET_TAG, info->to_uid);
 }
 
@@ -516,7 +512,7 @@ static void _qq_process_recv_file_ctl_packet(PurpleConnection *gc, guint8 *data,
 	decrypted_data = g_newa(guint8, data_len);
 	decrypted_len = qq_decrypt(decrypted_data, data, data_len, qd->session_md5);
 	if ( decrypted_len <= 0 ) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Error decrypt rcv file ctrl packet\n");
+		purple_debug_error("QQ", "Error decrypt rcv file ctrl packet\n");
 		return;
 	}
 
@@ -526,7 +522,7 @@ static void _qq_process_recv_file_ctl_packet(PurpleConnection *gc, guint8 *data,
 	decryped_bytes += qq_get16(&seq, decrypted_data + decryped_bytes);
 	decryped_bytes += 4+1+1+19+1;	/* skip something */
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "==> [%d] receive %s packet\n", seq, qq_get_file_cmd_desc(packet_type));
+	purple_debug_info("QQ", "==> [%d] receive %s packet\n", seq, qq_get_file_cmd_desc(packet_type));
 	qq_hex_dump(PURPLE_DEBUG_INFO, "QQ",
 		decrypted_data, decrypted_len,
 		"decrypted control packet received:");
@@ -566,7 +562,7 @@ static void _qq_process_recv_file_ctl_packet(PurpleConnection *gc, guint8 *data,
 			qq_send_file_ctl_packet(gc, QQ_FILE_CMD_SENDER_SAY_HELLO, fh.sender_uid, 0);
 			break;
 		default:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "unprocess file command %d\n", packet_type);
+			purple_debug_info("QQ", "unprocess file command %d\n", packet_type);
 	}
 }
 
@@ -577,7 +573,7 @@ static void _qq_recv_file_progess(PurpleConnection *gc, guint8 *buffer, guint16
 	ft_info *info = (ft_info *) xfer->data;
 	guint32 mask;
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", 
+	purple_debug_info("QQ", 
 			"receiving %dth fragment with length %d, slide window status %o, max_fragment_index %d\n", 
 			index, len, info->window, info->max_fragment_index);
 	if (info->window == 0 && info->max_fragment_index == 0) {
@@ -585,11 +581,11 @@ static void _qq_recv_file_progess(PurpleConnection *gc, guint8 *buffer, guint16
 			purple_xfer_cancel_local(xfer);
 			return;
 		}
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "object file opened for writing\n");
+		purple_debug_info("QQ", "object file opened for writing\n");
 	}
 	mask = 0x1 << (index % sizeof(info->window));
 	if (index < info->max_fragment_index || (info->window & mask)) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "duplicate %dth fragment, drop it!\n", index+1);
+		purple_debug_info("QQ", "duplicate %dth fragment, drop it!\n", index+1);
 		return;
 	}
 
@@ -609,7 +605,7 @@ static void _qq_recv_file_progess(PurpleConnection *gc, guint8 *buffer, guint16
 		if (mask & 0x8000) mask = 0x0001;
 		else mask = mask << 1;
 	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "procceed %dth fragment, slide window status %o, max_fragment_index %d\n", 
+	purple_debug_info("QQ", "procceed %dth fragment, slide window status %o, max_fragment_index %d\n", 
 			index, info->window, info->max_fragment_index);
 }
 
@@ -654,12 +650,12 @@ static void _qq_update_send_progess(PurpleConnection *gc, guint32 fragment_index
 	PurpleXfer *xfer = qd->xfer;
 	ft_info *info = (ft_info *) xfer->data;
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", 
+	purple_debug_info("QQ", 
 			"receiving %dth fragment ack, slide window status %o, max_fragment_index %d\n", 
 			fragment_index, info->window, info->max_fragment_index);
 	if (fragment_index < info->max_fragment_index || 
 			fragment_index >= info->max_fragment_index + sizeof(info->window)) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "duplicate %dth fragment, drop it!\n", fragment_index+1);
+		purple_debug_info("QQ", "duplicate %dth fragment, drop it!\n", fragment_index+1);
 		return;
 	}
 	mask = 0x1 << (fragment_index % sizeof(info->window));
@@ -696,7 +692,7 @@ static void _qq_update_send_progess(PurpleConnection *gc, guint32 fragment_index
 			else mask = mask << 1;
 		}
 	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", 
+	purple_debug_info("QQ", 
 			"procceed %dth fragment ack, slide window status %o, max_fragment_index %d\n", 
 			fragment_index, info->window, info->max_fragment_index);
 }
@@ -737,7 +733,7 @@ static void _qq_process_recv_file_data(PurpleConnection *gc, guint8 *data, gint
 
 					info->max_fragment_index = 0;
 					info->window = 0;
-					purple_debug(PURPLE_DEBUG_INFO, "QQ", 
+					purple_debug_info("QQ", 
 							"start receiving data, %d fragments with %d length each\n",
 							info->fragment_num, info->fragment_len);
 					_qq_send_file_data_packet(gc, QQ_FILE_CMD_FILE_OP_ACK, sub_type,
@@ -747,7 +743,7 @@ static void _qq_process_recv_file_data(PurpleConnection *gc, guint8 *data, gint
 					bytes += qq_get32(&fragment_index, data + bytes);
 					bytes += qq_get32(&fragment_offset, data + bytes);
 					bytes += qq_get16(&fragment_len, data + bytes);
-					purple_debug(PURPLE_DEBUG_INFO, "QQ", 
+					purple_debug_info("QQ", 
 							"received %dth fragment with length %d, offset %d\n",
 							fragment_index, fragment_len, fragment_offset);
 
@@ -756,7 +752,7 @@ static void _qq_process_recv_file_data(PurpleConnection *gc, guint8 *data, gint
 					_qq_recv_file_progess(gc, data + bytes, fragment_len, fragment_index, fragment_offset);
 					break;
 				case QQ_FILE_EOF:
-					purple_debug(PURPLE_DEBUG_INFO, "QQ", "end of receiving\n");
+					purple_debug_info("QQ", "end of receiving\n");
 					_qq_send_file_data_packet(gc, QQ_FILE_CMD_FILE_OP_ACK, sub_type,
 							0, 0, NULL, 0);
 					break;
@@ -795,11 +791,11 @@ static void _qq_process_recv_file_data(PurpleConnection *gc, guint8 *data, gint
 			purple_xfer_end(qd->xfer);
 			break;
 		case QQ_FILE_BASIC_INFO:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "here\n");
+			purple_debug_info("QQ", "here\n");
 			_qq_send_file_data_packet(gc, QQ_FILE_DATA_INFO, 0, 0, 0, NULL, 0);
 			break;
 		default:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "_qq_process_recv_file_data: unknown packet type [%d]\n",
+			purple_debug_info("QQ", "_qq_process_recv_file_data: unknown packet type [%d]\n",
 					packet_type);
 			break;
 	}
@@ -824,6 +820,6 @@ void qq_process_recv_file(PurpleConnection *gc, guint8 *data, gint len)
 			_qq_process_recv_file_data(gc, data + bytes, len - bytes);
 			break;
 		default:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "unknown packet tag");
+			purple_debug_info("QQ", "unknown packet tag");
 	}
 }
diff --git a/libpurple/protocols/qq/group.c b/libpurple/protocols/qq/group.c
index bf5d9b0c09..206b86c236 100644
--- a/libpurple/protocols/qq/group.c
+++ b/libpurple/protocols/qq/group.c
@@ -64,9 +64,9 @@ GList *qq_chat_info(PurpleConnection *gc)
 
 	pce = g_new0(struct proto_chat_entry, 1);
 	pce->label = _("ID: ");
-	pce->identifier = QQ_GROUP_KEY_EXTERNAL_ID;
+	pce->identifier = QQ_ROOM_KEY_EXTERNAL_ID;
 	m = g_list_append(m, pce);
-	
+
 	return m;
 }
 
@@ -77,7 +77,7 @@ GHashTable *qq_chat_info_defaults(PurpleConnection *gc, const gchar *chat_name)
 	defaults = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_free);
 
 	if (chat_name != NULL)
-		g_hash_table_insert(defaults, QQ_GROUP_KEY_EXTERNAL_ID, g_strdup(chat_name));
+		g_hash_table_insert(defaults, QQ_ROOM_KEY_EXTERNAL_ID, g_strdup(chat_name));
 
 	return defaults;
 }
@@ -96,33 +96,33 @@ PurpleRoomlist *qq_roomlist_get_list(PurpleConnection *gc)
 	rl = purple_roomlist_new(purple_connection_get_account(gc));
 	qd->roomlist = rl;
 
-	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, _("Group ID"), QQ_GROUP_KEY_EXTERNAL_ID, FALSE);
+	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, _("Group ID"), QQ_ROOM_KEY_EXTERNAL_ID, FALSE);
 	fields = g_list_append(fields, f);
-	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, _("Creator"), QQ_GROUP_KEY_CREATOR_UID, FALSE);
+	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, _("Creator"), QQ_ROOM_KEY_CREATOR_UID, FALSE);
 	fields = g_list_append(fields, f);
 	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING,
-				    _("Group Description"), QQ_GROUP_KEY_GROUP_DESC_UTF8, FALSE);
+				    _("Group Description"), QQ_ROOM_KEY_DESC_UTF8, FALSE);
 	fields = g_list_append(fields, f);
-	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_GROUP_KEY_INTERNAL_ID, TRUE);
+	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_ROOM_KEY_INTERNAL_ID, TRUE);
 	fields = g_list_append(fields, f);
-	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_GROUP_KEY_TYPE, TRUE);
+	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_ROOM_KEY_TYPE, TRUE);
 	fields = g_list_append(fields, f);
-	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, _("Auth"), QQ_GROUP_KEY_AUTH_TYPE, TRUE);
+	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, _("Auth"), QQ_ROOM_KEY_AUTH_TYPE, TRUE);
 	fields = g_list_append(fields, f);
-	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_GROUP_KEY_GROUP_CATEGORY, TRUE);
+	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_ROOM_KEY_CATEGORY, TRUE);
 	fields = g_list_append(fields, f);
-	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_GROUP_KEY_GROUP_NAME_UTF8, TRUE);
+	f = purple_roomlist_field_new(PURPLE_ROOMLIST_FIELD_STRING, "", QQ_ROOM_KEY_TITLE_UTF8, TRUE);
 
 	fields = g_list_append(fields, f);
 	purple_roomlist_set_fields(rl, fields);
 	purple_roomlist_set_in_progress(qd->roomlist, TRUE);
 
 	purple_request_input(gc, _("QQ Qun"),
-			   _("Please enter external group ID"),
-			   _("You can only search for permanent QQ groups\n"),
-			   NULL, FALSE, FALSE, NULL, 
-			   _("Search"), G_CALLBACK(_qq_group_search_callback), 
-			   _("Cancel"), G_CALLBACK(_qq_group_search_cancel_callback), 
+			   _("Please enter Qun number"),
+			   _("You can only search for permanent Qun\n"),
+			   NULL, FALSE, FALSE, NULL,
+			   _("Search"), G_CALLBACK(_qq_group_search_callback),
+			   _("Cancel"), G_CALLBACK(_qq_group_search_cancel_callback),
 			   purple_connection_get_account(gc), NULL, NULL,
 			   gc);
 
@@ -157,7 +157,7 @@ void qq_group_init(PurpleConnection *gc)
 
 	purple_group = purple_find_group(PURPLE_GROUP_QQ_QUN);
 	if (purple_group == NULL) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "We have no QQ Qun\n");
+		purple_debug_info("QQ", "We have no QQ Qun\n");
 		return;
 	}
 
@@ -170,7 +170,7 @@ void qq_group_init(PurpleConnection *gc)
 		chat = (PurpleChat *) node;
 		if (account != chat->account)	/* not qq account*/
 			continue;
-		group = qq_group_from_hashtable(gc, chat->components);
+		group = qq_room_create_by_hashtable(gc, chat->components);
 		if (group == NULL)
 			continue;
 
@@ -178,8 +178,7 @@ void qq_group_init(PurpleConnection *gc)
 			continue;
 
 		count++;
-		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Load %d QQ Qun configurations\n", count);
+	purple_debug_info("QQ", "Load %d QQ Qun configurations\n", count);
 }
diff --git a/libpurple/protocols/qq/group.h b/libpurple/protocols/qq/group.h
index 5fe7987118..f36aed7af1 100644
--- a/libpurple/protocols/qq/group.h
+++ b/libpurple/protocols/qq/group.h
@@ -34,27 +34,29 @@
 #define PURPLE_GROUP_QQ_QUN         "QQ 群"
 
 typedef enum {
-	QQ_GROUP_MEMBER_STATUS_NOT_MEMBER = 0x00,	/* default 0x00 means not member */
-	QQ_GROUP_MEMBER_STATUS_IS_MEMBER,
-	QQ_GROUP_MEMBER_STATUS_APPLYING,
-	QQ_GROUP_MEMBER_STATUS_IS_ADMIN,
-} qq_group_member_status;
+	QQ_ROOM_ROLE_NO = 0x00,	/* default 0x00 means not member */
+	QQ_ROOM_ROLE_YES,
+	QQ_ROOM_ROLE_REQUESTING,
+	QQ_ROOM_ROLE_ADMIN,
+} qq_room_role;
 
 typedef struct _qq_group {
 	/* all these will be saved when we exit Purple */
-	qq_group_member_status my_status;	/* my status for this group */
-	gchar *my_status_desc;			/* my status description */
+	qq_room_role my_role;	/* my role for this room */
+	gchar *my_role_desc;			/* my role description */
 	guint32 id;
 	guint32 ext_id;
 	guint8 type8;			/* permanent or temporory */
 	guint32 creator_uid;
-	guint32 group_category;
+	guint32 category;
 	guint8 auth_type;
-	gchar *group_name_utf8;
-	gchar *group_desc_utf8;
+	gchar *title_utf8;
+	gchar *desc_utf8;
 	/* all these will be loaded from the network */
 	gchar *notice_utf8;	/* group notice by admin */
-	GList *members;	
+	GList *members;
+
+	gboolean is_got_info;
 } qq_group;
 
 GList *qq_chat_info(PurpleConnection *gc);
diff --git a/libpurple/protocols/qq/group_conv.c b/libpurple/protocols/qq/group_conv.c
index f49bd32f00..59e204a751 100644
--- a/libpurple/protocols/qq/group_conv.c
+++ b/libpurple/protocols/qq/group_conv.c
@@ -25,25 +25,40 @@
 #include <glib.h>
 #include "qq.h"
 
-#include "conversation.h"
-
 #include "group_conv.h"
 #include "buddy_list.h"
+#include "header_info.h"
+#include "qq_network.h"
+#include "qq_process.h"
 #include "utils.h"
 
 /* show group conversation window */
-void qq_group_conv_show_window(PurpleConnection *gc, qq_group *group)
+PurpleConversation *qq_room_conv_create(PurpleConnection *gc, qq_group *group)
 {
 	PurpleConversation *conv;
 	qq_data *qd;
 
-	g_return_if_fail(group != NULL);
+	g_return_val_if_fail(group != NULL, NULL);
 	qd = (qq_data *) gc->proto_data;
 
-	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, 
-			group->group_name_utf8, purple_connection_get_account(gc));
-	if (conv == NULL)	/* show only one window per group */
-		serv_got_joined_chat(gc, qd->channel++, group->group_name_utf8);
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
+			group->title_utf8, purple_connection_get_account(gc));
+	if (conv != NULL)	{
+		/* show only one conversation per group */
+		return conv;
+	}
+
+	serv_got_joined_chat(gc, qd->channel++, group->title_utf8);
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, group->title_utf8, purple_connection_get_account(gc));
+	if (conv != NULL) {
+		purple_conv_chat_set_topic(PURPLE_CONV_CHAT(conv), NULL, group->notice_utf8);
+		if (group->is_got_info)
+			qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_ONLINES, group->id);
+		else
+			qq_update_room(gc, 0, group->id);
+		return conv;
+	}
+	return NULL;
 }
 
 /* refresh online member in group conversation window */
@@ -59,7 +74,7 @@ void qq_group_conv_refresh_online_member(PurpleConnection *gc, qq_group *group)
 	names = NULL;
 	flags = NULL;
 	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
-			group->group_name_utf8, purple_connection_get_account(gc));
+			group->title_utf8, purple_connection_get_account(gc));
 	if (conv != NULL && group->members != NULL) {
 		list = group->members;
 		while (list != NULL) {
diff --git a/libpurple/protocols/qq/group_conv.h b/libpurple/protocols/qq/group_conv.h
index ef9cfe030e..4824ad454c 100644
--- a/libpurple/protocols/qq/group_conv.h
+++ b/libpurple/protocols/qq/group_conv.h
@@ -26,9 +26,10 @@
 #define _QQ_GROUP_CONV_H_
 
 #include "connection.h"
+#include "conversation.h"
 #include "group.h"
 
-void qq_group_conv_show_window(PurpleConnection *gc, qq_group *group);
+PurpleConversation *qq_room_conv_create(PurpleConnection *gc, qq_group *group);
 void qq_group_conv_refresh_online_member(PurpleConnection *gc, qq_group *group);
 
 #endif
diff --git a/libpurple/protocols/qq/group_find.c b/libpurple/protocols/qq/group_find.c
index 6ec1e92dcb..0e26a3d18d 100644
--- a/libpurple/protocols/qq/group_find.c
+++ b/libpurple/protocols/qq/group_find.c
@@ -110,10 +110,10 @@ qq_group *qq_group_find_by_channel(PurpleConnection *gc, gint channel)
 	group = NULL;
 	while (list != NULL) {
 		group = (qq_group *) list->data;
-		if (group->group_name_utf8 == NULL) {
+		if (group->title_utf8 == NULL) {
 			continue;
 		}
-		if (!g_ascii_strcasecmp(purple_conversation_get_name(conv), group->group_name_utf8))
+		if (!g_ascii_strcasecmp(purple_conversation_get_name(conv), group->title_utf8))
 			break;
 		list = list->next;
 	}
@@ -167,3 +167,83 @@ qq_group *qq_room_search_id(PurpleConnection *gc, guint32 room_id)
 
 	return NULL;
 }
+
+qq_group *qq_room_get_next(PurpleConnection *gc, guint32 room_id)
+{
+	GList *list;
+	qq_group *group;
+	qq_data *qd;
+	gboolean is_find = FALSE;
+	
+	qd = (qq_data *) gc->proto_data;
+
+	if (qd->groups == NULL) {
+		return NULL;
+	}
+	
+	 if (room_id <= 0) {
+		return (qq_group *) qd->groups->data;
+	}
+	
+	list = qd->groups;
+	while (list != NULL) {
+		group = (qq_group *) list->data;
+		list = list->next;
+		if (group->id == room_id) {
+			is_find = TRUE;
+			break;
+		}
+	}
+
+	if ( !is_find || list == NULL) {
+		return NULL;
+	}
+
+	return (qq_group *)list->data;
+}
+
+qq_group *qq_room_get_next_conv(PurpleConnection *gc, guint32 room_id)
+{
+	GList *list;
+	qq_group *group;
+	qq_data *qd;
+	gboolean is_find;
+
+	qd = (qq_data *) gc->proto_data;
+
+ 	list = qd->groups;
+	if (room_id > 0) {
+		/* search next room */
+		is_find = FALSE;
+		while (list != NULL) {
+			group = (qq_group *) list->data;
+			list = list->next;
+			if (group->id == room_id) {
+				is_find = TRUE;
+				break;
+			}
+		}
+		if ( !is_find || list == NULL) {
+			return NULL;
+		}
+	}
+	
+	is_find = FALSE;
+	while (list != NULL) {
+		group = (qq_group *) list->data;
+		if (group->my_role == QQ_ROOM_ROLE_YES || group->my_role == QQ_ROOM_ROLE_ADMIN) {
+			if (NULL != purple_find_conversation_with_account(
+						PURPLE_CONV_TYPE_CHAT,group->title_utf8, purple_connection_get_account(gc))) {
+				/* In convseration*/
+				is_find = TRUE;
+				break;
+			}
+		}
+		list = list->next;
+	}
+
+	if ( !is_find) {
+		return NULL;
+	}
+	return group;
+}
diff --git a/libpurple/protocols/qq/group_find.h b/libpurple/protocols/qq/group_find.h
index 45e0b15657..47b3b35051 100644
--- a/libpurple/protocols/qq/group_find.h
+++ b/libpurple/protocols/qq/group_find.h
@@ -32,10 +32,12 @@
 qq_buddy *qq_group_find_member_by_uid(qq_group *group, guint32 uid);
 void qq_group_remove_member_by_uid(qq_group *group, guint32 uid);
 qq_buddy *qq_group_find_or_add_member(PurpleConnection *gc, qq_group *group, guint32 member_uid);
-gboolean qq_group_find_id_by_seq(PurpleConnection *gc, guint16 seq, guint32 *id);
 qq_group *qq_group_find_by_channel(PurpleConnection *gc, gint channel);
 
 qq_group *qq_room_search_ext_id(PurpleConnection *gc, guint32 ext_id);
 qq_group *qq_room_search_id(PurpleConnection *gc, guint32 room_id);
 
+qq_group *qq_room_get_next(PurpleConnection *gc, guint32 room_id);
+qq_group *qq_room_get_next_conv(PurpleConnection *gc, guint32 room_id);
+
 #endif
diff --git a/libpurple/protocols/qq/group_free.c b/libpurple/protocols/qq/group_free.c
index eb76ad5ae4..7417697c05 100644
--- a/libpurple/protocols/qq/group_free.c
+++ b/libpurple/protocols/qq/group_free.c
@@ -54,9 +54,9 @@ void qq_group_free(qq_group *group)
 {
 	g_return_if_fail(group != NULL);
 	qq_group_free_member(group);
-	g_free(group->my_status_desc);
-	g_free(group->group_name_utf8);
-	g_free(group->group_desc_utf8);
+	g_free(group->my_role_desc);
+	g_free(group->title_utf8);
+	g_free(group->desc_utf8);
 	g_free(group->notice_utf8);
 	g_free(group);
 }
@@ -64,16 +64,18 @@ void qq_group_free(qq_group *group)
 void qq_group_free_all(qq_data *qd)
 {
 	qq_group *group;
-	gint i;
-	g_return_if_fail(qd != NULL);
+	gint count;
 
-	i = 0;
+	g_return_if_fail(qd != NULL);
+	count = 0;
 	while (qd->groups != NULL) {
-		i++;
 		group = (qq_group *) qd->groups->data;
 		qd->groups = g_list_remove(qd->groups, group);
 		qq_group_free(group);
+		count++;
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "%d groups are freed\n", i);
+	if (count > 0) {
+		purple_debug_info("QQ", "%d rooms are freed\n", count);
+	}
 }
diff --git a/libpurple/protocols/qq/group_im.c b/libpurple/protocols/qq/group_im.c
index f4b9cff90f..5848b53cc8 100644
--- a/libpurple/protocols/qq/group_im.c
+++ b/libpurple/protocols/qq/group_im.c
@@ -37,10 +37,12 @@
 #include "group_info.h"
 #include "group_im.h"
 #include "group_opt.h"
+#include "group_conv.h"
 #include "im.h"
 #include "header_info.h"
 #include "packet_parse.h"
 #include "qq_network.h"
+#include "qq_process.h"
 #include "utils.h"
 
 typedef struct _qq_recv_group_im {
@@ -85,12 +87,12 @@ void qq_send_packet_group_im(PurpleConnection *gc, qq_group *group, const gchar
 	if (bytes == data_len)	/* create OK */
 		qq_send_room_cmd(gc, QQ_ROOM_CMD_SEND_MSG, group->id, raw_data, data_len);
 	else
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
+		purple_debug_error("QQ",
 				"Fail creating group_im packet, expect %d bytes, build %d bytes\n", data_len, bytes);
 }
 
 /* this is the ACK */
-void qq_process_group_cmd_im(guint8 *data, gint len, PurpleConnection *gc) 
+void qq_process_group_cmd_im(guint8 *data, gint len, PurpleConnection *gc)
 {
 	/* return should be the internal group id
 	 * but we have nothing to do with it */
@@ -98,7 +100,7 @@ void qq_process_group_cmd_im(guint8 *data, gint len, PurpleConnection *gc)
 }
 
 /* receive an application to join the group */
-void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
+void qq_process_room_msg_apply_join(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
 	guint32 ext_id, user_uid;
 	guint8 type8;
@@ -119,8 +121,8 @@ void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 id, Pur
 
 	bytes += convert_as_pascal_string(data + bytes, &reason_utf8, QQ_CHARSET_DEFAULT);
 
-	msg = g_strdup_printf(_("User %d requested to join group %d"), user_uid, ext_id);
-	reason = g_strdup_printf(_("Reason: %s"), reason_utf8);
+	msg = g_strdup_printf(_("%d request to join Qun %d"), user_uid, ext_id);
+	reason = g_strdup_printf(_("Message: %s"), reason_utf8);
 
 	g = g_new0(group_member_opt, 1);
 	g->gc = gc;
@@ -149,7 +151,7 @@ void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 id, Pur
 }
 
 /* the request to join a group is rejected */
-void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
+void qq_process_room_msg_been_rejected(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
 	guint32 ext_id, admin_uid;
 	guint8 type8;
@@ -170,14 +172,14 @@ void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 id,
 	bytes += convert_as_pascal_string(data + bytes, &reason_utf8, QQ_CHARSET_DEFAULT);
 
 	msg = g_strdup_printf
-		(_("Your request to join group %d has been rejected by admin %d"), ext_id, admin_uid);
-	reason = g_strdup_printf(_("Reason: %s"), reason_utf8);
+		(_("Failed to join Qun %d, operated by admin %d"), ext_id, admin_uid);
+	reason = g_strdup_printf(_("Message: %s"), reason_utf8);
 
 	purple_notify_warning(gc, _("QQ Qun Operation"), msg, reason);
 
 	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
-		group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
+		group->my_role = QQ_ROOM_ROLE_NO;
 		qq_group_refresh(gc, group);
 	}
 
@@ -187,7 +189,7 @@ void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 id,
 }
 
 /* the request to join a group is approved */
-void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
+void qq_process_room_msg_been_approved(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
 	guint32 ext_id, admin_uid;
 	guint8 type8;
@@ -208,13 +210,13 @@ void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 id,
 	bytes += convert_as_pascal_string(data + bytes, &reason_utf8, QQ_CHARSET_DEFAULT);
 
 	msg = g_strdup_printf
-		(_("Your request to join group %d has been approved by admin %d"), ext_id, admin_uid);
+		(_("Successed to join Qun %d, operated by admin %d"), ext_id, admin_uid);
 
 	purple_notify_warning(gc, _("QQ Qun Operation"), msg, NULL);
 
 	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
-		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
+		group->my_role = QQ_ROOM_ROLE_YES;
 		qq_group_refresh(gc, group);
 	}
 
@@ -223,7 +225,7 @@ void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 id,
 }
 
 /* process the packet when removed from a group */
-void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
+void qq_process_room_msg_been_removed(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
 	guint32 ext_id, uid;
 	guint8 type8;
@@ -241,12 +243,12 @@ void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 id, P
 
 	g_return_if_fail(ext_id > 0 && uid > 0);
 
-	msg = g_strdup_printf(_("You [%d] have left group \"%d\""), uid, ext_id);
-	purple_notify_info(gc, _("QQ Qun Operation"), msg, NULL);
+	msg = g_strdup_printf(_("[%d] removed from Qun \"%d\""), uid, ext_id);
+	purple_notify_info(gc, _("QQ Qun Operation"), _("Notice:"), msg);
 
 	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
-		group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
+		group->my_role = QQ_ROOM_ROLE_NO;
 		qq_group_refresh(gc, group);
 	}
 
@@ -254,7 +256,7 @@ void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 id, P
 }
 
 /* process the packet when added to a group */
-void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
+void qq_process_room_msg_been_added(guint8 *data, gint len, guint32 id, PurpleConnection *gc)
 {
 	guint32 ext_id, uid;
 	guint8 type8;
@@ -272,18 +274,18 @@ void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 id, Pur
 
 	g_return_if_fail(ext_id > 0 && uid > 0);
 
-	msg = g_strdup_printf(_("You [%d] have been added to group \"%d\""), uid, ext_id);
-	purple_notify_info(gc, _("QQ Qun Operation"), msg, _("This group has been added to your buddy list"));
+	msg = g_strdup_printf(_("[%d] added to Qun \"%d\""), uid, ext_id);
+	purple_notify_info(gc, _("QQ Qun Operation"), _("Notice:"), msg);
 
 	group = qq_room_search_id(gc, id);
 	if (group != NULL) {
-		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
+		group->my_role = QQ_ROOM_ROLE_YES;
 		qq_group_refresh(gc, group);
 	} else {		/* no such group, try to create a dummy first, and then update */
 		group = qq_group_create_internal_record(gc, id, ext_id, NULL);
-		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
+		group->my_role = QQ_ROOM_ROLE_YES;
 		qq_group_refresh(gc, group);
-		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
+		qq_update_room(gc, 0, group->id);
 		/* the return of this cmd will automatically update the group in blist */
 	}
 
@@ -291,7 +293,7 @@ void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 id, Pur
 }
 
 /* recv an IM from a group chat */
-void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 im_type)
+void qq_process_room_msg_normal(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 im_type)
 {
 	gchar *msg_with_purple_smiley, *msg_utf8_encoded, *im_src_name;
 	guint16 unknown;
@@ -310,7 +312,9 @@ void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 id, PurpleCon
 
 	qd = (qq_data *) gc->proto_data;
 
-	/* qq_hex_dump(PURPLE_DEBUG_INFO, "QQ", data, data_len, "group im hex dump"); */
+#if 0
+	qq_hex_dump(PURPLE_DEBUG_INFO, "QQ", data, data_len, "group im hex dump");
+#endif
 
 	im_group = g_newa(qq_recv_group_im, 1);
 
@@ -374,13 +378,9 @@ void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 id, PurpleCon
 	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
-	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, group->group_name_utf8, purple_connection_get_account(gc));
-	if (conv == NULL && purple_prefs_get_bool("/plugins/prpl/qq/prompt_group_msg_on_recv")) {
-		/* New conv should open, get group info*/
-		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
-		
-		serv_got_joined_chat(gc, qd->channel++, group->group_name_utf8);
-		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, group->group_name_utf8, purple_connection_get_account(gc));
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, group->title_utf8, purple_connection_get_account(gc));
+	if (conv == NULL && purple_prefs_get_bool("/plugins/prpl/qq/show_room_when_newin")) {
+		conv = qq_room_conv_create(gc, group);
 	}
 
 	if (conv != NULL) {
diff --git a/libpurple/protocols/qq/group_im.h b/libpurple/protocols/qq/group_im.h
index 6d38cb2fc0..09bc4dad07 100644
--- a/libpurple/protocols/qq/group_im.h
+++ b/libpurple/protocols/qq/group_im.h
@@ -31,30 +31,17 @@
 
 void qq_send_packet_group_im(PurpleConnection *gc, qq_group *group, const gchar *msg);
 
-/* void qq_process_group_cmd_im(guint8 *data, guint8 **cursor, gint len, PurpleConnection *gc); */
 void qq_process_group_cmd_im(guint8 *data, gint len, PurpleConnection *gc);
 
-/* void qq_process_recv_group_im(guint8 *data, guint8 **cursor, 
- * gint data_len, guint32 id, PurpleConnection *gc, guint16 im_type); */
-void qq_process_recv_group_im(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 im_type);
+void qq_process_room_msg_normal(guint8 *data, gint data_len, guint32 id, PurpleConnection *gc, guint16 im_type);
 
-/* void qq_process_recv_group_im_apply_join(guint8 *data, guint8 **cursor, gint len, 
- * guint32 id, PurpleConnection *gc); */
-void qq_process_recv_group_im_apply_join(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
+void qq_process_room_msg_apply_join(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
 
-/* void qq_process_recv_group_im_been_rejected(guint8 *data, guint8 **cursor, gint len, 
- * guint32 id, PurpleConnection *gc); */
-void qq_process_recv_group_im_been_rejected(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
+void qq_process_room_msg_been_rejected(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
 
-/* void qq_process_recv_group_im_been_approved(guint8 *data, guint8 **cursor, gint len, 
- * guint32 id, PurpleConnection *gc); */
-void qq_process_recv_group_im_been_approved(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
+void qq_process_room_msg_been_approved(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
 
-/* void qq_process_recv_group_im_been_removed(guint8 *data, guint8 **cursor, gint len, 
- * guint32 id, PurpleConnection *gc); */
-void qq_process_recv_group_im_been_removed(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
+void qq_process_room_msg_been_removed(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
 
-/* void qq_process_recv_group_im_been_added(guint8 *data,  guint8 **cursor, gint len, 
- * guint32 id, PurpleConnection *gc); */
-void qq_process_recv_group_im_been_added(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
+void qq_process_room_msg_been_added(guint8 *data, gint len, guint32 id, PurpleConnection *gc);
 #endif
diff --git a/libpurple/protocols/qq/group_info.c b/libpurple/protocols/qq/group_info.c
index ba9b1536ea..b1f3ea6fc6 100644
--- a/libpurple/protocols/qq/group_info.c
+++ b/libpurple/protocols/qq/group_info.c
@@ -41,16 +41,16 @@
  * this interval determines if their member info is outdated */
 #define QQ_GROUP_CHAT_REFRESH_NICKNAME_INTERNAL  180
 
-static gboolean _is_group_member_need_update_info(qq_buddy *member)
+static gboolean check_update_interval(qq_buddy *member)
 {
 	g_return_val_if_fail(member != NULL, FALSE);
 	return (member->nickname == NULL) ||
-		(time(NULL) - member->last_refresh) > QQ_GROUP_CHAT_REFRESH_NICKNAME_INTERNAL;
+		(time(NULL) - member->last_update) > QQ_GROUP_CHAT_REFRESH_NICKNAME_INTERNAL;
 }
 
 /* this is done when we receive the reply to get_online_members sub_cmd
  * all member are set offline, and then only those in reply packets are online */
-static void _qq_group_set_members_all_offline(qq_group *group)
+static void set_all_offline(qq_group *group)
 {
 	GList *list;
 	qq_buddy *member;
@@ -59,65 +59,29 @@ static void _qq_group_set_members_all_offline(qq_group *group)
 	list = group->members;
 	while (list != NULL) {
 		member = (qq_buddy *) list->data;
-		member->status = QQ_BUDDY_ONLINE_OFFLINE;
+		member->status = QQ_BUDDY_CHANGE_TO_OFFLINE;
 		list = list->next;
 	}
 }
 
-/* send packet to get online group member, called by keep_alive */
-void qq_send_cmd_group_all_get_online_members(PurpleConnection *gc)
-{
-	qq_data *qd;
-	qq_group *group;
-	GList *list;
-
-	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-	qd = (qq_data *) gc->proto_data;
-
-	list = qd->groups;
-	while (list != NULL) {
-		group = (qq_group *) list->data;
-		if (group->my_status == QQ_GROUP_MEMBER_STATUS_IS_MEMBER ||
-		    group->my_status == QQ_GROUP_MEMBER_STATUS_IS_ADMIN)
-			/* no need to get info time and time again, online members enough */
-			qq_send_cmd_group_get_online_members(gc, group);
-
-		list = list->next;
-	}
-}
-
-void qq_send_cmd_group_get_online_members(PurpleConnection *gc, qq_group *group)
-{
-	g_return_if_fail(group != NULL);
-
-	/* only get online members when conversation window is on */
-	if (NULL == purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,group->group_name_utf8, purple_connection_get_account(gc))) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-				"Conversation \"%s\" is not open, ignore to get online members\n", group->group_name_utf8);
-		return;
-	}
-
-	qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_ONLINES, group->id);
-}
-
 /* send packet to get info for each group member */
-void qq_send_cmd_group_get_members_info(PurpleConnection *gc, qq_group *group)
+gint qq_request_room_get_buddies(PurpleConnection *gc, qq_group *group, gint update_class)
 {
 	guint8 *raw_data;
 	gint bytes, num;
 	GList *list;
 	qq_buddy *member;
 
-	g_return_if_fail(group != NULL);
+	g_return_val_if_fail(group != NULL, 0);
 	for (num = 0, list = group->members; list != NULL; list = list->next) {
 		member = (qq_buddy *) list->data;
-		if (_is_group_member_need_update_info(member))
+		if (check_update_interval(member))
 			num++;
 	}
 
 	if (num <= 0) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "No group member info needs to be updated now.\n");
-		return;
+		purple_debug_info("QQ", "No group member info needs to be updated now.\n");
+		return 0;
 	}
 
 	raw_data = g_newa(guint8, 4 * num);
@@ -127,12 +91,14 @@ void qq_send_cmd_group_get_members_info(PurpleConnection *gc, qq_group *group)
 	list = group->members;
 	while (list != NULL) {
 		member = (qq_buddy *) list->data;
-		if (_is_group_member_need_update_info(member))
+		if (check_update_interval(member))
 			bytes += qq_put32(raw_data + bytes, member->uid);
 		list = list->next;
 	}
 
-	qq_send_room_cmd(gc, QQ_ROOM_CMD_GET_MEMBER_INFO, group->id, raw_data, bytes);
+	qq_send_room_cmd_mess(gc, QQ_ROOM_CMD_GET_BUDDIES, group->id, raw_data, bytes,
+			update_class, 0);
+	return num;
 }
 
 void qq_process_room_cmd_get_info(guint8 *data, gint data_len, PurpleConnection *gc)
@@ -174,8 +140,8 @@ void qq_process_room_cmd_get_info(guint8 *data, gint data_len, PurpleConnection
 	bytes += qq_get32(&(group->creator_uid), data + bytes);
 	bytes += qq_get8(&(group->auth_type), data + bytes);
 	bytes += qq_get32(&unknown4, data + bytes);	/* oldCategory */
-	bytes += qq_get16(&unknown, data + bytes);	
-	bytes += qq_get32(&(group->group_category), data + bytes);
+	bytes += qq_get16(&unknown, data + bytes);
+	bytes += qq_get32(&(group->category), data + bytes);
 	bytes += qq_get16(&max_members, data + bytes);
 	bytes += qq_get8(&unknown1, data + bytes);
 	/* the following, while Eva:
@@ -183,17 +149,17 @@ void qq_process_room_cmd_get_info(guint8 *data, gint data_len, PurpleConnection
 	 * 2(qunNoticeLen), qunNoticeLen(qunNoticeContent, 1(qunDescLen),
 	 * qunDestLen(qunDestcontent)) */
 	bytes += qq_get8(&unknown1, data + bytes);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "type=%u creatorid=%u category=%u maxmembers=%u\n",
-			group->type8, group->creator_uid, group->group_category, max_members);
-	
+	purple_debug_info("QQ", "type=%u creatorid=%u category=%u maxmembers=%u\n",
+			group->type8, group->creator_uid, group->category, max_members);
+
 	/* strlen + <str content> */
-	bytes += convert_as_pascal_string(data + bytes, &(group->group_name_utf8), QQ_CHARSET_DEFAULT);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "group \"%s\"\n", group->group_name_utf8); 
+	bytes += convert_as_pascal_string(data + bytes, &(group->title_utf8), QQ_CHARSET_DEFAULT);
 	bytes += qq_get16(&unknown, data + bytes);	/* 0x0000 */
 	bytes += convert_as_pascal_string(data + bytes, &notice, QQ_CHARSET_DEFAULT);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "notice \"%s\"\n", notice); 
-	bytes += convert_as_pascal_string(data + bytes, &(group->group_desc_utf8), QQ_CHARSET_DEFAULT);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "group_desc \"%s\"\n", group->group_desc_utf8); 
+	bytes += convert_as_pascal_string(data + bytes, &(group->desc_utf8), QQ_CHARSET_DEFAULT);
+
+	purple_debug_info("QQ", "room [%s] notice [%s] desc [%s] unknow 0x%04X\n",
+			group->title_utf8, notice, group->desc_utf8, unknown);
 
 	num = 0;
 	/* now comes the member list separated by 0x00 */
@@ -205,7 +171,7 @@ void qq_process_room_cmd_get_info(guint8 *data, gint data_len, PurpleConnection
 
 #if 0
 		if(organization != 0 || role != 0) {
-			purple_debug(PURPLE_DEBUG_INFO, "QQ_GRP", "%d, organization=%d, role=%d\n", member_uid, organization, role);
+			purple_debug_info("QQ_GRP", "%d, organization=%d, role=%d\n", member_uid, organization, role);
 		}
 #endif
 
@@ -214,30 +180,31 @@ void qq_process_room_cmd_get_info(guint8 *data, gint data_len, PurpleConnection
 			member->role = role;
 	}
 	if(bytes > data_len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
+		purple_debug_error("QQ",
 			"group_cmd_get_group_info: Dangerous error! maybe protocol changed, notify me!");
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "group \"%s\" has %d members\n", group->group_name_utf8, num);
+	purple_debug_info("QQ", "group \"%s\" has %d members\n", group->title_utf8, num);
 
 	if (group->creator_uid == qd->uid)
-		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_ADMIN;
+		group->my_role = QQ_ROOM_ROLE_ADMIN;
+
+	/* filter \r\n in notice */
+	qq_filter_str(notice);
+	group->notice_utf8 = strdup(notice);
+	g_free(notice);
 
 	qq_group_refresh(gc, group);
 
-	purple_conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT, 
-			group->group_name_utf8, purple_connection_get_account(gc));
+	purple_conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
+			group->title_utf8, purple_connection_get_account(gc));
 	if(NULL == purple_conv) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-				"Conversation \"%s\" is not open, do not set topic\n", group->group_name_utf8);
+		purple_debug_warning("QQ",
+				"Conversation \"%s\" is not open, do not set topic\n", group->title_utf8);
 		return;
 	}
 
-	/* filter \r\n in notice */
-	qq_filter_str(notice);
-	group->notice_utf8 = strdup(notice);
-	g_free(notice);
-	
+	purple_debug_info("QQ", "Set chat topic to %s\n", group->notice_utf8);
 	purple_conv_chat_set_topic(PURPLE_CONV_CHAT(purple_conv), NULL, group->notice_utf8);
 }
 
@@ -252,7 +219,7 @@ void qq_process_room_cmd_get_onlines(guint8 *data, gint len, PurpleConnection *g
 	g_return_if_fail(data != NULL && len > 0);
 
 	if (len <= 3) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Invalid group online member reply, discard it!\n");
+		purple_debug_error("QQ", "Invalid group online member reply, discard it!\n");
 		return;
 	}
 
@@ -263,13 +230,12 @@ void qq_process_room_cmd_get_onlines(guint8 *data, gint len, PurpleConnection *g
 
 	group = qq_room_search_id(gc, id);
 	if (group == NULL) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
-				"We have no group info for internal id [%d]\n", id);
+		purple_debug_error("QQ", "We have no group info for internal id [%d]\n", id);
 		return;
 	}
 
 	/* set all offline first, then update those online */
-	_qq_group_set_members_all_offline(group);
+	set_all_offline(group);
 	num = 0;
 	while (bytes < len) {
 		bytes += qq_get32(&member_uid, data + bytes);
@@ -279,15 +245,15 @@ void qq_process_room_cmd_get_onlines(guint8 *data, gint len, PurpleConnection *g
 			member->status = QQ_BUDDY_ONLINE_NORMAL;
 	}
 	if(bytes > len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
-				"group_cmd_get_online_members: Dangerous error! maybe protocol changed, notify developers!");
+		purple_debug_error("QQ",
+			"group_cmd_get_online_members: Dangerous error! maybe protocol changed, notify developers!");
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Group \"%s\" has %d online members\n", group->group_name_utf8, num);
+	purple_debug_info("QQ", "Group \"%s\" has %d online members\n", group->title_utf8, num);
 }
 
 /* process the reply to get_members_info packet */
-void qq_process_room_cmd_get_members(guint8 *data, gint len, PurpleConnection *gc)
+void qq_process_room_cmd_get_buddies(guint8 *data, gint len, PurpleConnection *gc)
 {
 	gint bytes;
 	gint num;
@@ -300,7 +266,7 @@ void qq_process_room_cmd_get_members(guint8 *data, gint len, PurpleConnection *g
 	g_return_if_fail(data != NULL && len > 0);
 
 #if 0
-	qq_show_packet("qq_process_room_cmd_get_members", data, len);
+	qq_show_packet("qq_process_room_cmd_get_buddies", data, len);
 #endif
 
 	bytes = 0;
@@ -331,19 +297,19 @@ void qq_process_room_cmd_get_members(guint8 *data, gint len, PurpleConnection *g
 		qq_filter_str(nick);
 		member->nickname = g_strdup(nick);
 		g_free(nick);
-		
+
 #if 0
-		purple_debug(PURPLE_DEBUG_INFO, "QQ",
+		purple_debug_info("QQ",
 				"member [%09d]: ext_flag=0x%02x, comm_flag=0x%02x, nick=%s\n",
 				member_uid, member->ext_flag, member->comm_flag, member->nickname);
 #endif
 
-		member->last_refresh = time(NULL);
+		member->last_update = time(NULL);
 	}
 	if (bytes > len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
+		purple_debug_error("QQ",
 				"group_cmd_get_members_info: Dangerous error! maybe protocol changed, notify developers!");
 	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Group \"%s\" obtained %d member info\n", group->group_name_utf8, num);
+	purple_debug_info("QQ", "Group \"%s\" obtained %d member info\n", group->title_utf8, num);
 }
 
diff --git a/libpurple/protocols/qq/group_info.h b/libpurple/protocols/qq/group_info.h
index d2ac04fe0b..cc9f1b44c6 100644
--- a/libpurple/protocols/qq/group_info.h
+++ b/libpurple/protocols/qq/group_info.h
@@ -29,12 +29,9 @@
 #include "connection.h"
 #include "group.h"
 
-void qq_send_cmd_group_get_online_members(PurpleConnection *gc, qq_group *group);
-void qq_send_cmd_group_all_get_online_members(PurpleConnection *gc);
-
-void qq_send_cmd_group_get_members_info(PurpleConnection *gc, qq_group *group);
+gint qq_request_room_get_buddies(PurpleConnection *gc, qq_group *group, gint update_class);
 
 void qq_process_room_cmd_get_info(guint8 *data, gint len, PurpleConnection *gc);
 void qq_process_room_cmd_get_onlines(guint8 *data, gint len, PurpleConnection *gc);
-void qq_process_room_cmd_get_members(guint8 *data, gint len, PurpleConnection *gc);
+void qq_process_room_cmd_get_buddies(guint8 *data, gint len, PurpleConnection *gc);
 #endif
diff --git a/libpurple/protocols/qq/group_internal.c b/libpurple/protocols/qq/group_internal.c
index 997fda8a82..bf7849ac05 100644
--- a/libpurple/protocols/qq/group_internal.c
+++ b/libpurple/protocols/qq/group_internal.c
@@ -31,49 +31,49 @@
 #include "group_internal.h"
 #include "utils.h"
 
-static gchar *_qq_group_set_my_status_desc(qq_group *group)
+static gchar *get_role_desc(qq_group *group)
 {
-	const char *status_desc;
+	const char *role_desc;
 	g_return_val_if_fail(group != NULL, g_strdup(""));
 
-	switch (group->my_status) {
-	case QQ_GROUP_MEMBER_STATUS_NOT_MEMBER:
-		status_desc = _("I am not a member");
+	switch (group->my_role) {
+	case QQ_ROOM_ROLE_NO:
+		role_desc = _("I am not a member");
 		break;
-	case QQ_GROUP_MEMBER_STATUS_IS_MEMBER:
-		status_desc = _("I am a member");
+	case QQ_ROOM_ROLE_YES:
+		role_desc = _("I am a member");
 		break;
-	case QQ_GROUP_MEMBER_STATUS_APPLYING:
-		status_desc = _("I am applying to join");
+	case QQ_ROOM_ROLE_REQUESTING:
+		role_desc = _("I am requesting");
 		break;
-	case QQ_GROUP_MEMBER_STATUS_IS_ADMIN:
-		status_desc = _("I am the admin");
+	case QQ_ROOM_ROLE_ADMIN:
+		role_desc = _("I am the admin");
 		break;
 	default:
-		status_desc = _("Unknown status");
+		role_desc = _("Unknown status");
 	}
 
-	return g_strdup(status_desc);
+	return g_strdup(role_desc);
 }
 
-static void _qq_group_add_to_blist(PurpleConnection *gc, qq_group *group)
+static void add_room_to_blist(PurpleConnection *gc, qq_group *group)
 {
 	GHashTable *components;
 	PurpleGroup *g;
 	PurpleChat *chat;
 	components = qq_group_to_hashtable(group);
-	chat = purple_chat_new(purple_connection_get_account(gc), group->group_name_utf8, components);
+	chat = purple_chat_new(purple_connection_get_account(gc), group->title_utf8, components);
 	g = qq_get_purple_group(PURPLE_GROUP_QQ_QUN);
 	purple_blist_add_chat(chat, g, NULL);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "You have added group \"%s\" to blist locally\n", group->group_name_utf8);
+	purple_debug_info("QQ", "You have added group \"%s\" to blist locally\n", group->title_utf8);
 }
 
 /* Create a dummy qq_group, which includes only internal_id, ext_id,
- * and potentially group_name_utf8, in case we need to call group_conv_show_window
+ * and potentially title_utf8, in case we need to call group_conv_show_window
  * right after creation. All other attributes are set to empty.
  * We need to send a get_group_info to the QQ server to update it right away */
 qq_group *qq_group_create_internal_record(PurpleConnection *gc,
-                guint32 internal_id, guint32 ext_id, gchar *group_name_utf8)
+                guint32 internal_id, guint32 ext_id, gchar *title_utf8)
 {
         qq_group *group;
         qq_data *qd;
@@ -82,21 +82,21 @@ qq_group *qq_group_create_internal_record(PurpleConnection *gc,
         qd = (qq_data *) gc->proto_data;
 
         group = g_new0(qq_group, 1);
-        group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
-        group->my_status_desc = _qq_group_set_my_status_desc(group);
+        group->my_role = QQ_ROOM_ROLE_NO;
+        group->my_role_desc = get_role_desc(group);
         group->id = internal_id;
         group->ext_id = ext_id;
         group->type8 = 0x01;       /* assume permanent Qun */
         group->creator_uid = 10000;     /* assume by QQ admin */
-        group->group_category = 0x01;
+        group->category = 0x01;
         group->auth_type = 0x02;        /* assume need auth */
-        group->group_name_utf8 = g_strdup(group_name_utf8 == NULL ? "" : group_name_utf8);
-        group->group_desc_utf8 = g_strdup("");
+        group->title_utf8 = g_strdup(title_utf8 == NULL ? "" : title_utf8);
+        group->desc_utf8 = g_strdup("");
         group->notice_utf8 = g_strdup("");
         group->members = NULL;
 
         qd->groups = g_list_append(qd->groups, group);
-        _qq_group_add_to_blist(gc, group);
+        add_room_to_blist(gc, group);
 
         return group;
 }
@@ -124,26 +124,26 @@ GHashTable *qq_group_to_hashtable(qq_group *group)
 {
 	GHashTable *components;
 	components = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
-	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_MEMBER_STATUS), g_strdup_printf("%d", group->my_status));
-	group->my_status_desc = _qq_group_set_my_status_desc(group);
+	g_hash_table_insert(components, g_strdup(QQ_ROOM_KEY_ROLE), g_strdup_printf("%d", group->my_role));
+	group->my_role_desc = get_role_desc(group);
 
 	g_hash_table_insert(components,
-			    g_strdup(QQ_GROUP_KEY_INTERNAL_ID), g_strdup_printf("%d", group->id));
-	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_EXTERNAL_ID),
+			    g_strdup(QQ_ROOM_KEY_INTERNAL_ID), g_strdup_printf("%d", group->id));
+	g_hash_table_insert(components, g_strdup(QQ_ROOM_KEY_EXTERNAL_ID),
 			    g_strdup_printf("%d", group->ext_id));
-	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_TYPE), g_strdup_printf("%d", group->type8));
-	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_CREATOR_UID), g_strdup_printf("%d", group->creator_uid));
+	g_hash_table_insert(components, g_strdup(QQ_ROOM_KEY_TYPE), g_strdup_printf("%d", group->type8));
+	g_hash_table_insert(components, g_strdup(QQ_ROOM_KEY_CREATOR_UID), g_strdup_printf("%d", group->creator_uid));
 	g_hash_table_insert(components,
-			    g_strdup(QQ_GROUP_KEY_GROUP_CATEGORY), g_strdup_printf("%d", group->group_category));
-	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_AUTH_TYPE), g_strdup_printf("%d", group->auth_type));
-	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_MEMBER_STATUS_DESC), g_strdup(group->my_status_desc));
-	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_GROUP_NAME_UTF8), g_strdup(group->group_name_utf8));
-	g_hash_table_insert(components, g_strdup(QQ_GROUP_KEY_GROUP_DESC_UTF8), g_strdup(group->group_desc_utf8));
+			    g_strdup(QQ_ROOM_KEY_CATEGORY), g_strdup_printf("%d", group->category));
+	g_hash_table_insert(components, g_strdup(QQ_ROOM_KEY_AUTH_TYPE), g_strdup_printf("%d", group->auth_type));
+	g_hash_table_insert(components, g_strdup(QQ_ROOM_KEY_ROLE_DESC), g_strdup(group->my_role_desc));
+	g_hash_table_insert(components, g_strdup(QQ_ROOM_KEY_TITLE_UTF8), g_strdup(group->title_utf8));
+	g_hash_table_insert(components, g_strdup(QQ_ROOM_KEY_DESC_UTF8), g_strdup(group->desc_utf8));
 	return components;
 }
 
 /* create a qq_group from hashtable */
-qq_group *qq_group_from_hashtable(PurpleConnection *gc, GHashTable *data)
+qq_group *qq_room_create_by_hashtable(PurpleConnection *gc, GHashTable *data)
 {
 	qq_data *qd;
 	qq_group *group;
@@ -152,25 +152,25 @@ qq_group *qq_group_from_hashtable(PurpleConnection *gc, GHashTable *data)
 	qd = (qq_data *) gc->proto_data;
 
 	group = g_new0(qq_group, 1);
-	group->my_status =
+	group->my_role =
 	    qq_string_to_dec_value
 	    (NULL ==
 	     g_hash_table_lookup(data,
-				 QQ_GROUP_KEY_MEMBER_STATUS) ?
-	     g_strdup_printf("%d", QQ_GROUP_MEMBER_STATUS_NOT_MEMBER) :
-	     g_hash_table_lookup(data, QQ_GROUP_KEY_MEMBER_STATUS));
-	group->id = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_INTERNAL_ID));
-	group->ext_id = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_EXTERNAL_ID));
-	group->type8 = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_TYPE));
-	group->creator_uid = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_CREATOR_UID));
-	group->group_category = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_GROUP_CATEGORY));
-	group->auth_type = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_GROUP_KEY_AUTH_TYPE));
-	group->group_name_utf8 = g_strdup(g_hash_table_lookup(data, QQ_GROUP_KEY_GROUP_NAME_UTF8));
-	group->group_desc_utf8 = g_strdup(g_hash_table_lookup(data, QQ_GROUP_KEY_GROUP_DESC_UTF8));
-	group->my_status_desc = _qq_group_set_my_status_desc(group);
+				 QQ_ROOM_KEY_ROLE) ?
+	     g_strdup_printf("%d", QQ_ROOM_ROLE_NO) :
+	     g_hash_table_lookup(data, QQ_ROOM_KEY_ROLE));
+	group->id = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_ROOM_KEY_INTERNAL_ID));
+	group->ext_id = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_ROOM_KEY_EXTERNAL_ID));
+	group->type8 = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_ROOM_KEY_TYPE));
+	group->creator_uid = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_ROOM_KEY_CREATOR_UID));
+	group->category = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_ROOM_KEY_CATEGORY));
+	group->auth_type = qq_string_to_dec_value(g_hash_table_lookup(data, QQ_ROOM_KEY_AUTH_TYPE));
+	group->title_utf8 = g_strdup(g_hash_table_lookup(data, QQ_ROOM_KEY_TITLE_UTF8));
+	group->desc_utf8 = g_strdup(g_hash_table_lookup(data, QQ_ROOM_KEY_DESC_UTF8));
+	group->my_role_desc = get_role_desc(group);
+	group->is_got_info = FALSE;
 
 	qd->groups = g_list_append(qd->groups, group);
-
 	return group;
 }
 
@@ -184,48 +184,54 @@ void qq_group_refresh(PurpleConnection *gc, qq_group *group)
 	ext_id = g_strdup_printf("%d", group->ext_id);
 	chat = purple_blist_find_chat(purple_connection_get_account(gc), ext_id);
 	g_free(ext_id);
-	if (chat == NULL && group->my_status != QQ_GROUP_MEMBER_STATUS_NOT_MEMBER) {
-		_qq_group_add_to_blist(gc, group);
-	} else if (chat != NULL) {	/* we have a local record, update its info */
-		/* if there is group_name_utf8, we update the group name */
-		if (group->group_name_utf8 != NULL && strlen(group->group_name_utf8) > 0)
-			purple_blist_alias_chat(chat, group->group_name_utf8);
-		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_MEMBER_STATUS), g_strdup_printf("%d", group->my_status));
-		group->my_status_desc = _qq_group_set_my_status_desc(group);
-		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_MEMBER_STATUS_DESC), g_strdup(group->my_status_desc));
-		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_INTERNAL_ID),
-				     g_strdup_printf("%d", group->id));
-		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_EXTERNAL_ID),
-				     g_strdup_printf("%d", group->ext_id));
-		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_TYPE), g_strdup_printf("%d", group->type8));
-		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_CREATOR_UID), g_strdup_printf("%d", group->creator_uid));
-		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_GROUP_CATEGORY),
-				     g_strdup_printf("%d", group->group_category));
-		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_AUTH_TYPE), g_strdup_printf("%d", group->auth_type));
-		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_GROUP_NAME_UTF8), g_strdup(group->group_name_utf8));
-		g_hash_table_replace(chat->components,
-				     g_strdup(QQ_GROUP_KEY_GROUP_DESC_UTF8), g_strdup(group->group_desc_utf8));
+	if (chat == NULL && group->my_role != QQ_ROOM_ROLE_NO) {
+		add_room_to_blist(gc, group);
+		return;
+	}
+
+	if (chat == NULL) {
+		return;
 	}
+
+	/* we have a local record, update its info */
+	/* if there is title_utf8, we update the group name */
+	if (group->title_utf8 != NULL && strlen(group->title_utf8) > 0)
+		purple_blist_alias_chat(chat, group->title_utf8);
+	g_hash_table_replace(chat->components,
+		     g_strdup(QQ_ROOM_KEY_ROLE), g_strdup_printf("%d", group->my_role));
+	group->my_role_desc = get_role_desc(group);
+	g_hash_table_replace(chat->components,
+		     g_strdup(QQ_ROOM_KEY_ROLE_DESC), g_strdup(group->my_role_desc));
+	g_hash_table_replace(chat->components,
+		     g_strdup(QQ_ROOM_KEY_INTERNAL_ID),
+		     g_strdup_printf("%d", group->id));
+	g_hash_table_replace(chat->components,
+		     g_strdup(QQ_ROOM_KEY_EXTERNAL_ID),
+		     g_strdup_printf("%d", group->ext_id));
+	g_hash_table_replace(chat->components,
+		     g_strdup(QQ_ROOM_KEY_TYPE), g_strdup_printf("%d", group->type8));
+	g_hash_table_replace(chat->components,
+		     g_strdup(QQ_ROOM_KEY_CREATOR_UID), g_strdup_printf("%d", group->creator_uid));
+	g_hash_table_replace(chat->components,
+		     g_strdup(QQ_ROOM_KEY_CATEGORY),
+		     g_strdup_printf("%d", group->category));
+	g_hash_table_replace(chat->components,
+		     g_strdup(QQ_ROOM_KEY_AUTH_TYPE), g_strdup_printf("%d", group->auth_type));
+	g_hash_table_replace(chat->components,
+		     g_strdup(QQ_ROOM_KEY_TITLE_UTF8), g_strdup(group->title_utf8));
+	g_hash_table_replace(chat->components,
+		     g_strdup(QQ_ROOM_KEY_DESC_UTF8), g_strdup(group->desc_utf8));
 }
 
-/* NOTE: If we knew how to convert between an external and internal group id, as the official 
+/* NOTE: If we knew how to convert between an external and internal group id, as the official
  * client seems to, the following would be unnecessary. That would be ideal. */
 
 /* Use list to specify if id's alternate id is pending discovery. */
 void qq_set_pending_id(GSList **list, guint32 id, gboolean pending)
 {
-	if (pending) 
+	if (pending)
 		*list = g_slist_prepend(*list, GINT_TO_POINTER(id));
-	else 
+	else
 		*list = g_slist_remove(*list, GINT_TO_POINTER(id));
 }
 
diff --git a/libpurple/protocols/qq/group_internal.h b/libpurple/protocols/qq/group_internal.h
index 4dc11adb28..e08d048970 100644
--- a/libpurple/protocols/qq/group_internal.h
+++ b/libpurple/protocols/qq/group_internal.h
@@ -28,23 +28,23 @@
 #include <glib.h>
 #include "group.h"
 
-#define QQ_GROUP_KEY_MEMBER_STATUS				"my_status_code"
-#define QQ_GROUP_KEY_MEMBER_STATUS_DESC	"my_status_desc"
-#define QQ_GROUP_KEY_INTERNAL_ID					"id"
-#define QQ_GROUP_KEY_EXTERNAL_ID					"ext_id"
-#define QQ_GROUP_KEY_TYPE								"type"
-#define QQ_GROUP_KEY_CREATOR_UID					"creator_uid"
-#define QQ_GROUP_KEY_GROUP_CATEGORY			"category"
-#define QQ_GROUP_KEY_AUTH_TYPE						"auth_type"
-#define QQ_GROUP_KEY_GROUP_NAME_UTF8			"name_utf8"
-#define QQ_GROUP_KEY_GROUP_DESC_UTF8			"desc_utf8"
-
-qq_group *qq_group_create_internal_record(PurpleConnection *gc, 
+#define QQ_ROOM_KEY_ROLE									"my_role"
+#define QQ_ROOM_KEY_ROLE_DESC						"my_role_desc"
+#define QQ_ROOM_KEY_INTERNAL_ID					"id"
+#define QQ_ROOM_KEY_EXTERNAL_ID					"ext_id"
+#define QQ_ROOM_KEY_TYPE									"type"
+#define QQ_ROOM_KEY_CREATOR_UID					"creator_uid"
+#define QQ_ROOM_KEY_CATEGORY							"category"
+#define QQ_ROOM_KEY_AUTH_TYPE						"auth_type"
+#define QQ_ROOM_KEY_TITLE_UTF8						"title_utf8"
+#define QQ_ROOM_KEY_DESC_UTF8						"desc_utf8"
+
+qq_group *qq_group_create_internal_record(PurpleConnection *gc,
 		guint32 internal_id, guint32 ext_id, gchar *group_name_utf8);
 void qq_group_delete_internal_record(qq_data *qd, guint32 id);
 
 GHashTable *qq_group_to_hashtable(qq_group *group);
-qq_group *qq_group_from_hashtable(PurpleConnection *gc, GHashTable *data);
+qq_group *qq_room_create_by_hashtable(PurpleConnection *gc, GHashTable *data);
 
 void qq_group_refresh(PurpleConnection *gc, qq_group *group);
 
diff --git a/libpurple/protocols/qq/group_join.c b/libpurple/protocols/qq/group_join.c
index fa85eb8266..cd552a0792 100644
--- a/libpurple/protocols/qq/group_join.c
+++ b/libpurple/protocols/qq/group_join.c
@@ -38,14 +38,17 @@
 #include "group_info.h"
 #include "group_join.h"
 #include "group_opt.h"
+#include "group_conv.h"
 #include "group_search.h"
 #include "header_info.h"
 #include "packet_parse.h"
 #include "qq_network.h"
+#include "qq_process.h"
 
 enum {
-	QQ_GROUP_JOIN_OK = 0x01,
-	QQ_GROUP_JOIN_NEED_AUTH = 0x02,
+	QQ_ROOM_JOIN_OK = 0x01,
+	QQ_ROOM_JOIN_NEED_AUTH = 0x02,
+	QQ_ROOM_JOIN_DENIED = 0x03,
 };
 
 static void _qq_group_exit_with_gc_and_id(gc_and_uid *g)
@@ -64,24 +67,28 @@ static void _qq_group_exit_with_gc_and_id(gc_and_uid *g)
 }
 
 /* send packet to join a group without auth */
-void qq_send_cmd_group_join_group(PurpleConnection *gc, qq_group *group)
+void qq_request_room_join(PurpleConnection *gc, qq_group *group)
 {
 	g_return_if_fail(group != NULL);
 
-	if (group->my_status == QQ_GROUP_MEMBER_STATUS_NOT_MEMBER) {
-		group->my_status = QQ_GROUP_MEMBER_STATUS_APPLYING;
+	if (group->my_role == QQ_ROOM_ROLE_NO) {
+		group->my_role = QQ_ROOM_ROLE_REQUESTING;
 		qq_group_refresh(gc, group);
 	}
 
 	switch (group->auth_type) {
-	case QQ_GROUP_AUTH_TYPE_NO_AUTH:
-	case QQ_GROUP_AUTH_TYPE_NEED_AUTH:
+	case QQ_ROOM_AUTH_TYPE_NO_AUTH:
+	case QQ_ROOM_AUTH_TYPE_NEED_AUTH:
+		break;
+	case QQ_ROOM_AUTH_TYPE_NO_ADD:
+		if (group->my_role == QQ_ROOM_ROLE_NO
+				&& group->my_role == QQ_ROOM_ROLE_REQUESTING) {
+			purple_notify_warning(gc, NULL, _("The Qun does not allow others to join"), NULL);
+			return;
+		}
 		break;
-	case QQ_GROUP_AUTH_TYPE_NO_ADD:
-		purple_notify_warning(gc, NULL, _("This group does not allow others to join"), NULL);
-		return;
 	default:
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Unknown group auth type: %d\n", group->auth_type);
+		purple_debug_error("QQ", "Unknown room auth type: %d\n", group->auth_type);
 		break;
 	}
 
@@ -99,10 +106,10 @@ static void _qq_group_join_auth_with_gc_and_id(gc_and_uid *g, const gchar *reaso
 
 	group = qq_room_search_id(gc, id);
 	if (group == NULL) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Can not find qq_group by internal_id: %d\n", id);
+		purple_debug_error("QQ", "Can not find qq_group by internal_id: %d\n", id);
 		return;
 	} else {		/* everything is OK */
-		qq_send_cmd_group_auth(gc, group, QQ_GROUP_AUTH_REQUEST_APPLY, 0, reason_utf8);
+		qq_send_cmd_group_auth(gc, group, QQ_ROOM_AUTH_REQUEST_APPLY, 0, reason_utf8);
 	}
 }
 
@@ -112,10 +119,9 @@ static void _qq_group_join_auth(PurpleConnection *gc, qq_group *group)
 	gc_and_uid *g;
 	g_return_if_fail(group != NULL);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", 
-			"Group (internal id: %d) needs authentication\n", group->id);
+	purple_debug_info("QQ", "Group (internal id: %d) needs authentication\n", group->id);
 
-	msg = g_strdup_printf("Group \"%s\" needs authentication\n", group->group_name_utf8);
+	msg = g_strdup_printf("Group \"%s\" needs authentication\n", group->title_utf8);
 	g = g_new0(gc_and_uid, 1);
 	g->gc = gc;
 	g->uid = group->id;
@@ -125,7 +131,7 @@ static void _qq_group_join_auth(PurpleConnection *gc, qq_group *group)
 			   _("Send"),
 			   G_CALLBACK(_qq_group_join_auth_with_gc_and_id),
 			   _("Cancel"), G_CALLBACK(qq_do_nothing_with_gc_and_uid),
-			   purple_connection_get_account(gc), group->group_name_utf8, NULL,
+			   purple_connection_get_account(gc), group->title_utf8, NULL,
 			   g);
 	g_free(msg);
 }
@@ -143,8 +149,8 @@ void qq_send_cmd_group_auth(PurpleConnection *gc, qq_group *group, guint8 opt, g
 	else
 		reason_qq = utf8_to_qq(reason_utf8, QQ_CHARSET_DEFAULT);
 
-	if (opt == QQ_GROUP_AUTH_REQUEST_APPLY) {
-		group->my_status = QQ_GROUP_MEMBER_STATUS_APPLYING;
+	if (opt == QQ_ROOM_AUTH_REQUEST_APPLY) {
+		group->my_role = QQ_ROOM_ROLE_REQUESTING;
 		qq_group_refresh(gc, group);
 		uid = 0;
 	}
@@ -173,8 +179,7 @@ void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *g
 	qd = (qq_data *) gc->proto_data;
 
 	if (len < 4) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
-			   "Invalid exit group reply, expect %d bytes, read %d bytes\n", 4, len);
+		purple_debug_error("QQ", "Invalid exit group reply, expect %d bytes, read %d bytes\n", 4, len);
 		return;
 	}
 
@@ -189,7 +194,7 @@ void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *g
 			purple_blist_remove_chat(chat);
 		qq_group_delete_internal_record(qd, id);
 	}
-	purple_notify_info(gc, _("QQ Qun Operation"), _("You have successfully left the group"), NULL);
+	purple_notify_info(gc, _("QQ Qun Operation"), _("Successed:"), _("Remove from Qun"));
 }
 
 /* Process the reply to group_auth subcmd */
@@ -203,16 +208,15 @@ void qq_process_group_cmd_join_group_auth(guint8 *data, gint len, PurpleConnecti
 	qd = (qq_data *) gc->proto_data;
 
 	if (len < 4) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
-			   "Invalid join group reply, expect %d bytes, read %d bytes\n", 4, len);
+		purple_debug_error("QQ",
+			"Invalid join room reply, expect %d bytes, read %d bytes\n", 4, len);
 		return;
 	}
 	bytes = 0;
 	bytes += qq_get32(&id, data + bytes);
 	g_return_if_fail(id > 0);
 
-	purple_notify_info(gc, _("QQ Group Auth"),
-		     _("Your authorization request has been accepted by the QQ server"), NULL);
+	purple_notify_info(gc, _("QQ Qun Operation"), _("Successed:"), _("Join to Qun"));
 }
 
 /* process group cmd reply "join group" */
@@ -222,15 +226,16 @@ void qq_process_group_cmd_join_group(guint8 *data, gint len, PurpleConnection *g
 	guint32 id;
 	guint8 reply;
 	qq_group *group;
+	gchar *msg;
 
 	g_return_if_fail(data != NULL && len > 0);
 
 	if (len < 5) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
+		purple_debug_error("QQ",
 			   "Invalid join group reply, expect %d bytes, read %d bytes\n", 5, len);
 		return;
 	}
-	
+
 	bytes = 0;
 	bytes += qq_get32(&id, data + bytes);
 	bytes += qq_get8(&reply, data + bytes);
@@ -240,26 +245,32 @@ void qq_process_group_cmd_join_group(guint8 *data, gint len, PurpleConnection *g
 	/* need to check if group is NULL or not. */
 	g_return_if_fail(group != NULL);
 	switch (reply) {
-	case QQ_GROUP_JOIN_OK:
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed joining group \"%s\"\n", group->group_name_utf8);
-		group->my_status = QQ_GROUP_MEMBER_STATUS_IS_MEMBER;
+	case QQ_ROOM_JOIN_OK:
+		purple_debug_info("QQ", "Successed in joining group \"%s\"\n", group->title_utf8);
+		group->my_role = QQ_ROOM_ROLE_YES;
 		qq_group_refresh(gc, group);
 		/* this must be shown before getting online members */
-		qq_group_conv_show_window(gc, group);
-		qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, group->id);
+		qq_room_conv_create(gc, group);
 		break;
-	case QQ_GROUP_JOIN_NEED_AUTH:
-		purple_debug(PURPLE_DEBUG_INFO, "QQ",
+	case QQ_ROOM_JOIN_NEED_AUTH:
+		purple_debug_info("QQ",
 			   "Fail joining group [%d] %s, needs authentication\n",
-			   group->ext_id, group->group_name_utf8);
-		group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
+			   group->ext_id, group->title_utf8);
+		group->my_role = QQ_ROOM_ROLE_NO;
 		qq_group_refresh(gc, group);
 		_qq_group_join_auth(gc, group);
 		break;
+	case QQ_ROOM_JOIN_DENIED:
+		msg = g_strdup_printf(_("Qun %d denied to join"), group->ext_id);
+		purple_notify_info(gc, _("QQ Qun Operation"), _("Failed:"), msg);
+		g_free(msg);
+		break;
 	default:
-		purple_debug(PURPLE_DEBUG_INFO, "QQ",
-			   "Error joining group [%d] %s, unknown reply: 0x%02x\n",
-			   group->ext_id, group->group_name_utf8, reply);
+		purple_debug_info("QQ",
+			   "Failed joining group [%d] %s, unknown reply: 0x%02x\n",
+			   group->ext_id, group->title_utf8, reply);
+
+		purple_notify_info(gc, _("QQ Qun Operation"), _("Failed:"), _("Join Qun, Unknow Reply"));
 	}
 }
 
@@ -274,7 +285,7 @@ void qq_group_join(PurpleConnection *gc, GHashTable *data)
 	g_return_if_fail(data != NULL);
 	qd = (qq_data *) gc->proto_data;
 
-	ext_id_ptr = g_hash_table_lookup(data, QQ_GROUP_KEY_EXTERNAL_ID);
+	ext_id_ptr = g_hash_table_lookup(data, QQ_ROOM_KEY_EXTERNAL_ID);
 	g_return_if_fail(ext_id_ptr != NULL);
 	errno = 0;
 	ext_id = strtol(ext_id_ptr, NULL, 10);
@@ -286,7 +297,7 @@ void qq_group_join(PurpleConnection *gc, GHashTable *data)
 
 	group = qq_room_search_ext_id(gc, ext_id);
 	if (group) {
-		qq_send_cmd_group_join_group(gc, group);
+		qq_request_room_join(gc, group);
 	} else {
 		qq_set_pending_id(&qd->joining_groups, ext_id, TRUE);
 		qq_send_cmd_group_search_group(gc, ext_id);
@@ -301,7 +312,7 @@ void qq_group_exit(PurpleConnection *gc, GHashTable *data)
 
 	g_return_if_fail(data != NULL);
 
-	id_ptr = g_hash_table_lookup(data, QQ_GROUP_KEY_INTERNAL_ID);
+	id_ptr = g_hash_table_lookup(data, QQ_ROOM_KEY_INTERNAL_ID);
 	id = strtol(id_ptr, NULL, 10);
 
 	g_return_if_fail(id > 0);
@@ -312,8 +323,7 @@ void qq_group_exit(PurpleConnection *gc, GHashTable *data)
 
 	purple_request_action(gc, _("QQ Qun Operation"),
 			    _("Are you sure you want to leave this Qun?"),
-			    _
-			    ("Note, if you are the creator, \nthis operation will eventually remove this Qun."),
+			    _("Note, if you are the creator, \nthis operation will eventually remove this Qun."),
 			    1,
 				purple_connection_get_account(gc), NULL, NULL,
 			    g, 2, _("Cancel"),
diff --git a/libpurple/protocols/qq/group_join.h b/libpurple/protocols/qq/group_join.h
index 4b0483b6e3..f6b1032e2b 100644
--- a/libpurple/protocols/qq/group_join.h
+++ b/libpurple/protocols/qq/group_join.h
@@ -30,20 +30,20 @@
 #include "group.h"
 
 enum {
-	QQ_GROUP_AUTH_TYPE_NO_AUTH = 0x01,
-	QQ_GROUP_AUTH_TYPE_NEED_AUTH = 0x02,
-	QQ_GROUP_AUTH_TYPE_NO_ADD = 0x03
+	QQ_ROOM_AUTH_TYPE_NO_AUTH = 0x01,
+	QQ_ROOM_AUTH_TYPE_NEED_AUTH = 0x02,
+	QQ_ROOM_AUTH_TYPE_NO_ADD = 0x03
 };
 
 enum {
-	QQ_GROUP_AUTH_REQUEST_APPLY = 0x01,
-	QQ_GROUP_AUTH_REQUEST_APPROVE = 0x02,
-	QQ_GROUP_AUTH_REQUEST_REJECT = 0x03
+	QQ_ROOM_AUTH_REQUEST_APPLY = 0x01,
+	QQ_ROOM_AUTH_REQUEST_APPROVE = 0x02,
+	QQ_ROOM_AUTH_REQUEST_REJECT = 0x03
 };
 
 void qq_send_cmd_group_auth(PurpleConnection *gc, qq_group *group, guint8 opt, guint32 uid, const gchar *reason_utf8);
 void qq_group_join(PurpleConnection *gc, GHashTable *data);
-void qq_send_cmd_group_join_group(PurpleConnection *gc, qq_group *group);
+void qq_request_room_join(PurpleConnection *gc, qq_group *group);
 void qq_group_exit(PurpleConnection *gc, GHashTable *data);
 void qq_process_group_cmd_exit_group(guint8 *data, gint len, PurpleConnection *gc);
 void qq_process_group_cmd_join_group_auth(guint8 *data, gint len, PurpleConnection *gc);
diff --git a/libpurple/protocols/qq/group_opt.c b/libpurple/protocols/qq/group_opt.c
index 5f7fcabfb2..4d8002a97c 100644
--- a/libpurple/protocols/qq/group_opt.c
+++ b/libpurple/protocols/qq/group_opt.c
@@ -38,6 +38,7 @@
 #include "header_info.h"
 #include "packet_parse.h"
 #include "qq_network.h"
+#include "qq_process.h"
 #include "utils.h"
 
 static int _compare_guint32(const void *a,
@@ -67,7 +68,7 @@ static void _qq_group_member_opt(PurpleConnection *gc, qq_group *group, gint ope
 	}
 	data_len = 6 + count * 4;
 	data = g_newa(guint8, data_len);
-	
+
 	bytes = 0;
 	bytes += qq_put8(data + bytes, operation);
 	for (i = 0; i < count; i++)
@@ -88,7 +89,7 @@ static void _qq_group_reject_application_real(group_member_opt *g, gchar *msg_ut
 	g_return_if_fail(g != NULL && g->gc != NULL && g->id > 0 && g->member > 0);
 	group = qq_room_search_id(g->gc, g->id);
 	g_return_if_fail(group != NULL);
-	qq_send_cmd_group_auth(g->gc, group, QQ_GROUP_AUTH_REQUEST_REJECT, g->member, msg_utf8);
+	qq_send_cmd_group_auth(g->gc, group, QQ_ROOM_AUTH_REQUEST_REJECT, g->member, msg_utf8);
 	g_free(g);
 }
 
@@ -111,11 +112,11 @@ void qq_group_reject_application_with_struct(group_member_opt *g)
 	g_return_if_fail(g != NULL && g->gc != NULL && g->member > 0);
 
 	msg1 = g_strdup_printf(_("You rejected %d's request"), g->member);
-	msg2 = g_strdup(_("Enter your reason:"));
+	msg2 = g_strdup(_("Message:"));
 
 	nombre = uid_to_purple_name(g->member);
 	purple_request_input(g->gc, /* title */ NULL, msg1, msg2,
-			   _("Sorry, you are not my type..."), /* multiline */ TRUE, /* masked */ FALSE,
+			   _("Sorry, you are not my style..."), /* multiline */ TRUE, /* masked */ FALSE,
 			   /* hint */ NULL,
 			   _("Send"), G_CALLBACK(_qq_group_reject_application_real),
 			   _("Cancel"), G_CALLBACK(_qq_group_do_nothing_with_struct),
@@ -133,7 +134,7 @@ void qq_group_approve_application_with_struct(group_member_opt *g)
 	g_return_if_fail(g != NULL && g->gc != NULL && g->id > 0 && g->member > 0);
 	group = qq_room_search_id(g->gc, g->id);
 	g_return_if_fail(group != NULL);
-	qq_send_cmd_group_auth(g->gc, group, QQ_GROUP_AUTH_REQUEST_APPROVE, g->member, "");
+	qq_send_cmd_group_auth(g->gc, group, QQ_ROOM_AUTH_REQUEST_APPROVE, g->member, "");
 	qq_group_find_or_add_member(g->gc, group, g->member);
 	g_free(g);
 }
@@ -189,9 +190,9 @@ void qq_group_modify_members(PurpleConnection *gc, qq_group *group, guint32 *new
 		qq_group_find_or_add_member(gc, group, add_members[i]);
 
 	if (del > 0)
-		_qq_group_member_opt(gc, group, QQ_GROUP_MEMBER_DEL, del_members);
+		_qq_group_member_opt(gc, group, QQ_ROOM_MEMBER_DEL, del_members);
 	if (add > 0)
-		_qq_group_member_opt(gc, group, QQ_GROUP_MEMBER_ADD, add_members);
+		_qq_group_member_opt(gc, group, QQ_ROOM_MEMBER_ADD, add_members);
 }
 
 void qq_group_process_modify_members_reply(guint8 *data, gint len, PurpleConnection *gc)
@@ -209,9 +210,9 @@ void qq_group_process_modify_members_reply(guint8 *data, gint len, PurpleConnect
 	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in modify members for Qun %d\n", group->ext_id);
+	purple_debug_info("QQ", "Succeed in modify members for room %d\n", group->ext_id);
 
-	purple_notify_info(gc, _("QQ Qun Operation"), _("You have successfully modified Qun member"), NULL);
+	purple_notify_info(gc, _("QQ Qun Operation"), _("Successed:"), _("Change Qun member"));
 }
 
 void qq_room_change_info(PurpleConnection *gc, qq_group *group)
@@ -223,8 +224,8 @@ void qq_room_change_info(PurpleConnection *gc, qq_group *group)
 
 	g_return_if_fail(group != NULL);
 
-	group_name = group->group_name_utf8 == NULL ? "" : utf8_to_qq(group->group_name_utf8, QQ_CHARSET_DEFAULT);
-	group_desc = group->group_desc_utf8 == NULL ? "" : utf8_to_qq(group->group_desc_utf8, QQ_CHARSET_DEFAULT);
+	group_name = group->title_utf8 == NULL ? "" : utf8_to_qq(group->title_utf8, QQ_CHARSET_DEFAULT);
+	group_desc = group->desc_utf8 == NULL ? "" : utf8_to_qq(group->desc_utf8, QQ_CHARSET_DEFAULT);
 	notice = group->notice_utf8 == NULL ? "" : utf8_to_qq(group->notice_utf8, QQ_CHARSET_DEFAULT);
 
 	data_len = 64 + strlen(group_name) + strlen(group_desc) + strlen(notice);
@@ -237,7 +238,7 @@ void qq_room_change_info(PurpleConnection *gc, qq_group *group)
 	/* 007-008 */
 	bytes += qq_put16(data + bytes, 0x0000);
 	/* 009-010 */
-	bytes += qq_put16(data + bytes, group->group_category);
+	bytes += qq_put16(data + bytes, group->category);
 
 	bytes += qq_put8(data + bytes, strlen(group_name));
 	bytes += qq_putdata(data + bytes, (guint8 *) group_name, strlen(group_name));
@@ -251,7 +252,7 @@ void qq_room_change_info(PurpleConnection *gc, qq_group *group)
 	bytes += qq_putdata(data + bytes, (guint8 *) group_desc, strlen(group_desc));
 
 	if (bytes > data_len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
+		purple_debug_error("QQ",
 			   "Overflow in qq_room_change_info, max %d bytes, now %d bytes\n",
 			   data_len, bytes);
 		return;
@@ -274,10 +275,10 @@ void qq_group_process_modify_info_reply(guint8 *data, gint len, PurpleConnection
 	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in modify info for Qun %d\n", group->ext_id);
+	purple_debug_info("QQ", "Succeed in modify info for Qun %d\n", group->ext_id);
 	qq_group_refresh(gc, group);
 
-	purple_notify_info(gc, _("QQ Qun Operation"), _("You have successfully modified Qun information"), NULL);
+	purple_notify_info(gc, _("QQ Qun Operation"), _("Successed:"), _("Change Qun information"));
 }
 
 /* we create a very simple group first, and then let the user to modify */
@@ -297,9 +298,9 @@ void qq_room_create_new(PurpleConnection *gc, const gchar *name)
 	bytes = 0;
 	/* we create the simpleset group, only group name is given */
 	/* 001 */
-	bytes += qq_put8(data + bytes, QQ_GROUP_TYPE_PERMANENT);
+	bytes += qq_put8(data + bytes, QQ_ROOM_TYPE_PERMANENT);
 	/* 002 */
-	bytes += qq_put8(data + bytes, QQ_GROUP_AUTH_TYPE_NEED_AUTH);
+	bytes += qq_put8(data + bytes, QQ_ROOM_AUTH_TYPE_NEED_AUTH);
 	/* 003-004 */
 	bytes += qq_put16(data + bytes, 0x0000);
 	/* 005-006 */
@@ -313,7 +314,7 @@ void qq_room_create_new(PurpleConnection *gc, const gchar *name)
 	bytes += qq_put32(data + bytes, qd->uid);	/* I am member of coz */
 
 	if (bytes > data_len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
+		purple_debug_error("QQ",
 			   "Overflow in qq_room_create, max %d bytes, now %d bytes\n",
 			   data_len, bytes);
 		return;
@@ -352,14 +353,14 @@ void qq_group_process_create_group_reply(guint8 *data, gint len, PurpleConnectio
 	g_return_if_fail(id > 0 && ext_id);
 
 	group = qq_group_create_internal_record(gc, id, ext_id, NULL);
-	group->my_status = QQ_GROUP_MEMBER_STATUS_IS_ADMIN;
+	group->my_role = QQ_ROOM_ROLE_ADMIN;
 	group->creator_uid = qd->uid;
 	qq_group_refresh(gc, group);
 
 	qq_send_room_cmd_only(gc, QQ_ROOM_CMD_ACTIVATE, id);
-	qq_send_room_cmd_only(gc, QQ_ROOM_CMD_GET_INFO, id);
+	qq_update_room(gc, 0, group->id);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in create Qun, external ID %d\n", group->ext_id);
+	purple_debug_info("QQ", "Succeed in create Qun, external ID %d\n", group->ext_id);
 
 	g = g_new0(gc_and_uid, 1);
 	g->gc = gc;
@@ -368,7 +369,7 @@ void qq_group_process_create_group_reply(guint8 *data, gint len, PurpleConnectio
 	purple_request_action(gc, _("QQ Qun Operation"),
 			    _("You have successfully created a Qun"),
 			    _
-			    ("Would you like to set up the Qun details now?"),
+			    ("Would you like to set up the detail information now?"),
 			    1,
 				purple_connection_get_account(gc), NULL, NULL,
 				g, 2,
@@ -391,7 +392,7 @@ void qq_group_process_activate_group_reply(guint8 *data, gint len, PurpleConnect
 	group = qq_room_search_id(gc, id);
 	g_return_if_fail(group != NULL);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Succeed in activate Qun %d\n", group->ext_id);
+	purple_debug_info("QQ", "Succeed in activate Qun %d\n", group->ext_id);
 }
 
 void qq_group_manage_group(PurpleConnection *gc, GHashTable *data)
@@ -402,7 +403,7 @@ void qq_group_manage_group(PurpleConnection *gc, GHashTable *data)
 
 	g_return_if_fail(data != NULL);
 
-	id_ptr = g_hash_table_lookup(data, QQ_GROUP_KEY_INTERNAL_ID);
+	id_ptr = g_hash_table_lookup(data, QQ_ROOM_KEY_INTERNAL_ID);
 	id = strtol(id_ptr, NULL, 10);
 	g_return_if_fail(id > 0);
 
diff --git a/libpurple/protocols/qq/group_opt.h b/libpurple/protocols/qq/group_opt.h
index 4a0cd43928..3946279006 100644
--- a/libpurple/protocols/qq/group_opt.h
+++ b/libpurple/protocols/qq/group_opt.h
@@ -38,13 +38,13 @@ typedef struct _group_member_opt {
 } group_member_opt;
 
 enum {
-	QQ_GROUP_TYPE_PERMANENT = 0x01,
-	QQ_GROUP_TYPE_TEMPORARY
+	QQ_ROOM_TYPE_PERMANENT = 0x01,
+	QQ_ROOM_TYPE_TEMPORARY
 };
 
 enum {
-	QQ_GROUP_MEMBER_ADD = 0x01,
-	QQ_GROUP_MEMBER_DEL
+	QQ_ROOM_MEMBER_ADD = 0x01,
+	QQ_ROOM_MEMBER_DEL
 };
 
 void qq_group_modify_members(PurpleConnection *gc, qq_group *group, guint32 *new_members);
diff --git a/libpurple/protocols/qq/group_search.c b/libpurple/protocols/qq/group_search.c
index c0ec194eb6..9996c70cfb 100644
--- a/libpurple/protocols/qq/group_search.c
+++ b/libpurple/protocols/qq/group_search.c
@@ -38,8 +38,8 @@
 #include "qq_network.h"
 
 enum {
-	QQ_GROUP_SEARCH_TYPE_BY_ID = 0x01,
-	QQ_GROUP_SEARCH_TYPE_DEMO = 0x02
+	QQ_ROOM_SEARCH_TYPE_BY_ID = 0x01,
+	QQ_ROOM_SEARCH_TYPE_DEMO = 0x02
 };
 
 /* send packet to search for qq_group */
@@ -49,7 +49,7 @@ void qq_send_cmd_group_search_group(PurpleConnection *gc, guint32 ext_id)
 	gint bytes = 0;
 	guint8 type;
 
-	type = (ext_id == 0x00000000) ? QQ_GROUP_SEARCH_TYPE_DEMO : QQ_GROUP_SEARCH_TYPE_BY_ID;
+	type = (ext_id == 0x00000000) ? QQ_ROOM_SEARCH_TYPE_DEMO : QQ_ROOM_SEARCH_TYPE_BY_ID;
 
 	bytes = 0;
 	bytes += qq_put8(raw_data + bytes, type);
@@ -63,21 +63,21 @@ static void _qq_setup_roomlist(qq_data *qd, qq_group *group)
 	PurpleRoomlistRoom *room;
 	gchar field[11];
 
-	room = purple_roomlist_room_new(PURPLE_ROOMLIST_ROOMTYPE_ROOM, group->group_name_utf8, NULL);
+	room = purple_roomlist_room_new(PURPLE_ROOMLIST_ROOMTYPE_ROOM, group->title_utf8, NULL);
 	g_snprintf(field, sizeof(field), "%d", group->ext_id);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
 	g_snprintf(field, sizeof(field), "%d", group->creator_uid);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
-	purple_roomlist_room_add_field(qd->roomlist, room, group->group_desc_utf8);
+	purple_roomlist_room_add_field(qd->roomlist, room, group->desc_utf8);
 	g_snprintf(field, sizeof(field), "%d", group->id);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
 	g_snprintf(field, sizeof(field), "%d", group->type8);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
 	g_snprintf(field, sizeof(field), "%d", group->auth_type);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
-	g_snprintf(field, sizeof(field), "%d", group->group_category);
+	g_snprintf(field, sizeof(field), "%d", group->category);
 	purple_roomlist_room_add_field(qd->roomlist, room, field);
-	purple_roomlist_room_add_field(qd->roomlist, room, group->group_name_utf8);
+	purple_roomlist_room_add_field(qd->roomlist, room, group->title_utf8);
 	purple_roomlist_room_add(qd->roomlist, room);
 
 	purple_roomlist_set_in_progress(qd->roomlist, FALSE);
@@ -109,14 +109,14 @@ void qq_process_group_cmd_search_group(guint8 *data, gint len, PurpleConnection
 	bytes += qq_get16(&(unknown), data + bytes);
 	bytes += qq_get16(&(unknown), data + bytes);
 	bytes += qq_get16(&(unknown), data + bytes);
-	bytes += qq_get32(&(group.group_category), data + bytes);
-	bytes += convert_as_pascal_string(data + bytes, &(group.group_name_utf8), QQ_CHARSET_DEFAULT);
+	bytes += qq_get32(&(group.category), data + bytes);
+	bytes += convert_as_pascal_string(data + bytes, &(group.title_utf8), QQ_CHARSET_DEFAULT);
 	bytes += qq_get16(&(unknown), data + bytes);
 	bytes += qq_get8(&(group.auth_type), data + bytes);
-	bytes += convert_as_pascal_string(data + bytes, &(group.group_desc_utf8), QQ_CHARSET_DEFAULT);
+	bytes += convert_as_pascal_string(data + bytes, &(group.desc_utf8), QQ_CHARSET_DEFAULT);
 	/* end of one qq_group */
 	if(bytes != len) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
+		purple_debug_error("QQ",
 			"group_cmd_search_group: Dangerous error! maybe protocol changed, notify developers!");
 	}
 
@@ -124,9 +124,9 @@ void qq_process_group_cmd_search_group(guint8 *data, gint len, PurpleConnection
 	if (pending_id != NULL) {
 		qq_set_pending_id(&qd->joining_groups, group.ext_id, FALSE);
 		if (qq_room_search_id(gc, group.id) == NULL)
-			qq_group_create_internal_record(gc, 
-					group.id, group.ext_id, group.group_name_utf8);
-		qq_send_cmd_group_join_group(gc, &group);
+			qq_group_create_internal_record(gc,
+					group.id, group.ext_id, group.title_utf8);
+		qq_request_room_join(gc, &group);
 	} else {
 		_qq_setup_roomlist(qd, &group);
 	}
diff --git a/libpurple/protocols/qq/header_info.c b/libpurple/protocols/qq/header_info.c
index d39594c128..5dfe85c54e 100644
--- a/libpurple/protocols/qq/header_info.c
+++ b/libpurple/protocols/qq/header_info.c
@@ -122,7 +122,7 @@ const gchar *qq_get_ver_desc(gint source)
 	case QQ_SERVER_0100:
 		return "QQ Server 0100";
 	default:
-		return "Unknown";
+		return "Unknown Version";
 	}
 }
 
@@ -138,16 +138,16 @@ const gchar *qq_get_cmd_desc(gint cmd)
 		return "QQ_CMD_UPDATE_INFO";
 	case QQ_CMD_SEARCH_USER:
 		return "QQ_CMD_SEARCH_USER";
-	case QQ_CMD_GET_USER_INFO:
-		return "QQ_CMD_GET_USER_INFO";
+	case QQ_CMD_GET_BUDDY_INFO:
+		return "QQ_CMD_GET_BUDDY_INFO";
 	case QQ_CMD_ADD_BUDDY_WO_AUTH:
 		return "QQ_CMD_ADD_BUDDY_WO_AUTH";
 	case QQ_CMD_DEL_BUDDY:
 		return "QQ_CMD_DEL_BUDDY";
 	case QQ_CMD_BUDDY_AUTH:
 		return "QQ_CMD_BUDDY_AUTH";
-	case QQ_CMD_CHANGE_ONLINE_STATUS:
-		return "QQ_CMD_CHANGE_ONLINE_STATUS";
+	case QQ_CMD_CHANGE_STATUS:
+		return "QQ_CMD_CHANGE_STATUS";
 	case QQ_CMD_ACK_SYS_MSG:
 		return "QQ_CMD_ACK_SYS_MSG";
 	case QQ_CMD_SEND_IM:
@@ -172,10 +172,10 @@ const gchar *qq_get_cmd_desc(gint cmd)
 		return "QQ_CMD_TOKEN";
 	case QQ_CMD_RECV_MSG_SYS:
 		return "QQ_CMD_RECV_MSG_SYS";
-	case QQ_CMD_RECV_MSG_BUDDY_CHANGE_STATUS:
-		return "QQ_CMD_RECV_MSG_BUDDY_CHANGE_STATUS";
+	case QQ_CMD_BUDDY_CHANGE_STATUS:
+		return "QQ_CMD_BUDDY_CHANGE_STATUS";
 	default:
-		return "Unknown";
+		return "Unknown CMD";
 	}
 }
 
@@ -204,8 +204,8 @@ const gchar *qq_get_room_cmd_desc(gint room_cmd)
 		return "QQ_ROOM_CMD_SEND_MSG";
 	case QQ_ROOM_CMD_GET_ONLINES:
 		return "QQ_ROOM_CMD_GET_ONLINES";
-	case QQ_ROOM_CMD_GET_MEMBER_INFO:
-		return "QQ_ROOM_CMD_GET_MEMBER_INFO";
+	case QQ_ROOM_CMD_GET_BUDDIES:
+		return "QQ_ROOM_CMD_GET_BUDDIES";
 	case QQ_ROOM_CMD_CHANGE_CARD:
 		return "QQ_ROOM_CMD_CHANGE_CARD";
 	case QQ_ROOM_CMD_GET_REALNAMES:
@@ -231,6 +231,6 @@ const gchar *qq_get_room_cmd_desc(gint room_cmd)
 	case QQ_ROOM_CMD_TEMP_GET_MEMBERS:
 		return "QQ_ROOM_CMD_TEMP_GET_MEMBERS";
 	default:
-		return "Unknown QQ Room Command";
+		return "Unknown Room Command";
 	}
 }
diff --git a/libpurple/protocols/qq/header_info.h b/libpurple/protocols/qq/header_info.h
index caa671e78e..6f792e0c66 100644
--- a/libpurple/protocols/qq/header_info.h
+++ b/libpurple/protocols/qq/header_info.h
@@ -43,11 +43,11 @@ enum {
 	QQ_CMD_KEEP_ALIVE = 0x0002,			/* get onlines from tencent */
 	QQ_CMD_UPDATE_INFO = 0x0004,			/* update information */
 	QQ_CMD_SEARCH_USER = 0x0005,			/* search for user */
-	QQ_CMD_GET_USER_INFO = 0x0006,			/* get user information */
+	QQ_CMD_GET_BUDDY_INFO = 0x0006,			/* get user information */
 	QQ_CMD_ADD_BUDDY_WO_AUTH = 0x0009,		/* add buddy without auth */
 	QQ_CMD_DEL_BUDDY = 0x000a,			/* delete a buddy  */
 	QQ_CMD_BUDDY_AUTH = 0x000b,			/* buddy authentication */
-	QQ_CMD_CHANGE_ONLINE_STATUS = 0x000d,		/* change my online status */
+	QQ_CMD_CHANGE_STATUS = 0x000d,		/* change my online status */
 	QQ_CMD_ACK_SYS_MSG = 0x0012,			/* ack system message */
 	QQ_CMD_SEND_IM = 0x0016,			/* send message */
 	QQ_CMD_RECV_IM = 0x0017,			/* receive message */
@@ -59,11 +59,11 @@ enum {
 	QQ_CMD_GET_BUDDIES_ONLINE = 0x0027,		/* get online buddies list */
 	QQ_CMD_CELL_PHONE_2 = 0x0029,			/* cell phone 2 */
 	QQ_CMD_ROOM = 0x0030,			/* room command */
-	QQ_CMD_GET_BUDDIES_AND_ROOMS = 0x0058,  
+	QQ_CMD_GET_BUDDIES_AND_ROOMS = 0x0058,
 	QQ_CMD_GET_LEVEL = 0x005C,			/* get level for one or more buddies */
 	QQ_CMD_TOKEN  = 0x0062, 		/* get login token */
 	QQ_CMD_RECV_MSG_SYS = 0x0080,			/* receive a system message */
-	QQ_CMD_RECV_MSG_BUDDY_CHANGE_STATUS = 0x0081,	/* buddy change status */
+	QQ_CMD_BUDDY_CHANGE_STATUS = 0x0081,	/* buddy change status */
 };
 
 const gchar *qq_get_cmd_desc(gint type);
@@ -80,7 +80,7 @@ enum {
 	QQ_ROOM_CMD_QUIT = 0x09,
 	QQ_ROOM_CMD_SEND_MSG = 0x0a,
 	QQ_ROOM_CMD_GET_ONLINES = 0x0b,
-	QQ_ROOM_CMD_GET_MEMBER_INFO = 0x0c,
+	QQ_ROOM_CMD_GET_BUDDIES = 0x0c,
 
 	QQ_ROOM_CMD_CHANGE_CARD = 0x0E,
 	QQ_ROOM_CMD_GET_REALNAMES = 0x0F,
diff --git a/libpurple/protocols/qq/im.c b/libpurple/protocols/qq/im.c
index 15642528d1..845bcc6bed 100644
--- a/libpurple/protocols/qq/im.c
+++ b/libpurple/protocols/qq/im.c
@@ -209,21 +209,17 @@ static const gchar *qq_get_recv_im_type_str(gint type)
 			return "QQ_RECV_IM_TEMP_QUN_IM";
 		case QQ_RECV_IM_QUN_IM:
 			return "QQ_RECV_IM_QUN_IM";
+		case QQ_RECV_IM_NEWS:
+			return "QQ_RECV_IM_NEWS";
+		case QQ_RECV_IM_FROM_BUDDY_2006:
+			return "QQ_RECV_IM_FROM_BUDDY_2006";
+		case QQ_RECV_IM_FROM_UNKNOWN_2006:
+			return "QQ_RECV_IM_FROM_UNKNOWN_2006";
 		default:
 			return "QQ_RECV_IM_UNKNOWN";
 	}
 }
 
-/* when we receive a message,
- * we send an ACK which is the first 16 bytes of incoming packet */
-static void _qq_send_packet_recv_im_ack(PurpleConnection *gc, guint16 seq, guint8 *data)
-{
-	qq_data *qd;
-
-	qd = (qq_data *) gc->proto_data;
-	qq_send_cmd_detail(qd, QQ_CMD_RECV_IM, seq, FALSE, data, 16);
-}
-
 /* read the common parts of the normal_im,
  * returns the bytes read if succeed, or -1 if there is any error */
 static gint _qq_normal_im_common_read(guint8 *data, gint len, qq_recv_normal_im_common *common)
@@ -240,13 +236,64 @@ static gint _qq_normal_im_common_read(guint8 *data, gint len, qq_recv_normal_im_
 	bytes += qq_get16(&(common->normal_im_type), data + bytes);
 
 	if (bytes != 28) {	/* read common place fail */
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Expect 28 bytes, read %d bytes\n", bytes);
+		purple_debug_error("QQ", "Expect 28 bytes, read %d bytes\n", bytes);
 		return -1;
 	}
 
 	return bytes;
 }
 
+static void _qq_process_recv_news(guint8 *data, gint data_len, PurpleConnection *gc)
+{
+	qq_data *qd = (qq_data *) gc->proto_data;
+	gint bytes;
+	guint8 *temp;
+	guint8 temp_len;
+	gchar *title, *brief, *url;
+	gchar *title_utf8;
+	gchar *content, *content_utf8;
+
+	g_return_if_fail(data != NULL && data_len != 0);
+
+#if 0
+	qq_show_packet("Rcv news", data, data_len);
+#endif
+
+	temp = g_newa(guint8, data_len);
+	bytes = 4;	/* ignore unknown 4 bytes */
+
+	bytes += qq_get8(&temp_len, data + bytes);
+	g_return_if_fail(bytes + temp_len <= data_len);
+	bytes += qq_getdata(temp, temp_len, data+bytes);
+	title = g_strndup((gchar *)temp, temp_len);
+
+	bytes += qq_get8(&temp_len, data + bytes);
+	g_return_if_fail(bytes + temp_len <= data_len);
+	bytes += qq_getdata(temp, temp_len, data+bytes);
+	brief = g_strndup((gchar *)temp, temp_len);
+
+	bytes += qq_get8(&temp_len, data + bytes);
+	g_return_if_fail(bytes + temp_len <= data_len);
+	bytes += qq_getdata(temp, temp_len, data+bytes);
+	url = g_strndup((gchar *)temp, temp_len);
+
+	title_utf8 = qq_to_utf8(title, QQ_CHARSET_DEFAULT);
+	content = g_strdup_printf(_("%s\n\n%s"), brief, url);
+	content_utf8 = qq_to_utf8(content, QQ_CHARSET_DEFAULT);
+
+	if (qd->is_show_news) {
+		purple_notify_info(gc, _("QQ Server News"), title_utf8, content_utf8);
+	} else {
+		purple_debug_info("QQ", "QQ Server news:\n%s\n%s", title_utf8, content_utf8);
+	}
+	g_free(title);
+	g_free(title_utf8);
+	g_free(brief);
+	g_free(url);
+	g_free(content);
+	g_free(content_utf8);
+}
+
 /* process received normal text IM */
 static void _qq_process_recv_normal_im_text(guint8 *data, gint len, qq_recv_normal_im_common *common, PurpleConnection *gc)
 {
@@ -266,7 +313,7 @@ static void _qq_process_recv_normal_im_text(guint8 *data, gint len, qq_recv_norm
 	/* now it is QQ_NORMAL_IM_TEXT */
 	/*
 	   if (*cursor >= (data + len - 1)) {
-	   purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Received normal IM text is empty\n");
+	   purple_debug_warning("QQ", "Received normal IM text is empty\n");
 	   return;
 	   } else
 	   */
@@ -313,9 +360,9 @@ static void _qq_process_recv_normal_im_text(guint8 *data, gint len, qq_recv_norm
 	}
 	qq_b = (b == NULL) ? NULL : (qq_buddy *) b->proto_data;
 	if (qq_b != NULL) {
-		qq_b->client_version = common->sender_ver; 
+		qq_b->client_version = common->sender_ver;
 	}
-	
+
 	purple_msg_type = (im_text->msg_type == QQ_IM_AUTO_REPLY) ? PURPLE_MESSAGE_AUTO_RESP : 0;
 
 	msg_with_purple_smiley = qq_smiley_to_purple(im_text->msg);
@@ -350,19 +397,18 @@ static void _qq_process_recv_normal_im(guint8 *data, gint len, PurpleConnection
 
 	bytes = _qq_normal_im_common_read(data, len, common);
 	if (bytes < 0) {
-		purple_debug (PURPLE_DEBUG_ERROR, "QQ",
-				"Fail read the common part of normal IM\n");
+		purple_debug_error("QQ", "Fail read the common part of normal IM\n");
 		return;
 	}
 
 	switch (common->normal_im_type) {
 		case QQ_NORMAL_IM_TEXT:
-			purple_debug (PURPLE_DEBUG_INFO, "QQ",
+			purple_debug_info("QQ",
 					"Normal IM, text type:\n [%d] => [%d], src: %s (%04X)\n",
 					common->sender_uid, common->receiver_uid,
 					qq_get_ver_desc (common->sender_ver), common->sender_ver);
 			if (bytes >= len - 1) {
-				purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Received normal IM text is empty\n");
+				purple_debug_warning("QQ", "Received normal IM text is empty\n");
 				return;
 			}
 			_qq_process_recv_normal_im_text(data + bytes, len - bytes, common, gc);
@@ -382,16 +428,50 @@ static void _qq_process_recv_normal_im(guint8 *data, gint len, PurpleConnection
 		case QQ_NORMAL_IM_FILE_NOTIFY:
 			qq_process_recv_file_notify(data + bytes, len - bytes, common->sender_uid, gc);
 			break;
+		case QQ_NORMAL_IM_FILE_REQUEST_TCP:
+			/* Check ReceivedFileIM::parseContents in eva*/
+			/* some client use this function for detect invisable buddy*/
+			purple_debug_warning("QQ", "Normal IM, not support QQ_NORMAL_IM_FILE_REQUEST_TCP\n");
+			qq_show_packet ("Not support", data, len);
+			break;
+		case QQ_NORMAL_IM_FILE_APPROVE_TCP:
+			purple_debug_warning("QQ", "Normal IM, not support QQ_NORMAL_IM_FILE_APPROVE_TCP\n");
+			qq_show_packet ("Not support", data, len);
+			break;
+		case QQ_NORMAL_IM_FILE_REJECT_TCP:
+			purple_debug_warning("QQ", "Normal IM, not support QQ_NORMAL_IM_FILE_REJECT_TCP\n");
+			qq_show_packet ("Not support", data, len);
+			break;
+		case QQ_NORMAL_IM_FILE_PASV:
+			purple_debug_warning("QQ", "Normal IM, not support QQ_NORMAL_IM_FILE_PASV\n");
+			qq_show_packet ("Not support", data, len);
+			break;
+		case QQ_NORMAL_IM_FILE_EX_REQUEST_UDP:
+			purple_debug_warning("QQ", "Normal IM, not support QQ_NORMAL_IM_FILE_REQUEST_TCP\n");
+			qq_show_packet ("QQ", data, len);
+			break;
+		case QQ_NORMAL_IM_FILE_EX_REQUEST_ACCEPT:
+			purple_debug_warning("QQ", "Normal IM, not support QQ_NORMAL_IM_FILE_EX_REQUEST_ACCEPT\n");
+			qq_show_packet ("QQ", data, len);
+			break;
+		case QQ_NORMAL_IM_FILE_EX_REQUEST_CANCEL:
+			purple_debug_warning("QQ", "Normal IM, not support QQ_NORMAL_IM_FILE_EX_REQUEST_CANCEL\n");
+			qq_show_packet ("Not support", data, len);
+			break;
+		case QQ_NORMAL_IM_FILE_EX_NOTIFY_IP:
+			purple_debug_warning("QQ", "Normal IM, not support QQ_NORMAL_IM_FILE_EX_NOTIFY_IP\n");
+			qq_show_packet ("Not support", data, len);
+			break;
 		default:
 			im_unprocessed = g_newa (qq_recv_normal_im_unprocessed, 1);
 			im_unprocessed->common = common;
 			im_unprocessed->unknown = data + bytes;
 			im_unprocessed->length = len - bytes;
 			/* a simple process here, maybe more later */
-			purple_debug (PURPLE_DEBUG_WARNING, "QQ",
+			purple_debug_warning("QQ",
 					"Normal IM, unprocessed type [0x%04x], len %d\n",
 					common->normal_im_type, im_unprocessed->length);
-			qq_show_packet ("QQ unk-im", im_unprocessed->unknown, im_unprocessed->length);
+			qq_show_packet ("QQ", im_unprocessed->unknown, im_unprocessed->length);
 			return;
 	}
 }
@@ -412,7 +492,7 @@ static void _qq_process_recv_sys_im(guint8 *data, gint data_len, PurpleConnectio
 
 	reply = strtol(segments[0], NULL, 10);
 	if (reply == QQ_RECV_SYS_IM_KICK_OUT)
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "We are kicked out by QQ server\n");
+		purple_debug_warning("QQ", "We are kicked out by QQ server\n");
 	msg_utf8 = qq_to_utf8(segments[1], QQ_CHARSET_DEFAULT);
 	purple_notify_warning(gc, NULL, _("System Message"), msg_utf8);
 }
@@ -475,7 +555,7 @@ void qq_send_packet_im(PurpleConnection *gc, guint32 to_uid, gchar *msg, gint ty
 		g_datalist_clear(&attribs);
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_MESG", "send mesg: %s\n", msg);
+	purple_debug_info("QQ_MESG", "send mesg: %s\n", msg);
 	msg_filtered = purple_markup_strip_html(msg);
 	msg_len = strlen(msg_filtered);
 	now = time(NULL);
@@ -526,9 +606,9 @@ void qq_send_packet_im(PurpleConnection *gc, guint32 to_uid, gchar *msg, gint ty
 	qq_show_packet("QQ_raw_data debug", raw_data, bytes);
 
 	if (bytes == raw_len)	/* create packet OK */
-		qq_send_cmd(qd, QQ_CMD_SEND_IM, raw_data, bytes);
+		qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes);
 	else
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
+		purple_debug_error("QQ",
 				"Fail creating send_im packet, expect %d bytes, build %d bytes\n", raw_len, bytes);
 
 	if (font_color)
@@ -549,10 +629,10 @@ void qq_process_send_im_reply(guint8 *data, gint data_len, PurpleConnection *gc)
 	qd = gc->proto_data;
 
 	if (data[0] != QQ_SEND_IM_REPLY_OK) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Send IM fail\n");
+		purple_debug_warning("QQ", "Send IM fail\n");
 		purple_notify_error(gc, _("Error"), _("Failed to send IM."), NULL);
 	}	else {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "IM ACK OK\n");
+		purple_debug_info("QQ", "IM ACK OK\n");
 	}
 }
 
@@ -569,16 +649,17 @@ void qq_process_recv_im(guint8 *data, gint data_len, guint16 seq, PurpleConnecti
 	qd = (qq_data *) gc->proto_data;
 
 	if (data_len < 16) {	/* we need to ack with the first 16 bytes */
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "IM is too short\n");
+		purple_debug_error("QQ", "MSG is too short\n");
 		return;
 	} else {
-		_qq_send_packet_recv_im_ack(gc, seq, data);
+		/* when we receive a message,
+		 * we send an ACK which is the first 16 bytes of incoming packet */
+		qq_send_server_reply(gc, QQ_CMD_RECV_IM, seq, data, 16);
 	}
 
 	/* check len first */
 	if (data_len < 20) {	/* length of im_header */
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
-				"Fail read recv IM header, len should longer than 20 bytes, read %d bytes\n", data_len);
+		purple_debug_error("QQ", "Invald MSG header, len %d < 20\n", data_len);
 		return;
 	}
 
@@ -594,77 +675,71 @@ void qq_process_recv_im(guint8 *data, gint data_len, guint16 seq, PurpleConnecti
 	/* im_header prepared */
 
 	if (im_header->receiver_uid != qd->uid) {	/* should not happen */
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "IM to [%d], NOT me\n", im_header->receiver_uid);
+		purple_debug_error("QQ", "MSG to [%d], NOT me\n", im_header->receiver_uid);
 		return;
 	}
 
 	/* check bytes */
 	if (bytes >= data_len - 1) {
-		purple_debug (PURPLE_DEBUG_WARNING, "QQ", "Received IM is empty\n");
+		purple_debug_warning("QQ", "Empty MSG\n");
 		return;
 	}
 
 	switch (im_header->im_type) {
-		case QQ_RECV_IM_TO_BUDDY:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"IM from buddy [%d], I am in his/her buddy list\n", im_header->sender_uid);
-			_qq_process_recv_normal_im(data + bytes, data_len - bytes, gc); /* position and rest length */
+		case QQ_RECV_IM_NEWS:
+			_qq_process_recv_news(data + bytes, data_len - bytes, gc);
 			break;
+		case QQ_RECV_IM_FROM_BUDDY_2006:
+		case QQ_RECV_IM_FROM_UNKNOWN_2006:
 		case QQ_RECV_IM_TO_UNKNOWN:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"IM from buddy [%d], I am a stranger to him/her\n", im_header->sender_uid);
+		case QQ_RECV_IM_TO_BUDDY:
+			purple_debug_info("QQ", "MSG from buddy [%d]\n", im_header->sender_uid);
 			_qq_process_recv_normal_im(data + bytes, data_len - bytes, gc);
 			break;
 		case QQ_RECV_IM_UNKNOWN_QUN_IM:
 		case QQ_RECV_IM_TEMP_QUN_IM:
 		case QQ_RECV_IM_QUN_IM:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "IM from group, internal_id [%d]\n", im_header->sender_uid);
+			purple_debug_info("QQ", "MSG from room [%d]\n", im_header->sender_uid);
 			/* sender_uid is in fact id */
-			qq_process_recv_group_im(data + bytes, data_len - bytes, im_header->sender_uid, gc, im_header->im_type);
+			qq_process_room_msg_normal(data + bytes, data_len - bytes, im_header->sender_uid, gc, im_header->im_type);
 			break;
 		case QQ_RECV_IM_ADD_TO_QUN:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"IM from group, added by group internal_id [%d]\n", im_header->sender_uid);
+			purple_debug_info("QQ", "Notice from [%d], Added\n", im_header->sender_uid);
 			/* sender_uid is group id
 			 * we need this to create a dummy group and add to blist */
-			qq_process_recv_group_im_been_added(data + bytes, data_len - bytes, im_header->sender_uid, gc);
+			qq_process_room_msg_been_added(data + bytes, data_len - bytes, im_header->sender_uid, gc);
 			break;
 		case QQ_RECV_IM_DEL_FROM_QUN:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"IM from group, removed by group internal_ID [%d]\n", im_header->sender_uid);
+			purple_debug_info("QQ", "Notice from room [%d], Removed\n", im_header->sender_uid);
 			/* sender_uid is group id */
-			qq_process_recv_group_im_been_removed(data + bytes, data_len - bytes, im_header->sender_uid, gc);
+			qq_process_room_msg_been_removed(data + bytes, data_len - bytes, im_header->sender_uid, gc);
 			break;
 		case QQ_RECV_IM_APPLY_ADD_TO_QUN:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"IM from group, apply to join group internal_ID [%d]\n", im_header->sender_uid);
+			purple_debug_info("QQ", "Notice from room [%d], Joined\n", im_header->sender_uid);
 			/* sender_uid is group id */
-			qq_process_recv_group_im_apply_join(data + bytes, data_len - bytes, im_header->sender_uid, gc);
+			qq_process_room_msg_apply_join(data + bytes, data_len - bytes, im_header->sender_uid, gc);
 			break;
 		case QQ_RECV_IM_APPROVE_APPLY_ADD_TO_QUN:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"IM for group system info, approved by group internal_id [%d]\n",
+			purple_debug_info("QQ", "Notice from room [%d], Confirm add in\n",
 					im_header->sender_uid);
 			/* sender_uid is group id */
-			qq_process_recv_group_im_been_approved(data + bytes, data_len - bytes, im_header->sender_uid, gc);
+			qq_process_room_msg_been_approved(data + bytes, data_len - bytes, im_header->sender_uid, gc);
 			break;
 		case QQ_RECV_IM_REJCT_APPLY_ADD_TO_QUN:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"IM for group system info, rejected by group internal_id [%d]\n",
+			purple_debug_info("QQ", "Notice from room [%d], Refuse add in\n",
 					im_header->sender_uid);
 			/* sender_uid is group id */
-			qq_process_recv_group_im_been_rejected(data + bytes, data_len - bytes, im_header->sender_uid, gc);
+			qq_process_room_msg_been_rejected(data + bytes, data_len - bytes, im_header->sender_uid, gc);
 			break;
 		case QQ_RECV_IM_SYS_NOTIFICATION:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ",
-					"IM from [%d], should be a system administrator\n", im_header->sender_uid);
+			purple_debug_info("QQ", "Admin notice from [%d]\n", im_header->sender_uid);
 			_qq_process_recv_sys_im(data + bytes, data_len - bytes, gc);
 			break;
 		default:
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-					"IM from [%d], [0x%02x] %s is not processed\n",
-					im_header->sender_uid,
-					im_header->im_type, qq_get_recv_im_type_str(im_header->im_type));
+			purple_debug_warning("QQ", "MSG from [%d], unknown type %s [0x%02x]\n",
+					im_header->sender_uid, qq_get_recv_im_type_str(im_header->im_type),
+					im_header->im_type);
+			qq_show_packet("Unknown MSG type", data, data_len);
 	}
 }
 
diff --git a/libpurple/protocols/qq/im.h b/libpurple/protocols/qq/im.h
index 5e55413b23..4ada57fafd 100644
--- a/libpurple/protocols/qq/im.h
+++ b/libpurple/protocols/qq/im.h
@@ -41,6 +41,7 @@ enum {
 enum {
 	QQ_RECV_IM_TO_BUDDY = 0x0009,
 	QQ_RECV_IM_TO_UNKNOWN = 0x000a,
+	QQ_RECV_IM_NEWS = 0x0018,
 	QQ_RECV_IM_UNKNOWN_QUN_IM = 0x0020,
 	QQ_RECV_IM_ADD_TO_QUN = 0x0021,
 	QQ_RECV_IM_DEL_FROM_QUN = 0x0022,
@@ -50,7 +51,9 @@ enum {
 	QQ_RECV_IM_CREATE_QUN = 0x0026,
 	QQ_RECV_IM_TEMP_QUN_IM = 0x002A,
 	QQ_RECV_IM_QUN_IM = 0x002B,
-	QQ_RECV_IM_SYS_NOTIFICATION = 0x0030
+	QQ_RECV_IM_SYS_NOTIFICATION = 0x0030,
+	QQ_RECV_IM_FROM_BUDDY_2006 = 0x0084,
+	QQ_RECV_IM_FROM_UNKNOWN_2006 = 0x0085,
 };
 
 guint8 *qq_get_send_im_tail(const gchar *font_color,
diff --git a/libpurple/protocols/qq/packet_parse.c b/libpurple/protocols/qq/packet_parse.c
index 8698a78dc8..7e71960aae 100644
--- a/libpurple/protocols/qq/packet_parse.c
+++ b/libpurple/protocols/qq/packet_parse.c
@@ -46,8 +46,8 @@ gint qq_get8(guint8 *b, guint8 *buf)
 	memcpy(&b_dest, buf, sizeof(b_dest));
 	*b = b_dest;
 #ifdef PARSER_DEBUG
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][get8] buf %p\n", (void *)buf);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][get8] b_dest 0x%2x, *b 0x%02x\n", b_dest, *b);
+	purple_debug_info("QQ", "[DBG][get8] buf %p\n", (void *)buf);
+	purple_debug_info("QQ", "[DBG][get8] b_dest 0x%2x, *b 0x%02x\n", b_dest, *b);
 #endif
 	return sizeof(b_dest);
 }
@@ -61,8 +61,8 @@ gint qq_get16(guint16 *w, guint8 *buf)
 	memcpy(&w_dest, buf, sizeof(w_dest));
 	*w = g_ntohs(w_dest);
 #ifdef PARSER_DEBUG
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][get16] buf %p\n", (void *)buf);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][get16] w_dest 0x%04x, *w 0x%04x\n", w_dest, *w);
+	purple_debug_info("QQ", "[DBG][get16] buf %p\n", (void *)buf);
+	purple_debug_info("QQ", "[DBG][get16] w_dest 0x%04x, *w 0x%04x\n", w_dest, *w);
 #endif
 	return sizeof(w_dest);
 }
@@ -75,8 +75,8 @@ gint qq_get32(guint32 *dw, guint8 *buf)
 	memcpy(&dw_dest, buf, sizeof(dw_dest));
 	*dw = g_ntohl(dw_dest);
 #ifdef PARSER_DEBUG
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][get32] buf %p\n", (void *)buf);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][get32] dw_dest 0x%08x, *dw 0x%08x\n", dw_dest, *dw);
+	purple_debug_info("QQ", "[DBG][get32] buf %p\n", (void *)buf);
+	purple_debug_info("QQ", "[DBG][get32] dw_dest 0x%08x, *dw 0x%08x\n", dw_dest, *dw);
 #endif
 	return sizeof(dw_dest);
 }
@@ -93,7 +93,7 @@ gint qq_getdata(guint8 *data, gint datalen, guint8 *buf)
 {
     memcpy(data, buf, datalen);
 #ifdef PARSER_DEBUG
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][getdata] buf %p\n", (void *)buf);
+	purple_debug_info("QQ", "[DBG][getdata] buf %p\n", (void *)buf);
 #endif
     return datalen;
 }
@@ -107,12 +107,12 @@ gint qq_getime(time_t *t, guint8 *buf)
 	guint32 dw_dest;
 	memcpy(&dw_dest, buf, sizeof(dw_dest));
 #ifdef PARSER_DEBUG
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][getime] buf %p\n", (void *)buf);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][getime] dw_dest before 0x%08x\n", dw_dest);
+	purple_debug_info("QQ", "[DBG][getime] buf %p\n", (void *)buf);
+	purple_debug_info("QQ", "[DBG][getime] dw_dest before 0x%08x\n", dw_dest);
 #endif
 	dw_dest = g_ntohl(dw_dest);
 #ifdef PARSER_DEBUG
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][getime] dw_dest after 0x%08x\n", dw_dest);
+	purple_debug_info("QQ", "[DBG][getime] dw_dest after 0x%08x\n", dw_dest);
 #endif
 	memcpy(t, &dw_dest, sizeof(dw_dest));
 	return sizeof(dw_dest);
@@ -125,8 +125,8 @@ gint qq_put8(guint8 *buf, guint8 b)
 {
     memcpy(buf, &b, sizeof(b));
 #ifdef PARSER_DEBUG
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][put8] buf %p\n", (void *)buf);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][put8] b 0x%02x\n", b);
+	purple_debug_info("QQ", "[DBG][put8] buf %p\n", (void *)buf);
+	purple_debug_info("QQ", "[DBG][put8] b 0x%02x\n", b);
 #endif
     return sizeof(b);
 }
@@ -139,8 +139,8 @@ gint qq_put16(guint8 *buf, guint16 w)
     guint16 w_porter;
     w_porter = g_htons(w);
 #ifdef PARSER_DEBUG
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][put16] buf %p\n", (void *)buf);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][put16] w 0x%04x, w_porter 0x%04x\n", w, w_porter);
+	purple_debug_info("QQ", "[DBG][put16] buf %p\n", (void *)buf);
+	purple_debug_info("QQ", "[DBG][put16] w 0x%04x, w_porter 0x%04x\n", w, w_porter);
 #endif
     memcpy(buf, &w_porter, sizeof(w_porter));
     return sizeof(w_porter);
@@ -154,8 +154,8 @@ gint qq_put32(guint8 *buf, guint32 dw)
     guint32 dw_porter;
     dw_porter = g_htonl(dw);
 #ifdef PARSER_DEBUG
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][put32] buf %p\n", (void *)buf);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][put32] dw 0x%08x, dw_porter 0x%08x\n", dw, dw_porter);
+	purple_debug_info("QQ", "[DBG][put32] buf %p\n", (void *)buf);
+	purple_debug_info("QQ", "[DBG][put32] dw 0x%08x, dw_porter 0x%08x\n", dw, dw_porter);
 #endif
     memcpy(buf, &dw_porter, sizeof(dw_porter));
     return sizeof(dw_porter);
@@ -173,7 +173,7 @@ gint qq_putdata(guint8 *buf, const guint8 *data, const int datalen)
 {
     memcpy(buf, data, datalen);
 #ifdef PARSER_DEBUG
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "[DBG][putdata] buf %p\n", (void *)buf);
+	purple_debug_info("QQ", "[DBG][putdata] buf %p\n", (void *)buf);
 #endif
     return datalen;
 }
diff --git a/libpurple/protocols/qq/qq.c b/libpurple/protocols/qq/qq.c
index 0e7a591267..8ea5e26272 100644
--- a/libpurple/protocols/qq/qq.c
+++ b/libpurple/protocols/qq/qq.c
@@ -24,10 +24,6 @@
 
 #include "internal.h"
 
-#ifdef _WIN32
-#define random rand
-#endif
-
 #include "accountopt.h"
 #include "debug.h"
 #include "notify.h"
@@ -62,79 +58,69 @@
 #define OPENQ_AUTHOR            "Puzzlebird"
 #define OPENQ_WEBSITE            "http://openq.sourceforge.net"
 
-#define QQ_TCP_PORT       		8000
-#define QQ_UDP_PORT             	8000
+static GList *server_list_build(gchar select)
+{
+	GList *list = NULL;
+
+	if ( select == 'T' || select == 'A') {
+		list = g_list_append(list, "tcpconn.tencent.com:8000");
+		list = g_list_append(list, "tcpconn2.tencent.com:8000");
+		list = g_list_append(list, "tcpconn3.tencent.com:8000");
+		list = g_list_append(list, "tcpconn4.tencent.com:8000");
+		list = g_list_append(list, "tcpconn5.tencent.com:8000");
+		list = g_list_append(list, "tcpconn6.tencent.com:8000");
+	}
+	if ( select == 'U' || select == 'A') {
+		list = g_list_append(list, "sz.tencent.com:8000");
+		list = g_list_append(list, "sz2.tencent.com:8000");
+		list = g_list_append(list, "sz3.tencent.com:8000");
+		list = g_list_append(list, "sz4.tencent.com:8000");
+		list = g_list_append(list, "sz5.tencent.com:8000");
+		list = g_list_append(list, "sz6.tencent.com:8000");
+		list = g_list_append(list, "sz7.tencent.com:8000");
+		list = g_list_append(list, "sz8.tencent.com:8000");
+		list = g_list_append(list, "sz9.tencent.com:8000");
+	}
+	return list;
+}
 
-static void server_list_create(PurpleAccount *account) {
+static void server_list_create(PurpleAccount *account)
+{
 	PurpleConnection *gc;
 	qq_data *qd;
+	PurpleProxyInfo *gpi;
 	const gchar *user_server;
-	int port;
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Create server list\n");
 	gc = purple_account_get_connection(account);
 	g_return_if_fail(gc != NULL  && gc->proto_data != NULL);
 	qd = gc->proto_data;
 
+	gpi = purple_proxy_get_setup(account);
+
 	qd->use_tcp = purple_account_get_bool(account, "use_tcp", TRUE);
-	port = purple_account_get_int(account, "port", 0);
-	if (port == 0) {
-		if (qd->use_tcp) {
-			port = QQ_TCP_PORT;
-		} else {
-			port = QQ_UDP_PORT;
-		}
-	}
-	qd->user_port = port;
 
- 	g_return_if_fail(qd->user_server == NULL);
 	user_server = purple_account_get_string(account, "server", NULL);
-	if (user_server != NULL && strlen(user_server) > 0) {
-		qd->user_server = g_strdup(user_server);
-	}
-
-	if (qd->user_server != NULL) {
-		qd->servers = g_list_append(qd->servers, qd->user_server);
+	purple_debug_info("QQ", "Select server '%s'\n", user_server);
+	if ( (user_server != NULL && strlen(user_server) > 0) && strcasecmp(user_server, "auto") != 0) {
+		qd->servers = g_list_append(qd->servers, g_strdup(user_server));
 		return;
 	}
+
 	if (qd->use_tcp) {
-		qd->servers = g_list_append(qd->servers, "tcpconn.tencent.com");
-		qd->servers = g_list_append(qd->servers, "tcpconn2.tencent.com");
-		qd->servers = g_list_append(qd->servers, "tcpconn3.tencent.com");
-		qd->servers = g_list_append(qd->servers, "tcpconn4.tencent.com");
-		qd->servers = g_list_append(qd->servers, "tcpconn5.tencent.com");
-		qd->servers = g_list_append(qd->servers, "tcpconn6.tencent.com");
+		qd->servers =	server_list_build('T');
 		return;
     }
-    
-	qd->servers = g_list_append(qd->servers, "sz.tencent.com");
-	qd->servers = g_list_append(qd->servers, "sz2.tencent.com");
-	qd->servers = g_list_append(qd->servers, "sz3.tencent.com");
-	qd->servers = g_list_append(qd->servers, "sz4.tencent.com");
-	qd->servers = g_list_append(qd->servers, "sz5.tencent.com");
-	qd->servers = g_list_append(qd->servers, "sz6.tencent.com");
-	qd->servers = g_list_append(qd->servers, "sz7.tencent.com");
-	qd->servers = g_list_append(qd->servers, "sz8.tencent.com");
-	qd->servers = g_list_append(qd->servers, "sz9.tencent.com");
+
+	qd->servers =	server_list_build('U');
 }
 
-static void server_list_remove_all(qq_data *qd) {
+static void server_list_remove_all(qq_data *qd)
+{
  	g_return_if_fail(qd != NULL);
 
-	if (qd->real_hostname) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "free real_hostname\n");
-		g_free(qd->real_hostname);
-		qd->real_hostname = NULL;
-	}
-	
-	if (qd->user_server != NULL) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "free user_server\n");
-		g_free(qd->user_server);
-		qd->user_server = NULL;
-	}
-
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "free server list\n");
+	purple_debug_info("QQ", "free server list\n");
  	g_list_free(qd->servers);
+	qd->curr_server = NULL;
 }
 
 static void qq_login(PurpleAccount *account)
@@ -151,6 +137,7 @@ static void qq_login(PurpleAccount *account)
 	gc->flags |= PURPLE_CONNECTION_HTML | PURPLE_CONNECTION_NO_BGCOLOR | PURPLE_CONNECTION_AUTO_RESP;
 
 	qd = g_new0(qq_data, 1);
+	memset(qd, 0, sizeof(qq_data));
 	qd->gc = gc;
 	gc->proto_data = qd;
 
@@ -165,10 +152,36 @@ static void qq_login(PurpleAccount *account)
 	}
 
 	server_list_create(account);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ",
-		"Server list has %d\n", g_list_length(qd->servers));
+	purple_debug_info("QQ", "Server list has %d\n", g_list_length(qd->servers));
+
+	qd->is_show_notice = purple_account_get_bool(account, "show_notice", TRUE);
+	qd->is_show_news = purple_account_get_bool(account, "show_news", TRUE);
 
-	qq_connect(account);
+	qd->resend_times = purple_prefs_get_int("/plugins/prpl/qq/resend_times");
+	if (qd->resend_times <= 1) qd->itv_config.resend = 4;
+
+	qd->itv_config.resend = purple_prefs_get_int("/plugins/prpl/qq/resend_interval");
+	if (qd->itv_config.resend <= 0) qd->itv_config.resend = 3;
+	purple_debug_info("QQ", "Resend interval %d, retries %d\n",
+			qd->itv_config.resend, qd->resend_times);
+
+	qd->itv_config.keep_alive = purple_account_get_int(account, "keep_alive_interval", 60);
+	if (qd->itv_config.keep_alive < 30) qd->itv_config.keep_alive = 30;
+	qd->itv_config.keep_alive /= qd->itv_config.resend;
+	qd->itv_count.keep_alive = qd->itv_config.keep_alive;
+
+	qd->itv_config.update = purple_account_get_int(account, "update_interval", 300);
+	if (qd->itv_config.update > 0) {
+		if (qd->itv_config.update < qd->itv_config.keep_alive) {
+			qd->itv_config.update = qd->itv_config.keep_alive;
+		}
+		qd->itv_config.update /= qd->itv_config.resend;
+		qd->itv_count.update = qd->itv_config.update;
+	} else {
+		qd->itv_config.update = 0;
+	}
+
+	qd->connect_watcher = purple_timeout_add_seconds(0, qq_connect_later, gc);
 }
 
 /* clean up the given QQ connection and free all resources */
@@ -179,12 +192,20 @@ static void qq_close(PurpleConnection *gc)
 	g_return_if_fail(gc != NULL  && gc->proto_data);
 	qd = gc->proto_data;
 
-	qq_disconnect(gc);
+	if (qd->check_watcher > 0) {
+		purple_timeout_remove(qd->check_watcher);
+		qd->check_watcher = 0;
+	}
+
+	if (qd->connect_watcher > 0) {
+		purple_timeout_remove(qd->connect_watcher);
+		qd->connect_watcher = 0;
+	}
 
+	qq_disconnect(gc);
 	server_list_remove_all(qd);
-	
-	g_free(qd);
 
+	g_free(qd);
 	gc->proto_data = NULL;
 }
 
@@ -212,10 +233,10 @@ static gchar *_qq_status_text(PurpleBuddy *b)
 		g_string_append(status, _("Offline"));
 		break;
 	case QQ_BUDDY_ONLINE_NORMAL:
-		return NULL;
+		g_string_append(status, _("Online"));
 		break;
 	/* TODO What does this status mean? Labelling it as offline... */
-	case QQ_BUDDY_ONLINE_OFFLINE:
+	case QQ_BUDDY_CHANGE_TO_OFFLINE:
 		g_string_append(status, _("Offline"));
 		break;
 	case QQ_BUDDY_ONLINE_AWAY:
@@ -303,8 +324,8 @@ static void _qq_tooltip_text(PurpleBuddy *b, PurpleNotifyUserInfo *user_info, gb
 		g_string_append( str, _(" Video") );
 	}
 
-	if (q_bud->ext_flag & QQ_EXT_FLAG_SPACE) {
-		g_string_append( str, _(" Space") );
+	if (q_bud->ext_flag & QQ_EXT_FLAG_ZONE) {
+		g_string_append( str, _(" Zone") );
 	}
 	purple_notify_user_info_add_pair(user_info, _("Flag"), str->str);
 
@@ -329,7 +350,7 @@ static const char *_qq_list_emblem(PurpleBuddy *b)
 {
 	/* each char** are refering to a filename in pixmaps/purple/status/default/ */
 	qq_buddy *q_bud;
-	
+
 	if (!b || !(q_bud = b->proto_data)) {
 		return NULL;
 	}
@@ -374,11 +395,11 @@ static GList *_qq_away_states(PurpleAccount *ga)
 }
 
 /* initiate QQ away with proper change_status packet */
-static void _qq_set_away(PurpleAccount *account, PurpleStatus *status)
+static void _qq_change_status(PurpleAccount *account, PurpleStatus *status)
 {
 	PurpleConnection *gc = purple_account_get_connection(account);
 
-	qq_send_packet_change_status(gc);
+	qq_request_change_status(gc, 0);
 }
 
 /* IMPORTANT: PurpleConvImFlags -> PurpleMessageFlags */
@@ -444,12 +465,12 @@ static void _qq_get_info(PurpleConnection *gc, const gchar *who)
 	uid = purple_name_to_uid(who);
 
 	if (uid <= 0) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Not valid QQid: %s\n", who);
+		purple_debug_error("QQ", "Not valid QQid: %s\n", who);
 		purple_notify_error(gc, NULL, _("Invalid name"), NULL);
 		return;
 	}
 
-	qq_send_packet_get_level(gc, uid);
+	qq_request_get_level(gc, uid);
 	qq_send_packet_get_info(gc, uid, TRUE);
 }
 
@@ -502,7 +523,7 @@ static void _qq_menu_block_buddy(PurpleBlistNode * node)
 */
 
 /* show a brief summary of what we get from login packet */
-static void _qq_menu_show_login_info(PurplePluginAction *action)
+static void _qq_menu_account_info(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
 	qq_data *qd;
@@ -516,10 +537,17 @@ static void _qq_menu_show_login_info(PurplePluginAction *action)
 
 	g_string_append(info, "<hr>\n");
 
-	g_string_append_printf(info, _("<b>Server</b>: %s: %d<br>\n"), qd->server_name, qd->real_port);
+	g_string_append_printf(info, _("<b>Server</b>: %s<br>\n"), qd->curr_server);
 	g_string_append_printf(info, _("<b>Connection Mode</b>: %s<br>\n"), qd->use_tcp ? "TCP" : "UDP");
-	g_string_append_printf(info, _("<b>Real hostname</b>: %s: %d<br>\n"), qd->real_hostname, qd->real_port);
-	g_string_append_printf(info, _("<b>My Public IP</b>: %s<br>\n"), inet_ntoa(qd->my_ip));
+	g_string_append_printf(info, _("<b>My Internet Address</b>: %s<br>\n"), inet_ntoa(qd->my_ip));
+
+	g_string_append(info, "<hr>\n");
+	g_string_append(info, "<i>Network Status</i><br>\n");
+	g_string_append_printf(info, _("<b>Sent</b>: %lu<br>\n"), qd->net_stat.sent);
+	g_string_append_printf(info, _("<b>Resend</b>: %lu<br>\n"), qd->net_stat.resend);
+	g_string_append_printf(info, _("<b>Lost</b>: %lu<br>\n"), qd->net_stat.lost);
+	g_string_append_printf(info, _("<b>Received</b>: %lu<br>\n"), qd->net_stat.rcved);
+	g_string_append_printf(info, _("<b>Received Duplicate</b>: %lu<br>\n"), qd->net_stat.rcved_dup);
 
 	g_string_append(info, "<hr>\n");
 	g_string_append(info, "<i>Information below may not be accurate</i><br>\n");
@@ -612,7 +640,7 @@ static GList *_qq_actions(PurplePlugin *plugin, gpointer context)
 	act = purple_plugin_action_new(_("Change Password"), _qq_menu_change_password);
 	m = g_list_append(m, act);
 
-	act = purple_plugin_action_new(_("Show Login Information"), _qq_menu_show_login_info);
+	act = purple_plugin_action_new(_("Account Information"), _qq_menu_account_info);
 	m = g_list_append(m, act);
 
 	/*
@@ -633,7 +661,7 @@ static GList *_qq_chat_menu(PurpleBlistNode *node)
 	PurpleMenuAction *act;
 
 	m = NULL;
-	act = purple_menu_action_new(_("Leave this QQ Qun"), PURPLE_CALLBACK(_qq_menu_unsubscribe_group), NULL, NULL);
+	act = purple_menu_action_new(_("Leave the QQ Qun"), PURPLE_CALLBACK(_qq_menu_unsubscribe_group), NULL, NULL);
 	m = g_list_append(m, act);
 
 	/* TODO: enable this
@@ -708,7 +736,7 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL,							/* set_info */
 	NULL,							/* send_typing	*/
 	_qq_get_info,						/* get_info */
-	_qq_set_away,						/* set_away */
+	_qq_change_status,						/* change status */
 	NULL,							/* set_idle */
 	NULL,							/* change_passwd */
 	qq_add_buddy,						/* add_buddy */
@@ -802,17 +830,43 @@ static PurplePluginInfo info = {
 static void init_plugin(PurplePlugin *plugin)
 {
 	PurpleAccountOption *option;
+	PurpleKeyValuePair *kvp;
+	GList *list = NULL;
+	GList *kvlist = NULL;
+	GList *entry;
+
+	list = server_list_build('A');
+
+	purple_prefs_add_string_list("/plugins/prpl/qq/serverlist", list);
+	list = purple_prefs_get_string_list("/plugins/prpl/qq/serverlist");
+
+	kvlist = NULL;
+	kvp = g_new0(PurpleKeyValuePair, 1);
+	kvp->key = g_strdup(_("Auto"));
+	kvp->value = g_strdup("auto");
+	kvlist = g_list_append(kvlist, kvp);
+
+	entry = list;
+	while(entry) {
+		if (entry->data != NULL && strlen(entry->data) > 0) {
+			kvp = g_new0(PurpleKeyValuePair, 1);
+			kvp->key = g_strdup(entry->data);
+			kvp->value = g_strdup(entry->data);
+			kvlist = g_list_append(kvlist, kvp);
+		}
+		entry = entry->next;
+	}
 
-	option = purple_account_option_string_new(_("Server"), "server", NULL);
+	option = purple_account_option_list_new(_("Server"), "server", kvlist);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_int_new(_("Port"), "port", 0);
+	option = purple_account_option_bool_new(_("Connect by TCP"), "use_tcp", TRUE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_bool_new(_("Connect using TCP"), "use_tcp", TRUE);
+	option = purple_account_option_bool_new(_("Show server notice"), "show_notice", TRUE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_int_new(_("resend interval(s)"), "resend_interval", 10);
+	option = purple_account_option_bool_new(_("Show server news"), "show_news", TRUE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	option = purple_account_option_int_new(_("Keep alive interval(s)"), "keep_alive_interval", 60);
@@ -824,7 +878,9 @@ static void init_plugin(PurplePlugin *plugin)
 	purple_prefs_add_none("/plugins/prpl/qq");
 	purple_prefs_add_bool("/plugins/prpl/qq/show_status_by_icon", TRUE);
 	purple_prefs_add_bool("/plugins/prpl/qq/show_fake_video", FALSE);
-	purple_prefs_add_bool("/plugins/prpl/qq/prompt_group_msg_on_recv", TRUE);
+	purple_prefs_add_bool("/plugins/prpl/qq/show_room_when_newin", TRUE);
+	purple_prefs_add_int("/plugins/prpl/qq/resend_interval", 3);
+	purple_prefs_add_int("/plugins/prpl/qq/resend_times", 4);
 }
 
 PURPLE_INIT_PLUGIN(qq, init_plugin, info);
diff --git a/libpurple/protocols/qq/qq.h b/libpurple/protocols/qq/qq.h
index 2c21d2959c..503dcc3ce6 100644
--- a/libpurple/protocols/qq/qq.h
+++ b/libpurple/protocols/qq/qq.h
@@ -36,19 +36,23 @@
 
 #define QQ_KEY_LENGTH       16
 
-#ifdef _WIN32
-const char *qq_win32_buddy_icon_dir(void);
-#define QQ_BUDDY_ICON_DIR qq_win32_buddy_icon_dir()
-#endif
-
 typedef struct _qq_data qq_data;
 typedef struct _qq_buddy qq_buddy;
 typedef struct _qq_interval qq_interval;
+typedef struct _qq_net_stat qq_net_stat;
 
 struct _qq_interval {
 	gint resend;
 	gint keep_alive;
-	gint update; 
+	gint update;
+};
+
+struct _qq_net_stat {
+	glong sent;
+	glong resend;
+	glong lost;
+	glong rcved;
+	glong rcved_dup;
 };
 
 struct _qq_buddy {
@@ -68,44 +72,51 @@ struct _qq_buddy {
 	guint16 timeRemainder;
 	time_t signon;
 	time_t idle;
-	time_t last_refresh;
+	time_t last_update;
 
 	gint8  role;		/* role in group, used only in group->members list */
 };
 
+typedef struct _qq_connection qq_connection;
+struct _qq_connection {
+	int fd;				/* socket file handler */
+	int input_handler;
+
+	/* tcp related */
+	int can_write_handler; 	/* use in tcp_send_out */
+	PurpleCircBuffer *tcp_txbuf;
+	guint8 *tcp_rxqueue;
+	int tcp_rxlen;
+};
+
 struct _qq_data {
 	PurpleConnection *gc;
 
-	/* common network resource */
-	GList *servers;
-	gchar *user_server;
-	gint user_port;
+	GSList *openconns;
 	gboolean use_tcp;		/* network in tcp or udp */
-	
-	gchar *server_name;
-	gboolean is_redirect;
-	gchar *real_hostname;	/* from real connction */
-	guint16 real_port;
-	guint reconnect_timeout;
-	gint reconnect_times;
-
-	PurpleProxyConnectData *connect_data;
-	gint fd;				/* socket file handler */
-	gint tx_handler; 	/* socket can_write handle, use in udp connecting and tcp send out */
+	PurpleProxyConnectData *conn_data;
+#ifndef purple_proxy_connect_udp
+	PurpleDnsQueryData *udp_query_data;		/* udp related */
+	gint udp_can_write_handler; 	/* socket can_write handle, use in udp connecting and tcp send out */
+#endif
+	gint fd;							/* socket file handler */
+	qq_net_stat net_stat;
+
+	GList *servers;
+	gchar *curr_server;		/* point to servers->data, do not free*/
+
+	struct in_addr redirect_ip;
+	guint16 redirect_port;
+	guint check_watcher;
+	guint connect_watcher;
+	gint connect_retry;
 
 	qq_interval itv_config;
 	qq_interval itv_count;
-	guint network_timeout;
-	
-	GList *transactions;	/* check ack packet and resend */
+	guint network_watcher;
+	gint resend_times;
 
-	/* tcp related */
-	PurpleCircBuffer *tcp_txbuf;
-	guint8 *tcp_rxqueue;
-	int tcp_rxlen;
-	
-	/* udp related */
-	PurpleDnsQueryData *udp_query_data;
+	GList *transactions;	/* check ack packet and resend */
 
 	guint32 uid;			/* QQ number */
 	guint8 *token;		/* get from server*/
@@ -117,7 +128,7 @@ struct _qq_data {
 
 	guint16 send_seq;		/* send sequence number */
 	guint8 login_mode;		/* online of invisible */
-	gboolean logged_in;		/* used by qq-add_buddy */
+	gboolean is_login;		/* used by qq-add_buddy */
 
 	PurpleXfer *xfer;			/* file transfer handler */
 
@@ -148,6 +159,9 @@ struct _qq_data {
 	/* TODO pass qq_send_packet_get_info() a callback and use signals to get rid of these */
 	gboolean modifying_info;
 	gboolean modifying_face;
+
+	gboolean is_show_notice;
+	gboolean is_show_news;
 };
 
 #endif
diff --git a/libpurple/protocols/qq/qq_base.c b/libpurple/protocols/qq/qq_base.c
index b1b5ed9e9e..8517fa9200 100644
--- a/libpurple/protocols/qq/qq_base.c
+++ b/libpurple/protocols/qq/qq_base.c
@@ -48,7 +48,7 @@
 	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 	0x00, 0x00, 0x00, 0x00, 0xbf, 0x14, 0x11, 0x20,
 	0x03, 0x9d, 0xb2, 0xe6, 0xb3, 0x11, 0xb7, 0x13,
-	0x95, 0x67, 0xda, 0x2c, 0x01 
+	0x95, 0x67, 0xda, 0x2c, 0x01
 }; */
 
 /* for QQ 2003iii 0304, fixed value */
@@ -139,7 +139,7 @@ static void get_session_md5(guint8 *session_md5, guint32 uid, guint8 *session_ke
 {
 	guint8 src[QQ_KEY_LENGTH + QQ_KEY_LENGTH];
 	gint bytes = 0;
-	
+
 	bytes += qq_put32(src + bytes, uid);
 	bytes += qq_putdata(src + bytes, session_key, QQ_KEY_LENGTH);
 
@@ -161,7 +161,7 @@ static gint8 process_login_ok(PurpleConnection *gc, guint8 *data, gint len)
 	bytes += qq_get8(&lrop.result, data + bytes);
 	/* 001-016: session key */
 	bytes += qq_getdata(lrop.session_key, sizeof(lrop.session_key), data + bytes);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Got session_key\n");
+	purple_debug_info("QQ", "Got session_key\n");
 	/* 017-020: login uid */
 	bytes += qq_get32(&lrop.uid, data + bytes);
 	/* 021-024: server detected user public IP */
@@ -200,16 +200,16 @@ static gint8 process_login_ok(PurpleConnection *gc, guint8 *data, gint len)
 	bytes += qq_getdata((guint8 *) &lrop.unknown6, 8, data + bytes);
 
 	if (bytes != QQ_LOGIN_REPLY_OK_PACKET_LEN) {	/* fail parsing login info */
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+		purple_debug_warning("QQ",
 			   "Fail parsing login info, expect %d bytes, read %d bytes\n",
 			   QQ_LOGIN_REPLY_OK_PACKET_LEN, bytes);
 	}			/* but we still go on as login OK */
 
 	memcpy(qd->session_key, lrop.session_key, sizeof(qd->session_key));
 	get_session_md5(qd->session_md5, qd->uid, qd->session_key);
-	
+
 	qd->my_ip.s_addr = lrop.client_ip.s_addr;
-	
+
 	qd->my_port = lrop.client_port;
 	qd->login_time = lrop.login_time;
 	qd->last_login_time = lrop.last_login_time;
@@ -237,39 +237,19 @@ static gint8 process_login_redirect(PurpleConnection *gc, guint8 *data, gint len
 	bytes += qq_get16(&lrrp.new_server_port, data + bytes);
 
 	if (bytes != QQ_LOGIN_REPLY_REDIRECT_PACKET_LEN) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
+		purple_debug_error("QQ",
 			   "Fail parsing login redirect packet, expect %d bytes, read %d bytes\n",
 			   QQ_LOGIN_REPLY_REDIRECT_PACKET_LEN, bytes);
 		return QQ_LOGIN_REPLY_ERR_MISC;
 	}
-	
+
 	/* redirect to new server, do not disconnect or connect here
 	 * those connect should be called at packet_process */
-	if (qd->real_hostname) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "free real_hostname\n");
-		g_free(qd->real_hostname);
-		qd->real_hostname = NULL;
-	}
-	qd->real_hostname = g_strdup( inet_ntoa(lrrp.new_server_ip) );
-	qd->real_port = lrrp.new_server_port;
-
+	qd->redirect_ip.s_addr = lrrp.new_server_ip.s_addr;
+	qd->redirect_port = lrrp.new_server_port;
 	return QQ_LOGIN_REPLY_REDIRECT;
 }
 
-/* process login reply which says wrong password */
-static gint8 process_login_wrong_pwd(PurpleConnection *gc, guint8 *data, gint len)
-{
-	gchar *server_reply, *server_reply_utf8;
-	server_reply = g_new0(gchar, len);
-	g_memmove(server_reply, data + 1, len - 1);
-	server_reply_utf8 = qq_to_utf8(server_reply, QQ_CHARSET_DEFAULT);
-	purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Wrong password, server msg in UTF8: %s\n", server_reply_utf8);
-	g_free(server_reply);
-	g_free(server_reply_utf8);
-
-	return QQ_LOGIN_REPLY_ERR_PWD;
-}
-
 /* request before login */
 void qq_send_packet_token(PurpleConnection *gc)
 {
@@ -281,9 +261,9 @@ void qq_send_packet_token(PurpleConnection *gc)
 	qd = (qq_data *) gc->proto_data;
 
 	bytes += qq_put8(buf + bytes, 0);
-	
+
 	qd->send_seq++;
-	qq_send_data(qd, QQ_CMD_TOKEN, qd->send_seq, TRUE, buf, bytes);
+	qq_send_cmd_encrypted(gc, QQ_CMD_TOKEN, qd->send_seq, buf, bytes, TRUE);
 }
 
 /* send login packet to QQ server */
@@ -312,14 +292,14 @@ void qq_send_packet_login(PurpleConnection *gc)
 	memset(raw_data, 0, QQ_LOGIN_DATA_LENGTH);
 
 	encrypted_data = g_newa(guint8, QQ_LOGIN_DATA_LENGTH + 16);	/* 16 bytes more */
-	
+
 	bytes = 0;
 	/* now generate the encrypted data
 	 * 000-015 use password_twice_md5 as key to encrypt empty string */
 	encrypted_len = qq_encrypt(raw_data + bytes, (guint8 *) "", 0, qd->password_twice_md5);
 	g_return_if_fail(encrypted_len == 16);
 	bytes += encrypted_len;
-	
+
 	/* 016-016 */
 	bytes += qq_put8(raw_data + bytes, 0x00);
 	/* 017-020, used to be IP, now zero */
@@ -349,14 +329,15 @@ void qq_send_packet_login(PurpleConnection *gc)
 	bytes += qq_putdata(buf + bytes, encrypted_data, encrypted_len);
 
 	qd->send_seq++;
-	qq_send_data(qd, QQ_CMD_LOGIN, qd->send_seq, TRUE, buf, bytes);
+	qq_send_cmd_encrypted(gc, QQ_CMD_LOGIN, qd->send_seq, buf, bytes, TRUE);
 }
 
-guint8 qq_process_token_reply(PurpleConnection *gc, gchar *error_msg, guint8 *buf, gint buf_len)
+guint8 qq_process_token_reply(PurpleConnection *gc, guint8 *buf, gint buf_len)
 {
 	qq_data *qd;
 	guint8 ret;
 	int token_len;
+	gchar *error_msg;
 
 	g_return_val_if_fail(buf != NULL && buf_len != 0, -1);
 
@@ -364,30 +345,37 @@ guint8 qq_process_token_reply(PurpleConnection *gc, gchar *error_msg, guint8 *bu
 	qd = (qq_data *) gc->proto_data;
 
 	ret = buf[0];
-	
+
 	if (ret != QQ_TOKEN_REPLY_OK) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Unknown request login token reply code : %d\n", buf[0]);
+		purple_debug_error("QQ", "Failed to request token: %d\n", buf[0]);
 		qq_hex_dump(PURPLE_DEBUG_WARNING, "QQ",
 				buf, buf_len,
 				">>> [default] decrypt and dump");
 		error_msg = try_dump_as_gbk(buf, buf_len);
+		if (error_msg == NULL) {
+				error_msg = g_strdup_printf( _("Invalid token reply code, 0x%02X"), ret);
+		}
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_msg);
+		g_free(error_msg);
 		return ret;
 	}
-	
+
 	token_len = buf_len-2;
 	if (token_len <= 0) {
 		error_msg = g_strdup_printf( _("Invalid token len, %d"), token_len);
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_msg);
+		g_free(error_msg);
 		return -1;
 	}
-	
+
 	if (buf[1] != token_len) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ",
+		purple_debug_info("QQ",
 				"Invalid token len. Packet specifies length of %d, actual length is %d\n", buf[1], buf_len-2);
 	}
 	qq_hex_dump(PURPLE_DEBUG_INFO, "QQ",
 			buf+2, token_len,
 			"<<< got a token -> [default] decrypt and dump");
-			
+
 	qd->token = g_new0(guint8, token_len);
 	qd->token_len = token_len;
 	g_memmove(qd->token, buf + 2, qd->token_len);
@@ -402,48 +390,85 @@ void qq_send_packet_logout(PurpleConnection *gc)
 
 	qd = (qq_data *) gc->proto_data;
 	for (i = 0; i < 4; i++)
-		qq_send_cmd_detail(qd, QQ_CMD_LOGOUT, 0xffff, FALSE, qd->password_twice_md5, QQ_KEY_LENGTH);
+		qq_send_cmd(gc, QQ_CMD_LOGOUT, qd->password_twice_md5, QQ_KEY_LENGTH);
 
-	qd->logged_in = FALSE;	/* update login status AFTER sending logout packets */
+	qd->is_login = FALSE;	/* update login status AFTER sending logout packets */
 }
 
 /* process the login reply packet */
-guint8 qq_process_login_reply(guint8 *data, gint data_len, PurpleConnection *gc)
+guint8 qq_process_login_reply( PurpleConnection *gc, guint8 *data, gint data_len)
 {
 	qq_data *qd;
-	gchar* error_msg;
+	guint8 ret = data[0];
+	gchar *server_reply, *server_reply_utf8;
+	gchar *error_msg;
 
 	g_return_val_if_fail(data != NULL && data_len != 0, QQ_LOGIN_REPLY_ERR_MISC);
 
 	qd = (qq_data *) gc->proto_data;
 
-	switch (data[0]) {
+	switch (ret) {
 		case QQ_LOGIN_REPLY_OK:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "Login reply is OK\n");
+			purple_debug_info("QQ", "Login OK\n");
 			return process_login_ok(gc, data, data_len);
 		case QQ_LOGIN_REPLY_REDIRECT:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "Login reply is redirect\n");
+			purple_debug_info("QQ", "Redirect new server\n");
 			return process_login_redirect(gc, data, data_len);
+
+		case QQ_LOGIN_REPLY_REDIRECT_EX:
+			purple_debug_error("QQ", "Extend redirect new server, not supported yet\n");
+			error_msg = g_strdup( _("Unable login for not support Redirect_EX now") );
+			return QQ_LOGIN_REPLY_REDIRECT_EX;
+
 		case QQ_LOGIN_REPLY_ERR_PWD:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "Login reply is error password\n");
-			return process_login_wrong_pwd(gc, data, data_len);
+			server_reply = g_strndup((gchar *)data + 1, data_len - 1);
+			server_reply_utf8 = qq_to_utf8(server_reply, QQ_CHARSET_DEFAULT);
+
+			purple_debug_error("QQ", "Error password: %s\n", server_reply_utf8);
+			error_msg = g_strdup_printf( _("Error password: %s"), server_reply_utf8);
+
+			g_free(server_reply);
+			g_free(server_reply_utf8);
+
+			if (!purple_account_get_remember_password(gc->account)) {
+				purple_account_set_password(gc->account, NULL);
+			}
+
+			purple_connection_error_reason(gc,
+				PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, error_msg);
+			g_free(error_msg);
+
+			return QQ_LOGIN_REPLY_ERR_PWD;
+
 		case QQ_LOGIN_REPLY_NEED_REACTIVE:
-		case QQ_LOGIN_REPLY_REDIRECT_EX:
-			purple_debug(PURPLE_DEBUG_INFO, "QQ", "Login reply is not actived or redirect extend\n");
-		default:
-		break;
-	}
+			server_reply = g_strndup((gchar *)data + 1, data_len - 1);
+			server_reply_utf8 = qq_to_utf8(server_reply, QQ_CHARSET_DEFAULT);
+
+			purple_debug_error("QQ", "Need active: %s\n", server_reply_utf8);
+			error_msg = g_strdup_printf( _("Need active: %s"), server_reply_utf8);
+
+			g_free(server_reply);
+			g_free(server_reply_utf8);
+			break;
 
-	purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Unknown reply code: 0x%02X\n", data[0]);
+		default:
+			purple_debug_error("QQ",
+				"Unable login for unknow reply code 0x%02X\n", data[0]);
 			qq_hex_dump(PURPLE_DEBUG_WARNING, "QQ",
-			data, data_len,
-			">>> [default] decrypt and dump");
-	error_msg = try_dump_as_gbk(data, data_len);
-	if (error_msg)	{
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_msg);
-			g_free(error_msg);
+				data, data_len,
+				">>> [default] decrypt and dump");
+			error_msg = try_dump_as_gbk(data, data_len);
+			if (error_msg == NULL) {
+				error_msg = g_strdup_printf(
+					_("Unable login for unknow reply code 0x%02X"), data[0] );
+			}
+			break;
 	}
-	return QQ_LOGIN_REPLY_ERR_MISC;
+
+	purple_connection_error_reason(gc,
+		PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_msg);
+	g_free(error_msg);
+	return ret;
 }
 
 /* send keep-alive packet to QQ server (it is a heart-beat) */
@@ -460,11 +485,11 @@ void qq_send_packet_keep_alive(PurpleConnection *gc)
 	 * the amount of online QQ users, my ip and port */
 	bytes += qq_put32(raw_data + bytes, qd->uid);
 
-	qq_send_cmd(qd, QQ_CMD_KEEP_ALIVE, raw_data, 4);
+	qq_send_cmd(gc, QQ_CMD_KEEP_ALIVE, raw_data, 4);
 }
 
 /* parse the return of keep-alive packet, it includes some system information */
-gboolean qq_process_keep_alive(guint8 *data, gint data_len, PurpleConnection *gc) 
+gboolean qq_process_keep_alive(guint8 *data, gint data_len, PurpleConnection *gc)
 {
 	qq_data *qd;
 	gchar **segments;
@@ -478,7 +503,7 @@ gboolean qq_process_keep_alive(guint8 *data, gint data_len, PurpleConnection *gc
 	/* the last one is 60, don't know what it is */
 	if (NULL == (segments = split_data(data, data_len, "\x1f", 6)))
 			return TRUE;
-			
+
 	/* segments[0] and segment[1] are all 0x30 ("0") */
 	qd->total_online = strtol(segments[2], NULL, 10);
 	if(0 == qd->total_online) {
@@ -488,9 +513,9 @@ gboolean qq_process_keep_alive(guint8 *data, gint data_len, PurpleConnection *gc
 	qd->my_ip.s_addr = inet_addr(segments[3]);
 	qd->my_port = strtol(segments[4], NULL, 10);
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "keep alive, %s:%d\n",
+	purple_debug_info("QQ", "keep alive, %s:%d\n",
 		inet_ntoa(qd->my_ip), qd->my_port);
-	
+
 	g_strfreev(segments);
 	return TRUE;
 }
diff --git a/libpurple/protocols/qq/qq_base.h b/libpurple/protocols/qq/qq_base.h
index ce5c210bca..eb2e413f04 100644
--- a/libpurple/protocols/qq/qq_base.h
+++ b/libpurple/protocols/qq/qq_base.h
@@ -44,10 +44,10 @@
 #define QQ_UPDATE_ONLINE_INTERVAL   300	/* in sec */
 
 void qq_send_packet_token(PurpleConnection *gc);
-guint8 qq_process_token_reply(PurpleConnection *gc, gchar *error_msg, guint8 *buf, gint buf_len);
+guint8 qq_process_token_reply(PurpleConnection *gc, guint8 *buf, gint buf_len);
 
 void qq_send_packet_login(PurpleConnection *gc);
-guint8 qq_process_login_reply(guint8 *data, gint data_len, PurpleConnection *gc);
+guint8 qq_process_login_reply( PurpleConnection *gc, guint8 *data, gint data_len);
 
 void qq_send_packet_logout(PurpleConnection *gc);
 
diff --git a/libpurple/protocols/qq/qq_network.c b/libpurple/protocols/qq/qq_network.c
index a1354af01b..aee961c930 100644
--- a/libpurple/protocols/qq/qq_network.c
+++ b/libpurple/protocols/qq/qq_network.c
@@ -26,11 +26,6 @@
 #include "debug.h"
 #include "internal.h"
 
-#ifdef _WIN32
-#define random rand
-#define srandom srand
-#endif
-
 #include "buddy_info.h"
 #include "group_info.h"
 #include "group_free.h"
@@ -44,63 +39,100 @@
 #include "utils.h"
 #include "qq_process.h"
 
-/* set QQ_RECONNECT_MAX to 1, when test reconnecting */
-#define QQ_RECONNECT_MAX					4
-#define QQ_RECONNECT_INTERVAL		5000
-#define QQ_KEEP_ALIVE_INTERVAL		60000
-#define QQ_TRANS_INTERVAL				10000
+#define QQ_DEFAULT_PORT					8000
+
+/* set QQ_CONNECT_MAX to 1, when test reconnecting */
+#define QQ_CONNECT_MAX						3
+#define QQ_CONNECT_INTERVAL			2
+#define QQ_CONNECT_CHECK					5
+#define QQ_KEEP_ALIVE_INTERVAL		60
+#define QQ_TRANS_INTERVAL				10
+
+gboolean connect_to_server(PurpleConnection *gc, gchar *server, gint port);
+
+static qq_connection *connection_find(qq_data *qd, int fd) {
+	qq_connection *ret = NULL;
+	GSList *entry = qd->openconns;
+	while(entry) {
+		ret = entry->data;
+		if(ret->fd == fd) return ret;
+		entry = entry->next;
+	}
+	return NULL;
+}
+
+static qq_connection *connection_create(qq_data *qd, int fd) {
+	qq_connection *ret = g_new0(qq_connection, 1);
+	ret->fd = fd;
+	qd->openconns = g_slist_append(qd->openconns, ret);
+	return ret;
+}
+
+static void connection_remove(qq_data *qd, int fd) {
+	qq_connection *conn = connection_find(qd, fd);
+	qd->openconns = g_slist_remove(qd->openconns, conn);
 
+	g_return_if_fail( conn != NULL );
+
+	purple_debug_info("QQ", "Close socket %d\n", conn->fd);
+	if(conn->input_handler > 0)	purple_input_remove(conn->input_handler);
+	if(conn->can_write_handler > 0)	purple_input_remove(conn->can_write_handler);
+
+	if (conn->fd >= 0)	close(conn->fd);
+	if(conn->tcp_txbuf != NULL) 	purple_circ_buffer_destroy(conn->tcp_txbuf);
+	if (conn->tcp_rxqueue != NULL)	g_free(conn->tcp_rxqueue);
+
+	g_free(conn);
+}
+
+static void connection_free_all(qq_data *qd) {
+	qq_connection *ret = NULL;
+	GSList *entry = qd->openconns;
+	while(entry) {
+		ret = entry->data;
+		connection_remove(qd, ret->fd);
+		entry = qd->openconns;
+	}
+}
 static gboolean set_new_server(qq_data *qd)
 {
 	gint count;
 	gint index;
 	GList *it = NULL;
-	
+
  	g_return_val_if_fail(qd != NULL, FALSE);
 
 	if (qd->servers == NULL) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Server list is NULL\n");
+		purple_debug_info("QQ", "Server list is NULL\n");
 		return FALSE;
 	}
 
-	if (qd->real_hostname) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "free real_hostname\n");
-		g_free(qd->real_hostname);
-		qd->real_hostname = NULL;
-	}
-
 	/* remove server used before */
-	if (qd->server_name != NULL) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ",
-			"Remove previous server [%s]\n", qd->server_name);
-   		qd->servers = g_list_remove(qd->servers, qd->server_name);
-   		qd->server_name = NULL;
+	if (qd->curr_server != NULL) {
+		purple_debug_info("QQ",
+			"Remove current [%s] from server list\n", qd->curr_server);
+   		qd->servers = g_list_remove(qd->servers, qd->curr_server);
+   		qd->curr_server = NULL;
     }
-	
+
 	count = g_list_length(qd->servers);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Server list has %d\n", count);
+	purple_debug_info("QQ", "Server list has %d\n", count);
 	if (count <= 0) {
 		/* no server left, disconnect when result is false */
 		qd->servers = NULL;
 		return FALSE;
 	}
-	
+
 	/* get new server */
-	index  = random() % count;
+	index  = rand() % count;
 	it = g_list_nth(qd->servers, index);
-    qd->server_name = it->data;		/* do not free server_name */
-    if (qd->server_name == NULL || strlen(qd->server_name) <= 0 ) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Server name at %d is empty\n", index);
+    qd->curr_server = it->data;		/* do not free server_name */
+    if (qd->curr_server == NULL || strlen(qd->curr_server) <= 0 ) {
+		purple_debug_info("QQ", "Server name at %d is empty\n", index);
 		return FALSE;
 	}
 
-	qd->real_hostname = g_strdup(qd->server_name);
-	qd->real_port = qd->user_port;
-	
- 	qd->reconnect_times = QQ_RECONNECT_MAX;
-
-	purple_debug(PURPLE_DEBUG_INFO, "QQ",
-		"set new server to %s:%d\n", qd->real_hostname, qd->real_port);
+	purple_debug_info("QQ", "set new server to %s\n", qd->curr_server);
 	return TRUE;
 }
 
@@ -115,152 +147,199 @@ static gint packet_get_header(guint8 *header_tag,  guint16 *source_tag,
 	return bytes;
 }
 
-static gboolean reconnect_later_cb(gpointer data)
+static gboolean connect_check(gpointer data)
 {
-	PurpleConnection *gc;
+	PurpleConnection *gc = (PurpleConnection *) data;
 	qq_data *qd;
 
-	gc = (PurpleConnection *) data;
 	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, FALSE);
 	qd = (qq_data *) gc->proto_data;
 
-	qd->reconnect_timeout = 0;
+	if (qd->connect_watcher > 0) {
+		purple_timeout_remove(qd->connect_watcher);
+		qd->connect_watcher = 0;
+	}
 
-	qq_connect(gc->account);
-	return FALSE;	/* timeout callback stops */
+	if (qd->fd >= 0 && qd->token != NULL && qd->token_len >= 0) {
+		purple_debug_info("QQ", "Connect ok\n");
+		return FALSE;
+	}
+
+	qd->connect_watcher = purple_timeout_add_seconds(0, qq_connect_later, gc);
+	return FALSE;
 }
 
-static void reconnect_later(PurpleConnection *gc)
+/* Warning: qq_connect_later destory all connection
+ *  Any function should be care of use qq_data after call this function
+ *  Please conside tcp_pending and udp_pending */
+gboolean qq_connect_later(gpointer data)
 {
+	PurpleConnection *gc = (PurpleConnection *) data;
 	qq_data *qd;
+	char *server;
+	int port;
+	gchar **segments;
 
-	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, FALSE);
 	qd = (qq_data *) gc->proto_data;
 
-	qd->reconnect_times--;
-	if (qd->reconnect_times < 0) {
+	if (qd->check_watcher > 0) {
+		purple_timeout_remove(qd->check_watcher);
+		qd->check_watcher = 0;
+	}
+	qq_disconnect(gc);
+
+	if (qd->redirect_ip.s_addr != 0) {
+		/* redirect to new server */
+		server = g_strdup_printf("%s:%d", inet_ntoa(qd->redirect_ip), qd->redirect_port);
+		qd->servers = g_list_append(qd->servers, server);
+		qd->curr_server = server;
+
+		qd->redirect_ip.s_addr = 0;
+		qd->redirect_port = 0;
+		qd->connect_retry = QQ_CONNECT_MAX;
+	}
+
+	if (qd->curr_server == NULL || strlen (qd->curr_server) == 0 || qd->connect_retry <= 0) {
 		if ( set_new_server(qd) != TRUE) {
 			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-					_("Failed to connect server"));
-			return;
+					_("Failed to connect all servers"));
+			return FALSE;
 		}
+		qd->connect_retry = QQ_CONNECT_MAX;
 	}
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ",
-		"Reconnect to server %s:%d next retries %d in %d ms\n",
-		qd->real_hostname, qd->real_port,
-		qd->reconnect_times, QQ_RECONNECT_INTERVAL);
+	segments = g_strsplit_set(qd->curr_server, ":", 0);
+	server = g_strdup(segments[0]);
+	port = atoi(segments[1]);
+	if (port <= 0) {
+		purple_debug_info("QQ", "Port not define in %s\n", qd->curr_server);
+		port = QQ_DEFAULT_PORT;
+	}
+	g_strfreev(segments);
 
-	qd->reconnect_timeout = purple_timeout_add(QQ_RECONNECT_INTERVAL,
-		reconnect_later_cb, gc);
+	qd->connect_retry--;
+	if ( !connect_to_server(gc, server, port) ) {
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+				_("Unable to connect."));
+	}
+
+	qd->check_watcher = purple_timeout_add_seconds(QQ_CONNECT_CHECK, connect_check, gc);
+	return FALSE;	/* timeout callback stops */
 }
 
 /* process the incoming packet from qq_pending */
-static void packet_process(PurpleConnection *gc, guint8 *buf, gint buf_len)
+static gboolean packet_process(PurpleConnection *gc, guint8 *buf, gint buf_len)
 {
 	qq_data *qd;
 	gint bytes, bytes_not_read;
 
-	gboolean prev_login_status;
-	
 	guint8 header_tag;
 	guint16 source_tag;
 	guint16 cmd;
 	guint16 seq;		/* May be ack_seq or send_seq, depends on cmd */
-	
 	guint8 room_cmd;
 	guint32 room_id;
+	gint update_class;
+	guint32 ship32;
 
 	qq_transaction *trans;
 
-	g_return_if_fail(buf != NULL && buf_len > 0);
+	g_return_val_if_fail(buf != NULL && buf_len > 0, TRUE);
 
 	qd = (qq_data *) gc->proto_data;
 
-	prev_login_status = qd->logged_in;
+	qd->net_stat.rcved++;
+	if (qd->net_stat.rcved <= 0)	memset(&(qd->net_stat), 0, sizeof(qd->net_stat));
 
 	/* Len, header and tail tag have been checked before */
 	bytes = 0;
 	bytes += packet_get_header(&header_tag, &source_tag, &cmd, &seq, buf + bytes);
 
 #if 1
-		purple_debug(PURPLE_DEBUG_INFO, "QQ",
-				"==> [%05d] 0x%04X %s, from (0x%04X %s) len %d\n",
-				seq, cmd, qq_get_cmd_desc(cmd), source_tag, qq_get_ver_desc(source_tag), buf_len);
-#endif	
+		purple_debug_info("QQ", "==> [%05d] %s 0x%04X, source tag 0x%04X len %d\n",
+				seq, qq_get_cmd_desc(cmd), cmd, source_tag, buf_len);
+#endif
+	/* this is the length of all the encrypted data (also remove tail tag) */
 	bytes_not_read = buf_len - bytes - 1;
 
 	/* ack packet, we need to update send tranactions */
 	/* we do not check duplication for server ack */
-	trans = qq_trans_find_rcved(qd, cmd, seq);
+	trans = qq_trans_find_rcved(gc, cmd, seq);
 	if (trans == NULL) {
 		/* new server command */
-		qq_trans_add_server_cmd(qd, cmd, seq, buf + bytes, bytes_not_read);
-		if ( qd->logged_in ) {
-			qq_proc_cmd_server(gc, cmd, seq, buf + bytes, bytes_not_read);
+		if ( !qd->is_login ) {
+			qq_trans_add_remain(gc, cmd, seq, buf + bytes, bytes_not_read);
+		} else {
+			qq_trans_add_server_cmd(gc, cmd, seq, buf + bytes, bytes_not_read);
+			qq_proc_server_cmd(gc, cmd, seq, buf + bytes, bytes_not_read);
 		}
-		return;
+		return TRUE;
 	}
 
 	if (qq_trans_is_dup(trans)) {
-		purple_debug(PURPLE_DEBUG_WARNING,
-				"QQ", "dup [%05d] %s, discard...\n", seq, qq_get_cmd_desc(cmd));
-		return;
+		qd->net_stat.rcved_dup++;
+		purple_debug_info("QQ", "dup [%05d] %s, discard...\n", seq, qq_get_cmd_desc(cmd));
+		return TRUE;
 	}
 
-	if (qq_trans_is_server(trans)) {
-		if ( qd->logged_in ) {
-			qq_proc_cmd_server(gc, cmd, seq, buf + bytes, bytes_not_read);
-		}
-		return;
-	}
+	update_class = qq_trans_get_class(trans);
+	ship32 = qq_trans_get_ship(trans);
 
-	/* this is the length of all the encrypted data (also remove tail tag */
-	if (cmd == QQ_CMD_ROOM) {
-		room_cmd = qq_trans_get_room_cmd(trans);
-		room_id = qq_trans_get_room_id(trans);
+	switch (cmd) {
+		case QQ_CMD_TOKEN:
+			if (qq_process_token_reply(gc, buf + bytes, bytes_not_read) == QQ_TOKEN_REPLY_OK) {
+				qq_send_packet_login(gc);
+			}
+			break;
+		case QQ_CMD_LOGIN:
+			qq_proc_login_cmd(gc, buf + bytes, bytes_not_read);
+			/* check is redirect or not, and do it now */
+			if (qd->redirect_ip.s_addr != 0) {
+				if (qd->check_watcher > 0) {
+					purple_timeout_remove(qd->check_watcher);
+					qd->check_watcher = 0;
+				}
+				if (qd->connect_watcher > 0)	purple_timeout_remove(qd->connect_watcher);
+				qd->connect_watcher = purple_timeout_add_seconds(QQ_CONNECT_INTERVAL, qq_connect_later, gc);
+				return FALSE;	/* do nothing after this function and return now */
+			}
+			break;
+		case QQ_CMD_ROOM:
+			room_cmd = qq_trans_get_room_cmd(trans);
+			room_id = qq_trans_get_room_id(trans);
 #if 1
-		purple_debug(PURPLE_DEBUG_INFO, "QQ",
-				"%s (0x%02X ) for room %d, len %d\n",
-				qq_get_room_cmd_desc(room_cmd), room_cmd, room_id, buf_len);
-#endif	
-		qq_proc_room_cmd_reply(gc, seq, room_cmd, room_id, buf + bytes, bytes_not_read);
-	} else {
-		qq_proc_cmd_reply(gc, cmd, seq, buf + bytes, bytes_not_read);
-	}
-	
-	/* check is redirect or not, and do it now */
-	if (qd->is_redirect) {
-	 	/* free resource except real_hostname and port */
-		qq_disconnect(gc);
-	 	qd->reconnect_times = QQ_RECONNECT_MAX;
-		reconnect_later(gc);
-		return;
+			purple_debug_info("QQ", "%s (0x%02X) for room %d, len %d\n",
+					qq_get_room_cmd_desc(room_cmd), room_cmd, room_id, buf_len);
+#endif
+			qq_proc_room_cmd(gc, seq, room_cmd, room_id, buf + bytes, bytes_not_read, update_class, ship32);
+			break;
+		default:
+			qq_proc_client_cmd(gc, cmd, seq, buf + bytes, bytes_not_read, update_class, ship32);
+			break;
 	}
 
-	if (prev_login_status != qd->logged_in && qd->logged_in == TRUE) {
-		/* logged_in, but we have packets before login */
-		qq_trans_process_before_login(qd);
-	}
+	return TRUE;
 }
 
 static void tcp_pending(gpointer data, gint source, PurpleInputCondition cond)
 {
-	PurpleConnection *gc;
+	PurpleConnection *gc = (PurpleConnection *) data;
 	qq_data *qd;
+	qq_connection *conn;
 	guint8 buf[1024];		/* set to 16 when test  tcp_rxqueue */
 	gint buf_len;
 	gint bytes;
-	
+
 	guint8 *pkt;
 	guint16 pkt_len;
-	
+
 	gchar *error_msg;
 	guint8 *jump;
 	gint jump_len;
 
-	gc = (PurpleConnection *) data;
 	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
 
 	if(cond != PURPLE_INPUT_READ) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
@@ -268,8 +347,9 @@ static void tcp_pending(gpointer data, gint source, PurpleInputCondition cond)
 		return;
 	}
 
-	qd = (qq_data *) gc->proto_data;
-	
+	conn = connection_find(qd, source);
+	g_return_if_fail(conn != NULL);
+
 	/* test code, not using tcp_rxqueue
 	memset(pkt,0, sizeof(pkt));
 	buf_len = read(qd->fd, pkt, sizeof(pkt));
@@ -278,8 +358,8 @@ static void tcp_pending(gpointer data, gint source, PurpleInputCondition cond)
 	}
 	return;
 	*/
-	
-	buf_len = read(qd->fd, buf, sizeof(buf));
+
+	buf_len = read(source, buf, sizeof(buf));
 	if (buf_len < 0) {
 		if (errno == EAGAIN)
 			/* No worries */
@@ -299,93 +379,93 @@ static void tcp_pending(gpointer data, gint source, PurpleInputCondition cond)
 	 *  QQ need a keep alive packet in every 60 seconds
 	 gc->last_received = time(NULL);
 	*/
-	/*
-	purple_debug(PURPLE_DEBUG_INFO, "TCP_PENDING",
-			   "Read %d bytes from socket, rxlen is %d\n", buf_len, qd->tcp_rxlen);
-	*/
-	qd->tcp_rxqueue = g_realloc(qd->tcp_rxqueue, buf_len + qd->tcp_rxlen);
-	memcpy(qd->tcp_rxqueue + qd->tcp_rxlen, buf, buf_len);
-	qd->tcp_rxlen += buf_len;
-	
+	/* purple_debug_info("TCP_PENDING", "Read %d bytes, rxlen is %d\n", buf_len, conn->tcp_rxlen); */
+	conn->tcp_rxqueue = g_realloc(conn->tcp_rxqueue, buf_len + conn->tcp_rxlen);
+	memcpy(conn->tcp_rxqueue + conn->tcp_rxlen, buf, buf_len);
+	conn->tcp_rxlen += buf_len;
+
 	pkt = g_newa(guint8, MAX_PACKET_SIZE);
-	while (1) {
-		if (qd->tcp_rxlen < QQ_TCP_HEADER_LENGTH) {
+	while (PURPLE_CONNECTION_IS_VALID(gc)) {
+		if (qd->openconns == NULL) {
+			break;
+		}
+		if (conn->tcp_rxqueue == NULL) {
+			conn->tcp_rxlen = 0;
+			break;
+		}
+		if (conn->tcp_rxlen < QQ_TCP_HEADER_LENGTH) {
 			break;
 		}
-		
+
 		bytes = 0;
-		bytes += qq_get16(&pkt_len, qd->tcp_rxqueue + bytes);
-		if (qd->tcp_rxlen < pkt_len) {
+		bytes += qq_get16(&pkt_len, conn->tcp_rxqueue + bytes);
+		if (conn->tcp_rxlen < pkt_len) {
 			break;
 		}
 
-		/* 
-		purple_debug(PURPLE_DEBUG_INFO, "TCP_PENDING",
-				   "Packet len is %d bytes, rxlen is %d\n", pkt_len, qd->tcp_rxlen);
-		*/
+		/* purple_debug_info("TCP_PENDING", "Packet len=%d, rxlen=%d\n", pkt_len, conn->tcp_rxlen); */
 		if ( pkt_len < QQ_TCP_HEADER_LENGTH
-		    || *(qd->tcp_rxqueue + bytes) != QQ_PACKET_TAG
-			|| *(qd->tcp_rxqueue + pkt_len - 1) != QQ_PACKET_TAIL) {
+		    || *(conn->tcp_rxqueue + bytes) != QQ_PACKET_TAG
+			|| *(conn->tcp_rxqueue + pkt_len - 1) != QQ_PACKET_TAIL) {
 			/* HEY! This isn't even a QQ. What are you trying to pull? */
+			purple_debug_warning("TCP_PENDING", "Packet error, no header or tail tag\n");
 
-			purple_debug(PURPLE_DEBUG_ERROR, "TCP_PENDING",
-				 "Packet error, failed to check header and tail tag\n");
-
-			jump = memchr(qd->tcp_rxqueue + 1, QQ_PACKET_TAIL, qd->tcp_rxlen - 1);
+			jump = memchr(conn->tcp_rxqueue + 1, QQ_PACKET_TAIL, conn->tcp_rxlen - 1);
 			if ( !jump ) {
-				purple_debug(PURPLE_DEBUG_INFO, "TCP_PENDING",
-				 	"Failed to find next QQ_PACKET_TAIL, clear receive buffer\n");
-				g_free(qd->tcp_rxqueue);
-				qd->tcp_rxqueue = NULL;
-				qd->tcp_rxlen = 0;
+				purple_debug_warning("TCP_PENDING", "Failed to find next tail, clear receive buffer\n");
+				g_free(conn->tcp_rxqueue);
+				conn->tcp_rxqueue = NULL;
+				conn->tcp_rxlen = 0;
 				return;
 			}
 
 			/* jump and over QQ_PACKET_TAIL */
-			jump_len = (jump - qd->tcp_rxqueue) + 1;
-			purple_debug(PURPLE_DEBUG_INFO, "TCP_PENDING",
-				"Find next QQ_PACKET_TAIL at %d, jump %d bytes\n", jump_len, jump_len + 1);
-			g_memmove(qd->tcp_rxqueue, jump, qd->tcp_rxlen - jump_len);
-			qd->tcp_rxlen -= jump_len;
+			jump_len = (jump - conn->tcp_rxqueue) + 1;
+			purple_debug_warning("TCP_PENDING", "Find next tail at %d, jump %d\n", jump_len, jump_len + 1);
+			g_memmove(conn->tcp_rxqueue, jump, conn->tcp_rxlen - jump_len);
+			conn->tcp_rxlen -= jump_len;
 			continue;
 		}
 
 		memset(pkt, 0, MAX_PACKET_SIZE);
-		g_memmove(pkt, qd->tcp_rxqueue + bytes, pkt_len - bytes);
-		
+		g_memmove(pkt, conn->tcp_rxqueue + bytes, pkt_len - bytes);
+
 		/* jump to next packet */
-		qd->tcp_rxlen -= pkt_len;
-		if (qd->tcp_rxlen) {
-			/*
-			purple_debug(PURPLE_DEBUG_ERROR, "TCP_PENDING", "shrink tcp_rxqueue to %d\n", qd->tcp_rxlen);		
-			*/
-			jump = g_memdup(qd->tcp_rxqueue + pkt_len, qd->tcp_rxlen);
-			g_free(qd->tcp_rxqueue);
-			qd->tcp_rxqueue = jump;
+		conn->tcp_rxlen -= pkt_len;
+		if (conn->tcp_rxlen) {
+			/* purple_debug_info("TCP_PENDING", "shrink tcp_rxqueue to %d\n", conn->tcp_rxlen);	*/
+			jump = g_memdup(conn->tcp_rxqueue + pkt_len, conn->tcp_rxlen);
+			g_free(conn->tcp_rxqueue);
+			conn->tcp_rxqueue = jump;
 		} else {
-			/* purple_debug(PURPLE_DEBUG_ERROR, "TCP_PENDING", "free tcp_rxqueue\n"); */
-			g_free(qd->tcp_rxqueue);
-			qd->tcp_rxqueue = NULL;
+			/* purple_debug_info("TCP_PENDING", "free tcp_rxqueue\n"); */
+			g_free(conn->tcp_rxqueue);
+			conn->tcp_rxqueue = NULL;
 		}
 
 		if (pkt == NULL) {
 			continue;
 		}
-		/* do not call packet_process before jump 
-		 * packet_process may call disconnect and destory tcp_rxqueue */
-		packet_process(gc, pkt, pkt_len - bytes);
+		/* packet_process may call disconnect and destory data like conn
+		 * do not call packet_process before jump,
+		 * break if packet_process return FALSE */
+		if (packet_process(gc, pkt, pkt_len - bytes) == FALSE) {
+			purple_debug_info("TCP_PENDING", "Connection has been destory\n");
+			break;
+		}
 	}
 }
 
 static void udp_pending(gpointer data, gint source, PurpleInputCondition cond)
 {
-	PurpleConnection *gc;
+	PurpleConnection *gc = (PurpleConnection *) data;
 	qq_data *qd;
 	guint8 *buf;
 	gint buf_len;
 
 	gc = (PurpleConnection *) data;
 	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
 
 	if(cond != PURPLE_INPUT_READ) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
@@ -393,13 +473,10 @@ static void udp_pending(gpointer data, gint source, PurpleInputCondition cond)
 		return;
 	}
 
-	qd = (qq_data *) gc->proto_data;
-	g_return_if_fail(qd->fd >= 0);
-	
 	buf = g_newa(guint8, MAX_PACKET_SIZE);
 
 	/* here we have UDP proxy suppport */
-	buf_len = read(qd->fd, buf, MAX_PACKET_SIZE);
+	buf_len = read(source, buf, MAX_PACKET_SIZE);
 	if (buf_len <= 0) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 				_("Unable to read from socket"));
@@ -419,73 +496,95 @@ static void udp_pending(gpointer data, gint source, PurpleInputCondition cond)
 			return;
 		}
 	}
-	
+
+	/* packet_process may call disconnect and destory data like conn
+	 * do not call packet_process before jump,
+	 * break if packet_process return FALSE */
 	packet_process(gc, buf, buf_len);
 }
 
-static gint udp_send_out(qq_data *qd, guint8 *data, gint data_len)
+static gint udp_send_out(PurpleConnection *gc, guint8 *data, gint data_len)
 {
+	qq_data *qd;
 	gint ret;
 
-	g_return_val_if_fail(qd != NULL && qd->fd >= 0 && data != NULL && data_len > 0, -1);
+	g_return_val_if_fail(data != NULL && data_len > 0, -1);
+
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
+	qd = (qq_data *) gc->proto_data;
+
+#if 0
+	purple_debug_info("UDP_SEND_OUT", "Send %d bytes to socket %d\n", data_len, qd->fd);
+#endif
 
-	/*
-	purple_debug(PURPLE_DEBUG_INFO, "UDP_SEND_OUT", "Send %d bytes to socket %d\n", data_len, qd->fd);
-	*/
-	
 	errno = 0;
 	ret = send(qd->fd, data, data_len, 0);
 	if (ret < 0 && errno == EAGAIN) {
 		return ret;
 	}
-	
+
 	if (ret < 0) {
 		/* TODO: what to do here - do we really have to disconnect? */
-		purple_debug(PURPLE_DEBUG_ERROR, "UDP_SEND_OUT", "Send failed: %d, %s\n", errno, g_strerror(errno));
-		purple_connection_error_reason(qd->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, g_strerror(errno));
+		purple_debug_error("UDP_SEND_OUT", "Send failed: %d, %s\n", errno, g_strerror(errno));
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, g_strerror(errno));
 	}
 	return ret;
 }
 
 static void tcp_can_write(gpointer data, gint source, PurpleInputCondition cond)
 {
-	qq_data *qd = data;
+	PurpleConnection *gc = (PurpleConnection *) data;
+	qq_data *qd;
+	qq_connection *conn;
 	int ret, writelen;
 
-	writelen = purple_circ_buffer_get_max_read(qd->tcp_txbuf);
+	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
+
+	conn = connection_find(qd, source);
+	g_return_if_fail(conn != NULL);
+
+	writelen = purple_circ_buffer_get_max_read(conn->tcp_txbuf);
 	if (writelen == 0) {
-		purple_input_remove(qd->tx_handler);
-		qd->tx_handler = 0;
+		purple_input_remove(conn->can_write_handler);
+		conn->can_write_handler = 0;
 		return;
 	}
 
-	ret = write(qd->fd, qd->tcp_txbuf->outptr, writelen);
-	purple_debug(PURPLE_DEBUG_ERROR, "TCP_CAN_WRITE",
-		"total %d bytes is sent %d\n", writelen, ret);
+	ret = write(source, conn->tcp_txbuf->outptr, writelen);
+	purple_debug_info("TCP_CAN_WRITE", "total %d bytes is sent %d\n", writelen, ret);
 
 	if (ret < 0 && errno == EAGAIN)
 		return;
 	else if (ret < 0) {
 		/* TODO: what to do here - do we really have to disconnect? */
-		purple_connection_error_reason(qd->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
 		                               _("Write Error"));
 		return;
 	}
 
-	purple_circ_buffer_mark_read(qd->tcp_txbuf, ret);
+	purple_circ_buffer_mark_read(conn->tcp_txbuf, ret);
 }
 
-static gint tcp_send_out(qq_data *qd, guint8 *data, gint data_len)
+static gint tcp_send_out(PurpleConnection *gc, guint8 *data, gint data_len)
 {
+	qq_data *qd;
+	qq_connection *conn;
 	gint ret;
 
-	g_return_val_if_fail(qd != NULL && qd->fd >= 0 && data != NULL && data_len > 0, -1);
+	g_return_val_if_fail(data != NULL && data_len > 0, -1);
 
-	/*
-	purple_debug(PURPLE_DEBUG_INFO, "TCP_SEND_OUT", "Send %d bytes to socket %d\n", data_len, qd->fd);
-	 */
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
+	qd = (qq_data *) gc->proto_data;
+
+	conn = connection_find(qd, qd->fd);
+	g_return_val_if_fail(conn, -1);
+
+#if 0
+	purple_debug_info("TCP_SEND_OUT", "Send %d bytes to socket %d\n", data_len, qd->fd);
+#endif
 
-	if (qd->tx_handler == 0) {
+	if (conn->can_write_handler == 0) {
 		ret = write(qd->fd, data, data_len);
 	} else {
 		ret = -1;
@@ -493,28 +592,28 @@ static gint tcp_send_out(qq_data *qd, guint8 *data, gint data_len)
 	}
 
 	/*
-	purple_debug(PURPLE_DEBUG_INFO, "TCP_SEND_OUT",
+	purple_debug_info("TCP_SEND_OUT",
 		"Socket %d, total %d bytes is sent %d\n", qd->fd, data_len, ret);
 	*/
 	if (ret < 0 && errno == EAGAIN) {
 		/* socket is busy, send later */
-		purple_debug(PURPLE_DEBUG_INFO, "TCP_SEND_OUT", "Socket is busy and send later\n");
+		purple_debug_info("TCP_SEND_OUT", "Socket is busy and send later\n");
 		ret = 0;
 	} else if (ret <= 0) {
 		/* TODO: what to do here - do we really have to disconnect? */
-		purple_debug(PURPLE_DEBUG_ERROR, "TCP_SEND_OUT",
+		purple_debug_error("TCP_SEND_OUT",
 			"Send to socket %d failed: %d, %s\n", qd->fd, errno, g_strerror(errno));
-		purple_connection_error_reason(qd->gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, g_strerror(errno));
+		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, g_strerror(errno));
 		return ret;
 	}
 
 	if (ret < data_len) {
-		purple_debug(PURPLE_DEBUG_INFO, "TCP_SEND_OUT",
+		purple_debug_info("TCP_SEND_OUT",
 			"Add %d bytes to buffer\n", data_len - ret);
-		if (qd->tx_handler == 0) {
-			qd->tx_handler = purple_input_add(qd->fd, PURPLE_INPUT_WRITE, tcp_can_write, qd);
+		if (conn->can_write_handler == 0) {
+			conn->can_write_handler = purple_input_add(qd->fd, PURPLE_INPUT_WRITE, tcp_can_write, gc);
 		}
-		purple_circ_buffer_append(qd->tcp_txbuf, data + ret, data_len - ret);
+		purple_circ_buffer_append(conn->tcp_txbuf, data + ret, data_len - ret);
 	}
 	return ret;
 }
@@ -528,17 +627,17 @@ static gboolean network_timeout(gpointer data)
 	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, TRUE);
 	qd = (qq_data *) gc->proto_data;
 
-	is_lost_conn = qq_trans_scan(qd);
+	is_lost_conn = qq_trans_scan(gc);
 	if (is_lost_conn) {
 		purple_connection_error_reason(gc,
 			PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Connection lost"));
 		return TRUE;
 	}
 
-	if ( !qd->logged_in ) {
+	if ( !qd->is_login ) {
 		return TRUE;
 	}
-	
+
 	qd->itv_count.keep_alive--;
 	if (qd->itv_count.keep_alive <= 0) {
 		qd->itv_count.keep_alive = qd->itv_config.keep_alive;
@@ -553,55 +652,29 @@ static gboolean network_timeout(gpointer data)
 	qd->itv_count.update--;
 	if (qd->itv_count.update <= 0) {
 		qd->itv_count.update = qd->itv_config.update;
-		qq_send_packet_get_buddies_online(gc, 0);
-
-		qq_send_cmd_group_all_get_online_members(gc);
+		qq_update_online(gc, 0);
 		return TRUE;
 	}
 
 	return TRUE;		/* if return FALSE, timeout callback stops */
 }
 
-/* the callback function after socket is built
- * we setup the qq protocol related configuration here */
-static void qq_connect_cb(gpointer data, gint source, const gchar *error_message)
+static void do_request_token(PurpleConnection *gc)
 {
 	qq_data *qd;
-	PurpleConnection *gc;
 	gchar *conn_msg;
 	const gchar *passwd;
-	PurpleAccount *account ;
 
-	gc = (PurpleConnection *) data;
-
-	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ_CONN", "Invalid connection\n");
-		close(source);
-		return;
-	}
+	/* _qq_show_socket("Got login socket", source); */
 
 	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
 	qd = (qq_data *) gc->proto_data;
-	account = purple_connection_get_account(gc);
-
-	/* Connect is now complete; clear the PurpleProxyConnectData */
-	qd->connect_data = NULL;
-
-	if (source < 0) {	/* socket returns -1 */
-		purple_debug(PURPLE_DEBUG_INFO, "QQ_CONN", "Invalid connection, source is < 0\n");
-		qq_disconnect(gc);
-		reconnect_later(gc);
-		return;
-	}
-
-	/* _qq_show_socket("Got login socket", source); */
 
 	/* QQ use random seq, to minimize duplicated packets */
-	srandom(time(NULL));
-	qd->send_seq = random() & 0x0000ffff;
-	qd->fd = source;
-	qd->logged_in = FALSE;
+	srand(time(NULL));
+	qd->send_seq = rand() & 0xffff;
+
+	qd->is_login = FALSE;
 	qd->channel = 1;
 	qd->uid = strtol(purple_account_get_username(purple_connection_get_account(gc)), NULL, 10);
 
@@ -614,41 +687,63 @@ static void qq_connect_cb(gpointer data, gint source, const gchar *error_message
 	qq_get_md5(qd->password_twice_md5, sizeof(qd->password_twice_md5),
 		qd->password_twice_md5, sizeof(qd->password_twice_md5));
 
-	g_return_if_fail(qd->network_timeout == 0);
-	qd->itv_config.resend = purple_account_get_int(account, "resend_interval", 10);
-	if (qd->itv_config.resend <= 0) qd->itv_config.resend = 10;
+	g_return_if_fail(qd->network_watcher == 0);
+	qd->network_watcher = purple_timeout_add_seconds(qd->itv_config.resend, network_timeout, gc);
 
-	qd->itv_config.keep_alive = purple_account_get_int(account, "keep_alive_interval", 60);
-	if (qd->itv_config.keep_alive < 30) qd->itv_config.keep_alive = 30;
-	qd->itv_config.keep_alive /= qd->itv_config.resend;
-	qd->itv_count.keep_alive = qd->itv_config.keep_alive;
+	/* Update the login progress status display */
+	conn_msg = g_strdup_printf(_("Request token"));
+	purple_connection_update_progress(gc, conn_msg, 2, QQ_CONNECT_STEPS);
+	g_free(conn_msg);
 
-	qd->itv_config.update = purple_account_get_int(account, "update_interval", 300);
-	if (qd->itv_config.update > 0) {
-		if (qd->itv_config.update < qd->itv_config.keep_alive) {
-			qd->itv_config.update = qd->itv_config.keep_alive;
-		}
-		qd->itv_config.update /= qd->itv_config.resend;
-		qd->itv_count.update = qd->itv_config.update;
-	} else {
-		qd->itv_config.update = 0;
+	qq_send_packet_token(gc);
+}
+
+/* the callback function after socket is built
+ * we setup the qq protocol related configuration here */
+static void connect_cb(gpointer data, gint source, const gchar *error_message)
+{
+	PurpleConnection *gc;
+	qq_data *qd;
+	PurpleAccount *account ;
+	qq_connection *conn;
+
+	gc = (PurpleConnection *) data;
+	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
+
+	qd = (qq_data *) gc->proto_data;
+	account = purple_connection_get_account(gc);
+
+	/* conn_data will be destoryed */
+	qd->conn_data = NULL;
+
+	if (!PURPLE_CONNECTION_IS_VALID(gc)) {
+		purple_debug_info("QQ_CONN", "Invalid connection\n");
+		close(source);
+		return;
 	}
 
-	qd->network_timeout = purple_timeout_add(qd->itv_config.resend *1000, network_timeout, gc);
-	
-	if (qd->use_tcp)
-		gc->inpa = purple_input_add(qd->fd, PURPLE_INPUT_READ, tcp_pending, gc);
-	else
-		gc->inpa = purple_input_add(qd->fd, PURPLE_INPUT_READ, udp_pending, gc);
+	if (source < 0) {	/* socket returns -1 */
+		purple_debug_info("QQ_CONN",
+				"Could not establish a connection with the server:\n%s\n",
+				error_message);
+		if (qd->connect_watcher > 0)	purple_timeout_remove(qd->connect_watcher);
+		qd->connect_watcher = purple_timeout_add_seconds(QQ_CONNECT_INTERVAL, qq_connect_later, gc);
+		return;
+	}
 
-	/* Update the login progress status display */
-	conn_msg = g_strdup_printf("Login as %d", qd->uid);
-	purple_connection_update_progress(gc, conn_msg, QQ_CONNECT_STEPS - 1, QQ_CONNECT_STEPS);
-	g_free(conn_msg);
+	/* _qq_show_socket("Got login socket", source); */
+	qd->fd = source;
+	conn = connection_create(qd, source);
+	if (qd->use_tcp) {
+		conn->input_handler = purple_input_add(source, PURPLE_INPUT_READ, tcp_pending, gc);
+	} else {
+		conn->input_handler = purple_input_add(source, PURPLE_INPUT_READ, udp_pending, gc);
+	}
 
-	qq_send_packet_token(gc);
+	do_request_token( gc );
 }
 
+#ifndef purple_proxy_connect_udp
 static void udp_can_write(gpointer data, gint source, PurpleInputCondition cond)
 {
 	PurpleConnection *gc;
@@ -679,22 +774,22 @@ static void udp_can_write(gpointer data, gint source, PurpleInputCondition cond)
 	ret = getsockopt(source, SOL_SOCKET, SO_ERROR, &error, &len);
 	if (ret == 0 && error == EINPROGRESS)
 		return; /* we'll be called again later */
-		
-	purple_input_remove(qd->tx_handler);
-	qd->tx_handler = 0;
+
+	purple_input_remove(qd->udp_can_write_handler);
+	qd->udp_can_write_handler = 0;
 	if (ret < 0 || error != 0) {
-		if(ret != 0) 
+		if(ret != 0)
 			error = errno;
 
 		close(source);
 
 		purple_debug_error("proxy", "getsockopt SO_ERROR check: %s\n", g_strerror(error));
 
-		qq_connect_cb(gc, -1, _("Unable to connect"));
+		connect_cb(gc, -1, _("Unable to connect"));
 		return;
 	}
 
-	qq_connect_cb(gc, source, NULL);
+	connect_cb(gc, source, NULL);
 }
 
 static void udp_host_resolved(GSList *hosts, gpointer data, const char *error_message) {
@@ -725,7 +820,7 @@ static void udp_host_resolved(GSList *hosts, gpointer data, const char *error_me
 	hosts = g_slist_remove(hosts, hosts->data);
 	memcpy(&server_addr, hosts->data, addr_size);
 	g_free(hosts->data);
-	
+
 	hosts = g_slist_remove(hosts, hosts->data);
 	while(hosts) {
 		hosts = g_slist_remove(hosts, hosts->data);
@@ -735,7 +830,7 @@ static void udp_host_resolved(GSList *hosts, gpointer data, const char *error_me
 
 	fd = socket(PF_INET, SOCK_DGRAM, 0);
 	if (fd < 0) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", 
+		purple_debug_error("QQ",
 				"Unable to create socket: %s\n", g_strerror(errno));
 		return;
 	}
@@ -752,122 +847,97 @@ static void udp_host_resolved(GSList *hosts, gpointer data, const char *error_me
 	 * If a UDP socket is unconnected, which is the normal state after a
 	 * bind() call, then send() or write() are not allowed, since no
 	 * destination is available; only sendto() can be used to send data.
-	 *   
+	 *
 	 * Calling connect() on the socket simply records the specified address
 	 * and port number as being the desired communications partner. That
 	 * means that send() or write() are now allowed; they use the destination
 	 * address and port given on the connect call as the destination of packets.
 	 */
 	if (connect(fd, &server_addr, addr_size) >= 0) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Connected.\n");
+		purple_debug_info("QQ", "Connected.\n");
 		flags = fcntl(fd, F_GETFL);
 		fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
-		qq_connect_cb(gc, fd, NULL);
+		connect_cb(gc, fd, NULL);
 		return;
 	}
-	
+
 	/* [EINPROGRESS]
-	 *    The socket is marked as non-blocking and the connection cannot be 
-	 *    completed immediately. It is possible to select for completion by 
+	 *    The socket is marked as non-blocking and the connection cannot be
+	 *    completed immediately. It is possible to select for completion by
 	 *    selecting the socket for writing.
 	 * [EINTR]
-	 *    A signal interrupted the call. 
+	 *    A signal interrupted the call.
 	 *    The connection is established asynchronously.
 	 */
 	if ((errno == EINPROGRESS) || (errno == EINTR)) {
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Connect in asynchronous mode.\n");
-			qd->tx_handler = purple_input_add(fd, PURPLE_INPUT_WRITE, udp_can_write, gc);
+			purple_debug_warning( "QQ", "Connect in asynchronous mode.\n");
+			qd->udp_can_write_handler = purple_input_add(fd, PURPLE_INPUT_WRITE, udp_can_write, gc);
 			return;
 		}
 
-	purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Connection failed: %s\n", g_strerror(errno));
+	purple_debug_error("QQ", "Connection failed: %s\n", g_strerror(errno));
 	close(fd);
 }
+#endif
 
-/* establish a generic QQ connection 
- * TCP/UDP, and direct/redirected */
-void qq_connect(PurpleAccount *account)
+gboolean connect_to_server(PurpleConnection *gc, gchar *server, gint port)
 {
-	PurpleConnection *gc;
+	PurpleAccount *account ;
 	qq_data *qd;
 	gchar *conn_msg;
 
-	gc = purple_account_get_connection(account);
-	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
-
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, FALSE);
+	account = purple_connection_get_account(gc);
 	qd = (qq_data *) gc->proto_data;
 
-
-	/* test set_new_server
-	while (set_new_server(qd)) {
-   		purple_debug(PURPLE_DEBUG_INFO, "QQ_TEST",
-   			"New server %s:%d  Real server %s:%d\n",
-   			qd->server_name, qd->user_port, qd->real_hostname, qd->real_port);
-	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_TEST", "qd->servers %lu\n",
- 			qd->servers);
- 	exit(1);
-	*/
-	if (qd->server_name == NULL) {
-		/* must be first call this function */
-		if ( set_new_server(qd) != TRUE) {
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-					_("Failed to connect server"));
-			return;
-		}
-	}
-
-	if (qd->real_hostname == NULL || qd->real_port == 0) {
+	if (server == NULL || strlen(server) == 0 || port == 0) {
 		purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("hostname is NULL or port is 0"));
-		return;
+				_("Invalid server or port"));
+		return FALSE;
 	}
 
-	conn_msg = g_strdup_printf( _("Connecting server %s, retries %d"),
-		qd->real_hostname, qd->reconnect_times);
+	conn_msg = g_strdup_printf( _("Connecting server %s, retries %d"), server, port);
 	purple_connection_update_progress(gc, conn_msg, 1, QQ_CONNECT_STEPS);
 	g_free(conn_msg);
 
-	if (qd->is_redirect) {
-   		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Redirect to %s:%d\n",
-   			qd->real_hostname, qd->real_port);
-   	}
-	qd->is_redirect = FALSE;
+	purple_debug_info("QQ", "Connect to %s:%d\n", server, port);
 
-	qd->fd = -1;
-	qd->tx_handler = 0;
-	
-	/* QQ connection via UDP/TCP. 
+	if (qd->conn_data != NULL) {
+		purple_proxy_connect_cancel(qd->conn_data);
+		qd->conn_data = NULL;
+	}
+
+#ifdef purple_proxy_connect_udp
+	if (qd->use_tcp) {
+		qd->conn_data = purple_proxy_connect(gc, account, server, port, connect_cb, gc);
+	} else {
+		qd->conn_data = purple_proxy_connect_udp(gc, account, server, port, connect_cb, gc);
+	}
+	if ( qd->conn_data == NULL ) {
+		purple_debug_error("QQ", _("Couldn't create socket"));
+		return FALSE;
+	}
+#else
+	/* QQ connection via UDP/TCP.
 	* Now use Purple proxy function to provide TCP proxy support,
 	* and qq_udp_proxy.c to add UDP proxy support (thanks henry) */
 	if(qd->use_tcp) {
-   		purple_debug(PURPLE_DEBUG_INFO, "QQ", "TCP Connect to %s:%d\n",
-   			qd->real_hostname, qd->real_port);
-
-		/* TODO: is there a good default grow size? */
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Create tcp_txbuf\n");
-		qd->tcp_txbuf = purple_circ_buffer_new(0);
-
-		qd->connect_data = purple_proxy_connect(NULL, account,
-				qd->real_hostname, qd->real_port, qq_connect_cb, gc);
-		if (qd->connect_data == NULL) {
-			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-				_("Unable to connect."));
+		qd->conn_data = purple_proxy_connect(gc, account, server, port, connect_cb, gc);
+		if ( qd->conn_data == NULL ) {
+			purple_debug_error("QQ", "Unable to connect.");
+			return FALSE;
 		}
-		return;
+		return TRUE;
 	}
-	
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "UDP Connect to %s:%d\n",
-		qd->real_hostname, qd->real_port);
 
-	g_return_if_fail(qd->udp_query_data == NULL);
-	qd->udp_query_data = purple_dnsquery_a(qd->real_hostname, qd->real_port,
-		udp_host_resolved, gc);
-	if (qd->udp_query_data == NULL) {
-		purple_connection_error_reason(qd->gc,
-			PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
-			_("Could not resolve hostname"));
+	purple_debug_info("QQ", "UDP Connect to %s:%d\n", server, port);
+	qd->udp_query_data = purple_dnsquery_a(server, port, udp_host_resolved, gc);
+	if ( qd->udp_query_data == NULL ) {
+		purple_debug_error("QQ", "Could not resolve hostname");
+		return FALSE;
 	}
+#endif
+	return TRUE;
 }
 
 /* clean up qq_data structure and all its components
@@ -879,65 +949,43 @@ void qq_disconnect(PurpleConnection *gc)
 	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
 	qd = (qq_data *) gc->proto_data;
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "Disconnecting ...\n");
+	purple_debug_info("QQ", "Disconnecting ...\n");
 
-	if (qd->network_timeout > 0) {
-		purple_timeout_remove(qd->network_timeout);
-		qd->network_timeout = 0;
+	if (qd->network_watcher > 0) {
+		purple_debug_info("QQ", "Remove network watcher\n");
+		purple_timeout_remove(qd->network_watcher);
+		qd->network_watcher = 0;
 	}
 
 	/* finish  all I/O */
-	if (qd->fd >= 0 && qd->logged_in) {
+	if (qd->fd >= 0 && qd->is_login) {
 		qq_send_packet_logout(gc);
 	}
 
-	if (gc->inpa > 0) {
-		purple_input_remove(gc->inpa);
-		gc->inpa = 0;
-	}
-
-	if (qd->fd >= 0) {
-		close(qd->fd);
-		qd->fd = -1;
-	}
-
-	if (qd->reconnect_timeout > 0) {
-		purple_timeout_remove(qd->reconnect_timeout);
-		qd->reconnect_timeout = 0;
-	}
-
-	if (qd->connect_data != NULL) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Cancel connect_data\n");
-		purple_proxy_connect_cancel(qd->connect_data);
-	}
-	
-	if(qd->tcp_txbuf != NULL) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "destroy tcp_txbuf\n");
-		purple_circ_buffer_destroy(qd->tcp_txbuf);
-		qd->tcp_txbuf = NULL;
+	/* not connected */
+	if (qd->conn_data != NULL) {
+		purple_debug_info("QQ", "Connect cancel\n");
+		purple_proxy_connect_cancel(qd->conn_data);
+		qd->conn_data = NULL;
 	}
-	
-	if (qd->tx_handler) {
-		purple_input_remove(qd->tx_handler);
-		qd->tx_handler = 0;
+#ifndef purple_proxy_connect_udp
+	if (qd->udp_can_write_handler) {
+		purple_input_remove(qd->udp_can_write_handler);
+		qd->udp_can_write_handler = 0;
 	}
-	if (qd->tcp_rxqueue != NULL) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "destroy tcp_rxqueue\n");
-		g_free(qd->tcp_rxqueue);
-		qd->tcp_rxqueue = NULL;
-		qd->tcp_rxlen = 0;
-	}
-	
 	if (qd->udp_query_data != NULL) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "destroy udp_query_data\n");
+		purple_debug_info("QQ", "destroy udp_query_data\n");
 		purple_dnsquery_destroy(qd->udp_query_data);
 		qd->udp_query_data = NULL;
 	}
+#endif
+	connection_free_all(qd);
+	qd->fd = -1;
+
+	qq_trans_remove_all(gc);
 
-	qq_trans_remove_all(qd);
-	
 	if (qd->token) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "free token\n");
+		purple_debug_info("QQ", "free token\n");
 		g_free(qd->token);
 		qd->token = NULL;
 		qd->token_len = 0;
@@ -955,13 +1003,13 @@ void qq_disconnect(PurpleConnection *gc)
 	qq_buddies_list_free(gc->account, qd);
 }
 
-static gint encap(qq_data *qd, guint8 *buf, gint maxlen, guint16 cmd, guint16 seq, 
+static gint packet_encap(qq_data *qd, guint8 *buf, gint maxlen, guint16 cmd, guint16 seq,
 	guint8 *data, gint data_len)
 {
 	gint bytes = 0;
 	g_return_val_if_fail(qd != NULL && buf != NULL && maxlen > 0, -1);
 	g_return_val_if_fail(data != NULL && data_len > 0, -1);
-	
+
 	/* QQ TCP packet has two bytes in the begining defines packet length
 	 * so leave room here to store packet size */
 	if (qd->use_tcp) {
@@ -971,7 +1019,7 @@ static gint encap(qq_data *qd, guint8 *buf, gint maxlen, guint16 cmd, guint16 se
 	bytes += qq_put8(buf + bytes, QQ_PACKET_TAG);
 	bytes += qq_put16(buf + bytes, QQ_CLIENT);
 	bytes += qq_put16(buf + bytes, cmd);
-	
+
 	bytes += qq_put16(buf + bytes, seq);
 
 	bytes += qq_put32(buf + bytes, qd->uid);
@@ -987,109 +1035,168 @@ static gint encap(qq_data *qd, guint8 *buf, gint maxlen, guint16 cmd, guint16 se
 }
 
 /* data has been encrypted before */
-gint qq_send_data(qq_data *qd, guint16 cmd, guint16 seq, gboolean need_ack,
-	guint8 *data, gint data_len)
+static gint packet_send_out(PurpleConnection *gc, guint16 cmd, guint16 seq, guint8 *data, gint data_len)
 {
+	qq_data *qd;
 	guint8 *buf;
 	gint buf_len;
 	gint bytes_sent;
 
-	g_return_val_if_fail(qd != NULL, -1);
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
+	qd = (qq_data *)gc->proto_data;
 	g_return_val_if_fail(data != NULL && data_len > 0, -1);
 
 	buf = g_newa(guint8, MAX_PACKET_SIZE);
 	memset(buf, 0, MAX_PACKET_SIZE);
-	buf_len = encap(qd, buf, MAX_PACKET_SIZE, cmd, seq, data, data_len);
+	buf_len = packet_encap(qd, buf, MAX_PACKET_SIZE, cmd, seq, data, data_len);
 	if (buf_len <= 0) {
 		return -1;
 	}
 
+	qd->net_stat.sent++;
 	if (qd->use_tcp) {
-		bytes_sent = tcp_send_out(qd, buf, buf_len);
+		bytes_sent = tcp_send_out(gc, buf, buf_len);
 	} else {
-		bytes_sent = udp_send_out(qd, buf, buf_len);
+		bytes_sent = udp_send_out(gc, buf, buf_len);
 	}
 
-	if (need_ack)  {
-		qq_trans_add_client_cmd(qd, cmd, seq, data, data_len);
-	}
-	
+	return bytes_sent;
+}
+
+gint qq_send_cmd_encrypted(PurpleConnection *gc, guint16 cmd, guint16 seq,
+	guint8 *encrypted_data, gint encrypted_len, gboolean is_save2trans)
+{
+	gint sent_len;
+
 #if 1
-		/* qq_show_packet("QQ_SEND_DATA", buf, buf_len); */
-		purple_debug(PURPLE_DEBUG_INFO, "QQ",
-				"<== [%05d], 0x%04X %s, total %d bytes is sent %d\n", 
-				seq, cmd, qq_get_cmd_desc(cmd), buf_len, bytes_sent);
+		/* qq_show_packet("qq_send_cmd_encrypted", data, data_len); */
+		purple_debug_info("QQ", "<== [%05d], %s(0x%04X), datalen %d\n",
+				seq, qq_get_cmd_desc(cmd), cmd, encrypted_len);
 #endif
-	return bytes_sent;
+
+	sent_len = packet_send_out(gc, cmd, seq, encrypted_data, encrypted_len);
+	if (is_save2trans)  {
+		qq_trans_add_client_cmd(gc, cmd, seq, encrypted_data, encrypted_len, 0, 0);
+	}
+	return sent_len;
 }
 
-/* Encrypt data with session_key, then call qq_send_data */
-gint qq_send_cmd_detail(qq_data *qd, guint16 cmd, guint16 seq, gboolean need_ack,
-	guint8 *data, gint data_len)
+/* Encrypt data with session_key, and send packet out */
+static gint send_cmd_detail(PurpleConnection *gc, guint16 cmd, guint16 seq,
+	guint8 *data, gint data_len, gboolean is_save2trans, gint update_class, guint32 ship32)
 {
+	qq_data *qd;
 	guint8 *encrypted_data;
 	gint encrypted_len;
+	gint bytes_sent;
 
-	g_return_val_if_fail(qd != NULL, -1);
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
+	qd = (qq_data *)gc->proto_data;
 	g_return_val_if_fail(data != NULL && data_len > 0, -1);
 
 	/* at most 16 bytes more */
 	encrypted_data = g_newa(guint8, data_len + 16);
-#if 0
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_ENCRYPT",
-			"Before %d: [%05d] 0x%04X %s\n",
-			data_len, seq, cmd, qq_get_cmd_desc(cmd));
-#endif
 	encrypted_len = qq_encrypt(encrypted_data, data, data_len, qd->session_key);
 	if (encrypted_len < 16) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ_ENCRYPT",
-				"Error len %d: [%05d] 0x%04X %s\n",
+		purple_debug_error("QQ_ENCRYPT", "Error len %d: [%05d] 0x%04X %s\n",
 				encrypted_len, seq, cmd, qq_get_cmd_desc(cmd));
 		return -1;
 	}
 
-#if 0
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_ENCRYPT",
-			"After %d: [%05d] 0x%04X %s\n",
-			encrypted_len, seq, cmd, qq_get_cmd_desc(cmd));
-#endif
-	return qq_send_data(qd, cmd, seq, need_ack, encrypted_data, encrypted_len);
+	bytes_sent = packet_send_out(gc, cmd, seq, encrypted_data, encrypted_len);
+
+	if (is_save2trans)  {
+		qq_trans_add_client_cmd(gc, cmd, seq, encrypted_data, encrypted_len,
+				update_class, ship32);
+	}
+	return bytes_sent;
 }
 
-/* set seq and need_ack, then call qq_send_cmd_detail */
-gint qq_send_cmd(qq_data *qd, guint16 cmd, guint8 *data, gint data_len)
+gint qq_send_cmd_mess(PurpleConnection *gc, guint16 cmd, guint8 *data, gint data_len,
+		gint update_class, guint32 ship32)
 {
-	g_return_val_if_fail(qd != NULL, -1);
+	qq_data *qd;
+	guint16 seq;
+
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
+	qd = (qq_data *) gc->proto_data;
 	g_return_val_if_fail(data != NULL && data_len > 0, -1);
 
-	qd->send_seq++;
-	return qq_send_cmd_detail(qd, cmd, qd->send_seq, TRUE, data, data_len);
+	seq = ++qd->send_seq;
+#if 1
+		purple_debug_info("QQ", "<== [%05d], %s(0x%04X), datalen %d\n",
+				seq, qq_get_cmd_desc(cmd), cmd, data_len);
+#endif
+	return send_cmd_detail(gc, cmd, seq, data, data_len, TRUE, update_class, ship32);
 }
 
-gint qq_send_room_cmd_noid(PurpleConnection *gc, guint8 room_cmd, 
-		guint8 *data, gint data_len)
+/* set seq and is_save2trans, then call send_cmd_detail */
+gint qq_send_cmd(PurpleConnection *gc, guint16 cmd, guint8 *data, gint data_len)
 {
-	return qq_send_room_cmd(gc, room_cmd, 0, data, data_len);
+	qq_data *qd;
+	guint16 seq;
+	gboolean is_save2trans;
+
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
+	qd = (qq_data *) gc->proto_data;
+	g_return_val_if_fail(data != NULL && data_len > 0, -1);
+
+	if (cmd != QQ_CMD_LOGOUT) {
+		seq = ++qd->send_seq;
+		is_save2trans = TRUE;
+	} else {
+		seq = 0xFFFF;
+		is_save2trans = FALSE;
+	}
+#if 1
+		purple_debug_info("QQ", "<== [%05d], %s(0x%04X), datalen %d\n",
+				seq, qq_get_cmd_desc(cmd), cmd, data_len);
+#endif
+	return send_cmd_detail(gc, cmd, seq, data, data_len, is_save2trans, 0, 0);
 }
 
-gint qq_send_room_cmd_only(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
+/* set seq and is_save2trans, then call send_cmd_detail */
+gint qq_send_server_reply(PurpleConnection *gc, guint16 cmd, guint16 seq, guint8 *data, gint data_len)
 {
-	g_return_val_if_fail(room_cmd > 0 && room_id > 0, -1);
-	return qq_send_room_cmd(gc, room_cmd, room_id, NULL, 0);
+	qq_data *qd;
+	guint8 *encrypted_data;
+	gint encrypted_len;
+	gint bytes_sent;
+
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
+	qd = (qq_data *)gc->proto_data;
+	g_return_val_if_fail(data != NULL && data_len > 0, -1);
+
+#if 1
+		purple_debug_info("QQ", "<== [SRV-%05d], %s(0x%04X), datalen %d\n",
+				seq, qq_get_cmd_desc(cmd), cmd, data_len);
+#endif
+	/* at most 16 bytes more */
+	encrypted_data = g_newa(guint8, data_len + 16);
+	encrypted_len = qq_encrypt(encrypted_data, data, data_len, qd->session_key);
+	if (encrypted_len < 16) {
+		purple_debug_error("QQ_ENCRYPT", "Error len %d: [%05d] 0x%04X %s\n",
+				encrypted_len, seq, cmd, qq_get_cmd_desc(cmd));
+		return -1;
+	}
+
+	bytes_sent = packet_send_out(gc, cmd, seq, encrypted_data, encrypted_len);
+	qq_trans_add_server_reply(gc, cmd, seq, encrypted_data, encrypted_len);
+
+	return bytes_sent;
 }
 
-gint qq_send_room_cmd(PurpleConnection *gc, guint8 room_cmd, guint32 room_id,
-		guint8 *data, gint data_len)
+static gint send_room_cmd(PurpleConnection *gc, guint8 room_cmd, guint32 room_id,
+		guint8 *data, gint data_len, gint update_class, guint32 ship32)
 {
 	qq_data *qd;
-
 	guint8 *buf;
 	gint buf_len;
 	guint8 *encrypted_data;
 	gint encrypted_len;
 	gint bytes_sent;
 	guint16 seq;
-	
+
 	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, -1);
 	qd = (qq_data *) gc->proto_data;
 
@@ -1106,6 +1213,7 @@ gint qq_send_room_cmd(PurpleConnection *gc, guint8 room_cmd, guint32 room_id,
 	if (data != NULL && data_len > 0) {
 		buf_len += qq_putdata(buf + buf_len, data, data_len);
 	}
+
 	qd->send_seq++;
 	seq = qd->send_seq;
 
@@ -1114,32 +1222,44 @@ gint qq_send_room_cmd(PurpleConnection *gc, guint8 room_cmd, guint32 room_id,
 	encrypted_data = g_newa(guint8, buf_len + 16);
 	encrypted_len = qq_encrypt(encrypted_data, buf, buf_len, qd->session_key);
 	if (encrypted_len < 16) {
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ_ENCRYPT",
-				"Error len %d: [%05d] QQ_CMD_ROOM.(0x%02X %s)\n",
-				encrypted_len, seq, room_cmd, qq_get_room_cmd_desc(room_cmd));
-		return -1;
-	}
-
-	/* Encap header to buf */
-	buf_len = encap(qd, buf, MAX_PACKET_SIZE, QQ_CMD_ROOM, seq, encrypted_data, encrypted_len);
-	if (buf_len <= 0) {
+		purple_debug_error("QQ_ENCRYPT", "Error len %d: [%05d] %s (0x%02X)\n",
+				encrypted_len, seq, qq_get_room_cmd_desc(room_cmd), room_cmd);
 		return -1;
 	}
 
-	if (qd->use_tcp) {
-		bytes_sent = tcp_send_out(qd, buf, buf_len);
-	} else {
-		bytes_sent = udp_send_out(qd, buf, buf_len);
-	}
-
-	qq_trans_add_room_cmd(qd, seq, room_cmd, room_id, buf, buf_len);
-	
+	bytes_sent = packet_send_out(gc, QQ_CMD_ROOM, seq, encrypted_data, encrypted_len);
 #if 1
-		/* qq_show_packet("QQ_SEND_DATA", buf, buf_len); */
-		purple_debug(PURPLE_DEBUG_INFO, "QQ",
-				"<== [%05d], QQ_CMD_ROOM.(0x%02X %s) to room %d, total %d bytes is sent %d\n", 
-				seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id,
-				buf_len, bytes_sent);
+		/* qq_show_packet("send_room_cmd", buf, buf_len); */
+		purple_debug_info("QQ",
+				"<== [%05d], %s (0x%02X) to room %d, datalen %d\n",
+				seq, qq_get_room_cmd_desc(room_cmd), room_cmd, room_id, buf_len);
 #endif
+
+	qq_trans_add_room_cmd(gc, seq, room_cmd, room_id, encrypted_data, encrypted_len,
+			update_class, ship32);
 	return bytes_sent;
 }
+
+gint qq_send_room_cmd_mess(PurpleConnection *gc, guint8 room_cmd, guint32 room_id,
+		guint8 *data, gint data_len, gint update_class, guint32 ship32)
+{
+	return send_room_cmd(gc, room_cmd, room_id, data, data_len, update_class, ship32);
+}
+
+gint qq_send_room_cmd(PurpleConnection *gc, guint8 room_cmd, guint32 room_id,
+		guint8 *data, gint data_len)
+{
+	return send_room_cmd(gc, room_cmd, room_id, data, data_len, 0, 0);
+}
+
+gint qq_send_room_cmd_noid(PurpleConnection *gc, guint8 room_cmd,
+		guint8 *data, gint data_len)
+{
+	return send_room_cmd(gc, room_cmd, 0, data, data_len, 0, 0);
+}
+
+gint qq_send_room_cmd_only(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
+{
+	g_return_val_if_fail(room_cmd > 0 && room_id > 0, -1);
+	return send_room_cmd(gc, room_cmd, room_id, NULL, 0, 0, 0);
+}
diff --git a/libpurple/protocols/qq/qq_network.h b/libpurple/protocols/qq/qq_network.h
index 33d4b7def5..e150f70639 100644
--- a/libpurple/protocols/qq/qq_network.h
+++ b/libpurple/protocols/qq/qq_network.h
@@ -32,19 +32,23 @@
 
 #define QQ_CONNECT_STEPS    3	/* steps in connection */
 
-void qq_connect(PurpleAccount *account);
+gboolean qq_connect_later(gpointer data);
 void qq_disconnect(PurpleConnection *gc);
-void qq_connect_later(PurpleConnection *gc);
 
-gint qq_send_cmd(qq_data *qd, guint16 cmd, guint8 *data, gint datalen);
-gint qq_send_data(qq_data *qd, guint16 cmd, guint16 seq, gboolean need_ack,
-	guint8 *data, gint data_len);
-gint qq_send_cmd_detail(qq_data *qd, guint16 cmd, guint16 seq, gboolean need_ack,
-	guint8 *data, gint data_len);
+gint qq_send_cmd_encrypted(PurpleConnection *gc, guint16 cmd, guint16 seq,
+		guint8 *encrypted_data, gint encrypted_len, gboolean is_save2trans);
+gint qq_send_cmd(PurpleConnection *gc, guint16 cmd, guint8 *data, gint datalen);
+gint qq_send_cmd_mess(PurpleConnection *gc, guint16 cmd, guint8 *data, gint data_len,
+		gint update_class, guint32 ship32);
+
+gint qq_send_server_reply(PurpleConnection *gc, guint16 cmd, guint16 seq,
+		guint8 *data, gint data_len);
 
 gint qq_send_room_cmd(PurpleConnection *gc, guint8 room_cmd, guint32 room_id,
 		guint8 *data, gint data_len);
+gint qq_send_room_cmd_mess(PurpleConnection *gc, guint8 room_cmd, guint32 room_id,
+		guint8 *data, gint data_len, gint update_class, guint32 ship32);
 gint qq_send_room_cmd_only(PurpleConnection *gc, guint8 room_cmd, guint32 room_id);
-gint qq_send_room_cmd_noid(PurpleConnection *gc, guint8 room_cmd, 
+gint qq_send_room_cmd_noid(PurpleConnection *gc, guint8 room_cmd,
 		guint8 *data, gint data_len);
 #endif
diff --git a/libpurple/protocols/qq/qq_process.c b/libpurple/protocols/qq/qq_process.c
index b1fafb1762..e2731fcb5a 100644
--- a/libpurple/protocols/qq/qq_process.c
+++ b/libpurple/protocols/qq/qq_process.c
@@ -26,11 +26,6 @@
 #include "debug.h"
 #include "internal.h"
 
-#ifdef _WIN32
-#define random rand
-#define srandom srand
-#endif
-
 #include "buddy_info.h"
 #include "buddy_list.h"
 #include "buddy_opt.h"
@@ -65,7 +60,7 @@ enum {
 };
 
 /* default process, decrypt and dump */
-static void process_cmd_unknow(PurpleConnection *gc,gchar *title, guint8 *data, gint data_len, guint16 cmd, guint16 seq)
+static void process_cmd_unknow(PurpleConnection *gc,const gchar *title, guint8 *data, gint data_len, guint16 cmd, guint16 seq)
 {
 	qq_data *qd;
 	gchar *msg_utf8 = NULL;
@@ -82,14 +77,13 @@ static void process_cmd_unknow(PurpleConnection *gc,gchar *title, guint8 *data,
 			seq, qq_get_cmd_desc(cmd));
 
 	msg_utf8 = try_dump_as_gbk(data, data_len);
-	if (msg_utf8) {
-		purple_notify_info(gc, NULL, msg_utf8, NULL);
+	if (msg_utf8 != NULL) {
+		purple_notify_info(gc, _("QQ Error"), title, msg_utf8);
 		g_free(msg_utf8);
 	}
 }
 
-void qq_proc_cmd_server(PurpleConnection *gc,
-	guint16 cmd, guint16 seq, guint8 *rcved, gint rcved_len)
+void qq_proc_server_cmd(PurpleConnection *gc, guint16 cmd, guint16 seq, guint8 *rcved, gint rcved_len)
 {
 	qq_data *qd;
 
@@ -102,20 +96,20 @@ void qq_proc_cmd_server(PurpleConnection *gc,
 	data = g_newa(guint8, rcved_len);
 	data_len = qq_decrypt(data, rcved, rcved_len, qd->session_key);
 	if (data_len < 0) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			"Can not decrypt server cmd by session key, [%05d], 0x%04X %s, len %d\n", 
+		purple_debug_warning("QQ",
+			"Can not decrypt server cmd by session key, [%05d], 0x%04X %s, len %d\n",
 			seq, cmd, qq_get_cmd_desc(cmd), rcved_len);
 		qq_show_packet("Can not decrypted", rcved, rcved_len);
 		return;
 	}
 
 	if (data_len <= 0) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			"Server cmd decrypted is empty, [%05d], 0x%04X %s, len %d\n", 
+		purple_debug_warning("QQ",
+			"Server cmd decrypted is empty, [%05d], 0x%04X %s, len %d\n",
 			seq, cmd, qq_get_cmd_desc(cmd), rcved_len);
 		return;
 	}
-	
+
 	/* now process the packet */
 	switch (cmd) {
 		case QQ_CMD_RECV_IM:
@@ -124,107 +118,208 @@ void qq_proc_cmd_server(PurpleConnection *gc,
 		case QQ_CMD_RECV_MSG_SYS:
 			qq_process_msg_sys(data, data_len, seq, gc);
 			break;
-		case QQ_CMD_RECV_MSG_BUDDY_CHANGE_STATUS:
+		case QQ_CMD_BUDDY_CHANGE_STATUS:
 			qq_process_buddy_change_status(data, data_len, gc);
 			break;
 		default:
-			process_cmd_unknow(gc, "Unknow SERVER CMD", data, data_len, cmd, seq);
+			process_cmd_unknow(gc, _("Unknow SERVER CMD"), data, data_len, cmd, seq);
 			break;
 	}
 }
 
-static void process_cmd_login(PurpleConnection *gc, guint8 *data, gint data_len)
+static void process_room_cmd_notify(PurpleConnection *gc,
+	guint8 room_cmd, guint8 room_id, guint8 reply, guint8 *data, gint data_len)
+{
+	gchar *prim;
+	gchar *msg, *msg_utf8;
+	g_return_if_fail(data != NULL && data_len > 0);
+
+	msg = g_strndup((gchar *) data, data_len);	/* it will append 0x00 */
+	msg_utf8 = qq_to_utf8(msg, QQ_CHARSET_DEFAULT);
+	g_free(msg);
+
+	prim = g_strdup_printf(_("Error reply of %s(0x%02X)\nRoom %d, reply 0x%02X"),
+		qq_get_room_cmd_desc(room_cmd), room_cmd, room_id, reply);
+
+	purple_notify_error(gc, _("QQ Qun Command"), prim, msg_utf8);
+
+	g_free(prim);
+	g_free(msg_utf8);
+}
+
+void qq_update_room(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
 {
 	qq_data *qd;
-	guint ret_8;
+	qq_group *group;
+	gint ret;
 
 	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
-	
 	qd = (qq_data *) gc->proto_data;
 
-	ret_8 = qq_process_login_reply(data, data_len, gc);
-	if (ret_8 == QQ_LOGIN_REPLY_OK) {
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "Login repliess OK; everything is fine\n");
+	group = qq_room_search_id(gc, room_id);
+	if (group == NULL && room_id <= 0) {
+		purple_debug_info("QQ", "No room, nothing update\n");
+		return;
+	}
+	if (group == NULL ) {
+		purple_debug_warning("QQ", "Failed search room id [%d]\n", room_id);
+		return;
+	}
 
-		purple_connection_set_state(gc, PURPLE_CONNECTED);
-		qd->logged_in = TRUE;	/* must be defined after sev_finish_login */
+	switch (room_cmd) {
+		case 0:
+			qq_send_room_cmd_mess(gc, QQ_ROOM_CMD_GET_INFO, group->id, NULL, 0,
+					QQ_CMD_CLASS_UPDATE_ROOM, 0);
+			break;
+		case QQ_ROOM_CMD_GET_INFO:
+			ret = qq_request_room_get_buddies(gc, group, QQ_CMD_CLASS_UPDATE_ROOM);
+			if (ret <= 0) {
+				qq_send_room_cmd_mess(gc, QQ_ROOM_CMD_GET_ONLINES, group->id, NULL, 0,
+						QQ_CMD_CLASS_UPDATE_ROOM, 0);
+			}
+			break;
+		case QQ_ROOM_CMD_GET_BUDDIES:
+			qq_send_room_cmd_mess(gc, QQ_ROOM_CMD_GET_ONLINES, group->id, NULL, 0,
+					QQ_CMD_CLASS_UPDATE_ROOM, 0);
+			break;
+		case QQ_ROOM_CMD_GET_ONLINES:
+			/* last command */
+		default:
+			break;
+	}
+}
 
-		/* now initiate QQ Qun, do it first as it may take longer to finish */
-		qq_group_init(gc);
+static void update_all_rooms(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
+{
+	qq_data *qd;
+	gboolean is_new_turn = FALSE;
+	qq_group *next_group;
 
-		/* Now goes on updating my icon/nickname, not showing info_window */
-		qd->modifying_face = FALSE;
+	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
 
-		qq_send_packet_get_info(gc, qd->uid, FALSE);
-		/* grab my level */
-		qq_send_packet_get_level(gc, qd->uid);
+	next_group = qq_room_get_next(gc, room_id);
+	if (next_group == NULL && room_id <= 0) {
+		purple_debug_info("QQ", "No room. Finished update\n");
+		return;
+	}
+	if (next_group == NULL ) {
+		is_new_turn = TRUE;
+		next_group = qq_room_get_next(gc, 0);
+		g_return_if_fail(next_group != NULL);
+	}
 
-		qq_send_packet_change_status(gc);
+	switch (room_cmd) {
+		case 0:
+			qq_send_room_cmd_mess(gc, QQ_ROOM_CMD_GET_INFO, next_group->id, NULL, 0,
+					QQ_CMD_CLASS_UPDATE_ALL, 0);
+			break;
+		case QQ_ROOM_CMD_GET_INFO:
+			if (!is_new_turn) {
+				qq_send_room_cmd_mess(gc, QQ_ROOM_CMD_GET_INFO, next_group->id, NULL, 0,
+						QQ_CMD_CLASS_UPDATE_ALL, 0);
+			} else {
+				qq_request_room_get_buddies(gc, next_group, QQ_CMD_CLASS_UPDATE_ALL);
+			}
+			break;
+		case QQ_ROOM_CMD_GET_BUDDIES:
+			/* last command */
+			if (!is_new_turn) {
+				qq_request_room_get_buddies(gc, next_group, QQ_CMD_CLASS_UPDATE_ALL);
+			} else {
+				purple_debug_info("QQ", "Finished update\n");
+			}
+			break;
+		default:
+			break;
+	}
+}
 
-		/* refresh buddies */
-		qq_send_packet_get_buddies_list(gc, 0);
+void qq_update_all(PurpleConnection *gc, guint16 cmd)
+{
+	qq_data *qd;
 
-		/* refresh groups */
-		qq_send_packet_get_buddies_and_rooms(gc, 0);
+	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
 
-		return;
+	switch (cmd) {
+		case 0:
+			qq_request_buddy_info(gc, qd->uid, QQ_CMD_CLASS_UPDATE_ALL, QQ_BUDDY_INFO_UPDATE_ONLY);
+			break;
+		case QQ_CMD_GET_BUDDY_INFO:
+			qq_request_change_status(gc, QQ_CMD_CLASS_UPDATE_ALL);
+			break;
+		case QQ_CMD_CHANGE_STATUS:
+			qq_request_get_buddies_list(gc, 0, QQ_CMD_CLASS_UPDATE_ALL);
+			break;
+		case QQ_CMD_GET_BUDDIES_LIST:
+			qq_request_get_buddies_and_rooms(gc, 0, QQ_CMD_CLASS_UPDATE_ALL);
+			break;
+		case QQ_CMD_GET_BUDDIES_AND_ROOMS:
+			qq_request_get_buddies_level(gc, QQ_CMD_CLASS_UPDATE_ALL);
+			break;
+		case QQ_CMD_GET_LEVEL:
+			qq_request_get_buddies_online(gc, 0, QQ_CMD_CLASS_UPDATE_ALL);
+			break;
+		case QQ_CMD_GET_BUDDIES_ONLINE:
+			/* last command */
+			update_all_rooms(gc, 0, 0);
+			break;
+		default:
+			break;
 	}
+}
+
+static void update_all_rooms_online(PurpleConnection *gc, guint8 room_cmd, guint32 room_id)
+{
+	qq_data *qd;
+	qq_group *next_group;
 
-	if (ret_8 == QQ_LOGIN_REPLY_REDIRECT) {
-		qd->is_redirect = TRUE;
-		/*
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			"Redirected to new server: %s:%d\n", qd->real_hostname, qd->real_port);
-		*/
+	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
+
+	next_group = qq_room_get_next_conv(gc, room_id);
+	if (next_group == NULL && room_id <= 0) {
+		purple_debug_info("QQ", "No room in conversation, no update online buddies\n");
 		return;
 	}
-
-	if (ret_8 == QQ_LOGIN_REPLY_ERR_PWD) {
-		if (!purple_account_get_remember_password(gc->account)) {
-			purple_account_set_password(gc->account, NULL);
-		}
-		purple_connection_error_reason(gc,
-			PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Incorrect password."));
+	if (next_group == NULL ) {
+		purple_debug_info("QQ", "finished update rooms' online buddies\n");
 		return;
 	}
 
-	if (ret_8 == QQ_LOGIN_REPLY_ERR_MISC) {
-		if (purple_debug_is_enabled())
-			purple_connection_error_reason(gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Unable to login. Check debug log."));
-		else
-			purple_connection_error_reason(gc,
-				PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Unable to login"));
-		return;
+	switch (room_cmd) {
+		case 0:
+			qq_send_room_cmd_mess(gc, QQ_ROOM_CMD_GET_ONLINES, next_group->id, NULL, 0,
+					QQ_CMD_CLASS_UPDATE_ALL, 0);
+			break;
+		case QQ_ROOM_CMD_GET_ONLINES:
+			qq_send_room_cmd_mess(gc, QQ_ROOM_CMD_GET_ONLINES, next_group->id, NULL, 0,
+					QQ_CMD_CLASS_UPDATE_ALL, 0);
+			break;
+		default:
+			break;
 	}
 }
 
-static void process_room_cmd_notify(PurpleConnection *gc, 
-	guint8 room_cmd, guint8 room_id, guint8 reply_cmd, guint8 reply, guint8 *data, gint data_len)
+void qq_update_online(PurpleConnection *gc, guint16 cmd)
 {
-	gchar *msg, *msg_utf8;
-	g_return_if_fail(data != NULL && data_len > 0);
-
-	msg = g_strndup((gchar *) data, data_len);	/* it will append 0x00 */
-	msg_utf8 = qq_to_utf8(msg, QQ_CHARSET_DEFAULT);
-	g_free(msg);
-	
-	msg = g_strdup_printf(_(
-		"Reply %s(0x%02X )\n"
-		"Sent %s(0x%02X )\n"
-		"Room id %d, reply [0x%02X]: \n"
-		"%s"), 
-		qq_get_room_cmd_desc(reply_cmd), reply_cmd, 
-		qq_get_room_cmd_desc(room_cmd), room_cmd, 
-		room_id, reply, msg_utf8);
-		
-	purple_notify_error(gc, NULL, _("Failed room reply"), msg);
-	g_free(msg);
-	g_free(msg_utf8);
+	switch (cmd) {
+		case 0:
+			qq_request_get_buddies_online(gc, 0, QQ_CMD_CLASS_UPDATE_ONLINE);
+			break;
+		case QQ_CMD_GET_BUDDIES_ONLINE:
+			/* last command */
+			update_all_rooms_online(gc, 0, 0);
+			break;
+		default:
+			break;
+	}
 }
 
-void qq_proc_room_cmd_reply(PurpleConnection *gc,
-	guint16 seq, guint8 room_cmd, guint32 room_id, guint8 *rcved, gint rcved_len)
+void qq_proc_room_cmd(PurpleConnection *gc, guint16 seq,
+		guint8 room_cmd, guint32 room_id, guint8 *rcved, gint rcved_len,
+		gint update_class, guint32 ship32)
 {
 	qq_data *qd;
 	guint8 *data;
@@ -239,58 +334,57 @@ void qq_proc_room_cmd_reply(PurpleConnection *gc,
 	data = g_newa(guint8, rcved_len);
 	data_len = qq_decrypt(data, rcved, rcved_len, qd->session_key);
 	if (data_len < 0) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			"Can not decrypt room cmd by session key, [%05d], 0x%02X %s for %d, len %d\n", 
+		purple_debug_warning("QQ",
+			"Can not decrypt room cmd by session key, [%05d], 0x%02X %s for %d, len %d\n",
 			seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
 		qq_show_packet("Can not decrypted", rcved, rcved_len);
 		return;
 	}
 
 	if (room_id <= 0) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			"Invaild room id, [%05d], 0x%02X %s for %d, len %d\n", 
+		purple_debug_warning("QQ",
+			"Invaild room id, [%05d], 0x%02X %s for %d, len %d\n",
 			seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
-		return;
+		/* Some room cmd has no room id, like QQ_ROOM_CMD_SEARCH */
 	}
 
 	if (data_len <= 2) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			"Invaild len of room cmd decrypted, [%05d], 0x%02X %s for %d, len %d\n", 
+		purple_debug_warning("QQ",
+			"Invaild len of room cmd decrypted, [%05d], 0x%02X %s for %d, len %d\n",
 			seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
 		return;
 	}
-	
+
 	group = qq_room_search_id(gc, room_id);
 	if (group == NULL) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			"Missing room id in [%05d], 0x%02X %s for %d, len %d\n", 
+		purple_debug_warning("QQ",
+			"Missing room id in [%05d], 0x%02X %s for %d, len %d\n",
 			seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
 	}
-	
+
 	bytes = 0;
 	bytes += qq_get8(&reply_cmd, data + bytes);
 	bytes += qq_get8(&reply, data + bytes);
 
 	if (reply_cmd != room_cmd) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			"Missing room cmd in reply 0x%02X %s, [%05d], 0x%02X %s for %d, len %d\n", 
+		purple_debug_warning("QQ",
+			"Missing room cmd in reply 0x%02X %s, [%05d], 0x%02X %s for %d, len %d\n",
 			reply_cmd, qq_get_room_cmd_desc(reply_cmd),
 			seq, room_cmd, qq_get_room_cmd_desc(room_cmd), room_id, rcved_len);
 	}
-	
+
 	/* now process the packet */
 	if (reply != QQ_ROOM_CMD_REPLY_OK) {
 		if (group != NULL) {
 			qq_set_pending_id(&qd->joining_groups, group->ext_id, FALSE);
 		}
-		
+
 		switch (reply) {	/* this should be all errors */
 		case QQ_ROOM_CMD_REPLY_NOT_MEMBER:
 			if (group != NULL) {
-				purple_debug(PURPLE_DEBUG_WARNING,
-					   "QQ",
-					   _("You are not a member of group \"%s\"\n"), group->group_name_utf8);
-				group->my_status = QQ_GROUP_MEMBER_STATUS_NOT_MEMBER;
+				purple_debug_warning("QQ",
+					   _("You are not a member of QQ Qun \"%s\"\n"), group->title_utf8);
+				group->my_role = QQ_ROOM_ROLE_NO;
 				qq_group_refresh(gc, group);
 			}
 			break;
@@ -300,7 +394,7 @@ void qq_proc_room_cmd_reply(PurpleConnection *gc,
 					purple_roomlist_set_in_progress(qd->roomlist, FALSE);
 			}
 		default:
-			process_room_cmd_notify(gc, room_cmd, room_id, reply_cmd, reply, data + bytes, data_len - bytes);
+			process_room_cmd_notify(gc, reply_cmd, room_id, reply, data + bytes, data_len - bytes);
 		}
 		return;
 	}
@@ -309,10 +403,6 @@ void qq_proc_room_cmd_reply(PurpleConnection *gc,
 	switch (reply_cmd) {
 	case QQ_ROOM_CMD_GET_INFO:
 		qq_process_room_cmd_get_info(data + bytes, data_len - bytes, gc);
-		if (group != NULL) {
-			qq_send_cmd_group_get_members_info(gc, group);
-			qq_send_cmd_group_get_online_members(gc, group);
-		}
 		break;
 	case QQ_ROOM_CMD_CREATE:
 		qq_group_process_create_group_reply(data + bytes, data_len - bytes, gc);
@@ -346,20 +436,88 @@ void qq_proc_room_cmd_reply(PurpleConnection *gc,
 		if (group != NULL)
 			qq_group_conv_refresh_online_member(gc, group);
 		break;
-	case QQ_ROOM_CMD_GET_MEMBER_INFO:
-		qq_process_room_cmd_get_members(data + bytes, data_len - bytes, gc);
-		if (group != NULL)
+	case QQ_ROOM_CMD_GET_BUDDIES:
+		qq_process_room_cmd_get_buddies(data + bytes, data_len - bytes, gc);
+		if (group != NULL) {
+			group->is_got_info = TRUE;
 			qq_group_conv_refresh_online_member(gc, group);
+		}
 		break;
 	default:
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			   "Unknow room cmd 0x%02X %s\n", 
+		purple_debug_warning("QQ", "Unknow room cmd 0x%02X %s\n",
 			   reply_cmd, qq_get_room_cmd_desc(reply_cmd));
 	}
+
+	if (update_class == QQ_CMD_CLASS_NONE)
+		return;
+
+	purple_debug_info("QQ", "Update class %d\n", update_class);
+	if (update_class == QQ_CMD_CLASS_UPDATE_ALL) {
+		update_all_rooms(gc, room_cmd, room_id);
+		return;
+	}
+	if (update_class == QQ_CMD_CLASS_UPDATE_ONLINE) {
+		update_all_rooms_online(gc, room_cmd, room_id);
+		return;
+	}
+	if (update_class == QQ_CMD_CLASS_UPDATE_ROOM) {
+		qq_update_room(gc, room_cmd, room_id);
+	}
 }
 
-void qq_proc_cmd_reply(PurpleConnection *gc,
-	guint16 cmd, guint16 seq, guint8 *rcved, gint rcved_len)
+void qq_proc_login_cmd(PurpleConnection *gc, guint8 *rcved, gint rcved_len)
+{
+	qq_data *qd;
+	guint8 *data;
+	gint data_len;
+	guint ret_8;
+
+	g_return_if_fail (gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
+
+	data = g_newa(guint8, rcved_len);
+	/* May use password_twice_md5 in the past version like QQ2005*/
+	data_len = qq_decrypt(data, rcved, rcved_len, qd->inikey);
+	if (data_len >= 0) {
+		purple_debug_warning("QQ",
+				"Decrypt login reply packet with inikey, %d bytes\n", data_len);
+	} else {
+		data_len = qq_decrypt(data, rcved, rcved_len, qd->password_twice_md5);
+		if (data_len >= 0) {
+			purple_debug_warning("QQ",
+				"Decrypt login reply packet with password_twice_md5, %d bytes\n", data_len);
+		} else {
+			purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
+				_("Can not decrypt login reply"));
+			return;
+		}
+	}
+
+	ret_8 = qq_process_login_reply(gc, data, data_len);
+	if (ret_8 != QQ_LOGIN_REPLY_OK) {
+		return;
+	}
+
+	purple_debug_info("QQ", "Login repliess OK; everything is fine\n");
+
+	purple_connection_set_state(gc, PURPLE_CONNECTED);
+	qd->is_login = TRUE;	/* must be defined after sev_finish_login */
+
+	/* now initiate QQ Qun, do it first as it may take longer to finish */
+	qq_group_init(gc);
+
+	/* Now goes on updating my icon/nickname, not showing info_window */
+	qd->modifying_face = FALSE;
+
+	/* is_login, but we have packets before login */
+	qq_trans_process_remained(gc);
+
+	qq_update_all(gc, 0);
+	return;
+}
+
+void qq_proc_client_cmd(PurpleConnection *gc, guint16 cmd, guint16 seq,
+		guint8 *rcved, gint rcved_len, gint update_class, guint32 ship32)
 {
 	qq_data *qd;
 
@@ -369,7 +527,7 @@ void qq_proc_cmd_reply(PurpleConnection *gc,
 	guint8 ret_8 = 0;
 	guint16 ret_16 = 0;
 	guint32 ret_32 = 0;
-	gchar *error_msg = NULL;
+	gboolean is_unknow = FALSE;
 
 	g_return_if_fail(rcved_len > 0);
 
@@ -377,61 +535,23 @@ void qq_proc_cmd_reply(PurpleConnection *gc,
 	qd = (qq_data *) gc->proto_data;
 
 	data = g_newa(guint8, rcved_len);
-	if (cmd == QQ_CMD_TOKEN) {
-		g_memmove(data, rcved, rcved_len);
-		data_len = rcved_len;
-	} else if (cmd == QQ_CMD_LOGIN) {
-		/* May use password_twice_md5 in the past version like QQ2005*/
-		data_len = qq_decrypt(data, rcved, rcved_len, qd->inikey);
-		if (data_len >= 0) {
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", 
-					"Decrypt login reply packet with inikey, %d bytes\n", data_len);
-		} else {
-			data_len = qq_decrypt(data, rcved, rcved_len, qd->password_twice_md5);
-			if (data_len >= 0) {
-				purple_debug(PURPLE_DEBUG_WARNING, "QQ", 
-					"Decrypt login reply packet with password_twice_md5, %d bytes\n", data_len);
-			} else {
-				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, 
-					_("Can not decrypt login reply"));
-				return;
-			}
-		}
-	} else {
-		data_len = qq_decrypt(data, rcved, rcved_len, qd->session_key);
-		if (data_len < 0) {
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-				"Can not reply by session key, [%05d], 0x%04X %s, len %d\n", 
-				seq, cmd, qq_get_cmd_desc(cmd), rcved_len);
-			qq_show_packet("Can not decrypted", rcved, rcved_len);
-			return;
-		}
+	data_len = qq_decrypt(data, rcved, rcved_len, qd->session_key);
+	if (data_len < 0) {
+		purple_debug_warning("QQ",
+			"Reply can not be decrypted by session key, [%05d], 0x%04X %s, len %d\n",
+			seq, cmd, qq_get_cmd_desc(cmd), rcved_len);
+		qq_show_packet("Can not decrypted", rcved, rcved_len);
+		return;
 	}
-	
+
 	if (data_len <= 0) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			"Reply decrypted is empty, [%05d], 0x%04X %s, len %d\n", 
+		purple_debug_warning("QQ",
+			"Reply decrypted is empty, [%05d], 0x%04X %s, len %d\n",
 			seq, cmd, qq_get_cmd_desc(cmd), rcved_len);
 		return;
 	}
 
 	switch (cmd) {
-		case QQ_CMD_TOKEN:
-			ret_8 = qq_process_token_reply(gc, error_msg, data, data_len);
-			if (ret_8 != QQ_TOKEN_REPLY_OK) {
-				if (error_msg == NULL) {
-					error_msg = g_strdup_printf( _("Invalid token reply code, 0x%02X"), ret_8);
-				}
-				purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, error_msg);
-				g_free(error_msg);
-				return;
-			}
-			
-			qq_send_packet_login(gc);
-			break;
-		case QQ_CMD_LOGIN:
-			process_cmd_login(gc, data, data_len);
-			break;
 		case QQ_CMD_UPDATE_INFO:
 			qq_process_modify_info_reply(data, data_len, gc);
 			break;
@@ -447,10 +567,10 @@ void qq_proc_cmd_reply(PurpleConnection *gc,
 		case QQ_CMD_BUDDY_AUTH:
 			qq_process_add_buddy_auth_reply(data, data_len, gc);
 			break;
-		case QQ_CMD_GET_USER_INFO:
-			qq_process_get_info_reply(data, data_len, gc);
+		case QQ_CMD_GET_BUDDY_INFO:
+			qq_process_get_buddy_info(data, data_len, gc);
 			break;
-		case QQ_CMD_CHANGE_ONLINE_STATUS:
+		case QQ_CMD_CHANGE_STATUS:
 			qq_process_change_status_reply(data, data_len, gc);
 			break;
 		case QQ_CMD_SEND_IM:
@@ -462,41 +582,53 @@ void qq_proc_cmd_reply(PurpleConnection *gc,
 		case QQ_CMD_GET_BUDDIES_ONLINE:
 			ret_8 = qq_process_get_buddies_online_reply(data, data_len, gc);
 			if (ret_8  > 0 && ret_8 < 0xff) {
-				purple_debug(PURPLE_DEBUG_INFO, "QQ", "Requesting for more online buddies\n"); 
-				qq_send_packet_get_buddies_online(gc, ret_8);
-			} else {
-				purple_debug(PURPLE_DEBUG_INFO, "QQ", "All online buddies received\n"); 
-				/* Fixme: this should not be called once*/
-				qq_send_packet_get_buddies_levels(gc);
-
-				qq_refresh_all_buddy_status(gc);
+				purple_debug_info("QQ", "Requesting for more online buddies\n");
+				qq_request_get_buddies_online(gc, ret_8, update_class);
+				return;
 			}
+			purple_debug_info("QQ", "All online buddies received\n");
+			qq_refresh_all_buddy_status(gc);
 			break;
 		case QQ_CMD_GET_LEVEL:
 			qq_process_get_level_reply(data, data_len, gc);
 			break;
 		case QQ_CMD_GET_BUDDIES_LIST:
 			ret_16 = qq_process_get_buddies_list_reply(data, data_len, gc);
-			if (ret_16 > 0	&& ret_16 < 0xffff) { 
-				purple_debug(PURPLE_DEBUG_INFO, "QQ", "Requesting for more buddies\n"); 
-				qq_send_packet_get_buddies_list(gc, ret_16);
-			} else {
-				purple_debug(PURPLE_DEBUG_INFO, "QQ", "All buddies received. Requesting buddies' levels\n");
-				qq_send_packet_get_buddies_online(gc, 0);
+			if (ret_16 > 0	&& ret_16 < 0xffff) {
+				purple_debug_info("QQ", "Requesting for more buddies\n");
+				qq_request_get_buddies_list(gc, ret_16, update_class);
+				return;
 			}
+			purple_debug_info("QQ", "All buddies received. Requesting buddies' levels\n");
 			break;
 		case QQ_CMD_GET_BUDDIES_AND_ROOMS:
 			ret_32 = qq_process_get_buddies_and_rooms(data, data_len, gc);
 			if (ret_32 > 0 && ret_32 < 0xffffffff) {
-				purple_debug(PURPLE_DEBUG_INFO, "QQ", "Requesting for more buddies and groups\n");
-				qq_send_packet_get_buddies_and_rooms(gc, ret_32);
-			} else {
-				purple_debug(PURPLE_DEBUG_INFO, "QQ", "All buddies and groups received\n"); 
+				purple_debug_info("QQ", "Requesting for more buddies and groups\n");
+				qq_request_get_buddies_and_rooms(gc, ret_32, update_class);
+				return;
 			}
+			purple_debug_info("QQ", "All buddies and groups received\n");
 			break;
 		default:
-			process_cmd_unknow(gc, "Unknow reply CMD", data, data_len, cmd, seq);
+			process_cmd_unknow(gc, _("Unknow reply CMD"), data, data_len, cmd, seq);
+			is_unknow = TRUE;
 			break;
 	}
+	if (is_unknow)
+		return;
+
+	if (update_class == QQ_CMD_CLASS_NONE)
+		return;
+
+	purple_debug_info("QQ", "Update class %d\n", update_class);
+	if (update_class == QQ_CMD_CLASS_UPDATE_ALL) {
+		qq_update_all(gc, cmd);
+		return;
+	}
+	if (update_class == QQ_CMD_CLASS_UPDATE_ONLINE) {
+		qq_update_online(gc, cmd);
+		return;
+	}
 }
 
diff --git a/libpurple/protocols/qq/qq_process.h b/libpurple/protocols/qq/qq_process.h
index 10fcbdd13d..e529100797 100644
--- a/libpurple/protocols/qq/qq_process.h
+++ b/libpurple/protocols/qq/qq_process.h
@@ -30,12 +30,24 @@
 
 #include "qq.h"
 
-void qq_proc_cmd_reply(PurpleConnection *gc,
-		guint16 cmd, guint16 seq, guint8 *rcved, gint rcved_len);
-void qq_proc_room_cmd_reply(PurpleConnection *gc,
-	guint16 seq, guint8 room_cmd, guint32 room_id, guint8 *rcved, gint rcved_len);
-	
-void qq_proc_cmd_server(PurpleConnection *gc,
-	guint16 cmd, guint16 seq, guint8 *rcved, gint rcved_len);
+enum {
+	QQ_CMD_CLASS_NONE = 0,
+	QQ_CMD_CLASS_UPDATE_ALL,
+	QQ_CMD_CLASS_UPDATE_ONLINE,
+	QQ_CMD_CLASS_UPDATE_ROOM,
+};
+
+void qq_proc_login_cmd(PurpleConnection *gc, guint8 *rcved, gint rcved_len);
+void qq_proc_client_cmd(PurpleConnection *gc, guint16 cmd, guint16 seq,
+		guint8 *rcved, gint rcved_len, gint update_class, guint32 ship32);
+void qq_proc_room_cmd(PurpleConnection *gc, guint16 seq,
+		guint8 room_cmd, guint32 room_id, guint8 *rcved, gint rcved_len,
+		gint update_class, guint32 ship32);
+
+void qq_proc_server_cmd(PurpleConnection *gc, guint16 cmd, guint16 seq, guint8 *rcved, gint rcved_len);
+
+void qq_update_all(PurpleConnection *gc, guint16 cmd);
+void qq_update_online(PurpleConnection *gc, guint16 cmd);
+void qq_update_room(PurpleConnection *gc, guint8 room_cmd, guint32 room_id);
 #endif
 
diff --git a/libpurple/protocols/qq/qq_trans.c b/libpurple/protocols/qq/qq_trans.c
index d376282952..3f507c6219 100644
--- a/libpurple/protocols/qq/qq_trans.c
+++ b/libpurple/protocols/qq/qq_trans.c
@@ -35,55 +35,47 @@
 #include "qq_process.h"
 #include "qq_trans.h"
 
-#define QQ_RESEND_MAX               3	/* max resend per packet */
-
-qq_transaction *qq_trans_find_rcved(qq_data *qd, guint16 cmd, guint16 seq)
-{
-	GList *curr;
-	GList *next;
-	qq_transaction *trans;
-
-	if (qd->transactions == NULL) {
-		return NULL;
-	}
-
-	next = qd->transactions;
-	while( (curr = next) ) {
-		next = curr->next;
-		
-		trans = (qq_transaction *) (curr->data);
-		if(trans->cmd == cmd && trans->seq == seq) {
-			if (trans->rcved_times == 0) {
-				trans->scan_times = 0;
-			}
-			trans->rcved_times++;
-			if (qq_trans_is_server(trans) && qq_trans_is_dup(trans)) {
-				/* server may not get our confirm reply before, send reply again*/
-				if (trans->data != NULL && trans->data_len > 0) {
-					qq_send_data(qd, trans->cmd, trans->seq, FALSE, trans->data, trans->data_len);
-				}
-			}
-			return trans;
-		}
-	}
-
-	return NULL;
-}
-
-gboolean qq_trans_is_server(qq_transaction *trans) 
+enum {
+	QQ_TRANS_IS_SERVER = 0x01,			/* Is server command or client command */
+	QQ_TRANS_IS_IMPORT = 0x02,			/* Only notice if not get reply; or resend, disconn if reties get 0*/
+	QQ_TRANS_REMAINED = 0x04,				/* server command before login*/
+	QQ_TRANS_IS_REPLY = 0x08,				/* server command before login*/
+};
+
+struct _qq_transaction {
+	guint8 flag;
+	guint16 seq;
+	guint16 cmd;
+
+	guint8 room_cmd;
+	guint32 room_id;
+
+	guint8 *data;
+	gint data_len;
+
+	gint fd;
+	gint send_retries;
+	gint rcved_times;
+	gint scan_times;
+
+	gint update_class;
+	guint32 ship32;
+};
+
+gboolean qq_trans_is_server(qq_transaction *trans)
 {
 	g_return_val_if_fail(trans != NULL, FALSE);
-	
+
 	if (trans->flag & QQ_TRANS_IS_SERVER)
 		return TRUE;
 	else
 		return FALSE;
 }
 
-gboolean qq_trans_is_dup(qq_transaction *trans) 
+gboolean qq_trans_is_dup(qq_transaction *trans)
 {
 	g_return_val_if_fail(trans != NULL, TRUE);
-	
+
 	if (trans->rcved_times > 1)
 		return TRUE;
 	else
@@ -102,115 +94,203 @@ guint32 qq_trans_get_room_id(qq_transaction *trans)
 	return trans->room_id;
 }
 
+gint qq_trans_get_class(qq_transaction *trans)
+{
+	g_return_val_if_fail(trans != NULL, QQ_CMD_CLASS_NONE);
+	return trans->update_class;
+}
+
+gint qq_trans_get_ship(qq_transaction *trans)
+{
+	g_return_val_if_fail(trans != NULL, 0);
+	return trans->ship32;
+}
+
+static qq_transaction *trans_create(PurpleConnection *gc, gint fd,
+	guint16 cmd, guint16 seq, guint8 *data, gint data_len, gint update_class, guint32 ship32)
+{
+	qq_data *qd;
+	qq_transaction *trans;
+
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
+	qd = (qq_data *) gc->proto_data;
+
+	trans = g_new0(qq_transaction, 1);
+
+	memset(trans, 0, sizeof(qq_transaction));
+	trans->fd = fd;
+	trans->cmd = cmd;
+	trans->seq = seq;
+
+	trans->data = NULL;
+	trans->data_len = 0;
+	if (data != NULL && data_len > 0) {
+		/* don't use g_strdup, may have 0x00 */
+		trans->data = g_memdup(data, data_len);
+		trans->data_len = data_len;
+	}
+
+	trans->update_class = update_class;
+	return trans;
+}
+
 /* Remove a packet with seq from send trans */
-static void trans_remove(qq_data *qd, qq_transaction *trans) 
+static void trans_remove(PurpleConnection *gc, qq_transaction *trans)
 {
-	g_return_if_fail(qd != NULL && trans != NULL);
-	
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS",
+	qq_data *qd = (qq_data *)gc->proto_data;
+
+	g_return_if_fail(gc != NULL && gc->proto_data != NULL);
+	qd = (qq_data *) gc->proto_data;
+
+	g_return_if_fail(trans != NULL);
+#if 0
+	purple_debug_info("QQ_TRANS",
 				"Remove [%s%05d] retry %d rcved %d scan %d %s\n",
 				(trans->flag & QQ_TRANS_IS_SERVER) ? "SRV-" : "",
 				trans->seq,
 				trans->send_retries, trans->rcved_times, trans->scan_times,
 				qq_get_cmd_desc(trans->cmd));
-
+#endif
 	if (trans->data)	g_free(trans->data);
 	qd->transactions = g_list_remove(qd->transactions, trans);
 	g_free(trans);
 }
 
-void qq_trans_add_client_cmd(qq_data *qd, guint16 cmd, guint16 seq, guint8 *data, gint data_len)
+static qq_transaction *trans_find(PurpleConnection *gc, guint16 cmd, guint16 seq)
 {
-	qq_transaction *trans = g_new0(qq_transaction, 1);
+	qq_data *qd;
+	GList *list;
+	qq_transaction *trans;
 
-	g_return_if_fail(trans != NULL);
+	g_return_val_if_fail(gc != NULL && gc->proto_data != NULL, NULL);
+	qd = (qq_data *) gc->proto_data;
 
-	trans->flag = 0;
-	if (cmd == QQ_CMD_TOKEN || cmd == QQ_CMD_LOGIN || cmd == QQ_CMD_KEEP_ALIVE) {
-		trans->flag |= QQ_TRANS_CLI_IMPORT;
+	list = qd->transactions;
+	while (list != NULL) {
+		trans = (qq_transaction *) list->data;
+		if(trans->cmd == cmd && trans->seq == seq) {
+			return trans;
+		}
+		list = list->next;
 	}
-	trans->fd = qd->fd;
-	trans->cmd = cmd;
-	trans->seq = seq;
-	trans->room_cmd = 0;
-	trans->room_id = 0;
-	trans->send_retries = QQ_RESEND_MAX;
-	trans->rcved_times = 0;
-	trans->scan_times = 0;
 
-	trans->data = NULL;
-	trans->data_len = 0;
-	if (data != NULL && data_len > 0) {
-		trans->data = g_memdup(data, data_len);	/* don't use g_strdup, may have 0x00 */
-		trans->data_len = data_len;
+	return NULL;
+}
+
+void qq_trans_add_client_cmd(PurpleConnection *gc,
+	guint16 cmd, guint16 seq, guint8 *data, gint data_len, gint update_class, guint32 ship32)
+{
+	qq_data *qd = (qq_data *)gc->proto_data;
+	qq_transaction *trans = trans_create(gc, qd->fd, cmd, seq, data, data_len, update_class, ship32);
+
+	if (cmd == QQ_CMD_TOKEN || cmd == QQ_CMD_LOGIN || cmd == QQ_CMD_KEEP_ALIVE) {
+		trans->flag |= QQ_TRANS_IS_IMPORT;
 	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS",
-			"Add client cmd, seq = %d, data = %p, len = %d\n",
+	trans->send_retries = qd->resend_times;
+#if 0
+	purple_debug_info("QQ_TRANS", "Add client cmd, seq %d, data %p, len %d\n",
 			trans->seq, trans->data, trans->data_len);
+#endif
 	qd->transactions = g_list_append(qd->transactions, trans);
 }
 
-void qq_trans_add_room_cmd(qq_data *qd, guint16 seq, guint8 room_cmd, guint32 room_id,
-		guint8 *data, gint data_len)
+qq_transaction *qq_trans_find_rcved(PurpleConnection *gc, guint16 cmd, guint16 seq)
 {
-	qq_transaction *trans = g_new0(qq_transaction, 1);
+	qq_transaction *trans;
 
-	g_return_if_fail(trans != NULL);
+	trans = trans_find(gc, cmd, seq);
+	if (trans == NULL) {
+		return NULL;
+	}
+
+	if (trans->rcved_times == 0) {
+		trans->scan_times = 0;
+	}
+	trans->rcved_times++;
+	/* server may not get our confirm reply before, send reply again*/
+	if (qq_trans_is_server(trans) && (trans->flag & QQ_TRANS_IS_REPLY)) {
+		if (trans->data != NULL && trans->data_len > 0) {
+			qq_send_cmd_encrypted(gc, trans->cmd, trans->seq, trans->data, trans->data_len, FALSE);
+		}
+	}
+	return trans;
+}
+
+void qq_trans_add_room_cmd(PurpleConnection *gc,
+		guint16 seq, guint8 room_cmd, guint32 room_id, guint8 *data, gint data_len,
+		gint update_class, guint32 ship32)
+{
+	qq_data *qd = (qq_data *)gc->proto_data;
+	qq_transaction *trans = trans_create(gc, qd->fd, QQ_CMD_ROOM, seq, data, data_len,
+			update_class, ship32);
 
-	trans->flag = 0;
-	trans->fd = qd->fd;
-	trans->seq = seq;
-	trans->cmd = QQ_CMD_ROOM;
 	trans->room_cmd = room_cmd;
 	trans->room_id = room_id;
-	trans->send_retries = QQ_RESEND_MAX;
-	trans->rcved_times = 0;
-	trans->scan_times = 0;
+	trans->send_retries = qd->resend_times;
+#if 0
+	purple_debug_info("QQ_TRANS", "Add room cmd, seq %d, data %p, len %d\n",
+			trans->seq, trans->data, trans->data_len);
+#endif
+	qd->transactions = g_list_append(qd->transactions, trans);
+}
 
-	trans->data = NULL;
-	trans->data_len = 0;
-	if (data != NULL && data_len > 0) {
-		trans->data = g_memdup(data, data_len);	/* don't use g_strdup, may have 0x00 */
-		trans->data_len = data_len;
-	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS",
-			"Add room cmd, seq = %d, data = %p, len = %d\n",
+void qq_trans_add_server_cmd(PurpleConnection *gc, guint16 cmd, guint16 seq,
+		guint8 *rcved, gint rcved_len)
+{
+	qq_data *qd = (qq_data *)gc->proto_data;
+	qq_transaction *trans = trans_create(gc, qd->fd, cmd, seq, rcved, rcved_len, QQ_CMD_CLASS_NONE, 0);
+
+	trans->flag = QQ_TRANS_IS_SERVER;
+	trans->send_retries = 0;
+	trans->rcved_times = 1;
+#if 0
+	purple_debug_info("QQ_TRANS", "Add server cmd, seq %d, data %p, len %d\n",
 			trans->seq, trans->data, trans->data_len);
+#endif
 	qd->transactions = g_list_append(qd->transactions, trans);
 }
 
-void qq_trans_add_server_cmd(qq_data *qd, guint16 cmd, guint16 seq, guint8 *data, gint data_len)
+void qq_trans_add_server_reply(PurpleConnection *gc, guint16 cmd, guint16 seq,
+		guint8 *reply, gint reply_len)
 {
-	qq_transaction *trans = g_new0(qq_transaction, 1);
+	qq_transaction *trans;
 
-	g_return_if_fail(trans != NULL);
+	g_return_if_fail(reply != NULL && reply_len > 0);
 
-	trans->flag = QQ_TRANS_IS_SERVER;
-	if ( !qd->logged_in ) {
-		trans->flag |= QQ_TRANS_BEFORE_LOGIN;
+	trans = trans_find(gc, cmd, seq);
+	if (trans == NULL) {
+		return;
 	}
-	trans->fd = qd->fd;
-	trans->cmd = cmd;
-	trans->seq = seq;
-	trans->room_cmd = 0;
-	trans->room_id = 0;
+
+	g_return_if_fail(trans->flag & QQ_TRANS_IS_SERVER);
+	trans->flag |= QQ_TRANS_IS_REPLY;
+
+	if (trans->data)	g_free(trans->data);
+
+	trans->data = g_memdup(reply, reply_len);
+	trans->data_len = reply_len;
+}
+
+void qq_trans_add_remain(PurpleConnection *gc, guint16 cmd, guint16 seq,
+		guint8 *data, gint data_len)
+{
+	qq_data *qd = (qq_data *)gc->proto_data;
+	qq_transaction *trans = trans_create(gc, qd->fd, cmd, seq, data, data_len, QQ_CMD_CLASS_NONE, 0);
+
+	trans->flag = QQ_TRANS_IS_SERVER;
+	trans->flag |= QQ_TRANS_REMAINED;
 	trans->send_retries = 0;
 	trans->rcved_times = 1;
-	trans->scan_times = 0;
-	trans->data = NULL;
-	trans->data_len = 0;
-	if (data != NULL && data_len > 0) {
-		trans->data = g_memdup(data, data_len);	/* don't use g_strdup, may have 0x00 */
-		trans->data_len = data_len;
-	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS",
-			"Add server cmd, seq = %d, data = %p, len = %d\n",
+#if 1
+	purple_debug_info("QQ_TRANS", "Add server cmd and remained, seq %d, data %p, len %d\n",
 			trans->seq, trans->data, trans->data_len);
+#endif
 	qd->transactions = g_list_append(qd->transactions, trans);
 }
 
-void qq_trans_process_before_login(qq_data *qd)
+void qq_trans_process_remained(PurpleConnection *gc)
 {
+	qq_data *qd = (qq_data *)gc->proto_data;
 	GList *curr;
 	GList *next;
 	qq_transaction *trans;
@@ -221,43 +301,46 @@ void qq_trans_process_before_login(qq_data *qd)
 	while( (curr = next) ) {
 		next = curr->next;
 		trans = (qq_transaction *) (curr->data);
-		/* purple_debug(PURPLE_DEBUG_ERROR, "QQ_TRANS", "Scan [%d]\n", trans->seq); */
-		
+#if 0
+		purple_debug_info("QQ_TRANS", "Scan [%d]\n", trans->seq);
+#endif
 		if ( !(trans->flag & QQ_TRANS_IS_SERVER) ) {
 			continue;
 		}
-		if ( !(trans->flag & QQ_TRANS_BEFORE_LOGIN) ) {
+		if ( !(trans->flag & QQ_TRANS_REMAINED) ) {
 			continue;
 		}
-		// set QQ_TRANS_BEFORE_LOGIN off
-		trans->flag &= ~QQ_TRANS_BEFORE_LOGIN;
+		/* set QQ_TRANS_REMAINED off */
+		trans->flag &= ~QQ_TRANS_REMAINED;
 
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ_TRANS",
-				"Process server cmd before login, seq %d, data %p, len %d, send_retries %d\n",
+#if 1
+		purple_debug_info("QQ_TRANS",
+				"Process server cmd remained, seq %d, data %p, len %d, send_retries %d\n",
 				trans->seq, trans->data, trans->data_len, trans->send_retries);
-
-		qq_proc_cmd_reply(qd->gc, trans->seq, trans->cmd, trans->data, trans->data_len);
+#endif
+		qq_proc_server_cmd(gc, trans->cmd, trans->seq, trans->data, trans->data_len);
 	}
 
-	/* purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS", "Scan finished\n"); */
+	/* purple_debug_info("QQ_TRANS", "Scan finished\n"); */
 	return;
 }
 
-gboolean qq_trans_scan(qq_data *qd)
+gboolean qq_trans_scan(PurpleConnection *gc)
 {
+	qq_data *qd = (qq_data *)gc->proto_data;
 	GList *curr;
 	GList *next;
 	qq_transaction *trans;
 
 	g_return_val_if_fail(qd != NULL, FALSE);
-	
+
 	next = qd->transactions;
 	while( (curr = next) ) {
 		next = curr->next;
 		trans = (qq_transaction *) (curr->data);
-		/* purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS", "Scan [%d]\n", trans->seq); */
-		
-		if (trans->flag & QQ_TRANS_BEFORE_LOGIN) {
+		/* purple_debug_info("QQ_TRANS", "Scan [%d]\n", trans->seq); */
+
+		if (trans->flag & QQ_TRANS_REMAINED) {
 			/* keep server cmd before login*/
 			continue;
 		}
@@ -270,67 +353,62 @@ gboolean qq_trans_scan(qq_data *qd)
 
 		if (trans->rcved_times > 0) {
 			/* Has been received */
-			trans_remove(qd, trans);
+			trans_remove(gc, trans);
 			continue;
 		}
 
 		if (trans->flag & QQ_TRANS_IS_SERVER) {
 			continue;
 		}
-		
+
 		/* Never get reply */
 		trans->send_retries--;
 		if (trans->send_retries <= 0) {
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ_TRANS",
+			purple_debug_warning("QQ_TRANS",
 				"[%d] %s is lost.\n",
 				trans->seq, qq_get_cmd_desc(trans->cmd));
-			if (trans->flag & QQ_TRANS_CLI_IMPORT) {
+			if (trans->flag & QQ_TRANS_IS_IMPORT) {
 				return TRUE;
 			}
 
-			purple_debug(PURPLE_DEBUG_ERROR, "QQ_TRANS",
+			qd->net_stat.lost++;
+			purple_debug_error("QQ_TRANS",
 				"Lost [%d] %s, data %p, len %d, retries %d\n",
 				trans->seq, qq_get_cmd_desc(trans->cmd),
 				trans->data, trans->data_len, trans->send_retries);
-			trans_remove(qd, trans);
+			trans_remove(gc, trans);
 			continue;
 		}
 
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ_TRANS",
+		qd->net_stat.resend++;
+		purple_debug_warning("QQ_TRANS",
 				"Resend [%d] %s data %p, len %d, send_retries %d\n",
 				trans->seq, qq_get_cmd_desc(trans->cmd),
 				trans->data, trans->data_len, trans->send_retries);
-		qq_send_data(qd, trans->cmd, trans->seq, FALSE, trans->data, trans->data_len);
+		qq_send_cmd_encrypted(gc, trans->cmd, trans->seq, trans->data, trans->data_len, FALSE);
 	}
 
-	/* purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS", "Scan finished\n"); */
+	/* purple_debug_info("QQ_TRANS", "Scan finished\n"); */
 	return FALSE;
 }
 
 /* clean up send trans and free all contents */
-void qq_trans_remove_all(qq_data *qd)
+void qq_trans_remove_all(PurpleConnection *gc)
 {
-	GList *curr;
-	GList *next;
+	qq_data *qd = (qq_data *)gc->proto_data;
 	qq_transaction *trans;
 	gint count = 0;
 
-	curr = qd->transactions;
-	while(curr) {
-		next = curr->next;
-		
-		trans = (qq_transaction *) (curr->data);
-		/*
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ_TRANS",
-			"Remove to transaction, seq = %d, buf = %p, len = %d\n",
-			trans->seq, trans->buf, trans->len);
-		*/
-		trans_remove(qd, trans);
+	while(qd->transactions != NULL) {
+		trans = (qq_transaction *) (qd->transactions->data);
+		qd->transactions = g_list_remove(qd->transactions, trans);
+
+		if (trans->data)	g_free(trans->data);
+		g_free(trans);
 
 		count++;
-		curr = next;
 	}
-	g_list_free(qd->transactions);
-
-	purple_debug(PURPLE_DEBUG_INFO, "QQ_TRANS", "Free all %d packets\n", count);
+	if (count > 0) {
+		purple_debug_info("QQ_TRANS", "Free all %d packets\n", count);
+	}
 }
diff --git a/libpurple/protocols/qq/qq_trans.h b/libpurple/protocols/qq/qq_trans.h
index 1b8ae995ae..63b4f9f78a 100644
--- a/libpurple/protocols/qq/qq_trans.h
+++ b/libpurple/protocols/qq/qq_trans.h
@@ -28,44 +28,30 @@
 #include <glib.h>
 #include "qq.h"
 
-enum {
-	QQ_TRANS_IS_SERVER = 0x01,			/* Is server command or client command */
-	/* prefix QQ_TRANS_CLI is for client command*/
-	QQ_TRANS_CLI_EMERGE = 0x02,		/* send at once; or may wait for next reply*/
-	QQ_TRANS_CLI_IMPORT = 0x04,		/* Only notice if not get reply; or resend, disconn if reties get 0*/
-	QQ_TRANS_BEFORE_LOGIN = 0x08,	/* server command before login*/
-};
+typedef struct _qq_transaction qq_transaction;
 
-typedef struct _qq_transaction {
-	guint8 flag;
-	guint16 seq;
-	guint16 cmd;
-
-	guint8 room_cmd;
-	guint32 room_id;
-	
-	guint8 *data;
-	gint data_len;
-
-	gint fd;
-	gint send_retries;
-	gint rcved_times;
-	gint scan_times;
-} qq_transaction;
-
-qq_transaction *qq_trans_find_rcved(qq_data *qd, guint16 cmd, guint16 seq);
+qq_transaction *qq_trans_find_rcved(PurpleConnection *gc, guint16 cmd, guint16 seq);
 gboolean qq_trans_is_server(qq_transaction *trans) ;
 gboolean qq_trans_is_dup(qq_transaction *trans);
 guint8 qq_trans_get_room_cmd(qq_transaction *trans);
 guint32 qq_trans_get_room_id(qq_transaction *trans);
-
-void qq_trans_add_client_cmd(qq_data *qd, guint16 cmd, guint16 seq, guint8 *data, gint data_len);
-void qq_trans_add_server_cmd(qq_data *qd, guint16 cmd, guint16 seq, guint8 *data, gint data_len);
-void qq_trans_add_room_cmd(qq_data *qd, guint16 seq, guint8 room_cmd, guint32 room_id,
+gint qq_trans_get_class(qq_transaction *trans);
+gint qq_trans_get_ship(qq_transaction *trans);
+
+void qq_trans_add_client_cmd(PurpleConnection *gc, guint16 cmd, guint16 seq,
+		guint8 *data, gint data_len, gint update_class, guint32 ship32);
+void qq_trans_add_room_cmd(PurpleConnection *gc,
+		guint16 seq, guint8 room_cmd, guint32 room_id,
+		guint8 *data, gint data_len, gint update_class, guint32 ship32);
+void qq_trans_add_server_cmd(PurpleConnection *gc, guint16 cmd, guint16 seq,
+	guint8 *rcved, gint rcved_len);
+void qq_trans_add_server_reply(PurpleConnection *gc, guint16 cmd, guint16 seq,
+		guint8 *reply, gint reply_len);
+void qq_trans_add_remain(PurpleConnection *gc, guint16 cmd, guint16 seq,
 	guint8 *data, gint data_len);
 
-void qq_trans_process_before_login(qq_data *qd);
-gboolean qq_trans_scan(qq_data *qd);
-void qq_trans_remove_all(qq_data *qd);
+void qq_trans_process_remained(PurpleConnection *gc);
+gboolean qq_trans_scan(PurpleConnection *gc);
+void qq_trans_remove_all(PurpleConnection *gc);
 
 #endif
diff --git a/libpurple/protocols/qq/send_file.c b/libpurple/protocols/qq/send_file.c
index eabf6515ea..d7a6b45164 100644
--- a/libpurple/protocols/qq/send_file.c
+++ b/libpurple/protocols/qq/send_file.c
@@ -54,7 +54,7 @@ enum
 static int _qq_in_same_lan(ft_info *info)
 {
 	if (info->remote_internet_ip == info->local_internet_ip) return 1;
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", 
+	purple_debug_info("QQ", 
 			"Not in the same LAN, remote internet ip[%x], local internet ip[%x]\n",  
 			info->remote_internet_ip
 			, info->local_internet_ip);
@@ -87,7 +87,7 @@ static ssize_t _qq_xfer_udp_recv(guint8 *buf, size_t len, PurpleXfer *xfer)
 	info = (ft_info *) xfer->data;
 	sinlen = sizeof(sin);
 	r = recvfrom(info->recv_fd, buf, len, 0, (struct sockaddr *) &sin, &sinlen);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", 
+	purple_debug_info("QQ", 
 			"==> recv %d bytes from File UDP Channel, remote ip[%s], remote port[%d]\n",
 			r, inet_ntoa(sin.sin_addr), g_ntohs(sin.sin_port));
 	return r;
@@ -121,12 +121,12 @@ static ssize_t _qq_xfer_udp_send(const guint8 *buf, size_t len, PurpleXfer *xfer
 		sin.sin_port = g_htons(info->remote_minor_port);
 		sin.sin_addr.s_addr = g_htonl(info->remote_real_ip);
 	}
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "sending to channel: %d.%d.%d.%d:%d\n",
-			sin.sin_addr.s_addr & 0xff,
-			(sin.sin_addr.s_addr >> 8) & 0xff,
-			(sin.sin_addr.s_addr >> 16) & 0xff,
-			sin.sin_addr.s_addr >> 24,
-			g_ntohs(sin.sin_port)
+	purple_debug_info("QQ", "sending to channel: %d.%d.%d.%d:%d\n",
+			(int)sin.sin_addr.s_addr & 0xff,
+			(int)(sin.sin_addr.s_addr >> 8) & 0xff,
+			(int)(sin.sin_addr.s_addr >> 16) & 0xff,
+			(int)sin.sin_addr.s_addr >> 24,
+			(int)g_ntohs(sin.sin_port)
 		  );
 	return sendto(info->sender_fd, buf, len, 0, (struct sockaddr *) &sin, sizeof(sin));
 }
@@ -207,20 +207,20 @@ static void _qq_xfer_end(PurpleXfer *xfer)
 	qq_xfer_close_file(xfer);
 	if (info->dest_fp != NULL) {
 		fclose(info->dest_fp);
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "file closed\n");
+		purple_debug_info("QQ", "file closed\n");
 	}
 	if (info->major_fd != 0) {
 		close(info->major_fd);
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "major port closed\n");
+		purple_debug_info("QQ", "major port closed\n");
 	}
 	if (info->minor_fd != 0) {
 		close(info->minor_fd);
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "minor port closed\n");
+		purple_debug_info("QQ", "minor port closed\n");
 	}
 	/*
 	if (info->buffer != NULL) {
 		munmap(info->buffer, purple_xfer_get_size(xfer));
-		purple_debug(PURPLE_DEBUG_INFO, "QQ", "file mapping buffer is freed.\n");
+		purple_debug_info("QQ", "file mapping buffer is freed.\n");
 	}
 	*/
 	g_free(info);
@@ -235,7 +235,7 @@ static void qq_show_conn_info(ft_info *info)
 	real_ip_str = gen_ip_str((guint8 *) &ip);
 	ip = g_htonl(info->remote_internet_ip);
 	internet_ip_str = gen_ip_str((guint8 *) &ip);
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "remote internet ip[%s:%d], major port[%d], real ip[%s], minor port[%d]\n",
+	purple_debug_info("QQ", "remote internet ip[%s:%d], major port[%d], real ip[%s], minor port[%d]\n",
 			internet_ip_str, info->remote_internet_port,
 			info->remote_major_port, real_ip_str, info->remote_minor_port
 		  );
@@ -393,7 +393,7 @@ static void _qq_xfer_init_socket(PurpleXfer *xfer)
 	info->local_real_ip = 0x7f000001;
 	*/
 	info->local_real_ip = g_ntohl(inet_addr(purple_network_get_my_ip(-1)));
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "local real ip is %x", info->local_real_ip);
+	purple_debug_info("QQ", "local real ip is %x", info->local_real_ip);
 
 	for (i = 0; i < 2; i++) {
 		sockfd = socket(PF_INET, SOCK_DGRAM, 0);
@@ -412,13 +412,13 @@ static void _qq_xfer_init_socket(PurpleXfer *xfer)
 			case 0:
 				info->local_major_port = listen_port;
 				info->major_fd = sockfd;
-				purple_debug(PURPLE_DEBUG_INFO, "QQ", "UDP Major Channel created on port[%d]\n",
+				purple_debug_info("QQ", "UDP Major Channel created on port[%d]\n",
 						info->local_major_port);
 				break;
 			case 1:
 				info->local_minor_port = listen_port;
 				info->minor_fd = sockfd;
-				purple_debug(PURPLE_DEBUG_INFO, "QQ", "UDP Minor Channel created on port[%d]\n",
+				purple_debug_info("QQ", "UDP Minor Channel created on port[%d]\n",
 						info->local_minor_port);
 				break;
 		}
@@ -475,9 +475,9 @@ static void _qq_send_packet_file_request (PurpleConnection *gc, guint32 to_uid,
 	bytes += qq_putdata (raw_data + bytes, (guint8 *) filelen_str, filelen_strlen);
 
 	if (packet_len == bytes)
-		qq_send_cmd (qd, QQ_CMD_SEND_IM, raw_data, bytes);
+		qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes);
 	else
-		purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file_request",
+		purple_debug_info("qq_send_packet_file_request",
 			    "%d bytes expected but got %d bytes\n",
 			    packet_len, bytes);
 
@@ -497,7 +497,7 @@ static void _qq_send_packet_file_accept(PurpleConnection *gc, guint32 to_uid)
 	qd = (qq_data *) gc->proto_data;
 	info = (ft_info *) qd->xfer->data;
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "I've accepted the file transfer request from %d\n", to_uid);
+	purple_debug_info("QQ", "I've accepted the file transfer request from %d\n", to_uid);
 	_qq_xfer_init_socket(qd->xfer);
 
 	packet_len = 79;
@@ -516,9 +516,9 @@ static void _qq_send_packet_file_accept(PurpleConnection *gc, guint32 to_uid)
 	info->local_real_ip = real_ip;
 
 	if (packet_len == bytes)
-		qq_send_cmd (qd, QQ_CMD_SEND_IM, raw_data, bytes);
+		qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes);
 	else
-		purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file_accept",
+		purple_debug_info("qq_send_packet_file_accept",
 			    "%d bytes expected but got %d bytes\n",
 			    packet_len, bytes);
 }
@@ -539,13 +539,13 @@ static void _qq_send_packet_file_notifyip(PurpleConnection *gc, guint32 to_uid)
 	raw_data = g_newa (guint8, packet_len);
 	bytes = 0;
 
-	purple_debug(PURPLE_DEBUG_INFO, "QQ", "<== sending qq file notify ip packet\n");
+	purple_debug_info("QQ", "<== sending qq file notify ip packet\n");
 	bytes += _qq_create_packet_file_header(raw_data + bytes, to_uid, QQ_FILE_TRANS_NOTIFY, qd, TRUE);
 	bytes += qq_fill_conn_info(raw_data + bytes, info);
 	if (packet_len == bytes)
-		qq_send_cmd (qd, QQ_CMD_SEND_IM, raw_data, bytes);
+		qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes);
 	else
-		purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file_notify",
+		purple_debug_info("qq_send_packet_file_notify",
 			    "%d bytes expected but got %d bytes\n",
 			    packet_len, bytes);
 
@@ -561,7 +561,7 @@ static void _qq_send_packet_file_reject (PurpleConnection *gc, guint32 to_uid)
 	guint8 *raw_data;
 	gint packet_len, bytes;
 
-	purple_debug(PURPLE_DEBUG_INFO, "_qq_send_packet_file_reject", "start");
+	purple_debug_info("_qq_send_packet_file_reject", "start");
 	qd = (qq_data *) gc->proto_data;
 
 	packet_len = 64;
@@ -571,9 +571,9 @@ static void _qq_send_packet_file_reject (PurpleConnection *gc, guint32 to_uid)
 	bytes += _qq_create_packet_file_header(raw_data + bytes, to_uid, QQ_FILE_TRANS_DENY_UDP, qd, TRUE);
 
 	if (packet_len == bytes)
-		qq_send_cmd (qd, QQ_CMD_SEND_IM, raw_data, bytes);
+		qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes);
 	else
-		purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file",
+		purple_debug_info("qq_send_packet_file",
 			    "%d bytes expected but got %d bytes\n",
 			    packet_len, bytes);
 }
@@ -585,27 +585,27 @@ static void _qq_send_packet_file_cancel (PurpleConnection *gc, guint32 to_uid)
 	guint8 *raw_data;
 	gint packet_len, bytes;
 
-	purple_debug(PURPLE_DEBUG_INFO, "_qq_send_packet_file_cancel", "start\n");
+	purple_debug_info("_qq_send_packet_file_cancel", "start\n");
 	qd = (qq_data *) gc->proto_data;
 
 	packet_len = 64;
 	raw_data = g_newa (guint8, packet_len);
 	bytes = 0;
 
-	purple_debug(PURPLE_DEBUG_INFO, "_qq_send_packet_file_cancel", "before create header\n");
+	purple_debug_info("_qq_send_packet_file_cancel", "before create header\n");
 	bytes += _qq_create_packet_file_header(raw_data + bytes, to_uid, QQ_FILE_TRANS_CANCEL, qd, TRUE);
-	purple_debug(PURPLE_DEBUG_INFO, "_qq_send_packet_file_cancel", "end create header\n");
+	purple_debug_info("_qq_send_packet_file_cancel", "end create header\n");
 
 	if (packet_len == bytes) {
-		purple_debug(PURPLE_DEBUG_INFO, "_qq_send_packet_file_cancel", "before send cmd\n");
-		qq_send_cmd (qd, QQ_CMD_SEND_IM, raw_data, bytes);
+		purple_debug_info("_qq_send_packet_file_cancel", "before send cmd\n");
+		qq_send_cmd(gc, QQ_CMD_SEND_IM, raw_data, bytes);
 	}
 	else
-		purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file",
+		purple_debug_info("qq_send_packet_file",
 			    "%d bytes expected but got %d bytes\n",
 			    packet_len, bytes);
 
-	purple_debug (PURPLE_DEBUG_INFO, "qq_send_packet_file_cancel", "end\n");
+	purple_debug_info("qq_send_packet_file_cancel", "end\n");
 }
 
 /* request to send a file */
@@ -694,7 +694,7 @@ void qq_process_recv_file_reject (guint8 *data, gint data_len,
 
 	/*	border has been checked before
 	if (*cursor >= (data + data_len - 1)) {
-		purple_debug (PURPLE_DEBUG_WARNING, "QQ",
+		purple_debug_warning("QQ",
 			    "Received file reject message is empty\n");
 		return;
 	}
@@ -724,8 +724,7 @@ void qq_process_recv_file_cancel (guint8 *data, gint data_len,
 
 	/*	border has been checked before
 	if (*cursor >= (data + data_len - 1)) {
-		purple_debug (PURPLE_DEBUG_WARNING, "QQ",
-			    "Received file reject message is empty\n");
+		purple_debug_warning("QQ", "Received file reject message is empty\n");
 		return;
 	}
 	*/
@@ -755,8 +754,7 @@ void qq_process_recv_file_accept(guint8 *data, gint data_len, guint32 sender_uid
 	info = (ft_info *) qd->xfer->data;
 
 	if (data_len <= 30 + QQ_CONN_INFO_LEN) {
-		purple_debug (PURPLE_DEBUG_WARNING, "QQ",
-			    "Received file reject message is empty\n");
+		purple_debug_warning("QQ", "Received file reject message is empty\n");
 		return;
 	}
 
@@ -789,8 +787,7 @@ void qq_process_recv_file_request(guint8 *data, gint data_len, guint32 sender_ui
 	info->to_uid = sender_uid;
 	
 	if (data_len <= 2 + 30 + QQ_CONN_INFO_LEN) {
-		purple_debug (PURPLE_DEBUG_WARNING, "QQ",
-			    "Received file request message is empty\n");
+		purple_debug_warning("QQ", "Received file request message is empty\n");
 		return;
 	}
 	bytes = 0;
@@ -806,7 +803,7 @@ void qq_process_recv_file_request(guint8 *data, gint data_len, guint32 sender_ui
 
 	/* FACE from IP detector, ignored by gfhuang */
 	if(g_ascii_strcasecmp(fileinfo[0], "FACE") == 0) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+		purple_debug_warning("QQ",
 			    "Received a FACE ip detect from qq-%d, so he/she must be online :)\n", sender_uid);
 
 		b = purple_find_buddy(gc->account, sender_name);
@@ -826,11 +823,11 @@ void qq_process_recv_file_request(guint8 *data, gint data_len, guint32 sender_ui
 				qq_update_buddy_contact(gc, q_bud);
 			}
 			else 
-				purple_debug(PURPLE_DEBUG_INFO, "QQ", "buddy %d is already online\n", sender_uid);
+				purple_debug_info("QQ", "buddy %d is already online\n", sender_uid);
 
 		}
 		else 
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "buddy %d is not in list\n", sender_uid);
+			purple_debug_warning("QQ", "buddy %d is not in list\n", sender_uid);
 
 		g_free(sender_name);	    
 		g_strfreev(fileinfo);
@@ -892,8 +889,7 @@ void qq_process_recv_file_notify(guint8 *data, gint data_len,
 	xfer = qd->xfer;
 	info = (ft_info *) qd->xfer->data;
 	if (data_len <= 2 + 30 + QQ_CONN_INFO_LEN) {
-		purple_debug (PURPLE_DEBUG_WARNING, "QQ",
-			    "Received file notify message is empty\n");
+		purple_debug_warning("QQ", "Received file notify message is empty\n");
 		return;
 	}
 	
diff --git a/libpurple/protocols/qq/sys_msg.c b/libpurple/protocols/qq/sys_msg.c
index ef7d12e084..0df850d6f5 100644
--- a/libpurple/protocols/qq/sys_msg.c
+++ b/libpurple/protocols/qq/sys_msg.c
@@ -84,7 +84,7 @@ static void _qq_search_before_auth_with_gc_and_uid(gc_and_uid *g)
 
 	nombre = uid_to_purple_name(uid);
 	purple_request_action
-	    (gc, NULL, _("Do you want to approve the request?"), "",
+	    (gc, NULL, _("Do you approve the requestion?"), "",
 		PURPLE_DEFAULT_ACTION_NONE,
 		 purple_connection_get_account(gc), nombre, NULL,
 		 g, 2,
@@ -108,7 +108,7 @@ static void _qq_search_before_add_with_gc_and_uid(gc_and_uid *g)
 	qq_send_packet_get_info(gc, uid, TRUE);	/* we want to see window */
 	nombre = uid_to_purple_name(uid);
 	purple_request_action
-	    (gc, NULL, _("Do you want to add this buddy?"), "",
+	    (gc, NULL, _("Do you add the buddy?"), "",
 		PURPLE_DEFAULT_ACTION_NONE,
 		 purple_connection_get_account(gc), nombre, NULL,
 		 g, 2,
@@ -126,7 +126,7 @@ static void _qq_send_packet_ack_msg_sys(PurpleConnection *gc, guint8 code, guint
 	gint ack_len, bytes;
 
 	qd = (qq_data *) gc->proto_data;
-	
+
 	str = g_strdup_printf("%d", from);
 	bar = 0x1e;
 	ack_len = 1 + 1 + strlen(str) + 1 + 2;
@@ -142,9 +142,9 @@ static void _qq_send_packet_ack_msg_sys(PurpleConnection *gc, guint8 code, guint
 	g_free(str);
 
 	if (bytes == ack_len)	/* creation OK */
-		qq_send_cmd_detail(qd, QQ_CMD_ACK_SYS_MSG, 0, FALSE, ack, ack_len);
+		qq_send_server_reply(gc, QQ_CMD_ACK_SYS_MSG, 0, ack, ack_len);
 	else
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
+		purple_debug_error("QQ",
 			   "Fail creating sys msg ACK, expect %d bytes, build %d bytes\n", ack_len, bytes);
 }
 
@@ -178,9 +178,9 @@ static void _qq_process_msg_sys_being_added(PurpleConnection *gc, gchar *from, g
 					_("Add"), G_CALLBACK(qq_add_buddy_with_gc_and_uid),
 				    _("Search"), G_CALLBACK(_qq_search_before_add_with_gc_and_uid));
 	} else {
-		message = g_strdup_printf(_("%s has added you [%s] to his or her buddy list"), from, to);
+		message = g_strdup_printf(_("%s added you [%s] to buddy list"), from, to);
 		_qq_sys_msg_log_write(gc, message, from);
-		purple_notify_info(gc, NULL, message, NULL);
+		purple_notify_info(gc, _("QQ Budy"), _("Successed:"), message);
 	}
 
 	g_free(name);
@@ -194,11 +194,11 @@ static void _qq_process_msg_sys_add_contact_rejected(PurpleConnection *gc, gchar
 
 	g_return_if_fail(from != NULL && to != NULL);
 
-	message = g_strdup_printf(_("User %s rejected your request"), from);
-	reason = g_strdup_printf(_("Reason: %s"), msg_utf8);
+	message = g_strdup_printf(_("Requestion rejected by %s"), from);
+	reason = g_strdup_printf(_("Message: %s"), msg_utf8);
 	_qq_sys_msg_log_write(gc, message, from);
 
-	purple_notify_info(gc, NULL, message, reason);
+	purple_notify_info(gc, _("QQ Buddy"), message, reason);
 	g_free(message);
 	g_free(reason);
 }
@@ -214,9 +214,9 @@ static void _qq_process_msg_sys_add_contact_approved(PurpleConnection *gc, gchar
 	qd = (qq_data *) gc->proto_data;
 	qq_add_buddy_by_recv_packet(gc, strtol(from, NULL, 10), TRUE, TRUE);
 
-	message = g_strdup_printf(_("User %s approved your request"), from);
+	message = g_strdup_printf(_("Requestion approved by %s"), from);
 	_qq_sys_msg_log_write(gc, message, from);
-	purple_notify_info(gc, NULL, message, NULL);
+	purple_notify_info(gc, _("QQ Buddy"), _("Notice:"), message);
 
 	g_free(message);
 }
@@ -263,9 +263,9 @@ static void _qq_process_msg_sys_add_contact_request(PurpleConnection *gc, gchar
 		g2 = g_new0(gc_and_uid, 1);
 		g2->gc = gc;
 		g2->uid = strtol(from, NULL, 10);
-		message = g_strdup_printf(_("%s is not in your buddy list"), from);
+		message = g_strdup_printf(_("%s is not in buddy list"), from);
 		purple_request_action(gc, NULL, message,
-				    _("Would you like to add him?"), PURPLE_DEFAULT_ACTION_NONE,
+				    _("Would you add?"), PURPLE_DEFAULT_ACTION_NONE,
 					purple_connection_get_account(gc), name, NULL,
 					g2, 3,
 					_("Cancel"), NULL,
@@ -279,14 +279,19 @@ static void _qq_process_msg_sys_add_contact_request(PurpleConnection *gc, gchar
 
 static void _qq_process_msg_sys_notice(PurpleConnection *gc, gchar *from, gchar *to, gchar *msg_utf8)
 {
+	qq_data *qd = (qq_data *) gc->proto_data;
 	gchar *title, *content;
 
 	g_return_if_fail(from != NULL && to != NULL);
 
-	title = g_strdup_printf(_("Notice from: %s"), from);
+	title = g_strdup_printf(_("From %s:"), from);
 	content = g_strdup_printf(_("%s"), msg_utf8);
 
-	purple_notify_info(gc, NULL, title, content);
+	if (qd->is_show_notice) {
+		purple_notify_info(gc, _("QQ Server Notice"), title, content);
+	} else {
+		purple_debug_info("QQ", "QQ Server notice from %s:\n%s", from, msg_utf8);
+}
 	g_free(title);
 	g_free(content);
 }
@@ -310,12 +315,19 @@ void qq_process_msg_sys(guint8 *data, gint data_len, guint16 seq, PurpleConnecti
 	_qq_send_packet_ack_msg_sys(gc, code[0], strtol(from, NULL, 10), seq);
 
 	if (strtol(to, NULL, 10) != qd->uid) {	/* not to me */
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ", "Recv sys msg to [%s], not me!, discard\n", to);
+		purple_debug_error("QQ", "Recv sys msg to [%s], not me!, discard\n", to);
 		g_strfreev(segments);
 		return;
 	}
 
 	msg_utf8 = qq_to_utf8(msg, QQ_CHARSET_DEFAULT);
+	if (from == NULL && msg_utf8) {
+		purple_debug_error("QQ", "Recv NULL sys msg to [%s], discard\n", to);
+		g_strfreev(segments);
+		g_free(msg_utf8);
+		return;
+	}
+
 	switch (strtol(code, NULL, 10)) {
 	case QQ_MSG_SYS_BEING_ADDED:
 		_qq_process_msg_sys_being_added(gc, from, to, msg_utf8);
@@ -333,12 +345,12 @@ void qq_process_msg_sys(guint8 *data, gint data_len, guint16 seq, PurpleConnecti
 		_qq_process_msg_sys_notice(gc, from, to, msg_utf8);
 		break;
 	case QQ_MSG_SYS_NEW_VERSION:
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+		purple_debug_warning("QQ",
 			   "QQ server says there is newer version than %s\n", qq_get_ver_desc(QQ_CLIENT));
 		break;
 	default:
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Recv unknown sys msg code: %s\n", code);
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "the msg is : %s\n", msg_utf8);
+		purple_debug_warning("QQ", "Recv unknown sys msg code: %s\n", code);
+		purple_debug_warning("QQ", "the msg is : %s\n", msg_utf8);
 	}
 	g_free(msg_utf8);
 	g_strfreev(segments);
diff --git a/libpurple/protocols/qq/utils.c b/libpurple/protocols/qq/utils.c
index d2b8121488..420e51886e 100644
--- a/libpurple/protocols/qq/utils.c
+++ b/libpurple/protocols/qq/utils.c
@@ -47,8 +47,8 @@
    struct sockaddr_in sin;
    socklen_t len = sizeof(sin);
    getsockname(fd, (struct sockaddr *)&sin, &len);
-   purple_debug(PURPLE_DEBUG_INFO, desc, "%s:%d\n",
-   inet_ntoa(sin.sin_addr), g_ntohs(sin.sin_port));
+   purple_debug_info(desc, "%s:%d\n",
+			inet_ntoa(sin.sin_addr), g_ntohs(sin.sin_port));
    }
    */
 
@@ -121,16 +121,16 @@ gchar **split_data(guint8 *data, gint len, const gchar *delimit, gint expected_f
 	for (i = 0; segments[i] != NULL; i++) {;
 	}
 	if (i < expected_fields) {	/* not enough fields */
-		purple_debug(PURPLE_DEBUG_ERROR, "QQ",
-			   "Invalid data, expect %d fields, found only %d, discard\n", expected_fields, i);
+		purple_debug_error("QQ", "Invalid data, expect %d fields, found only %d, discard\n",
+				expected_fields, i);
 		g_strfreev(segments);
 		return NULL;
 	} else if (i > expected_fields) {	/* more fields, OK */
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-			   "Dangerous data, expect %d fields, found %d, return all\n", expected_fields, i);
+		purple_debug_warning("QQ", "Dangerous data, expect %d fields, found %d, return all\n",
+				expected_fields, i);
 		/* free up those not used */
 		for (j = expected_fields; j < i; j++) {
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ", "field[%d] is %s\n", j, segments[j]);
+			purple_debug_warning("QQ", "field[%d] is %s\n", j, segments[j]);
 			g_free(segments[j]);
 		}
 
@@ -218,7 +218,7 @@ gchar* try_dump_as_gbk(const guint8 *const data, gint len)
 	msg_utf8 = i < len ? qq_to_utf8((gchar *) &incoming[i], QQ_CHARSET_DEFAULT) : NULL;
 
 	if (msg_utf8 != NULL) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ", "Try extract GB msg: %s\n", msg_utf8);
+		purple_debug_warning("QQ", "Try extract GB msg: %s\n", msg_utf8);
 	}
 	return msg_utf8;
 }
@@ -257,7 +257,7 @@ guint8 *hex_str_to_bytes(const gchar *const buffer, gint *out_len)
 	hex_buffer = strstrip(buffer);
 
 	if (strlen(hex_buffer) % 2 != 0) {
-		purple_debug(PURPLE_DEBUG_WARNING, "QQ",
+		purple_debug_warning("QQ",
 			"Unable to convert an odd number of nibbles to a string of bytes!\n");
 		g_free(hex_buffer);
 		return NULL;
@@ -272,8 +272,8 @@ guint8 *hex_str_to_bytes(const gchar *const buffer, gint *out_len)
 		} else if (g_ascii_isalpha(*cursor) && (gint) *cursor - 87 < 16) {
 			nibble1 = (gint) *cursor - 87;
 		} else {
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-				"Invalid char \'%c\' found in hex string!\n", *cursor);
+			purple_debug_warning("QQ", "Invalid char \'%c\' found in hex string!\n",
+					*cursor);
 			g_free(hex_str);
 			return NULL;
 		}
@@ -284,8 +284,7 @@ guint8 *hex_str_to_bytes(const gchar *const buffer, gint *out_len)
 		} else if (g_ascii_isalpha(*cursor) && (gint) (*cursor - 87) < 16) {
 			nibble2 = (gint) *cursor - 87;
 		} else {
-			purple_debug(PURPLE_DEBUG_WARNING, "QQ",
-				"Invalid char found in hex string!\n");
+			purple_debug_warning("QQ", "Invalid char found in hex string!\n");
 			g_free(hex_str);
 			return NULL;
 		}
@@ -362,22 +361,7 @@ void qq_hex_dump(PurpleDebugLevel level, const char *category,
 
 void qq_show_packet(const gchar *desc, const guint8 *buf, gint len)
 {
-	/*
-	   char buf1[8*len+2], buf2[10];
-	   int i;
-	   buf1[0] = 0;
-	   for (i = 0; i < len; i++) {
-	   sprintf(buf2, " %02x(%d)", buf[i] & 0xff, buf[i] & 0xff);
-	   strcat(buf1, buf2);
-	   }
-	   strcat(buf1, "\n");
-	   purple_debug(PURPLE_DEBUG_INFO, desc, "%s", buf1);
-	   */
-
-	/* modified by s3e, 20080424 */
-	qq_hex_dump(PURPLE_DEBUG_INFO, desc,
-		buf, len,
-		"");
+	qq_hex_dump(PURPLE_DEBUG_INFO, "QQ", buf, len, desc);
 }
 
 /* convert face num from packet (0-299) to local face (1-100) */
@@ -397,16 +381,5 @@ const char *qq_buddy_icon_dir(void)
 	if (purple_prefs_exists("/prpl/qq/buddy_icon_dir"))
 		return purple_prefs_get_string("/prpl/qq/buddy_icon_dir");
 	else
-		return QQ_BUDDY_ICON_DIR;
-}
-
-#ifdef _WIN32
-const char *qq_win32_buddy_icon_dir(void)
-{
-        static char *dir = NULL;
-        if (dir == NULL)
-                dir = g_build_filename(wpurple_install_dir(), "pixmaps",
-                        "purple", "buddy_icons", "qq", NULL);
-        return dir;
+		return NULL;
 }
-#endif
diff --git a/libpurple/protocols/qq/utils.h b/libpurple/protocols/qq/utils.h
index 14dfbcd40d..7cefde20ec 100644
--- a/libpurple/protocols/qq/utils.h
+++ b/libpurple/protocols/qq/utils.h
@@ -56,6 +56,5 @@ void qq_hex_dump(PurpleDebugLevel level, const char *category,
 guint8 *hex_str_to_bytes(const gchar *buf, gint *out_len);
 
 const gchar *qq_buddy_icon_dir(void);
-const gchar *qq_win32_buddy_icon_dir(void);
 
 #endif
diff --git a/libpurple/protocols/yahoo/yahoo.c b/libpurple/protocols/yahoo/yahoo.c
index ba55d739ec..0960c327e0 100644
--- a/libpurple/protocols/yahoo/yahoo.c
+++ b/libpurple/protocols/yahoo/yahoo.c
@@ -55,6 +55,12 @@
 
 /* #define TRY_WEBMESSENGER_LOGIN 0 */
 
+/* One hour */
+#define PING_TIMEOUT 3600
+
+/* One minute */
+#define KEEPALIVE_TIMEOUT 60
+
 static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *, PurpleGroup *);
 #ifdef TRY_WEBMESSENGER_LOGIN
 static void yahoo_login_page_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, size_t len, const gchar *error_message);
@@ -3001,6 +3007,7 @@ static void yahoo_login(PurpleAccount *account) {
 	yd->xfer_peer_idstring_map = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
 	yd->confs = NULL;
 	yd->conf_id = 2;
+	yd->last_keepalive = yd->last_ping = time(NULL);
 
 	yd->current_status = get_yahoo_status_from_purple_status(status);
 
@@ -3059,7 +3066,7 @@ static void yahoo_close(PurpleConnection *gc) {
 	}
 	g_slist_free(yd->cookies);
 
-	yd->chat_online = 0;
+	yd->chat_online = FALSE;
 	if (yd->in_chat)
 		yahoo_c_leave(gc, 1); /* 1 = YAHOO_CHAT_ID */
 
@@ -3871,21 +3878,36 @@ static GList *yahoo_status_types(PurpleAccount *account)
 
 static void yahoo_keepalive(PurpleConnection *gc)
 {
+	struct yahoo_packet *pkt;
 	struct yahoo_data *yd = gc->proto_data;
-	struct yahoo_packet *pkt = yahoo_packet_new(YAHOO_SERVICE_PING, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_send_and_free(pkt, yd);
+	time_t now = time(NULL);
 
-	if (!yd->chat_online)
-		return;
+	/* We're only allowed to send a ping once an hour or the servers will boot us */
+	if ((now - yd->last_ping) >= PING_TIMEOUT) {
+		yd->last_ping = now;
 
-	if (yd->wm) {
-		ycht_chat_send_keepalive(yd->ycht);
-		return;
+		/* The native client will only send PING or CHATPING */
+		if (yd->chat_online) {
+			if (yd->wm) {
+				ycht_chat_send_keepalive(yd->ycht);
+			} else {
+				pkt = yahoo_packet_new(YAHOO_SERVICE_CHATPING, YAHOO_STATUS_AVAILABLE, 0);
+				yahoo_packet_hash_str(pkt, 109, purple_connection_get_display_name(gc));
+				yahoo_packet_send_and_free(pkt, yd);
+			}
+		} else {
+			pkt = yahoo_packet_new(YAHOO_SERVICE_PING, YAHOO_STATUS_AVAILABLE, 0);
+			yahoo_packet_send_and_free(pkt, yd);
+		}
+	}
+
+	if ((now - yd->last_keepalive) >= KEEPALIVE_TIMEOUT) {
+		yd->last_keepalive = now;
+		pkt = yahoo_packet_new(YAHOO_SERVICE_KEEPALIVE, YAHOO_STATUS_AVAILABLE, 0);
+		yahoo_packet_hash_str(pkt, 0, purple_connection_get_display_name(gc));
+		yahoo_packet_send_and_free(pkt, yd);
 	}
 
-	pkt = yahoo_packet_new(YAHOO_SERVICE_CHATPING, YAHOO_STATUS_AVAILABLE, 0);
-	yahoo_packet_hash_str(pkt, 109, purple_connection_get_display_name(gc));
-	yahoo_packet_send_and_free(pkt, yd);
 }
 
 static void yahoo_add_buddy(PurpleConnection *gc, PurpleBuddy *buddy, PurpleGroup *g)
@@ -4301,6 +4323,15 @@ static gboolean yahoo_uri_handler(const char *proto, const char *cmd, GHashTable
 	return FALSE;
 }
 
+static GHashTable *
+yahoo_get_account_text_table(PurpleAccount *account)
+{
+	GHashTable *table;
+	table = g_hash_table_new(g_str_hash, g_str_equal);
+	g_hash_table_insert(table, "login_label", (gpointer)_("Yahoo ID..."));
+	return table;
+}
+
 static PurpleWhiteboardPrplOps yahoo_whiteboard_prpl_ops =
 {
 	yahoo_doodle_start,
@@ -4384,10 +4415,12 @@ static PurplePluginProtocolInfo prpl_info =
 	NULL, /* send_raw */
 	NULL, /* roomlist_room_serialize */
 	NULL, /* unregister_user */
+
 	yahoo_send_attention,
 	yahoo_attention_types,
+
 	sizeof(PurplePluginProtocolInfo),       /* struct_size */
-	NULL, /* get_account_text_table */
+	yahoo_get_account_text_table,    /* get_account_text_table */
 	NULL, /* initiate_media */
 	NULL  /* can_do_media */
 };
@@ -4482,4 +4515,3 @@ init_plugin(PurplePlugin *plugin)
 }
 
 PURPLE_INIT_PLUGIN(yahoo, init_plugin, info);
-
diff --git a/libpurple/protocols/yahoo/yahoo.h b/libpurple/protocols/yahoo/yahoo.h
index b63599a6c2..29a2009533 100644
--- a/libpurple/protocols/yahoo/yahoo.h
+++ b/libpurple/protocols/yahoo/yahoo.h
@@ -176,6 +176,8 @@ struct yahoo_data {
 	 * the server expects us to keep track of the group for which it is sending us contact names.
 	 */
 	char *current_list15_grp;
+	time_t last_ping;
+	time_t last_keepalive;
 };
 
 #define YAHOO_MAX_STATUS_MESSAGE_LENGTH (255)
diff --git a/libpurple/protocols/yahoo/yahoo_auth.c b/libpurple/protocols/yahoo/yahoo_auth.c
index ff9bf00327..845bfb7775 100644
--- a/libpurple/protocols/yahoo/yahoo_auth.c
+++ b/libpurple/protocols/yahoo/yahoo_auth.c
@@ -1,10 +1,23 @@
 /*
  * yahoo_auth.c: Authentication routines.
- *	
- * Written by Kevin Kurtz and Scott Werndorfer
  *
+ * Written by Kevin Kurtz and Scott Werndorfer
  * Copyright(c) 2003 Cerulean Studios
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
  */
 
 #include "internal.h"
diff --git a/libpurple/protocols/yahoo/yahoo_auth.h b/libpurple/protocols/yahoo/yahoo_auth.h
index fd5a94c1eb..2fd3565ca1 100755..100644
--- a/libpurple/protocols/yahoo/yahoo_auth.h
+++ b/libpurple/protocols/yahoo/yahoo_auth.h
@@ -2,6 +2,21 @@
  * yahoo_auth.h: Header for Yahoo Messenger authentication schemes.  Eew.
  *
  * Copyright(c) 2003 Cerulean Studios
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
  */
 
 #ifndef _YAHOO_AUTH_H_
diff --git a/libpurple/protocols/yahoo/yahoo_packet.h b/libpurple/protocols/yahoo/yahoo_packet.h
index f2b0ac853b..f90a71a4be 100644
--- a/libpurple/protocols/yahoo/yahoo_packet.h
+++ b/libpurple/protocols/yahoo/yahoo_packet.h
@@ -76,7 +76,7 @@ enum yahoo_service { /* these are easier to see in hex */
 	YAHOO_SERVICE_IGNORECONTACT,    /* > 1, 7, 13 < 1, 66, 13, 0*/
 	YAHOO_SERVICE_REJECTCONTACT,
 	YAHOO_SERVICE_GROUPRENAME = 0x89, /* > 1, 65(new), 66(0), 67(old) */
-	/* YAHOO_SERVICE_??? = 0x8A, */
+	YAHOO_SERVICE_KEEPALIVE = 0x8A,
 	YAHOO_SERVICE_CHATONLINE = 0x96, /* > 109(id), 1, 6(abcde) < 0,1*/
 	YAHOO_SERVICE_CHATGOTO,
 	YAHOO_SERVICE_CHATJOIN, /* > 1 104-room 129-1600326591 62-2 */
diff --git a/libpurple/protocols/yahoo/yahoochat.c b/libpurple/protocols/yahoo/yahoochat.c
index b704f919dc..387dfbb117 100644
--- a/libpurple/protocols/yahoo/yahoochat.c
+++ b/libpurple/protocols/yahoo/yahoochat.c
@@ -369,7 +369,7 @@ void yahoo_process_chat_online(PurpleConnection *gc, struct yahoo_packet *pkt)
 	struct yahoo_data *yd = (struct yahoo_data *) gc->proto_data;
 
 	if (pkt->status == 1) {
-		yd->chat_online = 1;
+		yd->chat_online = TRUE;
 
 		/* We need to goto a user in chat */
 		if (yd->pending_chat_goto) {
@@ -411,7 +411,7 @@ void yahoo_process_chat_logout(PurpleConnection *gc, struct yahoo_packet *pkt)
 	}
 
 	if (pkt->status == 1) {
-		yd->chat_online = 0;
+		yd->chat_online = FALSE;
 		g_free(yd->pending_chat_room);
 		yd->pending_chat_room = NULL;
 		g_free(yd->pending_chat_id);
@@ -881,7 +881,7 @@ static void yahoo_chat_leave(PurpleConnection *gc, const char *room, const char
 	yahoo_packet_hash_str(pkt, 1, dn);
 	yahoo_packet_send_and_free(pkt, yd);
 
-	yd->chat_online = 0;
+	yd->chat_online = FALSE;
 	g_free(yd->pending_chat_room);
 	yd->pending_chat_room = NULL;
 	g_free(yd->pending_chat_id);
diff --git a/libpurple/proxy.c b/libpurple/proxy.c
index 7e31faf0c0..9492717767 100644
--- a/libpurple/proxy.c
+++ b/libpurple/proxy.c
@@ -212,19 +212,21 @@ purple_gnome_proxy_get_info(void)
 {
 	static PurpleProxyInfo info = {0, NULL, 0, NULL, NULL};
 	gboolean use_same_proxy = FALSE;
-	gchar *tmp, *err;
+	gchar *tmp, *err = NULL;
 
 	tmp = g_find_program_in_path("gconftool-2");
 	if (tmp == NULL)
 		return purple_global_proxy_get_info();
 
 	g_free(tmp);
+	tmp = NULL;
 
 	/* Check whether to use a proxy. */
 	if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/mode",
 			&tmp, &err, NULL, NULL))
 		return purple_global_proxy_get_info();
 	g_free(err);
+	err = NULL;
 
 	if (!strcmp(tmp, "none\n")) {
 		info.type = PURPLE_PROXY_NONE;
@@ -239,6 +241,7 @@ purple_gnome_proxy_get_info(void)
 	}
 
 	g_free(tmp);
+	tmp = NULL;
 
 	/* Free the old fields */
 	if (info.host) {
@@ -258,28 +261,31 @@ purple_gnome_proxy_get_info(void)
 			&tmp, &err, NULL, NULL))
 		return purple_global_proxy_get_info();
 	g_free(err);
+	err = NULL;
 
 	if (!strcmp(tmp, "true\n"))
 		use_same_proxy = TRUE;
 	g_free(tmp);
+	tmp = NULL;
 
-	if (!use_same_proxy && !g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
+	if (!use_same_proxy) {
+		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_host",
 			&info.host, &err, NULL, NULL))
-		return purple_global_proxy_get_info();
-	g_free(err);
-	g_strchomp(info.host);
+			return purple_global_proxy_get_info();
+		g_free(err);
+		err = NULL;
+	}
+
+	if(info.host != NULL)
+		g_strchomp(info.host);
 
-	if (!use_same_proxy && *info.host != '\0') {
+	if (!use_same_proxy && (info.host != NULL) && (*info.host != '\0')) {
 		info.type = PURPLE_PROXY_SOCKS5;
 		if (!g_spawn_command_line_sync("gconftool-2 -g /system/proxy/socks_port",
 				&tmp, &err, NULL, NULL))
 		{
 			g_free(info.host);
 			info.host = NULL;
-			g_free(info.username);
-			info.username = NULL;
-			g_free(info.password);
-			info.password = NULL;
 			return purple_global_proxy_get_info();
 		}
 		g_free(err);
@@ -291,6 +297,8 @@ purple_gnome_proxy_get_info(void)
 					&info.host, &err, NULL, NULL))
 			return purple_global_proxy_get_info();
 		g_free(err);
+		err = NULL;
+
 		/* If we get this far then we know we're using an HTTP proxy */
 		info.type = PURPLE_PROXY_HTTP;
 
@@ -310,11 +318,10 @@ purple_gnome_proxy_get_info(void)
 		{
 			g_free(info.host);
 			info.host = NULL;
-			g_free(info.username);
-			info.username = NULL;
 			return purple_global_proxy_get_info();
 		}
 		g_free(err);
+		err = NULL;
 		g_strchomp(info.username);
 
 		if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/authentication_password",
@@ -327,6 +334,7 @@ purple_gnome_proxy_get_info(void)
 			return purple_global_proxy_get_info();
 		}
 		g_free(err);
+		err = NULL;
 		g_strchomp(info.password);
 
 		if (!g_spawn_command_line_sync("gconftool-2 -g /system/http_proxy/port",
@@ -1505,62 +1513,31 @@ hmacmd5_chap(const unsigned char * challenge, int challen, const char * passwd,
 }
 
 static void
-s5_readchap(gpointer data, gint source, PurpleInputCondition cond)
+s5_readchap(gpointer data, gint source, PurpleInputCondition cond);
+
+/*
+ * Return how many bytes we processed
+ * -1 means we've shouldn't keep reading from the buffer
+ */
+static gssize
+s5_parse_chap_msg(PurpleProxyConnectData *connect_data)
 {
-	guchar *cmdbuf, *buf;
-	PurpleProxyConnectData *connect_data = data;
+	guchar *buf, *cmdbuf = connect_data->read_buffer;
 	int len, navas, currentav;
 
-	purple_debug(PURPLE_DEBUG_INFO, "socks5 proxy", "Got CHAP response.\n");
-
-	if (connect_data->read_buffer == NULL) {
-		/* A big enough butfer to read the message header (2 bytes) and at least one complete attribute and value (1 + 1 + 255). */
-		connect_data->read_buf_len = 259;
-		connect_data->read_buffer = g_malloc(connect_data->read_buf_len);
-		connect_data->read_len = 0;
-	}
-
-	if (connect_data->read_buf_len - connect_data->read_len == 0) {
-		/*If the stuff below is right, this shouldn't be possible. */
-		purple_debug_error("socks5 proxy", "This is about to suck because the read buffer is full (shouldn't happen).\n");
-	}
-
-	len = read(connect_data->fd, connect_data->read_buffer + connect_data->read_len,
-		connect_data->read_buf_len - connect_data->read_len);
-
-	if (len == 0)
-	{
-		purple_proxy_connect_data_disconnect(connect_data,
-				_("Server closed the connection."));
-		return;
-	}
-
-	if (len < 0)
-	{
-		if (errno == EAGAIN)
-			/* No worries */
-			return;
-
-		/* Error! */
-		purple_proxy_connect_data_disconnect_formatted(connect_data,
-				_("Lost connection with server:\n%s"), g_strerror(errno));
-		return;
-	}
-
-	connect_data->read_len += len;
-	if (connect_data->read_len < 2)
-		return;
-
-	cmdbuf = connect_data->read_buffer;
+	purple_debug_misc("socks5 proxy", "Reading CHAP message: %x\n", *cmdbuf);
 
 	if (*cmdbuf != 0x01) {
 		purple_proxy_connect_data_disconnect(connect_data,
 				_("Received invalid data on connection with server."));
-		return;
+		return -1;
 	}
 	cmdbuf++;
 
 	navas = *cmdbuf;
+
+	purple_debug_misc("socks5 proxy", "Expecting %d attribute(s).\n", navas);
+
 	cmdbuf++;
 
 	for (currentav = 0; currentav < navas; currentav++) {
@@ -1575,7 +1552,10 @@ s5_readchap(gpointer data, gint source, PurpleInputCondition cond)
 			memmove((connect_data->read_buffer + 2), cmdbuf, len);
 			/* Decrease the read count accordingly */
 			connect_data->read_len = len + 2;
-			return;
+
+			purple_debug_info("socks5 proxy", "Need more data to retrieve attribute %d.\n", currentav);
+
+			return -1;
 		}
 
 		buf = cmdbuf + 2;
@@ -1605,7 +1585,11 @@ s5_readchap(gpointer data, gint source, PurpleInputCondition cond)
 					purple_proxy_connect_data_disconnect(connect_data,
 							_("Authentication failed"));
 				}
-				return;
+				return -1;
+			case 0x01:
+				/* We've already validated that cmdbuf[1] is sane. */
+				purple_debug_info("socks5 proxy", "Received TEXT-MESSAGE of '%.*s'\n", (int) cmdbuf[1], buf);
+				break;
 			case 0x03:
 				purple_debug_info("socks5 proxy", "Received CHALLENGE\n");
 				/* Server wants our credentials */
@@ -1617,6 +1601,7 @@ s5_readchap(gpointer data, gint source, PurpleInputCondition cond)
 				hmacmd5_chap(buf, cmdbuf[1],
 					purple_proxy_info_get_password(connect_data->gpi),
 					connect_data->write_buffer + 4);
+				/* TODO: What about USER-IDENTITY? */
 				connect_data->write_buffer[0] = 0x01;
 				connect_data->write_buffer[1] = 0x01;
 				connect_data->write_buffer[2] = 0x04;
@@ -1632,7 +1617,7 @@ s5_readchap(gpointer data, gint source, PurpleInputCondition cond)
 					PURPLE_INPUT_WRITE, proxy_do_write, connect_data);
 
 				proxy_do_write(connect_data, connect_data->fd, PURPLE_INPUT_WRITE);
-				return;
+				return -1;
 			case 0x11:
 				purple_debug_info("socks5 proxy", "Received ALGORIGTHMS of %x\n", buf[0]);
 				/* Server wants to select an algorithm */
@@ -1646,7 +1631,7 @@ s5_readchap(gpointer data, gint source, PurpleInputCondition cond)
 						"Disconnecting...");
 					purple_proxy_connect_data_disconnect(connect_data,
 							_("Received invalid data on connection with server."));
-					return;
+					return -1;
 				}
 				break;
 			default:
@@ -1655,10 +1640,85 @@ s5_readchap(gpointer data, gint source, PurpleInputCondition cond)
 		cmdbuf = buf + cmdbuf[1];
 	}
 
+	return (cmdbuf - connect_data->read_buffer);
+}
+
+static void
+s5_readchap(gpointer data, gint source, PurpleInputCondition cond)
+{
+	gssize msg_ret;
+	PurpleProxyConnectData *connect_data = data;
+	int len;
+
+	purple_debug(PURPLE_DEBUG_INFO, "socks5 proxy", "Got CHAP response.\n");
+
+	if (connect_data->read_buffer == NULL) {
+		/* A big enough butfer to read the message header (2 bytes) and at least one complete attribute and value (1 + 1 + 255). */
+		connect_data->read_buf_len = 259;
+		connect_data->read_buffer = g_malloc(connect_data->read_buf_len);
+		connect_data->read_len = 0;
+	}
+
+	if (connect_data->read_buf_len - connect_data->read_len == 0) {
+		/*If the stuff below is right, this shouldn't be possible. */
+		purple_debug_error("socks5 proxy", "This is about to suck because the read buffer is full (shouldn't happen).\n");
+	}
+
+	len = read(connect_data->fd, connect_data->read_buffer + connect_data->read_len,
+		connect_data->read_buf_len - connect_data->read_len);
+
+	if (len == 0) {
+		purple_proxy_connect_data_disconnect(connect_data,
+				_("Server closed the connection."));
+		return;
+	}
+
+	if (len < 0) {
+		if (errno == EAGAIN)
+			/* No worries */
+			return;
+
+		/* Error! */
+		purple_proxy_connect_data_disconnect_formatted(connect_data,
+				_("Lost connection with server:\n%s"), g_strerror(errno));
+		return;
+	}
+
+	connect_data->read_len += len;
+
+	/* We may have read more than one message into the buffer, we need to make sure to process them all */
+	while (1) {
+
+		/* We need more to be able to read this message */
+		if (connect_data->read_len < 2)
+			return;
+
+		msg_ret = s5_parse_chap_msg(connect_data);
+	
+		if (msg_ret < 0)
+			return;
+
+		/* See if we have another message already in the buffer */
+		if ((len = connect_data->read_len - msg_ret) > 0) {
+
+			/* Move on to the next message */
+			memmove(connect_data->read_buffer, connect_data->read_buffer + msg_ret, len);
+			/* Decrease the read count accordingly */
+			connect_data->read_len = len;
+
+			/* Try to read the message that connect_data->read_buffer now points to */
+			continue;
+		}
+
+		break;
+	}
+
 	/* Fell through.  We ran out of CHAP events to process, but haven't
 	 * succeeded or failed authentication - there may be more to come.
 	 * If this is the case, come straight back here. */
 
+	purple_debug_info("socks5 proxy", "Waiting for another message from which to read CHAP info.\n");
+
 	/* We've processed all the available attributes, so get ready for a whole new message */
  	g_free(connect_data->read_buffer);
 	connect_data->read_buffer = NULL;
diff --git a/libpurple/sslconn.h b/libpurple/sslconn.h
index 5272ec9227..d9d3a20c89 100644
--- a/libpurple/sslconn.h
+++ b/libpurple/sslconn.h
@@ -67,7 +67,7 @@ struct _PurpleSslConnection
 	int fd;
 	/** Glib event source ID; used to refer to the received data callback 
 	 * in the glib eventloop */
-	int inpa;
+	guint inpa;
 	/** Data related to the underlying TCP connection */
 	PurpleProxyConnectData *connect_data;
 
diff --git a/libpurple/util.c b/libpurple/util.c
index 1c3037aadc..0ab034575e 100644
--- a/libpurple/util.c
+++ b/libpurple/util.c
@@ -3763,9 +3763,7 @@ url_fetch_recv_cb(gpointer url_data, gint source, PurpleInputCondition cond)
 	while((len = read(source, buf, sizeof(buf))) > 0) {
 
 		if(gfud->max_len != -1 && (gfud->len + len) > gfud->max_len) {
-			/* TODO: Fix this when not string frozen */
-			/*purple_util_fetch_url_error(gfud, _("Error reading from %s: response too long (%d bytes limit)"),*/
-			purple_util_fetch_url_error(gfud, "Error reading from %s: response too long (%d bytes limit)",
+			purple_util_fetch_url_error(gfud, _("Error reading from %s: response too long (%d bytes limit)"),
 						    gfud->website.address, gfud->max_len);
 			return;
 		}
diff --git a/libpurple/win32/giowin32.c b/libpurple/win32/giowin32.c
index 74e6b5afc2..e103c95ee8 100644
--- a/libpurple/win32/giowin32.c
+++ b/libpurple/win32/giowin32.c
@@ -52,6 +52,8 @@ typedef struct _GIOWin32Watch GIOWin32Watch;
 
 #define BUFFER_SIZE 4096
 
+GIOChannel *wpurple_g_io_channel_win32_new_socket (int socket);
+
 typedef enum {
   G_IO_WIN32_WINDOWS_MESSAGES,	/* Windows messages */
   G_IO_WIN32_FILE_DESC,		/* Unix-like file descriptors from
diff --git a/libpurple/win32/libc_interface.h b/libpurple/win32/libc_interface.h
index 82bbf6a85b..413cbb2753 100644
--- a/libpurple/win32/libc_interface.h
+++ b/libpurple/win32/libc_interface.h
@@ -156,9 +156,6 @@ wpurple_rename(oldname, newname)
 #define localtime_r( time, resultp ) \
 wpurple_localtime_r( time, resultp )
 
-/* helper for purple_utf8_strftime() by way of purple_internal_strftime() in src/util.c */
-const char *wpurple_get_timezone_abbreviation(const struct tm *tm);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
diff --git a/libpurple/win32/libc_internal.h b/libpurple/win32/libc_internal.h
index 2a11083dac..9e4fe17393 100644
--- a/libpurple/win32/libc_internal.h
+++ b/libpurple/win32/libc_internal.h
@@ -29,6 +29,9 @@
 extern "C" {
 #endif /* __cplusplus */
 
+/* helper for purple_utf8_strftime() by way of purple_internal_strftime() in src/util.c */
+const char *wpurple_get_timezone_abbreviation(const struct tm *tm);
+
 /* sys/socket.h */
 int wpurple_socket(int domain, int style, int protocol);
 int wpurple_connect(int socket, struct sockaddr *addr, u_long length);
diff --git a/libpurple/win32/win32dep.h b/libpurple/win32/win32dep.h
index f2198a86dc..673b7d7abc 100644
--- a/libpurple/win32/win32dep.h
+++ b/libpurple/win32/win32dep.h
@@ -54,6 +54,7 @@ typedef struct {
  **/
 /* Windows helper functions */
 FARPROC wpurple_find_and_loadproc(const char *dllname, const char *procedure);
+gboolean wpurple_read_reg_dword(HKEY rootkey, const char *subkey, const char *valname, LPDWORD result);
 char *wpurple_read_reg_string(HKEY rootkey, const char *subkey, const char *valname); /* needs to be g_free'd */
 gboolean wpurple_write_reg_string(HKEY rootkey, const char *subkey, const char *valname, const char *value);
 char *wpurple_escape_dirsep(const char *filename); /* needs to be g_free'd */
diff --git a/pidgin.spec.in b/pidgin.spec.in
index 4daa417317..9dc5a9b47e 100644
--- a/pidgin.spec.in
+++ b/pidgin.spec.in
@@ -393,8 +393,6 @@ fi
 %attr(755, root, root) %{perl_vendorarch}/Purple.pm
 %attr(755, root, root) %{perl_vendorarch}/auto/Purple
 
-%{_datadir}/pixmaps/purple
-
 %if 0%{?_with_dbus:1}
 %{_bindir}/purple-client-example
 %{_bindir}/purple-remote
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
index be3fd3e1e3..17a076c129 100644
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -3275,7 +3275,7 @@ static GtkItemFactoryEntry blist_menu[] =
 	{ N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL },
 	{ N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 3, "<Item>", NULL },
 	{ "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL },
-	{ N_("/Tools/Mute _Sounds"), "<CTL>S", pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
+	{ N_("/Tools/Mute _Sounds"), NULL, pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL },
 	/* Help */
 	{ N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL },
 	{ N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP },
@@ -6483,7 +6483,7 @@ add_buddy_cb(GtkWidget *w, int resp, PidginAddBuddyData *data)
 		purple_account_add_buddy(data->account, b);
 
 		/* Offer to merge people with the same alias. */
-		if (whoalias != NULL)
+		if (whoalias != NULL && g != NULL)
 			gtk_blist_auto_personize((PurpleBlistNode *)g, whoalias);
 
 		/*
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
index f343e9a688..ee1b0f9bcd 100644
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -5288,8 +5288,7 @@ received_im_msg_cb(PurpleAccount *account, char *sender, char *message,
 	if (conv && PIDGIN_IS_PIDGIN_CONVERSATION(conv) && !hide) {
 		PidginConversation *gtkconv = PIDGIN_CONVERSATION(conv);
 		if (gtkconv->win == hidden_convwin) {
-			pidgin_conv_window_remove_gtkconv(gtkconv->win, gtkconv);
-			pidgin_conv_placement_place(gtkconv);
+			pidgin_conv_attach_to_conversation(gtkconv->active_conv);
 		}
 		return;
 	}
@@ -7249,6 +7248,14 @@ show_buddy_icons_pref_cb(const char *name, PurplePrefType type,
 			pidgin_conv_update_buddy_icon(conv);
 		}
 	}
+
+	/* Make the tabs show/hide correctly */
+	for (l = pidgin_conv_windows_get_list(); l != NULL; l = l->next) {
+		PidginWindow *win = l->data;
+		if (pidgin_conv_window_get_gtkconv_count(win) == 1)
+			gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
+						   GPOINTER_TO_INT(value) == 0);
+	}
 }
 
 static void
@@ -7297,8 +7304,7 @@ account_status_changed_cb(PurpleAccount *account, PurpleStatus *oldstatus,
 		if (!l)
 			break;
 
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		pidgin_conv_placement_place(gtkconv);
+		pidgin_conv_attach_to_conversation(conv);
 
 		/* TODO: do we need to do anything for any other conversations that are in the same gtkconv here?
 		 * I'm a little concerned that not doing so will cause the "pending" indicator in the gtkblist not to be cleared. -DAA*/
@@ -7338,8 +7344,7 @@ hide_new_pref_cb(const char *name, PurplePrefType type,
 							purple_conversation_get_account(conv)))))
 			continue;
 
-		pidgin_conv_window_remove_gtkconv(hidden_convwin, gtkconv);
-		pidgin_conv_placement_place(gtkconv);
+		pidgin_conv_attach_to_conversation(conv);
 	}
 }
 
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
index 46317f60bd..3f69eeb908 100644
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -100,6 +100,7 @@ static const struct developer developers[] = {
 /* Order: Alphabetical by Last Name */
 static const struct developer patch_writers[] = {
 	{"Felipe 'shx' Contreras",		NULL,	NULL},
+	{"Marcus 'malu' Lundblad", NULL, NULL},
 	{"Dennis 'EvilDennisR' Ristuccia",	N_("Senior Contributor/QA"),	NULL},
 	{"Peter 'Fmoo' Ruibal",		NULL,	NULL},
 	{"Gabriel 'Nix' Schulhof", 	NULL, 	NULL},
@@ -170,6 +171,7 @@ static const struct translator current_translators[] = {
 	{N_("Persian"),             "fa", "Roozbeh Pournader ", "roozbeh@farsiweb.info"},
 	{N_("Finnish"),             "fi", "Timo Jyrinki", "timo.jyrinki@iki.fi"},
 	{N_("French"),              "fr", "Éric Boumaour", "zongo_fr@users.sourceforge.net"},
+	{N_("Irish"),               "ga", "Aaron Kearns", "ajkearns6@gmail.com"},
 	{N_("Galician"),            "gl", "Mar Castro", "mariamarcp@gmail.com"},
 	{N_("Galician"),            "gl", "Frco. Javier Rial", "fjrial@cesga.es"},
 	{N_("Gujarati"),            "gu", "Ankit Patel", "ankit_patel@users.sf.net"},
diff --git a/pidgin/gtkimhtml.c b/pidgin/gtkimhtml.c
index 5d42fe09db..bc3bfa60be 100644
--- a/pidgin/gtkimhtml.c
+++ b/pidgin/gtkimhtml.c
@@ -348,6 +348,9 @@ gtk_smiley_tree_destroy (GtkSmileyTree *tree)
 			g_string_free (t->values, TRUE);
 			g_free (t->children);
 		}
+		if (t && t->image) {
+			t->image->imhtml = NULL;
+		}
 		g_free (t);
 	}
 }
@@ -446,6 +449,20 @@ gtk_imhtml_style_set(GtkWidget *widget, GtkStyle *prev_style)
 	parent_style_set(widget, prev_style);
 }
 
+static void
+gtk_imhtml_set_link_color(GtkIMHtml *imhtml, GtkTextTag *tag)
+{
+	GdkColor *color = NULL;
+	gboolean visited = !!g_object_get_data(G_OBJECT(tag), "visited");
+	gtk_widget_style_get(GTK_WIDGET(imhtml), visited ? "hyperlink-visited-color" : "hyperlink-color", &color, NULL);
+	if (color) {
+		g_object_set(G_OBJECT(tag), "foreground-gdk", color, NULL);
+		gdk_color_free(color);
+	} else {
+		g_object_set(G_OBJECT(tag), "foreground", visited ? "#800000" : "blue", NULL);
+	}
+}
+
 static gint
 gtk_imhtml_tip_paint (GtkIMHtml *imhtml)
 {
@@ -566,7 +583,6 @@ gtk_motion_event_notify(GtkWidget *imhtml, GdkEventMotion *event, gpointer data)
 	int x, y;
 	char *tip = NULL;
 	GSList *tags = NULL, *templist = NULL;
-	GdkColor *norm, *pre;
 	GtkTextTag *tag = NULL, *oldprelit_tag;
 	GtkTextChildAnchor* anchor;
 	gboolean hand = TRUE;
@@ -588,13 +604,15 @@ gtk_motion_event_notify(GtkWidget *imhtml, GdkEventMotion *event, gpointer data)
 		templist = templist->next;
 	}
 
-	if (tip) {
-		gtk_widget_style_get(GTK_WIDGET(imhtml), "hyperlink-prelight-color", &pre, NULL);
+	if (tip && (!tag || !g_object_get_data(G_OBJECT(tag), "visited"))) {
 		GTK_IMHTML(imhtml)->prelit_tag = tag;
 		if (tag != oldprelit_tag) {
-			if (pre)
+			GdkColor *pre = NULL;
+			gtk_widget_style_get(GTK_WIDGET(imhtml), "hyperlink-prelight-color", &pre, NULL);
+			if (pre) {
 				g_object_set(G_OBJECT(tag), "foreground-gdk", pre, NULL);
-			else
+				gdk_color_free(pre);
+			} else
 				g_object_set(G_OBJECT(tag), "foreground", "#70a0ff", NULL);
 		}
 	} else {
@@ -602,11 +620,7 @@ gtk_motion_event_notify(GtkWidget *imhtml, GdkEventMotion *event, gpointer data)
 	}
 
 	if ((oldprelit_tag != NULL) && (GTK_IMHTML(imhtml)->prelit_tag != oldprelit_tag)) {
-		gtk_widget_style_get(GTK_WIDGET(imhtml), "hyperlink-color", &norm, NULL);
-		if (norm)
-			g_object_set(G_OBJECT(oldprelit_tag), "foreground-gdk", norm, NULL);
-		else
-			g_object_set(G_OBJECT(oldprelit_tag), "foreground", "blue", NULL);
+		gtk_imhtml_set_link_color(GTK_IMHTML(imhtml), oldprelit_tag);
 	}
 
 	if (GTK_IMHTML(imhtml)->tip) {
@@ -670,12 +684,7 @@ gtk_leave_event_notify(GtkWidget *imhtml, GdkEventCrossing *event, gpointer data
 {
 	/* when leaving the widget, clear any current & pending tooltips and restore the cursor */
 	if (GTK_IMHTML(imhtml)->prelit_tag) {
-		GdkColor *norm;
-		gtk_widget_style_get(GTK_WIDGET(imhtml), "hyperlink-color", &norm, NULL);
-		if (norm)
-			g_object_set(G_OBJECT(GTK_IMHTML(imhtml)->prelit_tag), "foreground-gdk", norm, NULL);
-		else
-			g_object_set(G_OBJECT(GTK_IMHTML(imhtml)->prelit_tag), "foreground", "blue", NULL);
+		gtk_imhtml_set_link_color(GTK_IMHTML(imhtml), GTK_IMHTML(imhtml)->prelit_tag);
 		GTK_IMHTML(imhtml)->prelit_tag = NULL;
 	}
 
@@ -1482,6 +1491,10 @@ static void gtk_imhtml_class_init (GtkIMHtmlClass *klass)
 	                                        _("Hyperlink color"),
 	                                        _("Color to draw hyperlinks."),
 	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
+	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-visited-color",
+	                                        _("Hyperlink visited color"),
+	                                        _("Color to draw hyperlinks after it has been visited (or activated)."),
+	                                        GDK_TYPE_COLOR, G_PARAM_READABLE));
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-prelight-color",
 	                                        _("Hyperlink prelight color"),
 	                                        _("Color to draw hyperlinks when mouse is over them."),
@@ -1679,20 +1692,24 @@ GType gtk_imhtml_get_type()
 struct url_data {
 	GObject *object;
 	gchar *url;
+	GtkTextTag *tag;
 };
 
 static void url_data_destroy(gpointer mydata)
 {
 	struct url_data *data = mydata;
 	g_object_unref(data->object);
+	g_object_unref(data->tag);
 	g_free(data->url);
 	g_free(data);
 }
 
-static void url_open(GtkWidget *w, struct url_data *data) {
+static void url_open(GtkWidget *w, struct url_data *data)
+{
 	if(!data) return;
 	g_signal_emit(data->object, signals[URL_CLICKED], 0, data->url);
-
+	g_object_set_data(G_OBJECT(data->tag), "visited", GINT_TO_POINTER(TRUE));
+	gtk_imhtml_set_link_color(GTK_IMHTML(data->object), data->tag);
 }
 
 static void url_copy(GtkWidget *w, gchar *url) {
@@ -1706,7 +1723,8 @@ static void url_copy(GtkWidget *w, gchar *url) {
 }
 
 /* The callback for an event on a link tag. */
-static gboolean tag_event(GtkTextTag *tag, GObject *imhtml, GdkEvent *event, GtkTextIter *arg2, gpointer unused) {
+static gboolean tag_event(GtkTextTag *tag, GObject *imhtml, GdkEvent *event, GtkTextIter *arg2, gpointer unused)
+{
 	GdkEventButton *event_button = (GdkEventButton *) event;
 	if (GTK_IMHTML(imhtml)->editable)
 		return FALSE;
@@ -1723,12 +1741,15 @@ static gboolean tag_event(GtkTextTag *tag, GObject *imhtml, GdkEvent *event, Gtk
 			g_object_ref(G_OBJECT(tag));
 			g_signal_emit(imhtml, signals[URL_CLICKED], 0, g_object_get_data(G_OBJECT(tag), "link_url"));
 			g_object_unref(G_OBJECT(tag));
+			g_object_set_data(G_OBJECT(tag), "visited", GINT_TO_POINTER(TRUE));
+			gtk_imhtml_set_link_color(GTK_IMHTML(imhtml), tag);
 			return FALSE;
 		} else if(event_button->button == 3) {
 			GtkWidget *img, *item, *menu;
 			struct url_data *tempdata = g_new(struct url_data, 1);
 			tempdata->object = g_object_ref(imhtml);
 			tempdata->url = g_strdup(g_object_get_data(G_OBJECT(tag), "link_url"));
+			tempdata->tag = g_object_ref(tag);
 
 			/* Don't want the tooltip around if user right-clicked on link */
 			if (GTK_IMHTML(imhtml)->tip_window) {
@@ -1940,7 +1961,6 @@ gtk_imhtml_link_drag_rcv_cb(GtkWidget *widget, GdkDragContext *dc, guint x, guin
 	}
 }
 
-/* this isn't used yet
 static void gtk_smiley_tree_remove (GtkSmileyTree     *tree,
 			GtkIMHtmlSmiley   *smiley)
 {
@@ -1956,7 +1976,7 @@ static void gtk_smiley_tree_remove (GtkSmileyTree     *tree,
 
 		pos = strchr (t->values->str, *x);
 		if (pos)
-			t = t->children [(int) pos - (int) t->values->str];
+			t = t->children [(unsigned int) pos - (unsigned int) t->values->str];
 		else
 			return;
 
@@ -1967,8 +1987,6 @@ static void gtk_smiley_tree_remove (GtkSmileyTree     *tree,
 		t->image = NULL;
 	}
 }
-*/
-
 
 static gint
 gtk_smiley_tree_lookup (GtkSmileyTree *tree,
@@ -2028,6 +2046,25 @@ gtk_smiley_tree_lookup (GtkSmileyTree *tree,
 	return 0;
 }
 
+static void
+gtk_imhtml_disassociate_smiley_foreach(gpointer key, gpointer value,
+	gpointer user_data)
+{
+	GtkSmileyTree *tree = (GtkSmileyTree *) value;
+	GtkIMHtmlSmiley *smiley = (GtkIMHtmlSmiley *) user_data;
+	gtk_smiley_tree_remove(tree, smiley);
+}
+
+static void
+gtk_imhtml_disassociate_smiley(GtkIMHtmlSmiley *smiley)
+{
+	if (smiley->imhtml) {
+		gtk_smiley_tree_remove(smiley->imhtml->default_smilies, smiley);
+		g_hash_table_foreach(smiley->imhtml->smiley_data, 
+			gtk_imhtml_disassociate_smiley_foreach, smiley);
+	}
+}
+
 void
 gtk_imhtml_associate_smiley (GtkIMHtml       *imhtml,
 			     const gchar     *sml,
@@ -5599,12 +5636,14 @@ GtkIMHtmlSmiley *gtk_imhtml_smiley_create(const char *file, const char *shortcut
 	smiley->smile = g_strdup(shortcut);
 	smiley->hidden = hide;
 	smiley->flags = flags;
+	smiley->imhtml = NULL;
 	gtk_imhtml_smiley_reload(smiley);
 	return smiley;
 }
 
 void gtk_imhtml_smiley_destroy(GtkIMHtmlSmiley *smiley)
 {
+	gtk_imhtml_disassociate_smiley(smiley);
 	g_free(smiley->smile);
 	g_free(smiley->file);
 	if (smiley->icon)
diff --git a/pidgin/gtkimhtmltoolbar.c b/pidgin/gtkimhtmltoolbar.c
index f4801bb194..2e1bceb342 100644
--- a/pidgin/gtkimhtmltoolbar.c
+++ b/pidgin/gtkimhtmltoolbar.c
@@ -1148,7 +1148,7 @@ gtk_imhtmltoolbar_finalize (GObject *object)
 				toolbar);
 	}
 
-	free(toolbar->sml);
+	g_free(toolbar->sml);
 	gtk_object_sink(GTK_OBJECT(toolbar->tooltips));
 
 	menu = g_object_get_data(object, "font_menu");
diff --git a/pidgin/gtkmenutray.c b/pidgin/gtkmenutray.c
index da7111df4e..e1fa249e15 100644
--- a/pidgin/gtkmenutray.c
+++ b/pidgin/gtkmenutray.c
@@ -84,6 +84,14 @@ pidgin_menu_tray_get_property(GObject *obj, guint param_id, GValue *value,
 }
 
 static void
+pidgin_menu_tray_map(GtkWidget *widget)
+{
+	GTK_WIDGET_CLASS(parent_class)->map(widget);
+	gtk_container_add(GTK_CONTAINER(widget),
+			PIDGIN_MENU_TRAY(widget)->tray);
+}
+
+static void
 pidgin_menu_tray_finalize(GObject *obj)
 {
 	PidginMenuTray *tray = PIDGIN_MENU_TRAY(obj);
@@ -109,6 +117,7 @@ static void
 pidgin_menu_tray_class_init(PidginMenuTrayClass *klass) {
 	GObjectClass *object_class = G_OBJECT_CLASS(klass);
 	GtkItemClass *item_class = GTK_ITEM_CLASS(klass);
+	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 	GParamSpec *pspec;
 
 	parent_class = g_type_class_peek_parent(klass);
@@ -119,6 +128,8 @@ pidgin_menu_tray_class_init(PidginMenuTrayClass *klass) {
 	item_class->select = pidgin_menu_tray_select;
 	item_class->deselect = pidgin_menu_tray_deselect;
 
+	widget_class->map = pidgin_menu_tray_map;
+
 	pspec = g_param_spec_object("box", "The box",
 								"The box",
 								GTK_TYPE_BOX,
@@ -152,8 +163,6 @@ pidgin_menu_tray_init(PidginMenuTray *menu_tray) {
 		gtk_widget_set_size_request(widget, -1, height);
 	}
 
-	gtk_container_add(GTK_CONTAINER(menu_tray), menu_tray->tray);
-
 	gtk_widget_show(menu_tray->tray);
 }
 
diff --git a/pidgin/gtknotify.c b/pidgin/gtknotify.c
index e1af955498..b7bb905dde 100644
--- a/pidgin/gtknotify.c
+++ b/pidgin/gtknotify.c
@@ -50,7 +50,6 @@ typedef struct
 	PurpleAccount *account;
 	char *url;
 	GtkWidget *label;
-	GtkTreeIter iter;
 	int count;
 	gboolean purple_has_handle;
 } PidginNotifyMailData;
@@ -128,7 +127,10 @@ email_response_cb(GtkDialog *dlg, gint id, PidginMailDialog *dialog)
 			purple_notify_uri(NULL, data->url);
 
 			gtk_tree_store_remove(dialog->treemodel, &iter);
-			purple_notify_close(PURPLE_NOTIFY_EMAILS, data);
+			if (data->purple_has_handle)
+				purple_notify_close(PURPLE_NOTIFY_EMAILS, data);
+			else
+				pidgin_close_notify(PURPLE_NOTIFY_EMAILS, data);
 
 			if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(mail_dialog->treemodel), &iter))
 				return;
@@ -362,6 +364,10 @@ pidgin_get_mail_dialog(void)
 		button = gtk_dialog_add_button(GTK_DIALOG(dialog),
 						 PIDGIN_STOCK_OPEN_MAIL, GTK_RESPONSE_YES);
 
+		/* make "Open All Messages" the default response */
+		gtk_dialog_set_default_response(GTK_DIALOG(dialog),
+						GTK_RESPONSE_ACCEPT);
+
 		/* Setup the dialog */
 		gtk_container_set_border_width(GTK_CONTAINER(dialog), PIDGIN_HIG_BOX_SPACE);
 		gtk_container_set_border_width(GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), PIDGIN_HIG_BOX_SPACE);
@@ -483,13 +489,9 @@ pidgin_notify_add_mail(GtkTreeStore *treemodel, PurpleAccount *account, char *no
 								PIDGIN_MAIL_TEXT, notification,
 								PIDGIN_MAIL_DATA, data,
 								-1);
-	data->iter = iter;              /* XXX: Do we use this for something? */
 	data->account = account;
 	data->count = count;
 
-	/* Why is this necessary?*/
-	gtk_tree_model_get(GTK_TREE_MODEL(treemodel), &iter,
-						PIDGIN_MAIL_DATA, &data, -1);
 	if (icon)
 		g_object_unref(icon);
 
diff --git a/pidgin/gtkprefs.c b/pidgin/gtkprefs.c
index b5da63f3e9..e5cc449ca8 100644
--- a/pidgin/gtkprefs.c
+++ b/pidgin/gtkprefs.c
@@ -1829,6 +1829,25 @@ static void prefs_sound_sel(GtkTreeSelection *sel, GtkTreeModel *model) {
 	g_value_unset (&val);
 }
 
+
+static void
+mute_changed_cb(const char *pref_name,
+                PurplePrefType pref_type,
+                gconstpointer val,
+                gpointer data)
+{
+	GtkToggleButton *button = data;
+	gboolean muted = val;
+
+	g_return_if_fail(!strcmp (pref_name, PIDGIN_PREFS_ROOT "/sound/mute"));
+
+	/* Block the handler that re-sets the preference. */
+	g_signal_handlers_block_matched(button, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pref_name);
+	gtk_toggle_button_set_active (button, muted);
+	g_signal_handlers_unblock_matched(button, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, pref_name);
+}
+
+
 static GtkWidget *
 sound_page(void)
 {
@@ -1890,9 +1909,13 @@ sound_page(void)
 #endif /* _WIN32 */
 
 	vbox = pidgin_make_frame (ret, _("Sound Options"));
+
+	button = pidgin_prefs_checkbox(_("M_ute sounds"), PIDGIN_PREFS_ROOT "/sound/mute", vbox);
+	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/mute", mute_changed_cb, button);
+
 	pidgin_prefs_checkbox(_("Sounds when conversation has _focus"),
 				   PIDGIN_PREFS_ROOT "/sound/conv_focus", vbox);
-	pidgin_prefs_dropdown(vbox, _("Enable sounds:"),
+	pidgin_prefs_dropdown(vbox, _("_Enable sounds:"),
 				 PURPLE_PREF_INT, "/purple/sound/while_status",
 				_("Only when available"), 1,
 				_("Only when not available"), 2,
@@ -1909,7 +1932,7 @@ sound_page(void)
 	g_signal_connect (G_OBJECT (sw), "value-changed",
 			  G_CALLBACK (prefs_sound_volume_changed),
 			  NULL);
-	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("Volume:"), NULL, sw, TRUE, NULL);
+	hbox = pidgin_add_widget_to_vbox(GTK_BOX(vbox), _("V_olume:"), NULL, sw, TRUE, NULL);
 
 	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/method",
 								sound_changed3_cb, hbox);
diff --git a/pidgin/gtksmiley.c b/pidgin/gtksmiley.c
index 12cd3b5ea5..1f00060a11 100644
--- a/pidgin/gtksmiley.c
+++ b/pidgin/gtksmiley.c
@@ -273,8 +273,8 @@ static void do_add(GtkWidget *widget, PidginSmiley *s)
 			gsize size = 0;
 			gchar *filename;
 
-			gdk_pixbuf_save_to_bufferv(s->custom_pixbuf, &buffer, &size,
-									   "png", NULL, NULL, NULL);
+			gdk_pixbuf_save_to_buffer(s->custom_pixbuf, &buffer, &size,
+				"png", NULL, "compression", "9", NULL, NULL);
 			filename = purple_util_get_image_filename(buffer, size);
 			s->filename = g_build_filename(purple_smileys_get_storing_dir(), filename, NULL);
 			purple_util_write_data_to_file_absolute(s->filename, buffer, size);
diff --git a/pidgin/gtkstatusbox.c b/pidgin/gtkstatusbox.c
index 9fbeab330d..734b4dcec8 100644
--- a/pidgin/gtkstatusbox.c
+++ b/pidgin/gtkstatusbox.c
@@ -2715,7 +2715,6 @@ static void pidgin_status_box_changed(PidginStatusBox *status_box)
 			gtk_widget_show_all(status_box->vbox);
 			status_box->typing = g_timeout_add(TYPING_TIMEOUT, (GSourceFunc)remove_typing_cb, status_box);
 			gtk_widget_grab_focus(status_box->imhtml);
-			gtk_imhtml_clear(GTK_IMHTML(status_box->imhtml));
 		}
 		else
 		{
diff --git a/pidgin/pidginstock-artwork.c b/pidgin/pidginstock-artwork.c
new file mode 100644
index 0000000000..beab951296
--- /dev/null
+++ b/pidgin/pidginstock-artwork.c
@@ -0,0 +1,508 @@
+/**
+ * @file pidginstock.c GTK+ Stock resources
+ * @ingroup pidgin
+ */
+
+/* pidgin
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ *
+ */
+#include "internal.h"
+#include "pidgin.h"
+
+#include "pidginstock.h"
+
+static struct StockIcon
+{
+	const char *name;
+	const char *dir;
+	const char *filename;
+
+} const stock_icons[] =
+{
+	{ PIDGIN_STOCK_ACTION,          NULL,      GTK_STOCK_EXECUTE          },
+#if GTK_CHECK_VERSION(2,6,0)
+	{ PIDGIN_STOCK_ALIAS,           NULL,      GTK_STOCK_EDIT             },
+#else
+	{ PIDGIN_STOCK_ALIAS,           "buttons", "edit.png"                 },
+#endif
+	{ PIDGIN_STOCK_CHAT,            NULL,      GTK_STOCK_JUMP_TO          },
+	{ PIDGIN_STOCK_CLEAR,           NULL,      GTK_STOCK_CLEAR            },
+	{ PIDGIN_STOCK_CLOSE_TABS,      NULL,      GTK_STOCK_CLOSE            },
+	{ PIDGIN_STOCK_DEBUG,           NULL,      GTK_STOCK_PROPERTIES       },
+	{ PIDGIN_STOCK_DOWNLOAD,        NULL,      GTK_STOCK_GO_DOWN          },
+#if GTK_CHECK_VERSION(2,6,0)
+	{ PIDGIN_STOCK_DISCONNECT,      NULL,      GTK_STOCK_DISCONNECT       },
+#else
+	{ PIDGIN_STOCK_DISCONNECT,      "icons",   "stock_disconnect_16.png"  },
+#endif
+	{ PIDGIN_STOCK_FGCOLOR,         "buttons", "change-fgcolor-small.png" },
+#if GTK_CHECK_VERSION(2,6,0)
+	{ PIDGIN_STOCK_EDIT,            NULL,      GTK_STOCK_EDIT             },
+#else
+	{ PIDGIN_STOCK_EDIT,            "buttons", "edit.png"                 },
+#endif
+	{ PIDGIN_STOCK_FILE_CANCELED,   NULL,      GTK_STOCK_CANCEL           },
+	{ PIDGIN_STOCK_FILE_DONE,       NULL,      GTK_STOCK_APPLY            },
+	{ PIDGIN_STOCK_IGNORE,          NULL,      GTK_STOCK_DIALOG_ERROR     },
+	{ PIDGIN_STOCK_INVITE,          NULL,      GTK_STOCK_JUMP_TO          },
+	{ PIDGIN_STOCK_MODIFY,          NULL,      GTK_STOCK_PREFERENCES      },
+#if GTK_CHECK_VERSION(2,6,0)
+	{ PIDGIN_STOCK_PAUSE,           NULL,      GTK_STOCK_MEDIA_PAUSE      },
+#else
+	{ PIDGIN_STOCK_PAUSE,           "buttons", "pause.png"                },
+#endif
+	{ PIDGIN_STOCK_POUNCE,          NULL,      GTK_STOCK_REDO             },
+	{ PIDGIN_STOCK_OPEN_MAIL,       NULL,      GTK_STOCK_JUMP_TO          },
+	{ PIDGIN_STOCK_SIGN_ON,         NULL,      GTK_STOCK_EXECUTE          },
+	{ PIDGIN_STOCK_SIGN_OFF,        NULL,      GTK_STOCK_CLOSE            },
+	{ PIDGIN_STOCK_TYPED,           "pidgin",  "typed.png"                },
+	{ PIDGIN_STOCK_UPLOAD,          NULL,      GTK_STOCK_GO_UP            },
+#if GTK_CHECK_VERSION(2,8,0)
+	{ PIDGIN_STOCK_INFO,            NULL,      GTK_STOCK_INFO             },
+#else
+	{ PIDGIN_STOCK_INFO,            "buttons", "info.png"                 },
+#endif
+};
+
+static const GtkStockItem stock_items[] =
+{
+	{ PIDGIN_STOCK_ALIAS,               N_("_Alias"),      0, 0, NULL },
+	{ PIDGIN_STOCK_CHAT,                N_("_Join"),       0, 0, NULL },
+	{ PIDGIN_STOCK_CLOSE_TABS,          N_("Close _tabs"), 0, 0, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, N_("I_M"),         0, 0, NULL },
+	{ PIDGIN_STOCK_TOOLBAR_USER_INFO,   N_("_Get Info"),   0, 0, NULL },
+	{ PIDGIN_STOCK_INVITE,              N_("_Invite"),     0, 0, NULL },
+	{ PIDGIN_STOCK_MODIFY,              N_("_Modify"),     0, 0, NULL },
+	{ PIDGIN_STOCK_OPEN_MAIL,           N_("_Open Mail"),  0, 0, NULL },
+	{ PIDGIN_STOCK_PAUSE,               N_("_Pause"),      0, 0, NULL },
+	{ PIDGIN_STOCK_EDIT,                N_("_Edit"),       0, 0, NULL }
+};
+
+static struct SizedStockIcon {
+  const char *name;
+  const char *dir;
+  const char *filename;
+  gboolean microscopic;
+  gboolean extra_small;
+  gboolean small;
+  gboolean medium;
+  gboolean large;
+  gboolean huge;
+  gboolean rtl;
+  const char *translucent_name;
+} const sized_stock_icons [] = {
+
+
+        /* Status icons */
+
+	{ PIDGIN_STOCK_STATUS_AVAILABLE, "status", "pidgin-available.png", 	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AVAILABLE_I },
+	{ PIDGIN_STOCK_STATUS_AWAY, 	 "status", "pidgin-away.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_AWAY_I },
+	{ PIDGIN_STOCK_STATUS_BUSY, 	 "status", "pidgin-busy.png", 		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_BUSY_I },
+	{ PIDGIN_STOCK_STATUS_CHAT, 	 "status", "pidgin-chat.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_INVISIBLE, "status", "pidgin-invisible.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_XA, 	 "status", "pidgin-extended-away.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_XA_I },
+	{ PIDGIN_STOCK_STATUS_LOGIN, 	 "status", "pidgin-log-in.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_LOGOUT, 	 "status", "pidgin-log-out.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL },
+	{ PIDGIN_STOCK_STATUS_OFFLINE, 	 "status", "pidgin-offline.png",	TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, PIDGIN_STOCK_STATUS_OFFLINE_I  },
+	{ PIDGIN_STOCK_STATUS_PERSON, 	 "status", "pidgin-person.png",		TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_STATUS_MESSAGE, 	 "actions", "pidgin-message-new.png",   TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	
+
+        /* Chatroom icons */
+
+	{ PIDGIN_STOCK_STATUS_IGNORED,	 "status", "pidgin-blocked.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_STATUS_FOUNDER,	 "status", "pidgin-founder.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_STATUS_OPERATOR,	 "status", "pidgin-operator.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_STATUS_HALFOP, 	 "status", "pidgin-half-operator.png",	FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_STATUS_VOICE, 	 "status", "pidgin-voice.png",		FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+
+
+        /* Dialog icons */
+
+	{ PIDGIN_STOCK_DIALOG_AUTH,	"status", "pidgin-auth.png",		FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
+	{ PIDGIN_STOCK_DIALOG_COOL,	"status", "pidgin-cool.png", 		FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
+	{ PIDGIN_STOCK_DIALOG_ERROR,	"status", "pidgin-error.png",		FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
+	{ PIDGIN_STOCK_DIALOG_INFO,	"status", "pidgin-info.png",		FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
+	{ PIDGIN_STOCK_DIALOG_MAIL,	"status", "pidgin-mail.png",		FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
+	{ PIDGIN_STOCK_DIALOG_QUESTION,	"status", "pidgin-question.png",	FALSE, TRUE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
+	{ PIDGIN_STOCK_DIALOG_WARNING,	"status", "pidgin-warning.png",		FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, FALSE, NULL  },
+
+
+        /* Animations */
+
+	{ PIDGIN_STOCK_ANIMATION_CONNECT0, "animations", "process-working0.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT1, "animations", "process-working1.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT2, "animations", "process-working2.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT3, "animations", "process-working3.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT4, "animations", "process-working4.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT5, "animations", "process-working5.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT6, "animations", "process-working6.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT7, "animations", "process-working7.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT8, "animations", "process-working8.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT9, "animations", "process-working9.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT10, "animations", "process-working10.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT11, "animations", "process-working11.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT12, "animations", "process-working12.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT13, "animations", "process-working13.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT14, "animations", "process-working14.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT15, "animations", "process-working15.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT16, "animations", "process-working16.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT17, "animations", "process-working17.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT18, "animations", "process-working18.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT19, "animations", "process-working19.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT20, "animations", "process-working20.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT21, "animations", "process-working21.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT22, "animations", "process-working22.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT23, "animations", "process-working23.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT24, "animations", "process-working24.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT25, "animations", "process-working25.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT26, "animations", "process-working26.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT27, "animations", "process-working27.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT28, "animations", "process-working28.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT29, "animations", "process-working29.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_CONNECT30, "animations", "process-working30.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_TYPING0,  "animations", "typing0.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_TYPING1,  "animations", "typing1.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_TYPING2,  "animations", "typing2.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_TYPING3,  "animations", "typing3.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_TYPING4,  "animations", "typing4.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_ANIMATION_TYPING5,  "animations", "typing5.png",FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+
+
+        /* Conversation toolbar icons */
+
+	{ PIDGIN_STOCK_TOOLBAR_BGCOLOR, "actions", "pidgin-change-bgcolor.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_FGCOLOR, "actions", "pidgin-change-fgcolor.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_TEXT_SMALLER, "actions", "pidgin-font-size-down.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_TEXT_LARGER, "actions", "pidgin-font-size-up.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_SMILEY, "actions", "pidgin-emote-select.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_FONT_FACE, "actions", "pidgin-font-face.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_INSERT, "actions", "pidgin-insert.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE, "actions", "pidgin-insert-image.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_INSERT_LINK, "actions", "pidgin-insert-link.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+
+
+        /* Menu icons */
+
+	{ PIDGIN_STOCK_TOOLBAR_BLOCK, "status", "pidgin-blocked.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW, "actions", "pidgin-message-new.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_PENDING, "status", "pidgin-tray-new-im.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_PLUGINS, "actions", "pidgin-view-plugins.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_UNBLOCK, "actions", "pidgin-unblock.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_SELECT_AVATAR, "actions", "pidgin-select-avatar.png", FALSE, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_SEND_FILE, "actions", "pidgin-send-file.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TOOLBAR_TRANSFER, "actions", "pidgin-view-transfer.png", FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, NULL  },
+
+
+        /* Tray icons */
+
+	{ PIDGIN_STOCK_TRAY_AVAILABLE, "status", "pidgin-tray-online.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_INVISIBLE, "status", "pidgin-tray-invisible.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_AWAY, "status", "pidgin-tray-away.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_BUSY, "status", "pidgin-tray-busy.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_XA, "status", "pidgin-tray-extended-away.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_OFFLINE, "status", "pidgin-tray-offline.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_CONNECT, "status", "pidgin-tray-connecting.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_PENDING, "status", "pidgin-tray-new-im.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  },
+	{ PIDGIN_STOCK_TRAY_EMAIL, "status", "pidgin-tray-message.png", FALSE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, NULL  }
+
+};
+
+static gchar *
+find_file(const char *dir, const char *base)
+{
+	char *filename;
+
+	if (base == NULL)
+		return NULL;
+
+	if (!strcmp(dir, "pidgin"))
+		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", base, NULL);
+	else
+	{
+		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", dir,
+									base, NULL);
+	}
+
+	return filename;
+}
+
+static void
+add_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, const char *dir, 
+	       gboolean rtl, const char *size, const char *file)
+{
+	char *filename;
+	GtkIconSource *source;	
+
+	filename = g_build_filename(DATADIR, "pixmaps", "pidgin", dir, size, file, NULL);
+	source = gtk_icon_source_new();
+        gtk_icon_source_set_filename(source, filename);
+	gtk_icon_source_set_direction(source, GTK_TEXT_DIR_LTR);
+        gtk_icon_source_set_direction_wildcarded(source, !rtl);
+	gtk_icon_source_set_size(source, sizeid);
+        gtk_icon_source_set_size_wildcarded(source, FALSE);
+        gtk_icon_source_set_state_wildcarded(source, TRUE);
+        gtk_icon_set_add_source(iconset, source);
+	gtk_icon_source_free(source);
+
+	if (sizeid == gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)) {
+		source = gtk_icon_source_new();
+	        gtk_icon_source_set_filename(source, filename);
+        	gtk_icon_source_set_direction_wildcarded(source, TRUE);
+	        gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU);
+	        gtk_icon_source_set_size_wildcarded(source, FALSE);
+        	gtk_icon_source_set_state_wildcarded(source, TRUE);
+	        gtk_icon_set_add_source(iconset, source);
+	        gtk_icon_source_free(source);
+	}
+        g_free(filename);
+
+       if (rtl) {
+		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", dir, size, "rtl", file, NULL);
+                source = gtk_icon_source_new();
+                gtk_icon_source_set_filename(source, filename);
+                gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);
+                gtk_icon_source_set_size(source, sizeid);
+                gtk_icon_source_set_size_wildcarded(source, FALSE);
+                gtk_icon_source_set_state_wildcarded(source, TRUE);
+                gtk_icon_set_add_source(iconset, source);
+		g_free(filename);
+		gtk_icon_source_free(source);
+        }
+
+
+}
+
+/* Altered from do_colorshift in gnome-panel */
+static void
+do_alphashift (GdkPixbuf *dest, GdkPixbuf *src)
+{
+        gint i, j;
+        gint width, height, has_alpha, srcrowstride, destrowstride;
+        guchar *target_pixels;
+        guchar *original_pixels;
+        guchar *pixsrc;
+        guchar *pixdest;
+        guchar a;
+
+        has_alpha = gdk_pixbuf_get_has_alpha (src);
+        if (!has_alpha)
+          return;
+
+        width = gdk_pixbuf_get_width (src);
+        height = gdk_pixbuf_get_height (src);
+        srcrowstride = gdk_pixbuf_get_rowstride (src);
+        destrowstride = gdk_pixbuf_get_rowstride (dest);
+        target_pixels = gdk_pixbuf_get_pixels (dest);
+        original_pixels = gdk_pixbuf_get_pixels (src);
+
+        for (i = 0; i < height; i++) {
+                pixdest = target_pixels + i*destrowstride;
+                pixsrc = original_pixels + i*srcrowstride;
+                for (j = 0; j < width; j++) {
+                        *(pixdest++) = *(pixsrc++);
+                        *(pixdest++) = *(pixsrc++);
+                        *(pixdest++) = *(pixsrc++);
+                        a = *(pixsrc++);
+                        *(pixdest++) = a / 2;
+                }
+        }
+}
+
+/* TODO: This is almost certainly not the best way to do this, but it's late, I'm tired,
+ * we're a few hours from getting this thing out, and copy/paste is EASY.
+ */
+static void
+add_translucent_sized_icon(GtkIconSet *iconset, GtkIconSize sizeid, const char *dir,
+	       gboolean rtl, const char *size, const char *file)
+{
+	char *filename;
+	GtkIconSource *source;	
+	GdkPixbuf *pixbuf;
+
+	filename = g_build_filename(DATADIR, "pixmaps", "pidgin", dir, size, file, NULL);
+	pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
+	do_alphashift(pixbuf, pixbuf);
+
+	source = gtk_icon_source_new();
+        gtk_icon_source_set_pixbuf(source, pixbuf);
+	gtk_icon_source_set_direction(source, GTK_TEXT_DIR_LTR);
+        gtk_icon_source_set_direction_wildcarded(source, !rtl);
+	gtk_icon_source_set_size(source, sizeid);
+        gtk_icon_source_set_size_wildcarded(source, FALSE);
+        gtk_icon_source_set_state_wildcarded(source, TRUE);
+        gtk_icon_set_add_source(iconset, source);
+	gtk_icon_source_free(source);
+
+	if (sizeid == gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)) {
+		source = gtk_icon_source_new();
+	        gtk_icon_source_set_pixbuf(source, pixbuf);
+        	gtk_icon_source_set_direction_wildcarded(source, TRUE);
+	        gtk_icon_source_set_size(source, GTK_ICON_SIZE_MENU);
+	        gtk_icon_source_set_size_wildcarded(source, FALSE);
+        	gtk_icon_source_set_state_wildcarded(source, TRUE);
+	        gtk_icon_set_add_source(iconset, source);
+	        gtk_icon_source_free(source);
+	}
+        g_free(filename);
+	g_object_unref(pixbuf);
+
+       if (rtl) {
+		filename = g_build_filename(DATADIR, "pixmaps", "pidgin", dir, size, "rtl", file, NULL);
+ 		pixbuf = gdk_pixbuf_new_from_file(filename, NULL);
+		do_alphashift(pixbuf, pixbuf);
+		source = gtk_icon_source_new();
+                gtk_icon_source_set_pixbuf(source, pixbuf);
+                gtk_icon_source_set_direction(source, GTK_TEXT_DIR_RTL);
+                gtk_icon_source_set_size(source, sizeid);
+                gtk_icon_source_set_size_wildcarded(source, FALSE);
+                gtk_icon_source_set_state_wildcarded(source, TRUE);
+                gtk_icon_set_add_source(iconset, source);
+		g_free(filename);
+		g_object_unref(pixbuf);
+		gtk_icon_source_free(source);
+        }
+
+
+}
+
+
+void
+pidgin_stock_init(void)
+{
+	static gboolean stock_initted = FALSE;
+	GtkIconFactory *icon_factory;
+	size_t i;
+	GtkWidget *win;
+	GtkIconSize microscopic, extra_small, small, medium, large, huge;
+
+	if (stock_initted)
+		return;
+
+	stock_initted = TRUE;
+
+	/* Setup the icon factory. */
+	icon_factory = gtk_icon_factory_new();
+
+	gtk_icon_factory_add_default(icon_factory);
+
+	/* Er, yeah, a hack, but it works. :) */
+	win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+	gtk_widget_realize(win);
+
+	for (i = 0; i < G_N_ELEMENTS(stock_icons); i++)
+	{
+		GtkIconSource *source;
+		GtkIconSet *iconset;
+		gchar *filename;
+
+		if (stock_icons[i].dir == NULL)
+		{
+			/* GTK+ Stock icon */
+			iconset = gtk_style_lookup_icon_set(gtk_widget_get_style(win),
+					stock_icons[i].filename);
+		}
+		else
+		{
+			filename = find_file(stock_icons[i].dir, stock_icons[i].filename);
+
+			if (filename == NULL)
+				continue;
+
+			source = gtk_icon_source_new();
+			gtk_icon_source_set_filename(source, filename);
+			gtk_icon_source_set_direction_wildcarded(source, TRUE);
+			gtk_icon_source_set_size_wildcarded(source, TRUE);
+			gtk_icon_source_set_state_wildcarded(source, TRUE);
+
+
+			iconset = gtk_icon_set_new();
+			gtk_icon_set_add_source(iconset, source);
+
+			gtk_icon_source_free(source);
+			g_free(filename);
+		}
+
+		gtk_icon_factory_add(icon_factory, stock_icons[i].name, iconset);
+
+		gtk_icon_set_unref(iconset);
+	}
+
+	/* register custom icon sizes */
+
+	microscopic =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MICROSCOPIC, 11, 11);
+	extra_small =  gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL, 16, 16);
+	small =        gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_SMALL, 22, 22);
+	medium =       gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_MEDIUM, 32, 32);
+	large =        gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_LARGE, 48, 48);
+	huge =         gtk_icon_size_register(PIDGIN_ICON_SIZE_TANGO_HUGE, 64, 64);
+
+	for (i = 0; i < G_N_ELEMENTS(sized_stock_icons); i++)
+	{
+		GtkIconSet *iconset;
+
+		iconset = gtk_icon_set_new();
+
+#define ADD_SIZED_ICON(name, size) do { \
+		if (sized_stock_icons[i].name)  \
+			add_sized_icon(iconset, name,  \
+					sized_stock_icons[i].dir, sized_stock_icons[i].rtl, \
+					size, sized_stock_icons[i].filename); \
+		} while (0)
+		ADD_SIZED_ICON(microscopic, "11");
+		ADD_SIZED_ICON(extra_small, "16");
+		ADD_SIZED_ICON(small, "22");
+		ADD_SIZED_ICON(medium, "32");
+		ADD_SIZED_ICON(large, "48");
+		ADD_SIZED_ICON(huge, "64");
+#undef ADD_SIZED_ICON
+
+		gtk_icon_factory_add(icon_factory, sized_stock_icons[i].name, iconset);
+		gtk_icon_set_unref(iconset);
+
+		if (sized_stock_icons[i].translucent_name) {
+			iconset = gtk_icon_set_new();
+
+#define ADD_TRANS_ICON(name, size) do { \
+			if (sized_stock_icons[i].name) \
+				add_translucent_sized_icon(iconset, name, \
+						sized_stock_icons[i].dir, sized_stock_icons[i].rtl, \
+						size, sized_stock_icons[i].filename); \
+			} while (0)
+			ADD_TRANS_ICON(microscopic, "11");
+			ADD_TRANS_ICON(extra_small, "16");
+			ADD_TRANS_ICON(small, "22");
+			ADD_TRANS_ICON(medium, "32");
+			ADD_TRANS_ICON(large, "48");
+			ADD_TRANS_ICON(huge, "64");
+#undef ADD_TRANS_ICON
+
+			gtk_icon_factory_add(icon_factory, sized_stock_icons[i].translucent_name, iconset);
+			gtk_icon_set_unref(iconset);
+		}
+	}
+
+	gtk_widget_destroy(win);
+	g_object_unref(G_OBJECT(icon_factory));
+
+	/* Register the stock items. */
+	gtk_stock_add_static(stock_items, G_N_ELEMENTS(stock_items));
+}
diff --git a/pidgin/pixmaps/Makefile.am b/pidgin/pixmaps/Makefile.am
index 5d4cf54220..2acfe0ba07 100644
--- a/pidgin/pixmaps/Makefile.am
+++ b/pidgin/pixmaps/Makefile.am
@@ -1,11 +1,10 @@
 pidginpixmapdir = $(datadir)/pixmaps/pidgin
 pidginiconsdir = $(datadir)
 
-SUBDIRS = buddy_icons/qq emotes/default/24 emotes/none
+SUBDIRS = emotes/default/24 emotes/none
 
 if INSTALL_PIXMAPS
 MAKEFILE_MINGW = \
-		buddy_icons/qq/Makefile.mingw \
 		emotes/default/24/Makefile.mingw \
 		emotes/none/Makefile.mingw
 
@@ -551,6 +550,7 @@ nobase_dist_pidginpixmap_DATA = \
 		$(TOOLBAR_16) \
 		$(TOOLBAR_22) \
 		$(TRAY_16) \
+		$(TRAY_16_ICO) \
 		$(TRAY_22) \
 		$(TRAY_32) \
 		$(TRAY_48)
diff --git a/pidgin/pixmaps/Makefile.mingw b/pidgin/pixmaps/Makefile.mingw
index cecae8724b..158be05239 100644
--- a/pidgin/pixmaps/Makefile.mingw
+++ b/pidgin/pixmaps/Makefile.mingw
@@ -40,6 +40,7 @@ clean: ./Makefile.am.mingw
 		$(MAKE) -C $$subdir -f $(MINGW_MAKEFILE) clean;\
 		done; \
 	fi;
+	rm -f ./Makefile.am.mingw
 
 ./Makefile.am.mingw: ./Makefile.am
 	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
diff --git a/pidgin/pixmaps/buddy_icons/qq/Makefile.am b/pidgin/pixmaps/buddy_icons/qq/Makefile.am
deleted file mode 100644
index 714072b662..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/Makefile.am
+++ /dev/null
@@ -1,107 +0,0 @@
-EXTRA_DIST = \
-	qq_1.png \
-	qq_2.png \
-	qq_3.png \
-	qq_4.png \
-	qq_5.png \
-	qq_6.png \
-	qq_7.png \
-	qq_8.png \
-	qq_9.png \
-	qq_10.png \
-	qq_11.png \
-	qq_12.png \
-	qq_13.png \
-	qq_14.png \
-	qq_15.png \
-	qq_16.png \
-	qq_17.png \
-	qq_18.png \
-	qq_19.png \
-	qq_20.png \
-	qq_21.png \
-	qq_22.png \
-	qq_23.png \
-	qq_24.png \
-	qq_25.png \
-	qq_26.png \
-	qq_27.png \
-	qq_28.png \
-	qq_29.png \
-	qq_30.png \
-	qq_31.png \
-	qq_32.png \
-	qq_33.png \
-	qq_34.png \
-	qq_35.png \
-	qq_36.png \
-	qq_37.png \
-	qq_38.png \
-	qq_39.png \
-	qq_40.png \
-	qq_41.png \
-	qq_42.png \
-	qq_43.png \
-	qq_44.png \
-	qq_45.png \
-	qq_46.png \
-	qq_47.png \
-	qq_48.png \
-	qq_49.png \
-	qq_50.png \
-	qq_51.png \
-	qq_52.png \
-	qq_53.png \
-	qq_54.png \
-	qq_55.png \
-	qq_56.png \
-	qq_57.png \
-	qq_58.png \
-	qq_59.png \
-	qq_60.png \
-	qq_61.png \
-	qq_62.png \
-	qq_63.png \
-	qq_64.png \
-	qq_65.png \
-	qq_66.png \
-	qq_67.png \
-	qq_68.png \
-	qq_69.png \
-	qq_70.png \
-	qq_71.png \
-	qq_72.png \
-	qq_73.png \
-	qq_74.png \
-	qq_75.png \
-	qq_76.png \
-	qq_77.png \
-	qq_78.png \
-	qq_79.png \
-	qq_80.png \
-	qq_81.png \
-	qq_82.png \
-	qq_83.png \
-	qq_84.png \
-	qq_85.png \
-	qq_86.png \
-	qq_87.png \
-	qq_88.png \
-	qq_89.png \
-	qq_90.png \
-	qq_91.png \
-	qq_92.png \
-	qq_93.png \
-	qq_94.png \
-	qq_95.png \
-	qq_96.png \
-	qq_97.png \
-	qq_98.png \
-	qq_99.png \
-	qq_100.png
-
-if INSTALL_PIXMAPS
-qqbuddyiconspixdir = $(datadir)/pixmaps/purple/buddy_icons/qq
-
-qqbuddyiconspix_DATA = $(EXTRA_DIST)
-endif
diff --git a/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw b/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
deleted file mode 100644
index 3327cdfa4d..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/Makefile.mingw
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-## Makefile.mingw
-#
-## Description: Makefile for win32 (mingw) version of Pidgin QQ buddy icons
-#
-#
-
-PIDGIN_TREE_TOP = ../../../..
-include $(PIDGIN_TREE_TOP)/libpurple/win32/global.mak
-
-datadir = $(PIDGIN_INSTALL_DIR)
--include ./Makefile.am.mingw
-
-install: ./Makefile.am.mingw
-	if test '$(qqbuddyiconspix_DATA)'; then \
-	  mkdir -p $(qqbuddyiconspixdir); \
-	  cp $(qqbuddyiconspix_DATA) $(qqbuddyiconspixdir); \
-	fi;
-
-./Makefile.am.mingw: ./Makefile.am
-	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
-        include $@
-
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_1.png b/pidgin/pixmaps/buddy_icons/qq/qq_1.png
deleted file mode 100644
index 74d0b68477..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_1.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_10.png b/pidgin/pixmaps/buddy_icons/qq/qq_10.png
deleted file mode 100644
index d13c350c18..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_10.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_100.png b/pidgin/pixmaps/buddy_icons/qq/qq_100.png
deleted file mode 100644
index 5def02b293..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_100.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_11.png b/pidgin/pixmaps/buddy_icons/qq/qq_11.png
deleted file mode 100644
index 8d68673a94..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_11.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_12.png b/pidgin/pixmaps/buddy_icons/qq/qq_12.png
deleted file mode 100644
index e35b306760..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_12.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_13.png b/pidgin/pixmaps/buddy_icons/qq/qq_13.png
deleted file mode 100644
index a68159d8df..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_13.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_14.png b/pidgin/pixmaps/buddy_icons/qq/qq_14.png
deleted file mode 100644
index bdb07e845a..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_14.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_15.png b/pidgin/pixmaps/buddy_icons/qq/qq_15.png
deleted file mode 100644
index 78205604a5..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_15.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_16.png b/pidgin/pixmaps/buddy_icons/qq/qq_16.png
deleted file mode 100644
index 9a1890c4cf..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_16.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_17.png b/pidgin/pixmaps/buddy_icons/qq/qq_17.png
deleted file mode 100644
index 75415cfe0e..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_17.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_18.png b/pidgin/pixmaps/buddy_icons/qq/qq_18.png
deleted file mode 100644
index c21ca2eb4b..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_18.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_19.png b/pidgin/pixmaps/buddy_icons/qq/qq_19.png
deleted file mode 100644
index 4654ad5890..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_19.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_2.png b/pidgin/pixmaps/buddy_icons/qq/qq_2.png
deleted file mode 100644
index c576b371aa..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_2.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_20.png b/pidgin/pixmaps/buddy_icons/qq/qq_20.png
deleted file mode 100644
index 17dbad64d0..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_20.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_21.png b/pidgin/pixmaps/buddy_icons/qq/qq_21.png
deleted file mode 100644
index 81b4fedab1..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_21.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_22.png b/pidgin/pixmaps/buddy_icons/qq/qq_22.png
deleted file mode 100644
index e51db4cc49..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_22.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_23.png b/pidgin/pixmaps/buddy_icons/qq/qq_23.png
deleted file mode 100644
index be34b503ba..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_23.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_24.png b/pidgin/pixmaps/buddy_icons/qq/qq_24.png
deleted file mode 100644
index 3cc05f29d4..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_24.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_25.png b/pidgin/pixmaps/buddy_icons/qq/qq_25.png
deleted file mode 100644
index 603ead99bd..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_25.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_26.png b/pidgin/pixmaps/buddy_icons/qq/qq_26.png
deleted file mode 100644
index 074877a778..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_26.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_27.png b/pidgin/pixmaps/buddy_icons/qq/qq_27.png
deleted file mode 100644
index 91a0d9b210..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_27.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_28.png b/pidgin/pixmaps/buddy_icons/qq/qq_28.png
deleted file mode 100644
index 1394b0e934..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_28.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_29.png b/pidgin/pixmaps/buddy_icons/qq/qq_29.png
deleted file mode 100644
index 3633f51abc..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_29.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_3.png b/pidgin/pixmaps/buddy_icons/qq/qq_3.png
deleted file mode 100644
index 7eaafbac2a..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_3.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_30.png b/pidgin/pixmaps/buddy_icons/qq/qq_30.png
deleted file mode 100644
index 14221d0768..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_30.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_31.png b/pidgin/pixmaps/buddy_icons/qq/qq_31.png
deleted file mode 100644
index 2b3bf11050..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_31.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_32.png b/pidgin/pixmaps/buddy_icons/qq/qq_32.png
deleted file mode 100644
index 538ac4706f..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_32.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_33.png b/pidgin/pixmaps/buddy_icons/qq/qq_33.png
deleted file mode 100644
index 336b368378..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_33.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_34.png b/pidgin/pixmaps/buddy_icons/qq/qq_34.png
deleted file mode 100644
index d87b7c8df1..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_34.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_35.png b/pidgin/pixmaps/buddy_icons/qq/qq_35.png
deleted file mode 100644
index 4905204c8f..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_35.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_36.png b/pidgin/pixmaps/buddy_icons/qq/qq_36.png
deleted file mode 100644
index 1350fd6c57..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_36.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_37.png b/pidgin/pixmaps/buddy_icons/qq/qq_37.png
deleted file mode 100644
index 39361a8648..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_37.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_38.png b/pidgin/pixmaps/buddy_icons/qq/qq_38.png
deleted file mode 100644
index 26ee52ba73..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_38.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_39.png b/pidgin/pixmaps/buddy_icons/qq/qq_39.png
deleted file mode 100644
index 109486809a..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_39.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_4.png b/pidgin/pixmaps/buddy_icons/qq/qq_4.png
deleted file mode 100644
index be4b8b9bba..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_4.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_40.png b/pidgin/pixmaps/buddy_icons/qq/qq_40.png
deleted file mode 100644
index 21ce4abf6c..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_40.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_41.png b/pidgin/pixmaps/buddy_icons/qq/qq_41.png
deleted file mode 100644
index d0b9926b1e..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_41.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_42.png b/pidgin/pixmaps/buddy_icons/qq/qq_42.png
deleted file mode 100644
index 83a0e62173..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_42.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_43.png b/pidgin/pixmaps/buddy_icons/qq/qq_43.png
deleted file mode 100644
index 940c69c12f..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_43.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_44.png b/pidgin/pixmaps/buddy_icons/qq/qq_44.png
deleted file mode 100644
index 33f0c9918c..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_44.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_45.png b/pidgin/pixmaps/buddy_icons/qq/qq_45.png
deleted file mode 100644
index ea66c20898..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_45.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_46.png b/pidgin/pixmaps/buddy_icons/qq/qq_46.png
deleted file mode 100644
index 4ac37db20a..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_46.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_47.png b/pidgin/pixmaps/buddy_icons/qq/qq_47.png
deleted file mode 100644
index 19b5b756c0..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_47.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_48.png b/pidgin/pixmaps/buddy_icons/qq/qq_48.png
deleted file mode 100644
index 1827779a4a..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_48.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_49.png b/pidgin/pixmaps/buddy_icons/qq/qq_49.png
deleted file mode 100644
index 516427db97..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_49.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_5.png b/pidgin/pixmaps/buddy_icons/qq/qq_5.png
deleted file mode 100644
index 31a42e2a76..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_5.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_50.png b/pidgin/pixmaps/buddy_icons/qq/qq_50.png
deleted file mode 100644
index fe7f0a12c2..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_50.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_51.png b/pidgin/pixmaps/buddy_icons/qq/qq_51.png
deleted file mode 100644
index 565eda4d07..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_51.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_52.png b/pidgin/pixmaps/buddy_icons/qq/qq_52.png
deleted file mode 100644
index 8ae009e49e..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_52.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_53.png b/pidgin/pixmaps/buddy_icons/qq/qq_53.png
deleted file mode 100644
index 653a3dd1a7..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_53.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_54.png b/pidgin/pixmaps/buddy_icons/qq/qq_54.png
deleted file mode 100644
index 9ac58f82e8..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_54.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_55.png b/pidgin/pixmaps/buddy_icons/qq/qq_55.png
deleted file mode 100644
index c4aafd99bb..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_55.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_56.png b/pidgin/pixmaps/buddy_icons/qq/qq_56.png
deleted file mode 100644
index 67a87b8acf..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_56.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_57.png b/pidgin/pixmaps/buddy_icons/qq/qq_57.png
deleted file mode 100644
index 65b4eb9b22..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_57.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_58.png b/pidgin/pixmaps/buddy_icons/qq/qq_58.png
deleted file mode 100644
index e263eec036..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_58.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_59.png b/pidgin/pixmaps/buddy_icons/qq/qq_59.png
deleted file mode 100644
index dd68c0d435..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_59.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_6.png b/pidgin/pixmaps/buddy_icons/qq/qq_6.png
deleted file mode 100644
index 3026360a91..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_6.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_60.png b/pidgin/pixmaps/buddy_icons/qq/qq_60.png
deleted file mode 100644
index f8a668d6ed..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_60.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_61.png b/pidgin/pixmaps/buddy_icons/qq/qq_61.png
deleted file mode 100644
index 4ece88a2d4..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_61.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_62.png b/pidgin/pixmaps/buddy_icons/qq/qq_62.png
deleted file mode 100644
index b6edcc1138..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_62.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_63.png b/pidgin/pixmaps/buddy_icons/qq/qq_63.png
deleted file mode 100644
index 9c7b7389a2..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_63.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_64.png b/pidgin/pixmaps/buddy_icons/qq/qq_64.png
deleted file mode 100644
index d87d4785ef..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_64.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_65.png b/pidgin/pixmaps/buddy_icons/qq/qq_65.png
deleted file mode 100644
index 8300028378..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_65.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_66.png b/pidgin/pixmaps/buddy_icons/qq/qq_66.png
deleted file mode 100644
index 39c6e91a42..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_66.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_67.png b/pidgin/pixmaps/buddy_icons/qq/qq_67.png
deleted file mode 100644
index 687ffd2838..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_67.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_68.png b/pidgin/pixmaps/buddy_icons/qq/qq_68.png
deleted file mode 100644
index fd56e74cc7..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_68.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_69.png b/pidgin/pixmaps/buddy_icons/qq/qq_69.png
deleted file mode 100644
index f0fc53c468..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_69.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_7.png b/pidgin/pixmaps/buddy_icons/qq/qq_7.png
deleted file mode 100644
index b5fb783030..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_7.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_70.png b/pidgin/pixmaps/buddy_icons/qq/qq_70.png
deleted file mode 100644
index 4dd2e45bd2..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_70.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_71.png b/pidgin/pixmaps/buddy_icons/qq/qq_71.png
deleted file mode 100644
index 2c973c996e..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_71.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_72.png b/pidgin/pixmaps/buddy_icons/qq/qq_72.png
deleted file mode 100644
index e9a4e9f655..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_72.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_73.png b/pidgin/pixmaps/buddy_icons/qq/qq_73.png
deleted file mode 100644
index f258a407a9..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_73.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_74.png b/pidgin/pixmaps/buddy_icons/qq/qq_74.png
deleted file mode 100644
index 2e818001fa..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_74.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_75.png b/pidgin/pixmaps/buddy_icons/qq/qq_75.png
deleted file mode 100644
index 27213e33f7..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_75.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_76.png b/pidgin/pixmaps/buddy_icons/qq/qq_76.png
deleted file mode 100644
index 7aca88e08d..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_76.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_77.png b/pidgin/pixmaps/buddy_icons/qq/qq_77.png
deleted file mode 100644
index 4fa44dc3d0..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_77.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_78.png b/pidgin/pixmaps/buddy_icons/qq/qq_78.png
deleted file mode 100644
index bc9d4ead8f..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_78.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_79.png b/pidgin/pixmaps/buddy_icons/qq/qq_79.png
deleted file mode 100644
index e67b8ca8a9..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_79.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_8.png b/pidgin/pixmaps/buddy_icons/qq/qq_8.png
deleted file mode 100644
index 64c13b6dea..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_8.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_80.png b/pidgin/pixmaps/buddy_icons/qq/qq_80.png
deleted file mode 100644
index ab20c3c5f0..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_80.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_81.png b/pidgin/pixmaps/buddy_icons/qq/qq_81.png
deleted file mode 100644
index 38ee0aa64d..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_81.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_82.png b/pidgin/pixmaps/buddy_icons/qq/qq_82.png
deleted file mode 100644
index ce3faf52fd..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_82.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_83.png b/pidgin/pixmaps/buddy_icons/qq/qq_83.png
deleted file mode 100644
index d8d2ecf9c1..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_83.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_84.png b/pidgin/pixmaps/buddy_icons/qq/qq_84.png
deleted file mode 100644
index a0f6961ab4..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_84.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_85.png b/pidgin/pixmaps/buddy_icons/qq/qq_85.png
deleted file mode 100644
index 0494ca3562..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_85.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_86.png b/pidgin/pixmaps/buddy_icons/qq/qq_86.png
deleted file mode 100644
index 5c4004387e..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_86.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_87.png b/pidgin/pixmaps/buddy_icons/qq/qq_87.png
deleted file mode 100644
index c62d3ca0d5..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_87.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_88.png b/pidgin/pixmaps/buddy_icons/qq/qq_88.png
deleted file mode 100644
index 35839619ab..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_88.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_89.png b/pidgin/pixmaps/buddy_icons/qq/qq_89.png
deleted file mode 100644
index cb27540ea3..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_89.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_9.png b/pidgin/pixmaps/buddy_icons/qq/qq_9.png
deleted file mode 100644
index a85648742d..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_9.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_90.png b/pidgin/pixmaps/buddy_icons/qq/qq_90.png
deleted file mode 100644
index bee9955a24..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_90.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_91.png b/pidgin/pixmaps/buddy_icons/qq/qq_91.png
deleted file mode 100644
index 7c5ca4c7b3..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_91.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_92.png b/pidgin/pixmaps/buddy_icons/qq/qq_92.png
deleted file mode 100644
index c45977ab68..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_92.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_93.png b/pidgin/pixmaps/buddy_icons/qq/qq_93.png
deleted file mode 100644
index 578148f9ac..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_93.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_94.png b/pidgin/pixmaps/buddy_icons/qq/qq_94.png
deleted file mode 100644
index e7b1394c4b..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_94.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_95.png b/pidgin/pixmaps/buddy_icons/qq/qq_95.png
deleted file mode 100644
index 70b7ae65bf..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_95.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_96.png b/pidgin/pixmaps/buddy_icons/qq/qq_96.png
deleted file mode 100644
index 2268619548..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_96.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_97.png b/pidgin/pixmaps/buddy_icons/qq/qq_97.png
deleted file mode 100644
index 68979d94bf..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_97.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_98.png b/pidgin/pixmaps/buddy_icons/qq/qq_98.png
deleted file mode 100644
index 5d280cf982..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_98.png
+++ /dev/null
diff --git a/pidgin/pixmaps/buddy_icons/qq/qq_99.png b/pidgin/pixmaps/buddy_icons/qq/qq_99.png
deleted file mode 100644
index e2ad6890b4..0000000000
--- a/pidgin/pixmaps/buddy_icons/qq/qq_99.png
+++ /dev/null
diff --git a/pidgin/pixmaps/emotes/default/24/Makefile.mingw b/pidgin/pixmaps/emotes/default/24/Makefile.mingw
index f01b414267..c028cfef7a 100644
--- a/pidgin/pixmaps/emotes/default/24/Makefile.mingw
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.mingw
@@ -19,7 +19,7 @@ install: ./Makefile.am.mingw theme
 	fi;
 
 clean:
-	rm -f theme
+	rm -f theme ./Makefile.am.mingw
 
 ./Makefile.am.mingw: ./Makefile.am
 	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
diff --git a/pidgin/pixmaps/emotes/none/Makefile.mingw b/pidgin/pixmaps/emotes/none/Makefile.mingw
index 4fa27f2b3b..bcc6d5dfe4 100644
--- a/pidgin/pixmaps/emotes/none/Makefile.mingw
+++ b/pidgin/pixmaps/emotes/none/Makefile.mingw
@@ -19,7 +19,7 @@ install: ./Makefile.am.mingw theme
 	fi;
 
 clean:
-	rm -f theme
+	rm -f theme ./Makefile.am.mingw
 
 ./Makefile.am.mingw: ./Makefile.am
 	sed -e 's/^if\ INSTALL_PIXMAPS/ifeq (\$$(INSTALL_PIXMAPS), 1)/' ./Makefile.am > $@
diff --git a/pidgin/plugins/Makefile.am b/pidgin/plugins/Makefile.am
index 5f8147dec7..a8b21cb887 100644
--- a/pidgin/plugins/Makefile.am
+++ b/pidgin/plugins/Makefile.am
@@ -133,7 +133,7 @@ AM_CPPFLAGS = \
 #
 SUFFIXES = .c .so
 .c.so:
-	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_srcdir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
+	$(LIBTOOL) --mode=compile $(CC) -DHAVE_CONFIG_H -I$(top_builddir) $(AM_CPPFLAGS) $(CFLAGS) -c $< -o tmp$@.lo $(PLUGIN_CFLAGS)
 	$(LIBTOOL) --mode=link    $(CC) $(CFLAGS) -o libtmp$@.la -rpath $(plugindir) tmp$@.lo $(LIBS) $(LDFLAGS) -module -avoid-version $(PLUGIN_LIBS)
 	@rm -f tmp$@.lo tmp$@.o libtmp$@.la
 	@cp .libs/libtmp$@.so* $@
diff --git a/pidgin/plugins/Makefile.mingw b/pidgin/plugins/Makefile.mingw
index 478d73e5e7..bad7c0bef3 100644
--- a/pidgin/plugins/Makefile.mingw
+++ b/pidgin/plugins/Makefile.mingw
@@ -87,7 +87,8 @@ plugins: \
 		sendbutton.dll \
 		spellchk.dll \
 		timestamp_format.dll \
-		timestamp.dll
+		timestamp.dll \
+		xmppconsole.dll
 
 ##
 ## CLEAN RULES
diff --git a/pidgin/plugins/pidginrc.c b/pidgin/plugins/pidginrc.c
index 655afb7bb8..7fbaf17bb5 100644
--- a/pidgin/plugins/pidginrc.c
+++ b/pidgin/plugins/pidginrc.c
@@ -31,6 +31,7 @@ static const gchar *color_prefs[] = {
 	"/plugins/gtk/purplerc/color/GtkWidget::cursor-color",
 	"/plugins/gtk/purplerc/color/GtkWidget::secondary-cursor-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::hyperlink-color",
+	"/plugins/gtk/purplerc/color/GtkIMHtml::hyperlink-visited-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::send-name-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::receive-name-color",
 	"/plugins/gtk/purplerc/color/GtkIMHtml::highlight-name-color",
@@ -40,6 +41,7 @@ static const gchar *color_prefs_set[] = {
 	"/plugins/gtk/purplerc/set/color/GtkWidget::cursor-color",
 	"/plugins/gtk/purplerc/set/color/GtkWidget::secondary-cursor-color",
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::hyperlink-color",
+	"/plugins/gtk/purplerc/set/color/GtkIMHtml::hyperlink-visited-color",
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::send-name-color",
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::receive-name-color",
 	"/plugins/gtk/purplerc/set/color/GtkIMHtml::highlight-name-color",
@@ -49,6 +51,7 @@ static const gchar *color_names[] = {
 	N_("Cursor Color"),
 	N_("Secondary Cursor Color"),
 	N_("Hyperlink Color"),
+	N_("Visited Hyperlink Color"),
 	N_("Sent Message Name Color"),
 	N_("Received Message Name Color"),
 	N_("Highlighted Message Name Color"),
diff --git a/pidgin/plugins/relnot.c b/pidgin/plugins/relnot.c
index 7ec4798c92..13b63b665e 100644
--- a/pidgin/plugins/relnot.c
+++ b/pidgin/plugins/relnot.c
@@ -33,6 +33,7 @@
 
 #include "connection.h"
 #include "core.h"
+#include "debug.h"
 #include "notify.h"
 #include "prefs.h"
 #include "util.h"
@@ -45,14 +46,39 @@
 
 static void
 version_fetch_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
-		const gchar *changelog, size_t len, const gchar *error_message)
+		const gchar *response, size_t len, const gchar *error_message)
 {
-	char *cur_ver, *formatted;
+	gchar *cur_ver, *formatted;
+	const char *tmp, *changelog;
+	char response_code[4];
+
 	GString *message;
-	int i=0;
+	int i = 0;
+
+	if(error_message || !response || !len)
+		return;
+
+	memset(response_code, '\0', sizeof(response_code));
+	/* Parse the status code - the response should be in the form of "HTTP/?.? 200 ..." */
+	if ((tmp = strstr(response, " ")) != NULL) {
+		tmp++;
+		/* Read the 3 digit status code */
+		if (len - (tmp - response) > 3) {
+			memcpy(response_code, tmp, 3);
+		}
+	}
+
+	if (strcmp(response_code, "200") != 0) {
+		purple_debug_error("relnot", "Didn't recieve a HTTP status code of 200.\n");
+		return;
+	}
 
-	if(error_message || !changelog || !len)
+	/* Go to the start of the data */
+	if((changelog = strstr(response, "\r\n\r\n")) == NULL) {
+		purple_debug_error("relnot", "Unable to find start of HTTP response data.\n");
 		return;
+	}
+	changelog += 4;
 
 	while(changelog[i] && changelog[i] != '\n') i++;
 
@@ -94,16 +120,35 @@ do_check(void)
 {
 	int last_check = purple_prefs_get_int("/plugins/gtk/relnot/last_check");
 	if(!last_check || time(NULL) - last_check > MIN_CHECK_INTERVAL) {
-		char *url = g_strdup_printf("http://pidgin.im/version.php?version=%s&build=%s", purple_core_get_version(),
+		gchar *url, *request;
+		const char *host = "pidgin.im";
+		
+		url = g_strdup_printf("http://%s/version.php?version=%s&build=%s",
+				host,
+				purple_core_get_version(),
 #ifdef _WIN32
 				"purple-win32"
 #else
 				"purple"
 #endif
 		);
-		purple_util_fetch_url(url, TRUE, NULL, FALSE, version_fetch_cb, NULL);
-		purple_prefs_set_int("/plugins/gtk/relnot/last_check", time(NULL));
+
+		request = g_strdup_printf(
+				"GET %s HTTP/1.0\r\n"
+				"Connection: close\r\n"
+				"Accept: */*\r\n"
+				"Host: %s\r\n\r\n",
+				url,
+				host);
+
+		purple_util_fetch_url_request_len(url, TRUE, NULL, FALSE,
+			request, TRUE, -1, version_fetch_cb, NULL);
+
+		g_free(request);
 		g_free(url);
+
+		purple_prefs_set_int("/plugins/gtk/relnot/last_check", time(NULL));
+
 	}
 }
 
diff --git a/pidgin/win32/nsis/pidgin-installer.nsi b/pidgin/win32/nsis/pidgin-installer.nsi
index c219a33ca8..895fc409d9 100644
--- a/pidgin/win32/nsis/pidgin-installer.nsi
+++ b/pidgin/win32/nsis/pidgin-installer.nsi
@@ -716,6 +716,7 @@ Section Uninstall
     Delete "$INSTDIR\ca-certs\Microsoft_Secure_Server_Authority.pem"
     Delete "$INSTDIR\ca-certs\StartCom_Free_SSL_CA.pem"
     Delete "$INSTDIR\ca-certs\Verisign_Class3_Primary_CA.pem"
+    Delete "$INSTDIR\ca-certs\VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem"
     Delete "$INSTDIR\ca-certs\Verisign_RSA_Secure_Server_CA.pem"
     RMDir "$INSTDIR\ca-certs"
     RMDir /r "$INSTDIR\locale"
@@ -766,6 +767,7 @@ Section Uninstall
     Delete "$INSTDIR\plugins\timestamp_format.dll"
     Delete "$INSTDIR\plugins\win2ktrans.dll"
     Delete "$INSTDIR\plugins\winprefs.dll"
+    Delete "$INSTDIR\plugins\xmppconsole.dll"
     RMDir "$INSTDIR\plugins"
     RMDir /r "$INSTDIR\sasl2"
     Delete "$INSTDIR\sounds\purple\alert.wav"
@@ -775,12 +777,8 @@ Section Uninstall
     Delete "$INSTDIR\sounds\purple\send.wav"
     RMDir "$INSTDIR\sounds\purple"
     RMDir "$INSTDIR\sounds"
-    Delete "$INSTDIR\comerr32.dll"
     Delete "$INSTDIR\freebl3.dll"
-    Delete "$INSTDIR\gssapi32.dll"
     Delete "$INSTDIR\idletrack.dll"
-    Delete "$INSTDIR\k5sprt32.dll"
-    Delete "$INSTDIR\krb5_32.dll"
     Delete "$INSTDIR\libgtkspell.dll"
     Delete "$INSTDIR\libjabber.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"
@@ -1418,13 +1416,17 @@ Function preWelcomePage
   Push $R1
   Push $R2
 
-  ; Make the GTK+ Section RO if it is required.
   Call DoWeNeedGtk
   Pop $R0
   Pop $R2
-  IntCmp $R0 1 gtk_not_mandatory gtk_not_mandatory
+  IntCmp $R0 1 gtk_selection_done gtk_not_mandatory
+    ; Make the GTK+ Section RO if it is required.
     !insertmacro SetSectionFlag ${SecGtk} ${SF_RO}
+    Goto gtk_selection_done
   gtk_not_mandatory:
+    ; Don't select the GTK+ section if we already have this version or newer installed
+    !insertmacro UnselectSection ${SecGtk}
+  gtk_selection_done:
 
   ; If on Win95/98/ME warn them that the GTK+ version wont work
   ${Unless} ${IsNT}
diff --git a/po/ChangeLog b/po/ChangeLog
index 944bcd0707..1ef509a8ba 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,18 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.5.1
+	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
+	* Chinese (Traditional) translation updated (Ambrose C. Li)
+	* Czech translation updated (David Vachulka)
+	* Dutch translation updated (Daniël Heres)
+	* Galician translation updated (Frco. Javier Rial Rodríguez)
+	* Hebrew translation updated (Shalom Craimer)
+	* Italian translation updated (Claudio Satriano)
+	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
+	* Portuguese (Brazilian) translation updated (Rodrigo Luiz
+	  Marques Flores)
+	* Spanish translation updated (Javier Fernández-Sanguino)
+
 version 2.5.0
 	* Albanian translation updated (Besnik Bleta)
 	* Chinese (Hong Kong) translation updated (Ambrose C. Li)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7a33a0faec..e711b72934 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -100,6 +100,7 @@ libpurple/protocols/jabber/xdata.c
 libpurple/protocols/msn/contact.c
 libpurple/protocols/msn/dialog.c
 libpurple/protocols/msn/error.c
+libpurple/protocols/msn/group.h
 libpurple/protocols/msn/msn.c
 libpurple/protocols/msn/nexus.c
 libpurple/protocols/msn/notification.c
@@ -216,6 +217,7 @@ pidgin/gtkutils.c
 pidgin/gtkwhiteboard.c
 pidgin/pidgin.h
 pidgin/pidgincombobox.c
+pidgin/pidginstock-artwork.c
 pidgin/pidginstock.c
 pidgin/pidgintooltip.c
 pidgin/pixmaps/emotes/default/24/default.theme.in
diff --git a/po/cs.po b/po/cs.po
index df9e621290..e40d0e46fe 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pidgin VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 11:56-0400\n"
-"PO-Revision-Date: 2008-08-11 21:00+0100\n"
+"POT-Creation-Date: 2008-08-29 13:35-0400\n"
+"PO-Revision-Date: 2008-08-26 20:31+0100\n"
 "Last-Translator: David Vachulka <david@konstrukce-cad.com>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -2375,6 +2375,9 @@ msgstr "Minimální velikost místnosti"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Čas pro ne aktivitu uživatele (v minutách)"
 
+msgid "Apply hiding rules to buddies"
+msgstr "Aplikovat pravidlo skrývání na kamarády"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7495,17 +7498,20 @@ msgid ""
 "Room id %d, reply [0x%02X]: \n"
 "%s"
 msgstr ""
+"Odpověď %s(0x%02X )\n"
+"Posláno %s(0x%02X )\n"
+"Id místnosti %d, odpověď [0x%02X]: \n"
+"%s"
 
-#, fuzzy
 msgid "Failed room reply"
-msgstr "Přihlášení selhalo, žádná odpověď"
+msgstr "Odpověď místnosti selhala"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You are not a member of group \"%s\"\n"
-msgstr "Vy [%d] jste byli přidáno do skupiny \"%d\""
+msgstr "Nejste členem skupiny \"%s\"\n"
 
 msgid "Can not decrypt login reply"
-msgstr ""
+msgstr "Nemohu dešifrovat přihlašovací odpověď"
 
 #, c-format
 msgid "Invalid token reply code, 0x%02X"
@@ -10138,7 +10144,7 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Vítá vás %s!</span>\n"
 "\n"
@@ -10148,7 +10154,7 @@ msgstr ""
 "<b>Přidat</b>.\n"
 "\n"
 "Můžete se do tohoto okna vrátit a přidávat, upravovat nebo odstraňovat účty "
-"přes <b>Účty->Přidat/Upravit</b> v okně seznamu kamarádů."
+"přes <b>Účty->Spravovat</b> v okně seznamu kamarádů."
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -12531,6 +12537,12 @@ msgstr "Stav pro %s"
 msgid "Custom Smiley"
 msgstr "Uživatelský smajlík"
 
+msgid "More Data needed"
+msgstr "Je potřeba více dat"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Nastavte klávesovou zkratku asociovanou se smajlíkem."
+
 msgid "Duplicate Shortcut"
 msgstr "Duplikovat klávesovou zkratku"
 
@@ -12541,12 +12553,6 @@ msgstr ""
 "Už existuje uživatelský smajlík pro vybranou klávesovou zkratku. "
 "Specifikujte jinou."
 
-msgid "More Data needed"
-msgstr "Je potřeba více dat"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Nastavte klávesovou zkratku asociovanou se smajlíkem."
-
 msgid "Please select an image for the smiley."
 msgstr "Prosím vyberte obrázek pro smajlík."
 
@@ -12707,6 +12713,9 @@ msgstr "Z_měnit"
 msgid "_Open Mail"
 msgstr "_Otevřít poštu"
 
+msgid "_Edit"
+msgstr "_Upravit"
+
 msgid "Pidgin Tooltip"
 msgstr "Pidgin tipy"
 
diff --git a/po/de.po b/po/de.po
index 3b339f3199..8decb6c1fb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -11,14 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-26 22:39+0200\n"
-"PO-Revision-Date: 2008-08-26 22:32+0200\n"
-"Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n"
+"POT-Creation-Date: 2008-09-26 18:20+0200\n"
+"PO-Revision-Date: 2008-09-26 18:18+0200\n"
+"Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
@@ -75,7 +76,7 @@ msgstr "Benachrichtigung über neue Mails"
 msgid "Remember password"
 msgstr "Passwort speichern"
 
-msgid "There's no protocol plugins installed."
+msgid "There are no protocol plugins installed."
 msgstr "Es sind keine Protokoll-Plugins installiert."
 
 msgid "(You probably forgot to 'make install'.)"
@@ -1517,6 +1518,12 @@ msgstr "Meebo"
 msgid "No Grouping"
 msgstr "Keine Gruppierung"
 
+msgid "Nested Subgroup"
+msgstr ""
+
+msgid "Nested Grouping (experimental)"
+msgstr ""
+
 msgid "Provides alternate buddylist grouping options."
 msgstr "Bietet alternative Einstellungen für die Kontaktlisten-Gruppierung."
 
@@ -1832,8 +1839,8 @@ msgstr ""
 "Fehler beim Lesen vom Auflösungsprozess:\n"
 "%s"
 
-msgid "EOF while reading from resolver process"
-msgstr "EOF während vom Resolver-Prozess gelesen wurde"
+msgid "Resolver process exited without answering our request"
+msgstr "Auflösungsprozess hat sich beendet ohne die Anfrage zu beantworten"
 
 #, c-format
 msgid "Thread creation failure: %s"
@@ -4547,6 +4554,11 @@ msgstr "Verbindungsserver"
 msgid "File transfer proxies"
 msgstr "Proxys für Dateiübertragungen"
 
+#. this should probably be part of global smiley theme settings later on,
+#. shared with MSN
+msgid "Show Custom Smileys"
+msgstr "Zeige benutzerdefinierte Smileys"
+
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s hat das Gespräch verlassen."
@@ -4848,6 +4860,9 @@ msgstr "Kinder-Passwort ohne die Zustimmung der Eltern"
 msgid "Passport account not yet verified"
 msgstr "Passport-Konto wurde noch nicht überprüft"
 
+msgid "Passport account suspended"
+msgstr "Passport-Konto gesperrt"
+
 msgid "Bad ticket"
 msgstr "Falsches Ticket"
 
@@ -4859,6 +4874,12 @@ msgstr "Unbekannter Fehlercode %d"
 msgid "MSN Error: %s\n"
 msgstr "MSN-Fehler: %s\n"
 
+msgid "Other Contacts"
+msgstr "Andere Kontakte"
+
+msgid "Non-IM Contacts"
+msgstr "Nicht-IM-Kontakte"
+
 msgid "Nudge"
 msgstr "Anstoßen"
 
@@ -4929,6 +4950,9 @@ msgstr "Eine SMS senden."
 msgid "Page"
 msgstr "Nachricht"
 
+msgid "Has you"
+msgstr "Hat Sie"
+
 msgid "Home Phone Number"
 msgstr "Private Telefonnummer"
 
@@ -5211,6 +5235,9 @@ msgstr "Unbekannter Fehler (%d)"
 msgid "Unable to add user"
 msgstr "Kann den Benutzer nicht hinzufügen"
 
+msgid "The following users are missing from your addressbook"
+msgstr "Die folgenden Benutzer fehlen in Ihrem Adressbuch"
+
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Kann den Benutzer nicht zu %s (%s) hinzufügen"
@@ -5427,9 +5454,6 @@ msgstr "Der angegebene Benutzername ist ungültig."
 msgid "This Hotmail account may not be active."
 msgstr "Dieses Hotmail-Konto ist vielleicht nicht aktiv."
 
-msgid "Has you"
-msgstr "Hat Sie"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6120,6 +6144,9 @@ msgstr "Ungültige Daten in der Verbindung mit dem Server empfangen."
 msgid "AIM Protocol Plugin"
 msgstr "AIM-Protokoll-Plugin"
 
+msgid "ICQ UIN..."
+msgstr "ICQ-UIN..."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6460,7 +6487,6 @@ msgstr ""
 msgid "Unable to get a valid login hash."
 msgstr "Konnte keinen gültigen Login-Hash bekommen."
 
-#. allow multple logins?
 msgid "Password sent"
 msgstr "Passwort gesendet"
 
@@ -7164,14 +7190,23 @@ msgstr "Schwein"
 msgid "Other"
 msgstr "Andere"
 
-msgid "Modify my information"
-msgstr "Meine Informationen bearbeiten"
+msgid "Modify information"
+msgstr "Informationen bearbeiten"
 
-msgid "Update my information"
-msgstr "Meine Informationen aktualisieren"
+msgid "Update information"
+msgstr "Informationen aktualisieren"
 
-msgid "Your information has been updated"
-msgstr "Ihre Informationen wurden aktualisiert"
+#. TODO: We don't really need to notify the user about this, do we?
+#. TODO: Does the user really need to be notified about this?
+msgid "QQ Buddy"
+msgstr "QQ-Buddy"
+
+#, fuzzy
+msgid "Successed:"
+msgstr "Geschwindigkeit:"
+
+msgid "Change buddy information."
+msgstr "Buddy-Informationen bearbeiten"
 
 #, c-format
 msgid ""
@@ -7189,30 +7224,29 @@ msgstr "Ungültiges QQ-Gesicht"
 msgid "You rejected %d's request"
 msgstr "Sie haben die Anfrage von %d abgelehnt"
 
-msgid "Input your reason:"
-msgstr "Geben Sie Ihren Grund an:"
-
 msgid "Reject request"
 msgstr "Anfrage ablehnen"
 
 #. title
-msgid "Sorry, you are not my type..."
+msgid "Sorry, you are not my style..."
 msgstr "Tut mir Leid, du bist nicht mein Typ..."
 
 msgid "Add buddy with auth request failed"
 msgstr "Benutzer hinzufügen, wenn Autorisierungsanfrage fehlschlug"
 
-#. TODO: We don't really need to notify the user about this, do we?
-msgid "You have successfully removed a buddy"
-msgstr "Sie haben einen Buddy entfernt"
+msgid "Failed:"
+msgstr "Gescheitert:"
 
-#. TODO: Does the user really need to be notified about this?
-msgid "You have successfully removed yourself from your friend's buddy list"
-msgstr "Sie haben sich erfolgreich von der Kontaktliste Ihres Freunds entfernt"
+msgid "Remove buddy"
+msgstr "Buddy entfernen"
+
+#, fuzzy
+msgid "Remove from other's buddy list"
+msgstr "Von seiner/ihrer Buddy-Liste entfernen"
 
 #, c-format
-msgid "User %d needs authentication"
-msgstr "Benutzer %d benötigt Authentifizierung"
+msgid "%d needs authentication"
+msgstr "%d benötigt Authentifizierung"
 
 msgid "Input request here"
 msgstr "Anfrage hier eingeben"
@@ -7228,14 +7262,14 @@ msgid "Send"
 msgstr "Senden"
 
 #, c-format
-msgid "You have added %d to buddy list"
-msgstr "Sie haben %d zu Ihrer Buddy-Liste hinzugefügt"
+msgid "Add into %d's buddy list"
+msgstr "Zu %ds Buddy-Liste hinzufügen"
 
-msgid "QQid Error"
-msgstr "QQid-Fehler"
+msgid "QQ Number Error"
+msgstr "Fehler in QQ-Nummer"
 
-msgid "Invalid QQid"
-msgstr "Ungültige QQid"
+msgid "Invalid QQ Number"
+msgstr "Ungültige QQ-Nummer"
 
 msgid "ID: "
 msgstr "ID: "
@@ -7255,19 +7289,19 @@ msgstr "Autorisieren"
 msgid "QQ Qun"
 msgstr "QQ-Qun"
 
-msgid "Please enter external group ID"
-msgstr "Bitte geben Sie die externe Gruppen-ID an"
+msgid "Please enter Qun number"
+msgstr "Bitte geben Sie die Qun-Nummer ein"
 
-msgid "You can only search for permanent QQ groups\n"
-msgstr "Sie können nur nach permanenten QQ-Gruppen suchen\n"
+msgid "You can only search for permanent Qun\n"
+msgstr "Sie können nur nach permanenten Qun suchen\n"
 
 #, c-format
-msgid "User %d requested to join group %d"
-msgstr "Benutzer %d möchte der Gruppe %d beitreten"
+msgid "%d request to join Qun %d"
+msgstr "%d möchte dem Qun %d beitreten"
 
 #, c-format
-msgid "Reason: %s"
-msgstr "Grund: %s"
+msgid "Message: %s"
+msgstr "Nachricht: %s"
 
 msgid "QQ Qun Operation"
 msgstr "QQ-Qun-Operation"
@@ -7275,24 +7309,24 @@ msgstr "QQ-Qun-Operation"
 msgid "Approve"
 msgstr "Akzeptieren"
 
-#, c-format
-msgid "Your request to join group %d has been rejected by admin %d"
+#, fuzzy, c-format
+msgid "Failed to join Qun %d, operated by admin %d"
+msgstr "Dem Qun %d, moderiert von admin %d, konnte nicht beigetreten werden"
+
+#, fuzzy, c-format
+msgid "Successed to join Qun %d, operated by admin %d"
 msgstr "Ihre Anfrage, der Gruppe %d beizutreten wurde von Admin %d abgelehnt"
 
 #, c-format
-msgid "Your request to join group %d has been approved by admin %d"
-msgstr "Ihre Anfrage, der Gruppe %d beizutreten wurde von Admin %d akzeptiert"
+msgid "[%d] removed from Qun \"%d\""
+msgstr "[%d] vom Qun „%d“ entfernt"
 
-#, c-format
-msgid "You [%d] have left group \"%d\""
-msgstr "Sie [%d] haben die Gruppe „%d“ verlassen"
+msgid "Notice:"
+msgstr "Bemerkung:"
 
 #, c-format
-msgid "You [%d] have been added to group \"%d\""
-msgstr "Sie [%d] wurden der Gruppe „%d“ hinzugefügt"
-
-msgid "This group has been added to your buddy list"
-msgstr "Diese Gruppe wurde Ihrer Buddy-Liste hinzugefügt"
+msgid "[%d] added to Qun \"%d\""
+msgstr "[%d] zum Qun „%d“ hinzugefügt"
 
 msgid "I am not a member"
 msgstr "Ich bin kein Mitglied"
@@ -7300,8 +7334,9 @@ msgstr "Ich bin kein Mitglied"
 msgid "I am a member"
 msgstr "Ich bin Mitglied"
 
-msgid "I am applying to join"
-msgstr "Ich möchte beitreten"
+#, fuzzy
+msgid "I am requesting"
+msgstr "Ich frage an"
 
 msgid "I am the admin"
 msgstr "Ich bin der Admin"
@@ -7309,17 +7344,22 @@ msgstr "Ich bin der Admin"
 msgid "Unknown status"
 msgstr "Unbekannter Status"
 
-msgid "This group does not allow others to join"
-msgstr "Dieser Gruppe können andere nicht beitreten"
+msgid "The Qun does not allow others to join"
+msgstr "Diesen Qun können andere nicht beitreten"
 
-msgid "You have successfully left the group"
-msgstr "Sie haben die Gruppe erfolgreich verlassen"
+msgid "Remove from Qun"
+msgstr "vom Qun entfernen"
 
-msgid "QQ Group Auth"
-msgstr "QQ-Gruppenauthentifikation"
+#, fuzzy
+msgid "Join to Qun"
+msgstr "Chat betreten"
 
-msgid "Your authorization request has been accepted by the QQ server"
-msgstr "Ihre Autorisierungsanfrage wurde vom QQ-Server akzeptiert"
+#, c-format
+msgid "Qun %d denied to join"
+msgstr ""
+
+msgid "Join Qun, Unknow Reply"
+msgstr ""
 
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Sie haben eine Gruppen-ID außerhalb des erlaubten Bereichs angegeben"
@@ -7338,24 +7378,36 @@ msgstr ""
 msgid "Do you want to approve the request?"
 msgstr "Wollen sie die Anfrage akzeptieren?"
 
-msgid "Enter your reason:"
-msgstr "Geben Sie Ihren Grund an:"
-
-msgid "You have successfully modified Qun member"
-msgstr "Sie haben die Qun-Mitgliedschaft erfolgreich modifiziert"
+#, fuzzy
+msgid "Change Qun member"
+msgstr "Telefonnummer"
 
-msgid "You have successfully modified Qun information"
-msgstr "Sie haben die Qun-Information erfolgreich modifiziert"
+msgid "Change Qun information"
+msgstr "Qun-Informationen bearbeiten"
 
 msgid "You have successfully created a Qun"
 msgstr "Sie haben einen Qun angelegt"
 
-msgid "Would you like to set up the Qun details now?"
+#, fuzzy
+msgid "Would you like to set up the detail information now?"
 msgstr "Möchten Sie jetzt die Qun-Details einstellen?"
 
 msgid "Setup"
 msgstr "Setup"
 
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"%s"
+
+msgid "QQ Server News"
+msgstr "QQ-Server-News"
+
 msgid "System Message"
 msgstr "Systemnachricht"
 
@@ -7387,8 +7439,9 @@ msgstr "BindMobile"
 msgid " Video"
 msgstr " Video"
 
-msgid " Space"
-msgstr " Raum"
+#, fuzzy
+msgid " Zone"
+msgstr " Zone"
 
 msgid "Flag"
 msgstr "Flagge"
@@ -7408,20 +7461,36 @@ msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Letzte Aktualisierung</b>: %s<br>\n"
 
 #, c-format
-msgid "<b>Server</b>: %s: %d<br>\n"
-msgstr "<b>Server</b>: %s: %d<br>\n"
+msgid "<b>Server</b>: %s<br>\n"
+msgstr "<b>Server</b>: %s<br>\n"
 
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Verbindungsmodus</b>: %s<br>\n"
 
 #, c-format
-msgid "<b>Real hostname</b>: %s: %d<br>\n"
-msgstr "<b>Wirklicher Hostname</b>: %s: %d<br>\n"
+msgid "<b>My Internet Address</b>: %s<br>\n"
+msgstr "<b>Meine Internet-Adresse</b>: %s<br>\n"
 
 #, c-format
-msgid "<b>My Public IP</b>: %s<br>\n"
-msgstr "<b>Meine öffentlich IP</b>: %s<br>\n"
+msgid "<b>Sent</b>: %lu<br>\n"
+msgstr "<b>Gesendet</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Resend</b>: %lu<br>\n"
+msgstr "<b>Erneut senden</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Lost</b>: %lu<br>\n"
+msgstr "<b>Verloren</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received</b>: %lu<br>\n"
+msgstr "<b>Empfangen</b>: %lu<br>\n"
+
+#, c-format
+msgid "<b>Received Duplicate</b>: %lu<br>\n"
+msgstr "<b>Duplikat empfangen</b>: %lu<br>\n"
 
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
@@ -7444,11 +7513,11 @@ msgstr "Meine Informationen festlegen"
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-msgid "Show Login Information"
-msgstr "Login-Informationen anzeigen"
+msgid "Account Information"
+msgstr "Kontoinformationen"
 
-msgid "Leave this QQ Qun"
-msgstr "Dieses QQ-Qun verlassen"
+msgid "Leave the QQ Qun"
+msgstr "Diesen QQ-Qun verlassen"
 
 msgid "Block this buddy"
 msgstr "Diesen Buddy blockieren"
@@ -7466,11 +7535,18 @@ msgstr "Diesen Buddy blockieren"
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ-Protokoll-Plugin"
 
-msgid "Connect using TCP"
+msgid "Auto"
+msgstr "Auto"
+
+#, fuzzy
+msgid "Connect by TCP"
 msgstr "Über TCP verbinden"
 
-msgid "resend interval(s)"
-msgstr "Neusenden-Intervall(e)"
+msgid "Show server notice"
+msgstr "Server-Nachricht anzeigen"
+
+msgid "Show server news"
+msgstr "Server-News anzeigen"
 
 msgid "Keep alive interval(s)"
 msgstr "Intervall(e) zum Aufrechterhalten der Verbindung (Keep alive)"
@@ -7479,15 +7555,39 @@ msgid "Update interval(s)"
 msgstr "Aktualisierungsintervall(e)"
 
 #, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "Ungültiger Token-Antwort-Code, 0x%02X"
+
+#, c-format
 msgid "Invalid token len, %d"
 msgstr "Ungültige Länge des Tokens, %d"
 
+msgid "Unable login for not support Redirect_EX now"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Error password: %s"
+msgstr "Fehler beim Ändern des Passworts"
+
+#, c-format
+msgid "Need active: %s"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unable login for unknow reply code 0x%02X"
+msgstr "Ungültiger Token-Antwort-Code, 0x%02X"
+
 msgid "Keep alive error"
 msgstr "Fehler beim Aufrechterhalten der Verbindung (Keep alive)"
 
-msgid "Failed to connect server"
+#, fuzzy
+msgid "Failed to connect all servers"
 msgstr "Verbinden zum Server fehlgeschlagen"
 
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Verbindung nicht möglich."
+
 msgid "Socket error"
 msgstr "Socket-Fehler"
 
@@ -7508,54 +7608,50 @@ msgstr "Schreibfehler"
 msgid "Connection lost"
 msgstr "Verbindung verloren"
 
+#. Update the login progress status display
+#, fuzzy
+msgid "Request token"
+msgstr "Anfrage verweigert"
+
 msgid "Couldn't resolve host"
 msgstr "Kann den Hostnamen nicht auflösen"
 
-msgid "hostname is NULL or port is 0"
-msgstr "Hostname ist NULL oder Port ist 0"
+msgid "Invalid server or port"
+msgstr "Ungültiger Server oder Port"
 
 #, c-format
 msgid "Connecting server %s, retries %d"
 msgstr "Verbinde zu Server %s, %d Wiederholungen"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Verbindung nicht möglich."
-
-msgid "Could not resolve hostname"
-msgstr "Konnte den Hostnamen nicht auflösen"
-
-msgid "Unable to login. Check debug log."
-msgstr "Anmeldung fehlgeschlagen, Debugmitschnitt beachten."
+msgid "QQ Error"
+msgstr "QQ-Fehler"
 
-msgid "Unable to login"
-msgstr "Anmeldung fehlgeschlagen"
+msgid "Unknow SERVER CMD"
+msgstr ""
 
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Reply %s(0x%02X )\n"
-"Sent %s(0x%02X )\n"
-"Room id %d, reply [0x%02X]: \n"
-"%s"
+"Error reply of %s(0x%02X)\n"
+"Room %d, reply 0x%02X"
 msgstr ""
 "Antwort %s(0x%02X )\n"
 "Gesendet %s(0x%02X )\n"
 "Raum-ID %d, Antwort [0x%02X]: \n"
 "%s"
 
-msgid "Failed room reply"
-msgstr "Antwort vom Raum gescheitert"
+msgid "QQ Qun Command"
+msgstr "QQ-Qun-Kommando"
 
 #, c-format
-msgid "You are not a member of group \"%s\"\n"
-msgstr "Sie sind ein Mitglied der Gruppe „%s“\n"
+msgid "You are not a member of QQ Qun \"%s\"\n"
+msgstr "Sie sind kein Mitglied des Qun „%s“\n"
 
 msgid "Can not decrypt login reply"
 msgstr "Kann die Antwort der Anmeldung nicht entschlüsseln"
 
-#, c-format
-msgid "Invalid token reply code, 0x%02X"
-msgstr "Ungültiger Token-Antwort-Code, 0x%02X"
+#, fuzzy
+msgid "Unknow reply CMD"
+msgstr "Unbekannter Grund"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7568,7 +7664,12 @@ msgstr "Dateiübertragung"
 msgid "%d canceled the transfer of %s"
 msgstr "%d hat die Übertragung von %s abgebrochen"
 
-msgid "Do you want to add this buddy?"
+#, fuzzy
+msgid "Do you approve the requestion?"
+msgstr "Wollen sie die Anfrage akzeptieren?"
+
+#, fuzzy
+msgid "Do you add the buddy?"
 msgstr "Möchten Sie diesen Buddy hinzufügen?"
 
 #. only need to get value
@@ -7579,39 +7680,46 @@ msgstr "Sie wurden von %s hinzugefügt"
 msgid "Would you like to add him?"
 msgstr "Möchten Sie ihn hinzufügen?"
 
-#, c-format
-msgid "%s has added you [%s] to his or her buddy list"
+#, fuzzy, c-format
+msgid "%s added you [%s] to buddy list"
 msgstr "%s hat Sie [%s] zu seiner Buddy-Liste hinzugefügt"
 
+#, fuzzy
+msgid "QQ Budy"
+msgstr "Buddy"
+
 #, c-format
-msgid "User %s rejected your request"
-msgstr "Benutzer %s hat Ihre Anfrage abgelehnt"
+msgid "Requestion rejected by %s"
+msgstr ""
 
 #, c-format
-msgid "User %s approved your request"
-msgstr "Benutzer %s hat Ihre Anfrage akzeptiert"
+msgid "Requestion approved by %s"
+msgstr ""
 
 #. TODO: this should go through purple_account_request_authorization()
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s möchte Sie [%s] als Freund hinzufügen"
 
-#, c-format
-msgid "Message: %s"
-msgstr "Nachricht: %s"
-
-#, c-format
-msgid "%s is not in your buddy list"
+#, fuzzy, c-format
+msgid "%s is not in buddy list"
 msgstr "%s ist nicht in Ihrer Buddy-Liste"
 
+#, fuzzy
+msgid "Would you add?"
+msgstr "Möchten Sie ihn hinzufügen?"
+
 #, c-format
-msgid "Notice from: %s"
-msgstr "Ankündigung von %s"
+msgid "From %s:"
+msgstr "Von %s:"
 
 #, c-format
 msgid "%s"
 msgstr "%s"
 
+msgid "QQ Server Notice"
+msgstr "QQ-Server-Nachricht"
+
 msgid "Connection closed (writing)"
 msgstr "Verbindung geschlossen (schreibend)"
 
@@ -7949,7 +8057,7 @@ msgid "Export Sametime List..."
 msgstr "Export der Sametime-Liste..."
 
 msgid "Add Notes Address Book Group..."
-msgstr "Zum Notes-Adressbuch hinzufügen..."
+msgstr "Notes-Adressbuch-Gruppe hinzufügen..."
 
 msgid "User Search..."
 msgstr "Benutzersuche..."
@@ -9081,6 +9189,9 @@ msgstr "Unbekannte Serverantwort."
 msgid "Could not create listen socket"
 msgstr "Kann Listen-Socket nicht erstellen"
 
+msgid "Could not resolve hostname"
+msgstr "Konnte den Hostnamen nicht auflösen"
+
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-Benutzernamen dürfen keine Leerzeichen oder @-Symbole enthalten"
 
@@ -9465,6 +9576,9 @@ msgstr "list:  Liste Räume im Yahoo-Netzwerk auf"
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Einen Benutzer auffordern, eine Mal-Sitzung zu starten"
 
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID..."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10020,6 +10134,10 @@ msgid "Unable to connect to %s"
 msgstr "Verbindung zu %s nicht möglich"
 
 #, c-format
+msgid "Error reading from %s: response too long (%d bytes limit)"
+msgstr "Fehler beim Lesen von %s: Antwort zu lang (%d Bytes maximal)"
+
+#, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
@@ -11126,6 +11244,9 @@ msgstr "Finnisch"
 msgid "French"
 msgstr "Französisch"
 
+msgid "Irish"
+msgstr "Irisch"
+
 msgid "Galician"
 msgstr "Galizisch"
 
@@ -11547,6 +11668,13 @@ msgstr "Hyperlink-Farbe"
 msgid "Color to draw hyperlinks."
 msgstr "Farbe zum Darstellen von Hyperlinks."
 
+msgid "Hyperlink visited color"
+msgstr "Farbe für besuchte Hyperlinks"
+
+msgid "Color to draw hyperlinks after it has been visited (or activated)."
+msgstr ""
+"Farbe zum Darstellen von Hyperlinks, wenn sie besucht (oder aktiviert) wurden"
+
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink-Farbe"
 
@@ -12417,13 +12545,19 @@ msgstr ""
 "Klang-_Abspielbefehl:\n"
 "(%s für den Dateinamen)"
 
+#, fuzzy
+msgid "M_ute sounds"
+msgstr "Stu_mmschalten"
+
 msgid "Sounds when conversation has _focus"
 msgstr "Klang, wenn das Gespräch den _Fokus hat"
 
-msgid "Enable sounds:"
+#, fuzzy
+msgid "_Enable sounds:"
 msgstr "Klänge aktivieren:"
 
-msgid "Volume:"
+#, fuzzy
+msgid "V_olume:"
 msgstr "Lautstärke:"
 
 msgid "Play"
@@ -12616,6 +12750,12 @@ msgstr "Status für %s"
 msgid "Custom Smiley"
 msgstr "Benutzerdefinierter Smiley"
 
+msgid "More Data needed"
+msgstr "Weitere Daten benötigt"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Bitte geben Sie eine Tastenkombination für den Smiley an."
+
 msgid "Duplicate Shortcut"
 msgstr "Doppelte Tastenkombination"
 
@@ -12626,12 +12766,6 @@ msgstr ""
 "Für diese Tastenkombination existiert bereits ein benutzerdefinierter "
 "Smiley. Bitten wählen Sie eine andere Tastenkombination."
 
-msgid "More Data needed"
-msgstr "Weitere Daten benötigt"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Bitte geben Sie eine Tastenkombination für den Smiley an."
-
 msgid "Please select an image for the smiley."
 msgstr "Bitte wählen Sie ein Bild für den Smiley."
 
@@ -13373,6 +13507,9 @@ msgstr "Sekundäre Cursor-Farbe"
 msgid "Hyperlink Color"
 msgstr "Hyperlink-Farbe"
 
+msgid "Visited Hyperlink Color"
+msgstr "Farbe für besuchte Hyperlinks"
+
 msgid "Highlighted Message Name Color"
 msgstr "Farbe des Absendernamens für hervorgehobene Nachrichten"
 
diff --git a/po/es.po b/po/es.po
index 079fd7a0fb..39bc8aa24e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -53,7 +53,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 11:42-0400\n"
+"POT-Creation-Date: 2008-08-29 13:21-0400\n"
 "PO-Revision-Date: 2008-08-10 00:10+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
@@ -2463,6 +2463,9 @@ msgstr "Tamaño mínimo de sala"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Tiempo de inactividad de usuario (en minutos)"
 
+msgid "Apply hiding rules to buddies"
+msgstr "Aplicar las reglas de ocultación a los amigos"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7630,17 +7633,20 @@ msgid ""
 "Room id %d, reply [0x%02X]: \n"
 "%s"
 msgstr ""
+"Respuesta %s(0x%02X )\n"
+"Enviado %s(0x%02X )\n"
+"ID de sala %d, respuesta [0x%02X]: \n"
+"%s"
 
-#, fuzzy
 msgid "Failed room reply"
-msgstr "Fallo en la conexión, no ha habido respuesta"
+msgstr "Fallo en la respuesta a la sala"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You are not a member of group \"%s\"\n"
-msgstr "Vd. [%d] ha sido añadido al grupo «%d»"
+msgstr "Vd. no es un miembro del grupo «%s»\n"
 
 msgid "Can not decrypt login reply"
-msgstr ""
+msgstr "No se pudo descifrar la respuesta a la autenticación"
 
 #, c-format
 msgid "Invalid token reply code, 0x%02X"
@@ -10302,14 +10308,17 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>¡Bienvenido a %s!</span>\n"
 "\n"
 "No tiene configurada ninguna cuenta de MI. Para conectarse con %s debe "
 "pulsar el botón <b>Añadir</b> que tiene más abajo y configurar su primera "
 "cuenta. Si quiere que %s se conecte a múltiples cuentas de MI, deberá pulsar "
-"<b>Añadir</b> otra vez para configurarlas todas."
+"<b>Añadir</b> otra vez para configurarlas todas.\n"
+"\n"
+"Puede volver a esta venana para añadir, editar o eliminar cuentas desde la "
+"ventana de lista de amigos seleccionando <b>Cuentas->Gestionar Cuentas</b>"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -12715,6 +12724,12 @@ msgstr "Estado de %s"
 msgid "Custom Smiley"
 msgstr "Emoticono a medida"
 
+msgid "More Data needed"
+msgstr "Son necesarios más datos"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Indique un atajo para asociarlo al emoticono."
+
 msgid "Duplicate Shortcut"
 msgstr "Atajo duplicado"
 
@@ -12725,12 +12740,6 @@ msgstr ""
 "Ya existe un emoticono a medida para el atajo de teclado seleccionado. "
 "Especifique un atajo distinto."
 
-msgid "More Data needed"
-msgstr "Son necesarios más datos"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Indique un atajo para asociarlo al emoticono."
-
 msgid "Please select an image for the smiley."
 msgstr "Escoja una imagen para el emoticono."
 
@@ -12896,6 +12905,9 @@ msgstr "_Modificar"
 msgid "_Open Mail"
 msgstr "_Abrir correo"
 
+msgid "_Edit"
+msgstr "_Editar"
+
 msgid "Pidgin Tooltip"
 msgstr "Consejos de Pidgin"
 
diff --git a/po/fi.po b/po/fi.po
index 3065c51131..a65a09b666 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-11 12:39+0300\n"
-"PO-Revision-Date: 2008-08-11 12:39+0300\n"
+"POT-Creation-Date: 2008-08-28 12:10+0300\n"
+"PO-Revision-Date: 2008-08-28 12:19+0300\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -328,6 +328,7 @@ msgstr "Merkitse/poista merkintä"
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
 msgstr "Jouten"
@@ -2387,6 +2388,9 @@ msgstr "Huoneen minimikoko"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Käyttäjän inaktiivisuuden aikakatkaisu (minuuteissa)"
 
+msgid "Apply hiding rules to buddies"
+msgstr "Toteuta piilotussäännöt tuttaville"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10139,17 +10143,17 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Tervetuloa %siin!</span>\n"
 "\n"
-"Yhtäkään pikaviestintiliä ei ole määritelty. Aloittaaksesi %sin käytön "
-"napsauta <b>Lisää</b>-painiketta alla ja määritä ensimmäisen käyttäjätilisi "
+"Pikaviestintilejä ei ole määritelty. Yhdistääksesi %sillä "
+"napsauta <b>Lisää</b>-painiketta ja määritä ensimmäisen käyttäjätilisi "
 "tiedot. Jos haluat %sin yhdistävän useampiin pikaviestintileihin, napsauta "
 "uudestaan <b>Lisää</b>-painiketta määritelläksesi ne kaikki.\n"
 "\n"
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
-"valitsemalla <b>Käyttäjätilit->Lisää/muokkaa</b> Tuttavat-ikkunassa."
+"valitsemalla <b>Käyttäjätilit->Tilien hallinta</b> Tuttavat-ikkunassa."
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -12529,6 +12533,12 @@ msgstr "%s:n tila"
 msgid "Custom Smiley"
 msgstr "Oma hymiö"
 
+msgid "More Data needed"
+msgstr "Lisää tietoja tarvitaan"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Syötä hymiöön liitettävä oikotie."
+
 msgid "Duplicate Shortcut"
 msgstr "Monista oikotie"
 
@@ -12537,12 +12547,6 @@ msgid ""
 "different shortcut."
 msgstr "Valitulle oikotielle on jo oma hymiö. Valitse toisenlainen oikotie."
 
-msgid "More Data needed"
-msgstr "Lisää tietoja tarvitaan"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Syötä hymiöön liitettävä oikotie."
-
 msgid "Please select an image for the smiley."
 msgstr "Valitse hymiölle kuva."
 
@@ -12705,6 +12709,9 @@ msgstr "_Muokkaa"
 msgid "_Open Mail"
 msgstr "_Avaa sähköposti"
 
+msgid "_Edit"
+msgstr "_Muokkaa"
+
 msgid "Pidgin Tooltip"
 msgstr "Pidgin-työkaluvihje"
 
diff --git a/po/ga.po b/po/ga.po
new file mode 100644
index 0000000000..2fd543ddbb
--- /dev/null
+++ b/po/ga.po
@@ -0,0 +1,13099 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-08-29 15:29-0400\n"
+"PO-Revision-Date: 2008-08-27 16:26-0800\n"
+"Last-Translator: Aaron Kearns <ajkearns6@gmail.com>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Finch"
+msgstr "Finch"
+
+#, fuzzy, c-format
+msgid "%s. Try `%s -h' for more information.\n"
+msgstr "Bain triail as `%s %s' chun tuilleadh eolais a fháil.\n"
+
+#, c-format
+msgid ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -v, --version       display the current version and exit\n"
+
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+
+msgid "Error"
+msgstr "Earráid"
+
+msgid "Account was not added"
+msgstr ""
+
+msgid "Username of an account must be non-empty."
+msgstr ""
+
+msgid "New mail notifications"
+msgstr ""
+
+msgid "Remember password"
+msgstr ""
+
+msgid "There's no protocol plugins installed."
+msgstr ""
+
+msgid "(You probably forgot to 'make install'.)"
+msgstr ""
+
+msgid "Modify Account"
+msgstr ""
+
+msgid "New Account"
+msgstr "Cuntas Nua"
+
+msgid "Protocol:"
+msgstr "Prótacal:"
+
+msgid "Username:"
+msgstr "Ainm Úsáideora:"
+
+msgid "Password:"
+msgstr "Focal Faire:"
+
+msgid "Alias:"
+msgstr "Ailias:"
+
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr ""
+
+#. Cancel button
+#. Cancel
+msgid "Cancel"
+msgstr "Cealaigh"
+
+#. Save button
+#. Save
+msgid "Save"
+msgstr "Sábháil"
+
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "An bhfuil tú cinnte go teastaíonn uait a scrios %s?"
+
+msgid "Delete Account"
+msgstr "Scrios Cuntas"
+
+#. Delete button
+msgid "Delete"
+msgstr "Scrios"
+
+msgid "Accounts"
+msgstr "Cuntais"
+
+msgid "You can enable/disable accounts from the following list."
+msgstr ""
+
+#. Add button
+msgid "Add"
+msgstr "Cuir"
+
+#. Modify button
+msgid "Modify"
+msgstr "Modhnaigh"
+
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr ""
+
+msgid "Add buddy to your list?"
+msgstr ""
+
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr ""
+
+msgid "Authorize buddy?"
+msgstr "Údaraigh cara?"
+
+msgid "Authorize"
+msgstr "Údaraigh"
+
+msgid "Deny"
+msgstr ""
+
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Cuntas: %s (%s)"
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+
+msgid "Default"
+msgstr "Réamhshocrú"
+
+msgid "You must provide a username for the buddy."
+msgstr ""
+
+msgid "You must provide a group."
+msgstr ""
+
+msgid "You must select an account."
+msgstr ""
+
+msgid "The selected account is not online."
+msgstr ""
+
+msgid "Error adding buddy"
+msgstr ""
+
+msgid "Username"
+msgstr "Ainm Úsáideora"
+
+msgid "Alias (optional)"
+msgstr "Ailias (roghnach)"
+
+msgid "Add in group"
+msgstr ""
+
+msgid "Account"
+msgstr "Cuntas"
+
+msgid "Add Buddy"
+msgstr "Cuir Cara"
+
+msgid "Please enter buddy information."
+msgstr ""
+
+msgid "Chats"
+msgstr "Comhráite"
+
+#. Extract their Name and put it in
+msgid "Name"
+msgstr "Ainm"
+
+msgid "Alias"
+msgstr "Ailias"
+
+msgid "Group"
+msgstr "Grúpa"
+
+msgid "Auto-join"
+msgstr ""
+
+msgid "Add Chat"
+msgstr "Cuir Comhrá"
+
+msgid "You can edit more information from the context menu later."
+msgstr ""
+
+msgid "Error adding group"
+msgstr ""
+
+msgid "You must give a name for the group to add."
+msgstr ""
+
+msgid "A group with the name already exists."
+msgstr ""
+
+msgid "Add Group"
+msgstr "Cuir Grúpa"
+
+msgid "Enter the name of the group"
+msgstr ""
+
+msgid "Edit Chat"
+msgstr ""
+
+msgid "Please Update the necessary fields."
+msgstr ""
+
+msgid "Edit"
+msgstr "Cuir in Eagar"
+
+msgid "Edit Settings"
+msgstr ""
+
+msgid "Information"
+msgstr "Eolas"
+
+msgid "Retrieving..."
+msgstr ""
+
+msgid "Get Info"
+msgstr ""
+
+msgid "Add Buddy Pounce"
+msgstr ""
+
+#. if (q_bud && is_online(q_bud->status)) {
+msgid "Send File"
+msgstr ""
+
+msgid "Blocked"
+msgstr ""
+
+msgid "View Log"
+msgstr "Amharc ar Loga"
+
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr ""
+
+msgid "Rename"
+msgstr "Athainmigh"
+
+msgid "Set Alias"
+msgstr "Socraigh Ailias"
+
+msgid "Enter empty string to reset the name."
+msgstr ""
+
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr ""
+
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr ""
+
+#. XXX: anything to do with the returned ui-handle?
+msgid "Confirm Remove"
+msgstr ""
+
+# scrios???? scrud????
+msgid "Remove"
+msgstr "Scrios"
+
+#. Buddy List
+msgid "Buddy List"
+msgstr "Liosta Cara"
+
+msgid "Place tagged"
+msgstr ""
+
+msgid "Toggle Tag"
+msgstr ""
+
+#. General
+#, fuzzy
+msgid "Nickname"
+msgstr "_Leasainm:"
+
+#. Never know what those translations might end up like...
+#. Idle stuff
+msgid "Idle"
+msgstr "Díomhaoin"
+
+msgid "On Mobile"
+msgstr ""
+
+msgid "New..."
+msgstr "Nua..."
+
+msgid "Saved..."
+msgstr "Sábháilte..."
+
+msgid "Plugins"
+msgstr "Breiseáin"
+
+msgid "Block/Unblock"
+msgstr ""
+
+msgid "Block"
+msgstr "Cuireann bac"
+
+msgid "Unblock"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
+msgstr ""
+
+#. Not multiline
+#. Not masked?
+#. No hints?
+msgid "OK"
+msgstr "Ceart go Leor"
+
+msgid "New Instant Message"
+msgstr ""
+
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+
+msgid "Channel"
+msgstr "Cainéal"
+
+msgid "Join a Chat"
+msgstr ""
+
+msgid "Please enter the name of the chat you want to join."
+msgstr ""
+
+msgid "Join"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+
+#. Create the "Options" frame.
+msgid "Options"
+msgstr "Roghanna"
+
+msgid "Send IM..."
+msgstr ""
+
+msgid "Block/Unblock..."
+msgstr ""
+
+msgid "Join Chat..."
+msgstr ""
+
+msgid "View Log..."
+msgstr "Amharc ar Loga..."
+
+msgid "View All Logs"
+msgstr ""
+
+msgid "Show"
+msgstr "Taispeáin"
+
+msgid "Empty groups"
+msgstr ""
+
+msgid "Offline buddies"
+msgstr ""
+
+msgid "Sort"
+msgstr "Sórtáil"
+
+msgid "By Status"
+msgstr ""
+
+msgid "Alphabetically"
+msgstr ""
+
+msgid "By Log Size"
+msgstr ""
+
+msgid "Buddy"
+msgstr "Cara"
+
+msgid "Chat"
+msgstr "Comhrá"
+
+msgid "Grouping"
+msgstr ""
+
+msgid "Certificate Import"
+msgstr ""
+
+msgid "Specify a hostname"
+msgstr ""
+
+msgid "Type the host name this certificate is for."
+msgstr ""
+
+#, c-format
+msgid ""
+"File %s could not be imported.\n"
+"Make sure that the file is readable and in PEM format.\n"
+msgstr ""
+
+msgid "Certificate Import Error"
+msgstr ""
+
+msgid "X.509 certificate import failed"
+msgstr ""
+
+msgid "Select a PEM certificate"
+msgstr ""
+
+#, c-format
+msgid ""
+"Export to file %s failed.\n"
+"Check that you have write permission to the target path\n"
+msgstr ""
+
+msgid "Certificate Export Error"
+msgstr ""
+
+msgid "X.509 certificate export failed"
+msgstr ""
+
+msgid "PEM X.509 Certificate Export"
+msgstr ""
+
+#, c-format
+msgid "Certificate for %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"SHA1 fingerprint:\n"
+"%s"
+msgstr ""
+
+msgid "SSL Host Certificate"
+msgstr ""
+
+#, c-format
+msgid "Really delete certificate for %s?"
+msgstr ""
+
+msgid "Confirm certificate delete"
+msgstr ""
+
+msgid "Certificate Manager"
+msgstr ""
+
+#. Creating the user splits
+msgid "Hostname"
+msgstr "Óstainm"
+
+msgid "Info"
+msgstr "Eolas"
+
+#. Close button
+msgid "Close"
+msgstr "Dún"
+
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#, c-format
+msgid "%s disconnected."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+
+msgid "Re-enable Account"
+msgstr ""
+
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will be "
+"automatically rejoined in the chat when the account reconnects."
+msgstr ""
+
+msgid "No such command."
+msgstr ""
+
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+
+msgid "Your command failed for an unknown reason."
+msgstr ""
+
+msgid "That command only works in chats, not IMs."
+msgstr ""
+
+msgid "That command only works in IMs, not chats."
+msgstr ""
+
+msgid "That command doesn't work on this protocol."
+msgstr ""
+
+msgid "Message was not sent, because you are not signed on."
+msgstr ""
+
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+" Tá %s ag clóscríobh..."
+
+msgid "You have left this chat."
+msgstr ""
+
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+
+msgid "Send To"
+msgstr "Cuir Chuig"
+
+msgid "Invite message"
+msgstr ""
+
+msgid "Invite"
+msgstr ""
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+
+msgid "Conversation"
+msgstr ""
+
+msgid "Clear Scrollback"
+msgstr ""
+
+msgid "Show Timestamps"
+msgstr ""
+
+msgid "Add Buddy Pounce..."
+msgstr ""
+
+msgid "Invite..."
+msgstr ""
+
+msgid "Enable Logging"
+msgstr ""
+
+msgid "Enable Sounds"
+msgstr "Úsáid Fuaimeanna"
+
+msgid "<AUTO-REPLY> "
+msgstr ""
+
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Supported debug options are:  version"
+msgstr ""
+
+msgid "No such command (in this context)."
+msgstr ""
+
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+
+msgid "clear: Clears the conversation scrollback."
+msgstr ""
+
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr ""
+
+msgid "users:  Show the list of users in the chat."
+msgstr ""
+
+msgid "plugins: Show the plugins window."
+msgstr ""
+
+msgid "buddylist: Show the buddylist."
+msgstr ""
+
+msgid "accounts: Show the accounts window."
+msgstr ""
+
+msgid "debugwin: Show the debug window."
+msgstr ""
+
+msgid "prefs: Show the preference window."
+msgstr ""
+
+msgid "statuses: Show the savedstatuses window."
+msgstr ""
+
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+
+msgid "Unable to open file."
+msgstr "Ní féidir an comhad a oscailt."
+
+msgid "Debug Window"
+msgstr ""
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+msgid "Clear"
+msgstr "Glan"
+
+#, fuzzy
+msgid "Filter:"
+msgstr "Scagaire:"
+
+msgid "Pause"
+msgstr "Sos"
+
+#, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] ""
+msgstr[1] ""
+
+#. Create the window.
+msgid "File Transfers"
+msgstr ""
+
+#, fuzzy
+msgid "Progress"
+msgstr "Foras"
+
+msgid "Filename"
+msgstr "Ainm an Comhad"
+
+msgid "Size"
+msgstr "Méid"
+
+msgid "Speed"
+msgstr "Luas"
+
+#, fuzzy
+msgid "Remaining"
+msgstr "Fágtha:"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+msgid "Status"
+msgstr "Stádas"
+
+msgid "Close this window when all transfers finish"
+msgstr ""
+
+msgid "Clear finished transfers"
+msgstr ""
+
+msgid "Stop"
+msgstr "Stop"
+
+msgid "Waiting for transfer to begin"
+msgstr ""
+
+#, fuzzy
+msgid "Canceled"
+msgstr "Cealaithe"
+
+#, fuzzy
+msgid "Failed"
+msgstr "Theip"
+
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+msgid "Sent"
+msgstr ""
+
+#, fuzzy
+msgid "Received"
+msgstr "fuarthas %s."
+
+#, fuzzy
+msgid "Finished"
+msgstr "&Críochnaithe"
+
+#, c-format
+msgid "The file was saved as %s."
+msgstr ""
+
+msgid "Sending"
+msgstr ""
+
+msgid "Receiving"
+msgstr ""
+
+#, c-format
+msgid "Conversation in %s on %s"
+msgstr ""
+
+#, c-format
+msgid "Conversation with %s on %s"
+msgstr ""
+
+msgid "%B %Y"
+msgstr "%B %Y"
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+msgid "No logs were found"
+msgstr ""
+
+msgid "Total log size:"
+msgstr ""
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr ""
+
+#, c-format
+msgid "Conversations in %s"
+msgstr ""
+
+#, c-format
+msgid "Conversations with %s"
+msgstr ""
+
+msgid "All Conversations"
+msgstr ""
+
+msgid "System Log"
+msgstr ""
+
+msgid "Emails"
+msgstr "Ríomhphoist"
+
+msgid "You have mail!"
+msgstr "Tá ríomhphost agat!"
+
+msgid "Sender"
+msgstr ""
+
+msgid "Subject"
+msgstr "Ábhar"
+
+#, c-format
+msgid "%s (%s) has %d new message."
+msgid_plural "%s (%s) has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "New Mail"
+msgstr "Ríohmphost Nua"
+
+#, c-format
+msgid "Info for %s"
+msgstr "Eolas faoi %s"
+
+msgid "Buddy Information"
+msgstr ""
+
+msgid "Continue"
+msgstr ""
+
+msgid "IM"
+msgstr "IM"
+
+msgid "(none)"
+msgstr "(aon cheann)"
+
+msgid "URI"
+msgstr "URI"
+
+msgid "ERROR"
+msgstr "EARRÁID"
+
+#, fuzzy
+msgid "loading plugin failed"
+msgstr "Theip ar luchtú an bhreiseáin"
+
+#, fuzzy
+msgid "unloading plugin failed"
+msgstr "Theip ar dhíluchtú an bhreiseáin"
+
+#, c-format
+msgid ""
+"Name: %s\n"
+"Version: %s\n"
+"Description: %s\n"
+"Author: %s\n"
+"Website: %s\n"
+"Filename: %s\n"
+msgstr ""
+
+msgid "Plugin need to be loaded before you can configure it."
+msgstr ""
+
+msgid "No configuration options for this plugin."
+msgstr ""
+
+msgid "Error loading plugin"
+msgstr ""
+
+msgid "The selected file is not a valid plugin."
+msgstr ""
+
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+
+msgid "Select plugin to install"
+msgstr ""
+
+msgid "You can (un)load plugins from the following list."
+msgstr ""
+
+msgid "Install Plugin..."
+msgstr ""
+
+#, fuzzy
+msgid "Configure Plugin"
+msgstr "Cumraigh Breiseán"
+
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#, fuzzy
+msgid "Preferences"
+msgstr "Roghnachais"
+
+msgid "Please enter a buddy to pounce."
+msgstr ""
+
+msgid "New Buddy Pounce"
+msgstr ""
+
+msgid "Edit Buddy Pounce"
+msgstr ""
+
+msgid "Pounce Who"
+msgstr ""
+
+#. Account:
+msgid "Account:"
+msgstr "Cuntas:"
+
+msgid "Buddy name:"
+msgstr ""
+
+#. Create the "Pounce When Buddy..." frame.
+msgid "Pounce When Buddy..."
+msgstr ""
+
+msgid "Signs on"
+msgstr ""
+
+msgid "Signs off"
+msgstr ""
+
+msgid "Goes away"
+msgstr ""
+
+msgid "Returns from away"
+msgstr ""
+
+msgid "Becomes idle"
+msgstr ""
+
+msgid "Is no longer idle"
+msgstr ""
+
+msgid "Starts typing"
+msgstr ""
+
+msgid "Pauses while typing"
+msgstr ""
+
+msgid "Stops typing"
+msgstr ""
+
+msgid "Sends a message"
+msgstr ""
+
+#. Create the "Action" frame.
+#, fuzzy
+msgid "Action"
+msgstr "Aicsean"
+
+msgid "Open an IM window"
+msgstr ""
+
+msgid "Pop up a notification"
+msgstr ""
+
+msgid "Send a message"
+msgstr ""
+
+#, fuzzy
+msgid "Execute a command"
+msgstr "Rith Ordú"
+
+msgid "Play a sound"
+msgstr ""
+
+msgid "Pounce only when my status is not Available"
+msgstr ""
+
+msgid "Recurring"
+msgstr ""
+
+msgid "Cannot create pounce"
+msgstr ""
+
+msgid "You do not have any accounts."
+msgstr ""
+
+msgid "You must create an account first before you can create a pounce."
+msgstr ""
+
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr ""
+
+msgid "Buddy Pounces"
+msgstr ""
+
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unknown pounce event. Please report this!"
+msgstr ""
+
+msgid "Based on keyboard use"
+msgstr ""
+
+msgid "From last sent message"
+msgstr ""
+
+msgid "Never"
+msgstr "Choíche"
+
+msgid "Show Idle Time"
+msgstr ""
+
+msgid "Show Offline Buddies"
+msgstr ""
+
+msgid "Notify buddies when you are typing"
+msgstr ""
+
+msgid "Log format"
+msgstr ""
+
+msgid "Log IMs"
+msgstr ""
+
+msgid "Log chats"
+msgstr ""
+
+msgid "Log status change events"
+msgstr ""
+
+msgid "Report Idle time"
+msgstr ""
+
+msgid "Change status when idle"
+msgstr ""
+
+msgid "Minutes before changing status"
+msgstr ""
+
+msgid "Change status to"
+msgstr ""
+
+#. Conversations
+msgid "Conversations"
+msgstr ""
+
+msgid "Logging"
+msgstr ""
+
+msgid "You must fill all the required fields."
+msgstr ""
+
+msgid "The required fields are underlined."
+msgstr ""
+
+msgid "Not implemented yet."
+msgstr ""
+
+msgid "Save File..."
+msgstr "Sábháil Comhad..."
+
+msgid "Open File..."
+msgstr "Oscail Comhad..."
+
+msgid "Choose Location..."
+msgstr ""
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr ""
+
+msgid "Get"
+msgstr ""
+
+#. Create the window.
+msgid "Room List"
+msgstr ""
+
+msgid "Buddy logs in"
+msgstr ""
+
+msgid "Buddy logs out"
+msgstr ""
+
+msgid "Message received"
+msgstr ""
+
+msgid "Message received begins conversation"
+msgstr ""
+
+msgid "Message sent"
+msgstr ""
+
+msgid "Person enters chat"
+msgstr ""
+
+msgid "Person leaves chat"
+msgstr ""
+
+msgid "You talk in chat"
+msgstr ""
+
+msgid "Others talk in chat"
+msgstr ""
+
+msgid "Someone says your username in chat"
+msgstr ""
+
+msgid "GStreamer Failure"
+msgstr ""
+
+msgid "GStreamer failed to initialize."
+msgstr ""
+
+msgid "(default)"
+msgstr "(réamhshocrú)"
+
+msgid "Select Sound File ..."
+msgstr ""
+
+msgid "Sound Preferences"
+msgstr ""
+
+msgid "Profiles"
+msgstr "próifílí"
+
+#, fuzzy
+msgid "Automatic"
+msgstr "uathoibríoch"
+
+msgid "Console Beep"
+msgstr ""
+
+#, fuzzy
+msgid "Command"
+msgstr "Ordú"
+
+msgid "No Sound"
+msgstr "Níl fuaim"
+
+msgid "Sound Method"
+msgstr ""
+
+msgid "Method: "
+msgstr "Modh:"
+
+#, c-format
+msgid ""
+"Sound Command\n"
+"(%s for filename)"
+msgstr ""
+
+#. Sound options
+msgid "Sound Options"
+msgstr ""
+
+msgid "Sounds when conversation has focus"
+msgstr ""
+
+msgid "Always"
+msgstr "I gCónaí"
+
+msgid "Only when available"
+msgstr ""
+
+msgid "Only when not available"
+msgstr ""
+
+msgid "Volume(0-100):"
+msgstr ""
+
+#. Sound events
+msgid "Sound Events"
+msgstr ""
+
+#, fuzzy
+msgid "Event"
+msgstr "Teagmhas"
+
+msgid "File"
+msgstr "Comhad"
+
+msgid "Test"
+msgstr "Triail"
+
+#, fuzzy
+msgid "Reset"
+msgstr "Athshocraigh"
+
+#, fuzzy
+msgid "Choose..."
+msgstr "Roghnaigh..."
+
+#, fuzzy, c-format
+msgid "Are you sure you want to delete \"%s\""
+msgstr "An bhfuil tú cinnte go teastaíonn uait a scrios"
+
+msgid "Delete Status"
+msgstr "Scrios Stádas"
+
+msgid "Saved Statuses"
+msgstr ""
+
+#, fuzzy
+msgid "Title"
+msgstr "Teideal"
+
+#, fuzzy
+msgid "Type"
+msgstr "Saghas"
+
+#. Statuses are almost all the same. Define a macro to reduce code repetition.
+#. PurpleStatusPrimitive
+#. id - use default
+#. name - use default
+#. savable
+#. user_settable
+#. not independent
+#. Attributes - each status can have a message.
+#, fuzzy
+msgid "Message"
+msgstr "Scéal"
+
+#. Use
+#, fuzzy
+msgid "Use"
+msgstr "Úsáid:"
+
+msgid "Invalid title"
+msgstr ""
+
+msgid "Please enter a non-empty title for the status."
+msgstr ""
+
+msgid "Duplicate title"
+msgstr ""
+
+msgid "Please enter a different title for the status."
+msgstr ""
+
+msgid "Substatus"
+msgstr ""
+
+msgid "Status:"
+msgstr "Stádas:"
+
+#, fuzzy
+msgid "Message:"
+msgstr "Scéal:"
+
+msgid "Edit Status"
+msgstr ""
+
+msgid "Use different status for following accounts"
+msgstr ""
+
+#. Save & Use
+msgid "Save & Use"
+msgstr ""
+
+msgid "Certificates"
+msgstr ""
+
+msgid "Sounds"
+msgstr ""
+
+msgid "Statuses"
+msgstr ""
+
+msgid "Error loading the plugin."
+msgstr ""
+
+msgid "Couldn't find X display"
+msgstr ""
+
+msgid "Couldn't find window"
+msgstr ""
+
+msgid "This plugin cannot be loaded because it was not built with X11 support."
+msgstr ""
+
+msgid "GntClipboard"
+msgstr ""
+
+msgid "Clipboard plugin"
+msgstr ""
+
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+
+#, c-format
+msgid "%s just signed on"
+msgstr ""
+
+#, c-format
+msgid "%s just signed off"
+msgstr ""
+
+#, c-format
+msgid "%s sent you a message"
+msgstr ""
+
+#, c-format
+msgid "%s said your nick in %s"
+msgstr ""
+
+#, c-format
+msgid "%s sent a message in %s"
+msgstr ""
+
+msgid "Buddy signs on/off"
+msgstr ""
+
+msgid "You receive an IM"
+msgstr ""
+
+msgid "Someone speaks in a chat"
+msgstr ""
+
+msgid "Someone says your name in a chat"
+msgstr ""
+
+msgid "Notify with a toaster when"
+msgstr ""
+
+msgid "Beep too!"
+msgstr ""
+
+msgid "Set URGENT for the terminal window."
+msgstr ""
+
+msgid "GntGf"
+msgstr "GntGf"
+
+msgid "Toaster plugin"
+msgstr ""
+
+#, c-format
+msgid "<b>Conversation with %s on %s:</b><br>"
+msgstr ""
+
+msgid "History Plugin Requires Logging"
+msgstr ""
+
+msgid ""
+"Logging can be enabled from Tools -> Preferences -> Logging.\n"
+"\n"
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
+msgstr ""
+
+msgid "GntHistory"
+msgstr ""
+
+msgid "Shows recently logged conversations in new conversations."
+msgstr ""
+
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+
+#, c-format
+msgid "Online"
+msgstr ""
+
+msgid "Offline"
+msgstr ""
+
+msgid "Online Buddies"
+msgstr ""
+
+msgid "Offline Buddies"
+msgstr ""
+
+msgid "Online/Offline"
+msgstr ""
+
+msgid "Meebo"
+msgstr ""
+
+msgid "No Grouping"
+msgstr ""
+
+msgid "Provides alternate buddylist grouping options."
+msgstr ""
+
+msgid "Lastlog"
+msgstr ""
+
+#. Translator Note: The "backlog" is the conversation buffer/history.
+msgid "lastlog: Searches for a substring in the backlog."
+msgstr ""
+
+msgid "GntLastlog"
+msgstr ""
+
+msgid "Lastlog plugin."
+msgstr ""
+
+msgid "accounts"
+msgstr "cuntais"
+
+msgid "Password is required to sign on."
+msgstr ""
+
+#, c-format
+msgid "Enter password for %s (%s)"
+msgstr "Íontráil pasfhocal do %s (%s)"
+
+msgid "Enter Password"
+msgstr "Íontráil Pasfhocal"
+
+msgid "Save password"
+msgstr ""
+
+#, c-format
+msgid "Missing protocol plugin for %s"
+msgstr ""
+
+#, fuzzy
+msgid "Connection Error"
+msgstr "Earráid Nasctha"
+
+msgid "New passwords do not match."
+msgstr ""
+
+msgid "Fill out all fields completely."
+msgstr ""
+
+msgid "Original password"
+msgstr ""
+
+msgid "New password"
+msgstr ""
+
+msgid "New password (again)"
+msgstr ""
+
+#, c-format
+msgid "Change password for %s"
+msgstr ""
+
+msgid "Please enter your current password and your new password."
+msgstr ""
+
+#, c-format
+msgid "Change user information for %s"
+msgstr ""
+
+msgid "Set User Info"
+msgstr ""
+
+#, fuzzy
+msgid "Unknown"
+msgstr "Anaithnid"
+
+msgid "Buddies"
+msgstr "Cairde"
+
+msgid "buddy list"
+msgstr "liosta cara"
+
+msgid "(DOES NOT MATCH)"
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid "%s has presented the following certificate for just-this-once use:"
+msgstr ""
+
+#, c-format
+msgid ""
+"Common name: %s %s\n"
+"Fingerprint (SHA1): %s"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+msgid "Single-use Certificate Verification"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+msgid "Certificate Authorities"
+msgstr ""
+
+#. Scheme name
+#. Pool name
+msgid "SSL Peers Cache"
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid "Accept certificate for %s?"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+msgid "SSL Certificate Verification"
+msgstr ""
+
+#. Number of actions
+msgid "Accept"
+msgstr "Glac leis"
+
+msgid "Reject"
+msgstr ""
+
+msgid "_View Certificate..."
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+
+#, c-format
+msgid "The certificate chain presented for %s is not valid."
+msgstr ""
+
+#. TODO: Make this error either block the ensuing SSL
+#. connection error until the user dismisses this one, or
+#. stifle it.
+#. TODO: Probably wrong.
+#. TODO: Probably wrong
+msgid "SSL Certificate Error"
+msgstr ""
+
+msgid "Invalid certificate chain"
+msgstr ""
+
+#. vrq will be completed by user_auth
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+
+#. vrq will be completed by user_auth
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
+msgstr ""
+
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+
+msgid "Invalid certificate authority signature"
+msgstr ""
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+
+#. Make messages
+#, c-format
+msgid ""
+"Common name: %s\n"
+"\n"
+"Fingerprint (SHA1): %s\n"
+"\n"
+"Activation date: %s\n"
+"Expiration date: %s\n"
+msgstr ""
+
+#. TODO: Find what the handle ought to be
+msgid "Certificate Information"
+msgstr ""
+
+msgid "Registration Error"
+msgstr ""
+
+msgid "Unregistration Error"
+msgstr ""
+
+#, c-format
+msgid "+++ %s signed on"
+msgstr ""
+
+#, c-format
+msgid "+++ %s signed off"
+msgstr ""
+
+#, fuzzy
+msgid "Unknown error"
+msgstr "Earraidh gan aithne"
+
+msgid "Unable to send message: The message is too large."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s."
+msgstr ""
+
+msgid "The message is too large."
+msgstr ""
+
+msgid "Unable to send message."
+msgstr ""
+
+msgid "Send Message"
+msgstr ""
+
+msgid "_Send Message"
+msgstr ""
+
+#, c-format
+msgid "%s entered the room."
+msgstr ""
+
+#, c-format
+msgid "%s [<I>%s</I>] entered the room."
+msgstr ""
+
+#, c-format
+msgid "You are now known as %s"
+msgstr ""
+
+#, c-format
+msgid "%s is now known as %s"
+msgstr ""
+
+#, c-format
+msgid "%s left the room."
+msgstr ""
+
+#, c-format
+msgid "%s left the room (%s)."
+msgstr ""
+
+#, c-format
+msgid "Failed to get connection: %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to get name: %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to get serv name: %s"
+msgstr ""
+
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr ""
+
+msgid "No name"
+msgstr "Gan-ainm"
+
+msgid "Unable to create new resolver process\n"
+msgstr ""
+
+msgid "Unable to send request to resolver process\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error resolving %s:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Error resolving %s: %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reading from resolver process:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "EOF while reading from resolver process"
+msgstr ""
+
+#, c-format
+msgid "Thread creation failure: %s"
+msgstr ""
+
+#, fuzzy
+msgid "Unknown reason"
+msgstr "Ní fios cén fáth"
+
+#, fuzzy, c-format
+msgid ""
+"Error reading %s: \n"
+"%s.\n"
+msgstr "earráid agus ag léamh %s"
+
+#, c-format
+msgid ""
+"Error writing %s: \n"
+"%s.\n"
+msgstr ""
+"Earráid ag scríobh %s: \n"
+"%s.\n"
+
+#, c-format
+msgid ""
+"Error accessing %s: \n"
+"%s.\n"
+msgstr ""
+
+msgid "Directory is not writable."
+msgstr ""
+
+msgid "Cannot send a file of 0 bytes."
+msgstr ""
+
+msgid "Cannot send a directory."
+msgstr ""
+
+#, c-format
+msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
+msgstr ""
+
+#, c-format
+msgid "%s wants to send you %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s wants to send you a file"
+msgstr ""
+
+#, c-format
+msgid "Accept file transfer request from %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"A file is available for download from:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+#, c-format
+msgid "%s is offering to send file %s"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid filename.\n"
+msgstr ""
+
+#, c-format
+msgid "Offering to send %s to %s"
+msgstr ""
+
+#, c-format
+msgid "Starting transfer of %s from %s"
+msgstr ""
+
+#, c-format
+msgid "Transfer of file %s complete"
+msgstr ""
+
+#, c-format
+msgid "File transfer complete"
+msgstr ""
+
+#, c-format
+msgid "You canceled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "File transfer cancelled"
+msgstr ""
+
+#, c-format
+msgid "%s canceled the transfer of %s"
+msgstr ""
+
+#, c-format
+msgid "%s canceled the file transfer"
+msgstr ""
+
+#, c-format
+msgid "File transfer to %s failed."
+msgstr ""
+
+#, c-format
+msgid "File transfer from %s failed."
+msgstr ""
+
+msgid "Run the command in a terminal"
+msgstr ""
+
+msgid "The command used to handle \"aim\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"gg\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"icq\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"irc\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"msnim\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"sip\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"xmpp\" URLs, if enabled."
+msgstr ""
+
+msgid "The command used to handle \"ymsgr\" URLs, if enabled."
+msgstr ""
+
+msgid "The handler for \"aim\" URLs"
+msgstr "An láimhseálaí le \"aim\" URLs"
+
+msgid "The handler for \"gg\" URLs"
+msgstr "An láimhseálaí le \"gg\" URLs"
+
+msgid "The handler for \"icq\" URLs"
+msgstr "An láimhseálaí le \"icq\" URLs"
+
+msgid "The handler for \"irc\" URLs"
+msgstr "An láimhseálaí le \"irc\" URLs"
+
+msgid "The handler for \"msnim\" URLs"
+msgstr "An láimhseálaí le \"msnim\" URLs"
+
+msgid "The handler for \"sip\" URLs"
+msgstr "An láimhseálaí le \"sip\" URLs"
+
+msgid "The handler for \"xmpp\" URLs"
+msgstr "An láimhseálaí le \"xmpp\" URLs"
+
+msgid "The handler for \"ymsgr\" URLs"
+msgstr "An láimhseálaí le \"ymsgr\" URLs"
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
+msgstr ""
+
+msgid ""
+"True if the command used to handle this type of URL should be run in a "
+"terminal."
+msgstr ""
+
+msgid "Whether the specified command should handle \"aim\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"gg\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"icq\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"irc\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"msnim\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"sip\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"xmpp\" URLs"
+msgstr ""
+
+msgid "Whether the specified command should handle \"ymsgr\" URLs"
+msgstr ""
+
+msgid "<b><font color=\"red\">The logger has no read function</font></b>"
+msgstr ""
+
+msgid "HTML"
+msgstr "HTML"
+
+#, fuzzy
+msgid "Plain text"
+msgstr "Gnáth-Théacs"
+
+msgid "Old flat format"
+msgstr ""
+
+msgid "Logging of this conversation failed."
+msgstr ""
+
+msgid "XML"
+msgstr "XML"
+
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+
+msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
+msgstr ""
+
+#, c-format
+msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
+msgstr ""
+
+#, c-format
+msgid "(%s) %s <AUTO-REPLY>: %s\n"
+msgstr ""
+
+#, c-format
+msgid "You are using %s, but this plugin requires %s."
+msgstr ""
+
+#, c-format
+msgid "This plugin has not defined an ID."
+msgstr ""
+
+#, c-format
+msgid "Plugin magic mismatch %d (need %d)"
+msgstr ""
+
+#, c-format
+msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
+msgstr ""
+
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+
+msgid "Unable to load the plugin"
+msgstr ""
+
+#, c-format
+msgid "The required plugin %s was unable to load."
+msgstr ""
+
+msgid "Unable to load your plugin."
+msgstr ""
+
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr ""
+
+msgid "Autoaccept"
+msgstr ""
+
+msgid "Auto-accept file transfer requests from selected users."
+msgstr ""
+
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr ""
+
+msgid "Autoaccept complete"
+msgstr ""
+
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr ""
+
+msgid "Set Autoaccept Setting"
+msgstr ""
+
+msgid "_Save"
+msgstr "_Sábháil"
+
+msgid "_Cancel"
+msgstr "_Cealaigh"
+
+msgid "Ask"
+msgstr "Fiafraigh"
+
+msgid "Auto Accept"
+msgstr ""
+
+msgid "Auto Reject"
+msgstr ""
+
+msgid "Autoaccept File Transfers..."
+msgstr ""
+
+#. XXX: Is there a better way than this? There really should be.
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+
+msgid "Automatically reject from users not in buddy list"
+msgstr ""
+
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+
+msgid "Create a new directory for each user"
+msgstr ""
+
+msgid "Notes"
+msgstr "Nótai"
+
+msgid "Enter your notes below..."
+msgstr ""
+
+msgid "Edit Notes..."
+msgstr ""
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Notes"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Store notes on particular buddies."
+msgstr ""
+
+#. *< summary
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Cipher Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests the ciphers that ship with libpurple."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "DBus Example"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "DBus Plugin Example"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "File Control"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Allows control by entering commands in a file."
+msgstr ""
+
+msgid "Minutes"
+msgstr "Nóiméid"
+
+#. 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 ""
+
+msgid "Set Account Idle Time"
+msgstr ""
+
+msgid "_Set"
+msgstr ""
+
+msgid "None of your accounts are idle."
+msgstr ""
+
+msgid "Unset Account Idle Time"
+msgstr ""
+
+msgid "_Unset"
+msgstr ""
+
+msgid "Set Idle Time for All Accounts"
+msgstr ""
+
+msgid "Unset Idle Time for All Idled Accounts"
+msgstr ""
+
+msgid "Allows you to hand-configure how long you've been idle"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Client"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a client."
+msgstr ""
+
+#. *  description
+msgid ""
+"Test plugin IPC support, as a client. This locates the server plugin and "
+"calls the commands registered."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "IPC Test Server"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Test plugin IPC support, as a server."
+msgstr ""
+
+#. *  description
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+
+msgid "Join/Part Hiding Configuration"
+msgstr ""
+
+msgid "Minimum Room Size"
+msgstr ""
+
+msgid "User Inactivity Timeout (in minutes)"
+msgstr ""
+
+msgid "Apply hiding rules to buddies"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Join/Part Hiding"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Hides extraneous join/part messages."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+
+#. This is used in the place of a timezone abbreviation if the
+#. * offset is way off.  The user should never really see it, but
+#. * it's here just in case.  The parens are to make it clear it's
+#. * not a real timezone.
+msgid "(UTC)"
+msgstr "(UTC)"
+
+msgid "User is offline."
+msgstr ""
+
+msgid "Auto-response sent:"
+msgstr ""
+
+#, c-format
+msgid "%s has signed off."
+msgstr ""
+
+msgid "One or more messages may have been undeliverable."
+msgstr ""
+
+msgid "You were disconnected from the server."
+msgstr ""
+
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+
+msgid "Message could not be sent because the maximum length was exceeded."
+msgstr ""
+
+msgid "Message could not be sent."
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Adium"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Fire"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Messenger Plus!"
+msgstr ""
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "QIP"
+msgstr "QIP"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "MSN Messenger"
+msgstr "MSN Messenger"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "Trillian"
+msgstr "Trillian"
+
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "aMSN"
+msgstr "aMSN"
+
+#. Add general preferences.
+msgid "General Log Reading Configuration"
+msgstr ""
+
+msgid "Fast size calculations"
+msgstr ""
+
+msgid "Use name heuristics"
+msgstr ""
+
+#. Add Log Directory preferences.
+msgid "Log Directory"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Log Reader"
+msgstr ""
+
+#. *< name
+#. *< version
+#. * summary
+msgid "Includes other IM clients' logs in the log viewer."
+msgstr ""
+
+#. * description
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+
+msgid "Mono Plugin Loader"
+msgstr ""
+
+msgid "Loads .NET plugins with Mono."
+msgstr ""
+
+msgid "Add new line in IMs"
+msgstr ""
+
+msgid "Add new line in Chats"
+msgstr ""
+
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "New Line"
+msgstr "Líne Nua"
+
+#. *< name
+#. *< version
+msgid "Prepends a newline to displayed message."
+msgstr ""
+
+#. *< summary
+msgid ""
+"Prepends a newline to messages so that the rest of the message appears below "
+"the username in the conversation window."
+msgstr ""
+
+msgid "Offline Message Emulation"
+msgstr ""
+
+msgid "Save messages sent to an offline user as pounce."
+msgstr ""
+
+msgid ""
+"The rest of the messages will be saved as pounce. You can edit/delete the "
+"pounce from the `Buddy Pounce' dialog."
+msgstr ""
+
+#, c-format
+msgid ""
+"\"%s\" is currently offline. Do you want to save the rest of the messages in "
+"a pounce and automatically send them when \"%s\" logs back in?"
+msgstr ""
+
+msgid "Offline Message"
+msgstr ""
+
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr ""
+
+msgid "Yes"
+msgstr "Tá"
+
+msgid "No"
+msgstr "Níl"
+
+msgid "Save offline messages in pounce"
+msgstr ""
+
+msgid "Do not ask. Always save in pounce."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Perl Plugin Loader"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+msgid "Provides support for loading perl plugins."
+msgstr ""
+
+msgid "Psychic Mode"
+msgstr ""
+
+msgid "Psychic mode for incoming conversation"
+msgstr ""
+
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+
+msgid "You feel a disturbance in the force..."
+msgstr ""
+
+msgid "Only enable for users on the buddy list"
+msgstr ""
+
+msgid "Disable when away"
+msgstr ""
+
+msgid "Display notification message in conversations"
+msgstr ""
+
+msgid "Raise psychic conversations"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all signals are working properly."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Simple Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Tests to see that most things are working."
+msgstr ""
+
+#. Scheme name
+msgid "X.509 Certificates"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GNUTLS"
+msgstr "GNUTLS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through GNUTLS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "NSS"
+msgstr "NSS"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides SSL support through Mozilla NSS."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "SSL"
+msgstr "SSL"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a wrapper around SSL support libraries."
+msgstr ""
+
+#, c-format
+msgid "%s is no longer away."
+msgstr ""
+
+#, c-format
+msgid "%s has gone away."
+msgstr ""
+
+#, c-format
+msgid "%s has become idle."
+msgstr ""
+
+#, c-format
+msgid "%s is no longer idle."
+msgstr ""
+
+#, c-format
+msgid "%s has signed on."
+msgstr ""
+
+msgid "Notify When"
+msgstr ""
+
+msgid "Buddy Goes _Away"
+msgstr ""
+
+msgid "Buddy Goes _Idle"
+msgstr ""
+
+msgid "Buddy _Signs On/Off"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy State Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+
+msgid "Tcl Plugin Loader"
+msgstr ""
+
+msgid "Provides support for loading Tcl plugins"
+msgstr ""
+
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
+msgstr ""
+
+msgid "Unable to listen for incoming IM connections\n"
+msgstr ""
+
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+
+#. Creating the options for the protocol
+msgid "First name"
+msgstr "Ainm Baiste"
+
+msgid "Last name"
+msgstr "Sloinne"
+
+msgid "Email"
+msgstr "Ríomhphost"
+
+msgid "AIM Account"
+msgstr "Cuntas AIM"
+
+msgid "XMPP Account"
+msgstr "XMPP Account"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Bonjour Protocol Plugin"
+msgstr "Bonjour Prótacal Breiseán"
+
+msgid "Purple Person"
+msgstr ""
+
+msgid "Bonjour"
+msgstr "Bonjour"
+
+#, c-format
+msgid "%s has closed the conversation."
+msgstr ""
+
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr ""
+
+msgid "Cannot open socket"
+msgstr ""
+
+msgid "Could not bind socket to port"
+msgstr ""
+
+msgid "Could not listen on socket"
+msgstr ""
+
+msgid "Error communicating with local mDNSResponder."
+msgstr ""
+
+msgid "Invalid proxy settings"
+msgstr ""
+
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+
+msgid "Token Error"
+msgstr ""
+
+msgid "Unable to fetch the token.\n"
+msgstr ""
+
+msgid "Save Buddylist..."
+msgstr ""
+
+msgid "Your buddylist is empty, nothing was written to the file."
+msgstr ""
+
+msgid "Buddylist saved successfully!"
+msgstr ""
+
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr ""
+
+msgid "Couldn't load buddylist"
+msgstr ""
+
+msgid "Load Buddylist..."
+msgstr ""
+
+msgid "Buddylist loaded successfully!"
+msgstr ""
+
+msgid "Save buddylist..."
+msgstr ""
+
+msgid "Load buddylist from file..."
+msgstr ""
+
+msgid "Fill in the registration fields."
+msgstr ""
+
+msgid "Passwords do not match."
+msgstr ""
+
+msgid "Unable to register new account. Error occurred.\n"
+msgstr ""
+
+msgid "New Gadu-Gadu Account Registered"
+msgstr ""
+
+msgid "Registration completed successfully!"
+msgstr ""
+
+msgid "Password"
+msgstr "Pasfhocal"
+
+msgid "Password (retype)"
+msgstr ""
+
+msgid "Enter current token"
+msgstr ""
+
+msgid "Current token"
+msgstr ""
+
+msgid "Register New Gadu-Gadu Account"
+msgstr ""
+
+msgid "Please, fill in the following fields"
+msgstr ""
+
+msgid "City"
+msgstr "Cathair"
+
+msgid "Year of birth"
+msgstr ""
+
+msgid "Gender"
+msgstr "Cineál"
+
+msgid "Male or female"
+msgstr "Fireannach nó baineannach"
+
+msgid "Male"
+msgstr "Fireannach"
+
+msgid "Female"
+msgstr "Baineannach"
+
+msgid "Only online"
+msgstr ""
+
+msgid "Find buddies"
+msgstr ""
+
+msgid "Please, enter your search criteria below"
+msgstr ""
+
+msgid "Fill in the fields."
+msgstr ""
+
+msgid "Your current password is different from the one that you specified."
+msgstr ""
+
+msgid "Unable to change password. Error occurred.\n"
+msgstr ""
+
+msgid "Change password for the Gadu-Gadu account"
+msgstr ""
+
+msgid "Password was changed successfully!"
+msgstr ""
+
+msgid "Current password"
+msgstr ""
+
+msgid "Please, enter your current password and your new password for UIN: "
+msgstr ""
+
+msgid "Change Gadu-Gadu Password"
+msgstr ""
+
+#, c-format
+msgid "Select a chat for buddy: %s"
+msgstr ""
+
+msgid "Add to chat..."
+msgstr "Cuir le comhrá..."
+
+# infhaighte???
+msgid "Available"
+msgstr "Ar fáil"
+
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#, c-format
+msgid "Away"
+msgstr "Shiúl"
+
+msgid "UIN"
+msgstr "UIN"
+
+msgid "First Name"
+msgstr "Ainm Baiste:"
+
+msgid "Birth Year"
+msgstr ""
+
+msgid "Unable to display the search results."
+msgstr ""
+
+msgid "Gadu-Gadu Public Directory"
+msgstr ""
+
+msgid "Search results"
+msgstr ""
+
+msgid "No matching users found"
+msgstr ""
+
+msgid "There are no users matching your search criteria."
+msgstr ""
+
+msgid "Unable to read socket"
+msgstr ""
+
+msgid "Buddy list downloaded"
+msgstr ""
+
+msgid "Your buddy list was downloaded from the server."
+msgstr ""
+
+msgid "Buddy list uploaded"
+msgstr ""
+
+msgid "Your buddy list was stored on the server."
+msgstr ""
+
+msgid "Connection failed."
+msgstr ""
+
+msgid "Add to chat"
+msgstr "Cuir le comhrá"
+
+msgid "Chat _name:"
+msgstr ""
+
+msgid "Chat error"
+msgstr ""
+
+msgid "This chat name is already in use"
+msgstr ""
+
+msgid "Not connected to the server."
+msgstr ""
+
+msgid "Find buddies..."
+msgstr ""
+
+#, fuzzy
+msgid "Change password..."
+msgstr "Athraigh focal faire"
+
+msgid "Upload buddylist to Server"
+msgstr ""
+
+msgid "Download buddylist from Server"
+msgstr ""
+
+msgid "Delete buddylist from Server"
+msgstr ""
+
+msgid "Save buddylist to file..."
+msgstr ""
+
+#. magic
+#. major_version
+#. minor_version
+#. plugin type
+#. ui_requirement
+#. flags
+#. dependencies
+#. priority
+#. id
+#. name
+#. version
+msgid "Gadu-Gadu Protocol Plugin"
+msgstr "Gadu-Gadu Prótacal Breiseán"
+
+#. summary
+msgid "Polish popular IM"
+msgstr ""
+
+msgid "Gadu-Gadu User"
+msgstr "Gadu-Gadu Úsáideoir"
+
+#, fuzzy, c-format
+msgid "Unknown command: %s"
+msgstr "ordú anaithnid: `%c'"
+
+#, c-format
+msgid "current topic is: %s"
+msgstr ""
+
+msgid "No topic is set"
+msgstr ""
+
+msgid "File Transfer Failed"
+msgstr ""
+
+msgid "Could not open a listening port."
+msgstr ""
+
+msgid "Error displaying MOTD"
+msgstr ""
+
+msgid "No MOTD available"
+msgstr ""
+
+msgid "There is no MOTD associated with this connection."
+msgstr ""
+
+#, c-format
+msgid "MOTD for %s"
+msgstr "MOTD le %s"
+
+msgid "Server has disconnected"
+msgstr ""
+
+msgid "View MOTD"
+msgstr "Amharc MOTD"
+
+#, fuzzy
+msgid "_Channel:"
+msgstr "Bealach"
+
+msgid "_Password:"
+msgstr "_Pasfhocal:"
+
+msgid "IRC nicks may not contain whitespace"
+msgstr ""
+
+#. 1. connect to server
+#. connect to the server
+msgid "Connecting"
+msgstr "Nasctha"
+
+msgid "SSL support unavailable"
+msgstr ""
+
+msgid "Couldn't create socket"
+msgstr ""
+
+msgid "Couldn't connect to host"
+msgstr ""
+
+#, fuzzy
+msgid "Read error"
+msgstr "Earráid sa léamh"
+
+msgid "Users"
+msgstr "Úsáideoirí"
+
+msgid "Topic"
+msgstr "Ábhar"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "IRC Protocol Plugin"
+msgstr "IRC Prótacal Breiseán"
+
+#. *  summary
+msgid "The IRC Protocol Plugin that Sucks Less"
+msgstr ""
+
+#. host to connect to
+msgid "Server"
+msgstr "Freastalaí"
+
+#. port to connect to
+msgid "Port"
+msgstr "Port"
+
+msgid "Encodings"
+msgstr ""
+
+msgid "Auto-detect incoming UTF-8"
+msgstr ""
+
+msgid "Real name"
+msgstr ""
+
+#.
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
+#.
+msgid "Use SSL"
+msgstr "Úsáid SSL"
+
+msgid "Bad mode"
+msgstr ""
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr ""
+
+#, c-format
+msgid "Ban on %s"
+msgstr ""
+
+msgid "End of ban list"
+msgstr ""
+
+#, c-format
+msgid "You are banned from %s."
+msgstr ""
+
+msgid "Banned"
+msgstr ""
+
+#, c-format
+msgid "Cannot ban %s: banlist is full"
+msgstr ""
+
+msgid " <i>(ircop)</i>"
+msgstr " <i>(ircop)</i>"
+
+msgid " <i>(identified)</i>"
+msgstr ""
+
+msgid "Nick"
+msgstr ""
+
+msgid "Currently on"
+msgstr ""
+
+msgid "Idle for"
+msgstr ""
+
+msgid "Online since"
+msgstr ""
+
+msgid "<b>Defining adjective:</b>"
+msgstr ""
+
+msgid "Glorious"
+msgstr ""
+
+#, c-format
+msgid "%s has changed the topic to: %s"
+msgstr ""
+
+#, c-format
+msgid "%s has cleared the topic."
+msgstr ""
+
+#, c-format
+msgid "The topic for %s is: %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown message '%s'"
+msgstr ""
+
+msgid "Unknown message"
+msgstr ""
+
+msgid "The IRC server received a message it did not understand."
+msgstr ""
+
+#, c-format
+msgid "Users on %s: %s"
+msgstr ""
+
+msgid "Time Response"
+msgstr ""
+
+msgid "The IRC server's local time is:"
+msgstr ""
+
+msgid "No such channel"
+msgstr ""
+
+#. does this happen?
+msgid "no such channel"
+msgstr ""
+
+msgid "User is not logged in"
+msgstr ""
+
+msgid "No such nick or channel"
+msgstr ""
+
+msgid "Could not send"
+msgstr ""
+
+#, c-format
+msgid "Joining %s requires an invitation."
+msgstr ""
+
+msgid "Invitation only"
+msgstr ""
+
+#, c-format
+msgid "You have been kicked by %s: (%s)"
+msgstr ""
+
+#. Remove user from channel
+#, c-format
+msgid "Kicked by %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "mode (%s %s) by %s"
+msgstr ""
+
+msgid "Invalid nickname"
+msgstr ""
+
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+
+msgid "Cannot change nick"
+msgstr ""
+
+msgid "Could not change nick"
+msgstr ""
+
+#, c-format
+msgid "You have parted the channel%s%s"
+msgstr ""
+
+msgid "Error: invalid PONG from server"
+msgstr ""
+
+#, c-format
+msgid "PING reply -- Lag: %lu seconds"
+msgstr ""
+
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr ""
+
+msgid "Cannot join channel"
+msgstr ""
+
+msgid "Nick or channel is temporarily unavailable."
+msgstr ""
+
+#, c-format
+msgid "Wallops from %s"
+msgstr ""
+
+msgid "action &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr ""
+
+msgid "chanserv: Send a command to chanserv"
+msgstr ""
+
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+
+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 ""
+
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+
+msgid "me &lt;action to perform&gt;:  Perform an action."
+msgstr ""
+
+msgid "memoserv: Send a command to memoserv"
+msgstr ""
+
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+msgid "names [channel]:  List the users currently in a channel."
+msgstr ""
+
+msgid "nick &lt;new nickname&gt;:  Change your nickname."
+msgstr ""
+
+msgid "nickserv: Send a command to nickserv"
+msgstr ""
+
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr ""
+
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+
+msgid "operserv: Send a command to operserv"
+msgstr ""
+
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+
+msgid "quit [message]:  Disconnect from the server, with an optional message."
+msgstr ""
+
+msgid "quote [...]:  Send a raw command to the server."
+msgstr ""
+
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+
+msgid "time: Displays the current local time at the IRC server."
+msgstr ""
+
+msgid "topic [new topic]:  View or change the channel topic."
+msgstr ""
+
+msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
+msgstr ""
+
+msgid "version [nick]: send CTCP VERSION request to a user"
+msgstr ""
+
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+
+msgid "whois [server] &lt;nick&gt;:  Get information on a user."
+msgstr ""
+
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+
+#, c-format
+msgid "Reply time from %s: %lu seconds"
+msgstr ""
+
+msgid "PONG"
+msgstr "PONG"
+
+msgid "CTCP PING reply"
+msgstr ""
+
+msgid "Disconnected."
+msgstr ""
+
+#, fuzzy
+msgid "Unknown Error"
+msgstr "Earráid anaithnid=(%d)\n"
+
+msgid "Ad-Hoc Command Failed"
+msgstr ""
+
+#, fuzzy
+msgid "execute"
+msgstr "Deán"
+
+msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
+msgstr ""
+
+msgid "You require encryption, but no TLS/SSL support found."
+msgstr ""
+
+msgid "Server requires plaintext authentication over an unencrypted stream"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+
+msgid "Plaintext Authentication"
+msgstr ""
+
+msgid "Invalid response from server."
+msgstr ""
+
+msgid "Server does not use any supported authentication method"
+msgstr ""
+
+msgid "Invalid challenge from server"
+msgstr ""
+
+msgid "SASL error"
+msgstr ""
+
+msgid "Full Name"
+msgstr "Ainm Iomlán"
+
+msgid "Family Name"
+msgstr "Sloinne"
+
+msgid "Given Name"
+msgstr "Ainm Baiste"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "Street Address"
+msgstr "Seoladh Stráid"
+
+msgid "Extended Address"
+msgstr "Seoladh Fhada"
+
+#, fuzzy
+msgid "Locality"
+msgstr "Ceantar"
+
+#, fuzzy
+msgid "Region"
+msgstr "Ceantar"
+
+#, fuzzy
+msgid "Postal Code"
+msgstr "Cód Phoist"
+
+#, fuzzy
+msgid "Country"
+msgstr "Ceolta Tuaithe"
+
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
+msgid "Telephone"
+msgstr "Guthán"
+
+msgid "Organization Name"
+msgstr ""
+
+msgid "Organization Unit"
+msgstr ""
+
+#, fuzzy
+msgid "Role"
+msgstr "Post"
+
+msgid "Birthday"
+msgstr "Lá breithe"
+
+#, fuzzy
+msgid "Description"
+msgstr "Tuarascail"
+
+msgid "Edit XMPP vCard"
+msgstr ""
+
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+
+#, fuzzy
+msgid "Client"
+msgstr "Cliant:"
+
+msgid "Operating System"
+msgstr "Córas Oibriúcháin"
+
+msgid "Last Activity"
+msgstr ""
+
+msgid "Service Discovery Info"
+msgstr ""
+
+msgid "Service Discovery Items"
+msgstr ""
+
+msgid "Extended Stanza Addressing"
+msgstr ""
+
+msgid "Multi-User Chat"
+msgstr ""
+
+msgid "Multi-User Chat Extended Presence Information"
+msgstr ""
+
+msgid "In-Band Bytestreams"
+msgstr ""
+
+msgid "Ad-Hoc Commands"
+msgstr ""
+
+msgid "PubSub Service"
+msgstr ""
+
+msgid "SOCKS5 Bytestreams"
+msgstr "SOCKS5 Bytestreams"
+
+msgid "Out of Band Data"
+msgstr ""
+
+msgid "XHTML-IM"
+msgstr "XHTML-IM"
+
+msgid "In-Band Registration"
+msgstr ""
+
+msgid "User Location"
+msgstr ""
+
+msgid "User Avatar"
+msgstr ""
+
+msgid "Chat State Notifications"
+msgstr ""
+
+msgid "Software Version"
+msgstr ""
+
+msgid "Stream Initiation"
+msgstr ""
+
+msgid "File Transfer"
+msgstr ""
+
+msgid "User Mood"
+msgstr ""
+
+msgid "User Activity"
+msgstr ""
+
+msgid "Entity Capabilities"
+msgstr ""
+
+msgid "Encrypted Session Negotiations"
+msgstr ""
+
+msgid "User Tune"
+msgstr ""
+
+msgid "Roster Item Exchange"
+msgstr ""
+
+msgid "Reachability Address"
+msgstr ""
+
+msgid "User Profile"
+msgstr ""
+
+msgid "Jingle"
+msgstr ""
+
+msgid "Jingle Audio"
+msgstr ""
+
+msgid "User Nickname"
+msgstr ""
+
+msgid "Jingle ICE UDP"
+msgstr ""
+
+msgid "Jingle ICE TCP"
+msgstr ""
+
+msgid "Jingle Raw UDP"
+msgstr ""
+
+msgid "Jingle Video"
+msgstr ""
+
+msgid "Jingle DTMF"
+msgstr ""
+
+msgid "Message Receipts"
+msgstr ""
+
+msgid "Public Key Publishing"
+msgstr ""
+
+msgid "User Chatting"
+msgstr ""
+
+msgid "User Browsing"
+msgstr ""
+
+msgid "User Gaming"
+msgstr ""
+
+msgid "User Viewing"
+msgstr ""
+
+msgid "Ping"
+msgstr "Ping"
+
+msgid "Stanza Encryption"
+msgstr ""
+
+msgid "Entity Time"
+msgstr ""
+
+msgid "Delayed Delivery"
+msgstr ""
+
+msgid "Collaborative Data Objects"
+msgstr ""
+
+msgid "File Repository and Sharing"
+msgstr ""
+
+msgid "STUN Service Discovery for Jingle"
+msgstr ""
+
+msgid "Simplified Encrypted Session Negotiation"
+msgstr ""
+
+msgid "Hop Check"
+msgstr ""
+
+msgid "Capabilities"
+msgstr ""
+
+#, fuzzy
+msgid "Priority"
+msgstr "Tosaíocht"
+
+msgid "Resource"
+msgstr ""
+
+msgid "Middle Name"
+msgstr ""
+
+msgid "Address"
+msgstr "Seoladh"
+
+#, fuzzy
+msgid "P.O. Box"
+msgstr "Bosca"
+
+#, fuzzy
+msgid "Photo"
+msgstr "Grianghraf"
+
+#, fuzzy
+msgid "Logo"
+msgstr "Siombail"
+
+msgid "Un-hide From"
+msgstr ""
+
+msgid "Temporarily Hide From"
+msgstr ""
+
+#. && NOT ME
+msgid "Cancel Presence Notification"
+msgstr ""
+
+msgid "(Re-)Request authorization"
+msgstr ""
+
+#. if(NOT ME)
+#. shouldn't this just happen automatically when the buddy is
+#. removed?
+msgid "Unsubscribe"
+msgstr ""
+
+msgid "Log In"
+msgstr ""
+
+msgid "Log Out"
+msgstr ""
+
+msgid "Chatty"
+msgstr ""
+
+msgid "Extended Away"
+msgstr ""
+
+#, c-format
+msgid "Do Not Disturb"
+msgstr ""
+
+msgid "JID"
+msgstr "JID"
+
+msgid "Last Name"
+msgstr "Sloinne"
+
+msgid "The following are the results of your search"
+msgstr ""
+
+#. current comment from Jabber User Directory users.jabber.org
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+
+msgid "Directory Query Failed"
+msgstr ""
+
+msgid "Could not query the directory server."
+msgstr ""
+
+#. Try to translate the message (see static message
+#. list in jabber_user_dir_comments[])
+#, c-format
+msgid "Server Instructions: %s"
+msgstr ""
+
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+
+msgid "Email Address"
+msgstr "Ríomhsheoladh"
+
+msgid "Search for XMPP users"
+msgstr ""
+
+#. "Search"
+#, fuzzy
+msgid "Search"
+msgstr "Cuardach"
+
+msgid "Invalid Directory"
+msgstr ""
+
+msgid "Enter a User Directory"
+msgstr ""
+
+msgid "Select a user directory to search"
+msgstr ""
+
+msgid "Search Directory"
+msgstr ""
+
+msgid "_Room:"
+msgstr "_Seomra:"
+
+#, fuzzy
+msgid "_Server:"
+msgstr "Freastalaí"
+
+msgid "_Handle:"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid room name"
+msgstr ""
+
+msgid "Invalid Room Name"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid server name"
+msgstr ""
+
+msgid "Invalid Server Name"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid room handle"
+msgstr ""
+
+msgid "Invalid Room Handle"
+msgstr ""
+
+msgid "Configuration error"
+msgstr ""
+
+msgid "Unable to configure"
+msgstr ""
+
+msgid "Room Configuration Error"
+msgstr ""
+
+msgid "This room is not capable of being configured"
+msgstr ""
+
+msgid "Registration error"
+msgstr ""
+
+msgid "Nick changing not supported in non-MUC chatrooms"
+msgstr ""
+
+msgid "Error retrieving room list"
+msgstr ""
+
+msgid "Invalid Server"
+msgstr ""
+
+msgid "Enter a Conference Server"
+msgstr ""
+
+msgid "Select a conference server to query"
+msgstr ""
+
+msgid "Find Rooms"
+msgstr ""
+
+msgid "You require encryption, but it is not available on this server."
+msgstr ""
+
+#, fuzzy
+msgid "Write error"
+msgstr "Earráid sa scríobh"
+
+msgid "Ping timeout"
+msgstr ""
+
+#, fuzzy
+msgid "Read Error"
+msgstr "earráid ag léamh"
+
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+
+msgid "Unable to create socket"
+msgstr ""
+
+msgid "Invalid XMPP ID"
+msgstr "XMPP ID Neamhbhailí "
+
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr ""
+
+#, c-format
+msgid "Registration of %s@%s successful"
+msgstr ""
+
+#, c-format
+msgid "Registration to %s successful"
+msgstr ""
+
+msgid "Registration Successful"
+msgstr ""
+
+msgid "Registration Failed"
+msgstr ""
+
+#, c-format
+msgid "Registration from %s successfully removed"
+msgstr ""
+
+msgid "Unregistration Successful"
+msgstr ""
+
+msgid "Unregistration Failed"
+msgstr ""
+
+msgid "Already Registered"
+msgstr ""
+
+#, fuzzy
+msgid "State"
+msgstr "Stát"
+
+#, fuzzy
+msgid "Postal code"
+msgstr "Cód Phoist"
+
+msgid "Phone"
+msgstr "Guthán"
+
+msgid "Date"
+msgstr "Dáta"
+
+msgid "Unregister"
+msgstr ""
+
+msgid ""
+"Please fill out the information below to change your account registration."
+msgstr ""
+
+msgid "Please fill out the information below to register your new account."
+msgstr ""
+
+msgid "Register New XMPP Account"
+msgstr ""
+
+msgid "Register"
+msgstr ""
+
+#, c-format
+msgid "Change Account Registration at %s"
+msgstr ""
+
+#, c-format
+msgid "Register New Account at %s"
+msgstr ""
+
+msgid "Change Registration"
+msgstr ""
+
+msgid "Error unregistering account"
+msgstr ""
+
+msgid "Account successfully unregistered"
+msgstr ""
+
+msgid "Initializing Stream"
+msgstr ""
+
+msgid "Initializing SSL/TLS"
+msgstr ""
+
+msgid "Authenticating"
+msgstr ""
+
+msgid "Re-initializing Stream"
+msgstr ""
+
+msgid "Not Authorized"
+msgstr "Níl údaraithe"
+
+msgid "Both"
+msgstr "Araon"
+
+msgid "From (To pending)"
+msgstr ""
+
+#, fuzzy
+msgid "From"
+msgstr "Ó"
+
+#, fuzzy
+msgid "To"
+msgstr "Do"
+
+msgid "None (To pending)"
+msgstr ""
+
+#, fuzzy
+msgid "None"
+msgstr "Tada"
+
+msgid "Subscription"
+msgstr ""
+
+#, fuzzy
+msgid "Mood"
+msgstr "fonn"
+
+msgid "Now Listening"
+msgstr ""
+
+msgid "Mood Text"
+msgstr ""
+
+msgid "Allow Buzz"
+msgstr ""
+
+msgid "Tune Artist"
+msgstr ""
+
+msgid "Tune Title"
+msgstr ""
+
+msgid "Tune Album"
+msgstr ""
+
+msgid "Tune Genre"
+msgstr ""
+
+msgid "Tune Comment"
+msgstr ""
+
+msgid "Tune Track"
+msgstr ""
+
+msgid "Tune Time"
+msgstr ""
+
+msgid "Tune Year"
+msgstr ""
+
+msgid "Tune URL"
+msgstr ""
+
+msgid "Password Changed"
+msgstr ""
+
+msgid "Your password has been changed."
+msgstr ""
+
+msgid "Error changing password"
+msgstr ""
+
+msgid "Password (again)"
+msgstr ""
+
+msgid "Change XMPP Password"
+msgstr ""
+
+msgid "Please enter your new password"
+msgstr ""
+
+msgid "Set User Info..."
+msgstr ""
+
+#. if (js->protocol_options & CHANGE_PASSWORD) {
+#, fuzzy
+msgid "Change Password..."
+msgstr "Athraigh focal faire"
+
+#. }
+msgid "Search for Users..."
+msgstr ""
+
+msgid "Bad Request"
+msgstr ""
+
+msgid "Conflict"
+msgstr ""
+
+msgid "Feature Not Implemented"
+msgstr ""
+
+msgid "Forbidden"
+msgstr ""
+
+msgid "Gone"
+msgstr ""
+
+msgid "Internal Server Error"
+msgstr ""
+
+msgid "Item Not Found"
+msgstr ""
+
+msgid "Malformed XMPP ID"
+msgstr ""
+
+msgid "Not Acceptable"
+msgstr ""
+
+msgid "Not Allowed"
+msgstr ""
+
+msgid "Payment Required"
+msgstr ""
+
+msgid "Recipient Unavailable"
+msgstr ""
+
+msgid "Registration Required"
+msgstr ""
+
+msgid "Remote Server Not Found"
+msgstr ""
+
+msgid "Remote Server Timeout"
+msgstr ""
+
+msgid "Server Overloaded"
+msgstr ""
+
+msgid "Service Unavailable"
+msgstr ""
+
+msgid "Subscription Required"
+msgstr ""
+
+msgid "Unexpected Request"
+msgstr ""
+
+msgid "Authorization Aborted"
+msgstr ""
+
+msgid "Incorrect encoding in authorization"
+msgstr ""
+
+msgid "Invalid authzid"
+msgstr ""
+
+msgid "Invalid Authorization Mechanism"
+msgstr ""
+
+msgid "Authorization mechanism too weak"
+msgstr ""
+
+msgid "Temporary Authentication Failure"
+msgstr ""
+
+msgid "Authentication Failure"
+msgstr ""
+
+msgid "Bad Format"
+msgstr ""
+
+msgid "Bad Namespace Prefix"
+msgstr ""
+
+msgid "Resource Conflict"
+msgstr ""
+
+msgid "Connection Timeout"
+msgstr ""
+
+msgid "Host Gone"
+msgstr ""
+
+#, fuzzy
+msgid "Host Unknown"
+msgstr "Óstríomhaire anaithnid"
+
+msgid "Improper Addressing"
+msgstr ""
+
+msgid "Invalid ID"
+msgstr "ID Neamhbhailí"
+
+msgid "Invalid Namespace"
+msgstr ""
+
+msgid "Invalid XML"
+msgstr "XML Neamhbhailí"
+
+msgid "Non-matching Hosts"
+msgstr ""
+
+msgid "Policy Violation"
+msgstr ""
+
+msgid "Remote Connection Failed"
+msgstr ""
+
+msgid "Resource Constraint"
+msgstr ""
+
+msgid "Restricted XML"
+msgstr ""
+
+msgid "See Other Host"
+msgstr ""
+
+msgid "System Shutdown"
+msgstr ""
+
+msgid "Undefined Condition"
+msgstr ""
+
+msgid "Unsupported Encoding"
+msgstr ""
+
+msgid "Unsupported Stanza Type"
+msgstr ""
+
+msgid "Unsupported Version"
+msgstr ""
+
+msgid "XML Not Well Formed"
+msgstr ""
+
+msgid "Stream Error"
+msgstr ""
+
+#, c-format
+msgid "Unable to ban user %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown affiliation: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unable to affiliate user %s as \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unknown role: \"%s\""
+msgstr ""
+
+#, c-format
+msgid "Unable to set role \"%s\" for user: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to kick user %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to ping user %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because there is nothing known about user %s."
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because user %s might be offline."
+msgstr ""
+
+#, c-format
+msgid "Unable to buzz, because the user %s does not support it."
+msgstr ""
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr ""
+
+#, c-format
+msgid "%s has buzzed you!"
+msgstr ""
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr ""
+
+msgid "config:  Configure a chat room."
+msgstr ""
+
+msgid "configure:  Configure a chat room."
+msgstr ""
+
+msgid "part [room]:  Leave the room."
+msgstr ""
+
+msgid "register:  Register with a chat room."
+msgstr ""
+
+msgid "topic [new topic]:  View or change the topic."
+msgstr ""
+
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr ""
+
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+
+msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
+msgstr ""
+
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
+msgstr ""
+
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr ""
+
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+
+msgid "ping &lt;jid&gt;:\tPing a user/component/server."
+msgstr ""
+
+msgid "buzz: Buzz a user to get their attention"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Prótacal Breiseán"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+msgid "Domain"
+msgstr "Fearann"
+
+msgid "Require SSL/TLS"
+msgstr ""
+
+msgid "Force old (port 5223) SSL"
+msgstr ""
+
+msgid "Allow plaintext auth over unencrypted streams"
+msgstr ""
+
+msgid "Connect port"
+msgstr ""
+
+#. TODO: default to automatically try different ports. Make the user be
+#. * able to set the first port to try (like LastConnectedPort in Windows client).
+#. Account options
+msgid "Connect server"
+msgstr ""
+
+msgid "File transfer proxies"
+msgstr ""
+
+#, c-format
+msgid "%s has left the conversation."
+msgstr ""
+
+#, c-format
+msgid "Message from %s"
+msgstr ""
+
+#, c-format
+msgid "%s has set the topic to: %s"
+msgstr ""
+
+#, c-format
+msgid "The topic is: %s"
+msgstr ""
+
+#, c-format
+msgid "Message delivery to %s failed: %s"
+msgstr ""
+
+msgid "XMPP Message Error"
+msgstr ""
+
+#, c-format
+msgid "(Code %s)"
+msgstr "(Code %s)"
+
+msgid "XML Parse error"
+msgstr ""
+
+msgid "Unknown Error in presence"
+msgstr ""
+
+msgid "Create New Room"
+msgstr ""
+
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+
+msgid "_Configure Room"
+msgstr ""
+
+msgid "_Accept Defaults"
+msgstr ""
+
+#, c-format
+msgid "Error joining chat %s"
+msgstr ""
+
+#, c-format
+msgid "Error in chat %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, user does not support file transfers"
+msgstr ""
+
+msgid "File Send Failed"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr ""
+
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+
+#, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
+msgstr ""
+
+msgid "Select a Resource"
+msgstr ""
+
+msgid "Edit User Mood"
+msgstr ""
+
+msgid "Please select your mood from the list."
+msgstr ""
+
+msgid "Set"
+msgstr ""
+
+msgid "Set Mood..."
+msgstr ""
+
+msgid "Set User Nickname"
+msgstr ""
+
+msgid "Please specify a new nickname for you."
+msgstr ""
+
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+
+msgid "Set Nickname..."
+msgstr ""
+
+#, fuzzy
+msgid "Actions"
+msgstr "Aicsin"
+
+msgid "Select an action"
+msgstr ""
+
+msgid "Unable to retrieve MSN Address Book"
+msgstr ""
+
+#, c-format
+msgid "Buddy list synchronization issue in %s (%s)"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+
+#, c-format
+msgid "Unable to parse message"
+msgstr ""
+
+#, c-format
+msgid "Syntax Error (probably a client bug)"
+msgstr ""
+
+#, c-format
+msgid "Invalid email address"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "User does not exist"
+msgstr "Níl úsáideoir '%s' ar bith ann."
+
+#, c-format
+msgid "Fully qualified domain name missing"
+msgstr ""
+
+#, c-format
+msgid "Already logged in"
+msgstr ""
+
+#, c-format
+msgid "Invalid username"
+msgstr ""
+
+#, c-format
+msgid "Invalid friendly name"
+msgstr ""
+
+#, c-format
+msgid "List full"
+msgstr ""
+
+#, c-format
+msgid "Already there"
+msgstr ""
+
+#, c-format
+msgid "Not on list"
+msgstr ""
+
+#, c-format
+msgid "User is offline"
+msgstr ""
+
+#, c-format
+msgid "Already in the mode"
+msgstr ""
+
+#, c-format
+msgid "Already in opposite list"
+msgstr ""
+
+#, c-format
+msgid "Too many groups"
+msgstr ""
+
+#, c-format
+msgid "Invalid group"
+msgstr "grúpa Neamhbhailí"
+
+#, c-format
+msgid "User not in group"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Group name too long"
+msgstr "Ainm grúpa rófhada"
+
+#, c-format
+msgid "Cannot remove group zero"
+msgstr ""
+
+#, c-format
+msgid "Tried to add a user to a group that doesn't exist"
+msgstr ""
+
+#, c-format
+msgid "Switchboard failed"
+msgstr ""
+
+#, c-format
+msgid "Notify transfer failed"
+msgstr ""
+
+#, c-format
+msgid "Required fields missing"
+msgstr ""
+
+#, c-format
+msgid "Too many hits to a FND"
+msgstr ""
+
+#, c-format
+msgid "Not logged in"
+msgstr ""
+
+#, c-format
+msgid "Service temporarily unavailable"
+msgstr ""
+
+#, c-format
+msgid "Database server error"
+msgstr ""
+
+#, c-format
+msgid "Command disabled"
+msgstr ""
+
+#, c-format
+msgid "File operation error"
+msgstr ""
+
+#, c-format
+msgid "Memory allocation error"
+msgstr ""
+
+#, c-format
+msgid "Wrong CHL value sent to server"
+msgstr ""
+
+#, c-format
+msgid "Server busy"
+msgstr ""
+
+#, c-format
+msgid "Server unavailable"
+msgstr ""
+
+#, c-format
+msgid "Peer notification server down"
+msgstr ""
+
+#, c-format
+msgid "Database connect error"
+msgstr ""
+
+#, c-format
+msgid "Server is going down (abandon ship)"
+msgstr ""
+
+#, c-format
+msgid "Error creating connection"
+msgstr ""
+
+#, c-format
+msgid "CVR parameters are either unknown or not allowed"
+msgstr ""
+
+#, c-format
+msgid "Unable to write"
+msgstr ""
+
+#, c-format
+msgid "Session overload"
+msgstr ""
+
+#, c-format
+msgid "User is too active"
+msgstr ""
+
+#, c-format
+msgid "Too many sessions"
+msgstr ""
+
+#, c-format
+msgid "Passport not verified"
+msgstr ""
+
+#, c-format
+msgid "Bad friend file"
+msgstr ""
+
+#, c-format
+msgid "Not expected"
+msgstr ""
+
+#, c-format
+msgid "Friendly name changes too rapidly"
+msgstr ""
+
+#, c-format
+msgid "Server too busy"
+msgstr ""
+
+#, c-format
+msgid "Authentication failed"
+msgstr ""
+
+#, c-format
+msgid "Not allowed when offline"
+msgstr ""
+
+#, c-format
+msgid "Not accepting new users"
+msgstr ""
+
+#, c-format
+msgid "Kids Passport without parental consent"
+msgstr ""
+
+#, c-format
+msgid "Passport account not yet verified"
+msgstr ""
+
+#, c-format
+msgid "Bad ticket"
+msgstr ""
+
+#, c-format
+msgid "Unknown Error Code %d"
+msgstr ""
+
+#, c-format
+msgid "MSN Error: %s\n"
+msgstr ""
+
+msgid "Nudge"
+msgstr ""
+
+#, c-format
+msgid "%s has nudged you!"
+msgstr ""
+
+#, c-format
+msgid "Nudging %s..."
+msgstr ""
+
+msgid "Email Address..."
+msgstr "Ríomhsheoladh..."
+
+msgid "Your new MSN friendly name is too long."
+msgstr ""
+
+msgid "Set your friendly name."
+msgstr ""
+
+msgid "This is the name that other MSN buddies will see you as."
+msgstr ""
+
+msgid "Set your home phone number."
+msgstr ""
+
+msgid "Set your work phone number."
+msgstr ""
+
+msgid "Set your mobile phone number."
+msgstr ""
+
+msgid "Allow MSN Mobile pages?"
+msgstr ""
+
+msgid ""
+"Do you want to allow or disallow people on your buddy list to send you MSN "
+"Mobile pages to your cell phone or other mobile device?"
+msgstr ""
+
+msgid "Allow"
+msgstr "Ceadiagh"
+
+msgid "Disallow"
+msgstr ""
+
+#, c-format
+msgid "Blocked Text for %s"
+msgstr ""
+
+msgid "No text is blocked for this account."
+msgstr ""
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+
+msgid "This account does not have email enabled."
+msgstr ""
+
+msgid "Send a mobile message."
+msgstr ""
+
+#, fuzzy
+msgid "Page"
+msgstr "Leathanach"
+
+msgid "Home Phone Number"
+msgstr ""
+
+msgid "Work Phone Number"
+msgstr ""
+
+msgid "Mobile Phone Number"
+msgstr ""
+
+msgid "Be Right Back"
+msgstr ""
+
+msgid "Busy"
+msgstr ""
+
+msgid "On the Phone"
+msgstr ""
+
+msgid "Out to Lunch"
+msgstr ""
+
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+#, fuzzy
+msgid "Artist"
+msgstr "Ealaíontóir"
+
+#, fuzzy
+msgid "Album"
+msgstr "Albam"
+
+msgid "Set Friendly Name..."
+msgstr ""
+
+msgid "Set Home Phone Number..."
+msgstr ""
+
+msgid "Set Work Phone Number..."
+msgstr ""
+
+msgid "Set Mobile Phone Number..."
+msgstr ""
+
+msgid "Enable/Disable Mobile Devices..."
+msgstr ""
+
+msgid "Allow/Disallow Mobile Pages..."
+msgstr ""
+
+msgid "View Blocked Text..."
+msgstr ""
+
+msgid "Open Hotmail Inbox"
+msgstr ""
+
+msgid "Send to Mobile"
+msgstr ""
+
+msgid "Initiate _Chat"
+msgstr ""
+
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+
+msgid "Failed to connect to server."
+msgstr ""
+
+msgid "Error retrieving profile"
+msgstr ""
+
+#, fuzzy
+msgid "General"
+msgstr "Ginearálta"
+
+msgid "Age"
+msgstr ""
+
+msgid "Occupation"
+msgstr ""
+
+#, fuzzy
+msgid "Location"
+msgstr "Áit"
+
+msgid "Hobbies and Interests"
+msgstr ""
+
+msgid "A Little About Me"
+msgstr ""
+
+msgid "Social"
+msgstr ""
+
+msgid "Marital Status"
+msgstr ""
+
+msgid "Interests"
+msgstr ""
+
+msgid "Pets"
+msgstr ""
+
+msgid "Hometown"
+msgstr ""
+
+msgid "Places Lived"
+msgstr ""
+
+msgid "Fashion"
+msgstr ""
+
+#, fuzzy
+msgid "Humor"
+msgstr "Greann"
+
+msgid "Music"
+msgstr "Ceol"
+
+msgid "Favorite Quote"
+msgstr ""
+
+msgid "Contact Info"
+msgstr ""
+
+msgid "Personal"
+msgstr ""
+
+msgid "Significant Other"
+msgstr ""
+
+msgid "Home Phone"
+msgstr ""
+
+msgid "Home Phone 2"
+msgstr ""
+
+msgid "Home Address"
+msgstr ""
+
+msgid "Personal Mobile"
+msgstr ""
+
+msgid "Home Fax"
+msgstr ""
+
+msgid "Personal Email"
+msgstr ""
+
+msgid "Personal IM"
+msgstr ""
+
+msgid "Anniversary"
+msgstr ""
+
+#. Business
+msgid "Work"
+msgstr "Obair"
+
+msgid "Job Title"
+msgstr ""
+
+#, fuzzy
+msgid "Company"
+msgstr "Comhlacht:"
+
+msgid "Department"
+msgstr ""
+
+msgid "Profession"
+msgstr ""
+
+msgid "Work Phone"
+msgstr ""
+
+msgid "Work Phone 2"
+msgstr ""
+
+msgid "Work Address"
+msgstr ""
+
+msgid "Work Mobile"
+msgstr ""
+
+msgid "Work Pager"
+msgstr ""
+
+msgid "Work Fax"
+msgstr ""
+
+msgid "Work Email"
+msgstr ""
+
+msgid "Work IM"
+msgstr ""
+
+msgid "Start Date"
+msgstr ""
+
+msgid "Favorite Things"
+msgstr ""
+
+msgid "Last Updated"
+msgstr ""
+
+#, fuzzy
+msgid "Homepage"
+msgstr "clár cinn"
+
+msgid "The user has not created a public profile."
+msgstr ""
+
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+
+msgid "Profile URL"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Windows Live Messenger Prótacal Breiseán"
+
+msgid "Use HTTP Method"
+msgstr ""
+
+msgid "HTTP Method Server"
+msgstr ""
+
+msgid "Show custom smileys"
+msgstr ""
+
+msgid "nudge: nudge a user to get their attention"
+msgstr ""
+
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr ""
+
+msgid "Windows Live ID authentication:Invalid response"
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid group."
+msgstr ""
+
+#, fuzzy
+msgid "Unknown error."
+msgstr "Earráid anaithnid=(%d)\n"
+
+#, c-format
+msgid "%s on %s (%s)"
+msgstr "%s ar %s (%s)"
+
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Earráid anaithnid=(%d)\n"
+
+msgid "Unable to add user"
+msgstr ""
+
+#, c-format
+msgid "Unable to add user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to block user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Unable to permit user on %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "%s could not be added because your buddy list is full."
+msgstr ""
+
+#, c-format
+msgid "%s is not a valid passport account."
+msgstr ""
+
+msgid "Service Temporarily Unavailable."
+msgstr ""
+
+msgid "Mobile message was not sent because it was too long."
+msgstr ""
+
+msgid "Unable to rename group"
+msgstr ""
+
+msgid "Unable to delete group"
+msgstr ""
+
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgid_plural ""
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
+"\n"
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr ""
+
+msgid "Unable to connect"
+msgstr ""
+
+msgid "Writing error"
+msgstr "Earráid sa scríobh"
+
+#, fuzzy
+msgid "Reading error"
+msgstr "Earráid léamh"
+
+#, c-format
+msgid ""
+"Connection error from %s server:\n"
+"%s"
+msgstr ""
+
+msgid "Our protocol is not supported by the server."
+msgstr ""
+
+msgid "Error parsing HTTP."
+msgstr ""
+
+msgid "You have signed on from another location."
+msgstr ""
+
+msgid "The MSN servers are temporarily unavailable. Please wait and try again."
+msgstr ""
+
+msgid "The MSN servers are going down temporarily."
+msgstr ""
+
+#, c-format
+msgid "Unable to authenticate: %s"
+msgstr ""
+
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+
+msgid "Handshaking"
+msgstr ""
+
+msgid "Transferring"
+msgstr ""
+
+msgid "Starting authentication"
+msgstr ""
+
+msgid "Getting cookie"
+msgstr ""
+
+msgid "Sending cookie"
+msgstr ""
+
+msgid "Retrieving buddy list"
+msgstr ""
+
+msgid "Away From Computer"
+msgstr ""
+
+msgid "On The Phone"
+msgstr ""
+
+msgid "Out To Lunch"
+msgstr ""
+
+msgid "Message may have not been sent because a timeout occurred:"
+msgstr ""
+
+msgid "Message could not be sent, not allowed while invisible:"
+msgstr ""
+
+msgid "Message could not be sent because the user is offline:"
+msgstr ""
+
+msgid "Message could not be sent because a connection error occurred:"
+msgstr ""
+
+msgid "Message could not be sent because we are sending too quickly:"
+msgstr ""
+
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+
+msgid "Message may have not been sent because an unknown error occurred:"
+msgstr ""
+
+#, c-format
+msgid "%s has added you to his or her buddy list."
+msgstr ""
+
+#, c-format
+msgid "%s has removed you from his or her buddy list."
+msgstr ""
+
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
+#, c-format
+msgid "Unable to add \"%s\"."
+msgstr ""
+
+msgid "The username specified is invalid."
+msgstr ""
+
+msgid "This Hotmail account may not be active."
+msgstr ""
+
+msgid "Has you"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "MSN Protocol Plugin"
+msgstr "MSN Prótacal Breiseán"
+
+msgid "Missing Cipher"
+msgstr ""
+
+msgid "The RC4 cipher could not be found"
+msgstr ""
+
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+
+msgid "Reading challenge"
+msgstr ""
+
+msgid "Unexpected challenge length from server"
+msgstr ""
+
+msgid "Logging in"
+msgstr ""
+
+#, c-format
+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] ""
+msgstr[1] ""
+
+#. Can't write _()'d strings in array initializers. Workaround.
+msgid "New mail messages"
+msgstr ""
+
+msgid "New blog comments"
+msgstr ""
+
+msgid "New profile comments"
+msgstr ""
+
+msgid "New friend requests!"
+msgstr ""
+
+msgid "New picture comments"
+msgstr ""
+
+msgid "MySpace"
+msgstr "MySpace"
+
+msgid "MySpaceIM - No Username Set"
+msgstr ""
+
+msgid "You appear to have no MySpace username."
+msgstr ""
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr ""
+
+#. The session is now set up, ready to be connected. This emits the
+#. * signedOn signal, so clients can now do anything with msimprpl, and
+#. * we're ready for it (session key, userid, username all setup).
+msgid "Connected"
+msgstr "Ceangailte"
+
+#, c-format
+msgid "Protocol error, code %d: %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
+msgstr ""
+
+msgid "MySpaceIM Error"
+msgstr ""
+
+msgid "Failed to add buddy"
+msgstr ""
+
+msgid "'addbuddy' command failed."
+msgstr ""
+
+msgid "persist command failed"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "No such user: %s"
+msgstr "%s: Níl a leithéid d'úsáideoir ann"
+
+msgid "User lookup"
+msgstr ""
+
+msgid "Failed to remove buddy"
+msgstr ""
+
+msgid "'delbuddy' command failed"
+msgstr ""
+
+msgid "blocklist command failed"
+msgstr ""
+
+msgid "Invalid input condition"
+msgstr ""
+
+msgid "Read buffer full (2)"
+msgstr ""
+
+msgid "Unparseable message"
+msgstr ""
+
+#, c-format
+msgid "Couldn't connect to host: %s (%d)"
+msgstr ""
+
+msgid "IM Friends"
+msgstr ""
+
+#, c-format
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Add contacts from server"
+msgstr ""
+
+msgid "Add friends from MySpace.com"
+msgstr ""
+
+msgid "Importing friends failed"
+msgstr ""
+
+#. TODO: find out how
+msgid "Find people..."
+msgstr ""
+
+msgid "Change IM name..."
+msgstr ""
+
+msgid "myim URL handler"
+msgstr ""
+
+msgid "No suitable MySpaceIM account could be found to open this myim URL."
+msgstr ""
+
+msgid "Enable the proper MySpaceIM account and try again."
+msgstr ""
+
+msgid "Show display name in status text"
+msgstr ""
+
+msgid "Show headline in status text"
+msgstr ""
+
+msgid "Send emoticons"
+msgstr ""
+
+msgid "Screen resolution (dots per inch)"
+msgstr ""
+
+msgid "Base font size (points)"
+msgstr ""
+
+msgid "User"
+msgstr "Úsáideoir"
+
+msgid "Profile"
+msgstr "Próifíl"
+
+msgid "Headline"
+msgstr ""
+
+msgid "Song"
+msgstr "Amhrán"
+
+msgid "Total Friends"
+msgstr ""
+
+msgid "Client Version"
+msgstr ""
+
+#. Protocol won't log in now without a username set.. Disconnect
+msgid "No username set"
+msgstr ""
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr ""
+
+msgid "Please enter a username to check its availability:"
+msgstr ""
+
+msgid "MySpaceIM - Username Available"
+msgstr ""
+
+msgid "This username is available. Would you like to set it?"
+msgstr ""
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr ""
+
+msgid "This username is unavailable."
+msgstr ""
+
+msgid "Please try another username:"
+msgstr ""
+
+#. TODO: icons for each zap
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
+msgid "Zap"
+msgstr ""
+
+#, c-format
+msgid "%s has zapped you!"
+msgstr ""
+
+#, c-format
+msgid "Zapping %s..."
+msgstr ""
+
+#. Whack means "to hit or strike someone with a sharp blow"
+msgid "Whack"
+msgstr ""
+
+#, c-format
+msgid "%s has whacked you!"
+msgstr ""
+
+#, c-format
+msgid "Whacking %s..."
+msgstr ""
+
+#. 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 ""
+
+#, c-format
+msgid "%s has torched you!"
+msgstr ""
+
+#, c-format
+msgid "Torching %s..."
+msgstr ""
+
+#. Smooch means "to kiss someone, often enthusiastically"
+msgid "Smooch"
+msgstr ""
+
+#, c-format
+msgid "%s has smooched you!"
+msgstr ""
+
+#, c-format
+msgid "Smooching %s..."
+msgstr ""
+
+#. A hug is a display of affection; wrapping your arms around someone
+msgid "Hug"
+msgstr "Beir barróg ar"
+
+#, c-format
+msgid "%s has hugged you!"
+msgstr ""
+
+#, c-format
+msgid "Hugging %s..."
+msgstr ""
+
+#. Slap means "to hit someone with an open/flat hand"
+msgid "Slap"
+msgstr ""
+
+#, c-format
+msgid "%s has slapped you!"
+msgstr ""
+
+#, c-format
+msgid "Slapping %s..."
+msgstr ""
+
+#. Goose means "to pinch someone on their butt"
+msgid "Goose"
+msgstr ""
+
+#, c-format
+msgid "%s has goosed you!"
+msgstr ""
+
+#, c-format
+msgid "Goosing %s..."
+msgstr ""
+
+#. 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 ""
+
+#, c-format
+msgid "%s has high-fived you!"
+msgstr ""
+
+#, c-format
+msgid "High-fiving %s..."
+msgstr ""
+
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
+msgid "Punk"
+msgstr "Punc"
+
+#, c-format
+msgid "%s has punk'd you!"
+msgstr ""
+
+#, c-format
+msgid "Punking %s..."
+msgstr ""
+
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
+msgid "Raspberry"
+msgstr ""
+
+#, c-format
+msgid "%s has raspberried you!"
+msgstr ""
+
+#, c-format
+msgid "Raspberrying %s..."
+msgstr ""
+
+msgid "Required parameters not passed in"
+msgstr ""
+
+msgid "Unable to write to network"
+msgstr ""
+
+msgid "Unable to read from network"
+msgstr ""
+
+msgid "Error communicating with server"
+msgstr ""
+
+msgid "Conference not found"
+msgstr ""
+
+msgid "Conference does not exist"
+msgstr ""
+
+msgid "A folder with that name already exists"
+msgstr ""
+
+msgid "Not supported"
+msgstr "Gan tacaíocht"
+
+msgid "Password has expired"
+msgstr ""
+
+#, fuzzy
+msgid "Incorrect password"
+msgstr "pasfhocal mícheart"
+
+msgid "User not found"
+msgstr ""
+
+msgid "Account has been disabled"
+msgstr ""
+
+msgid "The server could not access the directory"
+msgstr ""
+
+msgid "Your system administrator has disabled this operation"
+msgstr ""
+
+msgid "The server is unavailable; try again later"
+msgstr ""
+
+msgid "Cannot add a contact to the same folder twice"
+msgstr ""
+
+msgid "Cannot add yourself"
+msgstr ""
+
+msgid "Master archive is misconfigured"
+msgstr ""
+
+msgid "Incorrect username or password"
+msgstr ""
+
+msgid "Could not recognize the host of the username you entered"
+msgstr ""
+
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+
+msgid "You cannot add the same person twice to a conversation"
+msgstr ""
+
+msgid "You have reached your limit for the number of contacts allowed"
+msgstr ""
+
+msgid "You have entered an incorrect username"
+msgstr ""
+
+msgid "An error occurred while updating the directory"
+msgstr ""
+
+msgid "Incompatible protocol version"
+msgstr ""
+
+msgid "The user has blocked you"
+msgstr ""
+
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+
+msgid "The user is either offline or you are blocked"
+msgstr ""
+
+#, c-format
+msgid "Unknown error: 0x%X"
+msgstr ""
+
+#, c-format
+msgid "Login failed (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message. Could not get details for user (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to your buddy list (%s)."
+msgstr ""
+
+#. TODO: Improve this! message to who or for what conference?
+#, c-format
+msgid "Unable to send message (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to invite user (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message to %s. Could not create the conference (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to send message. Could not create the conference (%s)."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to add %s to your buddy list. Error creating folder in server side "
+"list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Could not get details for user %s (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add user to privacy list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to deny list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to add %s to permit list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to remove %s from privacy list (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to change server side privacy settings (%s)."
+msgstr ""
+
+#, c-format
+msgid "Unable to create conference (%s)."
+msgstr ""
+
+msgid "Error communicating with server. Closing connection."
+msgstr ""
+
+msgid "Telephone Number"
+msgstr ""
+
+msgid "Personal Title"
+msgstr ""
+
+msgid "Mailstop"
+msgstr ""
+
+msgid "User ID"
+msgstr ""
+
+#. tag = _("DN");
+#. value = nm_user_record_get_dn(user_record);
+#. if (value) {
+#. purple_notify_user_info_add_pair(user_info, tag, value);
+#. }
+#.
+msgid "Full name"
+msgstr "Ainm Iomlán"
+
+#, c-format
+msgid "GroupWise Conference %d"
+msgstr ""
+
+msgid "Authenticating..."
+msgstr ""
+
+msgid "Unable to connect to server."
+msgstr ""
+
+msgid "Waiting for response..."
+msgstr ""
+
+#, c-format
+msgid "%s has been invited to this conversation."
+msgstr ""
+
+msgid "Invitation to Conversation"
+msgstr ""
+
+#, c-format
+msgid ""
+"Invitation from: %s\n"
+"\n"
+"Sent: %s"
+msgstr ""
+
+msgid "Would you like to join the conversation?"
+msgstr ""
+
+msgid "You have been logged out because you logged in at another workstation."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
+msgstr ""
+
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+
+msgid "Error. SSL support is not installed."
+msgstr ""
+
+#, c-format
+msgid "This conference has been closed. No more messages can be sent."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Novell GroupWise Messenger Protocol Plugin"
+msgstr "Novell GroupWise Messenger Prótacal Breiseán"
+
+msgid "Server address"
+msgstr ""
+
+msgid "Server port"
+msgstr ""
+
+msgid "Could not join chat room"
+msgstr ""
+
+msgid "Invalid chat room name"
+msgstr ""
+
+msgid "Server closed the connection."
+msgstr ""
+
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%s"
+msgstr ""
+
+msgid "Received invalid data on connection with server."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "AIM Protocol Plugin"
+msgstr "AIM Prótacal Breiseán"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "ICQ Protocol Plugin"
+msgstr "ICQ Prótacal Breiseán"
+
+msgid "Encoding"
+msgstr ""
+
+msgid "The remote user has closed the connection."
+msgstr ""
+
+msgid "The remote user has declined your request."
+msgstr ""
+
+#, c-format
+msgid "Lost connection with the remote user:<br>%s"
+msgstr ""
+
+msgid "Received invalid data on connection with remote user."
+msgstr ""
+
+msgid "Could not establish a connection with the remote user."
+msgstr ""
+
+msgid "Direct IM established"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+
+#, c-format
+msgid "File %s is %s, which is larger than the maximum size of %s."
+msgstr ""
+
+msgid "Invalid error"
+msgstr ""
+
+msgid "Invalid SNAC"
+msgstr "SNAC Neamhbhailí"
+
+msgid "Rate to host"
+msgstr ""
+
+msgid "Rate to client"
+msgstr ""
+
+msgid "Service unavailable"
+msgstr ""
+
+msgid "Service not defined"
+msgstr ""
+
+msgid "Obsolete SNAC"
+msgstr ""
+
+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 ""
+
+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 ""
+
+#, fuzzy
+msgid "No match"
+msgstr "Níl a leithéid ann"
+
+msgid "List overflow"
+msgstr ""
+
+msgid "Request ambiguous"
+msgstr ""
+
+msgid "Queue full"
+msgstr ""
+
+msgid "Not while on AOL"
+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 "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+
+#, c-format
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"different encodings selected, or %s has a buggy client.)"
+msgstr ""
+
+#. Label
+msgid "Buddy Icon"
+msgstr ""
+
+#, fuzzy
+msgid "Voice"
+msgstr "Guth"
+
+msgid "AIM Direct IM"
+msgstr ""
+
+msgid "Get File"
+msgstr ""
+
+#, fuzzy
+msgid "Games"
+msgstr "Cluichí"
+
+msgid "Add-Ins"
+msgstr ""
+
+msgid "Send Buddy List"
+msgstr ""
+
+msgid "ICQ Direct Connect"
+msgstr ""
+
+msgid "AP User"
+msgstr ""
+
+msgid "ICQ RTF"
+msgstr "ICQ RTF"
+
+msgid "Nihilist"
+msgstr ""
+
+msgid "ICQ Server Relay"
+msgstr ""
+
+msgid "Old ICQ UTF8"
+msgstr ""
+
+msgid "Trillian Encryption"
+msgstr ""
+
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+msgid "Hiptop"
+msgstr ""
+
+msgid "Security Enabled"
+msgstr ""
+
+msgid "Video Chat"
+msgstr ""
+
+msgid "iChat AV"
+msgstr ""
+
+msgid "Live Video"
+msgstr ""
+
+msgid "Camera"
+msgstr ""
+
+msgid "Screen Sharing"
+msgstr ""
+
+#, c-format
+msgid "Free For Chat"
+msgstr ""
+
+#, c-format
+msgid "Not Available"
+msgstr "níl ar fáil"
+
+#, c-format
+msgid "Occupied"
+msgstr ""
+
+#, c-format
+msgid "Web Aware"
+msgstr ""
+
+#, c-format
+msgid "Invisible"
+msgstr ""
+
+msgid "IP Address"
+msgstr "Seoladh IP"
+
+msgid "Warning Level"
+msgstr ""
+
+msgid "Buddy Comment"
+msgstr ""
+
+#, c-format
+msgid ""
+"Could not connect to authentication server:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Could not connect to BOS server:\n"
+"%s"
+msgstr ""
+
+msgid "Username sent"
+msgstr ""
+
+msgid "Connection established, cookie sent"
+msgstr ""
+
+#. TODO: Don't call this with ssi
+msgid "Finalizing connection"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+
+#. Unregistered screen name
+msgid "Invalid username."
+msgstr ""
+
+#, fuzzy
+msgid "Incorrect password."
+msgstr "pasfhocal mícheart"
+
+#. Suspended account
+msgid "Your account is currently suspended."
+msgstr ""
+
+#. service temporarily unavailable
+msgid "The AOL Instant Messenger service is temporarily unavailable."
+msgstr ""
+
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+msgid ""
+"You have been connecting and disconnecting too frequently. Wait ten minutes "
+"and try again. If you continue to try, you will need to wait even longer."
+msgstr ""
+
+#, c-format
+msgid "The client version you are using is too old. Please upgrade at %s"
+msgstr ""
+
+msgid "Could Not Connect"
+msgstr ""
+
+msgid "Received authorization"
+msgstr ""
+
+msgid "The SecurID key entered is invalid."
+msgstr ""
+
+msgid "Enter SecurID"
+msgstr ""
+
+msgid "Enter the 6 digit number from the digital display."
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+msgid "_OK"
+msgstr "_Ceart go Leor"
+
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid AIM login hash."
+msgstr ""
+
+#, c-format
+msgid "You may be disconnected shortly.  Check %s for updates."
+msgstr ""
+
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+#. allow multple logins?
+msgid "Password sent"
+msgstr ""
+
+msgid "Unable to initialize connection"
+msgstr ""
+
+msgid "Please authorize me so I can add you to my buddy list."
+msgstr ""
+
+msgid "Authorization Request Message:"
+msgstr ""
+
+msgid "Please authorize me!"
+msgstr ""
+
+msgid "No reason given."
+msgstr ""
+
+msgid "Authorization Denied Message:"
+msgstr ""
+
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+msgid "ICQ authorization denied."
+msgstr ""
+
+#. Someone has granted you authorization
+#, c-format
+msgid "The user %u has granted your request to add them to your buddy list."
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received a special message\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received an ICQ page\n"
+"\n"
+"From: %s [%s]\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have received an ICQ email from %s [%s]\n"
+"\n"
+"Message is:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "ICQ user %u has sent you a buddy: %s (%s)"
+msgstr ""
+
+msgid "Do you want to add this buddy to your buddy list?"
+msgstr ""
+
+msgid "_Add"
+msgstr "_Cuir"
+
+msgid "_Decline"
+msgstr ""
+
+#, c-format
+msgid "You missed %hu message from %s because it was invalid."
+msgid_plural "You missed %hu messages from %s because they were invalid."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "You missed %hu message from %s because it was too large."
+msgid_plural "You missed %hu messages from %s because they were too large."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "You missed %hu message from %s for an unknown reason."
+msgid_plural "You missed %hu messages from %s for an unknown reason."
+msgstr[0] ""
+msgstr[1] ""
+
+#. Data is assumed to be the destination sn
+#, c-format
+msgid "Unable to send message: %s"
+msgstr ""
+
+#, fuzzy
+msgid "Unknown reason."
+msgstr "níl fhios an fáth"
+
+#, c-format
+msgid "Unable to send message to %s:"
+msgstr ""
+
+#, c-format
+msgid "User information not available: %s"
+msgstr ""
+
+msgid "Online Since"
+msgstr ""
+
+msgid "Member Since"
+msgstr ""
+
+msgid "Your AIM connection may be lost."
+msgstr ""
+
+#. The conversion failed!
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+
+#, c-format
+msgid "You have been disconnected from chat room %s."
+msgstr ""
+
+msgid "Mobile Phone"
+msgstr "Fón Póca"
+
+msgid "Personal Web Page"
+msgstr ""
+
+#. aim_userinfo_t
+#. strip_html_tags
+msgid "Additional Information"
+msgstr ""
+
+msgid "Zip Code"
+msgstr ""
+
+msgid "Work Information"
+msgstr ""
+
+msgid "Division"
+msgstr ""
+
+#, fuzzy
+msgid "Position"
+msgstr "Áit"
+
+#, fuzzy
+msgid "Web Page"
+msgstr "Leathanach Gréasáin"
+
+msgid "Pop-Up Message"
+msgstr ""
+
+#, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "No results found for email address %s"
+msgstr ""
+
+#, c-format
+msgid "You should receive an email asking to confirm %s."
+msgstr ""
+
+msgid "Account Confirmation Requested"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+
+#, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+
+#, c-format
+msgid "Error 0x%04x: Unknown error."
+msgstr ""
+
+msgid "Error Changing Account Info"
+msgstr ""
+
+#, c-format
+msgid "The email address for %s is %s"
+msgstr ""
+
+msgid "Account Info"
+msgstr ""
+
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+
+msgid "Unable to set AIM profile."
+msgstr ""
+
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Profile too long."
+msgstr ""
+
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Away message too long."
+msgstr ""
+
+#, c-format
+msgid ""
+"Could not 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 ""
+
+msgid "Unable To Add"
+msgstr ""
+
+msgid "Unable To Retrieve Buddy List"
+msgstr ""
+
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few minutes."
+msgstr ""
+
+msgid "Orphans"
+msgstr ""
+
+#, c-format
+msgid ""
+"Could not add the buddy %s because you have too many buddies in your buddy "
+"list.  Please remove one and try again."
+msgstr ""
+
+msgid "(no name)"
+msgstr "(gan-ainm)"
+
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr ""
+
+#, c-format
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+
+msgid "Authorization Given"
+msgstr ""
+
+#. Granted
+#, c-format
+msgid "The user %s has granted your request to add them to your buddy list."
+msgstr ""
+
+msgid "Authorization Granted"
+msgstr ""
+
+#. Denied
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
+"%s"
+msgstr ""
+
+msgid "Authorization Denied"
+msgstr ""
+
+msgid "_Exchange:"
+msgstr ""
+
+msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
+msgstr ""
+
+msgid "iTunes Music Store Link"
+msgstr ""
+
+#, c-format
+msgid "Buddy Comment for %s"
+msgstr ""
+
+msgid "Buddy Comment:"
+msgstr ""
+
+#, c-format
+msgid "You have selected to open a Direct IM connection with %s."
+msgstr ""
+
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+
+msgid "C_onnect"
+msgstr ""
+
+msgid "Get AIM Info"
+msgstr ""
+
+msgid "Edit Buddy Comment"
+msgstr ""
+
+msgid "Get Status Msg"
+msgstr ""
+
+msgid "Direct IM"
+msgstr ""
+
+msgid "Re-request Authorization"
+msgstr ""
+
+msgid "Require authorization"
+msgstr ""
+
+msgid "Web aware (enabling this will cause you to receive SPAM!)"
+msgstr ""
+
+msgid "ICQ Privacy Options"
+msgstr ""
+
+msgid "The new formatting is invalid."
+msgstr ""
+
+msgid "Username formatting can change only capitalization and whitespace."
+msgstr ""
+
+msgid "Change Address To:"
+msgstr ""
+
+msgid "<i>you are not waiting for authorization</i>"
+msgstr ""
+
+msgid "You are awaiting authorization from the following buddies"
+msgstr ""
+
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+
+msgid "Find Buddy by Email"
+msgstr ""
+
+msgid "Search for a buddy by email address"
+msgstr ""
+
+msgid "Type the email address of the buddy you are searching for."
+msgstr ""
+
+#, fuzzy
+msgid "_Search"
+msgstr "Cuardaigh ("
+
+msgid "Set User Info (web)..."
+msgstr ""
+
+msgid "Change Password (web)"
+msgstr ""
+
+msgid "Configure IM Forwarding (web)"
+msgstr ""
+
+#. ICQ actions
+msgid "Set Privacy Options..."
+msgstr ""
+
+#. AIM actions
+msgid "Confirm Account"
+msgstr ""
+
+msgid "Display Currently Registered Email Address"
+msgstr ""
+
+msgid "Change Currently Registered Email Address..."
+msgstr ""
+
+msgid "Show Buddies Awaiting Authorization"
+msgstr ""
+
+msgid "Search for Buddy by Email Address..."
+msgstr ""
+
+msgid "Search for Buddy by Information"
+msgstr ""
+
+msgid ""
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
+msgstr ""
+
+msgid "Allow multiple simultaneous logins"
+msgstr ""
+
+#, c-format
+msgid "Asking %s to connect to us at %s:%hu for Direct IM."
+msgstr ""
+
+#, c-format
+msgid "Attempting to connect to %s:%hu."
+msgstr ""
+
+#, c-format
+msgid "Attempting to connect via proxy server."
+msgstr ""
+
+#, c-format
+msgid "%s has just asked to directly connect to %s"
+msgstr ""
+
+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 ""
+
+msgid "Primary Information"
+msgstr ""
+
+msgid "Personal Introduction"
+msgstr ""
+
+msgid "QQ Number"
+msgstr ""
+
+msgid "Country/Region"
+msgstr ""
+
+msgid "Province/State"
+msgstr ""
+
+msgid "Horoscope Symbol"
+msgstr ""
+
+msgid "Zodiac Sign"
+msgstr ""
+
+msgid "Blood Type"
+msgstr ""
+
+msgid "College"
+msgstr ""
+
+msgid "Zipcode"
+msgstr ""
+
+msgid "Cellphone Number"
+msgstr ""
+
+#, fuzzy
+msgid "Phone Number"
+msgstr "Uimhir Guthán"
+
+msgid "Aquarius"
+msgstr ""
+
+msgid "Pisces"
+msgstr ""
+
+msgid "Aries"
+msgstr ""
+
+msgid "Taurus"
+msgstr ""
+
+msgid "Gemini"
+msgstr ""
+
+msgid "Cancer"
+msgstr ""
+
+msgid "Leo"
+msgstr ""
+
+msgid "Virgo"
+msgstr ""
+
+msgid "Libra"
+msgstr ""
+
+msgid "Scorpio"
+msgstr ""
+
+msgid "Sagittarius"
+msgstr ""
+
+msgid "Capricorn"
+msgstr ""
+
+msgid "Rat"
+msgstr ""
+
+msgid "Ox"
+msgstr ""
+
+msgid "Tiger"
+msgstr ""
+
+msgid "Rabbit"
+msgstr ""
+
+msgid "Dragon"
+msgstr ""
+
+msgid "Snake"
+msgstr ""
+
+msgid "Horse"
+msgstr ""
+
+msgid "Goat"
+msgstr ""
+
+msgid "Monkey"
+msgstr ""
+
+msgid "Rooster"
+msgstr ""
+
+msgid "Dog"
+msgstr "Madra"
+
+msgid "Pig"
+msgstr ""
+
+msgid "Other"
+msgstr "Eile"
+
+msgid "Modify my information"
+msgstr ""
+
+msgid "Update my information"
+msgstr ""
+
+msgid "Your information has been updated"
+msgstr ""
+
+#, c-format
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
+msgstr ""
+
+msgid "Invalid QQ Face"
+msgstr ""
+
+#, c-format
+msgid "You rejected %d's request"
+msgstr ""
+
+msgid "Input your reason:"
+msgstr ""
+
+msgid "Reject request"
+msgstr ""
+
+#. title
+msgid "Sorry, you are not my type..."
+msgstr ""
+
+msgid "Add buddy with auth request failed"
+msgstr ""
+
+#. TODO: We don't really need to notify the user about this, do we?
+msgid "You have successfully removed a buddy"
+msgstr ""
+
+#. TODO: Does the user really need to be notified about this?
+msgid "You have successfully removed yourself from your friend's buddy list"
+msgstr ""
+
+#, c-format
+msgid "User %d needs authentication"
+msgstr ""
+
+msgid "Input request here"
+msgstr ""
+
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+msgid "Would you be my friend?"
+msgstr ""
+
+#. multiline
+#. masked
+#. hint
+msgid "Send"
+msgstr "Seol"
+
+#, c-format
+msgid "You have added %d to buddy list"
+msgstr ""
+
+msgid "QQid Error"
+msgstr ""
+
+msgid "Invalid QQid"
+msgstr ""
+
+msgid "ID: "
+msgstr "ID:"
+
+msgid "Group ID"
+msgstr ""
+
+#, fuzzy
+msgid "Creator"
+msgstr "cruthaitheoir"
+
+msgid "Group Description"
+msgstr ""
+
+msgid "Auth"
+msgstr ""
+
+msgid "QQ Qun"
+msgstr ""
+
+msgid "Please enter external group ID"
+msgstr ""
+
+msgid "You can only search for permanent QQ groups\n"
+msgstr ""
+
+#, c-format
+msgid "User %d requested to join group %d"
+msgstr ""
+
+#, c-format
+msgid "Reason: %s"
+msgstr ""
+
+msgid "QQ Qun Operation"
+msgstr ""
+
+msgid "Approve"
+msgstr ""
+
+#, c-format
+msgid "Your request to join group %d has been rejected by admin %d"
+msgstr ""
+
+#, c-format
+msgid "Your request to join group %d has been approved by admin %d"
+msgstr ""
+
+#, c-format
+msgid "You [%d] have left group \"%d\""
+msgstr ""
+
+#, c-format
+msgid "You [%d] have been added to group \"%d\""
+msgstr ""
+
+msgid "This group has been added to your buddy list"
+msgstr ""
+
+msgid "I am not a member"
+msgstr ""
+
+msgid "I am a member"
+msgstr ""
+
+msgid "I am applying to join"
+msgstr ""
+
+msgid "I am the admin"
+msgstr ""
+
+msgid "Unknown status"
+msgstr ""
+
+msgid "This group does not allow others to join"
+msgstr ""
+
+msgid "You have successfully left the group"
+msgstr ""
+
+msgid "QQ Group Auth"
+msgstr ""
+
+msgid "Your authorization request has been accepted by the QQ server"
+msgstr ""
+
+msgid "You entered a group ID outside the acceptable range"
+msgstr ""
+
+msgid "Are you sure you want to leave this Qun?"
+msgstr ""
+
+msgid ""
+"Note, if you are the creator, \n"
+"this operation will eventually remove this Qun."
+msgstr ""
+
+#. we want to see window
+msgid "Do you want to approve the request?"
+msgstr ""
+
+msgid "Enter your reason:"
+msgstr ""
+
+msgid "You have successfully modified Qun member"
+msgstr ""
+
+msgid "You have successfully modified Qun information"
+msgstr ""
+
+msgid "You have successfully created a Qun"
+msgstr ""
+
+msgid "Would you like to set up the Qun details now?"
+msgstr ""
+
+msgid "Setup"
+msgstr "Cumraigh"
+
+msgid "System Message"
+msgstr ""
+
+msgid "Failed to send IM."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Unknown-%d"
+msgstr "anaithnid"
+
+msgid "Level"
+msgstr "Leibhéal"
+
+msgid "Member"
+msgstr ""
+
+msgid " VIP"
+msgstr ""
+
+msgid " TCP"
+msgstr " TCP"
+
+msgid " FromMobile"
+msgstr ""
+
+msgid " BindMobile"
+msgstr ""
+
+#, fuzzy
+msgid " Video"
+msgstr "Fís"
+
+#, fuzzy
+msgid " Space"
+msgstr "Spás"
+
+msgid "Flag"
+msgstr "Brat"
+
+msgid "Ver"
+msgstr ""
+
+msgid "Invalid name"
+msgstr ""
+
+#, c-format
+msgid "<b>Current Online</b>: %d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Last Refresh</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Connection Mode</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>My Public IP</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Login Time</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Last Login IP</b>: %s<br>\n"
+msgstr ""
+
+#, c-format
+msgid "<b>Last Login Time</b>: %s\n"
+msgstr ""
+
+#, fuzzy
+msgid "Login Information"
+msgstr "Eolais Logann"
+
+msgid "Set My Information"
+msgstr ""
+
+#, fuzzy
+msgid "Change Password"
+msgstr "Athraigh focal faire"
+
+msgid "Show Login Information"
+msgstr ""
+
+msgid "Leave this QQ Qun"
+msgstr ""
+
+msgid "Block this buddy"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "QQ Protocol\tPlugin"
+msgstr ""
+
+msgid "Connect using TCP"
+msgstr ""
+
+msgid "resend interval(s)"
+msgstr ""
+
+msgid "Keep alive interval(s)"
+msgstr ""
+
+msgid "Update interval(s)"
+msgstr ""
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr ""
+
+msgid "Keep alive error"
+msgstr ""
+
+msgid "Failed to connect server"
+msgstr ""
+
+msgid "Socket error"
+msgstr ""
+
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+
+msgid "Unable to read from socket"
+msgstr ""
+
+msgid "Write Error"
+msgstr "Earráid scríobh"
+
+msgid "Connection lost"
+msgstr ""
+
+msgid "Couldn't resolve host"
+msgstr ""
+
+msgid "hostname is NULL or port is 0"
+msgstr ""
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr ""
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr ""
+
+msgid "Could not resolve hostname"
+msgstr ""
+
+msgid "Unable to login. Check debug log."
+msgstr ""
+
+msgid "Unable to login"
+msgstr ""
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+msgid "Failed room reply"
+msgstr ""
+
+#, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr ""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
+
+#, c-format
+msgid "%d has declined the file %s"
+msgstr ""
+
+msgid "File Send"
+msgstr ""
+
+#, c-format
+msgid "%d canceled the transfer of %s"
+msgstr ""
+
+msgid "Do you want to add this buddy?"
+msgstr ""
+
+#. only need to get value
+#, c-format
+msgid "You have been added by %s"
+msgstr ""
+
+msgid "Would you like to add him?"
+msgstr ""
+
+#, c-format
+msgid "%s has added you [%s] to his or her buddy list"
+msgstr ""
+
+#, c-format
+msgid "User %s rejected your request"
+msgstr ""
+
+#, c-format
+msgid "User %s approved your request"
+msgstr ""
+
+#. TODO: this should go through purple_account_request_authorization()
+#, c-format
+msgid "%s wants to add you [%s] as a friend"
+msgstr ""
+
+#, c-format
+msgid "Message: %s"
+msgstr "Teachtaireacht: %s"
+
+#, c-format
+msgid "%s is not in your buddy list"
+msgstr ""
+
+#, c-format
+msgid "Notice from: %s"
+msgstr ""
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+msgid "Connection closed (writing)"
+msgstr ""
+
+#, c-format
+msgid "<b>Group Title:</b> %s<br>"
+msgstr ""
+
+#, c-format
+msgid "<b>Notes Group ID:</b> %s<br>"
+msgstr ""
+
+#, c-format
+msgid "Info for Group %s"
+msgstr ""
+
+msgid "Notes Address Book Information"
+msgstr ""
+
+msgid "Invite Group to Conference..."
+msgstr ""
+
+msgid "Get Notes Address Book Info"
+msgstr ""
+
+msgid "Sending Handshake"
+msgstr ""
+
+msgid "Waiting for Handshake Acknowledgement"
+msgstr ""
+
+msgid "Handshake Acknowledged, Sending Login"
+msgstr ""
+
+msgid "Waiting for Login Acknowledgement"
+msgstr ""
+
+msgid "Login Redirected"
+msgstr ""
+
+msgid "Forcing Login"
+msgstr ""
+
+msgid "Login Acknowledged"
+msgstr ""
+
+msgid "Starting Services"
+msgstr ""
+
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+
+msgid "Sametime Administrator Announcement"
+msgstr ""
+
+msgid "Connection reset"
+msgstr ""
+
+#, c-format
+msgid "Error reading from socket: %s"
+msgstr ""
+
+#. this is a regular connect, error out
+msgid "Unable to connect to host"
+msgstr ""
+
+#, c-format
+msgid "Announcement from %s"
+msgstr ""
+
+msgid "Conference Closed"
+msgstr ""
+
+msgid "Unable to send message: "
+msgstr ""
+
+msgid "Place Closed"
+msgstr ""
+
+msgid "Microphone"
+msgstr ""
+
+msgid "Speakers"
+msgstr ""
+
+msgid "Video Camera"
+msgstr ""
+
+msgid "Supports"
+msgstr ""
+
+msgid "External User"
+msgstr ""
+
+msgid "Create conference with user"
+msgstr ""
+
+#, c-format
+msgid ""
+"Please enter a topic for the new conference, and an invitation message to be "
+"sent to %s"
+msgstr ""
+
+msgid "New Conference"
+msgstr ""
+
+#, fuzzy
+msgid "Create"
+msgstr "Cruthaigh"
+
+msgid "Available Conferences"
+msgstr ""
+
+msgid "Create New Conference..."
+msgstr ""
+
+msgid "Invite user to a conference"
+msgstr ""
+
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+
+msgid "Invite to Conference"
+msgstr ""
+
+msgid "Invite to Conference..."
+msgstr ""
+
+msgid "Send TEST Announcement"
+msgstr ""
+
+msgid "Topic:"
+msgstr "Ábhar:"
+
+msgid "No Sametime Community Server specified"
+msgstr ""
+
+#, c-format
+msgid ""
+"No host or IP address has been configured for the Meanwhile account %s. "
+"Please enter one below to continue logging in."
+msgstr ""
+
+msgid "Meanwhile Connection Setup"
+msgstr ""
+
+msgid "No Sametime Community Server Specified"
+msgstr ""
+
+#, fuzzy
+msgid "Connect"
+msgstr "Ceangal"
+
+#, c-format
+msgid "Unknown (0x%04x)<br>"
+msgstr ""
+
+msgid "Last Known Client"
+msgstr ""
+
+msgid "User Name"
+msgstr "Ainm Úsáideora"
+
+msgid "Sametime ID"
+msgstr ""
+
+msgid "An ambiguous user ID was entered"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+
+msgid "Select User"
+msgstr ""
+
+msgid "Unable to add user: user not found"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+
+#, c-format
+msgid ""
+"Error reading file %s: \n"
+"%s\n"
+msgstr ""
+
+msgid "Remotely Stored Buddy List"
+msgstr ""
+
+msgid "Buddy List Storage Mode"
+msgstr ""
+
+msgid "Local Buddy List Only"
+msgstr ""
+
+msgid "Merge List from Server"
+msgstr ""
+
+msgid "Merge and Save List to Server"
+msgstr ""
+
+msgid "Synchronize List with Server"
+msgstr ""
+
+#, c-format
+msgid "Import Sametime List for Account %s"
+msgstr ""
+
+#, c-format
+msgid "Export Sametime List for Account %s"
+msgstr ""
+
+msgid "Unable to add group: group exists"
+msgstr ""
+
+#, c-format
+msgid "A group named '%s' already exists in your buddy list."
+msgstr ""
+
+msgid "Unable to add group"
+msgstr ""
+
+msgid "Possible Matches"
+msgstr ""
+
+msgid "Notes Address Book group results"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+
+msgid "Select Notes Address Book"
+msgstr ""
+
+msgid "Unable to add group: group not found"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+
+msgid "Notes Address Book Group"
+msgstr ""
+
+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 ""
+
+#, c-format
+msgid "Search results for '%s'"
+msgstr ""
+
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+
+msgid "Search Results"
+msgstr ""
+
+msgid "No matches"
+msgstr ""
+
+#, c-format
+msgid "The identifier '%s' did not match any users in your Sametime community."
+msgstr ""
+
+msgid "No Matches"
+msgstr ""
+
+msgid "Search for a user"
+msgstr ""
+
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+
+msgid "User Search"
+msgstr ""
+
+msgid "Import Sametime List..."
+msgstr ""
+
+msgid "Export Sametime List..."
+msgstr ""
+
+msgid "Add Notes Address Book Group..."
+msgstr ""
+
+msgid "User Search..."
+msgstr ""
+
+msgid "Force login (ignore server redirects)"
+msgstr ""
+
+#. pretend to be Sametime Connect
+msgid "Hide client identity"
+msgstr ""
+
+#, c-format
+msgid "User %s is not present in the network"
+msgstr ""
+
+msgid "Key Agreement"
+msgstr ""
+
+msgid "Cannot perform the key agreement"
+msgstr ""
+
+msgid "Error occurred during key agreement"
+msgstr ""
+
+msgid "Key Agreement failed"
+msgstr ""
+
+msgid "Timeout during key agreement"
+msgstr ""
+
+msgid "Key agreement was aborted"
+msgstr ""
+
+msgid "Key agreement is already started"
+msgstr ""
+
+msgid "Key agreement cannot be started with yourself"
+msgstr ""
+
+msgid "The remote user is not present in the network any more"
+msgstr ""
+
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+
+#, c-format
+msgid ""
+"The remote user is waiting key agreement on:\n"
+"Remote host: %s\n"
+"Remote port: %d"
+msgstr ""
+
+msgid "Key Agreement Request"
+msgstr ""
+
+msgid "IM With Password"
+msgstr ""
+
+msgid "Cannot set IM key"
+msgstr ""
+
+msgid "Set IM Password"
+msgstr ""
+
+msgid "Get Public Key"
+msgstr ""
+
+msgid "Cannot fetch the public key"
+msgstr ""
+
+msgid "Show Public Key"
+msgstr ""
+
+msgid "Could not load public key"
+msgstr ""
+
+msgid "User Information"
+msgstr "Eolas Úsáideoir"
+
+msgid "Cannot get user information"
+msgstr ""
+
+#, c-format
+msgid "The %s buddy is not trusted"
+msgstr ""
+
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+
+#. Open file selector to select the public key.
+msgid "Open..."
+msgstr "Oscail..."
+
+#, c-format
+msgid "The %s buddy is not present in the network"
+msgstr ""
+
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+
+msgid "_Import..."
+msgstr "_Iompórtáil..."
+
+msgid "Select correct user"
+msgstr ""
+
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+
+msgid ""
+"More than one user was found with the same name. Select the correct user "
+"from the list to add to the buddy list."
+msgstr ""
+
+msgid "Detached"
+msgstr ""
+
+msgid "Indisposed"
+msgstr ""
+
+msgid "Wake Me Up"
+msgstr ""
+
+msgid "Hyper Active"
+msgstr ""
+
+msgid "Robot"
+msgstr ""
+
+msgid "Happy"
+msgstr ""
+
+msgid "Sad"
+msgstr ""
+
+msgid "Angry"
+msgstr ""
+
+msgid "Jealous"
+msgstr ""
+
+msgid "Ashamed"
+msgstr ""
+
+msgid "Invincible"
+msgstr ""
+
+msgid "In Love"
+msgstr ""
+
+msgid "Sleepy"
+msgstr ""
+
+msgid "Bored"
+msgstr ""
+
+msgid "Excited"
+msgstr ""
+
+msgid "Anxious"
+msgstr ""
+
+msgid "User Modes"
+msgstr ""
+
+msgid "Preferred Contact"
+msgstr ""
+
+msgid "Preferred Language"
+msgstr ""
+
+#, fuzzy
+msgid "Device"
+msgstr "Gaireas"
+
+msgid "Timezone"
+msgstr ""
+
+msgid "Geolocation"
+msgstr ""
+
+msgid "Reset IM Key"
+msgstr ""
+
+msgid "IM with Key Exchange"
+msgstr ""
+
+msgid "IM with Password"
+msgstr ""
+
+msgid "Get Public Key..."
+msgstr ""
+
+msgid "Kill User"
+msgstr ""
+
+msgid "Draw On Whiteboard"
+msgstr ""
+
+msgid "_Passphrase:"
+msgstr ""
+
+#, c-format
+msgid "Channel %s does not exist in the network"
+msgstr ""
+
+msgid "Channel Information"
+msgstr ""
+
+msgid "Cannot get channel information"
+msgstr ""
+
+#, c-format
+msgid "<b>Channel Name:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>User Count:</b> %d"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Founder:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Cipher:</b> %s"
+msgstr ""
+
+#. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
+#, c-format
+msgid "<br><b>Channel HMAC:</b> %s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Topic:</b><br>%s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Channel Modes:</b> "
+msgstr ""
+
+#, c-format
+msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
+msgstr ""
+
+#, c-format
+msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
+msgstr ""
+
+msgid "Add Channel Public Key"
+msgstr ""
+
+#. Add new public key
+msgid "Open Public Key..."
+msgstr ""
+
+msgid "Channel Passphrase"
+msgstr ""
+
+msgid "Channel Public Keys List"
+msgstr ""
+
+#, c-format
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+
+msgid "Channel Authentication"
+msgstr ""
+
+msgid "Add / Remove"
+msgstr ""
+
+msgid "Group Name"
+msgstr "Ainm an Ghrúpa"
+
+msgid "Passphrase"
+msgstr ""
+
+#, c-format
+msgid "Please enter the %s channel private group name and passphrase."
+msgstr ""
+
+msgid "Add Channel Private Group"
+msgstr ""
+
+msgid "User Limit"
+msgstr ""
+
+msgid "Set user limit on channel. Set to zero to reset user limit."
+msgstr ""
+
+msgid "Invite List"
+msgstr ""
+
+msgid "Ban List"
+msgstr ""
+
+msgid "Add Private Group"
+msgstr ""
+
+msgid "Reset Permanent"
+msgstr ""
+
+msgid "Set Permanent"
+msgstr ""
+
+msgid "Set User Limit"
+msgstr ""
+
+msgid "Reset Topic Restriction"
+msgstr ""
+
+msgid "Set Topic Restriction"
+msgstr ""
+
+msgid "Reset Private Channel"
+msgstr ""
+
+msgid "Set Private Channel"
+msgstr ""
+
+msgid "Reset Secret Channel"
+msgstr ""
+
+msgid "Set Secret Channel"
+msgstr ""
+
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+
+msgid "Join Private Group"
+msgstr ""
+
+msgid "Cannot join private group"
+msgstr ""
+
+msgid "Call Command"
+msgstr ""
+
+msgid "Cannot call command"
+msgstr ""
+
+#, fuzzy
+msgid "Unknown command"
+msgstr "ordú anaithnid: `%c'"
+
+msgid "Secure File Transfer"
+msgstr ""
+
+msgid "Error during file transfer"
+msgstr ""
+
+msgid "Remote disconnected"
+msgstr ""
+
+#, fuzzy
+msgid "Permission denied"
+msgstr "Cead diúltaithe"
+
+msgid "Key agreement failed"
+msgstr ""
+
+#, fuzzy
+msgid "Connection timed out"
+msgstr "Dínascadh de bharr moille rófhada"
+
+msgid "Creating connection failed"
+msgstr ""
+
+msgid "File transfer session does not exist"
+msgstr ""
+
+msgid "No file transfer session active"
+msgstr ""
+
+msgid "File transfer already started"
+msgstr ""
+
+msgid "Could not perform key agreement for file transfer"
+msgstr ""
+
+msgid "Could not start the file transfer"
+msgstr ""
+
+msgid "Cannot send file"
+msgstr ""
+
+msgid "Error occurred"
+msgstr ""
+
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr ""
+
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr ""
+
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr ""
+
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr ""
+
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr ""
+
+msgid "Server signoff"
+msgstr ""
+
+msgid "Personal Information"
+msgstr ""
+
+msgid "Birth Day"
+msgstr "Lá Breithe"
+
+msgid "Job Role"
+msgstr ""
+
+#, fuzzy
+msgid "Organization"
+msgstr "Eagrú"
+
+#, fuzzy
+msgid "Unit"
+msgstr "Aonad"
+
+msgid "Note"
+msgstr "Nóta"
+
+msgid "Join Chat"
+msgstr ""
+
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr ""
+
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr ""
+
+msgid "Real Name"
+msgstr ""
+
+msgid "Status Text"
+msgstr ""
+
+msgid "Public Key Fingerprint"
+msgstr ""
+
+msgid "Public Key Babbleprint"
+msgstr ""
+
+msgid "_More..."
+msgstr "_Níos mó..."
+
+msgid "Detach From Server"
+msgstr ""
+
+msgid "Cannot detach"
+msgstr ""
+
+msgid "Cannot set topic"
+msgstr ""
+
+msgid "Failed to change nickname"
+msgstr ""
+
+msgid "Roomlist"
+msgstr ""
+
+msgid "Cannot get room list"
+msgstr ""
+
+msgid "Network is empty"
+msgstr ""
+
+msgid "No public key was received"
+msgstr ""
+
+msgid "Server Information"
+msgstr ""
+
+msgid "Cannot get server information"
+msgstr ""
+
+msgid "Server Statistics"
+msgstr ""
+
+msgid "Cannot get server statistics"
+msgstr ""
+
+#, c-format
+msgid ""
+"Local server start time: %s\n"
+"Local server uptime: %s\n"
+"Local server clients: %d\n"
+"Local server channels: %d\n"
+"Local server operators: %d\n"
+"Local router operators: %d\n"
+"Local cell clients: %d\n"
+"Local cell channels: %d\n"
+"Local cell servers: %d\n"
+"Total clients: %d\n"
+"Total channels: %d\n"
+"Total servers: %d\n"
+"Total routers: %d\n"
+"Total server operators: %d\n"
+"Total router operators: %d\n"
+msgstr ""
+
+msgid "Network Statistics"
+msgstr ""
+
+msgid "Ping failed"
+msgstr ""
+
+msgid "Ping reply received from server"
+msgstr ""
+
+msgid "Could not kill user"
+msgstr ""
+
+#, fuzzy
+msgid "WATCH"
+msgstr "UAIREADÓIR"
+
+msgid "Cannot watch user"
+msgstr ""
+
+msgid "Resuming session"
+msgstr ""
+
+msgid "Authenticating connection"
+msgstr ""
+
+msgid "Verifying server public key"
+msgstr ""
+
+msgid "Passphrase required"
+msgstr ""
+
+#, c-format
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+
+#, c-format
+msgid "Received %s's public key. Would you like to accept this public key?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Fingerprint and babbleprint for the %s key are:\n"
+"\n"
+"%s\n"
+"%s\n"
+msgstr ""
+
+msgid "Verify Public Key"
+msgstr ""
+
+msgid "_View..."
+msgstr "_Amharc..."
+
+msgid "Unsupported public key type"
+msgstr ""
+
+msgid "Disconnected by server"
+msgstr ""
+
+msgid "Error during connecting to SILC Server"
+msgstr ""
+
+msgid "Key Exchange failed"
+msgstr ""
+
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+
+msgid "Connection failed"
+msgstr ""
+
+msgid "Performing key exchange"
+msgstr ""
+
+msgid "Unable to create connection"
+msgstr ""
+
+msgid "Could not load SILC key pair"
+msgstr ""
+
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr ""
+
+#, fuzzy
+msgid "Out of memory"
+msgstr "Cuimhne ídithe"
+
+msgid "Cannot initialize SILC protocol"
+msgstr ""
+
+msgid "Error loading SILC key pair"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Download %s: %s"
+msgstr "Í_osluchtaigh..."
+
+msgid "Your Current Mood"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Normal"
+msgstr "Gnáth"
+
+msgid "In love"
+msgstr ""
+
+msgid ""
+"\n"
+"Your Preferred Contact Methods"
+msgstr ""
+
+msgid "SMS"
+msgstr ""
+
+msgid "MMS"
+msgstr ""
+
+msgid "Video conferencing"
+msgstr ""
+
+msgid "Your Current Status"
+msgstr ""
+
+msgid "Online Services"
+msgstr ""
+
+msgid "Let others see what services you are using"
+msgstr ""
+
+msgid "Let others see what computer you are using"
+msgstr ""
+
+msgid "Your VCard File"
+msgstr ""
+
+msgid "Timezone (UTC)"
+msgstr ""
+
+msgid "User Online Status Attributes"
+msgstr ""
+
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+
+msgid "Message of the Day"
+msgstr ""
+
+msgid "No Message of the Day available"
+msgstr ""
+
+msgid "There is no Message of the Day associated with this connection"
+msgstr ""
+
+msgid "Create New SILC Key Pair"
+msgstr ""
+
+msgid "Passphrases do not match"
+msgstr ""
+
+msgid "Key Pair Generation failed"
+msgstr ""
+
+msgid "Key length"
+msgstr ""
+
+msgid "Public key file"
+msgstr ""
+
+#, fuzzy
+msgid "Private key file"
+msgstr "       --private-key=COMHAD     comhad don eochair phríobháideach.\n"
+
+msgid "Passphrase (retype)"
+msgstr ""
+
+msgid "Generate Key Pair"
+msgstr ""
+
+msgid "Online Status"
+msgstr ""
+
+msgid "View Message of the Day"
+msgstr ""
+
+msgid "Create SILC Key Pair..."
+msgstr ""
+
+#, c-format
+msgid "User <I>%s</I> is not present in the network"
+msgstr ""
+
+msgid "Topic too long"
+msgstr ""
+
+msgid "You must specify a nick"
+msgstr ""
+
+#, c-format
+msgid "channel %s not found"
+msgstr ""
+
+#, c-format
+msgid "channel modes for %s: %s"
+msgstr ""
+
+#, c-format
+msgid "no channel modes are set on %s"
+msgstr ""
+
+#, c-format
+msgid "Failed to set cmodes for %s"
+msgstr ""
+
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr ""
+
+msgid "part [channel]:  Leave the chat"
+msgstr ""
+
+msgid "leave [channel]:  Leave the chat"
+msgstr ""
+
+msgid "topic [&lt;new topic&gt;]:  View or change the topic"
+msgstr ""
+
+msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
+msgstr ""
+
+msgid "list:  List channels on this network"
+msgstr ""
+
+msgid "whois &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
+msgstr ""
+
+msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
+msgstr ""
+
+msgid "motd:  View the server's Message Of The Day"
+msgstr ""
+
+msgid "detach:  Detach this session"
+msgstr ""
+
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr ""
+
+msgid "call &lt;command&gt;:  Call any silc client command"
+msgstr ""
+
+msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
+msgstr ""
+
+msgid "nick &lt;newnick&gt;:  Change your nickname"
+msgstr ""
+
+msgid "whowas &lt;nick&gt;:  View nick's information"
+msgstr ""
+
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+
+msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
+msgstr ""
+
+msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
+msgstr ""
+
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+
+msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
+msgstr ""
+
+msgid "info [server]:  View server administrative details"
+msgstr ""
+
+msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
+msgstr ""
+
+msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
+msgstr ""
+
+msgid "stats:  View server and network statistics"
+msgstr ""
+
+msgid "ping:  Send PING to the connected server"
+msgstr ""
+
+msgid "users &lt;channel&gt;:  List users in channel"
+msgstr ""
+
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+msgid "SILC Protocol Plugin"
+msgstr "SILC Prótacal Breiseán"
+
+#. *  description
+msgid "Secure Internet Live Conferencing (SILC) Protocol"
+msgstr ""
+
+msgid "Network"
+msgstr ""
+
+msgid "Public Key file"
+msgstr ""
+
+#, fuzzy
+msgid "Private Key file"
+msgstr "       --private-key=COMHAD     comhad don eochair phríobháideach.\n"
+
+msgid "Cipher"
+msgstr "Cipher"
+
+msgid "HMAC"
+msgstr "HMAC"
+
+msgid "Use Perfect Forward Secrecy"
+msgstr ""
+
+msgid "Public key authentication"
+msgstr ""
+
+msgid "Block IMs without Key Exchange"
+msgstr ""
+
+msgid "Block messages to whiteboard"
+msgstr ""
+
+msgid "Automatically open whiteboard"
+msgstr ""
+
+msgid "Digitally sign and verify all messages"
+msgstr ""
+
+msgid "Creating SILC key pair..."
+msgstr ""
+
+msgid "Cannot create SILC key pair\n"
+msgstr ""
+
+#. Hint for translators: Please check the tabulator width here and in
+#. the next strings (short strings: 2 tabs, longer strings 1 tab,
+#. sum: 3 tabs or 24 characters)
+#, c-format
+msgid "Real Name: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "User Name: \t%s\n"
+msgstr "Logainm: \t%s\n"
+
+#, c-format
+msgid "Email: \t\t%s\n"
+msgstr "Ríomhphost: \t\t%s\n"
+
+#, c-format
+msgid "Host Name: \t%s\n"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Organization: \t%s\n"
+msgstr "eagras"
+
+#, c-format
+msgid "Country: \t%s\n"
+msgstr "Tír: \t%s\n"
+
+#, c-format
+msgid "Algorithm: \t%s\n"
+msgstr ""
+
+#, c-format
+msgid "Key Length: \t%d bits\n"
+msgstr ""
+
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Leagan: \t%s\n"
+
+#, c-format
+msgid ""
+"Public Key Fingerprint:\n"
+"%s\n"
+"\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"Public Key Babbleprint:\n"
+"%s"
+msgstr ""
+
+msgid "Public Key Information"
+msgstr ""
+
+msgid "Paging"
+msgstr ""
+
+msgid "Video Conferencing"
+msgstr ""
+
+msgid "Computer"
+msgstr ""
+
+msgid "PDA"
+msgstr ""
+
+#, fuzzy
+msgid "Terminal"
+msgstr "Terminéal"
+
+#, c-format
+msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+
+msgid "Whiteboard"
+msgstr ""
+
+msgid "No server statistics available"
+msgstr ""
+
+#, c-format
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed KE group"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed cipher"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed hash function"
+msgstr ""
+
+#, c-format
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr ""
+
+#, c-format
+msgid "Failure: Incorrect signature"
+msgstr ""
+
+#, c-format
+msgid "Failure: Invalid cookie"
+msgstr ""
+
+#, c-format
+msgid "Failure: Authentication failed"
+msgstr ""
+
+msgid "Cannot initialize SILC Client connection"
+msgstr ""
+
+msgid "John Noname"
+msgstr ""
+
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr ""
+
+msgid "Could not write"
+msgstr ""
+
+msgid "Could not connect"
+msgstr ""
+
+msgid "Unknown server response."
+msgstr ""
+
+msgid "Could not create listen socket"
+msgstr ""
+
+msgid "SIP usernames may not contain whitespaces or @ symbols"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "SIP/SIMPLE Protocol Plugin"
+msgstr "SIP/SIMPLE Prótacal Breiseán"
+
+#. *  summary
+msgid "The SIP/SIMPLE Protocol Plugin"
+msgstr "An SIP/SIMPLE Prótacal Breiseán"
+
+msgid "Publish status (note: everyone may watch you)"
+msgstr ""
+
+msgid "Use UDP"
+msgstr "Úsáid UDP"
+
+msgid "Use proxy"
+msgstr "Úsáid seach"
+
+msgid "Proxy"
+msgstr "Seach"
+
+msgid "Auth User"
+msgstr ""
+
+msgid "Auth Domain"
+msgstr ""
+
+#, c-format
+msgid "Looking up %s"
+msgstr ""
+
+#, c-format
+msgid "Connect to %s failed"
+msgstr ""
+
+#, c-format
+msgid "Signon: %s"
+msgstr ""
+
+#, c-format
+msgid "Unable to write file %s."
+msgstr ""
+
+#, c-format
+msgid "Unable to read file %s."
+msgstr ""
+
+#, c-format
+msgid "Message too long, last %s bytes truncated."
+msgstr ""
+
+#, c-format
+msgid "%s not currently logged in."
+msgstr ""
+
+#, c-format
+msgid "Warning of %s not allowed."
+msgstr ""
+
+#, c-format
+msgid "A message has been dropped, you are exceeding the server speed limit."
+msgstr ""
+
+#, c-format
+msgid "Chat in %s is not available."
+msgstr ""
+
+#, c-format
+msgid "You are sending messages too fast to %s."
+msgstr ""
+
+#, c-format
+msgid "You missed an IM from %s because it was too big."
+msgstr ""
+
+#, c-format
+msgid "You missed an IM from %s because it was sent too fast."
+msgstr ""
+
+#, c-format
+msgid "Failure."
+msgstr ""
+
+#, c-format
+msgid "Too many matches."
+msgstr ""
+
+#, c-format
+msgid "Need more qualifiers."
+msgstr ""
+
+#, c-format
+msgid "Dir service temporarily unavailable."
+msgstr ""
+
+#, c-format
+msgid "Email lookup restricted."
+msgstr ""
+
+#, c-format
+msgid "Keyword ignored."
+msgstr ""
+
+#, c-format
+msgid "No keywords."
+msgstr ""
+
+#, c-format
+msgid "User has no directory information."
+msgstr ""
+
+#, c-format
+msgid "Country not supported."
+msgstr ""
+
+#, c-format
+msgid "Failure unknown: %s."
+msgstr ""
+
+#, c-format
+msgid "Incorrect username or password."
+msgstr ""
+
+#, c-format
+msgid "The service is temporarily unavailable."
+msgstr ""
+
+#, c-format
+msgid "Your warning level is currently too high to log in."
+msgstr ""
+
+#, c-format
+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 ""
+
+#, c-format
+msgid "An unknown signon error has occurred: %s."
+msgstr ""
+
+#, c-format
+msgid "An unknown error, %d, has occurred.  Info: %s"
+msgstr ""
+
+msgid "Invalid Groupname"
+msgstr ""
+
+#, fuzzy
+msgid "Connection Closed"
+msgstr "Nasc dúnta"
+
+msgid "Waiting for reply..."
+msgstr ""
+
+msgid "TOC has come back from its pause. You may now send messages again."
+msgstr ""
+
+msgid "Password Change Successful"
+msgstr ""
+
+msgid "_Group:"
+msgstr "_Grúpa:"
+
+msgid "Get Dir Info"
+msgstr ""
+
+msgid "Set Dir Info"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Could not open %s for writing!"
+msgstr "Níorbh fhéidir `%s' a oscailt chun scríoch ann: %s"
+
+msgid "File transfer failed; other side probably canceled."
+msgstr ""
+
+msgid "Could not connect for transfer."
+msgstr ""
+
+msgid "Could not write file header.  The file will not be transferred."
+msgstr ""
+
+msgid "Save As..."
+msgstr "Sábháil le..."
+
+#, c-format
+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] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s requests you to send them a file"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "TOC Protocol Plugin"
+msgstr "TOC Prótacal Breiseán"
+
+#, c-format
+msgid "%s has sent you a webcam invite, which is not yet supported."
+msgstr ""
+
+msgid "Your Yahoo! message did not get sent."
+msgstr ""
+
+#, c-format
+msgid "Yahoo! system message for %s:"
+msgstr ""
+
+msgid "Authorization denied message:"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+
+#, c-format
+msgid "%s has (retroactively) denied your request to add them to your list."
+msgstr ""
+
+msgid "Add buddy rejected"
+msgstr ""
+
+#, c-format
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+
+msgid "Failed Yahoo! Authentication"
+msgstr ""
+
+#, 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 ""
+
+msgid "Ignore buddy?"
+msgstr ""
+
+msgid "Your account is locked, please log in to the Yahoo! website."
+msgstr ""
+
+#, c-format
+msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
+msgstr ""
+
+#, c-format
+msgid "Could not add buddy %s to group %s to the server list on account %s."
+msgstr ""
+
+msgid "Could not add buddy to server list"
+msgstr ""
+
+#, c-format
+msgid "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ Audible %s/%s/%s.swf ] %s"
+
+msgid "Received unexpected HTTP response from server."
+msgstr ""
+
+msgid "Connection problem"
+msgstr ""
+
+#, fuzzy, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr "Cailleadh an nasc le \"%s\"."
+
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+
+msgid "Not at Home"
+msgstr ""
+
+msgid "Not at Desk"
+msgstr ""
+
+msgid "Not in Office"
+msgstr ""
+
+msgid "On Vacation"
+msgstr "Ar Saoire"
+
+msgid "Stepped Out"
+msgstr ""
+
+msgid "Not on server list"
+msgstr ""
+
+msgid "Appear Online"
+msgstr ""
+
+msgid "Appear Permanently Offline"
+msgstr ""
+
+msgid "Presence"
+msgstr ""
+
+msgid "Appear Offline"
+msgstr ""
+
+msgid "Don't Appear Permanently Offline"
+msgstr ""
+
+msgid "Join in Chat"
+msgstr ""
+
+msgid "Initiate Conference"
+msgstr ""
+
+msgid "Presence Settings"
+msgstr ""
+
+msgid "Start Doodling"
+msgstr ""
+
+msgid "Activate which ID?"
+msgstr ""
+
+msgid "Join whom in chat?"
+msgstr ""
+
+msgid "Activate ID..."
+msgstr ""
+
+msgid "Join User in Chat..."
+msgstr ""
+
+msgid "Open Inbox"
+msgstr ""
+
+msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
+msgstr ""
+
+msgid "list: List rooms on the Yahoo network"
+msgstr ""
+
+msgid "doodle: Request user to start a Doodle session"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Yahoo Protocol Plugin"
+msgstr "Yahoo Prótacal Breiseán"
+
+msgid "Yahoo Japan"
+msgstr ""
+
+msgid "Pager server"
+msgstr ""
+
+msgid "Japan Pager server"
+msgstr ""
+
+msgid "Pager port"
+msgstr ""
+
+msgid "File transfer server"
+msgstr ""
+
+msgid "Japan file transfer server"
+msgstr ""
+
+msgid "File transfer port"
+msgstr ""
+
+msgid "Chat room locale"
+msgstr ""
+
+msgid "Ignore conference and chatroom invitations"
+msgstr ""
+
+msgid "Chat room list URL"
+msgstr ""
+
+msgid "Yahoo Chat server"
+msgstr ""
+
+msgid "Yahoo Chat port"
+msgstr ""
+
+#. Write a local message to this conversation showing that a request for a
+#. * Doodle session has been made
+#.
+msgid "Sent Doodle request."
+msgstr ""
+
+msgid "Unable to establish file descriptor."
+msgstr ""
+
+#, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr ""
+
+msgid "Yahoo! Japan Profile"
+msgstr ""
+
+msgid "Yahoo! Profile"
+msgstr ""
+
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
+msgstr ""
+
+msgid "Yahoo! ID"
+msgstr "Yahoo! ID"
+
+msgid "Hobbies"
+msgstr ""
+
+msgid "Latest News"
+msgstr ""
+
+#, fuzzy
+msgid "Home Page"
+msgstr "Leathanach baile:"
+
+msgid "Cool Link 1"
+msgstr ""
+
+msgid "Cool Link 2"
+msgstr ""
+
+msgid "Cool Link 3"
+msgstr ""
+
+msgid "Last Update"
+msgstr ""
+
+#, c-format
+msgid "User information for %s unavailable"
+msgstr ""
+
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
+msgstr ""
+
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+
+msgid "The user's profile is empty."
+msgstr ""
+
+#, c-format
+msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
+msgstr ""
+
+msgid "Invitation Rejected"
+msgstr ""
+
+msgid "Failed to join chat"
+msgstr ""
+
+#. -6
+msgid "Unknown room"
+msgstr ""
+
+#. -15
+msgid "Maybe the room is full"
+msgstr ""
+
+#. -35
+msgid "Not available"
+msgstr "Níl ar fáil"
+
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+
+#, c-format
+msgid "You are now chatting in %s."
+msgstr ""
+
+msgid "Failed to join buddy in chat"
+msgstr ""
+
+msgid "Maybe they're not in a chat?"
+msgstr ""
+
+msgid "Fetching the room list failed."
+msgstr ""
+
+msgid "Voices"
+msgstr ""
+
+msgid "Webcams"
+msgstr ""
+
+msgid "Unable to fetch room list."
+msgstr ""
+
+msgid "User Rooms"
+msgstr ""
+
+msgid "Connection problem with the YCHT server."
+msgstr ""
+
+#, c-format
+msgid ""
+"Lost connection with server\n"
+"%s"
+msgstr ""
+
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+
+#, c-format
+msgid "Unable to send to chat %s,%s,%s"
+msgstr ""
+
+msgid "Hidden or not logged-in"
+msgstr ""
+
+#, c-format
+msgid "<br>At %s since %s"
+msgstr ""
+
+msgid "Anyone"
+msgstr ""
+
+msgid "_Class:"
+msgstr "_Rang:"
+
+msgid "_Instance:"
+msgstr ""
+
+msgid "_Recipient:"
+msgstr ""
+
+#, c-format
+msgid "Attempt to subscribe to %s,%s,%s failed"
+msgstr ""
+
+msgid "zlocate &lt;nick&gt;: Locate user"
+msgstr ""
+
+msgid "zl &lt;nick&gt;: Locate user"
+msgstr ""
+
+msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
+msgstr ""
+
+msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
+msgstr ""
+
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+
+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 ""
+
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+
+msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
+msgstr ""
+
+msgid "Resubscribe"
+msgstr ""
+
+msgid "Retrieve subscriptions from server"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Zephyr Protocol Plugin"
+msgstr "Zephyr Prótacal Breiseán"
+
+msgid "Use tzc"
+msgstr ""
+
+msgid "tzc command"
+msgstr ""
+
+msgid "Export to .anyone"
+msgstr ""
+
+msgid "Export to .zephyr.subs"
+msgstr ""
+
+msgid "Import from .anyone"
+msgstr ""
+
+msgid "Import from .zephyr.subs"
+msgstr ""
+
+msgid "Realm"
+msgstr ""
+
+#, fuzzy
+msgid "Exposure"
+msgstr "nochtadh"
+
+#, c-format
+msgid ""
+"Unable to create socket:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "Unable to parse response from HTTP proxy: %s\n"
+msgstr ""
+
+#, c-format
+msgid "HTTP proxy connection error %d"
+msgstr ""
+
+#, c-format
+msgid "Access denied: HTTP proxy server forbids port %d tunneling."
+msgstr ""
+
+#, c-format
+msgid "Error resolving %s"
+msgstr ""
+
+msgid "Could not resolve host name"
+msgstr ""
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr ""
+
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#.
+msgid "_Yes"
+msgstr "_Tá"
+
+msgid "_No"
+msgstr "_Níl"
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+msgid "_Accept"
+msgstr "_Glac leis"
+
+#. *
+#. * The default message to use when the user becomes auto-away.
+#.
+msgid "I'm not here right now"
+msgstr ""
+
+msgid "saved statuses"
+msgstr ""
+
+#, c-format
+msgid "%s is now known as %s.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s has invited %s to the chat room %s:\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid "%s has invited %s to the chat room %s\n"
+msgstr ""
+
+msgid "Accept chat invitation?"
+msgstr ""
+
+#. Shortcut
+msgid "Shortcut"
+msgstr ""
+
+msgid "The text-shortcut for the smiley"
+msgstr ""
+
+#. Stored Image
+msgid "Stored Image"
+msgstr ""
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr ""
+
+msgid "SSL Connection Failed"
+msgstr ""
+
+msgid "SSL Handshake Failed"
+msgstr ""
+
+msgid "SSL peer presented an invalid certificate"
+msgstr ""
+
+msgid "Unknown SSL error"
+msgstr ""
+
+msgid "Unset"
+msgstr ""
+
+msgid "Do not disturb"
+msgstr ""
+
+msgid "Extended away"
+msgstr ""
+
+msgid "Mobile"
+msgstr ""
+
+msgid "Listening to music"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr ""
+
+#, c-format
+msgid "%s (%s) is now %s"
+msgstr "Tá %s (%s) %s anois"
+
+#, c-format
+msgid "%s (%s) is no longer %s"
+msgstr ""
+
+#, c-format
+msgid "%s became idle"
+msgstr ""
+
+#, c-format
+msgid "%s became unidle"
+msgstr ""
+
+#, c-format
+msgid "+++ %s became idle"
+msgstr ""
+
+#, c-format
+msgid "+++ %s became unidle"
+msgstr ""
+
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
+#, c-format
+msgid "%x %X"
+msgstr "%x %X"
+
+#, fuzzy, c-format
+msgid "Error Reading %s"
+msgstr "earráid agus ag léamh %s"
+
+#, c-format
+msgid ""
+"An error was encountered reading your %s.  They have not been loaded, and "
+"the old file has been renamed to %s~."
+msgstr ""
+
+msgid "Calculating..."
+msgstr ""
+
+#, fuzzy
+msgid "Unknown."
+msgstr "anaithnid"
+
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s, %d hour"
+msgid_plural "%s, %d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s, %d minute"
+msgid_plural "%s, %d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr ""
+
+#, c-format
+msgid "Unable to connect to %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+
+#, c-format
+msgid "Error reading from %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Error writing to %s: %s"
+msgstr "Teip ar scríobh %s: %s"
+
+#, c-format
+msgid "Unable to connect to %s: %s"
+msgstr ""
+
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr ""
+
+#. 10054
+#, c-format
+msgid "Remote host closed connection."
+msgstr ""
+
+#. 10060
+#, fuzzy, c-format
+msgid "Connection timed out."
+msgstr "Dínascadh de bharr moille rófhada"
+
+#. 10061
+#, fuzzy, c-format
+msgid "Connection refused."
+msgstr "Nasc diúltaithe"
+
+#. 10048
+#, fuzzy, c-format
+msgid "Address already in use."
+msgstr "Seoladh in úsáid cheana féin"
+
+msgid "Internet Messenger"
+msgstr ""
+
+msgid "Pidgin Internet Messenger"
+msgstr ""
+
+msgid "Send instant messages over multiple protocols"
+msgstr ""
+
+#, fuzzy
+msgid "Orientation"
+msgstr "Treosuíomh"
+
+#, fuzzy
+msgid "The orientation of the tray."
+msgstr "Treoshuíomh an thráidire."
+
+#. Build the login options frame.
+msgid "Login Options"
+msgstr ""
+
+msgid "Pro_tocol:"
+msgstr ""
+
+msgid "_Username:"
+msgstr "_Ainm Úsáideora"
+
+msgid "Remember pass_word"
+msgstr ""
+
+#. Build the user options frame.
+msgid "User Options"
+msgstr "Roghanna Úsáideoire"
+
+msgid "_Local alias:"
+msgstr ""
+
+msgid "New _mail notifications"
+msgstr ""
+
+#. Buddy icon
+msgid "Use this buddy _icon for this account:"
+msgstr ""
+
+#. Build the protocol options frame.
+#, c-format
+msgid "%s Options"
+msgstr "%s Roghanna"
+
+msgid "Use GNOME Proxy Settings"
+msgstr ""
+
+msgid "Use Global Proxy Settings"
+msgstr ""
+
+msgid "No Proxy"
+msgstr ""
+
+msgid "HTTP"
+msgstr "HTTP"
+
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+msgid "Use Environmental Settings"
+msgstr ""
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+msgid "If you look real closely"
+msgstr ""
+
+#. This is an easter egg. See the comment on the previous line in the source.
+msgid "you can see the butterflies mating"
+msgstr ""
+
+msgid "Proxy Options"
+msgstr ""
+
+msgid "Proxy _type:"
+msgstr ""
+
+msgid "_Host:"
+msgstr "_Óstach"
+
+msgid "_Port:"
+msgstr "_Port:"
+
+msgid "Pa_ssword:"
+msgstr "Pa_sfhocal:"
+
+msgid "Unable to save new account"
+msgstr ""
+
+msgid "An account already exists with the specified criteria."
+msgstr ""
+
+msgid "Add Account"
+msgstr ""
+
+#, fuzzy
+msgid "_Basic"
+msgstr "Bunúsach"
+
+msgid "Create _this new account on the server"
+msgstr ""
+
+#, fuzzy
+msgid "_Advanced"
+msgstr "_Ardmódh"
+
+msgid "Enabled"
+msgstr "cumasaithe"
+
+msgid "Protocol"
+msgstr "Prótacal"
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
+msgstr ""
+
+#, c-format
+msgid "You have %d contact named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+
+msgid "Please update the necessary fields."
+msgstr ""
+
+msgid "Room _List"
+msgstr ""
+
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+
+msgid "_Account:"
+msgstr "_Cuntas:"
+
+msgid "_Block"
+msgstr "_Cuireann bac"
+
+msgid "Un_block"
+msgstr ""
+
+msgid "Move to"
+msgstr "Bog do"
+
+msgid "Get _Info"
+msgstr ""
+
+msgid "I_M"
+msgstr ""
+
+msgid "_Send File..."
+msgstr ""
+
+msgid "Add Buddy _Pounce..."
+msgstr ""
+
+#, fuzzy
+msgid "View _Log"
+msgstr "Amharc ar logchomhad"
+
+msgid "Hide when offline"
+msgstr ""
+
+msgid "Show when offline"
+msgstr ""
+
+msgid "_Alias..."
+msgstr "_Ailias..."
+
+msgid "_Remove"
+msgstr "_Scrios"
+
+msgid "Set Custom Icon"
+msgstr ""
+
+msgid "Remove Custom Icon"
+msgstr ""
+
+msgid "Add _Buddy..."
+msgstr ""
+
+msgid "Add C_hat..."
+msgstr ""
+
+msgid "_Delete Group"
+msgstr "_Scrios Grúpa"
+
+msgid "_Rename"
+msgstr "_Athainmigh"
+
+#. join button
+msgid "_Join"
+msgstr ""
+
+msgid "Auto-Join"
+msgstr ""
+
+msgid "Persistent"
+msgstr ""
+
+msgid "_Edit Settings..."
+msgstr ""
+
+msgid "_Collapse"
+msgstr ""
+
+msgid "_Expand"
+msgstr ""
+
+msgid "/Tools/Mute Sounds"
+msgstr ""
+
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+msgid "Unknown node type"
+msgstr ""
+
+#. Buddies menu
+msgid "/_Buddies"
+msgstr "/_Cairde"
+
+msgid "/Buddies/New Instant _Message..."
+msgstr ""
+
+msgid "/Buddies/Join a _Chat..."
+msgstr ""
+
+msgid "/Buddies/Get User _Info..."
+msgstr ""
+
+msgid "/Buddies/View User _Log..."
+msgstr ""
+
+msgid "/Buddies/Sh_ow"
+msgstr "?Cairde/Ta_ispeáin"
+
+msgid "/Buddies/Show/_Offline Buddies"
+msgstr ""
+
+msgid "/Buddies/Show/_Empty Groups"
+msgstr ""
+
+msgid "/Buddies/Show/Buddy _Details"
+msgstr ""
+
+msgid "/Buddies/Show/Idle _Times"
+msgstr ""
+
+msgid "/Buddies/Show/_Protocol Icons"
+msgstr ""
+
+msgid "/Buddies/_Sort Buddies"
+msgstr ""
+
+msgid "/Buddies/_Add Buddy..."
+msgstr ""
+
+msgid "/Buddies/Add C_hat..."
+msgstr ""
+
+msgid "/Buddies/Add _Group..."
+msgstr ""
+
+msgid "/Buddies/_Quit"
+msgstr "/Cairde/_Scoir"
+
+#. Accounts menu
+msgid "/_Accounts"
+msgstr "/_Cuntais"
+
+msgid "/Accounts/Manage Accounts"
+msgstr ""
+
+#. Tools
+msgid "/_Tools"
+msgstr "/_Uirlísí"
+
+msgid "/Tools/Buddy _Pounces"
+msgstr ""
+
+msgid "/Tools/_Certificates"
+msgstr ""
+
+msgid "/Tools/Plu_gins"
+msgstr ""
+
+msgid "/Tools/Pr_eferences"
+msgstr ""
+
+msgid "/Tools/Pr_ivacy"
+msgstr ""
+
+msgid "/Tools/Smile_y"
+msgstr ""
+
+msgid "/Tools/_File Transfers"
+msgstr ""
+
+msgid "/Tools/R_oom List"
+msgstr ""
+
+msgid "/Tools/System _Log"
+msgstr ""
+
+msgid "/Tools/Mute _Sounds"
+msgstr ""
+
+#. Help
+msgid "/_Help"
+msgstr "/_Cabhair"
+
+msgid "/Help/Online _Help"
+msgstr ""
+
+msgid "/Help/_Debug Window"
+msgstr ""
+
+msgid "/Help/_About"
+msgstr "/Cabhair/_Faoi"
+
+#, c-format
+msgid "<b>Account:</b> %s"
+msgstr "<b>Cuntas:</b> %s"
+
+#, c-format
+msgid ""
+"\n"
+"<b>Occupants:</b> %d"
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+
+msgid "(no topic set)"
+msgstr ""
+
+msgid "Buddy Alias"
+msgstr ""
+
+#, fuzzy
+msgid "Logged In"
+msgstr "Logáilte isteach!\n"
+
+msgid "Last Seen"
+msgstr ""
+
+msgid "Spooky"
+msgstr ""
+
+msgid "Awesome"
+msgstr ""
+
+msgid "Rockin'"
+msgstr ""
+
+msgid "Total Buddies"
+msgstr ""
+
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Díomhaoin %dl %du %02dn"
+
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Díomhaoin %du %02dn"
+
+#, c-format
+msgid "Idle %dm"
+msgstr "Díomhaoin %dn"
+
+msgid "/Buddies/New Instant Message..."
+msgstr ""
+
+msgid "/Buddies/Join a Chat..."
+msgstr ""
+
+msgid "/Buddies/Get User Info..."
+msgstr ""
+
+msgid "/Buddies/Add Buddy..."
+msgstr ""
+
+msgid "/Buddies/Add Chat..."
+msgstr ""
+
+msgid "/Buddies/Add Group..."
+msgstr ""
+
+msgid "/Tools/Privacy"
+msgstr ""
+
+msgid "/Tools/Room List"
+msgstr ""
+
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Manually"
+msgstr ""
+
+msgid "By status"
+msgstr ""
+
+msgid "By log size"
+msgstr ""
+
+#, c-format
+msgid "%s disconnected"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s disabled"
+msgstr "Míchumasach"
+
+msgid "Reconnect"
+msgstr ""
+
+msgid "Re-enable"
+msgstr ""
+
+msgid "Welcome back!"
+msgstr ""
+
+#, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "<b>Username:</b>"
+msgstr "<b>Logainm:</b>"
+
+msgid "<b>Password:</b>"
+msgstr "<b>Pasfhocal</b>"
+
+#, fuzzy
+msgid "_Login"
+msgstr "Log Ann"
+
+msgid "/Accounts"
+msgstr "/Cuntais"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
+msgstr ""
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+msgid "/Buddies/Show/Offline Buddies"
+msgstr ""
+
+msgid "/Buddies/Show/Empty Groups"
+msgstr ""
+
+msgid "/Buddies/Show/Buddy Details"
+msgstr ""
+
+msgid "/Buddies/Show/Idle Times"
+msgstr ""
+
+msgid "/Buddies/Show/Protocol Icons"
+msgstr ""
+
+msgid "Add a buddy.\n"
+msgstr ""
+
+msgid "Buddy's _username:"
+msgstr ""
+
+msgid "(Optional) A_lias:"
+msgstr ""
+
+msgid "Add buddy to _group:"
+msgstr ""
+
+msgid "This protocol does not support chat rooms."
+msgstr ""
+
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+
+msgid "A_lias:"
+msgstr "A_ilias"
+
+msgid "Auto_join when account becomes online."
+msgstr ""
+
+msgid "_Hide chat when the window is closed."
+msgstr ""
+
+msgid "Please enter the name of the group to be added."
+msgstr ""
+
+msgid "Enable Account"
+msgstr ""
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr ""
+
+msgid "<PurpleMain>/Accounts/"
+msgstr ""
+
+msgid "_Edit Account"
+msgstr ""
+
+msgid "No actions available"
+msgstr ""
+
+msgid "_Disable"
+msgstr ""
+
+msgid "/Tools"
+msgstr "/Uirlísí"
+
+msgid "/Buddies/Sort Buddies"
+msgstr ""
+
+#. Widget creation function
+msgid "SSL Servers"
+msgstr "SSL Servers"
+
+#, fuzzy
+msgid "Unknown command."
+msgstr "ordú anaithnid: `%c'"
+
+msgid "That buddy is not on the same protocol as this chat."
+msgstr ""
+
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+
+msgid "Invite Buddy Into Chat Room"
+msgstr ""
+
+#. Put our happy label in it.
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+
+msgid "_Buddy:"
+msgstr "_Cara:"
+
+#, fuzzy
+msgid "_Message:"
+msgstr "_Scéal:"
+
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr ""
+
+msgid "Save Conversation"
+msgstr ""
+
+#, fuzzy
+msgid "Find"
+msgstr "Cuardaigh"
+
+#, fuzzy
+msgid "_Search for:"
+msgstr "Déan cuardach ar"
+
+msgid "Un-Ignore"
+msgstr ""
+
+#, fuzzy
+msgid "Ignore"
+msgstr "Déan neamhshuim"
+
+msgid "Get Away Message"
+msgstr ""
+
+msgid "Last said"
+msgstr ""
+
+msgid "Unable to save icon file to disk."
+msgstr ""
+
+msgid "Save Icon"
+msgstr ""
+
+msgid "Animate"
+msgstr ""
+
+msgid "Hide Icon"
+msgstr ""
+
+msgid "Save Icon As..."
+msgstr ""
+
+msgid "Set Custom Icon..."
+msgstr ""
+
+msgid "Change Size"
+msgstr ""
+
+msgid "Show All"
+msgstr "Táispeáin Gach"
+
+#. Conversation menu
+msgid "/_Conversation"
+msgstr ""
+
+msgid "/Conversation/New Instant _Message..."
+msgstr ""
+
+msgid "/Conversation/_Find..."
+msgstr ""
+
+msgid "/Conversation/View _Log"
+msgstr ""
+
+msgid "/Conversation/_Save As..."
+msgstr ""
+
+msgid "/Conversation/Clea_r Scrollback"
+msgstr ""
+
+msgid "/Conversation/Se_nd File..."
+msgstr ""
+
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr ""
+
+msgid "/Conversation/_Get Info"
+msgstr ""
+
+msgid "/Conversation/In_vite..."
+msgstr ""
+
+msgid "/Conversation/M_ore"
+msgstr ""
+
+msgid "/Conversation/Al_ias..."
+msgstr ""
+
+msgid "/Conversation/_Block..."
+msgstr ""
+
+msgid "/Conversation/_Unblock..."
+msgstr ""
+
+msgid "/Conversation/_Add..."
+msgstr "/Comhrá/_Cuir..."
+
+msgid "/Conversation/_Remove..."
+msgstr ""
+
+msgid "/Conversation/Insert Lin_k..."
+msgstr ""
+
+msgid "/Conversation/Insert Imag_e..."
+msgstr ""
+
+msgid "/Conversation/_Close"
+msgstr ""
+
+#. Options
+msgid "/_Options"
+msgstr "/_Roghanna"
+
+msgid "/Options/Enable _Logging"
+msgstr ""
+
+msgid "/Options/Enable _Sounds"
+msgstr "/Roghanna/Úsáid _Fuaimeanna"
+
+msgid "/Options/Show Formatting _Toolbars"
+msgstr ""
+
+msgid "/Options/Show Ti_mestamps"
+msgstr ""
+
+msgid "/Conversation/More"
+msgstr ""
+
+msgid "/Options"
+msgstr "/Roghanna"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+msgid "/Conversation"
+msgstr "/Comhrá"
+
+msgid "/Conversation/View Log"
+msgstr ""
+
+msgid "/Conversation/Send File..."
+msgstr ""
+
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr ""
+
+msgid "/Conversation/Get Info"
+msgstr "/Comhrá/Faigh Eolas"
+
+msgid "/Conversation/Invite..."
+msgstr ""
+
+msgid "/Conversation/Alias..."
+msgstr ""
+
+msgid "/Conversation/Block..."
+msgstr ""
+
+msgid "/Conversation/Unblock..."
+msgstr ""
+
+msgid "/Conversation/Add..."
+msgstr "/Comhrá/Cuir..."
+
+msgid "/Conversation/Remove..."
+msgstr ""
+
+msgid "/Conversation/Insert Link..."
+msgstr ""
+
+msgid "/Conversation/Insert Image..."
+msgstr ""
+
+msgid "/Options/Enable Logging"
+msgstr ""
+
+msgid "/Options/Enable Sounds"
+msgstr "/Roghanna/Úsáid Fuaimeanna"
+
+msgid "/Options/Show Formatting Toolbars"
+msgstr ""
+
+msgid "/Options/Show Timestamps"
+msgstr ""
+
+msgid "User is typing..."
+msgstr " Tá  úsáideoir ag clóscríobh..."
+
+#, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+
+#. Build the Send To menu
+msgid "S_end To"
+msgstr ""
+
+msgid "_Send"
+msgstr "_Post"
+
+#. Setup the label telling how many people are in the room.
+msgid "0 people in room"
+msgstr ""
+
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Typing"
+msgstr ""
+
+msgid "Stopped Typing"
+msgstr ""
+
+msgid "Nick Said"
+msgstr ""
+
+msgid "Unread Messages"
+msgstr ""
+
+msgid "New Event"
+msgstr ""
+
+msgid "clear: Clears all conversation scrollbacks."
+msgstr ""
+
+msgid "Confirm close"
+msgstr ""
+
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr ""
+
+msgid "Close other tabs"
+msgstr ""
+
+msgid "Close all tabs"
+msgstr ""
+
+msgid "Detach this tab"
+msgstr ""
+
+#, fuzzy
+msgid "Close this tab"
+msgstr "Dún an Cluaisín seo"
+
+msgid "Close conversation"
+msgstr ""
+
+msgid "Last created window"
+msgstr ""
+
+msgid "Separate IM and Chat windows"
+msgstr ""
+
+#, fuzzy
+msgid "New window"
+msgstr "Fhuinneog nua:"
+
+msgid "By group"
+msgstr ""
+
+msgid "By account"
+msgstr ""
+
+msgid "Save Debug Log"
+msgstr ""
+
+#, fuzzy
+msgid "Invert"
+msgstr "Aisiompaigh"
+
+msgid "Highlight matches"
+msgstr ""
+
+msgid "_Icon Only"
+msgstr ""
+
+#, fuzzy
+msgid "_Text Only"
+msgstr "Teacs amhain"
+
+msgid "_Both Icon & Text"
+msgstr ""
+
+#, fuzzy
+msgid "Filter"
+msgstr "Scagaire"
+
+msgid "Right click for more options."
+msgstr ""
+
+msgid "Level "
+msgstr "Leibhéal"
+
+msgid "Select the debug filter level."
+msgstr ""
+
+msgid "All"
+msgstr "Gach Rud"
+
+#, fuzzy
+msgid "Misc"
+msgstr "Teibí."
+
+#, fuzzy
+msgid "Warning"
+msgstr "Rabhadh"
+
+#, fuzzy
+msgid "Error "
+msgstr "Earraidh"
+
+#, fuzzy
+msgid "Fatal Error"
+msgstr "earráid mharfach: "
+
+#, fuzzy
+msgid "developer"
+msgstr "Forbróir"
+
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr ""
+
+msgid "support"
+msgstr ""
+
+msgid "support/QA"
+msgstr ""
+
+msgid "developer & webmaster"
+msgstr ""
+
+msgid "Senior Contributor/QA"
+msgstr ""
+
+msgid "win32 port"
+msgstr ""
+
+#, fuzzy
+msgid "maintainer"
+msgstr "Cothaitheoir"
+
+msgid "libfaim maintainer"
+msgstr ""
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+msgid "hacker and designated driver [lazy bum]"
+msgstr ""
+
+msgid "XMPP developer"
+msgstr ""
+
+#, fuzzy
+msgid "original author"
+msgstr "An Chéad Údar"
+
+#, fuzzy
+msgid "lead developer"
+msgstr "Príomhfhorbróir"
+
+msgid "Afrikaans"
+msgstr "Afracáinis"
+
+msgid "Arabic"
+msgstr "Araibis"
+
+msgid "Belarusian Latin"
+msgstr ""
+
+msgid "Bulgarian"
+msgstr "Bulgáiris"
+
+msgid "Bengali"
+msgstr "Beangáilis"
+
+msgid "Bosnian"
+msgstr "Boisnis"
+
+msgid "Catalan"
+msgstr "Catalóinis"
+
+msgid "Valencian-Catalan"
+msgstr "Catalóinis; Vaileinsis"
+
+msgid "Czech"
+msgstr "Seicis"
+
+msgid "Danish"
+msgstr "Danmhairgais"
+
+msgid "German"
+msgstr "Gearmáinis"
+
+msgid "Dzongkha"
+msgstr ""
+
+msgid "Greek"
+msgstr "Gréigis"
+
+msgid "Australian English"
+msgstr "Béarla Astrálach"
+
+msgid "Canadian English"
+msgstr "Bearla (Ceanada)"
+
+msgid "British English"
+msgstr "Bearla (An Bhreatain)"
+
+msgid "Esperanto"
+msgstr "Esperanto"
+
+msgid "Spanish"
+msgstr "Spáinnis"
+
+msgid "Estonian"
+msgstr "Eastóinis"
+
+msgid "Euskera(Basque)"
+msgstr ""
+
+msgid "Persian"
+msgstr "Peirsis"
+
+msgid "Finnish"
+msgstr "Fionnlainnis"
+
+msgid "French"
+msgstr "Fraincis"
+
+msgid "Galician"
+msgstr "Gailísis"
+
+msgid "Gujarati"
+msgstr "Guidsearatis"
+
+msgid "Gujarati Language Team"
+msgstr ""
+
+msgid "Hebrew"
+msgstr "Eabhrais"
+
+msgid "Hindi"
+msgstr "Hiondis"
+
+msgid "Hungarian"
+msgstr "Ungáiris"
+
+msgid "Indonesian"
+msgstr "Indinéisis"
+
+msgid "Italian"
+msgstr "Iodáilis"
+
+msgid "Japanese"
+msgstr "Seapáinis"
+
+msgid "Georgian"
+msgstr "Grúisis"
+
+msgid "Ubuntu Georgian Translators"
+msgstr ""
+
+msgid "Kannada"
+msgstr "Cannadais"
+
+msgid "Kannada Translation team"
+msgstr ""
+
+msgid "Korean"
+msgstr "Córéis"
+
+msgid "Kurdish"
+msgstr "Coirdis"
+
+msgid "Lao"
+msgstr "Láóis"
+
+msgid "Lithuanian"
+msgstr "Liotuáinis"
+
+msgid "Macedonian"
+msgstr "Macadóinis"
+
+msgid "Bokmål Norwegian"
+msgstr "Ioruais Bokmål"
+
+msgid "Nepali"
+msgstr "Neipealais"
+
+msgid "Dutch, Flemish"
+msgstr "Ollainnis; Pléimeannais"
+
+msgid "Norwegian Nynorsk"
+msgstr "Ioruais Nynorsk"
+
+msgid "Occitan"
+msgstr ""
+
+msgid "Punjabi"
+msgstr "Painseáibis"
+
+msgid "Polish"
+msgstr "Polainnis"
+
+msgid "Portuguese"
+msgstr "Portaingéilis"
+
+msgid "Portuguese-Brazil"
+msgstr ""
+
+msgid "Pashto"
+msgstr ""
+
+msgid "Romanian"
+msgstr "Rómáinis"
+
+msgid "Russian"
+msgstr "Rúisis"
+
+msgid "Slovak"
+msgstr "Slóvaicis"
+
+msgid "Slovenian"
+msgstr "Slóivéinis"
+
+msgid "Albanian"
+msgstr "Albáinis"
+
+msgid "Serbian"
+msgstr "Seirbis"
+
+msgid "Sinhala"
+msgstr "Siolóinis"
+
+msgid "Swedish"
+msgstr "Sualainnis"
+
+msgid "Tamil"
+msgstr "Tamailis"
+
+msgid "Telugu"
+msgstr "Teileagúis"
+
+msgid "Thai"
+msgstr "Téalannais"
+
+msgid "Turkish"
+msgstr "Tuircis"
+
+msgid "Urdu"
+msgstr "Urdais"
+
+msgid "Vietnamese"
+msgstr "Vítneaimis"
+
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr ""
+
+msgid "Simplified Chinese"
+msgstr "Sínis Shimplí"
+
+msgid "Hong Kong Chinese"
+msgstr ""
+
+msgid "Traditional Chinese"
+msgstr "Sínis Traidisiúnta"
+
+msgid "Amharic"
+msgstr "Amáiris"
+
+#, c-format
+msgid "About %s"
+msgstr "Faoi %s"
+
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+
+#, c-format
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr ""
+
+msgid "Current Developers"
+msgstr ""
+
+msgid "Crazy Patch Writers"
+msgstr ""
+
+msgid "Retired Developers"
+msgstr ""
+
+msgid "Retired Crazy Patch Writers"
+msgstr ""
+
+msgid "Artists"
+msgstr ""
+
+msgid "Current Translators"
+msgstr ""
+
+msgid "Past Translators"
+msgstr ""
+
+msgid "Debugging Information"
+msgstr ""
+
+msgid "_Name"
+msgstr "_Ainm"
+
+msgid "_Account"
+msgstr "_Cuntas"
+
+msgid "Get User Info"
+msgstr ""
+
+msgid ""
+"Please enter the username or alias of the person whose info you would like "
+"to view."
+msgstr ""
+
+msgid "View User Log"
+msgstr ""
+
+msgid "Alias Contact"
+msgstr ""
+
+msgid "Enter an alias for this contact."
+msgstr ""
+
+#, c-format
+msgid "Enter an alias for %s."
+msgstr ""
+
+msgid "Alias Buddy"
+msgstr ""
+
+msgid "Alias Chat"
+msgstr ""
+
+msgid "Enter an alias for this chat."
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "Remove Contact"
+msgstr ""
+
+msgid "_Remove Contact"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+
+msgid "Merge Groups"
+msgstr ""
+
+msgid "_Merge Groups"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+
+msgid "Remove Group"
+msgstr ""
+
+msgid "_Remove Group"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr ""
+
+msgid "Remove Buddy"
+msgstr ""
+
+msgid "_Remove Buddy"
+msgstr ""
+
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+
+msgid "Remove Chat"
+msgstr ""
+
+msgid "_Remove Chat"
+msgstr ""
+
+msgid "Right-click for more unread messages...\n"
+msgstr ""
+
+msgid "_Change Status"
+msgstr ""
+
+msgid "Show Buddy _List"
+msgstr ""
+
+msgid "_Unread Messages"
+msgstr ""
+
+msgid "New _Message..."
+msgstr ""
+
+msgid "_Accounts"
+msgstr "_Cuntais"
+
+msgid "Plu_gins"
+msgstr ""
+
+msgid "Pr_eferences"
+msgstr ""
+
+msgid "Mute _Sounds"
+msgstr ""
+
+msgid "_Blink on New Message"
+msgstr ""
+
+msgid "_Quit"
+msgstr "_Scoir"
+
+msgid "Not started"
+msgstr ""
+
+msgid "<b>Receiving As:</b>"
+msgstr ""
+
+msgid "<b>Receiving From:</b>"
+msgstr ""
+
+msgid "<b>Sending To:</b>"
+msgstr ""
+
+msgid "<b>Sending As:</b>"
+msgstr ""
+
+msgid "There is no application configured to open this type of file."
+msgstr ""
+
+msgid "An error occurred while opening the file."
+msgstr ""
+
+#, c-format
+msgid "Error launching %s: %s"
+msgstr ""
+
+#, c-format
+msgid "Error running %s"
+msgstr ""
+
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+msgid "Filename:"
+msgstr "Ainm Comhad:"
+
+msgid "Local File:"
+msgstr ""
+
+msgid "Speed:"
+msgstr "Luas:"
+
+msgid "Time Elapsed:"
+msgstr ""
+
+msgid "Time Remaining:"
+msgstr ""
+
+msgid "Close this window when all transfers _finish"
+msgstr ""
+
+msgid "C_lear finished transfers"
+msgstr ""
+
+#. "Download Details" arrow
+msgid "File transfer _details"
+msgstr ""
+
+#. Pause button
+msgid "_Pause"
+msgstr "_Sos"
+
+#. Resume button
+msgid "_Resume"
+msgstr "_Atosaigh"
+
+msgid "Paste as Plain _Text"
+msgstr ""
+
+msgid "_Reset formatting"
+msgstr ""
+
+msgid "Disable _smileys in selected text"
+msgstr ""
+
+msgid "Hyperlink color"
+msgstr ""
+
+msgid "Color to draw hyperlinks."
+msgstr ""
+
+msgid "Hyperlink prelight color"
+msgstr ""
+
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr ""
+
+msgid "Sent Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you sent."
+msgstr ""
+
+msgid "Received Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received."
+msgstr ""
+
+msgid "\"Attention\" Name Color"
+msgstr ""
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr ""
+
+msgid "Action Message Name Color"
+msgstr ""
+
+msgid "Color to draw the name of an action message."
+msgstr ""
+
+msgid "Action Message Name Color for Whispered Message"
+msgstr ""
+
+msgid "Whisper Message Name Color"
+msgstr ""
+
+msgid "Typing notification color"
+msgstr ""
+
+msgid "The color to use for the typing notification font"
+msgstr ""
+
+msgid "Typing notification font"
+msgstr ""
+
+msgid "The font to use for the typing notification"
+msgstr ""
+
+msgid "Enable typing notification"
+msgstr ""
+
+msgid "_Copy Email Address"
+msgstr ""
+
+msgid "_Open Link in Browser"
+msgstr ""
+
+msgid "_Copy Link Location"
+msgstr ""
+
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Save Image"
+msgstr "Sábháil an Íomha"
+
+#, c-format
+msgid "_Save Image..."
+msgstr "_Sábháil Íomhá..."
+
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr ""
+
+#, fuzzy
+msgid "Select Font"
+msgstr "Roghnaigh Cló..."
+
+msgid "Select Text Color"
+msgstr ""
+
+#, fuzzy
+msgid "Select Background Color"
+msgstr "Cuir dath cúlra"
+
+msgid "_URL"
+msgstr "_URL"
+
+#, fuzzy
+msgid "_Description"
+msgstr "_Cuir síos"
+
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+
+msgid "Please enter the URL of the link that you want to insert."
+msgstr ""
+
+msgid "Insert Link"
+msgstr ""
+
+msgid "_Insert"
+msgstr ""
+
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr ""
+
+msgid "Insert Image"
+msgstr ""
+
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+
+msgid "Smile!"
+msgstr "Miongháire!"
+
+msgid "_Manage custom smileys"
+msgstr ""
+
+msgid "This theme has no available smileys."
+msgstr ""
+
+msgid "_Font"
+msgstr "_Clófhoireann"
+
+msgid "Group Items"
+msgstr ""
+
+msgid "Ungroup Items"
+msgstr ""
+
+msgid "Bold"
+msgstr "Trom"
+
+msgid "Italic"
+msgstr "Iodálach"
+
+msgid "Underline"
+msgstr "Cuir líine faoi"
+
+msgid "Strikethrough"
+msgstr ""
+
+msgid "Increase Font Size"
+msgstr ""
+
+msgid "Decrease Font Size"
+msgstr ""
+
+msgid "Font Face"
+msgstr "Clófhoireann"
+
+#, fuzzy
+msgid "Background Color"
+msgstr "Dath Cúlra"
+
+msgid "Foreground Color"
+msgstr "Dath an Tulra"
+
+msgid "Reset Formatting"
+msgstr ""
+
+msgid "Insert IM Image"
+msgstr ""
+
+msgid "Insert Smiley"
+msgstr ""
+
+msgid "<b>_Bold</b>"
+msgstr "<b>_Trom</b>"
+
+msgid "<i>_Italic</i>"
+msgstr "<i>_Iodálach</i>"
+
+msgid "<u>_Underline</u>"
+msgstr "<u>_Cuir líne faoi</u>"
+
+msgid "<span strikethrough='true'>Strikethrough</span>"
+msgstr ""
+
+msgid "<span size='larger'>_Larger</span>"
+msgstr ""
+
+#, fuzzy
+msgid "_Normal"
+msgstr "_Gnáth"
+
+msgid "<span size='smaller'>_Smaller</span>"
+msgstr ""
+
+#. If we want to show the formatting for the following items, we would
+#. * need to update them when formatting changes. The above items don't need
+#. * no updating nor nothin'
+msgid "_Font face"
+msgstr "_Clófhoireann"
+
+msgid "Foreground _color"
+msgstr "Dath an _tulra"
+
+msgid "Bac_kground color"
+msgstr ""
+
+msgid "_Image"
+msgstr "_Íomhá"
+
+msgid "_Link"
+msgstr "_Nasc"
+
+msgid "_Horizontal rule"
+msgstr ""
+
+msgid "_Smile!"
+msgstr "_Miongháire!"
+
+msgid "Log Deletion Failed"
+msgstr ""
+
+msgid "Check permissions and try again."
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+
+msgid "Delete Log?"
+msgstr ""
+
+msgid "Delete Log..."
+msgstr ""
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr ""
+
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr ""
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+msgid "_Browse logs folder"
+msgstr ""
+
+# Bain triail as `%s %s' chun tuilleadh eolais a fháil.\n
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr ""
+
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -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 ""
+
+#, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -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 ""
+
+#, 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"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%swiki/GetABacktrace\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%swiki/DeveloperPages\n"
+msgstr ""
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+msgid "Pidgin"
+msgstr "Pidgin"
+
+msgid "Open All Messages"
+msgstr ""
+
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr ""
+
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr ""
+
+msgid "Unable to open URL"
+msgstr ""
+
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr ""
+
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+
+msgid "The following plugins will be unloaded."
+msgstr ""
+
+msgid "Multiple plugins will be unloaded."
+msgstr ""
+
+msgid "Unload Plugins"
+msgstr ""
+
+msgid "Could not unload plugin"
+msgstr ""
+
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+
+#, c-format
+msgid ""
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+
+#, fuzzy
+msgid "Author"
+msgstr "Údar"
+
+#, fuzzy
+msgid "<b>Written by:</b>"
+msgstr "Le %s.\n"
+
+msgid "<b>Web site:</b>"
+msgstr "<b>Suíomh Gréasáin:</b>"
+
+msgid "<b>Filename:</b>"
+msgstr "<b>Ainm an Comhad:</b>"
+
+msgid "Configure Pl_ugin"
+msgstr ""
+
+msgid "<b>Plugin Details</b>"
+msgstr ""
+
+#, fuzzy
+msgid "Select a file"
+msgstr "Roghnaigh Comhad"
+
+#. Create the "Pounce on Whom" frame.
+msgid "Pounce on Whom"
+msgstr ""
+
+msgid "_Buddy name:"
+msgstr ""
+
+msgid "Si_gns on"
+msgstr ""
+
+msgid "Signs o_ff"
+msgstr ""
+
+msgid "Goes a_way"
+msgstr ""
+
+msgid "Ret_urns from away"
+msgstr ""
+
+msgid "Becomes _idle"
+msgstr ""
+
+msgid "Is no longer i_dle"
+msgstr ""
+
+msgid "Starts _typing"
+msgstr ""
+
+msgid "P_auses while typing"
+msgstr ""
+
+msgid "Stops t_yping"
+msgstr ""
+
+msgid "Sends a _message"
+msgstr ""
+
+msgid "Ope_n an IM window"
+msgstr ""
+
+msgid "_Pop up a notification"
+msgstr ""
+
+msgid "Send a _message"
+msgstr ""
+
+msgid "E_xecute a command"
+msgstr ""
+
+msgid "P_lay a sound"
+msgstr ""
+
+msgid "Brows_e..."
+msgstr "Brabhsáil..."
+
+msgid "Br_owse..."
+msgstr "Brabhsáil..."
+
+msgid "Pre_view"
+msgstr ""
+
+msgid "P_ounce only when my status is not Available"
+msgstr ""
+
+msgid "_Recurring"
+msgstr ""
+
+msgid "Pounce Target"
+msgstr ""
+
+msgid "Smiley theme failed to unpack."
+msgstr ""
+
+msgid "Install Theme"
+msgstr ""
+
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+
+msgid "Icon"
+msgstr "Deilbhín"
+
+msgid "Keyboard Shortcuts"
+msgstr ""
+
+msgid "Cl_ose conversations with the Escape key"
+msgstr ""
+
+msgid "System Tray Icon"
+msgstr ""
+
+msgid "_Show system tray icon:"
+msgstr ""
+
+msgid "On unread messages"
+msgstr ""
+
+msgid "Conversation Window Hiding"
+msgstr ""
+
+msgid "_Hide new IM conversations:"
+msgstr ""
+
+msgid "When away"
+msgstr ""
+
+#. All the tab options!
+msgid "Tabs"
+msgstr ""
+
+msgid "Show IMs and chats in _tabbed windows"
+msgstr ""
+
+msgid "Show close b_utton on tabs"
+msgstr ""
+
+msgid "_Placement:"
+msgstr ""
+
+msgid "Top"
+msgstr "Barr"
+
+msgid "Bottom"
+msgstr "Bun"
+
+msgid "Left"
+msgstr "Clé"
+
+msgid "Right"
+msgstr "Deas"
+
+msgid "Left Vertical"
+msgstr ""
+
+msgid "Right Vertical"
+msgstr ""
+
+msgid "N_ew conversations:"
+msgstr ""
+
+msgid "Show _formatting on incoming messages"
+msgstr ""
+
+msgid "Close IMs immediately when the tab is closed"
+msgstr ""
+
+msgid "Show _detailed information"
+msgstr ""
+
+msgid "Enable buddy ic_on animation"
+msgstr ""
+
+msgid "_Notify buddies that you are typing to them"
+msgstr ""
+
+msgid "Highlight _misspelled words"
+msgstr ""
+
+msgid "Use smooth-scrolling"
+msgstr ""
+
+msgid "F_lash window when IMs are received"
+msgstr ""
+
+msgid "Minimi_ze new conversation windows"
+msgstr ""
+
+msgid "Minimum input area height in lines:"
+msgstr ""
+
+msgid "Font"
+msgstr "Clófhoireann"
+
+msgid "Use document font from _theme"
+msgstr ""
+
+#, fuzzy
+msgid "Use font from _theme"
+msgstr "Bain úsáid as clófhoireann ó théama"
+
+msgid "Conversation _font:"
+msgstr ""
+
+msgid "Default Formatting"
+msgstr ""
+
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+
+msgid "Cannot start proxy configuration program."
+msgstr ""
+
+msgid "Cannot start browser configuration program."
+msgstr ""
+
+msgid "ST_UN server:"
+msgstr ""
+
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr ""
+
+msgid "_Autodetect IP address"
+msgstr ""
+
+msgid "Public _IP:"
+msgstr ""
+
+msgid "Ports"
+msgstr "poirt"
+
+msgid "_Enable automatic router port forwarding"
+msgstr ""
+
+msgid "_Manually specify range of ports to listen on"
+msgstr ""
+
+msgid "_Start port:"
+msgstr ""
+
+msgid "_End port:"
+msgstr ""
+
+msgid "Proxy Server &amp; Browser"
+msgstr ""
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr ""
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr ""
+
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+
+msgid "Configure _Proxy"
+msgstr ""
+
+msgid "Configure _Browser"
+msgstr ""
+
+msgid "Proxy Server"
+msgstr ""
+
+msgid "No proxy"
+msgstr ""
+
+msgid "_User:"
+msgstr "_Úsáideoir:"
+
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+msgid "Opera"
+msgstr "Opera"
+
+msgid "Netscape"
+msgstr "Netscape"
+
+msgid "Mozilla"
+msgstr "Mozilla"
+
+msgid "Konqueror"
+msgstr "Konqueror"
+
+msgid "Desktop Default"
+msgstr ""
+
+msgid "GNOME Default"
+msgstr ""
+
+msgid "Galeon"
+msgstr "Galeon"
+
+msgid "Firefox"
+msgstr "Firefox"
+
+msgid "Firebird"
+msgstr "Firebird"
+
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#, fuzzy
+msgid "Manual"
+msgstr "Lámhleabhar"
+
+msgid "Browser Selection"
+msgstr ""
+
+msgid "_Browser:"
+msgstr "_Brabhsálaí:"
+
+msgid "_Open link in:"
+msgstr ""
+
+msgid "Browser default"
+msgstr ""
+
+msgid "Existing window"
+msgstr ""
+
+msgid "New tab"
+msgstr "Táb Nua"
+
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+
+msgid "Log _format:"
+msgstr ""
+
+msgid "Log all _instant messages"
+msgstr ""
+
+msgid "Log all c_hats"
+msgstr ""
+
+msgid "Log all _status changes to system log"
+msgstr ""
+
+msgid "Sound Selection"
+msgstr ""
+
+#, c-format
+msgid "Quietest"
+msgstr ""
+
+#, c-format
+msgid "Quieter"
+msgstr ""
+
+#, c-format
+msgid "Quiet"
+msgstr "Ciúin"
+
+#, c-format
+msgid "Loud"
+msgstr "Ard"
+
+#, c-format
+msgid "Louder"
+msgstr "Níos Airde"
+
+#, c-format
+msgid "Loudest"
+msgstr "Is Airde"
+
+msgid "_Method:"
+msgstr "_Modh:"
+
+msgid "Console beep"
+msgstr ""
+
+msgid "No sounds"
+msgstr ""
+
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+
+msgid "Sounds when conversation has _focus"
+msgstr ""
+
+msgid "Enable sounds:"
+msgstr "Úsáid Fuaimeanna:"
+
+msgid "Volume:"
+msgstr "Láine:"
+
+msgid "Play"
+msgstr "Seinn"
+
+msgid "_Browse..."
+msgstr "_Brabhsáil..."
+
+#, fuzzy
+msgid "_Reset"
+msgstr "Athshocraigh"
+
+msgid "_Report idle time:"
+msgstr ""
+
+msgid "Based on keyboard or mouse use"
+msgstr ""
+
+msgid "_Auto-reply:"
+msgstr ""
+
+msgid "When both away and idle"
+msgstr ""
+
+#. Auto-away stuff
+msgid "Auto-away"
+msgstr ""
+
+msgid "Change status when _idle"
+msgstr ""
+
+msgid "_Minutes before becoming idle:"
+msgstr ""
+
+msgid "Change _status to:"
+msgstr ""
+
+#. Signon status stuff
+msgid "Status at Startup"
+msgstr ""
+
+msgid "Use status from last _exit at startup"
+msgstr ""
+
+msgid "Status to a_pply at startup:"
+msgstr ""
+
+#, fuzzy
+msgid "Interface"
+msgstr "Comhéadan"
+
+msgid "Smiley Themes"
+msgstr ""
+
+msgid "Browser"
+msgstr "Brabhsálaí"
+
+msgid "Status / Idle"
+msgstr ""
+
+msgid "Allow all users to contact me"
+msgstr ""
+
+msgid "Allow only the users on my buddy list"
+msgstr ""
+
+msgid "Allow only the users below"
+msgstr ""
+
+msgid "Block all users"
+msgstr ""
+
+msgid "Block only the users below"
+msgstr ""
+
+msgid "Privacy"
+msgstr ""
+
+msgid "Changes to privacy settings take effect immediately."
+msgstr ""
+
+msgid "Set privacy for:"
+msgstr ""
+
+#. Remove All button
+msgid "Remove Al_l"
+msgstr ""
+
+msgid "Permit User"
+msgstr ""
+
+msgid "Type a user you permit to contact you."
+msgstr ""
+
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr ""
+
+msgid "_Permit"
+msgstr ""
+
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr ""
+
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr ""
+
+msgid "Block User"
+msgstr ""
+
+msgid "Type a user to block."
+msgstr ""
+
+msgid "Please enter the name of the user you wish to block."
+msgstr ""
+
+#, c-format
+msgid "Block %s?"
+msgstr "Cuireann bac le %s?"
+
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr ""
+
+msgid "Apply"
+msgstr "Cuir i bhfeidhm"
+
+msgid "That file already exists"
+msgstr ""
+
+msgid "Would you like to overwrite it?"
+msgstr ""
+
+#, fuzzy
+msgid "Overwrite"
+msgstr "Forscríobh"
+
+msgid "Choose New Name"
+msgstr ""
+
+msgid "Select Folder..."
+msgstr ""
+
+#. list button
+msgid "_Get List"
+msgstr ""
+
+#. add button
+msgid "_Add Chat"
+msgstr "_Cuir Comhrá"
+
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr ""
+
+#. Use button
+#, fuzzy
+msgid "_Use"
+msgstr "Úsáid:"
+
+msgid "Title already in use.  You must choose a unique title."
+msgstr ""
+
+msgid "Different"
+msgstr ""
+
+#, fuzzy
+msgid "_Title:"
+msgstr "_Teideal:"
+
+msgid "_Status:"
+msgstr "_Stádas:"
+
+#. Different status message expander
+msgid "Use a _different status for some accounts"
+msgstr ""
+
+#. Save & Use button
+msgid "Sa_ve & Use"
+msgstr ""
+
+#, c-format
+msgid "Status for %s"
+msgstr "Stádas le %s"
+
+msgid "Custom Smiley"
+msgstr ""
+
+msgid "More Data needed"
+msgstr ""
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr ""
+
+msgid "Duplicate Shortcut"
+msgstr ""
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+
+msgid "Please select an image for the smiley."
+msgstr ""
+
+msgid "Edit Smiley"
+msgstr ""
+
+msgid "Add Smiley"
+msgstr "Cuir Straoiseog"
+
+msgid "Smiley _Image"
+msgstr ""
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr ""
+
+msgid "Smiley"
+msgstr "Straoiseog"
+
+msgid "Custom Smiley Manager"
+msgstr ""
+
+msgid "Waiting for network connection"
+msgstr ""
+
+msgid "New status..."
+msgstr "Stádas nua"
+
+msgid "Saved statuses..."
+msgstr ""
+
+msgid "Status Selector"
+msgstr ""
+
+msgid "Google Talk"
+msgstr ""
+
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr ""
+
+msgid "Failed to load image"
+msgstr ""
+
+#, c-format
+msgid "Cannot send folder %s."
+msgstr ""
+
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+
+msgid "You have dragged an image"
+msgstr ""
+
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+msgid "Set as buddy icon"
+msgstr ""
+
+msgid "Send image file"
+msgstr ""
+
+msgid "Insert in message"
+msgstr ""
+
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr ""
+
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+msgid "Cannot send launcher"
+msgstr ""
+
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+
+msgid "Icon Error"
+msgstr ""
+
+msgid "Could not set icon"
+msgstr ""
+
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr ""
+
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+msgid "Save File"
+msgstr "Sábháil comhad..."
+
+msgid "Select color"
+msgstr "Roghnaigh dath"
+
+msgid "_Alias"
+msgstr "_Ailias"
+
+msgid "Close _tabs"
+msgstr ""
+
+msgid "_Get Info"
+msgstr ""
+
+msgid "_Invite"
+msgstr ""
+
+#, fuzzy
+msgid "_Modify"
+msgstr "modhnaigh"
+
+msgid "_Open Mail"
+msgstr ""
+
+#, fuzzy
+msgid "_Edit"
+msgstr "Cuir in Eagar"
+
+msgid "Pidgin Tooltip"
+msgstr ""
+
+msgid "Pidgin smileys"
+msgstr ""
+
+msgid "Penguin Pimps"
+msgstr ""
+
+msgid "Selecting this disables graphical emoticons."
+msgstr ""
+
+msgid "none"
+msgstr "aon cheann"
+
+msgid "Response Probability:"
+msgstr ""
+
+msgid "Statistics Configuration"
+msgstr ""
+
+#. msg_difference spinner
+msgid "Maximum response timeout:"
+msgstr ""
+
+msgid "minutes"
+msgstr "nóiméid"
+
+#. last_seen spinner
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. threshold spinner
+msgid "Threshold:"
+msgstr "Tairseach:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Availability Prediction"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Contact Availability Prediction plugin."
+msgstr ""
+
+#. *  summary
+msgid "Displays statistical information about your buddies' availability"
+msgstr ""
+
+msgid "Buddy is idle"
+msgstr ""
+
+msgid "Buddy is away"
+msgstr "Tá cara shiúl"
+
+msgid "Buddy is \"extended\" away"
+msgstr ""
+
+#. Not used yet.
+msgid "Buddy is mobile"
+msgstr ""
+
+msgid "Buddy is offline"
+msgstr "Tá cara as líne"
+
+msgid "Point values to use when..."
+msgstr ""
+
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+
+msgid "Use last buddy when scores are equal"
+msgstr ""
+
+msgid "Point values to use for account..."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Contact Priority"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *< summary
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+
+#. *< description
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+
+msgid "Conversation Colors"
+msgstr ""
+
+msgid "Customize colors in the conversation window"
+msgstr ""
+
+msgid "Error Messages"
+msgstr "Teachtaireachtaí earráideacha:"
+
+msgid "Highlighted Messages"
+msgstr ""
+
+msgid "System Messages"
+msgstr ""
+
+msgid "Sent Messages"
+msgstr ""
+
+msgid "Received Messages"
+msgstr ""
+
+#, c-format
+msgid "Select Color for %s"
+msgstr ""
+
+msgid "Ignore incoming format"
+msgstr ""
+
+msgid "Apply in Chats"
+msgstr ""
+
+msgid "Apply in IMs"
+msgstr ""
+
+msgid "By conversation count"
+msgstr ""
+
+msgid "Conversation Placement"
+msgstr ""
+
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+
+msgid "Number of conversations per window"
+msgstr ""
+
+msgid "Separate IM and Chat windows when placing by number"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "ExtPlacement"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Extra conversation placement options."
+msgstr ""
+
+#. *< summary
+#. *  description
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+
+#. Configuration frame
+msgid "Mouse Gestures Configuration"
+msgstr ""
+
+msgid "Middle mouse button"
+msgstr ""
+
+msgid "Right mouse button"
+msgstr ""
+
+#. "Visual gesture display" checkbox
+msgid "_Visual gesture display"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Mouse Gestures"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Provides support for mouse gestures"
+msgstr ""
+
+#. *  description
+msgid ""
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
+msgstr ""
+
+msgid "Instant Messaging"
+msgstr ""
+
+#. Add the label.
+msgid "Select a person from your address book below, or add a new person."
+msgstr ""
+
+msgid "Group:"
+msgstr "Grúpa:"
+
+#. "New Person" button
+msgid "New Person"
+msgstr ""
+
+#. "Select Buddy" button
+msgid "Select Buddy"
+msgstr ""
+
+#. Add the label.
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+
+#. Add the expander
+msgid "User _details"
+msgstr ""
+
+#. "Associate Buddy" button
+msgid "_Associate Buddy"
+msgstr ""
+
+msgid "Unable to send email"
+msgstr ""
+
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+msgid "An email address was not found for this buddy."
+msgstr ""
+
+msgid "Add to Address Book"
+msgstr ""
+
+msgid "Send Email"
+msgstr ""
+
+#. Configuration frame
+msgid "Evolution Integration Configuration"
+msgstr ""
+
+#. Label
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Evolution Integration"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides integration with Evolution."
+msgstr ""
+
+msgid "Please enter the person's information below."
+msgstr ""
+
+msgid "Please enter the buddy's username and account type below."
+msgstr ""
+
+msgid "Account type:"
+msgstr ""
+
+#. Optional Information section
+msgid "Optional information:"
+msgstr ""
+
+msgid "First name:"
+msgstr "Ainm baiste:"
+
+msgid "Last name:"
+msgstr ""
+
+msgid "Email:"
+msgstr "Ríomhphost:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "GTK Signals Test"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Test to see that all ui signals are working properly."
+msgstr ""
+
+#, c-format
+msgid ""
+"\n"
+"<b>Buddy Note</b>: %s"
+msgstr ""
+
+msgid "History"
+msgstr "Stair"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Iconify on Away"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr ""
+
+msgid "Mail Checker"
+msgstr ""
+
+msgid "Checks for new local mail."
+msgstr ""
+
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
+msgid "Markerline"
+msgstr ""
+
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr ""
+
+msgid "Jump to markerline"
+msgstr ""
+
+msgid "Draw Markerline in "
+msgstr ""
+
+msgid "_IM windows"
+msgstr ""
+
+msgid "C_hat windows"
+msgstr ""
+
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+msgid "Music messaging session confirmed."
+msgstr ""
+
+msgid "Music Messaging"
+msgstr ""
+
+msgid "There was a conflict in running the command:"
+msgstr ""
+
+msgid "Error Running Editor"
+msgstr ""
+
+msgid "The following error has occurred:"
+msgstr ""
+
+#. Configuration frame
+msgid "Music Messaging Configuration"
+msgstr ""
+
+msgid "Score Editor Path"
+msgstr ""
+
+msgid "_Apply"
+msgstr "_Cuir i bhfeidhm"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr ""
+
+#. *  summary
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+
+#. ---------- "Notify For" ----------
+msgid "Notify For"
+msgstr ""
+
+msgid "\t_Only when someone says your username"
+msgstr ""
+
+msgid "_Focused windows"
+msgstr ""
+
+#. ---------- "Notification Methods" ----------
+msgid "Notification Methods"
+msgstr ""
+
+msgid "Prepend _string into window title:"
+msgstr ""
+
+#. Count method button
+msgid "Insert c_ount of new messages into window title"
+msgstr ""
+
+#. Count xprop method button
+msgid "Insert count of new message into _X property"
+msgstr ""
+
+#. Urgent method button
+msgid "Set window manager \"_URGENT\" hint"
+msgstr ""
+
+#. Raise window method button
+msgid "R_aise conversation window"
+msgstr ""
+
+#. Present conversation method button
+msgid "_Present conversation window"
+msgstr ""
+
+#. ---------- "Notification Removals" ----------
+msgid "Notification Removal"
+msgstr ""
+
+#. Remove on focus button
+msgid "Remove when conversation window _gains focus"
+msgstr ""
+
+#. Remove on click button
+msgid "Remove when conversation window _receives click"
+msgstr ""
+
+#. Remove on type button
+msgid "Remove when _typing in conversation window"
+msgstr ""
+
+#. Remove on message send button
+msgid "Remove when a _message gets sent"
+msgstr ""
+
+#. Remove on conversation switch button
+msgid "Remove on switch to conversation ta_b"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Pidgin Demonstration Plugin"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "An example plugin that does stuff - see the description."
+msgstr ""
+
+#. *  description
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+
+msgid "Cursor Color"
+msgstr ""
+
+msgid "Secondary Cursor Color"
+msgstr ""
+
+msgid "Hyperlink Color"
+msgstr ""
+
+msgid "Highlighted Message Name Color"
+msgstr ""
+
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+msgid "Conversation Entry"
+msgstr ""
+
+msgid "Request Dialog"
+msgstr ""
+
+msgid "Notify Dialog"
+msgstr ""
+
+# Tóg?
+msgid "Select Color"
+msgstr "Roghnaigh Dath"
+
+#, c-format
+msgid "Select Interface Font"
+msgstr ""
+
+#, c-format
+msgid "Select Font for %s"
+msgstr ""
+
+msgid "GTK+ Interface Font"
+msgstr ""
+
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+msgid "Interface colors"
+msgstr ""
+
+msgid "Widget Sizes"
+msgstr ""
+
+msgid "Fonts"
+msgstr "Clófhoireann"
+
+msgid "Gtkrc File Tools"
+msgstr ""
+
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr ""
+
+msgid "Re-read gtkrc files"
+msgstr ""
+
+msgid "Pidgin GTK+ Theme Control"
+msgstr ""
+
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
+
+#, fuzzy
+msgid "Raw"
+msgstr "Amh"
+
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+
+#, c-format
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
+msgstr ""
+
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr ""
+
+msgid "New Version Available"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Release Notification"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Checks periodically for new releases."
+msgstr ""
+
+#. *  description
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Send Button"
+msgstr ""
+
+#. *< name
+#. *< version
+msgid "Conversation Window Send Button."
+msgstr ""
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+msgstr ""
+
+msgid "Duplicate Correction"
+msgstr ""
+
+msgid "The specified word already exists in the correction list."
+msgstr ""
+
+msgid "Text Replacements"
+msgstr ""
+
+msgid "You type"
+msgstr ""
+
+msgid "You send"
+msgstr ""
+
+msgid "Whole words only"
+msgstr ""
+
+msgid "Case sensitive"
+msgstr "Cásíogair"
+
+msgid "Add a new text replacement"
+msgstr ""
+
+msgid "You _type:"
+msgstr ""
+
+msgid "You _send:"
+msgstr ""
+
+#. Created here so it can be passed to whole_words_button_toggled.
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+
+msgid "Only replace _whole words"
+msgstr ""
+
+msgid "General Text Replacement Options"
+msgstr ""
+
+msgid "Enable replacement of last word on send"
+msgstr ""
+
+msgid "Text replacement"
+msgstr ""
+
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Buddy Ticker"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "A horizontal scrolling version of the buddy list."
+msgstr ""
+
+msgid "Display Timestamps Every"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Timestamp"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Display iChat-style timestamps"
+msgstr ""
+
+#. *  description
+msgid "Display iChat-style timestamps every N minutes."
+msgstr ""
+
+msgid "Timestamp Format Options"
+msgstr ""
+
+#, c-format
+msgid "_Force 24-hour time format"
+msgstr ""
+
+msgid "Show dates in..."
+msgstr ""
+
+msgid "Co_nversations:"
+msgstr ""
+
+msgid "For delayed messages"
+msgstr ""
+
+msgid "For delayed messages and in chats"
+msgstr ""
+
+msgid "_Message Logs:"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Message Timestamp Formats"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Customizes the message timestamp formats."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+
+msgid "Opacity:"
+msgstr "Teimhneacht:"
+
+#. IM Convo trans options
+msgid "IM Conversation Windows"
+msgstr ""
+
+msgid "_IM window transparency"
+msgstr ""
+
+msgid "_Show slider bar in IM window"
+msgstr ""
+
+msgid "Remove IM window transparency on focus"
+msgstr ""
+
+msgid "Always on top"
+msgstr ""
+
+#. Buddy List trans options
+msgid "Buddy List Window"
+msgstr ""
+
+msgid "_Buddy List window transparency"
+msgstr ""
+
+msgid "Remove Buddy List window transparency on focus"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "Transparency"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr ""
+
+#. *  description
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+
+msgid "GTK+ Runtime Version"
+msgstr ""
+
+#. Autostart
+msgid "Startup"
+msgstr "Tosú"
+
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr ""
+
+msgid "_Dockable Buddy List"
+msgstr ""
+
+#. Blist On Top
+msgid "_Keep Buddy List window on top:"
+msgstr ""
+
+#. XXX: Did this ever work?
+msgid "Only when docked"
+msgstr ""
+
+msgid "_Flash window when chat messages are received"
+msgstr ""
+
+msgid "Windows Pidgin Options"
+msgstr ""
+
+msgid "Options specific to Pidgin for Windows."
+msgstr ""
+
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+msgid "XMPP Console"
+msgstr ""
+
+msgid "Account: "
+msgstr "Cuntas:"
+
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr ""
+
+msgid "Insert an <iq/> stanza."
+msgstr ""
+
+msgid "Insert a <presence/> stanza."
+msgstr ""
+
+msgid "Insert a <message/> stanza."
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr ""
+
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Code [0x%02X]: %s"
diff --git a/po/gl.po b/po/gl.po
index bbd7ab46a5..a9deb22bd2 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,29 +5,28 @@
 # Frco. Javier Rial Rodríguez <fjrial@cesga.es>, 2007.
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin\n"
+"Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-28 15:32-0500\n"
-"PO-Revision-Date: 2007-08-20 13:55+0200\n"
-"Last-Translator: Frco. Javier Rial Rodríguez <fjrial@cesga.es>\n"
+"POT-Creation-Date: 2008-08-29 12:39-0400\n"
+"PO-Revision-Date: 2008-08-10 23:47+0100\n"
+"Last-Translator: \n"
 "Language-Team: Galician <mancomun@mancomun.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Generator: KBabel 1.11.4\n"
+"X-Poedit-Language: Galician\n"
 
-#: ../finch/finch.c:64 ../finch/finch.c:301 ../finch/finch.c:330
-#: ../finch/finch.c:418
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
 msgid "Finch"
-msgstr "Pidgin"
+msgstr "Finch"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Tente `%s -h' para máis información.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -48,705 +47,471 @@ msgstr ""
 "  -n, --nologin       non iniciar a sesión automaticamente\n"
 "  -v, --version       mostrar a versión actual e saír\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:711
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s atopou erros migrando as súas configuracións de %s a %s. Investigue e "
-"complete a migración manualmente. Informe deste erro en http://developer."
+"%s encontrou erros ao migrar as súas configuracións de %s a %s. Investigue e "
+"termine a migración manualmente. Informe deste erro en http://developer."
 "pidgin.im"
 
-#: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:186
-#: ../finch/gntplugin.c:234 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2029
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Erro"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
-msgstr "A conta non foi engadida"
+msgstr "Non se engadiu a conta"
 
-#: ../finch/gntaccount.c:125
-msgid "Screenname of an account must be non-empty."
-msgstr "O nome de usuario da conta non pode estar baleiro."
+#, fuzzy
+msgid "Username of an account must be non-empty."
+msgstr "O nome de usuario dunha conta non pode estar baleiro."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Notificacións de correo novo"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Lembrar o contrasinal"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "Non hai complementos de protocolo instalados."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
-msgstr "(Probablemente olvidaches executar 'make install'.)"
+msgstr "(Probabelmente esqueceu executar 'make install'.)"
 
-#: ../finch/gntaccount.c:496 ../finch/gntconn.c:136
-#: ../pidgin/gtkaccount.c:1473 ../pidgin/gtkblist.c:4040
 msgid "Modify Account"
 msgstr "Modificar a conta"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Nova conta"
 
-#: ../finch/gntaccount.c:521 ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
-msgid "Screen name:"
+#, fuzzy
+msgid "Username:"
 msgstr "Nome de usuario:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Contrasinal:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Alias:"
 
+#. Register checkbox
+#, fuzzy
+msgid "Create this account on the server"
+msgstr "Crear esta conta no servidor"
+
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2222 ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:459 ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265 ../finch/gntsound.c:1058 ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2449
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msn/msn.c:304
-#: ../libpurple/protocols/msn/msn.c:321 ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:359
-#: ../libpurple/protocols/oscar/oscar.c:6094
-#: ../libpurple/protocols/oscar/peer.c:1046
-#: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
-#: ../libpurple/protocols/yahoo/yahoo.c:3498
-#: ../libpurple/protocols/yahoo/yahoo.c:3509 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2495 ../pidgin/gtkblist.c:5967
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:773
-#: ../pidgin/gtkdialogs.c:912 ../pidgin/gtkdialogs.c:1004
-#: ../pidgin/gtkdialogs.c:1024 ../pidgin/gtkdialogs.c:1048
-#: ../pidgin/gtkdialogs.c:1070 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1159 ../pidgin/gtkdialogs.c:1215
-#: ../pidgin/gtkdialogs.c:1254 ../pidgin/gtkdialogs.c:1281
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1101
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1574
 msgid "Cancel"
 msgstr "Cancelar"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311
-#: ../finch/gntplugin.c:379 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "Gardar"
 
-#: ../finch/gntaccount.c:632 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:333 ../pidgin/gtkstatusbox.c:1568
 #, c-format
 msgid "Are you sure you want to delete %s?"
-msgstr "Está seguro de que quere borrar %s?"
+msgstr "Está seguro de que quere eliminar %s?"
 
-#: ../finch/gntaccount.c:635
 msgid "Delete Account"
-msgstr "Borrar a conta"
+msgstr "Eliminar a conta"
 
 #. Delete button
-#: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1100 ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1573
 msgid "Delete"
-msgstr "Borrar"
+msgstr "Eliminar"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2119 ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2325 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Contas"
 
-#: ../finch/gntaccount.c:675
 msgid "You can enable/disable accounts from the following list."
-msgstr "Pode activar/desactivar contas da seguinte lista."
+msgstr "Pode activar/desactivar as contas da seguinte lista."
 
 #. Add button
-#: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:380 ../finch/gntpounce.c:713 ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883 ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2494
-#: ../pidgin/gtkblist.c:5966 ../pidgin/gtkconv.c:1659
-#: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Engadir"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../finch/gntaccount.c:811 ../pidgin/gtkaccount.c:2441
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s fixo a %s un contacto seu %s%s"
+msgstr "%s%s%s%s fixo a %s o seu contacto%s%s"
 
-#: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2493
 msgid "Add buddy to your list?"
 msgstr "Quere engadir o contacto á súa lista?"
 
-#: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2551
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s quere engadir a %s á súa lista de contactos%s%s"
 
-#: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2574
-#: ../pidgin/gtkaccount.c:2580
 msgid "Authorize buddy?"
-msgstr "Autorizar o contacto?"
+msgstr "Quere autorizar o contacto?"
 
-#: ../finch/gntaccount.c:976 ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2575 ../pidgin/gtkaccount.c:2581
 msgid "Authorize"
 msgstr "Autorizar"
 
-#: ../finch/gntaccount.c:977 ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
 msgid "Deny"
-msgstr "Rexeitar"
+msgstr "Denegar"
+
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Conectados: %d\n"
+"Total: %d"
 
-#: ../finch/gntblist.c:289
-msgid "You must provide a screename for the buddy."
-msgstr "Debe especificarlle un nome de usuario ao contacto."
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Conta: %s (%s)"
+
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Visto por última vez: hai %s"
+
+msgid "Default"
+msgstr "Predeterminado"
+
+#, fuzzy
+msgid "You must provide a username for the buddy."
+msgstr "Debe especificar un nome de usuario para o contacto."
 
-#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr "Debe especificar un grupo."
 
-#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr "Debe seleccionar unha conta."
 
-#: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr "A conta seleccionada non está conectada."
 
-#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "Erro ao engadir un contacto"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2888
-#: ../pidgin/gtkaccount.c:1981 ../pidgin/gtksavedstatuses.c:980
-msgid "Screen Name"
+msgid "Username"
 msgstr "Nome de usuario"
 
-#: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1395
-#: ../libpurple/protocols/silc/chat.c:606
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047 ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkrequest.c:278
-msgid "Alias"
-msgstr "Alias"
+#, fuzzy
+msgid "Alias (optional)"
+msgstr "Alias (opcional)"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:413
-msgid "Group"
-msgstr "Grupo"
+#, fuzzy
+msgid "Add in group"
+msgstr "Engadir a un grupo"
 
-#: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntnotify.c:174 ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3008 ../pidgin/gtknotify.c:506
-#: ../pidgin/gtkpounce.c:1268 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Conta"
 
-#: ../finch/gntblist.c:341 ../finch/gntblist.c:852
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3343 ../pidgin/gtkblist.c:5483
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Engadir contacto"
 
-#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "Introduza a información do contacto."
 
-#: ../finch/gntblist.c:370 ../libpurple/blist.c:1209
 msgid "Chats"
 msgstr "Conversas"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1584 ../libpurple/protocols/msn/msn.c:1649
-#: ../libpurple/protocols/msn/msn.c:1676
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nome"
 
-#: ../finch/gntblist.c:416 ../finch/gntblist.c:819
+msgid "Alias"
+msgstr "Alias"
+
+msgid "Group"
+msgstr "Grupo"
+
 msgid "Auto-join"
-msgstr "Conectar automaticamente"
+msgstr "Conectarse automaticamente"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:5859
 msgid "Add Chat"
 msgstr "Engadir conversa"
 
-#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
-msgstr "Pode editar máis información desde o menu de contexto máis tarde."
+msgstr "Pode editar máis información desde o menú de contexto máis tarde."
 
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "Erro ao engadir o grupo"
 
-#: ../finch/gntblist.c:434
 msgid "You must give a name for the group to add."
 msgstr "Debe proporcionarlle un nome ao grupo que quere engadir."
 
-#: ../finch/gntblist.c:447
 msgid "A group with the name already exists."
 msgstr "Xa existe un grupo con ese nome."
 
-#: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5963
 msgid "Add Group"
-msgstr "Engadir un grupo"
+msgstr "Engadir grupo"
 
-#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "Introduza o nome do grupo"
 
-#: ../finch/gntblist.c:802
 msgid "Edit Chat"
 msgstr "Editar a conversa"
 
-#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
 msgstr "Actualice os campos necesarios."
 
-#: ../finch/gntblist.c:803 ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Editar"
 
-#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "Editar a configuración"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "Información"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
 msgstr "Recuperando..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:507
-#: ../libpurple/protocols/silc/chat.c:899
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Obter información"
 
-#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr "Engadir aviso de contacto"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:519
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1607
 msgid "Send File"
 msgstr "Enviar o ficheiro"
 
-#: ../finch/gntblist.c:919
+msgid "Blocked"
+msgstr "Bloqueado"
+
 msgid "View Log"
 msgstr "Ver o rexistro"
 
-#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduza o novo nome para %s"
 
-#: ../finch/gntblist.c:1002 ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../finch/gntblist.c:1002
 msgid "Set Alias"
-msgstr "Establecer alias"
+msgstr "Definir o alias"
 
-#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "Introduza unha cadea baleira para restablecer o nome."
 
-#: ../finch/gntblist.c:1079
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
-"Ao eliminar este contacto, eliminará tameń todos os contactos que contén"
+"Ao eliminar este contacto eliminará tamén todos os contactos que contén"
 
-#: ../finch/gntblist.c:1087
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Ao eliminar este grupo, eliminará tamén todos os contactos do grupo"
+msgstr "Ao eliminar este grupo eliminará tamén todos os contactos do grupo"
 
-#: ../finch/gntblist.c:1092
 #, c-format
 msgid "Are you sure you want to remove %s?"
-msgstr "Está seguro de que quere borrar %s?"
+msgstr "Está seguro de que quere eliminar %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1095
 msgid "Confirm Remove"
 msgstr "Confirmar a eliminación"
 
-#: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1656 ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Eliminar"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2307 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2688 ../pidgin/gtkblist.c:4284
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Lista de contactos"
 
-#: ../finch/gntblist.c:1257
 msgid "Place tagged"
-msgstr "Lugares etiquetados"
+msgstr "Lugar etiquetado"
 
-#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
-msgstr "Cambiar etiqueta"
+msgstr "Cambiar a etiqueta"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050 ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2214
-#: ../libpurple/protocols/jabber/buddy.c:2396
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1403 ../libpurple/protocols/msn/msn.c:1587
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3032
 msgid "Nickname"
-msgstr "Alias"
+msgstr "Alcume"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:340
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:544 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2912
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3060
-#: ../pidgin/gtkblist.c:3460 ../pidgin/gtkprefs.c:1925
 msgid "Idle"
 msgstr "Inactivo"
 
-#: ../finch/gntblist.c:1334
 msgid "On Mobile"
 msgstr "No móbil"
 
-#: ../finch/gntblist.c:1415
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"Conectado: %d\n"
-"Total: %d"
-
-#: ../finch/gntblist.c:1424
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Conta: %s (%s)"
-
-#: ../finch/gntblist.c:1436
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"Visto por última vez: hai %s"
-
-#: ../finch/gntblist.c:1702 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Novo..."
 
-#: ../finch/gntblist.c:1709 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Gardado..."
 
-#: ../finch/gntblist.c:2087 ../finch/gntplugin.c:255 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Complementos"
 
-#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:754
-#: ../pidgin/gtkdialogs.c:893 ../pidgin/gtkdialogs.c:974
-msgid "_Name"
-msgstr "_Nome"
+#, fuzzy
+msgid "Block/Unblock"
+msgstr "Bloquear/desbloquear"
 
-#: ../finch/gntblist.c:2208 ../pidgin/gtkdialogs.c:759
-#: ../pidgin/gtkdialogs.c:898 ../pidgin/gtkdialogs.c:979
-msgid "_Account"
-msgstr "_Conta"
+msgid "Block"
+msgstr "Bloquear"
 
-#: ../finch/gntblist.c:2216 ../pidgin/gtkdialogs.c:767
-msgid "New Instant Message"
-msgstr "Mensaxe instantánea nova"
+msgid "Unblock"
+msgstr "Desbloquear"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:769
+#, fuzzy
 msgid ""
-"Please enter the screen name or alias of the person you would like to IM."
+"Please enter the username or alias of the person you would like to Block/"
+"Unblock."
 msgstr ""
-"Introduza o nome de usuario ou o alias da persoa con quen quere comunicarse."
+"Introduza o nome de usuario ou o alias da persoa que quere bloquear ou "
+"desbloquear."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2221 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:135
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msn/msn.c:303
-#: ../libpurple/protocols/msn/msn.c:320 ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/oscar/oscar.c:6093
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
-#: ../libpurple/protocols/yahoo/yahoo.c:3508 ../pidgin/gtkblist.c:4039
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "Aceptar"
 
+msgid "New Instant Message"
+msgstr "Nova mensaxe instantánea"
+
+#, fuzzy
+msgid "Please enter the username or alias of the person you would like to IM."
+msgstr ""
+"Introduza o nome de usuario ou o alias da persoa á que quere enviar unha MI."
+
+#, fuzzy
+msgid "Channel"
+msgstr "Canle"
+
+msgid "Join a Chat"
+msgstr "Unirse a unha conversa"
+
+#, fuzzy
+msgid "Please enter the name of the chat you want to join."
+msgstr "Introduza o nome da conversa á que se quere unir."
+
+msgid "Join"
+msgstr "Unirse"
+
+#, fuzzy
+msgid ""
+"Please enter the username or alias of the person whose log you would like to "
+"view."
+msgstr ""
+"Introduza o nome de usuario ou o alias da persoa da que quere ver o rexistro."
+
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2241 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:790
 msgid "Options"
 msgstr "Opcións"
 
-#: ../finch/gntblist.c:2247
 msgid "Send IM..."
 msgstr "Enviar MI..."
 
-#: ../finch/gntblist.c:2251
 #, fuzzy
-msgid "Show empty groups"
-msgstr "Mostrar grupos baleiros"
+msgid "Block/Unblock..."
+msgstr "Bloquear/desbloquear..."
+
+#, fuzzy
+msgid "Join Chat..."
+msgstr "Unirse a unha conversa..."
+
+#, fuzzy
+msgid "View Log..."
+msgstr "Ver o rexistro..."
+
+#, fuzzy
+msgid "View All Logs"
+msgstr "Ver todos os rexistros"
+
+msgid "Show"
+msgstr "Mostrar"
+
+#, fuzzy
+msgid "Empty groups"
+msgstr "Grupos baleiros"
+
+#, fuzzy
+msgid "Offline buddies"
+msgstr "Contactos desconectados"
+
+#, fuzzy
+msgid "Sort"
+msgstr "Ordenar"
+
+#, fuzzy
+msgid "By Status"
+msgstr "Por estado"
+
+msgid "Alphabetically"
+msgstr "Alfabeticamente"
 
-#: ../finch/gntblist.c:2257
 #, fuzzy
-msgid "Show offline buddies"
-msgstr "Mostrar contactos desconectados"
+msgid "By Log Size"
+msgstr "Por tamaño do rexistro"
 
-#: ../finch/gntblist.c:2263
-msgid "Sort by status"
-msgstr "Ordenar por estado"
+#, fuzzy
+msgid "Buddy"
+msgstr "Contacto"
 
-#: ../finch/gntblist.c:2267
-msgid "Sort alphabetically"
-msgstr "Ordenar alfabeticamente"
+msgid "Chat"
+msgstr "Conversa"
 
-#: ../finch/gntblist.c:2271
-msgid "Sort by log size"
-msgstr "Ordenar por tamaño de rexistro"
+#, fuzzy
+msgid "Grouping"
+msgstr "Agrupamento"
 
-#: ../finch/gntcertmgr.c:86 ../pidgin/gtkcertmgr.c:188
 #, fuzzy
 msgid "Certificate Import"
-msgstr "Conectar co porto"
+msgstr "Importación de certificado"
 
-#: ../finch/gntcertmgr.c:87 ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr ""
+msgstr "Especifique un nome de host"
 
-#: ../finch/gntcertmgr.c:88 ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
-msgstr ""
+msgstr "Escriba o nome do host para o que é este certificado."
 
-#: ../finch/gntcertmgr.c:97 ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
+"Non se puido importar o ficheiro %s.\n"
+"Asegúrese de que o ficheiro é lexíbel e de que está no formato PEM.\n"
 
-#: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr ""
+msgstr "Erro de importación de certificado"
 
-#: ../finch/gntcertmgr.c:100 ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr ""
+msgstr "Fallou a importación do certificado X.509"
 
-#: ../finch/gntcertmgr.c:110 ../pidgin/gtkcertmgr.c:224
 #, fuzzy
 msgid "Select a PEM certificate"
-msgstr "Seleccionar un ficheiro"
+msgstr "Seleccione un certificado PEM"
 
-#: ../finch/gntcertmgr.c:127 ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
+"Fallou a exportación ao ficheiro %s.\n"
+"Verifique que ten dereitos de escritura no camiño de destino\n"
 
-#: ../finch/gntcertmgr.c:129 ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr ""
+msgstr "Erro de exportación de certificado"
 
-#: ../finch/gntcertmgr.c:130 ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr ""
+msgstr "Fallou a exportación do certificado X.509"
 
-#: ../finch/gntcertmgr.c:159 ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
-msgstr ""
+msgstr "Exportación de certificado PEM X.509"
 
-#: ../finch/gntcertmgr.c:188
 #, fuzzy, c-format
 msgid "Certificate for %s"
-msgstr "Estado para %s"
+msgstr "Certificado para %s"
 
-#: ../finch/gntcertmgr.c:195
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -754,57 +519,43 @@ msgid ""
 "SHA1 fingerprint:\n"
 "%s"
 msgstr ""
+"Nome común: %s\n"
+"\n"
+"Impresión dixital SHA1:\n"
+"%s"
 
-#: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
-msgstr ""
+msgstr "Certificado de host SSL"
 
-#: ../finch/gntcertmgr.c:233 ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
-msgstr ""
+msgstr "Está seguro de que quere eliminar o certificado para %s?"
 
-#: ../finch/gntcertmgr.c:236 ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
-msgstr ""
+msgstr "Confirme a eliminación do certificado"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
-msgstr ""
+msgstr "Xestor de certificados"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:652
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
-msgstr "Nome do servidor"
+msgstr "Nome do host"
 
-#: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:383 ../pidgin/gtkconv.c:1635
-#: ../pidgin/gtkdebug.c:835
 msgid "Info"
-msgstr "Info"
+msgstr "Información"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:210 ../finch/gntplugin.c:310 ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:403
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2468
-#: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Pechar"
 
-#: ../finch/gntconn.c:124
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:127
 #, c-format
 msgid "%s disconnected."
 msgstr "%s desconectado."
 
-#: ../finch/gntconn.c:128
 #, c-format
 msgid ""
 "%s\n"
@@ -814,55 +565,52 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"Pidgin non tentará reconectar a conta ata que vostede corrixa o erro e a "
+"O Finch non tentará conectar novamente a conta até que  corrixa o erro e a "
 "volva activar."
 
-#: ../finch/gntconn.c:137 ../pidgin/gtkblist.c:4041
 msgid "Re-enable Account"
 msgstr "Reactivar conta"
 
-#: ../finch/gntconv.c:139
+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 ""
+"A conta desconectouse e xa non está nesta sala de conversa. Será conectado "
+"de novo automaticamente á sala de conversa cando a conta se conecte "
+"novamente."
+
 msgid "No such command."
 msgstr "Non existe o comando."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:489
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
-"Erro de sintaxe: O número de argumentos para ese comando non é correcto."
+"Erro de sintaxe: escribiu un número incorrecto de argumentos para ese "
+"comando."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:495
 msgid "Your command failed for an unknown reason."
 msgstr "O seu comando fallou por motivos descoñecidos."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:502
 msgid "That command only works in chats, not IMs."
-msgstr "Ese comando só funciona en conversas, non en MI."
+msgstr "Ese comando só funciona en conversas, non en MIs."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:505
 msgid "That command only works in IMs, not chats."
-msgstr "Ese comando só funciona en MI, non en conversas."
+msgstr "Ese comando só funciona en MIs, non en conversas."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:510
 msgid "That command doesn't work on this protocol."
 msgstr "Ese comando non funciona neste protocolo."
 
-#: ../finch/gntconv.c:168
 #, fuzzy
 msgid "Message was not sent, because you are not signed on."
-msgstr ""
-"Non se puido enviar a mensaxe porque estamos a enviar demasiado rápido:"
+msgstr "Non se enviou a mensaxe porque non está conectado."
 
-#: ../finch/gntconv.c:251
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:773
 #, c-format
 msgid ""
 "\n"
@@ -871,137 +619,161 @@ msgstr ""
 "\n"
 "%s está a escribir..."
 
-#: ../finch/gntconv.c:298
 msgid "You have left this chat."
 msgstr "Abandonou esta conversa."
 
-#: ../finch/gntconv.c:387 ../pidgin/gtkconv.c:1362
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
-"Iniciuose o rexistro. A partir de agora rexistraranse todas as mensaxes "
+"Iniciouse o rexistro. A partir de agora rexistraranse todas as mensaxes "
 "desta conversa."
 
-#: ../finch/gntconv.c:393 ../pidgin/gtkconv.c:1370
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
-"Detívose o rexistro. Non se rexistrarán mensaxes desta conversa de agora en "
-"adiante."
+"Detívose o rexistro. Non se rexistrarán as mensaxes desta conversa de agora "
+"en adiante."
 
-#: ../finch/gntconv.c:442
 msgid "Send To"
 msgstr "Enviar a"
 
-#: ../finch/gntconv.c:486
+#, fuzzy
+msgid "Invite message"
+msgstr "Mensaxe de convite"
+
+msgid "Invite"
+msgstr "Convidar"
+
+#, fuzzy
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Introduza o nome do usuario que desexa convidar,\n"
+"xunto cunha mensaxe de convite opcional."
+
 msgid "Conversation"
 msgstr "Conversa"
 
-#: ../finch/gntconv.c:492
 msgid "Clear Scrollback"
 msgstr "Limpar o historial da conversa"
 
-#: ../finch/gntconv.c:496 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
-msgstr "Mostrar marcas de tempo"
+msgstr "Mostrar as marcas temporais"
 
-#: ../finch/gntconv.c:512
 msgid "Add Buddy Pounce..."
 msgstr "Engadir aviso de contacto..."
 
-#: ../finch/gntconv.c:527
+#, fuzzy
+msgid "Invite..."
+msgstr "Convidar..."
+
 #, fuzzy
 msgid "Enable Logging"
-msgstr "/Opcións/Activar rexistro"
+msgstr "Activar o rexistro"
 
-#: ../finch/gntconv.c:533
 #, fuzzy
 msgid "Enable Sounds"
-msgstr "Activar os sons:"
+msgstr "Activar os sons"
 
-#: ../finch/gntconv.c:739
 msgid "<AUTO-REPLY> "
-msgstr "<RESPOSTA AUTOMÁTICA>"
+msgstr "<RESPOSTA AUTOMÁTICA> "
 
-#. Print the list of users in the room
-#: ../finch/gntconv.c:861
-msgid "List of users:\n"
-msgstr "Lista de usuarios:\n"
+#, fuzzy, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Lista de %d usuario:\n"
+msgstr[1] "Lista de %d usuarios:\n"
 
-#: ../finch/gntconv.c:1023 ../pidgin/gtkconv.c:331
 msgid "Supported debug options are:  version"
 msgstr "As opcións de depuración soportadas son:  version"
 
-#: ../finch/gntconv.c:1059 ../pidgin/gtkconv.c:381
 msgid "No such command (in this context)."
 msgstr "Non existe o comando (neste contexto)."
 
-#: ../finch/gntconv.c:1062 ../pidgin/gtkconv.c:384
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
 msgstr ""
-"Usar \"/help &lt;comando&gt;\" para obter axuda dun comando específico.\n"
-"Os seguintes comandos están dispoñibles neste contexto:\n"
+"Use \"/help &lt;comando&gt;\" para obter axuda sobre un comando específico.\n"
+"Os seguintes comandos están dispoñíbeis neste contexto:\n"
+
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s non é unha clase válida de mensaxe. Consulte o ficheiro '/help msgcolor' "
+"para ver as mensaxes de clase válidas."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr ""
+"%s non é unha cor válida. Consulte o ficheiro '/help msgcolor' para ver as "
+"cores válidas."
 
-#: ../finch/gntconv.c:1120 ../pidgin/gtkconv.c:7560
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
 msgstr ""
-"say &lt;mensaxe&gt;:  Envía unha mensaxe como se non se estivese a "
-"utilizarun comando."
+"say &lt;mensaxe&gt;:  Envía unha mensaxe normalmente, como se non estivese "
+"utilizando un comando."
 
-#: ../finch/gntconv.c:1123 ../pidgin/gtkconv.c:7563
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
-"me &lt;acción&gt;:  Envía unha acción estilo IRC a un contacto ou a unha "
+"me &lt;acción&gt;:  Envía unha acción do estilo IRC a un contacto ou a unha "
 "conversa."
 
-#: ../finch/gntconv.c:1126 ../pidgin/gtkconv.c:7566
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
-"debug&lt;opción&gt;:  Envía información de depuración sobre a conversa "
-"actual."
+"debug&lt;opción&gt;:  Envía varias informacións de depuración sobre a "
+"conversa actual."
 
-#: ../finch/gntconv.c:1129 ../pidgin/gtkconv.c:7569
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Limpa o historial da conversa."
 
-#: ../finch/gntconv.c:1132 ../pidgin/gtkconv.c:7575
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comando&gt;:  Axuda sobre un comando específico."
 
-#: ../finch/gntconv.c:1135
 msgid "users:  Show the list of users in the chat."
-msgstr "users:  Amosa a lista de usuarios na conversa"
+msgstr "users:  Mostra a lista de usuarios na sala de conversa."
 
-#: ../finch/gntconv.c:1140
 msgid "plugins: Show the plugins window."
-msgstr "complementos: Mostra a ventá de complementos."
+msgstr "plugins: Mostra a ventá de plugins."
 
-#: ../finch/gntconv.c:1143
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Mostra a lista de contactos."
 
-#: ../finch/gntconv.c:1146
 msgid "accounts: Show the accounts window."
 msgstr "contas: Mostra a ventá de contas."
 
-#: ../finch/gntconv.c:1149
 msgid "debugwin: Show the debug window."
-msgstr "depuración: Mostra a ventá de depuración."
+msgstr "debugwin: Mostra a ventá de depuración."
 
-#: ../finch/gntconv.c:1152
 msgid "prefs: Show the preference window."
-msgstr "preferencias: Mostra a ventá de preferencias."
+msgstr "prefs: Mostra a ventá de preferencias."
 
-#: ../finch/gntconv.c:1155
 msgid "statuses: Show the savedstatuses window."
-msgstr "estados: Mostrar a ventá de estados gardardos."
+msgstr "statuses: Mostra a ventá de estados gardardos."
+
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Defina a cor "
+"para as diferentes clases de mensaxes na ventá de conversa.<br>    &lt;"
+"class&gt;: recibir, enviar, realzar, acción, marca temporal<br>    &lt;"
+"foreground/background&gt;: negro, vermello, verde, azul, branco, gris, gris "
+"escuro, fucsia, cián, predeterminada<br><br>EXAMPLE:<br>    msgcolor send "
+"cyan default"
+
+msgid "Unable to open file."
+msgstr "Non se puido abrir o ficheiro."
 
-#: ../finch/gntdebug.c:235 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Ventá de depuración"
 
@@ -1009,186 +781,196 @@ msgstr "Ventá de depuración"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Limpar"
 
-#: ../finch/gntdebug.c:262
-msgid "Filter: "
+#, fuzzy
+msgid "Filter:"
 msgstr "Filtro: "
 
-#: ../finch/gntdebug.c:266 ../pidgin/gtkdebug.c:763
 msgid "Pause"
-msgstr "Pausar"
+msgstr "Deter"
 
-#: ../finch/gntft.c:118 ../pidgin/gtkft.c:229
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Transferencia de ficheiros - %d%% de %d ficheiros"
+#, fuzzy, c-format
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Transferencias de ficheiros - %d%% de %d ficheiro"
+msgstr[1] "Transferencias de ficheiros - %d%% de %d ficheiros"
 
 #. Create the window.
-#: ../finch/gntft.c:123 ../finch/gntft.c:196 ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234 ../pidgin/gtkft.c:762
 msgid "File Transfers"
-msgstr "Transferencia de ficheiros"
+msgstr "Transferencias de ficheiros"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Progreso"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Nome do ficheiro"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Tamaño"
 
-#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "Velocidade"
 
-#: ../finch/gntft.c:201 ../pidgin/gtkft.c:666
 msgid "Remaining"
-msgstr "Restante"
+msgstr "Restantes"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:344
-#: ../libpurple/protocols/gg/gg.c:1039 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:543
-#: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2700
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3248 ../pidgin/gtkblist.c:3104
-#: ../pidgin/gtkblist.c:3118 ../pidgin/gtkblist.c:3120
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Estado"
 
-#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr "Pechar está ventá cando rematen todas as transferencias"
 
-#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
-msgstr "Limpar transferencias rematadas"
+msgstr "Limpar transferencias terminadas"
 
-#: ../finch/gntft.c:232
 msgid "Stop"
-msgstr "Parar"
+msgstr "Deter"
 
-#: ../finch/gntft.c:305 ../pidgin/gtkft.c:169 ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "Agardando o comezo da transferencia"
 
-#: ../finch/gntft.c:372 ../pidgin/gtkft.c:166 ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Cancelado"
 
-#: ../finch/gntft.c:374 ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Fallou"
 
-#: ../finch/gntft.c:420 ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:431
+#, fuzzy
+msgid "Sent"
+msgstr "Enviado"
+
+#, fuzzy
+msgid "Received"
+msgstr "Recibido"
+
+msgid "Finished"
+msgstr "Terminado"
+
 #, c-format
 msgid "The file was saved as %s."
+msgstr "O ficheiro gardouse como %s."
+
+#, fuzzy
+msgid "Sending"
+msgstr "Enviando"
+
+#, fuzzy
+msgid "Receiving"
+msgstr "Recibindo"
+
+#, fuzzy, c-format
+msgid "Conversation in %s on %s"
+msgstr "Conversa en %s sobre %s"
+
+#, fuzzy, c-format
+msgid "Conversation with %s on %s"
+msgstr "Conversa con %s sobre %s"
+
+msgid "%B %Y"
+msgstr "%B %Y"
+
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
 msgstr ""
+"Só se rexistrarán os eventos do sistema se nas preferencias está activada a "
+"opción \"Rexistrar todos os cambios de estado no rexistro do sistema\"."
 
-#: ../finch/gntft.c:432 ../finch/gntft.c:433 ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
-msgid "Finished"
-msgstr "Rematado"
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Só se rexistrarán as mensaxes instantáneas se nas preferencias está activada "
+"a opción \"Rexistrar todas as mensaxes instantáneas\"."
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:347
-msgid "Transferring"
-msgstr "Transferindo"
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"As conversas só se rexistrarán se nas preferencias está activada a opción "
+"\"Rexistrar todas as conversas\"."
+
+msgid "No logs were found"
+msgstr "Non se encontrou rexistros"
+
+msgid "Total log size:"
+msgstr "Tamaño total do rexistro:"
+
+#. Search box *********
+msgid "Scroll/Search: "
+msgstr "Desprazar/Buscar: "
+
+#, c-format
+msgid "Conversations in %s"
+msgstr "Conversas en %s"
+
+#, c-format
+msgid "Conversations with %s"
+msgstr "Conversas con %s"
+
+#, fuzzy
+msgid "All Conversations"
+msgstr "Todas as conversas"
+
+msgid "System Log"
+msgstr "Rexistro do sistema"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Correos electrónicos"
 
-#: ../finch/gntnotify.c:171 ../finch/gntnotify.c:225
 msgid "You have mail!"
 msgstr "Ten un correo!"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:513
 msgid "Sender"
 msgstr "Remitente"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:520
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../finch/gntnotify.c:201
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) ten %d mensaxe nova."
-msgstr[1] "%s (%s) ten %d mensaxe nova."
+msgstr[1] "%s (%s) ten %d mensaxes nova."
 
-#: ../finch/gntnotify.c:225 ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "Correo novo"
 
-#: ../finch/gntnotify.c:290 ../pidgin/gtknotify.c:940
 #, c-format
 msgid "Info for %s"
 msgstr "Información sobre %s"
 
-#: ../finch/gntnotify.c:291 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:941
 msgid "Buddy Information"
 msgstr "Información do contacto"
 
-#: ../finch/gntnotify.c:377 ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Continuar"
 
-#: ../finch/gntnotify.c:386 ../pidgin/gtkconv.c:1596
 msgid "IM"
 msgstr "MI"
 
-#: ../finch/gntnotify.c:389
-msgid "Join"
-msgstr "Unirse"
-
-#: ../finch/gntnotify.c:392 ../libpurple/protocols/sametime/sametime.c:3473
-msgid "Invite"
-msgstr "Convidar"
-
-#: ../finch/gntnotify.c:395
 msgid "(none)"
 msgstr "(ningún)"
 
-#: ../finch/gntplugin.c:75 ../finch/gntplugin.c:84
+#, fuzzy
+msgid "URI"
+msgstr "URI"
+
 msgid "ERROR"
 msgstr "ERRO"
 
-#: ../finch/gntplugin.c:75
 msgid "loading plugin failed"
-msgstr "Fallou ao cargar o complemento"
+msgstr "fallou ao cargar o plugin"
 
-#: ../finch/gntplugin.c:84
 msgid "unloading plugin failed"
-msgstr "Fallou ao desactivar o complemento"
+msgstr "fallou ao descargar o plugin"
 
-#: ../finch/gntplugin.c:129
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1205,19 +987,36 @@ msgstr ""
 "Sitio web: %s\n"
 "Nome de ficheiro: %s\n"
 
-#: ../finch/gntplugin.c:187
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "O complemento precisa ser cargado antes de poder configuralo."
+msgstr "É necesario cargar o complemento antes de que poida configuralo."
 
-#: ../finch/gntplugin.c:235
 msgid "No configuration options for this plugin."
 msgstr "Non existen opcións de configuración para este complemento."
 
-#: ../finch/gntplugin.c:260
+#, fuzzy
+msgid "Error loading plugin"
+msgstr "Erro ao cargar o complemento"
+
+#, fuzzy
+msgid "The selected file is not a valid plugin."
+msgstr "O ficheiro seleccionado non é un complemento válido."
+
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Abra a ventá de depuración e tente ver de novo a mensaxe exacta de erro."
+
+#, fuzzy
+msgid "Select plugin to install"
+msgstr "Seleccione o complemento para instalar"
+
 msgid "You can (un)load plugins from the following list."
 msgstr "Pode (des)cargar complementos da seguinte lista."
 
-#: ../finch/gntplugin.c:315
+#, fuzzy
+msgid "Install Plugin..."
+msgstr "Instalar complemento..."
+
 msgid "Configure Plugin"
 msgstr "Configurar o complemento"
 
@@ -1226,364 +1025,298 @@ msgstr "Configurar o complemento"
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:371 ../finch/gntplugin.c:378 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2067
 msgid "Preferences"
 msgstr "Preferencias"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Indique o contacto sobre o que avisar."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "New Buddy Pounce"
 msgstr "Novo aviso de contacto"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:517
 msgid "Edit Buddy Pounce"
 msgstr "Editar aviso de contacto"
 
-#: ../finch/gntpounce.c:333
 msgid "Pounce Who"
-msgstr "Quen avisa"
+msgstr "Avisar a quen?"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Conta:"
 
-#: ../finch/gntpounce.c:358
 msgid "Buddy name:"
 msgstr "Nome do contacto:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:585
 msgid "Pounce When Buddy..."
 msgstr "Avisar cando un contacto..."
 
-#: ../finch/gntpounce.c:376
 msgid "Signs on"
-msgstr "Está conectado"
+msgstr "Se conecta"
 
-#: ../finch/gntpounce.c:377
 msgid "Signs off"
-msgstr "Está desconectado"
+msgstr "Se desconecta"
 
-#: ../finch/gntpounce.c:378
 msgid "Goes away"
 msgstr "Está ausente"
 
-#: ../finch/gntpounce.c:379
 msgid "Returns from away"
 msgstr "Deixa de estar ausente"
 
-#: ../finch/gntpounce.c:380
 msgid "Becomes idle"
-msgstr "Está inactivo"
+msgstr "Se volve inactivo"
 
-#: ../finch/gntpounce.c:381
 msgid "Is no longer idle"
 msgstr "Deixa de estar inactivo"
 
-#: ../finch/gntpounce.c:382
 msgid "Starts typing"
 msgstr "Comeza a escribir"
 
-#: ../finch/gntpounce.c:383
 msgid "Pauses while typing"
 msgstr "Fai unha pausa ao escribir"
 
-#: ../finch/gntpounce.c:384
 msgid "Stops typing"
 msgstr "Deixa de escribir"
 
-#: ../finch/gntpounce.c:385
 msgid "Sends a message"
 msgstr "Envía unha mensaxe"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:646
 msgid "Action"
 msgstr "Acción"
 
-#: ../finch/gntpounce.c:416
 msgid "Open an IM window"
-msgstr "Abre unha ventá de MI"
+msgstr "Abrir unha ventá de MI"
 
-#: ../finch/gntpounce.c:417
 msgid "Pop up a notification"
 msgstr "Notificación cunha ventá emerxente"
 
-#: ../finch/gntpounce.c:418
 msgid "Send a message"
 msgstr "Enviar unha mensaxe"
 
-#: ../finch/gntpounce.c:419
 msgid "Execute a command"
 msgstr "Executar un comando"
 
-#: ../finch/gntpounce.c:420
 msgid "Play a sound"
 msgstr "Reproducir un son"
 
-#: ../finch/gntpounce.c:448
-msgid "Pounce only when my status is not available"
-msgstr "Só avisar cando o meu estado é non dispoñible"
+#, fuzzy
+msgid "Pounce only when my status is not Available"
+msgstr "Avisar só cando o meu estado é \"non dispoñíbel\""
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1281
 msgid "Recurring"
-msgstr "Recorrente"
+msgstr "Recorrencia"
 
-#: ../finch/gntpounce.c:618
 #, fuzzy
 msgid "Cannot create pounce"
-msgstr "Non se pode cambiar o alias"
+msgstr "Non se pode crear o aviso"
 
-#: ../finch/gntpounce.c:619
 #, fuzzy
 msgid "You do not have any accounts."
-msgstr "Debe seleccionar unha conta."
+msgstr "Non ten ningunha conta."
 
-#: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "Debe crear unha conta antes de poder crear un aviso."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1096
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Está seguro de que quere borrar o aviso sobre %s para %s?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1325
 msgid "Buddy Pounces"
 msgstr "Avisos de contacto"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1452
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s comezou a escribirlle (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1454
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s fixo unha pausa ao escribirlle (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1456
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s conectouse (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1458
 #, c-format
 msgid "%s has returned from being idle (%s)"
-msgstr "%s volveu da súa inactividade (%s)"
+msgstr "%s volveu da inactividade (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s deixou de estar ausente (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s deixou de escribirlle (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s desconectouse (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has become idle (%s)"
-msgstr "%s está inactivo (%s)"
+msgstr "%s volveuse inactivo (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s marchou. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s envioulle unha mensaxe. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1471
 #, c-format
 msgid "Unknown pounce event. Please report this!"
-msgstr "Evento de aviso descoñecido. Por favor, informe disto!"
+msgstr "Evento de aviso descoñecido. Informe disto!"
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Baseado no uso do teclado"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:1930
 msgid "From last sent message"
 msgstr "Desde a última mensaxe enviada"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1929 ../pidgin/gtkprefs.c:1943
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nunca"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
-msgstr "Mostrar tempos de ausencia"
+msgstr "Mostrar os tempos de ausencia"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
-msgstr "Mostrar contactos desconectados"
+msgstr "Mostrar os contactos desconectados"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
-msgstr "Notificarlle aos contactos cando lles está a escribir"
+msgstr "Notificar aos contactos cando lles está a escribir"
 
-#: ../finch/gntprefs.c:198
 msgid "Log format"
 msgstr "Formato de rexistro"
 
-#: ../finch/gntprefs.c:199
 msgid "Log IMs"
-msgstr "Rexistrar MI"
+msgstr "Rexistrar MIs"
 
-#: ../finch/gntprefs.c:200
 msgid "Log chats"
 msgstr "Rexistrar as conversas"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Rexistrar os eventos de cambios de estado"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Mostrar o tempo de inactividade"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Cambiar o estado cando estea inactivo"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minutos antes de cambiar o estado"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Cambiar o estado a"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:993 ../pidgin/gtkprefs.c:2033
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
-msgstr "Conversas"
+msgstr "Conversacións"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1467 ../pidgin/gtkprefs.c:2044
 msgid "Logging"
 msgstr "Rexistro"
 
-#: ../finch/gntrequest.c:583
+#, fuzzy
+msgid "You must fill all the required fields."
+msgstr "Debe encher todos os campos requiridos."
+
+#, fuzzy
+msgid "The required fields are underlined."
+msgstr "Os campos requiridos están subliñados."
+
 msgid "Not implemented yet."
-msgstr "Funcionalidade non implementada."
+msgstr "Aínda non está implementada."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Gardar ficheiro..."
 
-#: ../finch/gntrequest.c:659 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Abrir ficheiro..."
 
-#: ../finch/gntsound.c:97 ../pidgin/gtksound.c:64
+#, fuzzy
+msgid "Choose Location..."
+msgstr "Seleccionar localización..."
+
+msgid "Hit 'Enter' to find more rooms of this category."
+msgstr "Prema a tecla 'Intro' para encontrar máis salas desta categoría."
+
+#, fuzzy
+msgid "Get"
+msgstr "Obter"
+
+#. Create the window.
+msgid "Room List"
+msgstr "Lista de salas"
+
 msgid "Buddy logs in"
 msgstr "Conéctase un contacto"
 
-#: ../finch/gntsound.c:98 ../pidgin/gtksound.c:65
 msgid "Buddy logs out"
 msgstr "Desconéctase un contacto"
 
-#: ../finch/gntsound.c:99 ../pidgin/gtksound.c:66
 msgid "Message received"
 msgstr "Mensaxe recibida"
 
-#: ../finch/gntsound.c:100 ../pidgin/gtksound.c:67
 msgid "Message received begins conversation"
 msgstr "Mensaxe recibida que comeza unha conversa"
 
-#: ../finch/gntsound.c:101 ../pidgin/gtksound.c:68
 msgid "Message sent"
 msgstr "Mensaxe enviada"
 
-#: ../finch/gntsound.c:102 ../pidgin/gtksound.c:69
 msgid "Person enters chat"
 msgstr "Alguén entra na conversa"
 
-#: ../finch/gntsound.c:103 ../pidgin/gtksound.c:70
 msgid "Person leaves chat"
 msgstr "Alguén deixa a conversa"
 
-#: ../finch/gntsound.c:104 ../pidgin/gtksound.c:71
 msgid "You talk in chat"
 msgstr "Participa na conversa"
 
-#: ../finch/gntsound.c:105 ../pidgin/gtksound.c:72
 msgid "Others talk in chat"
-msgstr "Conversan outros"
+msgstr "Falan outros na conversa"
 
-#: ../finch/gntsound.c:107 ../pidgin/gtksound.c:75
-msgid "Someone says your screen name in chat"
-msgstr "Alguén menciona o seu nome na conversa"
+#, fuzzy
+msgid "Someone says your username in chat"
+msgstr "Alguén dixo o seu nome na conversa"
 
-#: ../finch/gntsound.c:361 ../pidgin/gtksound.c:311
 msgid "GStreamer Failure"
 msgstr "Fallo de GStreamer"
 
-#: ../finch/gntsound.c:362 ../pidgin/gtksound.c:312
 msgid "GStreamer failed to initialize."
-msgstr "O GStreamer errou ao iniciar."
+msgstr "O GStreamer fallou ao iniciar."
 
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1587
-#: ../pidgin/gtkprefs.c:1676 ../pidgin/gtkprefs.c:1872
 msgid "(default)"
-msgstr "(por defecto)"
+msgstr "(predeterminado)"
 
-#: ../finch/gntsound.c:729
 msgid "Select Sound File ..."
-msgstr "Elixir ficheiro de son ..."
+msgstr "Seleccionar ficheiro de son ..."
 
-#: ../finch/gntsound.c:904
 msgid "Sound Preferences"
 msgstr "Preferencias de son"
 
-#: ../finch/gntsound.c:915
 msgid "Profiles"
 msgstr "Perfís"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1717
 msgid "Automatic"
 msgstr "Automático"
 
-#: ../finch/gntsound.c:957
 msgid "Console Beep"
-msgstr "Bip da consola"
+msgstr "Ton de aviso da consola"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1721
 msgid "Command"
 msgstr "Comando"
 
-#: ../finch/gntsound.c:959
 msgid "No Sound"
 msgstr "Sen son"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1712
 msgid "Sound Method"
-msgstr "Método para reproducir sons"
+msgstr "Método para reproducir o son"
 
-#: ../finch/gntsound.c:966
 msgid "Method: "
-msgstr "Método:"
+msgstr "Método: "
 
-#: ../finch/gntsound.c:973
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1593,80 +1326,56 @@ msgstr ""
 "(%s para nome de ficheiro)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1756
 msgid "Sound Options"
 msgstr "Opcións de son"
 
-#: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
-msgstr "Sons cando a conversa ten o _foco"
+msgstr "Sons cando a conversa ten o foco"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1763 ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Sempre"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1761
 msgid "Only when available"
-msgstr "Só cando estea dispoñible"
+msgstr "Só cando estea dispoñíbel"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1762
 msgid "Only when not available"
-msgstr "Só cando estea non dispoñible"
+msgstr "Só cando non estea dispoñíbel"
 
-#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
 msgstr "Volume(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1798
 msgid "Sound Events"
 msgstr "Eventos de son"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1857
 msgid "Event"
 msgstr "Evento"
 
-#: ../finch/gntsound.c:1020
 msgid "File"
 msgstr "Ficheiro"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1876
 msgid "Test"
-msgstr "Probar"
+msgstr "Proba"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1880
 msgid "Reset"
-msgstr "Reiniciar"
+msgstr "Restaurar"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1884
 msgid "Choose..."
-msgstr "Escoller..."
+msgstr "Seleccionar..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
-msgstr "Está seguro de que quere borrar \"%s\""
+msgstr "Está seguro de que quere eliminar \"%s\""
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
-msgstr "Borrar estado"
+msgstr "Borrar o estado"
 
-#: ../finch/gntstatus.c:176 ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Estados gardados"
 
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Título"
 
-#: ../finch/gntstatus.c:183 ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Tipo"
 
@@ -1678,210 +1387,137 @@ msgstr "Tipo"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:256
-#: ../libpurple/protocols/bonjour/bonjour.c:263
-#: ../libpurple/protocols/bonjour/bonjour.c:346
-#: ../libpurple/protocols/gg/gg.c:1077 ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597 ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613 ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5554
-#: ../libpurple/protocols/oscar/oscar.c:5772
-#: ../libpurple/protocols/oscar/oscar.c:5786
-#: ../libpurple/protocols/oscar/oscar.c:5802
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/oscar/oscar.c:5816
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3751
-#: ../libpurple/protocols/yahoo/yahoo.c:3757
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "Mensaxe"
 
 #. Use
-#: ../finch/gntstatus.c:194 ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Usar"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "O título non é válido"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Introduza un título non baleiro para o estado."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Título duplicado"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Introduza un título diferente para o estado."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Estado secundario"
 
-#: ../finch/gntstatus.c:464 ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Mensaxe:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Editar estado"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Usar un estado diferente para as contas seguintes"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Gardar e usar"
 
-#: ../finch/gntui.c:85
 msgid "Certificates"
-msgstr ""
+msgstr "Certificados"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2035
 msgid "Sounds"
 msgstr "Sons"
 
-#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Estados"
 
-#: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 #, fuzzy
 msgid "Error loading the plugin."
-msgstr "Ocorreron erros ao descargar o complemento."
+msgstr "Houbo un erro ao cargar o complemento."
 
-#: ../finch/plugins/gntclipboard.c:116
 #, fuzzy
 msgid "Couldn't find X display"
-msgstr "Non se puido abrir o ficheiro"
+msgstr "Non se puido encontrar a pantalla de X"
 
-#: ../finch/plugins/gntclipboard.c:122
 #, fuzzy
 msgid "Couldn't find window"
-msgstr "Non se puido abrir o ficheiro"
+msgstr "Non se puido encontrar a ventá"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
 msgstr ""
+"Este complemento non se pode cargar porque non se construíu con soporte de "
+"X11."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Complemento de portapapeis"
 
-#: ../finch/plugins/gntclipboard.c:161
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
 msgstr ""
 "Cando cambia o contido do portapapeis de gnt, os contidos póñense "
-"dispoñibles nas X, se é posible."
+"dispoñíbeis nas X, se é posíbel."
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
-msgstr "%s conectouse"
+msgstr "%s acaba de conectarse"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
-msgstr "%s desconectouse"
+msgstr "%s acaba de desconectarse"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s envioulle unha mensaxe"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s dixo o seu alias en %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s envioulle unha mensaxe en %s"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Conéctase/Desconéctase un contacto"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Recibiu unha MI"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
-msgstr "Alguén está a falar na conversa"
+msgstr "Alguén está a falar nunha sala de conversa"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
-msgstr "Alguén dixo o seu nome na conversa"
+msgstr "Alguén dixo o seu nome nunha conversa"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
-msgstr "Notificar cunha ventá emerxente cando"
+msgstr "Notificar cunha \"torradora\" cando"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
-msgstr "Emitir ton de aviso tamén!"
+msgstr "Emitir tamén un ton de aviso!"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
-msgstr "Activar URXENTE para a ventá do terminal."
+msgstr "Definir URXENTE para a ventá do terminal."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
-msgstr "Complemento de ventá emerxente"
+msgstr "Complemento Toaster"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Conversa con %s en %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
-msgstr "O complemento de historial require conectarse"
+msgstr "O complemento de historial require estar conectado"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1893,261 +1529,241 @@ msgstr ""
 "A activación do rexistro das mensaxes instantáneas e/ou das conversas "
 "activará o historial para os mesmos tipos de conversa."
 
-#: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
-msgstr "Historial"
+msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
-msgstr "Mostra as conversas rexistradas previamente nas novas conversas."
+msgstr "Mostra as conversas rexistradas recentemente nas novas conversas."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
 msgstr ""
-"Cando se abre unha nova conversa, este complemento introduce a última "
+"Cando se abra unha nova conversa este complemento introducirá a última "
 "conversa na actual."
 
-#: ../finch/plugins/lastlog.c:69
+#, c-format
+msgid "Online"
+msgstr "Conectado"
+
+msgid "Offline"
+msgstr "Desconectado"
+
+#, fuzzy
+msgid "Online Buddies"
+msgstr "Contactos conectados"
+
+#, fuzzy
+msgid "Offline Buddies"
+msgstr "Contactos desconectados"
+
+#, fuzzy
+msgid "Online/Offline"
+msgstr "Conectado/Desconectado"
+
+msgid "Meebo"
+msgstr "Meebo"
+
+#, fuzzy
+msgid "No Grouping"
+msgstr "Non agrupar"
+
+#, fuzzy
+msgid "Provides alternate buddylist grouping options."
+msgstr "Proporcionaopcións alternativas para o agrupamento de contactos."
+
 msgid "Lastlog"
 msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr "lastlog: Busca unha subcadea no backlog."
+msgstr "lastlog: busca unha subcadea no último rexistro."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124 ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Complemento de Lastlog."
 
-#: ../libpurple/account.c:791
 msgid "accounts"
 msgstr "contas"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "O contrasinal é necesario para iniciar a sesión."
 
-#: ../libpurple/account.c:992
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Introducir o contrasinal para %s (%s)"
 
-#: ../libpurple/account.c:999
 msgid "Enter Password"
 msgstr "Introducir o contrasinal"
 
-#: ../libpurple/account.c:1004
 msgid "Save password"
 msgstr "Gardar o contrasinal"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Falta o complemento de protocolo para %s"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4036
 msgid "Connection Error"
 msgstr "Erro de conexión"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "Os novos contrasinais non coinciden."
 
-#: ../libpurple/account.c:1208
 msgid "Fill out all fields completely."
 msgstr "Encha todos os campos completamente."
 
-#: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr "Contrasinal orixinal"
 
-#: ../libpurple/account.c:1238
 msgid "New password"
-msgstr "Novo contrasinal"
+msgstr "Contrasinal novo"
 
-#: ../libpurple/account.c:1245
 msgid "New password (again)"
-msgstr "Novo contrasinal (outra vez)"
+msgstr "Contrasinal novo (outra vez)"
 
-#: ../libpurple/account.c:1251
 #, c-format
 msgid "Change password for %s"
 msgstr "Modificar o contrasinal de %s"
 
-#: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
-msgstr "Introduza o contrasinal actual e o novo."
+msgstr "Introduza o seu contrasinal actual e o novo."
 
-#: ../libpurple/account.c:1290
 #, c-format
 msgid "Change user information for %s"
-msgstr "Modificar a información do usuario %s"
+msgstr "Modificar a información de usuario para %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
-msgstr "Establecer a información de usuario"
-
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1017
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2027
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+msgstr "Definir a información de usuario"
+
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1320
-#: ../libpurple/blist.c:1552 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3244 ../pidgin/gtkblist.c:5373
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Contactos"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "lista de contactos"
 
-#: ../libpurple/certificate.c:545
 msgid "(DOES NOT MATCH)"
-msgstr ""
+msgstr "(NON COINCIDE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:549
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
-msgstr ""
+msgstr "%s presentou o seguinte certificado para un único uso:"
 
-#: ../libpurple/certificate.c:550
 #, c-format
 msgid ""
 "Common name: %s %s\n"
 "Fingerprint (SHA1): %s"
 msgstr ""
+"Nome común: %s %s\n"
+"Impresión dixital (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:555
 msgid "Single-use Certificate Verification"
-msgstr ""
+msgstr "Verificación de certificado de un único uso"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:872
 msgid "Certificate Authorities"
-msgstr ""
+msgstr "Autoridades de certificación"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1040
 msgid "SSL Peers Cache"
-msgstr ""
+msgstr "Caché de pares SSL"
 
 #. Make messages
-#: ../libpurple/certificate.c:1171
 #, fuzzy, c-format
 msgid "Accept certificate for %s?"
-msgstr "Aceptar o convite para conversar?"
+msgstr "Quere aceptar o certificado para %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1177
 msgid "SSL Certificate Verification"
-msgstr ""
+msgstr "Verificación de certificado SSL"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1186
 #, fuzzy
 msgid "Accept"
-msgstr "_Aceptar"
+msgstr "Aceptar"
 
-#: ../libpurple/certificate.c:1187 ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "Rexeitar"
 
-#: ../libpurple/certificate.c:1188
 msgid "_View Certificate..."
-msgstr ""
-
-#. Prompt the user to authenticate the certificate
-#. TODO: Provide the user with more guidance about why he is
-#. being prompted
-#. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1288
-#, c-format
-msgid ""
-"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
-"could mean that you are not connecting to the service you believe you are."
-msgstr ""
+msgstr "_Ver certificado..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1313
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
 "automatically checked."
 msgstr ""
+"O certificado presentado por \"%s\" está autoasinado. Non se pode verificar "
+"automaticamente."
 
-#: ../libpurple/certificate.c:1331
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
-msgstr ""
+msgstr "A cadea de certificación presentada para %s non é válida."
 
 #. TODO: Make this error either block the ensuing SSL
 #. connection error until the user dismisses this one, or
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1339 ../libpurple/certificate.c:1416
 #, fuzzy
 msgid "SSL Certificate Error"
-msgstr "Erro de escritura"
+msgstr "Erro de certificado SSL"
 
-#: ../libpurple/certificate.c:1340
 #, fuzzy
 msgid "Invalid certificate chain"
-msgstr "O título non é válido"
+msgstr "Cadea de certificación non válida"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1360
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
 msgstr ""
+"Non ten unha base de datos de certificados raíz, así que o certificado non "
+"se pode validar."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1382
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
+"O certificado raíz polo que este certificado afirma ser emitido é "
+"descoñecido para o Pidgin."
 
-#: ../libpurple/certificate.c:1408
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
 "signature from the Certificate Authority from which it claims to have a "
 "signature."
 msgstr ""
+"A cadea de certificación presentada por %s non ten unha sinatura dixital "
+"válida da Autoridade certificadora da que afirma ter unha sinatura."
 
-#: ../libpurple/certificate.c:1417
 msgid "Invalid certificate authority signature"
+msgstr "Asinatura de autoridade certificadora non válida"
+
+#. Prompt the user to authenticate the certificate
+#. TODO: Provide the user with more guidance about why he is
+#. being prompted
+#. vrq will be completed by user_auth
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
 msgstr ""
+"O certificado presentado por \"%s\" afirma vir de \"%s\" en vez do primeiro. "
+"Isto podería significar que non se está conectando ao servizo ao que pensa "
+"que está conectado."
 
 #. Make messages
-#: ../libpurple/certificate.c:1881
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2157,129 +1773,105 @@ msgid ""
 "Activation date: %s\n"
 "Expiration date: %s\n"
 msgstr ""
+"Nome común: %s\n"
+"\n"
+"Impresión dixital (SHA1): %s\n"
+"\n"
+"Data de activación: %s\n"
+"Data de vencemento: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1890
 #, fuzzy
 msgid "Certificate Information"
-msgstr "Información do servidor"
+msgstr "Información do certificado"
 
-#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Erro de rexistro"
 
-#: ../libpurple/connection.c:180
 #, fuzzy
 msgid "Unregistration Error"
-msgstr "Erro de rexistro"
+msgstr "Erro de eliminación do rexistro"
 
-#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s conectouse"
 
-#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s desconectouse"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2337
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Erro descoñecido"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
-msgstr "Non se puido enviar a mensaxe. É demasiado longa."
+msgstr "Non se puido enviar a mensaxe: é demasiado longa."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Non se puido enviar a mensaxe a %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "A mensaxe é demasiado longa."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Non se puido enviar a mensaxe."
 
-#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Enviar a mensaxe"
 
-#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
-msgstr "_Enviar a mensaxe"
+msgstr "_Enviar mensaxe"
 
-#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s entrou na sala."
 
-#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] entrou na sala."
 
-#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Agora chámase %s"
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s chámase agora %s"
 
-#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s saíu da sala."
 
-#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s saíu da sala (%s)."
 
-#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
-msgstr "Fallou ao se conectar: %s"
+msgstr "Fallou ao obter a conexión: %s"
 
-#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
-msgstr "Fallou ao buscar o nome: %s"
+msgstr "Fallou ao obter o nome: %s"
 
-#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
-msgstr "Fallou ao buscar o nome do servidor: %s"
+msgstr "Fallou ao obter o nome do servidor: %s"
 
-#: ../libpurple/dbus-server.h:85
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
-"O servidor D-BUS de Purple non está executándose polo motivo amosado a "
-"continuación"
+"O servidor D-BUS de Purple non se está executando polo motivo que se mostra "
+"a continuación"
 
-#: ../libpurple/desktopitem.c:287 ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Sen nome"
 
-#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
-msgstr "Non é posible crear un novo proceso resolvedor\n"
+msgstr "Non é posíbel crear un novo proceso de resolución\n"
 
-#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
-msgstr "Non é posible enviar a solicitude ao proceso resolvedor\n"
+msgstr "Non é posíbel enviar a solicitude ao proceso resolvedor\n"
 
-#: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:697
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2288,13 +1880,10 @@ msgstr ""
 "Erro ao resolver %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552 ../libpurple/dnsquery.c:711
-#: ../libpurple/dnsquery.c:831
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Erro ao resolver %s: %d"
 
-#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2303,21 +1892,17 @@ msgstr ""
 "Erro ao ler desde o proceso resolvedor:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
 #, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF ao ler desde o proceso resolvedor"
 
-#: ../libpurple/dnsquery.c:761
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Fallo ao crear o fío: %s"
 
-#: ../libpurple/dnsquery.c:762
 msgid "Unknown reason"
 msgstr "Razón descoñecida"
 
-#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2326,7 +1911,6 @@ msgstr ""
 "Erro ao ler %s:\n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2335,7 +1919,6 @@ msgstr ""
 "Erro ao escribir %s:\n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2344,307 +1927,246 @@ msgstr ""
 "Erro ao acceder a %s:\n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr "Non se pode escribir no directorio."
 
-#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "Non se pode enviar un ficheiro de 0 bytes."
 
-#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "Non se pode enviar un directorio."
 
-#: ../libpurple/ft.c:287
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s non é un ficheiro regular. Non se sobrescribirá.\n"
+msgstr "%s non é un ficheiro normal. Non se sobrescribirá.\n"
 
-#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s quere enviarlle %s (%s)"
 
-#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
-msgstr "%s quere enviarlle un ficheiro"
+msgstr "%s quérelle enviar un ficheiro"
 
-#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
-msgstr "Aceptar a solicitude de transferencia de ficheiro de %s?"
+msgstr "Quere aceptar a solicitude de transferencia de ficheiro de %s?"
 
-#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
 "Remote host: %s\n"
 "Remote port: %d"
 msgstr ""
-"Hai un ficheiro dispoñible para descargar desde:\n"
-"Servidor remoto: %s\n"
+"Hai un ficheiro dispoñíbel para descargar desde:\n"
+"Host remoto: %s\n"
 "Porto remoto: %d"
 
-#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s ofrécese para envialle o ficheiro %s"
 
-#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s non é un nome de ficheiro válido.\n"
 
-#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Ofrécese para enviar %s a %s"
 
-#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Iniciando transferencia de %s desde %s"
 
-#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
-msgstr "Completouse a transferencia do ficheiro %s"
+msgstr "Terminou a transferencia do ficheiro %s"
 
-#: ../libpurple/ft.c:685
 #, c-format
 msgid "File transfer complete"
-msgstr "Transferencia de ficheiros completa"
+msgstr "Transferencia de ficheiros terminada"
 
-#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Cancelou a transferencia de %s"
 
-#: ../libpurple/ft.c:1108
 #, c-format
 msgid "File transfer cancelled"
 msgstr "Transferencia de ficheiros cancelada"
 
-#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s cancelou a transferencia de %s"
 
-#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s cancelou a transferencia de ficheiros"
 
-#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "A transferencia de ficheiros a %s fallou."
 
-#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
-msgstr "A transferencia de ficheiro desde %s fallou."
+msgstr "A transferencia de ficheiros desde %s fallou."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Executar o comando nun terminal"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "Comando usado para manipular URLs \"aim\", se está activado."
+msgstr "O comando usado para manipular os URL \"aim\", se está activado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "Comando usado para manipular URLs \"gg\",  se está activado."
+msgstr "O comando usado para manipular os URL \"gg\",  se está activado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "Comando usado para manipular URLs \"icq\", se está activado."
+msgstr "O comando usado para manipular os URL \"icq\",  se está activado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "Comando usado para manipular URLs \"irc\", se está activado."
+msgstr "O comando usado para manipular os URL \"irc\",  se está activado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "Comando usado para manipular URLs \"msnim\", se está activado."
+msgstr "O comando usado para manipular os URL \"msnim\", se está activado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "Comando usado para manipular URLs \"sip\", se está activado."
+msgstr "O comando usado para manipular os URL \"sip\", se está activado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "Comando usado para manipular URLs \"xmpp\", se está activado."
+msgstr "O comando usado para manipular os URL \"xmpp\", se está activado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "Comando usado para manipular URLs \"ymsgr\", se está activado."
+msgstr "O comando usado para manipular os URL \"ymsgr\",  se está activado."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
-msgstr "Manipulador para URLs \"aim\""
+msgstr "O manipulador dos URL \"aim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
-msgstr "Manipulador para URLs \"gg\""
+msgstr "O manipulador dos URL \"gg\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
-msgstr "Manipulador para URLs \"icq\""
+msgstr "O manipulador dos URL \"icq\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
-msgstr "Manipulador para URLs \"irc\""
+msgstr "O manipulador dos URL \"irc\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
-msgstr "Manipulador para URLs \"msnim\""
+msgstr "O manipulador dos URL \"msnim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
-msgstr "Manipulador para URLs \"sip\""
+msgstr "O manipulador dos URL \"sip\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
-msgstr "Manipulador para URLs \"xmpp\""
+msgstr "O manipulador dos URL \"xmpp\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
-msgstr "Manipulador para URLs \"ymsgr\""
+msgstr "O manipulador dos URL \"ymsgr\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
 msgstr ""
-"Verdadeiro se o comando específicado na chave de \"command\" debería "
-"manipular os URL \"aim\"."
+"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
+"os URL \"aim\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
 msgstr ""
-"Verdadeiro se o comando específicado na chave de \"command\" debería "
-"manipular os URL \"gg\"."
+"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
+"os URL \"gg\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
 msgstr ""
-"Verdadeiro se o comando específicado na chave de \"command\" debería "
-"manipular os URL \"icq\"."
+"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
+"os URL \"icq\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
 msgstr ""
-"Verdadeiro se o comando específicado na chave de \"command\" debería "
-"manipular os URL \"irc\"."
+"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
+"os URL \"irc\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
 msgstr ""
-"Verdadeiro se o comando específicado na chave de \"command\" debería "
-"manipular os URL \"msnim\"."
+"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
+"os URL \"msnim\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
 msgstr ""
-"Verdadeiro se o comando específicado na chave de \"command\" debería "
-"manipular os URL \"sip\"."
+"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
+"os URL \"sip\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
 msgstr ""
-"Verdadeiro se o comando específicado na chave de \"command\" debería "
-"manipular URL \"xmpp\"."
+"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
+"os URL \"xmpp\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
 msgstr ""
-"Verdadeiro se o comando específicado na chave de \"command\" debería "
-"manipular os URL \"ymsgr\"."
+"É verdadeiro se o comando especificado na chave \"command\" debe manipular "
+"os URL \"ymsgr\"."
 
-#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
 msgstr ""
-"Verdadeiro se o comando usado para manipular este tipo de URL debe ser "
+"É verdadeiro se o comando usado para manipular este tipo de URL debe ser "
 "executado nun terminal."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
-msgstr "Se o comando específicado debería manipular os URL \"aim\""
+msgstr "Indica se o comando especificado debe manipular os URL \"aim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
-msgstr "Se o comando específicado debería manipular os URL \"gg\""
+msgstr "Indica se o comando especificado debe manipular os URL \"gg\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
-msgstr "Se o comando específicado debería manipular os URL \"icq\""
+msgstr "Indica se o comando especificado debe manipular os URL \"icq\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
-msgstr "Se o comando específicado debería manipular os URL \"irc\""
+msgstr "Indica se o comando especificado debe manipular os URL \"irc\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
-msgstr "Se o comando específicado debería manipular os URL \"msnim\""
+msgstr "Indica se o comando especificado debe manipular os URL \"msnim\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
-msgstr "Se o comando específicado debería manipular os URL \"sip\""
+msgstr "Indica se o comando especificado debe manipular os URL \"sip\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
-msgstr "Se o comando específicado debería manipular os URL \"xmpp\""
+msgstr "Indica se o comando especificado debe manipular os URL \"xmpp\""
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
-msgstr "Se o comando específicado debería manipular os URL \"ymsgr\""
+msgstr "Indica se o comando especificado debe manipular os URL \"ymsgr\""
 
-#: ../libpurple/log.c:183
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">O rexistro non ten función de lectura</font></b>"
 
-#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr "Texto plano"
 
-#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr "Formato plano antigo"
 
-#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "O rexistro desta conversa fallou."
 
-#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2653,7 +2175,6 @@ msgstr ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1368
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2662,175 +2183,136 @@ msgstr ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;RESPOSTA "
 "AUTOMÁTICA&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1426 ../libpurple/log.c:1559
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 "<font color=\"red\"><b>Non se puido encontrar o camiño do rexistro!</b></"
 "font>"
 
-#: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Non se puido ler o ficheiro: %s</b></font>"
 
-#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <RESPOSTA AUTOMÁTICA>: %s\n"
 
-#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Esta a empregar %s, mais este complemento precisa %s."
 
-#: ../libpurple/plugin.c:380
 #, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Este complemento non definiu un ID."
 
-#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 "Non houbo coincidencia no número máxico do complemento %d (necesitaba %d)"
 
-#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr ""
 "Non houbo coincidencia no número de versión ABI %d.%d.x (necesitaba %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
-msgid "Plugin does not implement all required functions"
+#, fuzzy
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
 msgstr "O complemento non implementa todas as funcións necesarias"
 
-#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
-"Non se atopou o complemento necesario %s. Instala este complemento e "
-"inténtao novamente."
+"Non se encontrou o complemento requirido %s. Instale este complemento e "
+"ténteo de novo."
 
-#: ../libpurple/plugin.c:552
 msgid "Unable to load the plugin"
 msgstr "Non se puido cargar o complemento"
 
-#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "Non se puido cargar o complemento necesario %s."
+msgstr "Non se puido cargar o complemento requirido %s."
 
-#: ../libpurple/plugin.c:578
 msgid "Unable to load your plugin."
 msgstr "Non se puido cargar o seu complemento."
 
-#: ../libpurple/plugin.c:677
-#, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "Non se puido descargar o complemento dependente %s."
-
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "Ocorreron erros ao descargar o complemento."
+#, fuzzy, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s require %s mais non se puido cargar."
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
-msgstr "Autoaceptar"
+msgstr "Aceptar automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr ""
-"Autoaceptar as peticións de transferencia de ficheiros dos usuarios "
-"seleccionados."
+"Aceptar automaticamente as peticións de transferencia de ficheiros dos "
+"usuarios seleccionados."
 
-#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
-"Completada a transferencia aceptada automaticamente do ficheiro \"%s\" desde "
+"Terminou a transferencia aceptada automaticamente do ficheiro \"%s\" desde "
 "\"%s\"."
 
-#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
-msgstr "Completar a aceptación automática"
+msgstr "Terminou a aceptación automática"
 
-#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Cando chega unha solicitude de transferencia de ficheiro desde %s"
 
-#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "Establecer a configuración de aceptación automática"
 
-#: ../libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Gardar"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1453
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2282
-#: ../libpurple/protocols/oscar/oscar.c:5886
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:6167
-#: ../libpurple/protocols/oscar/oscar.c:6237 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Preguntar"
 
-#: ../libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Aceptar automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Rexeitar automaticamente"
 
-#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Aceptar automaticamente a transferencia de ficheiros..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
-"Camiño para gardar os ficheiros en\n"
-"(Especifica o camiño completo)"
+"Camiño en que gardar os ficheiros\n"
+"(Especifique o camiño completo)"
 
-#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 "Rexeitar automaticamente de usuarios que non están na lista de contactos"
 
-#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
-"Notificar cunha ventá enerxente cando se completa unha transferencia de "
+"Notificar cunha ventá emerxente cando se termine unha transferencia de "
 "ficheiros aceptada automaticamente\n"
-"(Só cando non hai unha conversa co remitente)"
+"(só cando non hai unha conversa co remitente)"
+
+#, fuzzy
+msgid "Create a new directory for each user"
+msgstr "Crear un novo directorio para cada usuario"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1660
-#: ../libpurple/protocols/msn/msn.c:1690
 msgid "Notes"
-msgstr "Anotacións"
+msgstr "Notas"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Introduza as súas anotacións debaixo..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Editar anotacións..."
 
@@ -2842,18 +2324,15 @@ msgstr "Editar anotacións..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Anotacións de contactos"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
-msgstr "Almacenar anotacións de contactos particulares."
+msgstr "Almacenar anotacións sobre contactos particulares."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Engade a opción para almacenar anotacións para os contactos da súa lista de "
@@ -2865,7 +2344,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Proba de cifrado"
 
@@ -2873,7 +2351,6 @@ msgstr "Proba de cifrado"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Proba os cifrados que se inclúen en libpurple."
 
@@ -2883,7 +2360,6 @@ msgstr "Proba os cifrados que se inclúen en libpurple."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "Exemplo de DBus"
 
@@ -2891,8 +2367,6 @@ msgstr "Exemplo de DBus"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "Exemplo de complemento DBus"
 
@@ -2902,7 +2376,6 @@ msgstr "Exemplo de complemento DBus"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Control de ficheiros"
 
@@ -2910,50 +2383,38 @@ msgstr "Control de ficheiros"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Permite controlar o programa introducindo comandos nun ficheiro."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minutos"
 
 #. 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.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
-msgstr "Xerador de ausencia"
+msgstr "Xerador de inactividade"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
-msgstr "Establecer tempo de inactividade da conta"
+msgstr "Definir o tempo de inactividade da conta"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
-msgstr "_Establecer"
+msgstr "_Definir"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Ningunha das súas contas está inactiva."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Desactivar o tempo de inactividade da conta"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Desactivar"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Establecer o tempo de inactividade para todas as contas"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Desactivar o tempo de inactividade para todas as contas inactivas"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "Permite configurar manualmente canto tempo estivo ausente"
 
@@ -2963,24 +2424,21 @@ msgstr "Permite configurar manualmente canto tempo estivo ausente"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "Cliente de proba IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
-msgstr "Probar soporte do complemento IPC, como un cliente."
+msgstr "Probar o soporte do complemento IPC como un cliente."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
 msgstr ""
-"Probar soporte do complemento IPC, como un cliente. Esto localiza o "
+"Probar o soporte do complemento IPC como un cliente. Isto localiza o "
 "complemento de servidor e chama aos comandos rexistrados."
 
 #. *< type
@@ -2989,35 +2447,32 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "Servidor de proba IPC"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
-msgstr "Probar soporte do complemento IPC, como un servidor."
+msgstr "Probar o soporte do complemento IPC como un servidor."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
-"Probar soporte do complemento IPC, como un servidor. Esto rexistra os "
+"Probar o soporte do complemento IPC como un servidor. Isto rexistra os "
 "comandos IPC."
 
-#: ../libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
 msgstr "Configuración da ocultación de Unirse/Deixar"
 
-#: ../libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
 msgstr "Tamaño mínimo da sala"
 
-#: ../libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
-msgstr "Tempo de inactividade do usuario (en minutos)"
+msgstr "Tempo de espera para a inactividade do usuario (en minutos)"
+
+msgid "Apply hiding rules to buddies"
+msgstr ""
 
 #. *< type
 #. *< ui_requirement
@@ -3025,136 +2480,112 @@ msgstr "Tempo de inactividade do usuario (en minutos)"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Ocultar Unirse/Deixar"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
-msgstr "Ocultar as mensaxes alleas ao unirse/deixar."
+msgstr "Oculta as mensaxes alleas ao unirse/deixar."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
 msgstr ""
 "Este complemento oculta as mensaxes de Unirse/Deixar en salas grandes, "
-"excepto as de aqueles usuarios que toman parte activa nunha conversa."
+"excepto as daqueles usuarios que toman parte activa nunha conversa."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:493
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1577
 msgid "User is offline."
 msgstr "O usuario está desconectado."
 
-#: ../libpurple/plugins/log_reader.c:1583
 msgid "Auto-response sent:"
 msgstr "Resposta automática enviada:"
 
-#: ../libpurple/plugins/log_reader.c:1593
-#: ../libpurple/plugins/log_reader.c:1596
-#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s desconectouse."
 
-#: ../libpurple/plugins/log_reader.c:1610
 msgid "One or more messages may have been undeliverable."
 msgstr "Unha ou máis mensaxes puideron non chegar ao destino."
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "You were disconnected from the server."
 msgstr "Foi desconectado do servidor."
 
-#: ../libpurple/plugins/log_reader.c:1628
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
-"Está actualmente desconectado. As mensaxes non se recibirán a non ser que "
-"inicie sesión."
+"Está actualmente desconectado. Non se recibirán mensaxes a non ser que teña "
+"unha sesión iniciada."
 
-#: ../libpurple/plugins/log_reader.c:1643
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Non se puido enviar a mensaxe porque excedeu a lonxitude máxima."
 
-#: ../libpurple/plugins/log_reader.c:1648
 msgid "Message could not be sent."
 msgstr "Non se puido enviar a mensaxe."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2349
-#: ../libpurple/plugins/log_reader.c:2472
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2362
-#: ../libpurple/plugins/log_reader.c:2477
 msgid "Fire"
 msgstr "Fire"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2374
-#: ../libpurple/plugins/log_reader.c:2481
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2388
-#: ../libpurple/plugins/log_reader.c:2486
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2400
-#: ../libpurple/plugins/log_reader.c:2490
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2412
-#: ../libpurple/plugins/log_reader.c:2494
 msgid "Trillian"
 msgstr "Trillian"
 
+#. The names of IM clients are marked for translation at the request of
+#. translators who wanted to transliterate them.  Many translators
+#. choose to leave them alone.  Choose what's best for your language.
+msgid "aMSN"
+msgstr "aMSN"
+
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2454
 msgid "General Log Reading Configuration"
-msgstr "Configuración de lectura de rexistro xeral"
+msgstr "Configuración de lectura do rexistro xeral"
 
-#: ../libpurple/plugins/log_reader.c:2458
 msgid "Fast size calculations"
-msgstr "Cálculos de tamaño rápido"
+msgstr "Cálculos rápidos de tamaño"
 
-#: ../libpurple/plugins/log_reader.c:2462
 msgid "Use name heuristics"
-msgstr "Usar nomes heurísticos"
+msgstr "Usar heurística de nomes"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2468
 msgid "Log Directory"
 msgstr "Directorio de rexistro"
 
@@ -3164,19 +2595,16 @@ msgstr "Directorio de rexistro"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2523
 msgid "Log Reader"
 msgstr "Lector de rexistro"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2527
 msgid "Includes other IM clients' logs in the log viewer."
-msgstr "Incluír outros rexistros de clientes de MI no visor de rexistro."
+msgstr "Inclúe outros rexistros de clientes de MI no visualizador de rexistro."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2531
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -3185,20 +2613,25 @@ msgid ""
 "at your own risk!"
 msgstr ""
 "Cando vexa os rexistros, este complemento incluirá rexistros doutros "
-"clientes de MI. Actualmente, isto inclúe Adium, MSN Messenger e Trillian.\n"
+"clientes de MI. Actualmente, isto inclúe ao Adium, o MSN Messenger e o "
+"Trillian.\n"
 "\n"
-"AVISO: Este complemento é todavía unha versión alfa e pode producir erros "
-"con frecuencia. Úseo baixo a súa responsabilidade!"
+"AVISO: Este complemento é aínda unha versión alfa e pode producir erros con "
+"frecuencia. Úseo baixo a súa responsabilidade!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Cargador de complementos Mono"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "Carga complementos .NET con Mono."
 
+msgid "Add new line in IMs"
+msgstr "Engadir unha nova liña nos MIs"
+
+#, fuzzy
+msgid "Add new line in Chats"
+msgstr "Engadir unha nova liña nas salas de conversa"
+
 #. *< magic
 #. *< major version
 #. *< minor version
@@ -3208,90 +2641,62 @@ msgstr "Carga complementos .NET con Mono."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "Nova liña"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
-msgstr "Engadir unha nova liña ao comenzo da mensaxe amosada."
+msgstr "Engade unha nova liña ao comenzo da mensaxe mostrada."
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:71
+#, fuzzy
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
-"the screen name in the conversation window."
+"the username in the conversation window."
 msgstr ""
-"Engade unha liña en branco ás mensaxes para que o resto da mensaxe "
-"aparezadebaixo do nome de usuario na ventá de conversa."
+"Engade unha liña en branco ás mensaxes para que o resto da mensaxe apareza "
+"debaixo do nome de usuario na ventá de conversa."
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Emulación de mensaxe a contactos desconectados"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr "Gardar como avisos as mensaxes enviadas a un usuario desconectado."
 
-#: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
-"O resto das mensaxes serán gardadas como avisos. Pode editar/eliminar os "
-"avisos na ventá de diálogo 'Avisos de amigo'."
+"O resto das mensaxes gardaranse como avisos. Pode editar/eliminar os avisos "
+"na ventá de diálogo 'Avisos de amigo'."
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, 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\" está actualmente fóra de liña. Quere gardar o resto de mensaxes nun "
-"aviso e enviarllas automaticamente cando \"%s\" volva conectarse?"
+"\"%s\" está actualmente desconectado. Quere gardar o resto de mensaxes nun "
+"aviso e enviarllas automaticamente cando \"%s\" se volva conectar?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Mensaxe sen conexión"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 "Pode editar/eliminar o aviso desde a ventá de diálogo 'Avisos de amigos'"
 
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "Si"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:550 ../libpurple/protocols/msn/msn.c:560
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "Non"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
-msgstr "Gardar as mensaxes sen conexión en aviso"
+msgstr "Gardar as mensaxes sen conexión nun aviso"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
-msgstr "Non preguntar. Gardar sempre en avisos."
+msgstr "Non preguntar. Gardar sempre nun aviso."
 
 #. *< type
 #. *< ui_requirement
@@ -3299,52 +2704,43 @@ msgstr "Non preguntar. Gardar sempre en avisos."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Cargador de complementos Perl"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
-msgstr "Prové o soporte para cargar complementos en perl."
+msgstr "Proporciona o soporte para cargar complementos en perl."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Modo psíquico"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Modo psíquico para conversas entrantes"
 
-#: ../libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Provoca que aparezan ventás de conversa cando outros usuarios comezan unha "
-"conversa contigo.  Isto funciona para AIM, ICQ, XMPP, Sametime e Yahoo!"
+"conversa consigo. Isto funciona para o AIM, o ICQ, o XMPP, o Sametime e o "
+"Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Sentiu unha alteración na forza..."
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Activar só para usuarios da lista de contactos"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Desactivar cando está ausente"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Mostrar a mensaxe de notificación nas conversas"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
-msgstr "Aumentar psicoticidade das conversas"
+msgstr "Activar as conversas psíquicas"
 
 #. *< type
 #. *< ui_requirement
@@ -3352,7 +2748,6 @@ msgstr "Aumentar psicoticidade das conversas"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Proba de sinais"
 
@@ -3360,10 +2755,8 @@ msgstr "Proba de sinais"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
-msgstr "Probar para ver se todos os sinais funcionan correctamente."
+msgstr "Proba para ver se todos os sinais funcionan correctamente."
 
 #. *< type
 #. *< ui_requirement
@@ -3371,7 +2764,6 @@ msgstr "Probar para ver se todos os sinais funcionan correctamente."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Complemento sinxelo"
 
@@ -3379,15 +2771,12 @@ msgstr "Complemento sinxelo"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
-msgstr "Fai probas para determinar se a maior parte das cousas funcionan."
+msgstr "Probas para determinar se a maior parte das cousas funcionan."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:902
-#: ../libpurple/plugins/ssl/ssl-nss.c:725
 msgid "X.509 Certificates"
-msgstr ""
+msgstr "Certificados X.509"
 
 #. *< type
 #. *< ui_requirement
@@ -3395,7 +2784,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:986
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3403,8 +2791,6 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:989
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:991
 msgid "Provides SSL support through GNUTLS."
 msgstr "Proporciona soporte SSL a través de GNUTLS."
 
@@ -3414,7 +2800,6 @@ msgstr "Proporciona soporte SSL a través de GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:810
 msgid "NSS"
 msgstr "NSS"
 
@@ -3422,8 +2807,6 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:813
-#: ../libpurple/plugins/ssl/ssl-nss.c:815
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Proporciona soporte SSL a través do NSS de Mozilla."
 
@@ -3433,7 +2816,6 @@ msgstr "Proporciona soporte SSL a través do NSS de Mozilla."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3441,50 +2823,40 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Proporciona un wrapper para as bibliotecas de soporte de SSL."
 
-#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s xa non está ausente."
 
-#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
-msgstr "%s marchou."
+msgstr "%s foise."
 
-#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
-msgstr "%s está agora inactivo."
+msgstr "%s volveuse inactivo."
 
-#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s xa non está inactivo."
 
-#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s conectouse."
 
-#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Notificar cando"
 
-#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "O contacto _está ausente"
 
-#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "O contacto está _inactivo"
 
-#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
-msgstr "_Conéctase/Desconéctase un contacto"
+msgstr "Un contacto se _conectase/desconecta"
 
 #. *< type
 #. *< ui_requirement
@@ -3492,7 +2864,6 @@ msgstr "_Conéctase/Desconéctase un contacto"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Notificación do estado dos contactos"
 
@@ -3500,8 +2871,6 @@ msgstr "Notificación do estado dos contactos"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:151
-#: ../libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -3509,69 +2878,50 @@ msgstr ""
 "Notifica nunha ventá de conversa cando un contacto se ausenta, volve ou está "
 "inactivo."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Cargador de complementos Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
-msgstr "Prové soporte para cargar complementos Tcl"
+msgstr "Proporciona o soporte para cargar complementos Tcl"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
-"Non é posible detectar a intalación de ActiveTCL. Se quere empregar "
+"Non é posíbel detectar a instalación de ActiveTCL. Se quere empregar "
 "complementos de TCL, precisa instalar ActiveTCL desde o enderezo http://www."
 "activestate.com\n"
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
+msgstr ""
+"Non se encontrou o toolkit Apple Bonjour for Windows, vexa a sección de "
+"preguntas máis frecuentes (FAQ) en: http://d.pidgin.im/BonjourWindows para "
+"máis información."
+
 msgid "Unable to listen for incoming IM connections\n"
-msgstr "Imposible escoitar as conexións de MI entrantes\n"
+msgstr "Non é posíbel escoitar as conexións entrantes de MI\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
-"Imposible establecer a conexión co servidor local mDNS. Estase a executar?"
+"Non é posíbel establecer a conexión co servidor local mDNS. Estase a "
+"executar?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:351
-#: ../libpurple/protocols/bonjour/bonjour.c:656
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:353
-#: ../libpurple/protocols/bonjour/bonjour.c:659
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Apelidos"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:357
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2216
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "Email"
 msgstr "Correo electrónico"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/bonjour/bonjour.c:665
 msgid "AIM Account"
 msgstr "Conta de AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:363
-#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "XMPP Account"
 msgstr "Conta de XMPP"
 
@@ -3585,410 +2935,255 @@ msgstr "Conta de XMPP"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:467
-#: ../libpurple/protocols/bonjour/bonjour.c:469
 msgid "Bonjour Protocol Plugin"
 msgstr "Complemento de protocolo Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:610
 msgid "Purple Person"
 msgstr "Persoa Purple"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:380
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s pechou a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:437
-#: ../libpurple/protocols/bonjour/jabber.c:660
-#: ../libpurple/protocols/bonjour/jabber.c:678
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Non se puido enviar a mensaxe, non se puido iniciar a conversa."
+msgstr "Non é posíbel enviar a mensaxe; non se puido iniciar a conversa."
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Cannot open socket"
-msgstr "Non se puido abrir o conectador"
+msgstr "Non se pode abrir o conectador"
 
-#: ../libpurple/protocols/bonjour/jabber.c:591
-msgid "Error setting socket options"
-msgstr "Erro ao establecer as opcións do conectador"
-
-#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not bind socket to port"
-msgstr "Non se pode ligar o conectador ao porto"
+msgstr "Non se puido vincular o conectador ao porto"
 
-#: ../libpurple/protocols/bonjour/jabber.c:623
 msgid "Could not listen on socket"
-msgstr "Non se pode escoitar o conectador"
+msgstr "Non se puido escoitar o conectador"
+
+#, fuzzy
+msgid "Error communicating with local mDNSResponder."
+msgstr "Erro ao comunicar co mDNSResponder local"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1829
 msgid "Invalid proxy settings"
-msgstr "Configuración incorrecta de proxy"
+msgstr "A configuración do proxy non é válida"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1829
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
-"O nome do servidor ou o porto especificados non son válidos para o seu tipo "
-"de proxy."
+"O nome do servidor ou o número de porto especificados non son válidos para o "
+"seu tipo de proxy."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Erro de token"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
-#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Non se puido obter o token.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Gardar lista de contactos..."
 
-#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr ""
 "A súa lista de contactos está baleira, non se escribiu nada no ficheiro."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "Non se puido abrir o ficheiro"
-
-#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "A lista de contactos gardouse correctamente!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#, fuzzy, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "Non se puido escribir a lista de contactos de %s a %s"
+
 msgid "Couldn't load buddylist"
 msgstr "Non se puido cargar a lista de contactos"
 
-#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Cargar lista de contactos..."
 
-#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "A lista de contactos cargouse satisfactoriamente!"
 
-#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Gardar lista de contactos..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+msgid "Load buddylist from file..."
+msgstr "Cargar a lista de contactos desde un ficheiro..."
+
 msgid "Fill in the registration fields."
 msgstr "Encher os campos de rexistro."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Os contrasinais non coinciden."
 
-#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Non se puido rexistrar a nova conta. Produciuse un erro.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova conta rexistrada de Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
-msgstr "O rexistro completouse satisfactoriamente!"
+msgstr "O rexistro terminou satisfactoriamente!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "Contrasinal"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
-msgstr "Contrasinal (reescribir)"
+msgstr "Contrasinal (escribir de novo)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Introduza o token actual"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Token actual"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
-msgstr "Rexistrar conta nova de Gadu-Gadu"
+msgstr "Rexistrar unha conta nova de Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Encha os seguintes campos"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3789
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Cidade"
 
-#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
-msgstr "Data de nacemento"
-
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1589
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
+msgstr "Ano de nacemento"
+
 msgid "Gender"
 msgstr "Sexo"
 
-#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Home ou muller"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
-msgstr "Home"
+msgstr "Male"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3732
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Muller"
 
-#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
-msgstr "En liña só"
+msgstr "Só conectado"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Buscar contactos"
 
-#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
-msgstr "Introduza debaixo o seu criterio de busca"
+msgstr "Introduza abaixo o seu criterio de busca"
 
-#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
-msgstr "Encher os campos."
+msgstr "Encha os campos."
 
-#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
-msgstr "O contrasinal actual é diferente do que especificou."
+msgstr "O seu contrasinal actual é diferente do que especificou."
 
-#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
-msgstr "Non se puido modificar o contrasinal. Produciuse un erro.\n"
+msgstr "Non é posíbel modificar o contrasinal. Produciuse un erro.\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Modificar o contrasinal da conta Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
-msgstr "Modificouse con éxito o contrasinal!"
+msgstr "O contrasinal modificouse con éxito!"
 
-#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Contrasinal actual"
 
-#: ../libpurple/protocols/gg/gg.c:795
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Introduza o seu contrasinal actual e o contrasinal novo para UIN: "
+msgstr "Introduza o seu contrasinal actual e o novo para o UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
-msgstr "Modificar o contrasinal Gadu-Gadu"
+msgstr "Modificar o contrasinal do Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Seleccione unha conversa para o contacto: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879 ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Engadir á conversa..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2031
-#: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5604
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3099 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3104 ../pidgin/gtkblist.c:3436
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1061
-msgid "Offline"
-msgstr "Desconectado"
-
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2033
-#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2816
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
-msgstr "Dispoñible"
+msgstr "Dispoñíbel"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1014 ../libpurple/protocols/irc/irc.c:528
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2037
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4547
-#: ../libpurple/protocols/oscar/oscar.c:5632
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3653
-#: ../libpurple/protocols/yahoo/yahoo.c:3727 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1939
-#: ../pidgin/gtkstatusbox.c:1058
 #, c-format
 msgid "Away"
 msgstr "Ausente"
 
-#: ../libpurple/protocols/gg/gg.c:1043 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2699
-#: ../libpurple/protocols/oscar/oscar.c:3699
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2210
-#: ../libpurple/protocols/jabber/buddy.c:2386
-#: ../libpurple/protocols/oscar/oscar.c:3710
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Nome"
 
-#: ../libpurple/protocols/gg/gg.c:1059 ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
-msgstr "Data de nacemento"
+msgstr "Ano de nacemento"
 
-#: ../libpurple/protocols/gg/gg.c:1111 ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3911
 msgid "Unable to display the search results."
-msgstr "Non se poden mostrar os resultados da busca."
+msgstr "Non é posíbel mostrar os resultados da busca."
 
-#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Directorio público Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Resultados da busca"
 
-#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
-msgstr "Non se atoparon usuarios coincidentes"
+msgstr "Non se encontrou usuarios coincidentes"
 
-#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "Non hai usuarios que coincidan cos seus criterios de busca."
 
-#: ../libpurple/protocols/gg/gg.c:1310 ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
-msgstr "Non se puido ler o conectador "
+msgstr "Non é posíbel ler o conectador"
 
-#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
-msgstr "Lista de contactos descargada"
+msgstr "Descargouse a lista de contactos"
 
-#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
-msgstr "Lista de contactos descargada desde o servidor."
+msgstr "Descargouse súa lista de contactos desde o servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
-msgstr "Lista de contactos subida"
+msgstr "Enviouse a lista de contactos"
 
-#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
-msgstr "Lista de contactos almacenada no servidor."
+msgstr "A súa lista de contactos almacenouse no servidor."
 
-#: ../libpurple/protocols/gg/gg.c:1509 ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Fallou a conexión."
 
-#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/msn/msn.c:559
-msgid "Blocked"
-msgstr "Bloqueado"
-
-#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Engadir á conversa"
 
-#: ../libpurple/protocols/gg/gg.c:1653
-msgid "Unblock"
-msgstr "Desbloquear"
-
-#: ../libpurple/protocols/gg/gg.c:1657
-msgid "Block"
-msgstr "Bloquear"
-
-#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "_Nome da conversa:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Erro da conversa"
 
-#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "O nome desta conversa xa está en uso"
 
-#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
-msgstr "Non conectado ao servidor."
+msgstr "Non está conectado ao servidor."
 
-#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Buscar contactos..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Modificar contrasinal..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
-msgstr "Subir a lista de contactos ao servidor"
+msgstr "Enviar a lista de contactos ao servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Descargar a lista de contactos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
-msgstr "Borrar a lista de contactos do servidor"
+msgstr "Eliminar a lista de contactos do servidor"
 
-#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
-msgstr "Gardar a lista de contactos no ficheiro..."
-
-#: ../libpurple/protocols/gg/gg.c:2049
-msgid "Load buddylist from file..."
-msgstr "Cargar a lista de contactos desde un ficheiro..."
+msgstr "Gardar a lista de contactos nun ficheiro..."
 
 #. magic
 #. major_version
@@ -4001,151 +3196,81 @@ msgstr "Cargar a lista de contactos desde un ficheiro..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Complemento de protocolo Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
-msgstr "Polish popular IM"
+msgstr "MI popular en Polonia"
 
-#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Usuario de Gadu-Gadu"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comando descoñecido: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "o asunto actual é: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
-msgstr "Non hai un asunto establecido"
+msgstr "Non hai un asunto definido"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:287
 msgid "File Transfer Failed"
 msgstr "Fallou a transferencia do ficheiro"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
 msgid "Could not open a listening port."
-msgstr "Non puido abrir un porto de escoita."
+msgstr "Non se puido abrir un porto de escoita."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Erro ao mostrar o MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
-msgstr "Non hai MOTD dispoñible"
+msgstr "Non hai un MOTD dispoñíbel"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
-msgstr "Non hai MOTD asociado con esta conexión."
+msgstr "Non hai un MOTD asociado con esta conexión."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD para %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2356
 msgid "Server has disconnected"
 msgstr "O servidor desconectouse"
 
-#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "Ver MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Canle:"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:524
 msgid "_Password:"
 msgstr "_Contrasinal:"
 
-#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
-msgstr "Os alias de IRC non poden ter espazos en branco"
+msgstr "Os alias de IRC non poden conter espazos en branco"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/myspace/myspace.c:301
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1287
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1716
-#: ../libpurple/protocols/yahoo/yahoo.c:2939
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Conectando"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
 msgid "SSL support unavailable"
-msgstr "Soporte SSL non dispoñible"
-
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:317
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1631
+msgstr "O soporte de SSL non está dispoñíbel"
+
 msgid "Couldn't create socket"
 msgstr "Non se puido crear o conectador "
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2469
-#: ../libpurple/protocols/oscar/oscar.c:1283
 msgid "Couldn't connect to host"
 msgstr "Non se puido conectar ao servidor"
 
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2352
 msgid "Read error"
 msgstr "Erro de lectura"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1412
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Usuarios"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Asunto"
 
@@ -4157,66 +3282,27 @@ msgstr "Asunto"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "Complemento de protocolo IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "Complemento de protocolo IRC menos malo"
+msgstr "O complemento de protocolo IRC menos mao"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/oscar/oscar.c:6671
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1896
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servidor"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2190
-#: ../libpurple/protocols/oscar/oscar.c:6674
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Porto"
 
-#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Codificacións"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
-msgid "Username"
-msgstr "Nome de usuario"
+msgid "Auto-detect incoming UTF-8"
+msgstr "Detectar automaticamente UTF-8 entrante"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Nome real"
 
@@ -4224,232 +3310,191 @@ msgstr "Nome real"
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:960
 msgid "Use SSL"
 msgstr "Usar SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
-msgstr "Modo erróneo"
+msgstr "Modo non válido"
+
+#, c-format
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Expulsado de %s por %s, vai %s segundo(s)"
+
+#, fuzzy, c-format
+msgid "Ban on %s"
+msgstr "Expulsar de %s"
+
+#, fuzzy
+msgid "End of ban list"
+msgstr "Fin da lista de expulsados"
 
-#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
-msgstr "Foi vedado por %s."
+msgstr "Vostede está excluído de %s."
 
-#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
-msgstr "Vedado"
+msgstr "Excluído"
 
-#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
-msgstr "Non se puido vedar a %s: a lista de vedados está chea"
+msgstr "Non se puido excluír a %s: a lista de excluídos está chea"
 
-#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identificado)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3700
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Alias"
 
-#: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1268
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Actualmente en"
 
-#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Inactivo para"
 
-#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Adxetivo que o define:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Glorioso"
 
-#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s cambiou o asunto a: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
-msgstr "%s quitou o asunto."
+msgstr "%s eliminou o asunto."
 
-#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "O asunto de %s é: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Mensaxe descoñecida '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Mensaxe descoñecida"
 
-#: ../libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
-msgstr "O servidor IRC recibiu unha mensaxe que non entendeu."
+msgstr "O servidor de IRC recibiu unha mensaxe que non entendeu."
 
-#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Usuarios en %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Resposta de hora"
 
-#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "A hora local do servidor de IRC é:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Non existe esa canle"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
-msgstr "non existe a canle"
+msgstr "non existe esa canle"
 
-#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "O usuario non está conectado"
 
-#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Non existe o alias ou a canle"
 
-#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Non se puido enviar"
 
-#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Para unirse a %s requírese un convite."
 
-#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Só con convite"
 
-#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Foi expulsado por %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Expulsado por %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modo (%s %s) por %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Alias non válido"
 
-#: ../libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"O servidor rexeitou o alias que escolleu. É posible que inclúa caracteres "
+"O servidor rexeitou o alias que escolleu. É probábel que inclúa caracteres "
 "non válidos."
 
-#: ../libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
 msgstr ""
-"O servidor rexeitou o nome que escolleu para a súa conta. É posible que "
+"O servidor rexeitou o nome que escolleu para a súa conta. É probábel que "
 "inclúa caracteres non válidos."
 
-#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Non se pode cambiar o alias"
 
-#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Non se puido cambiar o alias"
 
-#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
-msgstr "Partiu a canle %s%s"
+msgstr "Vostede saíu da canle %s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
-msgstr "Erro: PONG inválido do servidor"
+msgstr "Erro: PONG non válido do servidor"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "Resposta PING -- Atraso: %lu segundos"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Non se puido unir a %s. O rexistro é necesario."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Non se pode unir á canle"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
-msgstr "O alias ou a canle non están temporalmente dispoñibles."
+msgstr "O alias ou a canle non están dispoñíbeis temporalmente."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Mensaxes de %s"
 
-#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
-msgstr "action &lt;acción a realizar&gt;:  Realiza unha acción."
+msgstr "action &lt;acción que realizar&gt;:  Realiza unha acción."
 
-#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
 msgstr ""
-"away [mensaxe]:  Establece a mensaxe cando está ausente ou non emprega unha "
+"away [mensaxe]:  Establece unha mensaxe de ausencia, ou non emprega ningunha "
 "mensaxe ao deixar de estar ausente."
 
-#: ../libpurple/protocols/irc/parse.c:124
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <nick> <msg>: envía unha mensaxe ctcp ao alias."
+
 msgid "chanserv: Send a command to chanserv"
-msgstr "chanserv: Enviar un comando a chanserv"
+msgstr "chanserv: Enviar un comando ao chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -4457,24 +3502,21 @@ msgstr ""
 "deop &lt;alias1&gt; [alias2] ...:  Quitarlle a alguén o estado de operador "
 "de canle. Só un operador de canle pode facer iso."
 
-#: ../libpurple/protocols/irc/parse.c:126
 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;alias1&gt; [alias2] ...: Silenciar a alguén e impedirllefalar na "
-"canle se está moderada (+m). Só o pode facer un operador de canle."
+"devoice &lt;alias1&gt; [alias2] ...: Silenciar a alguén e impedirlle falar "
+"na canle se está moderada (+m). Só o pode facer un operador de canle."
 
-#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
-"invite &lt;alias&gt; [sala]:  Convida a alguén a se unir á canle "
+"invite &lt;alias&gt; [sala]:  Convidar a alguén a se unir á canle "
 "especificada ou á canle actual."
 
-#: ../libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4482,7 +3524,6 @@ msgstr ""
 "j &lt;sala1&gt;[,sala2][,...] [chave1[,chave2][,...]]:  Entrar nunha ou máis "
 "canles empregando, opcionalmente, unha chave de canle se fose necesaria."
 
-#: ../libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -4490,31 +3531,26 @@ msgstr ""
 "join &lt;sala1&gt;[,sala2][,...] [chave1[,chave2][,...]]:  Entrar nunha ou "
 "máis canles empregando, opcionalmente, unha chave de canle se fose necesaria."
 
-#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
-"kick &lt;alcume&gt; [mensaxe]:  Botar a alguén da canle. Só o poden facer os "
-"operadores de canle."
+"kick &lt;alcume&gt; [mensaxe]:  Expulsar a alguén da canle. Só un operador "
+"de canle pode facer iso."
 
-#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list:  Mostra unha lista das salas de conversa dispoñibles na rede. "
-"<i>Aviso: algúns servidores pode que lle desconecten se fai isto.</i>"
+"list:  Mostra unha lista das salas de conversa dispoñíbeis na rede. "
+"<i>Aviso: algúns servidores pode que o desconecten se fai isto.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;acción para realizar&gt;:  Realizar unha acción."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Enviar un comando ao memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -4522,7 +3558,6 @@ msgstr ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;alias|canle&gt;:  Establece ou elimina un "
 "modo de canle ou de usuario."
 
-#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4530,40 +3565,36 @@ msgstr ""
 "msg &lt;nick&gt; &lt;message&gt;:  Enviarlle unha mensaxe privada a un "
 "usuario (o oposto a unha canle)."
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [canle]:  Obter a lista dos usuarios que están na canle."
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2261
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;novo alias&gt;:  Cambia o seu alias."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Enviar un comando ao nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#, fuzzy
+msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
+msgstr "notice &lt;target&lt;:  Enviar un aviso a un usuario ou canle."
+
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"op &lt;alcume1&gt; [alcume2] ...:  Darlle estado de operador de canle a "
-"outra persoa. Só o pode facer un operador de canle."
+"op &lt;alias1&gt; [alias2] ...:  Concederllo o status de operador de canle a "
+"alguén. Só un operador de canle pode facer iso."
 
-#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
-"operwall &lt;mensaxe&gt;:  Se non sabe o que é probablemente non pode "
+"operwall &lt;mensaxe&gt;:  Se non sabe o que é probabelmente non pode "
 "utilizalo."
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Enviar un comando ao operserv"
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4571,7 +3602,6 @@ msgstr ""
 "part [sala] [mensaxe]:  Abandonar a canle actual, ou unha canle específica, "
 "cunha mensaxe opcional."
 
-#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4579,7 +3609,6 @@ msgstr ""
 "ping [alias]:  Pregunta canto atraso ten un usuario (ou o servidor se non se "
 "especifica un usuario)."
 
-#: ../libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4587,17 +3616,13 @@ msgstr ""
 "query &lt;alias&gt; &lt;mensaxe&gt;:  Envía unha mensaxe privada a un "
 "usuario (o oposto a unha canle)."
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
-"quit [mensaxe]:  Desconecta do servidor actual indicando unha mensaxe "
-"(opcional)."
+"quit [mensaxe]:  Desconéctase do servidor actual cunha mensaxe opcional"
 
-#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
-msgstr "quote [...]:  Enviar un comando ao servidor."
+msgstr "quote [...]:  Enviar un comando en bruto ao servidor."
 
-#: ../libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4605,248 +3630,155 @@ msgstr ""
 "remove &lt;alias&gt; [mensaxe]:  Eliminar a alguén dunha sala. Só pode "
 "facelo un operador de canle."
 
-#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Mostra a hora local no servidor IRC."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [novo tópico]:  Ver ou cambiar o asunto da canle."
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
-"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece ou elimina un modo de usuario."
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Establece ou desfai a configuración dun "
+"modo de usuario."
 
-#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "versión [alias]: enviar solicitude CTCP VERSION ao ususario"
+msgstr "versión [alias]: enviar unha solicitude CTCP VERSION a un ususario"
 
-#: ../libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
-"voice &lt;alias1&gt; [alias2] ...:  Darlle a posibilidade de falar na canle "
-"a alguén. Só o pode facer un operador de canle."
+"voice &lt;alias1&gt; [alias2] ...:  Concederlle a posibilidade de falar na "
+"canle a alguén. Só o pode facer un operador de canle."
 
-#: ../libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 "wallops &lt;mensaxe&gt;:  Se non sabe o que é probablemente non poida usalo."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [server] &lt;nick&gt;:  Obtén información dun usuario."
+msgstr "whois [servidor] &lt;nick&gt;:  Obter información sobre un usuario."
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whowas &lt;nick&gt;: Obtén información dun usuario que se desconectou."
+msgstr ""
+"whowas &lt;nick&gt;: Obter información sobre un usuario que se desconectou."
 
-#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Tempo de resposta de %s: %lu segundos"
 
-#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "Resposta a PING CTCP"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
-#: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Desconectado."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Unknown Error"
 msgstr "Erro descoñecido"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
 #, fuzzy
 msgid "Ad-Hoc Command Failed"
-msgstr "Comando desactivado"
+msgstr "Fallo o comando Ad-Hoc"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:173
 #, fuzzy
 msgid "execute"
-msgstr "Non se agardaba"
+msgstr "executar"
 
-#: ../libpurple/protocols/jabber/auth.c:53
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte "
 "TLS/SSL."
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#, fuzzy
+msgid "You require encryption, but no TLS/SSL support found."
+msgstr ""
+"O servidor require TLS/SSL para iniciar a sesión. Non se dispón de soporte "
+"TLS/SSL."
+
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
-"O servidor solicita autenticación con texto plano sobre unha canle non "
-"cifrada"
+"O servidor require a autenticación con texto plano sobre un fluxo non cifrado"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s require autenticación con texto plano sobre canles non cifradas.  "
-"Permitir isto e continuar coa autenticación?"
+"%s require a autenticación con texto plano sobre unha conexión no cifrada. "
+"Quere permitir isto e continuar coa autenticación?"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
 msgid "Plaintext Authentication"
 msgstr "Autenticación con texto plano"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
-msgid "Server does not use any supported authentication method"
-msgstr "O servidor non usa un método de autenticación coñecido"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
-msgstr "Resposta inválida do servidor."
+msgstr "Resposta non válida do servidor."
 
-#: ../libpurple/protocols/jabber/auth.c:600
-msgid ""
-"This server requires plaintext authentication over an unencrypted "
-"connection.  Allow this and continue authentication?"
-msgstr ""
-"O servidor solicita autenticación con texto sobre unha canle non cifrada. "
-"Quere permitir isto e continuar co proceso de autenticación?"
+msgid "Server does not use any supported authentication method"
+msgstr "O servidor non usa ningún método de autenticación coñecido"
 
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
 msgid "Invalid challenge from server"
-msgstr "Desafío inválido do servidor"
+msgstr "O desafío do servidor non é válido."
 
-#: ../libpurple/protocols/jabber/auth.c:892
 msgid "SASL error"
 msgstr "Erro de SASL"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
-msgstr "Nome completo"
+msgstr "Nome completo:"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Apelidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Nome propio"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Rúa"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
-msgstr "Enderezo estendido"
+msgstr "Enderezo ampliado"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Localidade"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Rexión"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "País"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Teléfono"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Nome da organización"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Grupo de traballo"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Papel"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1658
-#: ../libpurple/protocols/oscar/oscar.c:3749
 msgid "Birthday"
-msgstr "Ano de nacemento"
+msgstr "Aniversario"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:175 ../pidgin/gtkblist.c:3116
-#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Descrición"
 
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
 msgid "Edit XMPP vCard"
 msgstr "Editar vCard de XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:724
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4854,600 +3786,384 @@ msgstr ""
 "Todos os elementos seguintes son opcionais. Introduza só a información coa "
 "que se sinta cómodo."
 
-#: ../libpurple/protocols/jabber/buddy.c:795
-#: ../libpurple/protocols/jabber/buddy.c:960
 msgid "Client"
 msgstr "Cliente"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Sistema operativo"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
-msgstr ""
+msgstr "Última actividade"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
 #, fuzzy
 msgid "Service Discovery Info"
-msgstr "Establecer a información do directorio"
+msgstr "Información de descubrimento de servizo"
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
-msgstr ""
+msgstr "Elementos de descubrimento de servizo"
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
 #, fuzzy
 msgid "Extended Stanza Addressing"
-msgstr "Enderezo estendido"
+msgstr "Envío de parágrafos ampliado"
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
 #, fuzzy
 msgid "Multi-User Chat"
-msgstr "Alias na conversa"
+msgstr "Conversa multiusuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
 #, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "O usuario non ten información no directorio."
+msgstr "Información de presencia ampliada de conversa multiusuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
 msgid "In-Band Bytestreams"
-msgstr ""
+msgstr "Fluxos de bytes In-Band"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
 #, fuzzy
 msgid "Ad-Hoc Commands"
-msgstr "Comando"
+msgstr "Comandos Ad-Hoc"
 
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
 msgid "PubSub Service"
-msgstr ""
+msgstr "Servizo PubSub"
 
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
 msgid "SOCKS5 Bytestreams"
-msgstr ""
+msgstr "Fluxos de bytes SOCKS5"
 
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
-msgstr ""
+msgstr "Datos fóra de banda"
 
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
 #, fuzzy
 msgid "XHTML-IM"
-msgstr "HTML"
+msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
 #, fuzzy
 msgid "In-Band Registration"
-msgstr "Erro de rexistro"
+msgstr "Rexistro In-Band"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
 #, fuzzy
 msgid "User Location"
-msgstr "Localización"
+msgstr "Localización do usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
 #, fuzzy
 msgid "User Avatar"
-msgstr "Busca de usuario"
+msgstr "Avatar de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
 #, fuzzy
 msgid "Chat State Notifications"
-msgstr "Notificación do estado dos contactos"
+msgstr "Notificacións de estado da conversa"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
 #, fuzzy
 msgid "Software Version"
-msgstr "Versión non soportada"
+msgstr "Versión de software"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
 #, fuzzy
 msgid "Stream Initiation"
-msgstr "Orientación"
+msgstr "Inicio de fluxo"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Transferencia de ficheiros"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
 #, fuzzy
 msgid "User Mood"
-msgstr "Modos de usuario"
+msgstr "Estado de ánimo do usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
 #, fuzzy
 msgid "User Activity"
-msgstr "Límite de usuarios"
+msgstr "Actividade do usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
 #, fuzzy
 msgid "Entity Capabilities"
-msgstr "Capacidades"
+msgstr "Capacidades da entidade"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
 msgid "Encrypted Session Negotiations"
-msgstr ""
+msgstr "Negociacións de sesión codificada"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
 #, fuzzy
 msgid "User Tune"
-msgstr "Nome de usuario"
+msgstr "Música do usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
 #, fuzzy
 msgid "Roster Item Exchange"
-msgstr "MI con intercambio de chave"
+msgstr "Intercambio de elementos da lista"
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
 #, fuzzy
 msgid "Reachability Address"
-msgstr "Enderezo de correo electrónico"
+msgstr "Enderezo de contacto"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
 #, fuzzy
 msgid "User Profile"
-msgstr "Perfil"
+msgstr "Perfil de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
 #, fuzzy
 msgid "Jingle"
-msgstr "Unirse"
+msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
-msgstr ""
+msgstr "Jingle Audio"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
 #, fuzzy
 msgid "User Nickname"
-msgstr "Nome de usuario"
+msgstr "Alias do usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
-msgstr ""
+msgstr "Jingle ICE UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
-msgstr ""
+msgstr "Jingle ICE TCP"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle Raw UDP"
-msgstr ""
+msgstr "Jingle UDP en bruto"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
 #, fuzzy
 msgid "Jingle Video"
-msgstr "Vídeo en directo"
+msgstr "Jingle Video"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
-msgstr ""
+msgstr "Jingle DTMF"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
 #, fuzzy
 msgid "Message Receipts"
-msgstr "Mensaxe recibida"
+msgstr "Recibos de mensaxe"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
 #, fuzzy
 msgid "Public Key Publishing"
-msgstr "Babbleprint da chave pública"
+msgstr "Publicación da chave pública"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
 #, fuzzy
 msgid "User Chatting"
-msgstr "Opcións de usuario"
+msgstr "O usuario está conversando"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
 #, fuzzy
 msgid "User Browsing"
-msgstr "Modos de usuario"
+msgstr "O usuario está navegando"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
 #, fuzzy
 msgid "User Gaming"
-msgstr "Nome de usuario"
+msgstr "O usuario está xogando"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
 #, fuzzy
 msgid "User Viewing"
-msgstr "Límite de usuarios"
+msgstr "O usuario está observando"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
 #, fuzzy
 msgid "Stanza Encryption"
-msgstr "Cifraxe Trillian"
+msgstr "Cifrado de parágrafo"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
-msgstr ""
+msgstr "Hora da entidade"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
-msgstr ""
+msgstr "Envío atrasado"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Collaborative Data Objects"
-msgstr ""
+msgstr "Collaborative Data Objects"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "File Repository and Sharing"
-msgstr ""
+msgstr "Repositorio de ficheiros e compartidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
-msgstr ""
+msgstr "Descubrimento de servizo STUN para o Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgstr "Negociación simplificada de sesión cifrada"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
-msgstr ""
+msgstr "Verificación de saltos"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Capabilities"
 msgstr "Capacidades"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../libpurple/protocols/jabber/si.c:859
-msgid "Resource"
-msgstr "Recurso"
-
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Priority"
 msgstr "Prioridade"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
+msgid "Resource"
+msgstr "Recurso"
+
 msgid "Middle Name"
-msgstr "Nome do medio"
-
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3788
-#: ../libpurple/protocols/oscar/oscar.c:3801
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
+msgstr "Segundo nome"
+
 msgid "Address"
 msgstr "Enderezo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
-msgstr "Código postal"
+msgstr "Apartado de correos"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1942
 msgid "Un-hide From"
 msgstr "Non ocultarse de"
 
-#: ../libpurple/protocols/jabber/buddy.c:1946
 msgid "Temporarily Hide From"
 msgstr "Ocultarse temporalmente de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1954
 msgid "Cancel Presence Notification"
 msgstr "Cancelar a notificación de presenza"
 
-#: ../libpurple/protocols/jabber/buddy.c:1961
 msgid "(Re-)Request authorization"
 msgstr "(Volver a) pedir autorización"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Unsubscribe"
-msgstr "De-subscribir"
+msgstr "Eliminar subscrición"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
 #, fuzzy
 msgid "Log In"
-msgstr "Xa está conectado"
+msgstr "Iniciar a sesión"
 
-#: ../libpurple/protocols/jabber/buddy.c:1989
 #, fuzzy
 msgid "Log Out"
-msgstr "Rexistrar as conversas"
+msgstr "Terminar a sesión"
 
-#: ../libpurple/protocols/jabber/buddy.c:2035
-#: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Falador"
 
-#: ../libpurple/protocols/jabber/buddy.c:2039
 msgid "Extended Away"
 msgstr "Ausencia estendida"
 
-#: ../libpurple/protocols/jabber/buddy.c:2041
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5808
-#: ../libpurple/protocols/sametime/sametime.c:3297
 #, c-format
 msgid "Do Not Disturb"
 msgstr "Non molestar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2208
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2212
-#: ../libpurple/protocols/jabber/buddy.c:2391
-#: ../libpurple/protocols/oscar/oscar.c:3711
 msgid "Last Name"
 msgstr "Apelidos"
 
-#: ../libpurple/protocols/jabber/buddy.c:2244
 msgid "The following are the results of your search"
 msgstr "Os resultados da súa busca son os seguintes"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2319
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
-"Localizar un contacto introducindo os criterios de busca nos seguintes "
-"campos. Nota: cada campo admitecomodíns (%)"
+"Localizar un contacto introducindo os criterios de busca nos campos "
+"indicados. Nota: cada campo admite buscas con comodíns (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:2339
 msgid "Directory Query Failed"
-msgstr "Fallou o directorio de consultas"
+msgstr "Fallou a consulta de directorio"
 
-#: ../libpurple/protocols/jabber/buddy.c:2340
 msgid "Could not query the directory server."
-msgstr "Non se puido procurar no servidor de directorio."
+msgstr "Non se puido consultar o servidor de directorio."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2374
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instrucións do servidor: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2381
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
-"Encher nun ou máis campos para buscar usuarios XMPP que poidan coincidir."
+"Encher un ou máis campos para buscar usuarios XMPP que poidan coincidir."
 
-#: ../libpurple/protocols/jabber/buddy.c:2401
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/oscar/oscar.c:3723
 msgid "Email Address"
 msgstr "Enderezo de correo electrónico"
 
-#: ../libpurple/protocols/jabber/buddy.c:2410
-#: ../libpurple/protocols/jabber/buddy.c:2411
 msgid "Search for XMPP users"
 msgstr "Localizar usuarios XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2412
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2427
 msgid "Invalid Directory"
-msgstr "Directorio inválido"
+msgstr "Directorio non válido"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
 msgid "Enter a User Directory"
 msgstr "Introducir un directorio de usuario"
 
-#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Select a user directory to search"
 msgstr "Seleccione un directorio de usuario para buscar"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Search Directory"
 msgstr "Buscar directorio"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5294
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Sala:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
-msgstr "_Identificador:"
+msgstr "_Manipulador:"
 
-#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s non é un nome de sala válido"
 
-#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Nome de sala non válido"
 
-#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s non é un nome de servidor válido"
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Nome de servidor non válido"
 
-#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s non é un indentificador de sala válido"
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
-msgstr "Idetificador de sala non válido"
+msgstr "Identificador de sala non válido"
 
-#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Erro de configuración"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
-msgstr "Non se puido configurar"
+msgstr "Non é posíbel configurar"
 
-#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Erro de configuración de sala"
 
-#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Esta sala non se pode configurar"
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Erro de rexistro"
 
-#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "O cambio de alias non está admitido en salas de conversa non-MUC"
 
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Erro ao obter a lista de salas"
 
-#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Servidor non válido"
 
-#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Introduza un servidor de conferencias"
 
-#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Seleccione un servidor de conferencias ao que consultar"
 
-#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Buscar salas"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "Erro ao inicializar a sesión"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
 msgid "You require encryption, but it is not available on this server."
 msgstr ""
+"Vostede solicitou a codificación, mais non está dispoñíbel neste servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
 msgid "Write error"
 msgstr "Erro de escritura"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#, fuzzy
+msgid "Ping timeout"
+msgstr "Excedeuse o tempo de espera do ping"
+
 msgid "Read Error"
 msgstr "Erro de lectura"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/protocols/yahoo/yahoo.c:2558
-#: ../libpurple/protocols/yahoo/yahoo.c:2590
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5456,668 +4172,467 @@ msgstr ""
 "Non se puido establecer unha conexión co servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
 msgid "Unable to create socket"
-msgstr "Non se puido crear o conectador "
+msgstr "Non é posíbel crear o conectador"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
 msgid "Invalid XMPP ID"
 msgstr "ID de XMPP non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
 msgid "Invalid XMPP ID. Domain must be set."
-msgstr "ID de XMPP non válido. Debe establecerse o dominio."
+msgstr "ID de XMPP non válido. Débese definir o dominio."
 
-#: ../libpurple/protocols/jabber/jabber.c:656
 #, c-format
 msgid "Registration of %s@%s successful"
-msgstr "Rexistro de %s@%s con éxito"
+msgstr "Rexistro de %s@%s efectuado con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
 #, fuzzy, c-format
 msgid "Registration to %s successful"
-msgstr "Rexistro de %s@%s con éxito"
+msgstr "Rexistro de %s@%s efectuado con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
 msgid "Registration Successful"
-msgstr "Éxito no rexistro"
+msgstr "O rexistro efectuouse con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
 msgid "Registration Failed"
 msgstr "Fallou o rexistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
 #, fuzzy, c-format
 msgid "Registration from %s successfully removed"
-msgstr "Rexistro de %s@%s con éxito"
+msgstr "O rexistro de %s@%s eliminouse con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
 #, fuzzy
 msgid "Unregistration Successful"
-msgstr "Éxito no rexistro"
+msgstr "O rexistro cancelouse con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
 #, fuzzy
 msgid "Unregistration Failed"
-msgstr "Fallou o rexistro"
+msgstr "Fallou a cancelación do rexistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
 msgid "Already Registered"
 msgstr "Xa está rexistrado"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3790
-#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "State"
 msgstr "Estado"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
 msgid "Postal code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
 msgid "Date"
 msgstr "Data"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
 #, fuzzy
 msgid "Unregister"
-msgstr "Rexistrar"
+msgstr "Cancelar o rexistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
 #, fuzzy
 msgid ""
 "Please fill out the information below to change your account registration."
-msgstr "Cubre a información que se indica abaixo para rexistrar a nova conta."
+msgstr ""
+"Encha a información que se indica abaixo para modificar o seu rexistro de "
+"conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
-msgstr "Cubre a información que se indica abaixo para rexistrar a nova conta."
+msgstr ""
+"Encha a información que se indica abaixo para rexistrar a súa nova conta."
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "Register New XMPP Account"
 msgstr "Rexistrar unha nova conta XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Register"
 msgstr "Rexistrar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
 #, fuzzy, c-format
 msgid "Change Account Registration at %s"
-msgstr "Modificar a información do usuario %s"
+msgstr "Modificar o rexistro de conta en %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
 #, fuzzy, c-format
 msgid "Register New Account at %s"
-msgstr "Rexistrar unha nova conta XMPP"
+msgstr "Rexistrar unha nova conta en %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
 #, fuzzy
 msgid "Change Registration"
-msgstr "Cambiar o estado a"
+msgstr "Modificar rexistro"
 
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
 #, fuzzy
 msgid "Error unregistering account"
-msgstr "Erro ao cambiar a información da conta"
+msgstr "Erro ao cancelar o rexistro de conta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
 #, fuzzy
 msgid "Account successfully unregistered"
-msgstr "Creou con éxito un Qun "
+msgstr "O rexistro cancelouse con éxito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
 msgstr "Inicializando fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
 #, fuzzy
 msgid "Initializing SSL/TLS"
-msgstr "Inicializando fluxo"
+msgstr "Inicializando SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
-msgstr "Autenticando"
+msgstr "Autentificación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Re-initializing Stream"
-msgstr "Reinicializando fluxo"
-
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5602
+msgstr "Reinicializando  o fluxo"
+
 msgid "Not Authorized"
 msgstr "Non autorizado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "Both"
 msgstr "Ambos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "From (To pending)"
 msgstr "Desde (Destino pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
 msgid "From"
 msgstr "De"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
 msgid "To"
-msgstr "A"
+msgstr "Para"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "None (To pending)"
 msgstr "Ninguén (Destino pendente)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
-msgstr "Ningún"
+msgstr "Ninguén"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Subscription"
 msgstr "Subscrición"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:166
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Estado de ánimo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Now Listening"
+msgstr "Escoitando agora"
+
 #, fuzzy
 msgid "Mood Text"
-msgstr "Tipo de sangue"
+msgstr "Texto de estado de ánimo"
+
+#, fuzzy
+msgid "Allow Buzz"
+msgstr "Permitir zumbidos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
 #, fuzzy
 msgid "Tune Artist"
-msgstr "Artistas"
+msgstr "Artista da canción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
 #, fuzzy
 msgid "Tune Title"
-msgstr "Título"
+msgstr "Título da canción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
 msgid "Tune Album"
-msgstr ""
+msgstr "Álbume da canción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
 msgid "Tune Genre"
-msgstr ""
+msgstr "Xénero da canción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
 #, fuzzy
 msgid "Tune Comment"
-msgstr "Comentario de contacto"
+msgstr "Comentario da canción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
 msgid "Tune Track"
-msgstr ""
+msgstr "Pista da canción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
 msgid "Tune Time"
-msgstr ""
+msgstr "Tempo da canción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
 msgid "Tune Year"
-msgstr ""
+msgstr "Ano da canción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
 msgid "Tune URL"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-#, fuzzy
-msgid "Allow Buzz"
-msgstr "Permitir"
+msgstr "URL da canción"
 
-#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr "Contrasinal modificado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
-msgstr "O contrasinal foi modificado."
+msgstr "Modificouse o seu contrasinal."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Error changing password"
-msgstr "Erro ao cambiar o contrasinal"
+msgstr "Erro ao modificar o contrasinal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Password (again)"
 msgstr "Contrasinal (de novo)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Change XMPP Password"
-msgstr "Cambiar contrasinal XMPP"
+msgstr "Cambiar o contrasinal de XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
-msgstr "Introduza o novo contrasinal"
+msgstr "Introduza o seu novo contrasinal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6388
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
-msgstr "Establecer a información de usuario..."
+msgstr "Definir a información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6399
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Modificar o contrasinal..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Search for Users..."
-msgstr "Localizar usuarios..."
+msgstr "Buscar usuarios..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Bad Request"
-msgstr "Solicitude errónea"
+msgstr "A solicitude non é válida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Conflict"
 msgstr "Conflito"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Feature Not Implemented"
-msgstr "Funcionalidade non implementada"
+msgstr "A funcionalidade non está implementada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Forbidden"
 msgstr "Prohibido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Gone"
-msgstr "Desapareceu"
+msgstr "Saíu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Internal Server Error"
 msgstr "Erro interno do servidor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Item Not Found"
-msgstr "Elemento non atopado"
+msgstr "Non se encontrou o elemento"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Malformed XMPP ID"
-msgstr "ID de XMPP inválido"
+msgstr "ID de XMPP malformado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Not Acceptable"
-msgstr "Non aceptable"
+msgstr "Non aceptábel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Not Allowed"
 msgstr "Non permitido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Payment Required"
-msgstr "Pagamento necesario"
+msgstr "Pagamento requirido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Recipient Unavailable"
-msgstr "Destinatario non dispoñible"
+msgstr "Destinatario non dispoñíbel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Registration Required"
-msgstr "Rexistro necesario"
+msgstr "Rexistro requirido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Remote Server Not Found"
-msgstr "Non se atopou o servidor remoto"
+msgstr "Non se encontrou o servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Remote Server Timeout"
-msgstr "Tempo de espera do servidor remoto"
+msgstr "Excedeuse o tempo de espera do servidor remoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Server Overloaded"
 msgstr "Servidor sobrecargado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Service Unavailable"
-msgstr "Servizo non dispoñible"
+msgstr "Servizo non dispoñíbel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Subscription Required"
-msgstr "Subscrición necesaria"
+msgstr "Subscrición requirida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
 msgid "Unexpected Request"
-msgstr "Solicitude non esperada"
+msgstr "Solicitude inesperada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authorization Aborted"
-msgstr "Autorización interrumpida"
+msgstr "Autorización interrompida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Incorrect encoding in authorization"
 msgstr "Codificación incorrecta na autorización"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Invalid authzid"
 msgstr "Authzid non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Invalid Authorization Mechanism"
 msgstr "Mecanismo de autorización non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Authorization mechanism too weak"
-msgstr "Mecanismo de autorización demasiado feble"
+msgstr "O mecanismo de autenticación é demasiado débil"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Temporary Authentication Failure"
-msgstr "Fallo temporal da autenticación"
+msgstr "Fallo temporal de autenticación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Authentication Failure"
 msgstr "Fallo de autenticación"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Bad Format"
-msgstr "Formato erróneo"
+msgstr "Formato non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Bad Namespace Prefix"
-msgstr "Prefixo do espazo de nomes erróneo"
+msgstr "O prefixo do espazo de nomes non é válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Resource Conflict"
 msgstr "Conflito de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:244
-#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
-msgstr "Tempo de espera da conexión"
+msgstr "Tempo de espera da conexión excedido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Host Gone"
-msgstr "Servidor desaparecido"
+msgstr "Host perdido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Host Unknown"
-msgstr "Servidor descoñecido"
+msgstr "Host descoñecido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Improper Addressing"
 msgstr "Direccionamento incorrecto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Invalid ID"
 msgstr "ID non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Invalid Namespace"
 msgstr "Espazo de nomes non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Invalid XML"
 msgstr "XML non válido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Non-matching Hosts"
-msgstr "Non existen servidores coincidentes"
+msgstr "Non existen hosts coincidentes"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Policy Violation"
 msgstr "Violación da política"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Remote Connection Failed"
 msgstr "Fallou a conexión remota"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Resource Constraint"
 msgstr "Restrición de recursos"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
 msgid "Restricted XML"
 msgstr "XML restrinxido"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "See Other Host"
-msgstr "Ver outros servidores"
+msgstr "Ver outros host"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "System Shutdown"
-msgstr "Parada do sistema"
+msgstr "Peche do sistema"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Undefined Condition"
 msgstr "Condición non definida"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Unsupported Encoding"
 msgstr "Codificación non soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Unsupported Stanza Type"
-msgstr "Tipo de estrofa non soportada"
+msgstr "Tipo de parágrafo non soportado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Unsupported Version"
 msgstr "Versión non soportada"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "XML Not Well Formed"
-msgstr "XML mal formado"
+msgstr "XML incorrectamente formado"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Stream Error"
 msgstr "Erro de fluxo"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "Non puido vedar o usuario %s"
+msgstr "Non puido excluír o usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Afiliación descoñecida: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Non se puido afiliar o usuario %s como \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Papel descoñecido: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Non se puido establecer o papel \"%s\" para o usuario: %s"
+msgstr "Non é posíbel definir o papel \"%s\" para o usuario: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "Non puido expulsar o usuario %s"
+msgstr "Non é posíbel expulsar o usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
 #, fuzzy, c-format
 msgid "Unable to ping user %s"
-msgstr "Non puido vedar o usuario %s"
+msgstr "Non é posíbel facer ping ao usuario %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2207
-#: ../libpurple/protocols/jabber/jabber.c:2217
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr ""
+"Non é posíbel enviar un zunido porque non se coñece nada do usuario %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2213
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
+"Non é posíbel enviar un zunido porque pode que o usuario %s estea "
+"desconectado."
 
-#: ../libpurple/protocols/jabber/jabber.c:2239
 #, fuzzy, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr ""
-"Non se puido enviar o ficheiro %s, o usuario non soporta transferencias de "
-"ficheiros"
+msgstr "Non é posíbel enviar un zunido porque o usuario %s non o soporta."
+
+#. Yahoo only supports one attention command: the 'buzz'.
+#. This is index number YAHOO_BUZZ.
+msgid "Buzz"
+msgstr "Zunido"
+
+#, fuzzy, c-format
+msgid "%s has buzzed you!"
+msgstr "%s envioulle un zunido!"
+
+#, c-format
+msgid "Buzzing %s..."
+msgstr "Enviando un zunido a %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2253
 msgid "config:  Configure a chat room."
-msgstr "config:  Configurar unha sala de conversa."
+msgstr "config: Configurar unha sala de conversa."
 
-#: ../libpurple/protocols/jabber/jabber.c:2257
 msgid "configure:  Configure a chat room."
-msgstr "configure:  Configurar unha sala de conversa."
+msgstr "configure: Configurar unha sala de conversa."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
 msgid "part [room]:  Leave the room."
-msgstr "part [sala]:  Abandonar a sala."
+msgstr "part [sala]: Abandonar a sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2271
 msgid "register:  Register with a chat room."
 msgstr "register: Rexistrarse nunha sala de conversa."
 
-#: ../libpurple/protocols/jabber/jabber.c:2277
 msgid "topic [new topic]:  View or change the topic."
-msgstr "topic [novo asunto]:  Ver ou cambiar o asunto."
+msgstr "topic [novo asunto]: Ver ou cambiar o asunto."
 
-#: ../libpurple/protocols/jabber/jabber.c:2283
-msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
-msgstr "ban &lt;usuario&gt; [sala]:  Vedar un usuario da sala."
+#, fuzzy
+msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
+msgstr "ban &lt;usuario&gt; [sala]: Excluír un usuario da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2289
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
-"affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: "
-"Establecer a afiliación dun usuario coa sala."
+"affiliate &lt;usuario&gt; &lt;owner|admin|member|outcast|none&gt;: Definir a "
+"afiliación dun usuario coa sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2295
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
-"role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Establecer "
-"o papel dun usuario na sala."
+"role &lt;usuario&gt; &lt;moderator|participant|visitor|none&gt;: Definir o "
+"papel dun usuario na sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2301
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;usuario&gt; [mensaxe]:  Convidar un usuario á sala."
+msgstr "invite &lt;usuario&gt; [mensaxe]: Convidar un usuario á sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2307
-msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
+#, fuzzy
+msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
 msgstr ""
-"join: &lt;sala&gt; [servidor]:  Unirse a unha sala no servidor indicado."
+"join: &lt;sala&gt; [contrasinal]: Unirse a unha conversa neste servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:2313
-msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
-msgstr "kick &lt;usuario&gt; [sala]:  Botar un usuario da sala."
+#, fuzzy
+msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
+msgstr "kick &lt;usuario&gt; [sala]:  Expulsar un usuario da sala."
 
-#: ../libpurple/protocols/jabber/jabber.c:2318
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
-"msg &lt;usuario&gt; &lt;mensaxe&gt;:  Enviarlle unha mensaxe privada a un "
+"msg &lt;usuario&gt; &lt;mensaxe&gt;:  Enviar unha mensaxe privada a outro "
 "usuario."
 
-#: ../libpurple/protocols/jabber/jabber.c:2324
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr ""
+"ping &lt;jid&gt;:\tFacerlle un ping a un usuario, compoñente ou servidor."
 
-#: ../libpurple/protocols/jabber/jabber.c:2329
-#: ../libpurple/protocols/yahoo/yahoo.c:4145
 msgid "buzz: Buzz a user to get their attention"
-msgstr "buzz: Avisar a un contacto para chamar a súa atención"
+msgstr "buzz: Enviarlle un zunido a un usuario para chamar a súa atención"
 
 #. *< type
 #. *< ui_requirement
@@ -6129,98 +4644,71 @@ msgstr "buzz: Avisar a un contacto para chamar a súa atención"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
 msgstr "Complemento de protocolo XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:202 ../pidgin/gtkaccount.c:506
 msgid "Domain"
 msgstr "Dominio"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
 msgid "Require SSL/TLS"
-msgstr ""
+msgstr "Require SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
-msgstr "Forzar SSL antigo (porto 5223)"
+msgstr "Forzar o SSL antigo (porto 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
-msgstr "Permitir autenticación con texto plano sobre as canles non cifradas"
+msgstr "Permitir a autenticación con texto plano sobre as canles non cifradas"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3277
-#: ../libpurple/protocols/simple/simple.c:1902
 msgid "Connect port"
 msgstr "Conectar co porto"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3274
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Conectar co servidor"
 
-#: ../libpurple/protocols/jabber/message.c:106
+#, fuzzy
+msgid "File transfer proxies"
+msgstr "Proxies de transferencia de ficheiros"
+
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s saíu da conversa."
 
-#: ../libpurple/protocols/jabber/message.c:161
 #, c-format
 msgid "Message from %s"
 msgstr "Mensaxe de %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s cambiou o asunto a: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
 #, c-format
 msgid "The topic is: %s"
 msgstr "O asunto é: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Fallou o envío da mensaxe a %s: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
 msgid "XMPP Message Error"
 msgstr "Mensaxe de erro de XMPP"
 
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4120
 #, fuzzy, c-format
-msgid "%s has buzzed you!"
-msgstr "%s conectouse."
-
-#: ../libpurple/protocols/jabber/message.c:407
-#, c-format
-msgid " (Code %s)"
+msgid "(Code %s)"
 msgstr " (Código %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
-msgstr "Erro de tratamento XML"
+msgstr "Erro de análise de XML"
 
-#: ../libpurple/protocols/jabber/presence.c:427
 msgid "Unknown Error in presence"
-msgstr "Erro descoñecido en presenza"
+msgstr "Erro descoñecido na presenza"
 
-#: ../libpurple/protocols/jabber/presence.c:508
-#: ../libpurple/protocols/jabber/presence.c:509
 msgid "Create New Room"
 msgstr "Crear unha sala nova"
 
-#: ../libpurple/protocols/jabber/presence.c:510
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6228,806 +4716,640 @@ msgstr ""
 "Vai crear unha sala nova. Desexa configurala ou aceptar os valores "
 "predeterminados?"
 
-#: ../libpurple/protocols/jabber/presence.c:516
 msgid "_Configure Room"
 msgstr "_Configurar a sala"
 
-#: ../libpurple/protocols/jabber/presence.c:517
 msgid "_Accept Defaults"
 msgstr "_Aceptar os valores predeterminados"
 
-#: ../libpurple/protocols/jabber/presence.c:559
-#, c-format
-msgid "Error in chat %s"
-msgstr "Erro na conversa %s"
-
-#: ../libpurple/protocols/jabber/presence.c:563
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Erro ao unirse á conversa %s"
 
-#: ../libpurple/protocols/jabber/si.c:775
+#, c-format
+msgid "Error in chat %s"
+msgstr "Erro na conversa %s"
+
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
-"Non se puido enviar o ficheiro %s, o usuario non soporta transferencias de "
-"ficheiros"
+"Non se puido enviar o ficheiro a %s, o usuario non soporta a transferencia "
+"de ficheiros"
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Fallou o envío do ficheiro"
 
-#: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Non se puido enviar o ficheiro a %s, JID inválido"
+msgstr "Non se puido enviar o ficheiro a %s, JID non válido"
 
-#: ../libpurple/protocols/jabber/si.c:840
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Non se puido enviar o ficheiro a %s, o usuario non está conectado"
 
-#: ../libpurple/protocols/jabber/si.c:842
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr ""
 "Non se puido enviar o ficheiro a %s, non está subscrito á presenza do usuario"
 
-#: ../libpurple/protocols/jabber/si.c:857
-#, c-format
-msgid "Please select which resource of %s you would like to send a file to"
+#, fuzzy, c-format
+msgid "Please select the resource of %s to which you would like to send a file"
 msgstr "Seleccione o recurso de %s ao que quere enviar o ficheiro"
 
-#: ../libpurple/protocols/jabber/si.c:873
 msgid "Select a Resource"
-msgstr "Seleccione o recurso"
+msgstr "Seleccione un recurso"
 
-#: ../libpurple/protocols/jabber/usermood.c:179
-#: ../libpurple/protocols/jabber/usermood.c:180
 #, fuzzy
 msgid "Edit User Mood"
-msgstr "Modos de usuario"
+msgstr "Editar o estado de ánimo de usuario"
 
-#: ../libpurple/protocols/jabber/usermood.c:181
 msgid "Please select your mood from the list."
-msgstr ""
+msgstr "Seleccione o seu estado de ánimo da lista."
 
-#: ../libpurple/protocols/jabber/usermood.c:183
-#: ../libpurple/protocols/jabber/usernick.c:78
 #, fuzzy
 msgid "Set"
-msgstr "_Establecer"
+msgstr "Definir"
 
-#: ../libpurple/protocols/jabber/usermood.c:191
 #, fuzzy
 msgid "Set Mood..."
-msgstr "Enviar MI..."
+msgstr "Definir o estado de ánimo..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 #, fuzzy
 msgid "Set User Nickname"
-msgstr "Establecer un límite de usuarios"
+msgstr "Definir o alias do usuario"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 #, fuzzy
 msgid "Please specify a new nickname for you."
-msgstr "Introduza o novo nome para %s"
+msgstr "Especifique un novo alias para vostede."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
 msgid ""
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
+"Esta información é visíbel para todos os contactos da súa lista de "
+"contactos, así que escolla algo apropiado."
 
-#: ../libpurple/protocols/jabber/usernick.c:99
 #, fuzzy
 msgid "Set Nickname..."
-msgstr "Alias"
+msgstr "Definir o alias..."
 
-#: ../libpurple/protocols/jabber/xdata.c:378
 #, fuzzy
 msgid "Actions"
-msgstr "Acción"
+msgstr "Accións"
 
-#: ../libpurple/protocols/jabber/xdata.c:380
 #, fuzzy
 msgid "Select an action"
-msgstr "Seleccionar un ficheiro"
+msgstr "Seleccionar unha acción"
+
+#, fuzzy
+msgid "Unable to retrieve MSN Address Book"
+msgstr "Non é posíbel obter a axenda de enderezos do MSN"
 
-#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problema de sincronización da lista de contactos en %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
 "%s está na lista local dentro do grupo \"%s\" mais non na lista do servidor. "
-"Desexa engadir este contacto?"
+"Quere engadir este contacto?"
 
-#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
-"%s está na lista local mais non está na lista do servidor. Desexa engadir "
+"%s está na lista local mais non está na lista do servidor. Quere engadir "
 "este contacto?"
 
-#: ../libpurple/protocols/msn/error.c:36
 #, c-format
 msgid "Unable to parse message"
-msgstr "Non se puido interpretar a mensaxe"
+msgstr "Non se puido analizar a mensaxe"
 
-#: ../libpurple/protocols/msn/error.c:41
 #, c-format
 msgid "Syntax Error (probably a client bug)"
-msgstr "Erro de sintaxe (probablemente é un erro do cliente)"
+msgstr "Erro de sintaxe (probabelmente é un erro do cliente)"
 
-#: ../libpurple/protocols/msn/error.c:46
 #, c-format
 msgid "Invalid email address"
-msgstr "Enderezo de correo electrónico non válido"
+msgstr "O enderezo de correo electrónico non é válido"
 
-#: ../libpurple/protocols/msn/error.c:49
 #, c-format
 msgid "User does not exist"
 msgstr "O usuario non existe"
 
-#: ../libpurple/protocols/msn/error.c:53
 #, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Falta un nome de dominio totalmente cualificado"
 
-#: ../libpurple/protocols/msn/error.c:56
 #, c-format
 msgid "Already logged in"
-msgstr "Xa está conectado"
+msgstr "Sesión xa iniciada"
 
-#: ../libpurple/protocols/msn/error.c:59
-#, c-format
-msgid "Invalid screen name"
-msgstr "Nome de usuario incorrecto"
+#, fuzzy, c-format
+msgid "Invalid username"
+msgstr "Nome de usuario non válido"
 
-#: ../libpurple/protocols/msn/error.c:62
 #, c-format
 msgid "Invalid friendly name"
 msgstr "Nome de contacto incorrecto"
 
-#: ../libpurple/protocols/msn/error.c:65
 #, c-format
 msgid "List full"
 msgstr "Lista chea"
 
-#: ../libpurple/protocols/msn/error.c:68
 #, c-format
 msgid "Already there"
 msgstr "Xa está na lista"
 
-#: ../libpurple/protocols/msn/error.c:72
 #, c-format
 msgid "Not on list"
 msgstr "Non está na lista"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "User is offline"
 msgstr "O usuario está desconectado"
 
-#: ../libpurple/protocols/msn/error.c:78
 #, c-format
 msgid "Already in the mode"
 msgstr "Xa está nese modo"
 
-#: ../libpurple/protocols/msn/error.c:82
 #, c-format
 msgid "Already in opposite list"
 msgstr "Xa está na lista contraria"
 
-#: ../libpurple/protocols/msn/error.c:86
 #, c-format
 msgid "Too many groups"
 msgstr "Demasiados grupos"
 
-#: ../libpurple/protocols/msn/error.c:89
 #, c-format
 msgid "Invalid group"
-msgstr "Grupo incorrecto"
+msgstr "Grupo non válido"
 
-#: ../libpurple/protocols/msn/error.c:92
 #, c-format
 msgid "User not in group"
 msgstr "O usuario non está no grupo"
 
-#: ../libpurple/protocols/msn/error.c:95
 #, c-format
 msgid "Group name too long"
-msgstr "Nome de grupo demasiado longo"
+msgstr "O nome de grupo é demasiado longo"
 
-#: ../libpurple/protocols/msn/error.c:98
 #, c-format
 msgid "Cannot remove group zero"
 msgstr "Non se pode eliminar o grupo cero"
 
-#: ../libpurple/protocols/msn/error.c:103
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Intentou engadir un contacto a un grupo que non existe"
 
-#: ../libpurple/protocols/msn/error.c:107
 #, c-format
 msgid "Switchboard failed"
-msgstr "Fallou o servidor centraliña"
+msgstr "Fallou o servidor switchboard"
 
-#: ../libpurple/protocols/msn/error.c:111
 #, c-format
 msgid "Notify transfer failed"
 msgstr "Fallou a notificación da transferencia"
 
-#: ../libpurple/protocols/msn/error.c:116
 #, c-format
 msgid "Required fields missing"
-msgstr "Faltan campos obrigatorios"
+msgstr "Faltan campos requiridos"
 
-#: ../libpurple/protocols/msn/error.c:120
 #, c-format
 msgid "Too many hits to a FND"
 msgstr "Demasiados resultados dun FND"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
 #, c-format
 msgid "Not logged in"
 msgstr "Non iniciou a sesión"
 
-#: ../libpurple/protocols/msn/error.c:128
 #, c-format
 msgid "Service temporarily unavailable"
-msgstr "Servizo non dispoñible temporalmente"
+msgstr "Servizo non dispoñíbel temporalmente"
 
-#: ../libpurple/protocols/msn/error.c:131
 #, c-format
 msgid "Database server error"
 msgstr "Erro do servidor de base de datos"
 
-#: ../libpurple/protocols/msn/error.c:135
 #, c-format
 msgid "Command disabled"
 msgstr "Comando desactivado"
 
-#: ../libpurple/protocols/msn/error.c:139
 #, c-format
 msgid "File operation error"
 msgstr "Erro de operación de ficheiros"
 
-#: ../libpurple/protocols/msn/error.c:143
 #, c-format
 msgid "Memory allocation error"
-msgstr "Erro ao asignar memoria"
+msgstr "Erro de asignación de memoria"
 
-#: ../libpurple/protocols/msn/error.c:147
 #, c-format
 msgid "Wrong CHL value sent to server"
-msgstr "Valor CHL erróneo enviado ao servidor"
+msgstr "Enviouse un valor CHL erróneo ao servidor"
 
-#: ../libpurple/protocols/msn/error.c:152
 #, c-format
 msgid "Server busy"
 msgstr "Servidor ocupado"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
 #, c-format
 msgid "Server unavailable"
-msgstr "Servidor non dispoñible"
+msgstr "Servidor non dispoñíbel"
 
-#: ../libpurple/protocols/msn/error.c:158
 #, c-format
 msgid "Peer notification server down"
 msgstr "Servidor de notificación de pares caído"
 
-#: ../libpurple/protocols/msn/error.c:162
 #, c-format
 msgid "Database connect error"
 msgstr "Erro de conexión coa base de datos"
 
-#: ../libpurple/protocols/msn/error.c:167
 #, c-format
 msgid "Server is going down (abandon ship)"
-msgstr "O servidor está apagándose (abandoen o barco!)"
+msgstr "O servidor está apagándose (abandonen o barco!)"
 
-#: ../libpurple/protocols/msn/error.c:174
 #, c-format
 msgid "Error creating connection"
 msgstr "Erro ao crear a conexión"
 
-#: ../libpurple/protocols/msn/error.c:179
 #, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "Os parámetros CVR non se coñecen ou non están permitidos"
 
-#: ../libpurple/protocols/msn/error.c:183
 #, c-format
 msgid "Unable to write"
-msgstr "Non se puido escribir"
+msgstr "Non é posíbel escribir"
 
-#: ../libpurple/protocols/msn/error.c:186
 #, c-format
 msgid "Session overload"
 msgstr "Sesión sobrecargada"
 
-#: ../libpurple/protocols/msn/error.c:190
 #, c-format
 msgid "User is too active"
 msgstr "O usuario está demasiado activo"
 
-#: ../libpurple/protocols/msn/error.c:193
 #, c-format
 msgid "Too many sessions"
 msgstr "Demasiadas sesións"
 
-#: ../libpurple/protocols/msn/error.c:196
 #, c-format
 msgid "Passport not verified"
 msgstr "Pasaporte non verificado"
 
-#: ../libpurple/protocols/msn/error.c:199
 #, c-format
 msgid "Bad friend file"
 msgstr "Ficheiro de contactos incorrecto"
 
-#: ../libpurple/protocols/msn/error.c:203
 #, c-format
 msgid "Not expected"
 msgstr "Non se agardaba"
 
-#: ../libpurple/protocols/msn/error.c:209
 #, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Os nomes dos contactos cambian demasiado rápido"
 
-#: ../libpurple/protocols/msn/error.c:218
 #, c-format
 msgid "Server too busy"
-msgstr "Servidor moi ocupado"
+msgstr "Servidor demasiado ocupado"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1380
-#: ../libpurple/protocols/silc/silc.c:233
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1380
 #, c-format
 msgid "Authentication failed"
 msgstr "Fallou a autenticación"
 
-#: ../libpurple/protocols/msn/error.c:225
 #, c-format
 msgid "Not allowed when offline"
 msgstr "Non pode mandar mensaxes se está desconectado"
 
-#: ../libpurple/protocols/msn/error.c:233
 #, c-format
 msgid "Not accepting new users"
-msgstr "Non se aceptan usuarios novos"
+msgstr "Non se aceptan novos usuarios"
 
-#: ../libpurple/protocols/msn/error.c:237
 #, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Pasaporte de menores sen consentimento paterno"
 
-#: ../libpurple/protocols/msn/error.c:241
 #, c-format
 msgid "Passport account not yet verified"
 msgstr "Conta de pasaporte aínda non verificada"
 
-#: ../libpurple/protocols/msn/error.c:244
 #, c-format
 msgid "Bad ticket"
 msgstr "Billete erróneo"
 
-#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Código de erro descoñecido %d"
 
-#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
-msgstr "Erro MSN: %s\n"
+msgstr "Erro do MSN: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
 msgid "Nudge"
-msgstr ""
+msgstr "Chamar a atención"
 
-#: ../libpurple/protocols/msn/msn.c:131
 #, fuzzy, c-format
 msgid "%s has nudged you!"
-msgstr "%s conectouse."
+msgstr "%s chamou a súa atención!"
 
-#: ../libpurple/protocols/msn/msn.c:132
 #, c-format
 msgid "Nudging %s..."
-msgstr ""
+msgstr "Chamando a atención de %s..."
+
+#, fuzzy
+msgid "Email Address..."
+msgstr "Enderezo de correo electrónico..."
 
-#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
-msgstr "O novo nome do contacto MSN é demasiado longo."
+msgstr "O seu novo nome do contacto MSN é demasiado longo."
 
-#: ../libpurple/protocols/msn/msn.c:282
 msgid "Set your friendly name."
-msgstr "Establecer o seu nome de contacto."
+msgstr "Defina o seu nome de contacto."
 
-#: ../libpurple/protocols/msn/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "Este é o nome co que lle verán outros usuarios MSN."
+msgstr "Este é o nome co que o verán outros usuarios do MSN."
 
-#: ../libpurple/protocols/msn/msn.c:301
 msgid "Set your home phone number."
-msgstr "Establecer o número de teléfono do seu domicilio."
+msgstr "Defina o número de teléfono do seu domicilio."
 
-#: ../libpurple/protocols/msn/msn.c:318
 msgid "Set your work phone number."
-msgstr "Establecer o número de teléfono do seu traballo."
+msgstr "Defina o número de teléfono do seu traballo."
 
-#: ../libpurple/protocols/msn/msn.c:335
 msgid "Set your mobile phone number."
-msgstr "Establecer o seu número de teléfono móbil."
+msgstr "Defina o seu número de teléfono móbil."
 
-#: ../libpurple/protocols/msn/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Quere permitir páxinas de MSN Mobile?"
 
-#: ../libpurple/protocols/msn/msn.c:351
 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 ""
-"Quere permitir ou rexeitar que a xente na súa lista de contactos lle envíe "
+"Quere permitir ou rexeitar, que a xente na súa lista de contactos lle envíe "
 "mensaxes a través de MSN Mobile ao seu teléfono móbil (ou outro dispositivo "
 "móbil)?"
 
-#: ../libpurple/protocols/msn/msn.c:357
 msgid "Allow"
 msgstr "Permitir"
 
-#: ../libpurple/protocols/msn/msn.c:358
 msgid "Disallow"
 msgstr "Rexeitar"
 
-#: ../libpurple/protocols/msn/msn.c:374
-msgid "This Hotmail account may not be active."
-msgstr "Esta conta de Hotmail talvez non estea activa."
+#, fuzzy, c-format
+msgid "Blocked Text for %s"
+msgstr "Texto bloqueado para %s"
+
+#, fuzzy
+msgid "No text is blocked for this account."
+msgstr "Non hai ningún texto bloqueado para esta conta."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"Os servidores MSN están bloqueando actualmente as seguintes expresións "
+"regulares:<br/>%s"
+
+#, fuzzy
+msgid "This account does not have email enabled."
+msgstr "Esta conta non ten o correo electrónico activado."
 
-#: ../libpurple/protocols/msn/msn.c:400
 msgid "Send a mobile message."
 msgstr "Enviar unha mensaxe a un móbil."
 
-#: ../libpurple/protocols/msn/msn.c:402
 msgid "Page"
 msgstr "Páxina"
 
-#: ../libpurple/protocols/msn/msn.c:549
-msgid "Has you"
-msgstr "Tenlle"
+#, fuzzy
+msgid "Home Phone Number"
+msgstr "Definir o número de teléfono particular"
+
+#, fuzzy
+msgid "Work Phone Number"
+msgstr "Definir o número de teléfono do traballo"
+
+#, fuzzy
+msgid "Mobile Phone Number"
+msgstr "Definir o número do teléfono móbil"
 
-#: ../libpurple/protocols/msn/msn.c:579 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3077
-#: ../libpurple/protocols/yahoo/yahoo.c:3761
 msgid "Be Right Back"
-msgstr "Volvo deseguida"
-
-#: ../libpurple/protocols/msn/msn.c:583 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3764
+msgstr "Volto agora"
+
 msgid "Busy"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/msn/msn.c:587
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3776
 msgid "On the Phone"
 msgstr "Ao teléfono"
 
-#: ../libpurple/protocols/msn/msn.c:591
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3782
 msgid "Out to Lunch"
 msgstr "Saín xantar"
 
-#: ../libpurple/protocols/msn/msn.c:619
+#. primitive
+#. ID
+#. name - use default
+#. savable
+#. should be user_settable some day
+#. independent
+#, fuzzy
+msgid "Artist"
+msgstr "Artista"
+
+#, fuzzy
+msgid "Album"
+msgstr "Álbum"
+
 msgid "Set Friendly Name..."
 msgstr "Establecer o nome do contacto..."
 
-#: ../libpurple/protocols/msn/msn.c:624
 msgid "Set Home Phone Number..."
-msgstr "Establecer o número de teléfono do seu domicilio..."
+msgstr "Establecer o número de teléfono particular..."
 
-#: ../libpurple/protocols/msn/msn.c:628
 msgid "Set Work Phone Number..."
-msgstr "Establecer o número de teléfono do seu traballo..."
+msgstr "Establecer o número de teléfono do traballo..."
 
-#: ../libpurple/protocols/msn/msn.c:632
 msgid "Set Mobile Phone Number..."
 msgstr "Establecer o número do teléfono móbil..."
 
-#: ../libpurple/protocols/msn/msn.c:638
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Activar/Desactivar dispositivos móbiles..."
 
-#: ../libpurple/protocols/msn/msn.c:643
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Permitir/Rexeitar páxinas de móbiles..."
 
-#: ../libpurple/protocols/msn/msn.c:654
+msgid "View Blocked Text..."
+msgstr "Ver o texto bloqueado..."
+
 msgid "Open Hotmail Inbox"
-msgstr "Abrir o correo de entrada de Hotmail"
+msgstr "Abrir a caixa de entrada do Hotmail"
 
-#: ../libpurple/protocols/msn/msn.c:678
 msgid "Send to Mobile"
 msgstr "Enviar a un móbil"
 
-#: ../libpurple/protocols/msn/msn.c:688
-#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Iniciar a _conversa"
 
-#: ../libpurple/protocols/msn/msn.c:726
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
-"Necesítase o soporte SSL para MSN. Instale unha biblioteca SSL soportada."
+"Necesítase o soporte SSL para o MSN. Instale unha biblioteca SSL soportada."
 
-#: ../libpurple/protocols/msn/msn.c:754
 msgid "Failed to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../libpurple/protocols/msn/msn.c:1510 ../libpurple/protocols/msn/msn.c:1858
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Erro ao obter o perfil"
 
-#: ../libpurple/protocols/msn/msn.c:1581 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Xeral"
 
-#: ../libpurple/protocols/msn/msn.c:1588
-#: ../libpurple/protocols/myspace/user.c:110
-#: ../libpurple/protocols/oscar/oscar.c:3755
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Idade"
 
-#: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Ocupación"
 
-#: ../libpurple/protocols/msn/msn.c:1591
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Localización"
 
-#: ../libpurple/protocols/msn/msn.c:1596 ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/msn/msn.c:1794 ../libpurple/protocols/msn/msn.c:1801
 msgid "Hobbies and Interests"
 msgstr "Afeccións e intereses"
 
-#: ../libpurple/protocols/msn/msn.c:1602 ../libpurple/protocols/msn/msn.c:1722
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1735
-#: ../libpurple/protocols/msn/msn.c:1743 ../libpurple/protocols/msn/msn.c:1750
 msgid "A Little About Me"
 msgstr "Un pouco sobre min"
 
-#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1621
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Estado civil"
 
-#: ../libpurple/protocols/msn/msn.c:1622
 msgid "Interests"
-msgstr "Interese"
+msgstr "Intereses"
 
-#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Pets"
 msgstr "Mascotas"
 
-#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Hometown"
-msgstr "Cidade"
+msgstr "Cidade natal"
 
-#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Places Lived"
-msgstr "Lugares en que vivin"
+msgstr "Lugares en que vivín"
 
-#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Fashion"
-msgstr "Moderno"
+msgstr "Moda"
 
-#: ../libpurple/protocols/msn/msn.c:1627
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Music"
 msgstr "Música"
 
-#: ../libpurple/protocols/msn/msn.c:1629 ../libpurple/protocols/msn/msn.c:1810
-#: ../libpurple/protocols/msn/msn.c:1816
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Cita preferida"
 
-#: ../libpurple/protocols/msn/msn.c:1646
 msgid "Contact Info"
-msgstr "Información de contactos"
+msgstr "Información do contacto"
 
-#: ../libpurple/protocols/msn/msn.c:1647
 msgid "Personal"
 msgstr "Persoal"
 
-#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Significant Other"
 msgstr "Outro significativo"
 
-#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Home Phone"
-msgstr "Teléfono da casa"
+msgstr "Teléfono particular"
 
-#: ../libpurple/protocols/msn/msn.c:1652
 msgid "Home Phone 2"
-msgstr "Teléfono da casa 2"
+msgstr "Teléfono particular 2"
 
-#: ../libpurple/protocols/msn/msn.c:1653
-#: ../libpurple/protocols/oscar/oscar.c:3793
 msgid "Home Address"
-msgstr "Domicilio"
+msgstr "Enderezo de casa"
 
-#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Personal Mobile"
 msgstr "Móbil persoal"
 
-#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Home Fax"
-msgstr "Fax de casa"
+msgstr "Fax particular"
 
-#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Personal Email"
 msgstr "Correo electrónico persoal"
 
-#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Personal IM"
 msgstr "MI persoal"
 
-#: ../libpurple/protocols/msn/msn.c:1659
 msgid "Anniversary"
 msgstr "Aniversario"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1675
 msgid "Work"
 msgstr "Traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1677
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Posto de traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1678
-#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Company"
 msgstr "Compañía"
 
-#: ../libpurple/protocols/msn/msn.c:1679
-#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departamento"
 
-#: ../libpurple/protocols/msn/msn.c:1680
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../libpurple/protocols/msn/msn.c:1681
 msgid "Work Phone"
 msgstr "Teléfono do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1682
 msgid "Work Phone 2"
 msgstr "Teléfono do traballo 2"
 
-#: ../libpurple/protocols/msn/msn.c:1683
-#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Work Address"
 msgstr "Enderezo do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1684
 msgid "Work Mobile"
 msgstr "Móbil do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1685
 msgid "Work Pager"
 msgstr "Buscapersoas do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1686
 msgid "Work Fax"
 msgstr "Fax do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1687
 msgid "Work Email"
 msgstr "Correo electrónico do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1688
 msgid "Work IM"
 msgstr "MI do traballo"
 
-#: ../libpurple/protocols/msn/msn.c:1689
 msgid "Start Date"
 msgstr "Data de inicio"
 
-#: ../libpurple/protocols/msn/msn.c:1759 ../libpurple/protocols/msn/msn.c:1765
-#: ../libpurple/protocols/msn/msn.c:1772 ../libpurple/protocols/msn/msn.c:1779
 msgid "Favorite Things"
 msgstr "Cousas preferidas"
 
-#: ../libpurple/protocols/msn/msn.c:1824
 msgid "Last Updated"
 msgstr "Última actualización"
 
-#: ../libpurple/protocols/msn/msn.c:1835
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Páxina persoal"
 
-#: ../libpurple/protocols/msn/msn.c:1859
 msgid "The user has not created a public profile."
 msgstr "O usuario non creou un perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1860
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
-"MSN indicou que non puido localizar un perfil para ese usuario. Isto "
-"significa que ou ben o usuario non existe ou que o usuario existe mais non "
-"creou un perfil público."
+"O MSN indicou que non puido localizar o perfil do usuario. Isto significa "
+"que ou ben o usuario non existe ou que o usuario existe mais non creou un "
+"perfil público."
 
-#: ../libpurple/protocols/msn/msn.c:1864
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
 msgstr ""
-"Non se puido atopar información no perfil do usuario. É probable que o "
-"usuario non exista."
+"Non se puido encontrar ningunha información no perfil do usuario. É probábel "
+"que o usuario non exista."
 
-#: ../libpurple/protocols/msn/msn.c:1872
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL do perfil"
 
@@ -7041,101 +5363,86 @@ msgstr "URL do perfil"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2158 ../libpurple/protocols/msn/msn.c:2160
-msgid "MSN Protocol Plugin"
-msgstr "Complemento de protocolo MSN"
+#, fuzzy
+msgid "Windows Live Messenger Protocol Plugin"
+msgstr "Complemento de protocolo de mensaxería Windows Live"
 
-#: ../libpurple/protocols/msn/msn.c:2194
 msgid "Use HTTP Method"
-msgstr "Usar método HTTP"
+msgstr "Usar o método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2199
 #, fuzzy
 msgid "HTTP Method Server"
-msgstr "Servidor de proba IPC"
+msgstr "Servidor de método HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2204
 msgid "Show custom smileys"
 msgstr "Mostrar as emoticonas personalizadas"
 
-#: ../libpurple/protocols/msn/msn.c:2212
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Avisar a un contacto para chamar a súa atención"
 
-#: ../libpurple/protocols/msn/nexus.c:146
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:321
-#: ../libpurple/protocols/qq/qq_proxy.c:366
-#: ../libpurple/protocols/qq/qq_proxy.c:399
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
-msgid "Unable to connect"
-msgstr "Non se puido conectar"
+#, fuzzy
+msgid "Windows Live ID authentication:Unable to connect"
+msgstr "Autenticación do Windows Live ID: non é posíbel conectarse"
+
+#, fuzzy
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Autenticación do Windows Live ID: resposta non válida"
 
-#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
-msgstr "%s non é un nome de grupo válido."
+msgstr "%s non é un grupo válido."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Erro descoñecido."
 
-#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#, c-format
+msgid "%s just sent you a Nudge!"
+msgstr "%s acáballe de dar un cobadazo!"
+
+#, fuzzy, c-format
+msgid "Unknown error (%d)"
+msgstr "Erro descoñecido (%s)"
+
+msgid "Unable to add user"
+msgstr "Non é posíbel engadir o usuario"
+
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "Non se puido engadir o usuario a %s (%s)"
+msgstr "Non é posíbel engadir o usuario a %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "Non se puido bloquear o usuario en %s (%s)"
+msgstr "Non é posíbel bloquear o usuario en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
-msgstr "Non se puido permitir ao usuario en %s (%s)"
+msgstr "Non é posíbel permitir o usuario en %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "Non se puido engadir a %s porque a súa lista de contactos está chea."
 
-#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s non é un nome válido de conta passport."
 
-#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
-msgstr "Servizo non dispoñible temporalmente."
+msgstr "Servizo non dispoñíbel temporalmente."
+
+#, fuzzy
+msgid "Mobile message was not sent because it was too long."
+msgstr "Non se puido enviar a mensaxe porque era demasiado longa."
 
-#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
-msgstr "Non se puido cambiar o nome do grupo"
+msgstr "Non é posíbel renomear o grupo"
 
-#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
-msgstr "Non se puido borrar o grupo"
+msgstr "Non é posíbel eliminar o grupo"
 
-#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7152,29 +5459,50 @@ msgid_plural ""
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-"O servidor de MSN desconectarase para as tarefas de mantemento en %d "
-"minutos. Desconectaraselle automaticamente nese momento. Remate calquera "
-"conversa activa.\n"
+"O servidor de MSN desconectarase para as tarefas de mantemento en %d minuto. "
+"Desconectaráselle automaticamente nese momento. Remate calquera conversa "
+"activa.\n"
 "\n"
 "Despois de que rematen as tarefas de mantemento poderá conectarse con éxito "
 "de novo."
 msgstr[1] ""
 "O servidor de MSN desconectarase para as tarefas de mantemento en %d "
-"minutos. Desconectaraselle automaticamente nese momento. Remate calquera "
+"minutos. Desconectaráselle automaticamente nese momento. Remate calquera "
 "conversa activa.\n"
 "\n"
 "Despois de que rematen as tarefas de mantemento poderá conectarse con éxito "
 "de novo."
 
-#: ../libpurple/protocols/msn/servconn.c:137
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Non se enviou a mensaxe porque o sistema non está dispoñíbel. Isto sucede "
+"normalmente cando o usuario está bloqueado ou non existe."
+
+#, fuzzy
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr "Non enviou a mensaxe porque están sendo enviadas demasiado rápido."
+
+#, fuzzy
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+"Non se enviou a mensaxe porque se produciu un erro de codificación "
+"descoñecido."
+
+#, fuzzy
+msgid "Message was not sent because an unknown error occurred."
+msgstr "Non se enviou a mensaxe porque se produciu un erro descoñecido."
+
+msgid "Unable to connect"
+msgstr "Non é posíbel conectar"
+
 msgid "Writing error"
 msgstr "Erro de escritura"
 
-#: ../libpurple/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr "Erro de lectura"
 
-#: ../libpurple/protocols/msn/servconn.c:146
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7183,631 +5511,586 @@ msgstr ""
 "Erro de conexión do servidor %s :\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "O servidor non soporta o noso protocolo."
 
-#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Erro na análise HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:205
 msgid "You have signed on from another location."
 msgstr "Conectouse desde outra localización."
 
-#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
-"Os servidores MSN non están dispoñibles temporalmente. Agarde e volva "
+"Os servidores MSN non están dispoñíbeis temporalmente. Agarde e volva "
 "tentalo máis tarde."
 
-#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Os servidores MSN van sufrir un apagado temporal."
 
-#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
-msgstr "Non se puido autenticar: %s"
+msgstr "Non é posíbel autenticar: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
-"A lista de contactos MSN non está dispoñible temporalmente. Agarde e volva a "
+"A lista de contactos MSN non está dispoñíbel temporalmente. Agarde e volva "
 "tentalo máis tarde."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Negociación"
 
-#: ../libpurple/protocols/msn/session.c:349
+msgid "Transferring"
+msgstr "Transferindo"
+
 msgid "Starting authentication"
 msgstr "Comezando coa autenticación"
 
-#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Obtendo unha cookie"
 
-#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
-msgstr "Enviando cookie"
+msgstr "Enviando unha cookie"
 
-#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Recuperando a lista de contactos"
 
-#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
-msgstr "Ausente"
+msgstr "Ausente do computador"
 
-#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Ao teléfono"
 
-#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Saín comer"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
-"Posiblemente non se puido enviar a mensaxe porque se excedeu o tempo de "
+"Posíbelmente non se puido enviar a mensaxe porque se excedeu o tempo de "
 "espera:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
-"Non se puido enviar a mensaxe, non está permitido mentres sexa invisible:"
+"Non se puido enviar a mensaxe, non está permitido mentres sexa invisíbel:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Non se puido enviar a mensaxe porque o usuario non está conectado:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro na conexión:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 "Non se puido enviar a mensaxe porque estamos a enviar demasiado rápido:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 "Non se puido enviar a mensaxe porque non se puido establecer unha conexión "
-"co servidor. É probable que sexa un problema do servidor, inténteo de novo "
-"nuns minutos."
+"co servidor. É probábel que sexa un problema do servidor, inténteo de novo "
+"nuns minutos:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
-"Non se puido enviar a mensaxe porque se produciu un erro coa centraliña:"
+"Non se puido enviar a mensaxe porque se produciu un erro co switchboard:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Non se puido enviar a mensaxe porque se produciu un erro descoñecido:"
 
-#: ../libpurple/protocols/msn/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "O usuario %s engadiulle á súa lista de contactos."
+msgstr "O usuario %s engadiuno á súa lista de contactos."
 
-#: ../libpurple/protocols/msn/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "O usuario %s eliminoulle da súa lista de contactos."
+msgstr "O usuario %s eliminouno da súa lista de contactos."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#. only notify the user about problems adding to the friends list
+#. * maybe we should do something else for other lists, but it probably
+#. * won't cause too many problems if we just ignore it
 #, c-format
 msgid "Unable to add \"%s\"."
-msgstr "Imposible engadir \"%s\"."
+msgstr "Non é posíbel engadir \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:645
-msgid "The screen name specified is invalid."
-msgstr "O nome especificado é incorrecto."
+#, fuzzy
+msgid "The username specified is invalid."
+msgstr "O nome especificado non é válido."
+
+msgid "This Hotmail account may not be active."
+msgstr "Pode que esta conta do Hotmail non estea activa."
+
+msgid "Has you"
+msgstr "Tenno"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "MSN Protocol Plugin"
+msgstr "Complemento de protocolo MSN"
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 #, fuzzy
 msgid "Missing Cipher"
-msgstr "Cifrado"
+msgstr "Falta o cifrado"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
-msgstr ""
+msgstr "Non se puido encontrar o cifrado RC4"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
 msgid ""
 "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
 "not be loaded."
 msgstr ""
+" Actualice a unha versión do libpurple con soporte de RC4 (>= 2.0.1). Non se "
+"cargará o complemento MySpaceIM."
 
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid ""
-"Sorry, passwords over %d characters in length (yours is %d) are not "
-"supported by MySpace."
-msgstr ""
-
-#. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1801
-msgid "MySpaceIM Error"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/myspace.c:349
 #, fuzzy
 msgid "Reading challenge"
-msgstr "Erro de lectura"
+msgstr "Lendo o desafío"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
 #, fuzzy
 msgid "Unexpected challenge length from server"
-msgstr "Desafío inválido do servidor"
+msgstr "O desafío do servidor ten unha lonxitude inesperada"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
 #, fuzzy
 msgid "Logging in"
-msgstr "Rexistro"
+msgstr "Iniciando a sesión"
 
-#: ../libpurple/protocols/myspace/myspace.c:1286
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr ""
+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] ""
+"Perdeuse a conexión co servidor (non se receberon datos durante %d segundo)"
+msgstr[1] ""
+"Perdeuse a conexión co servidor (non se receberon datos durante %d segundos)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1328
 #, fuzzy
 msgid "New mail messages"
-msgstr "Enviar unha mensaxe"
+msgstr "Novas mensaxes de correo"
 
-#: ../libpurple/protocols/myspace/myspace.c:1329
 msgid "New blog comments"
-msgstr ""
+msgstr "Novos comentarios de blogue"
 
-#: ../libpurple/protocols/myspace/myspace.c:1330
 msgid "New profile comments"
-msgstr ""
+msgstr "Novos comentarios de perfil"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
 msgid "New friend requests!"
-msgstr ""
+msgstr "Novas solicitudes de amigos!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1332
 msgid "New picture comments"
-msgstr ""
+msgstr "Novos comentarios de fotos"
 
-#: ../libpurple/protocols/myspace/myspace.c:1360
 msgid "MySpace"
-msgstr ""
+msgstr "MySpace"
+
+#, fuzzy
+msgid "MySpaceIM - No Username Set"
+msgstr "MySpace - Sen definición de usuario"
+
+msgid "You appear to have no MySpace username."
+msgstr "Parece que non ten un nome de usuario no MySpace."
+
+msgid "Would you like to set one now? (Note: THIS CANNOT BE CHANGED!)"
+msgstr "Gustaríalle configurar un agora? (Nota: ISTO NON SE PODE CAMBIAR!)"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1543
-#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../libpurple/protocols/myspace/myspace.c:1554
-#: ../libpurple/protocols/myspace/myspace.c:1556
-#, fuzzy
-msgid "No username set"
-msgstr "Sen nome"
+#, fuzzy, c-format
+msgid "Protocol error, code %d: %s"
+msgstr "Erro de protocolo, código %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1555
+#, c-format
 msgid ""
-"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
-"username and choose a username and try to login again."
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. Please shorten your password at http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword and try "
+"again."
 msgstr ""
+"%s O seu contrasinal ten %d caracteres, maior do que a lonxitude máxima de %"
+"d para o MySpaceIM. Faga a súa conta máis curta en http://profileedit."
+"myspace.com/index.cfm?fuseaction=accountSettings.changePassword e ténteo de "
+"novo."
 
-#: ../libpurple/protocols/myspace/myspace.c:1782
-#, fuzzy, c-format
-msgid "Protocol error, code %d: %s"
-msgstr "O proceso devolveu o código de erro %d"
+msgid "MySpaceIM Error"
+msgstr "Erro do MySpaceIM"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
-#: ../libpurple/protocols/myspace/myspace.c:2006
 #, fuzzy
 msgid "Failed to add buddy"
-msgstr "Non se puido unir o contacto á conversa"
+msgstr "Fallou ao engadir un contacto"
 
-#: ../libpurple/protocols/myspace/myspace.c:1972
 #, fuzzy
 msgid "'addbuddy' command failed."
-msgstr "Cargar a lista de contactos desde un ficheiro..."
+msgstr "O comando 'adbuddy' fallou."
 
-#: ../libpurple/protocols/myspace/myspace.c:2006
-#: ../libpurple/protocols/myspace/myspace.c:2247
 #, fuzzy
 msgid "persist command failed"
-msgstr "Fallou o servidor centraliña"
+msgstr "O comando 'persist' fallou"
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
 #, c-format
 msgid "No such user: %s"
-msgstr ""
+msgstr "Non existe ese usuario: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2116
 #, fuzzy
 msgid "User lookup"
-msgstr "Salas de usuarios"
+msgstr "Busca de usuario"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
-#: ../libpurple/protocols/myspace/myspace.c:2247
-#: ../libpurple/protocols/myspace/myspace.c:2269
 #, fuzzy
 msgid "Failed to remove buddy"
-msgstr "Non se puido unir o contacto á conversa"
+msgstr "Fallou ao eliminar o contacto"
 
-#: ../libpurple/protocols/myspace/myspace.c:2228
 msgid "'delbuddy' command failed"
-msgstr ""
+msgstr "O comando 'delbuddy' fallou."
 
-#: ../libpurple/protocols/myspace/myspace.c:2269
 #, fuzzy
 msgid "blocklist command failed"
-msgstr "Fallou o servidor centraliña"
+msgstr "O comando 'blocklist' fallou"
 
-#: ../libpurple/protocols/myspace/myspace.c:2315
 #, fuzzy
 msgid "Invalid input condition"
-msgstr "Rematando a conexión"
+msgstr "Condición de entrada non válida"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2333
-#: ../libpurple/protocols/myspace/myspace.c:2364
 #, fuzzy
-msgid "Read buffer full"
-msgstr "Cola chea"
+msgid "Read buffer full (2)"
+msgstr "O búfer de lectura está cheo (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2402
 #, fuzzy
 msgid "Unparseable message"
-msgstr "Non se puido interpretar a mensaxe"
+msgstr "A mensaxe non é analizábel"
 
-#: ../libpurple/protocols/myspace/myspace.c:2471
 #, fuzzy, c-format
 msgid "Couldn't connect to host: %s (%d)"
-msgstr "Non se puido conectar ao servidor"
+msgstr "Non se puido conectar ao servidor: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2642
 #, fuzzy
 msgid "IM Friends"
-msgstr "Ventás de M_I"
+msgstr "Amigos de MI"
 
-#: ../libpurple/protocols/myspace/myspace.c:2741
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
+"Engadiuse ou actualizouse %d contacto desde o servidor (incluídos os "
+"contactos que xa estaban na lista do lado do servidor)"
+msgstr[1] ""
+"Engadíronse ou actualizáronse %d contactos desde o servidor (incluídos os "
+"contactos que xa estaban na lista do lado do servidor)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2742
 #, fuzzy
 msgid "Add contacts from server"
-msgstr "Resposta inválida do servidor."
+msgstr "Engadir contactos desde o servidor"
 
-#: ../libpurple/protocols/myspace/myspace.c:2794
-#: ../libpurple/protocols/myspace/myspace.c:2859
 msgid "Add friends from MySpace.com"
-msgstr ""
+msgstr "Engadir amigos desde MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2795
 #, fuzzy
 msgid "Importing friends failed"
-msgstr "Fallou ao cargar o complemento"
+msgstr "A importación de amigos fallou"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2851
 #, fuzzy
 msgid "Find people..."
-msgstr "Buscar contactos..."
+msgstr "Encontrar persoas..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2854
 #, fuzzy
 msgid "Change IM name..."
-msgstr "Modificar contrasinal..."
+msgstr "Modificar o nome de MI..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3156
 msgid "myim URL handler"
-msgstr ""
+msgstr "Manipulador de URL myim"
 
-#: ../libpurple/protocols/myspace/myspace.c:3157
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr ""
+"Non se puido encontrar unha conta MySpaceIM apropiada para este URL myim."
 
-#: ../libpurple/protocols/myspace/myspace.c:3158
 msgid "Enable the proper MySpaceIM account and try again."
-msgstr ""
+msgstr "Active a conta MySpaceIM apropiada e ténteo de novo."
 
-#: ../libpurple/protocols/myspace/myspace.c:3281
 msgid "Show display name in status text"
-msgstr ""
+msgstr "Mostrar o nome de pantalla no texto de estado"
 
-#: ../libpurple/protocols/myspace/myspace.c:3284
 msgid "Show headline in status text"
-msgstr ""
+msgstr "Mostrar o encabezamento no texto de estado"
 
-#: ../libpurple/protocols/myspace/myspace.c:3289
 #, fuzzy
 msgid "Send emoticons"
-msgstr "Opcións de son"
+msgstr "Enviar emoticonas"
 
-#: ../libpurple/protocols/myspace/myspace.c:3294
 msgid "Screen resolution (dots per inch)"
-msgstr ""
+msgstr "Resolución de pantalla (puntos por polgada)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3297
 msgid "Base font size (points)"
-msgstr ""
+msgstr "Tamaño do tipo de letra base (puntos)"
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Usuario"
 
-#. TODO: link to username, if available
-#: ../libpurple/protocols/myspace/user.c:102
-#: ../libpurple/protocols/oscar/oscar.c:2964
 msgid "Profile"
 msgstr "Perfil"
 
-#: ../libpurple/protocols/myspace/user.c:124
 #, fuzzy
 msgid "Headline"
-msgstr "_Identificador:"
+msgstr "Encabezamento"
 
-#: ../libpurple/protocols/myspace/user.c:129
 #, fuzzy
 msgid "Song"
-msgstr "Sons"
+msgstr "Canción"
 
-#: ../libpurple/protocols/myspace/user.c:134
 msgid "Total Friends"
-msgstr ""
+msgstr "Total de amigos"
 
-#: ../libpurple/protocols/myspace/user.c:145
-#: ../libpurple/protocols/myspace/user.c:148
-#: ../libpurple/protocols/myspace/user.c:151
 #, fuzzy
 msgid "Client Version"
-msgstr "Pechar a conversa"
+msgstr "Versión do cliente"
+
+#. Protocol won't log in now without a username set.. Disconnect
+#, fuzzy
+msgid "No username set"
+msgstr "Non hai definido un nome de usuario"
+
+msgid "MySpaceIM - Please Set a Username"
+msgstr "MySpaceIM - Defina un nome de usuario"
+
+msgid "Please enter a username to check its availability:"
+msgstr "Introduza un nome de usuario para verificar a súa dispoñibilidade:"
+
+#, fuzzy
+msgid "MySpaceIM - Username Available"
+msgstr "MySpaceIM - O nome de usuario está dispoñíbel"
+
+#, fuzzy
+msgid "This username is available. Would you like to set it?"
+msgstr "Este nome de usuario está dispoñíbel. Quere configuralo?"
+
+msgid "ONCE SET, THIS CANNOT BE CHANGED!"
+msgstr "UNHA VEZ CONFIGURADO NON SE PODE CAMBIAR!"
+
+#, fuzzy
+msgid "This username is unavailable."
+msgstr "Este nome de usuario non está dispoñibel."
+
+#, fuzzy
+msgid "Please try another username:"
+msgstr "Intente outro nome de usuario:"
 
 #. TODO: icons for each zap
-#: ../libpurple/protocols/myspace/zap.c:44
-#: ../libpurple/protocols/myspace/zap.c:177
+#. Lots of comments for translators:
+#. Zap means "to strike suddenly and forcefully as if with a
+#. * projectile or weapon."  This term often has an electrical
+#. * connotation, for example, "he was zapped by electricity when
+#. * he put a fork in the toaster."
 msgid "Zap"
-msgstr ""
+msgstr "Dar unha descarga"
 
-#: ../libpurple/protocols/myspace/zap.c:44
 #, fuzzy, c-format
 msgid "%s has zapped you!"
-msgstr "%s conectouse."
+msgstr "%s deulle unha descarga!"
 
-#: ../libpurple/protocols/myspace/zap.c:44
 #, c-format
 msgid "Zapping %s..."
-msgstr ""
+msgstr "Dándolle unha descarga a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:45
+#. Whack means "to hit or strike someone with a sharp blow"
 msgid "Whack"
-msgstr ""
+msgstr "Golpear"
 
-#: ../libpurple/protocols/myspace/zap.c:45
 #, fuzzy, c-format
 msgid "%s has whacked you!"
-msgstr "O usuario bloqueoulle"
+msgstr "%s golpeouno!"
 
-#: ../libpurple/protocols/myspace/zap.c:45
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "Golpeando a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:46
+#. Torch means "to set on fire."  Don't worry, this doesn't
+#. * make a whole lot of sense in English, either.  Feel free
+#. * to translate it literally.
 #, fuzzy
 msgid "Torch"
-msgstr "Asunto"
+msgstr "Incendiar"
 
-#: ../libpurple/protocols/myspace/zap.c:46
 #, fuzzy, c-format
 msgid "%s has torched you!"
-msgstr "O usuario bloqueoulle"
+msgstr "%s incendiouno!"
 
-#: ../libpurple/protocols/myspace/zap.c:46
 #, c-format
 msgid "Torching %s..."
-msgstr ""
+msgstr "Incendiando a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:47
+#. Smooch means "to kiss someone, often enthusiastically"
 msgid "Smooch"
-msgstr ""
+msgstr "Bicar"
 
-#: ../libpurple/protocols/myspace/zap.c:47
 #, fuzzy, c-format
 msgid "%s has smooched you!"
-msgstr "%s conectouse."
+msgstr "%s bicouno!"
 
-#: ../libpurple/protocols/myspace/zap.c:47
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "Bicando a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:48
+#. A hug is a display of affection; wrapping your arms around someone
 msgid "Hug"
-msgstr ""
+msgstr "Abrazar"
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, fuzzy, c-format
 msgid "%s has hugged you!"
-msgstr "%s conectouse."
+msgstr "%s abrazouno!"
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "Hugging %s..."
-msgstr ""
+msgstr "Abrazando a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:49
+#. Slap means "to hit someone with an open/flat hand"
 #, fuzzy
 msgid "Slap"
-msgstr "Durmido"
+msgstr "Dar unha labazada"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, fuzzy, c-format
 msgid "%s has slapped you!"
-msgstr "%s conectouse."
+msgstr "%s deulle unha labazada!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "Dándolle unha labazada a %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:50
+#. Goose means "to pinch someone on their butt"
 #, fuzzy
 msgid "Goose"
-msgstr "Desapareceu"
+msgstr "Beliscar"
 
-#: ../libpurple/protocols/myspace/zap.c:50
 #, fuzzy, c-format
 msgid "%s has goosed you!"
-msgstr "%s marchou."
+msgstr "%s beliscouno!"
 
-#: ../libpurple/protocols/myspace/zap.c:50
 #, fuzzy, c-format
 msgid "Goosing %s..."
-msgstr "Buscando %s"
+msgstr "Beliscando a %s"
 
-#: ../libpurple/protocols/myspace/zap.c:51
+#. 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 ""
+msgstr "Chocar as 5"
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, fuzzy, c-format
 msgid "%s has high-fived you!"
-msgstr "%s conectouse."
+msgstr "%s chocou as 5 consigo!"
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "Chocando as 5 con %s..."
 
-#: ../libpurple/protocols/myspace/zap.c:52
+#. We're not entirely sure what the MySpace people mean by
+#. * this... but we think it's the equivalent of "prank."  Or, for
+#. * someone to perform a mischievous trick or practical joke.
 msgid "Punk"
-msgstr ""
+msgstr "Tomar o pelo"
 
-#: ../libpurple/protocols/myspace/zap.c:52
 #, fuzzy, c-format
 msgid "%s has punk'd you!"
-msgstr "%s conectouse."
+msgstr "%s tomoulle o pelo!"
 
-#: ../libpurple/protocols/myspace/zap.c:52
 #, c-format
 msgid "Punking %s..."
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:53
+msgstr "Tomándolle o pelo a %s..."
+
+#. Raspberry is a slang term for the vibrating sound made
+#. * when you stick your tongue out of your mouth with your
+#. * lips closed and blow.  It is typically done when
+#. * gloating or bragging.  Nowadays it's a pretty silly
+#. * gesture, so it does not carry a harsh negative
+#. * connotation.  It is generally used in a playful tone
+#. * with friends.
 msgid "Raspberry"
-msgstr ""
+msgstr "Sacar a lingua"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, fuzzy, c-format
 msgid "%s has raspberried you!"
-msgstr "%s conectouse."
+msgstr "%s sacoulle a lingua!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Raspberrying %s..."
-msgstr ""
+msgstr "Sacándolle a lingua a %s..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
-msgstr "Non se recibiron os parámetros necesarios"
+msgstr "Non se recibiron os parámetros requiridos"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Non se puido escribir na rede"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Non se puido ler da rede"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Erro ao se comunicar co servidor"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
-msgstr "Conferencia non atopada"
+msgstr "Non se encontrou a conferencia"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "A conferencia non existe"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Xa existe un cartafol con ese nome"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Non soportado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "O contrasinal expirou"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Contrasinal incorrecto"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
-msgstr "Usuario non atopado"
+msgstr "Non se encontrou o usuario"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "A conta foi deshabilitada"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "O servidor non puido acceder ao directorio"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "O administrador do sistema desactivou esta operación"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
-msgstr "O servidor non está dispoñible, ténteo de novo máis tarde"
+msgstr "O servidor non está dispoñíbel; ténteo de novo máis tarde"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Non se pode engadir un contacto ao mesmo cartafol dúas veces"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Non se pode engadir a si mesmo"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "O arquivo mestre non está ben configurado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
-msgid "Incorrect screen name or password"
-msgstr "Nome de conta ou contrasinal incorrecto"
+#, fuzzy
+msgid "Incorrect username or password"
+msgstr "O nome de conta ou contrasinal non é correcto"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
-msgid "Could not recognize the host of the screen name you entered"
-msgstr "Non se recoñeceu o servidor do nome de usuario que introduciu"
+#, fuzzy
+msgid "Could not recognize the host of the username you entered"
+msgstr "Non se recoñeceu o host do nome de usuario que introduciu"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
@@ -7815,161 +6098,129 @@ msgstr ""
 "A súa conta foi deshabilitada porque introduciu demasiadas veces un "
 "contrasinal incorrecto"
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Non pode engadir a mesma persoa dúas veces a unha conversa"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Alcanzou o límite do número de contactos permitidos"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
-msgid "You have entered an incorrect screen name"
+#, fuzzy
+msgid "You have entered an incorrect username"
 msgstr "O nome de usuario que introduciu é incorrecto"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Produciuse un erro ao actualizar o directorio"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
-msgstr "Versión de protocolo incompatible"
+msgstr "A versión de protocolo non é compatible"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
-msgstr "O usuario bloqueoulle"
+msgstr "O usuario bloqueouno"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
-"Esta versión de avaliación non permite a conexión simultánea a máis de dez "
+"Esta versión de avaliación non permite a conexión simultánea de máis de dez "
 "usuarios"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "O usuario non está conectado ou vostede está sendo bloqueado"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Erro descoñecido: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Fallou o inicio de sesión (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
-"Non se puido enviar a mensaxe. Non se puideron obter os detalles do usuario "
+"Non é posíbel enviar a mensaxe. Non se puideron obter os detalles do usuario "
 "(%s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Non se puido engadir %s á súa lista de contactos (%s)."
+msgstr "Non é posíbel engadir a %s á súa lista de contactos (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
-msgstr "Non se puido enviar a mensaxe (%s)."
+msgstr "Non é posíbel enviar a mensaxe (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
-msgstr "Non se puido convidar o usuario (%s)."
+msgstr "Non é posíbel convidar o usuario (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"Non se puido enviar unha mensaxe a %s. Non se puido crear a conferencia (%s)."
+"Non é posíbel enviar unha mensaxe a %s. Non se puido crear a conferencia (%"
+"s)."
 
-#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "Non se puido enviar a mensaxe. Non se puido crear a conferencia (%s)."
+msgstr "Non é posíbel enviar a mensaxe. Non se puido crear a conferencia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"Non se puido mover o usuario %s ao cartafol %s na lista do servidor. "
+"Non é posíbel mover o usuario %s ao cartafol %s na lista do servidor. "
 "Produciuse un erro ao crear o cartafol (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"Non se puido engadir na súa lista de contactos a %s. Produciuse un erro ao "
+"Non é posíbel engadir %s na súa lista de contactos. Produciuse un erro ao "
 "crear o cartafol na lista do servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Non se puideron obter os detalles do usuario %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Non se puido engadir o usuario á lista de privacidade (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Non se puido engadir %s á súa lista de rexeitados (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Non se puido engadir %s á súa lista de permitidos (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Non se puido eliminar %s da lista de privacidade (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr "Non se puideron modificar as opcións de privacidade do servidor (%s)."
+msgstr ""
+"Non se puideron modificar as definicións de privacidade do servidor (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Non se puido crear a conferencia (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
-msgstr "Erro ao se comunicar co servidor. Pecharase a conexión."
+msgstr "Erro ao se comunicar co servidor. Pechando a conexión."
 
-#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Número de teléfono"
 
-#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Título"
 
-#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Caixa de correo"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "ID de usuario"
 
@@ -7979,41 +6230,29 @@ msgstr "ID de usuario"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Nome completo"
 
-#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Conferencia GroupWise %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
-msgid "Unable to make SSL connection to server."
-msgstr "Non se puido establecer unha conexión SSL co servidor."
-
-#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Non se puido conectar ao servidor."
 
-#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "Agardando unha resposta..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "Convidouse a %s a esta conversa."
 
-#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Convite para unha conversa"
 
-#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8024,16 +6263,12 @@ msgstr ""
 "\n"
 "Enviado: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Desexa unirse á conversa?"
 
-#. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Foi desconectado porque se conectou desde outra estación de traballo."
 
-#: ../libpurple/protocols/novell/novell.c:2069
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
@@ -8041,11 +6276,6 @@ msgstr ""
 "Non parece que %s estea conectado e non recibiu a mensaxe que lle acaba de "
 "enviar."
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -8053,11 +6283,9 @@ msgstr ""
 "Non se puido contactar co servidor. Indique o enderezo do servidor co que "
 "desexa conectar."
 
-#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Erro. O soporte SSL non está instalado."
 
-#: ../libpurple/protocols/novell/novell.c:2504
 #, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Pechouse esta conferencia. Non se poden enviar máis mensaxes."
@@ -8072,33 +6300,26 @@ msgstr "Pechouse esta conferencia. Non se poden enviar máis mensaxes."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Complemento de protocolo de Mensaxería GroupWise de Novell"
 
-#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Enderezo do servidor"
 
-#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Porto do servidor"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:387
-#: ../libpurple/protocols/yahoo/yahoo.c:2469
-#: ../libpurple/protocols/yahoo/yahoo.c:2636
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:581
-#: ../libpurple/proxy.c:1116 ../libpurple/proxy.c:1225
-#: ../libpurple/proxy.c:1325 ../libpurple/proxy.c:1453
+#, fuzzy
+msgid "Could not join chat room"
+msgstr "Non se puido unir á sala de conversa"
+
+#, fuzzy
+msgid "Invalid chat room name"
+msgstr "Nome de sala de conversa non válido"
+
 msgid "Server closed the connection."
 msgstr "O servidor pechou a conexión."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2463
-#: ../libpurple/protocols/yahoo/yahoo.c:2630 ../libpurple/proxy.c:593
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1237
-#: ../libpurple/proxy.c:1337 ../libpurple/proxy.c:1465
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8107,10 +6328,6 @@ msgstr ""
 "Perdeuse a conexión co servidor:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:392
-#: ../libpurple/proxy.c:1145 ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1349 ../libpurple/proxy.c:1421
-#: ../libpurple/proxy.c:1478
 msgid "Received invalid data on connection with server."
 msgstr "Recibíronse datos non válidos na conexión co servidor."
 
@@ -8124,8 +6341,6 @@ msgstr "Recibíronse datos non válidos na conexión co servidor."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "Complemento de protocolo AIM/ICQ"
 
@@ -8139,144 +6354,116 @@ msgstr "Complemento de protocolo AIM/ICQ"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "Complemento de protocolo ICQ"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4410
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Codificación"
 
-#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "O usuario remoto pechou a conexión."
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "O usuario remoto rexeitou a petición."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Perdeuse a conexión co usuario remoto:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
-msgstr "Recibíronse datos inválidos na conexión co usuario remoto."
+msgstr "Recibíronse datos non válidos na conexión co usuario remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
-msgstr "Non se puido establecer a conexión co usuario remoto."
+msgstr "Non se puido establecer unha conexión co usuario remoto."
 
-#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "MI directa establecida"
 
-#: ../libpurple/protocols/oscar/oft.c:656
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s tentou enviarlle un ficheiro %s, mais só permitimos enviar ficheiros até %"
+"s a través de MI directa. Tente usar a transferencia de ficheiros en vez "
+"disto.\n"
+
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "O ficheiro %s é %s, que é maior que o tamaño máximo de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
-msgstr "Erro inválido"
+msgstr "Erro non válido"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
-msgstr "SNAC inválido"
+msgstr "SNAC non válido"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
-msgstr "Taxa de mensaxes para o servidor"
+msgstr "Taxa de mensaxes para o host"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "Taxa de mensaxes para o cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
-msgstr "Servizo non dispoñible"
+msgstr "Servizo non dispoñíbel"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "Servizo non definido"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "SNAC obsoleto"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
-msgstr "Non soportado polo servidor"
+msgstr "Non soportado polo host"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "Non soportado polo cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "Rexeitado polo cliente"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr "Resposta demasiado grande"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Responses lost"
 msgstr "Respostas perdidas"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
 msgstr "Solicitude rexeitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr "Carga de SNAC destrozada"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "Dereitos insuficientes"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "Na lista local de autorizar/rexeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
-msgid "Too evil (sender)"
-msgstr "Demasiado malvado (remitente)"
+msgid "Warning level too high (sender)"
+msgstr "Nivel de aviso demasiado alto (remitente)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
-msgid "Too evil (receiver)"
-msgstr "Demasiado malvado (destinatario)"
+msgid "Warning level too high (receiver)"
+msgstr "Nivel de aviso moi alto (destinatario)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "User temporarily unavailable"
-msgstr "Usuario temporalmente non dispoñible"
+msgstr "Usuario temporalmente non dispoñíbel"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "Non houbo coincidencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "List overflow"
-msgstr "Límite da lista excedido"
+msgstr "Desbordouse o límite da lista"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
-msgstr "Solicitude ambigüa"
+msgstr "Solicitude ambigua"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
-msgstr "Cola chea"
+msgstr "Fila chea"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "Non mentres está en AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
 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 "
@@ -8285,9 +6472,8 @@ msgid ""
 msgstr ""
 "(Houbo un erro ao recibir a mensaxe. O contacto co que está falando está a "
 "empregar unha codificación diferente da esperada. Se sabe cal está "
-"empregando pode especificalo nas opcións avanzadas de conta para AIM/ICQ)"
+"empregando pode especificalo nas opcións avanzadas de conta para AIM/ICQ)."
 
-#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -8295,156 +6481,105 @@ msgid ""
 msgstr ""
 "(Produciuse un erro ao recibir esta mensaxe. Pode deberse a que vostede e "
 "mais %s teñen seleccionadaunha codificación diferente ou que %s ten un "
-"cliente con erros.)"
+"cliente con erros)."
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2387
-#: ../pidgin/gtkutils.c:2417
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Icona de contacto"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Voz"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "MI Directa AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
-msgid "Chat"
-msgstr "Conversa"
-
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6010
 msgid "Get File"
 msgstr "Recibir ficheiro"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Xogos"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Extensións"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Enviar lista de contactos"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "Conexión directa ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "Usuario de AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilista"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Antigo ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
-msgstr "Cifraxe Trillian"
+msgstr "Cifrado Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Seguridade activada"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
-msgstr "Vídeoconversa"
+msgstr "Videoconferencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Vídeo en directo"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#, fuzzy
+msgid "Screen Sharing"
+msgstr "Pantalla compartida"
+
 #, c-format
 msgid "Free For Chat"
-msgstr "Dispoñible para conversar"
+msgstr "Dispoñíbel para conversar"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5815
 #, c-format
 msgid "Not Available"
-msgstr "Non dispoñible"
+msgstr "Non dispoñíbel"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5801
 #, c-format
 msgid "Occupied"
 msgstr "Ocupado"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
 #, c-format
 msgid "Web Aware"
-msgstr "Visible na Web"
+msgstr "Visibilidade na Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3095 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1060
 #, c-format
 msgid "Invisible"
-msgstr "Invisible"
+msgstr "Invisíbel"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
-#, c-format
-msgid "Online"
-msgstr "Conectado"
-
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3707
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1126
 msgid "IP Address"
 msgstr "Enderezo IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2891
 msgid "Warning Level"
 msgstr "Nivel de aviso"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Comentario de contacto"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -8453,7 +6588,6 @@ msgstr ""
 "Non se puido conectar ao servidor de autenticación:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8462,155 +6596,119 @@ msgstr ""
 "Non se puido conectar ao servidor BOS:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
-msgid "Screen name sent"
+#, fuzzy
+msgid "Username sent"
 msgstr "Enviouse o nome de usuario"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
-msgstr "Conexión establecida, cookie enviada"
+msgstr "Estableceuse a conexión e enviouse a cookie"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Rematando a conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:1260
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must be a valid email address, or start with a letter "
-"and contain only letters, numbers and spaces, or contain only numbers."
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
 msgstr ""
 "Non se puido iniciar a sesión: Non se iniciou a sesión como %s porque o nome "
-"de usuario é inválido.  Os nomes de usuario teñen que ser unha dirección de "
-"correo electrónico válida ou comezar cunha letra e conter só letras, números "
-"e espazos, ou conter só números."
-
-#: ../libpurple/protocols/oscar/oscar.c:1345
-#: ../libpurple/protocols/yahoo/yahoo.c:2105
-msgid "Invalid screen name."
-msgstr "Nome de usuario incorrecto."
-
-#: ../libpurple/protocols/oscar/oscar.c:1352
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1045
-#: ../libpurple/protocols/yahoo/yahoo.c:2126
+"de usuario non é válido.  Os nomes de usuario teñen que ser unha dirección "
+"de correo electrónico válida ou comezar cunha letra e conter só letras, "
+"números e espazos, ou conter só números."
+
+#. Unregistered screen name
+#, fuzzy
+msgid "Invalid username."
+msgstr "Nome de usuario non válido."
+
 msgid "Incorrect password."
 msgstr "Contrasinal incorrecto."
 
-#: ../libpurple/protocols/oscar/oscar.c:1357
+#. Suspended account
 msgid "Your account is currently suspended."
-msgstr "A conta está deshabilitada actualmente."
+msgstr "A conta está actualmente deshabilitada."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr ""
-"O servizo de mensaxería instantánea AOL non está dispoñible temporalmente."
+"O servizo de mensaxería instantánea AOL non está dispoñíbel temporalmente."
 
-#: ../libpurple/protocols/oscar/oscar.c:1366
-#: ../libpurple/protocols/oscar/oscar.c:1377
+#. screen name connecting too frequently
+#. IP address connecting too frequently
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 "Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
-"de novo. Se segue a intentalo, pode que necesite agardar máis tempo."
+"de novo. Se segue a intentalo pode que precise agardar aínda máis tempo."
 
-#: ../libpurple/protocols/oscar/oscar.c:1371
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "A versión do cliente que usa é demasiado antiga. Actualízea en %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1410
 msgid "Could Not Connect"
 msgstr "Non se puido conectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1414
 msgid "Received authorization"
 msgstr "Recibiuse a autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
 msgid "The SecurID key entered is invalid."
-msgstr "A clave SecurID que se introduciu non é válida."
+msgstr "A chave SecurID que se introduciu non é válida."
 
-#: ../libpurple/protocols/oscar/oscar.c:1449
 msgid "Enter SecurID"
 msgstr "Introduza o SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduza o díxito de seis números que aparece na pantalla."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1452
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2281
-#: ../libpurple/protocols/oscar/oscar.c:5885
-#: ../libpurple/protocols/oscar/oscar.c:6166 ../libpurple/request.h:1388
 msgid "_OK"
 msgstr "_Aceptar"
 
-#: ../libpurple/protocols/oscar/oscar.c:1491
-#: ../libpurple/protocols/oscar/oscar.c:1534
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
-"Talvez sexa desconectado en breve. Pode querer usar TOC ata que se resolva "
-"isto. Comprobe %s para as novidades."
+"Talvez sexa desconectado en breve. Pode querer usar TOC até que se resolva "
+"isto. Comprobe %s para as actualizacións."
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
 msgid "Unable to get a valid AIM login hash."
 msgstr "Non se puido obter un hash de inicio de sesión AIM válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1622
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Talvez sexa desconectado en breve. Comprobe %s para actualizacións."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
 msgid "Unable to get a valid login hash."
 msgstr "Non se puido obter un hash de inicio de sesión válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
+#. allow multple logins?
 msgid "Password sent"
 msgstr "Contrasinal enviado"
 
-#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
-msgstr "Non é posible comezar a conexión"
+msgstr "Non é posíbel comezar a conexión"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Autoríceme para que poida engadirlle á miña lista de contactos."
+msgstr "Autoríceme para que poida engadilo á miña lista de contactos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
 msgid "Authorization Request Message:"
 msgstr "Mensaxe de solicitude de autorización:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
 msgid "Please authorize me!"
 msgstr "Por favor, autoríceme!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2272
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:2407
-#: ../libpurple/protocols/oscar/oscar.c:5263
-#: ../libpurple/protocols/yahoo/yahoo.c:1030
 msgid "No reason given."
 msgstr "Non se indicou unha razón."
 
-#: ../libpurple/protocols/oscar/oscar.c:2279
 msgid "Authorization Denied Message:"
 msgstr "Mensaxe de autorización rexeitada:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2407
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -8621,19 +6719,16 @@ msgstr ""
 "pola seguinte razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2408
 msgid "ICQ authorization denied."
 msgstr "Autorización ICQ rexeitada."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2415
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "O usuario %u autorizou a súa solicitude de engadilos á súa lista de "
 "contactos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8646,7 +6741,6 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2431
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8659,7 +6753,6 @@ msgstr ""
 "De: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -8672,109 +6765,91 @@ msgstr ""
 "A mensaxe é:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2460
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "O usuario ICQ %u envioulle un contacto: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2466
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Desexa engadir este contacto á lista de contactos?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2471 ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Engadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../libpurple/protocols/oscar/oscar.c:2596
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Perdeuse %hu mensaxe de %s porque non era válida."
-msgstr[1] "Perdeuse %hu mensaxe de %s porque non era válida."
+msgstr[1] "Perdeuse %hu mensaxes de %s porque non eran válidas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2605
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "Perdeuse %hu mensaxe de %s porque era demasiado longa."
-msgstr[1] "Perdeuse %hu mensaxe de %s porque era demasiado longa."
+msgstr[1] "Perdeuse %hu mensaxes de %s porque eran demasiado longas."
 
-#: ../libpurple/protocols/oscar/oscar.c:2614
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "Perdeu %hu mensaxe de %s porque se mandou damasiado rápido."
-msgstr[1] "Perdeu %hu mensaxe de %s porque se mandou damasiado rápido."
+msgstr[0] "Perdeu %hu mensaxe de %s porque se excedeu o límite de taxa."
+msgstr[1] "Perdeu %hu mensaxes de %s porque se excedeu o límite de taxa."
 
-#: ../libpurple/protocols/oscar/oscar.c:2623
-#, c-format
-msgid "You missed %hu message from %s because he/she was too evil."
-msgid_plural "You missed %hu messages from %s because he/she was too evil."
-msgstr[0] "Perdeuse %hu mensaxe de %s porque el/ela foi moi malvado/a."
-msgstr[1] "Perdeuse %hu mensaxe de %s porque el/ela foi moi malvado/a."
+#, fuzzy, c-format
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Perdeuse %hu mensaxe de %s porque o seu nivel de aviso é demasiado alto."
+msgstr[1] ""
+"Perdeuse %hu mensaxes de %s porque o nivel de aviso dela/del é demasiado "
+"alto."
 
-#: ../libpurple/protocols/oscar/oscar.c:2632
-#, c-format
-msgid "You missed %hu message from %s because you are too evil."
-msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] "Perdeuse %hu mensaxe de %s porque es moi malvado/a."
-msgstr[1] "Perdeuse %hu mensaxe de %s porque es moi malvado/a."
+#, fuzzy, c-format
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Perdeuse %hu mensaxe de %s porque o seu nivel de aviso é demasiado alto."
+msgstr[1] ""
+"Perdeuse %hu mensaxes de %s porque o seu nivel de aviso é demasiado alto."
 
-#: ../libpurple/protocols/oscar/oscar.c:2641
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
-msgstr[1] "Perdeuse %hu mensaxe de %s por motivos descoñecidos."
+msgstr[1] "Perdeuse %hu mensaxes de %s por motivos descoñecidos."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2796
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Non se puido enviar a mensaxe: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2796
-#: ../libpurple/protocols/oscar/oscar.c:2801
-#: ../libpurple/protocols/oscar/oscar.c:2865
 msgid "Unknown reason."
 msgstr "Razón descoñecida."
 
-#: ../libpurple/protocols/oscar/oscar.c:2799
-#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Non se puido enviar a mensaxe a %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2865
 #, c-format
 msgid "User information not available: %s"
-msgstr "Información de usuario non dispoñible: %s"
+msgstr "Información de usuario non dispoñíbel: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2896
 msgid "Online Since"
 msgstr "Conectado desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2901
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membro desde"
 
-#: ../libpurple/protocols/oscar/oscar.c:2936
-msgid "Available Message"
-msgstr "Mensaxe dispoñible"
-
-#: ../libpurple/protocols/oscar/oscar.c:3044
 msgid "Your AIM connection may be lost."
 msgstr "Pode que se perdese a conexión AIM."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3232
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -8782,7 +6857,6 @@ msgstr ""
 "[Non se puido mostrar unha mensaxe deste usuario porque contén caracteres "
 "incorrectos.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3396
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8790,169 +6864,134 @@ msgstr ""
 "A última acción que se intentou non se puido realizar porque superou o "
 "límite na taxa de envío de mensaxes. Agarde 10 segundos e volva a intentalo."
 
-#: ../libpurple/protocols/oscar/oscar.c:3479
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
-msgstr "Desconectouse da sala de conversa: %s."
+msgstr "Vostede foi desconectado da sala de conversa: %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/silc/util.c:585
-#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Teléfono móbil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Personal Web Page"
-msgstr "Sitio web persoal"
+msgstr "Páxina web persoal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3783
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Información adicional"
 
-#: ../libpurple/protocols/oscar/oscar.c:3791
-#: ../libpurple/protocols/oscar/oscar.c:3804
 msgid "Zip Code"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3815
+msgid "Work Information"
+msgstr "Información do traballo"
+
 msgid "Division"
 msgstr "Sección"
 
-#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Position"
-msgstr "Cargo"
+msgstr "Posición"
 
-#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Web Page"
 msgstr "Páxina web"
 
-#: ../libpurple/protocols/oscar/oscar.c:3821
-msgid "Work Information"
-msgstr "Información do traballo"
-
-#: ../libpurple/protocols/oscar/oscar.c:3877
 msgid "Pop-Up Message"
 msgstr "Mensaxe emerxente"
 
-#: ../libpurple/protocols/oscar/oscar.c:3917
-#, c-format
-msgid "The following screen name is associated with %s"
-msgid_plural "The following screen names are associated with %s"
+#, fuzzy, c-format
+msgid "The following username is associated with %s"
+msgid_plural "The following usernames are associated with %s"
 msgstr[0] "O seguinte nome de usuario está asociado a %s"
-msgstr[1] "O seguinte nome de usuario está asociado a %s"
+msgstr[1] "Os seguintes nome de usuario están asociados a %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3922
-msgid "Screen name"
-msgstr "Nome de usuario"
-
-#: ../libpurple/protocols/oscar/oscar.c:3948
 #, c-format
 msgid "No results found for email address %s"
-msgstr "Non se atoparon resultados para o enderezo de correo electrónico %s"
+msgstr "Non se encontrou resultados para o enderezo de correo electrónico %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3969
 #, c-format
 msgid "You should receive an email asking to confirm %s."
-msgstr "Debería recibir un correo electrónico. solicitando confirmación de %s."
+msgstr "Debería recibir un correo electrónico solicitando confirmación de %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3971
 msgid "Account Confirmation Requested"
 msgstr "Confirmación de conta solicitada"
 
-#: ../libpurple/protocols/oscar/oscar.c:4002
-#, c-format
-msgid "Error Changing Account Info"
-msgstr "Erro ao cambiar a información da conta"
-
-#: ../libpurple/protocols/oscar/oscar.c:4005
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"differs from the original."
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
 msgstr ""
 "Erro 0x%04x: Non se lle pode dar formato ao nome de usuario porque o nome "
 "solicitado difire do orixinal."
 
-#: ../libpurple/protocols/oscar/oscar.c:4008
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because it is invalid."
+#, fuzzy, c-format
+msgid "Error 0x%04x: Unable to format username because it is invalid."
 msgstr ""
-"Erro 0x%04x: Non se pode dar formato ao nome de usuario porque é incorrecto."
+"Erro 0x%04x: Non se lle pode dar formato ao nome de usuario porque non é "
+"válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4011
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Error 0x%04x: Unable to format screen name because the requested screen name "
-"is too long."
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
 msgstr ""
-"Erro 0x%04x: Non se pode dar formato ao nome de usuario porque o nome "
+"Erro 0x%04x: Non se lle pode dar formato ao nome de usuario porque o nome "
 "solicitado é demasiado longo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4014
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because there is already a "
-"request pending for this screen name."
+"request pending for this username."
 msgstr ""
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque xa "
-"existe unha solicitude pendente para este usuario."
+"existe unha solicitude pendente para este nome de usuario."
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address has "
-"too many screen names associated with it."
+"too many usernames associated with it."
 msgstr ""
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o "
-"enderezo dado ten demasiados nomes asociados."
+"enderezo proporcionado ten demasiados nomes de usuario asociados."
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change email address because the given address is "
 "invalid."
 msgstr ""
 "Erro 0x%04x: Non se pode cambiar o enderezo de correo electrónico porque o "
-"enderezo dado é incorrecto."
+"enderezo proporcionado non é válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Erro 0x%04x: Erro descoñecido."
 
-#: ../libpurple/protocols/oscar/oscar.c:4033
+msgid "Error Changing Account Info"
+msgstr "Erro ao cambiar a información da conta"
+
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "O enderezo de correo electrónico de %s é %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
 msgid "Account Info"
 msgstr "Información da conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:4218
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
-"Non se enviou a súa imaxe MI. Debe estar directamente conectado para enviar "
+"Non se enviou a súa imaxe MI. Debe estar conectado directamente para enviar "
 "imaxes MI."
 
-#: ../libpurple/protocols/oscar/oscar.c:4489
 msgid "Unable to set AIM profile."
 msgstr "Non se puido establecer o perfil AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4490
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
-"Probablemente intentou establecer o seu perfil antes de que o procedemento "
+"Probablemente intentou configurar o seu perfil antes de que o procedemento "
 "de inicio de sesión se completase. O perfil non se establecerá, inténteo "
 "novamente cando xa estea conectado completamente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -8964,14 +7003,12 @@ msgstr[0] ""
 "Excedeuse a lonxitude máxima de %d byte do perfil de usuario.  Eliminouse o "
 "excedente."
 msgstr[1] ""
-"Excedeuse a lonxitude máxima de %d byte do perfil de usuario.  Eliminouse o "
+"Excedeuse a lonxitude máxima de %d bytes do perfil de usuario.  Eliminouse o "
 "excedente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4509
 msgid "Profile too long."
-msgstr "Perfil demasiado longo."
+msgstr "O perfil é demasiado longo."
 
-#: ../libpurple/protocols/oscar/oscar.c:4554
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -8983,154 +7020,111 @@ msgstr[0] ""
 "Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse "
 "o excedente."
 msgstr[1] ""
-"Excedeuse a lonxitude máxima de %d byte da mensaxe de ausencia.  Eliminouse "
+"Excedeuse a lonxitude máxima de %d bytes da mensaxe de ausencia.  Eliminouse "
 "o excedente."
 
-#: ../libpurple/protocols/oscar/oscar.c:4559
 msgid "Away message too long."
-msgstr "Mensaxe de ausencia demasiado longa."
+msgstr "A mensaxe de ausencia é demasiado longa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must be a valid email address, or start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
+"Could not 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 ""
-"Non se puido engadir o contacto %s porque o nome de usuario é inválido.  Os "
-"nomes de usuario deben ser un enderezo de correo electrónico válidos, ou "
+"Non se puido engadir o contacto %s porque o nome de usuario non é válido.  "
+"Os nomes de usuario deben ser un enderezo de correo electrónico válido ou "
 "comezar cunha letra e conter só letras, números e espazos, ou só conter "
 "números."
 
-#: ../libpurple/protocols/oscar/oscar.c:4630
-#: ../libpurple/protocols/oscar/oscar.c:5060
-#: ../libpurple/protocols/oscar/oscar.c:5075
 msgid "Unable To Add"
 msgstr "Non se puido engadir"
 
-#: ../libpurple/protocols/oscar/oscar.c:4739
 msgid "Unable To Retrieve Buddy List"
 msgstr "Non se puido obter a lista de contactos"
 
-#: ../libpurple/protocols/oscar/oscar.c:4740
+#, fuzzy
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
-"list is not lost, and will probably become available in a few hours."
+"list is not lost, and will probably become available in a few minutes."
 msgstr ""
-"Os servidores de AIM non son capaces de enviar a súa lista de contactos.  A "
+"Os servidores de AIM non son capaces de enviar a súa lista de contactos. A "
 "súa lista de contactos non se perdeu, e probablemente volva a estar "
-"dispoñible nunhas horas."
+"dispoñíbel nuns minutos."
 
-#: ../libpurple/protocols/oscar/oscar.c:4922
-#: ../libpurple/protocols/oscar/oscar.c:4924
-#: ../libpurple/protocols/oscar/oscar.c:5140
-#: ../libpurple/protocols/oscar/oscar.c:5141
-#: ../libpurple/protocols/oscar/oscar.c:5146
 msgid "Orphans"
 msgstr "Orfos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 "Non se puido engadir o contacto %s porque hai demasiados contactos na lista "
-"de contactos. Elimina un e volve probar."
+"de contactos. Elimine un e ténteo de novo."
 
-#: ../libpurple/protocols/oscar/oscar.c:5058
-#: ../libpurple/protocols/oscar/oscar.c:5073
 msgid "(no name)"
 msgstr "(sen nome)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5072
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Non se puido engadir o contacto %s por unha razón descoñecida."
 
-#: ../libpurple/protocols/oscar/oscar.c:5178
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The user %s has given you permission to add you to their buddy list.  Do you "
-"want to add them?"
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
 msgstr ""
-"O usuario %s deulle permiso para engadilo nas súas listas de contactos. "
-"Desexa engadilos a eles?"
+"O usuario %s deulle permiso para engadilo á súa lista de contactos. Desexa "
+"engadilo a el?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5186
 msgid "Authorization Given"
 msgstr "Autorización concedida"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5259
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
-"O usuario %s autorizou a súa solicitude de engadilos á súa lista de "
-"contactos."
+"O usuario %s autorizou a súa solicitude de engadilo á súa lista de contactos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5263
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"O usuario %s denegou a súa solicitude de engadilos á lista de contactos pola "
-"seguinte razón:\n"
+"O usuario %s denegou a súa solicitude de engadilo á súa lista de contactos "
+"pola seguinte razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5264
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5300
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "Int_ercambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5340
-msgid "Invalid chat name specified."
-msgstr "Especificouse un nome de conversa incorrecto."
-
-#: ../libpurple/protocols/oscar/oscar.c:5409
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
-"Non se enviou a imaxe MI. Non se poden enviar imaxes MI en conversas AIM."
+"Non se enviou a imaxe MI. Non se pode enviar imaxes MI en conversas AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5569
-#: ../libpurple/protocols/oscar/oscar.c:5574
-msgid "Away Message"
-msgstr "Mensaxe de ausencia"
-
-#: ../libpurple/protocols/oscar/oscar.c:5574
-msgid "<i>(retrieving)</i>"
-msgstr " <i>(obtendo)</i>"
-
-#: ../libpurple/protocols/oscar/oscar.c:5774
 msgid "iTunes Music Store Link"
-msgstr "LIgazón a tenda de música iTunes"
+msgstr "LIgazón á tenda de música iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5882
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de contacto para %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
 msgid "Buddy Comment:"
 msgstr "Comentario de contacto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5930
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Pediu abrir unha conexión MI directa con %s."
+msgstr "Solicitou abrir unha conexión MI directa con %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9138,560 +7132,417 @@ msgstr ""
 "Como isto revela o seu enderezo IP, pode ser considerado como un risco de "
 "privacidade. Quere continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/peer.c:1045
 msgid "C_onnect"
 msgstr "C_onectar"
 
-#: ../libpurple/protocols/oscar/oscar.c:5975
 msgid "Get AIM Info"
-msgstr "Obter informaciónde AIM"
+msgstr "Obter información de AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Edit Buddy Comment"
-msgstr "Editar comentario de contacto"
+msgstr "Editar o comentario de contacto"
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get Status Msg"
 msgstr "Obter mensaxe de estado"
 
-#: ../libpurple/protocols/oscar/oscar.c:6002
 msgid "Direct IM"
 msgstr "MI directa"
 
-#: ../libpurple/protocols/oscar/oscar.c:6024
 msgid "Re-request Authorization"
 msgstr "Solicitar unha autorización outra vez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6083
 msgid "Require authorization"
 msgstr "Pedir unha autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6086
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
-msgstr "Capacidade web (habilitar isto pode provocar que reciba SPAM!)"
+msgstr "Visibilidade na web (habilitar isto pode provocar que reciba SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6091
 msgid "ICQ Privacy Options"
 msgstr "Opcións de privacidade ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6110
 msgid "The new formatting is invalid."
-msgstr "O novo formato é incorrecto."
+msgstr "O novo formato non é válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:6111
-msgid "Screen name formatting can change only capitalization and whitespace."
+#, fuzzy
+msgid "Username formatting can change only capitalization and whitespace."
 msgstr ""
-"O formato do nome de usuario só pode modificar a capitalización e espazos en "
-"branco."
+"O formatado do nome de usuario só pode modificar a capitalización e os "
+"espazos en branco."
 
-#: ../libpurple/protocols/oscar/oscar.c:6164
 msgid "Change Address To:"
 msgstr "Cambiar o enderezo a:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "<i>you are not waiting for authorization</i>"
-msgstr "<i>vostede non está agardando autorización</i>"
+msgstr "<i>vostede non está agardando por unha autorización</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6213
 msgid "You are awaiting authorization from the following buddies"
-msgstr "Agardando a autorización dos seguintes contactos"
+msgstr "Vostede está agardando a autorización dos seguintes contactos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
 msgstr ""
-"Pode volver pedir autorización a estes contactos ao premer o botón dereito "
-"do rato sobre eles e escoller\"Solicitar autorización outra vez.\""
+"Pode volver pedir a autorización a estes contactos premendo o botón dereito "
+"do rato sobre eles, e escollendo \"Solicitar autorización outra vez.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6231
 msgid "Find Buddy by Email"
 msgstr "Buscar un contacto polo correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6232
 msgid "Search for a buddy by email address"
 msgstr "Buscar un contacto polo enderezo de correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6233
 msgid "Type the email address of the buddy you are searching for."
 msgstr ""
 "Escriba o enderezo de correo electrónico do contacto que está a buscar."
 
-#: ../libpurple/protocols/oscar/oscar.c:6236
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
-msgid "Set User Info (URL)..."
-msgstr "Editar a información de usuario (URL)..."
+#, fuzzy
+msgid "Set User Info (web)..."
+msgstr "Editar a información de usuario (web)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
-msgid "Change Password (URL)"
-msgstr "Modificar contrasinal (URL)"
+#, fuzzy
+msgid "Change Password (web)"
+msgstr "Modificar contrasinal (web)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
-msgid "Configure IM Forwarding (URL)"
-msgstr "Configurar o reenvío de MI (URL)"
+#, fuzzy
+msgid "Configure IM Forwarding (web)"
+msgstr "Configurar o reenvío de MI (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "Set Privacy Options..."
 msgstr "Editar opcións de privacidade..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Confirm Account"
 msgstr "Confirmar conta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6430
 msgid "Display Currently Registered Email Address"
-msgstr "Mostrar o enderezo rexistrado actualmente"
+msgstr "Mostrar o enderezo de correo electrónico rexistrado actualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6434
 msgid "Change Currently Registered Email Address..."
-msgstr "Cambiar o enderezo de correo actualmente rexistrado..."
+msgstr "Modificar o enderezo de correo electrónico rexistrado actualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6441
 msgid "Show Buddies Awaiting Authorization"
-msgstr "Mostrar contactos pendentes de autorización"
+msgstr "Mostrar os contactos pendentes de autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6447
 msgid "Search for Buddy by Email Address..."
 msgstr "Buscar un contacto polo enderezo de correo electrónico..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6452
 msgid "Search for Buddy by Information"
 msgstr "Localizar un contacto pola súa información"
 
-#: ../libpurple/protocols/oscar/oscar.c:6520
-msgid "Use recent buddies group"
-msgstr "Usar un grupo de contactos recente"
-
-#: ../libpurple/protocols/oscar/oscar.c:6523
-msgid "Show how long you have been idle"
-msgstr "Mostrar o tempo que estivo inactivo"
-
-#: ../libpurple/protocols/oscar/oscar.c:6678
+#, fuzzy
 msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
+"Always use AIM/ICQ proxy server for\n"
+"file transfers and direct IM (slower,\n"
+"but does not reveal your IP address)"
 msgstr ""
-"Empregar sempre o servidor proxy ICQ para a transferencia de arquivos\n"
-"(máis lento, pero non revela o seu enderezo IP)"
+"Empregar sempre o servidor proxy ICQ para a transferencia de ficheiros\n"
+"(é máis lento, mais non revela o seu enderezo IP)"
+
+msgid "Allow multiple simultaneous logins"
+msgstr "Permitir múltiples inicios de sesión simultáneos"
 
-#: ../libpurple/protocols/oscar/peer.c:697
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Preguntando a %s para conectarnos a %s: %hu para MI Directa."
+msgstr "Preguntándolle a %s para nos conectar a %s: %hu para MI Directa."
 
-#: ../libpurple/protocols/oscar/peer.c:782
 #, c-format
 msgid "Attempting to connect to %s:%hu."
-msgstr "Intento de conectarse a %s:%hu."
+msgstr "Tentando conectarse a %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:856
 #, c-format
 msgid "Attempting to connect via proxy server."
-msgstr "Intento de conectarse ao servidor por medio do proxy."
+msgstr "Tentando conectarse ao servidor por medio do proxy."
 
-#: ../libpurple/protocols/oscar/peer.c:1033
 #, c-format
 msgid "%s has just asked to directly connect to %s"
-msgstr "%s vén de solicitar conectar directamente con: %s"
+msgstr "%s vén de solicitar conectar directamente a %s"
 
-#: ../libpurple/protocols/oscar/peer.c:1037
 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 ""
-"Requírese una conexión directa entre os dous ordenadores e é preciso "
-"empregar imaxes MI. O seu enderezo IP será revelado e isto pode ter riscos "
-"de privacidade."
+"Isto require una conexión directa entre os dous computadores e é preciso "
+"empregar imaxes MI. O seu enderezo IP será revelado e isto pódese considerar "
+"un risco para a privacidade."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
-msgstr "Información fundamental"
+msgstr "Información principal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Introdución persoal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "Número QQ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "País/Rexión"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provincia/Estado"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Símbolo do horóscopo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Signo zodiacal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Tipo de sangue"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Escola"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Código postal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Número de teléfono móbil"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Acuario"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
-msgstr "Peixes"
+msgstr "Pisces"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Aries"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
-msgstr "Touro"
+msgstr "Tauro"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
-msgstr "Xemelgos"
+msgstr "Xémini"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
-msgstr "Cangrexo"
+msgstr "Cáncer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "León"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Virxe"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
-msgstr "Balanza"
+msgstr "Libra"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Escorpión"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Saxitario"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Capricornio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Rato"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Boi"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tigre"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Coello"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Dragón"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Serpe"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Cabalo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Cabra"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Mono"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Galo"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Can"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Porco"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
-msgstr "Outro"
+msgstr "Outros"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr "Modificar a miña información"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "Actualizar a miña información"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
-msgstr "A súa información foi actualizada"
+msgstr "Actualizouse a súa información"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 msgstr ""
-"Aínda non está soportado establecer unha cara á medida. Elixa unha imaxe de %"
-"s."
+"Aínda non se soporta establecer unha cara á medida. Elixa unha imaxe de %s."
 
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Imaxe QQ non válida"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Rexeitou a solicitude de %d"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
-msgstr "Introduza a súa razón:"
+msgstr "Introduza o seu motivo:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Rexeitar a solicitude"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
-msgstr "Síntoo, non é o meu tipo..."
+msgstr "Síntoo, non es o meu tipo..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
-msgstr "Engadir contacto con fallo na solicitude de autorización"
+msgstr "Fallou ao engadir un contacto con solicitude de autorización"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Eliminou con éxito un contacto"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
-msgstr "Eliminóuselle con éxito da lista de contactos do seu amigo."
+msgstr "Eliminouse a si mesmo con éxito da lista de contactos do seu amigo"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "O usuario %d precisa unha autenticación"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Introduza a solicitude aquí"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Quere ser o meu amigo?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Enviar"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
-msgstr "Engadiu a %d á súa lista de contactos."
+msgstr "Engadiu a %d á súa lista de contactos"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "Erro de QQid"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "QQid non válido"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
-msgstr "Grupo ID"
+msgstr "ID de grupo"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Creador"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Descrición do grupo"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
-msgstr "Autorizar"
+msgstr "Autoriza"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Introduza o ID do grupo externo"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
-msgstr "Pode buscar só grupos QQ permanentes\n"
+msgstr "Só pode buscar grupos QQ permanentes\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "O usuario %d pediu unirse ao grupo %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Razón: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "Operación QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Aprobar"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr ""
 "A súa petición para unirse ao grupo %d foi rexeitada polo administrador %d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr ""
 "A súa petición para unirse ao grupo %d foi aprobada polo administrador %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
-msgstr "Vostede [%d] abandoou o grupo \"%d\""
+msgstr "Vostede [%d] abandonou o grupo \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
-msgstr "Vostede [%d] uniuse ao grupo \"%d\""
+msgstr "Vostede [%d] foi engadido ao grupo \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Este grupo foi engadido á súa lista de contactos"
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "Non son un membro"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Son un membro"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Solicito unirme"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Son o administrador"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Estado descoñecido"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Este grupo non permite que se unan outros membros"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
-msgstr "Abandoou o grupo con éxito"
+msgstr "Abandonou o grupo con éxito"
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Autenticación de grupo QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "A súa solicitude de autorización foi aceptada polo servidor QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
-msgstr "Introduciu un ID de grupo fora do rango de aceptación"
+msgstr "Introduciu un ID de grupo fóra do intervalo de aceptación"
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
-msgstr "Está seguro que quera abandoar este Qun?"
+msgstr "Está seguro que quera abandonar este Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -9699,157 +7550,129 @@ msgstr ""
 "Nota: se vostede é o creador, \n"
 "esta operación eliminará finalmente este Qun."
 
-#: ../libpurple/protocols/qq/group_network.c:92
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Código [0x%02X]: %s"
-
-#: ../libpurple/protocols/qq/group_network.c:93
-msgid "Group Operation Error"
-msgstr "Erro de operación do grupo"
-
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
-msgstr "Quere aprobar esta petición?"
+msgstr "Quere aprobar a petición?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Enter your reason:"
-msgstr "Introduza a súa razón:"
+msgstr "Introduza o seu motivo:"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modified Qun member"
 msgstr "Modificou con éxito o membro de Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modified Qun information"
 msgstr "Modificou con éxito a información de Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Creou con éxito un Qun "
 
-#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Quere configurar os detalles de Qun agora?"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
-msgstr "Configurar"
+msgstr "Configuración"
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Mensaxe do sistema"
 
-#: ../libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
-msgstr "Non se puido enviar MI."
+msgstr "Fallou ao enviar a MI."
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
-msgid "Keep alive error"
-msgstr "Produciuse un erro"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Descoñecido-%d"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
-msgid "Error requesting login token"
-msgstr "Erro na solicitude de inicio de sesión"
+msgid "Level"
+msgstr "Nivel"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
-msgid "Unable to login, check debug log"
-msgstr "Non é posible iniciar a sesión, comprobe o rexistro de depuración"
+#, fuzzy
+msgid "Member"
+msgstr "Membro"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
-msgid "Unable to connect."
-msgstr "Non se puido conectar."
+msgid " VIP"
+msgstr " VIP"
 
-#: ../libpurple/protocols/qq/qq.c:186
-#, c-format
-msgid "Unknown-%d"
-msgstr "Descoñecido-%d"
+msgid " TCP"
+msgstr " TCP"
 
-#: ../libpurple/protocols/qq/qq.c:211
-msgid "TCP Address"
-msgstr "Enderezo TCP"
+#, fuzzy
+msgid " FromMobile"
+msgstr " Móbil"
 
-#: ../libpurple/protocols/qq/qq.c:213
-msgid "UDP Address"
-msgstr "Enderezo UDP"
+#, fuzzy
+msgid " BindMobile"
+msgstr " Móbil"
 
-#: ../libpurple/protocols/qq/qq.c:242
-msgid "Level"
-msgstr "Nivel"
+#, fuzzy
+msgid " Video"
+msgstr " Vídeo"
+
+#, fuzzy
+msgid " Space"
+msgstr " Espazo"
+
+msgid "Flag"
+msgstr "Flag"
+
+msgid "Ver"
+msgstr "Ver"
 
-#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Nome non válido"
 
-#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Actualmente conectado</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Última actualización</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#, fuzzy, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Servidor:</b> %s:%d<br>\n"
+
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Modo de conexión:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
-#, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>IP do servidor:</b> %s:%d<br>\n"
+#, fuzzy, c-format
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Nome real do host:</b> %s:%d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>A miña IP pública:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Hora de inicio de sesión:</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Última IP de inicio de sesión</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Última hora de inicio de sesión</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Información de inicio de sesión"
 
-#: ../libpurple/protocols/qq/qq.c:533
 msgid "Set My Information"
-msgstr "Establecer a miña información"
+msgstr "Configurar a miña información"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Modificar o contrasinal"
 
-#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
-msgstr "Mostrar información de inicio de sesión"
+msgstr "Mostrar a información de inicio de sesión"
 
-#: ../libpurple/protocols/qq/qq.c:560
 msgid "Leave this QQ Qun"
 msgstr "Saír desta QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
-msgstr "Bloquear a este contacto"
+msgstr "Bloquear este contacto"
 
 #. *< type
 #. *< ui_requirement
@@ -9861,455 +7684,437 @@ msgstr "Bloquear a este contacto"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "Protocolo QQ\tComplemento"
 
-#: ../libpurple/protocols/qq/qq.c:752
 msgid "Connect using TCP"
 msgstr "Conectar usando TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
+msgid "resend interval(s)"
+msgstr "intervalo(s) de reenvío"
+
+#, fuzzy
+msgid "Keep alive interval(s)"
+msgstr "Manter vivo o intervalo ou intervalos"
+
+msgid "Update interval(s)"
+msgstr "Actualizar o intervalo ou intervalos"
+
+#, fuzzy, c-format
+msgid "Invalid token len, %d"
+msgstr "O título non é válido"
+
+#, fuzzy
+msgid "Keep alive error"
+msgstr "Manter vivo o intervalo ou intervalos"
+
+#, fuzzy
+msgid "Failed to connect server"
+msgstr "Fallou ao conectar ao servidor"
+
 msgid "Socket error"
 msgstr "Erro do conectador"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#, fuzzy, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Perdeuse a conexión co servidor:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
-msgstr "Non se puido ler do conectador"
+msgstr "Non é posíbel ler desde o conectador"
+
+msgid "Write Error"
+msgstr "Erro de escritura"
+
+msgid "Connection lost"
+msgstr "Conexión perdida"
+
+msgid "Couldn't resolve host"
+msgstr "Non se puido resolver o host"
+
+msgid "hostname is NULL or port is 0"
+msgstr "o nome do host é NULL ou o porto é 0"
+
+#, fuzzy, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Conectando ao servidor %s, novas tentativas %d"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Non é posíbel conectar."
+
+msgid "Could not resolve hostname"
+msgstr "Non se puido resolver o nome do host"
+
+#, fuzzy
+msgid "Unable to login. Check debug log."
+msgstr "Non é posible iniciar a sesión, comprobe o rexistro de depuración"
+
+#, fuzzy
+msgid "Unable to login"
+msgstr "Non se puido cargar o complemento"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "Fallou o inicio de sesión , non responder"
+
+#, fuzzy, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Vostede [%d] foi engadido ao grupo \"%d\""
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr ""
 
-#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d rexeitou o ficheiro %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
-msgstr "Envio do ficheiro"
+msgstr "Ficheiro enviado"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d cancelou a transferencia de %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
-msgid "Connection lost"
-msgstr "Conexión perdida"
-
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
-msgid "Login failed, no reply"
-msgstr "Fallou o inicio de sesión , non responder"
-
-#: ../libpurple/protocols/qq/sys_msg.c:110
 msgid "Do you want to add this buddy?"
 msgstr "Quere engadir este contacto?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
-msgstr "Foi engadido por %s"
+msgstr "Vostede foi engadido por %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
 msgid "Would you like to add him?"
-msgstr "Quere engadilo?"
+msgstr "Quere engadilo a el?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s engadiuno [%s] á súa lista de contactos"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "O usuario %s rexeitou a súa solicitude"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
 msgid "User %s approved your request"
 msgstr "O usuario %s aprobou a súa solicitude"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s quere engadilo [%s] como amigo"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Mensaxe: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr " %s non está na súa lista de contactos"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#, fuzzy, c-format
+msgid "Notice from: %s"
+msgstr "Notificación de: %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "Conexión pechada (escribindo)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Título do grupo:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>ID de grupo de Notes:</b>%s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "Información sobre o grupo %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
-msgstr "Información do libro de enderezos de Notes"
+msgstr "Información da axenda de enderezos de Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "Convidar o grupo á conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
-msgstr "Obter a información do libro de enderezos de Notes"
+msgstr "Obter a información da axenda de enderezos de Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "Enviando a negociación"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Agardando a aceptación da negociación"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
-msgstr "Aceptouse a negociación. Enviando inicio de sesión"
+msgstr "Aceptouse a negociación. Enviando o inicio de sesión"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
-msgstr "Agardando a aceptación do inicio de sesión"
+msgstr "Agardando á aceptación do inicio de sesión"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
-msgstr "Inicio de sesión redirixida"
+msgstr "Inicio de sesión redirixido"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
-msgstr "Forzando inicio de sesión"
+msgstr "Forzando o inicio de sesión"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
-msgstr "Inicio de sesión aceptada"
+msgstr "Inicio de sesión aceptado"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Iniciando servizos"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
-msgstr "Un administrador de Sametime enviou o seguinte anuncio ao servidor %s"
+msgstr ""
+"Un administrador de Sametime publicou o seguinte anuncio no servidor %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr "Anuncio do administrador Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Conexión reiniciada"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Erro ao ler do conectador: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
-msgstr "Non se puido conectar ao servidor"
+msgstr "Non é posíbel conectarse ao host"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
-msgstr "Aviso de %s"
+msgstr "Anuncio de %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "Conferencia pechada"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
-msgstr "Non se puido enviar a mensaxe: "
+msgstr "Non é posíbel enviar a mensaxe: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Lugar pechado"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Micrófono"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Altofalantes"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videocámara"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Admitidos"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Usuario externo"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Crear conferencia co usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 "Introduza un tema para a nova conferencia, e unha mensaxe de convite que se "
-"enviará a %s"
+"lle enviará a %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
 msgid "New Conference"
 msgstr "Nova conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Crear"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
-msgstr "Conferencias dispoñibles"
+msgstr "Conferencias dispoñíbeis"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Crear unha nova conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
-msgstr "Convidar ao usuario a unha conferencia"
+msgstr "Convidar o usuario a unha conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
 "\"Create New Conference\" if you'd like to create a new conference to invite "
 "this user to."
 msgstr ""
-"Seleccionar unha conferencia da lista amosada para convidar ao usuario %s. "
-"Seleccione \"Crear nova conferencia\" se quere crear unha nova conferencia "
-"para convidar a este usuario."
+"Seleccione unha conferencia da lista de abaixo para convidar ao usuario %s. "
+"Seleccione \"Crear unha nova conferencia\" se quere crear unha nova "
+"conferencia para convidar a este usuario."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr "Convidar a unha conferencia"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Convidar a unha conferencia..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
-msgstr "Enviar anuncio de PROBA"
+msgstr "Enviar un anuncio de PROBA"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4354
 msgid "Topic:"
 msgstr "Asunto:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Non se especificou o servidor de comunidade Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
-"Non se configurou ningún enderezo IP ou nome de equipo para a conta "
-"Meanwhile %s. Introduza un máis abaixo para continuar o rexistro."
+"Non se configurou ningún enderezo IP ou host para a conta Meanwhile %s. "
+"Introduza un máis abaixo para continuar o inicio de sesión."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "Meanwhile Connection Setup"
 msgstr "Configuración da conexión Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Non se especificou un servidor de comunidade Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4041
 msgid "Connect"
 msgstr "Conectar"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Descoñecido (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Último cliente coñecido"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Nome de usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Introduciuse un ID de usuario ambiguo"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
 "O identificador '%s' pode referirse a calquera dos seguintes usuarios. "
-"Seleccione o usuario da lista amosada para engadilo á súa lista de contactos."
+"Seleccione o usuario correcto da lista de abaixo para engadilos á súa lista "
+"de contactos."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
 msgid "Select User"
 msgstr "Seleccionar usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
-msgstr "Non se puido engadir o usuario: usuario non atopado"
+msgstr "Non se puido engadir o usuario: non se encontrou o usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
-"O identificador '%s' non coincide con ningún usuario na comunidade Sametime. "
-"Eliminouse esta entrada da lista de contactos."
-
-#: ../libpurple/protocols/sametime/sametime.c:4425
-msgid "Unable to add user"
-msgstr "Imposible engadir o usuario"
+"O identificador '%s' non coincide con ningún usuario da súa comunidade "
+"Sametime. Eliminouse esta entrada da súa lista de contactos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5011
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
 "Erro ao ler o ficheiro %s: \n"
-"%s.\n"
+"%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Lista de contactos almacenada remotamente"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Modo de almacenaxe da lista de contactos"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Só lista de contactos local"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Combinar a lista desde o servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Combinar e gardar a lista no servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Sincronizar a lista co servidor"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importar a lista Sametime para a conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportar a lista Sametime para a conta %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
-msgstr "É imposible engadir o grupo: o grupo existe"
+msgstr "É imposíbel engadir o grupo: o grupo existe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "Un grupo chamado '%s' xa existe na lista de contactos."
+msgstr "Xa existe un grupo chamado '%s' na lista de contactos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
-msgstr "É imposible engadir o grupo"
+msgstr "Non é posíbel engadir o grupo"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
-msgstr "Coincidencias posibles"
+msgstr "Posíbeis coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
-msgstr "Resultados dos grupos do libro de enderezos de Notes"
+msgstr "Resultados do grupo da axenda de enderezos de Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
 "Book groups. Please select the correct group from the list below to add it "
 "to your buddy list."
 msgstr ""
-"É posible que o identificador '%s' se refira a calquera dos grupos do libro "
-"de enderezos de Notes. Escolla o grupo máis axeitado da lista que se mostra "
-"abaixo para engadilo á lista de contactos."
+"É posíbel que o identificador '%s' se refira a calquera dos grupos da axenda "
+"de enderezos de Notes. Seleccione o grupo máis axeitado da lista que se "
+"mostra abaixo para engadilo á súa lista de contactos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
 msgid "Select Notes Address Book"
-msgstr "Seleccionar libro de enderezos de Notes"
+msgstr "Seleccionar a axenda de enderezos de Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
-msgstr "É imposible engadir o grupo: non se atopou"
+msgstr "É imposíbel engadir o grupo: non se encontrou"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
-"O identificador '%s' non coincide con ningún dos grupos do libro de "
+"O identificador '%s' non coincide con ningún dos grupos da axenda de "
 "enderezos de Notes da comunidade Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
 msgid "Notes Address Book Group"
-msgstr "Grupo do libro de enderezos de Notes"
+msgstr "Grupo da axenda de enderezos de Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
 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."
@@ -10317,171 +8122,106 @@ msgstr ""
 "Introduza o nome dun grupo do libro de enderezos de Notes no campo a "
 "continuación para engadir o grupo e os seus membros á súa lista de contactos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Resultados da busca para '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
 "may add these users to your buddy list or send them messages with the action "
 "buttons below."
 msgstr ""
-"O identificador '%s' pode referirse a calquera dos usuarios amosados a "
+"O identificador '%s' pode referirse a calquera dos usuarios que se mostran a "
 "continuación. Pode engadir estes usuarios á súa lista de contactos ou "
-"enviarlles mensaxes cos botóns de acción que se amosan abaixo."
+"enviarlles mensaxes cos botóns de acción de abaixo."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:756
 msgid "Search Results"
 msgstr "Resultados da busca"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
-msgstr "Non houbo coincidencia"
+msgstr "Sen coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
-"O identificador '%s' non coincide con ningún usuario na comunidade Sametime."
+"O identificador '%s' non coincide con ningún usuario da súa comunidade "
+"Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
-msgstr "Non houbo coincidencia"
+msgstr "Sen coincidencias"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
-msgstr "Localizar un usuario"
+msgstr "Buscar un usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
-"Introduza o nome ou o identificador parcial no campo amosado debaixo para "
-"localizar usuarios coincidentes na comunidade Sametime."
+"Introduza o nome ou o identificador parcial no campo de abaixo para "
+"localizar usuarios coincidentes na súa comunidade Sametime."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "User Search"
 msgstr "Busca de usuario"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
-msgstr "Importar a lista Sametime..."
+msgstr "Importar lista Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
-msgstr "Exportar a lista Sametime..."
+msgstr "Exportar lista Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
-msgstr "Engadir grupo do libro de enderezos de Notes..."
+msgstr "Engadir grupo da axenda de enderezos de Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Busca de usuario..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
-msgstr "Forzar inicio de sesión (ignorar redireccións do servidor)"
+msgstr "Forzar o inicio de sesión (ignorar redireccións do servidor)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Ocultar a identificación do cliente"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
-msgstr "O usuario %s non está dispoñible na rede"
-
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
+msgstr "O usuario %s non está presente na rede"
+
 msgid "Key Agreement"
-msgstr "Negociación da chave"
+msgstr "Acordo de chaves"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Non se puido efectuar a negociación da chave"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Produciuse un erro durante a negociación da chave"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Fallou a negociación da chave"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Excedeuse o tempo de espera durante a negociación de chave"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Interrompeuse a negociación da chave"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
-msgstr "Iniciouse xa a negociación da chave"
+msgstr "A negociación da chave xa está iniciada"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
-msgstr "Non pode comezar a negociación da chave con vostede mesmo"
-
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
+msgstr "A negociación da chave non pode comezar con vostede mesmo"
+
 msgid "The remote user is not present in the network any more"
-msgstr "O usuario remoto xa non está activo dentro da rede"
+msgstr "O usuario remoto xa non está presente dentro da rede"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
-"Recibiuse unha solicitude de %s para a negociación da chave . Desexa "
-"efectuar a negociación?"
+"Recibiuse unha solicitude de %s para a negociación da chave. Desexa efectuar "
+"a negociación?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10489,123 +8229,58 @@ msgid ""
 "Remote port: %d"
 msgstr ""
 "O usuario remoto está agardando unha negociación da chave en:\n"
-"Servidor remoto: %s\n"
+"Host remoto: %s\n"
 "Porto remoto: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
-msgstr "Solicitude de negociación da chave"
-
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
+msgstr "Solicitude de negociación de chave"
+
 msgid "IM With Password"
 msgstr "MI con contrasinal"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Non se puido establecer a chave MI"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Establecer contrasinal MI"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Obter chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Non se puido obter a chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
-msgstr "Mostrar chave pública"
-
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/chat.c:237
+msgstr "Mostrar a chave pública"
+
 msgid "Could not load public key"
 msgstr "Non se puido cargar a chave pública"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Información de usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Non se puido obter a información do usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Non se confía no contacto %s"
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/buddy.c:738
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 "Non pode recibir notificacións do contacto hasta que importe a súa chave "
-"pública. Pode empregar o comando \"Obter chave pública\" para importala."
+"pública. Pode empregar o comando \"Obter chave pública\" para obtela."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
-msgstr "Non se atopa o contacto %s na rede"
+msgstr "O contacto %s non está presente na rede"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -10613,341 +8288,173 @@ msgstr ""
 "Para engadir o contacto debe importar a súa chave pública. Prema en Importar "
 "para importar unha chave pública."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Importar..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Seleccione o usuario correcto"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
-"Atopouse máis dun usuario coa mesma chave pública. Seleccione na lista o "
+"Encontrouse máis dun usuario coa mesma chave pública. Seleccione na lista o "
 "usuario que desexa engadir á lista de contactos."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
 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 ""
-"Atopouse máis dun usuario co mesmo nome. Seleccione na lista amosada o "
-"usuario que desexa engadir á lista de contactos."
+"Encontrouse máis dun usuario co mesmo nome. Seleccione na lista o usuario "
+"que desexa engadir á lista de contactos."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Separado"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisposto"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Espérteme"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperactivo"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Feliz"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Triste"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Enfadado"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Envexoso"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Avergoñado"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
-msgstr "Invencible"
+msgstr "Invencíbel"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
-#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Namorado"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
-msgstr "Durmido"
-
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
+msgstr "Adurmiñado"
+
 msgid "Bored"
 msgstr "Aburrido"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Emocionado"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Ansioso"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Modos de usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contacto preferido"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
-msgstr "Lingua preferida"
+msgstr "Idioma preferido"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispositivo"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
-msgstr "Zona horaria"
+msgstr "Fuso horario"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
-msgstr "Localización"
+msgstr "Xeolocalización"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Restaurar a chave MI"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "MI con intercambio de chave"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "MI con contrasinal"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Obter chave pública..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Matar o usuario"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
-msgstr "Escribir no encerado"
+msgstr "Debuxar no encerado"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
-msgstr "_Frase contrasinal:"
+msgstr "_Frase de paso:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Non existe a canle %s na rede"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Información da canle"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Non se puido obter a información da canle"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nome da canle:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Número de usuarios:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Fundador da canle:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifrado da canle:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>HMAC da canle:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Asunto da canle:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Modos da canle:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Impresión dixital da chave do fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
-msgstr "<br><b>Babbleprint da chave do fundador:</b><br>%s"
+msgstr "<br><b>Impresión babble da chave do fundador:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Engadir chave pública da canle"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Abrir chave pública..."
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
-msgstr "Frase contrasinal da canle"
+msgstr "Frase de paso da canle"
 
-#: ../libpurple/protocols/silc/chat.c:430
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lista de chaves públicas da canle"
 
-#: ../libpurple/protocols/silc/chat.c:435
-#: ../libpurple/protocols/silc10/chat.c:413
 #, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
@@ -10957,453 +8464,253 @@ msgid ""
 "able to join."
 msgstr ""
 "Utilízase a autenticación da canle para prever o acceso non autorizado. A "
-"autenticación pode estar baseada nun contrasinal ou en sinaturas dixitais. "
-"Se se estableceu unha frase contrasinal, precisarase ésta para unirse á "
-"canle. Só poderán conectarse os usuarios que están na lista de chaves "
-"públicas se se utilizan chaves públicas para o unirse á canle."
-
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
+"autenticación pode estar baseada nunha frase de paso e sinaturas dixitais. "
+"Se se definiu unha frase de paso, esta será necesaria para poder unirse á "
+"canle. Só se poderán conectar os usuarios que estean na lista de chaves "
+"públicas se se utilizan chaves públicas para unirse á canle."
+
 msgid "Channel Authentication"
 msgstr "Autenticación da canle"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Engadir / Eliminar"
 
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nome do grupo"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
-msgstr "Frase contrasinal"
+msgstr "Frase de paso"
 
-#: ../libpurple/protocols/silc/chat.c:612
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
-msgstr "Introduza o nome do grupo privado de canle %s e a frase contrasinal."
+msgstr "Introduza o nome do grupo privado de canle %s e a frase de paso."
 
-#: ../libpurple/protocols/silc/chat.c:614
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Engadir un grupo privado de canle"
 
-#: ../libpurple/protocols/silc/chat.c:742
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Límite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:743
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
-"Establecer un límite de usuarios na canle. Poñer a cero para restaurar o "
-"límite de usuarios."
+"Definir un límite de usuarios na canle. Poñer a cero para restaurar o límite "
+"de usuarios."
 
-#: ../libpurple/protocols/silc/chat.c:907
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Lista de convidados"
 
-#: ../libpurple/protocols/silc/chat.c:912
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
-msgstr "Lista de vedados"
+msgstr "Lista de excluídos"
 
-#: ../libpurple/protocols/silc/chat.c:920
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Engadir un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:933
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Reestablecer permanente"
 
-#: ../libpurple/protocols/silc/chat.c:938
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Establecer permanente"
 
-#: ../libpurple/protocols/silc/chat.c:946
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Establecer un límite de usuarios"
 
-#: ../libpurple/protocols/silc/chat.c:952
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
-msgstr "Restablecer restricións de asuntos"
+msgstr "Restablecer a restrición de asuntos"
 
-#: ../libpurple/protocols/silc/chat.c:957
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
-msgstr "Establecer restricións de asuntos"
+msgstr "Establecer a restrición de asuntos"
 
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Limpar a canle privada"
 
-#: ../libpurple/protocols/silc/chat.c:969
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Establecer a canle privada"
 
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Limpar a canle secreta"
 
-#: ../libpurple/protocols/silc/chat.c:981
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Establecer a canle secreta"
 
-#: ../libpurple/protocols/silc/chat.c:1045
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
 msgstr "Ten que unirse á canle %s antes de poder unirse ao grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1047
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Unirse a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Non se pode unir a un grupo privado"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Chamar ao comando"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Non se pode chamar ao comando"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Comando descoñecido"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transferencia segura de ficheiros"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Erro durante a transferencia de ficheiros"
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "Desconectado remotamente"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
-msgstr "Permiso rexeitado"
+msgstr "Permiso denegado"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Fallou a negociación da chave"
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
-msgstr "A conexión esgotou o tempo de espera"
+msgstr "A conexión excedeu o tempo de espera"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Fallou a creación da conexión"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Non existe a sesión de transferencia de ficheiros"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Non hai ningunha sesión de transferencia de ficheiros activa"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "A transferencia de ficheiros xa se iniciou"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 "Non se puido efectuar a negociación da chave para a transferencia de "
 "ficheiros"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Non se puido comezar a transferencia de ficheiros"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Non se pode enviar o ficheiro"
 
-#: ../libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
 msgstr "Ocorreu un erro"
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s cambiou o asunto de <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:617
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> estableceu os modos da canle <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:621
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> eliminou todos os modos da canle <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:654
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> estableceu os modos do usuario <I>%s</I> a: %s"
 
-#: ../libpurple/protocols/silc/ops.c:662
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> eliminou todos os modos do usuario <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:691
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Foi expulsado de <I>%s</I> por <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Foi matado por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Matado por %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
-msgstr "Desconectado do servidor"
+msgstr "Desconexión do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Información persoal"
 
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
-msgstr "Día de nacemento"
+msgstr "Aniversario"
 
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Posto de traballo"
 
-#: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organización"
 
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unidade"
 
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Nota"
 
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Unirse a unha conversa"
 
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
-msgstr "É o fundador da canle en <I>%s</I>"
+msgstr "Vostede é o fundador da canle en <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1131
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "O fundador da canle en <I>%s</I> é <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Nome real"
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Texto de estado"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Impresión dixital da chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
-msgstr "Babbleprint da chave pública"
+msgstr "Impresión babble da chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Máis..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
-msgstr "Desconectar do servidor"
+msgstr "Separarse do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
-msgstr "Non se pode desconectar"
+msgstr "Non se pode separar"
 
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Non se pode establecer o asunto"
 
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
-msgstr "Non se puido cambiar o alias"
+msgstr "Fallou ao cambiar o alias"
 
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Non pode obter a lista de salas"
 
-#: ../libpurple/protocols/silc/ops.c:1468
 msgid "Network is empty"
 msgstr "A rede está baleira"
 
-#: ../libpurple/protocols/silc/ops.c:1512
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Non se recibiu unha chave pública"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Información do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1525
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Non se pode obter a información do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Estatísticas do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Non se poden obter as estatísticas do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1556
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11423,7 +8730,7 @@ msgid ""
 "Total router operators: %d\n"
 msgstr ""
 "Hora de arranque do servidor local: %s\n"
-"Tempo encendido o servidor local: %s\n"
+"Tempo de funcionamento do servidor local: %s\n"
 "Clientes do servidor local: %d\n"
 "Canles do servidor local: %d\n"
 "Operadores do servidor local: %d\n"
@@ -11431,66 +8738,43 @@ msgstr ""
 "Clientes da cela local: %d\n"
 "Canles da cela local: %d\n"
 "Servidores da cela local: %d\n"
-"Clientes totales: %d\n"
-"Canles totales: %d\n"
-"Servidores totales: %d\n"
-"Routers totales: %d\n"
-"Operadores de servidor totales: %d\n"
-"Operadores de routers en totales: %d\n"
-
-#: ../libpurple/protocols/silc/ops.c:1588
-#: ../libpurple/protocols/silc10/ops.c:1604
+"Clientes totais: %d\n"
+"Canles totais: %d\n"
+"Servidores totais: %d\n"
+"Routers totais: %d\n"
+"Operadores de servidor totais: %d\n"
+"Operadores de routers en total: %d\n"
+
 msgid "Network Statistics"
 msgstr "Estatísticas de rede"
 
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Fallou o ping"
 
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
-msgstr "Recibiuse a resposta ao ping ao servidor"
+msgstr "Recibiuse a resposta do servidor ao ping"
 
-#: ../libpurple/protocols/silc/ops.c:1609
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
-msgstr "Non se puido matar ao usuario"
+msgstr "Non se puido matar o usuario"
 
-#: ../libpurple/protocols/silc/ops.c:1648
 msgid "WATCH"
 msgstr "VIXIAR"
 
-#: ../libpurple/protocols/silc/ops.c:1648
 msgid "Cannot watch user"
-msgstr "Non se puido vixiar ao usuario"
-
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
+msgstr "Non se puido vixiar o usuario"
+
 msgid "Resuming session"
 msgstr "Reanudando a sesión"
 
-#: ../libpurple/protocols/silc/ops.c:1726
-#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Autenticando a conexión"
 
-#: ../libpurple/protocols/silc/ops.c:1777
-#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Comprobando a chave pública do servidor"
 
-#: ../libpurple/protocols/silc/ops.c:1814
-#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
-msgstr "Precísase unha frase contrasinal"
+msgstr "Precísase unha frase de paso"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -11499,12 +8783,10 @@ msgstr ""
 "Recibiuse a chave pública de %s. A súa copia local non coincide coa chave "
 "recibida. Desexa aceptar a chave pública de todas as maneiras?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Recibiuse a chave pública de %s. Desexa aceptar esta chave pública?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11512,107 +8794,74 @@ msgid ""
 "%s\n"
 "%s\n"
 msgstr ""
-"A impresión dixital e a babbleprint para a chave %s son:\n"
+"A impresión dixital e a impresión babble para a chave %s son:\n"
 "\n"
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verificar a chave pública"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Ver..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
-msgstr "Tipo de chave pública non sopotada"
+msgstr "Tipo de chave pública non soportada"
 
-#: ../libpurple/protocols/silc/silc.c:217
-#: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Desconectado polo servidor"
 
-#: ../libpurple/protocols/silc/silc.c:224
-#: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Produciuse un erro durante a conexión ao servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:229
-#: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Fallou o intercambio de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:238
-#: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Produciuse un erro ao retomar a sesión desconectada. Prema Reconectar para "
 "crear unha nova conexión."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
-#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
-msgstr "Fallou a conexión"
+msgstr "Fallo ao conectar"
 
-#: ../libpurple/protocols/silc/silc.c:280
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
-msgstr "Efectuando intercambio de chaves"
+msgstr "Efectuando o intercambio de chaves"
 
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/silc.c:325
-msgid "Connecting to SILC Server"
-msgstr "Conectando co servidor SILC"
+msgid "Unable to create connection"
+msgstr "Non é posíbel crear a conexión"
 
-#: ../libpurple/protocols/silc/silc.c:352
-#, c-format
 msgid "Could not load SILC key pair"
 msgstr "Non se puido cargar o par de chaves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:366
-#: ../libpurple/protocols/silc10/silc.c:355
-msgid "Unable to create connection"
-msgstr "Imposible crear a conexión"
+#. Progress
+msgid "Connecting to SILC Server"
+msgstr "Conectando co servidor SILC"
 
-#: ../libpurple/protocols/silc/silc.c:395
-#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Sen memoria"
 
-#: ../libpurple/protocols/silc/silc.c:438
-#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Non se puido inicializar o protocolo SILC"
 
-#: ../libpurple/protocols/silc/silc.c:445
 msgid "Error loading SILC key pair"
 msgstr "Erro ao cargar o par de chaves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:739
-#: ../libpurple/protocols/silc10/silc.c:650
+#, fuzzy, c-format
+msgid "Download %s: %s"
+msgstr "Descarga de %s: %s"
+
 msgid "Your Current Mood"
 msgstr "O seu estado de ánimo actual"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1641
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:755
-#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Namorado"
 
-#: ../libpurple/protocols/silc/silc.c:766
-#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11620,283 +8869,167 @@ msgstr ""
 "\n"
 "Métodos de contacto preferidos"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videoconferencia"
 
-#: ../libpurple/protocols/silc/silc.c:783
-#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
-msgstr "Estado actual"
+msgstr "O seu estado actual"
 
-#: ../libpurple/protocols/silc/silc.c:790
-#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Servizos en liña"
 
-#: ../libpurple/protocols/silc/silc.c:793
-#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Permitir que outros consulten os servizos que está empregando"
 
-#: ../libpurple/protocols/silc/silc.c:799
-#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Permitir que outros consulten que computador está empregando"
 
-#: ../libpurple/protocols/silc/silc.c:806
-#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "O seu ficheiro VCard"
 
-#: ../libpurple/protocols/silc/silc.c:812
 msgid "Timezone (UTC)"
 msgstr "Zona horaria (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Atributos de estado en liña do usuario"
 
-#: ../libpurple/protocols/silc/silc.c:818
-#: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
 "Pode permitir que outros usuarios consulten a información do seu estado en "
-"liña así como a súa información persoal. Cubra a información que desexa que "
+"liña así como a súa información persoal. Encha a información que desexa que "
 "outros usuarios vexan de vostede."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
-#: ../libpurple/protocols/silc10/silc.c:772
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Mensaxe do día"
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
-msgstr "Non hai dispoñible unha mensaxe do día"
+msgstr "Non hai unha mensaxe do día dispoñíbel"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Non hai unha mensaxe do día asociada con esta conexión"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Crear un novo par de chaves SILC"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
-msgstr "As frases contrasinais non coinciden"
+msgstr "As frases de paso non coinciden"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Fallou a xeración do par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Lonxitude da chave"
 
-#: ../libpurple/protocols/silc/silc.c:998
-#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Ficheiro da chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1000
-#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Ficheiro da chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1023
-#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
-msgstr "Frase contrasinal (reescribir)"
+msgstr "Frase de paso (escribir de novo)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
-#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Xerar un par de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Estado en liña"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
-msgstr "Mostrar a mensaxe do día"
+msgstr "Ver a mensaxe do día"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Crear un par de chaves SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
-msgstr "O usuario <I>%s</I> non está na rede"
+msgstr "O usuario <I>%s</I> non está presente na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
-msgstr "Asunto demasiado longo"
+msgstr "O asunto é demasiado longo"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Debe especificar un alias"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
-msgstr "non se atopou a canle %s"
+msgstr "non se encontrou a canle %s"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "os modos da canle de %s son: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "non se definiron modos da canle para %s"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
-msgstr "Non se puideron establecer os modos da canle para %s"
+msgstr "Fallou ao definir os modos da canle para %s"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Comando descoñecido: %s, (pode ser un erro do cliente)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
-msgstr "part [canle]:  Abandonar unha conversa"
+msgstr "part [canle]:  Abandonar a conversa"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
-msgstr "leave [canle]:  Abandonar unha conversa"
+msgstr "leave [canle]:  Abandonar a conversa"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;novo asunto&gt;]:  Ver ou cambiar o asunto"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;canle&gt; [&lt;contrasinal&gt;]:  Unirse a unha conversa nesta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Mostrar as canles nesta rede"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
-msgstr "whois &lt;alcume&gt;:  Ver a información do alias"
+msgstr "whois &lt;alias&gt;:  Ver a información do alias"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;alias&gt; &lt;mensaxe&gt;:  Enviarlle unha mensaxe privada a un "
 "usuario"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
-"query &lt;alias&gt; [&lt;mensaxe&gt;]:  Enviarlle unha mensaxe privada ao "
+"query &lt;alias&gt; [&lt;mensaxe&gt;]:  Enviarlle unha mensaxe privada a un "
 "usuario"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Mostrar a mensaxe do día do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Desconectar esta sesión"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mensaxe]:  Desconecta do servidor, cunha mensaxe opcional"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comando&gt;:  Executar un comando calquera do cliente silc"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;alias&gt; [-pubkey|&lt;razón&gt;]:  Matar un alias"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;novo alias&gt;:  Cambia o seu alias"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;alias&gt;:  Mostrar a información do alias"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11904,8 +9037,6 @@ msgstr ""
 "cmode &lt;canle&gt; [+|-&lt;modos&gt;] [argumentos]:  Cambia ou mostra os "
 "modos da canle"
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11913,19 +9044,13 @@ msgstr ""
 "cumode &lt;canle&gt; +|-&lt;modos&gt; &lt;alias&gt;:  Cambia os modos do "
 "usuario na canle"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;modos de usuario&gt;:  Establecer os seus modos na rede"
 
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
-"oper &lt;alias&gt; [-pubkey]:  Obter privilexios de operador do servidor"
+"oper &lt;alias&gt; [-pubkey]:  Obter os privilexios de operador do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -11933,46 +9058,30 @@ msgstr ""
 "invite &lt;canle&gt; [-|+]&lt;aliasgt;:  convida un alias ou engade/elimina "
 "o alias da lista de convidados para a canle"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;canle&gt; &lt;alias&gt; [comentario]:  Botar un cliente da canle"
 
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
-msgstr "info [servidor]:  Consulta detalles administrativos do servidor"
+msgstr "info [servidor]:  Consultar os detalles administrativos do servidor"
 
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;canle&gt; +|-&lt;alias&gt;]:  Vedar un cliente da canle"
+msgstr "ban [&lt;canle&gt; +|-&lt;alias&gt;]:  Excluír un cliente da canle"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;alias|servidor&gt;:  Obtén a chave pública do servidor ou do "
 "cliente"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Mostra as estatísticas do servidor e da rede"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Enviar un PING ao servidor ao que está conectado"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;canle&gt;:  Obtén a lista dos usuarios que están na canle"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -11989,141 +9098,91 @@ msgstr ""
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Complemento de protocolo SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
-msgstr "Protocolo de conferencia segura en vivo na Internet (SILC)"
+msgstr "Protocolo de conferencia segura en directo na Internet (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2036
 msgid "Network"
 msgstr "Rede"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Ficheiro de chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Ficheiro de chave privada"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Cifrado"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
-msgstr "Utilizar confidencialidade directa perfecta"
+msgstr "Utilizar a confidencialidade directa perfecta"
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Autenticación de chave pública"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
-msgstr "Bloquear MI que non fagan un intercambio de chaves"
+msgstr "Bloquear as MI que non fagan un intercambio de chaves"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Bloquear as mensaxes para o encerado"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Abrir o encerado automaticamente"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Asinar dixitalmente e verificar todas as mensaxes"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creando o par de chaves SILC..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
 msgid "Cannot create SILC key pair\n"
-msgstr "Non se puido crear o par de chaves SILC\n"
+msgstr "Non se pode crear o par de chaves SILC\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:358
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nome real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nome de usuario :\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "Correo electrónico: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
-msgstr "Nome do servidor: \t%s\n"
+msgstr "Nome do host: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organización: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "País: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmo: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
-msgstr "Lonxitude da clave: \t%d bits\n"
+msgstr "Lonxitude da chave: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:372
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versión: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12134,167 +9193,114 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
-"Babbleprint da chave pública:\n"
+"Impresión babble da chave pública:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Información de chave pública"
 
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Chamar"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videoconferencia"
 
-#: ../libpurple/protocols/silc/util.c:583
-#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Computador"
 
-#: ../libpurple/protocols/silc/util.c:587
-#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s enviou unha mensaxe ao encerado. Quere abrir o encerado?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
-msgstr "%s enviou unha mensaxe ao encerado da canle %s Quere abrir o encerado?"
+msgstr ""
+"%s enviou unha mensaxe ao encerado da canle %s. Quere abrir o encerado?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Encerado"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
-msgstr "Non se dispón de estatísticas do servidor"
+msgstr "Non hai estatísticas do servidor dispoñíbeis"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Fallo: Existe unha diferenza nas versións, actualice o cliente"
+msgstr "Fallo: Existe unha diferenza nas versións, actualice o seu cliente"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
 #, c-format
 msgid "Failure: Remote does not trust/support your public key"
 msgstr "Fallo: O servidor remoto non soporta/confía na súa chave pública"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
 #, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Fallo: O servidor remoto non soporta o grupo de KE proposto"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Fallo: O servidor remoto non soporta o sistema de cifrado proposto"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fallo: O servidor remoto non soporta os PKCS proposto"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
 #, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Fallo: O servidor remoto non soporta a función de hash proposta"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fallo: O servidor remoto non soporta o HMAC proposto"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
 #, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Fallo: Sinatura incorrecta"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
 #, c-format
 msgid "Failure: Invalid cookie"
-msgstr "Fallo: Cookie incorrecta"
+msgstr "Fallo: Cookie non válida"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
 #, c-format
 msgid "Failure: Authentication failed"
 msgstr "Fallo: Fallou a autenticación"
 
-#: ../libpurple/protocols/silc10/silc.c:182
 msgid "Cannot initialize SILC Client connection"
 msgstr "Non se puido inicializar a conexión do cliente SILC"
 
-#: ../libpurple/protocols/silc10/silc.c:290
 msgid "John Noname"
 msgstr "Nome Apelidos"
 
-#: ../libpurple/protocols/silc10/silc.c:320
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Non se pode localizar ou acceder ao directorio ~/.silc"
-
-#: ../libpurple/protocols/silc10/silc.c:334
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Non se puido cargar o par de chaves SILC: %s"
 
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Non se puido escribir"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1529
 msgid "Could not connect"
 msgstr "Non se puido conectar"
 
-#: ../libpurple/protocols/simple/simple.c:1059
 #, fuzzy
 msgid "Unknown server response."
-msgstr "Razón descoñecida."
+msgstr "Resposta do servidor descoñecida."
 
-#: ../libpurple/protocols/simple/simple.c:1563
-#: ../libpurple/protocols/simple/simple.c:1605
-#: ../libpurple/protocols/simple/simple.c:1618
-#: ../libpurple/protocols/simple/simple.c:1669
 msgid "Could not create listen socket"
 msgstr "Non se puido crear o conectador para escoitar"
 
-#: ../libpurple/protocols/simple/simple.c:1586
-msgid "Couldn't resolve host"
-msgstr "Non se puido resolver o servidor"
-
-#: ../libpurple/protocols/simple/simple.c:1677
-msgid "Could not resolve hostname"
-msgstr "Non se puido obter o nome do host"
-
-#: ../libpurple/protocols/simple/simple.c:1694
-msgid "SIP screen names may not contain whitespaces or @ symbols"
+#, fuzzy
+msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr ""
 "Os nomes de usuario SIP non poden conter espazos en branco nin o símbolo @"
 
@@ -12306,259 +9312,208 @@ msgstr ""
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1870
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Complemento de protocolo SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1871
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "O complemento de protocolo SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1899
 msgid "Publish status (note: everyone may watch you)"
-msgstr "Publicar estado (nota: todos poderán velo)"
+msgstr "Publicar o estado (nota: todos poderán velo)"
 
-#: ../libpurple/protocols/simple/simple.c:1905
 msgid "Use UDP"
 msgstr "Usar UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1907
 msgid "Use proxy"
 msgstr "Usar proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1909
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1911
 msgid "Auth User"
 msgstr "Usuario de autenticación"
 
-#: ../libpurple/protocols/simple/simple.c:1913
 msgid "Auth Domain"
 msgstr "Dominio de autenticación"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Buscando %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Fallou a conexión a %s"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Conectado: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Non se puido escribir o ficheiro %s."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Non se puido ler o ficheiro %s."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
-msgstr "Mensaxe demasiado longa, os últimos %s bytes foron borrados."
+msgstr "A mensaxe é demasiado longa; borrouse os últimos %s bytes."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s non está conectado agora."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Non se permiten avisos de %s."
 
-#: ../libpurple/protocols/toc/toc.c:503
 #, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
-"A mensaxe foi descartada, está a exceder o límite de velocidade do servidor."
+"Descartouse a mensaxe; vostede está a exceder o límite de velocidade do "
+"servidor."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
-msgstr "Non está dispoñible a conversa en %s."
+msgstr "Non está dispoñíbel a conversa en %s."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Está a enviar mensaxes demasiado rápido a %s."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
-msgstr "Perdeuse unha MI de %s porque era demasiado grade."
+msgstr "Perdeu unha MI de %s porque era demasiado grande."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
-msgstr "Perdeuse unha MI de %s porque se mandou demasiado rápido."
+msgstr "Perdeu unha MI de %s porque se mandou demasiado rápido."
 
-#: ../libpurple/protocols/toc/toc.c:518
 #, c-format
 msgid "Failure."
 msgstr "Fallo."
 
-#: ../libpurple/protocols/toc/toc.c:521
 #, c-format
 msgid "Too many matches."
 msgstr "Demasiados resultados."
 
-#: ../libpurple/protocols/toc/toc.c:524
 #, c-format
 msgid "Need more qualifiers."
 msgstr "Necesítanse máis cualificadores."
 
-#: ../libpurple/protocols/toc/toc.c:527
 #, c-format
 msgid "Dir service temporarily unavailable."
-msgstr "Servizo de directorio non dispoñible temporalmente."
+msgstr "Servizo de directorio non dispoñíbel temporalmente."
 
-#: ../libpurple/protocols/toc/toc.c:530
 #, c-format
 msgid "Email lookup restricted."
 msgstr "Busca de enderezos de correo electrónico restrinxida."
 
-#: ../libpurple/protocols/toc/toc.c:533
 #, c-format
 msgid "Keyword ignored."
 msgstr "Palabra chave ignorada."
 
-#: ../libpurple/protocols/toc/toc.c:536
 #, c-format
 msgid "No keywords."
 msgstr "Sen palabras chave."
 
-#: ../libpurple/protocols/toc/toc.c:539
 #, c-format
 msgid "User has no directory information."
-msgstr "O usuario non ten información no directorio."
+msgstr "O usuario non ten información de directorio."
 
-#: ../libpurple/protocols/toc/toc.c:543
 #, c-format
 msgid "Country not supported."
-msgstr "País non admitido."
+msgstr "País non soportado."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Fallo descoñecido: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
-#, c-format
-msgid "Incorrect screen name or password."
-msgstr "Nome de usuario ou contrasinal incorrecto."
+#, fuzzy, c-format
+msgid "Incorrect username or password."
+msgstr "O nome de usuario ou contrasinal non é correcto."
 
-#: ../libpurple/protocols/toc/toc.c:552
 #, c-format
 msgid "The service is temporarily unavailable."
-msgstr "Servizo non dispoñible temporalmente."
+msgstr "O servizo non está dispoñíbel temporalmente."
 
-#: ../libpurple/protocols/toc/toc.c:555
 #, c-format
 msgid "Your warning level is currently too high to log in."
-msgstr "O nivel de advertencias é demasiado alto para iniciar a sesión."
+msgstr ""
+"O seu nivel de advertencias é actualmente demasiado alto para iniciar a "
+"sesión."
 
-#: ../libpurple/protocols/toc/toc.c:558
 #, c-format
 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 ""
-"Conectouse e desconectouse demasiadas veces. Agarde dez minutos e inténteo "
-"de novo. Se segue intentándoo, poida que precise agardar máis tempo."
+"Conectouse e desconectouse con demasida frecuencia. Agarde dez minutos e "
+"inténteo de novo. Se segue intentándoo, poida que precise agardar aínda máis "
+"tempo."
 
-#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ocorreu un erro descoñecido ao conectarse: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
-msgstr "Ocorreu un erro descoñecido, %d: %s"
+msgstr "Ocorreu un erro (%d) descoñecido. Información: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
-msgstr "Nome de grupo incorrecto"
+msgstr "Nome de grupo non válido"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Conexión pechada"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Agardando resposta..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC rematou a pausa. Xa pode volver a enviar mensaxes."
+msgstr "O TOC rematou a pausa. Xa pode volver a enviar mensaxes."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "O contrasinal modificouse con éxito"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5582
-#: ../pidgin/gtkblist.c:5932
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Obter a información do directorio"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Establecer a información do directorio"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Non se puido abrir %s para escritura!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
-"Fallou a transferencia do ficheiro; posiblemente foi cancelado polo outro "
+"Fallou a transferencia do ficheiro; posibelmente foi cancelado polo outro "
 "extremo."
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Non se puido conectar para realizar a transferencia."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
-"Non se puido escribir a cabeceira do ficheiro. O ficheiro non será "
-"transferido."
+"Non se puido escribir a cabeceira do ficheiro. O ficheiro non se transferirá."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Gardar como..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 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 solicita a %s que acepte %d ficheiro: %s (%.2f %s)%s%s"
-msgstr[1] "%s solicita a %s que acepte %d ficheiro: %s (%.2f %s)%s%s"
+msgstr[1] "%s solicita a %s que acepte %d ficheiros: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
-msgstr "%s solicítalle que lle envíe un ficheiro"
+msgstr "%s solicita que lles envíe un ficheiro"
 
 #. *< type
 #. *< ui_requirement
@@ -12570,29 +9525,23 @@ msgstr "%s solicítalle que lle envíe un ficheiro"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Complemento de protocolo TOC"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:782
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
-msgstr ""
+msgstr "%s enviou unconvite de cámara web, mais aínda non está soportada."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:838
 msgid "Your Yahoo! message did not get sent."
 msgstr "A súa mensaxe Yahoo! non se enviou."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:960
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Mensaxe do sistema Yahoo! para %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1029
 msgid "Authorization denied message:"
 msgstr "Mensaxe de autorización rexeitada:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1047
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -12601,18 +9550,15 @@ msgstr ""
 "O usuario %s rexeitou (de forma retroactiva) a súa solicitude de engadilos á "
 "súa lista pola seguinte razón: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1050
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"O usuario %s rexeitou a súa solicitude de engadilos á súa lista(de forma "
-"retroactiva)."
+"O usuario %s rexeitou (de forma retroactiva) a súa solicitude de engadilos á "
+"súa lista."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1052
 msgid "Add buddy rejected"
 msgstr "Rexeitouse engadir o contacto"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1994
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -12620,14 +9566,12 @@ msgid ""
 "Check %s for updates."
 msgstr ""
 "O servidor de Yahoo pediu o uso dun método de autenticación non recoñecido. "
-"Probablemente non será capaz de conectarse con Yahoo.  Comprobe se hai "
+"Probabelmente non será capaz de conectarse con Yahoo.  Comprobe se hai "
 "actualizacións de %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1997
 msgid "Failed Yahoo! Authentication"
 msgstr "Fallou a autenticación en Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2063
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -12636,52 +9580,37 @@ msgstr ""
 "Intentou ignorar a %s, mais o usuario está na súa lista de contactos. Se "
 "selecciona \"Si\" eliminarase e ignorarase este contacto."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2066
 msgid "Ignore buddy?"
-msgstr "Ignorar o contacto?"
+msgstr "Quere ignorar o contacto?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2129
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "A conta está bloqueada. Inicie sesión no sitio web de Yahoo!."
+msgstr "A súa conta está bloqueada. Inicie unha sesión no sitio web de Yahoo!."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2132
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Erro descoñecido número %d. Se inicia sesión no sitio web de Yahoo! é "
-"posible que isto se arranxe."
+"posíbel que isto se arranxe."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2186
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Non se puido engadir o contacto %s ao grupo %s á lista no servidor para a "
 "conta %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2189
 msgid "Could not add buddy to server list"
 msgstr "Non se puido engadir o contacto á lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2308
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
-msgstr "[ Audible %s/%s/%s.swf ] %s"
+msgstr "[ Audíbel %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2651
 msgid "Received unexpected HTTP response from server."
 msgstr "Recibiuse unha resposta HTTP inesperada do servidor."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2675
-#: ../libpurple/protocols/yahoo/yahoo.c:2861
-#: ../libpurple/protocols/yahoo/yahoo.c:2964
-#: ../libpurple/protocols/yahoo/yahoo.c:2974
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problema de conexión"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2701
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12690,7 +9619,6 @@ msgstr ""
 "Perdeuse a conexión con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2726
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12699,114 +9627,74 @@ msgstr ""
 "Non se puido establecer unha conexión con %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3767
 msgid "Not at Home"
 msgstr "Fóra da casa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3770
 msgid "Not at Desk"
 msgstr "Lonxe do escritorio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3773
 msgid "Not in Office"
 msgstr "Fóra da oficina"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
 msgid "On Vacation"
 msgstr "De vacacións"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3785
 msgid "Stepped Out"
 msgstr "Abandonou"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3186
-#: ../libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Not on server list"
 msgstr "Non incluído na lista do servidor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3233
-#: ../libpurple/protocols/yahoo/yahoo.c:3291
 msgid "Appear Online"
 msgstr "Aparecer conectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3236
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
 msgid "Appear Permanently Offline"
 msgstr "Aparecer permanentemente desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3254
 msgid "Presence"
 msgstr "Presenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
 msgid "Appear Offline"
 msgstr "Aparecer desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3306
 msgid "Don't Appear Permanently Offline"
 msgstr "Non aparecer sempre desconectado"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3354
 msgid "Join in Chat"
 msgstr "Unirse a unha conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3360
 msgid "Initiate Conference"
 msgstr "Iniciar unha conferencia"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3388
 msgid "Presence Settings"
 msgstr "Configuración da presenza"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3394
 msgid "Start Doodling"
-msgstr "Comezar Doodle"
+msgstr "Comezar o Doodle"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3495
 msgid "Activate which ID?"
-msgstr "Que ID activar?"
+msgstr "Que ID quere activar?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Join whom in chat?"
 msgstr "A quen quere unir á conversa?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3518
 msgid "Activate ID..."
 msgstr "Activar ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "Join User in Chat..."
-msgstr "Unir a un usuario á conversa..."
+msgstr "Unir un usuario á conversa..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3527
 msgid "Open Inbox"
 msgstr "Abrir a caixa de entrada"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
-msgid "Buzz"
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
-#, c-format
-msgid "Buzzing %s..."
-msgstr ""
-
-#: ../libpurple/protocols/yahoo/yahoo.c:4136
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
-msgstr "join &lt;sala&gt;:  Unirse a unha sala na rede de Yahoo"
+msgstr "join &lt;sala&gt;:  Unirse a unha sala na rede Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4141
 msgid "list: List rooms on the Yahoo network"
-msgstr "list:  Mostrar as canles da rede Yahoo"
+msgstr "list:  Mostrar as salas da rede Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4149
 msgid "doodle: Request user to start a Doodle session"
-msgstr "doodle: Solicitarlle ao usuario o comezo dunha sesión Doodle"
+msgstr "doodle: Solicitar ao usuario o comezo dunha sesión Doodle"
 
 #. *< type
 #. *< ui_requirement
@@ -12818,156 +9706,119 @@ msgstr "doodle: Solicitarlle ao usuario o comezo dunha sesión Doodle"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4358
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
 msgid "Yahoo Protocol Plugin"
 msgstr "Complemento de protocolo Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4383
 msgid "Yahoo Japan"
 msgstr "Yahoo Xapón"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4386
 msgid "Pager server"
 msgstr "Servidor do buscapersoas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4389
 msgid "Japan Pager server"
 msgstr "Servidor de buscapersoas xaponés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4392
 msgid "Pager port"
 msgstr "Porto do buscapersoas"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4395
 msgid "File transfer server"
 msgstr "Servidor de transferencia de ficheiros"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4398
 msgid "Japan file transfer server"
 msgstr "Servidor de transferencia de ficheiros xaponés"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4401
 msgid "File transfer port"
 msgstr "Porto de transferencia de ficheiros"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4404
 msgid "Chat room locale"
 msgstr "Localización da sala de conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4407
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorar os convites a salas de conferencias ou de conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room list URL"
-msgstr "Url de lista de salas da conversa"
+msgstr "URL de lista de salas da conversa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Yahoo Chat server"
 msgstr "Servidor de conversa de Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4421
 msgid "Yahoo Chat port"
 msgstr "Porto de conversa de Yahoo"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Enviar unha petición Doodle."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "Non se puido establecer o descritor de ficheiro."
 
-#. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
-msgid "Write Error"
-msgstr "Erro de escritura"
+#, fuzzy, c-format
+msgid "%s is trying to send you a group of %d files.\n"
+msgstr "%s está tentándolle enviar un grupo de %d ficheiros.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Perfil de Yahoo! xaponés"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
-msgstr "Perfil Yahoo!"
+msgstr "Perfil de Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
-"Síntoo, os perfís con contido só para adultos non están admitidos aínda."
+"Síntoo, os perfís marcados como con contido só para adultos non están "
+"admitidos aínda."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
 "Se desexa ver este perfil, debería visitar esta ligazón co seu navegador web:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "ID Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Afeccións"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Últimas novas"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Páxina persoal"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Ligazón interesante 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Ligazón interesante 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Ligazón interesante 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Última actualización"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
-msgstr "Información de usuario %s non dispoñible"
+msgstr "Información de usuario %s non dispoñíbel"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
-"Síntoo, este perfil parece estar nun idioma ou nun formato aínda non "
-"admitido."
+"Síntoo, este perfil parece estar nun idioma ou nun formato que aínda non se "
+"soporta."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
-"Non se puido obter o perfil do usuario. É probable que sexa un problema "
+"Non se puido obter o perfil do usuario. É probábel que sexa un problema "
 "temporal do servidor. Probe de novo máis tarde."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
@@ -12977,86 +9828,66 @@ msgstr ""
 "usuario non existe. No entanto, ás veces Yahoo! falla ao buscar un perfil de "
 "usuario. Se está seguro de que o usuario existe inténteo de novo máis tarde."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "O perfil do usuario está baleiro."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s declinou o seu convite de conferencia na sala \"%s\" porque \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Convite rexeitado"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
-msgstr "Non se puido unir á conversa"
+msgstr "Fallou ao unirse á conversa"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Sala descoñecida"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Quizais a sala está chea"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
-msgstr "Non dispoñible"
+msgstr "Non dispoñíbel"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
 "Erro descoñecido. Pode que teña que desconectarse e agardar cinco minutos "
-"antes de poder unirse á sala da conversa"
+"antes de poder unirse de novo á sala da conversa"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:534
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Agora está conversando en %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
-msgstr "Non se puido unir o contacto á conversa"
+msgstr "Houbo un fallo ao unir o contacto á conversa"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "Quizais non están nunha conversa?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
-msgstr "Non se puido obter a lista de salas."
+msgstr "Fallou ao obter a lista de salas."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Voces"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Cámaras web"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Non se puido obter a lista de salas."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Salas de usuarios"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Produciuse un problema ao conectarse co servidor YCHT."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13065,7 +9896,6 @@ msgstr ""
 "Perdeuse a conexión co servidor\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -13073,84 +9903,65 @@ msgstr ""
 "(Houbo un erro convertendo esta mensaxe.\tComprobe a opción de "
 "'Codificación' no Editor de contas)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Non se puido enviar á conversa %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
-msgstr "Oculto ou non conectado"
+msgstr "Oculto ou sen sesión iniciada"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>En %s desde %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Calquera"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Clase:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Instancia:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Destinatario:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Fallou o intento de subscrición a %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
-msgstr "zlocate &lt;alias&gt;: Localiza un usuario"
+msgstr "zlocate &lt;alias&gt;: Localizar un usuario"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
-msgstr "zl &lt;alias&gt;: Localiza un usuario"
+msgstr "zl &lt;alias&gt;: Localizar un usuario"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;instancia&gt;: Establecer a instancia que se debe empregar "
 "nesta clase"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "inst &lt;instancia&gt;: Establecer a instancia que se debe empregar nesta "
 "clase"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
-"topic &lt;instancia&gt;: Establecee a instancia que se debe empregar nesta "
+"topic &lt;instancia&gt;: Establece a instancia que se debe empregar nesta "
 "clase"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Unirse a unha nova "
 "conversa"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
 msgid ""
 "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;instancia&gt;: Enviar unha mensaxe a &lt;mensaxe,<i>instancia</i>,"
 "*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -13158,7 +9969,6 @@ msgstr ""
 "zci &lt;clase&gt; &lt;instance&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,"
 "<i>instancia</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
 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;"
@@ -13166,7 +9976,6 @@ msgstr ""
 "zcir &lt;clase&gt; &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha "
 "mensaxe a &lt;<i>clase</i>,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -13174,15 +9983,12 @@ msgstr ""
 "zir &lt;instancia&gt; &lt;destinatario&gt;: Enviar unha mensaxe a &lt;"
 "MENSAXE,<i>instancia</i>,<i>destinatario</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr "zc &lt;clase&gt;: Enviar unha mensaxe a &lt;<i>clase</i>,PERSOAL,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
-msgstr "Re-subscribir"
+msgstr "Repetir a subscrición"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Obter as subscricións desde o servidor"
 
@@ -13196,45 +10002,33 @@ msgstr "Obter as subscricións desde o servidor"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Complemento de protocolo Zephyr"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Usar tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "Comando tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Exportar a .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Exportar a .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Importar desde .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Importar desde .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
-msgstr "Reino"
+msgstr "Dominio"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Exposición"
 
-#: ../libpurple/proxy.c:459 ../libpurple/proxy.c:894 ../libpurple/proxy.c:1049
-#: ../libpurple/proxy.c:1617
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13243,77 +10037,62 @@ msgstr ""
 "Non se puido crear un conectador:\n"
 "%s"
 
-#: ../libpurple/proxy.c:659
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Non é posible analizar a resposta desde o proxy de HTTP: %s\n"
+msgstr "Non é posíbel analizar a resposta desde o proxy HTTP: %s\n"
 
-#: ../libpurple/proxy.c:698 ../libpurple/proxy.c:744 ../libpurple/proxy.c:780
-#: ../libpurple/proxy.c:792
 #, c-format
 msgid "HTTP proxy connection error %d"
-msgstr "Erro de conexión no proxy de HTTP %d"
+msgstr "Erro de conexión no proxy HTTP %d"
 
-#: ../libpurple/proxy.c:788
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr ""
-"Acceso denegado: o servidor proxy non permite \"tunneling\" no porto %d."
+"Acceso denegado: o servidor de proxy HTTP prohibe o túnel polo porto %d."
 
-#: ../libpurple/proxy.c:1012
 #, c-format
 msgid "Error resolving %s"
-msgstr "Erro ao solucionar %s"
+msgstr "Erro ao resolver %s"
 
-#: ../libpurple/proxy.c:1714
 msgid "Could not resolve host name"
-msgstr "Non se puido resolver o nome do servidor"
+msgstr "Non se puido resolver o nome do host"
+
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr ""
+
+#, fuzzy, c-format
+msgid "%s has requested your attention!"
+msgstr "%s envioulle un zunido!"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1378
 msgid "_Yes"
 msgstr "_Si"
 
-#: ../libpurple/request.h:1378
 msgid "_No"
 msgstr "_Non"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1398
 msgid "_Accept"
 msgstr "_Aceptar"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Non estou aquí agora"
 
-#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "estados gardados"
 
-#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s chámase agora %s.\n"
 
-#: ../libpurple/server.c:302
-#, c-format
-msgid "Requesting %s's attention..."
-msgstr ""
-
-#: ../libpurple/server.c:347
-#, c-format
-msgid "%s has requested your attention!"
-msgstr ""
-
-#: ../libpurple/server.c:796
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13322,349 +10101,333 @@ msgstr ""
 "%s convidou a %s á sala de conversa %s:\n"
 "%s"
 
-#: ../libpurple/server.c:801
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s convidou a %s á sala de conversa %s\n"
 
-#: ../libpurple/server.c:805
 msgid "Accept chat invitation?"
-msgstr "Aceptar o convite para conversar?"
+msgstr "Quere aceptar o convite para conversar?"
+
+#. Shortcut
+#, fuzzy
+msgid "Shortcut"
+msgstr "Atallo"
+
+#, fuzzy
+msgid "The text-shortcut for the smiley"
+msgstr "O atallo de texto para a emoticona"
+
+#. Stored Image
+#, fuzzy
+msgid "Stored Image"
+msgstr "Imaxe gardada"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Imaxe gardada. (isto será suficiente polo de agora)"
 
-#: ../libpurple/sslconn.c:164
 #, fuzzy
 msgid "SSL Connection Failed"
-msgstr "Fallou a conexión"
+msgstr "Fallou a conexión SSL"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Fallou na negociación SSL"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
-msgstr ""
+msgstr "O par SSL presentou un certificado non válido"
 
-#: ../libpurple/sslconn.c:171
 #, fuzzy
 msgid "Unknown SSL error"
-msgstr "Erro descoñecido"
+msgstr "Erro descoñecido de SSL"
 
-#: ../libpurple/status.c:153
 msgid "Unset"
-msgstr "Quitar"
+msgstr "Desconfigurar"
 
-#: ../libpurple/status.c:156 ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Non molestar"
 
-#: ../libpurple/status.c:159
 msgid "Extended away"
-msgstr "Ausencia estendida"
+msgstr "Ausencia ampliada"
 
-#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Móbil"
 
-#: ../libpurple/status.c:609
-#, c-format
-msgid "%s changed status from %s to %s"
-msgstr "%s cambiou o estado de %s a %s"
+msgid "Listening to music"
+msgstr "Escoitando música"
 
-#: ../libpurple/status.c:619
-#, c-format
-msgid "%s is now %s"
-msgstr "%s agora é %s"
+#, fuzzy, c-format
+msgid "%s (%s) changed status from %s to %s"
+msgstr "%s (%s) cambiou o estado de %s a %s"
 
-#: ../libpurple/status.c:624
-#, c-format
-msgid "%s is no longer %s"
-msgstr "%s xa non é %s"
+#, fuzzy, c-format
+msgid "%s (%s) is now %s"
+msgstr "%s (%s) é agora %s"
+
+#, fuzzy, c-format
+msgid "%s (%s) is no longer %s"
+msgstr "%s (%s) xa non é %s"
 
-#: ../libpurple/status.c:1234
 #, c-format
 msgid "%s became idle"
 msgstr "%s agora está inactivo"
 
-#: ../libpurple/status.c:1251
 #, c-format
 msgid "%s became unidle"
 msgstr "%s agora está activo"
 
-#: ../libpurple/status.c:1314
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s agora está inactivo"
 
-#: ../libpurple/status.c:1316
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s agora está activo"
 
-#: ../libpurple/util.c:718
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2722
 #, c-format
 msgid "Error Reading %s"
 msgstr "Erro ao ler %s"
 
-#: ../libpurple/util.c:2723
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
-"Atopouse un erro ao ler o seu %s. Non se cargou e o ficheiro antigo foi "
-"renomeado a %s~."
+"Encontrouse un erro ao ler o seu %s. Non se cargaron e o ficheiro antigo "
+"renomeouse como %s~."
 
-#: ../libpurple/util.c:3223
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:3226
 msgid "Unknown."
 msgstr "Descoñecido."
 
-#: ../libpurple/util.c:3252
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
-msgstr[1] "%d segundo"
+msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:3264
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
-msgstr[1] "%d día"
+msgstr[1] "%d días"
 
-#: ../libpurple/util.c:3272
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
-msgstr[1] "%s, %d hora"
+msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:3278
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
-msgstr[1] "%d hora"
+msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:3286
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
-msgstr[1] "%s, %d minuto"
+msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:3292
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
-msgstr[1] "%d minuto"
+msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3552
 #, c-format
 msgid "Could not open %s: Redirected too many times"
-msgstr "Non se puido abrir %s: Demasiadas redireccións"
+msgstr "Non se puido abrir %s: Redireccionado demasiadas veces"
 
-#: ../libpurple/util.c:3589 ../libpurple/util.c:3885
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Non se puido conectar a %s"
 
-#: ../libpurple/util.c:3712
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
-"Non é posible asignar memoria suficiente para manter os contidos de %s. O "
-"servidor web talvez pode estar a intentar algo malintencionado."
+"Non é posíbel asignar a memoria suficiente para manter os contidos de %s. "
+"Pode que o servidor web estea intentando algo malintencionado."
 
-#: ../libpurple/util.c:3747
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Erro ao ler desde %s: %s"
 
-#: ../libpurple/util.c:3778
 #, c-format
 msgid "Error writing to %s: %s"
-msgstr "Error ao escribir a %s: %s"
+msgstr "Error ao escribir en %s: %s"
 
-#: ../libpurple/util.c:3803
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Non se pode conectar a %s: %s"
 
-#: ../pidgin.desktop.in.h:1
+#, c-format
+msgid " - %s"
+msgstr " - %s"
+
+#, fuzzy, c-format
+msgid " (%s)"
+msgstr " (%s)"
+
+#. 10053
+#, c-format
+msgid "Connection interrupted by other software on your computer."
+msgstr "A conexión foi interrompida por outro software do seu computador."
+
+#. 10054
+#, fuzzy, c-format
+msgid "Remote host closed connection."
+msgstr "O host remoto pechou a conexión."
+
+#. 10060
+#, fuzzy, c-format
+msgid "Connection timed out."
+msgstr "A conexión excedeu o tempo de espera."
+
+#. 10061
+#, fuzzy, c-format
+msgid "Connection refused."
+msgstr "Conexión rexeitada."
+
+#. 10048
+#, fuzzy, c-format
+msgid "Address already in use."
+msgstr "O enderezo xa está en uso."
+
 msgid "Internet Messenger"
 msgstr "Mensaxería na Internet"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Mensaxería na Internet de Pidgin"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Envía mensaxes instantáneas a través de múltiples protocolos"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "Orientation"
 msgstr "Orientación"
 
-#: ../pidgin/eggtrayicon.c:130
 msgid "The orientation of the tray."
-msgstr "A orientación da bandexa."
+msgstr "A orientación do panel de notificación."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:407
 msgid "Login Options"
 msgstr "Opcións de inicio de sesión"
 
-#: ../pidgin/gtkaccount.c:428
 msgid "Pro_tocol:"
 msgstr "Pro_tocolo:"
 
-#: ../pidgin/gtkaccount.c:439
-msgid "Screen _name:"
+msgid "_Username:"
 msgstr "_Nome de usuario:"
 
-#: ../pidgin/gtkaccount.c:529
-msgid "_Local alias:"
-msgstr "Alias _local:"
-
-#: ../pidgin/gtkaccount.c:533
 msgid "Remember pass_word"
-msgstr "_Recordar contrasinal"
+msgstr "_Recordar o contrasinal"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:591
 msgid "User Options"
 msgstr "Opcións de usuario"
 
-#: ../pidgin/gtkaccount.c:604
+msgid "_Local alias:"
+msgstr "Alias _local:"
+
 msgid "New _mail notifications"
 msgstr "Noti_ficacións de correo novo"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:609
 msgid "Use this buddy _icon for this account:"
 msgstr "Usar esta icona de contacto para esta conta:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "Opcións de %s"
 
-#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
-msgstr "Usar configuración de proxy de GNOME"
+msgstr "Usar a configuración de proxy de GNOME"
 
-#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Usar a configuración global do proxy"
 
-#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Sen proxy"
 
-#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1211
 msgid "Use Environmental Settings"
-msgstr "Usar a configuración do contorno"
+msgstr "Usar a configuración da contorna"
 
 #. This is an easter egg.
 #. It means one of two things, both intended as humourus:
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
-msgstr "Se miras de preto"
+msgstr "Se mira ben preto"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
-msgstr "pode ver as volvoretas apareándose"
+msgstr "pode ver as bolboretas apareándose"
 
-#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Opcións do proxy"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1205
 msgid "Proxy _type:"
 msgstr "_Tipo de proxy:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1226
 msgid "_Host:"
-msgstr "_Servidor:"
+msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1244
 msgid "_Port:"
 msgstr "_Porto:"
 
-#: ../pidgin/gtkaccount.c:1065
-msgid "_Username:"
-msgstr "Nome de _usuario:"
-
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1281
 msgid "Pa_ssword:"
 msgstr "Co_ntrasinal:"
 
-#: ../pidgin/gtkaccount.c:1195
 #, fuzzy
 msgid "Unable to save new account"
-msgstr "Imposible crear a conexión"
+msgstr "Non é posíbel gardar a conta nova"
 
-#: ../pidgin/gtkaccount.c:1196
 msgid "An account already exists with the specified criteria."
-msgstr ""
+msgstr "Xa existe unha conta cos criterios especificados."
 
-#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Engadir conta"
 
-#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Básico"
 
-#: ../pidgin/gtkaccount.c:1499
-msgid "Create this new account on the server"
-msgstr ""
+msgid "Create _this new account on the server"
+msgstr "Crear es_ta conta nova no servidor"
 
-#: ../pidgin/gtkaccount.c:1515
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../pidgin/gtkaccount.c:1973 ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Activado"
 
-#: ../pidgin/gtkaccount.c:2001
 msgid "Protocol"
 msgstr "Protocolo"
 
-#: ../pidgin/gtkaccount.c:2201
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
@@ -13674,740 +10437,668 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Benvida/o a %s!</span>\n"
 "\n"
-"Non ten ningunha conta de MI habilitada. Para comezar conéctese con %s "
-"premendo no botón <b>Engadir</b> e configure a súa conta primeiro. Se desexa "
-"que %s se conecte a varias contas de MI, prema de novo <b>Engadir</b> para "
-"configuralas\n"
+"Non ten ningunha conta de MI configurada. Para comezar conéctese con %s "
+"premendo no botón <b>Engadir</b> e configure a súa primeira conta. Se desexa "
+"que %s se conecte a varias contas de MI, prema de novo en <b>Engadir</b> "
+"para configuralas.\n"
 "\n"
 "Pode voltar outra vez a esta ventá para engadir, editar ou eliminar as "
 "contas de <b>Contas->Engadir/Editart</b> na ventá da lista de contactos"
 
-#: ../pidgin/gtkblist.c:767
-msgid "Join a Chat"
-msgstr "Unirse a unha conversa"
+#, 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] "Ten %d contacto chamado %s. Quere combinalos?"
+msgstr[1] "Agora ten %d contactos chamados %s. Quere combinalos?"
+
+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 ""
+"Ao combinar eses contactos, provocará que todos eles compartan unha única "
+"entrada na lista de contactos, e que usen unha única ventá de conversa. Pode "
+"separalos de novo seleccionando 'Expandir' no menú contextual de contactos"
+
+#, fuzzy
+msgid "Please update the necessary fields."
+msgstr "Actualice os campos necesarios."
+
+#, fuzzy
+msgid "Room _List"
+msgstr "_Lista de salas"
 
-#: ../pidgin/gtkblist.c:788
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr ""
 "Introduza a información apropiada da conversa á que desexaría unirse.\n"
 
-#. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:799 ../pidgin/gtkblist.c:5530
-#: ../pidgin/gtkblist.c:5893 ../pidgin/gtkpounce.c:539
-#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
-msgstr "Con_ta:"
+msgstr "_Conta:"
 
-#: ../pidgin/gtkblist.c:1088 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Bloquear"
 
-#: ../pidgin/gtkblist.c:1088
 msgid "Un_block"
 msgstr "Des_bloquear"
 
-#: ../pidgin/gtkblist.c:1139
+msgid "Move to"
+msgstr "Mover a"
+
 msgid "Get _Info"
 msgstr "Obter _información"
 
-#: ../pidgin/gtkblist.c:1142 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "M_I"
 
-#: ../pidgin/gtkblist.c:1148
 #, fuzzy
-msgid "_Send File"
-msgstr "Enviar o ficheiro"
+msgid "_Send File..."
+msgstr "E_nviar ficheiro..."
 
-#: ../pidgin/gtkblist.c:1155
-msgid "Add Buddy _Pounce"
-msgstr "Engadir _aviso de contacto"
+#, fuzzy
+msgid "Add Buddy _Pounce..."
+msgstr "Engadir _aviso de contacto..."
 
-#: ../pidgin/gtkblist.c:1160 ../pidgin/gtkblist.c:1164
-#: ../pidgin/gtkblist.c:1269 ../pidgin/gtkblist.c:1292
 msgid "View _Log"
 msgstr "Ver _rexistro"
 
-#: ../pidgin/gtkblist.c:1177 ../pidgin/gtkblist.c:1186
-#: ../pidgin/gtkblist.c:1277 ../pidgin/gtkblist.c:1298
+#, fuzzy
+msgid "Hide when offline"
+msgstr "Ocultar cando se está desconectado"
+
+#, fuzzy
+msgid "Show when offline"
+msgstr "Mostrar cando se está desconectado"
+
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkblist.c:1188
-#: ../pidgin/gtkblist.c:1279 ../pidgin/gtkblist.c:1300
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../pidgin/gtkblist.c:1238
-msgid "Add a _Buddy"
-msgstr "Engadir un _contacto"
+#, fuzzy
+msgid "Set Custom Icon"
+msgstr "Definir icona personalizada"
+
+msgid "Remove Custom Icon"
+msgstr "Eliminar icona personalizada"
+
+#, fuzzy
+msgid "Add _Buddy..."
+msgstr "Engadir _contacto..."
 
-#: ../pidgin/gtkblist.c:1241
-msgid "Add a C_hat"
-msgstr "Engadir unha _conversa"
+#, fuzzy
+msgid "Add C_hat..."
+msgstr "Engadir con_versa..."
 
-#: ../pidgin/gtkblist.c:1244
 msgid "_Delete Group"
 msgstr "_Borrar o grupo"
 
-#: ../pidgin/gtkblist.c:1246
 msgid "_Rename"
 msgstr "_Renomear"
 
 #. join button
-#: ../pidgin/gtkblist.c:1265 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Unirse"
 
-#: ../pidgin/gtkblist.c:1267
 msgid "Auto-Join"
-msgstr "Conectarse automaticamente"
+msgstr "Unirse automaticamente"
+
+#, fuzzy
+msgid "Persistent"
+msgstr "Persistente"
+
+#, fuzzy
+msgid "_Edit Settings..."
+msgstr "_Editar a configuración..."
 
-#: ../pidgin/gtkblist.c:1305 ../pidgin/gtkblist.c:1329
 msgid "_Collapse"
 msgstr "_Contraer"
 
-#: ../pidgin/gtkblist.c:1334
 msgid "_Expand"
 msgstr "_Expandir"
 
-#: ../pidgin/gtkblist.c:1585 ../pidgin/gtkblist.c:1597
-#: ../pidgin/gtkblist.c:4603 ../pidgin/gtkblist.c:4616
 msgid "/Tools/Mute Sounds"
 msgstr "/Ferramentas/Silenciar sons"
 
-#: ../pidgin/gtkblist.c:2057 ../pidgin/gtkconv.c:4840
-#: ../pidgin/gtkpounce.c:430
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Actualmente non está conectado con ningunha conta que poida engadir a ese "
 "contacto."
 
+#. I don't believe this can happen currently, I think
+#. * everything that calls this function checks for one of the
+#. * above node types first.
+#, fuzzy
+msgid "Unknown node type"
+msgstr "Tipo de nodo descoñecido"
+
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2869
 msgid "/_Buddies"
 msgstr "/_Contactos"
 
-#: ../pidgin/gtkblist.c:2870
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contactos/_Mensaxe instantánea nova..."
 
-#: ../pidgin/gtkblist.c:2871
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contactos/_Unirse a unha conversa..."
 
-#: ../pidgin/gtkblist.c:2872
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contactos/Obter _información do usuario..."
 
-#: ../pidgin/gtkblist.c:2873
 msgid "/Buddies/View User _Log..."
 msgstr "/Contactos/Ver _rexistro do usuario..."
 
-#: ../pidgin/gtkblist.c:2875
 #, fuzzy
-msgid "/Buddies/Show"
-msgstr "/_Contactos"
+msgid "/Buddies/Sh_ow"
+msgstr "/Contactos/M_ostrar"
 
-#: ../pidgin/gtkblist.c:2876
 #, fuzzy
 msgid "/Buddies/Show/_Offline Buddies"
-msgstr "/Contactos/Mostrar contactos _desconectados"
+msgstr "/Contactos/Mostrar/Contactos _desconectados"
 
-#: ../pidgin/gtkblist.c:2877
 #, fuzzy
 msgid "/Buddies/Show/_Empty Groups"
-msgstr "/Contactos/Mostrar grupos _baleiros"
+msgstr "/Contactos/Mostrar/Grupos _baleiros"
 
-#: ../pidgin/gtkblist.c:2878
 #, fuzzy
 msgid "/Buddies/Show/Buddy _Details"
-msgstr "/Contactos/Mostrar detalles de _contactos"
+msgstr "/Contactos/Mostrar/Detalles de _contactos"
 
-#: ../pidgin/gtkblist.c:2879
 #, fuzzy
 msgid "/Buddies/Show/Idle _Times"
-msgstr "/Contactos/Mostrar _tempo de ausencia"
+msgstr "/Contactos/Mostrar/_Tempos de ausencia"
 
-#: ../pidgin/gtkblist.c:2880
 #, fuzzy
 msgid "/Buddies/Show/_Protocol Icons"
-msgstr "/Contactos/Mostrar grupos _baleiros"
+msgstr "/Contactos/Mostrar/Iconas de _protocolo"
 
-#: ../pidgin/gtkblist.c:2881
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contactos/_Ordenar contactos"
 
-#: ../pidgin/gtkblist.c:2883
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contactos/_Engadir un contacto..."
 
-#: ../pidgin/gtkblist.c:2884
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contactos/Engadir unha con_versa..."
 
-#: ../pidgin/gtkblist.c:2885
 msgid "/Buddies/Add _Group..."
 msgstr "/Contactos/Engadir un _grupo..."
 
-#: ../pidgin/gtkblist.c:2887
 msgid "/Buddies/_Quit"
 msgstr "/Contactos/_Saír"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2890
 msgid "/_Accounts"
 msgstr "/Con_tas"
 
-#: ../pidgin/gtkblist.c:2891 ../pidgin/gtkblist.c:6589
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Contas/Engadir\\/Editar"
+#, fuzzy
+msgid "/Accounts/Manage Accounts"
+msgstr "/Contas/Xestionar contas"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2894
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: ../pidgin/gtkblist.c:2895
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Ferramentas/_Avisos de contacto"
 
-#: ../pidgin/gtkblist.c:2896
 #, fuzzy
 msgid "/Tools/_Certificates"
-msgstr "/Ferramentas/Pr_eferencias"
+msgstr "/Ferramentas/_Certificados"
 
-#: ../pidgin/gtkblist.c:2897
 msgid "/Tools/Plu_gins"
 msgstr "/Ferramentas/C_omplementos"
 
-#: ../pidgin/gtkblist.c:2898
 msgid "/Tools/Pr_eferences"
 msgstr "/Ferramentas/Pr_eferencias"
 
-#: ../pidgin/gtkblist.c:2899
 msgid "/Tools/Pr_ivacy"
 msgstr "/Ferramentas/Pr_ivacidade"
 
-#: ../pidgin/gtkblist.c:2901
+#, fuzzy
+msgid "/Tools/Smile_y"
+msgstr "/Ferramentas/E_moticona"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Ferramentas/Transferencias de _ficheiros"
 
-#: ../pidgin/gtkblist.c:2902
 msgid "/Tools/R_oom List"
 msgstr "/Ferramentas/Lista de _salas"
 
-#: ../pidgin/gtkblist.c:2903
 msgid "/Tools/System _Log"
 msgstr "/Ferramentas/_Rexistro do sistema"
 
-#: ../pidgin/gtkblist.c:2905
 msgid "/Tools/Mute _Sounds"
 msgstr "/Ferramentas/Silenciar s_ons"
 
 #. Help
-#: ../pidgin/gtkblist.c:2907
 msgid "/_Help"
 msgstr "/A_xuda"
 
-#: ../pidgin/gtkblist.c:2908
 msgid "/Help/Online _Help"
 msgstr "/Axuda/A_xuda en liña"
 
-#: ../pidgin/gtkblist.c:2909
 msgid "/Help/_Debug Window"
 msgstr "/Axuda/Ventá de _depuración"
 
-#: ../pidgin/gtkblist.c:2911 ../pidgin/gtkblist.c:2913
 msgid "/Help/_About"
-msgstr "/Axuda/_Acerca de"
+msgstr "/Axuda/_Sobre"
 
-#: ../pidgin/gtkblist.c:2942
-#, c-format
+#, fuzzy, c-format
+msgid "<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>Conta:</b> %s"
+
+#, fuzzy, c-format
 msgid ""
 "\n"
-"<b>Account:</b> %s"
+"<b>Occupants:</b> %d"
 msgstr ""
 "\n"
-"<b>Conta:</b> %s"
+"<b>Ocupantes:</b> %d"
+
+#, fuzzy, c-format
+msgid ""
+"\n"
+"<b>Topic:</b> %s"
+msgstr ""
+"\n"
+"<b>Asunto:</b> %s"
+
+#, fuzzy
+msgid "(no topic set)"
+msgstr "(non se definiu un asunto)"
 
-#: ../pidgin/gtkblist.c:3020
 msgid "Buddy Alias"
 msgstr "Alias de contacto"
 
-#: ../pidgin/gtkblist.c:3049
 msgid "Logged In"
-msgstr "Xa está conectado"
+msgstr "Con sesión iniciada"
 
-#: ../pidgin/gtkblist.c:3095
 msgid "Last Seen"
 msgstr "Última vista"
 
-#: ../pidgin/gtkblist.c:3116
 msgid "Spooky"
 msgstr "Espeluznante"
 
-#: ../pidgin/gtkblist.c:3118
 msgid "Awesome"
 msgstr "Impresionante"
 
-#: ../pidgin/gtkblist.c:3120
 msgid "Rockin'"
 msgstr "Brillante"
 
-#: ../pidgin/gtkblist.c:3453
+#, fuzzy
+msgid "Total Buddies"
+msgstr "Total de contactos"
+
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactivo %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3455
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactivo %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3457
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactivo %dm"
 
-#: ../pidgin/gtkblist.c:3602
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacto/Mensaxe instantánea _nova..."
 
-#: ../pidgin/gtkblist.c:3603 ../pidgin/gtkblist.c:3636
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacto/Unirse a unha conversa..."
 
-#: ../pidgin/gtkblist.c:3604
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacto/Obter información do usuario..."
 
-#: ../pidgin/gtkblist.c:3605
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacto/Engadir un contacto..."
 
-#: ../pidgin/gtkblist.c:3606 ../pidgin/gtkblist.c:3639
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacto/Engadir unha conversa..."
 
-#: ../pidgin/gtkblist.c:3607
 msgid "/Buddies/Add Group..."
 msgstr "/Contacto/Engadir un grupo..."
 
-#: ../pidgin/gtkblist.c:3642
 msgid "/Tools/Privacy"
 msgstr "/Ferramentas/Privacidade"
 
-#: ../pidgin/gtkblist.c:3645
 msgid "/Tools/Room List"
 msgstr "/Ferramentas/Lista de salas"
 
-#: ../pidgin/gtkblist.c:3742 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d mensaxes sen ler de %s\n"
+msgstr[0] "%d mensaxe sen ler de %s\n"
 msgstr[1] "%d mensaxes sen ler de %s\n"
 
-#: ../pidgin/gtkblist.c:3822
 msgid "Manually"
 msgstr "Manualmente"
 
-#: ../pidgin/gtkblist.c:3824
-msgid "Alphabetically"
-msgstr "Alfabeticamente"
-
-#: ../pidgin/gtkblist.c:3825
 msgid "By status"
 msgstr "Por estado"
 
-#: ../pidgin/gtkblist.c:3826
 msgid "By log size"
 msgstr "Por tamaño de rexistro"
 
-#: ../pidgin/gtkblist.c:4031 ../pidgin/gtkconn.c:179
 #, c-format
 msgid "%s disconnected"
 msgstr "%s desconectado"
 
-#: ../pidgin/gtkblist.c:4067
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s desconectado: %s</span>"
+#, fuzzy, c-format
+msgid "%s disabled"
+msgstr "%s desactivado"
+
+#, fuzzy
+msgid "Reconnect"
+msgstr "Conectar de novo"
+
+#, fuzzy
+msgid "Re-enable"
+msgstr "Activar de novo"
+
+msgid "Welcome back!"
+msgstr "Benvida/o de novo!"
+
+#, fuzzy, c-format
+msgid "%d account was disabled because you signed on from another location:"
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location:"
+msgstr[0] ""
+"%d conta foi desactivada porque se conectou desde outra localización:"
+msgstr[1] ""
+"%d contas foron desactivada porque se conectou desde outra localización:"
 
-#: ../pidgin/gtkblist.c:4219
 msgid "<b>Username:</b>"
 msgstr "<b>Nome de usuario:</b>"
 
-#: ../pidgin/gtkblist.c:4226
 msgid "<b>Password:</b>"
 msgstr "<b>Contrasinal:</b>"
 
-#: ../pidgin/gtkblist.c:4237
 msgid "_Login"
-msgstr "_Iniciar a sesión"
+msgstr "_Inicio de sesión"
 
-#: ../pidgin/gtkblist.c:4320
 msgid "/Accounts"
 msgstr "/Contas"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4334
 #, fuzzy, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Benvida/o a %s!</span>\n"
 "\n"
-"Non ten ningunha conta habilitada. Active as súas contas de MI desde  a "
-"ventá de <b>Contas</b> en <b>Contas->Engadir/Editar</b>. Unha vez actives as "
-"túas contas, poderá conectarse, establecer o seu estado e falar cos seus "
+"Non ten ningunha conta habilitada. Active as súas contas de MI desde a ventá "
+"de <b>Contas</b> en <b>Contas->Engadir/Editar</b>. Unha vez que active as "
+"súas contas, poderá conectarse, establecer o seu estado e falar cos seus "
 "amigos."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4597
 #, fuzzy
 msgid "/Buddies/Show/Offline Buddies"
-msgstr "/Contactos/Mostrar contactos desconectados"
+msgstr "/Contactos/Mostrar/Contactos desconectados"
 
-#: ../pidgin/gtkblist.c:4600
 #, fuzzy
 msgid "/Buddies/Show/Empty Groups"
-msgstr "/Contactos/Mostrar grupos baleiros"
+msgstr "/Contactos/Mostrar/Grupos baleiros"
 
-#: ../pidgin/gtkblist.c:4606
 #, fuzzy
 msgid "/Buddies/Show/Buddy Details"
-msgstr "/Contactos/Mostrar detalles de contactos"
+msgstr "/Contactos/Mostrar/Detalles de contactos"
 
-#: ../pidgin/gtkblist.c:4609
 #, fuzzy
 msgid "/Buddies/Show/Idle Times"
-msgstr "/Contactos/Mostrar tempos de ausencia"
+msgstr "/Contactos/Mostrar/Tempo de ausencia"
 
-#: ../pidgin/gtkblist.c:4612
 #, fuzzy
 msgid "/Buddies/Show/Protocol Icons"
-msgstr "/Contactos/Mostrar grupos baleiros"
+msgstr "/Contactos/Mostrar/Iconas de protocolo"
 
-#: ../pidgin/gtkblist.c:5507
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"Introduza o nome de usuario da persoa que quere engadir á lista. "
-"Opcionalmente, pode introducir un alias. O alias mostrarase en lugar do nome "
-"de usuario sempre que for posible.\n"
+#, fuzzy
+msgid "Add a buddy.\n"
+msgstr "Engadir un contacto.\n"
 
-#. End of account box
-#: ../pidgin/gtkblist.c:5542
-msgid "_Screen name:"
-msgstr "_Nome de usuario:"
+#, fuzzy
+msgid "Buddy's _username:"
+msgstr "Nome de _usuario do contacto:"
 
-#: ../pidgin/gtkblist.c:5564 ../pidgin/gtkblist.c:5914
-msgid "A_lias:"
-msgstr "A_lias:"
+#, fuzzy
+msgid "(Optional) A_lias:"
+msgstr "(Opcional) A_lias:"
+
+#, fuzzy
+msgid "Add buddy to _group:"
+msgstr "Engadir o contacto ao _grupo:"
 
-#: ../pidgin/gtkblist.c:5826
 msgid "This protocol does not support chat rooms."
-msgstr "Este protocolo non está soportado nas salas de conversa."
+msgstr "Este protocolo non soporta as salas de conversa."
 
-#: ../pidgin/gtkblist.c:5842
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr ""
-"Non está conectado con ningunha conta que teña capacidade de acceder a "
+"Non está conectado con ningún protocolo que teñan a capacidade de acceder a "
 "conversas."
 
-#: ../pidgin/gtkblist.c:5883
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "Introduza un alias e a información que crea apropiada da conversa que "
-"desexaría engadir á lista de contactos.\n"
+"desexaría engadir á súa lista de contactos.\n"
+
+msgid "A_lias:"
+msgstr "A_lias:"
+
+msgid "Auto_join when account becomes online."
+msgstr "_Unirse automatiamente cando unha conta se volve activa."
+
+msgid "_Hide chat when the window is closed."
+msgstr "_Ocultar a conversa cando a ventá está pechada."
 
-#: ../pidgin/gtkblist.c:5964
 msgid "Please enter the name of the group to be added."
 msgstr "Introduza o nome do grupo que quere engadir."
 
-#: ../pidgin/gtkblist.c:6609
+msgid "Enable Account"
+msgstr "Activar a conta"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Contas/Activar conta"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Contas/"
 
-#: ../pidgin/gtkblist.c:6633
 msgid "_Edit Account"
 msgstr "_Editar a conta"
 
-#: ../pidgin/gtkblist.c:6646 ../pidgin/gtkconv.c:3073
 msgid "No actions available"
-msgstr "Non hai accións dispoñibles"
+msgstr "Non hai accións dispoñíbeis"
 
-#: ../pidgin/gtkblist.c:6654
 msgid "_Disable"
 msgstr "_Desactivar"
 
-#: ../pidgin/gtkblist.c:6666
-msgid "Enable Account"
-msgstr "Activar a conta"
-
-#: ../pidgin/gtkblist.c:6672
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Contas/Activar conta"
-
-#: ../pidgin/gtkblist.c:6721
 msgid "/Tools"
 msgstr "/Ferramentas"
 
-#: ../pidgin/gtkblist.c:6791
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contactos/Ordenar contactos"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
 #, fuzzy
 msgid "SSL Servers"
-msgstr "Servidor"
-
-#: ../pidgin/gtkconn.c:180
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"%s will not attempt to reconnect the account until you correct the error and "
-"re-enable the account."
-msgstr ""
-"%s\n"
-"\n"
-"%s non tentará reconectar a conta até que vostede corrixa o erro e a volva "
-"activar."
+msgstr "Servidores SSL"
 
-#: ../pidgin/gtkconv.c:482
 msgid "Unknown command."
 msgstr "Comando descoñecido."
 
-#: ../pidgin/gtkconv.c:754 ../pidgin/gtkconv.c:780
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Ese contacto non utiliza o mesmo protocolo que esta conversa."
 
-#: ../pidgin/gtkconv.c:774
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Non está conectado con ningunha conta coa que poida convidar a ese contacto."
 
-#: ../pidgin/gtkconv.c:827
 msgid "Invite Buddy Into Chat Room"
 msgstr "Convidar a un contacto á sala de conversa"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:857
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
 msgstr ""
-"Introduza o nome de usuario que desexa convidar, xunto cunha mensaxe de "
+"Introduza o nome do usuario que desexa convidar, xunto cunha mensaxe de "
 "convite opcional."
 
-#: ../pidgin/gtkconv.c:878
 msgid "_Buddy:"
 msgstr "_Contacto:"
 
-#: ../pidgin/gtkconv.c:889 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1528
 msgid "_Message:"
 msgstr "_Mensaxe:"
 
-#: ../pidgin/gtkconv.c:947 ../pidgin/gtkconv.c:2598 ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
-msgid "Unable to open file."
-msgstr "Non se puido abrir o ficheiro."
-
-#: ../pidgin/gtkconv.c:953
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Conversa con %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:991
 msgid "Save Conversation"
 msgstr "Gardar conversa"
 
-#: ../pidgin/gtkconv.c:1140 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Buscar"
 
-#: ../pidgin/gtkconv.c:1166 ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Buscar:"
 
-#: ../pidgin/gtkconv.c:1622
 msgid "Un-Ignore"
 msgstr "Non ignorar"
 
-#: ../pidgin/gtkconv.c:1625
 msgid "Ignore"
 msgstr "Ignorar"
 
-#: ../pidgin/gtkconv.c:1645
 msgid "Get Away Message"
 msgstr "Mensaxe de ausencia"
 
-#: ../pidgin/gtkconv.c:1668
 msgid "Last said"
 msgstr "Dito a última vez"
 
-#: ../pidgin/gtkconv.c:2606
 msgid "Unable to save icon file to disk."
 msgstr "Non se puido gardar o ficheiro de iconas no disco."
 
-#: ../pidgin/gtkconv.c:2657
 msgid "Save Icon"
 msgstr "Gardar icona"
 
-#: ../pidgin/gtkconv.c:2709
 msgid "Animate"
 msgstr "Animar"
 
-#: ../pidgin/gtkconv.c:2714
 msgid "Hide Icon"
 msgstr "Ocultar icona"
 
-#: ../pidgin/gtkconv.c:2717
 msgid "Save Icon As..."
 msgstr "Gardar a icona como..."
 
-#: ../pidgin/gtkconv.c:2721
 msgid "Set Custom Icon..."
 msgstr "Establecer iconas personalizadas..."
 
-#: ../pidgin/gtkconv.c:2734
-msgid "Remove Custom Icon"
-msgstr "Eliminar as iconas personalizadas"
+#, fuzzy
+msgid "Change Size"
+msgstr "Cambiar o tamaño"
 
-#: ../pidgin/gtkconv.c:2861
 msgid "Show All"
-msgstr ""
+msgstr "Mostrar todo"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2880
 msgid "/_Conversation"
 msgstr "/_Conversa"
 
-#: ../pidgin/gtkconv.c:2882
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Conversa/_Mensaxe instantánea nova..."
 
-#: ../pidgin/gtkconv.c:2887
 msgid "/Conversation/_Find..."
 msgstr "/Conversa/_Buscar..."
 
-#: ../pidgin/gtkconv.c:2889
 msgid "/Conversation/View _Log"
 msgstr "/Conversa/Ver _rexistro"
 
-#: ../pidgin/gtkconv.c:2890
 msgid "/Conversation/_Save As..."
 msgstr "/Conversa/_Gardar como..."
 
-#: ../pidgin/gtkconv.c:2892
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Conversa/Limpar _historial"
 
-#: ../pidgin/gtkconv.c:2896
 msgid "/Conversation/Se_nd File..."
 msgstr "/Conversa/E_nviar ficheiro..."
 
-#: ../pidgin/gtkconv.c:2897
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Conversa/Engadir _aviso de contacto..."
 
-#: ../pidgin/gtkconv.c:2899
 msgid "/Conversation/_Get Info"
 msgstr "/Conversa/_Obter información"
 
-#: ../pidgin/gtkconv.c:2901
 msgid "/Conversation/In_vite..."
 msgstr "/Conversa/Con_vidar..."
 
-#: ../pidgin/gtkconv.c:2903
 msgid "/Conversation/M_ore"
 msgstr "/Conversa/Má_is"
 
-#: ../pidgin/gtkconv.c:2907
 msgid "/Conversation/Al_ias..."
 msgstr "/Conversa/A_lias..."
 
-#: ../pidgin/gtkconv.c:2909
 msgid "/Conversation/_Block..."
 msgstr "/Conversa/_Bloquear..."
 
-#: ../pidgin/gtkconv.c:2911
 msgid "/Conversation/_Unblock..."
 msgstr "/Conversa/_Desbloquear..."
 
-#: ../pidgin/gtkconv.c:2913
 msgid "/Conversation/_Add..."
 msgstr "/Conversa/Enga_dir..."
 
-#: ../pidgin/gtkconv.c:2915
 msgid "/Conversation/_Remove..."
 msgstr "/Conversa/_Eliminar..."
 
-#: ../pidgin/gtkconv.c:2920
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Conversa/Inserir liga_zón..."
 
-#: ../pidgin/gtkconv.c:2922
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Conversa/Inserir ima_xe..."
 
-#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/_Close"
 msgstr "/Conversa/_Pechar"
 
 #. Options
-#: ../pidgin/gtkconv.c:2932
 msgid "/_Options"
 msgstr "/_Opcións"
 
-#: ../pidgin/gtkconv.c:2933
 msgid "/Options/Enable _Logging"
 msgstr "/Opcións/Activar _rexistro"
 
-#: ../pidgin/gtkconv.c:2934
 msgid "/Options/Enable _Sounds"
 msgstr "/Opcións/Activar _sons"
 
-#: ../pidgin/gtkconv.c:2936
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opcións/Mostrar _barra de formato"
 
-#: ../pidgin/gtkconv.c:2937
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opcións/Mostrar _marcas de tempo"
 
-#: ../pidgin/gtkconv.c:3061
 msgid "/Conversation/More"
 msgstr "/Conversa/Máis"
 
-#: ../pidgin/gtkconv.c:3117
 msgid "/Options"
 msgstr "/Opcións"
 
@@ -14416,589 +11107,442 @@ msgstr "/Opcións"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3152 ../pidgin/gtkconv.c:3184
 msgid "/Conversation"
 msgstr "/Conversa"
 
-#: ../pidgin/gtkconv.c:3192
 msgid "/Conversation/View Log"
 msgstr "/Conversa/Ver o rexistro"
 
-#: ../pidgin/gtkconv.c:3198
 msgid "/Conversation/Send File..."
 msgstr "/Conversa/Enviar o ficheiro..."
 
-#: ../pidgin/gtkconv.c:3202
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Conversa/Engadir un aviso de contacto..."
 
-#: ../pidgin/gtkconv.c:3208
 msgid "/Conversation/Get Info"
 msgstr "/Conversa/Obter información"
 
-#: ../pidgin/gtkconv.c:3212
 msgid "/Conversation/Invite..."
 msgstr "/Conversa/Convidar..."
 
-#: ../pidgin/gtkconv.c:3218
 msgid "/Conversation/Alias..."
 msgstr "/Conversa/Alias..."
 
-#: ../pidgin/gtkconv.c:3222
 msgid "/Conversation/Block..."
 msgstr "/Conversa/Bloquear..."
 
-#: ../pidgin/gtkconv.c:3226
 msgid "/Conversation/Unblock..."
 msgstr "/Conversa/Desbloquear..."
 
-#: ../pidgin/gtkconv.c:3230
 msgid "/Conversation/Add..."
 msgstr "/Conversa/Engadir..."
 
-#: ../pidgin/gtkconv.c:3234
 msgid "/Conversation/Remove..."
 msgstr "/Conversa/Eliminar..."
 
-#: ../pidgin/gtkconv.c:3240
 msgid "/Conversation/Insert Link..."
 msgstr "/Conversa/Inserir ligazón..."
 
-#: ../pidgin/gtkconv.c:3244
 msgid "/Conversation/Insert Image..."
 msgstr "/Conversa/Inserir unha imaxe..."
 
-#: ../pidgin/gtkconv.c:3250
 msgid "/Options/Enable Logging"
 msgstr "/Opcións/Activar rexistro"
 
-#: ../pidgin/gtkconv.c:3253
 msgid "/Options/Enable Sounds"
 msgstr "/Opcións/Activar sons"
 
-#: ../pidgin/gtkconv.c:3266
 msgid "/Options/Show Formatting Toolbars"
-msgstr "/Opcións/Mostrar barra de formato"
+msgstr "/Opcións/Mostrar as barras de formato"
 
-#: ../pidgin/gtkconv.c:3269
 msgid "/Options/Show Timestamps"
-msgstr "/Opcións/Mostrar marcas de tempo"
+msgstr "/Opcións/Mostrar as marcas de tempo"
 
-#: ../pidgin/gtkconv.c:3346 ../pidgin/gtkconv.c:3388
 msgid "User is typing..."
-msgstr "O usuario está a escribir..."
+msgstr "O usuario está escribindo..."
 
-#: ../pidgin/gtkconv.c:3391
-msgid "User has typed something and stopped"
-msgstr "O usuario escribiu algo e parou"
+#, fuzzy, c-format
+msgid ""
+"\n"
+"%s has stopped typing"
+msgstr ""
+"\n"
+"%s deixou de escribir"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3574 ../pidgin/gtkconv.c:8022
-msgid "_Send To"
+#, fuzzy
+msgid "S_end To"
 msgstr "_Enviar a"
 
-#: ../pidgin/gtkconv.c:4286
 msgid "_Send"
-msgstr "_Enviar"
+msgstr "E_nviar"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4390
 msgid "0 people in room"
 msgstr "0 persoas na sala"
 
-#: ../pidgin/gtkconv.c:5759 ../pidgin/gtkconv.c:5880
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoa na sala"
-msgstr[1] "%d persoa na sala"
+msgstr[1] "%d persoas na sala"
 
-#: ../pidgin/gtkconv.c:6486 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Escribindo"
 
-#: ../pidgin/gtkconv.c:6490
 msgid "Stopped Typing"
 msgstr "Deixou de escribir"
 
-#: ../pidgin/gtkconv.c:6493
 msgid "Nick Said"
-msgstr "Alias dixo"
+msgstr "O alias dixo"
 
-#: ../pidgin/gtkconv.c:6496 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
-msgstr "Mensaxes sen ler"
+msgstr "Mensaxes non lidas"
 
-#: ../pidgin/gtkconv.c:6499
 msgid "New Event"
 msgstr "Evento novo"
 
-#: ../pidgin/gtkconv.c:7572
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Limpa todos os historiais de conversas."
 
-#: ../pidgin/gtkconv.c:7736
 msgid "Confirm close"
 msgstr "Confirmar o peche"
 
-#: ../pidgin/gtkconv.c:7768
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Hai mensaxes sen ler. Seguro que quere pechar a ventá?"
+msgstr "Ten mensaxes sen ler. Está seguro de que quere pechar a ventá?"
 
-#: ../pidgin/gtkconv.c:8355
 msgid "Close other tabs"
 msgstr "Pechar outros separadores"
 
-#: ../pidgin/gtkconv.c:8361
 msgid "Close all tabs"
-msgstr "Pechar todas os separadores"
+msgstr "Pechar todos os separadores"
 
-#: ../pidgin/gtkconv.c:8369
 msgid "Detach this tab"
-msgstr "Separar este separador"
+msgstr "Desprender este separador"
 
-#: ../pidgin/gtkconv.c:8375
 msgid "Close this tab"
 msgstr "Pechar este separador"
 
-#: ../pidgin/gtkconv.c:8875
 msgid "Close conversation"
 msgstr "Pechar a conversa"
 
-#: ../pidgin/gtkconv.c:9477
 msgid "Last created window"
 msgstr "Última ventá creada"
 
-#: ../pidgin/gtkconv.c:9479
 msgid "Separate IM and Chat windows"
 msgstr "Separar as ventás de MI e de conversa"
 
-#: ../pidgin/gtkconv.c:9481 ../pidgin/gtkprefs.c:1415
 msgid "New window"
 msgstr "Nova ventá"
 
-#: ../pidgin/gtkconv.c:9483
 msgid "By group"
 msgstr "Por grupo"
 
-#: ../pidgin/gtkconv.c:9485
 msgid "By account"
 msgstr "Por conta"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Gardar rexistro de depuración"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Inverter"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
-msgstr "Coincidencias resaltadas"
+msgstr "Realzar as coincidencias"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
-msgstr "_Só iconas"
+msgstr "Só _iconas"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
-msgstr "_Só texto"
+msgstr "Só _texto"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
-msgstr "_Texto e iconas"
+msgstr "Texto _e iconas"
 
-#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "Filtro"
 
-#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr "Premer co botón dereito para máis opcións."
 
-#: ../pidgin/gtkdebug.c:824
 msgid "Level "
-msgstr "Nivel"
+msgstr "Nivel "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "Seleccione o nivel do filtro de depuración."
 
-#: ../pidgin/gtkdebug.c:833
 msgid "All"
-msgstr "Todos"
+msgstr "Todo"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr "Diversos"
 
-#: ../pidgin/gtkdebug.c:836
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../pidgin/gtkdebug.c:837
 msgid "Error "
-msgstr "Erro"
+msgstr "Erro "
 
-#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr "Erro moi grave"
 
-#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:117
-msgid "lead developer"
-msgstr "desenvolvedor principal"
-
-#: ../pidgin/gtkdialogs.c:73 ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75 ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77 ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "desenvolvedor"
 
-#: ../pidgin/gtkdialogs.c:87
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr "Ka-Hing Cheung"
+
 msgid "support"
 msgstr "soporte"
 
-#: ../pidgin/gtkdialogs.c:88
 msgid "support/QA"
 msgstr "soporte/QA"
 
-#: ../pidgin/gtkdialogs.c:90 ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "desenvolvedor e webmaster"
 
-#: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
-msgstr ""
+msgstr "Contribuínte sénior/QA"
 
-#: ../pidgin/gtkdialogs.c:108
 msgid "win32 port"
 msgstr "adaptación a win32"
 
-#: ../pidgin/gtkdialogs.c:109 ../pidgin/gtkdialogs.c:110
 msgid "maintainer"
 msgstr "mantedor"
 
-#: ../pidgin/gtkdialogs.c:111
 msgid "libfaim maintainer"
 msgstr "mantedor de libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
-msgstr "hacker e deseñador de controladores [lazy bum]"
+msgstr "hacker e deseñador de controladores [vagabundo preguizoso]"
 
-#: ../pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
-msgstr "Desenvolvedor XMPP"
+msgstr "desenvolvedor XMPP"
 
-#: ../pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "autor orixinal"
 
-#: ../pidgin/gtkdialogs.c:133
+msgid "lead developer"
+msgstr "desenvolvedor principal"
+
 msgid "Afrikaans"
-msgstr "Africano"
+msgstr "Africáner"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr "Árabe"
 
-#: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "Bieloruso Latín"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "Búlgaro"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "Bengalí"
 
-#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
-msgstr "Bosnio"
+msgstr "Bosníaco"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "Catalán"
 
-#: ../pidgin/gtkdialogs.c:144 ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
-msgstr "Valenciano"
+msgstr "Valenciano-Catalán"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "Checo"
 
-#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "Danés"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "Alemán"
 
-#: ../pidgin/gtkdialogs.c:151 ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "Grego"
 
-#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "Inglés australiano"
 
-#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "Inglés canadense"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "Inglés británico"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
-msgstr "Español"
+msgstr "Castelán"
 
-#: ../pidgin/gtkdialogs.c:161
 msgid "Estonian"
-msgstr "Estonio"
+msgstr "Estoniano"
 
-#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "Euskera"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "Persa"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
-msgstr "Finlandés"
+msgstr "Finés"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "Francés"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "Galego"
 
-#: ../pidgin/gtkdialogs.c:171 ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
-msgstr "Gujarati"
+msgstr "Guxarati"
 
-#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
 msgstr "Equipo de idioma de Gujarati"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "Hebreo"
 
-#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
-msgstr "Hindú"
+msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "Húngaro"
 
-#: ../pidgin/gtkdialogs.c:176
 msgid "Indonesian"
 msgstr "Indonesio"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "Italiano"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "Xaponés"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "Xeorxiano"
 
-#: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr "Tradutores xeorxianos de Ubuntu"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
 msgstr "Equipo de tradución ao Kannada"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "Coreano"
 
-#: ../pidgin/gtkdialogs.c:182 ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
-msgstr "Curdo"
+msgstr "Kurdo"
 
-#: ../pidgin/gtkdialogs.c:185
 #, fuzzy
 msgid "Lao"
-msgstr "León"
+msgstr "Lao"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "Lituano"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "Macedonio"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
 msgid "Bokmål Norwegian"
-msgstr "Bokmål noruegués"
+msgstr "Noruegués Bokmål"
 
-#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
-msgstr "Bengalí"
+msgstr "Nepalí"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Dutch, Flemish"
 msgstr "Holandés, Flamenco"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Norwegian Nynorsk"
-msgstr "Nynorsk noruegués"
+msgstr "Noruegués Nynorsk"
+
+msgid "Occitan"
+msgstr "Occitano"
+
+msgid "Punjabi"
+msgstr "Punjabi"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
 msgid "Polish"
 msgstr "Polaco"
 
-#: ../pidgin/gtkdialogs.c:197
 msgid "Portuguese"
 msgstr "Portugués"
 
-#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese-Brazil"
-msgstr "Portugués brasileiro"
+msgstr "Portugués do Brasil"
 
-#: ../pidgin/gtkdialogs.c:199
 msgid "Pashto"
-msgstr "Pashto"
+msgstr "Pashtún"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
-msgstr "Romeno"
+msgstr "Romanés"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "Ruso"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "Eslovaco"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "Esloveno"
 
-#: ../pidgin/gtkdialogs.c:205
 msgid "Albanian"
 msgstr "Albanés"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "Serbio"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#, fuzzy
+msgid "Sinhala"
+msgstr "Sinhala"
+
 msgid "Swedish"
 msgstr "Sueco"
 
-#: ../pidgin/gtkdialogs.c:209
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
-msgstr "Thai"
+msgstr "Tailandés"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "Turco"
 
-#: ../pidgin/gtkdialogs.c:213
+msgid "Urdu"
+msgstr "Urdu"
+
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh e o equipo Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "Chinés simplificado"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr "Chinés de Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "Chinés tradicional"
 
-#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "Amhárico"
 
-#: ../pidgin/gtkdialogs.c:357
 #, c-format
 msgid "About %s"
-msgstr "Acerca de %s"
+msgstr "Sobre %s"
 
-#: ../pidgin/gtkdialogs.c:400
 #, fuzzy, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15011,103 +11555,83 @@ msgid ""
 "complete list of contributors.  We provide no warranty for this program."
 "<BR><BR>"
 msgstr ""
-"%s é un cliente de mensaxería gráfico e modular baseado en libpurple e que "
-"écapaz de conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"%s é un cliente de mensaxería gráfico e modular baseado en libpurple e que é "
+"capaz de conectarse a AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
 "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, e QQ todos a "
-"un tempo.  Está escrito usando GTK+.<BR><BR>Vostede pode modificar e "
-"redistribuír o programa baixo os termos da GPL (versión 2 ou posterior).  "
-"Unha copia da GPL vai dentro do ficheiro 'COPYING' distribuído con %s.  Os "
-"dereitos de autor de %s son dos contribuíntes.  Vexa o ficheiro de "
-"'COPYRIGHT' para a lista completa de contribuíntes.  Nós non damos ningún "
-"tipo de garantía sobre este programa.<BR><BR>"
+"un tempo. Está escrito usando GTK+.<BR><BR>Vostede pode modificar e "
+"redistribuír o programa baixo os termos da GPL (versión 2 ou posterior). "
+"Unha copia da GPL está contida dentro do ficheiro 'COPYING' distribuído con %"
+"s. Os dereitos de autor de %s son dos contribuíntes. Vexa o ficheiro "
+"'COPYRIGHT' para a lista completa de contribuíntes. Nós non damos ningún "
+"tipo de garantía para este programa.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
 #, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin en irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
 msgid "Current Developers"
 msgstr "Desenvolvedores actuais"
 
-#: ../pidgin/gtkdialogs.c:438
 msgid "Crazy Patch Writers"
-msgstr "Tolos escritores de parches"
+msgstr "Escritores de parches loucos"
 
-#: ../pidgin/gtkdialogs.c:453
 msgid "Retired Developers"
 msgstr "Desenvolvedores retirados"
 
-#: ../pidgin/gtkdialogs.c:468
 msgid "Retired Crazy Patch Writers"
-msgstr "Desenvolvedores de parches tolos retirados"
+msgstr "Desenvolvedores de parches loucos retirados"
 
-#: ../pidgin/gtkdialogs.c:483
 msgid "Artists"
 msgstr "Artistas"
 
-#: ../pidgin/gtkdialogs.c:498
 msgid "Current Translators"
 msgstr "Tradutores actuais"
 
-#: ../pidgin/gtkdialogs.c:518
 msgid "Past Translators"
 msgstr "Tradutores anteriores"
 
-#: ../pidgin/gtkdialogs.c:536
 msgid "Debugging Information"
 msgstr "Información de depuración"
 
-#: ../pidgin/gtkdialogs.c:906
+msgid "_Name"
+msgstr "_Nome"
+
+msgid "_Account"
+msgstr "_Conta"
+
 msgid "Get User Info"
 msgstr "Obter información do usuario"
 
-#: ../pidgin/gtkdialogs.c:908
+#, fuzzy
 msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
+"Please enter the username or alias of the person whose info you would like "
+"to view."
 msgstr ""
-"Introduza o nome de usuario ou o alias da persoa da que quere ver "
+"Introduza o nome de usuario ou o alias da persoa da que quere ver a "
 "información."
 
-#: ../pidgin/gtkdialogs.c:998
 msgid "View User Log"
 msgstr "Ver rexistro do usuario"
 
-#: ../pidgin/gtkdialogs.c:1000
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"Introduza o nome de usuario ou o alias da persoa da que quere ver a "
-"información de rexistro."
-
-#: ../pidgin/gtkdialogs.c:1020
 msgid "Alias Contact"
 msgstr "Alias para o contacto"
 
-#: ../pidgin/gtkdialogs.c:1021
 msgid "Enter an alias for this contact."
 msgstr "Introduza un alias para este contacto."
 
-#: ../pidgin/gtkdialogs.c:1043
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduza un alias para %s."
 
-#: ../pidgin/gtkdialogs.c:1045
 msgid "Alias Buddy"
 msgstr "Alias do contacto"
 
-#: ../pidgin/gtkdialogs.c:1066
 msgid "Alias Chat"
 msgstr "Alias na conversa"
 
-#: ../pidgin/gtkdialogs.c:1067
 msgid "Enter an alias for this chat."
 msgstr "Introduza un alias para esta conversa."
 
-#: ../pidgin/gtkdialogs.c:1106
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15119,66 +11643,54 @@ msgstr[0] ""
 "Está a punto de eliminar o contacto que contén a %s e %d contacto máis da "
 "lista de contactos. Quere continuar?"
 msgstr[1] ""
-"Está a punto de eliminar o contacto que contén a %s e %d contacto máis da "
+"Está a punto de eliminar o contacto que contén a %s e %d contactos máis da "
 "lista de contactos. Quere continuar?"
 
-#: ../pidgin/gtkdialogs.c:1114
 msgid "Remove Contact"
 msgstr "Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1117
 msgid "_Remove Contact"
 msgstr "_Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1148
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr ""
-"Está a piques de combinar o grupo chamado %s dentro do grupo %s.Desexa "
+"Está a punto de combinar o grupo chamado %s dentro do grupo %s. Desexa "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1155
 msgid "Merge Groups"
 msgstr "Combinar grupos"
 
-#: ../pidgin/gtkdialogs.c:1158
 msgid "_Merge Groups"
 msgstr "_Combinar grupos"
 
-#: ../pidgin/gtkdialogs.c:1208
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
 "list.  Do you want to continue?"
 msgstr ""
-"Está a piques de borrar o grupo %s e todos os seus membros da lista de "
+"Está a punto de borrar o grupo %s e todos os seus membros da lista de "
 "contactos. Quere continuar?"
 
-#: ../pidgin/gtkdialogs.c:1211
 msgid "Remove Group"
 msgstr "Eliminar o grupo"
 
-#: ../pidgin/gtkdialogs.c:1214
 msgid "_Remove Group"
 msgstr "_Eliminar o grupo"
 
-#: ../pidgin/gtkdialogs.c:1247
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "Está a punto de eliminar a %s da lista de contactos. Quere continuar?"
 
-#: ../pidgin/gtkdialogs.c:1250
 msgid "Remove Buddy"
 msgstr "Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1253
 msgid "_Remove Buddy"
 msgstr "_Eliminar o contacto"
 
-#: ../pidgin/gtkdialogs.c:1274
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -15187,167 +11699,203 @@ msgstr ""
 "Está a punto de eliminar a conversa %s da lista de contactos. Quere "
 "continuar?"
 
-#: ../pidgin/gtkdialogs.c:1277
 msgid "Remove Chat"
 msgstr "Eliminar a conversa"
 
-#: ../pidgin/gtkdialogs.c:1280
 msgid "_Remove Chat"
 msgstr "_Eliminar a conversa"
 
-#: ../pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr "Premer co botón dereito para ver máis mensaxes sen ler...\n"
 
-#: ../pidgin/gtkdocklet.c:435
-msgid "Change Status"
-msgstr "Cambiar o estado"
+#, fuzzy
+msgid "_Change Status"
+msgstr "_Cambiar o estado"
+
+#, fuzzy
+msgid "Show Buddy _List"
+msgstr "Mostrar a _lista de contactos"
 
-#: ../pidgin/gtkdocklet.c:487
-msgid "Show Buddy List"
-msgstr "Mostrar a lista de contactos"
+#, fuzzy
+msgid "_Unread Messages"
+msgstr "Mensaxes _sen ler"
 
-#: ../pidgin/gtkdocklet.c:513
-msgid "New Message..."
-msgstr "Nova mensaxe..."
+#, fuzzy
+msgid "New _Message..."
+msgstr "Nova _mensaxe..."
 
-#: ../pidgin/gtkdocklet.c:528
-msgid "Mute Sounds"
-msgstr "Sen son"
+#, fuzzy
+msgid "_Accounts"
+msgstr "_Contas"
+
+#, fuzzy
+msgid "Plu_gins"
+msgstr "Com_plementos"
+
+#, fuzzy
+msgid "Pr_eferences"
+msgstr "Pr_eferencias"
 
-#: ../pidgin/gtkdocklet.c:535
 #, fuzzy
-msgid "Blink on new message"
-msgstr "Intermitencia para as novas mensaxes"
+msgid "Mute _Sounds"
+msgstr "Sen _sons"
 
-#: ../pidgin/gtkdocklet.c:542
-msgid "Quit"
-msgstr "Saír"
+#, fuzzy
+msgid "_Blink on New Message"
+msgstr "_Intermitencia para as novas mensaxes"
+
+#, fuzzy
+msgid "_Quit"
+msgstr "_Saír"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Non iniciado"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Recibindo como:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Recibindo de:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Enviando a:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Enviando como:</b>"
 
-#: ../pidgin/gtkft.c:498
 msgid "There is no application configured to open this type of file."
 msgstr ""
 "Non se configurou ningunha aplicación para abrir este tipo de ficheiro."
 
-#: ../pidgin/gtkft.c:503
 msgid "An error occurred while opening the file."
 msgstr "Produciuse un erro ao abrir o ficheiro."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Erro ao lanzar %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Erro ao executar %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "O proceso devolveu o código de erro %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Ficheiro local:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Velocidade:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Tempo transcorrido:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Tempo restante:"
 
-#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
 msgstr "_Pechar esta ventá cando rematen todas as transferencias"
 
-#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "L_impar as transferencias rematadas"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "_Detalles da transferencia de ficheiros"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833 ../pidgin/pidginstock.c:95
 msgid "_Pause"
-msgstr "_Pausar"
+msgstr "_Deter"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "_Continuar"
 
-#: ../pidgin/gtkimhtml.c:816
 msgid "Paste as Plain _Text"
 msgstr "Pegar como _texto plano"
 
-#: ../pidgin/gtkimhtml.c:833 ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "_Reset formatting"
-msgstr "_Reiniciar os formatos"
+msgstr "_Restaurar os formatos"
+
+msgid "Disable _smileys in selected text"
+msgstr "Desactivar as _emoticonas no texto seleccionado"
 
-#: ../pidgin/gtkimhtml.c:1373
 msgid "Hyperlink color"
 msgstr "Cor da ligazón"
 
-#: ../pidgin/gtkimhtml.c:1374
 msgid "Color to draw hyperlinks."
-msgstr "Cor para debuxar ligazóns."
+msgstr "Cor para debuxar as ligazóns."
 
-#: ../pidgin/gtkimhtml.c:1377
 msgid "Hyperlink prelight color"
-msgstr "Cor de ligazón pre-iluminada"
+msgstr "Cor de ligazón iluminada previamente"
 
-#: ../pidgin/gtkimhtml.c:1378
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Cor para debuxar ligazóns cando o rato estea enriba."
+msgstr "A cor para debuxar as ligazóns cando o rato estea enriba."
+
+#, fuzzy
+msgid "Sent Message Name Color"
+msgstr "Cor do nome para as mensaxes enviadas"
+
+msgid "Color to draw the name of a message you sent."
+msgstr "A cor para debuxar o nome dunha mensaxe que vostede enviou."
+
+#, fuzzy
+msgid "Received Message Name Color"
+msgstr "Cor do nome para as mensaxes recibidas"
+
+msgid "Color to draw the name of a message you received."
+msgstr "A cor para debuxar o nome dunha mensaxe que vostede recibiu."
+
+msgid "\"Attention\" Name Color"
+msgstr "Cor do nome para \"Atención\""
+
+msgid "Color to draw the name of a message you received containing your name."
+msgstr ""
+"A cor para debuxar o nome dunha mensaxe que recibiu e que contén o seu nome."
+
+msgid "Action Message Name Color"
+msgstr "Cor do nome para as mensaxes de atención"
+
+msgid "Color to draw the name of an action message."
+msgstr "A cor para debuxar o nome dunha mensaxe de acción."
+
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Cor do nome para a mensaxe de acción dunha mensaxe privada"
+
+msgid "Whisper Message Name Color"
+msgstr "Cor do nome para as mensaxes privadas"
+
+#, fuzzy
+msgid "Typing notification color"
+msgstr "Eliminación da notificación de escritura"
+
+msgid "The color to use for the typing notification font"
+msgstr "A cor que se usará para o tipo de letra da notificación de escritura"
+
+#, fuzzy
+msgid "Typing notification font"
+msgstr "Cor da notificación de escritura"
+
+msgid "The font to use for the typing notification"
+msgstr "A cor que se usará para a notificación de escritura"
+
+#, fuzzy
+msgid "Enable typing notification"
+msgstr "Activar a notificación de escritura"
 
-#: ../pidgin/gtkimhtml.c:1598
 msgid "_Copy Email Address"
-msgstr "_Copiar o enderezo de correo"
+msgstr "_Copiar enderezo de correo"
 
-#: ../pidgin/gtkimhtml.c:1610
 msgid "_Open Link in Browser"
-msgstr "_Abrir a ligazón no navegador"
+msgstr "_Abrir ligazón no navegador"
 
-#: ../pidgin/gtkimhtml.c:1620
 msgid "_Copy Link Location"
-msgstr "_Copiar o destino da ligazón"
+msgstr "_Copiar localización da ligazón"
 
-#: ../pidgin/gtkimhtml.c:3369
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15355,9 +11903,8 @@ msgid ""
 msgstr ""
 "<span size='larger' weight='bold'>Tipo de ficheiro descoñecido</span>\n"
 "\n"
-"PNG é o predeterminado."
+"Predeterminando como PNG."
 
-#: ../pidgin/gtkimhtml.c:3372
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15365,9 +11912,8 @@ msgid ""
 msgstr ""
 "Tipo de ficheiro descoñecido\n"
 "\n"
-"PNG é o predeterminado."
+"Predeterminando como PNG."
 
-#: ../pidgin/gtkimhtml.c:3401
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15378,7 +11924,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3404
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15389,36 +11934,32 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3482 ../pidgin/gtkimhtml.c:3494
 msgid "Save Image"
-msgstr "Gardar a imaxe"
+msgstr "Gardar imaxe"
 
-#: ../pidgin/gtkimhtml.c:3522
 #, c-format
 msgid "_Save Image..."
 msgstr "_Gardar a imaxe..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
+#, fuzzy, c-format
+msgid "_Add Custom Smiley..."
+msgstr "Eng_adir emoticonas personalizadas..."
+
 msgid "Select Font"
-msgstr "Seleccionar o tipo de letra"
+msgstr "Seleccionar tipo de letra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr "Seleccionar a cor do texto"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr "Seleccionar a cor do fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "_Descrición"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15426,259 +11967,195 @@ msgstr ""
 "Introduza o URL e a descrición da ligazón que quere inserir. A descrición é "
 "opcional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduza o URL da ligazón que quere inserir."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Inserir unha ligazón"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1262
 msgid "_Insert"
 msgstr "_Inserir"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
-msgstr "Non se puido almacenar a imaxe: %s\n"
+msgstr "Fallou ao almacenar a imaxe: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "Inserir imaxe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
-msgid "This theme has no available smileys."
-msgstr "Este tema non ten emoticonas dispoñibles."
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Esta emoticona está desactivada porque existe unha emoticona personalizada "
+"para este atallo :\n"
+" %s"
 
-#. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
-msgstr "Emoticona!"
+msgstr "Sorría!"
+
+#, fuzzy
+msgid "_Manage custom smileys"
+msgstr "_Xestionar as emoticonas personalizadas"
+
+msgid "This theme has no available smileys."
+msgstr "Este tema non ten emoticonas dispoñíbeis."
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1219
 msgid "_Font"
 msgstr "_Tipo de letra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
 #, fuzzy
 msgid "Group Items"
-msgstr "Grupo ID"
+msgstr "Agrupar elementos"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
-msgstr ""
+msgstr "Desagrupar elementos"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Negra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Subliñado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
-msgstr ""
+msgstr "Riscado"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Increase Font Size"
-msgstr ""
+msgstr "Aumentar o tamaño do tipo de letra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
-msgstr ""
+msgstr "Diminuír o tamaño do tipo de letra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
 #, fuzzy
 msgid "Font Face"
-msgstr "_Estilo do tipo de letra"
+msgstr "Estilo do tipo de letra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
 #, fuzzy
 msgid "Background Color"
-msgstr "Cor de _fondo"
+msgstr "Cor do fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 #, fuzzy
 msgid "Foreground Color"
 msgstr "Cor de primeiro plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
 #, fuzzy
 msgid "Reset Formatting"
-msgstr "_Reiniciar os formatos"
+msgstr "Restaurar os formatos"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
 #, fuzzy
 msgid "Insert IM Image"
-msgstr "Inserir imaxe"
+msgstr "Inserir imaxe de MI"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
 #, fuzzy
 msgid "Insert Smiley"
-msgstr "Inserir imaxe"
+msgstr "Inserir emoticona"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1179
 msgid "<b>_Bold</b>"
 msgstr "<b>_Negra</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<i>_Italic</i>"
 msgstr "<i>_Cursiva</i> "
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<u>_Underline</u>"
 msgstr "<u>_Subliñado</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 #, fuzzy
 msgid "<span strikethrough='true'>Strikethrough</span>"
-msgstr "<span size='larger'>_Máis grande</span>"
+msgstr "<span strikethrough='true'>Riscado</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Máis grande</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span size='smaller'>_Smaller</span>"
-msgstr "<span size='smaller'>Máis _pequena</span>"
+msgstr "<span size='smaller'>Máis _pequeno</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1191
 msgid "_Font face"
 msgstr "_Estilo do tipo de letra"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "Foreground _color"
-msgstr "Cor de primeiro plano"
+msgstr "_Cor de primeiro plano"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Bac_kground color"
 msgstr "Cor de _fondo"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1270
-msgid "_Smiley"
-msgstr "_Emoticona"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1276
 msgid "_Image"
 msgstr "_Imaxe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1282
 msgid "_Link"
 msgstr "_Ligazón"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1288
 msgid "_Horizontal rule"
-msgstr ""
+msgstr "Regra _horizontal"
+
+#, fuzzy
+msgid "_Smile!"
+msgstr "_Sorría!"
+
+#, fuzzy
+msgid "Log Deletion Failed"
+msgstr "Fallou a eliminación do rexistro"
+
+msgid "Check permissions and try again."
+msgstr "Verifique os permisos e ténteo de novo."
 
-#: ../pidgin/gtklog.c:293
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Está seguro de que quere borrar permanentemente o rexistro de conversas con %"
+"Está seguro de que quere borrar permanentemente o rexistro da conversa con %"
 "s que comezou o %s?"
 
-#: ../pidgin/gtklog.c:304
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
 msgstr ""
-"Está seguro de que quere borrar permanentemente o rexistro de conversas en %"
-"s que comezou o %s?"
+"Está seguro de que quere borrar permanentemente o rexistro da conversa en %s "
+"que comezou o %s?"
 
-#: ../pidgin/gtklog.c:309
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr ""
-"Está seguro de que quere borrar permanentemente o rexistro do sistema en %s?"
+"Está seguro de que quere borrar permanentemente o rexistro do sistema que "
+"comezou en %s?"
+
+#, fuzzy
+msgid "Delete Log?"
+msgstr "Quere eliminar o rexistro?"
+
+#, fuzzy
+msgid "Delete Log..."
+msgstr "Eliminar rexistro..."
 
-#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Conversa en %s de %s</span>"
+msgstr "<span size='larger' weight='bold'>Conversa en %s en %s</span>"
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Conversa con %s en %s</span>"
 
-#: ../pidgin/gtklog.c:503
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../pidgin/gtklog.c:550
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"Só se rexistrarán os eventos do sistema se nas preferencias está activada a "
-"opción \"Rexistrar todos os cambios de estado no rexistro do sistema\"."
-
-#: ../pidgin/gtklog.c:554
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-"Só se rexistrarán as mensaxes instantáneas se nas preferencias está activada "
-"a opción\"Rexistrar todas as mensaxes instantáneas\"."
-
-#: ../pidgin/gtklog.c:557
-msgid ""
-"Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-"As conversas só se rexistrarán se nas preferencias está activada a opción "
-"\"Rexistrar todas as conversas\"."
-
-#: ../pidgin/gtklog.c:561
-msgid "No logs were found"
-msgstr "Non se atoparon rexistros"
-
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:576
 msgid "_Browse logs folder"
-msgstr "_Explorar o cartafol dos rexistros"
-
-#: ../pidgin/gtklog.c:640
-msgid "Total log size:"
-msgstr "Tamaño total do rexistro:"
-
-#: ../pidgin/gtklog.c:709
-#, c-format
-msgid "Conversations in %s"
-msgstr "Conversas en %s"
-
-#: ../pidgin/gtklog.c:717 ../pidgin/gtklog.c:779
-#, c-format
-msgid "Conversations with %s"
-msgstr "Conversas con %s"
+msgstr "_Examinar o cartafol de rexistros"
 
-#: ../pidgin/gtklog.c:804
-msgid "System Log"
-msgstr "Rexistro do sistema"
-
-#: ../pidgin/gtkmain.c:386
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Probe `%s -h' para máis información.\n"
 
-#: ../pidgin/gtkmain.c:388
 #, fuzzy, c-format
 msgid ""
 "%s %s\n"
@@ -15689,8 +12166,40 @@ msgid ""
 "  -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]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\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"
+"Modo de uso: %s [OPCION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR para ficheiros de configuración\n"
+"  -d, --debug         imprime as mensaxes de depuración á saída estándar\n"
+"  -h, --help          mostra esta axuda e sae\n"
+"  -m, --multiple      non se asegurar de que hai só unha instancia\n"
+"  -n, --nologin       non iniciar a sesión de forma automática\n"
+"  -l, --login[=NOME]  iniciar a sesión de forma automática (o argumento "
+"opcional NOME especifica\n"
+"                      a(s) conta(s) que hai que empregar separadas por "
+"comas.\n"
+"                      Sen isto só se activará a primeira conta).\n"
+"  -v, --version       mostra a versión actual e sae\n"
+
+#, fuzzy, c-format
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -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"
@@ -15706,10 +12215,9 @@ msgstr ""
 "                      a(s) conta(s) a empregar separadas por comas)\n"
 "  -v, --version       mostra a versión actual e sae\n"
 
-#: ../pidgin/gtkmain.c:512
 #, fuzzy, c-format
 msgid ""
-"%s has segfaulted and attempted to dump a core file.\n"
+"%s %s has segfaulted and attempted to dump a core file.\n"
 "This is a bug in the software and has happened through\n"
 "no fault of your own.\n"
 "\n"
@@ -15727,479 +12235,436 @@ msgid ""
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"O programa %s deixou de funcionar e tentou gardar un ficheiro (core).\n"
-"Isto é un erro no software que non foi debido ao seu uso\n"
+"%s %s tivo un fallo de segmentación e tentou descargar un ficheiro core.\n"
+"Isto é un erro no software que non foi debido ao seu uso.\n"
 "\n"
 "Se pode reproducir este erro, notifíqueo aos desenvolvedores\n"
 "informando dun erro en:\n"
 "%ssimpleticket/\n"
 "\n"
-"Asegúrese de especificar que estaba facendo no momento do erro\n"
-"e poña unha traza ao ficheiro (core).  Se non sabe como \n"
-"obter unha traza, lea as instrucións en\n"
+"Asegúrese de especificar o que estaba facendo no momento do erro\n"
+"e poña unha traza ao ficheiro core. Se non sabe como \n"
+"obter a traza, lea as instrucións en\n"
 "%swiki/GetABacktrace\n"
 "\n"
-"Se necesita máis axuda, escriba unha mensaxe a SeanEgn ou \n"
-"LSchiere (vía AIM).  Información de contacto de Sean e Luke \n"
-"para outros protocolos en\n"
+"Se necesita máis axuda, escriba unha MI a SeanEgn ou a \n"
+"LSchiere (a través do AIM). A información de contacto de Sean e Luke \n"
+"para outros protocolos está en\n"
 "%swiki/DeveloperPages\n"
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:699 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
 msgid "Open All Messages"
 msgstr "Abrir todas as mensaxes"
 
-#: ../pidgin/gtknotify.c:402
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ten correo!</span>"
 
-#: ../pidgin/gtknotify.c:540
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s ten %d mensaxe nova."
-msgstr[1] "%s ten %d mensaxe nova."
+msgstr[1] "%s ten %d mensaxes novas."
 
-#: ../pidgin/gtknotify.c:564
 #, fuzzy, c-format
-msgid "<b>You have %d new email.</b>"
-msgid_plural "<b>You have %d new emails.</b>"
+msgid "<b>%d new email.</b>"
+msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>Ten %d correo electrónico novo.</b>"
-msgstr[1] "<b>Ten %d correo electrónico novo.</b>"
+msgstr[1] "<b>Ten %d correos electrónicos novos.</b>"
 
-#: ../pidgin/gtknotify.c:989
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "O comando do navegador \"%s\" non é válido."
 
-#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1003
-#: ../pidgin/gtknotify.c:1016 ../pidgin/gtknotify.c:1144
 msgid "Unable to open URL"
 msgstr "Non se puido abrir o URL"
 
-#: ../pidgin/gtknotify.c:1001 ../pidgin/gtknotify.c:1014
 #, c-format
 msgid "Error launching \"%s\": %s"
-msgstr "Erro ao lanzar \"%s\": %s"
+msgstr "Erro ao iniciar \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1145
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
 "Elixiuse o navegador 'Manual', mais non se definiu ningún comando para "
 "executalo."
 
-#: ../pidgin/gtkplugin.c:265
 msgid "The following plugins will be unloaded."
 msgstr "Desactivaranse os seguintes complementos."
 
-#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "Desactivaranse múltiples complementos."
 
-#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "Desactivar complementos"
 
-#: ../pidgin/gtkplugin.c:400
-#, c-format
+#, fuzzy
+msgid "Could not unload plugin"
+msgstr "Non se puido desactivar o complemento"
+
 msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
 msgstr ""
-"%s%s<span weight=\"bold\">Escrito por:</span>\t%s\n"
-"<span weight=\"bold\">Sitio web:</span>\t\t%s\n"
-"<span weight=\"bold\">Nome do ficheiro:</span>\t\t%s"
+"Non se puido desactivar o plugin neste momento, mais será desactivado no "
+"seguinte inicio."
 
-#: ../pidgin/gtkplugin.c:410
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Erro:·%s\n"
-"Comprobe o sitio web do complemento para obter unha actualización.</span>"
+"<span foreground=\"red\" weight=\"bold\">Erro: %s\n"
+"Verifique o sitio web do complemento para unha actualización.</span>"
+
+#, fuzzy
+msgid "Author"
+msgstr "Autor"
+
+#, fuzzy
+msgid "<b>Written by:</b>"
+msgstr "<b>Escrito por:</b>"
+
+#, fuzzy
+msgid "<b>Web site:</b>"
+msgstr "<b>Sitio web:</b>"
+
+#, fuzzy
+msgid "<b>Filename:</b>"
+msgstr "<b>Nome de ficheiro:</b>"
 
-#: ../pidgin/gtkplugin.c:536
 msgid "Configure Pl_ugin"
 msgstr "Configurar o _complemento"
 
-#: ../pidgin/gtkplugin.c:599
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalles do complemento</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
-msgstr "Seleccionar un ficheiro"
+msgstr "Seleccione un ficheiro"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:532
 msgid "Pounce on Whom"
 msgstr "A quen avisar"
 
-#: ../pidgin/gtkpounce.c:559
 msgid "_Buddy name:"
 msgstr "Nome do _contacto:"
 
-#: ../pidgin/gtkpounce.c:593
 msgid "Si_gns on"
-msgstr "_Está conectado"
+msgstr "_Conéctase"
 
-#: ../pidgin/gtkpounce.c:595
 msgid "Signs o_ff"
-msgstr "_Está desconectado"
+msgstr "_Desconéctase"
 
-#: ../pidgin/gtkpounce.c:597
 msgid "Goes a_way"
-msgstr "_Está ausente"
+msgstr "_Auséntase"
 
-#: ../pidgin/gtkpounce.c:599
 msgid "Ret_urns from away"
-msgstr "_Deixa de estar ausente"
+msgstr "Deixa de estar a_usente"
 
-#: ../pidgin/gtkpounce.c:601
 msgid "Becomes _idle"
-msgstr "Está _inactivo"
+msgstr "Vólvese _inactivo"
 
-#: ../pidgin/gtkpounce.c:603
 msgid "Is no longer i_dle"
 msgstr "_Xa non está inactivo"
 
-#: ../pidgin/gtkpounce.c:605
 msgid "Starts _typing"
 msgstr "Comeza a _escribir"
 
-#: ../pidgin/gtkpounce.c:607
 msgid "P_auses while typing"
 msgstr "Fai unha p_ausa ao escribir"
 
-#: ../pidgin/gtkpounce.c:609
 msgid "Stops t_yping"
 msgstr "Deixa de escr_ibir"
 
-#: ../pidgin/gtkpounce.c:611
 msgid "Sends a _message"
 msgstr "Envia unha _mensaxe"
 
-#: ../pidgin/gtkpounce.c:654
 msgid "Ope_n an IM window"
 msgstr "_Abrir unha ventá de MI"
 
-#: ../pidgin/gtkpounce.c:656
 msgid "_Pop up a notification"
 msgstr "_Notificación cunha ventá emerxente"
 
-#: ../pidgin/gtkpounce.c:658
 msgid "Send a _message"
 msgstr "Enviar unha _mensaxe"
 
-#: ../pidgin/gtkpounce.c:660
 msgid "E_xecute a command"
 msgstr "E_xecutar un comando"
 
-#: ../pidgin/gtkpounce.c:662
 msgid "P_lay a sound"
 msgstr "Re_producir un son"
 
-#: ../pidgin/gtkpounce.c:668
 msgid "Brows_e..."
-msgstr "Exp_lorar..."
+msgstr "Examina_r..."
 
-#: ../pidgin/gtkpounce.c:670
 msgid "Br_owse..."
-msgstr "Expl_orar..."
+msgstr "Ex_aminar..."
 
-#: ../pidgin/gtkpounce.c:671
 msgid "Pre_view"
 msgstr "Pre_visualizar"
 
-#: ../pidgin/gtkpounce.c:798
 msgid "P_ounce only when my status is not Available"
-msgstr "Só avisar cando _o meu estado é non dispoñible"
+msgstr "Avisar só cando _o meu estado é non dispoñíbel"
 
-#: ../pidgin/gtkpounce.c:803
 msgid "_Recurring"
 msgstr "_Recorrente"
 
-#: ../pidgin/gtkpounce.c:1246
 msgid "Pounce Target"
 msgstr "Sobre quen avisar"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
-msgid "Default"
-msgstr "Por defecto"
-
-#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "Fallou o desempaquetado do tema de emoticonas."
 
-#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr "Instalar tema"
 
-#: ../pidgin/gtkprefs.c:697
 msgid ""
 "Select a smiley theme that you would like to use from the list below. New "
 "themes can be installed by dragging and dropping them onto the theme list."
 msgstr ""
 "Seleccione da lista inferior o tema de emoticonas que desexa. Pode instalar "
-"temas novos arrastrándoos e soltándoos sobre esta lista de temas."
+"temas novos arrastrándoos e soltándoos sobre a lista de temas."
 
-#: ../pidgin/gtkprefs.c:732
 msgid "Icon"
 msgstr "Icona"
 
-#: ../pidgin/gtkprefs.c:894
+msgid "Keyboard Shortcuts"
+msgstr "Atallos de teclado"
+
+#, fuzzy
+msgid "Cl_ose conversations with the Escape key"
+msgstr "Pechar as c_onversas coa tecla Esc"
+
 msgid "System Tray Icon"
 msgstr "Icona da área de notificación do sistema"
 
-#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
-msgstr "Mo_strar icona da área de notificación do sistema:"
+msgstr "Mo_strar a icona da área de notificación do sistema:"
 
-#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr "Se hai mensaxes sen ler"
 
-#: ../pidgin/gtkprefs.c:904
 msgid "Conversation Window Hiding"
-msgstr "Ocultar ventá de conversa"
+msgstr "Ocultar a ventá de conversa"
 
-#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr "_Ocultar as novas conversas de MI:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1944
 msgid "When away"
 msgstr "Cando estea ausente"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
 msgstr "Separadores"
 
-#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Mostrar MI e conversas en ventás con _separadores"
+msgstr "Mostrar MIs e conversas en ventás con _separadores"
 
-#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr "Mostrar botóns de _peche nos separadores"
 
-#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr "_Localización:"
 
-#: ../pidgin/gtkprefs.c:937
 msgid "Top"
-msgstr "Enriba"
+msgstr "Superior"
 
-#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
-msgstr "Abaixo"
+msgstr "Inferior"
 
-#: ../pidgin/gtkprefs.c:939
 msgid "Left"
 msgstr "Esquerda"
 
-#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr "Dereita"
 
-#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr "Vertical esquerda"
 
-#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr "Vertical dereita"
 
-#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr "Conversas _novas:"
 
-#: ../pidgin/gtkprefs.c:995
 msgid "Show _formatting on incoming messages"
-msgstr "Mostrar _formato nas mensaxes entrantes"
+msgstr "Mostrar o _formato nas mensaxes entrantes"
+
+msgid "Close IMs immediately when the tab is closed"
+msgstr "Pechar inmediatamente as MIs cando se peche o separador"
 
-#: ../pidgin/gtkprefs.c:998
 msgid "Show _detailed information"
 msgstr "Mostrar información _detallada"
 
-#: ../pidgin/gtkprefs.c:1000
 msgid "Enable buddy ic_on animation"
 msgstr "Activar animacións nas i_conas dos contactos"
 
-#: ../pidgin/gtkprefs.c:1007
 msgid "_Notify buddies that you are typing to them"
-msgstr "_Notificarlles aos contactos cando se lles está escribindo"
+msgstr "_Notificar aos contactos cando se lles está escribindo"
 
-#: ../pidgin/gtkprefs.c:1010
 msgid "Highlight _misspelled words"
-msgstr "_Resaltar os erros de ortografía"
+msgstr "_Realzar os erros de ortografía"
 
-#: ../pidgin/gtkprefs.c:1014
 msgid "Use smooth-scrolling"
-msgstr "Usar desprazamento suave"
+msgstr "Usar o desprazamento suave"
 
-#: ../pidgin/gtkprefs.c:1017
 msgid "F_lash window when IMs are received"
-msgstr "Ventá escinti_lante ao se recibiren mensaxes"
+msgstr "Facer escinti_lar a ventá ao recibir mensaxes de MI"
 
-#: ../pidgin/gtkprefs.c:1019
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimi_zar as novas ventás de conversa"
 
-#: ../pidgin/gtkprefs.c:1023
+msgid "Minimum input area height in lines:"
+msgstr "Altura mínima da área de entrada en liñas:"
+
 msgid "Font"
 msgstr "Tipo de letra"
 
-#: ../pidgin/gtkprefs.c:1025
 msgid "Use document font from _theme"
-msgstr "Usar tipo de letra do documento do _tema"
+msgstr "Usar o tipo de letra de documento do _tema"
 
-#: ../pidgin/gtkprefs.c:1027
 msgid "Use font from _theme"
-msgstr "Usar tipo de letra do _tema"
+msgstr "Usar o tipo de letra do _tema"
 
-#: ../pidgin/gtkprefs.c:1029
 msgid "Conversation _font:"
 msgstr "Tipo de _letra da conversa:"
 
-#: ../pidgin/gtkprefs.c:1043
 msgid "Default Formatting"
 msgstr "Formato predeterminado"
 
-#: ../pidgin/gtkprefs.c:1062
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
 msgstr ""
 "Isto é unha mostra de como aparecerá a súa mensaxe saínte cando use "
-"protocolos que soportan formatado."
+"protocolos que soportan o formatado."
+
+msgid "Cannot start proxy configuration program."
+msgstr "Non se pode iniciar o programa de configuración do proxy."
+
+#, fuzzy
+msgid "Cannot start browser configuration program."
+msgstr "Non se pode iniciar o programa de configuración do navegador."
 
-#: ../pidgin/gtkprefs.c:1128
 msgid "ST_UN server:"
 msgstr "Servidor ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1140
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplo: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1144
 msgid "_Autodetect IP address"
-msgstr "_Autodetectar enderezo IP"
+msgstr "Detectar _automaticamente o enderezo IP"
 
-#: ../pidgin/gtkprefs.c:1153
 msgid "Public _IP:"
-msgstr "_IP pública:"
+msgstr "_IP público:"
 
-#: ../pidgin/gtkprefs.c:1182
 msgid "Ports"
 msgstr "Portos"
 
-#: ../pidgin/gtkprefs.c:1185
+msgid "_Enable automatic router port forwarding"
+msgstr "_Habilitar a redirección automática de portos do router"
+
 msgid "_Manually specify range of ports to listen on"
 msgstr "Especificar _manualmente o rango de portos en que se escoitará"
 
-#: ../pidgin/gtkprefs.c:1188
 msgid "_Start port:"
 msgstr "Porto _inicial:"
 
-#: ../pidgin/gtkprefs.c:1195
 msgid "_End port:"
 msgstr "Porto _final:"
 
-#: ../pidgin/gtkprefs.c:1203
+#, fuzzy
+msgid "Proxy Server &amp; Browser"
+msgstr "Servidor proxy &amp; Navegador"
+
+msgid "<b>Proxy configuration program was not found.</b>"
+msgstr "<b>Non se encontrou o programa de configuración do proxy.</b>"
+
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Non se encontrou o programa de configuración do navegador.</b>"
+
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"As preferencias do proxy e o navegador están configuradas\n"
+"nas preferencias do GNOME"
+
+#, fuzzy
+msgid "Configure _Proxy"
+msgstr "Configurar o _proxy"
+
+#, fuzzy
+msgid "Configure _Browser"
+msgstr "Configurar o _navegador"
+
 msgid "Proxy Server"
 msgstr "Servidor proxy"
 
-#: ../pidgin/gtkprefs.c:1207
 msgid "No proxy"
 msgstr "Sen proxy"
 
-#: ../pidgin/gtkprefs.c:1263
 msgid "_User:"
 msgstr "_Usuario:"
 
-#: ../pidgin/gtkprefs.c:1328
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1329
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1330
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1331
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1332
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1333
+#, fuzzy
+msgid "Desktop Default"
+msgstr "Predeterminado do escritorio"
+
 msgid "GNOME Default"
-msgstr "Predeterminado de Gnome"
+msgstr "Predeterminado do Gnome"
 
-#: ../pidgin/gtkprefs.c:1334
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1335
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1336
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1337
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1346
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1399
 msgid "Browser Selection"
 msgstr "Selección de navegador"
 
-#: ../pidgin/gtkprefs.c:1403
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../pidgin/gtkprefs.c:1411
 msgid "_Open link in:"
 msgstr "_Abrir ligazón en:"
 
-#: ../pidgin/gtkprefs.c:1413
 msgid "Browser default"
 msgstr "Navegador predeterminado"
 
-#: ../pidgin/gtkprefs.c:1414
 msgid "Existing window"
 msgstr "Ventá existente"
 
-#: ../pidgin/gtkprefs.c:1416
 msgid "New tab"
 msgstr "Novo separador"
 
-#: ../pidgin/gtkprefs.c:1430
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16208,69 +12673,54 @@ msgstr ""
 "_Manual:\n"
 "(%s para URL)"
 
-#: ../pidgin/gtkprefs.c:1470
 msgid "Log _format:"
 msgstr "_Formato de rexistro:"
 
-#: ../pidgin/gtkprefs.c:1475
 msgid "Log all _instant messages"
 msgstr "Rexistrar todas as mensaxes _instantáneas"
 
-#: ../pidgin/gtkprefs.c:1477
 msgid "Log all c_hats"
 msgstr "Rexistrar todas as _conversas"
 
-#: ../pidgin/gtkprefs.c:1479
 msgid "Log all _status changes to system log"
 msgstr "Rexistrar todas os cambios de e_stado no rexistro do sistema"
 
-#: ../pidgin/gtkprefs.c:1625
 msgid "Sound Selection"
 msgstr "Selección de son"
 
-#: ../pidgin/gtkprefs.c:1635
 #, c-format
 msgid "Quietest"
 msgstr "O máis silencioso"
 
-#: ../pidgin/gtkprefs.c:1637
 #, c-format
 msgid "Quieter"
 msgstr "Máis silencioso"
 
-#: ../pidgin/gtkprefs.c:1639
 #, c-format
 msgid "Quiet"
 msgstr "Silencioso"
 
-#: ../pidgin/gtkprefs.c:1643
 #, c-format
 msgid "Loud"
 msgstr "Ruidoso"
 
-#: ../pidgin/gtkprefs.c:1645
 #, c-format
 msgid "Louder"
 msgstr "Máis ruidoso"
 
-#: ../pidgin/gtkprefs.c:1647
 #, c-format
 msgid "Loudest"
 msgstr "O máis ruidoso"
 
-#: ../pidgin/gtkprefs.c:1713
 msgid "_Method:"
 msgstr "_Método:"
 
-#: ../pidgin/gtkprefs.c:1715
 msgid "Console beep"
-msgstr "Bip da consola"
+msgstr "Ton de aviso da consola"
 
-#: ../pidgin/gtkprefs.c:1722
 msgid "No sounds"
 msgstr "Sen sons"
 
-#: ../pidgin/gtkprefs.c:1730
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16279,308 +12729,306 @@ msgstr ""
 "C_omando para son:\n"
 "(%s para nome de ficheiro)"
 
-#: ../pidgin/gtkprefs.c:1757
 msgid "Sounds when conversation has _focus"
 msgstr "Sons cando a conversa ten o _foco"
 
-#: ../pidgin/gtkprefs.c:1759
 msgid "Enable sounds:"
 msgstr "Activar os sons:"
 
-#: ../pidgin/gtkprefs.c:1770
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1850
 msgid "Play"
 msgstr "Reproducir"
 
-#: ../pidgin/gtkprefs.c:1927
+#, fuzzy
+msgid "_Browse..."
+msgstr "_Navegar..."
+
+#, fuzzy
+msgid "_Reset"
+msgstr "_Restaurar"
+
 msgid "_Report idle time:"
-msgstr "Mostrar o _tempo de inactividade:"
+msgstr "Informar do _tempo de inactividade:"
 
-#: ../pidgin/gtkprefs.c:1932
 msgid "Based on keyboard or mouse use"
 msgstr "Baseado no uso do teclado ou do rato"
 
-#: ../pidgin/gtkprefs.c:1941
 msgid "_Auto-reply:"
 msgstr "Resposta _automática:"
 
-#: ../pidgin/gtkprefs.c:1945
 msgid "When both away and idle"
-msgstr "Cando estea ausente e inactivo"
+msgstr "Cando estea ausente ou inactivo"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1951
 msgid "Auto-away"
-msgstr "Auto-ausencia"
+msgstr "Ausencia automática"
 
-#: ../pidgin/gtkprefs.c:1953
 msgid "Change status when _idle"
 msgstr "Cambiar o estado cando estea _inactivo"
 
-#: ../pidgin/gtkprefs.c:1957
 msgid "_Minutes before becoming idle:"
-msgstr "_Minutos antes de cambiar a inactivo:"
+msgstr "_Minutos antes de volverse inactivo:"
 
-#: ../pidgin/gtkprefs.c:1965
 msgid "Change _status to:"
 msgstr "Cambiar o e_stado a:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1986
 msgid "Status at Startup"
 msgstr "Estado para o inicio"
 
-#: ../pidgin/gtkprefs.c:1988
 msgid "Use status from last _exit at startup"
-msgstr "Empregar o estado da última _saída ao comezar"
+msgstr "Empregar o estado da última _saída ao iniciar"
 
-#: ../pidgin/gtkprefs.c:1994
 msgid "Status to a_pply at startup:"
-msgstr "Estado para _aplicar ao comezar:"
+msgstr "Estado para _aplicar ao iniciar:"
 
-#: ../pidgin/gtkprefs.c:2032
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2034
 msgid "Smiley Themes"
-msgstr "Temas das emoticonas"
+msgstr "Temas de emoticonas"
 
-#: ../pidgin/gtkprefs.c:2041
 msgid "Browser"
 msgstr "Navegador"
 
-#: ../pidgin/gtkprefs.c:2045
 msgid "Status / Idle"
 msgstr "Estado / Inactivo"
 
-#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
-msgstr "Permitir que contacten comigo todos os usuarios"
+msgstr "Permitir que todos os usuarios contacten comigo"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
-msgstr "Permitirlles só aos usuarios na miña lista de contactos"
+msgstr "Permitirllo só aos usuarios na miña lista de contactos"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
-msgstr "Permitirlles só aos seguintes usuarios"
+msgstr "Permitirllo só aos seguintes usuarios"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
-msgstr "Bloquear a todos os usuarios"
+msgstr "Bloquear todos os usuarios"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
-msgstr "Bloquear só aos seguintes usuarios"
+msgstr "Bloquear só os seguintes usuarios"
 
-#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "Privacidade"
 
-#: ../pidgin/gtkprivacy.c:382
 msgid "Changes to privacy settings take effect immediately."
 msgstr ""
 "Os cambios na configuración de privacidade teñen efecto inmediatamente."
 
-#. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
 msgid "Set privacy for:"
-msgstr "Establecer privacidade para:"
+msgstr "Establecer a privacidade para:"
+
+#. Remove All button
+#, fuzzy
+msgid "Remove Al_l"
+msgstr "Eliminar to_dos"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
-msgstr "Permitir ao usuario"
+msgstr "Permitir o usuario"
 
-#: ../pidgin/gtkprivacy.c:558
 msgid "Type a user you permit to contact you."
 msgstr "Escriba un usuario ao que lle permita contactar con vostede."
 
-#: ../pidgin/gtkprivacy.c:559
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Introduza o nome de usuario ao que lle quere permitir que contacte con "
 "vostede."
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Permitir"
 
-#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Permite a %s contactar con vostede?"
 
-#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Está seguro que quere permitir que %s contacte con vostede?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
 msgid "Block User"
-msgstr "Bloquear ao usuario"
+msgstr "Bloquear usuario"
 
-#: ../pidgin/gtkprivacy.c:600
 msgid "Type a user to block."
-msgstr "Escriba o usuario ao que desexa bloquear."
+msgstr "Escriba o usuario que desexa bloquear."
 
-#: ../pidgin/gtkprivacy.c:601
 msgid "Please enter the name of the user you wish to block."
-msgstr "Introduza o nome do usuario ao que desexa bloquear."
+msgstr "Introduza o nome do usuario que desexa bloquear."
 
-#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
-msgstr "Bloquear a %s?"
+msgstr "Quere bloquear a %s?"
 
-#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Está seguro de que desexa bloquear a %s?"
 
-#: ../pidgin/gtkrequest.c:272
 msgid "Apply"
 msgstr "Aplicar"
 
-#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Ese ficheiro xa existe"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Quere sobrescribilo?"
 
-#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Sobrescribir"
 
-#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
-msgstr "Escoller un novo nome"
+msgstr "Escoller un nome novo"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Seleccionar cartafol..."
 
-#. Create the window.
-#: ../pidgin/gtkroomlist.c:375
-msgid "Room List"
-msgstr "Lista de salas"
-
 #. list button
-#: ../pidgin/gtkroomlist.c:443
 msgid "_Get List"
 msgstr "_Obter a lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
 msgid "_Add Chat"
 msgstr "_Engadir conversa"
 
-#: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Está seguro de que desexa borrar os estados gardados seleccionados?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "_Usar"
 
-#: ../pidgin/gtksavedstatuses.c:780
 msgid "Title already in use.  You must choose a unique title."
 msgstr "O título xa está en uso. Debe escoller un título único."
 
-#: ../pidgin/gtksavedstatuses.c:970
 msgid "Different"
 msgstr "Diferente"
 
-#: ../pidgin/gtksavedstatuses.c:1159
 msgid "_Title:"
 msgstr "_Título:"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1497
 msgid "_Status:"
 msgstr "E_stado:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
 msgid "Use a _different status for some accounts"
 msgstr "Usar un estado _diferente para algunhas contas"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
 msgid "Sa_ve & Use"
 msgstr "Ga_rdar e usar"
 
-#: ../pidgin/gtksavedstatuses.c:1480
 #, c-format
 msgid "Status for %s"
 msgstr "Estado para %s"
 
-#: ../pidgin/gtkstatusbox.c:664
+#, fuzzy
+msgid "Custom Smiley"
+msgstr "Emoticona personalizada"
+
+msgid "More Data needed"
+msgstr "Precísanse máis datos"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Proporcione un atallo para asociar á emoticona."
+
+#, fuzzy
+msgid "Duplicate Shortcut"
+msgstr "Atallo duplicado"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Xa existe unha emoticona personalizada para o atallo seleccionado. "
+"Especifique un atallo diferente."
+
+#, fuzzy
+msgid "Please select an image for the smiley."
+msgstr "Escolla unha imaxe para a emoticona."
+
+#, fuzzy
+msgid "Edit Smiley"
+msgstr "Editar emoticona"
+
+#, fuzzy
+msgid "Add Smiley"
+msgstr "Engadir emoticona"
+
+#, fuzzy
+msgid "Smiley _Image"
+msgstr "_Imaxe de emoticona"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "A_tallo de emoticona"
+
+#, fuzzy
+msgid "Smiley"
+msgstr "Emoticona"
+
+msgid "Custom Smiley Manager"
+msgstr "Xestor de emoticonas personalizadas"
+
 msgid "Waiting for network connection"
 msgstr "A agardar pola conexión á rede"
 
-#: ../pidgin/gtkutils.c:632
+#, fuzzy
+msgid "New status..."
+msgstr "Novo estado..."
+
+#, fuzzy
+msgid "Saved statuses..."
+msgstr "Estados gardados..."
+
+#, fuzzy
+msgid "Status Selector"
+msgstr "Selector de estado"
+
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1399 ../pidgin/gtkutils.c:1422
 #, c-format
 msgid "The following error has occurred loading %s: %s"
-msgstr "O seguinte erro ocorreu ao cargar %s: %s"
+msgstr "Ocorreu o seguinte erro ao cargar %s: %s"
 
-#: ../pidgin/gtkutils.c:1402 ../pidgin/gtkutils.c:1424
 msgid "Failed to load image"
 msgstr "Fallou ao cargar a imaxe"
 
-#: ../pidgin/gtkutils.c:1498
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Non se pode enviar o cartafol %s."
 
-#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 "%s non pode transferir un cartafol. Necesita enviar os ficheiros do cartafol "
-"de un en un."
+"individualmente."
 
-#: ../pidgin/gtkutils.c:1531 ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1550
 msgid "You have dragged an image"
-msgstr "Arrastrouse unha imaxe"
+msgstr "Arrastrou unha imaxe"
 
-#: ../pidgin/gtkutils.c:1532
 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 ""
-"Pode enviar esta imaxe como unha transferencia de ficheiro, inserila na "
+"Pode enviar esta imaxe como unha transferencia de ficheiro, incorporala na "
 "mensaxe ou usala como unha icona de contacto para este usuario."
 
-#: ../pidgin/gtkutils.c:1538 ../pidgin/gtkutils.c:1558
 msgid "Set as buddy icon"
 msgstr "Establecer como icona de contacto"
 
-#: ../pidgin/gtkutils.c:1539 ../pidgin/gtkutils.c:1559
 msgid "Send image file"
 msgstr "Enviar un ficheiro de imaxe"
 
-#: ../pidgin/gtkutils.c:1540 ../pidgin/gtkutils.c:1559
 msgid "Insert in message"
 msgstr "Inserir na mensaxe"
 
-#: ../pidgin/gtkutils.c:1544
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Desexa establecela como a icona de contacto para este usuario?"
 
-#: ../pidgin/gtkutils.c:1551
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16588,12 +13036,11 @@ msgstr ""
 "Pode enviar esta imaxe como unha transferencia ou usala como a icona de "
 "contacto para este usuario."
 
-#: ../pidgin/gtkutils.c:1552
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
 msgstr ""
-"Pode inserir esta imaxe na súa mensaxe ou empregala como icona de contacto "
+"Pode inserir esta imaxe nesta mensaxe ou empregala como icona de contacto "
 "para este usuario"
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
@@ -16601,19 +13048,16 @@ msgstr ""
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1610
 msgid "Cannot send launcher"
-msgstr "Non se pode enviar o acceso directo"
+msgstr "Non se pode enviar o iniciador"
 
-#: ../pidgin/gtkutils.c:1610
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
 msgstr ""
-"Arrastrou un acceso directo do escritorio. O máis probable é que queira "
-"enviar o contido ao que apunta o acceso directo."
+"Arrastrou un iniciador do escritorio. O máis probábel é que queira enviar o "
+"contido ao que apunta o propio iniciador."
 
-#: ../pidgin/gtkutils.c:2345
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16624,111 +13068,90 @@ msgstr ""
 "<b>Tamaño do ficheiro:</b> %s\n"
 "<b>Tamaño da imaxe:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2641
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
-"O ficheiro '%s' é demasiado grande para %s.  Probe cunha imaxe máis "
-"pequena.\n"
+"O ficheiro '%s' é demasiado grande para %s. Probe cunha imaxe máis pequena.\n"
 
-#: ../pidgin/gtkutils.c:2643
 msgid "Icon Error"
-msgstr "Erro de icona"
+msgstr "Erro na icona"
 
-#: ../pidgin/gtkutils.c:2644
 msgid "Could not set icon"
-msgstr "Non se puido enviar a icona"
+msgstr "Non se puido definir a icona"
 
-#: ../pidgin/gtkutils.c:2744
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Fallou ao abrir o ficheiro '%s': %s"
+msgstr "Fallo ao abrir o ficheiro '%s': %s"
 
-#: ../pidgin/gtkutils.c:2793
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"Fallou ao cargar a imaxe '%s': descoñécese a razón,o máis probable é que "
-"sexa un arquivo de imaxe danado"
+"Fallo ao cargar a imaxe '%s': causa descoñecida, probablemente o ficheiro "
+"está corrompido"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Gardar o ficheiro"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
-msgstr "Seleccionar a cor"
+msgstr "Seleccione a cor"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Pechar _os separadores"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "_Obter información"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Convidar"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Abrir o correo"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
+#, fuzzy
+msgid "_Edit"
+msgstr "Editar"
+
+#, fuzzy
+msgid "Pidgin Tooltip"
+msgstr "Indicación do Pidgin"
+
 msgid "Pidgin smileys"
-msgstr "Emitocanas de Pidgin"
+msgstr "Emoticonas de Pidgin"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
-msgstr "Pingüins bonitos"
+msgstr "Penguin Pimps"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Seleccionando isto desactívanse as emoticonas gráficas."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "ningún"
 
-#: ../pidgin/plugins/cap/cap.c:450
-msgid "Display Statistics"
-msgstr "Estatísticas de visualización"
-
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Probabilidade de resposta:"
 
-#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Configuración das estatísticas"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
-msgstr "Tempo máximo de espera de resposta:"
+msgstr "Tempo máximo de espera da resposta:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minutos"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
-msgstr "Diferenza máxima da última vista:"
+msgstr "Diferenza máxima da última visualización:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Límite:"
 
@@ -16738,62 +13161,46 @@ msgstr "Límite:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Predición de dispoñibilidade de contactos"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Complemento de predición da dispoñibilidade do contacto."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
+msgid "Displays statistical information about your buddies' availability"
 msgstr ""
-"O complemento de dispoñibilidade de contacto (cap) emprégase para mostrar a "
-"información estatística sobre os contactos nunha lista de contactos de "
-"usuarios."
+"Mostra información estatística sobre a dispoñibilidade dos seus contactos"
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "O contacto está inactivo"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "O contacto está ausente"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
-msgstr "O contacto está en ausencia \"extendida\""
+msgstr "O contacto está en ausencia \"ampliada\""
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "O contacto está móbil"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "O contacto está desconectado"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Valores para usar cando..."
 
-#: ../pidgin/plugins/contact_priority.c:118
 msgid ""
 "The buddy with the <i>largest score</i> is the buddy who will have priority "
 "in the contact.\n"
-msgstr "O contacto con <i>puntuación máis alta</i> é o que terá prioridade.\n"
+msgstr "O contacto coa <i>puntuación máis alta</i> é o que terá prioridade.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Usar o último contacto cando as puntuacións sexan iguais"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Valores para usar na conta..."
 
@@ -16803,97 +13210,78 @@ msgstr "Valores para usar na conta..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Prioridade do contacto"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
 msgid ""
 "Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Permite controlar os valores asociados aos diferentes estados dos contactos."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
 msgstr ""
-"Permite cambiar os puntos asignados aos estados inactivo/ausente/"
-"desconectado para os contactos nos cálculos de prioridades dos contactos."
+"Permite cambiar os valores asignados aos estados inactivo/ausente/"
+"desconectado para os contactos nos cálculos de prioridade dos contactos."
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Cores da conversa"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
-msgstr "Personalizar cores na ventá de conversa"
+msgstr "Personalizar as cores na ventá de conversa"
 
-#: ../pidgin/plugins/convcolors.c:82
 msgid "Error Messages"
 msgstr "Mensaxes de erro"
 
-#: ../pidgin/plugins/convcolors.c:83
 msgid "Highlighted Messages"
 msgstr "Mensaxes realzadas"
 
-#: ../pidgin/plugins/convcolors.c:84
 msgid "System Messages"
 msgstr "Mensaxes do sistema"
 
-#: ../pidgin/plugins/convcolors.c:85
 msgid "Sent Messages"
 msgstr "Mensaxes enviadas"
 
-#: ../pidgin/plugins/convcolors.c:86
 msgid "Received Messages"
 msgstr "Mensaxes recibidas"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Seleccionar a cor para %s"
 
-#: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
-msgstr "Ignorar os formatos entrantes"
+msgstr "Ignorar o formato entrante"
 
-#: ../pidgin/plugins/convcolors.c:311
 msgid "Apply in Chats"
 msgstr "Aplicar nas conversas"
 
-#: ../pidgin/plugins/convcolors.c:312
 msgid "Apply in IMs"
 msgstr "Aplicar nas MI"
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Por número de conversas"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Localización da conversa"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-#: ../pidgin/plugins/extplacement.c:105
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"Nota: A preferencia para \"Novas conversas\" debe estar establecida a \"Por "
+"Nota: A preferencia para \"Novas conversas\" debe estar definida como \"Por "
 "número de conversas\"."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Número de conversas por ventá"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
-msgstr "Separar ventás de MI e conversas cando se localizan por número"
+msgstr "Separar ventás de MI e de conversas cando se localizan por número"
 
 #. *< type
 #. *< ui_requirement
@@ -16901,41 +13289,34 @@ msgstr "Separar ventás de MI e conversas cando se localizan por número"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
-msgstr "_LocalizaciónExt"
+msgstr "Localización extra"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Opcións adicionais de localización de conversas."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
 msgstr ""
-"Restrinxir o número de conversas por ventá, de forma opcional utilizar "
-"ventás distintas para MI e conversas"
+"Restrinxir o número de conversas por ventá, utilizando opcionalmente ventás "
+"distintas para MI e conversas"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Configuración dos xestos co rato"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Botón central do rato"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Botón dereito do rato"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "Mostrar xestos _visuais"
 
@@ -16945,64 +13326,51 @@ msgstr "Mostrar xestos _visuais"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Xestos co rato"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
-msgstr "Proporciona soporte para xestos co rato"
+msgstr "Proporciona soporte para os xestos co rato"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
+#, fuzzy
 msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
+" • Drag down and then to the right to close a conversation.\n"
+" • Drag up and then to the left to switch to the previous conversation.\n"
+" • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"Permite soporte de xestos co rato nas ventás de conversa.\n"
-"Arrastre co botón central do rato para realizar certas accións:\n"
-"\n"
-"Abaixo e despois á dereita para pechar unha ventá de conversa.\n"
-"Arriba e despois á esquerda para mudar á conversa anterior.\n"
-"Arriba e despois á dereita para mudar á seguinte conversa."
+"Permite o soporte de xestos co rato nas ventás de conversa. Arrastre co "
+"botón central do rato para realizar certas accións:\n"
+" &bull; Abaixo e despois á dereita para pechar unha conversa.\n"
+" &bull; Arriba e despois á esquerda para mudar á conversa anterior.\n"
+" &bull; Arriba e despois á dereita para mudar á seguinte conversa."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
-msgstr "Mensaxaría instantánea"
+msgstr "Mensaxería instantánea"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
-"Seleccione unha persoa da súa axenda de enderezos amosada abaixo ou engada "
-"unha nova persoa."
+"Seleccione unha persoa da súa axenda de enderezos abaixo ou engada unha nova "
+"persoa."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:301
 msgid "Group:"
 msgstr "Grupo:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "Nova persoa"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 msgid "Select Buddy"
 msgstr "Seleccionar contacto"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -17011,46 +13379,36 @@ msgstr ""
 "unha nova persoa."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Detalles de usuario"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Asociar contacto"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:240
-#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send email"
-msgstr "Imposible enviar o correo electrónico"
+msgstr "Non é posíbel enviar o correo electrónico"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
-msgstr "O executable de evolution non se atopou no PATH."
+msgstr "O executábel do evolution non se encontrou no PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An email address was not found for this buddy."
-msgstr "Non se atopou un enderezo de correo electrónico para este amigo."
+msgstr "Non se encontrou un enderezo de correo electrónico para este amigo."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Engadir á axenda de enderezos"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send Email"
-msgstr "Enviar un correo"
+msgstr "Enviar un correo electrónico"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
-msgstr "Configuración da integración con Evolution"
+msgstr "Configuración da integración co Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
-"Seleccione todas as contas ás que se engadirán os contactos de forma "
+"Seleccione todas as contas ás que os contactos se deberían engadir de forma "
 "automática."
 
 #. *< type
@@ -17059,47 +13417,38 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
-msgstr "Integración con Evolution"
+msgstr "Integración co Evolution"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:530
-#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
-msgstr "Ofrece integración con Evolution."
+msgstr "Ofrece integración co Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:262
 msgid "Please enter the person's information below."
-msgstr "Introduza a información da persoa a continuación."
+msgstr "Introduza a información da persoa abaixo."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Introduza o nome de usuario do contacto e o tipo de conta máis abaixo."
+#, fuzzy
+msgid "Please enter the buddy's username and account type below."
+msgstr "Introduza o nome de usuario do contacto e o tipo de conta abaixo."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:286
 msgid "Account type:"
 msgstr "Tipo de conta:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "Información opcional:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Nome:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Apelidos:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "Email:"
-msgstr "Correo electrónico:"
+msgstr "Email:"
 
 #. *< type
 #. *< ui_requirement
@@ -17107,7 +13456,6 @@ msgstr "Correo electrónico:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "Proba de sinais GTK"
 
@@ -17115,14 +13463,11 @@ msgstr "Proba de sinais GTK"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr ""
 "Probar para ver se todos os sinais da interface de usuario funcionan "
 "correctamente."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -17131,7 +13476,6 @@ msgstr ""
 "\n"
 "<b>Nota do contacto</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Historial"
 
@@ -17141,52 +13485,45 @@ msgstr "Historial"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
-msgstr "Minimizar en ausencia"
+msgstr "Iconizar cando está ausente"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Minimiza a lista de contactos e de conversas cando está ausente."
+msgstr "Iconiza a lista de contactos e de conversas cando está ausente."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Comprobador de correo"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Comproba se hai correo local novo."
 
-#: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
-"Engade unha pequena caixa á lista de contactos que mostra se ten novo correo."
+"Engade unha pequena caixa á lista de contactos que mostra se ten correo novo."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Subliñado"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Debuxa unha liña para indicar as novas mensaxes nunha conversa."
 
-#: ../pidgin/plugins/markerline.c:246
+#, fuzzy
+msgid "Jump to markerline"
+msgstr "Ir ao subliñado"
+
 msgid "Draw Markerline in "
-msgstr "Debuxar subliñado en"
+msgstr "Debuxar o subliñado en "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:682
 msgid "_IM windows"
 msgstr "Ventás de M_I"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:689
 msgid "C_hat windows"
 msgstr "Ventás de C_onversa"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
@@ -17194,36 +13531,28 @@ msgstr ""
 "Solicitou unha sesión de mensaxería musical. Seleccione a icona de MM para "
 "aceptala."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Confirmouse a sesión de mensaxería musical."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Mensaxería musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Produciuse un conflito ao executar o comando:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
-msgstr "Erro ao executar o Editor"
+msgstr "Erro ao executar o editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "Ocorreu o seguinte erro:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Configuración de Mensaxería musical"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
-msgstr "Ruta do editor de partituras"
+msgstr "Camiño do editor de partituras"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Aplicar"
 
@@ -17235,89 +13564,78 @@ msgstr "_Aplicar"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Complemento de mensaxaría musical para composición colaborativa."
+msgstr "Complemento de mensaxería musical para a composición colaborativa."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
 msgid ""
 "The Music Messaging Plugin allows a number of users to simultaneously work "
 "on a piece of music by editting a common score in real-time."
 msgstr ""
-"O complemento de mensaxaría musical permítelle traballar a distintos "
-"usuarios de forma simultánea nunha peza de música ao editar unha partitura "
-"común en tempo real."
+"O complemento de mensaxería musical permíte que distintos usuarios traballen "
+"de forma simultánea nunha peza de música editando unha partitura común en "
+"tempo real."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:678
 msgid "Notify For"
 msgstr "Notificación para"
 
-#: ../pidgin/plugins/notify.c:697
-msgid "\t_Only when someone says your screen name"
+#, fuzzy
+msgid "\t_Only when someone says your username"
 msgstr "\t_Só se alguén di o seu nome de usuario"
 
-#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
-msgstr "Ventás con_foco"
+msgstr "Ventás con _foco"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Métodos de notificación"
 
-#: ../pidgin/plugins/notify.c:722
 msgid "Prepend _string into window title:"
 msgstr "Prefixar a _cadea no título da ventá:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:741
 msgid "Insert c_ount of new messages into window title"
 msgstr "Inserir o _número de mensaxes novas no título da ventá"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:750
 msgid "Insert count of new message into _X property"
 msgstr "Inserir a conta de mensaxes novas na característica _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
-msgstr "Establecer pista \"_URXENTE\" do xestor de ventás"
+msgstr "Definir a indicación \"_URXENTE\" do xestor de ventás"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
-msgstr "S_ubir a ventá de conversa"
+msgstr "Elev_ar a ventá de conversa"
+
+#. Present conversation method button
+#, fuzzy
+msgid "_Present conversation window"
+msgstr "Ventá de conversa a_ctual"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Eliminación da notificación"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
 msgid "Remove when conversation window _gains focus"
-msgstr "Eliminar cando a ventá da conversa ten o _foco"
+msgstr "Eliminar cando a ventá da conversa obteña o _foco"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:787
 msgid "Remove when conversation window _receives click"
-msgstr "Eliminar cando se prema na ventá da conversa"
+msgstr "Eliminar cando se p_rema na ventá da conversa"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:795
 msgid "Remove when _typing in conversation window"
 msgstr "Eliminar cando se _escriba na ventá da conversa"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:803
 msgid "Remove when a _message gets sent"
 msgstr "Eliminar cando se envíe unha _mensaxe"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Eliminar ao cambiar de _separador de conversa"
 
@@ -17327,7 +13645,6 @@ msgstr "Eliminar ao cambiar de _separador de conversa"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Notificación de mensaxes"
 
@@ -17335,9 +13652,8 @@ msgstr "Notificación de mensaxes"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910 ../pidgin/plugins/notify.c:912
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Permite notificar de diversas formas sobre as mensaxes sen ler."
+msgstr "Proporciona diversas maneiras de notificación para mensaxes sen ler."
 
 #. *< type
 #. *< ui_requirement
@@ -17345,19 +13661,16 @@ msgstr "Permite notificar de diversas formas sobre as mensaxes sen ler."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Complemento de demostración de Pidgin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr "Un exemplo de complemento que fai cousas - consulte a descrición."
 
 #. *  description
-#: ../pidgin/plugins/pidgininc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
@@ -17367,64 +13680,47 @@ msgstr ""
 "Este é un complemento moi interesante que fai moitas cousas:\n"
 "- Dille quen escribiu o programa cando inicia a sesión\n"
 "- Transpón os textos que lle envíen\n"
-"- Envíalles inmediatamente unha mensaxe ás persoas da súa lista cando se "
-"conectan"
+"- Envía inmediatamente unha mensaxe ás persoas da súa lista cando se conectan"
 
-#: ../pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Cor do cursor"
 
-#: ../pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
 msgstr "Cor secundaria do cursor"
 
-#: ../pidgin/plugins/pidginrc.c:43
 msgid "Hyperlink Color"
 msgstr "Cor da ligazón"
 
-#: ../pidgin/plugins/pidginrc.c:54
+#, fuzzy
+msgid "Highlighted Message Name Color"
+msgstr "Cor do nome para a mensaxe realzada"
+
 msgid "GtkTreeView Horizontal Separation"
 msgstr "Separación horizontal de GtkTreeView"
 
-#: ../pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
-msgstr "Entrada de conversas"
-
-#: ../pidgin/plugins/pidginrc.c:74
-msgid "Conversation History"
-msgstr "Historial de conversas"
+msgstr "Entrada de conversa"
 
-#: ../pidgin/plugins/pidginrc.c:75
-msgid "Log Viewer"
-msgstr "Visor do rexistro"
-
-#: ../pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Diálogo de solicitude"
 
-#: ../pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Diálogo de notificación"
 
-#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Seleccionar cor"
 
-#: ../pidgin/plugins/pidginrc.c:300
 #, c-format
 msgid "Select Interface Font"
-msgstr "Seleccionar tipo de letra da interface"
+msgstr "Seleccionar o tipo de letra da interface"
 
-#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Seleccionar tipo de letra para %s"
 
-#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "Tipo de letra da interface GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tema de atallo de texto GTK+"
 
@@ -17448,48 +13744,37 @@ msgstr "Tema de atallo de texto GTK+"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Cores da interface"
 
-#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Tamaño dos widget"
 
-#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Tipos de letra"
 
-#: ../pidgin/plugins/pidginrc.c:497
 msgid "Gtkrc File Tools"
 msgstr "Ferramentas de ficheiros Gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Escribir configuración en %s%sgtkrc-2.0"
+msgstr "Escribir a configuración en %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
-msgstr "Reler ficheiros gtkrc"
+msgstr "Reler os ficheiros gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control de temas GTK+ de Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
-msgstr "Prové acceso ás configuracións de gtkrc usadas comunmente."
+msgstr "Proporciona acceso ás configuracións de gtkrc usadas comunmente."
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Datos en bruto"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Permítelle enviar datos en bruto a protocolos baseados en texto."
 
-#: ../pidgin/plugins/raw.c:178
 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."
@@ -17498,23 +13783,20 @@ msgstr ""
 "IRC, TOC). Prema 'Intro' na caixa de entrada para enviar. Observe a ventá de "
 "depuración."
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
 "from <a href=\"%s\">%s</a><hr>"
 msgstr ""
-"Vostede usa %s versión %s.  A versión actual é a %s.  Pode obtela de <a href="
+"Vostede usa %s versión %s. A versión actual é a %s. Pode obtela de <a href="
 "\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Rexistro de modificacións:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
-msgstr "Nova versión dispoñible"
+msgstr "Nova versión dispoñíbel"
 
 #. *< type
 #. *< ui_requirement
@@ -17522,90 +13804,97 @@ msgstr "Nova versión dispoñible"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Notificación de versións"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Comproba periodicamente a existencia de novas versións."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
 msgstr ""
-"Comproba periodicamente se hai novas versións dispoñibles e notifícalle ao "
+"Comproba periodicamente se hai novas versións dispoñíbeis e notifica ao "
 "usuario co rexistro de cambios."
 
-#: ../pidgin/plugins/spellchk.c:1962
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#, fuzzy
+msgid "Send Button"
+msgstr "Botón enviar"
+
+#. *< name
+#. *< version
+#, fuzzy
+msgid "Conversation Window Send Button."
+msgstr "O botón para enviar a ventá de conversa."
+
+#. *< summary
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+msgstr ""
+"Engade un botón Enviar á área de entrada da ventá de conversa. Está previsto "
+"para cando non existe un teclado físico."
+
 msgid "Duplicate Correction"
 msgstr "Corrección duplicada"
 
-#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "A palabra especificada xa existe na lista de corrección."
 
-#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Substitucións de texto"
 
-#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Escribe"
 
-#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Envía"
 
-#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Só palabras enteiras"
 
-#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Diferenciar maiúsculas de minúsculas"
 
-#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Engadir unha nova regra de substitución de texto"
 
-#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "_Escribe:"
 
-#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
-msgstr "_Envía:"
+msgstr "En_vía:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr ""
-"Coincidencia _exacta (desmarcar para xestionar maiúsculas e minúsculas "
-"automaticamente)"
+"Coincidencia _exacta de Maiús/min (desmarcar para xestionar as maiúsculas e "
+"minúsculas automaticamente)"
 
-#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Substituír só palabras _enteiras"
 
-#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Opcións xerais de substitución de texto"
 
-#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Activar a substitución da última palabra ao enviar"
 
-#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Substitución de texto"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "Substitúe o texto das mensaxes saíntes segundo as regras definidas polo "
@@ -17617,7 +13906,6 @@ msgstr ""
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Monitor de contactos"
 
@@ -17625,13 +13913,11 @@ msgstr "Monitor de contactos"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Unha versión da lista de contactos con desprazamento horizontal."
 
-#: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
-msgstr "Amosar unha marca temporal cada"
+msgstr "Mostrar unha marca temporal cada"
 
 #. *< type
 #. *< ui_requirement
@@ -17639,52 +13925,40 @@ msgstr "Amosar unha marca temporal cada"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Marca temporal"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
-msgstr "Amosar marcas temporais con estilo iChat"
+msgstr "Mostrar marcas temporais do estilo iChat"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
-msgstr "Amosar marcas temporais con estilo iChat cada N minutos."
+msgstr "Mostra marcas temporais do estilo iChat cada N minutos."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Opcións de formato da marca temporal"
 
-#: ../pidgin/plugins/timestamp_format.c:26
 #, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Forzar o formato de 24 horas"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Mostrar datas en..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "Co_nversas:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Para mensaxes atrasadas"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
-msgstr "Para mensaxes atrasadas e para conversas"
+msgstr "Para mensaxes atrasadas e para mensaxes nas conversas"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
-msgstr "Rexistro de _mensaxes:"
+msgstr "Rexistros de _mensaxes:"
 
 #. *< type
 #. *< ui_requirement
@@ -17692,66 +13966,52 @@ msgstr "Rexistro de _mensaxes:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Formatos de marca de tempo das mensaxes"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Personaliza o formato da marca de tempo das mensaxes."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
 msgstr ""
-"Este complemento permitelle ao usuario personalizar os formatos de marca de "
+"Este complemento permítelle ao usuario personalizar os formatos de marca de "
 "tempo para as mensaxes de conversas e as mensaxes de rexistro."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Opacidade:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Ventás de conversa de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "Transparencia das ventás de M_I"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
-msgstr "M_ostrar barra de desprazamento na ventá MI"
+msgstr "M_ostrar a barra de desprazamento na ventá de MI"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
-msgstr "Eliminar a transparencia das ventás de MI ao ter o foco"
+msgstr "Eliminar a transparencia das ventás de MI ao obter o foco"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
-msgstr "Sempre enriba"
+msgstr "Sempre en primeiro plano"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Ventá da lista de contactos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Transparencia da ventá de lista de _contactos"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Eliminar transparencia da ventá da lista de contactos ao ter o foco"
+msgstr ""
+"Eliminar a transparencia da ventá da lista de contactos ao obter o foco"
 
 #. *< type
 #. *< ui_requirement
@@ -17759,19 +14019,16 @@ msgstr "Eliminar transparencia da ventá da lista de contactos ao ter o foco"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparencia"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Transparencia variable para a lista de contactos e as conversas."
+msgstr "Transparencia variábel para a lista de contactos e as conversas."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -17783,54 +14040,43 @@ msgstr ""
 "\n"
 "* Nota: este complemento require Win2000 ou outro máis novo."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Inicio"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
-msgstr "_Iniciar %s ao comezo de Windows"
+msgstr "_Iniciar %s no arranque do Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
-msgstr "Lista de contactos a_ncorable"
+msgstr "Lista de contactos a_ncorábel"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
-msgstr "_Manter a ventá da lista de contactos por enriba:"
+msgstr "_Manter a ventá da lista de contactos en primeiro plano:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Só cando está ancorado"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
-msgstr "_Ventá escintilante cando se reciben mensaxes nas conversas"
+msgstr "Facer escintilar a _ventá cando se reciben mensaxes de conversas"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
-msgstr "Opcións de Pidgin en Windows"
+msgstr "Opcións do Pidgin no Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
-msgstr "Opcións específicas de Pidgin en Windows."
+msgstr "Opcións específicas do Pidgin no Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
-"Prové opcións específicas para Pidgin en Windows , como o ancoraxe da ventá "
-"de contactos."
+"Proporciona opcións específicas para o Pidgin no Windows, como a ancoraxe da "
+"ventá de contactos."
 
-#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Desconectado.</font>"
 
@@ -17840,149 +14086,235 @@ msgstr "<font color='#777777'>Desconectado.</font>"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "Consola XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
-msgstr "Conta:"
+msgstr "Conta: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
-msgstr "<font color='#777777'>Non conectado a XMPP</font>"
+msgstr "<font color='#777777'>Non conectado ao XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "Inserir unha entrada <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "Inserir unha entrada <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "Inserir unha entrada <message/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Enviar e recibir entradas XMPP en bruto."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento é útil para depurar servidores XMPP ou clientes."
 
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Código [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Erro de operación do grupo"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "Erro na solicitude de inicio de sesión"
+
+#~ msgid "TCP Address"
+#~ msgstr "Enderezo TCP"
+
+#~ msgid "UDP Address"
+#~ msgstr "Enderezo UDP"
+
+#~ msgid "Screen name:"
+#~ msgstr "Nome de usuario:"
+
 #, fuzzy
-#~ msgid "Offline buddies"
+#~ msgid "Show offline buddies"
 #~ msgstr "Mostrar contactos desconectados"
 
-#, fuzzy
-#~ msgid "Sort"
-#~ msgstr "Porto"
+#~ msgid "Sort by status"
+#~ msgstr "Ordenar por estado"
 
-#, fuzzy
-#~ msgid "By Status"
-#~ msgstr "Por estado"
+#~ msgid "Sort alphabetically"
+#~ msgstr "Ordenar alfabeticamente"
 
-#, fuzzy
-#~ msgid "By Log Size"
-#~ msgstr "Por tamaño de rexistro"
+#~ msgid "Sort by log size"
+#~ msgstr "Ordenar por tamaño de rexistro"
 
-#, fuzzy
-#~ msgid "Unable to connect to contact server"
-#~ msgstr "Non se puido conectar ao servidor."
+#~ msgid "Pounce only when my status is not available"
+#~ msgstr "Só avisar cando o meu estado é non dispoñible"
 
-#, fuzzy
-#~ msgid "Unable to retrieve MSN Address Book"
-#~ msgstr "Seleccionar libro de enderezos de Notes"
+#~ msgid "Someone says your screen name in chat"
+#~ msgstr "Alguén menciona o seu nome na conversa"
 
-#, fuzzy
-#~ msgid "Current media"
-#~ msgstr "Token actual"
+#~ msgid "There were errors unloading the plugin."
+#~ msgstr "Ocorreron erros ao descargar o complemento."
 
-#, fuzzy
-#~ msgid "Windows Live Messenger Protocol Plugin"
-#~ msgstr "Complemento de protocolo de Mensaxería GroupWise de Novell"
+#~ msgid "Error setting socket options"
+#~ msgstr "Erro ao establecer as opcións do conectador"
 
-#, fuzzy
-#~ msgid "Windows Live ID authentication Failed"
-#~ msgstr "Fallo: Fallou a autenticación"
+#~ msgid "Couldn't open file"
+#~ msgstr "Non se puido abrir o ficheiro"
 
-#~ msgid "%s just sent you a Nudge!"
-#~ msgstr "%s acáballe de dar un cobadazo!"
+#~ msgid ""
+#~ "This server requires plaintext authentication over an unencrypted "
+#~ "connection.  Allow this and continue authentication?"
+#~ msgstr ""
+#~ "O servidor solicita autenticación con texto sobre unha canle non cifrada. "
+#~ "Quere permitir isto e continuar co proceso de autenticación?"
 
-#, fuzzy
-#~ msgid "Unknown error (%d)"
-#~ msgstr "Erro descoñecido"
+#~ msgid "Error initializing session"
+#~ msgstr "Erro ao inicializar a sesión"
 
-#, fuzzy
-#~ msgid "Unable to connect to OIM server"
-#~ msgstr "Non se puido conectar ao servidor."
+#~ msgid "Invalid screen name"
+#~ msgstr "Nome de usuario incorrecto"
 
-#, fuzzy
-#~ msgid "%s (%s) changed status from %s to %s"
+#~ msgid "Unable to make SSL connection to server."
+#~ msgstr "Non se puido establecer unha conexión SSL co servidor."
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "Demasiado malvado (remitente)"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "Demasiado malvado (destinatario)"
+
+#~ msgid "Screen name sent"
+#~ msgstr "Enviouse o nome de usuario"
+
+#~ msgid "Invalid screen name."
+#~ msgstr "Nome de usuario incorrecto."
+
+#~ msgid "Available Message"
+#~ msgstr "Mensaxe dispoñible"
+
+#~ msgid "Screen name"
+#~ msgstr "Nome de usuario"
+
+#~ msgid "Invalid chat name specified."
+#~ msgstr "Especificouse un nome de conversa incorrecto."
+
+#~ msgid "Away Message"
+#~ msgstr "Mensaxe de ausencia"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr " <i>(obtendo)</i>"
+
+#~ msgid "Use recent buddies group"
+#~ msgstr "Usar un grupo de contactos recente"
+
+#~ msgid "Show how long you have been idle"
+#~ msgstr "Mostrar o tempo que estivo inactivo"
+
+#~ msgid "Cannot find/access ~/.silc directory"
+#~ msgstr "Non se pode localizar ou acceder ao directorio ~/.silc"
+
+#~ msgid "%s changed status from %s to %s"
 #~ msgstr "%s cambiou o estado de %s a %s"
 
-#, fuzzy
-#~ msgid "%s (%s) is now %s"
+#~ msgid "%s is now %s"
 #~ msgstr "%s agora é %s"
 
-#, fuzzy
-#~ msgid "%s (%s) is no longer %s"
+#~ msgid "%s is no longer %s"
 #~ msgstr "%s xa non é %s"
 
-#, fuzzy
-#~ msgid "_Merge"
-#~ msgstr "_Mensaxe:"
+#~ msgid "Screen _name:"
+#~ msgstr "_Nome de usuario:"
 
 #, fuzzy
-#~ msgid "_Send File..."
-#~ msgstr "E_nviar ficheiro"
+#~ msgid "_Send File"
+#~ msgstr "Enviar o ficheiro"
 
-#, fuzzy
-#~ msgid "Add Buddy _Pounce..."
-#~ msgstr "Engadir aviso de contacto..."
+#~ msgid "Add Buddy _Pounce"
+#~ msgstr "Engadir _aviso de contacto"
 
-#, fuzzy
-#~ msgid "Hide when offline"
-#~ msgstr "Non pode mandar mensaxes se está desconectado"
+#~ msgid "Add a C_hat"
+#~ msgstr "Engadir unha _conversa"
 
-#, fuzzy
-#~ msgid "Show when offline"
-#~ msgstr "Non pode mandar mensaxes se está desconectado"
+#~ msgid "/Accounts/Add\\/Edit"
+#~ msgstr "/Contas/Engadir\\/Editar"
 
-#, fuzzy
-#~ msgid "Add _Buddy..."
-#~ msgstr "Engadir contacto"
+#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
+#~ msgstr "<span color=\"red\">%s desconectado: %s</span>"
 
-#, fuzzy
-#~ msgid "Add C_hat..."
-#~ msgstr "Engadir conversa"
+#~ msgid ""
+#~ "Please enter the screen name of the person you would like to add to your "
+#~ "buddy list. You may optionally enter an alias, or nickname,  for the "
+#~ "buddy. The alias will be displayed in place of the screen name whenever "
+#~ "possible.\n"
+#~ msgstr ""
+#~ "Introduza o nome de usuario da persoa que quere engadir á lista. "
+#~ "Opcionalmente, pode introducir un alias. O alias mostrarase en lugar do "
+#~ "nome de usuario sempre que for posible.\n"
+
+#~ msgid "_Screen name:"
+#~ msgstr "_Nome de usuario:"
+
+#~ msgid ""
+#~ "%s\n"
+#~ "\n"
+#~ "%s will not attempt to reconnect the account until you correct the error "
+#~ "and re-enable the account."
+#~ msgstr ""
+#~ "%s\n"
+#~ "\n"
+#~ "%s non tentará reconectar a conta até que vostede corrixa o erro e a "
+#~ "volva activar."
+
+#~ msgid "User has typed something and stopped"
+#~ msgstr "O usuario escribiu algo e parou"
+
+#~ msgid "_Send To"
+#~ msgstr "_Enviar a"
+
+#~ msgid ""
+#~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+#~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">Filename:</span>\t\t%s"
+#~ msgstr ""
+#~ "%s%s<span weight=\"bold\">Escrito por:</span>\t%s\n"
+#~ "<span weight=\"bold\">Sitio web:</span>\t\t%s\n"
+#~ "<span weight=\"bold\">Nome do ficheiro:</span>\t\t%s"
+
+#~ msgid "Display Statistics"
+#~ msgstr "Estatísticas de visualización"
+
+#~ msgid ""
+#~ "The contact availability plugin (cap) is used to display statistical "
+#~ "information about buddies in a users contact list."
+#~ msgstr ""
+#~ "O complemento de dispoñibilidade de contacto (cap) emprégase para mostrar "
+#~ "a información estatística sobre os contactos nunha lista de contactos de "
+#~ "usuarios."
+
+#~ msgid "Conversation History"
+#~ msgstr "Historial de conversas"
+
+#~ msgid "Log Viewer"
+#~ msgstr "Visor do rexistro"
 
 #, fuzzy
-#~ msgid "Persistent"
-#~ msgstr "Persa"
+#~ msgid "Unable to connect to contact server"
+#~ msgstr "Non se puido conectar ao servidor."
 
 #, fuzzy
-#~ msgid "/Accounts/Manage"
-#~ msgstr "/Contas"
+#~ msgid "Current media"
+#~ msgstr "Token actual"
 
 #, fuzzy
-#~ msgid "A_ccount:"
-#~ msgstr "Conta:"
+#~ msgid "Unable to connect to OIM server"
+#~ msgstr "Non se puido conectar ao servidor."
 
 #, fuzzy
-#~ msgid "S_end To"
-#~ msgstr "Enviar a"
+#~ msgid "_Merge"
+#~ msgstr "_Mensaxe:"
 
 #, fuzzy
-#~ msgid "_Smile!"
-#~ msgstr "Emoticona!"
+#~ msgid "A_ccount:"
+#~ msgstr "Conta:"
 
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "Acaba de enviar un cobadazo!"
diff --git a/po/he.po b/po/he.po
index 5b0d00a767..4adaa09604 100644
--- a/po/he.po
+++ b/po/he.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: he\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 11:38-0400\n"
-"PO-Revision-Date: 2008-08-10 01:11+0200\n"
+"POT-Creation-Date: 2008-08-29 15:27-0400\n"
+"PO-Revision-Date: 2008-08-27 21:03+0200\n"
 "Last-Translator: Shalom Craimer <scraimer at g mail dot com>\n"
 "Language-Team: Hebrew <he@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -2329,6 +2329,9 @@ msgstr "גודל חדר מינימלי"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "חוסר פעילות משתמש (בדקות)"
 
+msgid "Apply hiding rules to buddies"
+msgstr "החל חוקי-הסתר על אנשי-הקשר"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -7343,17 +7346,20 @@ msgid ""
 "Room id %d, reply [0x%02X]: \n"
 "%s"
 msgstr ""
+"משוב %s(0x%02X )\n"
+"נשלח %s(0x%02X )\n"
+"מזהה חדר %d, משוב [0x%02X]: \n"
+"%s"
 
-#, fuzzy
 msgid "Failed room reply"
-msgstr "לא ניתן להתחבר, אין תשובה"
+msgstr "כשל במשוב מהחדר"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You are not a member of group \"%s\"\n"
-msgstr "את/ה [%d] נוספת אל הקבוצה \"%d\""
+msgstr "אינך חבר/ה בקבוצה \"%s\"\n"
 
 msgid "Can not decrypt login reply"
-msgstr ""
+msgstr "אין אפשרות לפיענוח המשוב בעת אימות משתמש"
 
 #, c-format
 msgid "Invalid token reply code, 0x%02X"
@@ -9940,7 +9946,7 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>ברוכים הבאים ל-%s!</span>\n"
 "\n"
@@ -12300,6 +12306,12 @@ msgstr "מצב עבור %s"
 msgid "Custom Smiley"
 msgstr "חייכן שלך"
 
+msgid "More Data needed"
+msgstr "נחוץ מידע נוסף"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "נא להזין קיצור-דרך לקשר עם החייכן."
+
 msgid "Duplicate Shortcut"
 msgstr "כפילות בקיצורי-הדרך"
 
@@ -12308,12 +12320,6 @@ msgid ""
 "different shortcut."
 msgstr "חייכן שלך כבר קיים לקיצור-הדרך שנבחר. יש לבחור קיצור-דרך אחר."
 
-msgid "More Data needed"
-msgstr "נחוץ מידע נוסף"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "נא להזין קיצור-דרך לקשר עם החייכן."
-
 msgid "Please select an image for the smiley."
 msgstr "יש לבחור תמונה עבור החייכן."
 
@@ -12468,6 +12474,9 @@ msgstr "_ערוך"
 msgid "_Open Mail"
 msgstr "_פתח דואר"
 
+msgid "_Edit"
+msgstr "ע_רוך"
+
 msgid "Pidgin Tooltip"
 msgstr "מידעון פידג'ין"
 
diff --git a/po/it.po b/po/it.po
index e8bc2ec5ee..38cceb99da 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 12:11-0400\n"
-"PO-Revision-Date: 2008-08-14 15:03+0100\n"
+"POT-Creation-Date: 2008-08-29 13:28-0400\n"
+"PO-Revision-Date: 2008-08-26 14:12+0100\n"
 "Last-Translator: Claudio Satriano <satriano@na.infn.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
 "MIME-Version: 1.0\n"
@@ -43,8 +43,8 @@ msgstr ""
 "  -c, --config=DIR    usa DIR per i file di configurazione\n"
 "  -d, --debug         stampa messaggi di debug sullo standard output\n"
 "  -h, --help          mostra questo aiuto ed esce\n"
-"  -n, --nologin       non effettuare il login automatico  -v, --"
-"version       mostra la versione attuale ed esce\n"
+"  -n, --nologin       non effettuare il login automatico\n"
+"  -v, --version       mostra la versione attuale ed esce\n"
 
 #, c-format
 msgid ""
@@ -114,7 +114,7 @@ msgid "Are you sure you want to delete %s?"
 msgstr "Sei sicuro di voler eliminare %s?"
 
 msgid "Delete Account"
-msgstr "Cancella account"
+msgstr "Elimina account"
 
 #. Delete button
 msgid "Delete"
@@ -1451,9 +1451,8 @@ msgstr "Qualcuno pronuncia il tuo nome in una chat"
 msgid "Notify with a toaster when"
 msgstr "Segnala ai contatti che stai scrivendo"
 
-#, fuzzy
 msgid "Beep too!"
-msgstr "Bip di console"
+msgstr "Emetti anche un bip!"
 
 msgid "Set URGENT for the terminal window."
 msgstr "Imposta lo stato URGENTE per la finestra del terminale."
@@ -2420,6 +2419,9 @@ msgstr "Dimensione minima della stanza"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Tempo massimo di inattività per l'utente (in minuti)"
 
+msgid "Apply hiding rules to buddies"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2504,7 +2506,7 @@ msgstr "Messenger Plus!"
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
 msgid "QIP"
-msgstr ""
+msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -2971,13 +2973,11 @@ msgstr "Password"
 msgid "Password (retype)"
 msgstr "Password (di nuovo)"
 
-#, fuzzy
 msgid "Enter current token"
-msgstr "l'argomento attuale è: %s"
+msgstr "Inserisci il token corrente"
 
-#, fuzzy
 msgid "Current token"
-msgstr "Errore di token"
+msgstr "Token corrente"
 
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registra un nuovo account Gadu-Gadu"
@@ -3518,10 +3518,9 @@ msgstr "nick &lt;nuovo nickname&gt;: Cambia il tuo nickname."
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Invia un comando al nickserv"
 
-#, fuzzy
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
 msgstr ""
-"me &lt;azione&gt;: Invia un'azione in stile IRC ad un contatto o ad una chat."
+"notice &lt;destinatario&lt;:  Invia un annuncio ad un utente o ad un canale"
 
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
@@ -3826,35 +3825,29 @@ msgstr "Indirizzo notiziario:"
 msgid "User Profile"
 msgstr "Profilo dell'utente"
 
-#, fuzzy
 msgid "Jingle"
-msgstr "Entra"
+msgstr "Jingle"
 
-#, fuzzy
 msgid "Jingle Audio"
-msgstr "Bitrate audio:"
+msgstr "Jingle audio"
 
 msgid "User Nickname"
 msgstr "Nickname dell'utente"
 
-#, fuzzy
 msgid "Jingle ICE UDP"
-msgstr "Porta UDP del comando"
+msgstr "Jingle ICE UDP"
 
-#, fuzzy
 msgid "Jingle ICE TCP"
-msgstr "Connetti utilizzando TCP"
+msgstr "Jingle ICE TCP"
 
-#, fuzzy
 msgid "Jingle Raw UDP"
-msgstr "Porta UDP del comando"
+msgstr "Jingle Raw UDP"
 
-#, fuzzy
 msgid "Jingle Video"
-msgstr "Video chat"
+msgstr "Jingle video"
 
 msgid "Jingle DTMF"
-msgstr ""
+msgstr "Jingle DTMF"
 
 msgid "Message Receipts"
 msgstr "Ricevute per il messaggio"
@@ -3904,7 +3897,7 @@ msgid "STUN Service Discovery for Jingle"
 msgstr ""
 
 msgid "Simplified Encrypted Session Negotiation"
-msgstr ""
+msgstr "Negoziazione di una sessione criptata semplificata"
 
 #, fuzzy
 msgid "Hop Check"
@@ -4233,9 +4226,8 @@ msgstr "In ascolto"
 msgid "Mood Text"
 msgstr "Testo identificato"
 
-#, fuzzy
 msgid "Allow Buzz"
-msgstr "Permetti il timeshift"
+msgstr "Permetti i buzz"
 
 msgid "Tune Artist"
 msgstr "Artista del brano"
@@ -4471,30 +4463,30 @@ msgstr "Impossibile fare ping sull'utente %s"
 
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
+msgstr "Impossibile richiamare %s con un buzz: non conosco nulla dell'utente."
 
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
+"Impossibile richiamare %s con un buzz: l'utente potrebbe non essere in "
+"linea. "
 
-#, fuzzy, c-format
+#, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr ""
-"Impossibile inviare il file a %s. L'utente non supporta il trasferimento file"
+msgstr "Impossibile richiamare %s con un buzz: l'utente non lo supporta."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#, fuzzy
 msgid "Buzz"
-msgstr "Buzz!!"
+msgstr "Buzz"
 
-#, fuzzy, c-format
+#, c-format
 msgid "%s has buzzed you!"
-msgstr "%s ti ha aggiunto [%s]"
+msgstr "%s ti ha richiamato con un buzz!"
 
 #, c-format
 msgid "Buzzing %s..."
-msgstr ""
+msgstr "Sto richiamando l'attenzione di %s con un buzz..."
 
 msgid "config:  Configure a chat room."
 msgstr "config: Configura una chat room."
@@ -4518,15 +4510,15 @@ msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
-"affiliate &lt;utente&gt; &lt;proprietario|admin|membro|escluso|nessuno&gt;: "
-"Imposta un'affiliazione per l'utente nella stanza."
+"affiliate &lt;utente&gt; &lt;owner|admin|member|outcast|none&gt;: Imposta "
+"un'affiliazione per l'utente nella stanza."
 
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
-"role &lt;utente&gt; &lt;moderatore|partecipante|visitatore|nessuno&gt;: "
-"Imposta un ruolo per l'utente nella stanza."
+"role &lt;utente&gt; &lt;moderator|participant|visitor|none&gt;: Imposta un "
+"ruolo per l'utente nella stanza."
 
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;utente&gt; [messaggio]: Invita un utente nella stanza."
@@ -4677,7 +4669,7 @@ msgid "Edit User Mood"
 msgstr "Modifica l'umore dell'utente"
 
 msgid "Please select your mood from the list."
-msgstr ""
+msgstr "Scegli il tuo umore dalla lista."
 
 msgid "Set"
 msgstr "Imposta"
@@ -7574,9 +7566,9 @@ msgstr "Errore nell'aggiunta del contatto"
 msgid "Update interval(s)"
 msgstr "Intervallo(i) per l'aggiornamento"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "Titolo non valido"
+msgstr "Lunghezza del token non valida, %d"
 
 #, fuzzy
 msgid "Keep alive error"
@@ -7635,21 +7627,25 @@ msgid ""
 "Room id %d, reply [0x%02X]: \n"
 "%s"
 msgstr ""
+"Risposta %s(0x%02X )\n"
+"Inviato %s(0x%02X )\n"
+"Id della stanza %d, risposta [0x%02X]: \n"
+"%s"
 
 #, fuzzy
 msgid "Failed room reply"
 msgstr "Impossibile rimuovere il contatto"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You are not a member of group \"%s\"\n"
-msgstr "Tu [%d] sei stato aggiunto al gruppo \"%d\""
+msgstr "Non sei un membro del gruppo \"%s\"\n"
 
 msgid "Can not decrypt login reply"
-msgstr ""
+msgstr "Impossibile decrittare la risposta al login"
 
 #, c-format
 msgid "Invalid token reply code, 0x%02X"
-msgstr ""
+msgstr "Token non valido nel codice di risposta, 0x%02X"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -7698,9 +7694,9 @@ msgstr "Messaggio: %s"
 msgid "%s is not in your buddy list"
 msgstr "%s non è nella tua lista contatti"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Notice from: %s"
-msgstr "Annuncio da %s"
+msgstr "Annuncio da: %s"
 
 #, c-format
 msgid "%s"
@@ -10311,7 +10307,7 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Benvenuto in %s!</span>\n"
 "\n"
@@ -10321,7 +10317,7 @@ msgstr ""
 "<b>Aggiungi</b> per configurarli tutti.\n"
 "\n"
 "Puoi tornare a questa finestra, per aggiungere, modificare o rimuovere un "
-"account, attraverso <b>Account->Aggiungi/Modifica</b> nella finestra della "
+"account, attraverso <b>Account->Gestisci account</b> nella finestra della "
 "Lista contatti."
 
 #, c-format
@@ -11130,7 +11126,7 @@ msgstr "sviluppatore"
 
 #. feel free to not translate this
 msgid "Ka-Hing Cheung"
-msgstr ""
+msgstr "Ka-Hing Cheung"
 
 msgid "support"
 msgstr "supporto"
@@ -11173,7 +11169,7 @@ msgid "Arabic"
 msgstr "Arabo"
 
 msgid "Belarusian Latin"
-msgstr ""
+msgstr "Bielorusso latino"
 
 msgid "Bulgarian"
 msgstr "Bulgaro"
@@ -11302,7 +11298,7 @@ msgid "Norwegian Nynorsk"
 msgstr "Norvegese Nynorsk"
 
 msgid "Occitan"
-msgstr ""
+msgstr "Occitano"
 
 msgid "Punjabi"
 msgstr "Punjabi"
@@ -12726,6 +12722,12 @@ msgstr "Stato per %s"
 msgid "Custom Smiley"
 msgstr "Smiley personalizzato"
 
+msgid "More Data needed"
+msgstr "C'è bisogno di più dati"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Scegli una scorciatoia da tastiera da associare con lo smiley."
+
 msgid "Duplicate Shortcut"
 msgstr "Scorciatoia già esistente"
 
@@ -12736,12 +12738,6 @@ msgstr ""
 "Esiste già uno smiley personalizzato per la scorciatoia da tastiera "
 "selezionata. Specifica una scorciatoia differente."
 
-msgid "More Data needed"
-msgstr "C'è bisogno di più dati"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Scegli una scorciatoia da tastiera da associare con lo smiley."
-
 msgid "Please select an image for the smiley."
 msgstr "Scegli un'immagine per lo smiley."
 
@@ -12905,9 +12901,11 @@ msgstr "_Modifica"
 msgid "_Open Mail"
 msgstr "_Leggi la Posta"
 
-#, fuzzy
+msgid "_Edit"
+msgstr "_Modifica"
+
 msgid "Pidgin Tooltip"
-msgstr "Smiley di Pidgin"
+msgstr "Tooltip di Pidgin"
 
 msgid "Pidgin smileys"
 msgstr "Smiley di Pidgin"
@@ -13905,9 +13903,3 @@ msgstr ""
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Questo plugin è utile per effettuare il debug dei server o dei client XMPP."
-
-#~ msgid "Code [0x%02X]: %s"
-#~ msgstr "Codice [0x%02X]: %s"
-
-#~ msgid "Group Operation Error"
-#~ msgstr "Errore di operazione sul gruppo"
diff --git a/po/nl.po b/po/nl.po
index 9f1b71482a..c5092ee0a6 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,20 +1,18 @@
-# translation of nl.po to
+# 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 Gaim package.
 #
-# Hylke Bons <hylkebons@gmail.com>, 2008
 # 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.
-#
-# This file is distributed under the same license as the Pidgin package.
-
 msgid ""
 msgstr ""
 "Project-Id-Version: pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-06 03:06-0400\n"
-"PO-Revision-Date: 2008-08-06 14:55+0100\n"
-"Last-Translator: Hylke <hylkebons@gmail.com>\n"
+"POT-Creation-Date: 2008-08-29 13:25-0400\n"
+"PO-Revision-Date: 2008-08-26 10:39+0100\n"
+"Last-Translator: Daniël <danielheres@gmail.com>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,19 +22,13 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:64
-#: ../finch/finch.c:302
-#: ../finch/finch.c:331
-#: ../finch/finch.c:419
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Probeer '%s -h' voor meer informatie.\n"
 
-#: ../finch/finch.c:210
 #, c-format
 msgid ""
 "%s\n"
@@ -57,353 +49,115 @@ msgstr ""
 "  -n, --nologin       niet automatisch aanmelden\n"
 "  -v, --version       versie-info weergeven\n"
 
-#: ../finch/finch.c:329
-#: ../pidgin/gtkmain.c:736
-#, c-format
-msgid "%s encountered errors migrating your settings from %s to %s. Please investigate and complete the migration by hand. Please report this error at http://developer.pidgin.im"
-msgstr "%s zorgde voor fouten tijdens het verplaatsen van je instellingen van %s naar %s. Verplaats het handmatig. Rapporteer deze fout a.u.b. op http://developer.pidgin.im"
-
-#: ../finch/gntaccount.c:126
-#: ../finch/gntaccount.c:505
-#: ../finch/gntblist.c:595
-#: ../finch/gntblist.c:759
-#: ../finch/gntblist.c:772
-#: ../finch/gntplugin.c:196
-#: ../finch/gntplugin.c:244
-#: ../finch/gntrequest.c:380
-#: ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2053
-#: ../libpurple/protocols/jabber/chat.c:702
-#: ../libpurple/protocols/jabber/chat.c:713
-#: ../libpurple/protocols/jabber/jabber.c:1627
-#: ../libpurple/protocols/qq/group_join.c:310
-#: ../libpurple/protocols/qq/im.c:561
-#: ../libpurple/protocols/silc/ops.c:76
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1451
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s zorgde voor fouten tijdens het verplaatsen van je instellingen van %s "
+"naar %s. Verplaats het handmatig. Rapporteer deze fout alstublieft op http://"
+"developer.pidgin.im"
+
 msgid "Error"
 msgstr "Fout"
 
-#: ../finch/gntaccount.c:126
 msgid "Account was not added"
 msgstr "Account niet toegevoegd"
 
-#: ../finch/gntaccount.c:127
 msgid "Username of an account must be non-empty."
 msgstr "Gebruikersnaam van een acount mag niet leeg zijn."
 
-#: ../finch/gntaccount.c:458
 msgid "New mail notifications"
 msgstr "Nieuwe e-mailmeldingen"
 
-#: ../finch/gntaccount.c:468
 msgid "Remember password"
 msgstr "Wachtwoord onthouden"
 
-#: ../finch/gntaccount.c:506
 msgid "There's no protocol plugins installed."
-msgstr "Er is geen protocol-plugin geïnstalleerd"
+msgstr "Er is geen protocol-plug-in geïnstalleerd"
 
-#: ../finch/gntaccount.c:507
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Je bent waarschijnlijk 'make install' vergeten.)"
 
-#: ../finch/gntaccount.c:517
-#: ../finch/gntconn.c:138
-#: ../pidgin/gtkaccount.c:1501
-#: ../pidgin/gtkblist.c:4761
 msgid "Modify Account"
 msgstr "Account bewerken"
 
-#: ../finch/gntaccount.c:517
 msgid "New Account"
 msgstr "Nieuw account"
 
-#: ../finch/gntaccount.c:542
-#: ../pidgin/gtkft.c:698
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../finch/gntaccount.c:550
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:294
 msgid "Username:"
 msgstr "Gebruikersnaam:"
 
-#: ../finch/gntaccount.c:563
 msgid "Password:"
 msgstr "Wachtwoord: "
 
-#: ../finch/gntaccount.c:573
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Register checkbox
-#: ../finch/gntaccount.c:584
 msgid "Create this account on the server"
 msgstr "Maak dit account op de server aan"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:600
-#: ../finch/gntaccount.c:664
-#: ../finch/gntaccount.c:915
-#: ../finch/gntblist.c:641
-#: ../finch/gntblist.c:747
-#: ../finch/gntblist.c:782
-#: ../finch/gntblist.c:1134
-#: ../finch/gntblist.c:1360
-#: ../finch/gntblist.c:1494
-#: ../finch/gntblist.c:2661
-#: ../finch/gntblist.c:2712
-#: ../finch/gntblist.c:2786
-#: ../finch/gntblist.c:2848
-#: ../finch/gntcertmgr.c:90
-#: ../finch/gntconv.c:596
-#: ../finch/gntplugin.c:532
-#: ../finch/gntpounce.c:471
-#: ../finch/gntpounce.c:679
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1064
-#: ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485
-#: ../finch/gntstatus.c:610
-#: ../finch/plugins/gnthistory.c:178
-#: ../libpurple/account.c:1118
-#: ../libpurple/account.c:1437
-#: ../libpurple/account.c:1472
-#: ../libpurple/conversation.c:1235
-#: ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:509
-#: ../libpurple/protocols/gg/gg.c:671
-#: ../libpurple/protocols/gg/gg.c:808
-#: ../libpurple/protocols/gg/gg.c:890
-#: ../libpurple/protocols/jabber/buddy.c:759
-#: ../libpurple/protocols/jabber/buddy.c:2447
-#: ../libpurple/protocols/jabber/buddy.c:2483
-#: ../libpurple/protocols/jabber/chat.c:811
-#: ../libpurple/protocols/jabber/jabber.c:1093
-#: ../libpurple/protocols/jabber/jabber.c:1102
-#: ../libpurple/protocols/jabber/jabber.c:1820
-#: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/jabber/usermood.c:199
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:401
-#: ../libpurple/protocols/msn/msn.c:321
-#: ../libpurple/protocols/msn/msn.c:338
-#: ../libpurple/protocols/msn/msn.c:355
-#: ../libpurple/protocols/msn/msn.c:372
-#: ../libpurple/protocols/msn/msn.c:393
-#: ../libpurple/protocols/msnp9/msn.c:303
-#: ../libpurple/protocols/msnp9/msn.c:320
-#: ../libpurple/protocols/msnp9/msn.c:337
-#: ../libpurple/protocols/msnp9/msn.c:354
-#: ../libpurple/protocols/msnp9/msn.c:375
-#: ../libpurple/protocols/myspace/user.c:582
-#: ../libpurple/protocols/myspace/user.c:676
-#: ../libpurple/protocols/oscar/oscar.c:6299
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:684
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/buddy_opt.c:414
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:132
-#: ../libpurple/protocols/qq/group_join.c:347
-#: ../libpurple/protocols/qq/group_opt.c:122
-#: ../libpurple/protocols/qq/group_opt.c:387
-#: ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:178
-#: ../libpurple/protocols/qq/sys_msg.c:272
-#: ../libpurple/protocols/sametime/sametime.c:3440
-#: ../libpurple/protocols/sametime/sametime.c:3526
-#: ../libpurple/protocols/sametime/sametime.c:3700
-#: ../libpurple/protocols/sametime/sametime.c:5453
-#: ../libpurple/protocols/sametime/sametime.c:5543
-#: ../libpurple/protocols/sametime/sametime.c:5668
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc/chat.c:753
-#: ../libpurple/protocols/silc/ops.c:1833
-#: ../libpurple/protocols/silc/silc.c:1058
-#: ../libpurple/protocols/silc/silc.c:1266
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1910
-#: ../libpurple/protocols/silc10/silc.c:761
-#: ../libpurple/protocols/silc10/silc.c:967
-#: ../libpurple/protocols/yahoo/yahoo.c:994
-#: ../libpurple/protocols/yahoo/yahoo.c:3571
-#: ../libpurple/protocols/yahoo/yahoo.c:3582
-#: ../pidgin/gtkaccount.c:1865
-#: ../pidgin/gtkaccount.c:2417
-#: ../pidgin/gtkblist.c:686
-#: ../pidgin/gtkblist.c:6989
-#: ../pidgin/gtkcertmgr.c:197
-#: ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911
-#: ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047
-#: ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkdialogs.c:1117
-#: ../pidgin/gtkdialogs.c:1158
-#: ../pidgin/gtkdialogs.c:1214
-#: ../pidgin/gtkdialogs.c:1253
-#: ../pidgin/gtkdialogs.c:1280
-#: ../pidgin/gtkimhtmltoolbar.c:439
-#: ../pidgin/gtklog.c:327
-#: ../pidgin/gtkplugin.c:302
-#: ../pidgin/gtkpounce.c:1137
-#: ../pidgin/gtkprivacy.c:509
-#: ../pidgin/gtkprivacy.c:525
-#: ../pidgin/gtkprivacy.c:550
-#: ../pidgin/gtkprivacy.c:564
-#: ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:347
-#: ../pidgin/gtkstatusbox.c:1622
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:604
-#: ../finch/gntcertmgr.c:310
-#: ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:532
-#: ../finch/gntpounce.c:477
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1061
-#: ../finch/gntstatus.c:488
-#: ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1471
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:758
-#: ../pidgin/gtkblist.c:686
-#: ../pidgin/gtkdebug.c:746
-#: ../pidgin/gtkrequest.c:279
 msgid "Save"
 msgstr "Opslaan"
 
-#: ../finch/gntaccount.c:657
-#: ../pidgin/gtkaccount.c:1856
-#: ../pidgin/gtksavedstatuses.c:335
-#: ../pidgin/gtkstatusbox.c:1616
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wil je %s echt verwijderen?"
 
-#: ../finch/gntaccount.c:660
 msgid "Delete Account"
 msgstr "Account verwijderen"
 
 #. Delete button
-#: ../finch/gntaccount.c:663
-#: ../finch/gntaccount.c:733
-#: ../finch/gntcertmgr.c:318
-#: ../finch/gntpounce.c:678
-#: ../finch/gntpounce.c:741
-#: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1864
-#: ../pidgin/gtklog.c:326
-#: ../pidgin/gtkpounce.c:1136
-#: ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtksavedstatuses.c:346
-#: ../pidgin/gtkstatusbox.c:1621
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: ../finch/gntaccount.c:695
-#: ../finch/gntblist.c:2528
-#: ../finch/gntui.c:94
-#: ../pidgin/gtkaccount.c:2278
 msgid "Accounts"
 msgstr "Accounts"
 
-#: ../finch/gntaccount.c:701
 msgid "You can enable/disable accounts from the following list."
 msgstr "Je kunt accounts inschakelen/uitschakelen in de volgende lijst."
 
 #. Add button
-#: ../finch/gntaccount.c:724
-#: ../finch/gntaccount.c:914
-#: ../finch/gntblist.c:640
-#: ../finch/gntblist.c:747
-#: ../finch/gntblist.c:782
-#: ../finch/gntblist.c:2968
-#: ../finch/gntcertmgr.c:305
-#: ../finch/gntnotify.c:390
-#: ../finch/gntpounce.c:725
-#: ../finch/gntroomlist.c:274
-#: ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:889
-#: ../libpurple/protocols/qq/sys_msg.c:117
-#: ../libpurple/protocols/qq/sys_msg.c:179
-#: ../libpurple/protocols/qq/sys_msg.c:273
-#: ../libpurple/protocols/sametime/sametime.c:5542
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2416
-#: ../pidgin/gtkblist.c:6988
-#: ../pidgin/gtkconv.c:1740
-#: ../pidgin/gtkrequest.c:277
 msgid "Add"
 msgstr "Toevoegen"
 
 #. Modify button
-#: ../finch/gntaccount.c:729
-#: ../finch/gntpounce.c:733
 msgid "Modify"
 msgstr "Bewerken"
 
-#: ../finch/gntaccount.c:837
-#: ../pidgin/gtkaccount.c:2363
 #, 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"
 
-#: ../finch/gntaccount.c:910
-#: ../pidgin/gtkaccount.c:2415
 msgid "Add buddy to your list?"
 msgstr "Gebruiker toevoegen aan je lijst?"
 
-#: ../finch/gntaccount.c:970
-#: ../pidgin/gtkaccount.c:2473
 #, 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 ""
+"De gebruiker %s%s%s%s wil %s toevoegen aan zijn/haar contactenlijst%s%s."
 
-#: ../finch/gntaccount.c:995
-#: ../finch/gntaccount.c:998
-#: ../finch/gntaccount.c:1025
-#: ../pidgin/gtkaccount.c:2496
-#: ../pidgin/gtkaccount.c:2503
 msgid "Authorize buddy?"
-msgstr "Gebruiker toestemmen?"
+msgstr "Gebruiker toestaan?"
 
-#: ../finch/gntaccount.c:1002
-#: ../finch/gntaccount.c:1029
-#: ../pidgin/gtkaccount.c:2497
-#: ../pidgin/gtkaccount.c:2504
 msgid "Authorize"
-msgstr "Toestemmen"
+msgstr "Toestaan"
 
-#: ../finch/gntaccount.c:1003
-#: ../finch/gntaccount.c:1030
-#: ../pidgin/gtkaccount.c:2498
-#: ../pidgin/gtkaccount.c:2505
 msgid "Deny"
 msgstr "Blokkeren"
 
-#: ../finch/gntblist.c:265
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -412,661 +166,333 @@ msgstr ""
 "Online: %d\n"
 "Totaal: %d"
 
-#: ../finch/gntblist.c:274
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Account: %s (%s)"
 
-#: ../finch/gntblist.c:286
 #, c-format
 msgid ""
 "\n"
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"Voor Het Laatst Gezien: %s geleden"
+"Voor het laatst gezien: %s geleden"
 
-#: ../finch/gntblist.c:306
-#: ../pidgin/gtkprefs.c:327
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Standaard"
 
-#: ../finch/gntblist.c:584
 msgid "You must provide a username for the buddy."
-msgstr "Je moet een gebruikersnaam voor het contactpersoon opgeven."
+msgstr "Geef een gebruikersnaam voor het contactpersoon."
 
-#: ../finch/gntblist.c:586
 msgid "You must provide a group."
 msgstr "Je moet een groep aangeven."
 
-#: ../finch/gntblist.c:588
 msgid "You must select an account."
-msgstr "Je moet een account aangeven."
+msgstr "Selecteer een account."
 
-#: ../finch/gntblist.c:590
 msgid "The selected account is not online."
-msgstr "De geselecteerde account is niet online"
+msgstr "Het geselecteerde account is niet online"
 
-#: ../finch/gntblist.c:595
 msgid "Error adding buddy"
 msgstr "Fout bij toevoegen van contact"
 
-#: ../finch/gntblist.c:622
-#: ../libpurple/protocols/irc/irc.c:995
-#: ../libpurple/protocols/irc/msgs.c:368
-#: ../libpurple/protocols/jabber/jabber.c:1004
-#: ../libpurple/protocols/jabber/jabber.c:1006
-#: ../libpurple/protocols/oscar/oscar.c:4087
-#: ../libpurple/protocols/silc/buddy.c:1554
-#: ../libpurple/protocols/silc/ops.c:1210
-#: ../libpurple/protocols/silc/ops.c:1213
-#: ../libpurple/protocols/silc/ops.c:1349
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc/silc.c:1240
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:941
-#: ../pidgin/gtkaccount.c:1938
-#: ../pidgin/gtksavedstatuses.c:1011
 msgid "Username"
 msgstr "Gebruikersnaam"
 
-#: ../finch/gntblist.c:625
 msgid "Alias (optional)"
 msgstr "Alias (optioneel)"
 
-#: ../finch/gntblist.c:628
 msgid "Add in group"
 msgstr "In groep toevoegen"
 
-#: ../finch/gntblist.c:632
-#: ../finch/gntblist.c:726
-#: ../finch/gntblist.c:1705
-#: ../finch/gntblist.c:2642
-#: ../finch/gntblist.c:2698
-#: ../finch/gntblist.c:2773
-#: ../finch/gntblist.c:2833
-#: ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3409
-#: ../pidgin/gtknotify.c:530
-#: ../pidgin/gtkpounce.c:1305
-#: ../pidgin/plugins/gevolution/gevolution.c:447
 msgid "Account"
 msgstr "Account"
 
-#: ../finch/gntblist.c:638
-#: ../finch/gntblist.c:1183
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3407
-#: ../pidgin/gtkblist.c:6537
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:449
 msgid "Add Buddy"
 msgstr "Contact toevoegen"
 
-#: ../finch/gntblist.c:638
 msgid "Please enter buddy information."
 msgstr "Geef contactinformatie."
 
-#: ../finch/gntblist.c:694
-#: ../libpurple/blist.c:1246
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:732
-#: ../finch/gntblist.c:2637
-#: ../finch/gntblist.c:2693
-#: ../finch/gntblist.c:2828
-#: ../finch/gntconv.c:584
-#: ../finch/gntroomlist.c:298
-#: ../libpurple/protocols/jabber/jabber.c:1021
-#: ../libpurple/protocols/jabber/jabber.c:1024
-#: ../libpurple/protocols/msn/msn.c:1968
-#: ../libpurple/protocols/msn/msn.c:2033
-#: ../libpurple/protocols/msn/msn.c:2060
-#: ../libpurple/protocols/msnp9/msn.c:1724
-#: ../libpurple/protocols/msnp9/msn.c:1789
-#: ../libpurple/protocols/msnp9/msn.c:1816
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../pidgin/gtkplugin.c:770
-#: ../pidgin/gtkroomlist.c:739
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Naam"
 
-#: ../finch/gntblist.c:735
-#: ../finch/gntblist.c:1646
-#: ../libpurple/protocols/msn/msn.c:1787
-#: ../libpurple/protocols/msnp9/msn.c:1542
-#: ../libpurple/protocols/silc/chat.c:609
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1171
-#: ../pidgin/gtkdialogs.c:1022
-#: ../pidgin/gtkdialogs.c:1046
-#: ../pidgin/gtkdialogs.c:1068
-#: ../pidgin/gtkrequest.c:280
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:738
-#: ../finch/gntblist.c:2984
 msgid "Group"
 msgstr "Groep"
 
-#: ../finch/gntblist.c:742
-#: ../finch/gntblist.c:1150
 msgid "Auto-join"
 msgstr "Automatisch deelnemen"
 
-#: ../finch/gntblist.c:745
-#: ../finch/gntblist.c:1185
-#: ../pidgin/gtkblist.c:6902
 msgid "Add Chat"
 msgstr "Chat toevoegen"
 
-#: ../finch/gntblist.c:746
 msgid "You can edit more information from the context menu later."
 msgstr "Je kan meer informatie van het context-menu later veranderen"
 
-#: ../finch/gntblist.c:759
-#: ../finch/gntblist.c:772
 msgid "Error adding group"
 msgstr "Fout bij toevoegen van groep"
 
-#: ../finch/gntblist.c:760
 msgid "You must give a name for the group to add."
-msgstr "Geef de naam van de toe te voegen groep"
+msgstr "Geef de naam van de toe te voegen groep."
 
-#: ../finch/gntblist.c:773
 msgid "A group with the name already exists."
-msgstr "Er bestaat al een groep met dezelfde naam"
+msgstr "Die groep bestaat al."
 
-#: ../finch/gntblist.c:780
-#: ../finch/gntblist.c:1187
-#: ../libpurple/protocols/sametime/sametime.c:5452
-#: ../libpurple/protocols/sametime/sametime.c:5540
-#: ../pidgin/gtkblist.c:6985
 msgid "Add Group"
 msgstr "Groep toevoegen"
 
-#: ../finch/gntblist.c:780
 msgid "Enter the name of the group"
 msgstr "Geef de naam van de groep"
 
-#: ../finch/gntblist.c:1133
-#: ../pidgin/gtkblist.c:685
 msgid "Edit Chat"
 msgstr "Chat bewerken"
 
-#: ../finch/gntblist.c:1133
 msgid "Please Update the necessary fields."
 msgstr "Update de belangrijke velden"
 
-#: ../finch/gntblist.c:1134
-#: ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Bewerken"
 
-#: ../finch/gntblist.c:1159
 msgid "Edit Settings"
 msgstr "Instellingen bewerken"
 
-#: ../finch/gntblist.c:1195
-#: ../pidgin/gtkutils.c:982
 msgid "Information"
 msgstr "Informatie"
 
-#: ../finch/gntblist.c:1195
-#: ../pidgin/gtkutils.c:982
 msgid "Retrieving..."
 msgstr "Ophalen..."
 
-#: ../finch/gntblist.c:1249
-#: ../finch/gntconv.c:633
-#: ../libpurple/protocols/silc/chat.c:906
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
-msgstr "Verkrijg info"
+msgstr "Meer informatie"
 
-#: ../finch/gntblist.c:1253
 msgid "Add Buddy Pounce"
 msgstr "Contactalarm toevoegen"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:1260
-#: ../finch/gntconv.c:645
-#: ../libpurple/protocols/jabber/si.c:1109
-#: ../libpurple/protocols/oscar/oscar.c:657
-#: ../libpurple/protocols/qq/qq.c:664
-#: ../pidgin/gtkconv.c:1679
 msgid "Send File"
 msgstr "Bestanden verzenden"
 
-#: ../finch/gntblist.c:1267
-#: ../libpurple/protocols/gg/gg.c:1625
-#: ../libpurple/protocols/msn/msn.c:766
-#: ../libpurple/protocols/msnp9/msn.c:581
 msgid "Blocked"
 msgstr "Geblokkeerd"
 
-#: ../finch/gntblist.c:1273
-#: ../finch/gntblist.c:1662
-#: ../finch/gntblist.c:2842
 msgid "View Log"
 msgstr "Logboek"
 
-#: ../finch/gntblist.c:1355
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Geef de nieuwe naam voor %s"
 
-#: ../finch/gntblist.c:1357
-#: ../finch/gntblist.c:1646
 msgid "Rename"
 msgstr "Hernoemen"
 
-#: ../finch/gntblist.c:1357
 msgid "Set Alias"
 msgstr "Alias instellen"
 
-#: ../finch/gntblist.c:1358
 msgid "Enter empty string to reset the name."
 msgstr "Niets invullen om de naam te herstellen."
 
-#: ../finch/gntblist.c:1472
 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"
+msgstr ""
+"Verwijderen van dit contact verwijdert ook de gebruikers in het contact"
 
-#: ../finch/gntblist.c:1480
 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"
 
-#: ../finch/gntblist.c:1485
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Wil je %s echt verwijderen?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1488
 msgid "Confirm Remove"
 msgstr "Verwijderen bevestigen"
 
-#: ../finch/gntblist.c:1493
-#: ../finch/gntblist.c:1648
-#: ../finch/gntft.c:245
-#: ../pidgin/gtkconv.c:1737
-#: ../pidgin/gtkrequest.c:278
-#: ../pidgin/gtkstatusbox.c:269
 msgid "Remove"
 msgstr "Verwijderen"
 
 #. Buddy List
-#: ../finch/gntblist.c:1622
-#: ../finch/gntblist.c:3025
-#: ../finch/gntprefs.c:258
-#: ../finch/gntui.c:95
-#: ../pidgin/gtkblist.c:5261
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Contactenlijst"
 
-#: ../finch/gntblist.c:1653
 msgid "Place tagged"
 msgstr "Tag aan bladwijzer toegevoegd"
 
-#: ../finch/gntblist.c:1658
 msgid "Toggle Tag"
 msgstr "Tag wisselen"
 
 #. General
-#: ../finch/gntblist.c:1698
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/gg/gg.c:1059
-#: ../libpurple/protocols/gg/gg.c:1132
-#: ../libpurple/protocols/gg/gg.c:2247
-#: ../libpurple/protocols/jabber/buddy.c:309
-#: ../libpurple/protocols/jabber/buddy.c:1280
-#: ../libpurple/protocols/jabber/buddy.c:2238
-#: ../libpurple/protocols/jabber/buddy.c:2430
-#: ../libpurple/protocols/jabber/jabber.c:1032
-#: ../libpurple/protocols/jabber/jabber.c:1647
-#: ../libpurple/protocols/jabber/jabber.c:1661
-#: ../libpurple/protocols/jabber/jabber.c:1675
-#: ../libpurple/protocols/jabber/jabber.c:1689
-#: ../libpurple/protocols/jabber/jabber.c:1703
-#: ../libpurple/protocols/msn/msn.c:1795
-#: ../libpurple/protocols/msn/msn.c:1971
-#: ../libpurple/protocols/msnp9/msn.c:1550
-#: ../libpurple/protocols/msnp9/msn.c:1727
-#: ../libpurple/protocols/qq/buddy_info.c:44
-#: ../libpurple/protocols/silc/buddy.c:1550
-#: ../libpurple/protocols/silc/ops.c:1016
-#: ../libpurple/protocols/silc/ops.c:1199
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc10/buddy.c:1550
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1069
-#: ../pidgin/gtkblist.c:3433
 msgid "Nickname"
-msgstr "Bijnaam/Adres"
+msgstr "Bijnaam"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
-#: ../finch/gntblist.c:1720
-#: ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:365
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:991
-#: ../libpurple/protocols/msn/msn.c:713
-#: ../libpurple/protocols/msn/msn.c:731
-#: ../libpurple/protocols/msn/msn.c:739
-#: ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/msnp9/msn.c:560
-#: ../libpurple/protocols/msnp9/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/oscar/oscar.c:3142
-#: ../libpurple/protocols/yahoo/yahoo.c:3161
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
-#: ../pidgin/gtkblist.c:3461
-#: ../pidgin/gtkblist.c:3921
-#: ../pidgin/gtkprefs.c:2053
 msgid "Idle"
 msgstr "Inactief"
 
-#: ../finch/gntblist.c:1734
 msgid "On Mobile"
 msgstr "Op mobieltje"
 
-#: ../finch/gntblist.c:2035
-#: ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Nieuw..."
 
-#: ../finch/gntblist.c:2042
-#: ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Opgeslagen..."
 
-#: ../finch/gntblist.c:2496
-#: ../finch/gntplugin.c:352
-#: ../finch/gntui.c:100
-#: ../pidgin/gtkplugin.c:719
 msgid "Plugins"
-msgstr "Plugins"
+msgstr "Plug-ins"
 
-#: ../finch/gntblist.c:2650
-#: ../finch/gntblist.c:2655
 msgid "Block/Unblock"
 msgstr "Blokkeren/deblokkeren"
 
-#: ../finch/gntblist.c:2651
-#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Block"
 msgstr "Blokkeren"
 
-#: ../finch/gntblist.c:2652
-#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Unblock"
 msgstr "Deblokkeren"
 
-#: ../finch/gntblist.c:2657
-msgid "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/Deblokkeren."
+msgid ""
+"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/"
+"deblokkeren."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2660
-#: ../finch/gntblist.c:2711
-#: ../finch/gntblist.c:2847
-#: ../finch/gntcertmgr.c:89
-#: ../finch/gntconn.c:137
-#: ../finch/gntconv.c:595
-#: ../finch/gntnotify.c:80
-#: ../finch/plugins/gnthistory.c:177
-#: ../libpurple/account.c:1117
-#: ../libpurple/account.c:1436
-#: ../libpurple/protocols/gg/gg.c:508
-#: ../libpurple/protocols/gg/gg.c:670
-#: ../libpurple/protocols/gg/gg.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1819
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:320
-#: ../libpurple/protocols/msn/msn.c:337
-#: ../libpurple/protocols/msn/msn.c:354
-#: ../libpurple/protocols/msn/msn.c:371
-#: ../libpurple/protocols/msnp9/msn.c:302
-#: ../libpurple/protocols/msnp9/msn.c:319
-#: ../libpurple/protocols/msnp9/msn.c:336
-#: ../libpurple/protocols/msnp9/msn.c:353
-#: ../libpurple/protocols/myspace/user.c:581
-#: ../libpurple/protocols/myspace/user.c:675
-#: ../libpurple/protocols/oscar/oscar.c:6298
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc/chat.c:752
-#: ../libpurple/protocols/silc/ops.c:1306
-#: ../libpurple/protocols/silc/ops.c:1832
-#: ../libpurple/protocols/silc/silc.c:1057
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1909
-#: ../libpurple/protocols/silc10/silc.c:760
-#: ../libpurple/protocols/yahoo/yahoo.c:993
-#: ../libpurple/protocols/yahoo/yahoo.c:3570
-#: ../libpurple/protocols/yahoo/yahoo.c:3581
-#: ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:771
-#: ../pidgin/gtkdialogs.c:910
-#: ../pidgin/gtkdialogs.c:1002
-#: ../pidgin/gtkrequest.c:272
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2706
-#: ../pidgin/gtkdialogs.c:766
 msgid "New Instant Message"
 msgstr "Nieuw bericht"
 
-#: ../finch/gntblist.c:2708
-#: ../pidgin/gtkdialogs.c:768
 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 sturen."
+msgstr ""
+"Geef de gebruikersnaam van de persoon aan wie je een bericht zou willen "
+"sturen."
 
-#: ../finch/gntblist.c:2769
 msgid "Channel"
 msgstr "Ruimte"
 
-#: ../finch/gntblist.c:2781
-#: ../pidgin/gtkblist.c:1038
 msgid "Join a Chat"
 msgstr "Chat openen"
 
-#: ../finch/gntblist.c:2783
 msgid "Please enter the name of the chat you want to join."
-msgstr "Voer de naam in van het gesprek waarin je wilt deelnemen."
+msgstr "Voer de naam in van het gesprek die je wilt openen."
 
-#: ../finch/gntblist.c:2785
-#: ../finch/gntnotify.c:399
 msgid "Join"
 msgstr "Deelnemen"
 
-#: ../finch/gntblist.c:2844
-#: ../pidgin/gtkdialogs.c:999
-msgid "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 opvragen."
+msgid ""
+"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 "
+"bekijken."
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2898
-#: ../finch/gntpounce.c:459
-#: ../pidgin/gtkpounce.c:826
 msgid "Options"
 msgstr "Opties"
 
-#: ../finch/gntblist.c:2904
 msgid "Send IM..."
 msgstr "Bericht verzenden..."
 
-#: ../finch/gntblist.c:2909
 msgid "Block/Unblock..."
 msgstr "Blokkeren/deblokkeren..."
 
-#: ../finch/gntblist.c:2914
-#: ../pidgin/gtkdocklet.c:711
 msgid "Join Chat..."
 msgstr "Chat openen..."
 
-#: ../finch/gntblist.c:2919
-#: ../finch/gntconv.c:657
 msgid "View Log..."
-msgstr "Bekijk logboek"
+msgstr "Logboek bekijken..."
 
-#: ../finch/gntblist.c:2924
 msgid "View All Logs"
 msgstr "Alle logboeken bekijken"
 
-#: ../finch/gntblist.c:2929
 msgid "Show"
 msgstr "Weergeven"
 
-#: ../finch/gntblist.c:2934
 msgid "Empty groups"
 msgstr "Lege groepen"
 
-#: ../finch/gntblist.c:2941
 msgid "Offline buddies"
 msgstr "Offline contacten"
 
-#: ../finch/gntblist.c:2948
 msgid "Sort"
 msgstr "Sorteren"
 
-#: ../finch/gntblist.c:2953
 msgid "By Status"
 msgstr "Op status"
 
-#: ../finch/gntblist.c:2958
-#: ../pidgin/gtkblist.c:4412
 msgid "Alphabetically"
 msgstr "Alfabetisch"
 
-#: ../finch/gntblist.c:2963
 msgid "By Log Size"
 msgstr "Op logboekgrootte"
 
-#: ../finch/gntblist.c:2974
 msgid "Buddy"
 msgstr "Contact"
 
-#: ../finch/gntblist.c:2979
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/silc/silc.c:1003
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/silc.c:704
-#: ../libpurple/protocols/silc10/util.c:553
 msgid "Chat"
 msgstr "Chat"
 
-#: ../finch/gntblist.c:2989
-#: ../finch/plugins/grouping.c:255
 msgid "Grouping"
 msgstr "Groeperen"
 
-#: ../finch/gntcertmgr.c:85
-#: ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Import certificaat"
 
-#: ../finch/gntcertmgr.c:86
-#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
-msgstr "Geef een hostnaam"
+msgstr "Geef een computernaam"
 
-#: ../finch/gntcertmgr.c:87
-#: ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Geef de computernaam waar dit certificaat voor is."
 
-#: ../finch/gntcertmgr.c:96
-#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
 "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 gecodeerd.\n"
+"Ben er zeker van dat het bestand leesbaar is en in PEM-formaat is "
+"gecodeerd.\n"
 
-#: ../finch/gntcertmgr.c:98
-#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
-msgstr "Certificaat import fout"
+msgstr "Fout bij importeren van certificaat"
 
-#: ../finch/gntcertmgr.c:99
-#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
-msgstr "X.509 certificaat import mislukt"
+msgstr "Importeren van X.509-certificaat mislukt"
 
-#: ../finch/gntcertmgr.c:109
-#: ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Selecteer een PEM-certificaat"
 
-#: ../finch/gntcertmgr.c:126
-#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
 "Check that you have write permission to the target path\n"
 msgstr ""
-"Exporteren naar bestand %s msilukt.\n"
+"Exporteren naar bestand %s mislukt.\n"
 "Controleer of je schrijf-toegang tot de doelmap hebt\n"
 
-#: ../finch/gntcertmgr.c:128
-#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
-msgstr "Certificaat export fout"
+msgstr "Fout bij exporteren van certificaat"
 
-#: ../finch/gntcertmgr.c:129
-#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
-msgstr "X.509 certificaat export milsukt"
+msgstr "Exporteren can X.509-certificaat mislukt."
 
-#: ../finch/gntcertmgr.c:158
-#: ../pidgin/gtkcertmgr.c:298
 msgid "PEM X.509 Certificate Export"
-msgstr "PEM X.509 certificaat export"
+msgstr "Export vvan PEM-X.509-certificaat "
 
-#: ../finch/gntcertmgr.c:187
 #, c-format
 msgid "Certificate for %s"
 msgstr "Certificaat voor %s"
 
-#: ../finch/gntcertmgr.c:194
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -1076,138 +502,94 @@ msgid ""
 msgstr ""
 "Gemeenschappelijke naam: %s\n"
 "\n"
-"SHA1 fingerprint:\n"
+"SHA1 vingerafdruk:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:197
 msgid "SSL Host Certificate"
-msgstr "SSL host certificaat"
+msgstr "SSL-computer-certificaat"
 
-#: ../finch/gntcertmgr.c:232
-#: ../pidgin/gtkcertmgr.c:371
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Ben je er zeker van om het certificaat voor %s te verwijderen?"
 
-#: ../finch/gntcertmgr.c:235
-#: ../pidgin/gtkcertmgr.c:373
 msgid "Confirm certificate delete"
-msgstr "Bevestig het verwijderen van het certificaat."
+msgstr "Verwijderen van het certificaat bevestigen."
 
-#: ../finch/gntcertmgr.c:292
-#: ../pidgin/gtkcertmgr.c:613
 msgid "Certificate Manager"
-msgstr "Certificaat beheerder"
+msgstr "Certificaat beheer"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:297
-#: ../libpurple/protocols/bonjour/bonjour.c:705
-#: ../libpurple/protocols/silc/silc.c:1242
-#: ../libpurple/protocols/silc10/silc.c:943
-#: ../pidgin/gtkcertmgr.c:446
 msgid "Hostname"
 msgstr "Hostnaam"
 
-#: ../finch/gntcertmgr.c:314
-#: ../finch/gntnotify.c:393
-#: ../pidgin/gtkconv.c:1716
-#: ../pidgin/gtkdebug.c:832
 msgid "Info"
 msgstr "Info"
 
 #. Close button
-#: ../finch/gntcertmgr.c:323
-#: ../finch/gntft.c:255
-#: ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:220
-#: ../finch/gntplugin.c:413
-#: ../finch/gntpounce.c:750
-#: ../finch/gntroomlist.c:275
-#: ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:476
-#: ../libpurple/protocols/msnp9/msn.c:419
-#: ../libpurple/protocols/silc/util.c:385
-#: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2390
-#: ../pidgin/gtkrequest.c:275
 msgid "Close"
 msgstr "Sluiten"
 
-#: ../finch/gntconn.c:126
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid "%s disconnected."
 msgstr "%s heeft de verbinding verbroken."
 
-#: ../finch/gntconn.c:130
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
 msgstr ""
 "%s\n"
 "\n"
-"Finch zal geen verbinding meer proberen te maken tot je de fout is verhelpt en het account weer inschakeld."
+"Finch zal geen verbinding meer proberen te maken tot je de fout verhelpt en "
+"het account weer inschakeld wordt."
 
-#: ../finch/gntconn.c:139
 msgid "Re-enable Account"
 msgstr "Account opnieuw inschakelen"
 
-#: ../finch/gntconn.c:156
-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 account hersteld word."
+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 "
+"account hersteld wordt."
 
-#: ../finch/gntconv.c:160
 msgid "No such command."
 msgstr "Opdracht bestaat niet."
 
-#: ../finch/gntconv.c:164
-#: ../pidgin/gtkconv.c:493
 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."
+msgstr ""
+"Syntax-fout:  Je gaf de verkeerde hoeveelheid argumenten bij die opdracht."
 
-#: ../finch/gntconv.c:169
-#: ../pidgin/gtkconv.c:499
 msgid "Your command failed for an unknown reason."
 msgstr "Uw opdracht mislukte om een onbekende reden."
 
-#: ../finch/gntconv.c:174
-#: ../pidgin/gtkconv.c:506
 msgid "That command only works in chats, not IMs."
 msgstr "Die opdracht werkt alleen in chats, niet in gewone gesprekken."
 
-#: ../finch/gntconv.c:177
-#: ../pidgin/gtkconv.c:509
 msgid "That command only works in IMs, not chats."
 msgstr "Die opdracht werkt alleen in gewone gesprekken, niet in chats."
 
-#: ../finch/gntconv.c:181
-#: ../pidgin/gtkconv.c:514
 msgid "That command doesn't work on this protocol."
 msgstr "Die opdracht werkt niet met dit protocol."
 
-#: ../finch/gntconv.c:189
 msgid "Message was not sent, because you are not signed on."
-msgstr "Kan bericht niet versturen omdatje niet aangemeld bent."
+msgstr "Kan bericht niet versturen omdat je niet aangemeld bent."
 
-#: ../finch/gntconv.c:269
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:292
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:297
-#: ../finch/gntconv.c:974
-#: ../pidgin/gtkconv.c:3611
 #, c-format
 msgid ""
 "\n"
@@ -1216,94 +598,68 @@ msgstr ""
 "\n"
 "%s typt..."
 
-#: ../finch/gntconv.c:316
 msgid "You have left this chat."
 msgstr "Je hebt dit gesprek verlaten."
 
-#: ../finch/gntconv.c:434
-#: ../pidgin/gtkconv.c:1402
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr "Logboek wordt vanaf nu bijgehouden."
 
-#: ../finch/gntconv.c:438
-#: ../pidgin/gtkconv.c:1410
-msgid "Logging stopped. Future messages in this conversation will not be logged."
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
 msgstr "Logboek wordt vanaf nu niet meer bijgehouden."
 
-#: ../finch/gntconv.c:524
 msgid "Send To"
 msgstr "Verzenden aan"
 
-#: ../finch/gntconv.c:588
 msgid "Invite message"
-msgstr "Uitnodigingsbericht"
+msgstr "Uitnodiging"
 
-#: ../finch/gntconv.c:590
-#: ../finch/gntnotify.c:402
-#: ../libpurple/protocols/sametime/sametime.c:3525
 msgid "Invite"
 msgstr "Uitnodigen"
 
-#: ../finch/gntconv.c:592
 msgid ""
 "Please enter the name of the user you wish to invite,\n"
 "along with an optional invite message."
 msgstr ""
-"Geef de bijnaam van de persoon die je wil uitnodigen,\n"
+"Geef de naam van de persoon die u wilt uitnodigen,\n"
 "eventueel met een uitnodigende tekst."
 
-#: ../finch/gntconv.c:610
 msgid "Conversation"
 msgstr "Gesprek"
 
-#: ../finch/gntconv.c:616
 msgid "Clear Scrollback"
 msgstr "Gesprek opschonen"
 
-#: ../finch/gntconv.c:620
-#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Tijd in gesprek"
 
-#: ../finch/gntconv.c:638
 msgid "Add Buddy Pounce..."
 msgstr "Contactalarm toevoegen..."
 
-#: ../finch/gntconv.c:652
 msgid "Invite..."
 msgstr "Uitnodigen.."
 
-#: ../finch/gntconv.c:661
 msgid "Enable Logging"
 msgstr "Logboek bijhouden"
 
-#: ../finch/gntconv.c:667
 msgid "Enable Sounds"
 msgstr "Geluiden inschakelen"
 
-#: ../finch/gntconv.c:927
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-ANTWOORD>"
 
-#: ../finch/gntconv.c:1067
 #, c-format
 msgid "List of %d user:\n"
 msgid_plural "List of %d users:\n"
 msgstr[0] "Lijst van %d gebruiker:\n"
 msgstr[1] "Lijst van %d gebruikers:\n"
 
-#: ../finch/gntconv.c:1227
-#: ../pidgin/gtkconv.c:338
 msgid "Supported debug options are:  version"
 msgstr "Ondersteunde debug-opties zijn:  version"
 
-#: ../finch/gntconv.c:1263
-#: ../pidgin/gtkconv.c:390
 msgid "No such command (in this context)."
 msgstr "Opdracht onbekend (in deze context)."
 
-#: ../finch/gntconv.c:1266
-#: ../pidgin/gtkconv.c:393
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1311,85 +667,78 @@ msgstr ""
 "Gebruik \"/help &lt;opdracht&gt;\" voor hulp bij een bepaalde opdracht.\n"
 "De volgende opdrachten zijn hiervoor beschikbaar:\n"
 
-#: ../finch/gntconv.c:1310
 #, c-format
-msgid "%s is not a valid message class. See '/help msgcolor' for valid message classes."
+msgid ""
+"%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."
 
-#: ../finch/gntconv.c:1317
-#: ../finch/gntconv.c:1324
 #, c-format
 msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
-msgstr "%s is geen geldige kleur. Bekijk '/help msgcolor' voor geldige kleuren."
+msgstr ""
+"%s is geen geldige kleur. Bekijk '/help msgcolor' voor geldige kleuren."
 
-#: ../finch/gntconv.c:1380
-#: ../pidgin/gtkconv.c:7809
-msgid "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 gebruikt."
+msgid ""
+"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 "
+"gebruikt."
 
-#: ../finch/gntconv.c:1383
-#: ../pidgin/gtkconv.c:7812
 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 / chat sturen."
+msgstr "me &lt;actie&gt;:  Een IRC-achtige actie naar persoon of chat sturen."
 
-#: ../finch/gntconv.c:1386
-#: ../pidgin/gtkconv.c:7815
-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."
+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."
 
-#: ../finch/gntconv.c:1389
-#: ../pidgin/gtkconv.c:7818
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Maakt het gespreksvenster schoon."
 
-#: ../finch/gntconv.c:1392
-#: ../pidgin/gtkconv.c:7824
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;opdracht&gt;:  Hulp bij een specifieke opdracht."
 
-#: ../finch/gntconv.c:1395
 msgid "users:  Show the list of users in the chat."
 msgstr "gebruikers: Laat de lijst van gebruikers in het gesprek zien."
 
-#: ../finch/gntconv.c:1400
 msgid "plugins: Show the plugins window."
-msgstr "plugins: Plugins-venster weergeven."
+msgstr "plug-ins: Plug-ins-venster weergeven."
 
-#: ../finch/gntconv.c:1403
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Contactenlijst weergeven."
 
-#: ../finch/gntconv.c:1406
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Accounts-venster weergeven."
 
-#: ../finch/gntconv.c:1409
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Debugvenster weergeven."
 
-#: ../finch/gntconv.c:1412
 msgid "prefs: Show the preference window."
 msgstr "prefs: Voorkeuren weergeven."
 
-#: ../finch/gntconv.c:1415
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Venster met opgeslagen statussen weergeven."
 
-#: ../finch/gntconv.c:1420
-msgid "msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color for different classes of messages in the conversation window.<br>    &lt;class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/background&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
 msgstr ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Stel de kleur "
+"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"
 
-#: ../finch/gntdebug.c:231
-#: ../pidgin/gtkconv.c:966
-#: ../pidgin/gtkconv.c:2722
-#: ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:545
 msgid "Unable to open file."
-msgstr "Kan het bestand niet openen."
+msgstr "Kan bestand niet openen."
 
-#: ../finch/gntdebug.c:271
-#: ../finch/gntui.c:98
-#: ../pidgin/gtkdebug.c:689
 msgid "Debug Window"
 msgstr "Debugvenster"
 
@@ -1397,22 +746,15 @@ msgstr "Debugvenster"
 #. * it's necessary to make the width of the debug window resizable ... like I said,
 #. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
 #.
-#: ../finch/gntdebug.c:292
-#: ../pidgin/gtkdebug.c:751
 msgid "Clear"
 msgstr "Wissen"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "Filteren:"
 
-#: ../finch/gntdebug.c:309
-#: ../pidgin/gtkdebug.c:760
 msgid "Pause"
 msgstr "Pauzeren"
 
-#: ../finch/gntft.c:120
-#: ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d file"
 msgid_plural "File Transfers - %d%% of %d files"
@@ -1420,275 +762,172 @@ msgstr[0] "Bestandsoverdrachten - %d%% van %d bestand"
 msgstr[1] "Bestandsoverdrachten - %d%% van %d bestanden"
 
 #. Create the window.
-#: ../finch/gntft.c:127
-#: ../finch/gntft.c:214
-#: ../finch/gntui.c:99
-#: ../pidgin/gtkft.c:236
-#: ../pidgin/gtkft.c:763
 msgid "File Transfers"
 msgstr "Bestandsoverdrachten"
 
-#: ../finch/gntft.c:219
-#: ../pidgin/gtkft.c:647
 msgid "Progress"
 msgstr "Voortgang"
 
-#: ../finch/gntft.c:219
-#: ../pidgin/gtkft.c:654
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: ../finch/gntft.c:219
-#: ../pidgin/gtkft.c:661
 msgid "Size"
 msgstr "Grootte"
 
-#: ../finch/gntft.c:219
 msgid "Speed"
 msgstr "Snelheid"
 
-#: ../finch/gntft.c:219
-#: ../pidgin/gtkft.c:668
 msgid "Remaining"
 msgstr "Nog te gaan"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:219
-#: ../finch/gntstatus.c:547
-#: ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:369
-#: ../libpurple/protocols/gg/gg.c:1048
-#: ../libpurple/protocols/gg/gg.c:1580
-#: ../libpurple/protocols/gg/gg.c:1588
-#: ../libpurple/protocols/jabber/buddy.c:836
-#: ../libpurple/protocols/jabber/buddy.c:840
-#: ../libpurple/protocols/jabber/buddy.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/msn/msn.c:723
-#: ../libpurple/protocols/msn/msn.c:733
-#: ../libpurple/protocols/msn/msn.c:738
-#: ../libpurple/protocols/msn/msn.c:741
-#: ../libpurple/protocols/msnp9/msn.c:559
-#: ../libpurple/protocols/novell/novell.c:2853
-#: ../libpurple/protocols/oscar/oscar.c:910
-#: ../libpurple/protocols/oscar/oscar.c:2949
-#: ../libpurple/protocols/sametime/sametime.c:3315
-#: ../libpurple/protocols/sametime/sametime.c:4206
-#: ../libpurple/protocols/yahoo/yahoo.c:3312
-#: ../pidgin/gtkblist.c:3505
-#: ../pidgin/gtkblist.c:3519
-#: ../pidgin/gtkblist.c:3521
-#: ../pidgin/gtksavedstatuses.c:1030
-#: ../pidgin/gtksavedstatuses.c:1181
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:229
 msgid "Close this window when all transfers finish"
 msgstr "Venster sluiten nadat alles is voltooid"
 
-#: ../finch/gntft.c:236
 msgid "Clear finished transfers"
 msgstr "Verwerkte overdrachten uit lijst verwijderen"
 
-#: ../finch/gntft.c:250
-#: ../finch/gntroomlist.c:272
 msgid "Stop"
 msgstr "Stoppen"
 
-#: ../finch/gntft.c:323
-#: ../pidgin/gtkft.c:169
-#: ../pidgin/gtkft.c:936
 msgid "Waiting for transfer to begin"
 msgstr "Wacht op starten van overdracht"
 
-#: ../finch/gntft.c:390
-#: ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1017
 msgid "Canceled"
 msgstr "Afgebroken"
 
-#: ../finch/gntft.c:392
-#: ../pidgin/gtkft.c:1019
 msgid "Failed"
 msgstr "Mislukt"
 
-#: ../finch/gntft.c:438
-#: ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#: ../finch/gntft.c:449
 msgid "Sent"
 msgstr "Verzonden"
 
-#: ../finch/gntft.c:449
 msgid "Received"
 msgstr "Ontvangen"
 
-#: ../finch/gntft.c:450
-#: ../pidgin/gtkft.c:160
-#: ../pidgin/gtkft.c:1082
 msgid "Finished"
 msgstr "Klaar"
 
-#: ../finch/gntft.c:452
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Het bestand werd opgeslagen als %s."
 
-#: ../finch/gntft.c:459
 msgid "Sending"
 msgstr "Verzenden"
 
-#: ../finch/gntft.c:459
 msgid "Receiving"
 msgstr "Ontvangen"
 
-#: ../finch/gntlog.c:192
 #, c-format
 msgid "Conversation in %s on %s"
 msgstr "Gesprekken in %s op %s"
 
-#: ../finch/gntlog.c:195
 #, c-format
 msgid "Conversation with %s on %s"
 msgstr "Gesprekken met %s op %s"
 
-#: ../finch/gntlog.c:238
-#: ../pidgin/gtklog.c:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../finch/gntlog.c:278
-#: ../pidgin/gtklog.c:550
-msgid "System events will only be logged if the \"Log all status changes to system log\" preference is enabled."
-msgstr "Systeemgebeurtenissen worden alleen bijgehouden als \"Statusveranderingen opslaan in systeemlogboek\" is aangevinkt."
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Systeemgebeurtenissen worden alleen bijgehouden als \"Statusveranderingen "
+"opslaan in systeemlogboek\" is aangevinkt."
 
-#: ../finch/gntlog.c:282
-#: ../pidgin/gtklog.c:554
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr "Berichten worden alleen bijgehouden als \"Alle gesprekken opslaan\" is aangevinkt."
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Berichten worden alleen bijgehouden als \"Alle gesprekken opslaan\" is "
+"aangevinkt."
 
-#: ../finch/gntlog.c:285
-#: ../pidgin/gtklog.c:557
-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."
+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."
 
-#: ../finch/gntlog.c:291
-#: ../pidgin/gtklog.c:566
 msgid "No logs were found"
 msgstr "Geen logboek gevonden"
 
-#: ../finch/gntlog.c:338
-#: ../pidgin/gtklog.c:646
 msgid "Total log size:"
 msgstr "Totale logboekgrootte:"
 
 #. Search box *********
-#: ../finch/gntlog.c:346
 msgid "Scroll/Search: "
 msgstr "Scrollen/zoeken: "
 
-#: ../finch/gntlog.c:404
-#: ../pidgin/gtklog.c:716
 #, c-format
 msgid "Conversations in %s"
 msgstr "Gesprekken in %s"
 
-#: ../finch/gntlog.c:412
-#: ../finch/gntlog.c:485
-#: ../pidgin/gtklog.c:724
-#: ../pidgin/gtklog.c:799
 #, c-format
 msgid "Conversations with %s"
 msgstr "Gesprekken met %s"
 
-#: ../finch/gntlog.c:414
 msgid "All Conversations"
 msgstr "Alle gesprekken"
 
-#: ../finch/gntlog.c:510
-#: ../pidgin/gtklog.c:824
 msgid "System Log"
 msgstr "Systeemlogboek"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "E-mails"
 
-#: ../finch/gntnotify.c:171
-#: ../finch/gntnotify.c:231
 msgid "You have mail!"
 msgstr "Je hebt post!"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:537
 msgid "Sender"
 msgstr "Verzender"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:544
 msgid "Subject"
 msgstr "Onderwerp"
 
-#: ../finch/gntnotify.c:202
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) heeft %d nieuw bericht."
 msgstr[1] "%s (%s) heeft %d nieuwe berichten."
 
-#: ../finch/gntnotify.c:231
-#: ../pidgin/gtknotify.c:352
 msgid "New Mail"
 msgstr "Nieuwe e-mail"
 
-#: ../finch/gntnotify.c:296
-#: ../pidgin/gtknotify.c:984
 #, c-format
 msgid "Info for %s"
-msgstr "Info voor %s"
+msgstr "Informatie voor %s"
 
-#: ../finch/gntnotify.c:297
-#: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:985
 msgid "Buddy Information"
 msgstr "Contactinformatie"
 
-#: ../finch/gntnotify.c:387
-#: ../libpurple/protocols/qq/group_join.c:349
 msgid "Continue"
 msgstr "Doorgaan"
 
-#: ../finch/gntnotify.c:396
-#: ../pidgin/gtkconv.c:1666
 msgid "IM"
 msgstr "Bericht"
 
-#: ../finch/gntnotify.c:405
 msgid "(none)"
 msgstr "(geen)"
 
-#: ../finch/gntnotify.c:431
 msgid "URI"
 msgstr "URI"
 
-#: ../finch/gntplugin.c:84
-#: ../finch/gntplugin.c:93
 msgid "ERROR"
 msgstr "FOUT"
 
-#: ../finch/gntplugin.c:84
 msgid "loading plugin failed"
-msgstr "laden van plugin mislukt"
+msgstr "laden van plug-in mislukt"
 
-#: ../finch/gntplugin.c:93
 msgid "unloading plugin failed"
-msgstr "uitschakelen plugin mislukt"
+msgstr "uitschakelen plug-in mislukt"
 
-#: ../finch/gntplugin.c:139
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1702,493 +941,328 @@ msgstr ""
 "Versie: %s\n"
 "Omschrijving: %s\n"
 "Auteur: %s\n"
-"Webstek: %s\n"
+"Website: %s\n"
 "Bestand: %s\n"
 
-#: ../finch/gntplugin.c:197
 msgid "Plugin need to be loaded before you can configure it."
-msgstr "Plugin moet geladen zijn voordat je deze kunt configureren."
+msgstr "Plug-ins moeten geladen zijn voordat u deze kunt configureren."
 
-#: ../finch/gntplugin.c:245
 msgid "No configuration options for this plugin."
-msgstr "Geen configuratie voor deze plugin."
+msgstr "Geen configuratie voor deze plug-in."
 
-#: ../finch/gntplugin.c:266
 msgid "Error loading plugin"
-msgstr "Fout opgetreden bij het laden van de plugin"
+msgstr "Fout opgetreden bij het laden van de plug-in"
 
-#: ../finch/gntplugin.c:267
 msgid "The selected file is not a valid plugin."
-msgstr "Het geselecteerde bestand is geen geldige plugin."
+msgstr "Het geselecteerde bestand is geen geldige plug-in."
 
-#: ../finch/gntplugin.c:268
-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 bekijken."
+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 "
+"bekijken."
 
-#: ../finch/gntplugin.c:331
 msgid "Select plugin to install"
-msgstr "Selecteer plugin om te installeren"
+msgstr "Selecteer plug-in om te installeren"
 
-#: ../finch/gntplugin.c:357
 msgid "You can (un)load plugins from the following list."
-msgstr "U kunt plugins aan-/uitzetten in de volgende lijst."
+msgstr "U kunt plug-ins aan-/uitzetten in de volgende lijst."
 
-#: ../finch/gntplugin.c:408
 msgid "Install Plugin..."
-msgstr "Plugin installeren..."
+msgstr "Plug-in installeren..."
 
-#: ../finch/gntplugin.c:418
 msgid "Configure Plugin"
-msgstr "Plugin instellen"
+msgstr "Plug-in instellen"
 
 #. copy the preferences to tmp values...
 #. * I liked "take affect immediately" Oh well :-(
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:524
-#: ../finch/gntplugin.c:531
-#: ../finch/gntprefs.c:264
-#: ../finch/gntui.c:103
-#: ../pidgin/gtkprefs.c:2177
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: ../finch/gntpounce.c:193
-#: ../pidgin/gtkpounce.c:270
 msgid "Please enter a buddy to pounce."
-msgstr "Vul een vriend in om een alarm voor in te stellen."
+msgstr "Vul een contact in om een alarm voor in te stellen."
 
-#: ../finch/gntpounce.c:338
-#: ../pidgin/gtkpounce.c:538
 msgid "New Buddy Pounce"
 msgstr "Nieuw contactalarm"
 
-#: ../finch/gntpounce.c:338
-#: ../pidgin/gtkpounce.c:538
 msgid "Edit Buddy Pounce"
 msgstr "Contactalarm bewerken"
 
-#: ../finch/gntpounce.c:343
 msgid "Pounce Who"
-msgstr "Alarmdoel"
+msgstr "Wie alarmeren"
 
 #. Account:
-#: ../finch/gntpounce.c:346
-#: ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Account:"
 
-#: ../finch/gntpounce.c:368
 msgid "Buddy name:"
 msgstr "Contactnaam:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:386
-#: ../pidgin/gtkpounce.c:606
 msgid "Pounce When Buddy..."
 msgstr "Alarmeren als contactpersoon..."
 
-#: ../finch/gntpounce.c:388
 msgid "Signs on"
 msgstr "...zich aanmeldt"
 
-#: ../finch/gntpounce.c:389
 msgid "Signs off"
 msgstr "...zich afmeldt"
 
-#: ../finch/gntpounce.c:390
 msgid "Goes away"
 msgstr "...weggaat"
 
-#: ../finch/gntpounce.c:391
 msgid "Returns from away"
 msgstr "...van afwezigheid terugkeert "
 
-#: ../finch/gntpounce.c:392
 msgid "Becomes idle"
 msgstr "...inactief wordt"
 
-#: ../finch/gntpounce.c:393
 msgid "Is no longer idle"
 msgstr "...weer actief wordt"
 
-#: ../finch/gntpounce.c:394
 msgid "Starts typing"
 msgstr "...start met typen"
 
-#: ../finch/gntpounce.c:395
 msgid "Pauses while typing"
 msgstr "...pauzeert tijdens het typen"
 
-#: ../finch/gntpounce.c:396
 msgid "Stops typing"
 msgstr "...stopt met typen"
 
-#: ../finch/gntpounce.c:397
 msgid "Sends a message"
 msgstr "...een bericht verstuurt"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:426
-#: ../pidgin/gtkpounce.c:667
 msgid "Action"
 msgstr "Actie"
 
-#: ../finch/gntpounce.c:428
 msgid "Open an IM window"
 msgstr "Berichtvenster openen"
 
-#: ../finch/gntpounce.c:429
 msgid "Pop up a notification"
 msgstr "Melding weergeven"
 
-#: ../finch/gntpounce.c:430
 msgid "Send a message"
 msgstr "Een bericht versturen"
 
-#: ../finch/gntpounce.c:431
 msgid "Execute a command"
 msgstr "Opdracht uitvoeren"
 
-#: ../finch/gntpounce.c:432
 msgid "Play a sound"
 msgstr "Een geluidje afspelen"
 
-#: ../finch/gntpounce.c:460
 msgid "Pounce only when my status is not Available"
-msgstr "Alarmeer alleen wanneer ik niet beschikbaar ben"
+msgstr "Contactalarm alleen actief wanneer mijn status niet beschikbaar is"
 
-#: ../finch/gntpounce.c:462
-#: ../pidgin/gtkpounce.c:1318
 msgid "Recurring"
 msgstr "Herhalend"
 
-#: ../finch/gntpounce.c:630
 msgid "Cannot create pounce"
 msgstr "Kan contactalarm niet aanmaken"
 
-#: ../finch/gntpounce.c:631
 msgid "You do not have any accounts."
 msgstr "Je hebt geen accounts."
 
-#: ../finch/gntpounce.c:632
 msgid "You must create an account first before you can create a pounce."
-msgstr ""
+msgstr "Je moet eerst een account aanmaken voordat je een alarm kan instellen"
 
-#: ../finch/gntpounce.c:674
-#: ../pidgin/gtkpounce.c:1132
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "Wilt je het contactalarm van %s op %s echt verwijderen?"
+msgstr "Wil je het contactalarm van %s op %s echt verwijderen?"
 
-#: ../finch/gntpounce.c:708
-#: ../finch/gntui.c:96
-#: ../pidgin/gtkpounce.c:1361
 msgid "Buddy Pounces"
 msgstr "Contactalarmen"
 
-#: ../finch/gntpounce.c:817
-#: ../pidgin/gtkpounce.c:1460
 #, c-format
 msgid "%s has started typing to you (%s)"
-msgstr "%s is een bericht voor je aan het typen (%s)"
+msgstr "%s typt een bericht aan jou (%s)"
 
-#: ../finch/gntpounce.c:818
-#: ../pidgin/gtkpounce.c:1462
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s pauzeert tijdens typen van het bericht (%s)"
 
-#: ../finch/gntpounce.c:819
-#: ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s heeft zich aangemeld (%s)"
 
-#: ../finch/gntpounce.c:820
-#: ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s is weer actief (%s)"
 
-#: ../finch/gntpounce.c:821
-#: ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s is weer actief (%s)"
 
-#: ../finch/gntpounce.c:822
-#: ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s is gestopt met tikken (%s)"
 
-#: ../finch/gntpounce.c:823
-#: ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s heeft zich afgemeld (%s)"
 
-#: ../finch/gntpounce.c:824
-#: ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s is inactief (%s)"
 
-#: ../finch/gntpounce.c:825
-#: ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s is weggegaan. (%s)"
 
-#: ../finch/gntpounce.c:826
-#: ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has sent you a message. (%s)"
-msgstr "%s heeft je een bericht gestuurd. (%s)"
+msgstr "%s heeft u een bericht toegestuurd. (%s)"
 
-#: ../finch/gntpounce.c:845
-#: ../pidgin/gtkpounce.c:1479
+#, c-format
 msgid "Unknown pounce event. Please report this!"
-msgstr "Onbekend contactalarm. Rapporteer dit a.u.b!"
+msgstr "Onbekend contactalarm. Rapporteer dit alstublieft!"
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Afhankelijk van gebruik van toetsenbord en muis"
 
-#: ../finch/gntprefs.c:94
-#: ../pidgin/gtkprefs.c:2058
 msgid "From last sent message"
 msgstr "Laatst verstuurde bericht"
 
-#: ../finch/gntprefs.c:96
-#: ../pidgin/gtkprefs.c:945
-#: ../pidgin/gtkprefs.c:953
-#: ../pidgin/gtkprefs.c:2057
-#: ../pidgin/gtkprefs.c:2071
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Nooit"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Tijd van inactiviteit weergeven"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Off-line contacten weergeven"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
-msgstr "Laat anderen weten dat je aan het typen bent"
+msgstr "Laat anderen weten wanneer je typt"
 
-#: ../finch/gntprefs.c:198
-#: ../finch/plugins/gnthistory.c:153
 msgid "Log format"
 msgstr "Logboekopmaak"
 
-#: ../finch/gntprefs.c:199
-#: ../finch/plugins/gnthistory.c:143
 msgid "Log IMs"
 msgstr "Gesprekken bijhouden"
 
-#: ../finch/gntprefs.c:200
-#: ../finch/plugins/gnthistory.c:144
 msgid "Log chats"
 msgstr "Chats bijhouden"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Statusveranderingen opslaan"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
-msgstr "Bijhouden van inactiviteit:"
+msgstr "Bijhouden van inactiviteit"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
-msgstr "Status op afwezig zetten wanneer ik niets doe"
+msgstr "Status veranderen wanneer ik niets doe"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minuten voor wijzigen van status"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Status veranderen in "
 
 #. Conversations
-#: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:1043
-#: ../pidgin/gtkprefs.c:2144
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Gesprekken"
 
-#: ../finch/gntprefs.c:260
-#: ../finch/plugins/gnthistory.c:151
-#: ../pidgin/gtkprefs.c:1614
-#: ../pidgin/gtkprefs.c:2155
 msgid "Logging"
 msgstr "Logboek bijhouden"
 
-#: ../finch/gntrequest.c:381
 msgid "You must fill all the required fields."
-msgstr "Je moet al de benodigde registratievelden invullen."
+msgstr "Je moet al de benodigde velden invullen."
 
-#: ../finch/gntrequest.c:382
 msgid "The required fields are underlined."
 msgstr "De benodigde velden zijn onderstreept."
 
-#: ../finch/gntrequest.c:640
 msgid "Not implemented yet."
 msgstr "Nog niet geïmplementeerd."
 
-#: ../finch/gntrequest.c:745
-#: ../pidgin/gtkrequest.c:1553
-#: ../pidgin/gtkrequest.c:1599
 msgid "Save File..."
 msgstr "Bestand opslaan..."
 
-#: ../finch/gntrequest.c:745
-#: ../pidgin/gtkrequest.c:1554
-#: ../pidgin/gtkrequest.c:1600
 msgid "Open File..."
 msgstr "Bestand openen..."
 
-#: ../finch/gntrequest.c:762
 msgid "Choose Location..."
 msgstr "Kies locatie..."
 
-#: ../finch/gntroomlist.c:208
 msgid "Hit 'Enter' to find more rooms of this category."
 msgstr "Typ 'Enter' om meer ruimtes van deze categorie te vinden."
 
-#: ../finch/gntroomlist.c:273
 msgid "Get"
 msgstr "Verkrijg"
 
 #. Create the window.
-#: ../finch/gntroomlist.c:285
-#: ../finch/gntui.c:101
-#: ../pidgin/gtkroomlist.c:523
 msgid "Room List"
 msgstr "Lijst van ruimtes"
 
-#: ../finch/gntsound.c:96
-#: ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Contact meldt zich aan"
 
-#: ../finch/gntsound.c:97
-#: ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Contact meldt zich af"
 
-#: ../finch/gntsound.c:98
-#: ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Bericht ontvangen"
 
-#: ../finch/gntsound.c:99
-#: ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Ontvangen bericht begint een gesprek"
 
-#: ../finch/gntsound.c:100
-#: ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Bericht verzonden"
 
-#: ../finch/gntsound.c:101
-#: ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Persoon komt chatruimte binnen"
 
-#: ../finch/gntsound.c:102
-#: ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Persoon verlaat chatruimte"
 
-#: ../finch/gntsound.c:103
-#: ../pidgin/gtksound.c:69
 msgid "You talk in chat"
-msgstr "Je praat in de chatruimte"
+msgstr "U praat in de chatruimte"
 
-#: ../finch/gntsound.c:104
-#: ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Anderen praten in de chatruimte"
 
-#: ../finch/gntsound.c:106
-#: ../pidgin/gtksound.c:73
 msgid "Someone says your username in chat"
-msgstr "Iemand zegt je gebruikersnaam in de chatruimte"
+msgstr "Iemand zegt uw gebruikersnaam in de chatruimte"
 
-#: ../finch/gntsound.c:367
-#: ../pidgin/gtksound.c:309
 msgid "GStreamer Failure"
 msgstr "GStreamer-probleem"
 
-#: ../finch/gntsound.c:368
-#: ../pidgin/gtksound.c:310
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer kan niet starten."
 
-#: ../finch/gntsound.c:722
-#: ../finch/gntsound.c:808
-#: ../pidgin/gtkpounce.c:178
-#: ../pidgin/gtkpounce.c:189
-#: ../pidgin/gtkpounce.c:321
-#: ../pidgin/gtkpounce.c:691
-#: ../pidgin/gtkpounce.c:951
-#: ../pidgin/gtkprefs.c:1738
-#: ../pidgin/gtkprefs.c:1827
-#: ../pidgin/gtkprefs.c:2000
 msgid "(default)"
 msgstr "(standaard)"
 
-#: ../finch/gntsound.c:735
 msgid "Select Sound File ..."
 msgstr "Selecteer geluids-bestand..."
 
-#: ../finch/gntsound.c:910
 msgid "Sound Preferences"
 msgstr "Geluidsvoorkeuren"
 
-#: ../finch/gntsound.c:921
 msgid "Profiles"
 msgstr "Profielen"
 
-#: ../finch/gntsound.c:960
-#: ../pidgin/gtkprefs.c:1865
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../finch/gntsound.c:963
 msgid "Console Beep"
-msgstr "Terminal-pieptoon"
+msgstr "Console-pieptoon"
 
-#: ../finch/gntsound.c:964
-#: ../pidgin/gtkprefs.c:1869
 msgid "Command"
 msgstr "Opdracht"
 
-#: ../finch/gntsound.c:965
 msgid "No Sound"
 msgstr "Geen geluid"
 
-#: ../finch/gntsound.c:967
-#: ../pidgin/gtkprefs.c:1860
 msgid "Sound Method"
-msgstr "Methode"
+msgstr "Geluids-methode"
 
-#: ../finch/gntsound.c:972
 msgid "Method: "
 msgstr "Methode:"
 
-#: ../finch/gntsound.c:979
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -2198,94 +1272,56 @@ msgstr ""
 "(%s voor bestandsnaam)"
 
 #. Sound options
-#: ../finch/gntsound.c:987
-#: ../pidgin/gtkprefs.c:1891
 msgid "Sound Options"
 msgstr "Geluidsinstellingen"
 
-#: ../finch/gntsound.c:988
 msgid "Sounds when conversation has focus"
 msgstr "Geluiden wanneer gesprek de aandacht heeft"
 
-#: ../finch/gntsound.c:996
-#: ../pidgin/gtkprefs.c:943
-#: ../pidgin/gtkprefs.c:955
-#: ../pidgin/gtkprefs.c:1898
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Altijd"
 
-#: ../finch/gntsound.c:997
-#: ../pidgin/gtkprefs.c:1896
 msgid "Only when available"
 msgstr "Alleen wanneer beschikbaar"
 
-#: ../finch/gntsound.c:998
-#: ../pidgin/gtkprefs.c:1897
 msgid "Only when not available"
 msgstr "Alleen wanneer onbeschikbaar"
 
-#: ../finch/gntsound.c:1005
 msgid "Volume(0-100):"
 msgstr "Volume(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1024
-#: ../pidgin/gtkprefs.c:1926
 msgid "Sound Events"
 msgstr "Geluidsgebeurtenissen"
 
-#: ../finch/gntsound.c:1026
-#: ../pidgin/gtkprefs.c:1985
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../finch/gntsound.c:1026
 msgid "File"
 msgstr "Bestand"
 
-#: ../finch/gntsound.c:1045
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1048
-#: ../pidgin/gtkpounce.c:695
 msgid "Reset"
 msgstr "Wissen"
 
-#: ../finch/gntsound.c:1051
 msgid "Choose..."
 msgstr "Bladeren..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Wil je \"%s\" echt verwijderen?"
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Status verwijderen"
 
-#: ../finch/gntstatus.c:176
-#: ../pidgin/gtksavedstatuses.c:629
 msgid "Saved Statuses"
 msgstr "Opgeslagen statussen"
 
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:321
-#: ../libpurple/protocols/jabber/buddy.c:1387
-#: ../libpurple/protocols/msn/msn.c:839
-#: ../libpurple/protocols/myspace/myspace.c:171
-#: ../libpurple/protocols/novell/novell.c:1493
-#: ../pidgin/gtksavedstatuses.c:528
 msgid "Title"
 msgstr "Titel"
 
-#: ../finch/gntstatus.c:183
-#: ../pidgin/gtksavedstatuses.c:543
 msgid "Type"
 msgstr "Type"
 
@@ -2297,431 +1333,272 @@ msgstr "Type"
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:564
-#: ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:281
-#: ../libpurple/protocols/bonjour/bonjour.c:288
-#: ../libpurple/protocols/bonjour/bonjour.c:371
-#: ../libpurple/protocols/gg/gg.c:1086
-#: ../libpurple/protocols/gg/gg.c:1583
-#: ../libpurple/protocols/gg/gg.c:1601
-#: ../libpurple/protocols/gg/gg.c:1611
-#: ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1626
-#: ../libpurple/protocols/gg/gg.c:1631
-#: ../libpurple/protocols/irc/irc.c:245
-#: ../libpurple/protocols/jabber/jabber.c:1644
-#: ../libpurple/protocols/jabber/jabber.c:1658
-#: ../libpurple/protocols/jabber/jabber.c:1672
-#: ../libpurple/protocols/jabber/jabber.c:1686
-#: ../libpurple/protocols/jabber/jabber.c:1700
-#: ../libpurple/protocols/jabber/jabber.c:1716
-#: ../libpurple/protocols/msn/msn.c:791
-#: ../libpurple/protocols/msn/msn.c:797
-#: ../libpurple/protocols/msn/msn.c:803
-#: ../libpurple/protocols/msn/msn.c:809
-#: ../libpurple/protocols/msn/msn.c:814
-#: ../libpurple/protocols/msn/msn.c:819
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2856
-#: ../libpurple/protocols/novell/novell.c:2959
-#: ../libpurple/protocols/novell/novell.c:2965
-#: ../libpurple/protocols/novell/novell.c:2971
-#: ../libpurple/protocols/oscar/oscar.c:5977
-#: ../libpurple/protocols/oscar/oscar.c:5991
-#: ../libpurple/protocols/oscar/oscar.c:6007
-#: ../libpurple/protocols/oscar/oscar.c:6014
-#: ../libpurple/protocols/oscar/oscar.c:6021
-#: ../libpurple/protocols/sametime/sametime.c:3338
-#: ../libpurple/protocols/sametime/sametime.c:3344
-#: ../libpurple/protocols/sametime/sametime.c:3350
-#: ../libpurple/protocols/sametime/sametime.c:3429
-#: ../libpurple/protocols/silc/buddy.c:1566
-#: ../libpurple/protocols/silc10/buddy.c:1566
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3824
-#: ../libpurple/protocols/yahoo/yahoo.c:3830
-#: ../libpurple/protocols/zephyr/zephyr.c:2356
-#: ../pidgin/gtksavedstatuses.c:558
-#: ../pidgin/gtksavedstatuses.c:1045
 msgid "Message"
 msgstr "Bericht"
 
 #. Use
-#: ../finch/gntstatus.c:194
-#: ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Gebruiken"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Ongeldige titel"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Geef een titel voor de status."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Dubbele titel"
 
 #  Different status message expander
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Geef een andere titel aan de status."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:464
-#: ../pidgin/gtkft.c:701
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Bericht:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Status bewerken"
 
 #  Different status message expander
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Een andere status gebruiken voor de volgende accounts"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Opslaan & gebruiken"
 
-#: ../finch/gntui.c:97
 msgid "Certificates"
 msgstr "Certificaten"
 
-#: ../finch/gntui.c:102
-#: ../pidgin/gtkprefs.c:2146
 msgid "Sounds"
 msgstr "Geluiden"
 
-#: ../finch/gntui.c:104
 msgid "Statuses"
 msgstr "Statussen"
 
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
-msgstr "Fout opgetreden bij het laden van de plugin."
+msgstr "Fout opgetreden bij het laden van de plug-in."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "Kan X display niet vinden"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "Kan venster niet vinden"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr "De plugin kon niet worden geladen omdat het niet gemaakt is met X11 ondersteuning."
+msgstr ""
+"De plug-in kan niet worden geladen omdat het niet gemaakt is met X11-"
+"ondersteuning."
 
-#: ../finch/plugins/gntclipboard.c:158
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
-msgstr "Klembord-plugin"
+msgstr "Klembord-plug-in"
 
-#: ../finch/plugins/gntclipboard.c:161
-msgid "When the gnt clipboard contents change, the contents are made available to X, if possible."
-msgstr "Wanneer het gnt-klembord van inhoud verandert, wordt de inhoud beschikbaar gesteld aan X, indien mogelijk."
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"Wanneer het gnt-klembord van inhoud verandert, wordt de inhoud beschikbaar "
+"gesteld aan X, indien mogelijk."
 
-#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s heeft zich aangemeld"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s heeft zich afgemeld"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s heeft je een bericht gestuurd"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s heeft jouw naam gezegd in %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s heeft een bericht gestuurd in %s"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Contact meldt zich aan/af"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Je ontvangt een bericht"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Iemand spreekt in een chatgesprek"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
-msgstr "Iemand zegt je in de chatgesprek"
+msgstr "Iemand zegt je naam in het chatgesprek"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Notificatievenster weergeven wanneer"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Ook een piep geven!"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Stel URGENT in in het terminal-venster"
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379
-#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
-msgstr "Toaster-plugin"
+msgstr "Toaster-plug-in"
 
-#: ../finch/plugins/gnthistory.c:114
-#: ../pidgin/plugins/history.c:132
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Gesprek met %s op %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:172
-#: ../pidgin/plugins/history.c:159
 msgid "History Plugin Requires Logging"
-msgstr "De geschiedenisplugin vereist bijhouden van logboek"
+msgstr "De geschiedenis-plug-in vereist bijhouden van logboek"
 
-#: ../finch/plugins/gnthistory.c:173
-#: ../pidgin/plugins/history.c:160
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
 msgstr ""
-"Logboek bijhouden kan worden ingeschakeld via Extra -> Voorkeuren -> 'Logboek bijhouden'.\n"
+"Logboek bijhouden kan worden ingeschakeld via Extra -> Voorkeuren -> "
+"Logboek.\n"
 "\n"
-"Het inschakelen hiervan zal je de mogelijkheid geven om geschiedenis op te vragen."
+"Het inschakelen hiervan zal u de mogelijkheid geven om geschiedenis op te "
+"vragen."
 
-#: ../finch/plugins/gnthistory.c:217
 msgid "GntHistory"
 msgstr "GntGeschiedenis"
 
-#: ../finch/plugins/gnthistory.c:219
-#: ../pidgin/plugins/history.c:203
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Geeft recente gesprekken weer in een nieuw gesprek"
 
-#: ../finch/plugins/gnthistory.c:220
-#: ../pidgin/plugins/history.c:204
-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
-msgstr "Wanneer een nieuw gesprek wordt gestart, voegt deze plugin het vorige gesprek in."
+msgid ""
+"When a new conversation is opened this plugin will insert the last "
+"conversation into the current conversation."
+msgstr ""
+"Wanneer een nieuw gesprek wordt gestart, voegt deze plug-in het vorige "
+"gesprek in."
 
-#: ../finch/plugins/grouping.c:42
-#: ../libpurple/protocols/oscar/oscar.c:745
+#, c-format
 msgid "Online"
 msgstr "Online"
 
-#: ../finch/plugins/grouping.c:44
-#: ../finch/plugins/grouping.c:145
-#: ../libpurple/protocols/gg/gg.c:1017
-#: ../libpurple/protocols/jabber/buddy.c:2055
-#: ../libpurple/protocols/novell/novell.c:2846
-#: ../libpurple/protocols/oscar/oscar.c:904
-#: ../libpurple/protocols/oscar/oscar.c:5809
-#: ../libpurple/protocols/qq/qq.c:213
-#: ../libpurple/protocols/qq/qq.c:220
-#: ../libpurple/protocols/qq/qq.c:367
-#: ../libpurple/protocols/yahoo/yahoo.c:3163
-#: ../libpurple/status.c:159
-#: ../pidgin/gtkblist.c:3505
-#: ../pidgin/gtkblist.c:3897
-#: ../pidgin/gtkdocklet.c:561
-#: ../pidgin/gtkstatusbox.c:1093
 msgid "Offline"
 msgstr "Offline "
 
-#: ../finch/plugins/grouping.c:117
-#: ../pidgin/gtkblist.c:3541
 msgid "Online Buddies"
 msgstr "Online contacten"
 
-#: ../finch/plugins/grouping.c:117
 msgid "Offline Buddies"
 msgstr "Offline contacten"
 
-#: ../finch/plugins/grouping.c:127
 msgid "Online/Offline"
 msgstr "Online/offline"
 
-#: ../finch/plugins/grouping.c:168
 msgid "Meebo"
 msgstr "Meebo"
 
-#: ../finch/plugins/grouping.c:217
 msgid "No Grouping"
 msgstr "Geen groepering"
 
-#: ../finch/plugins/grouping.c:257
-#: ../finch/plugins/grouping.c:258
 msgid "Provides alternate buddylist grouping options."
 msgstr "Levert alternatieve groepeer-opties voor contactenlijst."
 
-#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Geschiedenis"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
-msgstr "geschiedenis: Zoekt voor een deeltekenreeks in het geschiedenis-logboek."
+msgstr ""
+"geschiedenis: Zoekt voor een deeltekenreeks in het geschiedenis-logboek."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntGeschiedenis"
 
-#: ../finch/plugins/lastlog.c:124
-#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
-msgstr "Geschiedenis plugin."
+msgstr "Geschiedenis-plug-in."
 
-#: ../libpurple/account.c:887
 msgid "accounts"
 msgstr "accounts"
 
-#: ../libpurple/account.c:1063
-#: ../libpurple/protocols/jabber/auth.c:204
-#: ../libpurple/protocols/silc/silc.c:474
 msgid "Password is required to sign on."
 msgstr "Wachtwoord nodig voor aanmelden."
 
-#: ../libpurple/account.c:1097
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Geef wachtwoord voor %s (%s)"
 
 # wachtwoord invoeren
-#: ../libpurple/account.c:1104
 msgid "Enter Password"
 msgstr "Voer wachtwoord in"
 
-#: ../libpurple/account.c:1109
 msgid "Save password"
 msgstr "Wachtwoord opslaan"
 
-#: ../libpurple/account.c:1144
-#: ../libpurple/connection.c:118
-#: ../libpurple/connection.c:191
 #, c-format
 msgid "Missing protocol plugin for %s"
-msgstr "Protocolplugin voor %s niet gevonden"
+msgstr "Protocolplug-in voor %s niet gevonden"
 
-#: ../libpurple/account.c:1146
-#: ../libpurple/connection.c:121
 msgid "Connection Error"
 msgstr "Verbindingsfout"
 
-#: ../libpurple/account.c:1357
-#: ../libpurple/protocols/gg/gg.c:712
-#: ../libpurple/protocols/jabber/jabber.c:1772
 msgid "New passwords do not match."
 msgstr "Nieuwe wachtwoorden zijn niet gelijk."
 
-#: ../libpurple/account.c:1370
 msgid "Fill out all fields completely."
 msgstr "Vul alle velden volledig in."
 
-#: ../libpurple/account.c:1402
 msgid "Original password"
 msgstr "Oud wachtwoord"
 
-#: ../libpurple/account.c:1410
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: ../libpurple/account.c:1418
 msgid "New password (again)"
 msgstr "Nieuw wachtwoord (herhalen)"
 
-#: ../libpurple/account.c:1425
 #, c-format
 msgid "Change password for %s"
 msgstr "Wachtwoord veranderen voor %s"
 
-#: ../libpurple/account.c:1433
 msgid "Please enter your current password and your new password."
-msgstr "Geef je oude wachtwoord en nieuwe wachtwoord."
+msgstr "Geef uw oude wachtwoord en nieuwe wachtwoord."
 
-#: ../libpurple/account.c:1464
 #, c-format
 msgid "Change user information for %s"
 msgstr "Gebruikersinformatie aanpassen voor %s"
 
-#: ../libpurple/account.c:1467
-#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Gebruikersinfo instellen"
 
-#: ../libpurple/account.c:1938
-#: ../libpurple/protocols/gg/gg.c:1026
-#: ../libpurple/protocols/jabber/buddy.c:840
-#: ../libpurple/protocols/jabber/buddy.c:2051
-#: ../libpurple/protocols/jabber/buddy.c:2068
-#: ../libpurple/protocols/novell/novell.c:2849
-#: ../libpurple/protocols/qq/qq.c:273
-#: ../pidgin/gtkft.c:166
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../libpurple/blist.c:521
-#: ../libpurple/blist.c:1347
-#: ../libpurple/blist.c:1559
-#: ../libpurple/blist.c:1561
-#: ../libpurple/protocols/jabber/roster.c:99
-#: ../libpurple/protocols/myspace/myspace.c:3459
-#: ../pidgin/gtkblist.c:6423
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Contacten"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "contactenlijst"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(KOMEN NIET OVEREEN)"
 
 #. Make messages
-#: ../libpurple/certificate.c:562
 #, 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 voor alleen-deze-keer gebruik "
+"gepresenteerd:"
 
-#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2731,59 +1608,48 @@ msgstr ""
 "Vingerafdruk (SHA1): %s"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
-msgstr "Eenmalig certificaat controle"
+msgstr "Eenmalige certificaat-controle"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:897
 msgid "Certificate Authorities"
-msgstr "Certificaat Identiteit"
+msgstr "Certificaat-identiteit"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1065
 msgid "SSL Peers Cache"
 msgstr "SSL peer cache"
 
 #. Make messages
-#: ../libpurple/certificate.c:1196
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Certificaat voor %s accepteren?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1202
 msgid "SSL Certificate Verification"
-msgstr "SSL certificaat controle"
+msgstr "SSL-certificaat-controle"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1211
 msgid "Accept"
 msgstr "Accepteren"
 
-#: ../libpurple/certificate.c:1212
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:105
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:252
 msgid "Reject"
 msgstr "Weigeren"
 
-#: ../libpurple/certificate.c:1213
 msgid "_View Certificate..."
 msgstr "_Bekijk certificaat..."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1314
 #, c-format
-msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
-msgstr "Het certificaat van \"%s\" is zelf-gesigneerd. Het kan niet automatisch gecontroleerd worden."
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Het certificaat van \"%s\" is zelf-gesigneerd. Het kan niet automatisch "
+"gecontroleerd worden."
 
-#: ../libpurple/certificate.c:1332
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "De certificaat-keten van %s is niet geldig."
@@ -2793,45 +1659,52 @@ msgstr "De certificaat-keten van %s is niet geldig."
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1340
-#: ../libpurple/certificate.c:1410
 msgid "SSL Certificate Error"
-msgstr "SSL Certificaat Fout"
+msgstr "SSL-certificaat fout"
 
-#: ../libpurple/certificate.c:1341
 msgid "Invalid certificate chain"
 msgstr "Dit is een ongeldige certificaat-keten"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1362
-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 gecontroleerd."
+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 "
+"gecontroleerd."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1385
-msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr ""
 
-#: ../libpurple/certificate.c:1402
 #, c-format
-msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
+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"
 
-#: ../libpurple/certificate.c:1411
 msgid "Invalid certificate authority signature"
-msgstr "Ongeldige certificaat identiteit handtekening"
+msgstr "Ongeldige certificaat-identiteit handtekening"
 
 #. Prompt the user to authenticate the certificate
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1437
 #, c-format
-msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
-msgstr "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."
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"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."
 
 #. Make messages
-#: ../libpurple/certificate.c:1899
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2841,178 +1714,135 @@ msgid ""
 "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"
 
-# msgstr ""
-# "Gemeenschappelijke naam: %s\n"
-# "\n"
-# "Vingerafdruk (SHA1): %s\n"
-# "\n"
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1908
 msgid "Certificate Information"
-msgstr "Certificaat informatie"
+msgstr "Informatie over certificaat"
 
-#: ../libpurple/connection.c:120
 msgid "Registration Error"
 msgstr "Registratiefout"
 
-#: ../libpurple/connection.c:193
 msgid "Unregistration Error"
-msgstr "Foet met het ongedaan maken van het  registeren"
+msgstr "Fout met het ongedaan maken van het  registeren"
 
-#: ../libpurple/connection.c:347
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s heeft zich aangemeld"
 
-#: ../libpurple/connection.c:377
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s heeft zich afgemeld"
 
-#: ../libpurple/connection.c:530
-#: ../libpurple/plugin.c:277
-#: ../libpurple/protocols/jabber/buddy.c:2371
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:384
-#: ../libpurple/protocols/msnp9/servconn.c:139
-#: ../libpurple/protocols/msnp9/session.c:343
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Kan het bericht niet verzenden. Het bericht is te groot."
 
-#: ../libpurple/conversation.c:173
-#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kan het bericht niet verzenden aan %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Afwezigheidsbericht te groot."
 
-#: ../libpurple/conversation.c:183
-#: ../libpurple/protocols/bonjour/jabber.c:296
-#: ../libpurple/protocols/bonjour/jabber.c:339
 msgid "Unable to send message."
 msgstr "Kan het bericht niet verzenden."
 
-#: ../libpurple/conversation.c:1231
 msgid "Send Message"
 msgstr "Verstuur bericht"
 
-#: ../libpurple/conversation.c:1234
 msgid "_Send Message"
 msgstr "Ver_stuur bericht"
 
-#: ../libpurple/conversation.c:1640
 #, c-format
 msgid "%s entered the room."
 msgstr "%s is de ruimte binnengekomen."
 
-#: ../libpurple/conversation.c:1643
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] is de ruimte binnengekomen."
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "You are now known as %s"
 msgstr "Je heet nu %s"
 
-#: ../libpurple/conversation.c:1773
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s heet nu %s"
 
-#: ../libpurple/conversation.c:1848
 #, c-format
 msgid "%s left the room."
 msgstr "%s is weggegaan."
 
-#: ../libpurple/conversation.c:1851
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s is weggegaan (%s)."
 
-#: ../libpurple/dbus-server.c:587
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kan geen nieuwe verbinding maken: %s"
 
-#: ../libpurple/dbus-server.c:599
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Kan naam niet ophalen: %s"
 
-#: ../libpurple/dbus-server.c:613
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Kan servernaam niet ophalen: %s"
 
-#: ../libpurple/dbus-server.h:86
 msgid "Purple's D-BUS server is not running for the reason listed below"
-msgstr "Purple's D-BUS server is niet acitef vanwege de volgende reden"
+msgstr "Purple's D-BUS server is niet actief vanwege de volgende reden"
 
 # was eerst: geen
-#: ../libpurple/desktopitem.c:287
-#: ../libpurple/desktopitem.c:878
 msgid "No name"
 msgstr "Geen naam"
 
-#: ../libpurple/dnsquery.c:535
-#, fuzzy
+#
 msgid "Unable to create new resolver process\n"
-msgstr "Kan geen socket aanmaken"
+msgstr "Kan geen nieuw opzoek-proces maken \n"
 
-#: ../libpurple/dnsquery.c:540
-#, fuzzy
+#
 msgid "Unable to send request to resolver process\n"
-msgstr "Kan het bericht niet verzenden (%s)."
+msgstr "Niet mogelijk om opzoek-proces te versturen\n"
 
-#: ../libpurple/dnsquery.c:573
-#: ../libpurple/dnsquery.c:722
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
-"Fout bij opzoeken van %s:\n"
+"Fout bij oplossen van %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:576
-#: ../libpurple/dnsquery.c:736
-#: ../libpurple/dnsquery.c:854
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Fout bij opzoeken van %s: %d"
 
-#: ../libpurple/dnsquery.c:598
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
-msgstr "Er is een fout opgetreden bij het lezen van de socket: %s"
+msgstr ""
+"Er is een fout opgetreden bij het lezen van opzoek-proces:\n"
+"%s"
 
-#: ../libpurple/dnsquery.c:602
-#, fuzzy
+#, c-format
 msgid "EOF while reading from resolver process"
-msgstr "Fout opgetreden bij lezen van socket."
+msgstr "EOF-fout opgetreden bij het lezen van opzoek-proces"
 
-#: ../libpurple/dnsquery.c:786
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Aanmaken thread mislukt: %s"
 
-#: ../libpurple/dnsquery.c:787
 msgid "Unknown reason"
 msgstr "Reden onbekend"
 
-#: ../libpurple/ft.c:210
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -3021,7 +1851,6 @@ msgstr ""
 "Fout bij lezen van %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:214
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -3030,7 +1859,6 @@ msgstr ""
 "Fout bij schrijven naar %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:218
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -3039,39 +1867,32 @@ msgstr ""
 "Fout bij benaderen van %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:254
 msgid "Directory is not writable."
 msgstr "Map is niet beschrijfbaar."
 
-#: ../libpurple/ft.c:269
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan geen bestand sturen van 0 bytes groot."
 
-#: ../libpurple/ft.c:279
 msgid "Cannot send a directory."
 msgstr "Kan geen map sturen."
 
-#: ../libpurple/ft.c:288
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s is geen normaal bestand. Ik weiger dit te overschrijven.\n"
+msgstr ""
+"%s is geen normaal bestand. Het wordt geweigerd dit te overschrijven.\n"
 
-#: ../libpurple/ft.c:348
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s wil je %s toesturen (%s)"
 
-#: ../libpurple/ft.c:355
 #, c-format
 msgid "%s wants to send you a file"
-msgstr "%s wil je een bestand toesturen"
+msgstr "%s wil u een bestand toesturen"
 
-#: ../libpurple/ft.c:398
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Bestandsoverdracht accepteren van %s?"
 
-#: ../libpurple/ft.c:402
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -3082,361 +1903,338 @@ msgstr ""
 "Computer: %s\n"
 "Poort: %d"
 
-#: ../libpurple/ft.c:437
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s biedt het bestand %s aan"
 
-#: ../libpurple/ft.c:490
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s is geen geldige bestandsnaam.\n"
 
-#: ../libpurple/ft.c:511
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Aanbieden om %s naar %s te sturen"
 
-#: ../libpurple/ft.c:523
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Overdracht van %s van %s wordt gestart"
 
-#: ../libpurple/ft.c:700
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Bestandsoverdracht van %s voltooid"
 
-#: ../libpurple/ft.c:703
+#, c-format
 msgid "File transfer complete"
 msgstr "Bestandsoverdracht voltooid"
 
-#: ../libpurple/ft.c:1138
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Je de overdracht van %s afgebroken"
 
-#: ../libpurple/ft.c:1143
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Bestandsoverdracht afgebroken"
 
-#: ../libpurple/ft.c:1201
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s heeft de overdracht van %s afgebroken"
 
-#: ../libpurple/ft.c:1206
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s heeft de overdracht afgebroken"
 
-#: ../libpurple/ft.c:1263
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Bestandsoverdracht naar %s mislukt."
 
-#: ../libpurple/ft.c:1265
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Bestandsoverdracht van %s mislukt."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Voer het commando uit in een terminal"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
-msgstr "De opdracht die gebruikt wordt om \"aim\" URLs af te handelen, indien ingeschakeld."
+msgstr ""
+"De opdracht die gebruikt wordt om \"aim\" URLs af te handelen, indien "
+"ingeschakeld."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
-msgstr "De opdracht die gebruikt wordt om \"gg\" URLs af te handelen, indien ingeschakeld."
+msgstr ""
+"De opdracht die gebruikt wordt om \"gg\" URLs af te handelen, indien "
+"ingeschakeld."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
-msgstr "De opdracht die gebruikt wordt om \"icq\" URLs af te handelen, indien ingeschakeld."
+msgstr ""
+"De opdracht die gebruikt wordt om \"icq\" URLs af te handelen, indien "
+"ingeschakeld."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
-msgstr "De opdracht die gebruikt wordt om \"irc\" URLs af te handelen, indien ingeschakeld."
+msgstr ""
+"De opdracht die gebruikt wordt om \"irc\" URLs af te handelen, indien "
+"ingeschakeld."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
-msgstr "De opdracht die gebruikt wordt om \"msnim\" URLs af te handelen, indien ingeschakeld."
+msgstr ""
+"De opdracht die gebruikt wordt om \"msnim\" URLs af te handelen, indien "
+"ingeschakeld."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
-msgstr "De opdracht die gebruikt wordt om \"sip\" URLs af te handelen, indien ingeschakeld."
+msgstr ""
+"De opdracht die gebruikt wordt om \"sip\" URLs af te handelen, indien "
+"ingeschakeld."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
-msgstr "De opdracht die gebruikt wordt om \"xmpp\" URLs af te handelen, indien ingeschakeld."
+msgstr ""
+"De opdracht die gebruikt wordt om \"xmpp\" URLs af te handelen, indien "
+"ingeschakeld."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
-msgstr "De opdracht die gebruikt wordt om \"ymsgr\" URLs af te handelen, indien ingeschakeld."
+msgstr ""
+"De opdracht die gebruikt wordt om \"ymsgr\" URLs af te handelen, indien "
+"ingeschakeld."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "De afhandelaar voor \"aim\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "De afhandelaar voor \"gg\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "De afhandelaar voor \"icq\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "De afhandelaar voor \"irc\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "De afhandelaar voor \"msnim\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "De afhandelaar voor \"sip\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "De afhandelaar voor \"xmpp\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "De afhandelaar voor \"ymsgr\" URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
-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 afhandelen."
+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 "
+"afhandelen."
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
-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 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 "
+"afhandelen."
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
-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 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 "
+"afhandelen."
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
-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 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 "
+"afhandelen."
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
-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 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 "
+"afhandelen."
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
-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 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 "
+"afhandelen."
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
-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 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 "
+"afhandelen."
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
-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 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 "
+"afhandelen."
 
-#: ../libpurple/gconf/purple.schemas.in.h:26
-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 moet uitgevoerd worden in een terminal."
+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 "
+"moet uitgevoerd worden in een terminal."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Wanneer de opdracht \"aim\" URLs moet afhandelen"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Wanneer de opdracht \"gg\" URLs moet afhandelen"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Wanneer de opdracht \"icq\" URLs moet afhandelen"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Wanneer de opdracht \"irc\" URLs moet afhandelen"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Wanneer de opdracht \"msnim\" URLs moet afhandelen"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Wanneer de opdracht \"sip\" URLs moet afhandelen"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Wanneer de opdracht \"xmpp\" URLs moet afhandelen"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Wanneer de opdracht \"ymsgr\" URLs moet afhandelen"
 
-#: ../libpurple/log.c:183
 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>"
 
-#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Tekst"
 
-#: ../libpurple/log.c:625
 msgid "Old flat format"
-msgstr ""
+msgstr "Oud plat formaat"
 
-#: ../libpurple/log.c:850
 msgid "Logging of this conversation failed."
 msgstr "Kan logboek van dit gesprek niet bijhouden."
 
-#: ../libpurple/log.c:1293
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1377
 #, c-format
-msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-ANTWOORD&gt;:</b></font> %s<br/>\n"
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"ANTWOORD&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1379
 #, c-format
-msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-ANTWOORD&gt;:</b></font> %s<br/>\n"
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"ANTWOORD&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1437
-#: ../libpurple/log.c:1570
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kan pad naar logboek niet vinden!</b></font>"
 
-#: ../libpurple/log.c:1449
-#: ../libpurple/log.c:1579
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kan bestand niet lezen: %s</b></font>"
 
-#: ../libpurple/log.c:1511
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-ANTWOORD>: %s\n"
 
-#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
-msgstr "je gebruikt %s, maar de plugin heeft %s nodig."
+msgstr "je gebruikt %s, maar de plug-in heeft %s nodig."
 
-#: ../libpurple/plugin.c:375
+#, c-format
 msgid "This plugin has not defined an ID."
-msgstr "Deze plugin heeft nog geen ID gedefinieerd."
+msgstr "Deze plug-in heeft nog geen ID gedefinieerd."
 
-#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
-msgstr "Pluginprobleem %d (nodig: %d)"
+msgstr "Plug-in-probleem %d (nodig: %d)"
 
-#: ../libpurple/plugin.c:460
 #, 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)"
 
-#: ../libpurple/plugin.c:477
-msgid "Plugin does not implement all required functions (list_icon, login and close)"
-msgstr "Plugin implementeert niet alle vereiste functies (iconenlijst, inloggen en afsluiten)"
+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)"
 
-#: ../libpurple/plugin.c:542
 #, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
-msgstr "De vereiste plugin %s is niet gevonden. Installeer de plugin en probeer opnieuw."
+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 "
+"opnieuw."
 
-#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
-msgstr "Kan de plugin niet laden."
+msgstr "Kan de plug-in niet laden."
 
-#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
-msgstr "De vereiste plugin %s kan niet geladen worden."
+msgstr "De vereiste plug-in %s kan niet geladen worden."
 
-#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
-msgstr "Kan jouw plugin niet laden."
+msgstr "Kan jouw plug-in niet laden."
 
-#: ../libpurple/plugin.c:663
 #, c-format
 msgid "%s requires %s, but it failed to unload."
 msgstr "%s is afhankelijk van %s, maar kan niet uitgeschakeld worden."
 
-#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Automatisch accepteren"
 
-#: ../libpurple/plugins/autoaccept.c:25
-#: ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
-msgstr "Bestandsoverdrachten automatisch accepteren van geselecteerde gebruikers."
+msgstr ""
+"Bestandsoverdrachten automatisch accepteren van geselecteerde gebruikers."
 
-#: ../libpurple/plugins/autoaccept.c:81
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
-msgstr "Automatische geaccepteerde bestands-overdracht van \"%s\" van \"%s\" klaar."
+msgstr ""
+"Automatische geaccepteerde bestands-overdracht van \"%s\" van \"%s\" klaar."
 
-#: ../libpurple/plugins/autoaccept.c:83
 msgid "Autoaccept complete"
 msgstr "Autoaccepteren compleet"
 
-#: ../libpurple/plugins/autoaccept.c:176
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Als een bestands-overdracht aanvraag komt van %s"
 
-#: ../libpurple/plugins/autoaccept.c:178
 msgid "Set Autoaccept Setting"
 msgstr "Automatisch accepteren instellen"
 
-#: ../libpurple/plugins/autoaccept.c:180
 msgid "_Save"
 msgstr "_Opslaan"
 
-#: ../libpurple/plugins/autoaccept.c:181
-#: ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204
-#: ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1612
-#: ../libpurple/protocols/oscar/oscar.c:2483
-#: ../libpurple/protocols/oscar/oscar.c:2531
-#: ../libpurple/protocols/oscar/oscar.c:6091
-#: ../libpurple/protocols/oscar/oscar.c:6146
-#: ../libpurple/protocols/oscar/oscar.c:6373
-#: ../libpurple/protocols/oscar/oscar.c:6443
-#: ../libpurple/request.h:1401
-#: ../libpurple/request.h:1411
 msgid "_Cancel"
 msgstr "_Annuleren"
 
-#: ../libpurple/plugins/autoaccept.c:184
 msgid "Ask"
 msgstr "Vraag"
 
-#: ../libpurple/plugins/autoaccept.c:185
 msgid "Auto Accept"
 msgstr "Automatisch accepteren"
 
-#: ../libpurple/plugins/autoaccept.c:186
 msgid "Auto Reject"
 msgstr "Automatisch afwijzen"
 
-#: ../libpurple/plugins/autoaccept.c:201
 msgid "Autoaccept File Transfers..."
 msgstr "Bestandsoverdrachten automatisch accepteren..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:231
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -3444,11 +2242,9 @@ msgstr ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 
-#: ../libpurple/plugins/autoaccept.c:236
 msgid "Automatically reject from users not in buddy list"
 msgstr "Automatisch verwerpen van gebruikers die niet in contactenlijst staan"
 
-#: ../libpurple/plugins/autoaccept.c:240
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -3456,23 +2252,15 @@ msgstr ""
 "Meld met een pop-up wanneer een automatisch geaccepteerde\n"
 "bestandsoverdracht compleet is"
 
-#: ../libpurple/plugins/autoaccept.c:245
 msgid "Create a new directory for each user"
 msgstr "Een nieuwe map voor elke gebruiker aanmaken"
 
-#: ../libpurple/plugins/buddynote.c:46
-#: ../libpurple/protocols/msn/msn.c:2044
-#: ../libpurple/protocols/msn/msn.c:2074
-#: ../libpurple/protocols/msnp9/msn.c:1800
-#: ../libpurple/protocols/msnp9/msn.c:1830
 msgid "Notes"
 msgstr "Opmerkingen"
 
-#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Voeg je opmerkingen hieronder toe..."
 
-#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Bewerk opmerkingen..."
 
@@ -3484,21 +2272,15 @@ msgstr "Bewerk opmerkingen..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
-#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Contact-opmerkingen"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
-#: ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Sla opmerkingen op bij bepaalde vrienden."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
-#: ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr "Contacten toevoegen aan de lijst"
 
@@ -3514,7 +2296,6 @@ msgstr "Contacten toevoegen aan de lijst"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Codering testen"
 
@@ -3526,8 +2307,6 @@ msgstr "Codering testen"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267
-#: ../libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "De met libpurple meegeleverde coderingen testen."
 
@@ -3541,7 +2320,6 @@ msgstr "De met libpurple meegeleverde coderingen testen."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus-voorbeeld"
 
@@ -3553,10 +2331,8 @@ msgstr "DBus-voorbeeld"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
-msgstr "DBus voorbeeldplugin"
+msgstr "DBus voorbeeldplug-in"
 
 #. *< type
 #. *< ui_requirement
@@ -3564,7 +2340,6 @@ msgstr "DBus voorbeeldplugin"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Bestands-controle"
 
@@ -3572,61 +2347,40 @@ msgstr "Bestands-controle"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251
-#: ../libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Besturing inschakelen door opdrachten in een bestand te zetten."
 
-#: ../libpurple/plugins/idle.c:158
-#: ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuten"
 
 #. 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.
-#: ../libpurple/plugins/idle.c:165
-#: ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225
-#: ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "'k ben d'r eventjes nie"
 
-#: ../libpurple/plugins/idle.c:166
-#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Afwezigheidstijd instellen"
 
-#: ../libpurple/plugins/idle.c:169
-#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Activeren"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
-msgstr "Geen van je accounts is inactief."
+msgstr "Geen van uw accounts is inactief."
 
-#: ../libpurple/plugins/idle.c:200
-#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Afwezigheid uitschakelen"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Uitschakelen"
 
-#: ../libpurple/plugins/idle.c:226
-#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Inactiviteit instellen voor alle accounts"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Inactiviteit uitzetten voor alle accounts"
 
-#: ../libpurple/plugins/idle.c:320
-#: ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Stelt je in staat om zelf in te stellen hoe lang je inactief bent"
+msgstr "Stelt u in staat om zelf in te stellen hoe lang u afwezig bent"
 
 #. *< type
 #. *< ui_requirement
@@ -3634,21 +2388,22 @@ msgstr "Stelt je in staat om zelf in te stellen hoe lang je inactief bent"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC test client"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
-msgstr "Test plugin IPC-ondersteuning, als een client."
+msgstr "Test-plug-in IPC-ondersteuning, als een client."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-client.c:92
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr "Test plugin IPC-ondersteuning, als een client. Deze zoekt de server-plugin en start de geregistreerde opdrachten."
+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 "
+"en start de geregistreerde opdrachten."
 
 #. *< type
 #. *< ui_requirement
@@ -3656,170 +2411,145 @@ msgstr "Test plugin IPC-ondersteuning, als een client. Deze zoekt de server-plug
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC testserver"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
-msgstr "Test plugin IPC-ondersteuning, als een server."
+msgstr "Test plug-in IPC-ondersteuning, als een server."
 
 #. *  description
-#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Test plugin PIC-ondersteuning, als een server. Deze registreert de IPC-opdrachten."
+msgstr ""
+"Test plug-in PIC-ondersteuning, als een server. Deze registreert de IPC-"
+"opdrachten."
 
-#: ../libpurple/plugins/joinpart.c:228
 msgid "Join/Part Hiding Configuration"
 msgstr "Instellingen om notificaties over deelnemen/verlaten te verbergen"
 
-#: ../libpurple/plugins/joinpart.c:232
 msgid "Minimum Room Size"
 msgstr "Minimale grootte van gespreksruimte"
 
-#: ../libpurple/plugins/joinpart.c:238
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Gebruikers-activiteit verlopen (in minuten)"
 
+msgid "Apply hiding rules to buddies"
+msgstr ""
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:269
 msgid "Join/Part Hiding"
 msgstr "Deelnemen/verlaten verbergen"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:272
 msgid "Hides extraneous join/part messages."
 msgstr "Verbergt vreemde deelnemen/verlaten meldingen."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:274
-msgid "This plugin hides join/part messages in large rooms, except for those users actively taking part in a conversation."
-msgstr "Deze plugin verbergt deelnemen/verlaten meldingen, behalve voor de gebruikerd die actief deelnemen aan een gesprek."
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+"Deze plug-in verbergt deelnemen/verlaten meldingen, behalve voor de "
+"gebruikerd 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
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Gebruiker is off-line."
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Automatische reactie verstuurd:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:84
 #, c-format
 msgid "%s has signed off."
 msgstr "%s heeft zich afgemeld."
 
-#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Enkele berichten zijn mogelijk niet aangekomen."
 
-#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "De verbinding met de server is verbroken."
 
-#: ../libpurple/plugins/log_reader.c:1605
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
-msgstr "Je bent op dit moment niet aangemeld. Je kunt geen berichten ontvangen totdat je bent aangemeld."
+msgid ""
+"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."
 
-#: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Kan bericht niet versturen omdat de maximumlengte is overschreden."
 
-#: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
 msgstr "Kan bericht niet versturen."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2855
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2712
-#: ../libpurple/plugins/log_reader.c:2860
 msgid "Fire"
 msgstr "Brand"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2724
-#: ../libpurple/plugins/log_reader.c:2864
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2738
-#: ../libpurple/plugins/log_reader.c:2869
 msgid "QIP"
 msgstr "QIP"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2873
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2762
-#: ../libpurple/plugins/log_reader.c:2877
 msgid "Trillian"
 msgstr "Trillian"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libpurple/plugins/log_reader.c:2774
-#: ../libpurple/plugins/log_reader.c:2881
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2837
 msgid "General Log Reading Configuration"
 msgstr "Instellingen voor algemene logboekweergave"
 
-#: ../libpurple/plugins/log_reader.c:2841
 msgid "Fast size calculations"
 msgstr "Snelle berekening grootte"
 
-#: ../libpurple/plugins/log_reader.c:2845
 msgid "Use name heuristics"
 msgstr "Heuristiek gebruiken voor namen"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2851
 msgid "Log Directory"
 msgstr "Map voor logboeken"
 
@@ -3829,7 +2559,6 @@ msgstr "Map voor logboeken"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2910
 msgid "Log Reader"
 msgstr "Logboekweergave"
 
@@ -3839,36 +2568,34 @@ msgstr "Logboekweergave"
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2914
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Logboeken van andere clients tonen in ons logboek."
 
 #  * description
 #. * description
-#: ../libpurple/plugins/log_reader.c:2918
 msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
 msgstr ""
-"Bij het weergeven van logboeken zal deze plugin ook de logboeken van andere clients voor berichten tonen. Op dit moment kunnen we dit doen voor Adium, MSN Messenger en Trillian.\n"
+"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 plugin is testcode en kan (regelmatig) crashen. Op eigen risico dus!"
+"WAARSCHUWING: Deze plug-in is testcode en kan (regelmatig) crashen. Op eigen "
+"risico dus!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
-msgstr "Mono-pluginlader"
+msgstr "Mono-plug-in-lader"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
-msgstr ".NET-plugins laden met Mono."
+msgstr ".NET-plug-ins laden met Mono."
 
-#: ../libpurple/plugins/newline.c:57
 msgid "Add new line in IMs"
 msgstr "Voeg een enter toe in berichten"
 
-#: ../libpurple/plugins/newline.c:61
 msgid "Add new line in Chats"
 msgstr "Voeg nieuwe lijn in gesprek toe"
 
@@ -3881,86 +2608,56 @@ msgstr "Voeg nieuwe lijn in gesprek toe"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:104
 msgid "New Line"
 msgstr "Nieuwe lijn"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:106
 msgid "Prepends a newline to displayed message."
-msgstr "Maakt een enter aan in weergegeven berichy"
+msgstr "Maakt een enter aan in weergegeven bericht"
 
 #. *< summary
-#: ../libpurple/plugins/newline.c:107
-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 ine het gespreksvenster onder de naam komt te staan."
+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."
 
-#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Offline berichten emulatie"
 
-#: ../libpurple/plugins/offlinemsg.c:25
-#: ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
-msgstr ""
+msgstr "Berichten aan een offline gebruiker opslaan in alarm"
 
-#: ../libpurple/plugins/offlinemsg.c:95
-msgid "The rest of the messages will be saved as pounce. You can edit/delete the pounce from the `Buddy Pounce' dialog."
-msgstr ""
+msgid ""
+"The rest of the messages will be saved as pounce. 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"
 
-#: ../libpurple/plugins/offlinemsg.c:156
 #, 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?"
+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?"
 
-#: ../libpurple/plugins/offlinemsg.c:160
 msgid "Offline Message"
 msgstr "Off-line bericht"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Je kan de alarmen bewerken/verwijderen uit het 'Contactalarm'-venster."
 
-#: ../libpurple/plugins/offlinemsg.c:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:767
-#: ../libpurple/protocols/msnp9/dialog.c:133
-#: ../libpurple/protocols/msnp9/msn.c:566
-#: ../libpurple/protocols/msnp9/msn.c:582
-#: ../libpurple/protocols/novell/novell.c:1929
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113
-#: ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307
-#: ../pidgin/gtkrequest.c:270
 msgid "Yes"
 msgstr "Ja"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:767
-#: ../libpurple/protocols/msnp9/dialog.c:134
-#: ../libpurple/protocols/msnp9/msn.c:566
-#: ../libpurple/protocols/msnp9/msn.c:582
-#: ../libpurple/protocols/novell/novell.c:1930
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114
-#: ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308
-#: ../pidgin/gtkrequest.c:271
 msgid "No"
 msgstr "Nee"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Offline berichten in alarm opslaan."
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Vraag niet. Altijd in alarm opslaan."
 
@@ -3970,47 +2667,40 @@ msgstr "Vraag niet. Altijd in alarm opslaan."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:657
 msgid "Perl Plugin Loader"
-msgstr "Perl-plugin lader"
+msgstr "Perl-plug-in lader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:659
-#: ../libpurple/plugins/perl/perl.c:660
 msgid "Provides support for loading perl plugins."
-msgstr "Geeft de mogelijkheid om perl-plugins te laden."
+msgstr "Geeft de mogelijkheid om perl-plug-ins te laden."
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Paragnost-stand"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Paragnost-stand voor inkomend gesprek"
 
-#: ../libpurple/plugins/psychic.c:22
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
-msgstr "Zorgt ervoor dat gespreksvensters verschijnen wanneer gebruikers berichten sturen. Dit werkt met AIM, ICQ, XMPP, Sametime, en Yahoo!"
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"Zorgt ervoor dat gespreksvensters verschijnen wanneer gebruikers berichten "
+"sturen. Dit werkt met AIM, ICQ, XMPP, Sametime, en Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Je krijgt het gevoel dat iemand contact met je zoekt..."
 
-#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Alleen inschakelen voor gebruikers uit mijn contactenlijst"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Uitschakelen bij afwezigheid"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Mededelingen in het gesprek weergeven."
 
-#: ../libpurple/plugins/psychic.c:105
 #, fuzzy
 msgid "Raise psychic conversations"
 msgstr "In verborgen gesprekken"
@@ -4021,7 +2711,6 @@ msgstr "In verborgen gesprekken"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Signalentest"
 
@@ -4029,8 +2718,6 @@ msgstr "Signalentest"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:756
-#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Test om te zien of alle signalen correct werken."
 
@@ -4040,22 +2727,17 @@ msgstr "Test om te zien of alle signalen correct werken."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
-msgstr "Simpele plugin"
+msgstr "Simpele plug-in"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40
-#: ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Test om te zien of de meeste dingen werken."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:910
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "X.509 Certificaten"
 
@@ -4065,7 +2747,6 @@ msgstr "X.509 Certificaten"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:994
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -4073,8 +2754,6 @@ msgstr "GNUTLS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:997
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:999
 msgid "Provides SSL support through GNUTLS."
 msgstr "SSL ondersteuning via GNUTLS."
 
@@ -4084,7 +2763,6 @@ msgstr "SSL ondersteuning via GNUTLS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -4092,8 +2770,6 @@ msgstr "NSS"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "SSL ondersteuning via Mozilla NSS."
 
@@ -4103,7 +2779,6 @@ msgstr "SSL ondersteuning via Mozilla NSS."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -4111,49 +2786,38 @@ msgstr "SSL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97
-#: ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Zorgt voor een schil om de SSL-bibliotheken"
 
-#: ../libpurple/plugins/statenotify.c:54
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s is niet meer afwezig."
 
-#: ../libpurple/plugins/statenotify.c:56
 #, c-format
 msgid "%s has gone away."
 msgstr "%s is afwezig."
 
-#: ../libpurple/plugins/statenotify.c:66
 #, c-format
 msgid "%s has become idle."
 msgstr "%s is inactief."
 
-#: ../libpurple/plugins/statenotify.c:68
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s is weer actief."
 
-#: ../libpurple/plugins/statenotify.c:77
 #, c-format
 msgid "%s has signed on."
 msgstr "%s heeft zich aangemeld."
 
-#: ../libpurple/plugins/statenotify.c:95
 msgid "Notify When"
 msgstr "Melding geven voor"
 
-#: ../libpurple/plugins/statenotify.c:98
 msgid "Buddy Goes _Away"
 msgstr "Contact _weggaat"
 
-#: ../libpurple/plugins/statenotify.c:101
 msgid "Buddy Goes _Idle"
 msgstr "Contact inactief wordt"
 
-#: ../libpurple/plugins/statenotify.c:104
 msgid "Buddy _Signs On/Off"
 msgstr "Contact _meldt zich aan/af"
 
@@ -4163,7 +2827,6 @@ msgstr "Contact _meldt zich aan/af"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:152
 msgid "Buddy State Notification"
 msgstr "Contactstatusmelding"
 
@@ -4171,79 +2834,55 @@ msgstr "Contactstatusmelding"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:155
-#: ../libpurple/plugins/statenotify.c:158
-msgid "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."
+msgid ""
+"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."
 
-#: ../libpurple/plugins/tcl/tcl.c:423
 msgid "Tcl Plugin Loader"
-msgstr "Tcl-plugin lader"
+msgstr "Tcl-plug-in lader"
 
-#: ../libpurple/plugins/tcl/tcl.c:425
-#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
-msgstr "Geeft de mogelijkheid om tcl-plugins te laden"
+msgstr "Geeft de mogelijkheid om tcl-plug-ins te laden"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
-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-plugins, installeer ActiveTCL vanaf http://www.activestate.com\n"
+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."
+"com\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:93
-msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: 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."
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: 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."
 
-#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kan niet luisteren naar binnenkomende gespreksverzoeken\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:139
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr "Kan geen verbinding maken met de lokale mDNS server. Is deze wel gestart?"
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+"Kan geen verbinding maken met de lokale mDNS server. Is deze wel gestart?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:381
-#: ../libpurple/protocols/bonjour/bonjour.c:709
-#: ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/jabber/jabber.c:1036
 msgid "First name"
 msgstr "Voornaam"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:383
-#: ../libpurple/protocols/bonjour/bonjour.c:712
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:1040
 msgid "Last name"
 msgstr "Achternaam"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:387
-#: ../libpurple/protocols/bonjour/bonjour.c:715
-#: ../libpurple/protocols/gg/gg.c:479
-#: ../libpurple/protocols/jabber/buddy.c:318
-#: ../libpurple/protocols/jabber/buddy.c:1351
-#: ../libpurple/protocols/jabber/buddy.c:1364
-#: ../libpurple/protocols/jabber/buddy.c:2240
-#: ../libpurple/protocols/jabber/jabber.c:1028
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1055
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc/silc.c:1246
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/silc.c:706
-#: ../libpurple/protocols/silc10/silc.c:947
-#: ../libpurple/protocols/silc10/util.c:555
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1064
 msgid "Email"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:390
-#: ../libpurple/protocols/bonjour/bonjour.c:718
 msgid "AIM Account"
 msgstr "AIM-account"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:393
-#: ../libpurple/protocols/bonjour/bonjour.c:721
 msgid "XMPP Account"
 msgstr "XMPP-account"
 
@@ -4257,418 +2896,249 @@ msgstr "XMPP-account"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:526
-#: ../libpurple/protocols/bonjour/bonjour.c:528
 msgid "Bonjour Protocol Plugin"
-msgstr "Bonjour-protocol plugin"
+msgstr "Bonjour-protocol plug-in"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:668
 msgid "Purple Person"
 msgstr "Purple mens"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:431
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s heeft het gesprek gesloten."
 
-#: ../libpurple/protocols/bonjour/jabber.c:481
-#: ../libpurple/protocols/bonjour/jabber.c:546
-#: ../libpurple/protocols/bonjour/jabber.c:591
-#: ../libpurple/protocols/bonjour/jabber.c:759
-#: ../libpurple/protocols/bonjour/jabber.c:777
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kan het bericht niet verzenden. Kan geen gesprek starten."
 
-#: ../libpurple/protocols/bonjour/jabber.c:684
 msgid "Cannot open socket"
-msgstr "Kan geen socket openen"
+msgstr "Kan socket niet openen"
 
-#: ../libpurple/protocols/bonjour/jabber.c:712
 msgid "Could not bind socket to port"
 msgstr "Kan socket niet koppelen aan poort"
 
-#: ../libpurple/protocols/bonjour/jabber.c:722
 msgid "Could not listen on socket"
 msgstr "Kan niet luisteren naar socket"
 
-#: ../libpurple/protocols/bonjour/mdns_win32.c:110
 msgid "Error communicating with local mDNSResponder."
 msgstr "Fout bij het communiceren met lokale mDNSResponder"
 
-#: ../libpurple/protocols/gg/gg.c:76
-#: ../libpurple/proxy.c:1919
 msgid "Invalid proxy settings"
 msgstr "Ongeldige proxy-instellingen"
 
-#: ../libpurple/protocols/gg/gg.c:77
-#: ../libpurple/proxy.c:1919
-msgid "Either the host name or port number specified for your given proxy type is invalid."
-msgstr "De computernaam of poort voor je gegeven proxy-type is ongeldig."
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr "De computernaam of poort voor uw gegeven proxy-type is ongeldig."
 
-#: ../libpurple/protocols/gg/gg.c:115
-#: ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Onbekende fout"
 
-#: ../libpurple/protocols/gg/gg.c:116
-#: ../libpurple/protocols/gg/gg.c:138
-#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr "Kan teken niet ophalen.\n"
 
-#: ../libpurple/protocols/gg/gg.c:267
-#: ../libpurple/protocols/gg/gg.c:274
-#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
 msgstr "Contactenlijst opslaan..."
 
-#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Uw lijst is leeg, niets weggeschreven naar het bestand."
 
-#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
 msgstr "Contactenlijst opgeslagen."
 
-#: ../libpurple/protocols/gg/gg.c:278
 #, c-format
 msgid "Couldn't write buddy list for %s to %s"
 msgstr "Kan contactenlijst niet beschrijven van %s naar %s"
 
-#: ../libpurple/protocols/gg/gg.c:303
-#: ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
 msgstr "kan contactenlijst niet laden"
 
-#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
 msgstr "Contactenlijst laden..."
 
-#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
 msgstr "Contactenlijst geladen."
 
-#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
 msgstr "Contactenlijst opslaan..."
 
-#: ../libpurple/protocols/gg/gg.c:346
-#: ../libpurple/protocols/gg/gg.c:2088
 msgid "Load buddylist from file..."
 msgstr "Contactenlijst laden uit bestand..."
 
-#: ../libpurple/protocols/gg/gg.c:383
 msgid "Fill in the registration fields."
 msgstr "Registratievelden invullen."
 
-#: ../libpurple/protocols/gg/gg.c:390
 msgid "Passwords do not match."
 msgstr "Wachtwoorden komen niet overeen."
 
-#: ../libpurple/protocols/gg/gg.c:400
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Kan geen nieuw account registreren. Er is een fout opgetreden.\n"
 
-#: ../libpurple/protocols/gg/gg.c:413
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nieuw Gadu-Gadu account geregistreerd"
 
-#: ../libpurple/protocols/gg/gg.c:414
 msgid "Registration completed successfully!"
 msgstr "Registratie voltooid."
 
-#: ../libpurple/protocols/gg/gg.c:484
-#: ../libpurple/protocols/gg/gg.c:780
-#: ../libpurple/protocols/jabber/jabber.c:1011
-#: ../libpurple/protocols/jabber/jabber.c:1014
-#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: ../libpurple/protocols/gg/gg.c:489
-#: ../libpurple/protocols/gg/gg.c:785
 msgid "Password (retype)"
 msgstr "Wachtwoord (nogmaals)"
 
-#: ../libpurple/protocols/gg/gg.c:494
-#: ../libpurple/protocols/gg/gg.c:790
 msgid "Enter current token"
 msgstr "Geef huidige teken"
 
-#: ../libpurple/protocols/gg/gg.c:500
-#: ../libpurple/protocols/gg/gg.c:796
 msgid "Current token"
 msgstr "Huidige teken"
 
-#: ../libpurple/protocols/gg/gg.c:504
-#: ../libpurple/protocols/gg/gg.c:505
 msgid "Register New Gadu-Gadu Account"
 msgstr "Nieuw Gadu-gadu-account registreren"
 
-#: ../libpurple/protocols/gg/gg.c:506
 msgid "Please, fill in the following fields"
 msgstr "Vul de volgende velden in"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/gg/gg.c:1063
-#: ../libpurple/protocols/gg/gg.c:1135
-#: ../libpurple/protocols/jabber/jabber.c:1048
-#: ../libpurple/protocols/oscar/oscar.c:3963
-#: ../libpurple/protocols/oscar/oscar.c:3971
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "City"
 msgstr "Stad"
 
-#: ../libpurple/protocols/gg/gg.c:652
 msgid "Year of birth"
 msgstr "Geboortejaar"
 
-#: ../libpurple/protocols/gg/gg.c:655
-#: ../libpurple/protocols/msn/msn.c:1973
-#: ../libpurple/protocols/msnp9/msn.c:1729
-#: ../libpurple/protocols/myspace/user.c:129
-#: ../libpurple/protocols/oscar/oscar.c:3922
-#: ../libpurple/protocols/qq/buddy_info.c:47
-#: ../libpurple/protocols/qq/qq.c:267
-#: ../libpurple/protocols/qq/qq.c:270
-#: ../libpurple/protocols/qq/qq.c:273
-#: ../libpurple/protocols/qq/qq.c:277
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1094
 msgid "Gender"
 msgstr "Geslacht"
 
-#: ../libpurple/protocols/gg/gg.c:656
 msgid "Male or female"
 msgstr "Man of Vrouw"
 
-#: ../libpurple/protocols/gg/gg.c:657
-#: ../libpurple/protocols/oscar/oscar.c:3922
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:267
 msgid "Male"
 msgstr "Man"
 
-#: ../libpurple/protocols/gg/gg.c:658
-#: ../libpurple/protocols/oscar/oscar.c:3922
-#: ../libpurple/protocols/qq/buddy_info.c:85
-#: ../libpurple/protocols/qq/qq.c:270
 msgid "Female"
 msgstr "Vrouw"
 
-#: ../libpurple/protocols/gg/gg.c:662
 msgid "Only online"
 msgstr "Alleen online"
 
-#: ../libpurple/protocols/gg/gg.c:666
-#: ../libpurple/protocols/gg/gg.c:667
 msgid "Find buddies"
 msgstr "Contacten zoeken"
 
-#: ../libpurple/protocols/gg/gg.c:668
 msgid "Please, enter your search criteria below"
-msgstr "Geef hieronder je zoekcriteria"
+msgstr "Geef hieronder uw zoekcriteria"
 
-#: ../libpurple/protocols/gg/gg.c:706
 msgid "Fill in the fields."
 msgstr "Vul de velden in."
 
-#: ../libpurple/protocols/gg/gg.c:718
 msgid "Your current password is different from the one that you specified."
-msgstr "Je huidige wachtwoord wijkt af van het opgegeven wachtwoord."
+msgstr "Je  huidige wachtwoord wijkt af van het door u gegeven wachtwoord."
 
-#: ../libpurple/protocols/gg/gg.c:732
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Kan wachtwoord niet wijzigen. Er is een fout opgetreden.\n"
 
-#: ../libpurple/protocols/gg/gg.c:741
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Wachtwoord wijzigen voor het gadu-gadu-account"
 
-#: ../libpurple/protocols/gg/gg.c:742
 msgid "Password was changed successfully!"
 msgstr "Wachtwoord gewijzigd."
 
-#: ../libpurple/protocols/gg/gg.c:775
 msgid "Current password"
 msgstr "Huidige wachtwoord"
 
-#: ../libpurple/protocols/gg/gg.c:800
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Geef je huidige wachtwoord en nieuwe wachtwoord voor UIN: "
 
-#: ../libpurple/protocols/gg/gg.c:804
-#: ../libpurple/protocols/gg/gg.c:805
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-gadu-wachtwoord wijzigen"
 
-#: ../libpurple/protocols/gg/gg.c:882
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Kies een chatgesprek voor het contact: %s"
 
-#: ../libpurple/protocols/gg/gg.c:885
-#: ../libpurple/protocols/gg/gg.c:886
 msgid "Add to chat..."
 msgstr "Toevoegen aan chatgesprek..."
 
-#: ../libpurple/protocols/gg/gg.c:1020
-#: ../libpurple/protocols/jabber/buddy.c:2057
-#: ../libpurple/protocols/msn/state.c:29
-#: ../libpurple/protocols/msn/state.c:30
-#: ../libpurple/protocols/msn/state.c:37
-#: ../libpurple/protocols/msn/state.c:38
-#: ../libpurple/protocols/msnp9/state.c:29
-#: ../libpurple/protocols/msnp9/state.c:30
-#: ../libpurple/protocols/msnp9/state.c:37
-#: ../libpurple/protocols/msnp9/state.c:38
-#: ../libpurple/protocols/novell/novell.c:2834
-#: ../libpurple/protocols/qq/qq.c:355
-#: ../libpurple/protocols/yahoo/yahoo.c:3165
-#: ../libpurple/status.c:160
-#: ../pidgin/gtkdocklet.c:545
-#: ../pidgin/gtkstatusbox.c:1089
 msgid "Available"
 msgstr "Beschikbaar"
 
 #. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
 #. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
 #. Away stuff
-#: ../libpurple/protocols/gg/gg.c:1023
-#: ../libpurple/protocols/irc/irc.c:561
-#: ../libpurple/protocols/irc/msgs.c:362
-#: ../libpurple/protocols/jabber/buddy.c:2061
-#: ../libpurple/protocols/novell/novell.c:2837
-#: ../libpurple/protocols/oscar/oscar.c:739
-#: ../libpurple/protocols/oscar/oscar.c:5837
-#: ../libpurple/protocols/qq/qq.c:223
-#: ../libpurple/protocols/qq/qq.c:359
-#: ../libpurple/protocols/silc/buddy.c:1491
-#: ../libpurple/protocols/silc10/buddy.c:1491
-#: ../libpurple/protocols/yahoo/yahoo.c:3726
-#: ../libpurple/protocols/yahoo/yahoo.c:3800
-#: ../libpurple/status.c:163
-#: ../pidgin/gtkdocklet.c:549
-#: ../pidgin/gtkprefs.c:2067
-#: ../pidgin/gtkstatusbox.c:1090
+#, c-format
 msgid "Away"
 msgstr "Afwezig"
 
-#: ../libpurple/protocols/gg/gg.c:1052
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/oscar/oscar.c:2948
-#: ../libpurple/protocols/oscar/oscar.c:3889
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1055
-#: ../libpurple/protocols/gg/gg.c:1129
-#: ../libpurple/protocols/jabber/buddy.c:2234
-#: ../libpurple/protocols/jabber/buddy.c:2420
-#: ../libpurple/protocols/oscar/oscar.c:3900
-#: ../libpurple/protocols/silc/ops.c:1004
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Voornaam"
 
-#: ../libpurple/protocols/gg/gg.c:1068
-#: ../libpurple/protocols/gg/gg.c:1138
 msgid "Birth Year"
 msgstr "Geboortejaar"
 
-#: ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/gg/gg.c:1189
-#: ../libpurple/protocols/oscar/oscar.c:4076
 msgid "Unable to display the search results."
 msgstr "kan zoekresultaten niet weergeven."
 
-#: ../libpurple/protocols/gg/gg.c:1180
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu-adresboek"
 
-#: ../libpurple/protocols/gg/gg.c:1181
 msgid "Search results"
 msgstr "Zoekresultaten"
 
-#: ../libpurple/protocols/gg/gg.c:1224
 msgid "No matching users found"
 msgstr "Niet overeenkomende gebruikers gevonden"
 
-#: ../libpurple/protocols/gg/gg.c:1225
 msgid "There are no users matching your search criteria."
-msgstr "Er zijn geen overeenkomende gebruikers voor je zoekcriteria"
+msgstr "Er zijn geen overeenkomende gebruikers voor uw zoekcriteria"
 
-#: ../libpurple/protocols/gg/gg.c:1321
-#: ../libpurple/protocols/gg/gg.c:1476
 msgid "Unable to read socket"
 msgstr "Kan niet lezen van socket."
 
-#: ../libpurple/protocols/gg/gg.c:1406
 msgid "Buddy list downloaded"
 msgstr "Contactenlijst gedownload"
 
-#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Your buddy list was downloaded from the server."
 msgstr "Uw contactenlijst is gedownload van de server."
 
-#: ../libpurple/protocols/gg/gg.c:1414
 msgid "Buddy list uploaded"
 msgstr "Contactenlijst verzonden"
 
-#: ../libpurple/protocols/gg/gg.c:1415
 msgid "Your buddy list was stored on the server."
 msgstr "Uw contactenlijst is opgeslagen op de server."
 
-#: ../libpurple/protocols/gg/gg.c:1513
-#: ../libpurple/protocols/gg/gg.c:1726
 msgid "Connection failed."
 msgstr "Verbinding mislukt."
 
-#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Add to chat"
 msgstr "Toevoegen aan chatgesprek"
 
-#: ../libpurple/protocols/gg/gg.c:1678
 msgid "Chat _name:"
 msgstr "_Naam chatgesprek:"
 
-#: ../libpurple/protocols/gg/gg.c:1951
 msgid "Chat error"
 msgstr "Chatfout"
 
-#: ../libpurple/protocols/gg/gg.c:1952
 msgid "This chat name is already in use"
 msgstr "De naam bestaat reeds"
 
-#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Not connected to the server."
 msgstr "Niet verbonden met de server."
 
-#: ../libpurple/protocols/gg/gg.c:2060
 msgid "Find buddies..."
 msgstr "Contacten zoeken..."
 
-#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Change password..."
 msgstr "Wachtwoord wijzigen..."
 
-#: ../libpurple/protocols/gg/gg.c:2072
 msgid "Upload buddylist to Server"
 msgstr "Contactenlijst opslaan op de server"
 
-#: ../libpurple/protocols/gg/gg.c:2076
 msgid "Download buddylist from Server"
 msgstr "Contactenlijst van server downloaden"
 
-#: ../libpurple/protocols/gg/gg.c:2080
 msgid "Delete buddylist from Server"
 msgstr "Contactenlijst verwijderen van server"
 
-#: ../libpurple/protocols/gg/gg.c:2084
 msgid "Save buddylist to file..."
 msgstr "Contactenlijst opslaan in bestand..."
 
@@ -4683,158 +3153,82 @@ msgstr "Contactenlijst opslaan in bestand..."
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2193
 msgid "Gadu-Gadu Protocol Plugin"
-msgstr "Gadu-Gadu-protocol-plugin"
+msgstr "Gadu-Gadu-protocol-plug-in"
 
 #  summary
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2194
 msgid "Polish popular IM"
 msgstr "Populaire Poolse client voor berichten"
 
-#: ../libpurple/protocols/gg/gg.c:2248
 msgid "Gadu-Gadu User"
 msgstr "Gadu-gadu-gebruiker"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1890
-#: ../libpurple/protocols/silc10/silc.c:1609
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Onbekende opdracht: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:537
-#: ../libpurple/protocols/jabber/chat.c:616
-#: ../libpurple/protocols/silc/silc.c:1580
-#: ../libpurple/protocols/silc10/silc.c:1299
 #, c-format
 msgid "current topic is: %s"
 msgstr "huidige onderwerp is: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:541
-#: ../libpurple/protocols/jabber/chat.c:620
-#: ../libpurple/protocols/silc/silc.c:1584
-#: ../libpurple/protocols/silc10/silc.c:1303
 msgid "No topic is set"
 msgstr "Geen onderwerp ingesteld"
 
-#: ../libpurple/protocols/irc/dcc_send.c:298
-#: ../libpurple/protocols/irc/dcc_send.c:339
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:318
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:327
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:336
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1110
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1514
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
 msgid "File Transfer Failed"
 msgstr "Bestandsoverdracht mislukt"
 
-#: ../libpurple/protocols/irc/dcc_send.c:299
-#: ../libpurple/protocols/irc/dcc_send.c:340
 msgid "Could not open a listening port."
 msgstr "Kon geen poort openen om te luisteren."
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Fout bij weergeven van MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Geen MOTD beschikbaar"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Er is geen MOTD geassocieerd met deze verbinding."
 
-#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD voor %s"
 
-#: ../libpurple/protocols/irc/irc.c:129
-#: ../libpurple/protocols/irc/irc.c:169
-#: ../libpurple/protocols/irc/irc.c:650
-#: ../libpurple/protocols/irc/irc.c:679
-#: ../libpurple/protocols/myspace/myspace.c:2554
 msgid "Server has disconnected"
 msgstr "Server heeft verbinding verbroken"
 
-#: ../libpurple/protocols/irc/irc.c:260
 msgid "View MOTD"
 msgstr "MOTD weergeven"
 
-#: ../libpurple/protocols/irc/irc.c:272
-#: ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Ruimte:"
 
-#: ../libpurple/protocols/irc/irc.c:278
-#: ../libpurple/protocols/jabber/chat.c:59
-#: ../pidgin/gtkaccount.c:550
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../libpurple/protocols/irc/irc.c:311
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-bijnamen mogen geen spaties bevatten"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:332
-#: ../libpurple/protocols/jabber/jabber.c:1380
-#: ../libpurple/protocols/msn/session.c:409
-#: ../libpurple/protocols/msnp9/session.c:368
-#: ../libpurple/protocols/myspace/myspace.c:295
-#: ../libpurple/protocols/novell/novell.c:2199
-#: ../libpurple/protocols/oscar/oscar.c:1446
-#: ../libpurple/protocols/sametime/sametime.c:3778
-#: ../libpurple/protocols/simple/simple.c:1931
-#: ../libpurple/protocols/yahoo/yahoo.c:2991
-#: ../libpurple/protocols/zephyr/zephyr.c:1589
-#: ../pidgin/gtkstatusbox.c:687
 msgid "Connecting"
 msgstr "Verbinding wordt gemaakt"
 
-#: ../libpurple/protocols/irc/irc.c:342
-#: ../libpurple/protocols/jabber/jabber.c:704
-#: ../libpurple/protocols/jabber/jabber.c:1185
 msgid "SSL support unavailable"
 msgstr "SSL niet beschikbaar"
 
-#: ../libpurple/protocols/irc/irc.c:355
-#: ../libpurple/protocols/myspace/myspace.c:313
-#: ../libpurple/protocols/simple/simple.c:485
-#: ../libpurple/protocols/simple/simple.c:1841
 msgid "Couldn't create socket"
 msgstr "Kan geen socket aanmaken"
 
-#: ../libpurple/protocols/irc/irc.c:453
-#: ../libpurple/protocols/oscar/oscar.c:1442
 msgid "Couldn't connect to host"
 msgstr "Kan geen verbinding maken met host"
 
-#: ../libpurple/protocols/irc/irc.c:645
-#: ../libpurple/protocols/irc/irc.c:674
-#: ../libpurple/protocols/myspace/myspace.c:2548
 msgid "Read error"
 msgstr "Leesfout"
 
-#: ../libpurple/protocols/irc/irc.c:815
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1508
 msgid "Users"
 msgstr "Gebruikers"
 
-#: ../libpurple/protocols/irc/irc.c:818
-#: ../libpurple/protocols/sametime/sametime.c:3426
-#: ../libpurple/protocols/silc/chat.c:1404
-#: ../libpurple/protocols/silc/ops.c:1406
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1517
 msgid "Topic"
 msgstr "Onderwerp"
 
@@ -4846,57 +3240,27 @@ msgstr "Onderwerp"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:957
 msgid "IRC Protocol Plugin"
-msgstr "IRC-protocol plugin"
+msgstr "IRC-protocol plug-in"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:958
 msgid "The IRC Protocol Plugin that Sucks Less"
-msgstr "De IRC-protocol plugin die minder zuigt"
+msgstr "De IRC-protocol plug-in die minder zuigt"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:983
-#: ../libpurple/protocols/irc/msgs.c:375
-#: ../libpurple/protocols/msn/msn.c:2571
-#: ../libpurple/protocols/msnp9/msn.c:2326
-#: ../libpurple/protocols/oscar/oscar.c:6836
-#: ../libpurple/protocols/qq/qq.c:805
-#: ../libpurple/protocols/sametime/sametime.c:5783
-#: ../libpurple/protocols/silc/ops.c:1262
-#: ../libpurple/protocols/silc/ops.c:1356
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2115
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:986
-#: ../libpurple/protocols/msn/msn.c:2576
-#: ../libpurple/protocols/msnp9/msn.c:2331
-#: ../libpurple/protocols/oscar/oscar.c:6839
-#: ../libpurple/protocols/qq/qq.c:808
-#: ../libpurple/protocols/sametime/sametime.c:5788
-#: ../libpurple/protocols/silc/silc.c:2181
-#: ../libpurple/protocols/silc10/silc.c:1904
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Poort"
 
-#: ../libpurple/protocols/irc/irc.c:989
 msgid "Encodings"
 msgstr "Coderingen"
 
-#: ../libpurple/protocols/irc/irc.c:992
 msgid "Auto-detect incoming UTF-8"
 msgstr "Inkomende UTF-8 automatisch herkennen"
 
-#: ../libpurple/protocols/irc/irc.c:998
-#: ../libpurple/protocols/irc/msgs.c:369
-#: ../libpurple/protocols/silc/silc.c:1244
-#: ../libpurple/protocols/silc10/silc.c:945
 msgid "Real name"
 msgstr "Echte naam"
 
@@ -4904,1125 +3268,830 @@ msgstr "Echte naam"
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:1006
 msgid "Use SSL"
 msgstr "SSL gebruiken"
 
-#: ../libpurple/protocols/irc/msgs.c:196
 msgid "Bad mode"
 msgstr "Slechte modus"
 
-#: ../libpurple/protocols/irc/msgs.c:218
 #, c-format
 msgid "Ban on %s by %s, set %s ago"
 msgstr "Ban op %s door %s, %s geleden ingesteld"
 
-#: ../libpurple/protocols/irc/msgs.c:221
 #, c-format
 msgid "Ban on %s"
 msgstr "Ban op %s"
 
-#: ../libpurple/protocols/irc/msgs.c:236
 msgid "End of ban list"
 msgstr "Einde van blokkeerlijst"
 
-#: ../libpurple/protocols/irc/msgs.c:250
 #, c-format
 msgid "You are banned from %s."
 msgstr "Je bent uit %s verbannen."
 
-#: ../libpurple/protocols/irc/msgs.c:251
 msgid "Banned"
 msgstr "Verbannen"
 
-#: ../libpurple/protocols/irc/msgs.c:268
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kan %s niet verbannen. De lijst is vol"
 
-#: ../libpurple/protocols/irc/msgs.c:353
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:354
 msgid " <i>(identified)</i>"
 msgstr " <i>(geïdentificeerd)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:355
-#: ../libpurple/protocols/oscar/oscar.c:3890
-#: ../libpurple/protocols/silc/ops.c:1435
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Bijnaam"
 
-#: ../libpurple/protocols/irc/msgs.c:381
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Nu aanwezig"
 
-#: ../libpurple/protocols/irc/msgs.c:386
 msgid "Idle for"
 msgstr "Inactief in"
 
-#: ../libpurple/protocols/irc/msgs.c:389
 msgid "Online since"
 msgstr "Online sinds"
 
-#: ../libpurple/protocols/irc/msgs.c:393
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Gedefinieerde eigenschap:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:393
 msgid "Glorious"
 msgstr "Glorieus"
 
-#: ../libpurple/protocols/irc/msgs.c:477
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s heeft het onderwerp veranderd naar: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:479
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s heeft het onderwerp gewist."
 
-#: ../libpurple/protocols/irc/msgs.c:487
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Het onderwerp voor %s is %s"
 
-#: ../libpurple/protocols/irc/msgs.c:505
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Onbekend bericht '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:506
 msgid "Unknown message"
 msgstr "Onbekend bericht"
 
-#: ../libpurple/protocols/irc/msgs.c:506
 msgid "The IRC server received a message it did not understand."
 msgstr "De IRC-server ontving een bericht dat niet werd begrepen."
 
-#: ../libpurple/protocols/irc/msgs.c:527
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Gebruikers op %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:634
 msgid "Time Response"
 msgstr "Tijdreactie"
 
-#: ../libpurple/protocols/irc/msgs.c:635
 msgid "The IRC server's local time is:"
 msgstr "De lokale tijd van de IRC server is:"
 
-#: ../libpurple/protocols/irc/msgs.c:646
 msgid "No such channel"
 msgstr "Ruimte bestaat niet"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:657
 msgid "no such channel"
 msgstr "ruimte bestaat niet"
 
-#: ../libpurple/protocols/irc/msgs.c:660
 msgid "User is not logged in"
 msgstr "Gebruiker is niet aangemeld"
 
-#: ../libpurple/protocols/irc/msgs.c:665
 msgid "No such nick or channel"
 msgstr "Bijnaam/ruimte bestaat niet"
 
-#: ../libpurple/protocols/irc/msgs.c:685
 msgid "Could not send"
 msgstr "Kan niet verzenden"
 
-#: ../libpurple/protocols/irc/msgs.c:741
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Deelnemen aan %s vereist een uitnodiging."
 
-#: ../libpurple/protocols/irc/msgs.c:742
 msgid "Invitation only"
 msgstr "Alleen op uitnodiging"
 
-#: ../libpurple/protocols/irc/msgs.c:858
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Je bent weggeschopt door %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:863
-#: ../libpurple/protocols/silc/ops.c:714
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Weggeschopt door %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:886
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "modus (%s %s) door %s"
 
-#: ../libpurple/protocols/irc/msgs.c:976
-#: ../libpurple/protocols/irc/msgs.c:977
 msgid "Invalid nickname"
 msgstr "Ongeldige bijnaam"
 
-#: ../libpurple/protocols/irc/msgs.c:978
-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
-msgstr "Uw gekozen bijnaam is geweigerd door de server. Het bevat waarschijnlijk onacceptabele tekens."
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Uw gekozen bijnaam is geweigerd door de server. Het bevat waarschijnlijk "
+"onacceptabele tekens."
 
-#: ../libpurple/protocols/irc/msgs.c:983
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
-msgstr "Uw gekozen accountnaam is geweigerd door de server. Het bevat waarschijnlijk onacceptabele tekens."
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Uw gekozen accountnaam is geweigerd door de server. Het bevat waarschijnlijk "
+"onacceptabele tekens."
 
-#: ../libpurple/protocols/irc/msgs.c:1031
 msgid "Cannot change nick"
 msgstr "Kan bijnaam niet veranderen"
 
-#: ../libpurple/protocols/irc/msgs.c:1031
 msgid "Could not change nick"
 msgstr "Kan bijnaam niet veranderen"
 
-#: ../libpurple/protocols/irc/msgs.c:1056
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Je hebt het kanaal%s%s verlaten"
 
-#: ../libpurple/protocols/irc/msgs.c:1100
 msgid "Error: invalid PONG from server"
 msgstr "Fout: ongeldige PONG van server"
 
-#: ../libpurple/protocols/irc/msgs.c:1102
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-antwoord -- Vertraging %lu seconden"
 
-#: ../libpurple/protocols/irc/msgs.c:1193
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kan niet deelnemen aan %s: Registratie vereist."
 
-#: ../libpurple/protocols/irc/msgs.c:1194
-#: ../libpurple/protocols/silc/ops.c:1106
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kan niet deelnemen aan ruimte"
 
-#: ../libpurple/protocols/irc/msgs.c:1228
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Bijnaam of chatgesprek is momenteel niet bereikbaar."
 
-#: ../libpurple/protocols/irc/msgs.c:1240
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops van %s"
 
-#: ../libpurple/protocols/irc/parse.c:124
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
 
-#: ../libpurple/protocols/irc/parse.c:125
-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "away [bericht]:  Een afwezigheidsbericht instellen, of afwezigheid uitschakelen door geen bericht te gebruiken."
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [bericht]:  Een afwezigheidsbericht instellen, of afwezigheid "
+"uitschakelen door geen bericht te gebruiken."
 
-#: ../libpurple/protocols/irc/parse.c:126
 msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
-msgstr ""
+msgstr "ctcp <nick> <msg>: verzend ctcp msg aan contact."
 
-#: ../libpurple/protocols/irc/parse.c:127
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Een opdracht naar chanserv sturen"
 
-#: ../libpurple/protocols/irc/parse.c:128
-msgid "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. Hiervoor is het nodig operator te zijn."
+msgid ""
+"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."
 
-#: ../libpurple/protocols/irc/parse.c:129
-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). Hiervoor is het nodig operator te zijn."
+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."
 
-#: ../libpurple/protocols/irc/parse.c:130
-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."
+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."
 
-#: ../libpurple/protocols/irc/parse.c:131
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;ruimte1&gt;[,ruimte2][,...] [ww1[,ww2][,...]]:  Een of meerdere "
+"ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
 
-#: ../libpurple/protocols/irc/parse.c:132
-msgid "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 ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
+msgid ""
+"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 "
+"ruimtes openen, met een optioneel wachtwoord indien noodzakelijk."
 
-#: ../libpurple/protocols/irc/parse.c:133
-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. Hiervoor is het nodig operator te zijn."
+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 "
+"zelf operator zijn hiervoor."
 
-#: ../libpurple/protocols/irc/parse.c:134
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers 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>"
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"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>"
 
-#: ../libpurple/protocols/irc/parse.c:135
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;uit te voeren actie&gt;:  Een bepaalde actie uitvoeren."
 
-#: ../libpurple/protocols/irc/parse.c:136
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv:  Een opdracht naar de memoserver sturen"
 
-#: ../libpurple/protocols/irc/parse.c:137
-msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
-msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;bijnaam|kanaal&gt;:  Kanaal- / gebruikersmodus aan of uitschakelen."
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;bijnaam|kanaal&gt;:  Kanaal- / "
+"gebruikersmodus aan of uitschakelen."
 
-#: ../libpurple/protocols/irc/parse.c:138
-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)."
+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)."
 
-#: ../libpurple/protocols/irc/parse.c:139
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [ruimte]:  De gebruikers in het kanaal opsommen."
 
-#: ../libpurple/protocols/irc/parse.c:140
-#: ../libpurple/protocols/jabber/jabber.c:2391
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
-msgstr "nick &lt;nieuwe bijnaam&gt;:  Je eigen bijnaam veranderen."
+msgstr "nick &lt;nieuwe bijnaam&gt;:  Uw eigen bijnaam veranderen."
 
-#: ../libpurple/protocols/irc/parse.c:141
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv:  Een opdracht naar de nickserver sturen"
 
-#: ../libpurple/protocols/irc/parse.c:142
 msgid "notice &lt;target&lt;:  Send a notice to a user or channel."
-msgstr "notice &lt;target&lt;:  Verzend een notitie naar een gebruiker of kanaal."
+msgstr ""
+"notice &lt;target&lt;:  Verzend een notitie naar een gebruiker of kanaal."
 
-#: ../libpurple/protocols/irc/parse.c:143
-msgid "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. Hiervoor is het nodig operator te zijn."
+msgid ""
+"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."
 
-#: ../libpurple/protocols/irc/parse.c:144
-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 waarschijnlijk niet gebruiken."
+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 "
+"waarschijnlijk niet gebruiken."
 
-#: ../libpurple/protocols/irc/parse.c:145
 msgid "operserv: Send a command to operserv"
 msgstr "operserv:  Een opdracht naar de operserver sturen"
 
-#: ../libpurple/protocols/irc/parse.c:146
-msgid "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 optioneel afscheidsbericht."
+msgid ""
+"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 "
+"optioneel afscheidsbericht."
 
-#: ../libpurple/protocols/irc/parse.c:147
-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)."
+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)."
 
-#: ../libpurple/protocols/irc/parse.c:148
-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."
+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."
 
-#: ../libpurple/protocols/irc/parse.c:149
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [bericht]:  Verbinding met de server verbreken met een optioneel afscheidsbericht."
+msgstr ""
+"quit [bericht]:  Verbinding met de server verbreken met een optioneel "
+"afscheidsbericht."
 
-#: ../libpurple/protocols/irc/parse.c:150
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Een opdracht direct naar de server sturen."
 
-#: ../libpurple/protocols/irc/parse.c:151
-msgid "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. Hiervoor is het nodig operator te zijn."
+msgid ""
+"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 "
+"wel zelf operator zijn hiervoor."
 
-#: ../libpurple/protocols/irc/parse.c:152
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Geeft de huidige lokale tijd van de IRC-server."
 
-#: ../libpurple/protocols/irc/parse.c:153
 msgid "topic [new topic]:  View or change the channel topic."
-msgstr "topic [nieuw onderwerp]:  Onderwerp van het kanaal weergeven / veranderen."
+msgstr ""
+"topic [nieuw onderwerp]:  Onderwerp van het kanaal weergeven / veranderen."
 
-#: ../libpurple/protocols/irc/parse.c:154
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Een gebruikersmodus aan- of uitzetten."
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Een gebruikersmodus aan- of uitzetten."
 
-#: ../libpurple/protocols/irc/parse.c:155
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [bijnaam]: CTCP VERSION sturen aan een gebruiker"
 
-#: ../libpurple/protocols/irc/parse.c:156
-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. Hiervoor is het nodig operator te zijn."
+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."
 
-#: ../libpurple/protocols/irc/parse.c:157
-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 je niet weet wat dit is, kun je het waarschijnlijk niet gebruiken."
+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 "
+"waarschijnlijk niet gebruiken."
 
-#: ../libpurple/protocols/irc/parse.c:158
 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;bijnaam&gt;:  Informatie over een gebruiker opvragen."
 
-#: ../libpurple/protocols/irc/parse.c:159
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
 msgstr "whowas &lt;nick&gt;:  Informatie over een gebruiker opvragen."
 
-#: ../libpurple/protocols/irc/parse.c:531
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwoord van %s na %lu seconden"
 
-#: ../libpurple/protocols/irc/parse.c:532
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:532
 msgid "CTCP PING reply"
 msgstr "CTCP PING antwoord"
 
-#: ../libpurple/protocols/irc/parse.c:644
-#: ../libpurple/protocols/irc/parse.c:651
-#: ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694
-#: ../libpurple/protocols/toc/toc.c:710
-#: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Verbinding verbroken"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:143
-#: ../libpurple/protocols/jabber/jabber.c:765
-#: ../libpurple/protocols/jabber/jabber.c:795
-#: ../libpurple/protocols/jabber/jabber.c:1975
 msgid "Unknown Error"
 msgstr "Onbekende fout"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:145
-#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "Ad-Hoc opdracht mislukt"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr "uitvoeren"
 
-#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
-msgstr "Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL gevonden."
+msgstr ""
+"Server vereist TLS/SSL voor aanmelding. Geen ondersteuning voor TLS/SSL "
+"gevonden."
 
-#: ../libpurple/protocols/jabber/auth.c:60
 msgid "You require encryption, but no TLS/SSL support found."
-msgstr "Server vereist versleuteling, maar er is geen ondersteuning voor TLS/SSL gevonden."
+msgstr ""
+"Server vereist versleuteling, maar er is geen ondersteuning voor TLS/SSL "
+"gevonden."
 
-#: ../libpurple/protocols/jabber/auth.c:125
 msgid "Server requires plaintext authentication over an unencrypted stream"
-msgstr "Server vereist een identificatie via tekstaanmelding via een ongecodeerde datastroom"
+msgstr ""
+"Server vereist een identificatie via tekstaanmelding via een ongecodeerde "
+"datastroom"
 
-#: ../libpurple/protocols/jabber/auth.c:328
-#: ../libpurple/protocols/jabber/auth.c:544
-#: ../libpurple/protocols/jabber/auth.c:670
 #, c-format
-msgid "%s requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "%s vereist een identificatie d.m.v tekst via een ongecodeerde datastroom. Wil je hiermee doorgaan?"
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s vereist een identificatie via tekstaanmelding via een ongecodeerde "
+"datastroom. Wilt u hiermee doorgaan?"
 
-#: ../libpurple/protocols/jabber/auth.c:330
-#: ../libpurple/protocols/jabber/auth.c:331
-#: ../libpurple/protocols/jabber/auth.c:546
-#: ../libpurple/protocols/jabber/auth.c:547
-#: ../libpurple/protocols/jabber/auth.c:672
-#: ../libpurple/protocols/jabber/auth.c:673
 msgid "Plaintext Authentication"
 msgstr "Tekstaanmelding"
 
-#: ../libpurple/protocols/jabber/auth.c:489
-#: ../libpurple/protocols/jabber/auth.c:602
-#: ../libpurple/protocols/jabber/auth.c:854
-#: ../libpurple/protocols/jabber/auth.c:1006
-#: ../libpurple/protocols/jabber/auth.c:1033
-#: ../libpurple/protocols/jabber/auth.c:1079
-#: ../libpurple/protocols/jabber/jabber.c:128
 msgid "Invalid response from server."
 msgstr "Ongeldig antwoord van server"
 
-#: ../libpurple/protocols/jabber/auth.c:560
-#: ../libpurple/protocols/jabber/auth.c:686
 msgid "Server does not use any supported authentication method"
 msgstr "Server gebruikt geen van de ondersteunde identificatiemethoden"
 
-#: ../libpurple/protocols/jabber/auth.c:877
-#: ../libpurple/protocols/jabber/auth.c:903
 msgid "Invalid challenge from server"
 msgstr "Ongeldige vraag van server"
 
-#: ../libpurple/protocols/jabber/auth.c:979
 msgid "SASL error"
 msgstr "SASL-fout"
 
-#: ../libpurple/protocols/jabber/buddy.c:306
-#: ../libpurple/protocols/jabber/buddy.c:1256
-#: ../libpurple/protocols/sametime/sametime.c:4184
-#: ../libpurple/protocols/silc/ops.c:1000
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Volledige naam"
 
-#: ../libpurple/protocols/jabber/buddy.c:307
-#: ../libpurple/protocols/jabber/buddy.c:1267
-#: ../libpurple/protocols/silc/ops.c:1012
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Achternaam"
 
-#: ../libpurple/protocols/jabber/buddy.c:308
-#: ../libpurple/protocols/jabber/buddy.c:1269
 msgid "Given Name"
 msgstr "Gegeven naam"
 
-#: ../libpurple/protocols/jabber/buddy.c:310
-#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:311
-#: ../libpurple/protocols/jabber/buddy.c:1310
 msgid "Street Address"
 msgstr "Adres"
 
-#: ../libpurple/protocols/jabber/buddy.c:312
-#: ../libpurple/protocols/jabber/buddy.c:1308
 msgid "Extended Address"
 msgstr "Adresbijvoeging"
 
-#: ../libpurple/protocols/jabber/buddy.c:313
-#: ../libpurple/protocols/jabber/buddy.c:1312
 msgid "Locality"
 msgstr "Localiteit"
 
-#: ../libpurple/protocols/jabber/buddy.c:314
-#: ../libpurple/protocols/jabber/buddy.c:1314
 msgid "Region"
 msgstr "Regio"
 
-#: ../libpurple/protocols/jabber/buddy.c:315
-#: ../libpurple/protocols/jabber/buddy.c:1316
 msgid "Postal Code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/jabber/buddy.c:316
-#: ../libpurple/protocols/jabber/buddy.c:1319
-#: ../libpurple/protocols/silc/silc.c:1250
-#: ../libpurple/protocols/silc10/silc.c:951
 msgid "Country"
 msgstr "Land"
 
 #. lots of clients (including purple) do this, but it's
 #. * out of spec
-#: ../libpurple/protocols/jabber/buddy.c:317
-#: ../libpurple/protocols/jabber/buddy.c:1333
-#: ../libpurple/protocols/jabber/buddy.c:1339
 msgid "Telephone"
 msgstr "Telefoon"
 
-#: ../libpurple/protocols/jabber/buddy.c:319
-#: ../libpurple/protocols/jabber/buddy.c:1380
 msgid "Organization Name"
 msgstr "Organisatie"
 
-#: ../libpurple/protocols/jabber/buddy.c:320
-#: ../libpurple/protocols/jabber/buddy.c:1382
 msgid "Organization Unit"
 msgstr "Afdeling"
 
-#: ../libpurple/protocols/jabber/buddy.c:322
-#: ../libpurple/protocols/jabber/buddy.c:1389
 msgid "Role"
 msgstr "Rol"
 
-#: ../libpurple/protocols/jabber/buddy.c:323
-#: ../libpurple/protocols/jabber/buddy.c:1282
-#: ../libpurple/protocols/msn/msn.c:2042
-#: ../libpurple/protocols/msnp9/msn.c:1798
-#: ../libpurple/protocols/oscar/oscar.c:3939
 msgid "Birthday"
 msgstr "Geboortedatum"
 
-#: ../libpurple/protocols/jabber/buddy.c:324
-#: ../libpurple/protocols/jabber/buddy.c:1391
-#: ../libpurple/protocols/jabber/chat.c:800
-#: ../libpurple/protocols/jabber/usermood.c:190
-#: ../pidgin/gtkblist.c:3517
-#: ../pidgin/gtkplugin.c:584
-#: ../pidgin/gtkprefs.c:688
 msgid "Description"
 msgstr "Beschrijving"
 
-#: ../libpurple/protocols/jabber/buddy.c:753
-#: ../libpurple/protocols/jabber/buddy.c:754
 msgid "Edit XMPP vCard"
 msgstr "XMPP vCard bewerken"
 
-#: ../libpurple/protocols/jabber/buddy.c:755
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
-msgstr "Alle items hieronder zijn optioneel. Geef alleen die informatie die je ook openbaar wilt maken."
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+"Alle items hieronder zijn optioneel. Geef alleen die informatie die u ook "
+"openbaar wilt maken."
 
-#: ../libpurple/protocols/jabber/buddy.c:811
-#: ../libpurple/protocols/jabber/buddy.c:980
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:984
 msgid "Operating System"
 msgstr "Besturingssysteem"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Last Activity"
 msgstr "Laatste activiteit"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "Service Discovery Info"
 msgstr "Directory info instellen"
 
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "Service Discovery Items"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Extended Stanza Addressing"
 msgstr "Stanza adresbijvoeging"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "Multi-User Chat"
 msgstr "Groepsgesprek"
 
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1035
 #, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
 msgstr "Deze gebruiker heeft geen profiel."
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "In-Band Bytestreams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Ad-Hoc Commands"
 msgstr "Ad-Hoc opdrachten"
 
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1041
 msgid "PubSub Service"
 msgstr "PubSub dienst"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "SOCKS5 Bytestreams"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "Out of Band Data"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1049
 #, fuzzy
 msgid "In-Band Registration"
 msgstr "Registratiefout"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Location"
 msgstr "Gebruikerslocatie"
 
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "User Avatar"
 msgstr "Avatar"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "Chat State Notifications"
 msgstr "Contactstatusmelding"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1057
 msgid "Software Version"
 msgstr "Software versie"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1059
 #, fuzzy
 msgid "Stream Initiation"
 msgstr "Oriëntatie"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1061
-#: ../libpurple/protocols/sametime/sametime.c:3287
 msgid "File Transfer"
 msgstr "Bestandsoverdracht"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "User Mood"
 msgstr "Humeur gebruiker"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "User Activity"
 msgstr "Activiteit gebruiker"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "Entity Capabilities"
 msgstr "Entiteit mogelijkheden"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "Encrypted Session Negotiations"
 msgstr "Gecodeerde sessie onderhandelingen"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "User Tune"
 msgstr "Gebruikers tune"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1073
 #, fuzzy
 msgid "Roster Item Exchange"
 msgstr "IM met sleuteluitwisseling"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1075
 msgid "Reachability Address"
 msgstr "Beschikbaarheid adres"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1077
 msgid "User Profile"
 msgstr "Profiel"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1079
 msgid "Jingle"
 msgstr "Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1081
 msgid "Jingle Audio"
 msgstr "Geluid jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1083
 msgid "User Nickname"
 msgstr "Gebruikersnaam"
 
-#: ../libpurple/protocols/jabber/buddy.c:915
-#: ../libpurple/protocols/jabber/buddy.c:1085
 msgid "Jingle ICE UDP"
 msgstr "ICE UDP Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:917
-#: ../libpurple/protocols/jabber/buddy.c:1087
 msgid "Jingle ICE TCP"
 msgstr "ICE TCP Jingle"
 
-#: ../libpurple/protocols/jabber/buddy.c:919
-#: ../libpurple/protocols/jabber/buddy.c:1089
 msgid "Jingle Raw UDP"
 msgstr "Raw UDP Raw UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1091
 msgid "Jingle Video"
 msgstr "Jingle Video"
 
-#: ../libpurple/protocols/jabber/buddy.c:923
-#: ../libpurple/protocols/jabber/buddy.c:1093
 msgid "Jingle DTMF"
 msgstr "DTMF DTMF"
 
-#: ../libpurple/protocols/jabber/buddy.c:925
-#: ../libpurple/protocols/jabber/buddy.c:1095
 msgid "Message Receipts"
 msgstr "Bericht ontvangen"
 
-#: ../libpurple/protocols/jabber/buddy.c:927
-#: ../libpurple/protocols/jabber/buddy.c:1097
 msgid "Public Key Publishing"
 msgstr "Openbare sleutel openbaren"
 
-#: ../libpurple/protocols/jabber/buddy.c:929
-#: ../libpurple/protocols/jabber/buddy.c:1099
 msgid "User Chatting"
 msgstr "Chattende gebruiker"
 
-#: ../libpurple/protocols/jabber/buddy.c:931
-#: ../libpurple/protocols/jabber/buddy.c:1101
 msgid "User Browsing"
 msgstr "Browsende gebruiker"
 
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/buddy.c:1103
 msgid "User Gaming"
 msgstr "Gamende gebruiker"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/buddy.c:1105
 msgid "User Viewing"
-msgstr "Gebruiker aan het kijken"
-
-#: ../libpurple/protocols/jabber/buddy.c:937
-#: ../libpurple/protocols/jabber/buddy.c:1107
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc/ops.c:1618
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
+msgstr "Kijkende gebruiker"
+
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:939
-#: ../libpurple/protocols/jabber/buddy.c:1109
 msgid "Stanza Encryption"
 msgstr "Stanza codering"
 
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/buddy.c:1111
 msgid "Entity Time"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:943
-#: ../libpurple/protocols/jabber/buddy.c:1113
 msgid "Delayed Delivery"
 msgstr "Vertraagde afgifte"
 
-#: ../libpurple/protocols/jabber/buddy.c:945
-#: ../libpurple/protocols/jabber/buddy.c:1115
 msgid "Collaborative Data Objects"
 msgstr "Samenwerkende data-objecten"
 
-#: ../libpurple/protocols/jabber/buddy.c:947
-#: ../libpurple/protocols/jabber/buddy.c:1117
 msgid "File Repository and Sharing"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:949
-#: ../libpurple/protocols/jabber/buddy.c:1119
 msgid "STUN Service Discovery for Jingle"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/jabber/buddy.c:1121
 msgid "Simplified Encrypted Session Negotiation"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:953
-#: ../libpurple/protocols/jabber/buddy.c:1123
 msgid "Hop Check"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:961
-#: ../libpurple/protocols/jabber/buddy.c:1131
-#: ../libpurple/protocols/oscar/oscar.c:3161
 msgid "Capabilities"
 msgstr "Mogelijkheden"
 
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/jabber/jabber.c:1643
-#: ../libpurple/protocols/jabber/jabber.c:1657
-#: ../libpurple/protocols/jabber/jabber.c:1671
-#: ../libpurple/protocols/jabber/jabber.c:1685
-#: ../libpurple/protocols/jabber/jabber.c:1699
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: ../libpurple/protocols/jabber/buddy.c:1016
-#: ../libpurple/protocols/jabber/libxmpp.c:210
-#: ../libpurple/protocols/jabber/si.c:1094
 msgid "Resource"
 msgstr "Hulpmiddel"
 
-#: ../libpurple/protocols/jabber/buddy.c:1271
-#: ../libpurple/protocols/silc/ops.c:1008
-#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Tweede naam"
 
-#: ../libpurple/protocols/jabber/buddy.c:1301
-#: ../libpurple/protocols/jabber/jabber.c:1044
-#: ../libpurple/protocols/oscar/oscar.c:3962
-#: ../libpurple/protocols/oscar/oscar.c:3970
-#: ../libpurple/protocols/qq/buddy_info.c:57
-#: ../libpurple/protocols/silc/ops.c:1044
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adres"
 
-#: ../libpurple/protocols/jabber/buddy.c:1306
 msgid "P.O. Box"
 msgstr "Postbus"
 
-#: ../libpurple/protocols/jabber/buddy.c:1414
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1414
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1966
 msgid "Un-hide From"
 msgstr "Afzender weergeven"
 
-#: ../libpurple/protocols/jabber/buddy.c:1970
 msgid "Temporarily Hide From"
 msgstr "Afzender tijdelijk verbergen"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1978
 msgid "Cancel Presence Notification"
 msgstr "Aanwezigheidsmelding annuleren"
 
-#: ../libpurple/protocols/jabber/buddy.c:1985
 msgid "(Re-)Request authorization"
 msgstr "(Opnieuw) toestemming vragen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1994
 msgid "Unsubscribe"
 msgstr "Opzeggen"
 
-#: ../libpurple/protocols/jabber/buddy.c:2009
 msgid "Log In"
 msgstr "Inloggen"
 
-#: ../libpurple/protocols/jabber/buddy.c:2013
 msgid "Log Out"
 msgstr "Afmelden"
 
-#: ../libpurple/protocols/jabber/buddy.c:2059
-#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Chatty"
 msgstr "Chatgraag"
 
-#: ../libpurple/protocols/jabber/buddy.c:2063
 msgid "Extended Away"
 msgstr "Lang weg"
 
-#: ../libpurple/protocols/jabber/buddy.c:2065
-#: ../libpurple/protocols/jabber/jabber.c:1698
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:6013
-#: ../libpurple/protocols/sametime/sametime.c:3349
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Niet storen"
 
-#: ../libpurple/protocols/jabber/buddy.c:2232
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2236
-#: ../libpurple/protocols/jabber/buddy.c:2425
-#: ../libpurple/protocols/oscar/oscar.c:3901
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: ../libpurple/protocols/jabber/buddy.c:2268
 msgid "The following are the results of your search"
-msgstr "Resultaten van je zoekopdracht"
+msgstr "Resultaten van uw zoekopdracht"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:2353
-msgid "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 (%)."
+msgid ""
+"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 (%)."
 
-#: ../libpurple/protocols/jabber/buddy.c:2373
 msgid "Directory Query Failed"
 msgstr "Aanvraag mislukt"
 
-#: ../libpurple/protocols/jabber/buddy.c:2374
 msgid "Could not query the directory server."
 msgstr "Kan de adressenserver niet benaderen."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:2408
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Server-instructies: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2415
 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"
 
-#: ../libpurple/protocols/jabber/buddy.c:2435
-#: ../libpurple/protocols/novell/novell.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:3904
-#: ../libpurple/protocols/oscar/oscar.c:3913
 msgid "Email Address"
 msgstr "E-mailadres"
 
-#: ../libpurple/protocols/jabber/buddy.c:2444
-#: ../libpurple/protocols/jabber/buddy.c:2445
 msgid "Search for XMPP users"
 msgstr " XMPP-gebruikers zoeken"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2446
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/sys_msg.c:180
-#: ../libpurple/protocols/qq/sys_msg.c:256
-#: ../libpurple/protocols/qq/sys_msg.c:274
-#: ../libpurple/protocols/sametime/sametime.c:5667
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:474
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Zoeken"
 
-#: ../libpurple/protocols/jabber/buddy.c:2461
 msgid "Invalid Directory"
 msgstr "Ongeldig adresboek"
 
-#: ../libpurple/protocols/jabber/buddy.c:2478
 msgid "Enter a User Directory"
 msgstr "Geef een adressenserver"
 
-#: ../libpurple/protocols/jabber/buddy.c:2479
 msgid "Select a user directory to search"
 msgstr "Kies een te raadplegen adressenserver"
 
-#: ../libpurple/protocols/jabber/buddy.c:2482
 msgid "Search Directory"
 msgstr "Adressenserver doorzoeken"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5524
-#: ../libpurple/protocols/yahoo/yahoochat.c:1057
 msgid "_Room:"
 msgstr "_Ruimte:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "Bij_naam:"
 
-#: ../libpurple/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s is geen geldige naam voor een ruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:232
 msgid "Invalid Room Name"
 msgstr "Ongeldige naam voor ruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:238
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s is geen geldige servernaam"
 
-#: ../libpurple/protocols/jabber/chat.c:239
-#: ../libpurple/protocols/jabber/chat.c:240
 msgid "Invalid Server Name"
 msgstr "Ongeldige servernaam"
 
-#: ../libpurple/protocols/jabber/chat.c:245
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s is geen geldige aanduiding voor een ruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:246
-#: ../libpurple/protocols/jabber/chat.c:247
 msgid "Invalid Room Handle"
 msgstr "Ongeldige aanduiding voor ruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:421
 msgid "Configuration error"
 msgstr "Configuratiefout"
 
-#: ../libpurple/protocols/jabber/chat.c:430
-#: ../libpurple/protocols/jabber/chat.c:573
 msgid "Unable to configure"
 msgstr "Kan niet configureren"
 
-#: ../libpurple/protocols/jabber/chat.c:445
 msgid "Room Configuration Error"
 msgstr "Configuratiefout van ruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:446
 msgid "This room is not capable of being configured"
 msgstr "Deze ruimte kan niet ingesteld worden"
 
-#: ../libpurple/protocols/jabber/chat.c:495
-#: ../libpurple/protocols/jabber/chat.c:564
 msgid "Registration error"
 msgstr "Registratiefout"
 
-#: ../libpurple/protocols/jabber/chat.c:652
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Verandering van bijnaam niet toegestaan in non-chatruimte"
 
-#: ../libpurple/protocols/jabber/chat.c:703
-#: ../libpurple/protocols/jabber/chat.c:714
-#: ../libpurple/protocols/silc/ops.c:1473
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Fout bij het inlezen van de lijst van ruimtes"
 
-#: ../libpurple/protocols/jabber/chat.c:762
 msgid "Invalid Server"
 msgstr "Ongeldige server"
 
-#: ../libpurple/protocols/jabber/chat.c:806
 msgid "Enter a Conference Server"
 msgstr "Verbinden met server voor groepsgesprekken"
 
-#: ../libpurple/protocols/jabber/chat.c:807
 msgid "Select a conference server to query"
 msgstr "Kies een te raadplegen conferentieserver"
 
-#: ../libpurple/protocols/jabber/chat.c:810
 msgid "Find Rooms"
 msgstr "Ruimtes zoeken"
 
-#: ../libpurple/protocols/jabber/jabber.c:152
 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."
 
-#: ../libpurple/protocols/jabber/jabber.c:270
-#: ../libpurple/protocols/jabber/jabber.c:295
 msgid "Write error"
 msgstr "Schrijffout"
 
-#: ../libpurple/protocols/jabber/jabber.c:389
 msgid "Ping timeout"
 msgstr "Ping Verlopen"
 
-#: ../libpurple/protocols/jabber/jabber.c:443
-#: ../libpurple/protocols/jabber/jabber.c:488
 msgid "Read Error"
 msgstr "Leesfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
-#: ../libpurple/protocols/oscar/flap_connection.c:444
-#: ../libpurple/protocols/yahoo/yahoo.c:2601
-#: ../libpurple/protocols/yahoo/yahoo.c:2633
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -6031,628 +4100,445 @@ msgstr ""
 "Kan geen verbinding maken met de server:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:593
 msgid "Unable to create socket"
 msgstr "Kan geen socket aanmaken"
 
-#: ../libpurple/protocols/jabber/jabber.c:665
-#: ../libpurple/protocols/jabber/jabber.c:1150
 msgid "Invalid XMPP ID"
 msgstr "Ongeldig XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:672
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ongeldige XMPP ID. Domein moet ingesteld worden"
 
-#: ../libpurple/protocols/jabber/jabber.c:750
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registratie van %s@%s voltooid"
 
-#: ../libpurple/protocols/jabber/jabber.c:756
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registratie van %s voltooid"
 
-#: ../libpurple/protocols/jabber/jabber.c:758
-#: ../libpurple/protocols/jabber/jabber.c:759
 msgid "Registration Successful"
 msgstr "Registratie voltooid"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
 msgid "Registration Failed"
 msgstr "Registratie mislukt"
 
-#: ../libpurple/protocols/jabber/jabber.c:786
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registratie van %s succesvol verwijderd"
 
-#: ../libpurple/protocols/jabber/jabber.c:788
-#: ../libpurple/protocols/jabber/jabber.c:789
 msgid "Unregistration Successful"
 msgstr "Registratie Ongedaan Maken Voltooid"
 
-#: ../libpurple/protocols/jabber/jabber.c:797
-#: ../libpurple/protocols/jabber/jabber.c:798
 msgid "Unregistration Failed"
 msgstr "Registratie Ongedaan Maken Mislukt"
 
-#: ../libpurple/protocols/jabber/jabber.c:964
-#: ../libpurple/protocols/jabber/jabber.c:965
 msgid "Already Registered"
 msgstr "Al geregistreerd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
-#: ../libpurple/protocols/oscar/oscar.c:3964
-#: ../libpurple/protocols/oscar/oscar.c:3972
 msgid "State"
 msgstr "Staat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1056
 msgid "Postal code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/jabber/jabber.c:1060
-#: ../libpurple/protocols/silc/ops.c:1049
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:708
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../libpurple/protocols/jabber/jabber.c:1068
 msgid "Date"
 msgstr "Datum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1072
 msgid "Unregister"
 msgstr "Registratie ongedaan maken"
 
-#: ../libpurple/protocols/jabber/jabber.c:1079
-msgid "Please fill out the information below to change your account registration."
+msgid ""
+"Please fill out the information below to change your account registration."
 msgstr "Vul onderstaand formulier in om je account te veranderen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1082
 msgid "Please fill out the information below to register your new account."
-msgstr "Vul onderstaand formulier in om je nieuwe account te registreren."
+msgstr "Vul onderstaand formulier in om uw nieuwe account te registreren."
 
-#: ../libpurple/protocols/jabber/jabber.c:1090
-#: ../libpurple/protocols/jabber/jabber.c:1091
 msgid "Register New XMPP Account"
 msgstr "Registreer Nieuw XMPP-account"
 
-#: ../libpurple/protocols/jabber/jabber.c:1092
-#: ../libpurple/protocols/jabber/jabber.c:1101
 msgid "Register"
 msgstr "Registreren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1097
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Gebruikersinformatie Aanpassen voor %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1098
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Nieuw Account op %s registreren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1101
 msgid "Change Registration"
 msgstr "Verander Registratie: "
 
-#: ../libpurple/protocols/jabber/jabber.c:1210
-#: ../libpurple/protocols/jabber/jabber.c:1211
 msgid "Error unregistering account"
 msgstr "Fout bij het ongedaan maken van de registratie"
 
-#: ../libpurple/protocols/jabber/jabber.c:1216
-#: ../libpurple/protocols/jabber/jabber.c:1217
 msgid "Account successfully unregistered"
 msgstr "Het registreren van het account is succesvol ongedaan gemaakt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1384
 msgid "Initializing Stream"
 msgstr "Starten van datastroom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1389
 msgid "Initializing SSL/TLS"
 msgstr "SSL/TLS Initialiseren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1393
-#: ../libpurple/protocols/msn/session.c:415
-#: ../libpurple/protocols/msnp9/session.c:374
 msgid "Authenticating"
 msgstr "Naam en wachtwoord worden gecontroleerd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1402
 msgid "Re-initializing Stream"
 msgstr "Herstarten van datastroom"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
-#: ../libpurple/protocols/jabber/jabber.c:1953
-#: ../libpurple/protocols/jabber/jabber.c:1996
-#: ../libpurple/protocols/jabber/jabber.c:2034
-#: ../libpurple/protocols/oscar/oscar.c:897
-#: ../libpurple/protocols/oscar/oscar.c:5807
 msgid "Not Authorized"
 msgstr "Geen toestemming"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
 msgid "Both"
 msgstr "Beide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "From (To pending)"
 msgstr "Van"
 
-#: ../libpurple/protocols/jabber/jabber.c:1547
 msgid "From"
 msgstr "Van"
 
-#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "To"
 msgstr "Aan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "None (To pending)"
 msgstr "Geen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Niet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1557
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1570
-#: ../libpurple/protocols/jabber/jabber.c:1645
-#: ../libpurple/protocols/jabber/jabber.c:1659
-#: ../libpurple/protocols/jabber/jabber.c:1673
-#: ../libpurple/protocols/jabber/jabber.c:1687
-#: ../libpurple/protocols/jabber/jabber.c:1701
-#: ../libpurple/protocols/jabber/usermood.c:181
-#: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1225
-#: ../libpurple/protocols/silc10/buddy.c:1572
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Stemming"
 
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/msn/msn.c:748
 msgid "Now Listening"
-msgstr "Aan het Luisteren"
+msgstr "Luistert nu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1646
-#: ../libpurple/protocols/jabber/jabber.c:1660
-#: ../libpurple/protocols/jabber/jabber.c:1674
-#: ../libpurple/protocols/jabber/jabber.c:1688
-#: ../libpurple/protocols/jabber/jabber.c:1702
 msgid "Mood Text"
-msgstr "Humeur Tekst"
+msgstr "Humeur-tekst"
 
-#: ../libpurple/protocols/jabber/jabber.c:1648
-#: ../libpurple/protocols/jabber/jabber.c:1662
-#: ../libpurple/protocols/jabber/jabber.c:1676
-#: ../libpurple/protocols/jabber/jabber.c:1690
-#: ../libpurple/protocols/jabber/jabber.c:1704
 msgid "Allow Buzz"
 msgstr "Trillen Toestaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Tune Artist"
 msgstr "Artiest"
 
-#: ../libpurple/protocols/jabber/jabber.c:1723
 msgid "Tune Title"
 msgstr "Titel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1724
 msgid "Tune Album"
 msgstr "Album"
 
-#: ../libpurple/protocols/jabber/jabber.c:1725
 msgid "Tune Genre"
 msgstr "Genre"
 
-#: ../libpurple/protocols/jabber/jabber.c:1726
 msgid "Tune Comment"
 msgstr "Opmerking"
 
-#: ../libpurple/protocols/jabber/jabber.c:1727
 msgid "Tune Track"
 msgstr "Track"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Tune Time"
 msgstr "Tijd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1729
 msgid "Tune Year"
 msgstr "Jaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
 msgid "Tune URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1746
 msgid "Password Changed"
 msgstr "Wachtwoord veranderd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1747
 msgid "Your password has been changed."
 msgstr "Wachtwoord is veranderd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1753
-#: ../libpurple/protocols/jabber/jabber.c:1754
 msgid "Error changing password"
 msgstr "Fout bij veranderen van wachtwoord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1811
 msgid "Password (again)"
 msgstr "Nieuw wachtwoord (herhalen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1817
-#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "Change XMPP Password"
 msgstr "Veranderen XMPP-wachtwoord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "Please enter your new password"
-msgstr "Vul je nieuwe wachtwoord in"
+msgstr "Vul uw nieuwe wachtwoord in"
 
-#: ../libpurple/protocols/jabber/jabber.c:1832
-#: ../libpurple/protocols/oscar/oscar.c:6591
-#: ../libpurple/protocols/silc/silc.c:1328
-#: ../libpurple/protocols/silc10/silc.c:1029
 msgid "Set User Info..."
 msgstr "Gebruikersinfo instellen..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1837
-#: ../libpurple/protocols/oscar/oscar.c:6602
-#: ../libpurple/protocols/silc/silc.c:1324
-#: ../libpurple/protocols/silc10/silc.c:1025
 msgid "Change Password..."
 msgstr "Wachtwoord veranderen..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1842
 msgid "Search for Users..."
 msgstr "Zoeken naar gebruikers..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Bad Request"
 msgstr "Slechte aanvraag"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Conflict"
 msgstr "Conflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Feature Not Implemented"
 msgstr "Feature niet geïmplementeerd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Forbidden"
 msgstr "Verboden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Gone"
 msgstr "Weg"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
-#: ../libpurple/protocols/jabber/jabber.c:2024
 msgid "Internal Server Error"
 msgstr "Interne serverfout"
 
-#: ../libpurple/protocols/jabber/jabber.c:1945
 msgid "Item Not Found"
 msgstr "Item niet gevonden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Malformed XMPP ID"
 msgstr "Ongeldig XMMP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Not Acceptable"
 msgstr "Onacceptabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Not Allowed"
 msgstr "Niet toegestaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "Payment Required"
 msgstr "Betaling vereist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "Recipient Unavailable"
 msgstr "Ontvanger niet beschikbaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Registration Required"
 msgstr "Registratie vereist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Remote Server Not Found"
 msgstr "Server niet gevonden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Remote Server Timeout"
 msgstr "Timeout op server"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "Server Overloaded"
 msgstr "Server te zwaar belast"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Service Unavailable"
 msgstr "Service niet beschikbaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1971
 msgid "Subscription Required"
 msgstr "Abonnement vereist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1973
 msgid "Unexpected Request"
 msgstr "Onverwachte aanvraag"
 
-#: ../libpurple/protocols/jabber/jabber.c:1981
 msgid "Authorization Aborted"
 msgstr "Aanmelding afgebroken"
 
-#: ../libpurple/protocols/jabber/jabber.c:1983
 msgid "Incorrect encoding in authorization"
 msgstr "Onjuiste codering bij aanmelding"
 
-#: ../libpurple/protocols/jabber/jabber.c:1985
 msgid "Invalid authzid"
 msgstr "Ongeldige authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1987
 msgid "Invalid Authorization Mechanism"
 msgstr "Ongeldig mechanisme"
 
-#: ../libpurple/protocols/jabber/jabber.c:1990
 msgid "Authorization mechanism too weak"
 msgstr "Mechanisme te onveilig"
 
-#: ../libpurple/protocols/jabber/jabber.c:1998
 msgid "Temporary Authentication Failure"
 msgstr "Tijdelijk identificatieprobleem"
 
-#: ../libpurple/protocols/jabber/jabber.c:2001
 msgid "Authentication Failure"
 msgstr "Identificatie mislukt"
 
-#: ../libpurple/protocols/jabber/jabber.c:2009
 msgid "Bad Format"
 msgstr "Slecht formaat"
 
-#: ../libpurple/protocols/jabber/jabber.c:2011
 msgid "Bad Namespace Prefix"
 msgstr "Slechte namespace"
 
-#: ../libpurple/protocols/jabber/jabber.c:2014
 msgid "Resource Conflict"
 msgstr "Bronconflict"
 
-#: ../libpurple/protocols/jabber/jabber.c:2016
-#: ../libpurple/protocols/silc/silc.c:351
-#: ../libpurple/protocols/silc10/ops.c:1725
 msgid "Connection Timeout"
 msgstr "Verbinding verlopen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2018
 msgid "Host Gone"
 msgstr "Host verdwenen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2020
 msgid "Host Unknown"
 msgstr "Host onbekend"
 
-#: ../libpurple/protocols/jabber/jabber.c:2022
 msgid "Improper Addressing"
 msgstr "Ongeldige adressering"
 
-#: ../libpurple/protocols/jabber/jabber.c:2026
 msgid "Invalid ID"
 msgstr "Ongeldig ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:2028
 msgid "Invalid Namespace"
 msgstr "Ongeldige omgeving"
 
-#: ../libpurple/protocols/jabber/jabber.c:2030
 msgid "Invalid XML"
 msgstr "Ongeldige XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2032
 msgid "Non-matching Hosts"
 msgstr "Niet overeenkomende computers"
 
-#: ../libpurple/protocols/jabber/jabber.c:2036
 msgid "Policy Violation"
 msgstr "Schending van beleid"
 
-#: ../libpurple/protocols/jabber/jabber.c:2038
 msgid "Remote Connection Failed"
 msgstr "Verbinding mislukt"
 
-#: ../libpurple/protocols/jabber/jabber.c:2040
 msgid "Resource Constraint"
 msgstr "Beperkte bronnen beschikbaar"
 
-#: ../libpurple/protocols/jabber/jabber.c:2042
 msgid "Restricted XML"
 msgstr "Strikte XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:2044
 msgid "See Other Host"
 msgstr "Zie Andere Host"
 
-#: ../libpurple/protocols/jabber/jabber.c:2046
 msgid "System Shutdown"
 msgstr "Systeem wordt uitgeschakeld"
 
-#: ../libpurple/protocols/jabber/jabber.c:2048
 msgid "Undefined Condition"
 msgstr "Ongedefnieerde voorwaarde"
 
-#: ../libpurple/protocols/jabber/jabber.c:2050
 msgid "Unsupported Encoding"
 msgstr "Codering niet ondersteund"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
 msgid "Unsupported Stanza Type"
 msgstr "Stanzatype niet ondersteund"
 
-#: ../libpurple/protocols/jabber/jabber.c:2054
 msgid "Unsupported Version"
 msgstr "Versie niet ondersteund"
 
-#: ../libpurple/protocols/jabber/jabber.c:2056
 msgid "XML Not Well Formed"
 msgstr "XML niet goed van structuur"
 
-#: ../libpurple/protocols/jabber/jabber.c:2058
 msgid "Stream Error"
 msgstr "Stream-fout"
 
-#: ../libpurple/protocols/jabber/jabber.c:2143
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kan gebruiker %s niet verbannen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2163
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Onbekende relatie: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2168
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kan relatie van %s niet instellen als \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2187
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Onbekende rol: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2192
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kan de rol \"%s\" niet aangeven voor gebruiker: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2245
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kan gebruiker %s niet schoppen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2276
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Kan gebruiker %s niet pingen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2294
-#: ../libpurple/protocols/jabber/jabber.c:2305
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
 msgstr "Trillen niet mogelijk, omdat er niets bekend is over gebruiker %s."
 
-#: ../libpurple/protocols/jabber/jabber.c:2300
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr "Trillen niet mogelijk, omdar gebruiker %s offline zou kunnen zijn."
 
-#: ../libpurple/protocols/jabber/jabber.c:2331
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Trillen niet mogelijk, omdat de gebruiker %s het niet ondersteund."
 
 #. Yahoo only supports one attention command: the 'buzz'.
 #. This is index number YAHOO_BUZZ.
-#: ../libpurple/protocols/jabber/jabber.c:2351
-#: ../libpurple/protocols/yahoo/yahoo.c:4174
 msgid "Buzz"
 msgstr "Trill"
 
-#: ../libpurple/protocols/jabber/jabber.c:2352
-#: ../libpurple/protocols/jabber/message.c:308
-#: ../libpurple/protocols/yahoo/yahoo.c:4175
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s heeft je laten trillen!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2352
-#: ../libpurple/protocols/yahoo/yahoo.c:4175
 #, c-format
 msgid "Buzzing %s..."
-msgstr "%s aan het laten trillen..."
+msgstr "%s trillen..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2383
 msgid "config:  Configure a chat room."
 msgstr "config:  Chatruimte instellen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2387
 msgid "configure:  Configure a chat room."
 msgstr "configure: Chatruimte instellen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2396
 msgid "part [room]:  Leave the room."
 msgstr "part [ruimte]:  Ruimte verlaten."
 
-#: ../libpurple/protocols/jabber/jabber.c:2401
 msgid "register:  Register with a chat room."
 msgstr "register:  Registreren bij een chatruimte."
 
-#: ../libpurple/protocols/jabber/jabber.c:2407
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nieuw onderwerp]:  Het onderwerp weergeven of veranderen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2413
 msgid "ban &lt;user&gt; [reason]:  Ban a user from the room."
-msgstr "ban &lt;gebruiker&gt; [reden]:  Een gebruiker uit een ruimte verbannen."
+msgstr ""
+"ban &lt;gebruiker&gt; [reden]:  Een gebruiker uit een ruimte verbannen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2419
-msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
-msgstr "affiliate &lt;naam&gt; &lt;owner|admin|member|outcast|none&gt;:Relatie tot een ruimte/kanaal instellen."
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+"affiliate &lt;naam&gt; &lt;owner|admin|member|outcast|none&gt;:Relatie tot "
+"een ruimte/kanaal instellen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2425
-msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
-msgstr "role &lt;naam&gt; &lt;moderator|participant|visitor|none&gt;:Rol van gebruiker in de ruimte instellen"
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+"role &lt;naam&gt; &lt;moderator|participant|visitor|none&gt;:Rol van "
+"gebruiker in de ruimte instellen"
 
-#: ../libpurple/protocols/jabber/jabber.c:2431
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;gebruiker&gt; [bericht]:  Een gebruiker uitnodigen in een ruimte."
+msgstr ""
+"invite &lt;gebruiker&gt; [bericht]:  Een gebruiker uitnodigen in een ruimte."
 
-#: ../libpurple/protocols/jabber/jabber.c:2437
 msgid "join: &lt;room&gt; [password]:  Join a chat on this server."
-msgstr "deelnemen: &lt;ruimte&gt; [wachtwoord]:  Deelnemen aan een chatruimte op deze server."
+msgstr ""
+"deelnemen: &lt;ruimte&gt; [wachtwoord]:  Deelnemen aan een chatruimte op "
+"deze server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2443
 msgid "kick &lt;user&gt; [reason]:  Kick a user from the room."
 msgstr "kick &lt;bijnaam&gt; [ruimte]:  Een gebruiker uit een ruimte schoppen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2448
-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 gebruiker."
+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 "
+"gebruiker."
 
-#: ../libpurple/protocols/jabber/jabber.c:2454
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPing een gebruiker/component/server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2459
-#: ../libpurple/protocols/yahoo/yahoo.c:4198
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Een contact buzzen om de aandacht te krijgen"
 
@@ -6666,659 +4552,487 @@ msgstr "buzz: Een contact buzzen om de aandacht te krijgen"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 msgid "XMPP Protocol Plugin"
-msgstr "XMPP-protocol plugin"
+msgstr "XMPP-protocol plug-in"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../pidgin/gtkaccount.c:532
 msgid "Domain"
 msgstr "Domein"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Require SSL/TLS"
 msgstr "SSL/TLS Vereist"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:218
 msgid "Force old (port 5223) SSL"
 msgstr "Oude SSL (poort 5223) forceren"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:223
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tekstaanmelding over ongecodeerde datastroom toestaan"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3492
-#: ../libpurple/protocols/simple/simple.c:2121
 msgid "Connect port"
 msgstr "Poort"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:232
-#: ../libpurple/protocols/myspace/myspace.c:3489
-#: ../libpurple/protocols/silc/silc.c:2177
-#: ../libpurple/protocols/silc10/silc.c:1900
-#: ../pidgin/gtkaccount.c:865
 msgid "Connect server"
 msgstr "Verbinden met server"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:237
 msgid "File transfer proxies"
 msgstr "Bestandsoverdracht poortnummer"
 
-#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s heeft het gesprek gesloten."
 
-#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Bericht van %s"
 
-#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s heeft het onderwerp veranderd naar: %s"
 
-#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "Het onderwerp voor is: %s"
 
-#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Bericht aan %s niet aangekomen: %s"
 
-#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "XMPP Bericht-fout"
 
-#: ../libpurple/protocols/jabber/message.c:414
 #, c-format
 msgid "(Code %s)"
 msgstr "(Code %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:219
 msgid "XML Parse error"
 msgstr "XML analysefout"
 
-#: ../libpurple/protocols/jabber/presence.c:453
 msgid "Unknown Error in presence"
 msgstr "Onbekende fout in aanwezigheid"
 
-#: ../libpurple/protocols/jabber/presence.c:534
-#: ../libpurple/protocols/jabber/presence.c:535
 msgid "Create New Room"
 msgstr "Nieuwe ruimte maken"
 
-#: ../libpurple/protocols/jabber/presence.c:536
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr "Je bent een nieuwe ruimte aan het maken. Wil je deze instellen, of de standaardinstellingen gebruiken?"
+msgid ""
+"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?"
 
-#: ../libpurple/protocols/jabber/presence.c:542
 msgid "_Configure Room"
 msgstr "Ruimte _instellen"
 
-#: ../libpurple/protocols/jabber/presence.c:543
 msgid "_Accept Defaults"
 msgstr "_Standaardinstellingen gebruiken"
 
-#: ../libpurple/protocols/jabber/presence.c:585
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fout bij meedoen aan chat: %s"
 
-#: ../libpurple/protocols/jabber/presence.c:588
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fout in chat: %s"
 
-#: ../libpurple/protocols/jabber/si.c:1009
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "Kan bestand niet verzenden naar %s. De gebruiker ondersteunt geen bestandsoverdracht"
+msgstr ""
+"Kan bestand niet verzenden naar %s. De gebruiker ondersteunt geen "
+"bestandsoverdracht"
 
-#: ../libpurple/protocols/jabber/si.c:1010
-#: ../libpurple/protocols/jabber/si.c:1011
-#: ../libpurple/protocols/jabber/si.c:1080
 msgid "File Send Failed"
 msgstr "Bestanden verzenden mislukt"
 
-#: ../libpurple/protocols/jabber/si.c:1073
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Kan bestand niet verzenden naar %s, ongeldige JID"
 
-#: ../libpurple/protocols/jabber/si.c:1075
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Kan bestand niet verzenden naar %s, gebruiker is niet online"
 
-#: ../libpurple/protocols/jabber/si.c:1077
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Kan bestand niet verzenden naar %s, niet aangemeld bij gebruikers-aanwezigheid."
+msgstr ""
+"Kan bestand niet verzenden naar %s, niet aangemeld bij gebruikers-"
+"aanwezigheid."
 
-#: ../libpurple/protocols/jabber/si.c:1092
 #, 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"
 
-#: ../libpurple/protocols/jabber/si.c:1108
 msgid "Select a Resource"
 msgstr "Kies een bron"
 
-#: ../libpurple/protocols/jabber/usermood.c:194
-#: ../libpurple/protocols/jabber/usermood.c:195
 msgid "Edit User Mood"
 msgstr "Humeur instellen"
 
-#: ../libpurple/protocols/jabber/usermood.c:196
 msgid "Please select your mood from the list."
 msgstr "Selecteer je humeur uit de lijst"
 
-#: ../libpurple/protocols/jabber/usermood.c:198
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Instellen"
 
-#: ../libpurple/protocols/jabber/usermood.c:206
 msgid "Set Mood..."
 msgstr "Humeur instellen..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Bijnaam instellen"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Voer een nieuwe bijnaam in."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
-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."
+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."
 
-#: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
 msgstr "Bijnaam instellen..."
 
-#: ../libpurple/protocols/jabber/xdata.c:379
 msgid "Actions"
 msgstr "Acties"
 
-#: ../libpurple/protocols/jabber/xdata.c:381
 msgid "Select an action"
 msgstr "Selecteer een actie"
 
-#: ../libpurple/protocols/msn/contact.c:790
 msgid "Unable to retrieve MSN Address Book"
 msgstr "Ophalen MSN Adressenlijst niet mogelijk"
 
-#: ../libpurple/protocols/msn/dialog.c:118
-#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Synchronisatieprobleem in contactenlijst van %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
-#: ../libpurple/protocols/msnp9/dialog.c:116
 #, c-format
-msgid "%s on the local list is inside the group \"%s\" but not on the server list. Do you want this buddy to be added?"
-msgstr "%s is op de lokale lijst in de groep \"%s\", maar niet op de serverlijst. Wil je deze toevoegen?"
+msgid ""
+"%s on the local list is inside the group \"%s\" but not on the server list. "
+"Do you want this buddy to be added?"
+msgstr ""
+"%s is op de lokale lijst in de groep \"%s\", maar niet op de serverlijst. "
+"Wilt u deze toevoegen?"
 
-#: ../libpurple/protocols/msn/dialog.c:132
-#: ../libpurple/protocols/msnp9/dialog.c:124
 #, c-format
-msgid "%s is on the local list but not on the server list. Do you want this buddy to be added?"
-msgstr "%s staat op de lokale lijst, maar niet op de server-lijst. Wil je deze toevoegen?"
+msgid ""
+"%s is on the local list but not on the server list. Do you want this buddy "
+"to be added?"
+msgstr ""
+"%s is op de lokale lijst, maar niet op de serverlijst. Wilt u deze toevoegen?"
 
-#: ../libpurple/protocols/msn/error.c:36
-#: ../libpurple/protocols/msnp9/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Kan het bericht niet analyseren"
 
-#: ../libpurple/protocols/msn/error.c:41
-#: ../libpurple/protocols/msnp9/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaxfout (waarschijnlijk een client-bug)"
 
-#: ../libpurple/protocols/msn/error.c:46
-#: ../libpurple/protocols/msnp9/error.c:46
+#, c-format
 msgid "Invalid email address"
 msgstr "Ongeldig e-mailadres"
 
-#: ../libpurple/protocols/msn/error.c:49
-#: ../libpurple/protocols/msnp9/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "Gebruiker bestaat niet"
 
-#: ../libpurple/protocols/msn/error.c:53
-#: ../libpurple/protocols/msnp9/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Geen geldige domeinnaam aanwezig"
 
-#: ../libpurple/protocols/msn/error.c:56
-#: ../libpurple/protocols/msnp9/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Al aangemeld"
 
-#: ../libpurple/protocols/msn/error.c:59
-#: ../libpurple/protocols/msnp9/error.c:59
+#, c-format
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam."
 
-#: ../libpurple/protocols/msn/error.c:62
-#: ../libpurple/protocols/msnp9/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Ongeldige bijnaam"
 
-#: ../libpurple/protocols/msn/error.c:65
-#: ../libpurple/protocols/msnp9/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Lijst is vol"
 
-#: ../libpurple/protocols/msn/error.c:68
-#: ../libpurple/protocols/msnp9/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Staat er al"
 
-#: ../libpurple/protocols/msn/error.c:72
-#: ../libpurple/protocols/msnp9/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Niet in de lijst"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/msnp9/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:759
+#, c-format
 msgid "User is offline"
 msgstr "Gebruiker is off-line"
 
-#: ../libpurple/protocols/msn/error.c:78
-#: ../libpurple/protocols/msnp9/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Reeds in die modus"
 
-#: ../libpurple/protocols/msn/error.c:82
-#: ../libpurple/protocols/msnp9/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Reeds in de tegenovergestelde lijst"
 
-#: ../libpurple/protocols/msn/error.c:86
-#: ../libpurple/protocols/msnp9/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Te veel groepen"
 
-#: ../libpurple/protocols/msn/error.c:89
-#: ../libpurple/protocols/msnp9/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Ongeldige groep"
 
-#: ../libpurple/protocols/msn/error.c:92
-#: ../libpurple/protocols/msnp9/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "Gebruiker niet in groep"
 
-#: ../libpurple/protocols/msn/error.c:95
-#: ../libpurple/protocols/msnp9/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Groepsnaam is te lang"
 
-#: ../libpurple/protocols/msn/error.c:98
-#: ../libpurple/protocols/msnp9/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kan groep nul niet verwijderen"
 
-#: ../libpurple/protocols/msn/error.c:103
-#: ../libpurple/protocols/msnp9/error.c:103
+#, c-format
 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"
 
-#: ../libpurple/protocols/msn/error.c:107
-#: ../libpurple/protocols/msnp9/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Schakelserver fout"
 
-#: ../libpurple/protocols/msn/error.c:111
-#: ../libpurple/protocols/msnp9/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "Melding overzetten mislukt"
 
-#: ../libpurple/protocols/msn/error.c:116
-#: ../libpurple/protocols/msnp9/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Niet alle verplichte velden zijn ingevuld"
 
-#: ../libpurple/protocols/msn/error.c:120
-#: ../libpurple/protocols/msnp9/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Te veel resultaten bij zoekopdracht"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/msnp9/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:123
+#, c-format
 msgid "Not logged in"
 msgstr "Niet aangemeld"
 
-#: ../libpurple/protocols/msn/error.c:128
-#: ../libpurple/protocols/msnp9/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
-msgstr "Dienst momenteel niet toegankelijk"
+msgstr "Service momenteel niet toegankelijk"
 
-#: ../libpurple/protocols/msn/error.c:131
-#: ../libpurple/protocols/msnp9/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Database-server fout"
 
-#: ../libpurple/protocols/msn/error.c:135
-#: ../libpurple/protocols/msnp9/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Opdracht uitgeschakeld"
 
-#: ../libpurple/protocols/msn/error.c:139
-#: ../libpurple/protocols/msnp9/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Bestandsfout"
 
-#: ../libpurple/protocols/msn/error.c:143
-#: ../libpurple/protocols/msnp9/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Geheugenfout"
 
-#: ../libpurple/protocols/msn/error.c:147
-#: ../libpurple/protocols/msnp9/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Verkeerde CHL-waarde naar server gestuurd"
 
-#: ../libpurple/protocols/msn/error.c:152
-#: ../libpurple/protocols/msnp9/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Server bezig"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
-#: ../libpurple/protocols/msnp9/error.c:155
-#: ../libpurple/protocols/msnp9/error.c:170
-#: ../libpurple/protocols/msnp9/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Server niet beschikbaar"
 
-#: ../libpurple/protocols/msn/error.c:158
-#: ../libpurple/protocols/msnp9/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "Meldingsserver is off-line"
 
-#: ../libpurple/protocols/msn/error.c:162
-#: ../libpurple/protocols/msnp9/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Database verbindingsprobleem"
 
-#: ../libpurple/protocols/msn/error.c:167
-#: ../libpurple/protocols/msnp9/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server wordt uitgeschakeld (verlaat het schip!)"
 
-#: ../libpurple/protocols/msn/error.c:174
-#: ../libpurple/protocols/msnp9/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Fout bij maken verbinding"
 
-#: ../libpurple/protocols/msn/error.c:179
-#: ../libpurple/protocols/msnp9/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parameters zijn onbekend of niet toegestaan"
 
-#: ../libpurple/protocols/msn/error.c:183
-#: ../libpurple/protocols/msnp9/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Kan niet schrijven"
 
-#: ../libpurple/protocols/msn/error.c:186
-#: ../libpurple/protocols/msnp9/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Sessie-overload"
 
-#: ../libpurple/protocols/msn/error.c:190
-#: ../libpurple/protocols/msnp9/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "Gebruiker is te actief"
 
-#: ../libpurple/protocols/msn/error.c:193
-#: ../libpurple/protocols/msnp9/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Te veel sessies"
 
-#: ../libpurple/protocols/msn/error.c:196
-#: ../libpurple/protocols/msnp9/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Passport niet geverifieerd"
 
-#: ../libpurple/protocols/msn/error.c:199
-#: ../libpurple/protocols/msnp9/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Onbegrijpelijk contactenbestand"
 
-#: ../libpurple/protocols/msn/error.c:203
-#: ../libpurple/protocols/msnp9/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Niet verwacht"
 
-#: ../libpurple/protocols/msn/error.c:209
-#: ../libpurple/protocols/msnp9/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Bijnaam verandert te snel"
 
-#: ../libpurple/protocols/msn/error.c:218
-#: ../libpurple/protocols/msnp9/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Server te druk bezig"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/msnp9/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1538
-#: ../libpurple/protocols/silc/silc.c:339
-#: ../libpurple/protocols/silc10/ops.c:1713
-#: ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1451
+#, c-format
 msgid "Authentication failed"
 msgstr "Identificatie mislukt"
 
-#: ../libpurple/protocols/msn/error.c:225
-#: ../libpurple/protocols/msnp9/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Niet toegestaan tijdens off-line-status"
 
-#: ../libpurple/protocols/msn/error.c:233
-#: ../libpurple/protocols/msnp9/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Nieuwe gebruikers worden niet geaccepteerd"
 
-#: ../libpurple/protocols/msn/error.c:237
-#: ../libpurple/protocols/msnp9/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kinderpaspoort zonder toezegging van ouder"
 
-#: ../libpurple/protocols/msn/error.c:241
-#: ../libpurple/protocols/msnp9/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-account nog niet geverifieerd"
 
-#: ../libpurple/protocols/msn/error.c:244
-#: ../libpurple/protocols/msnp9/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Slecht ticket"
 
-#: ../libpurple/protocols/msn/error.c:249
-#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Onbekende foutcode %d"
 
-#: ../libpurple/protocols/msn/error.c:263
-#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-fout: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:137
-#: ../libpurple/protocols/msnp9/msn.c:137
 msgid "Nudge"
 msgstr "Aanstoten"
 
-#: ../libpurple/protocols/msn/msn.c:138
-#: ../libpurple/protocols/msnp9/msn.c:138
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s heeft je aangestoten!"
 
-#: ../libpurple/protocols/msn/msn.c:138
-#: ../libpurple/protocols/msnp9/msn.c:138
 #, c-format
 msgid "Nudging %s..."
 msgstr "%s Aanstoten..."
 
-#: ../libpurple/protocols/msn/msn.c:151
-#: ../libpurple/protocols/msnp9/msn.c:151
-#: ../libpurple/protocols/myspace/myspace.c:2462
 msgid "Email Address..."
 msgstr "E-mailadres ..."
 
-#: ../libpurple/protocols/msn/msn.c:190
-#: ../libpurple/protocols/msnp9/msn.c:190
 msgid "Your new MSN friendly name is too long."
 msgstr "Uw nieuwe MSN-bijnaam is te lang."
 
-#: ../libpurple/protocols/msn/msn.c:316
-#: ../libpurple/protocols/msnp9/msn.c:298
 msgid "Set your friendly name."
 msgstr "Bijnaam instellen."
 
-#: ../libpurple/protocols/msn/msn.c:317
-#: ../libpurple/protocols/msnp9/msn.c:299
 msgid "This is the name that other MSN buddies will see you as."
-msgstr "Dit is de naam die je contacten zullen zien."
+msgstr "Dit is de naam die uw contacten zullen zien."
 
-#: ../libpurple/protocols/msn/msn.c:335
-#: ../libpurple/protocols/msnp9/msn.c:317
 msgid "Set your home phone number."
 msgstr "Telefoonnummer voor thuis instellen."
 
-#: ../libpurple/protocols/msn/msn.c:352
-#: ../libpurple/protocols/msnp9/msn.c:334
 msgid "Set your work phone number."
 msgstr "Telefoonnummer voor werk instellen."
 
-#: ../libpurple/protocols/msn/msn.c:369
-#: ../libpurple/protocols/msnp9/msn.c:351
 msgid "Set your mobile phone number."
 msgstr "Mobiel telefoonnummer instellen."
 
-#: ../libpurple/protocols/msn/msn.c:384
-#: ../libpurple/protocols/msnp9/msn.c:366
 msgid "Allow MSN Mobile pages?"
 msgstr "MSN-mobile oproepen toestaan?"
 
-#: ../libpurple/protocols/msn/msn.c:385
-#: ../libpurple/protocols/msnp9/msn.c:367
-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 "Wil je dat mensen in je contactenlijst je MSN-mobile oproepen kunnen sturen naar je mobiele telefoon of ander mobiel apparaat?"
+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?"
 
-#: ../libpurple/protocols/msn/msn.c:391
-#: ../libpurple/protocols/msnp9/msn.c:373
 msgid "Allow"
 msgstr "Toestaan"
 
-#: ../libpurple/protocols/msn/msn.c:392
-#: ../libpurple/protocols/msnp9/msn.c:374
 msgid "Disallow"
 msgstr "Weigeren"
 
-#: ../libpurple/protocols/msn/msn.c:407
 #, c-format
 msgid "Blocked Text for %s"
 msgstr "Geblokkeerde tekst %s"
 
-#: ../libpurple/protocols/msn/msn.c:409
 msgid "No text is blocked for this account."
 msgstr "Bij dit account is er geen tekst geblokkeerd"
 
-#: ../libpurple/protocols/msn/msn.c:412
 #, c-format
-msgid "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr "MSN-servers blokkeren momenteel de volgende reguliere expressies: <br/>%s"
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"MSN-servers blokkeren momenteel de volgende reguliere expressies: <br/>%s"
 
-#: ../libpurple/protocols/msn/msn.c:433
 msgid "This account does not have email enabled."
 msgstr "Dit hotmailaccount heeft geen ingeschakelde e-mail."
 
-#: ../libpurple/protocols/msn/msn.c:473
-#: ../libpurple/protocols/msnp9/msn.c:416
 msgid "Send a mobile message."
 msgstr "Een mobiel bericht versturen."
 
-#: ../libpurple/protocols/msn/msn.c:475
-#: ../libpurple/protocols/msnp9/msn.c:418
 msgid "Page"
 msgstr "Versturen (mobiel)"
 
-#: ../libpurple/protocols/msn/msn.c:771
-#: ../libpurple/protocols/msnp9/msn.c:586
 msgid "Home Phone Number"
 msgstr "Telefoonnummer thuis"
 
-#: ../libpurple/protocols/msn/msn.c:775
-#: ../libpurple/protocols/msnp9/msn.c:590
 msgid "Work Phone Number"
 msgstr "Telefoonnummer werk"
 
-#: ../libpurple/protocols/msn/msn.c:779
-#: ../libpurple/protocols/msnp9/msn.c:594
 msgid "Mobile Phone Number"
 msgstr "Telefoonnummer mobiel"
 
-#: ../libpurple/protocols/msn/msn.c:802
-#: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/msnp9/msn.c:613
-#: ../libpurple/protocols/msnp9/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3141
-#: ../libpurple/protocols/yahoo/yahoo.c:3834
 msgid "Be Right Back"
 msgstr "Ben zo terug"
 
-#: ../libpurple/protocols/msn/msn.c:808
-#: ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/msnp9/msn.c:617
-#: ../libpurple/protocols/msnp9/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2840
-#: ../libpurple/protocols/novell/novell.c:2970
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:57
-#: ../libpurple/protocols/silc10/buddy.c:1495
-#: ../libpurple/protocols/silc10/silc.c:48
-#: ../libpurple/protocols/yahoo/yahoo.c:3143
-#: ../libpurple/protocols/yahoo/yahoo.c:3837
 msgid "Busy"
 msgstr "Bezig"
 
-#: ../libpurple/protocols/msn/msn.c:813
-#: ../libpurple/protocols/msnp9/msn.c:621
-#: ../libpurple/protocols/yahoo/yahoo.c:3151
-#: ../libpurple/protocols/yahoo/yahoo.c:3849
 msgid "On the Phone"
 msgstr "Aan de telefoon"
 
-#: ../libpurple/protocols/msn/msn.c:818
-#: ../libpurple/protocols/msnp9/msn.c:625
-#: ../libpurple/protocols/yahoo/yahoo.c:3155
-#: ../libpurple/protocols/yahoo/yahoo.c:3855
 msgid "Out to Lunch"
-msgstr "Aan het lunchen"
+msgstr "Lunchen"
 
 #. primitive
 #. ID
@@ -7326,373 +5040,203 @@ msgstr "Aan het lunchen"
 #. savable
 #. should be user_settable some day
 #. independent
-#: ../libpurple/protocols/msn/msn.c:837
-#: ../libpurple/protocols/myspace/myspace.c:170
 msgid "Artist"
 msgstr "Artiest"
 
-#: ../libpurple/protocols/msn/msn.c:838
 msgid "Album"
 msgstr "Album"
 
-#: ../libpurple/protocols/msn/msn.c:852
-#: ../libpurple/protocols/msnp9/msn.c:653
 msgid "Set Friendly Name..."
 msgstr "Bijnaam instellen..."
 
-#: ../libpurple/protocols/msn/msn.c:857
-#: ../libpurple/protocols/msnp9/msn.c:658
 msgid "Set Home Phone Number..."
 msgstr "Telefoon thuis instellen..."
 
-#: ../libpurple/protocols/msn/msn.c:861
-#: ../libpurple/protocols/msnp9/msn.c:662
 msgid "Set Work Phone Number..."
 msgstr "Telefoon werk instellen..."
 
-#: ../libpurple/protocols/msn/msn.c:865
-#: ../libpurple/protocols/msnp9/msn.c:666
 msgid "Set Mobile Phone Number..."
 msgstr "Mobiel nummer instellen..."
 
-#: ../libpurple/protocols/msn/msn.c:871
-#: ../libpurple/protocols/msnp9/msn.c:672
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Mobiele apparaten inschakelen/uitschakelen..."
 
-#: ../libpurple/protocols/msn/msn.c:876
-#: ../libpurple/protocols/msnp9/msn.c:677
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Mobiele oproepen toestaan/weigeren..."
 
-#: ../libpurple/protocols/msn/msn.c:883
 msgid "View Blocked Text..."
 msgstr "Geblokkeerde tekst bekijken"
 
-#: ../libpurple/protocols/msn/msn.c:889
-#: ../libpurple/protocols/msnp9/msn.c:688
 msgid "Open Hotmail Inbox"
 msgstr "Hotmail-inbox openen"
 
-#: ../libpurple/protocols/msn/msn.c:912
-#: ../libpurple/protocols/msnp9/msn.c:712
 msgid "Send to Mobile"
 msgstr "Verzenden naar mobiel"
 
-#: ../libpurple/protocols/msn/msn.c:922
-#: ../libpurple/protocols/msnp9/msn.c:722
-#: ../libpurple/protocols/novell/novell.c:3426
 msgid "Initiate _Chat"
 msgstr "_Chat starten"
 
-#: ../libpurple/protocols/msn/msn.c:960
-#: ../libpurple/protocols/msnp9/msn.c:761
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "SSL-ondersteuning is vereist voor MSN. Installeer een SSL-bibliotheek."
 
-#: ../libpurple/protocols/msn/msn.c:991
-#: ../libpurple/protocols/msnp9/msn.c:792
 msgid "Failed to connect to server."
 msgstr "Kan geen verbinding maken met de server."
 
-#: ../libpurple/protocols/msn/msn.c:1899
-#: ../libpurple/protocols/msn/msn.c:2242
-#: ../libpurple/protocols/msnp9/msn.c:1655
-#: ../libpurple/protocols/msnp9/msn.c:1998
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:809
 msgid "Error retrieving profile"
 msgstr "Fout bij ophalen van profiel"
 
-#: ../libpurple/protocols/msn/msn.c:1965
-#: ../libpurple/protocols/msnp9/msn.c:1721
-#: ../pidgin/plugins/convcolors.c:371
-#: ../pidgin/plugins/pidginrc.c:372
 msgid "General"
 msgstr "Algemeen"
 
-#: ../libpurple/protocols/msn/msn.c:1972
-#: ../libpurple/protocols/msnp9/msn.c:1728
-#: ../libpurple/protocols/myspace/user.c:125
-#: ../libpurple/protocols/oscar/oscar.c:3944
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:262
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1084
 msgid "Age"
 msgstr "Leeftijd"
 
-#: ../libpurple/protocols/msn/msn.c:1974
-#: ../libpurple/protocols/msnp9/msn.c:1730
-#: ../libpurple/protocols/qq/buddy_info.c:52
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1099
 msgid "Occupation"
 msgstr "Beroep"
 
-#: ../libpurple/protocols/msn/msn.c:1975
-#: ../libpurple/protocols/msnp9/msn.c:1731
-#: ../libpurple/protocols/myspace/user.c:133
-#: ../libpurple/protocols/novell/novell.c:1487
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1079
-#: ../libpurple/protocols/zephyr/zephyr.c:801
-#: ../libpurple/protocols/zephyr/zephyr.c:1179
 msgid "Location"
 msgstr "Locatie"
 
-#: ../libpurple/protocols/msn/msn.c:1980
-#: ../libpurple/protocols/msn/msn.c:2172
-#: ../libpurple/protocols/msn/msn.c:2178
-#: ../libpurple/protocols/msn/msn.c:2185
-#: ../libpurple/protocols/msnp9/msn.c:1736
-#: ../libpurple/protocols/msnp9/msn.c:1928
-#: ../libpurple/protocols/msnp9/msn.c:1934
-#: ../libpurple/protocols/msnp9/msn.c:1941
 msgid "Hobbies and Interests"
 msgstr "Hobbies en interesses"
 
-#: ../libpurple/protocols/msn/msn.c:1986
-#: ../libpurple/protocols/msn/msn.c:2106
-#: ../libpurple/protocols/msn/msn.c:2112
-#: ../libpurple/protocols/msn/msn.c:2119
-#: ../libpurple/protocols/msn/msn.c:2127
-#: ../libpurple/protocols/msn/msn.c:2134
-#: ../libpurple/protocols/msnp9/msn.c:1742
-#: ../libpurple/protocols/msnp9/msn.c:1862
-#: ../libpurple/protocols/msnp9/msn.c:1868
-#: ../libpurple/protocols/msnp9/msn.c:1875
-#: ../libpurple/protocols/msnp9/msn.c:1883
-#: ../libpurple/protocols/msnp9/msn.c:1890
 msgid "A Little About Me"
 msgstr "Enige info over mij"
 
-#: ../libpurple/protocols/msn/msn.c:2003
-#: ../libpurple/protocols/msnp9/msn.c:1759
 msgid "Social"
 msgstr "Sociaal"
 
-#: ../libpurple/protocols/msn/msn.c:2005
-#: ../libpurple/protocols/msnp9/msn.c:1761
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
 msgid "Marital Status"
 msgstr "Burgerlijke status"
 
-#: ../libpurple/protocols/msn/msn.c:2006
-#: ../libpurple/protocols/msnp9/msn.c:1762
 msgid "Interests"
 msgstr "Interesses"
 
-#: ../libpurple/protocols/msn/msn.c:2007
-#: ../libpurple/protocols/msnp9/msn.c:1763
 msgid "Pets"
 msgstr "Huisdieren"
 
-#: ../libpurple/protocols/msn/msn.c:2008
-#: ../libpurple/protocols/msnp9/msn.c:1764
 msgid "Hometown"
 msgstr "Woonplaats"
 
-#: ../libpurple/protocols/msn/msn.c:2009
-#: ../libpurple/protocols/msnp9/msn.c:1765
 msgid "Places Lived"
 msgstr "Vroegere woonplaatsen"
 
-#: ../libpurple/protocols/msn/msn.c:2010
-#: ../libpurple/protocols/msnp9/msn.c:1766
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:2011
-#: ../libpurple/protocols/msnp9/msn.c:1767
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:2012
-#: ../libpurple/protocols/msnp9/msn.c:1768
 msgid "Music"
 msgstr "Muziek"
 
-#: ../libpurple/protocols/msn/msn.c:2013
-#: ../libpurple/protocols/msn/msn.c:2194
-#: ../libpurple/protocols/msn/msn.c:2200
-#: ../libpurple/protocols/msnp9/msn.c:1769
-#: ../libpurple/protocols/msnp9/msn.c:1950
-#: ../libpurple/protocols/msnp9/msn.c:1956
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1141
 msgid "Favorite Quote"
 msgstr "Favoriete citaat"
 
-#: ../libpurple/protocols/msn/msn.c:2030
-#: ../libpurple/protocols/msnp9/msn.c:1786
 msgid "Contact Info"
 msgstr "Accountinformatie"
 
-#: ../libpurple/protocols/msn/msn.c:2031
-#: ../libpurple/protocols/msnp9/msn.c:1787
 msgid "Personal"
 msgstr "Persoonlijk"
 
-#: ../libpurple/protocols/msn/msn.c:2034
-#: ../libpurple/protocols/msnp9/msn.c:1790
 msgid "Significant Other"
 msgstr "Partner"
 
-#: ../libpurple/protocols/msn/msn.c:2035
-#: ../libpurple/protocols/msnp9/msn.c:1791
 msgid "Home Phone"
 msgstr "Thuis telefoon"
 
-#: ../libpurple/protocols/msn/msn.c:2036
-#: ../libpurple/protocols/msnp9/msn.c:1792
 msgid "Home Phone 2"
 msgstr "Thuis telefoon 2"
 
-#: ../libpurple/protocols/msn/msn.c:2037
-#: ../libpurple/protocols/msnp9/msn.c:1793
-#: ../libpurple/protocols/oscar/oscar.c:3960
 msgid "Home Address"
 msgstr "Thuisadres"
 
-#: ../libpurple/protocols/msn/msn.c:2038
-#: ../libpurple/protocols/msnp9/msn.c:1794
 msgid "Personal Mobile"
 msgstr "Persoonlijke gsm"
 
-#: ../libpurple/protocols/msn/msn.c:2039
-#: ../libpurple/protocols/msnp9/msn.c:1795
 msgid "Home Fax"
 msgstr "Fax thuis"
 
-#: ../libpurple/protocols/msn/msn.c:2040
-#: ../libpurple/protocols/msnp9/msn.c:1796
 msgid "Personal Email"
 msgstr "Persoonlijke e-mail"
 
-#: ../libpurple/protocols/msn/msn.c:2041
-#: ../libpurple/protocols/msnp9/msn.c:1797
 msgid "Personal IM"
 msgstr "Persoonlijke chat"
 
-#: ../libpurple/protocols/msn/msn.c:2043
-#: ../libpurple/protocols/msnp9/msn.c:1799
 msgid "Anniversary"
 msgstr "Verjaardag"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:2059
-#: ../libpurple/protocols/msnp9/msn.c:1815
 msgid "Work"
 msgstr "Werk"
 
-#: ../libpurple/protocols/msn/msn.c:2061
-#: ../libpurple/protocols/msnp9/msn.c:1817
-#: ../libpurple/protocols/silc/ops.c:1024
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Functieomschrijving"
 
-#: ../libpurple/protocols/msn/msn.c:2062
-#: ../libpurple/protocols/msnp9/msn.c:1818
-#: ../libpurple/protocols/oscar/oscar.c:3978
 msgid "Company"
 msgstr "Bedrijf"
 
-#: ../libpurple/protocols/msn/msn.c:2063
-#: ../libpurple/protocols/msnp9/msn.c:1819
-#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Afdeling"
 
-#: ../libpurple/protocols/msn/msn.c:2064
-#: ../libpurple/protocols/msnp9/msn.c:1820
 msgid "Profession"
 msgstr "Baan"
 
-#: ../libpurple/protocols/msn/msn.c:2065
-#: ../libpurple/protocols/msnp9/msn.c:1821
 msgid "Work Phone"
 msgstr "Telefoon werk"
 
-#: ../libpurple/protocols/msn/msn.c:2066
-#: ../libpurple/protocols/msnp9/msn.c:1822
 msgid "Work Phone 2"
 msgstr "Telefoon werk 2"
 
-#: ../libpurple/protocols/msn/msn.c:2067
-#: ../libpurple/protocols/msnp9/msn.c:1823
-#: ../libpurple/protocols/oscar/oscar.c:3968
 msgid "Work Address"
 msgstr "Werkadres"
 
-#: ../libpurple/protocols/msn/msn.c:2068
-#: ../libpurple/protocols/msnp9/msn.c:1824
 msgid "Work Mobile"
 msgstr "Gsm werk"
 
-#: ../libpurple/protocols/msn/msn.c:2069
-#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Work Pager"
 msgstr "Semafoon werk"
 
-#: ../libpurple/protocols/msn/msn.c:2070
-#: ../libpurple/protocols/msnp9/msn.c:1826
 msgid "Work Fax"
 msgstr "Fax werk"
 
-#: ../libpurple/protocols/msn/msn.c:2071
-#: ../libpurple/protocols/msnp9/msn.c:1827
 msgid "Work Email"
 msgstr "E-mail werk"
 
-#: ../libpurple/protocols/msn/msn.c:2072
-#: ../libpurple/protocols/msnp9/msn.c:1828
 msgid "Work IM"
 msgstr "Chat werk"
 
-#: ../libpurple/protocols/msn/msn.c:2073
-#: ../libpurple/protocols/msnp9/msn.c:1829
 msgid "Start Date"
 msgstr "Begindatum"
 
-#: ../libpurple/protocols/msn/msn.c:2143
-#: ../libpurple/protocols/msn/msn.c:2149
-#: ../libpurple/protocols/msn/msn.c:2156
-#: ../libpurple/protocols/msn/msn.c:2163
-#: ../libpurple/protocols/msnp9/msn.c:1899
-#: ../libpurple/protocols/msnp9/msn.c:1905
-#: ../libpurple/protocols/msnp9/msn.c:1912
-#: ../libpurple/protocols/msnp9/msn.c:1919
 msgid "Favorite Things"
 msgstr "Mijn favoriete dingen"
 
-#: ../libpurple/protocols/msn/msn.c:2208
-#: ../libpurple/protocols/msnp9/msn.c:1964
 msgid "Last Updated"
 msgstr "Laatst bijgewerkt"
 
-#: ../libpurple/protocols/msn/msn.c:2219
-#: ../libpurple/protocols/msnp9/msn.c:1975
-#: ../libpurple/protocols/qq/buddy_info.c:61
-#: ../libpurple/protocols/silc/ops.c:1040
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Startpagina"
 
-#: ../libpurple/protocols/msn/msn.c:2243
-#: ../libpurple/protocols/msnp9/msn.c:1999
 msgid "The user has not created a public profile."
 msgstr "De gebruiker heeft geen openbaar profiel gemaakt."
 
-#: ../libpurple/protocols/msn/msn.c:2244
-#: ../libpurple/protocols/msnp9/msn.c:2000
-msgid "MSN reported not being able to find the user's profile. This either means that the user does not exist, or that the user exists but has not created a public profile."
-msgstr "MSN meldt dat het de profielgegevens van de gebruiker niet kan vinden. Dit betekent dat de gebruiker niet bestaat of dat deze geen openbaar profiel heeft aangemaakt."
+msgid ""
+"MSN reported not being able to find the user's profile. This either means "
+"that the user does not exist, or that the user exists but has not created a "
+"public profile."
+msgstr ""
+"MSN meldt dat het de profielgegevens van de gebruiker niet kan vinden. Dit "
+"betekent dat de gebruiker niet bestaat of dat deze geen openbaar profiel "
+"heeft aangemaakt."
 
-#: ../libpurple/protocols/msn/msn.c:2248
-#: ../libpurple/protocols/msnp9/msn.c:2004
-msgid "Could not find any information in the user's profile. The user most likely does not exist."
-msgstr "Kan geen informatie vinden in het gebruikersprofiel. De gebruiker bestaat waarschijnlijk niet."
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+"Kan geen informatie vinden in het gebruikersprofiel. De gebruiker bestaat "
+"waarschijnlijk niet."
 
-#: ../libpurple/protocols/msn/msn.c:2256
-#: ../libpurple/protocols/msnp9/msn.c:2012
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1243
 msgid "Profile URL"
 msgstr "Profiel-URL"
 
@@ -7706,182 +5250,133 @@ msgstr "Profiel-URL"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2543
-#: ../libpurple/protocols/msn/msn.c:2545
 msgid "Windows Live Messenger Protocol Plugin"
-msgstr "Windows Live Messenger protocol-plugin"
+msgstr "Windows Live Messenger protocol-plug-in"
 
-#: ../libpurple/protocols/msn/msn.c:2580
-#: ../libpurple/protocols/msnp9/msn.c:2335
 msgid "Use HTTP Method"
 msgstr "HTTP-methode gebruiken"
 
-#: ../libpurple/protocols/msn/msn.c:2585
-#: ../libpurple/protocols/msnp9/msn.c:2340
 msgid "HTTP Method Server"
 msgstr "HTTP-methode server"
 
-#: ../libpurple/protocols/msn/msn.c:2590
-#: ../libpurple/protocols/msnp9/msn.c:2345
 msgid "Show custom smileys"
 msgstr "Eigen smiley's weergeven"
 
-#: ../libpurple/protocols/msn/msn.c:2598
-#: ../libpurple/protocols/msnp9/msn.c:2353
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Een contact een duwtje geven om de aandacht te krijgen"
 
-#: ../libpurple/protocols/msn/nexus.c:359
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID authentication: Aanmelden niet mogelijk"
 
-#: ../libpurple/protocols/msn/nexus.c:366
 msgid "Windows Live ID authentication:Invalid response"
 msgstr "Windows Live ID autenticatie: ongeldig antwoord."
 
-#: ../libpurple/protocols/msn/notification.c:176
-#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s is geen geldige groep."
 
-#: ../libpurple/protocols/msn/notification.c:182
-#: ../libpurple/protocols/msn/notification.c:861
-#: ../libpurple/protocols/msn/session.c:394
-#: ../libpurple/protocols/msnp9/notification.c:184
-#: ../libpurple/protocols/msnp9/notification.c:534
-#: ../libpurple/protocols/msnp9/session.c:353
 msgid "Unknown error."
 msgstr "Onbekende fout."
 
-#: ../libpurple/protocols/msn/notification.c:185
-#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s op %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:475
 #, c-format
 msgid "%s just sent you a Nudge!"
-msgstr "%s heeft je zojuist een duwtje gegeven!"
+msgstr "%s heeft u zojuist een duwtje gegeven!"
 
-#: ../libpurple/protocols/msn/notification.c:768
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Onbekende fout (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:769
-#: ../libpurple/protocols/sametime/sametime.c:4481
 msgid "Unable to add user"
 msgstr "Kan gebruiker niet toevoegen"
 
-#: ../libpurple/protocols/msn/notification.c:827
-#: ../libpurple/protocols/msnp9/notification.c:500
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Kan gebruiker niet toevoegen op %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:831
-#: ../libpurple/protocols/msnp9/notification.c:504
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Kan gebruiker niet blokkeren op %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:835
-#: ../libpurple/protocols/msnp9/notification.c:508
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Kan gebruiker geen toestemming geven op %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:843
-#: ../libpurple/protocols/msnp9/notification.c:516
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr "Kan %s niet toevoegen omdat je contactenlijst vol is."
+msgstr "Kan %s niet toevoegen omdat uw contactenlijst vol is."
 
-#: ../libpurple/protocols/msn/notification.c:852
-#: ../libpurple/protocols/msnp9/notification.c:525
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s is geen geldig passport-account."
 
-#: ../libpurple/protocols/msn/notification.c:857
-#: ../libpurple/protocols/msnp9/notification.c:530
 msgid "Service Temporarily Unavailable."
 msgstr "Service momenteel niet beschikbaar."
 
-#: ../libpurple/protocols/msn/notification.c:1067
 msgid "Mobile message was not sent because it was too long."
 msgstr "Mobiel bericht is niet verstuurd omdat het te lang is."
 
-#: ../libpurple/protocols/msn/notification.c:1246
-#: ../libpurple/protocols/msnp9/notification.c:899
 msgid "Unable to rename group"
 msgstr "Kan groep niet hernoemen"
 
-#: ../libpurple/protocols/msn/notification.c:1273
-#: ../libpurple/protocols/msnp9/notification.c:954
 msgid "Unable to delete group"
 msgstr "Kan groep niet verwijderen"
 
-#: ../libpurple/protocols/msn/notification.c:1799
-#: ../libpurple/protocols/msnp9/notification.c:1373
 #, c-format
 msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
-"De MSN-server zal voor onderhoud uitgeschakeld worden over %d minuut. Je zult automatisch worden afgemeld op dat moment. Rond a.u.b. al je gesprekken af.\n"
+"De MSN-server zal voor onderhoud uitgeschakeld worden over %d minuut. U zult "
+"automatisch afgemeld worden op dat moment. Rond a.u.b. al uw gesprekken af.\n"
 "\n"
-"Je zult je weer kunnen aanmelden als het onderhoud gepleegd is."
+"U zult zich weer kunnen aanmelden als het onderhoud gepleegd is."
 msgstr[1] ""
-"De MSN-server zal voor onderhoud uitgeschakeld worden over %d minuten. Je zult automatisch afgemeld worden op dat moment. Rond a.u.b. al je gesprekken af.\n"
+"De MSN-server zal voor onderhoud uitgeschakeld worden over %d minuten. U "
+"zult automatisch afgemeld worden op dat moment. Rond a.u.b. al uw gesprekken "
+"af.\n"
 "\n"
 "U zult zich weer kunnen aanmelden als het onderhoud gepleegd is."
 
-#: ../libpurple/protocols/msn/oim.c:375
-msgid "Message was not sent because the system is unavailable. This normally happens when the user is blocked or does not exist."
-msgstr "Bericht is niet verzonden omdat het systeem niet beschikbaar is. Dit gebeurt normaal als de gebruiker geblokkeerd is of niet bestaat."
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Bericht is niet verzonden omdat het systeem niet beschikbaar is. Dit gebeurt "
+"normaal als de gebruiker geblokkeerd is of niet bestaat."
 
-#: ../libpurple/protocols/msn/oim.c:380
 msgid "Message was not sent because messages are being sent too quickly."
 msgstr "Kan bericht niet versturen omdat berichten te snel worden verzonden."
 
-#: ../libpurple/protocols/msn/oim.c:384
 msgid "Message was not sent because an unknown encoding error occurred."
 msgstr "Bericht is niet verstuurd wegens een onbekende coderingsfout:"
 
-#: ../libpurple/protocols/msn/oim.c:388
 msgid "Message was not sent because an unknown error occurred."
 msgstr "Bericht is niet verstuurd wegens een onbekende fout:"
 
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/msnp9/nexus.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:133
-#: ../libpurple/protocols/qq/qq_network.c:680
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1565
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Unable to connect"
 msgstr "Kan geen verbinding maken"
 
-#: ../libpurple/protocols/msn/servconn.c:137
-#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Schrijffout"
 
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Leesfout"
 
-#: ../libpurple/protocols/msn/servconn.c:146
-#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7890,162 +5385,115 @@ msgstr ""
 "Verbindingsfout van %s-server: \n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:356
-#: ../libpurple/protocols/msnp9/session.c:315
 msgid "Our protocol is not supported by the server."
 msgstr "Ons protocol wordt niet ondersteund door de server."
 
-#: ../libpurple/protocols/msn/session.c:361
-#: ../libpurple/protocols/msnp9/session.c:320
 msgid "Error parsing HTTP."
 msgstr "Fout bij analyseren HTTP."
 
-#: ../libpurple/protocols/msn/session.c:365
-#: ../libpurple/protocols/msnp9/session.c:324
-#: ../libpurple/protocols/oscar/flap_connection.c:433
-#: ../libpurple/protocols/yahoo/yahoo.c:155
 msgid "You have signed on from another location."
 msgstr "Je hebt jezelf aangemeld vanaf een andere locatie."
 
-#: ../libpurple/protocols/msn/session.c:371
-#: ../libpurple/protocols/msnp9/session.c:330
 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."
+msgstr ""
+"De MSN-servers zijn op dit moment niet beschikbaar. Probeer het later nog "
+"eens."
 
-#: ../libpurple/protocols/msn/session.c:377
-#: ../libpurple/protocols/msnp9/session.c:336
 msgid "The MSN servers are going down temporarily."
 msgstr "De MSN-servers worden tijdelijk uitgeschakeld."
 
-#: ../libpurple/protocols/msn/session.c:382
-#: ../libpurple/protocols/msnp9/session.c:341
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kan niet authentificeren: %s"
 
-#: ../libpurple/protocols/msn/session.c:388
-#: ../libpurple/protocols/msnp9/session.c:347
-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."
+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."
 
-#: ../libpurple/protocols/msn/session.c:410
-#: ../libpurple/protocols/msn/session.c:412
-#: ../libpurple/protocols/msnp9/session.c:369
-#: ../libpurple/protocols/msnp9/session.c:371
 msgid "Handshaking"
 msgstr "Verbinding opzetten"
 
-#: ../libpurple/protocols/msn/session.c:411
-#: ../libpurple/protocols/msnp9/session.c:370
 msgid "Transferring"
 msgstr "Bezig met transport"
 
-#: ../libpurple/protocols/msn/session.c:413
-#: ../libpurple/protocols/msnp9/session.c:372
 msgid "Starting authentication"
 msgstr "Starten van authentificatie"
 
-#: ../libpurple/protocols/msn/session.c:414
-#: ../libpurple/protocols/msnp9/session.c:373
 msgid "Getting cookie"
 msgstr "Cookie opvragen"
 
-#: ../libpurple/protocols/msn/session.c:416
-#: ../libpurple/protocols/msnp9/session.c:375
 msgid "Sending cookie"
 msgstr "Verzenden van cookie"
 
-#: ../libpurple/protocols/msn/session.c:417
-#: ../libpurple/protocols/msnp9/session.c:376
 msgid "Retrieving buddy list"
 msgstr "Opvragen van contactenlijst"
 
-#: ../libpurple/protocols/msn/state.c:34
-#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Weg van de computer"
 
-#: ../libpurple/protocols/msn/state.c:35
-#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Aan de telefoon"
 
-#: ../libpurple/protocols/msn/state.c:36
-#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
-msgstr "Aan het lunchen"
+msgstr "Lunchen"
 
-#: ../libpurple/protocols/msn/switchboard.c:406
-#: ../libpurple/protocols/msnp9/switchboard.c:411
 msgid "Message may have not been sent because a timeout occurred:"
-msgstr "Bericht is misschien niet verstuurd omdat er een time out is opgetreden:"
+msgstr ""
+"Bericht is misschien niet verstuurd omdat er een time out is opgetreden:"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
-#: ../libpurple/protocols/msnp9/switchboard.c:419
 msgid "Message could not be sent, not allowed while invisible:"
-msgstr "Je kan geen bericht versturen wanneer je onzichtbaar bent:"
+msgstr ""
+"Kan bericht niet versturen. Niet toegestaan wanneer u onzichtbaar bent:"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
-#: ../libpurple/protocols/msnp9/switchboard.c:423
 msgid "Message could not be sent because the user is offline:"
-msgstr "Kan bericht niet versturen omdat de ander offline is:"
+msgstr "Kan bericht niet versturen omdat de ander off-line is:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-#: ../libpurple/protocols/msnp9/switchboard.c:427
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Kan bericht niet versturen omdat er een verbindingsfout is opgetreden:"
 
-#: ../libpurple/protocols/msn/switchboard.c:426
-#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Kan bericht niet versturen omdat we dit te snel doen:"
 
-#: ../libpurple/protocols/msn/switchboard.c:430
-#: ../libpurple/protocols/msnp9/switchboard.c:435
-msgid "Message could not be sent because we were unable to establish a session with the server. This is likely a server problem, try again in a few minutes:"
-msgstr "Het bericht kon niet verzonden worden omdat we niet een sessie konden opzetten met de server. Dit ligtt waarschijnlijk aan de server, probeer het opnieuw over een paar minuten:"
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"Het bericht kon niet verzonden worden omdat we niet een sessie konden "
+"opzetten met de server. Dit ligtt waarschijnlijk aan de server, probeer het "
+"opnieuw over een paar minuten:"
 
-#: ../libpurple/protocols/msn/switchboard.c:437
-#: ../libpurple/protocols/msnp9/switchboard.c:442
-msgid "Message could not be sent because an error with the switchboard occurred:"
-msgstr "Kan bericht niet versturen omdat er een fout op het switchboard is opgetreden:"
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+"Kan bericht niet versturen omdat er een fout op het switchboard is "
+"opgetreden:"
 
-#: ../libpurple/protocols/msn/switchboard.c:445
-#: ../libpurple/protocols/msnp9/switchboard.c:450
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr "Bericht is misschien niet verstuurd wegens een onbekende fout:"
 
-#: ../libpurple/protocols/msn/userlist.c:215
-#: ../libpurple/protocols/msnp9/userlist.c:262
 #, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "%s heeft je aan zijn/haar contactenlijst toegevoegd."
+msgstr "%s heeft u aan zijn/haar contactenlijst toegevoegd."
 
-#: ../libpurple/protocols/msn/userlist.c:284
-#: ../libpurple/protocols/msnp9/userlist.c:331
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "%s heeft je van zijn/haar contactenlijst verwijderd."
+msgstr "%s heeft u van zijn/haar contactenlijst verwijderd."
 
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:676
-#: ../libpurple/protocols/msnp9/userlist.c:653
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kan \"%s\" niet toevoegen."
 
-#: ../libpurple/protocols/msn/userlist.c:679
-#: ../libpurple/protocols/msnp9/userlist.c:655
 msgid "The username specified is invalid."
 msgstr "Ingevoerde gebruikersnaam is ongeldig."
 
-#: ../libpurple/protocols/msnp9/msn.c:390
 msgid "This Hotmail account may not be active."
 msgstr "Dit Hotmail-account is misschien niet in gebruik."
 
-#: ../libpurple/protocols/msnp9/msn.c:565
 msgid "Has you"
 msgstr "Heeft je"
 
@@ -8059,281 +5507,233 @@ msgstr "Heeft je"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msnp9/msn.c:2299
-#: ../libpurple/protocols/msnp9/msn.c:2301
 msgid "MSN Protocol Plugin"
-msgstr "MSN-protocol-plugin"
+msgstr "MSN-protocol-plug-in"
 
-#: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Missende coderingsinformatie"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "De RC4 codering niet gevonden"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
-msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
-msgstr "Upgrade naar libpurple met RC4-ondersteuninh (>=2.0.1). MySpaceIM plugin zal niet geladen worden."
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Upgrade naar libpurple met RC4-ondersteuninh (>=2.0.1). MySpaceIM plug-in "
+"zal niet geladen worden."
 
-#: ../libpurple/protocols/myspace/myspace.c:345
 #, fuzzy
 msgid "Reading challenge"
 msgstr "Data wordt gelezen"
 
-#: ../libpurple/protocols/myspace/myspace.c:355
 #, fuzzy
 msgid "Unexpected challenge length from server"
 msgstr "Ongeldige vraag van server"
 
-#: ../libpurple/protocols/myspace/myspace.c:359
 msgid "Logging in"
 msgstr "Aanmelden"
 
-#: ../libpurple/protocols/myspace/myspace.c:1331
 #, c-format
 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)"
+msgstr[0] ""
+"Verbinding met server verloren (geen data ontvangen binnen %d seconde)"
+msgstr[1] ""
+"Verbinding met server verloren (geen data ontvangen binnen %d seconden)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1377
 msgid "New mail messages"
 msgstr "Nieuwe e-mailberichten"
 
-#: ../libpurple/protocols/myspace/myspace.c:1378
 msgid "New blog comments"
 msgstr "Nieuw blog commentaar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1379
 msgid "New profile comments"
 msgstr "Nieuw profiel commentaar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1380
 msgid "New friend requests!"
 msgstr "Nieuwe aanvragen van vrienden!"
 
-#: ../libpurple/protocols/myspace/myspace.c:1381
 msgid "New picture comments"
 msgstr "Nieuw commentaar op afbeelding"
 
-#: ../libpurple/protocols/myspace/myspace.c:1411
 msgid "MySpace"
 msgstr "MySpace"
 
-#: ../libpurple/protocols/myspace/myspace.c:1597
 msgid "MySpaceIM - No Username Set"
 msgstr "MySpaceIM - geen naam ingesteld"
 
-#: ../libpurple/protocols/myspace/myspace.c:1598
 msgid "You appear to have no MySpace username."
 msgstr "Je lijkt geen MySpace gebruikersnaam te hebben."
 
-#: ../libpurple/protocols/myspace/myspace.c:1599
 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!)"
+msgstr ""
+"Wil je er nu een instellen? (Opmerking: DIT KAN NIET VERANDERD WORDEN!)"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1623
-#: ../libpurple/protocols/sametime/sametime.c:1548
 msgid "Connected"
 msgstr "Verbonden"
 
-#: ../libpurple/protocols/myspace/myspace.c:1858
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protocol fout, code %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1880
 #, c-format
-msgid "%s Your password is %d characters, greater than the expected maximum length of %d for MySpaceIM. 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."
+msgid ""
+"%s Your password is %d characters, greater than the expected maximum length "
+"of %d for MySpaceIM. 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."
 
-#: ../libpurple/protocols/myspace/myspace.c:1903
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fout"
 
-#: ../libpurple/protocols/myspace/myspace.c:2081
-#: ../libpurple/protocols/myspace/myspace.c:2115
 msgid "Failed to add buddy"
 msgstr "Contact toevoegen mislukt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2081
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy' opdracht mislukt."
 
-#: ../libpurple/protocols/myspace/myspace.c:2115
-#: ../libpurple/protocols/myspace/myspace.c:2360
 #, fuzzy
 msgid "persist command failed"
 msgstr "Schakelserver fout"
 
-#: ../libpurple/protocols/myspace/myspace.c:2220
 #, c-format
 msgid "No such user: %s"
 msgstr "Onbekende gerbuiker: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2222
 msgid "User lookup"
 msgstr "Gebruiker opzoeken"
 
-#: ../libpurple/protocols/myspace/myspace.c:2341
-#: ../libpurple/protocols/myspace/myspace.c:2360
-#: ../libpurple/protocols/myspace/myspace.c:2382
 msgid "Failed to remove buddy"
 msgstr "Verwijderen buddy mislukt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2341
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy' opdracht mislukt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2382
 msgid "blocklist command failed"
 msgstr "blokkeerlijst-opdracht mislukt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2508
 msgid "Invalid input condition"
 msgstr "Ongeldige invoer voorwaarde"
 
-#: ../libpurple/protocols/myspace/myspace.c:2563
 msgid "Read buffer full (2)"
 msgstr "Wachtrij vol (2)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2606
 msgid "Unparseable message"
 msgstr "Kan het bericht niet analyseren"
 
-#: ../libpurple/protocols/myspace/myspace.c:2677
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Kan geen verbinding maken met host: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2844
 msgid "IM Friends"
 msgstr "Chat-vrienden"
 
-#: ../libpurple/protocols/myspace/myspace.c:2952
 #, c-format
-msgid "%d buddy was added or updated from the server (including buddies already on the server-side list)"
-msgid_plural "%d buddies were added or updated from the server (including buddies already on the server-side list)"
-msgstr[0] "%d contacten zijn toegevoeged of geüpdate van de server (inclusief buddies die al op de server stinden)"
-msgstr[1] "%d contacten zijn toegevoeged of geüpdate van de server (inclusief buddies die al op de server stinden)"
+msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr[0] ""
+"%d contacten zijn toegevoeged of geüpdate van de server (inclusief buddies "
+"die al op de server stinden)"
+msgstr[1] ""
+"%d contacten zijn toegevoeged of geüpdate van de server (inclusief buddies "
+"die al op de server stinden)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2956
 msgid "Add contacts from server"
 msgstr "Contacten toevoegen van de server"
 
-#: ../libpurple/protocols/myspace/myspace.c:3008
-#: ../libpurple/protocols/myspace/myspace.c:3072
 msgid "Add friends from MySpace.com"
 msgstr "Vrienden toevoegen van MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:3009
 msgid "Importing friends failed"
 msgstr "Importeren van vrienden mislukt"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:3065
 msgid "Find people..."
 msgstr "Mensen zoeken..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3068
 msgid "Change IM name..."
 msgstr "Chatnaam veranderen..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3371
 msgid "myim URL handler"
 msgstr "myim URL afhandelaar"
 
-#: ../libpurple/protocols/myspace/myspace.c:3372
 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 openen."
+msgstr ""
+"Geen bijpassend MySpaceIM-account kon gevonden worden om deze myim URL te "
+"openen."
 
-#: ../libpurple/protocols/myspace/myspace.c:3373
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Schakel de goede MySpaceIM-account in en probeer het opnieuw."
 
-#: ../libpurple/protocols/myspace/myspace.c:3496
 msgid "Show display name in status text"
 msgstr "Laat display-naam zien in status-tekst."
 
-#: ../libpurple/protocols/myspace/myspace.c:3499
 msgid "Show headline in status text"
 msgstr "Kop in status-tekst weergeven"
 
-#: ../libpurple/protocols/myspace/myspace.c:3504
 msgid "Send emoticons"
 msgstr "Verzend emoticons"
 
-#: ../libpurple/protocols/myspace/myspace.c:3509
 msgid "Screen resolution (dots per inch)"
 msgstr "Schermresolutie (dots per inch)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3512
 msgid "Base font size (points)"
 msgstr "Basis lettertype-grootte (in punten)"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/zephyr/zephyr.c:789
-#: ../libpurple/protocols/zephyr/zephyr.c:1168
 msgid "User"
 msgstr "Gebruiker"
 
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3174
 msgid "Profile"
 msgstr "Profiel"
 
-#: ../libpurple/protocols/myspace/user.c:138
 msgid "Headline"
 msgstr "Kop"
 
-#: ../libpurple/protocols/myspace/user.c:153
 msgid "Song"
 msgstr "Liedje"
 
-#: ../libpurple/protocols/myspace/user.c:162
 msgid "Total Friends"
 msgstr "Totaal aantal vrienden"
 
-#: ../libpurple/protocols/myspace/user.c:180
 msgid "Client Version"
 msgstr "Client-versie"
 
 #. Protocol won't log in now without a username set.. Disconnect
-#: ../libpurple/protocols/myspace/user.c:570
 msgid "No username set"
 msgstr "Geen naam ingesteld"
 
-#: ../libpurple/protocols/myspace/user.c:577
-#: ../libpurple/protocols/myspace/user.c:671
 msgid "MySpaceIM - Please Set a Username"
 msgstr "MySpaceIM - Stel een Gebruikersnaam In"
 
-#: ../libpurple/protocols/myspace/user.c:578
 msgid "Please enter a username to check its availability:"
 msgstr "Geef een gebruikersnaam om de beschikbaarheid te controleren"
 
-#: ../libpurple/protocols/myspace/user.c:658
 msgid "MySpaceIM - Username Available"
 msgstr "MySpaceIM - Gebruikersnaam Beschikbaar"
 
-#: ../libpurple/protocols/myspace/user.c:659
 msgid "This username is available. Would you like to set it?"
 msgstr "Deze gebruikersnaam is beschikbaar. Wil je het gebruiken?"
 
-#: ../libpurple/protocols/myspace/user.c:660
 msgid "ONCE SET, THIS CANNOT BE CHANGED!"
 msgstr "EENMAAL INGESTELD KAN HET NIET VERANDERD WORDEN!"
 
-#: ../libpurple/protocols/myspace/user.c:672
 msgid "This username is unavailable."
 msgstr "Deze gebruikersnaam is onbeschikbaar."
 
-#: ../libpurple/protocols/myspace/user.c:673
 msgid "Please try another username:"
 msgstr "Probeer een andere gebruikersnaam:"
 
@@ -8343,32 +5743,25 @@ msgstr "Probeer een andere gebruikersnaam:"
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:48
-#: ../libpurple/protocols/myspace/zap.c:221
 msgid "Zap"
 msgstr "Schrikken"
 
-#: ../libpurple/protocols/myspace/zap.c:48
 #, c-format
 msgid "%s has zapped you!"
 msgstr "%s heeft je laten schrikken!"
 
-#: ../libpurple/protocols/myspace/zap.c:49
 #, c-format
 msgid "Zapping %s..."
 msgstr "%s laten schrikken..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:52
 msgid "Whack"
 msgstr "Afranselen"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "%s has whacked you!"
 msgstr "%s heeft je afgeranseld!"
 
-#: ../libpurple/protocols/myspace/zap.c:53
 #, c-format
 msgid "Whacking %s..."
 msgstr "%s afranselen..."
@@ -8376,114 +5769,93 @@ msgstr "%s afranselen..."
 #. 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.
-#: ../libpurple/protocols/myspace/zap.c:58
 msgid "Torch"
 msgstr "Huis laten fikken"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr "%s heeft je huis in de fik gezet!"
 
 # msgstr "De gebruiker heeft u befakkeld"
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "Het huis van %s in de fik zetten..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
 msgstr "Zoenen"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "%s has smooched you!"
 msgstr "%s heeft je gezoend!"
 
-#: ../libpurple/protocols/myspace/zap.c:63
 #, c-format
 msgid "Smooching %s..."
 msgstr "%s zoenen..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:66
 msgid "Hug"
 msgstr "Knuffel"
 
-#: ../libpurple/protocols/myspace/zap.c:66
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s heeft je omarmd!"
 
-#: ../libpurple/protocols/myspace/zap.c:67
 #, c-format
 msgid "Hugging %s..."
 msgstr "%s Knuffelen..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:70
 msgid "Slap"
 msgstr "Meppen"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "%s has slapped you!"
 msgstr "%s heeft je gemept!"
 
-#: ../libpurple/protocols/myspace/zap.c:71
 #, c-format
 msgid "Slapping %s..."
-msgstr "%s aan het meppen..."
+msgstr "%s meppen..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:74
 msgid "Goose"
 msgstr "Bilknijpen"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "%s has goosed you!"
 msgstr "%s heeft in je billen geknepen!"
 
-#: ../libpurple/protocols/myspace/zap.c:75
 #, c-format
 msgid "Goosing %s..."
-msgstr "%s aan het billenknijpen..."
+msgstr "%s billenknijpen..."
 
 #. 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.
-#: ../libpurple/protocols/myspace/zap.c:80
 msgid "High-five"
 msgstr "High-fiven"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "%s has high-fived you!"
 msgstr "%s heeft je gehigh-fived!"
 
-#: ../libpurple/protocols/myspace/zap.c:81
 #, c-format
 msgid "High-fiving %s..."
-msgstr "%s aan het high-fiven..."
+msgstr "%s high-fiven..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:86
 msgid "Punk"
 msgstr "Punk"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "%s has punk'd you!"
 msgstr "%s heeft je gepunk'd!"
 
-#: ../libpurple/protocols/myspace/zap.c:87
 #, c-format
 msgid "Punking %s..."
-msgstr "%s aan het punken..."
+msgstr "%s punken..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -8492,244 +5864,205 @@ msgstr "%s aan het punken..."
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:96
 msgid "Raspberry"
 msgstr "Bespetteren"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "%s has raspberried you!"
 msgstr "%s heeft je bespetterd!"
 
-#: ../libpurple/protocols/myspace/zap.c:97
 #, c-format
 msgid "Raspberrying %s..."
 msgstr "%s bespetteren..."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Vereiste parameters niet bijgevoegd"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Kan niet naar netwerk schrijven"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Kan niet lezen van netwerk"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Fout opgetreden bij communicatie met de server"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Bijeenkomst niet gevonden"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Bijeenkomst bestaat niet"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Die map bestaat al"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Niet ondersteund"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Wachtwoord verlopen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Account is uitgeschakeld"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "De server kon het adresboek niet benaderen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Uw systeembeheerder heeft deze actie uitgeschakeld"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "De server is niet beschikbaar. Probeer het later nog eens"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Kan een contact niet tweemaal toevoegen aan dezelfde map"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Kan eigen account niet toevoegen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Hoofdarchief onjuist geconfigureerd"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect username or password"
 msgstr "Ongeldige gebruikersnaam of wachtwoord"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the username you entered"
 msgstr "Kan de host van de gebruikersnaam die je hebt ingevoerd niet vinden"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
-msgid "Your account has been disabled because too many incorrect passwords were entered"
-msgstr "Uw account is uitgeschakeld omdat er te vaak ongeldige wachtwoorden werden ingevoerd"
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+"Uw account is uitgeschakeld omdat er te vaak ongeldige wachtwoorden werden "
+"ingevoerd"
 
-#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "U kunt een persoon slechts eenmaal toevoegen aan een gesprek"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Je hebt je maximale hoeveelheid contacten bereikt"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect username"
 msgstr "Je hebt een ongeldige gebruikersnaam ingevuld"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Er is een fout opgetreden bij het bijwerken van het adresboek"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Incompatibele protocolversie"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
-msgstr "De gebruiker heeft je geblokkeerd"
+msgstr "De gebruiker heeft u geblokkeerd"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
-msgid "This evaluation version does not allow more than ten users to log in at one time"
-msgstr "Deze evaluatieversie geeft slechts de mogelijkheid voor tien gelijktijdige gebruikers"
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Deze evaluatieversie geeft slechts de mogelijkheid voor tien gelijktijdige "
+"gebruikers"
 
-#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
-msgstr "De gebruiker is offline of heeft je geblokkeerd"
+msgstr "De gebruiker is off-line of heeft u geblokkeerd"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Onbekende fout: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Aanmelden mislukt (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "Kan het bericht niet verzenden. Kan geen gegevens over gebruiker opvragen (%s)."
+msgstr ""
+"Kan het bericht niet verzenden. Kan geen gegevens over gebruiker opvragen (%"
+"s)."
 
-#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Kan %s niet toevoegen aan je contactenlijst (%s)."
+msgstr "Kan %s niet toevoegen aan uw contactenlijst (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Kan het bericht niet verzenden (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:501
-#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kan gebruiker niet uitnodigen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:540
 #, 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)."
+msgstr ""
+"Kan bericht naar %s niet versturen. Kan geen bijeenkomst aanmaken (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Kan het bericht niet versturen. Kan geen bijeenkomst aanmaken (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
-msgid "Unable to move user %s to folder %s in the server side list. Error while creating folder (%s)."
-msgstr "Kan de gebruiker %s niet naar de map %s verplaatsen op de server. Fout bij aanmaken van map (%s)."
+msgid ""
+"Unable to move user %s to folder %s in the server side list. Error while "
+"creating folder (%s)."
+msgstr ""
+"Kan de gebruiker %s niet naar de map %s verplaatsen op de server. Fout bij "
+"aanmaken van map (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
-msgid "Unable to add %s to your buddy list. Error creating folder in server side list (%s)."
-msgstr "Kan %s niet toevoegen aan je contactenlijst. Fout bij aanmaken van map op de server (%s)."
+msgid ""
+"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 "
+"server (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Kan details niet opvragen voor de gebruiker %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:759
-#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr "Kan de gebruiker niet toevoegen aan je privacy-lijst (%s)."
+msgstr "Kan de gebruiker niet toevoegen aan uw privacy-lijst (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "Kan %s niet aan je weigeringslijst toevoegen (%s)."
+msgstr "Kan %s niet aan uw weigeringslijst toevoegen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr "Kan %s niet toevoegen aan je toestemmingslijst (%s)."
+msgstr "Kan %s niet toevoegen aan uw toestemmingslijst (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr "Kan %s niet verwijderen van je privacy-lijst (%s)."
+msgstr "Kan %s niet verwijderen van uw privacy-lijst (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:950
-#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Kan privacy-instellingen op de server niet veranderen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Kan geen bijeenkomst aanmaken (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1131
-#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
-msgstr "Fout opgetreden bij communicatie met de server. Verbinding wordt verbroken."
+msgstr ""
+"Fout opgetreden bij communicatie met de server. Verbinding wordt verbroken."
 
-#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Telefoonnummer"
 
-#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Persoonlijke titel"
 
-#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Post-stop"
 
-#: ../libpurple/protocols/novell/novell.c:1511
-#: ../libpurple/protocols/sametime/sametime.c:4178
 msgid "User ID"
 msgstr "Gebruikers-ID"
 
@@ -8739,37 +6072,29 @@ msgstr "Gebruikers-ID"
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Volledige naam"
 
-#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "Groupwise bijeenkomst %d"
 
-#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Identificatie..."
 
-#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Kan geen verbinding maken met de computer."
 
-#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Wacht op antwoord..."
 
-#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s is uitgenodigd voor dit gesprek."
 
-#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Uitnodiging voor gesprek"
 
-#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8780,30 +6105,34 @@ msgstr ""
 "\n"
 "Verzonden: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
-msgstr "Wil je het gesprek bijwonen?"
+msgstr "Wilt u het gesprek bijwonen?"
 
-#: ../libpurple/protocols/novell/novell.c:2028
 msgid "You have been logged out because you logged in at another workstation."
-msgstr "De verbinding is verbroken omdat je je hebt aangemeld op een andere computer."
+msgstr ""
+"De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
+"computer."
 
-#: ../libpurple/protocols/novell/novell.c:2085
 #, 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 je bericht niet ontvangen."
+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."
 
-#: ../libpurple/protocols/novell/novell.c:2185
-msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
-msgstr "Kan geen verbinding maken met de server. Geef de naam op van de server waarmee je verbinding wilt maken."
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+"Kan geen verbinding makenmet server. Geef de naam op van de server waarmee u "
+"contact wilt maken."
 
-#: ../libpurple/protocols/novell/novell.c:2214
 msgid "Error. SSL support is not installed."
 msgstr "Fout! Geen SSL-ondersteuning geïnstalleerd."
 
-#: ../libpurple/protocols/novell/novell.c:2522
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
-msgstr "Deze bijeenkomst is gesloten. Er kunnen geen nieuwe berichten verzonden worden."
+msgstr ""
+"Deze bijeenkomst is afgesloten. Er kunnen geen nieuwe berichten verzonden "
+"worden."
 
 #. *< type
 #. *< ui_requirement
@@ -8815,48 +6144,24 @@ msgstr "Deze bijeenkomst is gesloten. Er kunnen geen nieuwe berichten verzonden
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3537
-#: ../libpurple/protocols/novell/novell.c:3539
 msgid "Novell GroupWise Messenger Protocol Plugin"
-msgstr "Novell GroupWise Messenger protocol-plugin"
+msgstr "Novell GroupWise Messenger protocol-plug-in"
 
-#: ../libpurple/protocols/novell/novell.c:3564
 msgid "Server address"
 msgstr "Server-adres"
 
-#: ../libpurple/protocols/novell/novell.c:3568
 msgid "Server port"
 msgstr "Server-poort"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:62
 msgid "Could not join chat room"
 msgstr "Kon gesprek-ruimte niet binnenkomen"
 
-#: ../libpurple/protocols/oscar/family_chatnav.c:63
 msgid "Invalid chat room name"
 msgstr "Ongeldige naam voor ruimte"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:437
-#: ../libpurple/protocols/qq/qq_network.c:281
-#: ../libpurple/protocols/yahoo/yahoo.c:2512
-#: ../libpurple/protocols/yahoo/yahoo.c:2680
-#: ../libpurple/protocols/yahoo/ycht.c:482
-#: ../libpurple/proxy.c:616
-#: ../libpurple/proxy.c:1159
-#: ../libpurple/proxy.c:1273
-#: ../libpurple/proxy.c:1379
-#: ../libpurple/proxy.c:1532
 msgid "Server closed the connection."
 msgstr "Server heeft de verbinding verbroken."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:439
-#: ../libpurple/protocols/yahoo/yahoo.c:2505
-#: ../libpurple/protocols/yahoo/yahoo.c:2673
-#: ../libpurple/proxy.c:628
-#: ../libpurple/proxy.c:1171
-#: ../libpurple/proxy.c:1285
-#: ../libpurple/proxy.c:1391
-#: ../libpurple/proxy.c:1544
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8865,13 +6170,6 @@ msgstr ""
 "Verbinding verloren met server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:442
-#: ../libpurple/proxy.c:1188
-#: ../libpurple/proxy.c:1218
-#: ../libpurple/proxy.c:1298
-#: ../libpurple/proxy.c:1403
-#: ../libpurple/proxy.c:1493
-#: ../libpurple/proxy.c:1557
 msgid "Received invalid data on connection with server."
 msgstr "Ongeldige data ontvangen van server."
 
@@ -8885,10 +6183,8 @@ msgstr "Ongeldige data ontvangen van server."
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
-msgstr "AIM-protocol plugin"
+msgstr "AIM-protocol plug-in"
 
 #. *< type
 #. *< ui_requirement
@@ -8900,299 +6196,235 @@ msgstr "AIM-protocol plugin"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
-msgstr "ICQ-protocol plugin"
+msgstr "ICQ-protocol plug-in"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4463
-#: ../libpurple/protocols/zephyr/zephyr.c:2986
 msgid "Encoding"
 msgstr "Codering"
 
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
 msgstr "De andere gebruiker heeft de verbinding verbroken."
 
-#: ../libpurple/protocols/oscar/odc.c:44
 msgid "The remote user has declined your request."
-msgstr "De andere gebruiker heeft je verzoek geweigerd."
+msgstr "De andere gebruiker heeft uw verzoek geweigerd."
 
-#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "De verbinding is verbroken met de volgende gebruiker:<br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Ongeldige data ontvangen via directe verbinding."
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Kan geen verbinding maken met de andere gebruiker."
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Directe verbinding opgezet"
 
-#: ../libpurple/protocols/oscar/odc.c:600
 #, c-format
-msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
-msgstr "%s probeerde je een bestand te sturen %s file, maar we stemmen alleen tot %s toe op Direct IM.  Probeer bestandsoverdracht.\n"
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s probeerde je een bestand te sturen %s file, maar we stemmen alleen tot %s "
+"toe op Direct IM.  Probeer bestandsoverdracht.\n"
 
-#: ../libpurple/protocols/oscar/oft.c:656
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Bestand %s is %s, welke is groter dan de maximale grootte van %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Invalid error"
 msgstr "Ongeldige fout"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Invalid SNAC"
 msgstr "Ongeldige SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Rate to host"
 msgstr "Frequentie naar host"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Rate to client"
 msgstr "Frequentie naar cliënt"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Service unavailable"
 msgstr "Service niet beschikbaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Service not defined"
 msgstr "Service niet gedefinieerd"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Obsolete SNAC"
 msgstr "Verouderde SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Not supported by host"
 msgstr "Niet ondersteund door host"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Not supported by client"
 msgstr "Niet ondersteund door cliënt"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Refused by client"
 msgstr "Gewegerd door cliënt"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Reply too big"
 msgstr "Antwoord te groot"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Responses lost"
 msgstr "Reacties verloren"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Request denied"
 msgstr "Aanvraag geweigerd"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Busted SNAC payload"
 msgstr "SNAC bagage kapot"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Insufficient rights"
 msgstr "Niet genoeg rechten"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "In local permit/deny"
 msgstr "In lokale toestaan/weigeren"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "Warning level too high (sender)"
 msgstr "Waarschuwingsniveau te hoog (verzender)"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Warning level too high (receiver)"
 msgstr "Waarschuwingsniveau te hoog (ontvanger)"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "User temporarily unavailable"
 msgstr "Gebruiker tijdelijk niet beschikbaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "No match"
 msgstr "Geen overeenkomstige resultaten"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "List overflow"
 msgstr "Te grote lijst"
 
-#: ../libpurple/protocols/oscar/oscar.c:141
 msgid "Request ambiguous"
 msgstr "Dubieuze aanvraag"
 
-#: ../libpurple/protocols/oscar/oscar.c:142
 msgid "Queue full"
 msgstr "Wachtrij vol"
 
-#: ../libpurple/protocols/oscar/oscar.c:143
 msgid "Not while on AOL"
 msgstr "Niet tijdens AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:351
-msgid "(There was an error receiving this message.  The buddy you are speaking with is probably using a different encoding than expected.  If you know what encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
-msgstr "(Er is een fout opgetreden bij het ontvangen van dit bericht. De ander gebruikt waarschijnlijk een andere tekencodering dan verwacht. Als je weet welke tekencodering er gebruikt wordt dan kun je dit instellen bij de geavanceerde instellingen van je AIM/ICQ-account.)"
+msgid ""
+"(There was an error receiving this message.  The buddy you are speaking with "
+"is probably using a different encoding than expected.  If you know what "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+"(Er is een fout opgetreden bij ontvangen van het bericht. De ander gebruikt "
+"waarschijnlijk een andere tekencodering dan verwacht. Als u weet welke "
+"tekencodering er gebruikt wordt dan kunt u dit instellen bij de geavanceerde "
+"instellingen van uw AIM/ICQ-account.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:460
 #, c-format
-msgid "(There was an error receiving this message.  Either you and %s have different encodings selected, or %s has a buggy client.)"
+msgid ""
+"(There was an error receiving this message.  Either you and %s have "
+"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.)"
 
 # 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.)"
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:642
-#: ../pidgin/gtkutils.c:2455
-#: ../pidgin/gtkutils.c:2485
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:336
 msgid "Buddy Icon"
 msgstr "pictogram"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "Voice"
 msgstr "Stem"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
 msgid "AIM Direct IM"
 msgstr "AIM Direct bericht"
 
-#: ../libpurple/protocols/oscar/oscar.c:654
-#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "Get File"
 msgstr "Bestanden Ophalen"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Games"
 msgstr "Spelletjes"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Add-Ins"
 msgstr "Extra's"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "Send Buddy List"
 msgstr "Contactenlijst verzenden"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "ICQ Direct Connect"
 msgstr "ICQ Directe verbinding"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "AP User"
 msgstr "AP-gebruiker"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Old ICQ UTF8"
 msgstr "Oude ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "Trillian Encryption"
 msgstr "Trillian codering"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Security Enabled"
 msgstr "Beveiliging ingeschakeld"
 
-#: ../libpurple/protocols/oscar/oscar.c:700
 msgid "Video Chat"
 msgstr "Video-chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Live Video"
 msgstr "Live Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:710
 msgid "Camera"
 msgstr "Camera"
 
-#: ../libpurple/protocols/oscar/oscar.c:713
 msgid "Screen Sharing"
 msgstr "Gedeelde schermen"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5985
+#, c-format
 msgid "Free For Chat"
 msgstr "Vrij om te chatten"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
-#: ../libpurple/protocols/oscar/oscar.c:6020
+#, c-format
 msgid "Not Available"
 msgstr "Niet beschikbaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:737
-#: ../libpurple/protocols/oscar/oscar.c:6006
+#, c-format
 msgid "Occupied"
 msgstr "Bezig"
 
-#: ../libpurple/protocols/oscar/oscar.c:741
+#, c-format
 msgid "Web Aware"
 msgstr "Zichtbaar op web"
 
-#: ../libpurple/protocols/oscar/oscar.c:743
-#: ../libpurple/protocols/qq/qq.c:226
-#: ../libpurple/protocols/qq/qq.c:363
-#: ../libpurple/protocols/yahoo/yahoo.c:3159
-#: ../libpurple/status.c:162
-#: ../pidgin/gtkdocklet.c:557
-#: ../pidgin/gtkstatusbox.c:1092
+#, c-format
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#: ../libpurple/protocols/oscar/oscar.c:951
-#: ../libpurple/protocols/oscar/oscar.c:3897
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
-#: ../pidgin/gtkprefs.c:1207
 msgid "IP Address"
 msgstr "IP-adres"
 
-#: ../libpurple/protocols/oscar/oscar.c:957
 msgid "Warning Level"
 msgstr "Waarschuwingsniveau"
 
-#: ../libpurple/protocols/oscar/oscar.c:967
 msgid "Buddy Comment"
 msgstr "Contactopmerking"
 
-#: ../libpurple/protocols/oscar/oscar.c:1107
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -9201,7 +6433,6 @@ msgstr ""
 "Kan niet verbinden met identificatieserver:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1115
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -9210,163 +6441,138 @@ msgstr ""
 "Kan niet verbinden met BOS-server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1155
 msgid "Username sent"
 msgstr "Gebruikersnaam verzonden"
 
-#: ../libpurple/protocols/oscar/oscar.c:1160
 msgid "Connection established, cookie sent"
 msgstr "Verbinding hersteld, Cookie verzonden"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1189
 msgid "Finalizing connection"
 msgstr "Afronden van verbinding"
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
 #, c-format
-msgid "Unable to login: Could not sign on as %s because the username is invalid.  Usernames must be a valid email address, or start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Kan niet aanmelden: Kan niet aanmelden als %s omdat de gebruikersnaam ongeldig is. Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een letter en slechts cijfers, letters en spaties bevatten, of slechts nummers bevatten."
+msgid ""
+"Unable to login: Could not sign on as %s because the username is invalid.  "
+"Usernames must be a valid email address, or start with a letter and contain "
+"only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Kan niet aanmelden: Kan niet aanmelden als %s omdat de gebruikersnaam "
+"ongeldig is. Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen "
+"met een letter en slechts cijfers, letters en spaties bevatten, of slechts "
+"nummers bevatten."
 
 #. Unregistered screen name
-#: ../libpurple/protocols/oscar/oscar.c:1503
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
 msgid "Invalid username."
 msgstr "Ongeldige gebruikersnaam."
 
-#: ../libpurple/protocols/oscar/oscar.c:1509
-#: ../libpurple/protocols/simple/simple.c:1128
-#: ../libpurple/protocols/yahoo/yahoo.c:2156
 msgid "Incorrect password."
 msgstr "Ongeldig wachtwoord."
 
 #. Suspended account
-#: ../libpurple/protocols/oscar/oscar.c:1513
 msgid "Your account is currently suspended."
 msgstr "Uw Account is momenteel afgesloten"
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1518
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "De AOL service is momenteel niet bereikbaar."
 
 #. screen name connecting too frequently
 #. IP address connecting too frequently
-#: ../libpurple/protocols/oscar/oscar.c:1522
-#: ../libpurple/protocols/oscar/oscar.c:1535
-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 "
+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 "
 
-#: ../libpurple/protocols/oscar/oscar.c:1528
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Het programma dat je gebruikt is te oud. Je kan upgraden op %s"
+msgstr ""
+"Het programma wat u gebruikt is te oud. Haal een nieuwe versie op bij %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1568
 msgid "Could Not Connect"
 msgstr "Kan geen verbinding maken"
 
-#: ../libpurple/protocols/oscar/oscar.c:1572
 msgid "Received authorization"
 msgstr "Toestemming gekregen"
 
-#: ../libpurple/protocols/oscar/oscar.c:1595
 msgid "The SecurID key entered is invalid."
 msgstr "Ingevoerde SecurID sleutel is ongeldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:1608
 msgid "Enter SecurID"
 msgstr "Geef SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1609
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Geef het 6-cijferige nummer van het digitale display."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1611
-#: ../libpurple/protocols/oscar/oscar.c:2482
-#: ../libpurple/protocols/oscar/oscar.c:2530
-#: ../libpurple/protocols/oscar/oscar.c:6090
-#: ../libpurple/protocols/oscar/oscar.c:6372
-#: ../libpurple/request.h:1401
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1651
 #, c-format
-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. Je kunt misschien beter TOC gebruiken tot dit probleem is opgelost. Kijk op %s voor updates."
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:1655
-#: ../libpurple/protocols/oscar/oscar.c:1701
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kon geen geldige AIM aanmeld-hash krijgen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1697
-#: ../libpurple/protocols/oscar/oscar.c:1799
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
+msgstr ""
+"U wordt waarschijnlijk binnenkort afgemeld. Kijk op %s voor nieuwe versies."
 
-#: ../libpurple/protocols/oscar/oscar.c:1803
 msgid "Unable to get a valid login hash."
 msgstr "Kon geen geldige aanmeld-hash krijgen."
 
 #. allow multple logins?
-#: ../libpurple/protocols/oscar/oscar.c:1834
 msgid "Password sent"
 msgstr "Wachtwoord verzonden"
 
-#: ../libpurple/protocols/oscar/oscar.c:1890
 msgid "Unable to initialize connection"
 msgstr "Kan verbinding niet initialiseren"
 
-#: ../libpurple/protocols/oscar/oscar.c:2451
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Geef mij a.u.b. toestemming zodat ik je kan toevoegen aan mijn contactenlijst."
+msgstr "Geef mij toestemming zodat ik u kan toevoegen aan mijn contactenlijst."
 
-#: ../libpurple/protocols/oscar/oscar.c:2480
 msgid "Authorization Request Message:"
 msgstr "Tekst van toestemmingsaanvraag"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481
 msgid "Please authorize me!"
-msgstr "Geef mij toestemming, a.u.b!"
+msgstr "Geef mij toestemming, alstublieft!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2521
-#: ../libpurple/protocols/oscar/oscar.c:2529
-#: ../libpurple/protocols/oscar/oscar.c:2656
-#: ../libpurple/protocols/oscar/oscar.c:5493
-#: ../libpurple/protocols/yahoo/yahoo.c:992
 msgid "No reason given."
 msgstr "Geen reden gegeven."
 
-#: ../libpurple/protocols/oscar/oscar.c:2528
 msgid "Authorization Denied Message:"
 msgstr "Tekst van weigeringsbericht:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2656
 #, c-format
 msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"De gebruiker %u heeft je aanvraag om hem/haar toe te voegen aan je lijst geweigerd met de volgende reden:\n"
+"De gebruiker %u heeft je aanvraag om hem/haar toe te voegen aan je lijst "
+"geweigerd met de volgende reden:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2657
 msgid "ICQ authorization denied."
 msgstr "ICQ identificatie geweigerd."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2664
 #, 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."
+msgstr ""
+"De gebruiker %u heeft toestemming gegeven. Hij/zij wordt toegevoegd aan je "
+"contactenlijst."
 
-#: ../libpurple/protocols/oscar/oscar.c:2672
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -9379,7 +6585,6 @@ msgstr ""
 "Afzender: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2680
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -9392,7 +6597,6 @@ msgstr ""
 "Afzender: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2688
 #, c-format
 msgid ""
 "You have received an ICQ email from %s [%s]\n"
@@ -9405,61 +6609,66 @@ msgstr ""
 "Bericht:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2709
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-gebruiker %u heeft je een contact toegestuurd: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2715
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Wil je deze persoon toevoegen aan je contactenlijst?"
+msgstr "Wilt u deze persoon toevoegen aan uw contactenlijst?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2720
-#: ../pidgin/gtkroomlist.c:315
 msgid "_Add"
 msgstr "Toe_voegen"
 
 # afzeggen/weigeren/afwijzen
-#: ../libpurple/protocols/oscar/oscar.c:2721
 msgid "_Decline"
 msgstr "Af_wijzen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2845
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "%hu bericht van %s is niet overgekomen omdat het ongeldig was."
-msgstr[1] "%hu berichten van %s zijn niet overgekomen omdat deze ongeldig waren."
+msgstr[1] ""
+"%hu berichten van %s zijn niet overgekomen omdat deze ongeldig waren."
 
-#: ../libpurple/protocols/oscar/oscar.c:2854
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] "%hu bericht van %s is niet overgekomen omdat het te groot was."
-msgstr[1] "%hu berichten van %s zijn niet overgekomen omdat deze te groot waren."
+msgstr[1] ""
+"%hu berichten van %s zijn niet overgekomen omdat deze te groot waren."
 
-#: ../libpurple/protocols/oscar/oscar.c:2863
 #, c-format
-msgid "You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
-msgstr[0] "%hu bericht van %s is niet overgekomen omdat het te snel verzonden werd."
-msgstr[1] "%hu berichten van %s zijn niet overgekomen omdat deze te snel verzonden werden."
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
+msgstr[0] ""
+"%hu bericht van %s is niet overgekomen omdat het te snel verzonden werd."
+msgstr[1] ""
+"%hu berichten van %s zijn niet overgekomen omdat deze te snel verzonden "
+"werden."
 
-#: ../libpurple/protocols/oscar/oscar.c:2872
 #, c-format
-msgid "You missed %hu message from %s because his/her warning level is too high."
-msgid_plural "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "Je hebt %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 hoog is."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
+msgstr[0] ""
+"Je hebt %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 "
+"hoog is."
 
-#: ../libpurple/protocols/oscar/oscar.c:2881
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
-msgid_plural "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "Je hebt %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."
+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."
+msgstr[1] ""
+"Je hebt %hu berichten van %s gemist omdat het waarschuwingsniveau te hoog is."
 
-#: ../libpurple/protocols/oscar/oscar.c:2890
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
@@ -9467,1010 +6676,838 @@ msgstr[0] "%hu bericht van %s is niet overgekomen om een onbekende reden."
 msgstr[1] "%hu berichten van %s zijn niet overgekomen om een onbekende reden."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:3045
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan het bericht niet verzenden: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3045
-#: ../libpurple/protocols/oscar/oscar.c:3050
-#: ../libpurple/protocols/oscar/oscar.c:3114
 msgid "Unknown reason."
 msgstr "Onbekende reden."
 
-#: ../libpurple/protocols/oscar/oscar.c:3048
-#: ../libpurple/protocols/sametime/sametime.c:2461
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kan het bericht niet verzenden aan %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:3114
 #, c-format
 msgid "User information not available: %s"
 msgstr "Gebruikersinformatie niet beschikbaar: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3151
 msgid "Online Since"
 msgstr "Online sinds"
 
-#: ../libpurple/protocols/oscar/oscar.c:3156
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1188
 msgid "Member Since"
 msgstr "Lid sinds"
 
-#: ../libpurple/protocols/oscar/oscar.c:3250
 msgid "Your AIM connection may be lost."
 msgstr "Uw AIM-verbinding is misschien verbroken."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3438
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
 msgstr "[kan bericht niet weergeven omdat deze ongeldige tekens bevat.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3602
-msgid "The last action you attempted could not be performed because you are over the rate limit. Please wait 10 seconds and try again."
-msgstr "Uw laatste actie is niet gebeurd omdat je snelheid te hoog ligt. Wacht 10 seconden en probeer het dan nogmaals."
+msgid ""
+"The last action you attempted could not be performed because you are over "
+"the rate limit. Please wait 10 seconds and try again."
+msgstr ""
+"Uw laatste actie is niet gebeurd omdat uw snelheid te hoog ligt. Wacht 10 "
+"seconden en probeer het dan nogmaals."
 
-#: ../libpurple/protocols/oscar/oscar.c:3687
-#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "De verbinding met chatruimte %s is verbroken"
 
-#: ../libpurple/protocols/oscar/oscar.c:3919
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:586
 msgid "Mobile Phone"
 msgstr "Mobiel nummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3948
 msgid "Personal Web Page"
 msgstr "Persoonlijke webpagina"
 
 #. aim_userinfo_t
 #. strip_html_tags
-#: ../libpurple/protocols/oscar/oscar.c:3956
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Additional Information"
 msgstr "Extra informatie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3965
-#: ../libpurple/protocols/oscar/oscar.c:3973
 msgid "Zip Code"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/oscar/oscar.c:3976
 msgid "Work Information"
 msgstr "Werkinformatie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3979
 msgid "Division"
 msgstr "Afdeling"
 
-#: ../libpurple/protocols/oscar/oscar.c:3980
 msgid "Position"
 msgstr "Positie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3984
 msgid "Web Page"
 msgstr "Webpagina"
 
-#: ../libpurple/protocols/oscar/oscar.c:4042
 msgid "Pop-Up Message"
 msgstr "Pop-up bericht"
 
-#: ../libpurple/protocols/oscar/oscar.c:4082
 #, c-format
 msgid "The following username is associated with %s"
 msgid_plural "The following usernames are associated with %s"
 msgstr[0] "De volgende naam wordt geassocieerd met %s"
 msgstr[1] "De volgende namen worden geassocieerd met %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4113
 #, c-format
 msgid "No results found for email address %s"
 msgstr "Niets gevonden voor e-mailadres %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4134
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4136
 msgid "Account Confirmation Requested"
 msgstr "Accountbevestiging aangevraagd"
 
-#: ../libpurple/protocols/oscar/oscar.c:4169
 #, c-format
-msgid "Error 0x%04x: Unable to format username because the requested name differs from the original."
-msgstr "Fout 0x%04x: Kan weergave van naam niet veranderen omdat de aangevraagde gebruikersnaam niet gelijk is aan het origineel."
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name differs "
+"from the original."
+msgstr ""
+"Fout 0x%04x: Kan weergave van naam niet veranderen omdat de aangevraagde "
+"gebruikersnaam niet gelijk is aan het origineel."
 
-#: ../libpurple/protocols/oscar/oscar.c:4171
 #, c-format
 msgid "Error 0x%04x: Unable to format username because it is invalid."
-msgstr "Fout 0x%04x: Kan weergave van naam niet veranderen omdat deze ongeldig is."
+msgstr ""
+"Fout 0x%04x: Kan weergave van naam niet veranderen omdat deze ongeldig is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4173
 #, c-format
-msgid "Error 0x%04x: Unable to format username because the requested name is too long."
-msgstr "Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde gebruikersnaam te lang is."
+msgid ""
+"Error 0x%04x: Unable to format username because the requested name is too "
+"long."
+msgstr ""
+"Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde gebruikersnaam "
+"te lang is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4175
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because there is already a request pending for this username."
-msgstr "Fout 0x%04x: Kan e-mailadres niet veranderen omdat er al een aanvraag in behandeling is."
+msgid ""
+"Error 0x%04x: Unable to change email address because there is already a "
+"request pending for this username."
+msgstr ""
+"Fout 0x%04x: Kan e-mailadres niet veranderen omdat er al een aanvraag in "
+"behandeling is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4177
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address has too many usernames associated with it."
-msgstr "Fout 0x%04x: Kan e-mailadres niet veranderen omdat het adres reeds te veel gebruikersnamen toegewezen heeft gekregen."
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address has "
+"too many usernames associated with it."
+msgstr ""
+"Fout 0x%04x: Kan e-mailadres niet veranderen omdat het adres reeds te veel "
+"gebruikersnamen toegewezen heeft gekregen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4179
 #, c-format
-msgid "Error 0x%04x: Unable to change email address because the given address is invalid."
-msgstr "Fout 0x%04x: Kan e-mailadres niet veranderen omdat het adres ongeldig is."
+msgid ""
+"Error 0x%04x: Unable to change email address because the given address is "
+"invalid."
+msgstr ""
+"Fout 0x%04x: Kan e-mailadres niet veranderen omdat het adres ongeldig is."
 
-#: ../libpurple/protocols/oscar/oscar.c:4181
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fout 0x%04x: Onbekende fout."
 
-#: ../libpurple/protocols/oscar/oscar.c:4183
 msgid "Error Changing Account Info"
 msgstr "Fout bij aanpassen van accountgegevens"
 
-#: ../libpurple/protocols/oscar/oscar.c:4189
 #, c-format
 msgid "The email address for %s is %s"
 msgstr "Het e-mailadres voor %s is %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4191
 msgid "Account Info"
 msgstr "Accountinformatie"
 
-#: ../libpurple/protocols/oscar/oscar.c:4377
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr "Je afbeelding is niet verstuurd. Er is een directe verbinding nodig om afbeeldingen te kunnen sturen."
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4648
 msgid "Unable to set AIM profile."
 msgstr "Kan AIM-profiel niet instellen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4649
-msgid "You have probably requested to set your profile before the login procedure completed.  Your profile remains unset; try setting it again when you are fully connected."
-msgstr "Je hebt waarschijnlijk je profiel aangepast voordat je volledig aangemeld was. Je profiel is niet ingesteld. Probeer het nogmaals wanneer je volledig aangemeld bent."
+msgid ""
+"You have probably requested to set your profile before the login procedure "
+"completed.  Your profile remains unset; try setting it again when you are "
+"fully connected."
+msgstr ""
+"Je hebt waarschijnlijk je profiel aangepast voordat je volledig aangemeld "
+"was. Je profiel is niet ingesteld. Probeer het nogmaals wanneer je volledig "
+"aangemeld bent."
 
-#: ../libpurple/protocols/oscar/oscar.c:4663
 #, c-format
-msgid "The maximum profile length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum profile length of %d bytes has been exceeded.  It has been truncated for you."
-msgstr[0] "De maximale profielgrootte van %d byte is overschreden. Het is voor je afgebroken."
-msgstr[1] "De maximale profielgrootte van %d bytes is overschreden. Het is voor je afgebroken."
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+"De maximale profielgrootte van %d byte is overschreden. Het is voor je "
+"afgebroken."
+msgstr[1] ""
+"De maximale profielgrootte van %d bytes is overschreden. Het is voor je "
+"afgebroken."
 
-#: ../libpurple/protocols/oscar/oscar.c:4668
 msgid "Profile too long."
 msgstr "Profiel is te lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4712
 #, c-format
-msgid "The maximum away message length of %d byte has been exceeded.  It has been truncated for you."
-msgid_plural "The maximum away message length of %d bytes has been exceeded.  It has been truncated for you."
-msgstr[0] "De maximale grootte voor afwezigheidsberichten van %d byte is overschreden. Het is voor je afgebroken."
-msgstr[1] "De maximale grootte van afwezigheidsberichten van %d bytes is overschreden. het is voor je afgebroken."
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+"De maximale grootte voor afwezigheidsberichten van %d byte is overschreden. "
+"Het is voor je afgebroken."
+msgstr[1] ""
+"De maximale grootte van afwezigheidsberichten van %d bytes is overschreden. "
+"het is voor je afgebroken."
 
-#: ../libpurple/protocols/oscar/oscar.c:4717
 msgid "Away message too long."
 msgstr "Afwezigheidsbericht te lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4790
 #, c-format
-msgid "Could not 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. Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een letter en slechts cijfers en letters bevatten, of slechts nummers bevatten."
+msgid ""
+"Could not 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. "
+"Gebruikersnamen moeten een geldig e-mailadres zijn, of beginnen met een "
+"letter en slechts cijfers en letters bevatten, of slechts nummers bevatten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4792
-#: ../libpurple/protocols/oscar/oscar.c:5262
-#: ../libpurple/protocols/oscar/oscar.c:5277
 msgid "Unable To Add"
 msgstr "Kan niet toevoegen"
 
-#: ../libpurple/protocols/oscar/oscar.c:4911
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kan contactenlijst niet ophalen"
 
-#: ../libpurple/protocols/oscar/oscar.c:4912
-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."
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5103
-#: ../libpurple/protocols/oscar/oscar.c:5105
-#: ../libpurple/protocols/oscar/oscar.c:5344
-#: ../libpurple/protocols/oscar/oscar.c:5345
-#: ../libpurple/protocols/oscar/oscar.c:5350
 msgid "Orphans"
 msgstr "Wezen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
 #, c-format
-msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
-msgstr "Kon %s niet toevoegen, lijst is vol. Verwijder een contactpersoon en probeer het opnieuw."
+msgid ""
+"Could not 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:5260
-#: ../libpurple/protocols/oscar/oscar.c:5275
 msgid "(no name)"
 msgstr "(naamloos)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5274
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Kan contact %s niet toevoegen voor een onbekende reden."
 
-#: ../libpurple/protocols/oscar/oscar.c:5408
 #, c-format
-msgid "The user %s has given you permission to add him or her to your buddy list.  Do you want to add this user?"
-msgstr "De gebruiker %s heeft je toestemming gegeven om hem/haar toe te voegen aan je contactenlijst. Wil je deze gebruiker toevoegen?"
+msgid ""
+"The user %s has given you permission to add him or her to your buddy list.  "
+"Do you want to add this user?"
+msgstr ""
+"De gebruiker %s heeft u toestemming gegeven om u toe te voegen aan zijn of "
+"haar contactenlijst. Wilt u deze gebruiker toevoegen?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5416
 msgid "Authorization Given"
 msgstr "Toestemming gegeven"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5489
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "De gebruiker %s heeft je toestemming gegeven hem/haar toe te voegen aan je contactenlijst."
+msgstr ""
+"De gebruiker %s heeft toestemming gegeven. Hij/zij wordt toegevoegd aan uw "
+"contactenlijst."
 
-#: ../libpurple/protocols/oscar/oscar.c:5490
 msgid "Authorization Granted"
 msgstr "Toestemming gegeven"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5493
 #, c-format
 msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"De gebruiker %s heeft je aanvraag om hem/haar toe te voegen aan je contactenlijst geweigerd met de volgende reden:\n"
+"De gebruiker %s heeft uw aanvraag om hem/haar toe te voegen aan uw "
+"contactenlijst geweigerd met de volgende reden:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5494
 msgid "Authorization Denied"
 msgstr "Toestemming geweigerd"
 
-#: ../libpurple/protocols/oscar/oscar.c:5530
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Uitwisselen:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5643
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "Uw afbeelding is niet verstuurd. Je kunt geen afbeeldingen versturen in een AIM-chat."
+msgstr ""
+"Uw chat-afbeelding is niet verstuurd. U kunt geen IM-afbeeldingen versturen "
+"in een AIM-chat."
 
-#: ../libpurple/protocols/oscar/oscar.c:5979
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:6087
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Contactopmerking voor %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:6088
 msgid "Buddy Comment:"
 msgstr "Contactopmerking:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6135
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "U heeft ervoor gekozen om een directe verbinding te openen met %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:6139
-msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
-msgstr "Omdat dit je IP-adres zichtbaar maakt voor de andere partij kan het worden gezien als veiligheidsrisico. Wil je doorgaan?"
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Omdat dit uw IP-adres zichtbaar maakt voor de andere partij kan het worden "
+"gezien als veiligheidsrisico. Wilt u doorgaan?"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
-#: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "_Verbinden"
 
-#: ../libpurple/protocols/oscar/oscar.c:6180
 msgid "Get AIM Info"
 msgstr "AIM-info ophalen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6186
 msgid "Edit Buddy Comment"
 msgstr "Opmerking bewerken"
 
-#: ../libpurple/protocols/oscar/oscar.c:6194
 msgid "Get Status Msg"
 msgstr "Statusbericht tonen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6207
 msgid "Direct IM"
 msgstr "Direct bericht"
 
-#: ../libpurple/protocols/oscar/oscar.c:6229
 msgid "Re-request Authorization"
 msgstr "Opnieuw toestemming vragen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6288
 msgid "Require authorization"
 msgstr "Identificatie nodig"
 
-#: ../libpurple/protocols/oscar/oscar.c:6291
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Webaanwezig (u kunt SPAM ontvangen als gevolg hiervan)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6296
 msgid "ICQ Privacy Options"
 msgstr "ICQ privacy-opties"
 
-#: ../libpurple/protocols/oscar/oscar.c:6316
 msgid "The new formatting is invalid."
 msgstr "De nieuwe formattering is ongeldig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6317
 msgid "Username formatting can change only capitalization and whitespace."
-msgstr "Kan alleen alleen hoofdletter en spaties veranderen aan de formattering van de gebruikersnaam."
+msgstr ""
+"Kan alleen alleen hoofdletter en spaties veranderen aan de formattering van "
+"de gebruikersnaam."
 
-#: ../libpurple/protocols/oscar/oscar.c:6370
 msgid "Change Address To:"
 msgstr "Adres veranderen in: "
 
-#: ../libpurple/protocols/oscar/oscar.c:6416
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>u wacht niet op toestemming</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6419
 msgid "You are awaiting authorization from the following buddies"
 msgstr "U wacht op toestemming van de volgende contacten"
 
-#: ../libpurple/protocols/oscar/oscar.c:6420
-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."
+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."
 
-#: ../libpurple/protocols/oscar/oscar.c:6437
 msgid "Find Buddy by Email"
 msgstr "Contact zoeken op e-mailadres"
 
-#: ../libpurple/protocols/oscar/oscar.c:6438
 msgid "Search for a buddy by email address"
 msgstr "Contact zoeken op e-mailadres"
 
-#: ../libpurple/protocols/oscar/oscar.c:6439
 msgid "Type the email address of the buddy you are searching for."
 msgstr "Geef het e-mail adres van de persoon waarnaar je zoekt."
 
-#: ../libpurple/protocols/oscar/oscar.c:6442
 msgid "_Search"
 msgstr "_Zoeken"
 
-#: ../libpurple/protocols/oscar/oscar.c:6597
 msgid "Set User Info (web)..."
 msgstr "Gebruikersinfo Instellen (web)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6608
 msgid "Change Password (web)"
 msgstr "Wachtwoord veranderen (web)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6612
 msgid "Configure IM Forwarding (web)"
 msgstr "IM-doorsturen configureren (web)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6622
 msgid "Set Privacy Options..."
 msgstr "Privacy-opties instellen..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6629
 msgid "Confirm Account"
 msgstr "Account bevestigen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6633
 msgid "Display Currently Registered Email Address"
 msgstr "Huidige geregistreerde e-mailadres weergeven"
 
-#: ../libpurple/protocols/oscar/oscar.c:6637
 msgid "Change Currently Registered Email Address..."
 msgstr "Huidige geregistreerde e-mailadres veranderen..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6644
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Contacten weergeven die op toestemming wachten"
 
-#: ../libpurple/protocols/oscar/oscar.c:6650
 msgid "Search for Buddy by Email Address..."
 msgstr "Contact zoeken door middel van e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6655
 msgid "Search for Buddy by Information"
 msgstr "Contact zoeken via informatie"
 
-#: ../libpurple/protocols/oscar/oscar.c:6843
 msgid ""
 "Always use AIM/ICQ proxy server for\n"
 "file transfers and direct IM (slower,\n"
 "but does not reveal your IP address)"
 msgstr ""
 "Altijd AIM/ICQ proxy gebruiken voor\n"
-"bestandsoverdrachten en directe gesprekken(langzaam, maar verbergt je IP-adres)"
+"bestandsoverdrachten en directe gesprekken(langzaam, maar verbergt uw IP-"
+"adres)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6847
 msgid "Allow multiple simultaneous logins"
 msgstr "Meerdere keren gelijk inloggen toestaan"
 
-#: ../libpurple/protocols/oscar/peer.c:699
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
-msgstr "Aanvraag van directe verbinding van %s naar %s:%hu voor berichtuitwisseling."
+msgstr ""
+"Aanvraag van directe verbinding van %s naar %s:%hu voor berichtuitwisseling."
 
-#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Verbinding maken met %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:858
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "verbinding maken via proxy-server."
 
-#: ../libpurple/protocols/oscar/peer.c:1035
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s heeft net een directe verbinding met %s aangevraagd"
 
-#: ../libpurple/protocols/oscar/peer.c:1039
-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 "Dit vereist een directe verbinding tussen de twee computers (nodig voor afbeeldingen via chatberichten). Dit zou als een inbreuk op de privacy beschouwd kunnen worden omdat de ander dan je IP-adres te weten komt."
+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 ""
+"Dit vereist een directe verbinding tussen de twee computers (nodig voor "
+"afbeeldingen via chatberichten). Dit zou als een inbreuk op de privacy "
+"beschouwd kunnen worden omdat de ander dan uw IP-adres te weten komt."
 
-#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Primary Information"
 msgstr "Belangrijke Informatie"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "Personal Introduction"
 msgstr "Persoonlijke introductie"
 
-#: ../libpurple/protocols/qq/buddy_info.c:43
 msgid "QQ Number"
 msgstr "QQ Nummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Country/Region"
 msgstr "Land/Regio"
 
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "Province/State"
 msgstr "Provincie/Staat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:51
 msgid "Horoscope Symbol"
 msgstr "Sterrenbeeld"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Zodiac Sign"
 msgstr "Sterrenbeeld"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "Blood Type"
 msgstr "Bloedgroep"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "College"
 msgstr "School"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Zipcode"
 msgstr "Postcode"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Cellphone Number"
 msgstr "Mobiele nummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:60
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Aquarius"
 msgstr "Waterman"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Pisces"
 msgstr "Vissen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Aries"
 msgstr "Ram"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Taurus"
 msgstr "Stier"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Gemini"
 msgstr "Tweelingen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Cancer"
 msgstr "Kreeft"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Leo"
 msgstr "Leeuw"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Virgo"
 msgstr "Maagd"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Libra"
 msgstr "Weegschaal"
 
-#: ../libpurple/protocols/qq/buddy_info.c:67
 msgid "Scorpio"
 msgstr "Schorpioen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:67
 msgid "Sagittarius"
 msgstr "Boogschutter"
 
-#: ../libpurple/protocols/qq/buddy_info.c:67
 msgid "Capricorn"
 msgstr "Steenbok"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Rat"
 msgstr "Rat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Ox"
 msgstr "Rund"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Tiger"
 msgstr "Tijger"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Rabbit"
 msgstr "Konijn"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dragon"
 msgstr "Draak"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Snake"
 msgstr "Slang"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Horse"
 msgstr "Paard"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Goat"
 msgstr "Geit"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Monkey"
 msgstr "Aap"
 
-#: ../libpurple/protocols/qq/buddy_info.c:74
 msgid "Rooster"
 msgstr "Haan"
 
-#: ../libpurple/protocols/qq/buddy_info.c:74
 msgid "Dog"
 msgstr "Hond"
 
-#: ../libpurple/protocols/qq/buddy_info.c:74
 msgid "Pig"
 msgstr "Varken"
 
-#: ../libpurple/protocols/qq/buddy_info.c:79
 msgid "Other"
 msgstr "Anders"
 
-#: ../libpurple/protocols/qq/buddy_info.c:681
-#: ../libpurple/protocols/qq/buddy_info.c:682
 msgid "Modify my information"
 msgstr "Informatie wijzigen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:683
 msgid "Update my information"
 msgstr "Informatie bijwerken"
 
-#: ../libpurple/protocols/qq/buddy_info.c:707
 msgid "Your information has been updated"
 msgstr "Uw informatie is bijgewerkt"
 
-#: ../libpurple/protocols/qq/buddy_info.c:759
 #, c-format
-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 ""
+"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"
 
-#: ../libpurple/protocols/qq/buddy_info.c:776
-#: ../libpurple/protocols/qq/buddy_info.c:789
 msgid "Invalid QQ Face"
 msgstr "Ongeldige QQ-gezicht"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:207
-#: ../libpurple/protocols/qq/group_opt.c:114
 #, c-format
 msgid "You rejected %d's request"
 msgstr "U heeft %d's verzoek geweigerd"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:208
 msgid "Input your reason:"
-msgstr "Geef je reden:"
+msgstr "Geef uw reden:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:211
 msgid "Reject request"
 msgstr "Verzoek weigeren"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:212
-#: ../libpurple/protocols/qq/group_opt.c:119
 msgid "Sorry, you are not my type..."
 msgstr "Sorry, niet mijn type..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:281
 msgid "Add buddy with auth request failed"
 msgstr "Toevoegen van gebruiker met autenticifatieverzoeken mislukt"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:314
 msgid "You have successfully removed a buddy"
 msgstr "Je hebt het contact verwijderd"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:344
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "Je hebt jezelf succesvol bij de ander verwijderd als contact"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:407
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Gebruiker %d vereist autentificatie"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:409
-#: ../libpurple/protocols/qq/group_join.c:128
 msgid "Input request here"
-msgstr "Geef hier je verzoek"
+msgstr "Geef hier uw verzoek"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:410
-#: ../libpurple/protocols/qq/group_join.c:129
 msgid "Would you be my friend?"
-msgstr "Wil je mijn vriend zijn?"
+msgstr "Wilt u mijn vriend zijn?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../libpurple/protocols/qq/group_join.c:130
-#: ../libpurple/protocols/qq/group_opt.c:121
 msgid "Send"
 msgstr "Verzenden"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:421
 #, c-format
 msgid "You have added %d to buddy list"
-msgstr "Je hebt %d toegevoegd aan je contactenlijst"
+msgstr "Je hebt %d toegevoegd aan uw contactenlijst"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:518
 msgid "QQid Error"
 msgstr "QQid fout"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:519
 msgid "Invalid QQid"
 msgstr "Ongeldige QQid"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "Groep-ID"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Starter"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Groepsbeschrijving"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Auth"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Voer extern groeps-ID in"
 
-#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "U kunt alleen naar permanente QQ-groepen zoeken\n"
 
-#: ../libpurple/protocols/qq/group_im.c:123
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "Gebruiker %d wil deelnemen aan de groep %d"
 
-#: ../libpurple/protocols/qq/group_im.c:124
-#: ../libpurple/protocols/qq/group_im.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:199
 #, c-format
 msgid "Reason: %s"
 msgstr "Reden: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:133
-#: ../libpurple/protocols/qq/group_im.c:177
-#: ../libpurple/protocols/qq/group_im.c:214
-#: ../libpurple/protocols/qq/group_im.c:246
-#: ../libpurple/protocols/qq/group_im.c:277
-#: ../libpurple/protocols/qq/group_join.c:220
-#: ../libpurple/protocols/qq/group_join.c:341
-#: ../libpurple/protocols/qq/group_opt.c:215
-#: ../libpurple/protocols/qq/group_opt.c:289
-#: ../libpurple/protocols/qq/group_opt.c:379
 msgid "QQ Qun Operation"
 msgstr "QQ Qun operatie"
 
-#: ../libpurple/protocols/qq/group_im.c:138
-#: ../libpurple/protocols/qq/group_opt.c:106
-#: ../libpurple/protocols/qq/sys_msg.c:93
-#: ../libpurple/protocols/qq/sys_msg.c:254
 msgid "Approve"
 msgstr "Goedkeuren"
 
-#: ../libpurple/protocols/qq/group_im.c:174
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Uw aanvraag om lid te worden van groep %d is geweigerd door admin %d"
 
-#: ../libpurple/protocols/qq/group_im.c:212
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Uw aanvraag om lid te worden van groep %d is goedgekeurd door admin %d"
 
-#: ../libpurple/protocols/qq/group_im.c:245
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "U [%d] heeft groep \"%d\" verlaten"
 
-#: ../libpurple/protocols/qq/group_im.c:276
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "U [%d] bent toegevoegd aan groep \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:277
 msgid "This group has been added to your buddy list"
-msgstr "Deze groep is toegevoegd aan je contactenlijst"
+msgstr "Deze groep is toegevoegd aan uw contactenlijst"
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "Ik ben geen lid"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Ik ben lid"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Ik wil lid worden"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Ik ben de admin"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Onbekende status"
 
-#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Deze groep laat geen nieuwe deelnemers toe"
 
-#: ../libpurple/protocols/qq/group_join.c:220
 msgid "You have successfully left the group"
 msgstr "Je hebt de groep met succes verlaten"
 
-#: ../libpurple/protocols/qq/group_join.c:242
 msgid "QQ Group Auth"
 msgstr "QQ groepsauth"
 
-#: ../libpurple/protocols/qq/group_join.c:243
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "Uw autorisatieopdracht is geaccepteerd door de QQ-server"
 
-#: ../libpurple/protocols/qq/group_join.c:311
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Je bent een groep ID binnengekomen buiten de accepteerbare grootte."
 
-#: ../libpurple/protocols/qq/group_join.c:342
 msgid "Are you sure you want to leave this Qun?"
-msgstr "Wil je deze Qun echt verlaten?"
+msgstr "Wilt u deze Qun echt verlaten?"
 
-#: ../libpurple/protocols/qq/group_join.c:344
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
-"Opmerking: Als je de maker bent, \n"
+"Opmerking: Als u de maker bent, \n"
 "deze opdracht verwijdert deze Qun uiteindelijk."
 
-#: ../libpurple/protocols/qq/group_network.c:116
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Code [0x%02X]: %s"
-
-#: ../libpurple/protocols/qq/group_network.c:117
-msgid "Group Operation Error"
-msgstr "Groepsopdrachtfout"
-
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:101
-#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you want to approve the request?"
-msgstr "Wil je de aanvraag goedkeuren?"
+msgstr "Wilt u de aanvraag goedkeuren?"
 
-#: ../libpurple/protocols/qq/group_opt.c:115
 msgid "Enter your reason:"
-msgstr "Geef je reden:"
+msgstr "Geef uw reden:"
 
-#: ../libpurple/protocols/qq/group_opt.c:215
 msgid "You have successfully modified Qun member"
 msgstr "Je hebt succesvol een Qun-lid bewerkt"
 
-#: ../libpurple/protocols/qq/group_opt.c:289
 msgid "You have successfully modified Qun information"
 msgstr "Je hebt met succes Qun-informatie bewerkt"
 
-#: ../libpurple/protocols/qq/group_opt.c:380
 msgid "You have successfully created a Qun"
 msgstr "Je hebt een Qun aangemaakt"
 
-#: ../libpurple/protocols/qq/group_opt.c:382
 msgid "Would you like to set up the Qun details now?"
-msgstr "Wil je de Qun-details nu instellen?"
+msgstr "Wilt u de Qundetails nu instellen?"
 
-#: ../libpurple/protocols/qq/group_opt.c:386
 msgid "Setup"
 msgstr "Instellen"
 
-#: ../libpurple/protocols/qq/im.c:418
 msgid "System Message"
 msgstr "Systeembericht"
 
-#: ../libpurple/protocols/qq/im.c:561
 msgid "Failed to send IM."
 msgstr "Kan bericht niet verzenden"
 
-#: ../libpurple/protocols/qq/qq.c:229
 #, c-format
 msgid "Unknown-%d"
 msgstr "Onbekend-%d"
 
-#: ../libpurple/protocols/qq/qq.c:283
 msgid "Level"
 msgstr "Niveau"
 
-#: ../libpurple/protocols/qq/qq.c:289
 msgid "Member"
 msgstr "Lid"
 
-#: ../libpurple/protocols/qq/qq.c:292
 msgid " VIP"
 msgstr "VIP"
 
-#: ../libpurple/protocols/qq/qq.c:295
 msgid " TCP"
 msgstr "TCP"
 
-#: ../libpurple/protocols/qq/qq.c:298
 msgid " FromMobile"
 msgstr " Vanaf mobiel"
 
-#: ../libpurple/protocols/qq/qq.c:301
 #, fuzzy
 msgid " BindMobile"
 msgstr "Mobile"
 
-#: ../libpurple/protocols/qq/qq.c:304
 msgid " Video"
 msgstr "Video"
 
-#: ../libpurple/protocols/qq/qq.c:308
 msgid " Space"
 msgstr " Ruimte"
 
-#: ../libpurple/protocols/qq/qq.c:310
-#: ../libpurple/protocols/qq/qq.c:323
 msgid "Flag"
 msgstr "Vlag"
 
-#: ../libpurple/protocols/qq/qq.c:318
 msgid "Ver"
 msgstr ""
 
-#: ../libpurple/protocols/qq/qq.c:449
 msgid "Invalid name"
 msgstr "Ongeldige bijnaam"
 
-#: ../libpurple/protocols/qq/qq.c:515
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Nu online</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:516
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Laatst bijgewerkt</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:520
 #, c-format
 msgid "<b>Server</b>: %s: %d<br>\n"
 msgstr "<b>Server</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:521
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Verbinding</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:522
 #, c-format
 msgid "<b>Real hostname</b>: %s: %d<br>\n"
 msgstr "<b>Echte hostnaam</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:523
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Mijn openbare IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:528
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Aanmeldtijd</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:529
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>IP laatste aanmelding</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:530
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Laatst aangemald</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:534
 msgid "Login Information"
 msgstr "Aanmeldinformatie"
 
-#: ../libpurple/protocols/qq/qq.c:610
 msgid "Set My Information"
 msgstr "Mijn informatie instellen"
 
-#: ../libpurple/protocols/qq/qq.c:613
-#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Wachtwoord veranderen"
 
-#: ../libpurple/protocols/qq/qq.c:616
 msgid "Show Login Information"
 msgstr "Aanmeldinformatie weergeven"
 
-#: ../libpurple/protocols/qq/qq.c:637
 msgid "Leave this QQ Qun"
 msgstr "Laat dit QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:661
 msgid "Block this buddy"
 msgstr "Contact blokkeren"
 
@@ -10484,38 +7521,34 @@ msgstr "Contact blokkeren"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:778
-#: ../libpurple/protocols/qq/qq.c:780
 msgid "QQ Protocol\tPlugin"
-msgstr "QQ Protocol\tPlugin"
+msgstr "QQ Protocol\tPlug-in"
 
-#: ../libpurple/protocols/qq/qq.c:811
 msgid "Connect using TCP"
 msgstr "Verbinding met behulp van TCP"
 
-#: ../libpurple/protocols/qq/qq.c:814
 msgid "resend interval(s)"
 msgstr "intervallen opnieuw verzenden"
 
-#: ../libpurple/protocols/qq/qq.c:817
 msgid "Keep alive interval(s)"
 msgstr "Interval(len) om verbinding te behouden"
 
-#: ../libpurple/protocols/qq/qq.c:820
 msgid "Update interval(s)"
 msgstr "Intervallen vernieuwen"
 
-#: ../libpurple/protocols/qq/qq_network.c:144
-#: ../libpurple/protocols/qq/qq_network.c:799
+#, fuzzy, c-format
+msgid "Invalid token len, %d"
+msgstr "Ongeldige titel"
+
+msgid "Keep alive error"
+msgstr "Interval(len) om verbinding te behouden fout"
+
 msgid "Failed to connect server"
 msgstr "Kan geen verbinding maken met de server"
 
-#: ../libpurple/protocols/qq/qq_network.c:254
-#: ../libpurple/protocols/qq/qq_network.c:379
 msgid "Socket error"
 msgstr "Socketfout"
 
-#: ../libpurple/protocols/qq/qq_network.c:275
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -10524,361 +7557,320 @@ msgstr ""
 "Verbinding verloren met server:\n"
 "%d, %s"
 
-#: ../libpurple/protocols/qq/qq_network.c:392
 msgid "Unable to read from socket"
 msgstr "Kan niet lezen van socket"
 
-#: ../libpurple/protocols/qq/qq_network.c:458
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Schrijffout"
 
-#: ../libpurple/protocols/qq/qq_network.c:521
 msgid "Connection lost"
 msgstr "Verbinding verbroken"
 
-#: ../libpurple/protocols/qq/qq_network.c:707
-#: ../libpurple/protocols/simple/simple.c:1790
 msgid "Couldn't resolve host"
 msgstr "Kan host niet vinden"
 
-#: ../libpurple/protocols/qq/qq_network.c:806
 msgid "hostname is NULL or port is 0"
 msgstr "gastnaam is NULL of de poort is 0"
 
-#: ../libpurple/protocols/qq/qq_network.c:810
 #, c-format
 msgid "Connecting server %s, retries %d"
 msgstr "Verbonden server %s, probeert over %d opnieuw"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq_network.c:839
-#: ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:158
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:238
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1195
-#: ../libpurple/protocols/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "Kan geen verbinding maken."
 
-#: ../libpurple/protocols/qq/qq_network.c:853
-#: ../libpurple/protocols/simple/simple.c:1891
 msgid "Could not resolve hostname"
 msgstr "Kan hostnaam niet vinden"
 
-#: ../libpurple/protocols/qq/send_file.c:704
+msgid "Unable to login. Check debug log."
+msgstr "Kan niet aanmelden. Controleer debuglogboek."
+
+msgid "Unable to login"
+msgstr "Aanmelden niet mogelijk"
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+
+#, fuzzy
+msgid "Failed room reply"
+msgstr "Aanmelden mislukt, geen reactie!"
+
+#, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Je bent niet langer lid van groep \"%s\"\n"
+
+msgid "Can not decrypt login reply"
+msgstr ""
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "Ongeldig antwoord-code, 0x%02X"
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d heeft het onderwerp veranderd naar: %s"
 
-#: ../libpurple/protocols/qq/send_file.c:707
-#: ../libpurple/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr "Bestanden sturen"
 
-#: ../libpurple/protocols/qq/send_file.c:735
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d heeft de overdracht van %s afgebroken"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you want to add this buddy?"
-msgstr "Wil je deze contactpersoon toevoegen?"
+msgstr "Wilt u deze contact toevoegen?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:171
 #, c-format
 msgid "You have been added by %s"
 msgstr "U bent toegevoegd door %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
 msgid "Would you like to add him?"
-msgstr "Wil je hem/haar toevoegen?"
+msgstr "Wilt u hem/haar toevoegen?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:182
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
-msgstr "%s heeft je [%s] aan zijn/haar contactenlijst toegevoegd"
+msgstr "%s heeft u [%s] aan zijn/haar contactenlijst toegevoegd"
 
-#: ../libpurple/protocols/qq/sys_msg.c:198
 #, c-format
 msgid "User %s rejected your request"
-msgstr "De gebruiker %s heeft je verzoek geweigerd"
+msgstr "De gebruiker %s heeft uw verzoek geweigerd"
 
-#: ../libpurple/protocols/qq/sys_msg.c:218
 #, c-format
 msgid "User %s approved your request"
-msgstr "De gebruiker %s heeft je verzoek goedgekeurd"
+msgstr "De gebruiker %s heeft uw verzoek goedgekeurd"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:244
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s wil jou [%s] als vriend toevoegen"
 
-#: ../libpurple/protocols/qq/sys_msg.c:245
 #, c-format
 msgid "Message: %s"
 msgstr "Bericht: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:267
 #, c-format
 msgid "%s is not in your buddy list"
-msgstr "%s staat niet in je contactenlijst"
+msgstr "%s staat niet in uw contactenlijst"
 
-#: ../libpurple/protocols/qq/sys_msg.c:287
 #, c-format
 msgid "Notice from: %s"
 msgstr "Aankondiging van: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:288
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../libpurple/protocols/sametime/sametime.c:420
 msgid "Connection closed (writing)"
 msgstr "Verbinding verbroken (schrijven)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1294
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Groepstitel:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes groeps-ID:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1297
 #, c-format
 msgid "Info for Group %s"
 msgstr "Info voor groep %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1299
 msgid "Notes Address Book Information"
 msgstr "Notes adresboekinformatie"
 
-#: ../libpurple/protocols/sametime/sametime.c:1331
 msgid "Invite Group to Conference..."
 msgstr "Groep uitnodigen voor conferentie..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1341
 msgid "Get Notes Address Book Info"
 msgstr "Notes Adresboekinformatie ophalen"
 
-#: ../libpurple/protocols/sametime/sametime.c:1508
 msgid "Sending Handshake"
 msgstr "Sturen van handshake"
 
-#: ../libpurple/protocols/sametime/sametime.c:1513
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Wacht op antwoord"
 
-#: ../libpurple/protocols/sametime/sametime.c:1518
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Contact gelegd. Bezig met aanmelding"
 
-#: ../libpurple/protocols/sametime/sametime.c:1523
 msgid "Waiting for Login Acknowledgement"
 msgstr "Wacht op bevestiging aanmelding"
 
-#: ../libpurple/protocols/sametime/sametime.c:1528
 msgid "Login Redirected"
 msgstr "Aanmelding doorgestuurd"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Forcing Login"
 msgstr "Aanmelden forceren"
 
-#: ../libpurple/protocols/sametime/sametime.c:1538
 msgid "Login Acknowledged"
 msgstr "Aanmelding bevestigd"
 
-#: ../libpurple/protocols/sametime/sametime.c:1543
 msgid "Starting Services"
 msgstr "Starten van service"
 
-#: ../libpurple/protocols/sametime/sametime.c:1680
 #, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr "Een Sametime-beheerder heeft de volgende mededeling gedaan op de server %s"
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+"Een Sametime-beheerder heeft de volgende mededeling gedaan op de server %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1685
 msgid "Sametime Administrator Announcement"
 msgstr "Aankondiging sametime-beheerder"
 
-#: ../libpurple/protocols/sametime/sametime.c:1738
 msgid "Connection reset"
 msgstr "Verbindingsfout"
 
-#: ../libpurple/protocols/sametime/sametime.c:1750
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Er is een fout opgetreden bij het lezen van de socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1775
-#: ../libpurple/protocols/sametime/sametime.c:3782
 msgid "Unable to connect to host"
 msgstr "Kan geen verbinding maken met de computer"
 
-#: ../libpurple/protocols/sametime/sametime.c:1816
 #, c-format
 msgid "Announcement from %s"
 msgstr "Aankondiging van %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1990
 msgid "Conference Closed"
 msgstr "Conferentie afgesloten"
 
-#: ../libpurple/protocols/sametime/sametime.c:2455
 msgid "Unable to send message: "
 msgstr "Kan bericht niet verzenden:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3011
 msgid "Place Closed"
 msgstr "Plek gesloten"
 
-#: ../libpurple/protocols/sametime/sametime.c:3281
 msgid "Microphone"
 msgstr "Microfoon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3282
 msgid "Speakers"
 msgstr "Speakers"
 
-#: ../libpurple/protocols/sametime/sametime.c:3283
 msgid "Video Camera"
 msgstr "Videocamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3321
-#: ../libpurple/protocols/sametime/sametime.c:4201
 msgid "Supports"
 msgstr "Ondersteuning"
 
-#: ../libpurple/protocols/sametime/sametime.c:3326
-#: ../libpurple/protocols/sametime/sametime.c:4175
 msgid "External User"
 msgstr "Externe Gebruiker"
 
-#: ../libpurple/protocols/sametime/sametime.c:3432
 msgid "Create conference with user"
 msgstr "Conferentie starten met gebruiker"
 
-#: ../libpurple/protocols/sametime/sametime.c:3433
 #, c-format
-msgid "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 sturen"
+msgid ""
+"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 "
+"sturen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3437
 msgid "New Conference"
 msgstr "Nieuwe conferentie"
 
-#: ../libpurple/protocols/sametime/sametime.c:3439
 msgid "Create"
 msgstr "Aanmaken"
 
-#: ../libpurple/protocols/sametime/sametime.c:3504
 msgid "Available Conferences"
 msgstr "Beschikbare bijeenkomsten"
 
-#: ../libpurple/protocols/sametime/sametime.c:3510
 msgid "Create New Conference..."
 msgstr "Nieuwe bijeenkomst..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3517
 msgid "Invite user to a conference"
 msgstr "Gebruiker uitnodigen voor een bijeenkomst"
 
-#: ../libpurple/protocols/sametime/sametime.c:3518
 #, c-format
-msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
-msgstr "Kies een bijeenkomst uit onderstaande lijst om een uitnodiging naar %s te sturen. Kies \"Nieuwe bijeenkomst\" als je een nieuwe bijeenkomst wilt aanmaken."
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"Kies een bijeenkomst uit onderstaande lijst om een uitnodiging naar %s te "
+"sturen. Kies \"Nieuwe bijeenkomst\" als u een nieuwe bijeenkomst wilt "
+"aanmaken."
 
-#: ../libpurple/protocols/sametime/sametime.c:3523
 msgid "Invite to Conference"
 msgstr "Uitnodigen voor bijeenkomst"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "Invite to Conference..."
 msgstr "Uitnodigen voor bijeenkomst..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3619
 msgid "Send TEST Announcement"
 msgstr "TESTaankondiging sturen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3638
-#: ../pidgin/gtkconv.c:4555
 msgid "Topic:"
 msgstr "Onderwerp:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3666
 msgid "No Sametime Community Server specified"
 msgstr "Geen Sametime communityserver gegeven"
 
-#: ../libpurple/protocols/sametime/sametime.c:3691
 #, c-format
-msgid "No host or IP address has been configured for the Meanwhile account %s. Please enter one below to continue logging in."
-msgstr "Er is geen computernaam of IP-adres inegsteld in Meanwhile-account %s. Vul hieronder één in om door te gaan met de aanmelding."
+msgid ""
+"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 "
+"hieronder één in om door te gaan met de aanmelding."
 
-#: ../libpurple/protocols/sametime/sametime.c:3696
 msgid "Meanwhile Connection Setup"
 msgstr "Instellen van verbinding"
 
-#: ../libpurple/protocols/sametime/sametime.c:3697
 msgid "No Sametime Community Server Specified"
 msgstr "Geen Sametime gemeenschapsserver gegeven"
 
-#: ../libpurple/protocols/sametime/sametime.c:3699
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../libpurple/protocols/sametime/sametime.c:4191
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Onbekend (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4193
 msgid "Last Known Client"
 msgstr "Laatst bekende client"
 
 # ui/epiphany.glade.h:126
 # ui/prompts.glade.h:3
-#: ../libpurple/protocols/sametime/sametime.c:4357
-#: ../libpurple/protocols/sametime/sametime.c:5562
 msgid "User Name"
 msgstr "Gebruikersnaam"
 
-#: ../libpurple/protocols/sametime/sametime.c:4360
-#: ../libpurple/protocols/sametime/sametime.c:5565
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4384
 msgid "An ambiguous user ID was entered"
 msgstr "Er is een onduidelijk ID ingevuld"
 
-#: ../libpurple/protocols/sametime/sametime.c:4385
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. Please select the correct user from the list below to add them to your buddy list."
-msgstr "Er zijn meerdere gebruikers gevonden die overeenkomen met '%s'. Kies de juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. Please "
+"select the correct user from the list below to add them to your buddy list."
+msgstr ""
+"Er zijn meerdere gebruikers gevonden die overeenkomen met '%s'. Kies de "
+"juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
 
-#: ../libpurple/protocols/sametime/sametime.c:4390
 msgid "Select User"
 msgstr "Gebruiker selecteren"
 
-#: ../libpurple/protocols/sametime/sametime.c:4474
 msgid "Unable to add user: user not found"
 msgstr "Kan gebruiker niet toevoegen: gebruiker niet gevonden"
 
-#: ../libpurple/protocols/sametime/sametime.c:4476
 #, c-format
-msgid "The identifier '%s' did not match any users in your Sametime community. This entry has been removed from your buddy list."
-msgstr "Identificatie '%s' heeft geen overeenkomende gebruikers in je Sametime-groep. Deze ingang is uit je lijst verwijderd."
+msgid ""
+"The identifier '%s' did not match any users in your Sametime community. This "
+"entry has been removed from your buddy list."
+msgstr ""
+"Identificatie '%s' heeft geen overeenkomende gebruikers in uw Sametime-"
+"groep. Deze ingang is uit uw lijst verwijderd."
 
-#: ../libpurple/protocols/sametime/sametime.c:5067
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10887,240 +7879,178 @@ msgstr ""
 "Fout bij lezen van %s: \n"
 "%s.\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Remotely Stored Buddy List"
 msgstr "Op server opgeslagen contactenlijst"
 
-#: ../libpurple/protocols/sametime/sametime.c:5207
 msgid "Buddy List Storage Mode"
 msgstr "Opslaan van contactenlijst"
 
-#: ../libpurple/protocols/sametime/sametime.c:5210
 msgid "Local Buddy List Only"
 msgstr "Alleen lokale contactenlijst"
 
-#: ../libpurple/protocols/sametime/sametime.c:5212
 msgid "Merge List from Server"
 msgstr "Lijst downloaden van server en samenvoegen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5214
 msgid "Merge and Save List to Server"
 msgstr "Lijst samenvoegen en opslaan op server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5216
 msgid "Synchronize List with Server"
 msgstr "Lijst met server synchroniseren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5271
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Sametime-lijst importen voor %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Sametime-lijst exporteren voor %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5365
 msgid "Unable to add group: group exists"
 msgstr "kan groep niet toevoegen: groep bestaat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5366
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Er bestaat al een groep in de lijst met de naam '%s'."
 
-#: ../libpurple/protocols/sametime/sametime.c:5369
-#: ../libpurple/protocols/sametime/sametime.c:5499
 msgid "Unable to add group"
 msgstr "Kan groep niet toevoegen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5428
 msgid "Possible Matches"
 msgstr "Mogelijke overeenkomende items"
 
-#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Notes Address Book group results"
 msgstr "Notes adresboek groepsresultaten"
 
-#: ../libpurple/protocols/sametime/sametime.c:5445
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
-msgstr "De identificatie '%s' kan naar ieder van de volgende groepen verwijzen. Kies de juiste uit de lijst hieronder."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+"De identificatie '%s' kan naar ieder van de volgende groepen verwijzen. Kies "
+"de juiste uit de lijst hieronder."
 
-#: ../libpurple/protocols/sametime/sametime.c:5450
 msgid "Select Notes Address Book"
 msgstr "Notes adresboek selecteren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5493
 msgid "Unable to add group: group not found"
 msgstr "Kan groep niet toevoegen: groep niet gevonden"
 
-#: ../libpurple/protocols/sametime/sametime.c:5495
 #, c-format
-msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
 msgstr "De identificatie '%s' gaf geen overeenkomende resultaten."
 
-#: ../libpurple/protocols/sametime/sametime.c:5536
 msgid "Notes Address Book Group"
 msgstr "Notes adresboekgroep"
 
-#: ../libpurple/protocols/sametime/sametime.c:5537
-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 je contactenlijst."
+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."
 
-#: ../libpurple/protocols/sametime/sametime.c:5586
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Zoekresultaten voor '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5587
 #, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
-msgstr "De identificatie '%s' kan naar ieder van de volgende gebruikers verwijzen. Je kunt deze gebruikers toevoegen aan je lijst of berichten sturen door middel van de knoppen hieronder."
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"De identificatie '%s' kan naar ieder van de volgende gebruikers verwijzen. U "
+"kunt deze gebruikers toevoegen aan uw lijst of berichten sturen door middel "
+"van de knoppen hieronder."
 
-#: ../libpurple/protocols/sametime/sametime.c:5594
-#: ../pidgin/gtknotify.c:794
 msgid "Search Results"
 msgstr "Zoekresultaten"
 
-#: ../libpurple/protocols/sametime/sametime.c:5619
 msgid "No matches"
 msgstr "Geen overeenkomsten"
 
-#: ../libpurple/protocols/sametime/sametime.c:5620
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "De identificatie '%s' gaf geen overeenkomende resultaten."
 
-#: ../libpurple/protocols/sametime/sametime.c:5624
 msgid "No Matches"
 msgstr "Geen overeenkomstige resultaten"
 
-#: ../libpurple/protocols/sametime/sametime.c:5661
 msgid "Search for a user"
 msgstr "Gebruiker zoeken"
 
-#: ../libpurple/protocols/sametime/sametime.c:5662
-msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
-msgstr "Geef een naam of gedeeltelijk ID in het veld hieronder om te zoeken naar overeenkomende gebruikers"
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"Geef een naam of gedeeltelijk ID in het veld hieronder om te zoeken naar "
+"overeenkomende gebruikers"
 
-#: ../libpurple/protocols/sametime/sametime.c:5665
 msgid "User Search"
 msgstr "Gebruiker zoeken"
 
-#: ../libpurple/protocols/sametime/sametime.c:5678
 msgid "Import Sametime List..."
 msgstr "Sametime-lijst importeren..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5682
 msgid "Export Sametime List..."
 msgstr "Sametime-lijst exporteren..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5686
 msgid "Add Notes Address Book Group..."
 msgstr "Notes adresboekgroep toevoegen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5690
 msgid "User Search..."
 msgstr "Gebruiker zoeken..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Force login (ignore server redirects)"
 msgstr "Aanmelding forceren (server redirect negeren)"
 
 #  pretend to be Sametime Connect
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5806
 msgid "Hide client identity"
 msgstr "Doen alsof we de echte client zijn"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Gebruiker %s is niet aanwezig op het netwerk"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Sleutels uitwisselen"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Kan sleutels niet uitwisselen"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Fout opgetreden bij uitwisseling van sleutels"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Uitwisseling van sleutels mislukt"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Tijd verlopen voor uitwisseling van sleutels"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Uitwisseling van sleutels afgebroken"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Uitwisseling van sleutels is al gestart"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
-msgstr "Je kan geen sleutels uitwisselen met jezelf"
-
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
+msgstr "Kan geen sleutels uitwisselen met uzelf"
+
 msgid "The remote user is not present in the network any more"
 msgstr "De andere gebruiker is niet meer aanwezig in het netwerk"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
-msgstr "%s wil sleutels uitwisselen. Wil je sleutels met deze persoon uitwisselen?"
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Verzoek tot uitwisselen van sleutels ontvangen van %s. Wilt u sleutels met "
+"deze persoon uitwisselen?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -11131,908 +8061,485 @@ msgstr ""
 "Computer: %s\n"
 "Poort: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Verzoek tot sleuteluitwisseling"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "IM met wachtwoord"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Kan IM-sleutel niet instellen"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "IM-wachtwoord instellen"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc/ops.c:1527
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Openbare sleutel ophalen"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1517
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Kan publieke sleutel niet ophalen"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1670
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1669
 msgid "Show Public Key"
 msgstr "Publieke sleutel weergeven"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Kan publieke sleutel niet laden"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1066
-#: ../libpurple/protocols/silc/ops.c:1181
-#: ../libpurple/protocols/silc/ops.c:1303
-#: ../libpurple/protocols/silc/ops.c:1304
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Gebruikersinformatie"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1182
-#: ../libpurple/protocols/silc/ops.c:1323
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Kan gebruikersinformatie niet ophalen"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "De persoon %s is niet betrouwbaar"
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/buddy.c:738
-msgid "You cannot receive buddy notifications until you import his/her public key.  You can use the Get Public Key command to get the public key."
-msgstr "Je kan geen meldingen krijgen totdat je de openbare sleutel van deze gebruiker importeert.  Je kan de opdracht \"Openbare sleutel ophalen\" gebruiken om de openbare sleutel te importeren."
+msgid ""
+"You cannot receive buddy notifications until you import his/her public key.  "
+"You can use the Get Public Key command to get the public key."
+msgstr ""
+"Je kan geen meldingen krijgen totdat u de openbare sleutel van deze "
+"gebruiker importeert.  Je kan de opdracht \"Openbare sleutel ophalen\" "
+"gebruiken om de openbare sleutel te importeren."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Openen..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "De %s contactpersoon is niet aanwezig op het netwerk"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc10/buddy.c:1084
-msgid "To add the buddy you must import his/her public key. Press Import to import a public key."
-msgstr "Om de gebruiker toe te voegen is het nodig zijn/haar publieke sleutel te importeren. Klik op \"Importeren\" om de publieke sleutel te importeren."
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"Om de gebruiker toe te voegen moet u de openbare sleutel importeren. Klik op "
+"\"Importeren\" om de openbare sleutel te importeren."
 
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
 msgid "_Import..."
 msgstr "_Importeren..."
 
-#: ../libpurple/protocols/silc/buddy.c:1186
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Kies juiste gebruiker"
 
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc10/buddy.c:1186
-msgid "More than one user was found with the same public key. Select the correct user from the list to add to the buddy list."
-msgstr "Er zijn meerdere gebruikers gevonden met dezelfde openbare sleutel. Kies de juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
+msgid ""
+"More than one user was found with the same public key. Select the correct "
+"user from the list to add to the buddy list."
+msgstr ""
+"Er zijn meerdere gebruikers gevonden met dezelfde openbare sleutel. Kies de "
+"juiste gebruiker uit de lijst om deze toe te voegen aan de contactenlijst."
 
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc10/buddy.c:1188
-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."
+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."
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Detached"
 msgstr "Losgekoppeld"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:59
-#: ../libpurple/protocols/silc10/buddy.c:1493
-#: ../libpurple/protocols/silc10/silc.c:50
 msgid "Indisposed"
 msgstr "Gammel"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:61
-#: ../libpurple/protocols/silc10/buddy.c:1497
-#: ../libpurple/protocols/silc10/silc.c:52
 msgid "Wake Me Up"
 msgstr "Maak me wakker"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:53
-#: ../libpurple/protocols/silc10/buddy.c:1499
-#: ../libpurple/protocols/silc10/silc.c:44
 msgid "Hyper Active"
 msgstr "Hyperactief"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc10/buddy.c:1501
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/silc.c:978
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:515
 msgid "Happy"
 msgstr "Blij"
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:980
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/util.c:517
 msgid "Sad"
 msgstr "Verdrietig"
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:982
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:519
 msgid "Angry"
 msgstr "Boos"
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:984
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:521
 msgid "Jealous"
 msgstr "Jaloers"
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:986
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:523
 msgid "Ashamed"
 msgstr "Beschaamd"
 
-#: ../libpurple/protocols/silc/buddy.c:1518
-#: ../libpurple/protocols/silc/silc.c:988
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1518
-#: ../libpurple/protocols/silc10/silc.c:689
-#: ../libpurple/protocols/silc10/util.c:525
 msgid "Invincible"
 msgstr "Onoverwinnelijk"
 
-#: ../libpurple/protocols/silc/buddy.c:1520
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1520
-#: ../libpurple/protocols/silc10/util.c:527
 msgid "In Love"
 msgstr "Verliefd"
 
-#: ../libpurple/protocols/silc/buddy.c:1522
-#: ../libpurple/protocols/silc/silc.c:992
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1522
-#: ../libpurple/protocols/silc10/silc.c:693
-#: ../libpurple/protocols/silc10/util.c:529
 msgid "Sleepy"
 msgstr "Slaperig"
 
-#: ../libpurple/protocols/silc/buddy.c:1524
-#: ../libpurple/protocols/silc/silc.c:994
-#: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1524
-#: ../libpurple/protocols/silc10/silc.c:695
-#: ../libpurple/protocols/silc10/util.c:531
 msgid "Bored"
 msgstr "Verveeld"
 
-#: ../libpurple/protocols/silc/buddy.c:1526
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1526
-#: ../libpurple/protocols/silc10/silc.c:697
-#: ../libpurple/protocols/silc10/util.c:533
 msgid "Excited"
 msgstr "Opgewonden"
 
-#: ../libpurple/protocols/silc/buddy.c:1528
-#: ../libpurple/protocols/silc/silc.c:998
-#: ../libpurple/protocols/silc/util.c:542
-#: ../libpurple/protocols/silc10/buddy.c:1528
-#: ../libpurple/protocols/silc10/silc.c:699
-#: ../libpurple/protocols/silc10/util.c:535
 msgid "Anxious"
 msgstr "Angstig"
 
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1220
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Gebruikersmodi"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1237
-#: ../libpurple/protocols/silc10/buddy.c:1577
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Voorkeurscontact"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1242
-#: ../libpurple/protocols/silc10/buddy.c:1582
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Voorkeurstaal"
 
-#: ../libpurple/protocols/silc/buddy.c:1587
-#: ../libpurple/protocols/silc/ops.c:1247
-#: ../libpurple/protocols/silc10/buddy.c:1587
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Apparaat"
 
-#: ../libpurple/protocols/silc/buddy.c:1592
-#: ../libpurple/protocols/silc/ops.c:1252
-#: ../libpurple/protocols/silc10/buddy.c:1592
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:747
-#: ../libpurple/protocols/silc10/silc.c:749
 msgid "Timezone"
 msgstr "Tijdzone"
 
-#: ../libpurple/protocols/silc/buddy.c:1597
-#: ../libpurple/protocols/silc/ops.c:1257
-#: ../libpurple/protocols/silc10/buddy.c:1597
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geo-locatie"
 
-#: ../libpurple/protocols/silc/buddy.c:1653
-#: ../libpurple/protocols/silc10/buddy.c:1651
 msgid "Reset IM Key"
 msgstr "IM-sleutel resetten"
 
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "IM with Key Exchange"
 msgstr "IM met sleuteluitwisseling"
 
-#: ../libpurple/protocols/silc/buddy.c:1663
-#: ../libpurple/protocols/silc10/buddy.c:1662
 msgid "IM with Password"
 msgstr "IM met wachtwoord"
 
-#: ../libpurple/protocols/silc/buddy.c:1676
-#: ../libpurple/protocols/silc10/buddy.c:1675
 msgid "Get Public Key..."
 msgstr "Openbare sleutel ophalen..."
 
-#: ../libpurple/protocols/silc/buddy.c:1683
-#: ../libpurple/protocols/silc/ops.c:1625
-#: ../libpurple/protocols/silc10/buddy.c:1682
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Gebruiker vernietigen"
 
-#: ../libpurple/protocols/silc/buddy.c:1693
-#: ../libpurple/protocols/silc/chat.c:1000
-#: ../libpurple/protocols/silc10/buddy.c:1692
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Tekenen op whiteboard"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Wachtwoord:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanaal %s bestaat niet in het netwerk"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:176
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Kanaal informatie"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Kan kanaalinformatie niet ophalen"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanaalnaam:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Aantal gebruikers:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanaalstarter:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanaalcodering:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanaal-HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanaalonderwerp:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanaalmodi:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Vingerafdruk van oprichter:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Babbleprint van oprichter:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:237
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Openbare kanaalsleutel toevoegen"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:305
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Openbare sleutel openen..."
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanaalwachtwoord"
 
-#: ../libpurple/protocols/silc/chat.c:431
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Lijst van openbare sleutels in kanaal"
 
-#: ../libpurple/protocols/silc/chat.c:436
-#: ../libpurple/protocols/silc10/chat.c:413
-msgid "Channel authentication is used to secure the channel from unauthorized access. The authentication may be based on passphrase and digital signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
-msgstr "Kanaalidentificatie wordt gebruikt om het kanaal te beveiligen tegen ongewenste personen. De identificaite 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."
-
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:934
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
+#, c-format
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"Kanaalidentificatie wordt gebruikt om het kanaal te beveiligen tegen "
+"ongewenste personen. De identificaite 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"
 
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Toevoegen / verwijderen"
 
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Groepsnaam"
 
-#: ../libpurple/protocols/silc/chat.c:604
-#: ../libpurple/protocols/silc/ops.c:1830
-#: ../libpurple/protocols/silc/silc.c:1255
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1907
-#: ../libpurple/protocols/silc10/silc.c:956
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Geef de %s privé groepsnaam en het wachtwoord."
 
-#: ../libpurple/protocols/silc/chat.c:617
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Privégroep toevoegen"
 
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Maximaal aantal gebruikers"
 
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr "Limiet stellen aan aantal gebruikers. Nul schakelt deze functie uit."
 
-#: ../libpurple/protocols/silc/chat.c:914
-#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Uitnodigingslijst"
 
-#: ../libpurple/protocols/silc/chat.c:919
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Verbanningslijst"
 
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Privégroep toevoegen"
 
-#: ../libpurple/protocols/silc/chat.c:940
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Permanent resetten"
 
-#: ../libpurple/protocols/silc/chat.c:945
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Permanent instellen"
 
-#: ../libpurple/protocols/silc/chat.c:953
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Gebruikerslimiet instellen"
 
-#: ../libpurple/protocols/silc/chat.c:959
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Beperkingen voor onderwerp resetten"
 
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Beperkingen voor onderwerp instellen"
 
-#: ../libpurple/protocols/silc/chat.c:971
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Privé-kanaal resetten"
 
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Privé-kanaal instellen"
 
-#: ../libpurple/protocols/silc/chat.c:983
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Geheim kanaal herstellen"
 
-#: ../libpurple/protocols/silc/chat.c:988
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Geheim kanaal instellen"
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
-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 je kan deelnemen aan de privé-groep"
+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"
 
-#: ../libpurple/protocols/silc/chat.c:1051
-#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Deelnemen aan privégroep"
 
-#: ../libpurple/protocols/silc/chat.c:1052
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
-msgstr "Kan niet deelnemen aan privégroep"
+msgstr "Kan niet deelnamen aan privégroep"
 
-#: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1452
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1162
 msgid "Call Command"
 msgstr "Oproep-opdracht"
 
-#: ../libpurple/protocols/silc/chat.c:1248
-#: ../libpurple/protocols/silc/silc.c:1453
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1162
 msgid "Cannot call command"
 msgstr "Kan opdracht niet starten"
 
-#: ../libpurple/protocols/silc/chat.c:1249
-#: ../libpurple/protocols/silc/silc.c:1454
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1163
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: ../libpurple/protocols/silc/ft.c:85
-#: ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104
-#: ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112
-#: ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120
-#: ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277
-#: ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288
-#: ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89
-#: ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Beveiligde bestandsoverdrachten"
 
-#: ../libpurple/protocols/silc/ft.c:86
-#: ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105
-#: ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113
-#: ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121
-#: ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93
-#: ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Fout bij bestandsoverdracht"
 
-#: ../libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "Computer verbroken"
 
-#: ../libpurple/protocols/silc/ft.c:106
-#: ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Geen toegang"
 
-#: ../libpurple/protocols/silc/ft.c:110
-#: ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Uitwisseling van sleutels mislukt"
 
-#: ../libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Verbinding verlopen"
 
-#: ../libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Verbinding maken mislukt"
 
-#: ../libpurple/protocols/silc/ft.c:122
-#: ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Sessie voor bestandsoverdracht is niet aanwezig"
 
-#: ../libpurple/protocols/silc/ft.c:273
-#: ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Geen sessie voor bestandsoverdracht actief"
 
-#: ../libpurple/protocols/silc/ft.c:278
-#: ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Bestandsoverdracht reeds gestart"
 
-#: ../libpurple/protocols/silc/ft.c:283
-#: ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
-msgstr "Kan geen overeenkomst bereiken over benodigde sleutels voor bestandsoverdracht"
+msgstr ""
+"Kan geen overeenkomst bereiken over benodigde sleutels voor "
+"bestandsoverdracht"
 
-#: ../libpurple/protocols/silc/ft.c:289
-#: ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Kan bestandsoverdracht niet starten"
 
-#: ../libpurple/protocols/silc/ft.c:426
-#: ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Kan bestand niet verzenden"
 
-#: ../libpurple/protocols/silc/ops.c:76
 msgid "Error occurred"
 msgstr "Fout is opgetreden"
 
-#: ../libpurple/protocols/silc/ops.c:548
-#: ../libpurple/protocols/silc/ops.c:557
-#: ../libpurple/protocols/silc/ops.c:566
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s heeft het onderwerp van <I>%s</I>veranderd naar: %s"
 
-#: ../libpurple/protocols/silc/ops.c:632
-#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> heeft kanaalinstellingen voor <I>%s</I> veranderd naar: %s"
 
-#: ../libpurple/protocols/silc/ops.c:636
-#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> heeft alle kanaalinstellingen voor <I>%s</I> verwijderd"
 
-#: ../libpurple/protocols/silc/ops.c:669
-#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> heeft <I>%s's</I> instellingen veranderd naar: %s"
 
-#: ../libpurple/protocols/silc/ops.c:677
-#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> heeft <I>%s's</I> instellingen verwijderd"
 
-#: ../libpurple/protocols/silc/ops.c:706
-#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "U bent uit <I>%s</I> weggeschopt door <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:733
-#: ../libpurple/protocols/silc/ops.c:738
-#: ../libpurple/protocols/silc/ops.c:743
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "U bent vernietigd door %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:764
-#: ../libpurple/protocols/silc/ops.c:769
-#: ../libpurple/protocols/silc/ops.c:774
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Vernietigd door %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:811
-#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Server afgemeld"
 
-#: ../libpurple/protocols/silc/ops.c:997
-#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Persoonlijke informatie"
 
-#: ../libpurple/protocols/silc/ops.c:1020
-#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Geboortedatum"
 
-#: ../libpurple/protocols/silc/ops.c:1028
-#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Rol"
 
-#: ../libpurple/protocols/silc/ops.c:1032
-#: ../libpurple/protocols/silc/silc.c:1248
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:949
 msgid "Organization"
 msgstr "Organisatie"
 
-#: ../libpurple/protocols/silc/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Afdeling"
 
-#: ../libpurple/protocols/silc/ops.c:1060
-#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Opmerking"
 
-#: ../libpurple/protocols/silc/ops.c:1106
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Chat openen"
 
-#: ../libpurple/protocols/silc/ops.c:1140
-#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "U bent kanaaloprichter op <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1144
-#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanaaloprichter voor <I>%s</I> is <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1203
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1074
 msgid "Real Name"
 msgstr "Echte naam"
 
-#: ../libpurple/protocols/silc/ops.c:1231
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Statustekst"
 
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1367
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Vingerafdruk van openbare sleutel"
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc/ops.c:1368
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Openbare babbleprint"
 
-#: ../libpurple/protocols/silc/ops.c:1307
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Meer..."
 
-#: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc/silc.c:1312
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:1013
 msgid "Detach From Server"
 msgstr "Loskoppelen van server"
 
-#: ../libpurple/protocols/silc/ops.c:1386
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Kan niet loskoppelen"
 
-#: ../libpurple/protocols/silc/ops.c:1406
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Kan onderwerp niet veranderen"
 
-#: ../libpurple/protocols/silc/ops.c:1435
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Kan bijnaam niet veranderen"
 
-#: ../libpurple/protocols/silc/ops.c:1484
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Lijst van ruimtes"
 
-#: ../libpurple/protocols/silc/ops.c:1484
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Kan lijst van ruimtes niet opvragen"
 
-#: ../libpurple/protocols/silc/ops.c:1485
 msgid "Network is empty"
 msgstr "Netwerk is leeg"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Geen publieke sleutel ontvangen"
 
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc/ops.c:1554
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Server-informatie"
 
-#: ../libpurple/protocols/silc/ops.c:1542
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Kan geen serverinformatie vinden"
 
-#: ../libpurple/protocols/silc/ops.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Serverstatistieken"
 
-#: ../libpurple/protocols/silc/ops.c:1566
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Kan geen serverstatistieken vinden"
 
-#: ../libpurple/protocols/silc/ops.c:1573
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -12067,72 +8574,49 @@ msgstr ""
 "Totaal aantal server-operators: %d\n"
 "Totaal aantal router-operators: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Netwerkstatistieken"
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping mislukt"
 
-#: ../libpurple/protocols/silc/ops.c:1618
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Antwoord ontvangen van server"
 
-#: ../libpurple/protocols/silc/ops.c:1626
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Kan gebruiker niet vernietigen"
 
-#: ../libpurple/protocols/silc/ops.c:1665
 msgid "WATCH"
 msgstr "KIJK"
 
-#: ../libpurple/protocols/silc/ops.c:1665
 msgid "Cannot watch user"
 msgstr "Kan gebruiker niet bekijken"
 
-#: ../libpurple/protocols/silc/ops.c:1741
-#: ../libpurple/protocols/silc/ops.c:1792
-#: ../libpurple/protocols/silc/silc.c:395
-#: ../libpurple/protocols/silc10/ops.c:1817
-#: ../libpurple/protocols/silc10/ops.c:1864
-#: ../libpurple/protocols/silc10/silc.c:194
 msgid "Resuming session"
 msgstr "Herstellen van sessie"
 
-#: ../libpurple/protocols/silc/ops.c:1743
-#: ../libpurple/protocols/silc10/ops.c:1819
 msgid "Authenticating connection"
 msgstr "Certificeren van verbinding"
 
-#: ../libpurple/protocols/silc/ops.c:1794
-#: ../libpurple/protocols/silc10/ops.c:1866
 msgid "Verifying server public key"
 msgstr "Verificatie van serversleutel"
 
-#: ../libpurple/protocols/silc/ops.c:1831
-#: ../libpurple/protocols/silc10/ops.c:1908
 msgid "Passphrase required"
 msgstr "Wachtwoord vereist"
 
-#: ../libpurple/protocols/silc/pk.c:98
-#: ../libpurple/protocols/silc10/pk.c:104
 #, c-format
-msgid "Received %s's public key. Your local copy does not match this key. Would you still like to accept this public key?"
-msgstr "%s's openbare sleutel ontvangen. Deze komt niet overeen met de opgeslagen sleutel. Wil je de publieke sleutel nog steeds accepteren?"
+msgid ""
+"Received %s's public key. Your local copy does not match this key. Would you "
+"still like to accept this public key?"
+msgstr ""
+"%s's openbare sleutel ontvangen. Deze komt niet overeen met de opgeslagen "
+"sleutel. Wil je de publieke sleutel nog steeds accepteren?"
 
-#: ../libpurple/protocols/silc/pk.c:103
-#: ../libpurple/protocols/silc10/pk.c:109
 #, 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?"
+msgstr ""
+"%s's openbare sleutel ontvangen. Wil je de publieke sleutel accepteren?"
 
-#: ../libpurple/protocols/silc/pk.c:107
-#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12145,113 +8629,69 @@ msgstr ""
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110
-#: ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Openbare sleutel verifiëren"
 
-#: ../libpurple/protocols/silc/pk.c:115
-#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "B_eeld..."
 
-#: ../libpurple/protocols/silc/pk.c:140
-#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Type openbare sleutel niet ondersteund"
 
-#: ../libpurple/protocols/silc/silc.c:320
-#: ../libpurple/protocols/silc10/ops.c:1755
 msgid "Disconnected by server"
 msgstr "Verbinding verbroken door server"
 
-#: ../libpurple/protocols/silc/silc.c:328
-#: ../libpurple/protocols/silc10/ops.c:1701
 msgid "Error during connecting to SILC Server"
 msgstr "Fout bij verbinden met SILC-server"
 
-#: ../libpurple/protocols/silc/silc.c:334
-#: ../libpurple/protocols/silc10/ops.c:1707
 msgid "Key Exchange failed"
 msgstr "Sleuteluitwisseling mislukt"
 
-#: ../libpurple/protocols/silc/silc.c:344
-#: ../libpurple/protocols/silc10/ops.c:1718
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "Hervatten van losgekoppelde sessie mislukt. Klik op \"Opnieuw verbinden\" om een nieuwe verbinding te maken."
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Hervatten van losgekoppelde sessie mislukt. Klik op \"Opnieuw verbinden\" om "
+"een nieuwe verbinding te maken."
 
-#: ../libpurple/protocols/silc/silc.c:374
-#: ../libpurple/protocols/silc/silc.c:421
-#: ../libpurple/protocols/silc10/silc.c:164
 msgid "Connection failed"
 msgstr "Verbinding mislukt"
 
-#: ../libpurple/protocols/silc/silc.c:398
-#: ../libpurple/protocols/silc10/silc.c:197
 msgid "Performing key exchange"
 msgstr "Bezig met sleuteluitwisseling"
 
-#: ../libpurple/protocols/silc/silc.c:450
-#: ../libpurple/protocols/silc10/silc.c:362
 msgid "Unable to create connection"
 msgstr "Kan geen nieuwe verbinding maken"
 
-#: ../libpurple/protocols/silc/silc.c:493
-#: ../libpurple/protocols/silc/silc.c:509
-#: ../libpurple/protocols/silc/silc.c:538
-#: ../libpurple/protocols/silc10/silc.c:341
 msgid "Could not load SILC key pair"
 msgstr "Kan SILC sleutelpaar niet laden"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:523
-#: ../libpurple/protocols/silc10/silc.c:330
 msgid "Connecting to SILC Server"
 msgstr "Verbinden met SILC-server"
 
-#: ../libpurple/protocols/silc/silc.c:569
-#: ../libpurple/protocols/silc10/silc.c:272
 msgid "Out of memory"
 msgstr "Te weinig geheugen"
 
-#: ../libpurple/protocols/silc/silc.c:620
-#: ../libpurple/protocols/silc10/silc.c:318
 msgid "Cannot initialize SILC protocol"
 msgstr "Kan SILC-protocol niet starten"
 
-#: ../libpurple/protocols/silc/silc.c:633
-#: ../libpurple/protocols/silc10/silc.c:325
 msgid "Error loading SILC key pair"
 msgstr "Fout in het laden van SILC sleutelpaar"
 
-#: ../libpurple/protocols/silc/silc.c:690
-#: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:405
-#: ../libpurple/protocols/silc10/silc.c:1582
 #, c-format
 msgid "Download %s: %s"
 msgstr "Download %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:974
-#: ../libpurple/protocols/silc10/silc.c:675
 msgid "Your Current Mood"
 msgstr "Uw huidige stemming"
 
-#: ../libpurple/protocols/silc/silc.c:976
-#: ../libpurple/protocols/silc10/silc.c:677
-#: ../pidgin/gtkprefs.c:1792
+#, c-format
 msgid "Normal"
 msgstr "Normaal"
 
-#: ../libpurple/protocols/silc/silc.c:990
-#: ../libpurple/protocols/silc10/silc.c:691
 msgid "In love"
 msgstr "Verliefd"
 
-#: ../libpurple/protocols/silc/silc.c:1001
-#: ../libpurple/protocols/silc10/silc.c:702
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -12259,334 +8699,231 @@ msgstr ""
 "\n"
 "Uw voorkeurscontactmethoden"
 
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:710
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/silc.c:712
-#: ../libpurple/protocols/silc10/util.c:563
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:1013
-#: ../libpurple/protocols/silc10/silc.c:714
 msgid "Video conferencing"
 msgstr "Video-conferencing"
 
-#: ../libpurple/protocols/silc/silc.c:1018
-#: ../libpurple/protocols/silc10/silc.c:719
 msgid "Your Current Status"
 msgstr "Uw huidige status"
 
-#: ../libpurple/protocols/silc/silc.c:1025
-#: ../libpurple/protocols/silc10/silc.c:726
 msgid "Online Services"
 msgstr "Online diensten"
 
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc10/silc.c:729
 msgid "Let others see what services you are using"
-msgstr "Anderen je gebruikte diensten laten zien"
+msgstr "Anderen uw gebruikte diensten laten zien"
 
-#: ../libpurple/protocols/silc/silc.c:1034
-#: ../libpurple/protocols/silc10/silc.c:735
 msgid "Let others see what computer you are using"
-msgstr "Laat anderen zien wat voor computer je gebruikt"
+msgstr "Anderen door u gebruiket computer laten zien"
 
-#: ../libpurple/protocols/silc/silc.c:1041
-#: ../libpurple/protocols/silc10/silc.c:742
 msgid "Your VCard File"
-msgstr "Jouw VCard-bestand"
+msgstr "Uw VCard-bestand"
 
-#: ../libpurple/protocols/silc/silc.c:1047
 msgid "Timezone (UTC)"
 msgstr "Tijdzone (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:1051
-#: ../libpurple/protocols/silc/silc.c:1052
-#: ../libpurple/protocols/silc10/silc.c:754
-#: ../libpurple/protocols/silc10/silc.c:755
 msgid "User Online Status Attributes"
 msgstr "Online gebruikersgegevens"
 
-#: ../libpurple/protocols/silc/silc.c:1053
-#: ../libpurple/protocols/silc10/silc.c:756
-msgid "You can let other users see your online status information and your personal information. Please fill the information you would like other users to see about yourself."
-msgstr "Je kunt andere gebruikers je online gegevens laten inzien. Geef de informatie waarvan je vind dat anderen die mogen zien."
-
-#: ../libpurple/protocols/silc/silc.c:1094
-#: ../libpurple/protocols/silc/silc.c:1100
-#: ../libpurple/protocols/silc/silc.c:1721
-#: ../libpurple/protocols/silc10/silc.c:797
-#: ../libpurple/protocols/silc10/silc.c:803
-#: ../libpurple/protocols/silc10/silc.c:1440
+msgid ""
+"You can let other users see your online status information and your personal "
+"information. Please fill the information you would like other users to see "
+"about yourself."
+msgstr ""
+"U kunt andere gebruikers uw online gegevens laten inzien. Geef de informatie "
+"waarvan u vind dat anderen die mogen zien."
+
 msgid "Message of the Day"
 msgstr "Bericht-van-de-dag"
 
-#: ../libpurple/protocols/silc/silc.c:1094
-#: ../libpurple/protocols/silc10/silc.c:797
 msgid "No Message of the Day available"
 msgstr "Geen bericht-van-de-dag beschikbaar"
 
-#: ../libpurple/protocols/silc/silc.c:1095
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:798
-#: ../libpurple/protocols/silc10/silc.c:1435
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Er is geen bericht-van-de-dag geassocieerd met deze verbinding."
 
-#: ../libpurple/protocols/silc/silc.c:1146
-#: ../libpurple/protocols/silc/silc.c:1192
-#: ../libpurple/protocols/silc/silc.c:1263
-#: ../libpurple/protocols/silc/silc.c:1264
-#: ../libpurple/protocols/silc10/silc.c:849
-#: ../libpurple/protocols/silc10/silc.c:893
-#: ../libpurple/protocols/silc10/silc.c:964
-#: ../libpurple/protocols/silc10/silc.c:965
 msgid "Create New SILC Key Pair"
 msgstr "Nieuw SILC sleutelpaar maken"
 
-#: ../libpurple/protocols/silc/silc.c:1146
-#: ../libpurple/protocols/silc10/silc.c:849
 msgid "Passphrases do not match"
 msgstr "Wachtwoorden zijn niet gelijk"
 
-#: ../libpurple/protocols/silc/silc.c:1192
-#: ../libpurple/protocols/silc10/silc.c:893
 msgid "Key Pair Generation failed"
 msgstr "Aanmaken van sleutelpaar mislukt"
 
-#: ../libpurple/protocols/silc/silc.c:1231
-#: ../libpurple/protocols/silc10/silc.c:932
 msgid "Key length"
 msgstr "Sleutellengte"
 
-#: ../libpurple/protocols/silc/silc.c:1233
-#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Public key file"
 msgstr "Bestand voor openbare sleutel"
 
-#: ../libpurple/protocols/silc/silc.c:1235
-#: ../libpurple/protocols/silc10/silc.c:936
 msgid "Private key file"
 msgstr "Bestand voor privésleutel"
 
-#: ../libpurple/protocols/silc/silc.c:1258
-#: ../libpurple/protocols/silc10/silc.c:959
 msgid "Passphrase (retype)"
 msgstr "Wachtwoord (nogmaals)"
 
-#: ../libpurple/protocols/silc/silc.c:1265
-#: ../libpurple/protocols/silc10/silc.c:966
 msgid "Generate Key Pair"
 msgstr "Sleutelpaar aanmaken"
 
-#: ../libpurple/protocols/silc/silc.c:1308
-#: ../libpurple/protocols/silc10/silc.c:1009
 msgid "Online Status"
 msgstr "Online status"
 
-#: ../libpurple/protocols/silc/silc.c:1316
-#: ../libpurple/protocols/silc10/silc.c:1017
 msgid "View Message of the Day"
 msgstr "Bericht-van-de-dag weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1320
-#: ../libpurple/protocols/silc10/silc.c:1021
 msgid "Create SILC Key Pair..."
 msgstr "Aanmaken van SILC sleutelpaar..."
 
-#: ../libpurple/protocols/silc/silc.c:1412
-#: ../libpurple/protocols/silc10/silc.c:1120
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "De gebruiker <I>%s</I> is niet aanwezig op het netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1592
-#: ../libpurple/protocols/silc10/silc.c:1311
 msgid "Topic too long"
 msgstr "Onderwerp te lang"
 
-#: ../libpurple/protocols/silc/silc.c:1673
-#: ../libpurple/protocols/silc10/silc.c:1392
 msgid "You must specify a nick"
 msgstr "U moet een bijnaam aangeven"
 
-#: ../libpurple/protocols/silc/silc.c:1775
-#: ../libpurple/protocols/silc10/silc.c:1494
 #, c-format
 msgid "channel %s not found"
 msgstr "kanaal %s niet gevonden"
 
-#: ../libpurple/protocols/silc/silc.c:1780
-#: ../libpurple/protocols/silc10/silc.c:1499
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanaalinstellingen voor %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1782
-#: ../libpurple/protocols/silc10/silc.c:1501
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "geen kanaalinstellingen voor %s"
 
-#: ../libpurple/protocols/silc/silc.c:1795
-#: ../libpurple/protocols/silc10/silc.c:1514
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Kan kanaalinstellingen (cmodes) niet instellen voor %s"
 
-#: ../libpurple/protocols/silc/silc.c:1825
-#: ../libpurple/protocols/silc10/silc.c:1544
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Onbekende opdracht: %s, (zou een client-bug kunnen zijn)"
 
-#: ../libpurple/protocols/silc/silc.c:1906
-#: ../libpurple/protocols/silc10/silc.c:1625
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanaal]:  Kanaal verlaten"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1629
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanaal]:  Kanaal verlaten"
 
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nieuw onderwerp&gt;]:  Onderwerp weergeven / veranderen"
 
-#: ../libpurple/protocols/silc/silc.c:1919
-#: ../libpurple/protocols/silc10/silc.c:1638
 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 netwerk"
+msgstr ""
+"join &lt;kanaal&gt; [&lt;wachtwoord&gt;]:  Deelnemen aan een kanaal op dit "
+"netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1923
-#: ../libpurple/protocols/silc10/silc.c:1642
 msgid "list:  List channels on this network"
 msgstr "list:  Lijst van kanalen op dit netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1927
-#: ../libpurple/protocols/silc10/silc.c:1646
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;bijnaam&gt;:  Informatie over bijnaam weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1931
-#: ../libpurple/protocols/silc10/silc.c:1650
-#: ../libpurple/protocols/zephyr/zephyr.c:2704
 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"
+msgstr ""
+"msg &lt;bijnaam&gt; &lt;bericht&gt;:  Een privébericht sturen aan een "
+"gebruiker"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1654
 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 gebruiker"
+msgstr ""
+"query &lt;bijnaam&gt; [&lt;bericht&gt;]:  Een privébercith sturen aan een "
+"gebruiker"
 
-#: ../libpurple/protocols/silc/silc.c:1939
-#: ../libpurple/protocols/silc10/silc.c:1658
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Bericht-van-de-dag weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1943
-#: ../libpurple/protocols/silc10/silc.c:1662
 msgid "detach:  Detach this session"
 msgstr "detach:  Deze sessie loskoppelen"
 
-#: ../libpurple/protocols/silc/silc.c:1947
-#: ../libpurple/protocols/silc10/silc.c:1666
 msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [bericht]:  Verbinding met server verbreken, eventueel met afscheidsbericht"
+msgstr ""
+"quit [bericht]:  Verbinding met server verbreken, eventueel met "
+"afscheidsbericht"
 
-#: ../libpurple/protocols/silc/silc.c:1951
-#: ../libpurple/protocols/silc10/silc.c:1670
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;opdracht&gt;:  Een willekeurige SILC-client-opdracht starten"
 
-#: ../libpurple/protocols/silc/silc.c:1957
-#: ../libpurple/protocols/silc10/silc.c:1676
 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;bijnaam&gt; [-openbsleutel|&lt;reden&gt;]:  bijnaam vernietigen"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "nick &lt;newnick&gt;:  Change your nickname"
-msgstr "nick &lt;nieuwebijnaam&gt;:  Je bijnaam veranderen"
+msgstr "nick &lt;nieuwebijnaam&gt;:  Uw bijnaam veranderen"
 
-#: ../libpurple/protocols/silc/silc.c:1965
-#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;bijnaam&gt;:  Bijnaam's informatie weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1969
-#: ../libpurple/protocols/silc10/silc.c:1688
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
-msgstr "cmode &lt;kanaal&gt; [+|-&lt;instellingen&gt;] [argumenten]:  Kanaalinstellingen weergeven of wijzigen"
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;kanaal&gt; [+|-&lt;instellingen&gt;] [argumenten]:  "
+"Kanaalinstellingen weergeven of wijzigen"
 
-#: ../libpurple/protocols/silc/silc.c:1973
-#: ../libpurple/protocols/silc10/silc.c:1692
-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 voor gebruiker wijzigen op het kanaal"
+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 "
+"voor gebruiker wijzigen op het kanaal"
 
-#: ../libpurple/protocols/silc/silc.c:1977
-#: ../libpurple/protocols/silc10/silc.c:1696
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;gebruikersinstellingen&gt;:  Je gebruikersinstellingen binnen het netwerk instellen"
+msgstr ""
+"umode &lt;gebruikersinstellingen&gt;:  Uw gebruikersinstellingen binnen het "
+"netwerk instellen"
 
-#: ../libpurple/protocols/silc/silc.c:1981
-#: ../libpurple/protocols/silc10/silc.c:1700
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;bijnaam&gt; [-pubkey]:  Operator-status instellen"
 
-#: ../libpurple/protocols/silc/silc.c:1985
-#: ../libpurple/protocols/silc10/silc.c:1704
-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/verwijderen van de lijst met genodigden"
+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/"
+"verwijderen van de lijst met genodigden"
 
-#: ../libpurple/protocols/silc/silc.c:1989
-#: ../libpurple/protocols/silc10/silc.c:1708
 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 schoppen"
+msgstr ""
+"kick &lt;kanaal&gt; &lt;bijnaam&gt; [commentaar]:  Iemand uit het kanaal "
+"schoppen"
 
-#: ../libpurple/protocols/silc/silc.c:1993
-#: ../libpurple/protocols/silc10/silc.c:1712
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  Serverdetails weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:1997
-#: ../libpurple/protocols/silc10/silc.c:1716
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
-msgstr "ban [&lt;kanaal&gt; +|-&lt;bijnaam&gt;]:  Bepaalde gebruikers uit kanaal verbannen"
+msgstr ""
+"ban [&lt;kanaal&gt; +|-&lt;bijnaam&gt;]:  Bepaalde gebruikers uit kanaal "
+"verbannen"
 
-#: ../libpurple/protocols/silc/silc.c:2001
-#: ../libpurple/protocols/silc10/silc.c:1720
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr "getkey &lt;bijnaam|server&gt;:  iemand openbare sleutel opvragen"
 
-#: ../libpurple/protocols/silc/silc.c:2005
-#: ../libpurple/protocols/silc10/silc.c:1724
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Server- en netwerkstatistieken weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:2009
-#: ../libpurple/protocols/silc10/silc.c:1728
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  PING sturen aan huidige server"
 
-#: ../libpurple/protocols/silc/silc.c:2014
-#: ../libpurple/protocols/silc10/silc.c:1733
 msgid "users &lt;channel&gt;:  List users in channel"
-msgstr "users &lt;kanaal&gt;:  Lijst van gebruikers in huidige kanaal weergeven"
+msgstr ""
+"users &lt;kanaal&gt;:  Lijst van gebruikers in huidige kanaal weergeven"
 
-#: ../libpurple/protocols/silc/silc.c:2018
-#: ../libpurple/protocols/silc10/silc.c:1737
-msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
-msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;kana(a)l(en)&gt;:  Lijst van gebruikers weergeven"
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kana(a)l(en)&gt;:  Lijst "
+"van gebruikers weergeven"
 
 #. *< type
 #. *< ui_requirement
@@ -12597,142 +8934,91 @@ msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;kana(a)l(en)&gt;:  Lijs
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2130
-#: ../libpurple/protocols/silc10/silc.c:1862
 msgid "SILC Protocol Plugin"
-msgstr "SILC-protocol plugin"
+msgstr "SILC-protocol plug-in"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2132
-#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) protocol"
 
-#: ../libpurple/protocols/silc/silc.c:2173
-#: ../libpurple/protocols/silc10/silc.c:1896
-#: ../pidgin/gtkprefs.c:2147
 msgid "Network"
 msgstr "Netwerk"
 
-#: ../libpurple/protocols/silc/silc.c:2184
-#: ../libpurple/protocols/silc10/silc.c:1907
 msgid "Public Key file"
 msgstr "Bestand voor openbare sleutel"
 
-#: ../libpurple/protocols/silc/silc.c:2188
-#: ../libpurple/protocols/silc10/silc.c:1911
 msgid "Private Key file"
 msgstr "Bestand voor privésleutel"
 
-#: ../libpurple/protocols/silc/silc.c:2198
-#: ../libpurple/protocols/silc10/silc.c:1921
 msgid "Cipher"
 msgstr "Codering"
 
-#: ../libpurple/protocols/silc/silc.c:2208
-#: ../libpurple/protocols/silc10/silc.c:1931
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2211
 msgid "Use Perfect Forward Secrecy"
 msgstr "Perfecte doorstuur-secretie gebruiken"
 
-#: ../libpurple/protocols/silc/silc.c:2215
-#: ../libpurple/protocols/silc10/silc.c:1934
 msgid "Public key authentication"
 msgstr "Certificering met openbare sleutel"
 
-#: ../libpurple/protocols/silc/silc.c:2218
-#: ../libpurple/protocols/silc10/silc.c:1937
 msgid "Block IMs without Key Exchange"
 msgstr "Berichten zonder sleuteluitwisseling blokkeren"
 
-#: ../libpurple/protocols/silc/silc.c:2221
-#: ../libpurple/protocols/silc10/silc.c:1940
 msgid "Block messages to whiteboard"
 msgstr "Berichten naar whiteboard blokkeren"
 
-#: ../libpurple/protocols/silc/silc.c:2224
-#: ../libpurple/protocols/silc10/silc.c:1943
 msgid "Automatically open whiteboard"
 msgstr "Whiteboard automatisch openen"
 
-#: ../libpurple/protocols/silc/silc.c:2227
-#: ../libpurple/protocols/silc10/silc.c:1946
 msgid "Digitally sign and verify all messages"
 msgstr "Alle berichten ondertekenen en controleren"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:250
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Aanmaken van SILC sleutelpaar..."
 
-#: ../libpurple/protocols/silc/util.c:216
-#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "Kan geen SILC sleutelpaar aanmaken\n"
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libpurple/protocols/silc/util.c:363
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Echte naam: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Gebruiker: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "Email: \t\t%s\n"
 msgstr "E-mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Computernaam: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:371
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisatie: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:373
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritme: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Sleutellengte: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:377
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versie: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12743,8 +9029,6 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12753,133 +9037,107 @@ msgstr ""
 "Babbleprint van openbare sleutel:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc/util.c:383
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Informatie over openbare sleutel"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "Paging"
 msgstr "Semafoon"
 
-#: ../libpurple/protocols/silc/util.c:571
-#: ../libpurple/protocols/silc10/util.c:565
 msgid "Video Conferencing"
 msgstr "Video-conferencing"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:584
 msgid "Computer"
 msgstr "Computer"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:588
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:595
-#: ../libpurple/protocols/silc10/util.c:590
 msgid "Terminal"
 msgstr "Terminalvenster"
 
-#: ../libpurple/protocols/silc/wb.c:288
-#: ../libpurple/protocols/silc10/wb.c:287
 #, 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?"
+msgstr ""
+"%s verzond een bericht naar het whiteboard. Wil je het whiteboard openen?"
 
-#: ../libpurple/protocols/silc/wb.c:292
-#: ../libpurple/protocols/silc10/wb.c:291
 #, 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 whiteboard openen?"
+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 "
+"whiteboard openen?"
 
-#: ../libpurple/protocols/silc/wb.c:306
-#: ../libpurple/protocols/silc10/wb.c:305
 msgid "Whiteboard"
 msgstr "Whiteboard"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Geen serverstatistieken beschikbaar"
 
-#: ../libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Mislukt: Versies komen niet overeen. Installeer een nieuwe versie van je programma"
+msgstr ""
+"Mislukt: Versies komen niet overeen. Installeer een nieuwe versie van uw "
+"programma"
 
-#: ../libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Mislukt: De andere kant vertrouwt/ondersteunt je openbare sleutel niet"
+msgstr "Mislukt: De andere kant vertrouwt/ondersteunt uw openbare sleutel niet"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
 msgstr "Mislukt: Andere kant ondersteunt voorgestelde KE-groep niet"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Mislukt: Andere kant ondersteunt voorgestelde codering niet"
 
-#: ../libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Mislukt: Andere kant ondersteunt voorgestelde PKCS niet"
 
-#: ../libpurple/protocols/silc10/ops.c:1952
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
 msgstr "Mislukt: Andere kant ondersteunt voorgestelde hash-functie niet"
 
-#: ../libpurple/protocols/silc10/ops.c:1955
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Mislukt: Andere kant ondersteunt voorgestelde HMAC niet"
 
-#: ../libpurple/protocols/silc10/ops.c:1957
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Mislukt: Ongeldige handtekening"
 
-#: ../libpurple/protocols/silc10/ops.c:1959
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Mislukt: Ongeldig cookie"
 
-#: ../libpurple/protocols/silc10/ops.c:1970
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Mislukt: Certificering mislukt"
 
-#: ../libpurple/protocols/silc10/silc.c:186
 msgid "Cannot initialize SILC Client connection"
 msgstr "Kan SILC-verbinding niet starten"
 
-#: ../libpurple/protocols/silc10/silc.c:295
 msgid "John Noname"
 msgstr "John Zondernaam"
 
-#: ../libpurple/protocols/silc10/silc.c:339
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "kan SILC sleutelpaar niet laden: %s"
 
-#: ../libpurple/protocols/simple/simple.c:435
 msgid "Could not write"
 msgstr "Kan niet schrijven"
 
-#: ../libpurple/protocols/simple/simple.c:459
-#: ../libpurple/protocols/simple/simple.c:1729
 msgid "Could not connect"
 msgstr "Kon geen verbinding maken"
 
-#: ../libpurple/protocols/simple/simple.c:1143
 msgid "Unknown server response."
 msgstr "Onbekend server-antwoord."
 
-#: ../libpurple/protocols/simple/simple.c:1765
-#: ../libpurple/protocols/simple/simple.c:1811
-#: ../libpurple/protocols/simple/simple.c:1826
-#: ../libpurple/protocols/simple/simple.c:1881
 msgid "Could not create listen socket"
 msgstr "Kan geen socket aanmaken om te luisteren"
 
-#: ../libpurple/protocols/simple/simple.c:1909
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-bijnamen mogen geen spaties of @-tekens bevatten"
 
@@ -12891,238 +9149,205 @@ msgstr "SIP-bijnamen mogen geen spaties of @-tekens bevatten"
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2089
 msgid "SIP/SIMPLE Protocol Plugin"
-msgstr "SIP/SIMPLE-protocol plugin"
+msgstr "SIP/SIMPLE-protocol plug-in"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2090
 msgid "The SIP/SIMPLE Protocol Plugin"
-msgstr "De plugin voor het SIP/SIMPLE-protocol"
+msgstr "De plug-in voor het SIP/SIMPLE-protocol"
 
-#: ../libpurple/protocols/simple/simple.c:2118
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publieke status (opmerking: iedereen kan je zien)"
 
-#: ../libpurple/protocols/simple/simple.c:2124
 msgid "Use UDP"
 msgstr "UDP gebruiken"
 
-#: ../libpurple/protocols/simple/simple.c:2126
 msgid "Use proxy"
 msgstr "Proxy gebruiken"
 
-#: ../libpurple/protocols/simple/simple.c:2128
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:2130
 msgid "Auth User"
 msgstr "Gebruiker"
 
-#: ../libpurple/protocols/simple/simple.c:2132
 msgid "Auth Domain"
 msgstr "Domein"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "%s wordt opgezocht"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Verbinding met %s verbroken"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Aanmelding: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kan niet naar bestand %s schrijven."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kan het bestand %s niet lezen."
 
-#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Bericht te lang, laatste %s Bytes afgekort."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s is niet aangemeld."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Waarschuwing van %s is niet toegestaan."
 
-#: ../libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
-msgstr "Een bericht is verloren gegaan. Je overschreidt de maximumsnelheid van de server."
+msgstr ""
+"Een bericht is verloren gegaan. U overschreidt de snelheid van de server."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chatruimte in %s is niet beschikbaar."
 
-#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "U verzend te snel berichten naar %s."
 
-#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 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."
 
-#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 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."
+msgstr ""
+"Een Bericht van %s is niet overgekomen omdat het te snel verzonden werd."
 
-#: ../libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Fout."
 
-#: ../libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Te veel matches."
 
-#: ../libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Meer gegevens nodig."
 
-#: ../libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Profielen service is momenteel niet toegankelijk."
 
-#: ../libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "Email lookup restricted."
 msgstr "Zoekfunctie e-mail beperkt."
 
-#: ../libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Sleutelwoord genegeerd."
 
-#: ../libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Geen sleutelwoorden."
 
-#: ../libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "Deze gebruiker heeft geen profiel."
 
-#: ../libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Land wordt niet ondersteund."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Onbekende Fout: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect username or password."
 msgstr "Ongeldige gebruikersnaam of wachtwoord."
 
-#: ../libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "De service is momenteel niet bereikbaar."
 
-#: ../libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Uw waarschuwingsniveau is momenteel te hoog om in te loggen."
 
-#: ../libpurple/protocols/toc/toc.c:558
-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."
+#, c-format
+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."
 
-#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Onbekende aanmeldingsfout: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Onbekende fout %d opgetreden. Info: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Ongeldige groep"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Verbinding verbroken"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Wacht op antwoord..."
 
-#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
-msgstr "TOC werkt weer. Je kunt nu weer berichten versturen."
+msgstr "TOC werkt weer. U kunt nu weer berichten versturen."
 
-#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Wachtwoord succesvol veranderd"
 
-#: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:6957
 msgid "_Group:"
 msgstr "_Groep:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Directory info ophalen"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Directory info instellen"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kon %s niet openen om naar te schrijven!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
-msgstr "Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk afgebroken."
+msgstr ""
+"Bestandsoverdracht mislukt; de andere kant heeft waarschijnl;ijk afgebroken."
 
-#: ../libpurple/protocols/toc/toc.c:1878
-#: ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042
-#: ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr "Kan niet verbinden voor overdracht."
 
-#: ../libpurple/protocols/toc/toc.c:2075
 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."
+msgstr ""
+"Kon koptekst van bestand niet instellen. Het bestand zal niet verzonden "
+"worden."
 
-#: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Opslaan als..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 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"
 
-#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
-msgstr "%s vraagt je om een bestand te verzenden"
+msgstr "%s vraagt u om een bestand te verzenden"
 
 #. *< type
 #. *< ui_requirement
@@ -13134,99 +9359,95 @@ msgstr "%s vraagt je om een bestand te verzenden"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306
-#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
-msgstr "TOC-protocol plugin"
+msgstr "TOC-protocol plug-in"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:745
 #, 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."
+msgstr ""
+"%s verzond je een uitnodiging voor een webcam, wat nog niet wordt "
+"ondersteund."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:804
 msgid "Your Yahoo! message did not get sent."
 msgstr "Uw Yahoo! bericht is niet verzonden."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:917
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! systeembericht voor %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:991
 msgid "Authorization denied message:"
 msgstr "Identificatie van weigeringsbericht:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1009
 #, c-format
-msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
-msgstr "De gebruiker %s heeft je aanvraag om hem/haar toe te voegen aan je contactenlijst met terugwerkende kracht geweigerd met de volgende reden: %s"
+msgid ""
+"%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"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1012
 #, 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 je contactenlijst."
+msgstr ""
+"De gebruiker %s heeft geen toestemming gegeven. Hij/zij wordt NIET "
+"toegevoegd aan uw contactenlijst."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1014
 msgid "Add buddy rejected"
 msgstr "Contact toevoegen geweigerd"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2001
 #, c-format
-msgid "The Yahoo server has requested the use of an unrecognized authentication method.  You will probably not be able to successfully sign on to Yahoo.  Check %s for updates."
-msgstr "De Yahoo-server heeft een niet herkende identificatiemethode aangevraagd. Je kan waarschijnlijk niet succesvol inloggen bij Yahoo. Kijk op %s voor updates."
+msgid ""
+"The Yahoo server has requested the use of an unrecognized authentication "
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+"De Yahoo-server heeft een niet herkende identificatiemethode aangevraagd. Je "
+"kan waarschijnlijk niet succesvol inloggen bij Yahoo. Kijk op %s voor "
+"updates."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2005
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo! identificatie mislukt"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2085
 #, 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 je contactenlijst.  Klik op \"Ja\" om de gebruiker uit je lijst te verwijderen en deze te negeren."
+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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2088
 msgid "Ignore buddy?"
 msgstr "Contact negeren?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2159
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Uw account is afgesloten. Meld je aan via de Yahoo website."
+msgstr "Uw account is afgesloten. Meld u aan via de Yahoo website."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2162
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
-msgstr "Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op kunnen lossen."
+msgstr ""
+"Onbekende fout %d. Aanmelden via de Yahoo! website zou dit probleem op "
+"kunnen lossen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2215
 #, c-format
 msgid "Could not 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 %s."
+msgstr ""
+"Kan contact %s niet toevoegen aan de groep %s in de server-lijst van account "
+"%s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2218
 msgid "Could not add buddy to server list"
 msgstr "Kan contact niet toevoegen aan serverlijst"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2340
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hoorbaar %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2696
 msgid "Received unexpected HTTP response from server."
 msgstr "Onverwacht HTTP-antwoord van de server ontvangen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2725
-#: ../libpurple/protocols/yahoo/yahoo.c:2913
-#: ../libpurple/protocols/yahoo/yahoo.c:3018
-#: ../libpurple/protocols/yahoo/yahoo.c:3029
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
-#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Verbindingprobleem"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2751
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -13235,7 +9456,6 @@ msgstr ""
 "Verbinding met %s:\n"
 "%s verloren"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2776
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -13244,103 +9464,73 @@ msgstr ""
 "Kan geen verbinding maken met %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3145
-#: ../libpurple/protocols/yahoo/yahoo.c:3840
 msgid "Not at Home"
 msgstr "Niet thuis"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3147
-#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "Not at Desk"
 msgstr "Niet op m'n plek"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3149
-#: ../libpurple/protocols/yahoo/yahoo.c:3846
 msgid "Not in Office"
 msgstr "Niet op kantoor"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3153
-#: ../libpurple/protocols/yahoo/yahoo.c:3852
 msgid "On Vacation"
 msgstr "Op vakantie"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3157
-#: ../libpurple/protocols/yahoo/yahoo.c:3858
 msgid "Stepped Out"
 msgstr "Even weg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3250
-#: ../libpurple/protocols/yahoo/yahoo.c:3280
 msgid "Not on server list"
 msgstr "Niet in de serverlijst"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3297
-#: ../libpurple/protocols/yahoo/yahoo.c:3355
 msgid "Appear Online"
 msgstr "Online weergeven"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3300
-#: ../libpurple/protocols/yahoo/yahoo.c:3376
 msgid "Appear Permanently Offline"
 msgstr "Altijd off-line weergeven"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3318
 msgid "Presence"
 msgstr "Aanwezigheid"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3361
 msgid "Appear Offline"
 msgstr "Off-line weergeven"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3370
 msgid "Don't Appear Permanently Offline"
 msgstr "Niet altijd off-line weergeven"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3418
 msgid "Join in Chat"
 msgstr "Deelnemen aan Chat"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3424
 msgid "Initiate Conference"
 msgstr "Groepsgesprek openen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3452
 msgid "Presence Settings"
 msgstr "Aanwezigheidsinstellingen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3458
 msgid "Start Doodling"
-msgstr ""
+msgstr "Wakker schudden"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3568
 msgid "Activate which ID?"
 msgstr "Welk ID activeren?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3579
 msgid "Join whom in chat?"
 msgstr "Deelnemen aan wiens chat?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3591
 msgid "Activate ID..."
 msgstr "ID activeren..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3595
 msgid "Join User in Chat..."
 msgstr "Deelnemen aan chat van gebruiker..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3600
 msgid "Open Inbox"
 msgstr "Iinbox Openen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4189
 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."
+msgstr ""
+"join: &lt;ruimte&gt;:  Meedoen aan een chatruimte op het Yahoo-netwerk."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4194
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Lijst van kanalen op dit netwerk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4202
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -13354,224 +9544,190 @@ msgstr ""
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4411
-#: ../libpurple/protocols/yahoo/yahoo.c:4413
 msgid "Yahoo Protocol Plugin"
-msgstr "Yahoo-protocol-plugin"
+msgstr "Yahoo-protocol-plug-in"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4436
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4439
 msgid "Pager server"
 msgstr "Semafoonserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4442
 msgid "Japan Pager server"
 msgstr "Japanse semafoonserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4445
 msgid "Pager port"
 msgstr "Semafoon-poort"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4448
 msgid "File transfer server"
 msgstr "Server voor bestandsoverdrachten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4451
 msgid "Japan file transfer server"
 msgstr "Japanse server voor bestandsoverdrachten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4454
 msgid "File transfer port"
 msgstr "Bestandsoverdracht poortnummer"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4457
 msgid "Chat room locale"
 msgstr "Taal van chatruimte"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4460
 msgid "Ignore conference and chatroom invitations"
 msgstr "Conferentie- en chatruimteverzoeken negeren"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4468
 msgid "Chat room list URL"
 msgstr "URL voor lijst van ruimtes"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4471
 msgid "Yahoo Chat server"
 msgstr "Yahoo chatserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4474
 msgid "Yahoo Chat port"
 msgstr "Chatpoort Yahoo"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:319
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:328
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1111
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1515
 msgid "Unable to establish file descriptor."
 msgstr "Kan geen bestandsbeschrijving aanmaken."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:1410
 #, c-format
 msgid "%s is trying to send you a group of %d files.\n"
-msgstr "%s biedt je een collectie van %d bestanden aan.\n"
+msgstr "%s biedt u een collectie van %d bestanden aan.\n"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Japan Profile"
 msgstr "Profiel van Yahoo! Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:799
 msgid "Yahoo! Profile"
 msgstr "Yahoo! profiel"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:839
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
-msgstr "Helaas worden profielen met voor volwassenen bedoelde inhoud op dit moment nog niet ondersteund."
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
+msgstr ""
+"Helaas worden profielen met voor volwassenen bedoelde inhoud op dit moment "
+"nog niet ondersteund."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:841
-msgid "If you wish to view this profile, you will need to visit this link in your web browser:"
-msgstr "Als je dit profiel wilt zien, zul je deze verwijzing moeten openen in je web-browser"
+msgid ""
+"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"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1036
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1112
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1116
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1120
 msgid "Hobbies"
 msgstr "Hobbies"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1130
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1134
 msgid "Latest News"
 msgstr "Laatste nieuws"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1155
 msgid "Home Page"
 msgstr "Startpagina"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1170
 msgid "Cool Link 1"
 msgstr "Toffe verwijding 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 msgid "Cool Link 2"
 msgstr "Toffe verwijzing 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1179
 msgid "Cool Link 3"
 msgstr "Toffe verwijzing 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1193
 msgid "Last Update"
 msgstr "Laatst bijgewerkt"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1202
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Gebruikersinformatie voor %s niet beschikbaar"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1208
-msgid "Sorry, this profile seems to be 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."
+msgid ""
+"Sorry, this profile seems to be 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."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
-msgid "Could not retrieve the user's profile. This most likely is a temporary server-side problem. Please try again later."
-msgstr "Kan gebruikersprofiel niet ophalen. Dit is waarschijnlijk een tijdelijk serverprobleem. Probeer het later nog een keer."
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Kan gebruikersprofiel niet ophalen. Dit is waarschijnlijk een tijdelijk "
+"serverprobleem. Probeert u het later nogmaals."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1227
-msgid "Could not retrieve the user's profile. This most likely means that the user does not exist; however, Yahoo! sometimes does fail to find a user's profile. If you know that the user exists, please try again later."
-msgstr "Kan gebruikersprofiel niet ophalen. Dit betekent waarschijnlijk dat de gebruiker niet bestaat. Soms kan Yahoo! ten onrechte een gebruiker niet vinden. Als je er zeker van bent dat de gebruiker bestaat, probeer het dan later nogmaals."
+msgid ""
+"Could not retrieve the user's profile. This most likely means that the user "
+"does not exist; however, Yahoo! sometimes does fail to find a user's "
+"profile. If you know that the user exists, please try again later."
+msgstr ""
+"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 "
+"later nogmaals."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1234
 msgid "The user's profile is empty."
 msgstr "Gebruikersprofiel is leeg."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:222
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
-msgstr "%s heeft je uitnodiging voor ruimte \"%s\" afgeslagen omdat \"%s\"."
+msgstr "%s heeft uw uitnodiging voor ruimte \"%s\" afgeslagen omdat \"%s\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:224
 msgid "Invitation Rejected"
 msgstr "Uitnodiging geweigerd"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:443
 msgid "Failed to join chat"
 msgstr "Kan niet deelnemen aan chat"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:446
 msgid "Unknown room"
 msgstr "Onbekende ruimte"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:449
 msgid "Maybe the room is full"
 msgstr "Misschien is de ruimte vol?"
 
 # niet aanwezig/beschikbaar
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
 msgid "Not available"
 msgstr "Niet beschikbaar"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:456
-msgid "Unknown error. You may need to logout and wait five minutes before being able to rejoin a chatroom"
-msgstr "Onbekende fout. Je kunt je het beste afmelden en een paar minuten wachten voordat je je weer nij de chatruimte kan voegen"
+msgid ""
+"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"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:539
 #, c-format
 msgid "You are now chatting in %s."
-msgstr "Je bent nu aan het chatten in  %s."
+msgstr "Je chat nu in %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:728
 msgid "Failed to join buddy in chat"
 msgstr "Kan niet deelnemen aan chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:729
 msgid "Maybe they're not in a chat?"
 msgstr "Misschien zitten ze niet in een chat?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1425
-#: ../libpurple/protocols/yahoo/yahoochat.c:1451
 msgid "Fetching the room list failed."
 msgstr "Opvragen lijst van ruimtes mislukt."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1511
 msgid "Voices"
 msgstr "Stemmen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
 msgid "Webcams"
 msgstr "Webcams"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
-#: ../libpurple/protocols/yahoo/yahoochat.c:1595
 msgid "Unable to fetch room list."
 msgstr "Kan lijst van ruimtes niet opvragen."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1588
 msgid "User Rooms"
 msgstr "Ruimtes van gebruiker"
 
-#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Verbindingprobleem met de YCHT-server."
 
-#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13580,97 +9736,91 @@ msgstr ""
 "Verbinding met de server \n"
 "%s verloren"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:357
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
-msgstr "(Er is een fout opgetreden bij het converteren van het bericht.\t Controleer de optie 'Codering' in het account)"
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(Er is een fout opgetreden bij het converteren van het bericht.\t Controleer "
+"de optie 'Codering' in het account)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:755
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Kan niet naar chat sturen: %s%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:794
-#: ../libpurple/protocols/zephyr/zephyr.c:1174
 msgid "Hidden or not logged-in"
 msgstr "Verborgen of niet aangemeld"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:800
-#: ../libpurple/protocols/zephyr/zephyr.c:1176
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br> Om %s sinds %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1514
-#: ../libpurple/protocols/zephyr/zephyr.c:1515
 msgid "Anyone"
 msgstr "Iemand"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2373
 msgid "_Class:"
 msgstr "_Klasse:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2379
 msgid "_Instance:"
 msgstr "_Instantie:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2385
 msgid "_Recipient:"
 msgstr "_Ontvanger:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2396
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Poging om te abonneren op %s,%s,%s mislukt"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2709
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;bijnaam&gt;: Gebruiker zoeken"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2714
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;bijnaam&gt;: Gebruiker zoeken"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2719
 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"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2724
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instantie&gt;: Te gebruiken instantie voor deze klasse"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2729
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "topic &lt;instantie&gt;: Te gebruiken instantie voor deze klasse"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2735
 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"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2740
-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;"
+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;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2746
-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;"
+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;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2752
-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;"
+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;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2758
-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;"
+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;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2763
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;class&gt;: Een bericht sturen aan &lt;<i>class</i>,PERSOONLIJK,*&gt;"
+msgstr ""
+"zc &lt;class&gt;: Een bericht sturen aan &lt;<i>class</i>,PERSOONLIJK,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2839
 msgid "Resubscribe"
 msgstr "Opnieuw abonneren"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2842
 msgid "Retrieve subscriptions from server"
 msgstr "Abonnementen ophalen van server"
 
@@ -13684,47 +9834,33 @@ msgstr "Abonnementen ophalen van server"
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2935
-#: ../libpurple/protocols/zephyr/zephyr.c:2937
 msgid "Zephyr Protocol Plugin"
-msgstr "Zephyr-protocol plugin"
+msgstr "Zephyr-protocol plug-in"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2962
 msgid "Use tzc"
 msgstr "tzc gebruiken"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2965
 msgid "tzc command"
 msgstr "tzc opdracht"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2968
 msgid "Export to .anyone"
 msgstr "Exporteren naar .iemand"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2971
 msgid "Export to .zephyr.subs"
 msgstr "Exporteren naar .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2974
 msgid "Import from .anyone"
 msgstr "Importeren van .iemand"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2977
 msgid "Import from .zephyr.subs"
 msgstr "Importeren van .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2980
 msgid "Realm"
 msgstr ""
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2983
 msgid "Exposure"
 msgstr "Ontmaskering"
 
-#: ../libpurple/proxy.c:493
-#: ../libpurple/proxy.c:955
-#: ../libpurple/proxy.c:1090
-#: ../libpurple/proxy.c:1698
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13733,70 +9869,61 @@ msgstr ""
 "Kan geen socket aanmaken:\n"
 "%s"
 
-#: ../libpurple/proxy.c:694
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Kan antwoord van HTTP-proxy niet parsen: %s\n"
 
-#: ../libpurple/proxy.c:734
-#: ../libpurple/proxy.c:783
-#: ../libpurple/proxy.c:821
-#: ../libpurple/proxy.c:833
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxy verbindingsfout %d"
 
-#: ../libpurple/proxy.c:829
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Toegang geweigerd: HTTP-proxy-server verbied tunnelen op poort %d."
 
-#: ../libpurple/proxy.c:1051
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fout oplossing %s"
 
-#: ../libpurple/proxy.c:1804
 msgid "Could not resolve host name"
 msgstr "Kan host niet vinden"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "%s's aandacht vragen..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s vraagt om uw aandacht!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1391
-#: ../pidgin/gtkblist.c:554
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../libpurple/request.h:1391
-#: ../pidgin/gtkblist.c:554
 msgid "_No"
 msgstr "_Nee"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1411
 msgid "_Accept"
 msgstr "_Accepteren"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Ik ben er even niet"
 
-#: ../libpurple/savedstatuses.c:537
 msgid "saved statuses"
 msgstr "opgeslagen statussen"
 
-#: ../libpurple/server.c:264
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s heet nu %s.\n"
 
-#: ../libpurple/server.c:827
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13805,326 +9932,272 @@ msgstr ""
 "%s nodigt %s uit in de chatruimte %s\n"
 "%s"
 
-#: ../libpurple/server.c:832
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s nodigt %s uit in de chatruimte %s\n"
 
-#: ../libpurple/server.c:836
 msgid "Accept chat invitation?"
 msgstr "Uitnodiging voor chat accepteren?"
 
 #. Shortcut
-#: ../libpurple/smiley.c:411
-#: ../pidgin/gtksmiley.c:504
 msgid "Shortcut"
 msgstr "Snelkoppeling"
 
-#: ../libpurple/smiley.c:412
 msgid "The text-shortcut for the smiley"
 msgstr "De tekst-snelkoppeling voor de smiley"
 
 #. Stored Image
-#: ../libpurple/smiley.c:418
 msgid "Stored Image"
 msgstr "Opgeslagen afbeelding"
 
-#: ../libpurple/smiley.c:419
 msgid "Stored Image. (that'll have to do for now)"
 msgstr "Opgeslagen afbeelding."
 
-#: ../libpurple/sslconn.c:164
 msgid "SSL Connection Failed"
 msgstr "SSL Verbinding Mislukt"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "Contact leggen via SSL mislukt"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "SSL peer gaf een ongeldig certificaat"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Onbekende SSL fout"
 
-#: ../libpurple/status.c:158
 msgid "Unset"
 msgstr "Niet ingesteld"
 
-#: ../libpurple/status.c:161
-#: ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1091
 msgid "Do not disturb"
 msgstr "Niet storen"
 
-#: ../libpurple/status.c:164
 msgid "Extended away"
 msgstr "Uitgebreide weg"
 
-#: ../libpurple/status.c:165
 msgid "Mobile"
 msgstr "Mobiel"
 
-#: ../libpurple/status.c:166
 msgid "Listening to music"
-msgstr "Naar muziek aan het luisteren"
+msgstr "Luisteren naar muziek"
 
-#: ../libpurple/status.c:615
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) heeft status veranderd van %s naar %s"
 
-#: ../libpurple/status.c:626
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) is nu %s"
 
-#: ../libpurple/status.c:632
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) is niet meer %s"
 
-#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr "%s is inactief"
 
-#: ../libpurple/status.c:1267
 #, c-format
 msgid "%s became unidle"
 msgstr "%s is actief"
 
-#: ../libpurple/status.c:1333
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s is inactief"
 
-#: ../libpurple/status.c:1335
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s is actief"
 
-#: ../libpurple/util.c:721
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2812
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fout bij lezen van %s"
 
-#: ../libpurple/util.c:2813
 #, c-format
-msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
-msgstr "Er is een fout opgetreden bij lezen van je %s. Deze is niet geladen. Het oude bestand is verplaatst naar %s~."
+msgid ""
+"An error was encountered reading your %s.  They have 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~."
 
-#: ../libpurple/util.c:3321
 msgid "Calculating..."
 msgstr "Berekenen..."
 
-#: ../libpurple/util.c:3324
 msgid "Unknown."
 msgstr "Onbekend."
 
-#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d seconden"
 
-#: ../libpurple/util.c:3362
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
-#: ../libpurple/util.c:3370
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d uur"
 msgstr[1] "%s, %d uren"
 
-#: ../libpurple/util.c:3376
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uren"
 
-#: ../libpurple/util.c:3384
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuut"
 msgstr[1] "%s, %d minuten"
 
-#: ../libpurple/util.c:3390
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuut"
 msgstr[1] "%d minuten"
 
-#: ../libpurple/util.c:3650
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Kan %s niet openen: Te vaak doorverwezen"
 
-#: ../libpurple/util.c:3687
-#: ../libpurple/util.c:3983
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kan geen verbinding maken met %s"
 
-#: ../libpurple/util.c:3810
 #, c-format
-msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
-msgstr "Niet mogelijk om genoeg geheugen toe te wijzen om de inhoud van %s te bewaren. De webserver zou iets kwaadwilligs kunnen proberen te doen."
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"Niet mogelijk om genoeg geheugen toe te wijzen om de inhoud van %s te "
+"bewaren. De webserver zou iets kwaadwilligs kunnen proberen te doen."
 
-#: ../libpurple/util.c:3845
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Er is een fout opgetreden bij het lezen van%s: %s"
 
-#: ../libpurple/util.c:3876
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fout bij schrijven naar %s: %s"
 
-#: ../libpurple/util.c:3901
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Kan geen verbinding maken met %s: %s"
 
-#: ../libpurple/util.c:4713
 #, c-format
 msgid " - %s"
 msgstr " - %s"
 
-#: ../libpurple/util.c:4719
 #, c-format
 msgid " (%s)"
 msgstr " (%s)"
 
 #. 10053
-#: ../libpurple/win32/libc_interface.c:322
+#, c-format
 msgid "Connection interrupted by other software on your computer."
 msgstr "Verbinding verbroken door andere software op je computer."
 
 #. 10054
-#: ../libpurple/win32/libc_interface.c:325
+#, c-format
 msgid "Remote host closed connection."
 msgstr "De andere gebruiker heeft de verbinding verbroken."
 
 #. 10060
-#: ../libpurple/win32/libc_interface.c:328
+#, c-format
 msgid "Connection timed out."
 msgstr "Verbinding verlopen."
 
 #. 10061
-#: ../libpurple/win32/libc_interface.c:331
+#, c-format
 msgid "Connection refused."
 msgstr "Verbinding geweigerd."
 
 #. 10048
-#: ../libpurple/win32/libc_interface.c:334
+#, c-format
 msgid "Address already in use."
 msgstr "Adres al in gebruik."
 
-#: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Expresberichten"
 
-#: ../pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet Messenger"
 
-#: ../pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Stuur chatberichten over verschillende diensten."
 
-#: ../pidgin/eggtrayicon.c:128
 msgid "Orientation"
 msgstr "Oriëntatie"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "De oriëntatie van het systeemvak."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:417
 msgid "Login Options"
 msgstr "Aanmeldopties"
 
-#: ../pidgin/gtkaccount.c:438
 msgid "Pro_tocol:"
 msgstr "Pro_tocol:"
 
-#: ../pidgin/gtkaccount.c:449
-#: ../pidgin/gtkaccount.c:1093
 msgid "_Username:"
 msgstr "_Gebruiker:"
 
-#: ../pidgin/gtkaccount.c:555
 msgid "Remember pass_word"
 msgstr "_Wachtwoord onthouden"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:609
 msgid "User Options"
 msgstr "Gebruikersopties"
 
-#: ../pidgin/gtkaccount.c:622
 msgid "_Local alias:"
 msgstr "_Lokale bijnaam:"
 
-#: ../pidgin/gtkaccount.c:626
 msgid "New _mail notifications"
 msgstr "Nieuwe e-_mail-meldingen"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:631
 msgid "Use this buddy _icon for this account:"
 msgstr "Dit contact_plaatje gebruiken voor dit account:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:759
 #, c-format
 msgid "%s Options"
 msgstr "%s Opties"
 
-#: ../pidgin/gtkaccount.c:964
 msgid "Use GNOME Proxy Settings"
 msgstr "Gebruik GNOME Proxy-instellingen"
 
-#: ../pidgin/gtkaccount.c:965
 msgid "Use Global Proxy Settings"
 msgstr "Hoofdinstellingen gebruiken"
 
-#: ../pidgin/gtkaccount.c:971
 msgid "No Proxy"
 msgstr "Geen proxy"
 
-#: ../pidgin/gtkaccount.c:977
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:983
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:989
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:995
-#: ../pidgin/gtkprefs.c:1337
 msgid "Use Environmental Settings"
 msgstr "Systeeminstellingen gebruiken"
 
@@ -14133,399 +10206,300 @@ msgstr "Systeeminstellingen gebruiken"
 #. A) your network is really slow and you have nothing better to do than
 #. look at butterflies.
 #. B)You are looking really closely at something that shouldn't matter.
-#: ../pidgin/gtkaccount.c:1034
 msgid "If you look real closely"
 msgstr "Als je zeer aandachtig kijkt"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1037
 msgid "you can see the butterflies mating"
-msgstr "kan je de vlinders zien paren"
+msgstr "kun je de vlinders zien paren"
 
-#: ../pidgin/gtkaccount.c:1058
 msgid "Proxy Options"
 msgstr "Proxy-opties"
 
-#: ../pidgin/gtkaccount.c:1072
-#: ../pidgin/gtkprefs.c:1331
 msgid "Proxy _type:"
 msgstr "Proxy_type:"
 
-#: ../pidgin/gtkaccount.c:1081
-#: ../pidgin/gtkprefs.c:1352
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1085
-#: ../pidgin/gtkprefs.c:1370
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../pidgin/gtkaccount.c:1100
-#: ../pidgin/gtkprefs.c:1407
 msgid "Pa_ssword:"
 msgstr "_Wachtwoord:"
 
-#: ../pidgin/gtkaccount.c:1224
 msgid "Unable to save new account"
 msgstr "Kan nieuwe account niet opslaan"
 
-#: ../pidgin/gtkaccount.c:1225
 msgid "An account already exists with the specified criteria."
 msgstr "Er bestaat al een account met de gegeven criteria."
 
-#: ../pidgin/gtkaccount.c:1501
 msgid "Add Account"
 msgstr "Account toevoegen"
 
-#: ../pidgin/gtkaccount.c:1518
 msgid "_Basic"
 msgstr "_Simpel"
 
-#: ../pidgin/gtkaccount.c:1526
 msgid "Create _this new account on the server"
 msgstr "_Dit account op de server aanmaken"
 
-#: ../pidgin/gtkaccount.c:1540
 msgid "_Advanced"
 msgstr "_Geavanceerd"
 
-#: ../pidgin/gtkaccount.c:1930
-#: ../pidgin/gtkplugin.c:757
-#: ../pidgin/plugins/convcolors.c:327
 msgid "Enabled"
 msgstr "Ingeschakeld"
 
-#: ../pidgin/gtkaccount.c:1958
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../pidgin/gtkaccount.c:2154
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
 "\n"
-"You have no IM accounts configured. To start connecting with %s press the <b>Add</b> button below and configure your first account. If you want %s to connect to multiple IM accounts, press <b>Add</b> again to configure them all.\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
 "\n"
-"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Welkom bij %s!</span>\n"
 "\n"
-"Je hebt geen accounts ingeschakeld. Om een verbinding te starten met %s druk op de <b>Toevoegen</b>-button 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"
+"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"
-"You can come back to this window to add, edit, or remove accounts from <b>Accounts->Add/Edit</b> in the Buddy List window"
+"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."
 
-#: ../pidgin/gtkblist.c:551
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "Je hebt %d contact genaamd %s. Wil je deze samenvoegen?"
 msgstr[1] "Je hebt %d contacten genaamd %s. Wil je deze samenvoegen?"
 
-#: ../pidgin/gtkblist.c:552
-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 "Het samenvoegen van contacten zorgt ervoor dat contacten een enkel item beslaan in de contactenlijst en het gespreksvenster. Je kunt ze weer scheiden door te kiezen voor 'Uitvouwen' in het contact-menu"
+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"
 
-#: ../pidgin/gtkblist.c:685
 msgid "Please update the necessary fields."
 msgstr "Update de belangrijke velden."
 
-#: ../pidgin/gtkblist.c:1040
-#: ../pidgin/gtkblist.c:6904
 msgid "Room _List"
 msgstr "_Lijst Van Ruimtes"
 
-#: ../pidgin/gtkblist.c:1060
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
-msgstr "Geef de benodigde informatie van de chat die je wil openen.\n"
+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"
 
-#: ../pidgin/gtkblist.c:1072
-#: ../pidgin/gtkblist.c:6939
-#: ../pidgin/gtkpounce.c:560
-#: ../pidgin/gtkroomlist.c:540
 msgid "_Account:"
 msgstr "_Account:"
 
-#: ../pidgin/gtkblist.c:1351
-#: ../pidgin/gtkprivacy.c:549
-#: ../pidgin/gtkprivacy.c:563
 msgid "_Block"
 msgstr "_Blokkeren"
 
-#: ../pidgin/gtkblist.c:1351
 msgid "Un_block"
 msgstr "De_blokkeren"
 
-#: ../pidgin/gtkblist.c:1394
 msgid "Move to"
 msgstr "Ga naar"
 
-#: ../pidgin/gtkblist.c:1434
 msgid "Get _Info"
 msgstr "_Info opzoeken"
 
-#: ../pidgin/gtkblist.c:1437
-#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Bericht sturen"
 
-#: ../pidgin/gtkblist.c:1443
 msgid "_Send File..."
 msgstr "Bestand _sturen"
 
-#: ../pidgin/gtkblist.c:1450
 msgid "Add Buddy _Pounce..."
 msgstr "_Contactalarm toevoegen"
 
-#: ../pidgin/gtkblist.c:1455
-#: ../pidgin/gtkblist.c:1459
-#: ../pidgin/gtkblist.c:1622
-#: ../pidgin/gtkblist.c:1649
 msgid "View _Log"
 msgstr "_Logboek"
 
-#: ../pidgin/gtkblist.c:1465
-#: ../pidgin/gtkblist.c:1594
 msgid "Hide when offline"
 msgstr "Verberg tijdens offline zijn"
 
-#: ../pidgin/gtkblist.c:1465
-#: ../pidgin/gtkblist.c:1594
 msgid "Show when offline"
 msgstr "Weergeven tijdens offline zijn"
 
-#: ../pidgin/gtkblist.c:1479
-#: ../pidgin/gtkblist.c:1488
-#: ../pidgin/gtkblist.c:1632
-#: ../pidgin/gtkblist.c:1655
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1482
-#: ../pidgin/gtkblist.c:1490
-#: ../pidgin/gtkblist.c:1634
-#: ../pidgin/gtkblist.c:1657
 msgid "_Remove"
 msgstr "_Verwijderen"
 
-#: ../pidgin/gtkblist.c:1564
 msgid "Set Custom Icon"
 msgstr "Eigen pictogram instellen"
 
-#: ../pidgin/gtkblist.c:1568
-#: ../pidgin/gtkconv.c:2916
 msgid "Remove Custom Icon"
 msgstr "Contactenplaatje Verwijderen"
 
-#: ../pidgin/gtkblist.c:1582
 msgid "Add _Buddy..."
 msgstr "_Contact toevoegen"
 
-#: ../pidgin/gtkblist.c:1585
 msgid "Add C_hat..."
 msgstr "C_hat toevoegen"
 
-#: ../pidgin/gtkblist.c:1588
 msgid "_Delete Group"
 msgstr "Groep _verwijderen"
 
-#: ../pidgin/gtkblist.c:1590
 msgid "_Rename"
 msgstr "_Hernoemen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1616
-#: ../pidgin/gtkroomlist.c:313
-#: ../pidgin/gtkroomlist.c:587
-#: ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Deelnemen"
 
-#: ../pidgin/gtkblist.c:1618
 msgid "Auto-Join"
 msgstr "Automatisch deelnemen"
 
-#: ../pidgin/gtkblist.c:1620
 msgid "Persistent"
 msgstr "Blijvend deelnemen"
 
-#: ../pidgin/gtkblist.c:1630
 msgid "_Edit Settings..."
 msgstr "Instellingen _bewerken..."
 
-#: ../pidgin/gtkblist.c:1664
-#: ../pidgin/gtkblist.c:1689
 msgid "_Collapse"
 msgstr "_Dichtvouwen"
 
-#: ../pidgin/gtkblist.c:1694
 msgid "_Expand"
 msgstr "_Uitvouwen"
 
-#: ../pidgin/gtkblist.c:1947
-#: ../pidgin/gtkblist.c:1959
-#: ../pidgin/gtkblist.c:5590
-#: ../pidgin/gtkblist.c:5603
 msgid "/Tools/Mute Sounds"
 msgstr "/Extra/Geluiden dempen"
 
-#: ../pidgin/gtkblist.c:2419
-#: ../pidgin/gtkconv.c:4957
-#: ../pidgin/gtkpounce.c:451
-msgid "You are not currently signed on with an account that can add that buddy."
-msgstr "U bent op het moment niet aangemeld met een protocol die deze persoon kan toevoegen."
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"U bent op het moment niet aangemeld met een protocol die deze persoon kan "
+"toevoegen."
 
 #. I don't believe this can happen currently, I think
 #. * everything that calls this function checks for one of the
 #. * above node types first.
-#: ../pidgin/gtkblist.c:2805
 msgid "Unknown node type"
 msgstr "Onbekende node-type"
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3241
 msgid "/_Buddies"
 msgstr "/_Contacten"
 
-#: ../pidgin/gtkblist.c:3242
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Contacten/Nieuw _bericht..."
 
-#: ../pidgin/gtkblist.c:3243
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Contacten/Chat _openen..."
 
-#: ../pidgin/gtkblist.c:3244
 msgid "/Buddies/Get User _Info..."
 msgstr "/Contacten/_Gebruikersinfo..."
 
-#: ../pidgin/gtkblist.c:3245
 msgid "/Buddies/View User _Log..."
 msgstr "/Contacten/_Logboek bekijken..."
 
-#: ../pidgin/gtkblist.c:3247
 msgid "/Buddies/Sh_ow"
 msgstr "/Contacten/_Weergave"
 
-#: ../pidgin/gtkblist.c:3248
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Contacten/Weergave/_Offline contacten"
 
-#: ../pidgin/gtkblist.c:3249
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Contacten/Weergave/_Lege groepen"
 
-#: ../pidgin/gtkblist.c:3250
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Contacten/Weergave/Contact_details"
 
-#: ../pidgin/gtkblist.c:3251
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Contacten/Weergave/Inactieve _tijden"
 
-#: ../pidgin/gtkblist.c:3252
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Contacten/Weergave/_Protocol pictogrammen"
 
-#: ../pidgin/gtkblist.c:3253
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Contacten/Contacten _sorteren"
 
-#: ../pidgin/gtkblist.c:3255
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Contacten/Contact _toevoegen..."
 
-#: ../pidgin/gtkblist.c:3256
 msgid "/Buddies/Add C_hat..."
 msgstr "/Contacten/_Chat toevoegen..."
 
-#: ../pidgin/gtkblist.c:3257
 msgid "/Buddies/Add _Group..."
 msgstr "/Contacten/Groep toe_voegen..."
 
-#: ../pidgin/gtkblist.c:3259
 msgid "/Buddies/_Quit"
 msgstr "/Contacten/_Afsluiten"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3262
 msgid "/_Accounts"
 msgstr "/_Accounts"
 
-#: ../pidgin/gtkblist.c:3263
-#: ../pidgin/gtkblist.c:7631
 msgid "/Accounts/Manage Accounts"
 msgstr "/Accounts/Accounts beheren"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3266
 msgid "/_Tools"
 msgstr "/E_xtra"
 
-#: ../pidgin/gtkblist.c:3267
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Extra/_Contactalarm"
 
-#: ../pidgin/gtkblist.c:3268
 msgid "/Tools/_Certificates"
 msgstr "/Extra/_Certificaten"
 
-#: ../pidgin/gtkblist.c:3269
 msgid "/Tools/Plu_gins"
-msgstr "/Extra/_Plugins"
+msgstr "/Extra/_Plug-ins"
 
-#: ../pidgin/gtkblist.c:3270
 msgid "/Tools/Pr_eferences"
 msgstr "/Extra/_Voorkeuren"
 
-#: ../pidgin/gtkblist.c:3271
 msgid "/Tools/Pr_ivacy"
 msgstr "/Extra/Pr_ivacy"
 
-#: ../pidgin/gtkblist.c:3272
 msgid "/Tools/Smile_y"
 msgstr "/Extra/Smile_y"
 
-#: ../pidgin/gtkblist.c:3274
 msgid "/Tools/_File Transfers"
 msgstr "/Extra/_Bestandsoverdrachten"
 
-#: ../pidgin/gtkblist.c:3275
 msgid "/Tools/R_oom List"
 msgstr "/Extra/Lijst van _ruimtes"
 
-#: ../pidgin/gtkblist.c:3276
 msgid "/Tools/System _Log"
 msgstr "/Extra/_Systeemlogboek"
 
-#: ../pidgin/gtkblist.c:3278
 msgid "/Tools/Mute _Sounds"
 msgstr "/Extra/Geluiden _dempen"
 
 #. Help
-#: ../pidgin/gtkblist.c:3280
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: ../pidgin/gtkblist.c:3281
 msgid "/Help/Online _Help"
 msgstr "/Hulp/Online _hulp"
 
-#: ../pidgin/gtkblist.c:3282
 msgid "/Help/_Debug Window"
 msgstr "/Hulp/_Debugvenster"
 
-#: ../pidgin/gtkblist.c:3284
-#: ../pidgin/gtkblist.c:3286
 msgid "/Help/_About"
 msgstr "/Hulp/_Info"
 
-#: ../pidgin/gtkblist.c:3317
 #, c-format
 msgid "<b>Account:</b> %s"
 msgstr "<b>Account:</b> %s"
 
-#: ../pidgin/gtkblist.c:3336
 #, c-format
 msgid ""
 "\n"
@@ -14534,7 +10508,6 @@ msgstr ""
 "\n"
 "<b>Deelnemers:</b> %d"
 
-#: ../pidgin/gtkblist.c:3342
 #, c-format
 msgid ""
 "\n"
@@ -14543,474 +10516,378 @@ msgstr ""
 "\n"
 "<b>Onderwerp:</b> %s"
 
-#: ../pidgin/gtkblist.c:3342
 msgid "(no topic set)"
 msgstr "(geen onderwerp ingesteld)"
 
-#: ../pidgin/gtkblist.c:3421
 msgid "Buddy Alias"
-msgstr "Contact Alias"
+msgstr "Contact-alias"
 
-#: ../pidgin/gtkblist.c:3450
 msgid "Logged In"
 msgstr "Ingelogd"
 
-#: ../pidgin/gtkblist.c:3496
 msgid "Last Seen"
-msgstr "Voor het laatste gezien"
+msgstr "Voor het laatst gezien"
 
-#: ../pidgin/gtkblist.c:3517
 msgid "Spooky"
 msgstr "Spookachtig"
 
-#: ../pidgin/gtkblist.c:3519
 msgid "Awesome"
 msgstr "Geweldig"
 
-#: ../pidgin/gtkblist.c:3521
 msgid "Rockin'"
 msgstr "Rocken"
 
-#: ../pidgin/gtkblist.c:3552
 msgid "Total Buddies"
 msgstr "Aantal contacten"
 
-#: ../pidgin/gtkblist.c:3914
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inactief %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3916
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactief %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3918
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactief %dm"
 
-#: ../pidgin/gtkblist.c:4072
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacten/Nieuw bericht..."
 
-#: ../pidgin/gtkblist.c:4073
-#: ../pidgin/gtkblist.c:4106
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacten/Chat _openen..."
 
-#: ../pidgin/gtkblist.c:4074
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacten/_Gebruikersinfo..."
 
-#: ../pidgin/gtkblist.c:4075
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacten/Contact _toevoegen..."
 
-#: ../pidgin/gtkblist.c:4076
-#: ../pidgin/gtkblist.c:4109
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacten/_Chat toevoegen..."
 
-#: ../pidgin/gtkblist.c:4077
 msgid "/Buddies/Add Group..."
 msgstr "/Contacten/Groep toe_voegen..."
 
-#: ../pidgin/gtkblist.c:4112
 msgid "/Tools/Privacy"
 msgstr "/Extra/Privacy"
 
-#: ../pidgin/gtkblist.c:4115
 msgid "/Tools/Room List"
 msgstr "/Extra/Lijst van ruimtes"
 
-#: ../pidgin/gtkblist.c:4247
-#: ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d ongelezen bericht van %s\n"
 msgstr[1] "%d ongelezen berichten van %s\n"
 
-#: ../pidgin/gtkblist.c:4410
 msgid "Manually"
 msgstr "Handmatig"
 
-#: ../pidgin/gtkblist.c:4413
 msgid "By status"
 msgstr "Op status"
 
-#: ../pidgin/gtkblist.c:4414
 msgid "By log size"
 msgstr "Op logboekgrootte"
 
-#: ../pidgin/gtkblist.c:4752
 #, c-format
 msgid "%s disconnected"
 msgstr "%s heeft de verbinding verbroken"
 
-#: ../pidgin/gtkblist.c:4754
 #, c-format
 msgid "%s disabled"
 msgstr "%s uitgeschakeld"
 
-#: ../pidgin/gtkblist.c:4758
 msgid "Reconnect"
 msgstr "Verbinding herstellen"
 
-#: ../pidgin/gtkblist.c:4758
-#: ../pidgin/gtkblist.c:4877
 msgid "Re-enable"
 msgstr "Weer aanzetten"
 
-#: ../pidgin/gtkblist.c:4875
 msgid "Welcome back!"
 msgstr "Welkom terug!"
 
-#: ../pidgin/gtkblist.c:4911
 #, c-format
 msgid "%d account was disabled because you signed on from another location:"
-msgid_plural "%d accounts were disabled because you signed on from another location:"
-msgstr[0] "%d account werd uitgeschakeld omdat je inlogde van een andere locatie"
-msgstr[1] "%d account werden uitgeschakeld omdat je inlogde van een andere locatie"
+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"
+msgstr[1] ""
+"%d account werden uitgeschakeld omdat je inlogde van een andere locatie"
 
-#: ../pidgin/gtkblist.c:5195
 msgid "<b>Username:</b>"
 msgstr "<b>Gebruikersnaam:</b>"
 
-#: ../pidgin/gtkblist.c:5202
 msgid "<b>Password:</b>"
 msgstr "<b>Wachtwoord:</b>"
 
-#: ../pidgin/gtkblist.c:5213
 msgid "_Login"
 msgstr "Aanme_lden"
 
-#: ../pidgin/gtkblist.c:5299
 msgid "/Accounts"
 msgstr "/Accounts"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:5313
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Welkom bij %s!</span>\n"
 "\n"
-"Je hebt geen account ingeschakeld. Schakel je accounts in in het <b>Accounts</b>-venster bij <b>Accounts->Behee accountsr</b>. Als je het eenmaal hebt ingeschakeld kan je inloggen, je status instellen en praten met je vrienden."
+"Je hebt geen account ingeschakeld. Schakel je accounts in in het "
+"<b>Accounts</b>-venster bij <b>Accounts->Behee accountsr</b>. Als je het "
+"eenmaal hebt ingeschakeld kan je inloggen, je status instellen en praten met "
+"je vrienden."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:5584
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Contacten/Weergave/Offline contacten"
 
-#: ../pidgin/gtkblist.c:5587
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Contacten/Weergave/Lege groepen"
 
-#: ../pidgin/gtkblist.c:5593
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Contacten/Weergave/Contactdetails"
 
-#: ../pidgin/gtkblist.c:5596
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Contacten/Weergave/Inactieve tijden"
 
-#: ../pidgin/gtkblist.c:5599
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Contacten/Weergave/Protocol pictogrammen"
 
-#: ../pidgin/gtkblist.c:6565
 msgid "Add a buddy.\n"
 msgstr "Contact toevoegen.\n"
 
-#: ../pidgin/gtkblist.c:6580
 msgid "Buddy's _username:"
 msgstr "_Gebruikersnaam contact"
 
-#: ../pidgin/gtkblist.c:6602
 msgid "(Optional) A_lias:"
 msgstr "(Optionele) A_lias:"
 
-#: ../pidgin/gtkblist.c:6620
 msgid "Add buddy to _group:"
 msgstr "Gebruiker toevoegen aan _groep:"
 
-#: ../pidgin/gtkblist.c:6869
 msgid "This protocol does not support chat rooms."
 msgstr "Dit protocol heeft geen ondersteuning voor chatruimtes."
 
-#: ../pidgin/gtkblist.c:6885
-msgid "You are not currently signed on with any protocols that have the ability to chat."
-msgstr "U bent op het moment niet aangemeld met een protocol die ondersteuning biedt voor chat."
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"U bent op het moment niet aangemeld met een protocol die ondersteuning biedt "
+"voor chat."
 
-#: ../pidgin/gtkblist.c:6929
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr "Geef de bijnaam en andere informatie van de chat die je wil toevoegen aan de contactlijst.\n"
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"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"
 
-#: ../pidgin/gtkblist.c:6952
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:6959
 msgid "Auto_join when account becomes online."
 msgstr "Automatisch deelnemen wanneer account online komt."
 
-#: ../pidgin/gtkblist.c:6960
 msgid "_Hide chat when the window is closed."
 msgstr "Verberg c_hat wanneer de verbinding verbroken wordt."
 
-#: ../pidgin/gtkblist.c:6986
 msgid "Please enter the name of the group to be added."
 msgstr "Geef de naam van de toe te voegen groep."
 
-#: ../pidgin/gtkblist.c:7645
 msgid "Enable Account"
 msgstr "Account inschakelen"
 
-#: ../pidgin/gtkblist.c:7651
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Accounts/Account inschakelen"
 
-#: ../pidgin/gtkblist.c:7697
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Accounts/"
 
-#: ../pidgin/gtkblist.c:7721
 msgid "_Edit Account"
 msgstr "_Account bewerken"
 
-#: ../pidgin/gtkblist.c:7734
-#: ../pidgin/gtkconv.c:3265
 msgid "No actions available"
 msgstr "Geen acties beschikbaar"
 
-#: ../pidgin/gtkblist.c:7742
 msgid "_Disable"
 msgstr "_Uitzetten"
 
-#: ../pidgin/gtkblist.c:7764
 msgid "/Tools"
 msgstr "/Extra"
 
-#: ../pidgin/gtkblist.c:7834
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacten/Sorteren"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:541
 msgid "SSL Servers"
 msgstr "SSL Servers"
 
-#: ../pidgin/gtkconv.c:486
 msgid "Unknown command."
 msgstr "Onbekende opdracht."
 
-#: ../pidgin/gtkconv.c:770
-#: ../pidgin/gtkconv.c:797
 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 chatgesprek"
 
-#: ../pidgin/gtkconv.c:791
-msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr "U bent op het moment niet aangemeld met een protocol die deze persoon kan uitnodigen."
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"U bent op het moment niet aangemeld met een protocol die deze persoon kan "
+"uitnodigen."
 
-#: ../pidgin/gtkconv.c:845
 msgid "Invite Buddy Into Chat Room"
 msgstr "Contact uitnodigen in chatruimte"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:875
-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 je wil uitnodigen, eventueel met een uitnodigende tekst."
+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"
 
-#: ../pidgin/gtkconv.c:896
 msgid "_Buddy:"
 msgstr "_Contact:"
 
-#: ../pidgin/gtkconv.c:909
-#: ../pidgin/gtksavedstatuses.c:1213
-#: ../pidgin/gtksavedstatuses.c:1527
 msgid "_Message:"
 msgstr "Be_richt"
 
-#: ../pidgin/gtkconv.c:972
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Gesprek met %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1010
 msgid "Save Conversation"
 msgstr "Gesprek opslaan"
 
-#: ../pidgin/gtkconv.c:1156
-#: ../pidgin/gtkdebug.c:167
-#: ../pidgin/gtkdebug.c:740
 msgid "Find"
 msgstr "Zoeken"
 
-#: ../pidgin/gtkconv.c:1182
-#: ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Zoekopdracht:"
 
-#: ../pidgin/gtkconv.c:1703
 msgid "Un-Ignore"
 msgstr "Negeren opheffen"
 
-#: ../pidgin/gtkconv.c:1706
 msgid "Ignore"
 msgstr "Negeren"
 
-#: ../pidgin/gtkconv.c:1726
 msgid "Get Away Message"
 msgstr "Afwezigheidsbericht"
 
-#: ../pidgin/gtkconv.c:1749
 msgid "Last said"
 msgstr "Laatst gezegd"
 
-#: ../pidgin/gtkconv.c:2730
 msgid "Unable to save icon file to disk."
 msgstr "Kan pictogram niet opslaan op schijf."
 
-#: ../pidgin/gtkconv.c:2829
 msgid "Save Icon"
 msgstr "Plaatje opslaan"
 
-#: ../pidgin/gtkconv.c:2887
 msgid "Animate"
 msgstr "Animeren"
 
-#: ../pidgin/gtkconv.c:2892
 msgid "Hide Icon"
 msgstr "Plaatje verbergen"
 
-#: ../pidgin/gtkconv.c:2895
 msgid "Save Icon As..."
 msgstr "Plaatje opslaan als..."
 
-#: ../pidgin/gtkconv.c:2899
 msgid "Set Custom Icon..."
 msgstr "Eigen pictogram instellen..."
 
-#: ../pidgin/gtkconv.c:2903
 msgid "Change Size"
 msgstr "Grootte veranderen"
 
-#: ../pidgin/gtkconv.c:3041
 msgid "Show All"
 msgstr "Alles weergeven"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:3060
 msgid "/_Conversation"
 msgstr "/_Gesprek"
 
-#: ../pidgin/gtkconv.c:3062
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Gesprek/Nieuw _bericht..."
 
-#: ../pidgin/gtkconv.c:3067
 msgid "/Conversation/_Find..."
 msgstr "/Gesprek/_Zoeken..."
 
-#: ../pidgin/gtkconv.c:3069
 msgid "/Conversation/View _Log"
 msgstr "/Gesprek/Logboek _weergeven"
 
-#: ../pidgin/gtkconv.c:3070
 msgid "/Conversation/_Save As..."
 msgstr "/Gesprek/Opslaan _als..."
 
-#: ../pidgin/gtkconv.c:3072
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Gesprek/_Opschonen"
 
-#: ../pidgin/gtkconv.c:3076
 msgid "/Conversation/Se_nd File..."
 msgstr "/Gesprek/Bestand ver_zenden..."
 
-#: ../pidgin/gtkconv.c:3077
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Gesprek/_Contactalarm toevoegen..."
 
-#: ../pidgin/gtkconv.c:3079
 msgid "/Conversation/_Get Info"
 msgstr "/Gesprek/Info _opvragen"
 
-#: ../pidgin/gtkconv.c:3081
 msgid "/Conversation/In_vite..."
 msgstr "/Gesprek/_Uitnodigen..."
 
-#: ../pidgin/gtkconv.c:3083
 msgid "/Conversation/M_ore"
 msgstr "/Gesprek/_Meer"
 
-#: ../pidgin/gtkconv.c:3087
 msgid "/Conversation/Al_ias..."
 msgstr "/Gesprek/A_lias..."
 
-#: ../pidgin/gtkconv.c:3089
 msgid "/Conversation/_Block..."
 msgstr "/Gesprek/Blo_kkeren..."
 
-#: ../pidgin/gtkconv.c:3091
 msgid "/Conversation/_Unblock..."
 msgstr "/Gesprek/_Deblokkeren..."
 
-#: ../pidgin/gtkconv.c:3093
 msgid "/Conversation/_Add..."
 msgstr "/Gesprek/_Toevoegen..."
 
-#: ../pidgin/gtkconv.c:3095
 msgid "/Conversation/_Remove..."
 msgstr "/Gesprek/Ver_wijderen..."
 
-#: ../pidgin/gtkconv.c:3100
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Gesprek/_URL invoegen..."
 
-#: ../pidgin/gtkconv.c:3102
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Gesprek/_Afbeelding invoegen..."
 
-#: ../pidgin/gtkconv.c:3108
 msgid "/Conversation/_Close"
 msgstr "/Gesprek/_Sluiten"
 
 #. Options
-#: ../pidgin/gtkconv.c:3112
 msgid "/_Options"
 msgstr "/_Opties"
 
-#: ../pidgin/gtkconv.c:3113
 msgid "/Options/Enable _Logging"
 msgstr "/Opties/_Logboek bijhouden"
 
-#: ../pidgin/gtkconv.c:3114
 msgid "/Options/Enable _Sounds"
 msgstr "/Opties/_Geluid gebruiken"
 
-#: ../pidgin/gtkconv.c:3116
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Opties/_Opmaakwerkbalk weergeven"
 
-#: ../pidgin/gtkconv.c:3117
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Opties/Bericht_tijd weergeven"
 
-#: ../pidgin/gtkconv.c:3253
 msgid "/Conversation/More"
 msgstr "/Gesprek/Meer"
 
-#: ../pidgin/gtkconv.c:3309
 msgid "/Options"
 msgstr "/Opties"
 
@@ -15019,80 +10896,60 @@ msgstr "/Opties"
 #. Make sure the 'Conversation -> More' menuitems are regenerated whenever
 #. * the 'Conversation' menu pops up because the entries can change after the
 #. * conversation is created.
-#: ../pidgin/gtkconv.c:3344
-#: ../pidgin/gtkconv.c:3376
 msgid "/Conversation"
 msgstr "/Gesprek"
 
-#: ../pidgin/gtkconv.c:3384
 msgid "/Conversation/View Log"
 msgstr "/Gesprek/Logboek weergeven"
 
-#: ../pidgin/gtkconv.c:3390
 msgid "/Conversation/Send File..."
 msgstr "/Gesprek/Bestand verzenden..."
 
-#: ../pidgin/gtkconv.c:3394
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Gesprek/Contactalarm toevoegen..."
 
-#: ../pidgin/gtkconv.c:3400
 msgid "/Conversation/Get Info"
 msgstr "/Gesprek/Info opvragen"
 
-#: ../pidgin/gtkconv.c:3404
 msgid "/Conversation/Invite..."
 msgstr "/Gesprek/Uitnodigen..."
 
-#: ../pidgin/gtkconv.c:3410
 msgid "/Conversation/Alias..."
 msgstr "/Gesprek/Alias..."
 
-#: ../pidgin/gtkconv.c:3414
 msgid "/Conversation/Block..."
 msgstr "/Gesprek/Blokkeren..."
 
-#: ../pidgin/gtkconv.c:3418
 msgid "/Conversation/Unblock..."
 msgstr "/Gesprek/Deblokkeren..."
 
-#: ../pidgin/gtkconv.c:3422
 msgid "/Conversation/Add..."
 msgstr "/Gesprek/Toevoegen..."
 
-#: ../pidgin/gtkconv.c:3426
 msgid "/Conversation/Remove..."
 msgstr "/Gesprek/Verwijderen..."
 
-#: ../pidgin/gtkconv.c:3432
 msgid "/Conversation/Insert Link..."
 msgstr "/Gesprek/URL invoegen..."
 
-#: ../pidgin/gtkconv.c:3436
 msgid "/Conversation/Insert Image..."
 msgstr "/Gesprek/Afbeelding invoegen..."
 
-#: ../pidgin/gtkconv.c:3442
 msgid "/Options/Enable Logging"
 msgstr "/Opties/Logboek bijhouden"
 
-#: ../pidgin/gtkconv.c:3445
 msgid "/Options/Enable Sounds"
 msgstr "/Opties/Geluid gebruiken"
 
-#: ../pidgin/gtkconv.c:3458
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Opties/Opmaakwerkbalk weergeven"
 
-#: ../pidgin/gtkconv.c:3461
 msgid "/Options/Show Timestamps"
 msgstr "/Opties/Berichttijd weergeven"
 
-#: ../pidgin/gtkconv.c:3539
 msgid "User is typing..."
 msgstr "Gebruiker typt..."
 
-#: ../pidgin/gtkconv.c:3613
 #, c-format
 msgid ""
 "\n"
@@ -15102,1001 +10959,721 @@ msgstr ""
 "%s is gestopt met tikken"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3793
-#: ../pidgin/gtkconv.c:8349
 msgid "S_end To"
 msgstr "_Verzenden aan"
 
 # verzenden/versturen
-#: ../pidgin/gtkconv.c:4462
-#: ../pidgin/plugins/sendbutton.c:44
 msgid "_Send"
 msgstr "Ver_sturen"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4621
 msgid "0 people in room"
 msgstr "0 personen in ruimte"
 
-#: ../pidgin/gtkconv.c:5899
-#: ../pidgin/gtkconv.c:6020
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d persoon in ruimte"
 msgstr[1] "%d personen in ruimte"
 
-#: ../pidgin/gtkconv.c:6564
-#: ../pidgin/gtkstatusbox.c:685
 msgid "Typing"
 msgstr "Typen"
 
-#: ../pidgin/gtkconv.c:6568
 msgid "Stopped Typing"
 msgstr "Gestopt met typen"
 
-#: ../pidgin/gtkconv.c:6571
 msgid "Nick Said"
 msgstr "Bijnaam gezegd"
 
-#: ../pidgin/gtkconv.c:6574
 msgid "Unread Messages"
 msgstr "Ongelezen berichten"
 
-#: ../pidgin/gtkconv.c:6580
 msgid "New Event"
 msgstr "Nieuwe gebeurtenis"
 
-#: ../pidgin/gtkconv.c:7821
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Maakt alle gespreksvensterers schoon."
 
-#: ../pidgin/gtkconv.c:8025
 msgid "Confirm close"
 msgstr "Sluiten bevestigen"
 
-#: ../pidgin/gtkconv.c:8057
 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?"
 
-#: ../pidgin/gtkconv.c:8690
 msgid "Close other tabs"
 msgstr "Andere tabbladen sluiten"
 
-#: ../pidgin/gtkconv.c:8696
 msgid "Close all tabs"
 msgstr "Alle tabbladen sluiten"
 
-#: ../pidgin/gtkconv.c:8704
 msgid "Detach this tab"
 msgstr "Tabblad losmaken"
 
 # src/bookmarks_editor.c:945
 # src/menubar.c:91
-#: ../pidgin/gtkconv.c:8710
 msgid "Close this tab"
 msgstr "Dit tabblad sluiten"
 
-#: ../pidgin/gtkconv.c:9232
 msgid "Close conversation"
 msgstr "Gesprek sluiten"
 
-#: ../pidgin/gtkconv.c:9836
 msgid "Last created window"
 msgstr "Laatst aangemaakte venster"
 
-#: ../pidgin/gtkconv.c:9838
 msgid "Separate IM and Chat windows"
 msgstr "Gewone gesprekken en chats in gescheiden vensters"
 
-#: ../pidgin/gtkconv.c:9840
-#: ../pidgin/gtkprefs.c:1573
 msgid "New window"
 msgstr "Nieuw venster"
 
-#: ../pidgin/gtkconv.c:9842
 msgid "By group"
 msgstr "Op groep"
 
-#: ../pidgin/gtkconv.c:9844
 msgid "By account"
 msgstr "Op account"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Debug-logboek opslaan"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Omkeren"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Overeenkomsten aangeven"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Alleen _plaatje"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Alleen _tekst"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "P_laatje & tekst"
 
 # filteren?
-#: ../pidgin/gtkdebug.c:772
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:791
 msgid "Right click for more options."
 msgstr "Klik met rechter muisknop voor meer opties."
 
-#: ../pidgin/gtkdebug.c:821
 msgid "Level "
 msgstr "Niveau"
 
-#: ../pidgin/gtkdebug.c:822
-#: ../pidgin/gtkdebug.c:828
 msgid "Select the debug filter level."
 msgstr "Selecteer het debug-niveau van het filter"
 
-#: ../pidgin/gtkdebug.c:830
 msgid "All"
 msgstr "Iedereen"
 
-#: ../pidgin/gtkdebug.c:831
 msgid "Misc"
 msgstr "Diversen"
 
-#: ../pidgin/gtkdebug.c:833
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Error "
 msgstr "Fout"
 
-#: ../pidgin/gtkdebug.c:835
 msgid "Fatal Error"
 msgstr "Fatale fout"
 
-#: ../pidgin/gtkdialogs.c:72
-#: ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:77
-#: ../pidgin/gtkdialogs.c:78
-#: ../pidgin/gtkdialogs.c:79
-#: ../pidgin/gtkdialogs.c:80
-#: ../pidgin/gtkdialogs.c:81
-#: ../pidgin/gtkdialogs.c:82
-#: ../pidgin/gtkdialogs.c:83
-#: ../pidgin/gtkdialogs.c:84
-#: ../pidgin/gtkdialogs.c:85
-#: ../pidgin/gtkdialogs.c:86
-#: ../pidgin/gtkdialogs.c:87
-#: ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:92
-#: ../pidgin/gtkdialogs.c:94
-#: ../pidgin/gtkdialogs.c:95
-#: ../pidgin/gtkdialogs.c:96
 msgid "developer"
 msgstr "ontwikkelaar"
 
 #. feel free to not translate this
-#: ../pidgin/gtkdialogs.c:77
 msgid "Ka-Hing Cheung"
 msgstr "Ka-Hing Cheung"
 
-#: ../pidgin/gtkdialogs.c:90
 msgid "support"
 msgstr "ondersteuning"
 
-#: ../pidgin/gtkdialogs.c:91
 msgid "support/QA"
 msgstr "ondersteuning/QA"
 
-#: ../pidgin/gtkdialogs.c:93
-#: ../pidgin/gtkdialogs.c:116
 msgid "developer & webmaster"
 msgstr "ontwikkelaar & webmaster"
 
-#: ../pidgin/gtkdialogs.c:103
 msgid "Senior Contributor/QA"
 msgstr "Senior meewerker/QA"
 
-#: ../pidgin/gtkdialogs.c:112
 msgid "win32 port"
 msgstr "win32 versie"
 
-#: ../pidgin/gtkdialogs.c:113
-#: ../pidgin/gtkdialogs.c:114
 msgid "maintainer"
 msgstr "beheerder"
 
-#: ../pidgin/gtkdialogs.c:115
 msgid "libfaim maintainer"
 msgstr "beheerder van libfaim"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:118
 msgid "hacker and designated driver [lazy bum]"
 msgstr "hacker en BOB (luie donder)"
 
-#: ../pidgin/gtkdialogs.c:119
 msgid "XMPP developer"
 msgstr "XMPP-ontwikkelaar"
 
-#: ../pidgin/gtkdialogs.c:120
 msgid "original author"
 msgstr "originele maker"
 
-#: ../pidgin/gtkdialogs.c:121
 msgid "lead developer"
 msgstr "hoofdontwikkelaar"
 
-#: ../pidgin/gtkdialogs.c:136
-#: ../pidgin/gtkdialogs.c:137
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:234
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../pidgin/gtkdialogs.c:139
 msgid "Belarusian Latin"
 msgstr "Witrussisch Latijn"
 
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:235
 msgid "Bulgarian"
 msgstr "Bulgaars"
 
-#: ../pidgin/gtkdialogs.c:142
-#: ../pidgin/gtkdialogs.c:143
-#: ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:145
 msgid "Bengali"
 msgstr "Bengaals"
 
-#: ../pidgin/gtkdialogs.c:146
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: ../pidgin/gtkdialogs.c:147
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
 msgid "Catalan"
 msgstr "Katalaans"
 
-#: ../pidgin/gtkdialogs.c:148
-#: ../pidgin/gtkdialogs.c:149
 msgid "Valencian-Catalan"
 msgstr "Valençiaans Catalaans"
 
-#: ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239
 msgid "Czech"
 msgstr "Tsjechisch"
 
-#: ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
 msgid "Danish"
 msgstr "Deens"
 
-#: ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:240
 msgid "German"
 msgstr "Duits"
 
-#: ../pidgin/gtkdialogs.c:155
-#: ../pidgin/gtkdialogs.c:156
-#: ../pidgin/gtkdialogs.c:157
 msgid "Dzongkha"
 msgstr "Bhutaans"
 
-#: ../pidgin/gtkdialogs.c:158
-#: ../pidgin/gtkdialogs.c:159
 msgid "Greek"
 msgstr "Grieks"
 
-#: ../pidgin/gtkdialogs.c:160
 msgid "Australian English"
 msgstr "Australisch Engels"
 
-#: ../pidgin/gtkdialogs.c:161
 msgid "Canadian English"
 msgstr "Canadees Engels"
 
-#: ../pidgin/gtkdialogs.c:162
 msgid "British English"
 msgstr "Brits Engels"
 
-#: ../pidgin/gtkdialogs.c:163
 msgid "Esperanto"
 msgstr "Spaans"
 
-#: ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
-#: ../pidgin/gtkdialogs.c:243
-#: ../pidgin/gtkdialogs.c:244
 msgid "Spanish"
 msgstr "Spaans"
 
-#: ../pidgin/gtkdialogs.c:165
 msgid "Estonian"
 msgstr "Estlands"
 
-#: ../pidgin/gtkdialogs.c:166
-#: ../pidgin/gtkdialogs.c:167
 msgid "Euskera(Basque)"
 msgstr "Baskisch"
 
-#: ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:170
 msgid "Persian"
 msgstr "Perzisch"
 
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:245
-#: ../pidgin/gtkdialogs.c:246
 msgid "Finnish"
 msgstr "Fins"
 
-#: ../pidgin/gtkdialogs.c:172
-#: ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
-#: ../pidgin/gtkdialogs.c:249
-#: ../pidgin/gtkdialogs.c:250
 msgid "French"
 msgstr "Frans"
 
-#: ../pidgin/gtkdialogs.c:173
-#: ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:251
 msgid "Galician"
 msgstr "Galiciaans"
 
-#: ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:176
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:176
 msgid "Gujarati Language Team"
 msgstr "Gujarati Taal Team"
 
-#: ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:252
 msgid "Hebrew"
 msgstr "Hebreeuws"
 
-#: ../pidgin/gtkdialogs.c:178
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:253
 msgid "Hungarian"
 msgstr "Hongaars"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Indonesian"
 msgstr "Indonesisch"
 
-#: ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:254
 msgid "Italian"
 msgstr "Italiaans"
 
-#: ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
-#: ../pidgin/gtkdialogs.c:257
 msgid "Japanese"
 msgstr "Japans"
 
-#: ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:258
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../pidgin/gtkdialogs.c:183
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Georgische Vertalers"
 
-#: ../pidgin/gtkdialogs.c:184
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:184
 msgid "Kannada Translation team"
 msgstr "Canada Vertaal Team"
 
-#: ../pidgin/gtkdialogs.c:185
-#: ../pidgin/gtkdialogs.c:259
-#: ../pidgin/gtkdialogs.c:260
 msgid "Korean"
 msgstr "Koreaans"
 
-#: ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188
 msgid "Kurdish"
 msgstr "Koerdisch"
 
-#: ../pidgin/gtkdialogs.c:189
 msgid "Lao"
 msgstr "Laotiaans"
 
-#: ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Lithuanian"
 msgstr "Litouws"
 
-#: ../pidgin/gtkdialogs.c:191
-#: ../pidgin/gtkdialogs.c:192
-#: ../pidgin/gtkdialogs.c:193
-#: ../pidgin/gtkdialogs.c:263
 msgid "Macedonian"
 msgstr "Macedonisch"
 
-#: ../pidgin/gtkdialogs.c:194
-#: ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
 msgid "Bokmål Norwegian"
 msgstr "Noors"
 
-#: ../pidgin/gtkdialogs.c:195
 msgid "Nepali"
 msgstr "Nepals"
 
-#: ../pidgin/gtkdialogs.c:196
 msgid "Dutch, Flemish"
 msgstr "Nederlands & Vlaams"
 
-#: ../pidgin/gtkdialogs.c:197
 msgid "Norwegian Nynorsk"
 msgstr "Noors"
 
-#: ../pidgin/gtkdialogs.c:198
 msgid "Occitan"
 msgstr "Occitaans"
 
-#: ../pidgin/gtkdialogs.c:199
 msgid "Punjabi"
 msgstr "Punjabi"
 
-#: ../pidgin/gtkdialogs.c:200
-#: ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:266
 msgid "Polish"
 msgstr "Pools"
 
-#: ../pidgin/gtkdialogs.c:203
 msgid "Portuguese"
 msgstr "Portugees"
 
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:267
 msgid "Portuguese-Brazil"
 msgstr "Braziliaans Portugees"
 
-#: ../pidgin/gtkdialogs.c:205
 msgid "Pashto"
 msgstr "Pasjtoe"
 
-#: ../pidgin/gtkdialogs.c:206
 msgid "Romanian"
 msgstr "Roemeens"
 
-#: ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:268
-#: ../pidgin/gtkdialogs.c:269
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:209
-#: ../pidgin/gtkdialogs.c:270
-#: ../pidgin/gtkdialogs.c:271
-#: ../pidgin/gtkdialogs.c:272
 msgid "Slovak"
 msgstr "Slowaaks"
 
-#: ../pidgin/gtkdialogs.c:210
-#: ../pidgin/gtkdialogs.c:273
 msgid "Slovenian"
 msgstr "Sloveens"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Albanian"
 msgstr "Albanisch"
 
-#: ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
-#: ../pidgin/gtkdialogs.c:274
-#: ../pidgin/gtkdialogs.c:275
 msgid "Serbian"
 msgstr "Servisch"
 
-#: ../pidgin/gtkdialogs.c:214
 msgid "Sinhala"
 msgstr "Singalees"
 
-#: ../pidgin/gtkdialogs.c:215
-#: ../pidgin/gtkdialogs.c:276
-#: ../pidgin/gtkdialogs.c:277
 msgid "Swedish"
 msgstr "Zweeds"
 
 # ui/preferences.glade.h:192
-#: ../pidgin/gtkdialogs.c:216
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:217
 msgid "Telugu"
 msgstr "Telugu"
 
 # ui/preferences.glade.h:192
-#: ../pidgin/gtkdialogs.c:218
 msgid "Thai"
 msgstr "Thais"
 
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:278
 msgid "Turkish"
 msgstr "Turks"
 
-#: ../pidgin/gtkdialogs.c:220
 msgid "Urdu"
 msgstr "Urdu"
 
-#: ../pidgin/gtkdialogs.c:221
 msgid "Vietnamese"
 msgstr "Vietnamees"
 
-#: ../pidgin/gtkdialogs.c:221
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh en het GNOME-Vi team"
 
-#: ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:279
 msgid "Simplified Chinese"
 msgstr "Eenvoudig Chinees"
 
-#: ../pidgin/gtkdialogs.c:223
-#: ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Chinees"
 
-#: ../pidgin/gtkdialogs.c:226
-#: ../pidgin/gtkdialogs.c:227
-#: ../pidgin/gtkdialogs.c:280
 msgid "Traditional Chinese"
 msgstr "Traditioneel Chinees"
 
-#: ../pidgin/gtkdialogs.c:233
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../pidgin/gtkdialogs.c:365
 #, c-format
 msgid "About %s"
 msgstr "Over %s"
 
-#: ../pidgin/gtkdialogs.c:401
 #, c-format
-msgid "%s is a graphical modular messaging client based on libpurple which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr "%s 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>"
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu, and "
+"QQ all at once.  It is written using GTK+.<BR><BR>You may modify and "
+"redistribute the program under the terms of the GPL (version 2 or later).  A "
+"copy of the GPL is contained in the 'COPYING' file distributed with %s.  %s "
+"is copyrighted by its contributors.  See the 'COPYRIGHT' file for the "
+"complete list of contributors.  We provide no warranty for this program."
+"<BR><BR>"
+msgstr ""
+"%s 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>"
 
-#: ../pidgin/gtkdialogs.c:419
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin op irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:424
 msgid "Current Developers"
 msgstr "Huidige ontwikkelaars"
 
-#: ../pidgin/gtkdialogs.c:439
 msgid "Crazy Patch Writers"
 msgstr "Gestoorde patch-schrijvers"
 
-#: ../pidgin/gtkdialogs.c:454
 msgid "Retired Developers"
 msgstr "Gestopte ontwikkelaars"
 
-#: ../pidgin/gtkdialogs.c:469
 msgid "Retired Crazy Patch Writers"
 msgstr "Gestoorde Patch-schrijvers"
 
-#: ../pidgin/gtkdialogs.c:484
 msgid "Artists"
 msgstr "Artiesten"
 
-#: ../pidgin/gtkdialogs.c:499
 msgid "Current Translators"
 msgstr "Huidige vertalers"
 
-#: ../pidgin/gtkdialogs.c:519
 msgid "Past Translators"
 msgstr "Gestopte vertalers"
 
-#: ../pidgin/gtkdialogs.c:537
 msgid "Debugging Information"
 msgstr "Debuginformatie"
 
-#: ../pidgin/gtkdialogs.c:753
-#: ../pidgin/gtkdialogs.c:892
-#: ../pidgin/gtkdialogs.c:973
 msgid "_Name"
 msgstr "_Naam"
 
-#: ../pidgin/gtkdialogs.c:758
-#: ../pidgin/gtkdialogs.c:897
-#: ../pidgin/gtkdialogs.c:978
 msgid "_Account"
 msgstr "_Account"
 
-#: ../pidgin/gtkdialogs.c:905
 msgid "Get User Info"
 msgstr "Gebruikersinfo"
 
-#: ../pidgin/gtkdialogs.c:907
-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 je de informatie wil opvragen."
+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."
 
-#: ../pidgin/gtkdialogs.c:997
 msgid "View User Log"
 msgstr "Gebruikerslogboek opvragen"
 
-#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Contact"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this contact."
 msgstr "Geef een alias voor deze persoon."
 
-#: ../pidgin/gtkdialogs.c:1042
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geef een alias voor %s."
 
-#: ../pidgin/gtkdialogs.c:1044
 msgid "Alias Buddy"
 msgstr "Alias voor contact"
 
-#: ../pidgin/gtkdialogs.c:1065
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: ../pidgin/gtkdialogs.c:1066
 msgid "Enter an alias for this chat."
 msgstr "Geef een alias voor deze chat."
 
-#: ../pidgin/gtkdialogs.c:1105
 #, c-format
-msgid "You are about to remove the contact containing %s and %d other buddy from your buddy list.  Do you want to continue?"
-msgid_plural "You are about to remove the contact containing %s and %d other buddies from your buddy list.  Do you want to continue?"
-msgstr[0] "Je gaat het contact met %s en %d ander contact van je contactenlijst wissen.  Wil je doorgaan?"
-msgstr[1] "Je gaat het contact met %s en %d ander contacten van je contactenlijst wissen.  Wil je doorgaan?"
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"Je gaat het contact met %s en %d ander contact van je contactenlijst "
+"wissen.  Wil je doorgaan?"
+msgstr[1] ""
+"Je gaat het contact met %s en %d ander contacten van je contactenlijst "
+"wissen.  Wil je doorgaan?"
 
-#: ../pidgin/gtkdialogs.c:1113
 msgid "Remove Contact"
 msgstr "Contact verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1116
 msgid "_Remove Contact"
 msgstr "_Contact verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1147
 #, c-format
-msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
-msgstr "Je staat op het punt om de groep %s in de groep %s samen te voegen. Wilt je doorgaan?"
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"U staat op het punt om de groep %s in de groep %s samen te voegen. Wilt u "
+"doorgaan?"
 
-#: ../pidgin/gtkdialogs.c:1154
 msgid "Merge Groups"
 msgstr "Groepen Samenvoegen"
 
-#: ../pidgin/gtkdialogs.c:1157
 msgid "_Merge Groups"
 msgstr "Groep _Samenvoegen"
 
-#: ../pidgin/gtkdialogs.c:1207
 #, c-format
-msgid "You are about to remove the group %s and all its members from your buddy list.  Do you want to continue?"
-msgstr "Je staat op het punt om de groep %s en alle contacten in die groep van je contactenlijst te verwijderen. Wil je doorgaan?"
+msgid ""
+"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?"
 
-#: ../pidgin/gtkdialogs.c:1210
 msgid "Remove Group"
 msgstr "Groep verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1213
 msgid "_Remove Group"
 msgstr "_Groep verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1246
 #, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "Je staat op het punt om %s van je contactenlijst te verwijderen. Wil je doorgaan?"
+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 "
+"doorgaan?"
 
-#: ../pidgin/gtkdialogs.c:1249
 msgid "Remove Buddy"
 msgstr "Contact verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1252
 msgid "_Remove Buddy"
 msgstr "Contact ver_wijderen"
 
-#: ../pidgin/gtkdialogs.c:1273
 #, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
-msgstr "Je staat op het punt om de chatruimte %s van je contactenlijst te verwijderen. Wil je doorgaan?"
+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?"
 
-#: ../pidgin/gtkdialogs.c:1276
 msgid "Remove Chat"
 msgstr "Chat verwijderen"
 
-#: ../pidgin/gtkdialogs.c:1279
 msgid "_Remove Chat"
 msgstr "Chat _verwijderen"
 
-#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Klik met de rechter muisknop voor meer ongelezen berichten...\n"
 
-#: ../pidgin/gtkdocklet.c:533
 msgid "_Change Status"
 msgstr "Status _wijzigen"
 
-#: ../pidgin/gtkdocklet.c:681
 msgid "Show Buddy _List"
 msgstr "Contactenlijst _weergeven"
 
-#: ../pidgin/gtkdocklet.c:686
 msgid "_Unread Messages"
 msgstr "_Ongelezen berichten"
 
-#: ../pidgin/gtkdocklet.c:707
 msgid "New _Message..."
 msgstr "Nieuw _bericht..."
 
-#: ../pidgin/gtkdocklet.c:721
 msgid "_Accounts"
 msgstr "_Accounts"
 
-#: ../pidgin/gtkdocklet.c:722
 msgid "Plu_gins"
 msgstr "Plu_gins"
 
-#: ../pidgin/gtkdocklet.c:723
 msgid "Pr_eferences"
 msgstr "Voork_euren"
 
-#: ../pidgin/gtkdocklet.c:727
 msgid "Mute _Sounds"
 msgstr "Geluiden _dempen..."
 
-#: ../pidgin/gtkdocklet.c:734
 msgid "_Blink on New Message"
 msgstr "_Knipperen bij nieuw bericht..."
 
-#: ../pidgin/gtkdocklet.c:744
 msgid "_Quit"
 msgstr "_Afsluiten"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Ontvangen als:</b>"
 
-#: ../pidgin/gtkft.c:278
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Ontvangen van:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending To:</b>"
 msgstr "<b>Verzenden naar:</b>"
 
-#: ../pidgin/gtkft.c:284
 msgid "<b>Sending As:</b>"
 msgstr "<b>Verzenden als:</b>"
 
-#: ../pidgin/gtkft.c:500
 msgid "There is no application configured to open this type of file."
 msgstr "Er is geen programma geconfigureerd om dit type bestand te openen."
 
-#: ../pidgin/gtkft.c:505
 msgid "An error occurred while opening the file."
 msgstr "Er is een fout opgetreden bij het openen van het bestand."
 
-#: ../pidgin/gtkft.c:542
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Fout bij starten van %s: %s"
 
-#: ../pidgin/gtkft.c:551
 #, c-format
 msgid "Error running %s"
 msgstr "Fout bij uitvoeren van %s"
 
-#: ../pidgin/gtkft.c:552
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Proces gaf foutcode terug: %d"
 
-#: ../pidgin/gtkft.c:699
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Local File:"
 msgstr "Lokaal bestand:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Speed:"
 msgstr "Snelheid:"
 
-#: ../pidgin/gtkft.c:703
 msgid "Time Elapsed:"
 msgstr "Tijd:"
 
-#: ../pidgin/gtkft.c:704
 msgid "Time Remaining:"
 msgstr "Schatting:"
 
-#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "Venster sluiten nadat alles is _voltooid"
 
-#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "Verwerkte overdrachten uit lijst _verwijderen"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "Details bestand"
 
 #. Pause button
-#: ../pidgin/gtkft.c:820
-#: ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pauzeren"
 
 #. Resume button
-#: ../pidgin/gtkft.c:825
 msgid "_Resume"
 msgstr "_Doorgaan"
 
-#: ../pidgin/gtkimhtml.c:897
 msgid "Paste as Plain _Text"
 msgstr "_Plakken als tekst"
 
-#: ../pidgin/gtkimhtml.c:914
-#: ../pidgin/gtkimhtmltoolbar.c:1325
 msgid "_Reset formatting"
 msgstr "Opmaak _verwijderen"
 
-#: ../pidgin/gtkimhtml.c:922
 msgid "Disable _smileys in selected text"
 msgstr "Smileys in geselecteerde tekst inschakelen"
 
-#: ../pidgin/gtkimhtml.c:1482
 msgid "Hyperlink color"
 msgstr "Kleur van verwijzing"
 
-#: ../pidgin/gtkimhtml.c:1483
 msgid "Color to draw hyperlinks."
 msgstr "Kleur van de verwijzingen"
 
-#: ../pidgin/gtkimhtml.c:1486
 msgid "Hyperlink prelight color"
 msgstr "Kleur van verwijzing"
 
-#: ../pidgin/gtkimhtml.c:1487
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Kleur van de verwijzingen wanneer muis erboven hangt"
 
-#: ../pidgin/gtkimhtml.c:1490
-#: ../pidgin/plugins/pidginrc.c:52
 msgid "Sent Message Name Color"
 msgstr "Verzonden bericht-kleur"
 
-#: ../pidgin/gtkimhtml.c:1491
 msgid "Color to draw the name of a message you sent."
 msgstr "De kleur die de naam van bericht met zich mee draagt"
 
-#: ../pidgin/gtkimhtml.c:1494
-#: ../pidgin/plugins/pidginrc.c:53
 msgid "Received Message Name Color"
 msgstr "Ontvangen bericht-kleur"
 
-#: ../pidgin/gtkimhtml.c:1495
 msgid "Color to draw the name of a message you received."
-msgstr ""
+msgstr "De kleur die weergegeven wordt van het bericht dat je ontvangt."
 
-#: ../pidgin/gtkimhtml.c:1498
 msgid "\"Attention\" Name Color"
 msgstr "\"Attentie\" -kleur"
 
-#: ../pidgin/gtkimhtml.c:1499
 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"
+msgstr ""
+"De kleur van de naam van een bericht dat je hebt ontvangen inclusief je naam"
 
-#: ../pidgin/gtkimhtml.c:1502
-#: ../pidgin/plugins/pidginrc.c:55
 msgid "Action Message Name Color"
 msgstr "Actie-bericht-kleur"
 
-#: ../pidgin/gtkimhtml.c:1503
-#: ../pidgin/gtkimhtml.c:1507
-#: ../pidgin/gtkimhtml.c:1511
 msgid "Color to draw the name of an action message."
 msgstr "De kleur van een naam van een melding."
 
-#: ../pidgin/gtkimhtml.c:1506
 msgid "Action Message Name Color for Whispered Message"
 msgstr ""
 
-#: ../pidgin/gtkimhtml.c:1510
 msgid "Whisper Message Name Color"
 msgstr "Fluisterend berichtkleur"
 
-#: ../pidgin/gtkimhtml.c:1520
 msgid "Typing notification color"
 msgstr "Kleur van melding van typen"
 
-#: ../pidgin/gtkimhtml.c:1521
 msgid "The color to use for the typing notification font"
 msgstr "De kleur die gebruikt wordt voor het lettertype van de typmelding"
 
-#: ../pidgin/gtkimhtml.c:1524
 msgid "Typing notification font"
 msgstr "Lettertype van melding van typen"
 
-#: ../pidgin/gtkimhtml.c:1525
 msgid "The font to use for the typing notification"
 msgstr "Het lettertype dat gebruikt wordt bij het typmelding."
 
-#: ../pidgin/gtkimhtml.c:1528
-#: ../pidgin/gtkimhtml.c:1529
 msgid "Enable typing notification"
 msgstr "Schakel typmelding in"
 
-#: ../pidgin/gtkimhtml.c:1757
 msgid "_Copy Email Address"
 msgstr "E-mailadres _kopiëren"
 
-#: ../pidgin/gtkimhtml.c:1769
 msgid "_Open Link in Browser"
 msgstr "Verwijzing _openen met webbrowser"
 
-#: ../pidgin/gtkimhtml.c:1779
 msgid "_Copy Link Location"
 msgstr "Verwijzing _kopiëren"
 
-#: ../pidgin/gtkimhtml.c:3551
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -16106,7 +11683,6 @@ msgstr ""
 "\n"
 "PNG wordt gebruikt."
 
-#: ../pidgin/gtkimhtml.c:3554
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -16116,7 +11692,6 @@ msgstr ""
 "\n"
 "PNG wordt gebruikt."
 
-#: ../pidgin/gtkimhtml.c:3583
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -16127,7 +11702,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3586
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -16138,261 +11712,215 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3667
-#: ../pidgin/gtkimhtml.c:3679
 msgid "Save Image"
 msgstr "Afbeelding opslaan"
 
-#: ../pidgin/gtkimhtml.c:3716
+#, c-format
 msgid "_Save Image..."
 msgstr "Afbeelding _opslaan..."
 
-#: ../pidgin/gtkimhtml.c:3730
+#, c-format
 msgid "_Add Custom Smiley..."
 msgstr "_Eigen smiley toevoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:165
 msgid "Select Font"
 msgstr "Lettertype selecteren"
 
-#: ../pidgin/gtkimhtmltoolbar.c:245
 msgid "Select Text Color"
 msgstr ":Tekstkleur selecteren"
 
-#: ../pidgin/gtkimhtmltoolbar.c:325
 msgid "Select Background Color"
 msgstr "Achtergrondkleur selecteren"
 
-#: ../pidgin/gtkimhtmltoolbar.c:414
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:422
 msgid "_Description"
 msgstr "_Beschrijving"
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
-msgstr "Geef het adres en de beschrijving van de verwijzing die je wilt invoegen. De beschrijving is optioneel."
+msgid ""
+"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 "
+"beschrijving is optioneel."
 
-#: ../pidgin/gtkimhtmltoolbar.c:429
 msgid "Please enter the URL of the link that you want to insert."
-msgstr "Geef het adres van de verwijzing die je wilt invoegen."
+msgstr "Geef de URL van de verwijzing die u wilt invoegen."
 
-#: ../pidgin/gtkimhtmltoolbar.c:434
-#: ../pidgin/gtkimhtmltoolbar.c:1232
 msgid "Insert Link"
 msgstr "Verwijzing invoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:438
-#: ../pidgin/gtkimhtmltoolbar.c:1393
 msgid "_Insert"
 msgstr "_Invoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kan de afbeelding niet opslaan: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:545
-#: ../pidgin/gtkimhtmltoolbar.c:555
 msgid "Insert Image"
 msgstr "Afbeelding invoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:684
 #, c-format
 msgid ""
 "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 snelkoppeling:\n"
+"%s"
 
-#: ../pidgin/gtkimhtmltoolbar.c:815
 msgid "Smile!"
 msgstr "Lachen!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:830
 msgid "_Manage custom smileys"
 msgstr "Eigen smileys _beheren"
 
-#: ../pidgin/gtkimhtmltoolbar.c:867
 msgid "This theme has no available smileys."
 msgstr "Dit thema heeft geen smileys beschikbaar."
 
-#: ../pidgin/gtkimhtmltoolbar.c:973
-#: ../pidgin/gtkimhtmltoolbar.c:1350
 msgid "_Font"
 msgstr "_Lettertype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "Group Items"
 msgstr "Groepeer items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "Ungroup Items"
 msgstr "Degroepeer items"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1218
-#: ../pidgin/plugins/convcolors.c:342
 msgid "Bold"
 msgstr "Vet"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1219
-#: ../pidgin/plugins/convcolors.c:351
 msgid "Italic"
 msgstr "Cursief"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1220
-#: ../pidgin/plugins/convcolors.c:360
 msgid "Underline"
 msgstr "Onderstrepen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1221
 msgid "Strikethrough"
 msgstr "Doorstrepen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1223
 msgid "Increase Font Size"
 msgstr "Groter lettertype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "Decrease Font Size"
 msgstr "Kleiner lettertype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1226
 msgid "Font Face"
 msgstr "Lettertype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1227
 msgid "Background Color"
 msgstr "Achtergrondkleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1228
 msgid "Foreground Color"
 msgstr "Tekstkleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1230
 msgid "Reset Formatting"
 msgstr "Opmaak verwijderen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1233
 msgid "Insert IM Image"
 msgstr "Afbeelding invoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1234
 msgid "Insert Smiley"
 msgstr "Smiley invoegen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1310
 msgid "<b>_Bold</b>"
 msgstr "<b>_Vet: </b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1311
 msgid "<i>_Italic</i>"
 msgstr " <i>_Cursief</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1312
 msgid "<u>_Underline</u>"
 msgstr "<u>Onderstrepen</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1313
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Doorstrepen</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1314
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Groter</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1316
 msgid "_Normal"
 msgstr "_Normaal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1318
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Kleiner</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1322
 msgid "_Font face"
 msgstr "_Lettertype"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1323
 msgid "Foreground _color"
 msgstr "Tekst_kleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1324
 msgid "Bac_kground color"
 msgstr "Achtergrond_kleur"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1401
 msgid "_Image"
 msgstr "_Afbeelding"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1407
 msgid "_Link"
 msgstr "_Link"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1413
 msgid "_Horizontal rule"
 msgstr "_Horizontale streep"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1435
 msgid "_Smile!"
 msgstr "L_achen!"
 
-#: ../pidgin/gtklog.c:245
 msgid "Log Deletion Failed"
 msgstr "Logboek verwijderen mislukt"
 
-#: ../pidgin/gtklog.c:246
 msgid "Check permissions and try again."
 msgstr "Controleer permissies en probeer het opnieuw."
 
-#: ../pidgin/gtklog.c:292
 #, c-format
-msgid "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?"
+msgid ""
+"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?"
 
-#: ../pidgin/gtklog.c:303
 #, 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 permanent wilt verwijderen?"
+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 "
+"permanent wilt verwijderen?"
 
-#: ../pidgin/gtklog.c:308
 #, c-format
-msgid "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 verwijderen?"
+msgid ""
+"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 "
+"verwijderen?"
 
-#: ../pidgin/gtklog.c:323
 msgid "Delete Log?"
 msgstr "Verwijder Logboek?"
 
-#: ../pidgin/gtklog.c:334
 msgid "Delete Log..."
 msgstr "Verwijderen Logboek..."
 
-#: ../pidgin/gtklog.c:453
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Gesprek in %s op %s</span>"
 
-#: ../pidgin/gtklog.c:456
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Gesprek met %s op %s</span>"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:581
 msgid "_Browse logs folder"
 msgstr "_Bekijk logboek-folder"
 
-#: ../pidgin/gtkmain.c:384
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Probeer '%s -h' voor meer informatie.\n"
 
-#: ../pidgin/gtkmain.c:387
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16421,7 +11949,6 @@ msgstr ""
 "                      (kommagescheiden)te gebruiken account(s) aan)\n"
 "  -v, --version       versie-info weergeven\n"
 
-#: ../pidgin/gtkmain.c:400
 #, c-format
 msgid ""
 "%s %s\n"
@@ -16449,7 +11976,6 @@ msgstr ""
 "                      (kommagescheiden)te gebruiken account(s) aan)\n"
 "  -v, --version       versie-info weergeven\n"
 
-#: ../pidgin/gtkmain.c:530
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -16490,421 +12016,330 @@ msgstr ""
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:724
-#: ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:360
 msgid "Open All Messages"
 msgstr "Alle berichten openen"
 
-#: ../pidgin/gtknotify.c:414
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Je hebt post!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Je hebt postl!</span>"
 
-#: ../pidgin/gtknotify.c:570
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s heeft %d nieuw bericht."
 msgstr[1] "%s heeft %d nieuwe berichten."
 
-#: ../pidgin/gtknotify.c:599
 #, c-format
 msgid "<b>%d new email.</b>"
 msgid_plural "<b>%d new emails.</b>"
 msgstr[0] "<b>%d nieuwe e-mail.</b>"
 msgstr[1] "<b>%d nieuwe e-mails.</b>"
 
-#: ../pidgin/gtknotify.c:1033
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "De webbrowser-opdracht \"%s\" is ongeldig."
 
-#: ../pidgin/gtknotify.c:1035
-#: ../pidgin/gtknotify.c:1047
-#: ../pidgin/gtknotify.c:1060
-#: ../pidgin/gtknotify.c:1197
 msgid "Unable to open URL"
 msgstr "Kan URL niet openen"
 
-#: ../pidgin/gtknotify.c:1045
-#: ../pidgin/gtknotify.c:1058
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Fout bij starten van \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1198
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Kan handmatige browser niet starten omdat er geen correcte opdracht is ingesteld."
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"Kan handmatige browser niet starten omdat er geen correcte opdracht is "
+"ingesteld."
 
-#: ../pidgin/gtkplugin.c:278
 msgid "The following plugins will be unloaded."
-msgstr "De volgende plugins zullen uitgeschakeld worden"
+msgstr "De volgende plug-ins zullen uitgeschakeld worden"
 
-#: ../pidgin/gtkplugin.c:297
 msgid "Multiple plugins will be unloaded."
-msgstr "Er zullen meerdere plugins uitgeschakeld worden."
+msgstr "Er zullen meerdere plug-ins uitgeschakeld worden."
 
-#: ../pidgin/gtkplugin.c:301
 msgid "Unload Plugins"
-msgstr "Plugins uitschakelen"
+msgstr "Plug-ins uitschakelen"
 
-#: ../pidgin/gtkplugin.c:318
 msgid "Could not unload plugin"
-msgstr "Kan plugin niet uitschakelen"
+msgstr "Kan plug-in niet uitschakelen"
 
-#: ../pidgin/gtkplugin.c:319
-msgid "The plugin could not be unloaded now, but will be disabled at the next startup."
-msgstr "De plugin kan nu niet uitgeschakeld worden, maar zal de volgende keer worden uitgeschakeld."
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"De plug-in kan nu niet uitgeschakeld worden, maar zal de volgende keer "
+"worden uitgeschakeld."
 
-#: ../pidgin/gtkplugin.c:456
 #, c-format
 msgid ""
 "<span foreground=\"red\" weight=\"bold\">Error: %s\n"
 "Check the plugin website for an update.</span>"
 msgstr ""
 "<span foreground=\"red\" weight=\"bold\">Fout: %s\n"
-"Controleer de website van de plugin voor een update.</span>"
+"Controleer de website van de plug-in voor een update.</span>"
 
-#: ../pidgin/gtkplugin.c:585
 msgid "Author"
 msgstr "Auteur"
 
-#: ../pidgin/gtkplugin.c:663
 msgid "<b>Written by:</b>"
 msgstr "<b>Geschreven door:</b>"
 
-#: ../pidgin/gtkplugin.c:687
 msgid "<b>Web site:</b>"
 msgstr "<b>Website:</b> "
 
-#: ../pidgin/gtkplugin.c:696
 msgid "<b>Filename:</b>"
 msgstr "<b>Bestandsnaam:</b>"
 
-#: ../pidgin/gtkplugin.c:724
 msgid "Configure Pl_ugin"
-msgstr "_Plugin instellen"
+msgstr "_Plug-in instellen"
 
-#: ../pidgin/gtkplugin.c:792
 msgid "<b>Plugin Details</b>"
-msgstr "<b>Details plugin</b>"
+msgstr "<b>Details plug-in</b>"
 
-#: ../pidgin/gtkpounce.c:158
 msgid "Select a file"
 msgstr "Kies een bestand"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:553
 msgid "Pounce on Whom"
-msgstr "Alarmdoel"
+msgstr "Wie alarmeren"
 
-#: ../pidgin/gtkpounce.c:580
 msgid "_Buddy name:"
 msgstr "_Contactnaam:"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "Si_gns on"
-msgstr "...zich _aanmeldt"
+msgstr "_Aanmelden"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Signs o_ff"
-msgstr "...zich af_meld"
+msgstr "Af_melden"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Goes a_way"
-msgstr "..._weggaat"
+msgstr "_Weggaan"
 
-#: ../pidgin/gtkpounce.c:620
 msgid "Ret_urns from away"
-msgstr "_terugkeert van afwezigheid"
+msgstr "_Terugkeren van afwezigheid"
 
-#: ../pidgin/gtkpounce.c:622
 msgid "Becomes _idle"
-msgstr "..._inactief is"
+msgstr "_Inactief is"
 
-#: ../pidgin/gtkpounce.c:624
 msgid "Is no longer i_dle"
-msgstr "...weer _actief is"
+msgstr "Weer _actief is"
 
-#: ../pidgin/gtkpounce.c:626
 msgid "Starts _typing"
-msgstr "...begint met _typen"
+msgstr "Start met _typen"
 
-#: ../pidgin/gtkpounce.c:628
 msgid "P_auses while typing"
-msgstr "...pauzeert tijdens het typen"
+msgstr "Pauzeert tijdens typen"
 
-#: ../pidgin/gtkpounce.c:630
 msgid "Stops t_yping"
-msgstr "...stopt _met typen"
+msgstr "Stopt _met typen"
 
-#: ../pidgin/gtkpounce.c:632
 msgid "Sends a _message"
-msgstr "...een bericht ver_stuurt"
+msgstr "Een bericht ver_stuurt"
 
-#: ../pidgin/gtkpounce.c:675
 msgid "Ope_n an IM window"
 msgstr "Be_richtvenster openen"
 
-#: ../pidgin/gtkpounce.c:677
 msgid "_Pop up a notification"
 msgstr "_Melding weergeven"
 
-#: ../pidgin/gtkpounce.c:679
 msgid "Send a _message"
 msgstr "Een bericht ver_sturen"
 
-#: ../pidgin/gtkpounce.c:681
 msgid "E_xecute a command"
 msgstr "Opdracht _uitvoeren"
 
-#: ../pidgin/gtkpounce.c:683
 msgid "P_lay a sound"
 msgstr "_Geluid afspelen"
 
-#: ../pidgin/gtkpounce.c:689
 msgid "Brows_e..."
 msgstr "Bl_aderen..."
 
-#: ../pidgin/gtkpounce.c:693
 msgid "Br_owse..."
 msgstr "Bl_aderen..."
 
-#: ../pidgin/gtkpounce.c:694
-#: ../pidgin/gtkprefs.c:2008
 msgid "Pre_view"
 msgstr "_Voorbeeld"
 
-#: ../pidgin/gtkpounce.c:834
 msgid "P_ounce only when my status is not Available"
-msgstr "Alarmeer alleen wanneer ik niet beschikbaar ben"
+msgstr "_Contactalarm alleen wanneer mijn status niet beschikbaar is"
 
-#: ../pidgin/gtkpounce.c:839
 msgid "_Recurring"
 msgstr "_Herhalend"
 
-#: ../pidgin/gtkpounce.c:1283
 msgid "Pounce Target"
 msgstr "Alarmdoel"
 
-#: ../pidgin/gtkprefs.c:458
 msgid "Smiley theme failed to unpack."
 msgstr "Kan smileythema niet uitpakken."
 
-#: ../pidgin/gtkprefs.c:593
 msgid "Install Theme"
 msgstr "Installeer thema"
 
-#: ../pidgin/gtkprefs.c:646
-msgid "Select a smiley theme that you would like to use from the list below. New themes can be installed by dragging and dropping them onto the theme list."
-msgstr "Kies een smiley-thema uit de lijst. Je kunt nieuwe thema's installeren door deze naar de lijst te slepen."
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"Kies een smileythema uit de lijst. U kunt nieuwe thema's installeren door "
+"deze naar de lijst te slepen."
 
-#: ../pidgin/gtkprefs.c:681
 msgid "Icon"
-msgstr "Voorbeeld"
+msgstr "Pictogram"
 
-#: ../pidgin/gtkprefs.c:891
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
 
-#: ../pidgin/gtkprefs.c:911
 msgid "Cl_ose conversations with the Escape key"
 msgstr "_Sluit gesprekken af met de Escape toets"
 
-#: ../pidgin/gtkprefs.c:940
 msgid "System Tray Icon"
 msgstr "Systeemvakpictogram"
 
-#: ../pidgin/gtkprefs.c:941
 msgid "_Show system tray icon:"
 msgstr "_Systeemvakpictogram weergeven:"
 
-#: ../pidgin/gtkprefs.c:944
 msgid "On unread messages"
 msgstr "Bij ongelezen berichten"
 
-#: ../pidgin/gtkprefs.c:950
 msgid "Conversation Window Hiding"
 msgstr "Gespreksvenster verbergen"
 
-#: ../pidgin/gtkprefs.c:951
 msgid "_Hide new IM conversations:"
 msgstr "_Nieuwe gesprekken verbergen:"
 
-#: ../pidgin/gtkprefs.c:954
-#: ../pidgin/gtkprefs.c:2072
 msgid "When away"
 msgstr "Bij afwezigheid"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:962
 msgid "Tabs"
 msgstr "Tabs"
 
-#: ../pidgin/gtkprefs.c:964
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Gesprekken en chats in venster met _tabbaden plaatsen"
 
-#: ../pidgin/gtkprefs.c:978
 msgid "Show close b_utton on tabs"
 msgstr "_Sluitknoppen weergeven op tabbladen"
 
-#: ../pidgin/gtkprefs.c:981
 msgid "_Placement:"
 msgstr "_Plaatsing:"
 
-#: ../pidgin/gtkprefs.c:983
 msgid "Top"
 msgstr "Boven"
 
-#: ../pidgin/gtkprefs.c:984
 msgid "Bottom"
 msgstr "Onder"
 
-#: ../pidgin/gtkprefs.c:985
 msgid "Left"
 msgstr "Links"
 
-#: ../pidgin/gtkprefs.c:986
 msgid "Right"
 msgstr "Rechts"
 
-#: ../pidgin/gtkprefs.c:988
 msgid "Left Vertical"
 msgstr "Links verticaal"
 
-#: ../pidgin/gtkprefs.c:989
 msgid "Right Vertical"
 msgstr "rechts verticaal"
 
-#: ../pidgin/gtkprefs.c:996
 msgid "N_ew conversations:"
 msgstr "_Nieuwe gesprekken:"
 
-#: ../pidgin/gtkprefs.c:1045
 msgid "Show _formatting on incoming messages"
 msgstr "_Opmaak weergeven bij ontvangen berichten"
 
-#: ../pidgin/gtkprefs.c:1047
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Chat direct sluiten wanneer de tab gesloten wordt"
 
-#: ../pidgin/gtkprefs.c:1050
 msgid "Show _detailed information"
 msgstr "Laat ge_detaileerde informatie zien"
 
-#: ../pidgin/gtkprefs.c:1052
 msgid "Enable buddy ic_on animation"
 msgstr "Bewegende _pictogrammen weergeven"
 
-#: ../pidgin/gtkprefs.c:1059
 msgid "_Notify buddies that you are typing to them"
-msgstr "Laat anderen weten dat je naar ze aan het _typen bent"
+msgstr "Laat anderen weten dat je iets naar ze typt"
 
-#: ../pidgin/gtkprefs.c:1062
 msgid "Highlight _misspelled words"
 msgstr "Verkeerd gespelde woorden _oplichten"
 
-#: ../pidgin/gtkprefs.c:1066
 msgid "Use smooth-scrolling"
 msgstr "Vloeiend schuiven"
 
-#: ../pidgin/gtkprefs.c:1069
 msgid "F_lash window when IMs are received"
 msgstr "Venster laten _knipperen wanneer gespreksberichten worden ontvangen"
 
-#: ../pidgin/gtkprefs.c:1071
 msgid "Minimi_ze new conversation windows"
 msgstr "Minimalizeer nieuwe gespreksvensters "
 
-#: ../pidgin/gtkprefs.c:1075
 msgid "Minimum input area height in lines:"
 msgstr "Minimale invoerhoogte in regels:"
 
-#: ../pidgin/gtkprefs.c:1081
 msgid "Font"
 msgstr "Lettertype"
 
-#: ../pidgin/gtkprefs.c:1083
 msgid "Use document font from _theme"
 msgstr "Gebruik lettertype uit _thema"
 
-#: ../pidgin/gtkprefs.c:1085
 msgid "Use font from _theme"
 msgstr "Gebruik lettertype van thema"
 
-#: ../pidgin/gtkprefs.c:1091
 msgid "Conversation _font:"
 msgstr "Gesprek _Lettertype:"
 
-#: ../pidgin/gtkprefs.c:1098
 msgid "Default Formatting"
 msgstr "Standaardopmaak"
 
-#: ../pidgin/gtkprefs.c:1117
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting."
-msgstr "Dit is hoe uitgaande berichten eruit zien via protocollen die ondersteuning voor berichtopmaak hebben."
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+"Dit is hoe uitgaande berichten eruit zien via protocollen die ondersteuning "
+"voor berichtopmaak hebben."
 
-#: ../pidgin/gtkprefs.c:1177
 msgid "Cannot start proxy configuration program."
 msgstr "Kan het programma voor proxy-instellingen niet starten."
 
-#: ../pidgin/gtkprefs.c:1189
 msgid "Cannot start browser configuration program."
 msgstr "Kan het programma voor browser-instellingen niet starten."
 
-#: ../pidgin/gtkprefs.c:1209
 msgid "ST_UN server:"
 msgstr "ST_UN-server:"
 
-#: ../pidgin/gtkprefs.c:1221
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Bijvoorbeeld: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1225
 msgid "_Autodetect IP address"
 msgstr "IP-adres _automatisch bepalen"
 
-#: ../pidgin/gtkprefs.c:1234
 msgid "Public _IP:"
 msgstr "Publiek _IP-adres:"
 
-#: ../pidgin/gtkprefs.c:1265
 msgid "Ports"
 msgstr "Poorten"
 
-#: ../pidgin/gtkprefs.c:1268
 msgid "_Enable automatic router port forwarding"
 msgstr "_Automatisch router port forwarding inschakelen"
 
-#: ../pidgin/gtkprefs.c:1271
 msgid "_Manually specify range of ports to listen on"
 msgstr "Poortbereik _handmatig aangeven"
 
-#: ../pidgin/gtkprefs.c:1274
 msgid "_Start port:"
 msgstr "_Beginpoort:"
 
-#: ../pidgin/gtkprefs.c:1281
 msgid "_End port:"
 msgstr "_Eindpoort:"
 
-#: ../pidgin/gtkprefs.c:1289
 msgid "Proxy Server &amp; Browser"
 msgstr "Proxy-server &amp; browser"
 
-#: ../pidgin/gtkprefs.c:1297
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Proxy-configuratie programma werd niet gevonden.</b>"
 
-#: ../pidgin/gtkprefs.c:1305
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Programma voor browser-instellingen werd niet gevonden.</b>"
 
-#: ../pidgin/gtkprefs.c:1310
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16912,99 +12347,75 @@ msgstr ""
 "Proxy- en browser-voorkeuren zijn ingesteld\n"
 "in GNOME-instellingen"
 
-#: ../pidgin/gtkprefs.c:1317
 msgid "Configure _Proxy"
 msgstr "_Proxy-instellingen veranderen"
 
-#: ../pidgin/gtkprefs.c:1322
 msgid "Configure _Browser"
 msgstr "_Browser instellen"
 
-#: ../pidgin/gtkprefs.c:1328
 msgid "Proxy Server"
 msgstr "Proxy-server"
 
-#: ../pidgin/gtkprefs.c:1333
 msgid "No proxy"
 msgstr "Geen proxy"
 
-#: ../pidgin/gtkprefs.c:1389
 msgid "_User:"
 msgstr "_Gebruiker:"
 
-#: ../pidgin/gtkprefs.c:1477
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1478
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1479
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1480
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1481
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1482
 msgid "Desktop Default"
 msgstr "Desktop standaard"
 
-#: ../pidgin/gtkprefs.c:1483
 msgid "GNOME Default"
 msgstr "GNOME standaard"
 
-#: ../pidgin/gtkprefs.c:1484
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1485
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1486
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1487
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1496
 msgid "Manual"
 msgstr "Handmatig"
 
-#: ../pidgin/gtkprefs.c:1557
 msgid "Browser Selection"
 msgstr "Browser-selectie"
 
-#: ../pidgin/gtkprefs.c:1561
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../pidgin/gtkprefs.c:1569
 msgid "_Open link in:"
 msgstr "Verwijzing _openen met:"
 
-#: ../pidgin/gtkprefs.c:1571
 msgid "Browser default"
 msgstr "Standaard-browser"
 
-#: ../pidgin/gtkprefs.c:1572
 msgid "Existing window"
 msgstr "Bestaand venster"
 
-#: ../pidgin/gtkprefs.c:1574
 msgid "New tab"
 msgstr "Nieuw tabblad"
 
-#: ../pidgin/gtkprefs.c:1591
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -17013,63 +12424,54 @@ msgstr ""
 "_Handmatig:\n"
 "(%s voor URL)"
 
-#: ../pidgin/gtkprefs.c:1617
 msgid "Log _format:"
 msgstr "Logboekop_maak:"
 
-#: ../pidgin/gtkprefs.c:1622
 msgid "Log all _instant messages"
 msgstr "Alle gesprekken _opslaan"
 
-#: ../pidgin/gtkprefs.c:1624
 msgid "Log all c_hats"
 msgstr "Alle _chats opslaan"
 
-#: ../pidgin/gtkprefs.c:1626
 msgid "Log all _status changes to system log"
 msgstr "_Statusveranderingen opslaan in systeemlogboek"
 
-#: ../pidgin/gtkprefs.c:1776
 msgid "Sound Selection"
 msgstr "Geluid selecteren"
 
-#: ../pidgin/gtkprefs.c:1786
+#, c-format
 msgid "Quietest"
 msgstr "Stilst"
 
-#: ../pidgin/gtkprefs.c:1788
+#, c-format
 msgid "Quieter"
 msgstr "Stiller"
 
-#: ../pidgin/gtkprefs.c:1790
+#, c-format
 msgid "Quiet"
 msgstr "Stil"
 
-#: ../pidgin/gtkprefs.c:1794
+#, c-format
 msgid "Loud"
 msgstr "Hard"
 
-#: ../pidgin/gtkprefs.c:1796
+#, c-format
 msgid "Louder"
 msgstr "Harder"
 
-#: ../pidgin/gtkprefs.c:1798
+#, c-format
 msgid "Loudest"
 msgstr "Hardst"
 
-#: ../pidgin/gtkprefs.c:1861
 msgid "_Method:"
 msgstr "_Methode:"
 
-#: ../pidgin/gtkprefs.c:1863
 msgid "Console beep"
 msgstr "Terminal-pieptoon"
 
-#: ../pidgin/gtkprefs.c:1870
 msgid "No sounds"
 msgstr "Geen geluid"
 
-#: ../pidgin/gtkprefs.c:1883
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -17078,401 +12480,321 @@ msgstr ""
 "Geluids_opdracht:\n"
 "(%s voor bestandsnaam)"
 
-#: ../pidgin/gtkprefs.c:1892
 msgid "Sounds when conversation has _focus"
 msgstr "Geluiden wanneer gesprek de _aandacht heeft"
 
-#: ../pidgin/gtkprefs.c:1894
 msgid "Enable sounds:"
 msgstr "Geluidjes inschakelen:"
 
-#: ../pidgin/gtkprefs.c:1911
 msgid "Volume:"
 msgstr "Volume:"
 
-#: ../pidgin/gtkprefs.c:1978
 msgid "Play"
 msgstr "Afspelen"
 
-#: ../pidgin/gtkprefs.c:2004
 msgid "_Browse..."
 msgstr "Bl_aderen..."
 
-#: ../pidgin/gtkprefs.c:2012
 msgid "_Reset"
 msgstr "_Herstellen"
 
-#: ../pidgin/gtkprefs.c:2055
 msgid "_Report idle time:"
 msgstr "Bijhouden van activiteit:"
 
-#: ../pidgin/gtkprefs.c:2060
 msgid "Based on keyboard or mouse use"
 msgstr "Activiteit van toetsenbord en muis"
 
-#: ../pidgin/gtkprefs.c:2069
 msgid "_Auto-reply:"
 msgstr "_Automatisch antwoord:"
 
-#: ../pidgin/gtkprefs.c:2073
 msgid "When both away and idle"
 msgstr "Bij afwezigheid en inactiviteit"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2079
 msgid "Auto-away"
 msgstr "Automatisch afwezig"
 
-#: ../pidgin/gtkprefs.c:2081
 msgid "Change status when _idle"
 msgstr "Status op afwezig zetten _wanneer ik inactief ben"
 
-#: ../pidgin/gtkprefs.c:2085
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuten voor inactief worden:"
 
-#: ../pidgin/gtkprefs.c:2092
 msgid "Change _status to:"
 msgstr "_Status veranderen in: "
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2105
 msgid "Status at Startup"
 msgstr "Status bij starten"
 
-#: ../pidgin/gtkprefs.c:2107
 msgid "Use status from last _exit at startup"
 msgstr "_Laatst gebruikte status herstellen bij opstarten"
 
-#: ../pidgin/gtkprefs.c:2114
 msgid "Status to a_pply at startup:"
 msgstr "Te gebruiken _status bij opstarten:"
 
-#: ../pidgin/gtkprefs.c:2143
 msgid "Interface"
 msgstr "Interface"
 
-#: ../pidgin/gtkprefs.c:2145
 msgid "Smiley Themes"
 msgstr "Smiley-thema's"
 
-#: ../pidgin/gtkprefs.c:2152
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:2156
 msgid "Status / Idle"
 msgstr "Status / inactief"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow all users to contact me"
 msgstr "Alle gebruikers mogen contact met mij leggen"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users on my buddy list"
 msgstr "Alleen gebruikers uit mijn contactenlijst mogen contact met mij leggen"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Allow only the users below"
 msgstr "Alleen onderstaande gebruikers mogen contact met mij leggen"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block all users"
 msgstr "Alle gebruikers blokkeren"
 
-#: ../pidgin/gtkprivacy.c:85
 msgid "Block only the users below"
 msgstr "Alleen onderstaande gebruikers blokkeren"
 
-#: ../pidgin/gtkprivacy.c:352
 msgid "Privacy"
 msgstr "Privacy"
 
-#: ../pidgin/gtkprivacy.c:362
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Veranderingen aan privacy-instellingen worden direct actief."
 
-#: ../pidgin/gtkprivacy.c:371
 msgid "Set privacy for:"
 msgstr "Privacy instellen voor:"
 
 #. Remove All button
-#: ../pidgin/gtkprivacy.c:417
 msgid "Remove Al_l"
 msgstr "Alles _verwijderen"
 
-#: ../pidgin/gtkprivacy.c:503
-#: ../pidgin/gtkprivacy.c:520
 msgid "Permit User"
 msgstr "Gebruiker toestaan"
 
-#: ../pidgin/gtkprivacy.c:504
 msgid "Type a user you permit to contact you."
-msgstr "Geef een gebruiker die contact met je mag leggen."
+msgstr "Geef een gebruiker die contact met u mag leggen."
 
-#: ../pidgin/gtkprivacy.c:505
 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 je mag leggen."
+msgstr "Geef de naam van de gebruiker die contact met u mag leggen."
 
-#: ../pidgin/gtkprivacy.c:508
-#: ../pidgin/gtkprivacy.c:524
 msgid "_Permit"
 msgstr "_Toestaan"
 
-#: ../pidgin/gtkprivacy.c:514
 #, c-format
 msgid "Allow %s to contact you?"
-msgstr "%s toestaan contact met je te leggen?"
+msgstr "%s toestaan contact met u te leggen?"
 
-#: ../pidgin/gtkprivacy.c:516
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Weet je zeker dat je %s toestemming wilt geven?"
+msgstr "Weet u zeker dat u %s toestemming wilt geven?"
 
-#: ../pidgin/gtkprivacy.c:545
-#: ../pidgin/gtkprivacy.c:559
 msgid "Block User"
 msgstr "Gebruiker blokkeren"
 
-#: ../pidgin/gtkprivacy.c:546
 msgid "Type a user to block."
 msgstr "Geef een gebruiker die geblokkeerd moet worden."
 
-#: ../pidgin/gtkprivacy.c:547
 msgid "Please enter the name of the user you wish to block."
-msgstr "Geef de naam van de gebruiker die je wil blokkeren."
+msgstr "Geef de naam van de gebruiker die u wilt blokkeren."
 
-#: ../pidgin/gtkprivacy.c:555
 #, c-format
 msgid "Block %s?"
 msgstr "%s blokkeren?"
 
-#: ../pidgin/gtkprivacy.c:557
 #, c-format
 msgid "Are you sure you want to block %s?"
-msgstr "Weet je zeker dat je %s wilt blokkeren?"
+msgstr "Weet u zeker dat u %s wilt blokkeren?"
 
-#: ../pidgin/gtkrequest.c:274
 msgid "Apply"
 msgstr "Toepassen"
 
-#: ../pidgin/gtkrequest.c:1504
 msgid "That file already exists"
 msgstr "Dat bestand bestaat al."
 
-#: ../pidgin/gtkrequest.c:1505
 msgid "Would you like to overwrite it?"
-msgstr "Wil je het overschrijven?"
+msgstr "Wilt u het overschrijven?"
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Overwrite"
 msgstr "Overschrijven"
 
-#: ../pidgin/gtkrequest.c:1509
 msgid "Choose New Name"
 msgstr "Kies een nieuwe naam"
 
-#: ../pidgin/gtkrequest.c:1650
-#: ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Map selecteren..."
 
 #. list button
-#: ../pidgin/gtkroomlist.c:570
 msgid "_Get List"
 msgstr "_Lijst ophalen"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:578
 msgid "_Add Chat"
 msgstr "_Chat toevoegen"
 
-#: ../pidgin/gtksavedstatuses.c:339
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Weet je zeker dat je de geselecteerde opgeslagen statussen wilt veranderen?"
+msgstr ""
+"Weet je zeker dat je de geselecteerde opgeslagen statussen wilt veranderen?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:648
-#: ../pidgin/gtksavedstatuses.c:1277
 msgid "_Use"
 msgstr "_Gebruiken"
 
-#: ../pidgin/gtksavedstatuses.c:791
 msgid "Title already in use.  You must choose a unique title."
-msgstr "Titel al in gebruik. Kies een unieke titel."
+msgstr "Titel al in gebruik. U dient een unieke titel te kiezen."
 
-#: ../pidgin/gtksavedstatuses.c:1001
 msgid "Different"
 msgstr "Anders"
 
-#: ../pidgin/gtksavedstatuses.c:1200
 msgid "_Title:"
 msgstr "_Titel:"
 
-#: ../pidgin/gtksavedstatuses.c:1208
-#: ../pidgin/gtksavedstatuses.c:1496
 msgid "_Status:"
 msgstr "_Status:"
 
 #  Different status message expander
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1224
 msgid "Use a _different status for some accounts"
 msgstr "Een _andere status gebruiken voor sommige accounts"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1284
 msgid "Sa_ve & Use"
 msgstr "Op_slaan & gebruiken"
 
-#: ../pidgin/gtksavedstatuses.c:1480
 #, c-format
 msgid "Status for %s"
 msgstr "Status van %s"
 
-#: ../pidgin/gtksmiley.c:229
-#: ../pidgin/gtksmiley.c:254
-#: ../pidgin/gtksmiley.c:327
 msgid "Custom Smiley"
 msgstr "Eigen smiley"
 
-#: ../pidgin/gtksmiley.c:230
-msgid "Duplicate Shortcut"
-msgstr "Dubbele snelkoppeling"
-
-#: ../pidgin/gtksmiley.c:231
-msgid "A custom smiley for the selected shortcut already exists. Please specify a different shortcut."
-msgstr "Een eigen smiley voor de geselecteerde snelkoppeling bestaat al reeds. Geef een andere snelkoppeling."
-
-#: ../pidgin/gtksmiley.c:255
 msgid "More Data needed"
 msgstr "Meer gegevens vereist"
 
-#: ../pidgin/gtksmiley.c:256
 msgid "Please provide a shortcut to associate with the smiley."
 msgstr "Geef een snelkoppeling om te associëren met de smiley."
 
-#: ../pidgin/gtksmiley.c:257
+msgid "Duplicate Shortcut"
+msgstr "Dubbele snelkoppeling"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"Een eigen smiley voor de geselecteerde snelkoppeling bestaat al reeds. Geef "
+"alsjeblieft een andere snelkoppeling."
+
 msgid "Please select an image for the smiley."
 msgstr "Selecteer een afbeelding uit de lijst voor de smiley"
 
-#: ../pidgin/gtksmiley.c:346
 msgid "Edit Smiley"
 msgstr "Smiley bewerken"
 
-#: ../pidgin/gtksmiley.c:346
 msgid "Add Smiley"
 msgstr "Smiley toevoegen"
 
-#: ../pidgin/gtksmiley.c:367
 msgid "Smiley _Image"
 msgstr "_Smiley-afbeelding"
 
 #. Smiley shortcut
-#: ../pidgin/gtksmiley.c:398
 msgid "Smiley S_hortcut"
 msgstr "Sneltoets smiley"
 
-#: ../pidgin/gtksmiley.c:494
 msgid "Smiley"
 msgstr "Eigen smileys"
 
-#: ../pidgin/gtksmiley.c:691
 msgid "Custom Smiley Manager"
 msgstr "Eigen smileys beheren"
 
-#: ../pidgin/gtkstatusbox.c:689
 msgid "Waiting for network connection"
 msgstr "Wachten op netwerk-verbinding"
 
-#: ../pidgin/gtkstatusbox.c:1104
 msgid "New status..."
 msgstr "Nieuwe status..."
 
-#: ../pidgin/gtkstatusbox.c:1105
 msgid "Saved statuses..."
 msgstr "Opgeslagen statussen..."
 
-#: ../pidgin/gtkstatusbox.c:1782
 msgid "Status Selector"
 msgstr "Statusselectie"
 
-#: ../pidgin/gtkutils.c:685
 msgid "Google Talk"
 msgstr "Google talk"
 
-#: ../pidgin/gtkutils.c:1455
-#: ../pidgin/gtkutils.c:1484
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "De volgende fout is opgetreden bij laden van %s: %s"
 
-#: ../pidgin/gtkutils.c:1458
-#: ../pidgin/gtkutils.c:1486
 msgid "Failed to load image"
 msgstr "Kan afbeelding niet laden"
 
-#: ../pidgin/gtkutils.c:1560
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kan map %s niet verzenden."
 
-#: ../pidgin/gtkutils.c:1561
 #, c-format
-msgid "%s cannot transfer a folder. You will need to send the files within individually."
-msgstr "%s kan geen hele map ineens sturen. Je zult de bestanden per stuk moeten selecteren."
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+"%s kan geen hele map ineens sturen. U zult de bestanden per stuk moeten "
+"selecteren."
 
-#: ../pidgin/gtkutils.c:1595
-#: ../pidgin/gtkutils.c:1607
-#: ../pidgin/gtkutils.c:1614
 msgid "You have dragged an image"
 msgstr "Je hebt een afbeelding hierheen gesleept"
 
-#: ../pidgin/gtkutils.c:1596
-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 "U kunt deze afbeelding overzenden, in dit gesprek invoegen, of als pictogram gebruiken voor deze gebruiker."
+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 ""
+"U kunt deze afbeelding overzenden, in dit gesprek invoegen, of als pictogram "
+"gebruiken voor deze gebruiker."
 
-#: ../pidgin/gtkutils.c:1602
-#: ../pidgin/gtkutils.c:1622
 msgid "Set as buddy icon"
 msgstr "Instellen als pictogram"
 
-#: ../pidgin/gtkutils.c:1603
-#: ../pidgin/gtkutils.c:1623
 msgid "Send image file"
 msgstr "Afbeelding sturen"
 
-#: ../pidgin/gtkutils.c:1604
-#: ../pidgin/gtkutils.c:1623
 msgid "Insert in message"
 msgstr "Invoegen in gesprek"
 
-#: ../pidgin/gtkutils.c:1608
 msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Wil je het instellen als het pictogram van deze gebruiker?"
+msgstr "Wilt u het instellen als het pictogram van deze gebruiker?"
 
-#: ../pidgin/gtkutils.c:1615
-msgid "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."
+msgid ""
+"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."
 
-#: ../pidgin/gtkutils.c:1616
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
-msgstr "U kunt deze afbeelding in dit gesprek invoegen, of als pictogram gebruiken voor deze gebruiker."
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"U kunt deze afbeelding in dit gesprek invoegen, of als pictogram gebruiken "
+"voor deze gebruiker."
 
 #. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
 #. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
 #. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
 #. * Probably not.  I'll just give an error and return.
 #. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../pidgin/gtkutils.c:1675
 msgid "Cannot send launcher"
 msgstr "Kan starter niet sturen"
 
-#: ../pidgin/gtkutils.c:1675
-msgid "You dragged a desktop launcher. Most likely you wanted to send whatever this launcher points to instead of this launcher itself."
-msgstr "Je hebt een starter hierheen gesleept. Waarschijnlijk wil je het waar deze starter naar verwijst sturen."
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"Je hebt een starter hierheen gesleept. Waarschijnlijk wil je het waar deze "
+"starter naar verwijst sturen."
 
-#: ../pidgin/gtkutils.c:2413
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -17483,110 +12805,88 @@ msgstr ""
 "<b>Grootte:</b> %s\n"
 "<b>Afbeeldingsgrootte:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2715
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "Het bestand '%s' is te groot voor %s. Probeer een kleinere afbeelding\n"
+msgstr ""
+"Het bestand '%s' is te groot voor %s. Probeer een kleinere afbeelding\n"
 
-#: ../pidgin/gtkutils.c:2717
 msgid "Icon Error"
 msgstr "Icoonfout"
 
-#: ../pidgin/gtkutils.c:2718
 msgid "Could not set icon"
 msgstr "Kan plaatje niet instellen"
 
-#: ../pidgin/gtkutils.c:2818
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Kan bestand '%s' niet openen: %s"
 
-#: ../pidgin/gtkutils.c:2867
 #, c-format
-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 ""
+"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"
 
-#: ../pidgin/gtkwhiteboard.c:754
-#: ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Bestand opslaan"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Selecteer kleur"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "tabs sluiten"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "Info ophalen"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "_Uitnodigen"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "Be_werken"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "E-mail _openen"
 
-#: ../pidgin/pidgintooltip.c:101
+msgid "_Edit"
+msgstr "_Bewerken"
+
 msgid "Pidgin Tooltip"
 msgstr "Pidgin tooltip"
 
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin smileys"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
-msgstr "Penguin oppimpen"
+msgstr "Penguin Pimps"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Als je dit selecteert, schakel je graphische emoticons uit."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "geen"
 
-#: ../pidgin/plugins/cap/cap.c:441
-#: ../pidgin/plugins/cap/cap.c:444
 msgid "Response Probability:"
 msgstr "Reactiewaarschijnlijkheid:"
 
-#: ../pidgin/plugins/cap/cap.c:769
 msgid "Statistics Configuration"
 msgstr "Instellingen Statistieken"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:772
 msgid "Maximum response timeout:"
 msgstr "Maximale reactietijd:"
 
-#: ../pidgin/plugins/cap/cap.c:775
-#: ../pidgin/plugins/cap/cap.c:782
-#: ../pidgin/plugins/cap/cap.c:789
-#: ../pidgin/plugins/timestamp.c:148
 msgid "minutes"
 msgstr "minuten"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:779
 msgid "Maximum last-seen difference:"
 msgstr "Maximaal verschil in laatst aanwezig:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:786
 msgid "Threshold:"
 msgstr "Drempel:"
 
@@ -17596,55 +12896,47 @@ msgstr "Drempel:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:894
 msgid "Contact Availability Prediction"
 msgstr "Contact-beschikbaarheids-voorspelling"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:896
 msgid "Contact Availability Prediction plugin."
-msgstr "Contact-beschikbaarheids-voorspellings-plugin"
+msgstr "Contact-beschikbaarheids-voorspellings-plug-in"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:897
 msgid "Displays statistical information about your buddies' availability"
 msgstr "Geeft statististieke informatie over de beschikbaarheid van je contact"
 
-#: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "Contact is inactief"
 
-#: ../pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Contact is weg"
 
-#: ../pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Contact is lang weg"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "Contact is mobiel"
 
-#: ../pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Contact is off-line"
 
-#: ../pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Te gebruiken puntentelling bij..."
 
-#: ../pidgin/plugins/contact_priority.c:118
-msgid "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 prioriteit in de contactgroep.\n"
+msgid ""
+"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 "
+"prioriteit in de contactgroep.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Laatstgebruikte contact gebruiken als scores gelijk zijn"
 
-#: ../pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Puntentelling voor account..."
 
@@ -17654,87 +12946,76 @@ msgstr "Puntentelling voor account..."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Contactprioriteit"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
-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."
+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."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:193
-msgid "Allows for changing the point values of idle/away/offline states for buddies in contact priority computations."
-msgstr "Geeft de mogelijkheid om de waardes te veranderen van de diverse contactstatussen bij berekening van de prioriteit."
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Geeft de mogelijkheid om de waardes te veranderen van de diverse "
+"contactstatussen bij berekening van de prioriteit."
 
-#: ../pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Gesprekskleuren"
 
-#: ../pidgin/plugins/convcolors.c:25
-#: ../pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Verander kleuren in het gesprek-venster"
 
-#: ../pidgin/plugins/convcolors.c:87
 msgid "Error Messages"
 msgstr "Foutmeldingen"
 
-#: ../pidgin/plugins/convcolors.c:88
 msgid "Highlighted Messages"
 msgstr "Gemarkeerde Berichten"
 
-#: ../pidgin/plugins/convcolors.c:89
 msgid "System Messages"
 msgstr "Systeemberichten"
 
-#: ../pidgin/plugins/convcolors.c:90
 msgid "Sent Messages"
 msgstr "Verzonden berichten"
 
-#: ../pidgin/plugins/convcolors.c:91
 msgid "Received Messages"
 msgstr "Ontvangen berichten"
 
-#: ../pidgin/plugins/convcolors.c:223
-#: ../pidgin/plugins/pidginrc.c:257
 #, c-format
 msgid "Select Color for %s"
 msgstr "Kies kleur voor %s"
 
-#: ../pidgin/plugins/convcolors.c:372
 msgid "Ignore incoming format"
 msgstr "Inkomende opmaak negeren"
 
-#: ../pidgin/plugins/convcolors.c:373
 msgid "Apply in Chats"
 msgstr "Toepassen in de gesprekken"
 
-#: ../pidgin/plugins/convcolors.c:374
 msgid "Apply in IMs"
 msgstr "Toepassen in gesprekken."
 
-#: ../pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Op hoeveelheid gesprekken"
 
-#: ../pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Plaatsing van gesprekken"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-#: ../pidgin/plugins/extplacement.c:105
-msgid "Note: The preference for \"New conversations\" must be set to \"By conversation count\"."
-msgstr "Opmerking: The voorkeur voor \"Nieuwe gesprekken\" moet veranderd worden naar \"By conversation count\"."
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"Opmerking: The voorkeur voor \"Nieuwe gesprekken\" moet veranderd worden "
+"naar \"By conversation count\"."
 
-#: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Aantal gesprekken per venster"
 
-#: ../pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Gescheiden vensters voor gesprekken en chats bij plaatsen op nummer"
 
@@ -17744,37 +13025,34 @@ msgstr "Gescheiden vensters voor gesprekken en chats bij plaatsen op nummer"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "ExtPlaatsing"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Extra opties voor plaatsen van gespreksvensters."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "Het aantal gesprekken per venster beperken, al of niet met splitsing van chats en gewone gesprekken."
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Het aantal gesprekken per venster beperken, al of niet met splitsing van "
+"chats en gewone gesprekken."
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Instellingen voor muisgebaren"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Middelste muisknop"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Rechter muisknop"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Visuele gebarenweergave"
 
@@ -17790,101 +13068,89 @@ msgstr "_Visuele gebarenweergave"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Muisgebaren"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Ondersteuning voor muisgebaren"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
 msgid ""
-"Allows support for mouse gestures in conversation windows. Drag the middle mouse button to perform certain actions:\n"
+"Allows support for mouse gestures in conversation windows. Drag the middle "
+"mouse button to perform certain actions:\n"
 " • Drag down and then to the right to close a conversation.\n"
 " • Drag up and then to the left to switch to the previous conversation.\n"
 " • Drag up and then to the right to switch to the next conversation."
 msgstr ""
-"Geeft ondersteuning voor muisgebaren in gespreksvensters. Sleep met de middelste muisknop ingedruk om bepaalde acties uit te voeren:\n"
+"Geeft ondersteuning voor muisgebaren in gespreksvensters. Sleep met de "
+"middelste muisknop ingedruk om bepaalde acties uit te voeren:\n"
 "• Sleep naar beneden en dan naar rechts om een gesprek te sluiten.\n"
 "• Sleep naar boven en dan naar links om naar het vorige gesprek te gaan.\n"
 "• Sleep naar boven en dan naar rechts om naar het volgende gesprek te gaan."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Expresberichten"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:461
 msgid "Select a person from your address book below, or add a new person."
-msgstr "Kies een persoon uit het hieronder weergegeven adresboek, of voeg een nieuw persoon toe."
+msgstr ""
+"Kies een persoon uit het hieronder weergegeven adresboek, of voeg een nieuw "
+"persoon toe."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:555
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:305
 msgid "Group:"
 msgstr "Groep:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:252
 msgid "New Person"
 msgstr "Nieuw persoon"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
 msgid "Select Buddy"
 msgstr "Contact selecteren"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
-msgid "Select a person from your address book to add this buddy to, or create a new person."
-msgstr "Kies een persoon uit je adresboek om dit contact aan toe te voegen, of maak een nieuw persoon aan."
+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 "
+"een nieuw persoon aan."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "Gebruiker_details"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "Contact _associëren"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:242
-#: ../pidgin/plugins/gevolution/gevolution.c:248
 msgid "Unable to send email"
 msgstr "Kan geen e-mail verzenden"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:243
 msgid "The evolution executable was not found in the PATH."
 msgstr "Kan het uitvoerbaar bestand van Evolution niet vinden in het PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:249
 msgid "An email address was not found for this buddy."
 msgstr "Er is geen e-mailadres gevonden van dit contact"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:275
 msgid "Add to Address Book"
 msgstr "Toevoegen aan adresboek"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:287
 msgid "Send Email"
 msgstr "E-mail sturen"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:414
 msgid "Evolution Integration Configuration"
 msgstr "Evolution integratie-opties"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:417
 msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Selecteer de accounts waar contacten automatisch aan toegevoegd moeten worden."
+msgstr ""
+"Selecteer de accounts waar contacten automatisch aan toegevoegd moeten "
+"worden."
 
 #. *< type
 #. *< ui_requirement
@@ -17892,7 +13158,6 @@ msgstr "Selecteer de accounts waar contacten automatisch aan toegevoegd moeten w
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:529
 msgid "Evolution Integration"
 msgstr "Integratie met Evolution"
 
@@ -17900,37 +13165,28 @@ msgstr "Integratie met Evolution"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:532
-#: ../pidgin/plugins/gevolution/gevolution.c:534
 msgid "Provides integration with Evolution."
 msgstr "Verzorgt de integratie met Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 msgid "Please enter the person's information below."
 msgstr "Vul hieronder de persoonsgegevens in."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:270
 msgid "Please enter the buddy's username and account type below."
-msgstr "Vul hieronder de gebruikersnaam en accounttype van je contact in."
+msgstr "Vul hieronder de gebruikersnaam en accounttype van uw contact in."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Account type:"
 msgstr "Accounttype:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:313
 msgid "Optional information:"
 msgstr "Optionele informatie:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:348
 msgid "First name:"
 msgstr "Voornaam:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:360
 msgid "Last name:"
 msgstr "Achternaam:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:380
 msgid "Email:"
 msgstr "E-mail:"
 
@@ -17940,7 +13196,6 @@ msgstr "E-mail:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "GTK signalentest"
 
@@ -17948,12 +13203,9 @@ msgstr "GTK signalentest"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
 msgid "Test to see that all ui signals are working properly."
 msgstr "Test om te zien of alle UI-signalen correct werken."
 
-#: ../pidgin/plugins/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -17962,7 +13214,6 @@ msgstr ""
 "\n"
 "<b>Contact opmerking:</b> %s"
 
-#: ../pidgin/plugins/history.c:201
 msgid "History"
 msgstr "Geschiedenis"
 
@@ -17972,7 +13223,6 @@ msgstr "Geschiedenis"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Minimaliseren bij afwezigheid"
 
@@ -17980,84 +13230,68 @@ msgstr "Minimaliseren bij afwezigheid"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85
-#: ../pidgin/plugins/iconaway.c:87
 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 contactenlijst bij afwezigheid."
 
-#: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "E-mailcontrole"
 
-#: ../pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "Controleert op lokale e-mail."
 
-#: ../pidgin/plugins/mailchk.c:163
 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 als je nieuwe e-mail hebt."
+msgstr ""
+"Voegt een klein vak toe aan de contactenlijst die aangeeft of u nieuwe e-"
+"mail heeft."
 
-#: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Markeerlijn"
 
-#: ../pidgin/plugins/markerline.c:25
-#: ../pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
 msgstr "Een lijn aanmaken om nieuwe berichten in een gesprek aan te geven."
 
-#: ../pidgin/plugins/markerline.c:240
 msgid "Jump to markerline"
 msgstr "Ga naar markeerlijn"
 
-#: ../pidgin/plugins/markerline.c:274
 msgid "Draw Markerline in "
 msgstr "Teken Markeerlijn in"
 
-#: ../pidgin/plugins/markerline.c:278
-#: ../pidgin/plugins/notify.c:693
 msgid "_IM windows"
 msgstr "_Berichtvensters"
 
-#: ../pidgin/plugins/markerline.c:282
-#: ../pidgin/plugins/notify.c:700
 msgid "C_hat windows"
 msgstr "C_hatvensters"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
-msgstr "Er wordt gevraagd om een Muzieksessie. Klik op het MM-pictogram om te accepteren."
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"Er wordt gevraagd om een Muzieksessie. Klik op het MM-pictogram om te "
+"accepteren."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Muzieksessie geaccepteerd."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Berichten met muziek"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Er ging iets mis bij het uitvoeren van:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Fout bij starten van editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "De volgende fout is opgetreden:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Instellingen voor berichten met muziek"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Pad naar muziekeditor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "Toe_passen"
 
@@ -18077,91 +13311,77 @@ msgstr "Toe_passen"
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Muzieksessie-plugin voor gezamenlijk componeren."
+msgstr "Muzieksessie-plug-in voor gezamenlijk componeren."
 
 #  *  summary
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-msgid "The Music Messaging Plugin allows a number of users to simultaneously work on a piece of music by editting a common score in real-time."
-msgstr "De muzieksessie-plugin geeft enkele gebruikers de mogelijkheid om tegelijkertijd gezamenlijk aan een muziekstuk te werken."
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"De muzieksessie-plug-in geeft enkele gebruikers de mogelijkheid om "
+"tegelijkertijd gezamenlijk aan een muziekstuk te werken."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:689
 msgid "Notify For"
 msgstr "Melding geven voor"
 
-#: ../pidgin/plugins/notify.c:708
 msgid "\t_Only when someone says your username"
-msgstr "\t _Alleen wanneer iemand je gebruikersnaam vermeldt"
+msgstr "\t _Alleen wanneer iemand uw gebruikersnaam vermeldt"
 
-#: ../pidgin/plugins/notify.c:718
 msgid "_Focused windows"
 msgstr "Vensters met invoer_aandacht"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:726
 msgid "Notification Methods"
 msgstr "Meldingmethode"
 
-#: ../pidgin/plugins/notify.c:733
 msgid "Prepend _string into window title:"
 msgstr "_Tekst om voor venstertitel te plakken:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:752
 msgid "Insert c_ount of new messages into window title"
 msgstr "Aantal _nieuwe berichten weergeven in venstertitel"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:761
 #, fuzzy
 msgid "Insert count of new message into _X property"
 msgstr "Aantal _nieuwe berichten weergeven in venstertitel"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:769
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "\"_URGENT\" (hoge prioriteit) doorgeven aan het vensterbeheer"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:778
 msgid "R_aise conversation window"
 msgstr "Gespreksvenster _optillen"
 
 #. Present conversation method button
-#: ../pidgin/plugins/notify.c:786
 msgid "_Present conversation window"
 msgstr "Gespreksventer _aanwezig"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:794
 msgid "Notification Removal"
 msgstr "Meldingverwijdering"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:799
 msgid "Remove when conversation window _gains focus"
 msgstr "Verwijderen wanneer het gespreksvenster de _aandacht krijgt"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:806
 msgid "Remove when conversation window _receives click"
 msgstr "Verwijderen wanneer het gespreksvenster een _muisklik ontvangt"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:814
 msgid "Remove when _typing in conversation window"
 msgstr "Verwijderen wanneer er ge_typt wordt in het gespreksvenster."
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:822
 msgid "Remove when a _message gets sent"
 msgstr "Verwijderen wanneer een bericht _verzonden wordt"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:831
 msgid "Remove on switch to conversation ta_b"
 msgstr "Verwijderen bij _tabbladwisseling"
 
@@ -18171,7 +13391,6 @@ msgstr "Verwijderen bij _tabbladwisseling"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:924
 msgid "Message Notification"
 msgstr "Bericht-attendering"
 
@@ -18179,10 +13398,8 @@ msgstr "Bericht-attendering"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:927
-#: ../pidgin/plugins/notify.c:929
 msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Geeft je een aantal manieren om je te attenderen op nieuwe berichten."
+msgstr "Geeft je een aantal manieren om u te attenderen op nieuwe berichten."
 
 #. *< type
 #. *< ui_requirement
@@ -18190,81 +13407,66 @@ msgstr "Geeft je een aantal manieren om je te attenderen op nieuwe berichten."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
-msgstr "Pidgin demonstratieplugin"
+msgstr "Pidgin demonstratieplug-in"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
-msgstr "Een voorbeeldplugin wat dingen doet - Zie de beschrijving."
+msgstr "Een voorbeeldplug-in wat dingen doet - Zie de beschrijving."
 
 #. *  description
-#: ../pidgin/plugins/pidgininc.c:96
 msgid ""
 "This is a really cool plugin that does a lot of stuff:\n"
 "- It tells you who wrote the program when you log in\n"
 "- It reverses all incoming text\n"
 "- It sends a message to people on your list immediately when they sign on"
 msgstr ""
-"Dit is een erg gave plugin die een hoop dingen doet:\n"
+"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 keert alle binnenkomende tekst om\n"
 "- Het stuurt direct een bericht naar mensen wanneer ze online komen"
 
-#: ../pidgin/plugins/pidginrc.c:49
 msgid "Cursor Color"
 msgstr "Cursorkleur"
 
-#: ../pidgin/plugins/pidginrc.c:50
 msgid "Secondary Cursor Color"
 msgstr "Secundaire cursorkleur"
 
-#: ../pidgin/plugins/pidginrc.c:51
 msgid "Hyperlink Color"
 msgstr "Kleur van verwijzing"
 
-#: ../pidgin/plugins/pidginrc.c:54
 msgid "Highlighted Message Name Color"
 msgstr "Gemarkeerde bericht-kleur"
 
-#: ../pidgin/plugins/pidginrc.c:66
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeView horizontale scheiding"
 
-#: ../pidgin/plugins/pidginrc.c:81
 msgid "Conversation Entry"
 msgstr "Tekstinvoer gesprek"
 
-#: ../pidgin/plugins/pidginrc.c:82
 msgid "Request Dialog"
 msgstr "Vraag"
 
-#: ../pidgin/plugins/pidginrc.c:83
 msgid "Notify Dialog"
 msgstr "Melding"
 
 # kleurselectie
-#: ../pidgin/plugins/pidginrc.c:259
 msgid "Select Color"
 msgstr "Kleur selecteren"
 
-#: ../pidgin/plugins/pidginrc.c:306
+#, c-format
 msgid "Select Interface Font"
 msgstr "Kies lettertype"
 
-#: ../pidgin/plugins/pidginrc.c:309
 #, c-format
 msgid "Select Font for %s"
 msgstr "Kies lettertype voor %s"
 
-#: ../pidgin/plugins/pidginrc.c:377
 msgid "GTK+ Interface Font"
 msgstr "GTK+ lettertype"
 
-#: ../pidgin/plugins/pidginrc.c:397
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ snelkoppelingtekst-thema"
 
@@ -18288,64 +13490,59 @@ msgstr "GTK+ snelkoppelingtekst-thema"
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:434
 msgid "Interface colors"
 msgstr "Kleuren van interface"
 
-#: ../pidgin/plugins/pidginrc.c:458
 msgid "Widget Sizes"
 msgstr "Elementgrootte"
 
-#: ../pidgin/plugins/pidginrc.c:479
 msgid "Fonts"
 msgstr "Lettertypen"
 
-#: ../pidgin/plugins/pidginrc.c:503
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc bestandsbesturing"
 
-#: ../pidgin/plugins/pidginrc.c:508
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Instellingen opslaan in %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:517
 msgid "Re-read gtkrc files"
 msgstr "gtkrc-bestanden opnieuw inlezen"
 
-#: ../pidgin/plugins/pidginrc.c:555
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ themabeheer"
 
-#: ../pidgin/plugins/pidginrc.c:557
-#: ../pidgin/plugins/pidginrc.c:558
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Geeft toegang tot veelgebruikte gtkrc-instellingen"
 
-#: ../pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Direct"
 
-#: ../pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
-msgstr "Geeft je de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde protocollen."
+msgstr ""
+"Geeft je de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde "
+"protocollen."
 
-#: ../pidgin/plugins/raw.c:178
-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 protocollen (XMPP, MSN, IRC, TOC). Druk op 'Enter' om te sturen en houd het debugvenster in de gaten."
+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 "
+"protocollen (XMPP, MSN, IRC, TOC). Druk op 'Enter' om te sturen en houd het "
+"debugvenster in de gaten."
 
-#: ../pidgin/plugins/relnot.c:71
 #, c-format
-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 ""
+"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>"
 
-#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Veranderingen:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84
-#: ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Nieuwe versie beschikbaar"
 
@@ -18355,21 +13552,22 @@ msgstr "Nieuwe versie beschikbaar"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Melding bij nieuwe versie van gaim"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Controleert regelmatig of er een nieuwe versie beschikbaar is."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Controleert regelmatig of er een nieuwe versie beschikbaar is en presenteert de veranderingen aan de gebruiker."
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Controleert regelmatig of er een nieuwe versie beschikbaar is en presenteert "
+"de veranderingen aan de gebruiker."
 
 #. *< major version
 #. *< minor version
@@ -18379,87 +13577,71 @@ msgstr "Controleert regelmatig of er een nieuwe versie beschikbaar is en present
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/sendbutton.c:138
 msgid "Send Button"
 msgstr "Verzendknop"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/sendbutton.c:140
 msgid "Conversation Window Send Button."
 msgstr "Gespreksvenser verzendknop"
 
 #. *< summary
-#: ../pidgin/plugins/sendbutton.c:141
-msgid "Adds a Send button to the entry area of the conversation window. Intended for when no physical keyboard is present."
-msgstr "Voegt een verzendknop toe bij de invoerruimte van het gespreksvenster. Dit is bedoeld wanneer er geen fysiek keyboard aanwezig is."
+msgid ""
+"Adds a Send button to the entry area of the conversation window. Intended "
+"for when no physical keyboard is present."
+msgstr ""
+"Voegt een verzendknop toe bij de invoerruimte van het gespreksvenster. Dit "
+"is bedoeld wanneer er geen fysiek keyboard aanwezig is."
 
-#: ../pidgin/plugins/spellchk.c:1971
 msgid "Duplicate Correction"
 msgstr "Dubbele correctie"
 
-#: ../pidgin/plugins/spellchk.c:1972
 msgid "The specified word already exists in the correction list."
 msgstr "Het aangegeven woord bestaat reeds in de correctielijst."
 
-#: ../pidgin/plugins/spellchk.c:2185
 msgid "Text Replacements"
 msgstr "Actieve tekstvervangingen"
 
-#: ../pidgin/plugins/spellchk.c:2208
 msgid "You type"
 msgstr "Je tikt"
 
-#: ../pidgin/plugins/spellchk.c:2222
 msgid "You send"
 msgstr "Je stuurt"
 
-#: ../pidgin/plugins/spellchk.c:2236
 msgid "Whole words only"
 msgstr "Alleen hele woorden"
 
-#: ../pidgin/plugins/spellchk.c:2248
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
-#: ../pidgin/plugins/spellchk.c:2274
 msgid "Add a new text replacement"
 msgstr "Nieuwe tekstvervanging toevoegen"
 
-#: ../pidgin/plugins/spellchk.c:2290
 msgid "You _type:"
 msgstr "Je _tikt:"
 
-#: ../pidgin/plugins/spellchk.c:2294
 msgid "You _send:"
 msgstr "Je _stuurt:"
 
 #  Created here so it can be passed to whole_words_button_toggled.
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2297
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_Hoofdlettergevoelig (uitzetten voor voor automatisch afhandelen)"
 
-#: ../pidgin/plugins/spellchk.c:2299
 msgid "Only replace _whole words"
 msgstr "Alleen _hele woorden vervangen"
 
-#: ../pidgin/plugins/spellchk.c:2324
 msgid "General Text Replacement Options"
 msgstr "Instellingen voor tekstvervanging"
 
-#: ../pidgin/plugins/spellchk.c:2325
 msgid "Enable replacement of last word on send"
 msgstr "Laatste woord vervangen bij versturen"
 
-#: ../pidgin/plugins/spellchk.c:2358
 msgid "Text replacement"
 msgstr "Tekstvervanging"
 
-#: ../pidgin/plugins/spellchk.c:2360
-#: ../pidgin/plugins/spellchk.c:2361
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Vervangt tekst in uitgaande berichten volgens jouw eigen regels."
+msgstr "Vervangt tekst in uitgaande berichten volgens uw eigen regels."
 
 #. *< type
 #. *< ui_requirement
@@ -18467,8 +13649,6 @@ msgstr "Vervangt tekst in uitgaande berichten volgens jouw eigen regels."
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74
-#: ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Contacten-ticker"
 
@@ -18476,12 +13656,9 @@ msgstr "Contacten-ticker"
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359
-#: ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Een horizontale schuivende versie van de contactenlijst."
 
-#: ../pidgin/plugins/timestamp.c:135
 msgid "Display Timestamps Every"
 msgstr "Gesprekstijd altijd weergeven"
 
@@ -18491,49 +13668,38 @@ msgstr "Gesprekstijd altijd weergeven"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:200
 msgid "Timestamp"
 msgstr "Tijd in gesprek"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:203
 msgid "Display iChat-style timestamps"
 msgstr "iChat gesprekstijd weergeven"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Voegt op iChat-achtige manier iedere N minuten de tijd toe."
 
-#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Instellingen tijdsweergave"
 
-#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "24-uurs weergave _gebruiken"
 
-#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Datum weergeven in..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "_Gesprekken:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Bij vertraagde berichten"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Voor vertraagde berichten en in chatsessies"
 
-#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "_Gesprekslogboeken:"
 
@@ -18549,7 +13715,6 @@ msgstr "_Gesprekslogboeken:"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Opmaak tijdsaanduiding berichten"
 
@@ -18559,54 +13724,44 @@ msgstr "Opmaak tijdsaanduiding berichten"
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Opmaak aanpassen van tijdsaanduiding."
 
 #  *  description
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
-msgstr "Deze plugin geeft de gebruiker de mogelijkheid om de opmaak van de tijdsaanduiding aante passen."
+msgid ""
+"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."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
 msgid "Opacity:"
 msgstr "Doorschijnendheid:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "IM gespreksvensters"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "_IM-vensterdoorschijnendheid"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Schuifbalk weergeven in IM-venster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "IM-vensterdoorschijnendheid uitschakelen bij aandacht"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Altijd bovenop"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Contactenlijst"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "_Contactenlijst doorschijnendheid"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Doorschijnendheid contactenlijst uitschakelen bij aandacht"
 
@@ -18616,74 +13771,63 @@ msgstr "Doorschijnendheid contactenlijst uitschakelen bij aandacht"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Transparantie"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variabele doorschijnendheid voor de contactenlijst en gesprekken."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
 msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Deze plugin zorgt voor variabele doorschijnendheid in gespreksvensters en de contactenlijst.\n"
+"Deze plug-in zorgt voor variabele doorschijnendheid in gespreksvensters en "
+"de contactenlijst.\n"
 "\n"
-"* Opmerking: Deze plugin vereist Windows 2000 of nieuwer."
+"* Opmerking: Deze plug-in vereist Windows 2000 of nieuwer."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime-versie"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Opstarten"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "%s _starten bij het opstarten van Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "Koppelbare contactenlijst"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "Contactenlijst bovenop _houden:"
 
 #  XXX: Did this ever work?
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Alleen wanneer aangekoppeld"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "Venster laten _knipperen wanneer chatberichten worden ontvangen"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Windows pidgin opties"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Opties van Pidgin voor Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr "Specifieke Windows-opties voor Pidgin, zoals contactenlijst."
 
-#: ../pidgin/plugins/xmppconsole.c:670
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Uitgelogd.</font>"
 
@@ -18693,93 +13837,96 @@ msgstr "<font color='#777777'>Uitgelogd.</font>"
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749
-#: ../pidgin/plugins/xmppconsole.c:844
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
-msgstr "XMPP Console"
+msgstr "XMPP-console"
 
-#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Account:"
 
-#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Niet verbonden met XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Voeg een <iq/> stanza toe."
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Voeg een <presence/> stanza toe."
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Voeg een <message/> stanza in."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Verstuur en ontvang ruwe XMPP stanza's."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:868
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
+msgstr "Deze plug-in is handig voor het debuggen van XMPP servers of clienten."
+
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Code [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Groepsopdrachtfout"
 
 #, fuzzy
 #~ msgid "Error requesting login token"
 #~ msgstr "Fout bij maken verbinding"
-#~ msgid "Unable to login. Check debug log."
-#~ msgstr "Kan niet aanmelden. Controleer debuglogboek."
-#~ msgid "Unable to login"
-#~ msgstr "Aanmelden niet mogelijk"
+
 #~ msgid "TCP Address"
 #~ msgstr "TCP-adres"
+
 #~ msgid "UDP Address"
 #~ msgstr "UDP-adres"
-#~ msgid "Login failed, no reply"
-#~ msgstr "Aanmelden mislukt, geen reactie!"
+
 #~ msgid "Error setting socket options"
 #~ msgstr "Kan socket niet instellen"
+
 #~ msgid ""
 #~ "Windows Live ID authentication: cannot find authenticate token in server "
 #~ "response"
 #~ msgstr ""
 #~ "Windows Live ID identificatie: kan de identiteit niet vinden die in het "
 #~ "server-antwoord werd gegeven"
+
 #~ msgid "Windows Live ID authentication Failed"
 #~ msgstr "Windows Live ID identificatie Mislukt"
+
 #~ msgid "Too evil (sender)"
 #~ msgstr "Te kwaadaardig (afzender)"
+
 #~ msgid "Too evil (receiver)"
 #~ msgstr "Te kwaadaardig (ontvanger)"
+
 #~ msgid "Available Message"
 #~ msgstr "Beschikbaarheidsbericht"
+
 #~ msgid "Away Message"
 #~ msgstr "Afwezigheidsbericht"
+
 #~ msgid "<i>(retrieving)</i>"
 #~ msgstr " <i>(ophalen)</i>"
-#~ msgid "Requesting %s's attention..."
-#~ msgstr "%s's aandacht vragen..."
-#~ msgid "%s has requested your attention!"
-#~ msgstr "%s vraagt om uw aandacht!"
+
 #~ msgid "Display Statistics"
 #~ msgstr "Statistieke weergeven"
+
 #~ msgid "Screen name:"
 #~ msgstr "Bijnaam:"
+
 #~ msgid "Someone says your screen name in chat"
 #~ msgstr "Iemand zegt uw naam in chatgesprek"
+
 #~ msgid "Invalid screen name"
 #~ msgstr "Ongeldige gebruikersnaam"
+
 #~ msgid "Invalid screen name."
 #~ msgstr "Ongeldige gebruikersnaam."
+
 #~ msgid "Screen _name:"
 #~ msgstr "Bij_naam:"
+
 #~ msgid ""
 #~ "This server requires plaintext authentication over an unencrypted "
 #~ "connection.  Allow this and continue authentication?"
@@ -18790,6 +13937,7 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Use GSSAPI (Kerberos v5) for authentication"
 #~ msgstr "Gebruiker %d vereist autentificatie"
+
 #~ msgid ""
 #~ "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
@@ -18798,6 +13946,7 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "%s%s<span weight=\"bold\">Geschreven door:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t\t%s\n"
 #~ "<span weight=\"bold\">Bestandsnaam:</span>\\tt%s"
+
 #~ msgid ""
 #~ "The contact availability plugin (cap) is used to display statistical "
 #~ "information about buddies in a users contact list."
@@ -18809,14 +13958,17 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Pounce only when my status is not available"
 #~ msgstr "Contactalarm alleen wanneer mijn status niet beschikbaar is"
+
 #~ msgid "Current media"
 #~ msgstr "Huidige media"
+
 #~ msgid ""
 #~ "Sorry, passwords over %d characters in length (yours is %d) are not "
 #~ "supported by MySpace."
 #~ msgstr ""
 #~ "Sorry, wachtwoorden die groter zijn dan %d tekens (die van jou is %d "
 #~ "tekens lang) worden niet ondersteund door MySpace."
+
 #~ msgid ""
 #~ "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 #~ "username and choose a username and try to login again."
@@ -18824,18 +13976,25 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Ga alstublieft naar http://editprofile.myspace.com/index.cfm?"
 #~ "fuseaction=profile.username en kies een gebruikersnaam en probeer opnieuw "
 #~ "in te loggen"
+
 #~ msgid "Screen name sent"
 #~ msgstr "Bijnaam verzonden"
+
 #~ msgid "Screen name"
 #~ msgstr "Gebruikersnaam"
+
 #~ msgid "Use recent buddies group"
 #~ msgstr "Groep voor recente contacten gebruiken"
+
 #~ msgid "Show how long you have been idle"
 #~ msgstr "Geeft aan hoe lang u inactief bent"
+
 #~ msgid "Cannot find/access ~/.silc directory"
 #~ msgstr "kan de map ~/.silc niet benaderen"
+
 #~ msgid "_Merge"
 #~ msgstr "Sa_menvoegen"
+
 #~ msgid ""
 #~ "Please enter the screen name of the person you would like to add to your "
 #~ "buddy list. You may optionally enter an alias, or nickname,  for the "
@@ -18846,16 +14005,20 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "zou willen toevoegen. U kunt ook een alias of bij bijnaam voor deze "
 #~ "persoon opgeven. Deze alias wordt dan gebruikt in plaats van de echte "
 #~ "naam (wanneer mogelijk).\n"
+
 #~ msgid "A_ccount:"
 #~ msgstr "A_ccount:"
+
 #~ msgid "User has typed something and stopped"
 #~ msgstr "Gebruiker is gestopt met typen"
+
 #~ msgid ""
 #~ "\n"
 #~ "%s has typed something and stopped"
 #~ msgstr ""
 #~ "\n"
 #~ "%s typte wat en is ermee gestopt"
+
 #~ msgid "S_mile!"
 #~ msgstr "L_achen!"
 
@@ -18878,18 +14041,25 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "There were errors unloading the plugin."
 #~ msgstr "Fout opgetreden bij uitschakelen plugin."
+
 #~ msgid "Couldn't open file"
 #~ msgstr "Kan bestand niet openen"
+
 #~ msgid "Error initializing session"
 #~ msgstr "Fout bij initialiseren van sessie"
+
 #~ msgid "Unable to make SSL connection to server."
 #~ msgstr "Kan geen beveiligde verbinding (SSL) maken met de server."
+
 #~ msgid "Invalid chat name specified."
 #~ msgstr "Onjuiste chat-naam opgegeven."
+
 #~ msgid "%s changed status from %s to %s"
 #~ msgstr "%s heeft status veranderd van %s naar %s"
+
 #~ msgid "%s is now %s"
 #~ msgstr "%s is nu %s"
+
 #~ msgid "%s is no longer %s"
 #~ msgstr "%s is niet meer %s"
 
@@ -18900,10 +14070,13 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Add Buddy _Pounce"
 #~ msgstr "Contactalarm toevoegen"
+
 #~ msgid "Add a C_hat"
 #~ msgstr "_Chat toevoegen"
+
 #~ msgid "/Accounts/Add\\/Edit"
 #~ msgstr "/Accounts/Toevoegen\\/Bewerken"
+
 #~ msgid "<span color=\"red\">%s disconnected: %s</span>"
 #~ msgstr "<span color=\"red\">%s heeft de verbinding verbroken: %s</span>"
 
@@ -18921,8 +14094,10 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "_Send To"
 #~ msgstr "_Verzenden aan"
+
 #~ msgid "Conversation History"
 #~ msgstr "Geschiedenis gesprek"
+
 #~ msgid "Log Viewer"
 #~ msgstr "Logboek"
 
@@ -18933,90 +14108,115 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Unable to connect to OIM server"
 #~ msgstr "Kan geen verbinding maken met de server"
+
 #~ msgid ""
 #~ "\n"
 #~ "Idle: %s"
 #~ msgstr ""
 #~ "\n"
 #~ "Inactief: %s"
+
 #~ msgid ""
 #~ "%s was disconnected due to the following error:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "%s heeft de verbinding verbroken om de volgende reden:\n"
 #~ "%s"
+
 #~ msgid "Commands are not supported yet. Message was NOT sent."
 #~ msgstr "Opdrachten worden nog niet ondersteund. Bericht NIET verzonden."
+
 #~ msgid "..."
 #~ msgstr "..."
+
 #~ msgid "Still need to do something about this."
 #~ msgstr "Hier moet nog wat aan gedaan worden."
+
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Gaim - Expresberichten"
+
 #~ msgid "Alias..."
 #~ msgstr "Alias..."
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Nickname:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Gebruikersnaam:</b> %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Logged In:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Aangemeld:</b> %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Idle:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Inactief:</b> %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Offline"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> Off-line"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Description:</b> Spooky"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Beschrijving:</b> Spookachtig"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Awesome"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b>: Zwaar flex"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> Rockin'"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b>: Rockin'"
+
 #~ msgid "/Tools/Buddy Pounces"
 #~ msgstr "/Extra/Contactalarm"
+
 #~ msgid "/Options/Show Buddy _Icon"
 #~ msgstr "/Opties/Contact_plaatjes weergeven"
+
 #~ msgid "/Options/Show Buddy Icon"
 #~ msgstr "/Opties/pictograms weergeven"
+
 #~ msgid "Timestamps"
 #~ msgstr "Tijd in gesprek"
+
 #~ msgid "Jabber developer"
 #~ msgstr "ontwikkelaar van Jabber"
+
 #~ msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
 #~ msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim op irc.freenode.net<BR><BR>"
+
 #~ msgid "Smaller font size"
 #~ msgstr "Kleinere letters"
+
 #~ msgid "Insert link"
 #~ msgstr "Verwijzing invoegen"
+
 #~ msgid "Insert image"
 #~ msgstr "Afbeelding invoegen"
+
 #~ msgid "Gaim %s. Try `%s -h' for more information.\n"
 #~ msgstr "Gaim %s. Probeer '%s -h' voor meer informatie.\n"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
 #~ "\n"
@@ -19025,38 +14225,53 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "<span weight=\"bold\" size=\"larger\">U heeft email!</span>\n"
 #~ "\n"
 #~ "%s"
+
 #~ msgid "Send unknown \"_slash\" commands as messages"
 #~ msgstr "Onbekende \"_slash\"-opdrachten ( / ) als normaal bericht sturen"
+
 #~ msgid "Show buddy _icons"
 #~ msgstr "Contact_plaatjes weergeven"
+
 #~ msgid "Tab Options"
 #~ msgstr "Tab-opties"
+
 #~ msgid "_Sounds while away"
 #~ msgstr "Geluiden wanneer u _weg bent"
+
 #~ msgid ""
 #~ "You can send this image as a file transfer or embed it into this message, "
 #~ "or use it as the buddy icon for this user."
 #~ msgstr ""
 #~ "U kunt deze afbeelding overzenden, in dit gesprek invoegen, of als "
 #~ "pictogram gebruiken voor deze gebruiker."
+
 #~ msgid "Error initializing libdbi."
 #~ msgstr "Fout bij initialiseren van libdbi."
+
 #~ msgid "Contact Availability Prediction Configuration"
 #~ msgstr "Configuratie van contactbeschikbaarheidsvoorspelling"
+
 #~ msgid "mysql"
 #~ msgstr "mysql"
+
 #~ msgid "Driver:"
 #~ msgstr "Driver:"
+
 #~ msgid "_Configure"
 #~ msgstr "_Instellen"
+
 #~ msgid "libdbi driver path:"
 #~ msgstr "libdbi pad:"
+
 #~ msgid "Host:"
 #~ msgstr "Host:"
+
 #~ msgid "Database:"
 #~ msgstr "Database:"
+
 #~ msgid "Port:"
 #~ msgstr "Poort:"
+
 #~ msgid "Crazychat"
 #~ msgstr "Crazychat"
 
@@ -19065,29 +14280,40 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #  *  summary
 #~ msgid "Plugin to establish a Crazychat session."
 #~ msgstr "Plugin om een crazychat sessie te starten."
+
 #  *  description
 #~ msgid "Uses Gaim to obtain buddy ips to connect for a Crazychat session"
 #~ msgstr ""
 #~ "Gebruikt gaim om IPs te verkrijgen van contacten om zo een "
 #~ "crazychatsessie te starten"
+
 #~ msgid "Network Configuration"
 #~ msgstr "Netwerkinstellingen"
+
 #~ msgid "TCP port"
 #~ msgstr "TCP-poort"
+
 #~ msgid "UDP port"
 #~ msgstr "UDP-poort"
+
 #~ msgid "Feature Calibration"
 #~ msgstr "Kalibreren"
+
 #~ msgid "Blink tray icon for unread..."
 #~ msgstr "Pictogram in mededelingengebied laten knipperen bij ongelezen..."
+
 #~ msgid "_Instant Messages:"
 #~ msgstr "_Expresberichten:"
+
 #~ msgid "C_hat Messages:"
 #~ msgstr "_Kanaalberichten:"
+
 #~ msgid "When my nick is said"
 #~ msgstr "Wanneer mijn bijnaam wordt gezegd"
+
 #~ msgid "Displays an icon for Gaim in the system tray."
 #~ msgstr "Geeft een pictogram voor Gaim weer in het mededelingengebied."
+
 #~ msgid ""
 #~ "Displays a system tray icon (in GNOME, KDE, or Windows for example) to "
 #~ "show the current status of Gaim, allow fast access to commonly used "
@@ -19099,115 +14325,160 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "te geven tot veelgebruikte functies en om het hoofdvenster te verbergen "
 #~ "of juist weer te geven. Ook biedt het de mogelijkheid om inkomende "
 #~ "berichten te laten wachten totdat erop geklikt wordt."
+
 #~ msgid "GtkTreeView Expander Size"
 #~ msgstr "Grootte van uitklappijltje"
+
 #~ msgid "GtkTreeView Indent Expanders"
 #~ msgstr "Grootte uitklappijltje"
+
 #~ msgid "Tools"
 #~ msgstr "Gereedschap"
+
 #~ msgid "The specified buddy was not found in the Evolution Contacts."
 #~ msgstr ""
 #~ "De contactpersoon kan niet gevonden worden in het Evolution adresboek."
+
 #~ msgid ""
 #~ "You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
 #~ "\">http://gaim.sourceforge.net</a>."
 #~ msgstr ""
 #~ "U kunt versie %s ophalen op:<br><a href=\"http://gaim.sourceforge.net/ "
 #~ "\">http://gaim.sourceforge.net</a>."
+
 #~ msgid "Delay"
 #~ msgstr "Vertraging"
+
 #~ msgid "minutes."
 #~ msgstr "minuten."
+
 #~ msgid "WinGaim Options"
 #~ msgstr "WinGaim opties"
+
 #~ msgid "Group not removed"
 #~ msgstr "Groep niet verwijderd"
+
 #~ msgid "Old Gaim"
 #~ msgstr "Oude Gaim"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b> %s"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Message:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Bericht:</b> %s"
+
 #~ msgid "Gaim User"
 #~ msgstr "Gaim gebruiker"
+
 #~ msgid "Jabber Account"
 #~ msgstr "Jabber-account"
+
 #~ msgid "<b>%s:</b> %s"
 #~ msgstr "<b>%s:</b> %s"
+
 #~ msgid "<b>%s:</b> %s<br>"
 #~ msgstr "<b>%s:</b> %s<br>"
+
 #~ msgid "<b>Idle for:</b> %s<br>"
 #~ msgstr "<b>Inactief voor:</b> %s<br>"
+
 #~ msgid ""
 #~ "Server requires TLS/SSL for login.  Select \"Use TLS if available\" in "
 #~ "account properties"
 #~ msgstr ""
 #~ "Server vereist TLS/SSL voor aanmelding. Selecteer \"TLS gebruiken indien "
 #~ "beschikbaar\" in de accounteigenschappen"
+
 #~ msgid "Server couldn't authenticate you without a password"
 #~ msgstr "Server kan u niet identificeren zonder wachtwoord"
+
 #~ msgid "Client:"
 #~ msgstr "Client:"
+
 #~ msgid "Search for Jabber users"
 #~ msgstr "Zoeken naar Jabbergebruikers"
+
 #~ msgid "Invalid Jabber ID"
 #~ msgstr "Ongeldige Jabber-ID"
+
 #~ msgid "Change Jabber Password"
 #~ msgstr "Jabber-wachtwoord veranderen"
+
 #~ msgid "Jabber Protocol Plugin"
 #~ msgstr "Jabber-protocol plugin"
+
 #~ msgid "Use TLS if available"
 #~ msgstr "TLS gebruiken indien beschikbaar"
+
 #~ msgid "The user %s wants to add %s to his or her buddy list."
 #~ msgstr "De gebruiker %s wil %s toevoegen aan zijn/haar contactenlijst."
+
 #~ msgid "_Authorize"
 #~ msgstr "_Autoriseren"
+
 #~ msgid "_Deny"
 #~ msgstr "Ne_geer"
+
 #~ msgid "You have just sent a Nudge!"
 #~ msgstr "U heeft zojuist een duwtje gestuurd!"
+
 #~ msgid "<b>Alias:</b> %s<br>"
 #~ msgstr "<b>Alias:</b> %s<br>"
+
 #~ msgid "MSN Profile"
 #~ msgstr "MSN-profiel"
+
 #~ msgid "%s<b>General</b><br>%s"
 #~ msgstr "%s<b>Algemeen</b><br>%s"
+
 #~ msgid "%s<b>Social</b><br>%s"
 #~ msgstr "%s<b>Sociaal</b><br>%s"
+
 #~ msgid "<br><b>Personal</b><br>%s"
 #~ msgstr "<br><b>Persoonlijk</b><br>%s"
+
 #~ msgid "<br><b>Business</b><br>%s"
 #~ msgstr "<br><b>Zakelijk</b><br>%s"
+
 #~ msgid "<hr><b>Contact Info</b>%s%s"
 #~ msgstr "<hr><b>Contactinfo</b>%s%s"
+
 #~ msgid "<hr><b>%s:</b> "
 #~ msgstr "<hr><b>%s:</b> "
+
 #~ msgid "The user %s (%s) wants to add %s to his or her buddy list."
 #~ msgstr "De gebruiker %s (%s) wil %s toevoegen aan zijn/haar contactenlijst."
+
 #~ msgid "Invalid password"
 #~ msgstr "Ongeldig wachtwoord"
+
 #~ msgid "Invalid username or password"
 #~ msgstr "Ongeldige gebruikersnaam of wachtwoord"
+
 #~ msgid "Lost connection with server for an unknown reason."
 #~ msgstr "Verbinding verbroken: Reden onbekend."
+
 #~ msgid ""
 #~ "The user %s requires authorization before being added to a buddy list.  "
 #~ "Do you want to send an authorization request?"
 #~ msgstr ""
 #~ "U heeft toestemming nodig om %s toe te voegen aan uw contactenlijst. Wilt "
 #~ "u om toestemming vragen?"
+
 #~ msgid "Request Authorization"
 #~ msgstr "Toestemming vragen"
+
 #~ msgid "_Request Authorization"
 #~ msgstr "_Toestemming vragen"
+
 #~ msgid ""
 #~ "The user %u wants to add %s to their buddy list for the following "
 #~ "reason:\n"
@@ -19216,24 +14487,32 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "De gebruiker %u wil %s toevoegen aan zijn/haar contactenlijst om de "
 #~ "volgende reden:\n"
 #~ "%s"
+
 #~ msgid "Authorization Request"
 #~ msgstr "Identificatie-aanvraag"
+
 #~ msgid "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
 #~ msgstr "<B>UIN:</B> %s<BR><B>Status:</B> %s<HR>%s"
+
 #~ msgid "SNAC threw error: %s\n"
 #~ msgstr "SNAC threw fout: %s\n"
+
 #~ msgid "User information for %s unavailable:"
 #~ msgstr "Gebruikersinformatie voor %s niet beschikbaar:"
+
 #~ msgid "Rate limiting error."
 #~ msgstr "Snelheidsoverschrijding."
+
 #~ msgid "You have been signed off for an unknown reason."
 #~ msgstr "De verbinding is verbroken om een onbekende reden."
+
 #~ msgid ""
 #~ "Your screen name is currently formatted as follows:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Uw gebruikersnaam wordt op het moment als volgt weergegeven:\n"
 #~ "%s"
+
 #~ msgid ""
 #~ "Could not add the buddy %s for an unknown reason.  The most common reason "
 #~ "for this is that you have the maximum number of allowed buddies in your "
@@ -19242,6 +14521,7 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Kon het contact %s niet toevoegen om onbekende redenen. De meest "
 #~ "voorkomende reden is dat het maximum aantal contacten in uw lijst is "
 #~ "bereikt."
+
 #~ msgid ""
 #~ "The user %s wants to add %s to their buddy list for the following "
 #~ "reason:\n"
@@ -19250,118 +14530,168 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "De gebruiker %s wil %s toevoegen aan zijn/haar contactenlijst om de "
 #~ "volgende reden:\n"
 #~ "%s"
+
 #~ msgid "_Connect"
 #~ msgstr "_Verbinden"
+
 #~ msgid "New screen name formatting:"
 #~ msgstr "Opmaak van gebruikersnaam:"
+
 #~ msgid "Format Screen Name..."
 #~ msgstr "Gebruikersnaam opmaken..."
+
 #~ msgid "A"
 #~ msgstr "A"
+
 #~ msgid "B"
 #~ msgstr "B"
+
 #~ msgid "AB"
 #~ msgstr "AB"
+
 #~ msgid ""
 #~ "Find one Qun in the server list, but i don't know its external id, please "
 #~ "re-rejoin it manually"
 #~ msgstr ""
 #~ "Eén Qun gevonden in de lijst, maar kan geen extern ID vinden. Probeer het "
 #~ "eens met de hand"
+
 #~ msgid ""
 #~ "Invalid QQid, to add buddy 1234567, \n"
 #~ "you should input qq-1234567"
 #~ msgstr ""
 #~ "Ongeldig QQid. Om de gebruiker 1234567 toe te voegen\n"
 #~ "dient u qq-1234567 te gebruiken"
+
 #~ msgid "Admin: "
 #~ msgstr "Admin: "
+
 #~ msgid "Status: "
 #~ msgstr "Status:"
+
 #~ msgid "Are you sure to exit this Qun?"
 #~ msgstr "Wilt u echt deze Qun verlaten?"
+
 #~ msgid "Go ahead"
 #~ msgstr "Ga maar door"
+
 #~ msgid "Server ACK"
 #~ msgstr "Server ACK"
+
 #~ msgid "Send IM fail\n"
 #~ msgstr "Sturen van bericht mislukt\n"
+
 #~ msgid "Keep alive error, seems connection lost!"
 #~ msgstr "Fout bij in stand houden van verbinding!"
+
 #~ msgid "Request login token error!"
 #~ msgstr "Tekenfout bij aanmelden!"
+
 #~ msgid "Wrong password!"
 #~ msgstr "Wachtwoord onjuist!"
+
 #~ msgid "QQ: Available"
 #~ msgstr "QQ: Beschikbaar"
+
 #~ msgid "QQ: Away"
 #~ msgstr "QQ: Afwezig"
+
 #~ msgid "QQ: Invisible"
 #~ msgstr "QQ: Onzichtbaar"
+
 #~ msgid "QQ: Offline"
 #~ msgstr "QQ: Off-line "
+
 #~ msgid "Invalid name, please input in qq-xxxxxxxx format"
 #~ msgstr "Ongeldige naam. Gebruik de opmaak qq-xxxxxxx."
+
 #~ msgid "Faces"
 #~ msgstr "gezichten"
+
 #~ msgid "Change Your QQ Face"
 #~ msgstr "QQ-gezicht wijzigen"
+
 #~ msgid "Update"
 #~ msgstr "Bijwerken"
+
 #~ msgid "Modify My Information"
 #~ msgstr "Mijn informatie wijzigen"
+
 #~ msgid "Please wait for new version"
 #~ msgstr "Wacht op een niewe versie"
+
 #~ msgid "Login in TCP"
 #~ msgstr "Aanmelden met TCP"
+
 #~ msgid "Login Hidden"
 #~ msgstr "Verborgen aanmelden"
+
 #~ msgid "QQ Server"
 #~ msgstr "QQ Server"
+
 #~ msgid "QQ Port"
 #~ msgstr "QQ Poort"
+
 #~ msgid "Socket send error"
 #~ msgstr "Socket-zendfout"
+
 #~ msgid "Your request to send file[%s] has been rejected by buddy[%d]"
 #~ msgstr ""
 #~ "Uw verzoek om het bestand[%s] te sturen is geweigerd door de gebruiker[%d]"
+
 #~ msgid "The sending process of file[%s] has been canceled by buddy[%d]"
 #~ msgstr ""
 #~ "het oversturen van het bestand[%s] is afgebroken door de gebruiker[%d]"
+
 #~ msgid "User info is not updated"
 #~ msgstr "Gebruikerinformatie niet bijgewerkt"
+
 #~ msgid "Send packet"
 #~ msgstr "pakket sturen"
+
 #~ msgid "Packets lost, send again?"
 #~ msgstr "We zijn pakketten kwijt. Nogmaals sturen?"
+
 #~ msgid "Would like to add him?"
 #~ msgstr "Wilt u hem/haar toevoegen?"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Supports:</b> %s"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Ondersteunt:</b> %s"
+
 #~ msgid "<b>External User</b><br>"
 #~ msgstr "<b>Externe gebruiker</b><br>"
+
 #~ msgid "<b>User ID:</b> %s<br>"
 #~ msgstr "<b>GebruikersID:</b> %s<br>"
+
 #~ msgid "<b>Full Name:</b> %s<br>"
 #~ msgstr "<b>Volledige naam:</b> %s<br>"
+
 #~ msgid "<b>Supports:</b> %s<br>"
 #~ msgstr "<b>Ondersteunt:</b> %s<br>"
+
 #~ msgid "<b>Status:</b> %s"
 #~ msgstr "<b>Status:</b> %s"
+
 #~ msgid "Reject watching by other users"
 #~ msgstr "Anderen mogen u niet in de gaten houden"
+
 #~ msgid "Block invites"
 #~ msgstr "Uitnodigingen blokkeren"
+
 #~ msgid "Reject online status attribute requests"
 #~ msgstr "Opvragen van uw online status weigeren"
+
 #~ msgid "Wrong Password"
 #~ msgstr "Wachtwoord onjuist"
+
 #~ msgid "TOC has sent a PAUSE command."
 #~ msgstr "TOC heeft een PAUSE-opdracht verstuurd."
+
 #~ msgid ""
 #~ "When this happens, TOC ignores any messages sent to it, and may kick you "
 #~ "off if you send a message. Gaim will prevent anything from going through. "
@@ -19371,8 +14701,10 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "misschien van het netwerk geschopt. Gaim voorkomt deze situatie door geen "
 #~ "berichten door te geven. Dit is slechts een tijdelijke oplossing, wees "
 #~ "geduldig."
+
 #~ msgid "Gaim - Save As..."
 #~ msgstr "Gaim - Opslaan als..."
+
 #~ msgid ""
 #~ "The normal authentication method has failed. This means either your "
 #~ "password is incorrect, or Yahoo!'s authentication scheme has changed. "
@@ -19383,38 +14715,55 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "wachtwoord onjuist is, of datYahoo! zijn aanmelding heeft veranderd. Gaim "
 #~ "zal nu proberen om via het Webmessenger-protocol aan te melden. Dit "
 #~ "resulteert wel in minder mogelijkheden en features."
+
 #~ msgid "Unable to read"
 #~ msgstr "Kan niet lezen"
+
 #~ msgid "<b>IP Address:</b> %s<br>"
 #~ msgstr "<b>IP-adres:</b> %s<br>"
+
 #~ msgid "<b>User:</b> %s<br>"
 #~ msgstr "<b>Gebruiker:</b> %s<br>"
+
 #~ msgid "g003: Error opening connection.\n"
 #~ msgstr "g003: Fout: Kan geen verbinding maken.\n"
+
 #~ msgid "Hide Disconnect Errors"
 #~ msgstr "Verbindingsfouten verbergen"
+
 #~ msgid "Hide Login Errors"
 #~ msgstr "Aanmeldfouten verbergen"
+
 #~ msgid "Hide Reconnecting Dialog"
 #~ msgstr "Fouten over de netwerkverbinding verbergen"
+
 #~ msgid "When you are kicked offline, this reconnects you."
 #~ msgstr "Wanneer je offline wordt geschopt, herstelt dit de verbinding."
+
 #~ msgid "Mail Server"
 #~ msgstr "Emailserver"
+
 #~ msgid "%s (%d new/%d total)"
 #~ msgstr "%s (%d nieuw/%d totaal)"
+
 #~ msgid "Check Mail"
 #~ msgstr "Email controleren"
+
 #~ msgid "Check email every X seconds.\n"
 #~ msgstr "Email iedere X seconden controleren.\n"
+
 #~ msgid "Buddy is offline:"
 #~ msgstr "Contact is off-line:"
+
 #~ msgid "Buddy is away:"
 #~ msgstr "Contact is weg:"
+
 #~ msgid "Buddy is idle:"
 #~ msgstr "Contact is inactief:"
+
 #~ msgid "Use last matching buddy"
 #~ msgstr "Laatst overeenkomend contact gebruiken"
+
 #~ msgid ""
 #~ "The buddy with the lowest score is the buddy who will have priority in "
 #~ "the contact.\n"
@@ -19426,18 +14775,25 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "De standaardwaardes (off-line = -4, weg = -2, inactief = -1)\n"
 #~ "zullen de ingebouwde volgorde vervangen van actief -> inactief -> weg -> "
 #~ "weg+inactief -> off-line."
+
 #~ msgid "Point values to use for Account..."
 #~ msgstr "Puntentelling voor account..."
+
 #~ msgid "Gaim"
 #~ msgstr "Gaim"
+
 #~ msgid "Gaim - Signed off"
 #~ msgstr "Gaim - Afgemeld"
+
 #~ msgid "Gaim - Away"
 #~ msgstr "Gaim - Afwezig"
+
 #~ msgid "Auto-login"
 #~ msgstr "Auto-aanmelden"
+
 #~ msgid "_Hide new messages until tray icon is clicked"
 #~ msgstr "Nieuwe berichten _verbergen tot pictogram wordt aangeklikt"
+
 #~ msgid ""
 #~ "Displays a system tray icon (in GNOME, KDE or Windows for example) to "
 #~ "show the current status of Gaim, allow fast access to commonly used "
@@ -19449,43 +14805,58 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "te geven tot veelgebruikte functies en om het hoofdvenster te verbergen "
 #~ "of juist weer te geven. Ook biedt het de mogelijkheid om inkomende "
 #~ "berichten te laten wachten totdat erop geklikt wordt, net als in ICQ."
+
 #~ msgid "Not connected to AIM"
 #~ msgstr "Niet verbonden met AIM"
+
 #~ msgid "No screenname given."
 #~ msgstr "Geen bijnaam gegeven."
+
 #~ msgid "No roomname given."
 #~ msgstr "Geen ruimte gegeven."
+
 #~ msgid "Invalid AIM URI"
 #~ msgstr "Ongeldige AIM URI"
+
 #~ msgid ""
 #~ "Failed to assign %s to a socket:\n"
 #~ "%s"
 #~ msgstr ""
 #~ "Kan %s niet aan een \"socket\" binden:\n"
 #~ "%s"
+
 #~ msgid "Unable to open socket"
 #~ msgstr "Kan socket. niet openen"
+
 #~ msgid "Remote Control"
 #~ msgstr "Afstandbediening"
+
 #~ msgid "Provides remote control for gaim applications."
 #~ msgstr ""
 #~ "Geeft u de mogelijkheid om Gaim te besturen via een afstandbediening."
+
 #~ msgid ""
 #~ "Gives Gaim the ability to be remote-controlled through third-party "
 #~ "applications or through the gaim-remote tool."
 #~ msgstr ""
 #~ "Geeft u de mogelijkheid om Gaim te besturen via een afstandbediening van "
 #~ "derden of via gaim-remote."
+
 #~ msgid "Show user details"
 #~ msgstr "Gebruikerdetails weergeven"
+
 #~ msgid "Hide user details"
 #~ msgstr "Gebruikerdetails verbergen"
+
 #~ msgid "Provides integration with Ximian Evolution."
 #~ msgstr "Verzorgt de integratie met Ximian Evolution."
+
 #~ msgid "Screenname:"
 #~ msgstr "Gebruikersnaam:"
+
 #~ msgid "Allows you to hand-configure how long you've been idle for"
 #~ msgstr "Stelt u in staat om zelf de tijd van afwezigheid in te stellen"
+
 #~ msgid ""
 #~ "This plugin enables variable alpha transparency on conversation windows "
 #~ "and the buddy list.\n"
@@ -19496,12 +14867,16 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "de contactenlijst.\n"
 #~ "\n"
 #~ "* Opmerking: Deze plugin vereist Windows2000 of Windows XP."
+
 #~ msgid "Docked _Buddy List is always on top"
 #~ msgstr "Gekoppelde contactenlijst ligt altijd bovenop"
+
 #~ msgid "_Keep Buddy List window on top"
 #~ msgstr "Contactenlijst bovenop _houden"
+
 #~ msgid "_Flash Window when messages are received"
 #~ msgstr "Venster laten _knipperen wanneer berichten worden ontvangen"
+
 #~ msgid ""
 #~ "%d buddy from group %s was not removed because its account was not logged "
 #~ "in.  This buddy and the group were not removed.\n"
@@ -19514,6 +14889,7 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ msgstr[1] ""
 #~ "%d contacten uit de groep %s zijn niet verwijderd omdat deze niet "
 #~ "aangemeld zijn. Deze gebruikers en de groep zijn niet verwijderd.\n"
+
 #~ msgid ""
 #~ "An error was encountered parsing the file containing your buddy list (%"
 #~ "s).  It has not been loaded, and the old file has been renamed to blist."
@@ -19522,19 +14898,26 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Er is een error opgetreden tijdens het parsen van het bestand met uw "
 #~ "buddy lijst (%s). Het is niet geladen, en het oude bestand is hernoemd "
 #~ "naar blist.xml~."
+
 #~ msgid "Buddy List Error"
 #~ msgstr "Contactenlijst fout"
+
 #~ msgid "(+%d more)"
 #~ msgstr "(+%d meer)"
+
 #~ msgid " left the room (%s)."
 #~ msgstr " is weggegaan (%s)."
+
 #, fuzzy
 #~ msgid "Transfer of %s complete"
 #~ msgstr "Bestandsoverdracht naar %s volledig"
+
 #~ msgid "File transfer to %s aborted.\n"
 #~ msgstr "Bestandsoverdracht naar %s afgebroken.\n"
+
 #~ msgid "File transfer from %s aborted.\n"
 #~ msgstr "Bestandsoverdracht van %s afgebroken.\n"
+
 #~ msgid ""
 #~ "Usage: %s command [OPTIONS] [URI]\n"
 #~ "\n"
@@ -19574,18 +14957,21 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "       -f, --from=SCREENNAME Specificeer scherm-naam om te gebruiken\n"
 #~ "       -s, --session=SESSION Specificeer welke Gaim sessie te gebruiken\n"
 #~ "       -h, --help [opdracht] Geef hulp weer voor opdracht\n"
+
 #~ msgid ""
 #~ "Gaim not running (on session %d)\n"
 #~ "Is the \"Remote Control\" plugin loaded?\n"
 #~ msgstr ""
 #~ "Gaim is niet actief (in sessie %d)\n"
 #~ "Is de \"bediening op afstand\" plugin geladen?\n"
+
 #~ msgid ""
 #~ "Insufficient arguments (-t, -f, -p, & -m are all required) or arguments "
 #~ "greater than 9999 chars\n"
 #~ msgstr ""
 #~ "Onvoldoende argumenten (-t, -f, -p, & -m zijn allemaal vereist) of "
 #~ "argumenten langer dan 9999 karakters.\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Using AIM: URIs:\n"
@@ -19629,24 +15015,28 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Een contact toevoegen aan de contactenlijst:\n"
 #~ "\tgaim-remote uri 'aim:addbuddy?screenname=Pinguin'\n"
 #~ "...zal Pinguin toevoegen aan de contactenlijst.\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Log out all accounts\n"
 #~ msgstr ""
 #~ "\n"
 #~ "Log uit alle accounts\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Close running copy of Gaim\n"
 #~ msgstr ""
 #~ "\n"
 #~ "Actieve Gaim sluiten\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Mark all accounts as \"away\" with the default message.\n"
 #~ msgstr ""
 #~ "\n"
 #~ "Markeer alle accounts als \"afwezig\" met het standaard bericht.\n"
+
 #~ msgid ""
 #~ "\n"
 #~ "Set all accounts as not away.\n"
@@ -19661,14 +15051,19 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ msgstr ""
 #~ "\n"
 #~ "Een bericht ver_sturen\n"
+
 #~ msgid "Screen Name:"
 #~ msgstr "Gebruikersnaam:"
+
 #~ msgid "Show more options"
 #~ msgstr "Meer opties"
+
 #~ msgid "Show fewer options"
 #~ msgstr "Minder opties"
+
 #~ msgid "%s%s%s%s has made %s his or her buddy%s%s%s"
 #~ msgstr "%s%s%s%s heeft %s in zijn/haar contactenlijst gezet%s%s%s"
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -19677,56 +15072,72 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "\n"
 #~ "\n"
 #~ "Wilt u hem of haar toevoegen aan uw contactenlijst?"
+
 #~ msgid "_Alias Buddy..."
 #~ msgstr "_Alias voor contact..."
+
 #~ msgid "Alias Contact..."
 #~ msgstr "Alias voor contactgroep..."
 
 #, fuzzy
 #~ msgid "/Buddies/_Log Out"
 #~ msgstr "/Contacten/_Afsluiten"
+
 #~ msgid "/Tools/Buddy _Pounce"
 #~ msgstr "/Extra/_Contactalarm"
+
 #~ msgid "/Tools/Account Ac_tions"
 #~ msgstr "/Extra/Account-acties"
+
 #~ msgid "/Tools/Pl_ugin Actions"
 #~ msgstr "/Extra/Plugin-acties"
+
 #~ msgid "/Tools/A_ccounts"
 #~ msgstr "/Extra/Acco_unts"
+
 #~ msgid "/Tools/View System _Log"
 #~ msgstr "/Extra/_Systeemlogboek"
+
 #~ msgid "Rename Group"
 #~ msgstr "Groep hernoemen"
+
 #~ msgid "New group name"
 #~ msgstr "Nieuwe groepsnaam"
+
 #~ msgid "Please enter a new name for the selected group."
 #~ msgstr "Geef alstublieft de nieuwe naam voor deze groep."
+
 #~ msgid "%d%%"
 #~ msgstr "%d%%"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Account:</b>"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Account:</b>"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Contact Alias:</b>"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Alias van contact:</b>"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Alias:</b>"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Alias:</b>"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Logged In:</b>"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Aangemeld:</b>"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Idle:</b>"
@@ -19741,34 +15152,45 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Afwezig:</b>"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status</b>: Awesome"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b>: Zwaar flex"
+
 #~ msgid ""
 #~ "\n"
 #~ "<b>Status</b>: Rockin'"
 #~ msgstr ""
 #~ "\n"
 #~ "<b>Status:</b>: Rockin'"
+
 #~ msgid "Idle (%dh%02dm) "
 #~ msgstr "Afwezig (%dh%02dm) "
+
 #~ msgid "Idle (%dm) "
 #~ msgstr "Afwezig (%dm) "
+
 #~ msgid "Warned (%d%%) "
 #~ msgstr "Gewaarschuwd (%d%%) "
+
 #~ msgid "/Buddies/Log Out"
 #~ msgstr "Vrienden/Log uit"
+
 #~ msgid "Alphabetical"
 #~ msgstr "Alfabetisch"
+
 #~ msgid "/Tools/Buddy Pounce"
 #~ msgstr "/Extra/Contactalarm"
+
 #~ msgid "/Tools/Account Actions"
 #~ msgstr "/Extra/Account acties"
+
 #~ msgid "/Tools/Plugin Actions"
 #~ msgstr "/Extra/Plugin-acties"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">%s has been disconnected.</span>\n"
 #~ "\n"
@@ -19780,55 +15202,75 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "\n"
 #~ "%s\n"
 #~ "%s"
+
 #~ msgid "Reason Unknown."
 #~ msgstr "Reden onbekend."
 
 #, fuzzy
 #~ msgid "Disconnected"
 #~ msgstr "Verbinding verbroken"
+
 #~ msgid "Reconnect _All"
 #~ msgstr "_Alle verbindingen herstellen"
+
 #~ msgid "me is using Gaim v%s."
 #~ msgstr "Ik gebruik Gaim v%s."
+
 #~ msgid "That command only works in Chats, not IMs."
 #~ msgstr "Die opdracht werkt alleen in chats, niet in gewone gesprekken."
+
 #~ msgid "That command only works in IMs, not Chats."
 #~ msgstr "Die opdracht werkt alleen in gewone gesprekken, niet in chats."
 
 #, fuzzy
 #~ msgid "That buddy is not on the same protocol as this chat"
 #~ msgstr "Deze vriend werkt niet met hetzelfde protocol als deze chat"
+
 #~ msgid "User has typed something and paused"
 #~ msgstr "Gebruiker is gestopt met typen"
+
 #~ msgid "_Send As"
 #~ msgstr "_Verzenden als"
+
 #~ msgid "/Conversation/Clear"
 #~ msgstr "/Gesprek/_Opschonen"
+
 #~ msgid "/Conversation/_Warn..."
 #~ msgstr "/Gesprek/_Waarschuwen..."
+
 #~ msgid "/Conversation/A_lias..."
 #~ msgid_plural ""
 #~ "Gaim cannot send files over Yahoo! that are bigger than %d megabytes (%s)."
 #~ msgstr[0] "/Gesprek/A_lias..."
 #~ msgstr[1] ""
+
 #~ msgid "/Options/Show T_imestamps"
 #~ msgstr "/Opties/Berichttijd _weergeven"
+
 #~ msgid "/Conversation/Warn..."
 #~ msgstr "/Gesprek/Waarschuwen..."
+
 #~ msgid "<main>/Conversation/Close"
 #~ msgstr "<main>/Gesprek/Sluiten"
+
 #~ msgid "former libfaim maintainer"
 #~ msgstr "ex-beheerder van libfaim"
+
 #~ msgid "former lead developer"
 #~ msgstr "ex-hoofdontwikkelaar"
+
 #~ msgid "former maintainer"
 #~ msgstr "ex-beheerder"
+
 #~ msgid "former Jabber developer"
 #~ msgstr "ex-ontwikkelaar van Jabber"
+
 #~ msgid "Dutch; Flemish"
 #~ msgstr "Nederlands; Vlaams"
+
 #~ msgid "Chinese"
 #~ msgstr "Chinees"
+
 #~ msgid ""
 #~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
 #~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
@@ -19839,24 +15281,31 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell Groupwise, Napster, "
 #~ "Zephyr en GaduGadu en dat allemaal tegelijk! Het is geschreven m.b.v. Gtk"
 #~ "+ en wordt verspreid onder een GPL-licentie.<BR><BR>"
+
 #~ msgid "Active Developers"
 #~ msgstr "Huidige ontwikkelaars"
+
 #~ msgid "_Screen name"
 #~ msgstr "_Gebruikersnaam"
+
 #~ msgid "Please enter the screen name of the person you would like to IM."
 #~ msgstr ""
 #~ "Geef alstublieft de gebruikersnaam van de persoon aan wie u een bericht "
 #~ "zou willen sturen."
+
 #~ msgid "Get User Log"
 #~ msgstr "Gebruikerslogboek opvragen"
+
 #~ msgid ""
 #~ "Please enter the screen name of the person whose log you would like to "
 #~ "view."
 #~ msgstr ""
 #~ "Geef alstublieft de gebruikersnaam van de persoon waarvan u het logboek "
 #~ "wilt opvragen."
+
 #~ msgid "Warn User"
 #~ msgstr "Gebruiker waarschuwen"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">Warn %s?</span>\n"
 #~ "\n"
@@ -19867,40 +15316,54 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "\n"
 #~ "Dit zal %s zijn/haar waarschuwingsniveau verhogen en strengere regels "
 #~ "zullen worden toegepast.\n"
+
 #~ msgid "Warn _anonymously?"
 #~ msgstr "_Anoniem waarschuwen?"
+
 #~ msgid "<b>Anonymous warnings are less severe.</b>"
 #~ msgstr "<b>Anonieme waarschuwingen zijn minder erg.</b>"
+
 #~ msgid "_Keep the dialog open"
 #~ msgstr "Dialoogvenster open _houden"
+
 #~ msgid "_Clear finished transfers"
 #~ msgstr "Verwerkte overdrachten uit lijst _verwijderen"
+
 #~ msgid "Show transfer details"
 #~ msgstr "Details weergeven"
+
 #~ msgid "Hide transfer details"
 #~ msgstr "Details verbergen"
+
 #~ msgid "Expander Size"
 #~ msgstr "Uitklapgrootte"
+
 #~ msgid "Size of the expander arrow"
 #~ msgstr "Grootte van de uitklappijl"
+
 #~ msgid "Pa_ste As Text"
 #~ msgstr "_Plakken als tekst"
+
 #~ msgid ""
 #~ "Unable to guess the image type based on the file extension supplied.  "
 #~ "Defaulting to PNG."
 #~ msgstr ""
 #~ "Gaim kon het type afbeelding niet bepalen aan de hand van het "
 #~ "achtervoegsel. PNG wordt geprobeerd."
+
 #~ msgid "Error saving image: %s"
 #~ msgstr "Fout bij opslaan afbeelding: %s"
 
 #, fuzzy
 #~ msgid "Unable to load preferences"
 #~ msgstr "Kan socket. niet openen"
+
 #~ msgid "<span weight=\"bold\">From:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">Van:</span> %s\n"
+
 #~ msgid "<span weight=\"bold\">Subject:</span> %s\n"
 #~ msgstr "<span weight=\"bold\">Onderwerp:</span> %s\n"
+
 #~ msgid ""
 #~ "<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
 #~ "\n"
@@ -19917,110 +15380,155 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Error launching <b>%s</b>: %s"
 #~ msgstr "Fout bij starten van \"%s\": %s"
+
 #~ msgid "Pounce When"
 #~ msgstr "Wanneer alarmeren"
 
 #, fuzzy
 #~ msgid "Si_gn on"
 #~ msgstr "_Aanmelden"
+
 #~ msgid "Sign _off"
 #~ msgstr "Af_melden"
+
 #~ msgid "A_way"
 #~ msgstr "_Afwezig"
 
 #, fuzzy
 #~ msgid "_Return from away"
 #~ msgstr "_Terugkeren van afwezigheid"
+
 #~ msgid "_Idle"
 #~ msgstr "_Inactief"
+
 #~ msgid "Retur_n from idle"
 #~ msgstr "Terugkeren _van inactief"
+
 #~ msgid "Buddy starts _typing"
 #~ msgstr "Contact start met _tikken"
+
 #~ msgid "Buddy stops t_yping"
 #~ msgstr "Contact _stopt met tikken"
+
 #~ msgid "Pounce Action"
 #~ msgstr "Alarm Actie"
+
 #~ msgid "Op_en an IM window"
 #~ msgstr "Be_richtvenster openen"
+
 #~ msgid "B_rowse..."
 #~ msgstr "Bl_aderen..."
+
 #~ msgid "Bro_wse..."
 #~ msgstr "Bl_aderen..."
+
 #~ msgid "Sav_e this pounce after activation"
 #~ msgstr "Dit alarm _opslaan na activatie"
+
 #~ msgid "Remove Buddy Pounce"
 #~ msgstr "Contactalarm verwijderen"
+
 #~ msgid "Display"
 #~ msgstr "Weergave"
+
 #~ msgid "_Highlight misspelled words"
 #~ msgstr "Verkeerd gespelde woorden _oplichten"
+
 #~ msgid "Ignore font _faces"
 #~ msgstr "Lettertype ne_geren"
+
 #~ msgid "_Send default formatting with outgoing messages"
 #~ msgstr "Opmaak _meesturen met uitgaande berichten"
+
 #~ msgid "_Clear Formatting"
 #~ msgstr "Opmaak _verwijderen"
+
 #~ msgid "Window Closing"
 #~ msgstr "Sluiten van venster"
+
 #~ msgid "_Escape closes window"
 #~ msgstr "_Escape sluit het venster"
+
 #~ msgid "Buddy List Sorting"
 #~ msgstr "Sorteren van contactenlijst"
+
 #~ msgid "Buddy Display"
 #~ msgstr "Contactenlijst"
+
 #~ msgid "Show more buddy details"
 #~ msgstr "Laat meer contact details zien"
+
 #~ msgid "Tab p_lacement:"
 #~ msgstr "Tabblad_plaatsing:"
+
 #~ msgid "New conversation _placement:"
 #~ msgstr "Plaatsing van nieuwe _gesprekken:"
+
 #~ msgid "_Autodetect IP Address"
 #~ msgstr "IP-adres _opzoeken"
+
 #~ msgid "_Start Port:"
 #~ msgstr "_Beginpoort:"
+
 #~ msgid "_End Port:"
 #~ msgstr "_Eindpoort:"
+
 #~ msgid "Gnome Default"
 #~ msgstr "GNOME standaard"
+
 #~ msgid "Message Logs"
 #~ msgstr "Gesprek-logboek"
+
 #~ msgid "Log _Format:"
 #~ msgstr "Logboekop_maak:"
+
 #~ msgid "_Log all instant messages"
 #~ msgstr "Alle gesprekken _opslaan"
+
 #~ msgid "System Logs"
 #~ msgstr "Systeemlogboeken"
+
 #~ msgid "_Enable system log"
 #~ msgstr "Systeemlogboek bijhouden"
 
 #, fuzzy
 #~ msgid "Log when buddies log in/log _out"
 #~ msgstr "Bijhouden wanneer contacten zich aan- of a_fmelden"
+
 #~ msgid "Log when buddies become _idle/un-idle"
 #~ msgstr "Bijhouden wanneer contacten (in)_actief zijn"
+
 #~ msgid "Log when buddies go away/come _back"
 #~ msgstr "Bijhouden wanneer contacten aan- of af_wezig zijn"
+
 #~ msgid "Log your own _signons/idleness/awayness"
 #~ msgstr "_Eigen aanmelding/inactiviteit/afwezigheid bijhouden"
+
 #~ msgid "_Queue new messages when away"
 #~ msgstr "Berichten in de _wachtrij zetten tijdens afwezigheid"
 
 #, fuzzy
 #~ msgid "When away and idle"
 #~ msgstr "Status op afwezig zetten _wanneer ik niets doe"
+
 #~ msgid "Idle _time reporting:"
 #~ msgstr "Afwezigheid _berekenen:"
+
 #~ msgid "Gaim usage"
 #~ msgstr "Gebruik van gaim"
+
 #~ msgid "X usage"
 #~ msgstr "Gebruik grafische omgeving (X)"
+
 #~ msgid "Windows usage"
 #~ msgstr "Gebruik grafische omgeving (Windows)"
+
 #~ msgid "Set away _when idle"
 #~ msgstr "Status op afwezig zetten _wanneer ik niets doe"
+
 #~ msgid "Away m_essage:"
 #~ msgstr "Afwezigheids_bericht:"
+
 #~ msgid ""
 #~ "<span size=\"larger\">%s %s</span>\n"
 #~ "\n"
@@ -20033,6 +15541,7 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "<span weight=\"bold\">Geschreven door:</span>\t%s\n"
 #~ "<span weight=\"bold\">Website:</span>\t%s\n"
 #~ "<span weight=\"bold\">Bestandsnaam:</span>\t%s"
+
 #~ msgid ""
 #~ "<span size=\"larger\">%s %s</span>\n"
 #~ "\n"
@@ -20045,130 +15554,183 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "<span weight=\"bold\">Geschreven door:</span>  %s\n"
 #~ "<span weight=\"bold\">URL:</span>  %s\n"
 #~ "<span weight=\"bold\">Bestandsnaam:</span>  %s"
+
 #~ msgid "Load"
 #~ msgstr "Laden"
+
 #~ msgid "Summary"
 #~ msgstr "Samenvatting"
+
 #~ msgid "Details"
 #~ msgstr "Details"
+
 #~ msgid "Message Text"
 #~ msgstr "Berichttekst"
+
 #~ msgid "Permit"
 #~ msgstr "Toestaan"
+
 #~ msgid "Hidden"
 #~ msgstr "Onzichtbaar"
+
 #~ msgid "_Warn"
 #~ msgstr "_Waarschuwen"
+
 #~ msgid "Slightly less boring default"
 #~ msgstr "Iets minder saaie standaardtekst"
+
 #~ msgid "Available for friends only"
 #~ msgstr "Alleen beschikbaar voor vrienden"
+
 #~ msgid "Away for friends only"
 #~ msgstr "Alleen afwezig voor vrienden"
+
 #~ msgid "Invisible for friends only"
 #~ msgstr "Alleen onzichtbaar voor vrienden"
+
 #~ msgid "Unable to resolve hostname."
 #~ msgstr "Kan computernaam niet opzoeken."
+
 #~ msgid "Error while writing to socket."
 #~ msgstr "Fout opgetreden bij schrijven naar socket."
+
 #~ msgid "Authentication failed."
 #~ msgstr "Identificatie mislukt."
+
 #~ msgid "Unknown Error Code."
 #~ msgstr "Onbekende Foutcode."
+
 #~ msgid "Status: %s"
 #~ msgstr "Status: %s"
+
 #~ msgid "Balancer handshake"
 #~ msgstr "Balancer handshake"
+
 #~ msgid "Reading server key"
 #~ msgstr "Serversleutel wordt gelezen"
+
 #~ msgid "Exchanging key hash"
 #~ msgstr "Sleutelhash wordt uitgewisseld"
+
 #~ msgid "Critical error in GG library\n"
 #~ msgstr "Kritieke fout in GaduGadu bibliotheek\n"
+
 #~ msgid "Unable to ping server"
 #~ msgstr "Kan server niet pingen"
+
 #~ msgid "Send as message"
 #~ msgstr "Verstuur als bericht"
+
 #~ msgid "Looking up GG server"
 #~ msgstr "GG-server wordt opgezocht"
+
 #~ msgid "Invalid Gadu-Gadu UIN specified"
 #~ msgstr "Onjuiste Gadu-Gadu UIN opgegeven"
+
 #~ msgid "You are trying to send a message to an invalid Gadu-Gadu UIN."
 #~ msgstr "U probeert een bericht te verzenden naar een ongeldig GaduGadu UIN."
+
 #~ msgid "Couldn't get search results"
 #~ msgstr "Geen zoekresultaten gevonden"
+
 #~ msgid "Gadu-Gadu Search Engine"
 #~ msgstr "Gadu-Gadu Zoekmachine"
+
 #~ msgid "Active"
 #~ msgstr "Actief"
+
 #~ msgid "Sex"
 #~ msgstr "Geslacht"
+
 #~ msgid "There is no Buddy List stored on the Gadu-Gadu server."
 #~ msgstr "Er is geen contactenlijst opgeslagen op de GaduGadu-server."
+
 #~ msgid "Couldn't Import Buddy List from Server"
 #~ msgstr "Kon de contactenlijst niet importeren van de server"
+
 #~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
 #~ msgstr "Contactenlijst is naar de GaduGadu-server gestuurd"
+
 #~ msgid "Couldn't transfer Buddy List to Gadu-Gadu server"
 #~ msgstr "Kon de contactenlijst niet versturen naar de GaduGadu-server"
+
 #~ msgid "Buddy List successfully deleted from Gadu-Gadu server"
 #~ msgstr "Contactenlijst is verwijderd van de GaduGadu-server"
+
 #~ msgid "Couldn't delete Buddy List from Gadu-Gadu server"
 #~ msgstr "Kon de contactenlijst niet verwijderen van de GaduGadu-server"
+
 #~ msgid "Password changed successfully"
 #~ msgstr "Wachtwoord veranderen gelukt"
+
 #~ msgid "Password couldn't be changed"
 #~ msgstr "Wachtwoord kon niet veranderd worden"
+
 #~ msgid "Error communicating with Gadu-Gadu server"
 #~ msgstr "Fout opgetreden bij communicatie met de GaduGadu-server"
+
 #~ msgid ""
 #~ "Gaim was unable to complete your request due to a problem communicating "
 #~ "with the Gadu-Gadu HTTP server.  Please try again later."
 #~ msgstr ""
 #~ "Gaim kon niet aan uw verzoek voldoen wegens een communicatieprobleem met "
 #~ "de GaduGadu HTTP-server. Probeert u het later nogmaals."
+
 #~ msgid "Unable to import Gadu-Gadu buddy list"
 #~ msgstr "Kon de GaduGadu contactenlijst niet importeren"
+
 #~ msgid ""
 #~ "Gaim was unable to connect to the Gadu-Gadu buddy list server.  Please "
 #~ "try again later."
 #~ msgstr ""
 #~ "Gaim kon geen verbinding maken met de GaduGadu contactenlijst-server. "
 #~ "Probeert u het later nogmaals."
+
 #~ msgid ""
 #~ "Gaim was unable to connect to the buddy list server.  Please try again "
 #~ "later."
 #~ msgstr ""
 #~ "Gaim kon geen verbinding maken met de contactenlijst-server. Probeert u "
 #~ "het later nogmaals."
+
 #~ msgid "Unable to delete Gadu-Gadu buddy list"
 #~ msgstr "Kan de GaduGadu contactenlijst niet verwijderen"
+
 #~ msgid "Unable to access directory"
 #~ msgstr "Kan adresboek niet benaderen"
+
 #~ msgid ""
 #~ "Gaim was unable to search the Directory because it was unable to connect "
 #~ "to the directory server.  Please try again later."
 #~ msgstr ""
 #~ "Gaim kon niet zoeken in het adresboek omdat de adresboek-server "
 #~ "onbereikbaar is. Probeert u het later nogmaals."
+
 #~ msgid "Unable to change Gadu-Gadu password"
 #~ msgstr "Kon GaduGadu-wachtwoord niet veranderen"
+
 #~ msgid ""
 #~ "Gaim was unable to change your password due to an error connecting to the "
 #~ "Gadu-Gadu server.  Please try again later."
 #~ msgstr ""
 #~ "Gaim kon uw wachtwoord niet veranderen wegens een communicatieprobleem "
 #~ "met de GaduGadu-server. Probeert u het later nogmaals."
+
 #~ msgid "Directory Search"
 #~ msgstr "Adresboek doorzoeken"
+
 #~ msgid "Import Buddy List from Server"
 #~ msgstr "Contactenlijst importeren van server"
+
 #~ msgid "Export Buddy List to Server"
 #~ msgstr "Contactenlijst exporteren naar server"
+
 #~ msgid "Delete Buddy List from Server"
 #~ msgstr "Contactenlijst verwijderen van server"
+
 #~ msgid "Unable to access user profile."
 #~ msgstr "Kan het gebruikersprofiel niet benaderen."
+
 #~ msgid ""
 #~ "Gaim was unable to access this user's profile due to an error connecting "
 #~ "to the directory server.  Please try again later."
@@ -20176,107 +15738,148 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Gaim kon het gebruikersprofiel niet benaderen wegens een "
 #~ "communicatieprobleem met de adresboek-server. Probeert u het later "
 #~ "nogmaals."
+
 #~ msgid "File Transfer Aborted"
 #~ msgstr "Bestandsoverdracht afgebroken"
 
 #, fuzzy
 #~ msgid "Logging in: %s"
 #~ msgstr "Aanmelden"
+
 #~ msgid "Realname"
 #~ msgstr "Echte naam"
+
 #~ msgid "Buddy Information for %s"
 #~ msgstr "Contact-info voor %s"
+
 #~ msgid ""
 #~ "mode &lt;nick|channel&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a "
 #~ "channel or user mode."
 #~ msgstr ""
 #~ "mode &lt;bijnaam|ruimte&gt; &lt;+|-&gt;&lt;A-Za-z&gt;:  Kanaal- / "
 #~ "gebruikersmodus aan of uitschakelen."
+
 #~ msgid "Server requires SSL for login"
 #~ msgstr "Server vereist SSL voor aanmelding"
+
 #~ msgid "Jabber ID"
 #~ msgstr "Jabber ID"
+
 #~ msgid "Jabber Profile"
 #~ msgstr "Jabber profiel"
+
 #~ msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 #~ msgstr ""
 #~ "invite &lt;bijnaam&gt; [ruimte]:  Een gebruiker uitnodigen in een ruimte."
+
 #~ msgid "Hide Operating System"
 #~ msgstr "Besturingssysteem verbergen"
+
 #~ msgid "Force old SSL"
 #~ msgstr "Oude SSL forceren"
+
 #~ msgid "The user %s wants to add you to their buddy list."
 #~ msgstr "De gebruiker %s wil u toevoegen aan zijn/haar contactenlijst."
+
 #~ msgid "Miscellaneous error"
 #~ msgstr "Onebeknde fout"
+
 #~ msgid "Tried to add a contact to a group that doesn't exist"
 #~ msgstr "Probeerde een contact aan een niet bestaande groep toe te voegen"
+
 #~ msgid "Set Friendly Name"
 #~ msgstr "Bijnaam instellen"
+
 #~ msgid "Enable/Disable Mobile Devices"
 #~ msgstr "Mobiele apparaten inschakelen/uitschakelen"
+
 #~ msgid "Allow/Disallow Mobile Pages"
 #~ msgstr "MSN-mobile pagina's toestaan/weigeren"
+
 #~ msgid "Initiate Chat"
 #~ msgstr "Chat starten"
+
 #~ msgid "Display conversation closed notices"
 #~ msgstr "Berichten over sluiting van gesprek weergeven"
+
 #~ msgid "Display timeout notices"
 #~ msgstr "Berichten over timeouts weergeven"
+
 #~ msgid "Login server"
 #~ msgstr "Aanmeldserver"
+
 #~ msgid "Unknown error when attempting to authorize with MSN login server."
 #~ msgstr "Onbekende fout opgetreden bij aanmeldpoging op MSN-server."
+
 #~ msgid "Requesting to send password"
 #~ msgstr "Wachtwoord-toestemming aangevraagd"
+
 #~ msgid ""
 #~ "Your MSN buddy list for %s is temporarily unavailable. Please wait and "
 #~ "try again."
 #~ msgstr ""
 #~ "Uw MSN vriendenlijst voor %s is tijdelijk niet beschikbaar. Probeer het "
 #~ "later nog eens."
+
 #~ msgid "Error writing to %s server"
 #~ msgstr "Fout bij schrijven naar %s-server"
+
 #~ msgid "Error reading from %s server"
 #~ msgstr "Fout bij inlezen van %s server"
+
 #~ msgid "Unknown error from %s server"
 #~ msgstr "Onbekende fout van %s-server"
+
 #~ msgid "Received HTTP error. Please report this."
 #~ msgstr "HTTP-fout ontvangen. Dit kunt u het beste rapporteren."
+
 #~ msgid "The conversation has become inactive and timed out."
 #~ msgstr "Het gesprek is niet meer actief en gemarkeerd als verlopen."
+
 #~ msgid ""
 #~ "You were disconnected from the server, because you logged on from a "
 #~ "different location"
 #~ msgstr ""
 #~ "De verbinding is verbroken. U heeft uzelf aangemeld vanaf een andere "
 #~ "locatie."
+
 #~ msgid "User Properties"
 #~ msgstr "Gebruikerseigenschappen"
+
 #~ msgid "Error processing event or response (%s)."
 #~ msgstr "Fout bij verwerken van gebeurtenis / reactie (%s)."
+
 #~ msgid "Direct IM with %s closed"
 #~ msgstr "Directe verbinding met %s afgesloten"
+
 #~ msgid "Direct IM with %s failed"
 #~ msgstr "Directe verbinding met %s mislukt"
+
 #~ msgid "Direct Connect failed"
 #~ msgstr "Directe verbinding mislukt"
+
 #~ msgid "Direct IM with %s established"
 #~ msgstr "Direkte verbinding met %s hersteld"
+
 #~ msgid "Attempting to connect to %s at %s:%hu for Direct IM."
 #~ msgstr "Verbinding maken met %s om %s:%hu voor directe verbinding."
+
 #~ msgid "Unable to open Direct IM"
 #~ msgstr "Kan geen directe verbinding openen"
+
 #~ msgid ""
 #~ "Because this reveals your IP address, it may be considered a privacy "
 #~ "risk.  Do you wish to continue?"
 #~ msgstr ""
 #~ "Omdat dit uw IP-adres zichtbaar maakt voor de andere partij, kan het "
 #~ "worden gezien als inbreuk op uw privacy. Wilt u doorgaan?"
+
 #~ msgid "Chat is currently unavailable"
 #~ msgstr "Chatruimte is momenteel niet bereikbaar."
+
 #~ msgid "Unable to establish listener socket."
 #~ msgstr "Kan geen luistersocket aanmaken."
+
 #~ msgid ""
 #~ "The user %u wants to add you to their buddy list for the following "
 #~ "reason:\n"
@@ -20285,36 +15888,44 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "De gebruiker %u wil u toevoegen aan zijn/haar contactenlijst om de "
 #~ "volgende reden:\n"
 #~ "%s"
+
 #~ msgid ""
 #~ "You have been disconnected because you have signed on with this screen "
 #~ "name at another location."
 #~ msgstr ""
 #~ "De verbinding is verbroken. U heeft uzelf aangemeld met dit account vanaf "
 #~ "een andere locatie."
+
 #~ msgid "ICQ Info for %s"
 #~ msgstr "ICQ info voor %s"
+
 #~ msgid "The following screen names are associated with %s"
 #~ msgstr "De volgende gebruikersnamen zijn geassocieerd met %s"
+
 #~ msgid ""
 #~ "Error 0x%04x: Unable to format screen name because the requested screen "
 #~ "name ends in a space."
 #~ msgstr ""
 #~ "Fout 0x%04x: Kan weergave niet veranderen omdat aangevraagde "
 #~ "gebruikersnaam eindigt op een spatie."
+
 #~ msgid ""
 #~ "Error 0x%04x: Unable to change email address because there is already a "
 #~ "request pending for this screen name."
 #~ msgstr ""
 #~ "Fout 0x%04x: Kan email adres niet veranderen omdat het adres al is "
 #~ "aangevraagd door een ander."
+
 #~ msgid ""
 #~ "Error 0x%04x: Unable to change email address because the given address "
 #~ "has too many screen names associated with it."
 #~ msgstr ""
 #~ "Fout 0x%04x: Kan email adres niet veranderen omdat het adres reeds te "
 #~ "veel gebruikersnamen toegewezen heeft gekregen."
+
 #~ msgid "Unable to set AIM away message."
 #~ msgstr "Kan geen AIM afwezigheidsbericht instellen."
+
 #~ msgid ""
 #~ "You have probably requested to set your away message before the login "
 #~ "procedure completed.  You remain in a \"present\" state; try setting it "
@@ -20323,6 +15934,7 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "U heeft waarschijnlijk uw afwezigheidsbericht aangepast voordat u "
 #~ "volledig aangemeld was. Uw afwezigheidsbericht is niet ingesteld. "
 #~ "Probeert u het nogmaals wanneer u volledig aangemeld bent."
+
 #~ msgid ""
 #~ "The user %s wants to add you to their buddy list for the following "
 #~ "reason:\n"
@@ -20331,16 +15943,22 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "De gebruiker %s wil u toevoegen aan zijn/haar contactenlijst om de "
 #~ "volgende reden:\n"
 #~ "%s"
+
 #~ msgid "Display Currently Registered Address"
 #~ msgstr "Huidige geregistreerde adres weergeven"
+
 #~ msgid "Change Currently Registered Address..."
 #~ msgstr "Huidige geregistreerde adres veranderen..."
+
 #~ msgid "Search for Buddy by Email..."
 #~ msgstr "Contact zoeken door middel van email..."
+
 #~ msgid "Auth host"
 #~ msgstr "Host authoriseren"
+
 #~ msgid "Auth port"
 #~ msgstr "Auth-poort"
+
 #~ msgid "More..."
 #~ msgstr "Meer..."
 
@@ -20363,72 +15981,98 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Digitally sign all channel messages"
 #~ msgstr "Alle gesprekken _opslaan"
+
 #~ msgid "Verify all channel message signatures"
 #~ msgstr "Alle berichthandtekeningen in kanaal controleren"
+
 #~ msgid "Default SILC Key Pair"
 #~ msgstr "Standaard SILC Sleutelpaar"
+
 #~ msgid "SILC Public Key"
 #~ msgstr "SILC Publieke sleutel"
+
 #~ msgid "SILC Private Key"
 #~ msgstr "SILC Privésleutel"
+
 #~ msgid "EMail: \t\t%s\n"
 #~ msgstr "Email: \t\t%s\n"
+
 #~ msgid "TOC host"
 #~ msgstr "TOC host"
+
 #~ msgid "TOC port"
 #~ msgstr "TOC poort"
+
 #~ msgid "Basic Profile"
 #~ msgstr "Basisprofiel"
+
 #~ msgid "Instant Messagers"
 #~ msgstr "Instant Messagers"
+
 #~ msgid "AIM"
 #~ msgstr "AIM"
+
 #~ msgid "ICQ UIN"
 #~ msgstr "ICQ UIN"
+
 #~ msgid "Yahoo"
 #~ msgstr "Yahoo"
+
 #~ msgid "I'm From"
 #~ msgstr "Ik kom uit"
+
 #~ msgid "Set your Trepia profile data."
 #~ msgstr "Uw Trepia profielinfo instellen"
+
 #~ msgid "Visit Homepage"
 #~ msgstr "Homepage bezoeken"
+
 #~ msgid "Local Users"
 #~ msgstr "Lokale gebruikers"
+
 #~ msgid "Trepia Protocol Plugin"
 #~ msgstr "Trepia protocolplugin"
+
 #~ msgid ""
 #~ "You have been logged off as you have logged in on a different machine or "
 #~ "device."
 #~ msgstr ""
 #~ "De verbinding is verbroken omdat u zich heeft aangemeld op een andere "
 #~ "computer."
+
 #~ msgid "Not At Home"
 #~ msgstr "Niet thuis"
+
 #~ msgid "Not At Desk"
 #~ msgstr "Niet op m'n plek"
+
 #~ msgid "Not In Office"
 #~ msgstr "Niet op kantoor"
+
 #~ msgid "Join user in chat..."
 #~ msgstr "Deelnemen aan chat van gebruiker..."
+
 #~ msgid "Pager host"
 #~ msgstr "semafoon host"
 
 #, fuzzy
 #~ msgid "Japan Pager host"
 #~ msgstr "semafoon host"
+
 #~ msgid "File transfer host"
 #~ msgstr "Bestandsoverdracht computer"
 
 #, fuzzy
 #~ msgid "Japan File transfer host"
 #~ msgstr "Bestandsoverdracht computer"
+
 #~ msgid "Chat Room List Url"
 #~ msgstr "URL voor lijst van ruimtes"
 
 #, fuzzy
 #~ msgid "YCHT Port"
 #~ msgstr "Poort"
+
 #~ msgid ""
 #~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte "
 #~ "(1,048,576 bytes)."
@@ -20443,22 +16087,28 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ msgstr ""
 #~ "<b>Helaas worden niet-Engelse profielen op dit moment nog niet "
 #~ "ondersteund.</b><br><br>"
+
 #~ msgid "Maybe the room is full?"
 #~ msgstr "Misschien is de ruimte vol?"
 
 #, fuzzy
 #~ msgid "Unable send to chat %s,%s,%s"
 #~ msgstr "Kan gebruiker niet uitnodigen (%s)."
+
 #~ msgid "Access denied: proxy server forbids port %d tunnelling."
 #~ msgstr "Toegang geweigerd: proxy-server verbied tunnelen op poort %d."
+
 #~ msgid "Proxy connection error %d"
 #~ msgstr "Proxy verbindingsfout %d"
+
 #~ msgid "Please enter your password"
 #~ msgstr "Vul uw wachtwoord in"
+
 #~ msgid "(%d message)"
 #~ msgid_plural "(%d messages)"
 #~ msgstr[0] "(%d bericht)"
 #~ msgstr[1] "(%d berichten)"
+
 #~ msgid "(1 message)"
 #~ msgstr "(1 bericht)"
 
@@ -20469,60 +16119,79 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ msgstr ""
 #~ "De gebruiker '%s' nodigt %s uit in de chatruimte '%s'\n"
 #~ "%s"
+
 #~ msgid "%s went away"
 #~ msgstr "%s is afwezig"
+
 #~ msgid "second"
 #~ msgid_plural "seconds"
 #~ msgstr[0] "seconde"
 #~ msgstr[1] "seconden"
+
 #~ msgid "day"
 #~ msgid_plural "days"
 #~ msgstr[0] "dag"
 #~ msgstr[1] "dagen"
+
 #~ msgid "hour"
 #~ msgid_plural "hours"
 #~ msgstr[0] "uur"
 #~ msgstr[1] "uren"
+
 #~ msgid "minute"
 #~ msgid_plural "minutes"
 #~ msgstr[0] "minuut"
 #~ msgstr[1] "minuten"
+
 #~ msgid "DBus"
 #~ msgstr "DBus"
+
 #~ msgid "Buddy icon:"
 #~ msgstr "pictogram:"
+
 #~ msgid "IM the user"
 #~ msgstr "Gebruiker IM sturen"
+
 #~ msgid "Ignore the user"
 #~ msgstr "Gebruiker negeren"
+
 #~ msgid "Get the user's information"
 #~ msgstr "Gebruikersinformatie opvragen"
+
 #~ msgid "Unable to read header from server"
 #~ msgstr "Kan header niet lezen van server"
+
 #~ msgid ""
 #~ "Unable to read message from server: %s.  Command is %hd, length is %hd."
 #~ msgstr ""
 #~ "Kan bericht niet lezen van server: %s. Opdracht is %hd, lengte is %hd."
+
 #~ msgid "users: %s, files: %s, size: %sGB"
 #~ msgstr "gebruikers: %s, bestanden: %s, grootte: %s GB"
+
 #~ msgid "Unable to add \"%s\" to your Napster hotlist"
 #~ msgstr "Kan \"%s\" niet toevoegen aan uw Napster hotlist"
+
 #~ msgid "%s requested a PING"
 #~ msgstr "%s vraagt om een PING"
+
 #~ msgid "NAPSTER Protocol Plugin"
 #~ msgstr "NAPSTER-protocol plugin"
+
 #~ msgid ""
 #~ "Unable to play sound because the 'Command' sound method has been chosen, "
 #~ "but no command has been set."
 #~ msgstr ""
 #~ "Kan geluid niet afspelen omdat de Geluidsmethode 'Opdracht' is gekozen, "
 #~ "zonder een correcte opdracht te geven."
+
 #~ msgid ""
 #~ "Unable to play sound because the configured sound command could not be "
 #~ "launched: %s"
 #~ msgstr ""
 #~ "Kan geluid niet afspelen omdat de ingestelde opdracht niet gestart kan "
 #~ "worden: %s"
+
 #~ msgid ""
 #~ "An error was encountered parsing your buddy list.  It has not been "
 #~ "loaded, and the old file has moved to blist.xml~."
@@ -20567,44 +16236,58 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Auto Log In"
 #~ msgstr "Auto-aanmelden"
+
 #~ msgid "/Tools/Away"
 #~ msgstr "/Extra/Afwezig"
+
 #~ msgid "Done."
 #~ msgstr "Klaar."
 
 #, fuzzy
 #~ msgid "Logging in: "
 #~ msgstr "Aanmelden "
+
 #~ msgid "Cancel All"
 #~ msgstr "Alles annuleren"
+
 #~ msgid "/Options/Show Formatting _Toolbar"
 #~ msgstr "/Opties/_Opmaakwerkbalk weergeven"
+
 #~ msgid "/Options/Show Formatting Toolbar"
 #~ msgstr "/Opties/Opmaakwerkbalk weergeven"
+
 #~ msgid "Send a file to the user"
 #~ msgstr "Een bestand aan de gebruiker verzenden"
+
 #~ msgid "Remove the user from your buddy list"
 #~ msgstr "Gebruiker verwijderen van de contactenlijst"
 
 #, fuzzy
 #~ msgid "Send message"
 #~ msgstr "Verstuur bericht"
+
 #~ msgid "Invite a user"
 #~ msgstr "Gebruiker uitnodigen"
+
 #~ msgid "Add the chat to your buddy list"
 #~ msgstr "Chat toevoegen aan de lijst"
+
 #~ msgid "Remove the chat from your buddy list"
 #~ msgstr "Chat verwijderen van de contactenlijst"
+
 #~ msgid ""
 #~ "You are about to remove the contact containing %s and %d other buddies "
 #~ "from your buddy list.  Do you want to continue?"
 #~ msgstr ""
 #~ "U staat op het punt om het contact die %s bevat en %d andere contacten "
 #~ "van uw contactenlijst te verwijderen. Wilt u doorgaan?"
+
 #~ msgid "Please create an account."
 #~ msgstr "Maak een account aan."
+
 #~ msgid "Login"
 #~ msgstr "Aanmelden"
+
 #~ msgid "<b>_Account:</b>"
 #~ msgstr "<b>_Account:</b>"
 
@@ -20615,6 +16298,7 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "P_references"
 #~ msgstr "Voorkeuren"
+
 #~ msgid ""
 #~ "Gaim %s\n"
 #~ "Usage: %s [OPTION]...\n"
@@ -20648,168 +16332,239 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "  -d, --debug         debuginfo via stdout weergeven\n"
 #~ "  -v, --version       huidige versie weergeven en afsluiten\n"
 #~ "  -h, --help          deze hulptekst weergeven en afsluiten\n"
+
 #~ msgid "Interface Options"
 #~ msgstr "Interface-instellingen"
+
 #~ msgid "D_isplay remote nicknames if no alias is set"
 #~ msgstr "Bijnaam _weergeven als geen alias is ingesteld"
+
 #~ msgid "Show _timestamp on messages"
 #~ msgstr "_Tijd weergeven bij berichten"
+
 #~ msgid "Show _warning levels"
 #~ msgstr "_Waarschuwingsniveau weergeven"
+
 #~ msgid "Show idle _times"
 #~ msgstr "Afwezigheidstijd _weergeven"
+
 #~ msgid "_Automatically expand contacts"
 #~ msgstr "Contacten _automatisch uitvouwen"
+
 #~ msgid "Show _buttons as:"
 #~ msgstr "_Knoppen weergeven als:"
+
 #~ msgid "Text"
 #~ msgstr "Tekst"
+
 #~ msgid "Pictures and text"
 #~ msgstr "Tekst en afbeeldingen"
+
 #~ msgid "Enable \"_slash\" commands"
 #~ msgstr "\"slash\"-opdrachten (/) gebruiken"
+
 #~ msgid "Show _formatting toolbar"
 #~ msgstr "_Opmaakwerkbalk weergeven"
+
 #~ msgid "_Raise IM window on events"
 #~ msgstr "Berichtvenster _optillen bij gebeurtenissen"
+
 #~ msgid "Raise chat _window on events"
 #~ msgstr "Venster _optillen bij gebeurtenissen"
+
 #~ msgid "Signoff"
 #~ msgstr "Afmelden"
+
 #~ msgid "Local Addressbook"
 #~ msgstr "Lokaal adresboek"
+
 #~ msgid "Away!"
 #~ msgstr "Weg!"
 
 #, fuzzy
 #~ msgid "Edit This Message"
 #~ msgstr "Verstuur als bericht"
+
 #~ msgid "I'm Back!"
 #~ msgstr "Ik ben terug!"
+
 #~ msgid "Are you sure you want to remove the away message \"%s\"?"
 #~ msgstr "Wilt u het afwezigheidsbericht \"%s\" echt verwijderen?"
+
 #~ msgid "Remove Away Message"
 #~ msgstr "Afwezigheidsbericht verwijderen"
+
 #~ msgid "Set All Away"
 #~ msgstr "Zet alles op afwezig"
+
 #~ msgid "You cannot save an away message with a blank title"
 #~ msgstr "U kunt geen afwezigheidsbericht maken zonder titel"
+
 #~ msgid ""
 #~ "Please give the message a title, or choose \"Use\" to use without saving."
 #~ msgstr ""
 #~ "Geef het bericht een titel, of kies \"Gebruiken\" om te gebruiken zonder "
 #~ "op te slaan."
+
 #~ msgid "You cannot create an empty away message"
 #~ msgstr "U kunt geen leeg bericht maken"
+
 #~ msgid "Away title: "
 #~ msgstr "Afwezig titel: "
+
 #~ msgid "Send a message to the selected buddy"
 #~ msgstr "Bericht sturen aan de geselecteerde persoon"
+
 #~ msgid "Get information on the selected buddy"
 #~ msgstr "Info over geselecteerde persoon"
+
 #~ msgid "_Chat"
 #~ msgstr "_Chat"
+
 #~ msgid "Join a chat room"
 #~ msgstr "Chatruimte binnengaan"
+
 #~ msgid "_Away"
 #~ msgstr "_Afwezig"
+
 #~ msgid "Set an away message"
 #~ msgstr "Afwezigheidsbericht instellen"
+
 #~ msgid "Signon: "
 #~ msgstr "Aanmelding: "
+
 #~ msgid "Signon"
 #~ msgstr "Aanmelden"
+
 #~ msgid "Get Away Msg"
 #~ msgstr "Haal afwezigheidsbericht op"
+
 #~ msgid "Warn the user"
 #~ msgstr "Gebruiker waarschuwen?"
+
 #~ msgid "Enter _sends message"
 #~ msgstr "Enter ver_stuurt bericht"
+
 #~ msgid "C_ontrol-Enter sends message"
 #~ msgstr "_CTRL-Enter verstuurt bericht"
+
 #~ msgid "Insertions"
 #~ msgstr "Invoegingen"
+
 #~ msgid "Control-{B/I/U} changes _formatting"
 #~ msgstr "CTRL-{B/I/U} verandert de _opmaak"
+
 #~ msgid "Control-(number) _inserts smileys"
 #~ msgstr "CTRL-(nummer) voegt _smileys in"
+
 #~ msgid "_Raise window on events"
 #~ msgstr "Venster _optillen bij gebeurtenissen"
+
 #~ msgid "Dim i_dle buddies"
 #~ msgstr "Afwezige contacten _uitgrijzen"
+
 #~ msgid "Use _multi-colored screen names in chats"
 #~ msgstr "Meerkleurige namen weergeven in chats"
-#~ msgid "_Edit"
-#~ msgstr "_Bewerken"
+
 #~ msgid "Away Messages"
 #~ msgstr "Afwezigheid"
+
 #~ msgid "_Preferences"
 #~ msgstr "_Voorkeuren"
+
 #~ msgid "_Sign on"
 #~ msgstr "_Aanmelden"
+
 #~ msgid "Gaim encountered an error communicating with the ICQ server."
 #~ msgstr ""
 #~ "Gaim is een fout tegen gekomen bij de communicatie met de ICQ-server."
+
 #~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them."
 #~ msgstr "De gebruiker %s (%s%s%s%s%s) wil dat u hem/haar toestemming geeft."
+
 #~ msgid "Send message through server"
 #~ msgstr "Verzend bericht via server"
+
 #~ msgid "Nick:"
 #~ msgstr "Bijnaam:"
+
 #~ msgid "Roomlist Error"
 #~ msgstr "Fout in lijst avn ruimtes"
+
 #~ msgid "Update Buddy Icon"
 #~ msgstr "pictogram bijwerken"
+
 #~ msgid "Syncing with server"
 #~ msgstr "Synchronisatie met server"
+
 #~ msgid "MSN error for account %s"
 #~ msgstr "MSN-fout voor account %s"
+
 #~ msgid "(There was an error receiving this message)"
 #~ msgstr "(Er is een fout opgetreden bij het ontvangen van dit bericht)"
+
 #~ msgid "Not specified"
 #~ msgstr "Niet gespecificeerd"
+
 #~ msgid "Visible"
 #~ msgstr "Zichtbaar"
+
 #~ msgid "Available Message:"
 #~ msgstr "Beschikbaar-bericht:"
+
 #~ msgid "I'm doing work and hoping for a distraction--IM me!"
-#~ msgstr "Ik ben aan het werk en hoop op een afleidend berichtje!"
+#~ msgstr "Ik ben met werk bezig en hoop op een afleidend berichtje!"
+
 #~ msgid "Set Available Message..."
 #~ msgstr "Beschikbaar-bericht instellen..."
 
 #, fuzzy
 #~ msgid "Failed to leave channel"
 #~ msgstr "Kan niet deelnemen aan chat"
+
 #~ msgid "Custom"
 #~ msgstr "Aangepast"
+
 #~ msgid "%s logged in."
 #~ msgstr "%s heeft zich aangemeld."
+
 #~ msgid "%s signed on"
 #~ msgstr "%s heeft zich aangemeld"
+
 #~ msgid "%s logged out."
 #~ msgstr "%s heeft zich afgemeld."
+
 #~ msgid "%s signed off"
 #~ msgstr "%s heeft zich afgemeld"
+
 #~ msgid ""
 #~ "%s has just been warned by %s.\n"
 #~ "Your new warning level is %d%%"
 #~ msgstr ""
 #~ "%s is zojuist gewaarschuwd door %s\n"
 #~ "Uw nieuwe waarschuwingsniveau is %d%%"
+
 #~ msgid "an anonymous person"
 #~ msgstr "een anoniem persoon"
+
 #~ msgid "Sorry, I ran out for a bit!"
 #~ msgstr "Sorry, ik ben d'r even niet!"
+
 #~ msgid "Moving Gaim Settings.."
 #~ msgstr "Verplaatsen van gaim-instellingen..."
+
 #~ msgid "Moving Gaim user settings to: "
 #~ msgstr "Verplaatsen van gaim instellingenmap naar: "
+
 #~ msgid "Notification"
 #~ msgstr "Melding"
+
 #~ msgid "That file does not exist."
 #~ msgstr "Dat bestand bestaat niet."
+
 #~ msgid "%s was not found.\n"
 #~ msgstr "%s niet gevonden.\n"
+
 #~ msgid ""
 #~ "No such command. If you didn't mean to type a command, you can turn "
 #~ "commands off from Tools->Preferences->Interface->Conversation->Enable "
@@ -20818,6 +16573,7 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #~ "Opdracht onbekend. Als u helemaal geen opdracht probeerde te typen, kunt "
 #~ "u deze functie uitschakelen via: Extra->Voorkeuren->Interface->Gesprekken-"
 #~ ">\"slash\"-opdrachten (/) gebruiken."
+
 #~ msgid ""
 #~ "Syntax Error:  You typed the wrong number of arguments to that command. "
 #~ "If you didn't mean to type a command, you can turn commands off from "
@@ -20831,24 +16587,31 @@ msgstr "Deze plugin is handig voor het debuggen van XMPP servers of clienten."
 #, fuzzy
 #~ msgid "Your message did not get sent."
 #~ msgstr "Uw Yahoo! bericht is niet verzonden."
+
 #~ msgid "Your message to %s did not get sent:"
 #~ msgstr "Uw bericht aan %s is niet verzonden:"
+
 #~ msgid "sorry, i ran out for a while. bbl"
 #~ msgstr "sorry, ik ben d'r even niet."
+
 #~ msgid "help:  List available commands."
 #~ msgstr "help:  Beschikbare opdrachten opsommen."
+
 #~ msgid "_Ignore formatting on incoming messages"
 #~ msgstr "Opmaak van inkomende berichten _negeren"
+
 #~ msgid "_Send auto-response"
 #~ msgstr "Auto-antwoord _sturen"
+
 #~ msgid "_Only send auto-response when idle"
 #~ msgstr "_Alleen auto-antwoord sturen tijdens afwezigheid"
+
 #~ msgid "Already logged in with Zephyr"
 #~ msgstr "Reeds aangemeld met zephyr"
+
 #~ msgid ""
 #~ "Because Zephyr uses your system username, you are unable to have multiple "
 #~ "accounts on it when logged in as the same user."
 #~ msgstr ""
 #~ "Omdat zephyr uw gebruikersnaam van de computer gebruikt, kunt u zich "
 #~ "hiermee met maximaal 1 account aanmelden."
-
diff --git a/po/nn.po b/po/nn.po
index d5761fd6df..4182278ab0 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 11:30-0400\n"
-"PO-Revision-Date: 2008-08-12 01:13+0100\n"
+"POT-Creation-Date: 2008-08-29 15:23-0400\n"
+"PO-Revision-Date: 2008-08-26 00:39+0100\n"
 "Last-Translator: YS Landro <nynorsk@strilen.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -2379,6 +2379,9 @@ msgstr "Minste romstorleik"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Tidsgrense for uverksame brukarar (i minutt)"
 
+msgid "Apply hiding rules to buddies"
+msgstr "Bruk skjul reglar på vennene"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10117,18 +10120,18 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Velkomen til %s!</span>\n"
 "\n"
-"Du har ingen lynmeldingskontoar. For å kopla deg til %s trykkjer du på "
+"Du har ingen lynmeldingskontoar. For å kopla deg til %s, trykkjer du på "
 "<b>Legg til</b>-knappen nedanfor og lagrar innstillingane for den første "
 "kontoen din. Om du ønskjer at %s skal kopla seg mot fleire "
-"lynmeldingskontoar, trykkjer du på <b>Legg til</b> nok ein gong og repeterer "
-"prosedyra.\n"
+"lynmeldingskontoar, trykkjer du på <b>Legg til</b> for å endra "
+"innstillingane for alle.\n"
 "\n"
 "Du kan koma attende til dette vindauget for å leggja til, endra eller fjerna "
-"kontoar frå <b>Kontoar->Legg til/endra</b> i vennelistevindauget"
+"kontoar frå <b>Kontoar->Behandla</b> i vennelistevindauget"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -12118,7 +12121,7 @@ msgid "Minimum input area height in lines:"
 msgstr "Minimumshøgda til inndataområdet (i linjer):"
 
 msgid "Font"
-msgstr "Skrifftype"
+msgstr "Skrifttype"
 
 msgid "Use document font from _theme"
 msgstr "Bruk dokumentskrifttype frå _tema"
@@ -12511,6 +12514,12 @@ msgstr "Status for %s"
 msgid "Custom Smiley"
 msgstr "Tilpassa smilefjes"
 
+msgid "More Data needed"
+msgstr "Treng fleire opplysningar"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Før opp ein snarveg knytt til smilefjeset."
+
 msgid "Duplicate Shortcut"
 msgstr "Duplisert snarveg"
 
@@ -12521,12 +12530,6 @@ msgstr ""
 "Det finst allereie eit tilpassa smilefjes til denne snarvegen. Vel ein annan "
 "snarveg."
 
-msgid "More Data needed"
-msgstr "Treng fleire opplysningar"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Før opp ein snarveg knytt til smilefjeset."
-
 msgid "Please select an image for the smiley."
 msgstr "Vel eit bilete til smilefjeset."
 
@@ -12688,6 +12691,9 @@ msgstr "_Endra"
 msgid "_Open Mail"
 msgstr "_Opna e-post"
 
+msgid "_Edit"
+msgstr "_Endra"
+
 msgid "Pidgin Tooltip"
 msgstr "Pidgin-verktøyhint"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index e84a54c6d1..79749f01ef 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 11:59-0400\n"
-"PO-Revision-Date: 2008-08-13 13:55-0300\n"
+"POT-Creation-Date: 2008-08-29 13:36-0400\n"
+"PO-Revision-Date: 2008-08-26 18:18-0300\n"
 "Last-Translator: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
 "Language-Team: Rodrigo Luiz Marques Flores <mail@rodrigoflores.org>\n"
 "MIME-Version: 1.0\n"
@@ -2405,6 +2405,9 @@ msgstr "Tamanho mínimo da sala"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Limite de inatividade de usuário (em minutos)"
 
+msgid "Apply hiding rules to buddies"
+msgstr "Aplicar regras de sumiço para amigos"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -10233,13 +10236,13 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Bem vindo ao %s!</span>\n"
 "\n"
 "Você não tem contas de mensagens instantâneas (MI) configuradas. Para "
-"começar a usar o %s, clique no botão <b>Adicionar</b> abaixo e configure sua "
-"primeira conta. Se você deseja que o %s conecte em mais de uma conta de "
+"começar a usar com o %s, clique no botão <b>Adicionar</b> abaixo e configure "
+"sua primeira conta. Se você deseja que o %s conecte a múltiplas contas de "
 "mensagens instantâneas, clique no botão <b>Adicionar</b> novamente para "
 "configurar quantas contas quiser.\n"
 "\n"
@@ -12641,6 +12644,12 @@ msgstr "Status de %s"
 msgid "Custom Smiley"
 msgstr "Emoticon personalizado"
 
+msgid "More Data needed"
+msgstr "Mais dados necessários"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Por favor, defina um atalho para associar com o emoticon."
+
 msgid "Duplicate Shortcut"
 msgstr "Atalho duplicado"
 
@@ -12651,12 +12660,6 @@ msgstr ""
 "Um emoticon personalizado para o atalho selecionado já existe. Por favor, "
 "forneça um atalho diferente."
 
-msgid "More Data needed"
-msgstr "Mais dados necessários"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "Por favor, defina um atalho para associar com o emoticon."
-
 msgid "Please select an image for the smiley."
 msgstr "Por favor, favor selecione uma imagem para o emoticon."
 
@@ -12819,6 +12822,9 @@ msgstr "_Modificar"
 msgid "_Open Mail"
 msgstr "_Abrir email"
 
+msgid "_Edit"
+msgstr "_Editar"
+
 msgid "Pidgin Tooltip"
 msgstr "Dicas de Ferramentas do Pidgin"
 
diff --git a/po/sv.po b/po/sv.po
index 1043232b69..18630c9d33 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-15 11:16+0200\n"
-"PO-Revision-Date: 2008-05-15 11:16+0100\n"
+"POT-Creation-Date: 2008-09-02 11:40+0200\n"
+"PO-Revision-Date: 2008-09-02 11:40+0100\n"
 "Last-Translator: Peter Hjalmarsson <xake@rymdraket.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -96,6 +96,10 @@ msgstr "Lösenord:"
 msgid "Alias:"
 msgstr "Alias:"
 
+#. Register checkbox
+msgid "Create this account on the server"
+msgstr "Skapa detta kontot på servern"
+
 #. Cancel button
 #. Cancel
 msgid "Cancel"
@@ -322,6 +326,7 @@ msgstr "Välj tagg"
 msgid "Nickname"
 msgstr "Smeknamn"
 
+#. Never know what those translations might end up like...
 #. Idle stuff
 msgid "Idle"
 msgstr "Inaktiv"
@@ -402,6 +407,9 @@ msgstr "Anslut till chatt..."
 msgid "View Log..."
 msgstr "Visa logg..."
 
+msgid "View All Logs"
+msgstr "Visa alla loggar"
+
 msgid "Show"
 msgstr "Visa"
 
@@ -599,6 +607,19 @@ msgstr ""
 msgid "Send To"
 msgstr "Skicka till"
 
+msgid "Invite message"
+msgstr "Ibjudningsmeddelande"
+
+msgid "Invite"
+msgstr "Bjud in"
+
+msgid ""
+"Please enter the name of the user you wish to invite,\n"
+"along with an optional invite message."
+msgstr ""
+"Ange namnet på den användare du vill bjuda in,\n"
+"samt ett inbjudningsmeddelande om du vill"
+
 msgid "Conversation"
 msgstr "Konversation"
 
@@ -611,6 +632,9 @@ msgstr "Visa tidsstämplar"
 msgid "Add Buddy Pounce..."
 msgstr "Lägg till kompisnotifiering..."
 
+msgid "Invite..."
+msgstr "Bjud in..."
+
 msgid "Enable Logging"
 msgstr "Aktivera loggning"
 
@@ -620,9 +644,11 @@ msgstr "Aktivera Ljud"
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-SVAR>"
 
-#. Print the list of users in the room
-msgid "List of users:\n"
-msgstr "Lista över användare:\n"
+#, c-format
+msgid "List of %d user:\n"
+msgid_plural "List of %d users:\n"
+msgstr[0] "Lista över %d användare:\n"
+msgstr[1] "Lista över %d användare:\n"
 
 msgid "Supported debug options are:  version"
 msgstr "De felsökningsalternativ som stöds är: version"
@@ -637,6 +663,18 @@ msgstr ""
 "Använde \"/help &lt;kommando&gt;\" för hjälp om ett specifikt kommando.\n"
 "Följande kommandon är tillgängliga i sammanhanget:\n"
 
+#, c-format
+msgid ""
+"%s is not a valid message class. See '/help msgcolor' for valid message "
+"classes."
+msgstr ""
+"%s är inte en giltig meddelandeklass. Se '/help msgcolor' för giltiga "
+"meddelandeklasser."
+
+#, c-format
+msgid "%s is not a valid color. See '/help msgcolor' for valid colors."
+msgstr "%s är inte en giltig färg. Se '/help msgcolor' för giltiga färger."
+
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -682,6 +720,19 @@ msgstr "prefs: Visa inställningsfönstret."
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Visar statushanteraren."
 
+msgid ""
+"msgcolor &lt;class&gt; &lt;foreground&gt; &lt;background&gt;: Set the color "
+"for different classes of messages in the conversation window.<br>    &lt;"
+"class&gt;: receive, send, highlight, action, timestamp<br>    &lt;foreground/"
+"background&gt;: black, red, green, blue, white, gray, darkgray, magenta, "
+"cyan, default<br><br>EXAMPLE:<br>    msgcolor send cyan default"
+msgstr ""
+"msgcolor &lt;klass&gt; &lt;förgrund&gt; &lt;bakgrund&gt;: Anger färgerna för "
+"olika klasser av meddelanden in konversationsfönstret. <br>    &lt;"
+"klass&gt;: recieve, send, highlight, action, timestamp<br>    &lt;förgrund/"
+"bakgrund&gt;: black, red, green, blue, white, gray, darkgray, magenta, cyan, "
+"default<br><br>EXEMPEL:<br>    msgcolor send cyan default"
+
 msgid "Unable to open file."
 msgstr "Kan inte öppna filen."
 
@@ -702,8 +753,10 @@ msgid "Pause"
 msgstr "Pausa"
 
 #, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Filöverföringar - %d%% av %d filer"
+msgid "File Transfers - %d%% of %d file"
+msgid_plural "File Transfers - %d%% of %d files"
+msgstr[0] "Filöverföringar - %d%% av %d fil"
+msgstr[1] "Filöverföringar - %d%% av %d filer"
 
 #. Create the window.
 msgid "File Transfers"
@@ -818,6 +871,9 @@ msgstr "Konversationer i %s"
 msgid "Conversations with %s"
 msgstr "Konversationer med %s"
 
+msgid "All Conversations"
+msgstr "Alla konversationer"
+
 msgid "System Log"
 msgstr "Systemlogg"
 
@@ -855,9 +911,6 @@ msgstr "Fortsätt"
 msgid "IM"
 msgstr "Meddelande"
 
-msgid "Invite"
-msgstr "Bjud in"
-
 msgid "(none)"
 msgstr "(inget)"
 
@@ -1451,6 +1504,12 @@ msgstr "Meebo"
 msgid "No Grouping"
 msgstr "Ingen gruppering"
 
+msgid "Nested Subgroup"
+msgstr "Nästad undergrupp"
+
+msgid "Nested Grouping (experimental)"
+msgstr "Nästad gruppering (experimental)"
+
 msgid "Provides alternate buddylist grouping options."
 msgstr "Erbjuder alternativa val för gruppering i kompislistan."
 
@@ -2069,8 +2128,11 @@ msgstr "Modulmagi atchar inte %d (behöver %d)"
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI versionen passar inte %d.%d.x (behöver %d.%d.x)"
 
-msgid "Plugin does not implement all required functions"
-msgstr "Insticksmodulen tillhandahåller inte alla nödvändiga funktioner"
+msgid ""
+"Plugin does not implement all required functions (list_icon, login and close)"
+msgstr ""
+"Insticksmodulen tillhandahåller inte alla nödvändiga funktioner (list_icon, "
+"login och close)"
 
 #, c-format
 msgid ""
@@ -2150,6 +2212,9 @@ msgstr ""
 "Rapportera med en popupp när en autoaccepterad filöverföring är avslutad\n"
 "(endast när det inte är någon konversation med sändaren)"
 
+msgid "Create a new directory for each user"
+msgstr "Skapa en ny katalog för varje användare"
+
 msgid "Notes"
 msgstr "Noteringar"
 
@@ -2313,6 +2378,9 @@ msgstr "Minimal rumsstorlek"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Användares inaktivitetstidsgräns (i minuter)"
 
+msgid "Apply hiding rules to buddies"
+msgstr "Verkställ döljningsregler för kompisar"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -2732,13 +2800,11 @@ msgstr ""
 "modulen måste du installera ActiveTCL från http://www.activestate.com\n"
 
 msgid ""
-"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
-"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
-"LocalMessaging for more information."
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d."
+"pidgin.im/BonjourWindows for more information."
 msgstr ""
-"Apples Bonjour För Windows hittades inte, läs FAQen: http://developer.pidgin."
-"im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging för mer "
-"information"
+"Apples Bonjour För Windows hittades inte, läs FAQen: http://d.pidgin.im/"
+"BonjourWindows för mer information"
 
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kan inte lyssna efter inkommande IM anslutningar\n"
@@ -2792,9 +2858,6 @@ msgstr "Kan inte skicka meddelandet, konversationen kunde inte startas."
 msgid "Cannot open socket"
 msgstr "Kan inte öppna uttag"
 
-msgid "Error setting socket options"
-msgstr "Fel vid angivning av socket-val"
-
 msgid "Could not bind socket to port"
 msgstr "Kunde inte binda uttag till port"
 
@@ -2848,6 +2911,9 @@ msgstr "Kompislistan inläst utan problem!"
 msgid "Save buddylist..."
 msgstr "Spara kompislista..."
 
+msgid "Load buddylist from file..."
+msgstr "Läs in kompislista från fil..."
+
 msgid "Fill in the registration fields."
 msgstr "Fyll i registreringsfälten."
 
@@ -3024,9 +3090,6 @@ msgstr "Ta bort kompislista från server"
 msgid "Save buddylist to file..."
 msgstr "Spara kompislista till fil..."
 
-msgid "Load buddylist from file..."
-msgstr "Läs in kompislista från fil..."
-
 #. magic
 #. major_version
 #. minor_version
@@ -3142,6 +3205,9 @@ msgstr "Port"
 msgid "Encodings"
 msgstr "Kodning"
 
+msgid "Auto-detect incoming UTF-8"
+msgstr "Auto-avkänning för inkommande UTF-8"
+
 msgid "Real name"
 msgstr "Fullständigt namn"
 
@@ -3156,8 +3222,8 @@ msgid "Bad mode"
 msgstr "Felaktigt läge"
 
 #, c-format
-msgid "Ban on %s by %s, set %ld seconds ago"
-msgstr "Bannlysning för %s av %s sattes för %ld sekunder sedan"
+msgid "Ban on %s by %s, set %s ago"
+msgstr "Bannlysning för %s av %s sattes för %s sedan"
 
 #, c-format
 msgid "Ban on %s"
@@ -3327,6 +3393,9 @@ msgstr ""
 "away [meddelande]:  Ange ett frånvaromeddelande eller ange utan meddelande "
 "för att återvända från frånvaro."
 
+msgid "ctcp <nick> <msg>: sends ctcp msg to nick."
+msgstr "ctcp <alias> <meddelande>: skicka ett ctcp meddelande till alias"
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Skicka ett kommando till chanserv"
 
@@ -3588,6 +3657,8 @@ msgstr "Postnummer"
 msgid "Country"
 msgstr "Land"
 
+#. lots of clients (including purple) do this, but it's
+#. * out of spec
 msgid "Telephone"
 msgstr "Telefon"
 
@@ -3788,6 +3859,9 @@ msgstr "Hoppkontroll"
 msgid "Capabilities"
 msgstr "Stödjer"
 
+msgid "Priority"
+msgstr "Prioritet"
+
 # Detta begrepp är ju skumt nog som det är på engelska, så det kanske
 # är lika bra att använda ett svensk ord som är nästan snarlikt så
 # att åtminstone de som känner till vad Resource betyder i Jabber
@@ -3796,9 +3870,6 @@ msgstr "Stödjer"
 msgid "Resource"
 msgstr "Resurs"
 
-msgid "Priority"
-msgstr "Prioritet"
-
 msgid "Middle Name"
 msgstr "Andranamn"
 
@@ -4490,8 +4561,8 @@ msgid "XMPP Message Error"
 msgstr "XMPP meddelandefel"
 
 #, c-format
-msgid " (Code %s)"
-msgstr " (Kod %s)"
+msgid "(Code %s)"
+msgstr "(Kod %s)"
 
 msgid "XML Parse error"
 msgstr "XML-tolkningsfel"
@@ -4516,14 +4587,14 @@ msgid "_Accept Defaults"
 msgstr "_Acceptera förval"
 
 #, c-format
-msgid "Error in chat %s"
-msgstr "Fel i chatt %s"
-
-#, c-format
 msgid "Error joining chat %s"
 msgstr "Fel vid anslutning till chatt %s"
 
 #, c-format
+msgid "Error in chat %s"
+msgstr "Fel i chatt %s"
+
+#, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Kan inte skicka fil till %s, användaren stödjer inte filöverföringar"
 
@@ -4819,6 +4890,10 @@ msgid "Passport account not yet verified"
 msgstr "Passkonto ännu inte verifierat"
 
 #, c-format
+msgid "Passport account suspended"
+msgstr "Passport-kontot är avstängt"
+
+#, c-format
 msgid "Bad ticket"
 msgstr "Ogiltig biljett"
 
@@ -4841,6 +4916,9 @@ msgstr "%s har vibbat dig!"
 msgid "Nudging %s..."
 msgstr "Vibbar %s..."
 
+msgid "Email Address..."
+msgstr "E-postadress..."
+
 msgid "Your new MSN friendly name is too long."
 msgstr "Ditt nya smeknamn för MSN är för långt."
 
@@ -4875,8 +4953,21 @@ msgstr "Tillåt"
 msgid "Disallow"
 msgstr "Tillåt ej"
 
-msgid "This Hotmail account may not be active."
-msgstr "Detta Hotmail-konto är kanske inte aktivt."
+#, c-format
+msgid "Blocked Text for %s"
+msgstr "Blockerad text för %s"
+
+msgid "No text is blocked for this account."
+msgstr "Ingen text är blockerad för detta kontot."
+
+#, c-format
+msgid ""
+"MSN servers are currently blocking the following regular expressions:<br/>%s"
+msgstr ""
+"MSN-servrarna blockerar för tillfället följande reguljära uttryck:<br/>%s"
+
+msgid "This account does not have email enabled."
+msgstr "Detta kontot har inte epost aktiverat."
 
 msgid "Send a mobile message."
 msgstr "Skicka ett mobilmeddelande."
@@ -4935,6 +5026,9 @@ msgstr "Aktivera/Avaktivera mobila enheter..."
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Tillåt/Hindra mobilsökningar..."
 
+msgid "View Blocked Text..."
+msgstr "Visa blockerad text..."
+
 msgid "Open Hotmail Inbox"
 msgstr "Öppna Hotmail Inkorg"
 
@@ -5137,16 +5231,8 @@ msgstr "nudge: Knuffa till en kontakt för att få dennes uppmärksamhet"
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID autentisering: Kunde inte ansluta"
 
-#. we must have failed!
-msgid ""
-"Windows Live ID authentication: cannot find authenticate token in server "
-"response"
-msgstr ""
-"Windows Live ID autentisering: Kunde inte finns autentiseringsmarkös i "
-"serverns svar"
-
-msgid "Windows Live ID authentication Failed"
-msgstr "Windows Live ID autentisering misslyckades"
+msgid "Windows Live ID authentication:Invalid response"
+msgstr "Windows Live ID autentisering: Ogiltigt svar"
 
 #, c-format
 msgid "%s is not a valid group."
@@ -5193,6 +5279,9 @@ msgstr "%s är inte ett giltigt passport-konto."
 msgid "Service Temporarily Unavailable."
 msgstr "Tjänst tillfälligt onåbar."
 
+msgid "Mobile message was not sent because it was too long."
+msgstr "Mobilmeddelandet sändes inte då det var för långt."
+
 msgid "Unable to rename group"
 msgstr "Kan inte byta namn på grupp"
 
@@ -5227,6 +5316,26 @@ msgstr[1] ""
 "\n"
 "Efter underhållet är slutfört kommer du kunna ansluta till MSN som vanligt."
 
+msgid ""
+"Message was not sent because the system is unavailable. This normally "
+"happens when the user is blocked or does not exist."
+msgstr ""
+"Meddelandet skickades inte eftersom systemet ej var tillgängligt. Detta "
+"händer normalt när en användare är blockerad eller inte existerar."
+
+msgid "Message was not sent because messages are being sent too quickly."
+msgstr ""
+"Meddelandet kunde inte skickas eftersom meddelandena skickades för snabbt."
+
+#, fuzzy
+msgid "Message was not sent because an unknown encoding error occurred."
+msgstr ""
+"Meddelandet kunde kanske inte skickas på grund av att ett okänt fel uppstod:"
+
+msgid "Message was not sent because an unknown error occurred."
+msgstr ""
+"Meddelandet kunde kanske inte skickas på grund av att ett okänt fel uppstod."
+
 msgid "Unable to connect"
 msgstr "Kan inte ansluta"
 
@@ -5344,6 +5453,9 @@ msgstr "Kunde inte lägga till \"%s\"."
 msgid "The username specified is invalid."
 msgstr "Den angivna användarnamnet är ogiltigt."
 
+msgid "This Hotmail account may not be active."
+msgstr "Detta Hotmail-konto är kanske inte aktivt."
+
 msgid "Has you"
 msgstr "Har dig"
 
@@ -5383,8 +5495,10 @@ msgid "Logging in"
 msgstr "Loggar in"
 
 #, c-format
-msgid "Connection to server lost (no data received within %d seconds)"
-msgstr "Anslutning till servern tappad (ingen data mottagen på %d sekunder)"
+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] "Anslutning till servern tappad (ingen data mottagen på %d sekund)"
+msgstr[1] "Anslutning till servern tappad (ingen data mottagen på %d sekunder)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
 msgid "New mail messages"
@@ -5484,9 +5598,15 @@ msgstr "Snabbmeddelandevänner"
 
 #, c-format
 msgid ""
+"%d buddy was added or updated from the server (including buddies already on "
+"the server-side list)"
+msgid_plural ""
 "%d buddies were added or updated from the server (including buddies already "
 "on the server-side list)"
-msgstr ""
+msgstr[0] ""
+"%d vän lades till eller uppdaterades av servern (inklusive vänner som redan "
+"fanns på serverns lista)"
+msgstr[1] ""
 "%d vänner lades till eller uppdaterades av servern (inklusive vänner som "
 "redan fanns på serverns lista)"
 
@@ -6018,6 +6138,9 @@ msgstr "Tog emot felaktig data vid anslutning till server."
 msgid "AIM Protocol Plugin"
 msgstr "Insticksmodul för AIM-protokoll"
 
+msgid "ICQ UIN..."
+msgstr "IQC UIN..."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6114,11 +6237,11 @@ msgstr "Otillräckliga rättigheter"
 msgid "In local permit/deny"
 msgstr "I lokal tillåt/neka"
 
-msgid "Too evil (sender)"
-msgstr "För onskefull (avsändare)"
+msgid "Warning level too high (sender)"
+msgstr "Varningsnivån för hög (sändaren)"
 
-msgid "Too evil (receiver)"
-msgstr "För onskefull (mottagare)"
+msgid "Warning level too high (receiver)"
+msgstr "Varningsnivån för hög (mottagaren)"
 
 msgid "User temporarily unavailable"
 msgstr "Användare är tillfälligt oåtkommlig"
@@ -6221,6 +6344,9 @@ msgstr "Live-video"
 msgid "Camera"
 msgstr "Kamera"
 
+msgid "Screen Sharing"
+msgstr "Skärmdelning"
+
 #, c-format
 msgid "Free For Chat"
 msgstr "Tillgänglig för chatt"
@@ -6312,7 +6438,6 @@ msgstr ""
 "Du har anslutit och kopplat ifrån för många gånger. Vänta tio minuter och "
 "prova igen. Om du fortsätter att försöka kommer du att få vänta ännu längre."
 
-#. client too old
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versionen av klienten du använder är för gammal. Uppgradera på %s"
@@ -6468,18 +6593,25 @@ msgstr[1] ""
 "Du missade %hu meddelanden från %s eftersom frekvensgränsen har överskridits."
 
 #, c-format
-msgid "You missed %hu message from %s because he/she was too evil."
-msgid_plural "You missed %hu messages from %s because he/she was too evil."
+msgid ""
+"You missed %hu message from %s because his/her warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because his/her warning level is too high."
 msgstr[0] ""
-"Du missade %hu meddelande från %s eftersom hon/han var för onskefull."
+"Du missade %hu meddelande från %s eftersom hennes/hans varningsnivå är för "
+"hög."
 msgstr[1] ""
-"Du missade %hu meddelanden från %s eftersom hon/han var för onskefull."
+"Du missade %hu meddelanden från %s eftersom hennes/hans varningsnivå är för "
+"hög."
 
 #, c-format
-msgid "You missed %hu message from %s because you are too evil."
-msgid_plural "You missed %hu messages from %s because you are too evil."
-msgstr[0] "Du missade %hu meddelande från %s eftersom du är för onskefull."
-msgstr[1] "Du missade %hu meddelanden från %s eftersom du är för onskefull."
+msgid "You missed %hu message from %s because your warning level is too high."
+msgid_plural ""
+"You missed %hu messages from %s because your warning level is too high."
+msgstr[0] ""
+"Du missade %hu meddelande från %s eftersom din varningsnivå är för hög."
+msgstr[1] ""
+"Du missade %hu meddelanden från %s eftersom din varningsnivå är för hög."
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -6509,9 +6641,6 @@ msgstr "Ansluten sedan"
 msgid "Member Since"
 msgstr "Medlem sedan"
 
-msgid "Available Message"
-msgstr "Tillgängliga meddelanden"
-
 msgid "Your AIM connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
@@ -6540,12 +6669,17 @@ msgstr "Mobilnummer"
 msgid "Personal Web Page"
 msgstr "Personlig webbsida"
 
+#. aim_userinfo_t
+#. strip_html_tags
 msgid "Additional Information"
 msgstr "Extra information"
 
 msgid "Zip Code"
 msgstr "Postnummer"
 
+msgid "Work Information"
+msgstr "Information om arbete"
+
 msgid "Division"
 msgstr "Avdelning"
 
@@ -6555,9 +6689,6 @@ msgstr "Befattning"
 msgid "Web Page"
 msgstr "Webbsida"
 
-msgid "Work Information"
-msgstr "Information om arbete"
-
 msgid "Pop-Up Message"
 msgstr "Popup-meddelande"
 
@@ -6774,12 +6905,6 @@ msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Din IM-bild skickades inte. Du kan inte skicka IM-bilder via AIM-chattar."
 
-msgid "Away Message"
-msgstr "Frånvaromeddelande"
-
-msgid "<i>(retrieving)</i>"
-msgstr "<i>(mottar)</i>"
-
 msgid "iTunes Music Store Link"
 msgstr "Länk till iTunes Musikaffär"
 
@@ -6906,6 +7031,9 @@ msgstr ""
 "filöverföringar och direktmeddelanden \n"
 "(långsammare men avslöjar inte ditt IP-nummer)"
 
+msgid "Allow multiple simultaneous logins"
+msgstr "Tillåt många samtidiga inloggningar"
+
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Ber %s att ansluta till oss på %s:%hu för Direct IM."
@@ -7211,13 +7339,6 @@ msgstr ""
 "Notera att om du är skaparen, \n"
 "denna operation kommer till slut ta bort detta Qun."
 
-#, c-format
-msgid "Code [0x%02X]: %s"
-msgstr "Kod [0x%02X]: %s"
-
-msgid "Group Operation Error"
-msgstr "Gruppoperationsfel"
-
 #. we want to see window
 msgid "Do you want to approve the request?"
 msgstr "Vill du godkänna förfrågan?"
@@ -7247,34 +7368,41 @@ msgstr "Systemmeddelande"
 msgid "Failed to send IM."
 msgstr "Kunde inte skicka snabbmeddelande"
 
-msgid "Keep alive error"
-msgstr "Problem att hålla vid liv"
+#, c-format
+msgid "Unknown-%d"
+msgstr "Okänd-%d"
 
-msgid "Error requesting login token"
-msgstr "Problem att efterfråga inloggningsmarkör"
+msgid "Level"
+msgstr "Nivå"
 
-msgid "Unable to login. Check debug log."
-msgstr "Kan inte logga in. Kolla felsökningsloggen."
+msgid "Member"
+msgstr "Medlem"
 
-msgid "Unable to login"
-msgstr "Kunde inte logga in."
+msgid " VIP"
+msgstr "VIP"
 
-#. we didn't successfully connect. tdt->toc_fd is valid here
-msgid "Unable to connect."
-msgstr "Kan inte ansluta."
+msgid " TCP"
+msgstr "TCP"
 
-#, c-format
-msgid "Unknown-%d"
-msgstr "Okänd-%d"
+#, fuzzy
+msgid " FromMobile"
+msgstr "Mobil"
+
+#, fuzzy
+msgid " BindMobile"
+msgstr "Mobil"
 
-msgid "TCP Address"
-msgstr "TCP-adress"
+msgid " Video"
+msgstr " Video"
 
-msgid "UDP Address"
-msgstr "UDP-adress"
+msgid " Space"
+msgstr " Space"
 
-msgid "Level"
-msgstr "Nivå"
+msgid "Flag"
+msgstr "Flagga"
+
+msgid "Ver"
+msgstr "Ver"
 
 msgid "Invalid name"
 msgstr "Ogiltigt namn"
@@ -7288,12 +7416,16 @@ msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Senast uppdatering</b>: %s<br>\n"
 
 #, c-format
+msgid "<b>Server</b>: %s: %d<br>\n"
+msgstr "<b>Server</b>: %s: %d<br>\n"
+
+#, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Anslutningsläge</b>: %s<br>\n"
 
 #, c-format
-msgid "<b>Server IP</b>: %s: %d<br>\n"
-msgstr "<b>Server IP</b>: %s: %d<br>\n"
+msgid "<b>Real hostname</b>: %s: %d<br>\n"
+msgstr "<b>Verkligt värdnamn</b>: %s: %d<br>\n"
 
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
@@ -7345,12 +7477,94 @@ msgstr "QQ protokoll\tmodul"
 msgid "Connect using TCP"
 msgstr "Ansluter med TCP"
 
+msgid "resend interval(s)"
+msgstr "återsändgningsintervall(er)"
+
+msgid "Keep alive interval(s)"
+msgstr "Håll vid liv intrevall(er)"
+
+msgid "Update interval(s)"
+msgstr "Uppdateringsintervall(er)"
+
+#, c-format
+msgid "Invalid token len, %d"
+msgstr "Ogiltig polettlen, %d"
+
+msgid "Keep alive error"
+msgstr "Problem att hålla vid liv"
+
+msgid "Failed to connect server"
+msgstr "Kunde inte ansluta till servern"
+
 msgid "Socket error"
 msgstr "Uttag-fel"
 
+#, c-format
+msgid ""
+"Lost connection with server:\n"
+"%d, %s"
+msgstr ""
+"Tappade anslutningen med servern:\n"
+"%d, %s"
+
 msgid "Unable to read from socket"
 msgstr "Kan inte läsa från uttag"
 
+msgid "Write Error"
+msgstr "Skrivfel"
+
+msgid "Connection lost"
+msgstr "Anslutningen tappades"
+
+msgid "Couldn't resolve host"
+msgstr "Kunde ej slå upp värden"
+
+msgid "hostname is NULL or port is 0"
+msgstr "värdnamn är NULL eller porten är 0"
+
+#, c-format
+msgid "Connecting server %s, retries %d"
+msgstr "Ansluter till server %s, försök %d"
+
+#. we didn't successfully connect. tdt->toc_fd is valid here
+msgid "Unable to connect."
+msgstr "Kan inte ansluta."
+
+msgid "Could not resolve hostname"
+msgstr "Kunde ej slå upp värden"
+
+msgid "Unable to login. Check debug log."
+msgstr "Kan inte logga in. Kolla felsökningsloggen."
+
+msgid "Unable to login"
+msgstr "Kunde inte logga in."
+
+#, c-format
+msgid ""
+"Reply %s(0x%02X )\n"
+"Sent %s(0x%02X )\n"
+"Room id %d, reply [0x%02X]: \n"
+"%s"
+msgstr ""
+"Svarade %s(0x%02X )\n"
+"Skickade %s(0x%02X )\n"
+"Rum id %d, svarade [0x%02X]: \n"
+"%s"
+
+msgid "Failed room reply"
+msgstr "Misslyckades med rumssvar"
+
+#, c-format
+msgid "You are not a member of group \"%s\"\n"
+msgstr "Du är inte medlemm i gruppen \"%s\"\n"
+
+msgid "Can not decrypt login reply"
+msgstr "Kan inte dekryptera inloggningssvaret"
+
+#, c-format
+msgid "Invalid token reply code, 0x%02X"
+msgstr "Ogiltig polettsvarskod, 0x%02X"
+
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d har har nekat filen %s"
@@ -7362,12 +7576,6 @@ msgstr "Filsändning"
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbröt överföringen av %s"
 
-msgid "Connection lost"
-msgstr "Anslutningen tappades"
-
-msgid "Login failed, no reply"
-msgstr "Inloggningen misslyckades, inget svar"
-
 msgid "Do you want to add this buddy?"
 msgstr "Vill du lägga till den här kompisen?"
 
@@ -7404,6 +7612,14 @@ msgstr "Meddelande: %s"
 msgid "%s is not in your buddy list"
 msgstr "%s finns inte på din kompislista"
 
+#, c-format
+msgid "Notice from: %s"
+msgstr "Notifiering från %s"
+
+#, c-format
+msgid "%s"
+msgstr "%s"
+
 msgid "Connection closed (writing)"
 msgstr "Anslutningen stängd (skrivande)"
 
@@ -8414,6 +8630,10 @@ msgstr "Kan inte inleda SILC-klientanslutning"
 msgid "Error loading SILC key pair"
 msgstr "Fel vid inläsning av SILC-nyckelpar"
 
+#, c-format
+msgid "Download %s: %s"
+msgstr "Laddar ned %s: %s"
+
 msgid "Your Current Mood"
 msgstr "Ditt nuvarande humör"
 
@@ -8860,12 +9080,6 @@ msgstr "Okänt serversvar."
 msgid "Could not create listen socket"
 msgstr "Kunde inte skapa lyssnarsocket"
 
-msgid "Couldn't resolve host"
-msgstr "Kunde ej slå upp värden"
-
-msgid "Could not resolve hostname"
-msgstr "Kunde ej slå upp värden"
-
 msgid "SIP usernames may not contain whitespaces or @ symbols"
 msgstr "SIP-användarnamnet får inte innehålla mellanslag eller symbolen @"
 
@@ -9251,6 +9465,9 @@ msgstr "list: Listar rummen på Yahoo's nätverk"
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Fråga användaren angående att starta en kladd-session"
 
+msgid "Yahoo ID..."
+msgstr "Yahoo-ID..."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9313,9 +9530,6 @@ msgstr "Kan inte inte etablera filbeskrivning."
 msgid "%s is trying to send you a group of %d files.\n"
 msgstr "%s försöker skicka en grupp av %d filer till dig.\n"
 
-msgid "Write Error"
-msgstr "Skrivfel"
-
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
@@ -9604,6 +9818,14 @@ msgstr "Fel vid uppslagning av %s"
 msgid "Could not resolve host name"
 msgstr "Kunde inte slå upp värdnamnet"
 
+#, c-format
+msgid "Requesting %s's attention..."
+msgstr "Efterfrågar %s's uppmärksamhet..."
+
+#, c-format
+msgid "%s has requested your attention!"
+msgstr "%s har efterfrågat din uppmärksamhet!"
+
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
@@ -9633,14 +9855,6 @@ msgid "%s is now known as %s.\n"
 msgstr "%s är nu känd som %s.\n"
 
 #, c-format
-msgid "Requesting %s's attention..."
-msgstr "Efterfrågar %s's uppmärksamhet..."
-
-#, c-format
-msgid "%s has requested your attention!"
-msgstr "%s har efterfrågat din uppmärksamhet!"
-
-#, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
 "%s"
@@ -9655,6 +9869,20 @@ msgstr "%s bjuder in %s till chattrum %s\n"
 msgid "Accept chat invitation?"
 msgstr "Tacka ja till chattinbjudan?"
 
+#. Shortcut
+msgid "Shortcut"
+msgstr "Genväg"
+
+msgid "The text-shortcut for the smiley"
+msgstr "Textgenvägen för smileyn"
+
+#. Stored Image
+msgid "Stored Image"
+msgstr "Sparad bild"
+
+msgid "Stored Image. (that'll have to do for now)"
+msgstr "Sparade bilder. (det får funka för tillfället)"
+
 msgid "SSL Connection Failed"
 msgstr "SSL-anslutning misslyckades"
 
@@ -9710,6 +9938,12 @@ msgstr "+++ %s har blivit inaktiv"
 msgid "+++ %s became unidle"
 msgstr "+++ %s har blivit aktiv"
 
+#.
+#. * This string determines how some dates are displayed.  The default
+#. * string "%x %X" shows the date then the time.  Translators can
+#. * change this to "%X %x" if they want the time to be shown first,
+#. * followed by the date.
+#.
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
@@ -9825,6 +10059,11 @@ msgstr "Anslutningen överskred tidsgränsen."
 msgid "Connection refused."
 msgstr "Anslutningen nekades."
 
+#. 10048
+#, c-format
+msgid "Address already in use."
+msgstr "Adressen används redan"
+
 msgid "Internet Messenger"
 msgstr "Meddelandeklient"
 
@@ -9932,8 +10171,8 @@ msgstr "Lägg till konto"
 msgid "_Basic"
 msgstr "_Basic"
 
-msgid "Create this new account on the server"
-msgstr "Skapa detta nya kontot på servern"
+msgid "Create _this new account on the server"
+msgstr "Skapa detta _nya kontot på servern"
 
 msgid "_Advanced"
 msgstr "_Avancerat"
@@ -9954,17 +10193,17 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>Välkommen till %s!</span>\n"
 "\n"
 "Du har inga IM-konton konfigurerade. För att påbörja en anslutning med %s så "
 "trycker du på knappen <b>Lägg till</b> nedanför och konfigurerar ditt första "
 "konto. Om du vill att %s ska ansluta till fler konton trycker du på <b>Lägg "
-"till</b> igen för att konfigurera dem en och en.\n"
+"till</b> igen för att konfigurera dem alla.\n"
 "\n"
 "Du kan komma tillbaka till detta fönster för att lägga till, ändra eller ta "
-"bort konton från <b>Konton->Lägg till/Ändra</b> i kompislistans fönster"
+"bort konton från <b>Konton->Hantera konton</b> i kompislistans fönster"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -10033,6 +10272,12 @@ msgstr "_Alias..."
 msgid "_Remove"
 msgstr "_Ta bort"
 
+msgid "Set Custom Icon"
+msgstr "Välj egen ikon"
+
+msgid "Remove Custom Icon"
+msgstr "Ta bort egen ikon"
+
 msgid "Add _Buddy..."
 msgstr "_Lägg till kompis..."
 
@@ -10132,8 +10377,8 @@ msgstr "/Kompisar/_Avsluta"
 msgid "/_Accounts"
 msgstr "/_Konton"
 
-msgid "/Accounts/Manage"
-msgstr "/Konton/Hantera"
+msgid "/Accounts/Manage Accounts"
+msgstr "/Konton/Hantera konton"
 
 #. Tools
 msgid "/_Tools"
@@ -10154,6 +10399,9 @@ msgstr "/Verktyg/_Inställningar"
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktyg/_Spärrlista"
 
+msgid "/Tools/Smile_y"
+msgstr "/Verktyg/Smile_y"
+
 msgid "/Tools/_File Transfers"
 msgstr "/Verktyg/_Filöverföringar"
 
@@ -10316,14 +10564,15 @@ msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
 "\n"
 "You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Manage</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
+"b> window at <b>Accounts->Manage Accounts</b>. Once you enable accounts, "
+"you'll be able to sign on, set your status, and talk to your friends."
 msgstr ""
 "<span weight='bold' size='larger'>Välkommen till %s!</span>\n"
 "\n"
 "Du har inga konton aktiverade. Aktivera dina IM-konton från fönstret "
-"<b>Konton</b> vid <b>Konton->Hantera</b>. Så snart du har aktiverat dina "
-"konton kommer du kunna välja en status och prata med dina vänner."
+"<b>Konton</b> vid <b>Konton->Hantera konton</b>. Så snart du har aktiverat "
+"dina konton kommer du kunna logga in, välja en status och prata med dina "
+"vänner."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -10383,6 +10632,12 @@ msgstr "Göm c_hatt när fönstret är stängt."
 msgid "Please enter the name of the group to be added."
 msgstr "Ange namnet på den grupp som du vill lägga till."
 
+msgid "Enable Account"
+msgstr "Aktivera konto"
+
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Konton/Aktivera Konto"
+
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Konton/"
 
@@ -10395,12 +10650,6 @@ msgstr "Inga åtgärder tillgängliga"
 msgid "_Disable"
 msgstr "A_vaktivera"
 
-msgid "Enable Account"
-msgstr "Aktivera konto"
-
-msgid "<PurpleMain>/Accounts/Enable Account"
-msgstr "<PurpleMain>/Konton/Aktivera Konto"
-
 msgid "/Tools"
 msgstr "/Verktyg"
 
@@ -10486,9 +10735,6 @@ msgstr "Välj egen ikon..."
 msgid "Change Size"
 msgstr "Ändra storlek"
 
-msgid "Remove Custom Icon"
-msgstr "Ta bort egen ikon"
-
 msgid "Show All"
 msgstr "Visa Alla"
 
@@ -10757,12 +11003,13 @@ msgstr "Fel"
 msgid "Fatal Error"
 msgstr "Allvarligt fel"
 
-msgid "lead developer"
-msgstr "utvecklingsledare"
-
 msgid "developer"
 msgstr "utvecklare"
 
+#. feel free to not translate this
+msgid "Ka-Hing Cheung"
+msgstr ""
+
 msgid "support"
 msgstr "support"
 
@@ -10800,6 +11047,9 @@ msgstr "XMPP utvecklare"
 msgid "original author"
 msgstr "ursprunglig upphovsman"
 
+msgid "lead developer"
+msgstr "utvecklingsledare"
+
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
@@ -10869,6 +11119,9 @@ msgstr "Finska"
 msgid "French"
 msgstr "Franska"
 
+msgid "Irish"
+msgstr "Irländska"
+
 msgid "Galician"
 msgstr "Galiciska"
 
@@ -10935,6 +11188,9 @@ msgstr "Holländska, Flamländska"
 msgid "Norwegian Nynorsk"
 msgstr "Norska Nynorsk"
 
+msgid "Occitan"
+msgstr ""
+
 msgid "Punjabi"
 msgstr "Punjabi"
 
@@ -11172,23 +11428,35 @@ msgstr "Ta bo_rt chatt"
 msgid "Right-click for more unread messages...\n"
 msgstr "Högerklicka för fler olästa meddelanden...\n"
 
-msgid "Change Status"
-msgstr "Ändra status"
+msgid "_Change Status"
+msgstr "Ändra s_tatus"
+
+msgid "Show Buddy _List"
+msgstr "Visa kompis_listan"
+
+msgid "_Unread Messages"
+msgstr "_Olästa meddeladen"
+
+msgid "New _Message..."
+msgstr "Nytt _meddelande..."
+
+msgid "_Accounts"
+msgstr "_Konton"
 
-msgid "Show Buddy List"
-msgstr "Visa kompislistan"
+msgid "Plu_gins"
+msgstr "I_nsticksmoduler"
 
-msgid "New Message..."
-msgstr "Nytt meddelande..."
+msgid "Pr_eferences"
+msgstr "_Inställningar"
 
-msgid "Mute Sounds"
-msgstr "Stäng av ljud"
+msgid "Mute _Sounds"
+msgstr "_Stäng av ljud"
 
-msgid "Blink on New Message"
-msgstr "Blinka vid nya meddelande"
+msgid "_Blink on New Message"
+msgstr "_Blinka vid nya meddelande"
 
-msgid "Quit"
-msgstr "Avsluta"
+msgid "_Quit"
+msgstr "_Avsluta"
 
 msgid "Not started"
 msgstr "Ej startad"
@@ -11291,9 +11559,8 @@ msgstr "Färg på namn i mottagna meddelande"
 msgid "Color to draw the name of a message you received."
 msgstr "Färg att rita namnet på ett meddelande du har tagit emot."
 
-#, fuzzy
 msgid "\"Attention\" Name Color"
-msgstr "Namn på bakgrundsfärg"
+msgstr "\"Uppmärksam\" Namnfärg"
 
 msgid "Color to draw the name of a message you received containing your name."
 msgstr ""
@@ -11306,22 +11573,26 @@ msgstr "Färg på namn i Actionmeddelanden"
 msgid "Color to draw the name of an action message."
 msgstr "Färgen att skriva namnet i ett actionmeddelande."
 
-#, fuzzy
+msgid "Action Message Name Color for Whispered Message"
+msgstr "Actionmeddelandens namnfärg"
+
+msgid "Whisper Message Name Color"
+msgstr "Viskade meddelandens namnfärg"
+
 msgid "Typing notification color"
-msgstr "Färg på utpekade länkar"
+msgstr "Färg på notifiering"
 
 msgid "The color to use for the typing notification font"
-msgstr ""
+msgstr "Färgen används för skriftnotifiering"
 
-#, fuzzy
 msgid "Typing notification font"
-msgstr "Öka Typsnittsstorlek"
+msgstr "Typsnitt för skriftnotifiering"
 
 msgid "The font to use for the typing notification"
 msgstr "Typsnittet använt för skrivnotifieringen"
 
 msgid "Enable typing notification"
-msgstr ""
+msgstr "Aktivera skriftnotifiering"
 
 msgid "_Copy Email Address"
 msgstr "_Kopiera e-postadress"
@@ -11377,6 +11648,10 @@ msgstr "Spara bild"
 msgid "_Save Image..."
 msgstr "_Spara bild..."
 
+#, c-format
+msgid "_Add Custom Smiley..."
+msgstr "Lägg till egn smiley..."
+
 msgid "Select Font"
 msgstr "Välj typsnitt"
 
@@ -11415,9 +11690,21 @@ msgstr "Kunde inte spara bilden: %s\n"
 msgid "Insert Image"
 msgstr "Infoga bild"
 
+#, c-format
+msgid ""
+"This smiley is disabled because a custom smiley exists for this shortcut:\n"
+" %s"
+msgstr ""
+"Denna mileyn är avaktiverad eftersom en egendefinierad smiley redan "
+"existerar för denna genvägen:\n"
+" %s"
+
 msgid "Smile!"
 msgstr "Smile!"
 
+msgid "_Manage custom smileys"
+msgstr "Hantera egna s_mileys"
+
 msgid "This theme has no available smileys."
 msgstr "Detta tema har inga tillgängliga smileys."
 
@@ -12138,6 +12425,12 @@ msgstr "Volum:"
 msgid "Play"
 msgstr "Spela upp"
 
+msgid "_Browse..."
+msgstr "_Bläddra..."
+
+msgid "_Reset"
+msgstr "Åte_rställ"
+
 msgid "_Report idle time:"
 msgstr "_Rapportera inaktivitetstid:"
 
@@ -12308,6 +12601,47 @@ msgstr "Spara & An_vänd"
 msgid "Status for %s"
 msgstr "Status för %s"
 
+msgid "Custom Smiley"
+msgstr "Egen Smiley"
+
+msgid "More Data needed"
+msgstr "Mer Data behövs"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "Var god ange en genväg att assocciera med den valda smileyn."
+
+msgid "Duplicate Shortcut"
+msgstr "Duplicera genvägen"
+
+msgid ""
+"A custom smiley for the selected shortcut already exists. Please specify a "
+"different shortcut."
+msgstr ""
+"En egen smiley för den valda genvägen existerar redan. Var vänlig ange en "
+"annorlunda genväg."
+
+msgid "Please select an image for the smiley."
+msgstr "Ange en bild för smileyn."
+
+msgid "Edit Smiley"
+msgstr "Redigera Smiley"
+
+msgid "Add Smiley"
+msgstr "Lägg till Smiley"
+
+msgid "Smiley _Image"
+msgstr "Smiley-_bild"
+
+#. Smiley shortcut
+msgid "Smiley S_hortcut"
+msgstr "Smiley-_genväg"
+
+msgid "Smiley"
+msgstr "Smiley"
+
+msgid "Custom Smiley Manager"
+msgstr "Hanterare för egna Smileys"
+
 msgid "Waiting for network connection"
 msgstr "Väntar på nätverksanslutning."
 
@@ -12446,6 +12780,9 @@ msgstr "_Ändra"
 msgid "_Open Mail"
 msgstr "_Öppna brev"
 
+msgid "_Edit"
+msgstr "R_edigera"
+
 msgid "Pidgin Tooltip"
 msgstr "Pidgin verktygstips"
 
@@ -13157,7 +13494,7 @@ msgstr "Skicka-knapp"
 #. *< name
 #. *< version
 msgid "Conversation Window Send Button."
-msgstr ""
+msgstr "Skicka-knapp i konversationsfönster"
 
 #. *< summary
 msgid ""
@@ -13427,3 +13764,46 @@ msgstr "Skicka och ta emot råa XMPP strofer."
 #. *  description
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Denna modul är användbar vid felsökning av XMPP serverar och klienter."
+
+#~ msgid "Error setting socket options"
+#~ msgstr "Fel vid angivning av socket-val"
+
+#~ msgid ""
+#~ "Windows Live ID authentication: cannot find authenticate token in server "
+#~ "response"
+#~ msgstr ""
+#~ "Windows Live ID autentisering: Kunde inte finns autentiseringsmarkös i "
+#~ "serverns svar"
+
+#~ msgid "Windows Live ID authentication Failed"
+#~ msgstr "Windows Live ID autentisering misslyckades"
+
+#~ msgid "Too evil (sender)"
+#~ msgstr "För onskefull (avsändare)"
+
+#~ msgid "Too evil (receiver)"
+#~ msgstr "För onskefull (mottagare)"
+
+#~ msgid "Available Message"
+#~ msgstr "Tillgängliga meddelanden"
+
+#~ msgid "Away Message"
+#~ msgstr "Frånvaromeddelande"
+
+#~ msgid "<i>(retrieving)</i>"
+#~ msgstr "<i>(mottar)</i>"
+
+#~ msgid "Code [0x%02X]: %s"
+#~ msgstr "Kod [0x%02X]: %s"
+
+#~ msgid "Group Operation Error"
+#~ msgstr "Gruppoperationsfel"
+
+#~ msgid "Error requesting login token"
+#~ msgstr "Problem att efterfråga inloggningsmarkör"
+
+#~ msgid "TCP Address"
+#~ msgstr "TCP-adress"
+
+#~ msgid "UDP Address"
+#~ msgstr "UDP-adress"
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 1e23b7bdf9..8a69a6d5f3 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -1,11 +1,11 @@
-# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.14 2008/08/13 04:23:30 acli Exp
+# NOTE: This file is generated from zh_TW.po by mkzhhk.pl,v 1.19 2008/08/24 21:23:04 acli Exp
 # ---
 # Pidgin's Traditional Chinese translation
 # Copyright (C) 2002-2008, Paladin R. Liu <paladin@ms1.hinet.net>
 # Copyright (C) 2003-2008, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.540 2008/08/10 08:37:23 acli Exp $
+# $InternalId: zh_TW.po,v 1.546 2008/08/27 04:00:09 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -52,8 +52,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 11:51-0400\n"
-"PO-Revision-Date: 2008-08-09 16:16-0400\n"
+"POT-Creation-Date: 2008-08-29 15:25-0400\n"
+"PO-Revision-Date: 2008-08-26 23:51-0400\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>, Paladin R. Liu "
 "<paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Hong Kong) <community@linuxhall.org>\n"
@@ -222,7 +222,7 @@ msgid ""
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"<b>最後見到：</b>%s前"
+"最後見到：%s前"
 
 msgid "Default"
 msgstr "預設"
@@ -231,7 +231,7 @@ msgid "You must provide a username for the buddy."
 msgstr "必須為好友指定帳號。"
 
 msgid "You must provide a group."
-msgstr "必須為好友指定羣組。"
+msgstr "必須指定羣組。"
 
 msgid "You must select an account."
 msgstr "必須指定帳號"
@@ -2462,6 +2462,9 @@ msgstr "聊天室大小下限"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "閒置時間下限（分鐘）"
 
+msgid "Apply hiding rules to buddies"
+msgstr "隱藏規則亦適用於好友"
+
 #  XXX 不通順
 #. *< type
 #. *< ui_requirement
@@ -5154,7 +5157,7 @@ msgstr "這個帳戶沒有文字被封鎖。"
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr "MSN 的伺服器目前正在封鎖乎合下列 regular expression 的文字：<br/>%s"
+msgstr "MSN 的伺服器目前正在封鎖符合下列 regular expression 的文字：<br/>%s"
 
 msgid "This account does not have email enabled."
 msgstr "這個帳號的電子郵件功能未有啟動。"
@@ -6809,15 +6812,15 @@ msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
-msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
+msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息，因為他（她）的警告等級過高。"
+msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息，因為他（她）的警告等級過高。"
 
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息，因為你太邪惡了。"
-msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息，因為你太邪惡了。"
+msgstr[0] "你遺失了 %hu 個由 %s 送來的訊息，因為你的警告等級過高。"
+msgstr[1] "你遺失了 %hu 個由 %s 送來的訊息，因為你的警告等級過高。"
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -7594,11 +7597,9 @@ msgstr " 使用流動通訊器材"
 msgid " BindMobile"
 msgstr " 綁定流動通訊器材"
 
-#, fuzzy
 msgid " Video"
 msgstr " 視像"
 
-#, fuzzy
 msgid " Space"
 msgstr " Space"
 
@@ -7699,14 +7700,12 @@ msgstr "每隔多少秒送出 Keep Alive"
 msgid "Update interval(s)"
 msgstr "每隔多少秒更新"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "標題無效"
+msgstr "符記長度「%d」無效"
 
-# XXX 20080810 acli - 譯文有待改進，原文也是
-#, fuzzy
 msgid "Keep alive error"
-msgstr "每隔多少秒送出 Keep Alive"
+msgstr "Keep Alive錯誤"
 
 msgid "Failed to connect server"
 msgstr "無法連線到伺服器"
@@ -7755,6 +7754,7 @@ msgstr "無法登入，請檢查除錯記錄。"
 msgid "Unable to login"
 msgstr "無法登入"
 
+# XXX This looks like some sort of debug message to me - 20080826 acli
 #, c-format
 msgid ""
 "Reply %s(0x%02X )\n"
@@ -7763,21 +7763,20 @@ msgid ""
 "%s"
 msgstr ""
 
-# FIXME 譯文有待改進  - 20070912 acli
-#, fuzzy
+# XXX 譯文有待改進  - 20080826 acli
 msgid "Failed room reply"
-msgstr "登入失敗，沒有回應"
+msgstr "聊天室回應錯誤"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You are not a member of group \"%s\"\n"
-msgstr "你 [%d] 已經被加入羣組 \"%d\""
+msgstr "你並非羣組「%s」的成員\n"
 
 msgid "Can not decrypt login reply"
-msgstr ""
+msgstr "登入回應解密失敗"
 
 #, c-format
 msgid "Invalid token reply code, 0x%02X"
-msgstr ""
+msgstr "符記回應碼「0x%02X」無效"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -10089,7 +10088,7 @@ msgstr "要求 %s 的注意中..."
 
 #, 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.
@@ -10437,7 +10436,7 @@ msgid "Unable to save new account"
 msgstr "無法儲存新帳號"
 
 msgid "An account already exists with the specified criteria."
-msgstr "已有一個乎合指定條件的帳號。"
+msgstr "已有一個符合指定條件的帳號。"
 
 msgid "Add Account"
 msgstr "新增帳號"
@@ -10467,7 +10466,7 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>歡迎使用 %s!</span>\n"
 "\n"
@@ -10475,8 +10474,8 @@ msgstr ""
 "設定好你的帳號即可。如果你希望 %s 使用多個即時通訊帳號，可在完成上一步後，繼"
 "續按「加入」按紐來設定其他的帳號。\n"
 "\n"
-"你如果希望新增、修改或刪除帳號，只要透過好友清單上的「帳號->新增／編輯」指"
-"令，即可返回這個畫面。"
+"你如果希望新增、修改或刪除帳號，只要透過好友清單上的「帳號->管理帳號」指令，"
+"即可返回這個畫面。"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -10653,7 +10652,7 @@ msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
 msgid "/Accounts/Manage Accounts"
-msgstr "/帳號/管理"
+msgstr "/帳號/管理帳號"
 
 #. Tools
 msgid "/_Tools"
@@ -10846,9 +10845,9 @@ msgid ""
 msgstr ""
 "<span weight='bold' size='larger'>歡迎使用 %s!</span>\n"
 "\n"
-"你未有啟動任何帳號，請透過好友清單上的「帳號->管理」指令，到「帳號清單」啟動"
-"即時訊息帳號。帳號一經啟動，就隨時可以登入或更改狀態；這樣，你就可以跟你的好"
-"友通訊了！"
+"你未有啟動任何帳號，請透過好友清單上的「帳號->管理帳號」指令，到「帳號清單」"
+"啟動即時訊息帳號。帳號一經啟動，就隨時可以登入或更改狀態；這樣，你就可以跟你"
+"的好友通訊了！"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -11335,7 +11334,7 @@ msgstr "主要開發者"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=A
 msgid "Afrikaans"
-msgstr "南非荷蘭文"
+msgstr "阿非利堪文"
 
 msgid "Arabic"
 msgstr "阿拉伯文"
@@ -11357,7 +11356,7 @@ msgstr "波斯尼亞文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=C
 msgid "Catalan"
-msgstr "加泰隆文"
+msgstr "加泰羅文"
 
 # NOTE 直譯是「瓦倫西亞式加泰隆文」，但正常的叫法是直接寫「瓦倫西亞語」(Valencian)
 msgid "Valencian-Catalan"
@@ -11427,7 +11426,7 @@ msgstr "希伯來文"
 
 #  NOTE 參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=H
 msgid "Hindi"
-msgstr "印度文"
+msgstr "印地文"
 
 msgid "Hungarian"
 msgstr "匈牙利文"
@@ -11467,7 +11466,7 @@ msgstr "韓文"
 #  NOTE 港譯只有「庫爾德」，台譯有「庫德」（標準譯法，看來亦較常見）和「庫爾德」
 #  NOTE 註：因 zh_TW 和 zh_HK 正式分家，保留台式譯法「庫德」
 msgid "Kurdish"
-msgstr "庫德文"
+msgstr "庫爾德文"
 
 msgid "Lao"
 msgstr "寮國文"
@@ -11485,7 +11484,7 @@ msgstr "馬其頓文"
 #  NOTE 譯音一般放在「挪威文」後的括弧內，也有不用括弧把譯音放在「挪威」和「文」之間
 #  NOTE 採用「標準」一詞，參見 http://www.cnscode.org.tw/cnscode/lang.jsp?qrytype=char&keyword=N&page=2
 msgid "Bokmål Norwegian"
-msgstr "標準挪威文"
+msgstr "博克莫爾文"
 
 msgid "Nepali"
 msgstr "尼泊爾文"
@@ -11493,10 +11492,10 @@ msgstr "尼泊爾文"
 # NOTE Flemish 譯法是跟了http://www.ee.tku.edu.tw/~rexchen/cdict/
 # XXX Dutch 和 Flemish 是同一種語言，是否應該只寫「荷蘭文」，刪去「法蘭德斯文」？
 msgid "Dutch, Flemish"
-msgstr "荷蘭文／法蘭德斯文"
+msgstr "荷蘭文／弗蘭德斯文"
 
 msgid "Norwegian Nynorsk"
-msgstr "新挪威文"
+msgstr "新諾爾斯克文"
 
 msgid "Occitan"
 msgstr "奧克文"
@@ -11543,7 +11542,7 @@ msgstr "塞爾維亞文"
 # NOTE 見http://www.cnscode.org.tw/cnscode/lang.jsp?keyword=sinhala&qrytype=en&x=10&y=11
 # NOTE Google finds gov.cn using the same translation; since hk now follows cn, this should be the zh-HK translation too
 msgid "Sinhala"
-msgstr "僧伽羅文"
+msgstr "僧迦羅文"
 
 msgid "Swedish"
 msgstr "瑞典文"
@@ -12933,6 +12932,12 @@ msgstr "狀態：%s"
 msgid "Custom Smiley"
 msgstr "自選表情"
 
+msgid "More Data needed"
+msgstr "需要進一步的資料"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "請給這個表情給定一個相關的捷徑。"
+
 msgid "Duplicate Shortcut"
 msgstr "重覆的表情定義"
 
@@ -12942,12 +12947,6 @@ msgid ""
 "different shortcut."
 msgstr "指定的捷徑已有相關的自選表情，請指定另一個捷徑。"
 
-msgid "More Data needed"
-msgstr "需要進一步的資料"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "請給這個表情給定一個相關的捷徑。"
-
 msgid "Please select an image for the smiley."
 msgstr "請給這個表情選擇一個圖像。"
 
@@ -13105,6 +13104,10 @@ msgstr "修改(_M)"
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+# TODO 要覆查 - 20080826
+msgid "_Edit"
+msgstr "修改(_E)"
+
 #  FIXME Tooltip中文怎寫？
 msgid "Pidgin Tooltip"
 msgstr "Pidgin Tooltip"
@@ -14123,7 +14126,7 @@ msgstr "幫助為 XMPP 伺服器或客戶端進行除錯。"
 #~ msgstr "代碼 0x%02X：%s"
 
 #~ msgid "Group Operation Error"
-#~ msgstr "羣組操作錯誤"
+#~ msgstr "群組操作錯誤"
 
 #~ msgid "Error setting socket options"
 #~ msgstr "設定 Socket 選項時錯誤"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8df8aecd8d..937b96ce58 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,7 +3,7 @@
 # Copyright (C) 2003-2008, Ambrose C. Li <acli@ada.dhs.org>
 #
 # This file is distributed under the same license as the "Pidgin" package.
-# $InternalId: zh_TW.po,v 1.540 2008/08/10 08:37:23 acli Exp $
+# $InternalId: zh_TW.po,v 1.546 2008/08/27 04:00:09 acli Exp $
 #
 # ----------------------------------------------------------
 # For internal use only:
@@ -50,8 +50,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Pidgin 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-15 22:30-0400\n"
-"PO-Revision-Date: 2008-08-09 16:16-0400\n"
+"POT-Creation-Date: 2008-08-29 15:24-0400\n"
+"PO-Revision-Date: 2008-08-26 23:51-0400\n"
 "Last-Translator: Ambrose C. Li <acli@ada.dhs.org>, Paladin R. Liu "
 "<paladin@ms1.hinet.net>\n"
 "Language-Team: Chinese (Traditional) <zh-l10n@linux.org.tw>\n"
@@ -220,7 +220,7 @@ msgid ""
 "Last Seen: %s ago"
 msgstr ""
 "\n"
-"<b>最後見到：</b>%s前"
+"最後見到：%s前"
 
 msgid "Default"
 msgstr "預設"
@@ -229,7 +229,7 @@ msgid "You must provide a username for the buddy."
 msgstr "必須為好友指定帳號。"
 
 msgid "You must provide a group."
-msgstr "必須為好友指定群組。"
+msgstr "必須指定群組。"
 
 msgid "You must select an account."
 msgstr "必須指定帳號"
@@ -2460,6 +2460,9 @@ msgstr "聊天室大小下限"
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "閒置時間下限（分鐘）"
 
+msgid "Apply hiding rules to buddies"
+msgstr "隱藏規則亦適用於好友"
+
 #  XXX 不通順
 #. *< type
 #. *< ui_requirement
@@ -5152,7 +5155,7 @@ msgstr "這個帳戶沒有文字被封鎖。"
 #, c-format
 msgid ""
 "MSN servers are currently blocking the following regular expressions:<br/>%s"
-msgstr "MSN 的伺服器目前正在封鎖乎合下列 regular expression 的文字：<br/>%s"
+msgstr "MSN 的伺服器目前正在封鎖符合下列 regular expression 的文字：<br/>%s"
 
 msgid "This account does not have email enabled."
 msgstr "這個帳號的電子郵件功能未有啟動。"
@@ -6807,15 +6810,15 @@ msgid ""
 "You missed %hu message from %s because his/her warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because his/her warning level is too high."
-msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
-msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）太邪惡了。"
+msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）的警告等級過高。"
+msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為他（她）的警告等級過高。"
 
 #, c-format
 msgid "You missed %hu message from %s because your warning level is too high."
 msgid_plural ""
 "You missed %hu messages from %s because your warning level is too high."
-msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
-msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為您太邪惡了。"
+msgstr[0] "您遺失了 %hu 個由 %s 送來的訊息，因為您的警告等級過高。"
+msgstr[1] "您遺失了 %hu 個由 %s 送來的訊息，因為您的警告等級過高。"
 
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
@@ -7592,11 +7595,9 @@ msgstr " 使用行動裝置"
 msgid " BindMobile"
 msgstr " 綁定行動裝置"
 
-#, fuzzy
 msgid " Video"
 msgstr " 視訊"
 
-#, fuzzy
 msgid " Space"
 msgstr " Space"
 
@@ -7697,14 +7698,12 @@ msgstr "每隔多少秒送出 Keep Alive"
 msgid "Update interval(s)"
 msgstr "每隔多少秒更新"
 
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid token len, %d"
-msgstr "標題無效"
+msgstr "符記長度「%d」無效"
 
-# XXX 20080810 acli - 譯文有待改進，原文也是
-#, fuzzy
 msgid "Keep alive error"
-msgstr "每隔多少秒送出 Keep Alive"
+msgstr "Keep Alive錯誤"
 
 msgid "Failed to connect server"
 msgstr "無法連線到伺服器"
@@ -7753,6 +7752,7 @@ msgstr "無法登入，請檢查除錯記錄。"
 msgid "Unable to login"
 msgstr "無法登入"
 
+# XXX This looks like some sort of debug message to me - 20080826 acli
 #, c-format
 msgid ""
 "Reply %s(0x%02X )\n"
@@ -7761,21 +7761,20 @@ msgid ""
 "%s"
 msgstr ""
 
-# FIXME 譯文有待改進  - 20070912 acli
-#, fuzzy
+# XXX 譯文有待改進  - 20080826 acli
 msgid "Failed room reply"
-msgstr "登入失敗，沒有回應"
+msgstr "聊天室回應錯誤"
 
-#, fuzzy, c-format
+#, c-format
 msgid "You are not a member of group \"%s\"\n"
-msgstr "您 [%d] 已經被加入群組 \"%d\""
+msgstr "您並非群組「%s」的成員\n"
 
 msgid "Can not decrypt login reply"
-msgstr ""
+msgstr "登入回應解密失敗"
 
 #, c-format
 msgid "Invalid token reply code, 0x%02X"
-msgstr ""
+msgstr "符記回應碼「0x%02X」無效"
 
 #, c-format
 msgid "%d has declined the file %s"
@@ -10431,7 +10430,7 @@ msgid "Unable to save new account"
 msgstr "無法儲存新帳號"
 
 msgid "An account already exists with the specified criteria."
-msgstr "已有一個乎合指定條件的帳號。"
+msgstr "已有一個符合指定條件的帳號。"
 
 msgid "Add Account"
 msgstr "新增帳號"
@@ -10461,7 +10460,7 @@ msgid ""
 "all.\n"
 "\n"
 "You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
+"<b>Accounts->Manage Accounts</b> in the Buddy List window"
 msgstr ""
 "<span size='larger' weight='bold'>歡迎使用 %s!</span>\n"
 "\n"
@@ -10469,8 +10468,8 @@ msgstr ""
 "設定好您的帳號即可。如果您希望 %s 使用多個即時通訊帳號，可在完成上一步後，繼"
 "續按「加入」按紐來設定其他的帳號。\n"
 "\n"
-"您如果希望新增、修改或刪除帳號，只要透過好友清單上的「帳號->新增／編輯」指"
-"令，即可返回這個畫面。"
+"您如果希望新增、修改或刪除帳號，只要透過好友清單上的「帳號->管理帳號」指令，"
+"即可返回這個畫面。"
 
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
@@ -10647,7 +10646,7 @@ msgid "/_Accounts"
 msgstr "/帳號(_A)"
 
 msgid "/Accounts/Manage Accounts"
-msgstr "/帳號/管理"
+msgstr "/帳號/管理帳號"
 
 #. Tools
 msgid "/_Tools"
@@ -10840,9 +10839,9 @@ msgid ""
 msgstr ""
 "<span weight='bold' size='larger'>歡迎使用 %s!</span>\n"
 "\n"
-"您未有啟動任何帳號，請透過好友清單上的「帳號->管理」指令，到「帳號清單」啟動"
-"即時訊息帳號。帳號一經啟動，就隨時可以登入或變更狀態；這樣，您就可以跟您的好"
-"友通訊了！"
+"您未有啟動任何帳號，請透過好友清單上的「帳號->管理帳號」指令，到「帳號清單」"
+"啟動即時訊息帳號。帳號一經啟動，就隨時可以登入或變更狀態；這樣，您就可以跟您"
+"的好友通訊了！"
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -12927,6 +12926,12 @@ msgstr "狀態：%s"
 msgid "Custom Smiley"
 msgstr "自訂表情"
 
+msgid "More Data needed"
+msgstr "需要進一步的資料"
+
+msgid "Please provide a shortcut to associate with the smiley."
+msgstr "請給這個表情給定一個相關的捷徑。"
+
 msgid "Duplicate Shortcut"
 msgstr "重覆的表情定義"
 
@@ -12936,12 +12941,6 @@ msgid ""
 "different shortcut."
 msgstr "給定的捷徑已有相關的自訂表情，請指定另一個捷徑。"
 
-msgid "More Data needed"
-msgstr "需要進一步的資料"
-
-msgid "Please provide a shortcut to associate with the smiley."
-msgstr "請給這個表情給定一個相關的捷徑。"
-
 msgid "Please select an image for the smiley."
 msgstr "請給這個表情選擇一個圖像。"
 
@@ -13099,6 +13098,10 @@ msgstr "修改(_M)"
 msgid "_Open Mail"
 msgstr "開啟郵件(_O)"
 
+# TODO 要覆查 - 20080826
+msgid "_Edit"
+msgstr "修改(_E)"
+
 #  FIXME Tooltip中文怎寫？
 msgid "Pidgin Tooltip"
 msgstr "Pidgin Tooltip"
diff --git a/share/ca-certs/Makefile.mingw b/share/ca-certs/Makefile.mingw
index 2472de98bf..c975a346e5 100644
--- a/share/ca-certs/Makefile.mingw
+++ b/share/ca-certs/Makefile.mingw
@@ -11,7 +11,7 @@ datadir := $(PIDGIN_INSTALL_DIR)
 -include ./Makefile.am.mingw
 cacertsdir := $(PIDGIN_INSTALL_DIR)/ca-certs
 
-.PHONY: install
+.PHONY: install clean
 
 install: ./Makefile.am.mingw
 	if test '$(cacerts_DATA)'; then \
@@ -19,6 +19,9 @@ install: ./Makefile.am.mingw
 	  cp $(cacerts_DATA) $(cacertsdir); \
 	fi;
 
+clean:
+	rm -f ./Makefile.am.mingw
+
 ./Makefile.am.mingw: ./Makefile.am
 	sed -e 's/^if\ INSTALL_SSL_CERTIFICATES/ifeq (\$$(INSTALL_SSL_CERTIFICATES), 1)/' ./Makefile.am > $@