changeset 16718:3bd360f26a9e

s/Jabber/XMPP/ in user-visible places.
author Richard Laager <rlaager@wiktel.com>
date Tue, 01 May 2007 05:53:57 +0000 (2007-05-01)
parents bb6cfc641496
children 1ac4039a2634 4cb9f5cc07ba
files AUTHORS README doc/finch.1.in doc/pidgin.1.in libpurple/plugins/psychic.c libpurple/protocols/bonjour/bonjour.c libpurple/protocols/jabber/buddy.c libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/libxmpp.c libpurple/protocols/jabber/message.c libpurple/prpl.h pidgin.apspec.in pidgin.spec.in pidgin/gtkdialogs.c pidgin/plugins/raw.c po/af.po po/am.po po/ar.po po/az.po po/bg.po po/bn.po po/bs.po po/ca.po po/ca@valencia.po po/cs.po po/da.po po/de.po po/dz.po po/el.po po/en_AU.po po/en_CA.po po/en_GB.po po/eo.po po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po po/gl.po po/gu.po po/he.po po/hi.po po/hu.po po/id.po po/it.po po/ja.po po/ka.po po/kn.po po/ko.po po/ku.po po/lt.po po/mk.po po/my_MM.po po/nb.po po/ne.po po/nl.po po/nn.po po/pa.po po/pl.po po/ps.po po/pt.po po/pt_BR.po po/ro.po po/ru.po po/sk.po po/sl.po po/sq.po po/sr.po po/sr@Latn.po po/sv.po po/ta.po po/te.po po/th.po po/tr.po po/uk.po po/vi.po po/xh.po po/zh_CN.po po/zh_HK.po po/zh_TW.po
diffstat 81 files changed, 1804 insertions(+), 1804 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Tue May 01 02:30:37 2007 +0000
+++ b/AUTHORS	Tue May 01 05:53:57 2007 +0000
@@ -14,7 +14,7 @@
 	ICQ: 96642211
 	Yahoo:	SeanEgn
 	MSN:  seanegn@hotmail.com
-	Jabber:  seanegn@jabber.org
+	XMPP:  seanegn@jabber.org
 	Gadu-Gadu:  1511497
 
 Daniel 'datallah' Atallah
@@ -52,7 +52,7 @@
 Rob Flynn <gaim@robflynn.com> - maintainer
 Adam Fritzler - libfaim maintainer
 Syd Logan - hacker and designated driver [lazy bum]
-Jim Seymour - Jabber developer
+Jim Seymour - XMPP developer
 Mark Spencer <markster@marko.net> - original author
 Eric Warmenhoven <eric@warmenhoven.org> - lead developer
 
--- a/README	Tue May 01 02:30:37 2007 +0000
+++ b/README	Tue May 01 05:53:57 2007 +0000
@@ -4,7 +4,7 @@
 
 libpurple is a library intended to be used by programmers seeking
 to write an IM client that connects to many IM networks.  It supports
-AIM, ICQ, Jabber, MSN and Yahoo!, among others.
+AIM, ICQ, XMPP, MSN and Yahoo!, among others.
 
 Pidgin is an graphical IM client written in C which uses the GTK+
 toolkit.
--- a/doc/finch.1.in	Tue May 01 02:30:37 2007 +0000
+++ b/doc/finch.1.in	Tue May 01 05:53:57 2007 +0000
@@ -30,7 +30,7 @@
 .SH DESCRIPTION
 .PP
 \fBfinch\fR is a console-based modular messaging client capable of using
-AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime,
+AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime,
 Zephyr, Gadu-Gadu, and QQ all at once. It has many common features found in
 other clients, as well as many unique features.  Finch is not endorsed by or
 affiliated with America Online, ICQ, Microsoft, or Yahoo.
--- a/doc/pidgin.1.in	Tue May 01 02:30:37 2007 +0000
+++ b/doc/pidgin.1.in	Tue May 01 05:53:57 2007 +0000
@@ -28,7 +28,7 @@
 
 .SH DESCRIPTION
 .PP
-Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber,
+Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP,
 ICQ, IRC, SILC, SIP/SIMPLE Novell GroupWise, Lotus Sametime, Bonjour,
 Zephyr, Gadu-Gadu, and QQ all at once.  It has many common features found in
 other clients, as well as many unique features.  Pidgin is not endorsed by or
--- a/libpurple/plugins/psychic.c	Tue May 01 02:30:37 2007 +0000
+++ b/libpurple/plugins/psychic.c	Tue May 01 05:53:57 2007 +0000
@@ -21,7 +21,7 @@
 #define PLUGIN_SUMMARY  N_("Psychic mode for incoming conversation")
 #define PLUGIN_DESC     N_("Causes conversation windows to appear as other" \
 			   " users begin to message you.  This works for" \
-			   " AIM, ICQ, Jabber, Sametime, and Yahoo!")
+			   " AIM, ICQ, XMPP, Sametime, and Yahoo!")
 #define PLUGIN_AUTHOR   "Christopher O'Brien <siege@preoccupied.net>"
 
 
--- a/libpurple/protocols/bonjour/bonjour.c	Tue May 01 02:30:37 2007 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Tue May 01 05:53:57 2007 +0000
@@ -592,7 +592,7 @@
 	option = purple_account_option_string_new(_("AIM Account"), "AIM", "");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_string_new(_("Jabber Account"), "jid", "");
+	option = purple_account_option_string_new(_("XMPP Account"), "jid", "");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	my_protocol = plugin;
--- a/libpurple/protocols/jabber/buddy.c	Tue May 01 02:30:37 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Tue May 01 05:53:57 2007 +0000
@@ -575,8 +575,8 @@
 	if(x_vc_data != NULL)
 		xmlnode_free(x_vc_data);
 
-	purple_request_fields(gc, _("Edit Jabber vCard"),
-						_("Edit Jabber vCard"),
+	purple_request_fields(gc, _("Edit XMPP vCard"),
+						_("Edit XMPP vCard"),
 						_("All items below are optional. Enter only the "
 						  "information with which you feel comfortable."),
 						fields,
@@ -1729,7 +1729,7 @@
 		if(!instructions)
 		{
 			instructions = g_strdup(_("Fill in one or more fields to search "
-						  "for any matching Jabber users."));
+						  "for any matching XMPP users."));
 		}
 
 		if(xmlnode_get_child(query, "first")) {
@@ -1757,8 +1757,8 @@
 		usi->js = js;
 		usi->directory_server = g_strdup(from);
 
-		purple_request_fields(js->gc, _("Search for Jabber users"),
-				_("Search for Jabber users"), instructions, fields,
+		purple_request_fields(js->gc, _("Search for XMPP users"),
+				_("Search for XMPP users"), instructions, fields,
 				_("Search"), G_CALLBACK(user_search_cb),
 				_("Cancel"), G_CALLBACK(user_search_cancel_cb),
 				NULL, NULL, NULL,
--- a/libpurple/protocols/jabber/jabber.c	Tue May 01 02:30:37 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Tue May 01 05:53:57 2007 +0000
@@ -562,7 +562,7 @@
 	js->write_buffer = purple_circ_buffer_new(512);
 
 	if(!js->user) {
-		purple_connection_error(gc, _("Invalid Jabber ID"));
+		purple_connection_error(gc, _("Invalid XMPP ID"));
 		return;
 	}
 
@@ -868,8 +868,8 @@
 			instructions = g_strdup(_("Please fill out the information below "
 						"to register your new account."));
 
-		purple_request_fields(js->gc, _("Register New Jabber Account"),
-				_("Register New Jabber Account"), instructions, fields,
+		purple_request_fields(js->gc, _("Register New XMPP Account"),
+				_("Register New XMPP Account"), instructions, fields,
 				_("Register"), G_CALLBACK(jabber_register_cb),
 				_("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
 				purple_connection_get_account(js->gc), NULL, NULL,
@@ -907,7 +907,7 @@
 	js->next_id = g_random_int();
 
 	if(!js->user) {
-		purple_connection_error(gc, _("Invalid Jabber ID"));
+		purple_connection_error(gc, _("Invalid XMPP ID"));
 		return;
 	}
 
@@ -1365,8 +1365,8 @@
 	purple_request_field_string_set_masked(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields(js->gc, _("Change Jabber Password"),
-			_("Change Jabber Password"), _("Please enter your new password"),
+	purple_request_fields(js->gc, _("Change XMPP Password"),
+			_("Change XMPP Password"), _("Please enter your new password"),
 			fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
 			_("Cancel"), NULL,
 			purple_connection_get_account(gc), NULL, NULL,			  
@@ -1480,7 +1480,7 @@
 		} else if(xmlnode_get_child(error, "item-not-found")) {
 			text = _("Item Not Found");
 		} else if(xmlnode_get_child(error, "jid-malformed")) {
-			text = _("Malformed Jabber ID");
+			text = _("Malformed XMPP ID");
 		} else if(xmlnode_get_child(error, "not-acceptable")) {
 			text = _("Not Acceptable");
 		} else if(xmlnode_get_child(error, "not-allowed")) {
--- a/libpurple/protocols/jabber/libxmpp.c	Tue May 01 02:30:37 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Tue May 01 05:53:57 2007 +0000
@@ -163,9 +163,9 @@
 	"XMPP",                                           /**< name           */
 	VERSION,                                          /**< version        */
 	                                                  /**  summary        */
-	N_("Jabber Protocol Plugin"),
+	N_("XMPP Protocol Plugin"),
 	                                                  /**  description    */
-	N_("Jabber Protocol Plugin"),
+	N_("XMPP Protocol Plugin"),
 	NULL,                                             /**< author         */
 	PURPLE_WEBSITE,                                     /**< homepage       */
 
--- a/libpurple/protocols/jabber/message.c	Tue May 01 02:30:37 2007 +0000
+++ b/libpurple/protocols/jabber/message.c	Tue May 01 05:53:57 2007 +0000
@@ -269,7 +269,7 @@
 	buf = g_strdup_printf(_("Message delivery to %s failed: %s"),
 			jm->from, jm->error ? jm->error : "");
 
-	purple_notify_formatted(jm->js->gc, _("Jabber Message Error"), _("Jabber Message Error"), buf,
+	purple_notify_formatted(jm->js->gc, _("XMPP Message Error"), _("XMPP Message Error"), buf,
 			jm->xhtml ? jm->xhtml : jm->body, NULL, NULL);
 
 	g_free(buf);
--- a/libpurple/prpl.h	Tue May 01 02:30:37 2007 +0000
+++ b/libpurple/prpl.h	Tue May 01 05:53:57 2007 +0000
@@ -99,7 +99,7 @@
 	/**
 	 * Use a unique name, not an alias, for chat rooms.
 	 *
-	 * Jabber lets you choose what name you want for chat.
+	 * XMPP lets you choose what name you want for chat.
 	 * So it shouldn't be pulling the alias for when you're in chat;
 	 * it gets annoying.
 	 */
@@ -108,7 +108,7 @@
 	/**
 	 * Chat rooms have topics.
 	 *
-	 * IRC and Jabber support this.
+	 * IRC and XMPP support this.
 	 */
 	OPT_PROTO_CHAT_TOPIC = 0x00000008,
 
@@ -145,7 +145,7 @@
 	/**
 	 * Allows font size to be specified in sane point size
 	 *
-	 * Probably just Jabber and Y!M
+	 * Probably just XMPP and Y!M
 	 */
 	OPT_PROTO_USE_POINTSIZE = 0x00000100,
 
--- a/pidgin.apspec.in	Tue May 01 02:30:37 2007 +0000
+++ b/pidgin.apspec.in	Tue May 01 05:53:57 2007 +0000
@@ -14,7 +14,7 @@
 
 [Description]
 Pidgin allows you to talk to anyone using a variety of messaging protocols,
-including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, Jabber,
+including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP,
 Gadu-Gadu, and Zephyr. These protocols are implemented using a
 modular, easy to use design. To use a protocol, just add an account using the
 account editor.
--- a/pidgin.spec.in	Tue May 01 02:30:37 2007 +0000
+++ b/pidgin.spec.in	Tue May 01 05:53:57 2007 +0000
@@ -129,7 +129,7 @@
 
 %description
 Pidgin allows you to talk to anyone using a variety of messaging
-protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu,
+protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
 ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
 Zephyr.  These protocols are implemented using a modular, easy to
 use design.  To use a protocol, just add an account using the
@@ -151,7 +151,7 @@
 and Finch.
 
 libpurple supports a variety of messaging protocols including AIM, MSN,
-Yahoo!, Jabber, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
 Lotus Sametime, SILC, Simple and Zephyr.
 
 %description -n libpurple-devel
--- a/pidgin/gtkdialogs.c	Tue May 01 02:30:37 2007 +0000
+++ b/pidgin/gtkdialogs.c	Tue May 01 05:53:57 2007 +0000
@@ -112,7 +112,7 @@
 	{"Adam Fritzler",		N_("libfaim maintainer"), NULL},
 	/* If "lazy bum" translates literally into a serious insult, use something else or omit it. */
 	{"Syd Logan",			N_("hacker and designated driver [lazy bum]"), NULL},
-	{"Jim Seymour",			N_("Jabber developer"), NULL},
+	{"Jim Seymour",			N_("XMPP developer"), NULL},
 	{"Mark Spencer",		N_("original author"), "markster@marko.net"},
 	{"Eric Warmenhoven",	N_("lead developer"), "warmenhoven@yahoo.com"},
 	{NULL, NULL, NULL}
@@ -361,7 +361,7 @@
 
 	g_string_append_printf(str,
 		_("%s is a modular messaging client capable of using "
-		  "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, "
+		  "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
 		  "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
 		  "Gadu-Gadu, and QQ all at once.  "
 		  "It is written using GTK+.<BR><BR>"
--- a/pidgin/plugins/raw.c	Tue May 01 02:30:37 2007 +0000
+++ b/pidgin/plugins/raw.c	Tue May 01 05:53:57 2007 +0000
@@ -175,7 +175,7 @@
 	N_("Raw"),
 	VERSION,
 	N_("Lets you send raw input to text-based protocols."),
-	N_("Lets you send raw input to text-based protocols (Jabber, MSN, IRC, "
+	N_("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."),
 	"Eric Warmenhoven <eric@warmenhoven.org>",
 	PURPLE_WEBSITE,
--- a/po/af.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/af.po	Tue May 01 05:53:57 2007 +0000
@@ -2285,8 +2285,8 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber-programmeerder"
+msgid "XMPP developer"
+msgstr "XMPP-programmeerder"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2518,7 +2518,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2526,7 +2526,7 @@
 "the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
-"Gaim is 'n modul棚re geselskli谷nt wat AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
+"Gaim is 'n modul棚re geselskli谷nt wat AIM, MSN, Yahoo!, XMPP, ICQ, IRC, "
 "SILC, SIP/SIMPLENovell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-"
 "Gadu, en QQ als gelyktydig kan gebruik.  Dit is geskryf met GTK+.<BR><BR>U "
 "mag die program aanpas en herversprei onderhewig aan die voorwaardes van die "
@@ -5084,7 +5084,7 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -6587,7 +6587,7 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -6836,8 +6836,8 @@
 msgstr "AIM-rekening"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Jabber-rekening"
+msgid "XMPP Account"
+msgstr "XMPP-rekening"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -7908,8 +7908,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Wysig Jabber-vCard"
+msgid "Edit XMPP vCard"
+msgstr "Wysig XMPP-vCard"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8024,7 +8024,7 @@
 msgid "The following are the results of your search"
 msgstr "Die volgende is die resultate van u soektog"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8047,8 +8047,8 @@
 msgstr "Bedienerinstruksies: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Vul een of meer velde in om te soek vir passende Jabber-gebruikers."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Vul een of meer velde in om te soek vir passende XMPP-gebruikers."
 
 #: ../libgaim/protocols/jabber/buddy.c:1749
 #: ../libgaim/protocols/novell/novell.c:1488
@@ -8059,8 +8059,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1758
 #: ../libgaim/protocols/jabber/buddy.c:1759
-msgid "Search for Jabber users"
-msgstr "Soek vir Jabber-gebruikers"
+msgid "Search for XMPP users"
+msgstr "Soek vir XMPP-gebruikers"
 
 #: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
@@ -8189,8 +8189,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "Ongeldige Jabber-ID"
+msgid "Invalid XMPP ID"
+msgstr "Ongeldige XMPP-ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8243,8 +8243,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "Registreer 'n nuwe Jabber-rekening"
+msgid "Register New XMPP Account"
+msgstr "Registreer 'n nuwe XMPP-rekening"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8307,8 +8307,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "Verander Jabber-wagwoord"
+msgid "Change XMPP Password"
+msgstr "Verander XMPP-wagwoord"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8362,8 +8362,8 @@
 msgstr "Item nie gevind nie"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "Misvormde Jabber-ID"
+msgid "Malformed XMPP ID"
+msgstr "Misvormde XMPP-ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
@@ -8625,8 +8625,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "Inprop vir Jabber-protokol"
+msgid "XMPP Protocol Plugin"
+msgstr "Inprop vir XMPP-protokol"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
@@ -8668,8 +8668,8 @@
 msgstr "Boodskapaflewering na %s het misluk: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Jabber-boodskapfout"
+msgid "XMPP Message Error"
+msgstr "XMPP-boodskapfout"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/am.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/am.po	Tue May 01 05:53:57 2007 +0000
@@ -828,7 +828,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -2743,8 +2743,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "��Jabber �求���衣�� %s"
+msgid "XMPP developer"
+msgstr "��XMPP �求���衣�� %s"
 
 #: src/gtkdialogs.c:93
 #, fuzzy
@@ -2921,7 +2921,7 @@
 #: src/gtkdialogs.c:226
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 
@@ -5570,7 +5570,7 @@
 msgstr "�����衣�� ������"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:569
@@ -5580,7 +5580,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
+msgid "XMPP ID"
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
@@ -5664,7 +5664,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5683,7 +5683,7 @@
 msgstr "�≡������ ���求����"
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5816,7 +5816,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:473
@@ -5866,7 +5866,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:842
@@ -5946,7 +5946,7 @@
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
 #, fuzzy
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "���求�≡���� ������ ������"
 
 #: src/protocols/jabber/jabber.c:1161
@@ -6001,7 +6001,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1273
@@ -6254,7 +6254,7 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6306,8 +6306,8 @@
 
 #: src/protocols/jabber/message.c:233
 #, fuzzy
-msgid "Jabber Message Error"
-msgstr "��Jabber �求���衣�� %s"
+msgid "XMPP Message Error"
+msgstr "��XMPP �求���衣�� %s"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -6782,7 +6782,7 @@
 #: src/protocols/msn/msn.c:1471
 #, fuzzy
 msgid "MSN Profile"
-msgstr "��Jabber �求���衣�� %s"
+msgstr "��XMPP �求���衣�� %s"
 
 #: src/protocols/msn/msn.c:1476 src/protocols/msn/msn.c:1727
 #: src/protocols/yahoo/yahoo_profile.c:760
@@ -10598,7 +10598,7 @@
 #: src/protocols/yahoo/yahoo_profile.c:749
 #, fuzzy
 msgid "Yahoo! Profile"
-msgstr "��Jabber �求���衣�� %s"
+msgstr "��XMPP �求���衣�� %s"
 
 #: src/protocols/yahoo/yahoo_profile.c:793
 msgid ""
@@ -11193,8 +11193,8 @@
 #~ msgstr "���潤����"
 
 #, fuzzy
-#~ msgid "Jabber Profile"
-#~ msgstr "��Jabber �求���衣�� %s"
+#~ msgid "XMPP Profile"
+#~ msgstr "��XMPP �求���衣�� %s"
 
 #, fuzzy
 #~ msgid "Roomlist Error"
--- a/po/ar.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ar.po	Tue May 01 05:53:57 2007 +0000
@@ -1321,7 +1321,7 @@
 msgstr ""
 
 #: ../plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #. This is a quote from Star Wars.  You should
@@ -1355,7 +1355,7 @@
 msgstr ""
 
 #: ../plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+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 ""
 
 #: ../plugins/relnot.c:63
@@ -3600,7 +3600,7 @@
 msgstr ""
 
 #: ../src/gtkdialogs.c:102
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr ""
 
 #: ../src/gtkdialogs.c:103
@@ -3893,7 +3893,7 @@
 msgstr " FileZilla  惺�"
 
 #: ../src/gtkdialogs.c:271
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, and Gadu-Gadu 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 Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, and Gadu-Gadu 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 Gaim.  Gaim 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 ""
 
 #: ../src/gtkdialogs.c:285
@@ -6034,7 +6034,7 @@
 
 #: ../src/protocols/bonjour/bonjour.c:592
 #, fuzzy
-msgid "Jabber Account"
+msgid "XMPP Account"
 msgstr "忰愕悋惡 愕��"
 
 #: ../src/protocols/bonjour/bonjour.h:35
@@ -7243,7 +7243,7 @@
 #: ../src/protocols/jabber/buddy.c:588
 #: ../src/protocols/jabber/buddy.c:589
 #, fuzzy
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr "... ID3 惠忰惘�惘 �愕��"
 
 #: ../src/protocols/jabber/buddy.c:590
@@ -7368,7 +7368,7 @@
 msgid "The following are the results of your search"
 msgstr ""
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../src/protocols/jabber/buddy.c:1633
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
 msgstr ""
@@ -7391,7 +7391,7 @@
 msgstr "��惺 &悋�悽悋惆�:"
 
 #: ../src/protocols/jabber/buddy.c:1695
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../src/protocols/jabber/buddy.c:1715
@@ -7404,7 +7404,7 @@
 
 #: ../src/protocols/jabber/buddy.c:1724
 #: ../src/protocols/jabber/buddy.c:1725
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr ""
 
 #: ../src/protocols/jabber/buddy.c:1739
@@ -7552,7 +7552,7 @@
 #: ../src/protocols/jabber/jabber.c:535
 #: ../src/protocols/jabber/jabber.c:873
 #, fuzzy
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr "悋��URI '%s' 愃�惘 愕���"
 
 #: ../src/protocols/jabber/jabber.c:605
@@ -7612,7 +7612,7 @@
 
 #: ../src/protocols/jabber/jabber.c:836
 #: ../src/protocols/jabber/jabber.c:837
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr ""
 
 #: ../src/protocols/jabber/jabber.c:999
@@ -7698,7 +7698,7 @@
 #: ../src/protocols/jabber/jabber.c:1337
 #: ../src/protocols/jabber/jabber.c:1338
 #, fuzzy
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "愀�惡 ���悸 悋��惘�惘"
 
 #: ../src/protocols/jabber/jabber.c:1338
@@ -7764,7 +7764,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1448
 #, fuzzy
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr "Malformed chunk data: %s"
 
 #: ../src/protocols/jabber/jabber.c:1450
@@ -8053,7 +8053,7 @@
 #: ../src/protocols/jabber/jabber.c:1903
 #: ../src/protocols/jabber/jabber.c:1905
 #, fuzzy
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr ":愃�惘 ��悴�惆 MP3  ��惡愕 惠惶惆�惘 "
 
 #: ../src/protocols/jabber/jabber.c:1931
@@ -8107,7 +8107,7 @@
 
 #: ../src/protocols/jabber/message.c:236
 #, fuzzy
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr "悽愀悖 悖惓�悋悄 悋�惠忰���: %s"
 
 #: ../src/protocols/jabber/message.c:316
--- a/po/az.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/az.po	Tue May 01 05:53:57 2007 +0000
@@ -823,7 +823,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -2749,8 +2749,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "Jabber Profili"
+msgid "XMPP developer"
+msgstr "XMPP Profili"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -2922,7 +2922,7 @@
 #: src/gtkdialogs.c:226
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 
@@ -5552,7 +5552,7 @@
 msgstr "Ad G端n端"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:569
@@ -5562,8 +5562,8 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID-si"
+msgid "XMPP ID"
+msgstr "XMPP ID-si"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5641,7 +5641,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5659,7 +5659,7 @@
 msgstr "E-Po巽t �nvan脹"
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5783,7 +5783,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:473
@@ -5830,7 +5830,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:842
@@ -5903,7 +5903,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1161
@@ -5954,7 +5954,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1273
@@ -6199,7 +6199,7 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6249,7 +6249,7 @@
 msgstr ""
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr ""
 
 #: src/protocols/jabber/message.c:297
--- a/po/bg.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/bg.po	Tue May 01 05:53:57 2007 +0000
@@ -2345,8 +2345,8 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "�舒亰�舒弍仂��亳从 仆舒 Jabber"
+msgid "XMPP developer"
+msgstr "�舒亰�舒弍仂��亳从 仆舒 XMPP"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2586,7 +2586,7 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2595,7 +2595,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim 仗�仂亞�舒仄舒 亰舒 亳亰仗�舒�舒仆亠 仆舒 ��仂弍�亠仆亳� ��亠亰 仗�仂�仂从仂仍亳�亠 AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, 亳 "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, 亳 "
 "Gadu-Gadu 亠亟仆仂于�亠仄亠仆仆仂. �舒仗亳�舒仆 亠 ��亠亰 Gtk+.<BR><BR> �仄舒�亠 仗�舒于仂 亟舒 "
 "仗�仂仄亠仆��亠 亳 �舒亰仗�仂���舒仆�于舒�亠  仗�仂亞�舒仄舒�舒 仗仂亟 ��仍仂于亳��舒 仆舒 仍亳�亠仆亰舒 GPL "
 "(于亠��亳� 1 亳仍亳 仗仂-仆仂于舒) �仂仗亳亠 仆舒 GPL 仄仂亢亠 亟舒 弍�亟亠 仆舒仄亠�亠仆 于�于 �舒亶仍舒 \"COPYING"
@@ -5226,11 +5226,11 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "�仂亰于仂仍�于舒 亳亰仗�舒�舒仆亠�仂 仆舒 仆亠仂弍�舒弍仂�亠仆亳 亟舒仆仆亳 亟仂 �亠从��仂于仂-弍舒亰亳�舒仆亳 仗�仂�仂从仂仍亳 "
-"(Jabber, MSN, IRC, TOC). �舒 亳亰仗�舒�舒仆亠 - 仆舒�亳�仆亠�亠 ��Enter�� 于 仗仂仍亠�仂 亰舒 "
+"(XMPP, MSN, IRC, TOC). �舒 亳亰仗�舒�舒仆亠 - 仆舒�亳�仆亠�亠 ��Enter�� 于 仗仂仍亠�仂 亰舒 "
 "仗亳�舒仆亠. �弍��仆亠�亠 于仆亳仄舒仆亳亠 仆舒 仗�仂亰仂�亠�舒 亰舒 仂����舒仆�于舒仆亠 仆舒 亞�亠�从亳."
 
 #: ../gtk/plugins/relnot.c:69
@@ -6849,7 +6849,7 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7109,7 +7109,7 @@
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
 #, fuzzy
-msgid "Jabber Account"
+msgid "XMPP Account"
 msgstr "�从�亳于亳�舒仆亠 仆舒 舒从舒�仆�"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
@@ -8191,8 +8191,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "�亠亟舒从�亳�舒仆亠 仆舒 Jabber-于亳亰亳�从舒"
+msgid "Edit XMPP vCard"
+msgstr "�亠亟舒从�亳�舒仆亠 仆舒 XMPP-于亳亰亳�从舒"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8306,7 +8306,7 @@
 msgid "The following are the results of your search"
 msgstr ""
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8331,7 +8331,7 @@
 msgstr "�舒仆仆亳 亰舒 ���于��舒"
 
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:1749
@@ -8343,8 +8343,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1758
 #: ../libgaim/protocols/jabber/buddy.c:1759
-msgid "Search for Jabber users"
-msgstr "丐���亠仆亠 亰舒 仗仂��亠弍亳�亠仍亳 仆舒 Jabber"
+msgid "Search for XMPP users"
+msgstr "丐���亠仆亠 亰舒 仗仂��亠弍亳�亠仍亳 仆舒 XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
@@ -8475,8 +8475,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "�亠于舒仍亳亟亠仆 ID 亰舒 Jabber"
+msgid "Invalid XMPP ID"
+msgstr "�亠于舒仍亳亟亠仆 ID 亰舒 XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8530,8 +8530,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "�亠亞亳���亳�舒仆亠 仆舒 仆仂于 Jabber-舒弍仂仆舒仄亠仆�"
+msgid "Register New XMPP Account"
+msgstr "�亠亞亳���亳�舒仆亠 仆舒 仆仂于 XMPP-舒弍仂仆舒仄亠仆�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8594,8 +8594,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "弌仄�仆舒 仆舒 仗舒�仂仍舒 亰舒 Jabber"
+msgid "Change XMPP Password"
+msgstr "弌仄�仆舒 仆舒 仗舒�仂仍舒 亰舒 XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8649,7 +8649,7 @@
 msgstr "�舒仗亳��� 仆亠 亠 仆舒仄亠�亠仆"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
@@ -8916,8 +8916,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "�仂亟�仍 亰舒 仗�仂�仂从仂仍舒 Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "�仂亟�仍 亰舒 仗�仂�仂从仂仍舒 XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 #, fuzzy
@@ -8960,8 +8960,8 @@
 msgstr "弌�仂弍�亠仆亳亠�仂 仆亠 仄仂亢舒 亟舒 亟仂��亳亞仆亠 亟仂 %s: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "��亠�从舒 于 Jabber-��仂弍�亠仆亳亠"
+msgid "XMPP Message Error"
+msgstr "��亠�从舒 于 XMPP-��仂弍�亠仆亳亠"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/bn.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/bn.po	Tue May 01 05:53:57 2007 +0000
@@ -2538,7 +2538,7 @@
 msgstr "爨項�爨��爨�爨鉦Π 爨� 爨��爭�爭�爨�爨逗Δ 爨÷�爨萎�爨�爨〝�爨� [爨�爭�爨�爭�爭�爨� 爨項Ζ爭�爨��]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "爨�爭�爨��爨��爨� 爨÷�爨〝�爨迦Κ爨鉦Π"
 
 #: ../gtk/gtkdialogs.c:109
@@ -2817,7 +2817,7 @@
 msgstr "爨�爭�爨�爨� 爨伍Ξ爭�爨�Θ爭�爨о�"
 
 #: ../gtk/gtkdialogs.c:335
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 Gaim.  Gaim 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 ""
 
 #: ../gtk/gtkdialogs.c:350
@@ -5388,7 +5388,7 @@
 msgstr "爨�爭�爨�爭�爨伍�-爨〝�爨む�爨む�爨� 爨��爨萎�爨�爨�爨迦� 爨�爨萎�爨��爨��爨むΠ爨逗Δ 爨�爨�Κ爭�爨� 爨��爨�爨鉦Δ爭� 爨伍�爨鉦�爨む� 爨�爨萎�爛�"
 
 #: ../gtk/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+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 "爨�爭�爨�爭�爨伍�-爨〝�爨む�爨む�爨� 爨��爨萎�爨�爨�爨迦�爭�爨迦�爨む� 爨�爨萎�爨��爨��爨むΠ爨逗Δ 爨�爨�Κ爭�爨� 爨��爨�爨鉦Δ爭� 爨伍�爨鉦�爨む� 爨�爨萎� (爨�爭�爨��爨��爨�, MSN, IRC, TOC)爛� 爨��爨�爨鉦Δ爭� 爨項Σ爭� 爨踶��爨�爭�爨萎� 爨��爭�爨伍� 'Enter' 爨�爨鉦Κ爭�爨�イ 爨÷�爨��爨� 爨�爨�爨��爨÷�爨�爨逗Δ爭� 爨�爭�爭�爨鉦Σ 爨萎�爨�爭�爨�イ"
 
 #: ../gtk/plugins/relnot.c:69
@@ -6949,7 +6949,7 @@
 msgstr "爨�爨�爨� 爨�爨�爨踶� 爨伍�爨��爨� 爨謹�爨�Δ爭� 爨��爨�Π爭�爨�\n"
 
 #: ../libgaim/plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7205,7 +7205,7 @@
 msgstr "爨踶�爨�爨踶� 爨�爭�爨��爨�爨鉦�爨��爨�"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
+msgid "XMPP Account"
 msgstr "爨�爭�爨��爨��爨� 爨�爭�爨��爨�爨鉦�爨��爨�"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
@@ -8297,8 +8297,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard 爨伍Ξ爭�爨��爨�Θ"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard 爨伍Ξ爭�爨��爨�Θ"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
@@ -8410,7 +8410,7 @@
 msgid "The following are the results of your search"
 msgstr "爨�爨�Θ爨鉦Π 爨�爨��爨伍Θ爭�爨о�爨� 爨踶� 爨��爨��爨��爭�爨� 爨�Σ爨鉦Λ爨� 爨��爨�爭�爨� 爨�爭�爨�爭�"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1672
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
 msgstr ""
@@ -8433,7 +8433,7 @@
 msgstr "爨伍�爨萎�爨〝�爨� 爨伍�爨�爭�爨萎�爨��爨� 爨むΕ爭�爨�"
 
 #: ../libgaim/protocols/jabber/buddy.c:1734
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "爨�爭�爨��爨��爨� 爨��爨�Μ爨項�爨萎�爨鉦Π爭�爨� 爨��爨� 爨�爨��爨伍Θ爭�爨о�爨� 爨�爨萎Δ爭� 爨踶� 爨�� 爨踶�爨鉦Η爨逗� 爨�爭�爨劇�爨む�爨� 爨��爨萎Θ 爨�爨萎�爨�イ"
 
 #: ../libgaim/protocols/jabber/buddy.c:1754
@@ -8445,7 +8445,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1763
 #: ../libgaim/protocols/jabber/buddy.c:1764
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "爨�爭�爨��爨��爨� 爨��爨�Μ爨項�爨萎�爨鉦Π爭� 爨�爨��爨伍Θ爭�爨о�爨�"
 
 #: ../libgaim/protocols/jabber/buddy.c:1778
@@ -8576,7 +8576,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:555
 #: ../libgaim/protocols/jabber/jabber.c:898
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr "爨�爨��爨� 爨�爭�爨��爨��爨� 爨�爨�爨÷�"
 
 #: ../libgaim/protocols/jabber/jabber.c:626
@@ -8631,7 +8631,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:861
 #: ../libgaim/protocols/jabber/jabber.c:862
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "爨�Δ爭�爨� 爨�爭�爨��爨��爨� 爨�爭�爨��爨�爨鉦�爨��爨� 爨萎�爨�爨逗Ψ爭�爨�爭�爨萎�爨謹Θ 爨�爨萎�爨�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1030
@@ -8695,7 +8695,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1367
 #: ../libgaim/protocols/jabber/jabber.c:1368
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "爨�爭�爨��爨��爨� 爨��爨伍�爭�爨鉦Π爭�爨� 爨�Π爨逗Μ爨萎�爨むΘ"
 
 #: ../libgaim/protocols/jabber/jabber.c:1368
@@ -8750,7 +8750,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1478
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1480
@@ -9008,7 +9008,7 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1967
 #: ../libgaim/protocols/jabber/jabber.c:1969
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr "爨�爭�爨��爨��爨� 爨��爨萎�爨�爭�爨�爨� 爨��爨迦�爨�爨�爨�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1995
@@ -9051,7 +9051,7 @@
 msgstr "%s 爨�爭� 爨��爨萎�爨む� 爨��爨�爨鉦Θ爭� 爨��爨�Π爭�爨� 爨項�爭�爨�爭�: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr "爨�爭�爨�Μ爨鉦Π 爨��爨萎�爨む� 爨む�爨萎�爨�爨�"
 
 #: ../libgaim/protocols/jabber/message.c:316
--- a/po/bs.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/bs.po	Tue May 01 05:53:57 2007 +0000
@@ -847,10 +847,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Dopu邸ta slanje sirovih podataka u tekst-bazirane protokole (Jabber, MSN, IRC, TOC). Pritisnite "
+"Dopu邸ta slanje sirovih podataka u tekst-bazirane protokole (XMPP, MSN, IRC, TOC). Pritisnite "
 "'Enter' u upisno polje da biste poslali. Gledajte debug prozor."
 
 #: plugins/relnot.c:63
@@ -2976,8 +2976,8 @@
 msgstr "biv邸i odr転avatelj"
 
 #: src/gtkdialogs.c:93
-msgid "former Jabber developer"
-msgstr "biv邸i Jabber razvijatelj"
+msgid "former XMPP developer"
+msgstr "biv邸i XMPP razvijatelj"
 
 #: src/gtkdialogs.c:94
 msgid "original author"
@@ -3179,11 +3179,11 @@
 #: src/gtkdialogs.c:244
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "Gaim je modularni klijent za poruke, koji je u mogucnosti da koristi u isto vrijeme "
-" AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, i Gadu-Gadu. "
+" AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, i Gadu-Gadu. "
 "Napisan je koristeci Gtk+ i licenciran pod GPL. <BR><BR>"
 
 #: src/gtkdialogs.c:254
@@ -5827,8 +5827,8 @@
 msgstr "Rodendan"
 
 #: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
-msgid "Edit Jabber vCard"
-msgstr "Uredi Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Uredi XMPP vCard"
 
 #: src/protocols/jabber/buddy.c:511
 msgid ""
@@ -5838,8 +5838,8 @@
 "Sve tacke ni転e su opcionalne. Unesite samo informacije koje hocete."
 
 #: src/protocols/jabber/buddy.c:556
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:566 src/protocols/jabber/buddy.c:573
 #: src/protocols/jabber/buddy.c:586 src/protocols/jabber/jabber.c:971
@@ -5873,8 +5873,8 @@
 msgstr "Logo"
 
 #: src/protocols/jabber/buddy.c:786
-msgid "Jabber Profile"
-msgstr "Jabber profil"
+msgid "XMPP Profile"
+msgstr "XMPP profil"
 
 #: src/protocols/jabber/buddy.c:941
 msgid "Un-hide From"
@@ -6012,8 +6012,8 @@
 msgstr "SSL rukovanje nije uspjelo"
 
 #: src/protocols/jabber/jabber.c:378 src/protocols/jabber/jabber.c:711
-msgid "Invalid Jabber ID"
-msgstr "Pogre邸an Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Pogre邸an XMPP ID"
 
 #: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:741
 msgid "SSL support unavailable"
@@ -6074,8 +6074,8 @@
 msgstr "Popunite informacije ni転e, da registrujete va邸 novi account."
 
 #: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:676
-msgid "Register New Jabber Account"
-msgstr "Registruj novi Jabber account"
+msgid "Register New XMPP Account"
+msgstr "Registruj novi XMPP account"
 
 #: src/protocols/jabber/jabber.c:759
 msgid "Logged out"
@@ -6161,8 +6161,8 @@
 msgstr "Lozinka (ponovo)"
 
 #: src/protocols/jabber/jabber.c:1084 src/protocols/jabber/jabber.c:1085
-msgid "Change Jabber Password"
-msgstr "Promjeni Jabber lozinku"
+msgid "Change XMPP Password"
+msgstr "Promjeni XMPP lozinku"
 
 #: src/protocols/jabber/jabber.c:1085
 msgid "Please enter your new password"
@@ -6201,8 +6201,8 @@
 msgstr "Unos nije pronaden"
 
 #: src/protocols/jabber/jabber.c:1191
-msgid "Malformed Jabber ID"
-msgstr "Pogre邸no formiran Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Pogre邸no formiran XMPP ID"
 
 #: src/protocols/jabber/jabber.c:1193
 msgid "Not Acceptable"
@@ -6435,8 +6435,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1595 src/protocols/jabber/jabber.c:1597
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber protokol plugin"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP protokol plugin"
 
 #: src/protocols/jabber/jabber.c:1620
 msgid "Resource"
@@ -6480,8 +6480,8 @@
 msgstr "Dostava poruke prema %s nije uspjela: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Gre邸ka Jabber poruke"
+msgid "XMPP Message Error"
+msgstr "Gre邸ka XMPP poruke"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
--- a/po/ca.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ca.po	Tue May 01 05:53:57 2007 +0000
@@ -2758,10 +2758,10 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Fa que apareguin finestres de conversa aix鱈 que altres usuaris us comencin a "
-"enviar missatges. Funciona per a AIM, ICQ, Jabber, Sametime, i Yahoo!"
+"enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -3039,8 +3039,8 @@
 msgstr "Compte AIM"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Compte Jabber"
+msgid "XMPP Account"
+msgstr "Compte XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4217,8 +4217,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Edita la vCard del Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Edita la vCard del XMPP"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4331,7 +4331,7 @@
 msgid "The following are the results of your search"
 msgstr "El que segueix s坦n els resultats de la vostra cerca"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4354,7 +4354,7 @@
 msgstr "Instruccions del servidor: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Introdu誰u un o m辿s camps per cercar usuaris que hi coincideixin."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
@@ -4366,8 +4366,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Cerca usuaris de Jabber"
+msgid "Search for XMPP users"
+msgstr "Cerca usuaris de XMPP"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4510,8 +4510,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "ID Jabber inv�lid"
+msgid "Invalid XMPP ID"
+msgstr "ID XMPP inv�lid"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4565,8 +4565,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Registra un compte Jabber nou"
+msgid "Register New XMPP Account"
+msgstr "Registra un compte XMPP nou"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4640,8 +4640,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Canvia la contrasenya per al Jabber"
+msgid "Change XMPP Password"
+msgstr "Canvia la contrasenya per al XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4695,8 +4695,8 @@
 msgstr "No s'ha trobat l'element"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "l'ID Jabber est� mal format"
+msgid "Malformed XMPP ID"
+msgstr "l'ID XMPP est� mal format"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -4965,8 +4965,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Connector per al protocol Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Connector per al protocol XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -5008,8 +5008,8 @@
 msgstr "No s'ha pogut fer arribar el missatge a %s: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Missatge d'error de Jabber"
+msgid "XMPP Message Error"
+msgstr "Missatge d'error de XMPP"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12399,8 +12399,8 @@
 msgstr "hacker i conductor designat"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Desenvolupador de Jabber"
+msgid "XMPP developer"
+msgstr "Desenvolupador de XMPP"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12675,7 +12675,7 @@
 #: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12683,7 +12683,7 @@
 "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 "El %s 辿s un client de missatgeria instant�nia modular, capa巽 d'utilitzar els protocols AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, i QQ, tots alhora. Utilitza la biblioteca de programaci坦 GTK+.<BR><BR>Podeu modificar i redistribuir el programa sota els termes de la GPL (versi坦 2 o posterior). Hi ha una c嘆pia de la GPL dins del fitxer 'COPYING' que es distribueix amb el %s. Els drets d'autor del %s pertanyen als seus col揃laboradors. El fitxer 'COPYRIGHT' cont辿 una llista completa de tots els contribu誰dors. No us proporcionem cap mena de garantia amb aquest programa.<BR><BR>"
+msgstr "El %s 辿s un client de missatgeria instant�nia modular, capa巽 d'utilitzar els protocols AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, i QQ, tots alhora. Utilitza la biblioteca de programaci坦 GTK+.<BR><BR>Podeu modificar i redistribuir el programa sota els termes de la GPL (versi坦 2 o posterior). Hi ha una c嘆pia de la GPL dins del fitxer 'COPYING' que es distribueix amb el %s. Els drets d'autor del %s pertanyen als seus col揃laboradors. El fitxer 'COPYRIGHT' cont辿 una llista completa de tots els contribu誰dors. No us proporcionem cap mena de garantia amb aquest programa.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
@@ -15079,10 +15079,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Permet enviar dades en brut als protocols en mode text (Jabber, MSN, IRC, "
+"Permet enviar dades en brut als protocols en mode text (XMPP, MSN, IRC, "
 "TOC). Premeu la tecla de retorn a la caixa d'entrada per enviar-les. "
 "Observeu la finestra de depuraci坦."
 
@@ -16327,8 +16327,8 @@
 #~ msgid "Change password"
 #~ msgstr "Canvia la contrasenya"
 
-#~ msgid "Jabber ID"
-#~ msgstr "ID per al Jabber"
+#~ msgid "XMPP ID"
+#~ msgstr "ID per al XMPP"
 
 #~ msgid "Error processing event or response (%s)."
 #~ msgstr "S'ha produ誰t un error en processar una incid竪ncia o resposta (%s)."
@@ -16468,8 +16468,8 @@
 #~ msgid "Buddy Information for %s"
 #~ msgstr "Informaci坦 d'amic per a %s"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Perfil Jabber"
+#~ msgid "XMPP Profile"
+#~ msgstr "Perfil XMPP"
 
 #~ msgid "User Properties"
 #~ msgstr "Propietat de l'usuari"
--- a/po/ca@valencia.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ca@valencia.po	Tue May 01 05:53:57 2007 +0000
@@ -2570,8 +2570,8 @@
 msgstr "hacker i conductor designat"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Desenvolupador de Jabber"
+msgid "XMPP developer"
+msgstr "Desenvolupador de XMPP"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2849,8 +2849,8 @@
 msgstr "Quant al Gaim"
 
 #: ../gtk/gtkdialogs.c:335
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 Gaim.  Gaim 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 "El Gaim 辿s un client missatgeria instant�nia modular, capa巽 d'utilitzar els protocols AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, i QQ, tots alhora. Utilitza la biblioteca de programaci坦 GTK+.<BR><BR>Podeu modificar i redistribuir el programa sota els termes de la GPL (versi坦 2 o posterior). Hi ha una c嘆pia de la GPL dins del fitxer 'COPYING' que es distribueix amb el Gaim. Els drets d'autor del Gaim pertany als seus col揃laboradors. El fitxer 'COPYRIGHT' cont辿 una llista completa de tots els contribu誰dors. No us proporcionem cap mena de garantia amb este programa.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 Gaim.  Gaim 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 "El Gaim 辿s un client missatgeria instant�nia modular, capa巽 d'utilitzar els protocols AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, i QQ, tots alhora. Utilitza la biblioteca de programaci坦 GTK+.<BR><BR>Podeu modificar i redistribuir el programa sota els termes de la GPL (versi坦 2 o posterior). Hi ha una c嘆pia de la GPL dins del fitxer 'COPYING' que es distribueix amb el Gaim. Els drets d'autor del Gaim pertany als seus col揃laboradors. El fitxer 'COPYRIGHT' cont辿 una llista completa de tots els contribu誰dors. No us proporcionem cap mena de garantia amb este programa.<BR><BR>"
 
 #: ../gtk/gtkdialogs.c:350
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -5431,8 +5431,8 @@
 msgstr "Vos permet enviar dades en brut als protocols en mode text."
 
 #: ../gtk/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "Permet enviar dades en brut als protocols en mode text (Jabber, MSN, IRC, TOC). Premeu la tecla de retorn a la caixa d'entrada per a enviar-les. Observeu la finestra de depuraci坦."
+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 "Permet enviar dades en brut als protocols en mode text (XMPP, MSN, IRC, TOC). Premeu la tecla de retorn a la caixa d'entrada per a enviar-les. Observeu la finestra de depuraci坦."
 
 #: ../gtk/plugins/relnot.c:69
 #, c-format
@@ -6984,8 +6984,8 @@
 msgstr "Mode ps鱈quic per a converses entrants"
 
 #: ../libgaim/plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "Fa que apareguen finestres de conversa aix鱈 que altres usuaris vos comencen a enviar missatges. Funciona per a AIM, ICQ, Jabber, Sametime, i Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Fa que apareguen finestres de conversa aix鱈 que altres usuaris vos comencen a enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!"
 
 #: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -7238,8 +7238,8 @@
 msgstr "Compte AIM"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Compte Jabber"
+msgid "XMPP Account"
+msgstr "Compte XMPP"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -8325,8 +8325,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Edita la vCard del Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Edita la vCard del XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
@@ -8438,7 +8438,7 @@
 msgid "The following are the results of your search"
 msgstr "El que segueix s坦n els resultats de la vostra cerca"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1672
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
 msgstr "Trobeu un contacte entrant el criteri de la cerca en els camps indicats. Nota: cada camp permet car�cters que actuen de comod鱈 (%)"
@@ -8459,7 +8459,7 @@
 msgstr "Instruccions del servidor: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1734
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Introdu誰u un o m辿s camps per cercar usuaris que hi coincidisquen."
 
 #: ../libgaim/protocols/jabber/buddy.c:1754
@@ -8471,8 +8471,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1763
 #: ../libgaim/protocols/jabber/buddy.c:1764
-msgid "Search for Jabber users"
-msgstr "Cerca usuaris de Jabber"
+msgid "Search for XMPP users"
+msgstr "Cerca usuaris de XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:1778
 msgid "Invalid Directory"
@@ -8602,8 +8602,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "ID Jabber inv�lid"
+msgid "Invalid XMPP ID"
+msgstr "ID XMPP inv�lid"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8657,8 +8657,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "Registra un compte Jabber nou"
+msgid "Register New XMPP Account"
+msgstr "Registra un compte XMPP nou"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8721,8 +8721,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "Canvia la contrasenya per al Jabber"
+msgid "Change XMPP Password"
+msgstr "Canvia la contrasenya per al XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8776,8 +8776,8 @@
 msgstr "No s'ha trobat l'element"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "l'ID Jabber est� mal format"
+msgid "Malformed XMPP ID"
+msgstr "l'ID XMPP est� mal format"
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
@@ -9035,8 +9035,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "Connector per al protocol Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Connector per al protocol XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
@@ -9078,8 +9078,8 @@
 msgstr "No s'ha pogut fer arribar el missatge a %s: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Missatge d'error de Jabber"
+msgid "XMPP Message Error"
+msgstr "Missatge d'error de XMPP"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
@@ -15608,8 +15608,8 @@
 #~ msgstr "No s'ha pogut obrir el fitxer"
 #~ msgid "Change password"
 #~ msgstr "Canvia la contrasenya"
-#~ msgid "Jabber ID"
-#~ msgstr "ID per al Jabber"
+#~ msgid "XMPP ID"
+#~ msgstr "ID per al XMPP"
 #~ msgid "Error processing event or response (%s)."
 #~ msgstr "S'ha produ誰t un error en processar una incid竪ncia o resposta (%s)."
 #~ msgid "Unable to set AIM away message."
--- a/po/cs.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/cs.po	Tue May 01 05:53:57 2007 +0000
@@ -1218,8 +1218,8 @@
 #: ../plugins/psychic.c:24
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "Zp哲sob鱈, 転e okna konverzac鱈 se objev鱈, kdy転 v叩m jin鱈 u転ivatel辿 za�nou ps叩t zpr叩vu.  Funguje s AIM, ICQ, Jabber, Sametime a Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Zp哲sob鱈, 転e okna konverzac鱈 se objev鱈, kdy転 v叩m jin鱈 u転ivatel辿 za�nou ps叩t zpr叩vu.  Funguje s AIM, ICQ, XMPP, Sametime a Yahoo!"
 
 #: ../plugins/psychic.c:60
 msgid "You feel a disturbance in the force..."
@@ -1247,10 +1247,10 @@
 
 #: ../plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Nech叩 v叩s odeslat p�鱈m箪 vstup protokol哲m zalo転en箪m na textu (Jabber MSN, "
+"Nech叩 v叩s odeslat p�鱈m箪 vstup protokol哲m zalo転en箪m na textu (XMPP MSN, "
 "IRC, TOC). Pro odesl叩n鱈 stiskn�te 'Enter' ve vstupn鱈m poli. Sledujte ladic鱈 "
 "okno."
 
@@ -3267,8 +3267,8 @@
 msgstr "hacker a jmenovan箪 �idi� [l鱈n叩 k哲転e]"
 
 #: ../src/gtkdialogs.c:98
-msgid "Jabber developer"
-msgstr "v箪voj叩� Jabberu"
+msgid "XMPP developer"
+msgstr "v箪voj叩� XMPPu"
 
 #: ../src/gtkdialogs.c:99
 msgid "original author"
@@ -3460,14 +3460,14 @@
 #: ../src/gtkdialogs.c:254
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
 "and Gadu-Gadu 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 Gaim.  Gaim 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 "Gaim je modul叩rn鱈 klient IM schopn箪 z叩rove� pou転鱈vat AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, a Gadu-Gadu. Je naps叩n pomoc鱈 GTK+<BR><BR>Program m哲転ete upravovat a d叩le 邸鱈�it pod podm鱈nkami GPL (verze 2 nebo nov�j邸鱈). Kopie GPL je obsa転ena v souboru 'COPYING' dod叩van辿m s Gaim. Copyright Gaimu vlastn鱈 jeho spoluauto�i. Pro 炭pln箪 seznam spoluautor哲 viz soubor 'COPYRIGHT'. Pro tento program neposkytujeme 転叩dnou z叩ruku.<BR><BR>"
+msgstr "Gaim je modul叩rn鱈 klient IM schopn箪 z叩rove� pou転鱈vat AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, a Gadu-Gadu. Je naps叩n pomoc鱈 GTK+<BR><BR>Program m哲転ete upravovat a d叩le 邸鱈�it pod podm鱈nkami GPL (verze 2 nebo nov�j邸鱈). Kopie GPL je obsa転ena v souboru 'COPYING' dod叩van辿m s Gaim. Copyright Gaimu vlastn鱈 jeho spoluauto�i. Pro 炭pln箪 seznam spoluautor哲 viz soubor 'COPYRIGHT'. Pro tento program neposkytujeme 転叩dnou z叩ruku.<BR><BR>"
 
 #: ../src/gtkdialogs.c:268
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -6444,8 +6444,8 @@
 msgstr "Datum narozen鱈"
 
 #: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Upravit vCard Jabberu"
+msgid "Edit XMPP vCard"
+msgstr "Upravit vCard XMPPu"
 
 #: ../src/protocols/jabber/buddy.c:569
 msgid ""
@@ -6529,8 +6529,8 @@
 msgstr "V箪sledky va邸eho hled叩n鱈 jsou n叩sleduj鱈c鱈"
 
 #: ../src/protocols/jabber/buddy.c:1388
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Vypl�te jedno nebo v鱈ce pol鱈 pro hled叩n鱈 odpov鱈daj鱈c鱈ch u転ivatel哲 Jabberu."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Vypl�te jedno nebo v鱈ce pol鱈 pro hled叩n鱈 odpov鱈daj鱈c鱈ch u転ivatel哲 XMPPu."
 
 #: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
 #: ../src/protocols/oscar/oscar.c:6175 ../src/protocols/silc/ops.c:1024
@@ -6547,8 +6547,8 @@
 msgstr "E-mailov叩 adresa"
 
 #: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
-msgid "Search for Jabber users"
-msgstr "Hledat u転ivatele Jabberu"
+msgid "Search for XMPP users"
+msgstr "Hledat u転ivatele XMPPu"
 
 #: ../src/protocols/jabber/buddy.c:1431
 msgid "Invalid Directory"
@@ -6669,8 +6669,8 @@
 msgstr "Nemohu vytvo�it socket"
 
 #: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
-msgid "Invalid Jabber ID"
-msgstr "Neplatn辿 ID Jabberu"
+msgid "Invalid XMPP ID"
+msgstr "Neplatn辿 ID XMPPu"
 
 #: ../src/protocols/jabber/jabber.c:590
 #, c-format
@@ -6712,8 +6712,8 @@
 msgstr "Pro zaregistrov叩n鱈 va邸eho nov辿ho 炭�tu pros鱈m vypl�te informace n鱈転e."
 
 #: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
-msgid "Register New Jabber Account"
-msgstr "Zaregistrovat nov箪 炭�et Jabber"
+msgid "Register New XMPP Account"
+msgstr "Zaregistrovat nov箪 炭�et XMPP"
 
 #: ../src/protocols/jabber/jabber.c:983
 msgid "Initializing Stream"
@@ -6776,8 +6776,8 @@
 msgstr "Heslo (znovu)"
 
 #: ../src/protocols/jabber/jabber.c:1316 ../src/protocols/jabber/jabber.c:1317
-msgid "Change Jabber Password"
-msgstr "Zm�nit heslo Jabberu"
+msgid "Change XMPP Password"
+msgstr "Zm�nit heslo XMPPu"
 
 #: ../src/protocols/jabber/jabber.c:1317
 msgid "Please enter your new password"
@@ -6828,8 +6828,8 @@
 msgstr "Polo転ka nenalezena"
 
 #: ../src/protocols/jabber/jabber.c:1427
-msgid "Malformed Jabber ID"
-msgstr "Neplatn辿 ID Jabberu"
+msgid "Malformed XMPP ID"
+msgstr "Neplatn辿 ID XMPPu"
 
 #: ../src/protocols/jabber/jabber.c:1429
 msgid "Not Acceptable"
@@ -7093,8 +7093,8 @@
 #. *  summary
 #. *  description
 #: ../src/protocols/jabber/jabber.c:1882 ../src/protocols/jabber/jabber.c:1884
-msgid "Jabber Protocol Plugin"
-msgstr "Z叩suvn箪 modul protokolu Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Z叩suvn箪 modul protokolu XMPP"
 
 #: ../src/protocols/jabber/jabber.c:1910
 msgid "Use TLS if available"
@@ -7142,8 +7142,8 @@
 msgstr "Doru�en鱈 zpr叩vy pro %s selhalo: %s"
 
 #: ../src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Chyba zpr叩vy Jabberu"
+msgid "XMPP Message Error"
+msgstr "Chyba zpr叩vy XMPPu"
 
 #: ../src/protocols/jabber/message.c:300
 #, c-format
--- a/po/da.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/da.po	Tue May 01 05:53:57 2007 +0000
@@ -2547,8 +2547,8 @@
 msgstr "hacker and designated driver [lazy bum]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber udvikler"
+msgid "XMPP developer"
+msgstr "XMPP udvikler"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2823,8 +2823,8 @@
 msgstr "Om Gaim"
 
 #: ../gtk/gtkdialogs.c:335
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 Gaim.  Gaim 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 "Gaim er en modul脱r beskeds-klient, der underst淡tter AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu og QQ p奪 samme tid. Det er skrevet i GTK+.<BR><BR>Du m奪 modificere og redistribuere programmet under de betingelser givet af GPL (version 2 eller senere). En kopi af GPL er indeholdt i 'COPYING' filen som blev distribueret med Gaim. Gaim er ophavsret af dens bidragsydere. Se 'COPYRIGHT' filen for den komplette liste af bidragsydere. Vi giver ingen garanti for dette program.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 Gaim.  Gaim 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 "Gaim er en modul脱r beskeds-klient, der underst淡tter AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu og QQ p奪 samme tid. Det er skrevet i GTK+.<BR><BR>Du m奪 modificere og redistribuere programmet under de betingelser givet af GPL (version 2 eller senere). En kopi af GPL er indeholdt i 'COPYING' filen som blev distribueret med Gaim. Gaim er ophavsret af dens bidragsydere. Se 'COPYRIGHT' filen for den komplette liste af bidragsydere. Vi giver ingen garanti for dette program.<BR><BR>"
 
 #: ../gtk/gtkdialogs.c:350
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -5395,8 +5395,8 @@
 msgstr "Giver dig mulighed for at sende r奪 inddata til text-baserede protokoller."
 
 #: ../gtk/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "Giver dig mulighed for at sende r奪 inddata til text-baserede protokoller (Jabber, MSN, IRC, TOC. Tryk 'Enter' i tekstfeltet for at sende. Hold 淡je med fejls淡gningsvinduet."
+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 "Giver dig mulighed for at sende r奪 inddata til text-baserede protokoller (XMPP, MSN, IRC, TOC. Tryk 'Enter' i tekstfeltet for at sende. Hold 淡je med fejls淡gningsvinduet."
 
 #: ../gtk/plugins/relnot.c:69
 #, c-format
@@ -6940,8 +6940,8 @@
 msgstr "Synsk tilstand for indg奪ende samtaler"
 
 #: ../libgaim/plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "F奪r samtalevinduer til at dukke frem n奪r andre brugere begynder at skrive til dig. Dette virker med AIM, ICQ, Jabber, Sametime og Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "F奪r samtalevinduer til at dukke frem n奪r andre brugere begynder at skrive til dig. Dette virker med AIM, ICQ, XMPP, Sametime og Yahoo!"
 
 #: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -7194,8 +7194,8 @@
 msgstr "AIM-konto"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Jabber-konto"
+msgid "XMPP Account"
+msgstr "XMPP-konto"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -8280,8 +8280,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Redig辿r Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Redig辿r XMPP vCard"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
@@ -8393,7 +8393,7 @@
 msgid "The following are the results of your search"
 msgstr "Det f淡lgende er resultaterne p奪 din s淡gning"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1672
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
 msgstr "Find en kontakt ved at indtaste s淡gekriterien i de givne felter. Bem脱rk: Hver felt underst淡tter joker-s淡gninger (%)"
@@ -8414,8 +8414,8 @@
 msgstr "Server instruktioner: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1734
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Udfyld et eller flere felter for at s淡ge efter Jabber brugere."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Udfyld et eller flere felter for at s淡ge efter XMPP brugere."
 
 #: ../libgaim/protocols/jabber/buddy.c:1754
 #: ../libgaim/protocols/novell/novell.c:1488
@@ -8426,8 +8426,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1763
 #: ../libgaim/protocols/jabber/buddy.c:1764
-msgid "Search for Jabber users"
-msgstr "S淡g efter Jabber brugere"
+msgid "Search for XMPP users"
+msgstr "S淡g efter XMPP brugere"
 
 #: ../libgaim/protocols/jabber/buddy.c:1778
 msgid "Invalid Directory"
@@ -8557,8 +8557,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "Ugyldigt Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Ugyldigt XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8612,8 +8612,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "Registr辿r ny Jabber konto"
+msgid "Register New XMPP Account"
+msgstr "Registr辿r ny XMPP konto"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8676,8 +8676,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "Skift Jabber adgangskode"
+msgid "Change XMPP Password"
+msgstr "Skift XMPP adgangskode"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8731,8 +8731,8 @@
 msgstr "Punkt ikke fundet"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "Ugyldigt Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Ugyldigt XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
@@ -8989,8 +8989,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber protokolmodul"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP protokolmodul"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
@@ -9032,8 +9032,8 @@
 msgstr "Beskedlevering til %s fejlede: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Jabber beskedfejl"
+msgid "XMPP Message Error"
+msgstr "XMPP beskedfejl"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/de.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/de.po	Tue May 01 05:53:57 2007 +0000
@@ -2770,10 +2770,10 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "�ffnet Gespr辰chsfenster, wenn andere Benutzer beginnen, Ihnen eine Nachricht "
-"zu senden.  Das funktioniert mit AIM, ICQ, Jabber, Sametime und Yahoo!"
+"zu senden.  Das funktioniert mit AIM, ICQ, XMPP, Sametime und Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -3051,8 +3051,8 @@
 msgstr "AIM-Konto"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber-Konto"
+msgid "XMPP Account"
+msgstr "XMPP-Konto"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4235,8 +4235,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard bearbeiten"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard bearbeiten"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4351,7 +4351,7 @@
 msgid "The following are the results of your search"
 msgstr "Dies sind die Ergebnisse Ihrer Suche"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4376,9 +4376,9 @@
 msgstr "Anleitung vom Server: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-"F端llen sie ein oder mehrere Felder aus, um nach entsprechenden Jabber-"
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+"F端llen sie ein oder mehrere Felder aus, um nach entsprechenden XMPP-"
 "Benutzern zu suchen."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
@@ -4390,8 +4390,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Nach Jabber-Benutzern suchen"
+msgid "Search for XMPP users"
+msgstr "Nach XMPP-Benutzern suchen"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4535,8 +4535,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Ung端ltige Jabber-ID"
+msgid "Invalid XMPP ID"
+msgstr "Ung端ltige XMPP-ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4592,8 +4592,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Registrierung eines neuen Jabber-Kontos"
+msgid "Register New XMPP Account"
+msgstr "Registrierung eines neuen XMPP-Kontos"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4667,8 +4667,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "�ndere das Jabber-Passwort"
+msgid "Change XMPP Password"
+msgstr "�ndere das XMPP-Passwort"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4722,8 +4722,8 @@
 msgstr "Eintrag nicht gefunden"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Falsche Jabber-ID"
+msgid "Malformed XMPP ID"
+msgstr "Falsche XMPP-ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -4992,8 +4992,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1977
 #: ../libpurple/protocols/jabber/jabber.c:1979
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber-Protokoll-Plugin"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP-Protokoll-Plugin"
 
 #: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Force old (port 5223) SSL"
@@ -5035,8 +5035,8 @@
 msgstr "Nachrichtenzustellung an %s fehlgeschlagen: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber Nachrichtenfehler"
+msgid "XMPP Message Error"
+msgstr "XMPP Nachrichtenfehler"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12533,8 +12533,8 @@
 msgstr "Grafische Benutzeroberfl辰che"
 
 #: ../pidgin/gtkdialogs.c:114
-msgid "Jabber developer"
-msgstr "Jabber-Entwickler"
+msgid "XMPP developer"
+msgstr "XMPP-Entwickler"
 
 #: ../pidgin/gtkdialogs.c:115
 msgid "original author"
@@ -12803,7 +12803,7 @@
 #: ../pidgin/gtkdialogs.c:360
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12812,7 +12812,7 @@
 "'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
-"%s ist ein modularer Nachrichtendienst, der AIM, MSN, Yahoo!, Jabber, ICQ, "
+"%s ist ein modularer Nachrichtendienst, der AIM, MSN, Yahoo!, XMPP, ICQ, "
 "IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
 "Gadu-Gadu und QQ gleichzeitig unterst端tzt.  Er wird mit GTK+ entwickelt."
 "<BR><BR>Sie k旦nnen das Programm nach den Bedingungen der GPL (Version 2 oder "
@@ -15237,10 +15237,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Erlaubt Ihnen Rohdaten an textbasierte Protokolle (Jabber, MSN, IRC, TOC) zu "
+"Erlaubt Ihnen Rohdaten an textbasierte Protokolle (XMPP, MSN, IRC, TOC) zu "
 "senden. Dr端cken Sie die 'Enter'-Taste im Eingabefeld zum Senden. Beachten "
 "Sie das Debug-Fenster."
 
--- a/po/dz.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/dz.po	Tue May 01 05:53:57 2007 +0000
@@ -2445,7 +2445,7 @@
 msgstr "狃�狃��犲�狃�狃�狆迦充狃�狃��狃�狃迦�狃�狃�犲�狃�狃�狆迦什狃�犲�狃�狆園什狃�犲�狃�狃�狃酌�犲�狃��狆迦讐狃�犲�狃�狃�狃�犲�狃�狃�狃�狃� [狃�什犲�狃�充犲�狃�狃� bum]"
 
 #: ../gtk/gtkdialogs.c:107
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "狃�狃材�犲�狃�狃∇�狃�狃�狃酌�狃�狃迦�"
 
 #: ../gtk/gtkdialogs.c:108
@@ -2709,7 +2709,7 @@
 msgstr "狃�狃園什狃�犲�狃�狆園讐犲�狃��狃酌就犲�狃�拾"
 
 #: ../gtk/gtkdialogs.c:329
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, 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 Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, 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 Gaim.  Gaim 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 "狃�狃材�犲�狃�狃�狃迦� 狃�什犲�狃��狃迦�狃�什狃�犲� 狃�什狃�犲�狃�什狃�讐犲�狃�什狃�犲� 狃÷�狃о輯犲�! 狃�狃材�犲�狃�狃∇� 狃��狃迦�狃�讐犲�狃�狃迦�狃巌� 狃��狃迦�狃�就犲�狃�讐犲� 狃�什狃�讐犲�狃��狃迦�狃�什狃��狃�讐犲� 狃�狃酌�狃�狃材州犲�狃�勝狃材�狃∇讐狃�犲� 狃�充犲�狃�狃�讐犲�狃�狃巌拾犲�狃�狃�狃迦�犲�狃�犲� 狃�狃材�狃�狃迦�狃∇� 狃�犲�狃�狃巌�-狃�犲�狃�狃巌� 狃�狃�犲� 狃�狃迦�狃巌�狃�狃迦�狃巌�狃�狃巌�狃�犲�狃�狃�狃�犲�狃∇�犲� 狃�狃∇�狃�狃�狃迦�犲�狃�狃巌�狃�輯犲�狃��犲�狃�什狃�犲�狃�狃�狃�犲�狃�狃迦�狃迦�狃��狃酌�狃��狃�狆迦輯狃�犲�狃÷充狃�犲�狃�狃�狃迦� 狃�狃�狆迦讐狃�犲�狃�狃蹱酌�犲�狃�狃�狃��狃蹱酌�犲�狃�召狆園充狃�犲�狃�狃迦�狃�商狆園充狃�犲�狃�狃�犲�狃�狃�狃迦�犲�狃�讐狃�犲� 狃�狃�狃迦� 狃�狃迦�狃�狃迦�狃�狃材�+ 狃��犲�狃�什狃�犲�狃�狃�狃�犲�狃�狃酌�犲�狃�拾犲�狃�狃�狆迦讐犲�狃÷充狃�狃�犲�狃�讐狃�犲� <BR><BR> 狃�狆園充狃�犲�狃�狆園讐狃�� 狃�拾犲�狃∇讐狃�犲�狃�狃�狃迦� 狃�狃迦�狃�狃迦�狃�什狃�� (狃�狃酌�犲�狃∇讐狃�犲� 犲� 狃÷�犲�狃�犲�狃む輯狃��狃�拾犲�) 狃�犲�狃��狃�犲�狃�狃巌�狃迦�狃�狃酌�犲�狃�輯犲� 狃�什狃�狃��狃�狃�狃酌拾犲�狃�狃�狃�犲�狃�狃材�狃�充狃�犲�狃�狃�狃酌�狃�狃�狆迦�犲�狃�狃�狃�犲�狃�狃蹱巌�犲�狃�讐狃�犲� 狃�狃迦�狃�狃迦�狃�什狃��狃�狆園讐犲�狃�狃�狆迦�狃�狃む輯狃��狃�狃�狃迦�犲� 'COPYING' 狃÷讐狃�犲�狃�升狃酌�犲�狃�狃�犲�狃む充狃�犲�狃蹱材�狃÷充狃�狃�犲�狃�狃�犲�狃�狃材�犲�狃�狃�犲�狃�狃�狃迦�犲�狃�狃∇�狃�狃�狃酌�狃�狃�狆迦�犲�狃�狃�狃�犲�狃�狃材�狃÷充狃�犲� 狃�狃材�犲�狃�狃�狃迦� 狃�狃材�狃迦� 狃�狆迦充狃�狃��狃∇�犲�狃�狃�狃�犲�狃�狃迦�狃�狃巌�狃�狃迦拾犲� 狃�狃�狃�犲�狃�狃�狃�犲�狃�狃酌�犲�狃��狃材�狃÷充狃�狃�犲�狃�讐狃�犲� 狃�狆迦充狃�狃��狃∇�犲�狃�犲�狃�狃巌�狃迦�狃�狃酌�狃÷讐狃�犲�狃÷充狃�狃��狃∇娼狃酌�狃��狃�狃酌�犲�狃�輯犲� 'COPYRIGHT' 狃÷讐狃�犲�狃�升狃酌�犲�狃�狃��犲� 狃�犲�狃�狃�狃��狃�狆園讐狃�� 狃�拾犲�狃∇讐狃�犲�狃�狃材�狃迦�狃�狃酌�犲�狃�輯犲� 狃�狃材�犲�狃�什狃�犲�狃�狆園讐狃�犲�狃�狃迦�狃�狃材�狃�犲�狃�讐狃�犲�<BR><BR>"
 
 #: ../gtk/gtkdialogs.c:343
@@ -5186,7 +5186,7 @@
 msgstr "狃�狃�狃迦�狃�狃�狃�犲�狃�狃迦�犲�狃÷讐狃�犲�狃�狃�狃�犲�狃�召狃材州犲�狃��犲�狃�輯狃�狃��狃�狃巌�狃�輯犲�狃∇�狃��狃�犲�狃�讐狃�犲�狃�狃巌�狃迦�狃�狃蹱�犲�狃�狃�狃巌�狃�犲�狃�讐狃�犲�"
 
 #: ../gtk/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+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 "狃�狃�狃迦�狃�狃�狃�犲�狃�狃迦�犲�狃÷讐狃�犲�狃�狃�狃�犲�狃�召狃材州犲�狃��犲�狃�輯狃�狃��狃�狃巌�狃�輯犲�狃∇�狃��狃�犲�狃�讐狃�犲�狃�狃巌�狃迦�狃�狃蹱�犲�狃�狃�狃巌�狃�犲�狃�讐狃�(狃�狃材�犲�狃�狃∇� 狃�什狃�犲�狃�什狃�讐犲�狃�什狃�犲� 狃��狃迦�狃�就犲�狃�讐犲� 狃�狃迦�狃�充犲�狃�讐)狃�狃�狃迦�狃�狃蹱�犲�狃�狃迦�狃迦�狃�狃酌�犲�狃�輯犲�狃�狃酌�狃�狃�狃酌�犲�狃��狆迦充狃�犲�狃�狃�犲�狃�輯犲� '狃�什狃�犲�狃�狃�' 狃�狃�狃迦�狃�什狃�犲� 狃∇�狆園什狃�犲�狃�什狃��狃��狃酌�狃��狆迦讐狃�犲�狃�狃�狃迦�狃�狃��犲�"
 
 #: ../gtk/plugins/relnot.c:69
@@ -6392,7 +6392,7 @@
 msgstr "狃�狃�犲�狃�狃�狆園充狃∇�狃�狃�狃�犲�狃�狃�狃迦�狃�狆迦充狃��狃�狆橿什狃�犲�狃�狃酌�犲�狃�輯犲�狃�什狃�狃��狃�狃�狃��狃�狃�犲�狃�狃�狆迦什狃��狃�狃�狃迦�狃�狃�狃��狃��犲�"
 
 #: ../libgaim/plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr "狃��犲�狃�什狃�犲�狃�犲�狃�狃�狃�犲�狃�狃迦�狃�狃巌�狃�狃迦拾犲�狃�狆園充狃�犲�狃�輯犲�狃�狃�狆迦讐狃�犲�狃�狃酌�犲�狃�狃蹱�犲�狃�狃迦�狃�狃�狃酌�狃�狃�狃巌�狃��犲�狃�犲� 狃�狆迦充狃��狃�狆橿什狃�犲�狃�狃迦�犲�狃�狃酌�狃�讐犲�狃�狃巌�狃�狃�狆園輯狃�犲�狃�狃迦�狃�輯犲�狃∇�狆園輯犲�狃∇�狆園什狃�犲�狃�狃�狃�狃�犲�狃�讐狃�犲� 狃�犲�狃�狃迦�狃�狃迦拾犲� 狃�什犲�狃��狃迦�狃�什狃�犲� 狃��狃迦�狃�讐犲�狃�狃迦�狃巌� 狃�狃材�犲�狃�狃∇� 狃�狃巌拾犲�狃�狃酌�犲�狃�狃�狃迦�犲�狃�犲�狃�狃�犲� 狃÷�狃о輯犲�狃�輯犲� 狃�襲犲�狃�狃�狃�狃�犲�狃�讐狃�犲�!"
 
 #. This is a quote from Star Wars.  You should
@@ -6663,7 +6663,7 @@
 msgstr "狃�什犲�狃��狃迦�狃�什狃�犲� 狃∇奨狃迦拾犲�狃�狃酌�"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:593
-msgid "Jabber Account"
+msgid "XMPP Account"
 msgstr "狃�狃材�犲�狃�狃∇�狃∇奨狃迦拾犲�狃�狃酌�"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
@@ -7773,7 +7773,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr "狃�狃�犲�狃�狃∇� 狃�狃迦�狃む充狃�犲�狃�狆園�犲� 狃�狃巌�犲�狃�狃�犲�狃�狃�狃�犲�"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
@@ -7889,7 +7889,7 @@
 msgid "The following are the results of your search"
 msgstr "狃�狃酌�犲�狃�輯犲�狃÷充狃�犲�狃�狃迦�狃�狃巌� 狃�狆園充狃�犲�狃�狆園讐犲�狃�狃�狃酌州犲�狃�狃迦�犲�狃�狆園讐犲�狃�狆迦輯狃�犲�狃�狃�狆迦拾犲�狃�狃巌�狃�讐狃�犲�"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1631
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
 msgstr "狃�狆園讐狃�犲�狃蹱材�狃÷充狃�犲�狃�狃�狃迦� 狃��狃��狃酌�狃�狃巌�狃�狃�犲� 狃�狃�狃酌州犲�狃�狃迦�犲�狃�狆園�犲�狃�狃�犲�狃�狃�狃巌�狃��狃�狃酌�犲�狃�拾犲�狃�狃�狆迦什狃��狃��狃�狃�狃酌州犲� 狃�狆迦�犲�狃�狃�狃酌�: 狃��狃��狃酌�狃∇什犲�狃∇什犲�狃�狃迦拾犲� 狃�狃�狃迦州犲�狃�狃�狃迦拾狃迦�狃�狃�狃酌州犲�狃�狃迦�犲�狃�狃巌�狃∇�狆園�犲�狃��狆園充狃∇�狃�狃�狃�狃�犲�狃�讐狃�犲� (%)"
@@ -7910,7 +7910,7 @@
 msgstr "狃�就犲�狃�狃∇�狃�狃�廠狃�犲�狃��狃酌�犲�狃�狃巌�: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1693
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "狃�狃�狃巌�犲�狃�狃�狃迦�狃�狃材�犲�狃�狃∇�狃��犲�狃�什狃�犲�狃�犲�狃�狃巌�狃�狃�狃酌州犲�狃�狃迦�犲�狃�狃�狃�犲�狃�狃迦�狃迦�狃�狃酌�犲�狃�輯犲� 狃��狃��狃酌�狃�狃�狃迦�犲�狃÷�犲�狃�犲�狃�狃�狃�犲�狃�狃�狃�犲�犲�"
 
 #: ../libgaim/protocols/jabber/buddy.c:1713
@@ -7922,7 +7922,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1722
 #: ../libgaim/protocols/jabber/buddy.c:1723
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "狃�狃材�犲�狃�狃∇�狃��犲�狃�什狃�犲�狃�犲�狃�狃巌�狃�輯犲�狃�狃�狃酌州犲�狃�狃迦�犲�狃�狃�狃�犲�"
 
 #: ../libgaim/protocols/jabber/buddy.c:1737
@@ -8054,7 +8054,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:545
 #: ../libgaim/protocols/jabber/jabber.c:888
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr "狃�狃巌拾犲�狃�狃材�犲� 狃�狃�犲�狃�狃� 狃��狃迦�狃�狃迦�"
 
 #: ../libgaim/protocols/jabber/jabber.c:616
@@ -8109,7 +8109,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:851
 #: ../libgaim/protocols/jabber/jabber.c:852
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "狃�狃∇�狃�狃∇�狃∇奨狃迦拾犲�狃�狃酌�狃�狃�就狃�犲� 狃�狃酌�狃�狃�狃酌�犲�狃�狃�狃�犲�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1013
@@ -8173,7 +8173,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1349
 #: ../libgaim/protocols/jabber/jabber.c:1350
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "狃�狃�犲�狃�狃∇�狃�狃酌�犲�狃÷讐狃�犲� 狃�狃��狆園輯狃∇�狃�狃�狃酌拾犲�狃�狃�狃�犲�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1350
@@ -8228,7 +8228,7 @@
 msgstr "狃∇升狃�犲�狃�狆迦�狃��狃�犲�狃�狃酌�犲�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1460
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr "狃�狃�狃酌�狃�狆園輯狃∇�狃�狃�狃迦� 狃�狃�犲�狃�狃∇� 狃��狃迦�狃�狃迦�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1462
@@ -8486,7 +8486,7 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1948
 #: ../libgaim/protocols/jabber/jabber.c:1950
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr "狃�狃�犲�狃�狃∇�狃�狃�狃�犲�狃�召狃材州犲�狃��犲�狃�輯狃�狃�� 狃�狃�犲�狃�狃��狆園充狃�犲�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1976
@@ -8529,7 +8529,7 @@
 msgstr "%s 狃�輯犲�狃�狃�狆迦讐狃�犲�狃�狃酌�犲�狃�狃�狆迦什狃�犲�狃�召狃材州犲�狃�狃�狃�犲�狃�狃迦�狃�狃�狃巌拾犲�狃む充狃∇�狃�狆園輯狃�犲�狃÷充狃�狃�犲�%s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr "狃�狃�犲�狃�狃∇�狃�狃�狆迦讐狃�犲�狃�狃酌�犲�狃�狃�狃酌州犲�狃�犲�"
 
 #: ../libgaim/protocols/jabber/message.c:316
@@ -14932,7 +14932,7 @@
 #~ msgstr "<span weight=\"bold\" size=\"larger\">狃�狃園什狃� v%s</span>"
 #~ msgid ""
 #~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
 #~ "all at once.  It is written using Gtk+ and is licensed under the GPL."
 #~ "<BR><BR>"
 #~ msgstr ""
@@ -15277,9 +15277,9 @@
 #~ msgstr ""
 #~ "狃�狃�犲�狃�狃��狆園充狃�犲�狃�狆園讐犲�狃�狃酌�犲�狃�拾犲� 狃�就犲�狃�狃∇�狃�輯犲� 狃蹱迦�狃�什狃��狃�什狃�讐/狃�什狃�讐犲�狃�什狃�讐犲�狃�什狃�� 狃�狃�狃酌拾犲�狃�狃�狃酌�狃÷充狃�狃�犲�狃�讐狃�犲� 狃∇奨狃迦拾犲�狃�狃酌�狃迦�狃∇�狆園輯犲�狃�狃�狃酌拾犲�狃�狃�犲�"
 #~ "狃�拾 \"狃�狃酌�犲�狃�狃巌�狃��狃�犲�狃�狃迦�犲� 狃�狃迦�狃�什狃��狃�什狃�讐犲� 狃��犲�狃�什狃�犲�狃�狃�狃�\"  狃�什狃��狃�狃�狃巌�狃�狃�狃�犲�"
-#~ msgid "Jabber ID"
+#~ msgid "XMPP ID"
 #~ msgstr "狃�狃�犲�狃�狃∇�狃��狃迦�狃�狃迦�"
-#~ msgid "Jabber Profile"
+#~ msgid "XMPP Profile"
 #~ msgstr "狃�狃�犲�狃�狃∇�狃�狃�州犲�狃�勝狃巌�犲�"
 #~ msgid "Roomlist Error"
 #~ msgstr "狃�狃�犲�狃�狃迦�犲�狃�狃酌�狃÷讐狃�犲�狃�狃迦�狃�狃�狃酌州犲�狃�犲�"
--- a/po/el.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/el.po	Tue May 01 05:53:57 2007 +0000
@@ -2316,8 +2316,8 @@
 msgstr "�略虜竜� 虜留旅 凌隆侶粒略�留 [�竜亮�劉了留�凌�]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "��竜�慮�僚凌� 留僚略���両侶� �凌� Jabber"
+msgid "XMPP developer"
+msgstr "��竜�慮�僚凌� 留僚略���両侶� �凌� XMPP"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2549,7 +2549,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2558,7 +2558,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "里凌 Gaim 竜溜僚留旅 劉僚留� 竜�亮竜�略硫了侶�凌� �竜了略�侶� 留僚�留了了留粒流� 亮侶僚�亮略��僚 �凌� 亮�凌�竜溜 僚留 "
-"��侶�旅亮凌�凌旅竜溜 �留 AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu 虜留旅 QQ, �了留 �留�����凌僚留.  �溜僚留旅 粒�留亮亮劉僚凌 亮竜 �侶 ��流�侶 GTK+.<BR><BR>��凌�竜溜�竜 僚留 ��凌�凌�凌旅流�竜�竜 虜留旅 僚留 "
+"��侶�旅亮凌�凌旅竜溜 �留 AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu 虜留旅 QQ, �了留 �留�����凌僚留.  �溜僚留旅 粒�留亮亮劉僚凌 亮竜 �侶 ��流�侶 GTK+.<BR><BR>��凌�竜溜�竜 僚留 ��凌�凌�凌旅流�竜�竜 虜留旅 僚留 "
 "留僚留隆旅留僚竜溜亮竜�竜 �凌 ���粒�留亮亮留 ��� �凌�� ��凌�� �侶� 略隆竜旅留� ��流�侶� GPL (劉虜隆凌�侶 2 流 "
 "僚竜��竜�侶).  �僚留 留僚�溜粒�留�凌 �侶� 略隆竜旅留� ��流�侶� GPL �竜�旅劉�竜�留旅 ��凌 留��竜溜凌 COPYING "
 "�凌� 隆旅留僚劉亮竜�留旅 亮留龍溜 亮竜 �凌 Gaim.  里凌 Gaim 竜溜僚留旅 �僚竜�亮留�旅虜流 旅隆旅凌虜�侶�溜留 ��僚 "
@@ -5158,11 +5158,11 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "裡留� 竜�旅��劉�竜旅 僚留 ��劉了僚竜�竜 留虜留�劉�粒留��侶 竜溜�凌隆凌 �竜 �����虜凌了了留 硫留�旅�亮劉僚留 �竜 "
-"虜竜溜亮竜僚凌. (Jabber, MSN, IRC, TOC). �留�流��竜 'Enter' ��凌 �留�略慮��凌 竜旅��隆凌� 粒旅留 "
+"虜竜溜亮竜僚凌. (XMPP, MSN, IRC, TOC). �留�流��竜 'Enter' ��凌 �留�略慮��凌 竜旅��隆凌� 粒旅留 "
 "僚留 ��竜溜了竜�竜.  �了劉粒両�竜 �凌 �留�略慮��凌 留�凌��留了亮略���侶�."
 
 #: ../gtk/plugins/relnot.c:69
@@ -6755,10 +6755,10 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "��凌虜留了竜溜 �侶僚 竜亮�略僚旅�侶 �留�留慮���僚 ��龍流�侶�侶� ��留僚 凌旅 略了了凌旅 ��流��竜� �留� ��劉了僚凌�僚 "
-"亮侶僚�亮留�留.  ���� 隆凌�了竜�竜旅 粒旅留 �凌 AIM, �凌 ICQ, �凌 Jabber, �凌 Sametime 虜留旅 �凌 "
+"亮侶僚�亮留�留.  ���� 隆凌�了竜�竜旅 粒旅留 �凌 AIM, �凌 ICQ, �凌 XMPP, �凌 Sametime 虜留旅 �凌 "
 "Yahoo!"
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7010,8 +7010,8 @@
 msgstr "�凌粒留�旅留�亮�� AIM"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "�凌粒留�旅留�亮�� Jabber"
+msgid "XMPP Account"
+msgstr "�凌粒留�旅留�亮�� XMPP"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -8124,8 +8124,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "��竜両竜�粒留�溜留 Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "��竜両竜�粒留�溜留 XMPP vCard"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8240,7 +8240,7 @@
 msgid "The following are the results of your search"
 msgstr "里留 留虜�了凌�慮留 竜溜僚留旅 �留 留�凌�竜了劉�亮留�留 �侶� 留僚留龍流�侶�流� �留�"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8263,9 +8263,9 @@
 msgstr "�隆侶粒溜竜� 竜両��侶�竜�侶�流: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-"裡�亮�了侶����竜 劉僚留 流 �竜�旅����竜�留 �竜隆溜留 粒旅留 �侶僚 留僚留龍流�侶�侶 ��侶���僚 Jabber �凌� "
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+"裡�亮�了侶����竜 劉僚留 流 �竜�旅����竜�留 �竜隆溜留 粒旅留 �侶僚 留僚留龍流�侶�侶 ��侶���僚 XMPP �凌� "
 "�留旅�旅略龍凌�僚."
 
 #: ../libgaim/protocols/jabber/buddy.c:1749
@@ -8277,8 +8277,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1758
 #: ../libgaim/protocols/jabber/buddy.c:1759
-msgid "Search for Jabber users"
-msgstr "�僚留龍流�侶�侶 ��侶���僚 Jabber"
+msgid "Search for XMPP users"
+msgstr "�僚留龍流�侶�侶 ��侶���僚 XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
@@ -8407,8 +8407,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "�侶 劉粒虜��凌 Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "�侶 劉粒虜��凌 XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8463,8 +8463,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "�留�留���侶�侶 僚劉凌� 了凌粒留�旅留�亮凌� Jabber"
+msgid "Register New XMPP Account"
+msgstr "�留�留���侶�侶 僚劉凌� 了凌粒留�旅留�亮凌� XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8527,8 +8527,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "�了了留粒流 虜�隆旅虜凌� Jabber"
+msgid "Change XMPP Password"
+msgstr "�了了留粒流 虜�隆旅虜凌� XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8582,8 +8582,8 @@
 msgstr "里凌 留僚�旅虜竜溜亮竜僚凌 隆竜 硫�劉慮侶虜竜"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "�留�留亮凌���亮劉僚凌 Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "�留�留亮凌���亮劉僚凌 XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
@@ -8848,8 +8848,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "����慮竜�凌 ����凌虜�了了凌� Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "����慮竜�凌 ����凌虜�了了凌� XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
@@ -8891,8 +8891,8 @@
 msgstr "�竜�留�凌�略 亮侶僚�亮留�凌� �竜 %s 留�劉���竜: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "裡�略了亮留 亮侶僚�亮留�凌� Jabber"
+msgid "XMPP Message Error"
+msgstr "裡�略了亮留 亮侶僚�亮留�凌� XMPP"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/en_AU.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/en_AU.po	Tue May 01 05:53:57 2007 +0000
@@ -849,10 +849,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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."
 
 #: plugins/relnot.c:63
@@ -2822,8 +2822,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "former Jabber developer"
+msgid "XMPP developer"
+msgstr "former XMPP developer"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -2996,11 +2996,11 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:235
@@ -5001,7 +5001,7 @@
 #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "Register New Jabber Account"
+msgstr "Register New XMPP Account"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
@@ -5723,8 +5723,8 @@
 msgstr "Birthday"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Edit XMPP vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5735,8 +5735,8 @@
 "comfortable."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5814,7 +5814,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5833,7 +5833,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "Search for a buddy by e-mail address"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5959,8 +5959,8 @@
 msgstr "Unable to create socket"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Invalid XMPP ID"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6006,8 +6006,8 @@
 msgstr "Please fill out the information below to register your new account."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "Register New Jabber Account"
+msgid "Register New XMPP Account"
+msgstr "Register New XMPP Account"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6079,8 +6079,8 @@
 msgstr "Password (again)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Change Jabber Password"
+msgid "Change XMPP Password"
+msgstr "Change XMPP Password"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6130,8 +6130,8 @@
 msgstr "Item Not Found"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Malformed XMPP ID"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6377,8 +6377,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protocol Plugin"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6428,8 +6428,8 @@
 msgstr "Message delivery to %s failed: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber Message Error"
+msgid "XMPP Message Error"
+msgstr "XMPP Message Error"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12182,8 +12182,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Invalid Username"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber Profile"
+#~ msgid "XMPP Profile"
+#~ msgstr "XMPP Profile"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Roomlist Error"
--- a/po/en_CA.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/en_CA.po	Tue May 01 05:53:57 2007 +0000
@@ -849,10 +849,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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."
 
 #: plugins/relnot.c:63
@@ -2818,8 +2818,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "former Jabber developer"
+msgid "XMPP developer"
+msgstr "former XMPP developer"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -2992,11 +2992,11 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licenced under the GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:235
@@ -4996,7 +4996,7 @@
 #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "Register New Jabber Account"
+msgstr "Register New XMPP Account"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
@@ -5717,8 +5717,8 @@
 msgstr "Birthday"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Edit XMPP vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5729,8 +5729,8 @@
 "comfortable."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5808,7 +5808,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5827,7 +5827,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "Search for a buddy by e-mail address"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5953,8 +5953,8 @@
 msgstr "Unable to create socket"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Invalid XMPP ID"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6000,8 +6000,8 @@
 msgstr "Please fill out the information below to register your new account."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "Register New Jabber Account"
+msgid "Register New XMPP Account"
+msgstr "Register New XMPP Account"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6073,8 +6073,8 @@
 msgstr "Password (again)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Change Jabber Password"
+msgid "Change XMPP Password"
+msgstr "Change XMPP Password"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6124,8 +6124,8 @@
 msgstr "Item Not Found"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Malformed XMPP ID"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6371,8 +6371,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protocol Plugin"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6422,8 +6422,8 @@
 msgstr "Message delivery to %s failed: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber Message Error"
+msgid "XMPP Message Error"
+msgstr "XMPP Message Error"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12162,8 +12162,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Invalid Username"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber Profile"
+#~ msgid "XMPP Profile"
+#~ msgstr "XMPP Profile"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Roomlist Error"
--- a/po/en_GB.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/en_GB.po	Tue May 01 05:53:57 2007 +0000
@@ -2744,10 +2744,10 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -3025,8 +3025,8 @@
 msgstr "AIM Account"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber Account"
+msgid "XMPP Account"
+msgstr "XMPP Account"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4204,8 +4204,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Edit XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4320,7 +4320,7 @@
 msgid "The following are the results of your search"
 msgstr "The following are the results of your search"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4345,8 +4345,8 @@
 msgstr "Server Instructions: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Fill in one or more fields to search for any matching XMPP users."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4357,8 +4357,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Search for Jabber users"
+msgid "Search for XMPP users"
+msgstr "Search for XMPP users"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4501,8 +4501,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Invalid XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4556,8 +4556,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Register New Jabber Account"
+msgid "Register New XMPP Account"
+msgstr "Register New XMPP Account"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4631,8 +4631,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Change Jabber Password"
+msgid "Change XMPP Password"
+msgstr "Change XMPP Password"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4686,8 +4686,8 @@
 msgstr "Item Not Found"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Malformed XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -4954,8 +4954,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protocol Plug-in"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protocol Plug-in"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -4997,8 +4997,8 @@
 msgstr "Message delivery to %s failed: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber Message Error"
+msgid "XMPP Message Error"
+msgstr "XMPP Message Error"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12364,8 +12364,8 @@
 msgstr "hacker and designated driver [lazy bum]"
 
 #: ../pidgin/gtkdialogs.c:114
-msgid "Jabber developer"
-msgstr "Jabber developer"
+msgid "XMPP developer"
+msgstr "XMPP developer"
 
 #: ../pidgin/gtkdialogs.c:115
 msgid "original author"
@@ -12634,7 +12634,7 @@
 #: ../pidgin/gtkdialogs.c:360
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12643,7 +12643,7 @@
 "'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -15035,10 +15035,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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."
 
 #: ../pidgin/plugins/relnot.c:71
--- a/po/eo.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/eo.po	Tue May 01 05:53:57 2007 +0000
@@ -2685,10 +2685,10 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Igas aperon de konversacia fenestro kiam alia uzanto komencas mesa�i vin.  "
-"Tio funkcias por AIM, ICQ, Jabber, Sametime, kaj Yahoo!"
+"Tio funkcias por AIM, ICQ, XMPP, Sametime, kaj Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -2963,8 +2963,8 @@
 msgstr "AIM Konto"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber Konto"
+msgid "XMPP Account"
+msgstr "XMPP Konto"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4103,8 +4103,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Redaktu Jabber-n vCard-n"
+msgid "Edit XMPP vCard"
+msgstr "Redaktu XMPP-n vCard-n"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4217,7 +4217,7 @@
 msgid "The following are the results of your search"
 msgstr "La jenaj estas la rezultoj de via ser�o"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4240,7 +4240,7 @@
 msgstr "Servilo instrukcioj: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
@@ -4252,8 +4252,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Ser�u Jabber-ajn uzantojn"
+msgid "Search for XMPP users"
+msgstr "Ser�u XMPP-ajn uzantojn"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4396,8 +4396,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Malvalida Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Malvalida XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4451,8 +4451,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Registradu Novan Jabber-n Konton"
+msgid "Register New XMPP Account"
+msgstr "Registradu Novan XMPP-n Konton"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4526,8 +4526,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "�an�u Jabber-n Pasvorton"
+msgid "Change XMPP Password"
+msgstr "�an�u XMPP-n Pasvorton"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4581,8 +4581,8 @@
 msgstr "Ero Ne Trovita"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Misformita Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Misformita XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -4844,8 +4844,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protokol-Kroma諜o"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protokol-Kroma諜o"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -4887,8 +4887,8 @@
 msgstr "Mesa�o transdono al %s malsukcesis: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber mesa�o eraro"
+msgid "XMPP Message Error"
+msgstr "XMPP mesa�o eraro"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -11988,8 +11988,8 @@
 msgstr "artifikulo kaj speciala pelilo"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber programisto"
+msgid "XMPP developer"
+msgstr "XMPP programisto"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12259,7 +12259,7 @@
 
 #: ../pidgin/gtkdialogs.c:359
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12268,7 +12268,7 @@
 "'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
-"%s estas modula mesa�okliento, kapablas uzi AIM, MSN, Yahoo!, Jabber, ICQ, "
+"%s estas modula mesa�okliento, kapablas uzi AIM, MSN, Yahoo!, XMPP, ICQ, "
 "IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
 "Gadu-Gadu kaj QQ �iujn samtempe.  �i estas programita per GTK+.<BR><BR>Vi "
 "rajtas modifi kaj pludistribui la programon je la kondi�oj de la GPL (versio "
@@ -14604,7 +14604,7 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 
--- a/po/es.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/es.po	Tue May 01 05:53:57 2007 +0000
@@ -2817,10 +2817,10 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Hace que aparezcan las ventanas de conversaci坦n cuando un usuario empieza a "
-"enviarle un mensaje. Esto funciona con AIM, ICQ, Jabber, Sametime y Yahoo!"
+"enviarle un mensaje. Esto funciona con AIM, ICQ, XMPP, Sametime y Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -3100,8 +3100,8 @@
 msgstr "Cuenta AIM"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Cuenta Jabber"
+msgid "XMPP Account"
+msgstr "Cuenta XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4285,8 +4285,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Editar vCard de Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Editar vCard de XMPP"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4401,7 +4401,7 @@
 msgid "The following are the results of your search"
 msgstr "�stos son los resultados de su b炭squeda"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4426,10 +4426,10 @@
 msgstr "Instrucciones del servidor: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Rellene uno o m叩s de los campos mostrados a continuaci坦n para buscar a un "
-"usuario Jabber que los tengan."
+"usuario XMPP que los tengan."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4440,8 +4440,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Buscar usuarios Jabber"
+msgid "Search for XMPP users"
+msgstr "Buscar usuarios XMPP"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4584,8 +4584,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "ID de Jabber no v叩lido"
+msgid "Invalid XMPP ID"
+msgstr "ID de XMPP no v叩lido"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4641,8 +4641,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Registrando cuenta nueva de Jabber"
+msgid "Register New XMPP Account"
+msgstr "Registrando cuenta nueva de XMPP"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4716,8 +4716,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Cambiar contrase単a de Jabber"
+msgid "Change XMPP Password"
+msgstr "Cambiar contrase単a de XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4771,8 +4771,8 @@
 msgstr "Elemento no encontrado"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "ID de Jabber no v叩lido"
+msgid "Malformed XMPP ID"
+msgstr "ID de XMPP no v叩lido"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -5040,8 +5040,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Complemento de protocolo Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Complemento de protocolo XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -5083,8 +5083,8 @@
 msgstr "Fall坦 el env鱈o de mensaje a %s: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Mensaje de error de Jabber"
+msgid "XMPP Message Error"
+msgstr "Mensaje de error de XMPP"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12525,8 +12525,8 @@
 msgstr "hacker y dise単ador de controladores [lazy bum]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "desarrollador de Jabber"
+msgid "XMPP developer"
+msgstr "desarrollador de XMPP"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12800,7 +12800,7 @@
 #: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12810,7 +12810,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "%s es un cliente de mensajer鱈a modular capaz de utilizar AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, Gadu-Gadu y QQ todos al mismo tiempo. Est叩 escrito "
 "utilizando GTK+.<BR><BR>Puede modificar y redistribuir este programa bajo "
 "los t辿rminos de la GPL (versi坦n 2 o posterior). Se incluye una copia de la "
@@ -15236,10 +15236,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Le permite enviar datos en bruto a protocolos basados en texto (Jabber, MSN, "
+"Le permite enviar datos en bruto a protocolos basados en texto (XMPP, MSN, "
 "IRC,  TOC). Pulse 束Intro損 en la caja de entrada para enviarlo. Observe la "
 "ventana de depuraci坦n."
 
@@ -16433,8 +16433,8 @@
 #~ msgid "_Warn"
 #~ msgstr "_Avisar"
 
-#~ msgid "Jabber ID"
-#~ msgstr "ID Jabber"
+#~ msgid "XMPP ID"
+#~ msgstr "ID XMPP"
 
 #~ msgid "Hide IP address"
 #~ msgstr "Ocultar direcci坦n IP"
@@ -16480,12 +16480,12 @@
 
 #~ msgid ""
 #~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, "
+#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, "
 #~ "Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is "
 #~ "licensed under the GNU GPL.<BR><BR>"
 #~ msgstr ""
 #~ "Gaim es un cliente modular de mensajer鱈a instant叩nea, capaz de utilizar "
-#~ "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus "
+#~ "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus "
 #~ "Sametime, Napster, Zephyr y Gadu-Gadu al mismo tiempo.  Est叩 escrito "
 #~ "usando Gtk+ y se licencia con la GPL.<BR><BR>"
 
@@ -16688,12 +16688,12 @@
 
 #~ msgid ""
 #~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
 #~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
 #~ "<BR><BR>"
 #~ msgstr ""
 #~ "Gaim es un cliente modular de mensajer鱈a instant叩nea, capaz de utilizar "
-#~ "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, "
+#~ "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, "
 #~ "Zephyr y Gadu-Gadu al mismo tiempo.  Est叩 escrito usando Gtk+ y est叩 "
 #~ "licencia bajo la GPL de GNU.<BR><BR>"
 
@@ -17523,8 +17523,8 @@
 #~ msgid "Invalid nickname '%s'"
 #~ msgstr "Apodo '%s' inv叩lido"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Perfil Jabber"
+#~ msgid "XMPP Profile"
+#~ msgstr "Perfil XMPP"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Error en la lista de salas"
@@ -18356,14 +18356,14 @@
 #~ "La nueva contrase単a que usted introdujo es la misma que la actual.  Su "
 #~ "contrase単a seguir叩 siendo la misma."
 
-#~ msgid "Jabber Error %s"
-#~ msgstr "Error Jabber %s"
-
-#~ msgid ""
-#~ "The Jabber user %s does not exist and was therefore not added to your "
+#~ msgid "XMPP Error %s"
+#~ msgstr "Error XMPP %s"
+
+#~ msgid ""
+#~ "The XMPP user %s does not exist and was therefore not added to your "
 #~ "roster."
 #~ msgstr ""
-#~ "El usuario Jabber %s no existe y por lo tanto no se lo a単adir叩 a su "
+#~ "El usuario XMPP %s no existe y por lo tanto no se lo a単adir叩 a su "
 #~ "束roster損."
 
 #~ msgid "No such user."
@@ -18378,9 +18378,9 @@
 #~ msgid "Requesting Authentication Method"
 #~ msgstr "Solicitando m辿todo de autenticaci坦n"
 
-#~ msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
-#~ msgstr ""
-#~ "El usuario %s es un I.D. de Jabber inv叩lido y por lo tanto no fue a単adido."
+#~ msgid "The user %s is an invalid XMPP I.D. and was therefore not added."
+#~ msgstr ""
+#~ "El usuario %s es un I.D. de XMPP inv叩lido y por lo tanto no fue a単adido."
 
 #~ msgid "View Error Msg"
 #~ msgstr "Ver mensaje de error"
@@ -18595,14 +18595,14 @@
 #~ "  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former "
 #~ "lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
 #~ "\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (former maintainer)<BR>  "
-#~ "Jim Seymour (former Jabber developer)<BR>  Mark Spencer (original author) "
+#~ "Jim Seymour (former XMPP developer)<BR>  Mark Spencer (original author) "
 #~ "&lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  "
 #~ "Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
 #~ msgstr ""
 #~ "  Adam Fritzler (antiguo mantenimiento de libfaim)<BR>  Eric Warmenhoven "
 #~ "(antiguo desarrollador l鱈der)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
 #~ "\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (antiguo mantenedor)"
-#~ "<BR>  Jim Seymour (antiguo desarrollador de Jabber)<BR>  Mark Spencer "
+#~ "<BR>  Jim Seymour (antiguo desarrollador de XMPP)<BR>  Mark Spencer "
 #~ "(autor original) &lt;<A HREF=\"mailto:markster@marko.net\">markster@marko."
 #~ "net</A>&gt;<BR>  Syd Logan (hacker y conductor por designaci坦n [lazy bum])"
 #~ "<BR><BR>"
--- a/po/et.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/et.po	Tue May 01 05:53:57 2007 +0000
@@ -2232,8 +2232,8 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:107
-msgid "Jabber developer"
-msgstr "Jabberi arendaja"
+msgid "XMPP developer"
+msgstr "XMPPi arendaja"
 
 #: ../gtk/gtkdialogs.c:108
 msgid "original author"
@@ -2455,7 +2455,7 @@
 #: ../gtk/gtkdialogs.c:328
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, 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 Gaim.  "
@@ -4935,7 +4935,7 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -6160,7 +6160,7 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #. This is a quote from Star Wars.  You should
@@ -6428,7 +6428,7 @@
 
 #: ../libgaim/protocols/bonjour/bonjour.c:593
 #, fuzzy
-msgid "Jabber Account"
+msgid "XMPP Account"
 msgstr "Luba konto"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
@@ -7521,8 +7521,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Jabber'i vKaardi redigeerimine"
+msgid "Edit XMPP vCard"
+msgstr "XMPP'i vKaardi redigeerimine"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -7641,7 +7641,7 @@
 msgid "The following are the results of your search"
 msgstr ""
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1631
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -7665,7 +7665,7 @@
 msgstr "Serveri juhised: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1693
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:1713
@@ -7677,8 +7677,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1722
 #: ../libgaim/protocols/jabber/buddy.c:1723
-msgid "Search for Jabber users"
-msgstr "Jabberikasutajate otsimine"
+msgid "Search for XMPP users"
+msgstr "XMPPikasutajate otsimine"
 
 #: ../libgaim/protocols/jabber/buddy.c:1737
 msgid "Invalid Directory"
@@ -7808,8 +7808,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:545
 #: ../libgaim/protocols/jabber/jabber.c:888
-msgid "Invalid Jabber ID"
-msgstr "Vigane Jabber'i ID"
+msgid "Invalid XMPP ID"
+msgstr "Vigane XMPP'i ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:616
 #, c-format
@@ -7862,8 +7862,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:851
 #: ../libgaim/protocols/jabber/jabber.c:852
-msgid "Register New Jabber Account"
-msgstr "Uue Jabber'i konto registreerimine"
+msgid "Register New XMPP Account"
+msgstr "Uue XMPP'i konto registreerimine"
 
 #: ../libgaim/protocols/jabber/jabber.c:1013
 msgid "Initializing Stream"
@@ -7926,8 +7926,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1349
 #: ../libgaim/protocols/jabber/jabber.c:1350
-msgid "Change Jabber Password"
-msgstr "Jabber'i parooli muutmine"
+msgid "Change XMPP Password"
+msgstr "XMPP'i parooli muutmine"
 
 #: ../libgaim/protocols/jabber/jabber.c:1350
 msgid "Please enter your new password"
@@ -7981,7 +7981,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1460
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1462
@@ -8247,8 +8247,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1948
 #: ../libgaim/protocols/jabber/jabber.c:1950
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber protokolli plugin"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP protokolli plugin"
 
 #: ../libgaim/protocols/jabber/jabber.c:1976
 msgid "Force old (port 5223) SSL"
@@ -8290,8 +8290,8 @@
 msgstr "T探rge s探numi edastamisel kasutajale %s: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Jabberi s探numi viga"
+msgid "XMPP Message Error"
+msgstr "XMPPi s探numi viga"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/eu.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/eu.po	Tue May 01 05:53:57 2007 +0000
@@ -1312,10 +1312,10 @@
 #: ../plugins/psychic.c:24
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Solasaldi lehioa azaltzen da beste erabiltzaile batek  mezua zeuri bidaltzen hasten denean. "
-"Honek funtzionatzen du AIM,ICQ,Jabber,Sametime eta Yahoo!"
+"Honek funtzionatzen du AIM,ICQ,XMPP,Sametime eta Yahoo!"
 
 #: ../plugins/psychic.c:60
 # , fuzzy
@@ -1344,10 +1344,10 @@
 
 #: ../plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Testuan oinarritutako protokoloetara (Jabber, MSN, IRC, TOC) formaturik "
+"Testuan oinarritutako protokoloetara (XMPP, MSN, IRC, TOC) formaturik "
 "gabeko testua bidaltzeko. Sakatu 'Sartu' sarrera-koadroan, eta zaindu "
 "arazketa-leihoa."
 
@@ -3400,8 +3400,8 @@
 msgstr "hacker eta zehaztutako kontrolatzailea [lazy bum]"
 
 #: ../src/gtkdialogs.c:101
-msgid "Jabber developer"
-msgstr "Jabber garatzailea"
+msgid "XMPP developer"
+msgstr "XMPP garatzailea"
 
 #: ../src/gtkdialogs.c:102
 msgid "original author"
@@ -3602,7 +3602,7 @@
 #: ../src/gtkdialogs.c:261
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
 "and Gadu-Gadu 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 "
@@ -3610,7 +3610,7 @@
 "file for the complete list of contributors.  We provide no warranty for this "
 "program.<BR><BR>"
 msgstr ""
-"Gaim berehalako mezuen bezero modularra da  AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"Gaim berehalako mezuen bezero modularra da  AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
 "eta Gadu-Gadu momentu berean erabiltzeko gaitasuna duena. GTK+ erabiliz idatzi izan da .<BR><BR> Programa hau aldatu eta ber-banatu dezakezu  GPL terminopean (2 bertsioa edo beranduagokoa). GPL -ren kopia COPYING izeneko fitxategi baten dago gaim distribuzioarekin batera. Gaim \"copyright\"-a du bere laguntzaileen eskutik. Ikusi ezazy COPYRIGHT fitxategia laguntzaileen zerrenda osoa ikusteko. Ez dugu programa honen bermea zihurtatzen.<BR><BR>"
 
 #: ../src/gtkdialogs.c:275
@@ -6633,8 +6633,8 @@
 msgstr "Urtebetetzea"
 
 #: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Editatu Jabber vCard-a"
+msgid "Edit XMPP vCard"
+msgstr "Editatu XMPP vCard-a"
 
 #: ../src/protocols/jabber/buddy.c:569
 msgid ""
@@ -6733,8 +6733,8 @@
 msgstr "Zerbitzariaren aginduak:%s"
 
 #: ../src/protocols/jabber/buddy.c:1392
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Bete ezazu bat edo eremu gehiago edozein Jabber erabiltzaileren topaketarako. "
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Bete ezazu bat edo eremu gehiago edozein XMPP erabiltzaileren topaketarako. "
 
 #: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/novell/novell.c:1490
 #: ../src/protocols/oscar/oscar.c:6178 ../src/protocols/oscar/oscar.c:6185
@@ -6742,8 +6742,8 @@
 msgstr "Helbide elektronikoa"
 
 #: ../src/protocols/jabber/buddy.c:1420 ../src/protocols/jabber/buddy.c:1421
-msgid "Search for Jabber users"
-msgstr "Bilatu Jabber erabiltzaileak"
+msgid "Search for XMPP users"
+msgstr "Bilatu XMPP erabiltzaileak"
 
 #: ../src/protocols/jabber/buddy.c:1435
 msgid "Invalid Directory"
@@ -6864,8 +6864,8 @@
 msgstr "Ezin da socket-a sortu"
 
 #: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
-msgid "Invalid Jabber ID"
-msgstr "Jabber ID baliogabea"
+msgid "Invalid XMPP ID"
+msgstr "XMPP ID baliogabea"
 
 #: ../src/protocols/jabber/jabber.c:590
 #, c-format
@@ -6911,8 +6911,8 @@
 msgstr "Eman datuak behean, zure kontu berria erregistratzeko."
 
 #: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
-msgid "Register New Jabber Account"
-msgstr "Erregistratu Jabber kontu berria"
+msgid "Register New XMPP Account"
+msgstr "Erregistratu XMPP kontu berria"
 
 #: ../src/protocols/jabber/jabber.c:983
 msgid "Initializing Stream"
@@ -6975,8 +6975,8 @@
 msgstr "Pasahitza (berriro)"
 
 #: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
-msgid "Change Jabber Password"
-msgstr "Aldatu Jabber pasahitza"
+msgid "Change XMPP Password"
+msgstr "Aldatu XMPP pasahitza"
 
 #: ../src/protocols/jabber/jabber.c:1318
 msgid "Please enter your new password"
@@ -7027,8 +7027,8 @@
 msgstr "Elementua ez da aurkitu"
 
 #: ../src/protocols/jabber/jabber.c:1428
-msgid "Malformed Jabber ID"
-msgstr "Gaizki osatutako Jabber IDa"
+msgid "Malformed XMPP ID"
+msgstr "Gaizki osatutako XMPP IDa"
 
 #: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Acceptable"
@@ -7291,8 +7291,8 @@
 #. *  summary
 #. *  description
 #: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber protokoloaren plugin-a"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP protokoloaren plugin-a"
 
 #: ../src/protocols/jabber/jabber.c:1911
 msgid "Use TLS if available"
@@ -7340,8 +7340,8 @@
 msgstr "%s(r)i mezua bidaltzeak huts egin du: %s"
 
 #: ../src/protocols/jabber/message.c:227
-msgid "Jabber Message Error"
-msgstr "Jabber mezuaren errorea"
+msgid "XMPP Message Error"
+msgstr "XMPP mezuaren errorea"
 
 #: ../src/protocols/jabber/message.c:295
 #, c-format
--- a/po/fa.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/fa.po	Tue May 01 05:53:57 2007 +0000
@@ -2709,11 +2709,11 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "惡悋惺惓 ����愆�惆 �� �忰惷 悋�� 擧� 擧悋惘惡惘悋� 惆�擯惘 愆惘�惺 惡� �悋惘惆 擧惘惆� 拆�愃悋� 惡惘悋� 愆�悋 "
 "����擧��惆� 拆�悴惘�� 擯�惠擯��愆悋� 惡惘悋� 愆�悋 惴悋�惘 愆�惆.悋�� �悋惡��惠 惡惘悋� "
-"AIM� ��ICQ� ��Jabber� ��Sametime � �悋�� 擧悋惘 ����擧�惆."
+"AIM� ��ICQ� ��XMPP� ��Sametime � �悋�� 擧悋惘 ����擧�惆."
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -2992,8 +2992,8 @@
 msgstr "忰愕悋惡 拆�愃悋���惘愕悋�� 悋��惠惘�惠�"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "忰愕悋惡 Jabber"
+msgid "XMPP Account"
+msgstr "忰愕悋惡 XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4170,8 +4170,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "��惘悋�愆 擧悋惘惠 �悴悋慍� Jabber��"
+msgid "Edit XMPP vCard"
+msgstr "��惘悋�愆 擧悋惘惠 �悴悋慍� XMPP��"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4284,7 +4284,7 @@
 msgid "The following are the results of your search"
 msgstr "�惠悋�悴 悴愕惠悴�� 愆�悋 惆惘 慍�惘 悛�惆� 悋愕惠"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4310,9 +4310,9 @@
 msgstr "惘悋���悋�����悋� 擧悋惘擯慍悋惘: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-"惡惘悋� 悴愕惠悴� 惡� 惆�惡悋� 擧悋惘惡惘悋� Jabber �擧� �悋 ��惆 惠悋 悋慍 ���惆�悋� 慍�惘 惘悋 拆惘 擧��惆."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+"惡惘悋� 悴愕惠悴� 惡� 惆�惡悋� 擧悋惘惡惘悋� XMPP �擧� �悋 ��惆 惠悋 悋慍 ���惆�悋� 慍�惘 惘悋 拆惘 擧��惆."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4323,8 +4323,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "悴愕惠悴� 惡� 惆�惡悋� 擧悋惘惡惘悋� Jabber"
+msgid "Search for XMPP users"
+msgstr "悴愕惠悴� 惡� 惆�惡悋� 擧悋惘惡惘悋� XMPP"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4467,8 +4467,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "愆�悋愕�� Jabber �悋�惺惠惡惘"
+msgid "Invalid XMPP ID"
+msgstr "愆�悋愕�� XMPP �悋�惺惠惡惘"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4522,8 +4522,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "惓惡惠 忰愕悋惡 Jabber 悴惆�惆"
+msgid "Register New XMPP Account"
+msgstr "惓惡惠 忰愕悋惡 XMPP 悴惆�惆"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4597,8 +4597,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "惠愃��惘 擯悵惘�悋��� Jabber"
+msgid "Change XMPP Password"
+msgstr "惠愃��惘 擯悵惘�悋��� XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4652,8 +4652,8 @@
 msgstr "��惘惆 拆�惆悋 �愆惆"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "愆�悋愕�� Jabber �惺��惡"
+msgid "Malformed XMPP ID"
+msgstr "愆�悋愕�� XMPP �惺��惡"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -4919,8 +4919,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "�惠惶� 愆��惆�� �惘悋惘惆悋惆 Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "�惠惶� 愆��惆�� �惘悋惘惆悋惆 XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -4962,8 +4962,8 @@
 msgstr "悋惘愕悋� 拆�愃悋� 惡� %s 愆擧愕惠 悽�惘惆: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "悽愀悋� 拆�愃悋� Jabber"
+msgid "XMPP Message Error"
+msgstr "悽愀悋� 拆�愃悋� XMPP"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12272,8 +12272,8 @@
 msgstr "��擧惘 � 惘悋��惆�� 悋�惠悽悋惡� (惺�悋�)"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "惡惘�悋����愕悋慍 Jabber"
+msgid "XMPP developer"
+msgstr "惡惘�悋����愕悋慍 XMPP"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12547,7 +12547,7 @@
 #: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12557,7 +12557,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "��%s �擧 擧悋惘擯�惘 拆�愃悋���惘愕悋�� 拆��悋����悋� 悋愕惠 擧� �悋惡��惠 悋愕惠愃悋惆�� ����慍�悋� 悋慍 "
-"AIM� ��MSN� ��Yahoo!�リ� ��Jabber� ��ICQ� ��IRC� SILC� SIP/SIMPLE� ��Novell Groupwise� ��Lotus Sametime� Bonjour� Zephyr "
+"AIM� ��MSN� ��Yahoo!�リ� ��XMPP� ��ICQ� ��IRC� SILC� SIP/SIMPLE� ��Novell Groupwise� ��Lotus Sametime� Bonjour� Zephyr "
 "� Gadu-Gadu � QQ 惘悋 惆悋惘惆. 悋�� 惡惘�悋�� 惡悋 悋愕惠�悋惆� 悋慍 GTK+�� ��愆惠� 愆惆� 悋愕惠.<BR><BR>愆�悋 "
 "����惠�悋��惆 悋�� 惡惘�悋�� 惘悋 惠忰惠 愆惘悋�愀 �悴�慍 惺���� ��擯悋�� 擯�� (�愕悽�� 2 �悋 惡悋�悋惠惘) "
 "惠愃��惘 惆悋惆� � 惠�慍�惺 擧��惆. �愕悽���悋� 悋慍 �悴�慍 惺���� ��擯悋�� 擯�� 惆惘 拆惘��惆�� 束COPYING損 "
@@ -14941,10 +14941,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"愆�悋 惘悋 �悋惆惘 ����愕悋慍惆 �惘�惆� 悽悋� 惘悋 惡� �惘悋惘惆悋惆�悋� �惠�� (Jabber� ��MSN�� ��IRC� ��TOC) "
+"莾�悋 惘悋 �悋惆惘 ����愕悋慍惆 �惘�惆� 悽悋� 惘悋 惡� �惘悋惘惆悋惆�悋� �惠�� (XMPP� ��MSN�� ��IRC� ��TOC) "
 "莍惘愕悋� 擧��惆. 惡惘悋� 悋惘愕悋� 惆惘 悴惺惡�� �惆悽� 擧��惆 束�惘�惆損 惘悋 �愆悋惘 惆��惆. �惘悋�惡 拆�悴惘�� "
 "悋愆擧悋���慍惆悋�� 惡悋愆�惆."
 
@@ -16255,7 +16255,7 @@
 
 #~ msgid ""
 #~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
 #~ "all at once.  It is written using Gtk+ and is licensed under the GPL."
 #~ "<BR><BR>"
 #~ msgstr ""
@@ -16674,11 +16674,11 @@
 #~ msgid "Invalid nickname '%s'"
 #~ msgstr "��惡 束%s損 �悋�惺惠惡惘"
 
-#~ msgid "Jabber ID"
-#~ msgstr "愆�悋愕�� Jabber��"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "�悴��惺� 惠�惴��悋惠 Jabber"
+#~ msgid "XMPP ID"
+#~ msgstr "愆�悋愕�� XMPP��"
+
+#~ msgid "XMPP Profile"
+#~ msgstr "�悴��惺� 惠�惴��悋惠 XMPP"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "悽愀悋� ��惘愕惠 悋惠悋����悋"
--- a/po/fi.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/fi.po	Tue May 01 05:53:57 2007 +0000
@@ -2760,10 +2760,10 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Keskusteluikkunat ilmestyv辰t, kun muut k辰ytt辰j辰t alkavat kirjoittaa viesti辰 "
-"sinulle. T辰m辰 toimii AIM-, ICQ-, Jabber-, Sametime- ja Yahoo!-"
+"sinulle. T辰m辰 toimii AIM-, ICQ-, XMPP-, Sametime- ja Yahoo!-"
 "yhteisk辰yt辰nn旦ill辰."
 
 #: ../libpurple/plugins/psychic.c:66
@@ -3042,8 +3042,8 @@
 msgstr "AIM-tili"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber-tili"
+msgid "XMPP Account"
+msgstr "XMPP-tili"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4221,8 +4221,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Muokkaa Jabberin vCardia"
+msgid "Edit XMPP vCard"
+msgstr "Muokkaa XMPPin vCardia"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4337,7 +4337,7 @@
 msgid "The following are the results of your search"
 msgstr "Hakutulokset"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4362,8 +4362,8 @@
 msgstr "Palvelimen ohjeet: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "T辰yt辰 yksi tai useampia kentist辰 etsi辰ksesi Jabber-k辰ytt辰ji辰."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "T辰yt辰 yksi tai useampia kentist辰 etsi辰ksesi XMPP-k辰ytt辰ji辰."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4374,8 +4374,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Etsi Jabber-k辰ytt辰ji辰"
+msgid "Search for XMPP users"
+msgstr "Etsi XMPP-k辰ytt辰ji辰"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4518,8 +4518,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Ep辰kelpo Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Ep辰kelpo XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4573,8 +4573,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Rekister旦i uusi Jabber-tili"
+msgid "Register New XMPP Account"
+msgstr "Rekister旦i uusi XMPP-tili"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4648,8 +4648,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Vaihda Jabber-salasana"
+msgid "Change XMPP Password"
+msgstr "Vaihda XMPP-salasana"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4703,8 +4703,8 @@
 msgstr "Kohdetta ei l旦ytynyt"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Ep辰kelpo Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Ep辰kelpo XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -4972,8 +4972,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber-yhteysk辰yt辰nt旦liit辰nn辰inen"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP-yhteysk辰yt辰nt旦liit辰nn辰inen"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -5015,8 +5015,8 @@
 msgstr "Viestin toimitus %s:lle ep辰onnistui: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber viestivirhe"
+msgid "XMPP Message Error"
+msgstr "XMPP viestivirhe"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12404,8 +12404,8 @@
 msgstr "hakkeri ja kuski [laiska pummi]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber-kehitt辰j辰"
+msgid "XMPP developer"
+msgstr "XMPP-kehitt辰j辰"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12677,7 +12677,7 @@
 #: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12687,7 +12687,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "%s on modulaarinen pikaviestinsovellus, joka kykenee k辰ytt辰m辰辰n AIM-, MSN-, "
-"Yahoo!-, Jabber-, ICQ-, IRC-, SILC-, SIP/SIMPLE-, Novell GroupWise-, Lotus "
+"Yahoo!-, XMPP-, ICQ-, IRC-, SILC-, SIP/SIMPLE-, Novell GroupWise-, Lotus "
 "Sametime-, Bonjour-, Zephyr-, Gadu-Gadu- ja QQ-yhteysk辰yt辰nt旦j辰 "
 "yht辰aikaisesti. Se on ohjelmoitu k辰ytt辰en Gtk+-kirjastoa.<BR><BR>Voit "
 "muokata ja jakaa ohjelmaa GPL-lisenssin (versio 2 tai my旦hempi) ehdoilla. "
@@ -15077,11 +15077,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "Antaa sinun l辰hett辰辰 raakamuotoista sy旦tett辰 tekstipohjaisilla  "
-"yhteysk辰yt辰nn旦ill辰 (Jabber MSN, IRC, TOC). Paina \"Enter\" "
+"yhteysk辰yt辰nn旦ill辰 (XMPP MSN, IRC, TOC). Paina \"Enter\" "
 "viestinsy旦tt旦laatikossa l辰hett辰辰ksesi. Tarkkaile virheenj辰ljitysikkunaa."
 
 #: ../pidgin/plugins/relnot.c:71
@@ -16092,10 +16092,10 @@
 #~ msgstr "Sinulla on jo meneill辰辰n oleva haku. Odota sen p辰辰ttymist辰."
 
 #~ msgid ""
-#~ "Could not query the directory server. Either the Jabber user directory "
+#~ "Could not query the directory server. Either the XMPP user directory "
 #~ "specified is invalid or directory server could not be reached."
 #~ msgstr ""
-#~ "Ei voitu tehd辰 hakua hakemistopalvelimelle. Joko m辰辰ritelty Jabber-"
+#~ "Ei voitu tehd辰 hakua hakemistopalvelimelle. Joko m辰辰ritelty XMPP-"
 #~ "k辰ytt辰j辰hakemisto on virheellinen, tai hakemistopalvelimelle ei p辰辰sty."
 
 #~ msgid "Direct IM with %s closed"
@@ -16376,8 +16376,8 @@
 #~ msgid "Host name"
 #~ msgstr "Is辰nt辰"
 
-#~ msgid "Jabber ID"
-#~ msgstr "Jabber ID"
+#~ msgid "XMPP ID"
+#~ msgstr "XMPP ID"
 
 #~ msgid "(pending)"
 #~ msgstr "(odottaa)"
@@ -16704,8 +16704,8 @@
 #~ msgid "Buddy Information for %s"
 #~ msgstr "Tuttavan %s tiedot"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber-profiili"
+#~ msgid "XMPP Profile"
+#~ msgstr "XMPP-profiili"
 
 #~ msgid "User Properties"
 #~ msgstr "K辰ytt辰j辰n valinnat"
--- a/po/fr.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/fr.po	Tue May 01 05:53:57 2007 +0000
@@ -2785,10 +2785,10 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Ouvre les fen棚tres des nouvelles conversations d竪s qu'un utilisateur "
-"commence � vous 辿crire un message. Cela fonctionne pour AIM, ICQ, Jabber, "
+"commence � vous 辿crire un message. Cela fonctionne pour AIM, ICQ, XMPP, "
 "Sametime et Yahoo."
 
 #: ../libpurple/plugins/psychic.c:66
@@ -3069,8 +3069,8 @@
 msgstr "Compte AIM"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Compte Jabber"
+msgid "XMPP Account"
+msgstr "Compte XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4255,8 +4255,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Modifier la carte de visite Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Modifier la carte de visite XMPP"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4372,7 +4372,7 @@
 msgid "The following are the results of your search"
 msgstr "Voici les r辿sultats de votre recherche."
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4397,8 +4397,8 @@
 msgstr "Instructions du serveur�: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Saisissez un ou plusieurs crit竪res de recherche d'utilisateurs Jabber."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Saisissez un ou plusieurs crit竪res de recherche d'utilisateurs XMPP."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4409,8 +4409,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Rechercher des utilisateurs Jabber"
+msgid "Search for XMPP users"
+msgstr "Rechercher des utilisateurs XMPP"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4555,8 +4555,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Identifiant Jabber non valide"
+msgid "Invalid XMPP ID"
+msgstr "Identifiant XMPP non valide"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4612,8 +4612,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Enregistrer un nouveau compte Jabber"
+msgid "Register New XMPP Account"
+msgstr "Enregistrer un nouveau compte XMPP"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4687,8 +4687,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Changer de mot de passe Jabber"
+msgid "Change XMPP Password"
+msgstr "Changer de mot de passe XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4742,8 +4742,8 @@
 msgstr "Item non trouv辿"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Identifiant Jabber non valide."
+msgid "Malformed XMPP ID"
+msgstr "Identifiant XMPP non valide."
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -5012,8 +5012,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Plugin pour le protocole Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Plugin pour le protocole XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -5055,8 +5055,8 @@
 msgstr "�chec de la livraison du message pour %s�: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Erreur message Jabber"
+msgid "XMPP Message Error"
+msgstr "Erreur message XMPP"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12502,8 +12502,8 @@
 msgstr "hacker et conducteur d辿sign辿 [feignasse]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "codeur Jabber"
+msgid "XMPP developer"
+msgstr "codeur XMPP"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12775,7 +12775,7 @@
 #: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12785,7 +12785,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "%s est un client de messagerie modulaire compatible avec AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, Gadu-Gadu et QQ. Il est 辿crit avec Gtk+.<BR><BR>Vous pouvez "
 "modifier et redistribuer ce programme sous les conditions 辿nonc辿es par la "
 "licence GNU GPL (version 2 ou ult辿rieure). Une copie de la licence GPL est "
@@ -15205,10 +15205,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Permet d'envoyer des donn辿es bruts aux protocoles en mode texte (Jabber, "
+"Permet d'envoyer des donn辿es bruts aux protocoles en mode texte (XMPP, "
 "MSN, IRC, TOC). Tapez 束�Entr辿e�損 dans la bo樽te de saisie pour envoyer. "
 "Observez le r辿sultat dans la fen棚tre de debug."
 
@@ -16060,8 +16060,8 @@
 #~ msgid "Account usage"
 #~ msgstr "Utilisation du compte"
 
-#~ msgid "Jabber ID"
-#~ msgstr "Identifiant Jabber"
+#~ msgid "XMPP ID"
+#~ msgstr "Identifiant XMPP"
 
 #~ msgid "Use last matching buddy"
 #~ msgstr "� valeur 辿gale, choisir le dernier trouv辿"
--- a/po/gl.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/gl.po	Tue May 01 05:53:57 2007 +0000
@@ -2308,8 +2308,8 @@
 msgstr "hacker e dese単ador de controladores [lazy bum]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "desenvolvedor de Jabber"
+msgid "XMPP developer"
+msgstr "desenvolvedor de XMPP"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2541,7 +2541,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2550,7 +2550,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim 辿 un cliente modular de mensaxar鱈a instant叩nea, capaz de utilizar AIM, "
-"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, "
+"MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, "
 "Napster, Zephyr, e Gadu-Gadu ao mesmo tempo. Est叩 escrito usando Gtk+."
 "<BR><BR> Pode modificar e redistribu鱈r este programa baixo os termos da GPL "
 "(versi坦n 2 ou posterior). Incl炭ese unha copia da licenza GPL no ficheiro "
@@ -5131,10 +5131,10 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Perm鱈telle enviar datos en bruto a protocolos baseados en texto (Jabber, "
+"Perm鱈telle enviar datos en bruto a protocolos baseados en texto (XMPP, "
 "MSN, IRC, TOC). Prema 'Intor' na caixa de entrada para envialo. Observe a "
 "vent叩 de depuraci坦n."
 
@@ -6668,10 +6668,10 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Fai que aparezan as vent叩s da conversa cando un usuario comeza a enviarlle "
-"unha mensaxe. Isto funciona con AIM, ICQ, Jabber, Sametime e Yahoo!"
+"unha mensaxe. Isto funciona con AIM, ICQ, XMPP, Sametime e Yahoo!"
 
 #: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -6922,8 +6922,8 @@
 msgstr "Conta de AIM"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Conta de Jabber"
+msgid "XMPP Account"
+msgstr "Conta de XMPP"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -8032,8 +8032,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Editar vCard de Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Editar vCard de XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8148,7 +8148,7 @@
 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
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8173,10 +8173,10 @@
 msgstr "Instruci坦ns do servidor: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Encha un ou m叩is dos campos amosados a seguir para localizar usuarios "
-"Jabber."
+"XMPP."
 
 #: ../libgaim/protocols/jabber/buddy.c:1749
 #: ../libgaim/protocols/novell/novell.c:1488
@@ -8187,8 +8187,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1758
 #: ../libgaim/protocols/jabber/buddy.c:1759
-msgid "Search for Jabber users"
-msgstr "Localizar usuarios de Jabber"
+msgid "Search for XMPP users"
+msgstr "Localizar usuarios de XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
@@ -8317,8 +8317,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:550
 #: ../libgaim/protocols/jabber/jabber.c:893
-msgid "Invalid Jabber ID"
-msgstr "ID de Jabber non v叩lido"
+msgid "Invalid XMPP ID"
+msgstr "ID de XMPP non v叩lido"
 
 #: ../libgaim/protocols/jabber/jabber.c:621
 #, c-format
@@ -8371,8 +8371,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:856
 #: ../libgaim/protocols/jabber/jabber.c:857
-msgid "Register New Jabber Account"
-msgstr "Rexistrando a conta nova de Jabber"
+msgid "Register New XMPP Account"
+msgstr "Rexistrando a conta nova de XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1023
 msgid "Initializing Stream"
@@ -8435,8 +8435,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1360
 #: ../libgaim/protocols/jabber/jabber.c:1361
-msgid "Change Jabber Password"
-msgstr "Modificar o contrasinal de Jabber"
+msgid "Change XMPP Password"
+msgstr "Modificar o contrasinal de XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1361
 msgid "Please enter your new password"
@@ -8490,8 +8490,8 @@
 msgstr "Elemento non atopado"
 
 #: ../libgaim/protocols/jabber/jabber.c:1471
-msgid "Malformed Jabber ID"
-msgstr "ID de Jabber inv叩lido"
+msgid "Malformed XMPP ID"
+msgstr "ID de XMPP inv叩lido"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
 msgid "Not Acceptable"
@@ -8758,8 +8758,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1960
 #: ../libgaim/protocols/jabber/jabber.c:1962
-msgid "Jabber Protocol Plugin"
-msgstr "Complemento de protocolo Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Complemento de protocolo XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1988
 msgid "Force old (port 5223) SSL"
@@ -8801,8 +8801,8 @@
 msgstr "Fallou o env鱈o da mensaxe a %s: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Mensaxe de erro de Jabber"
+msgid "XMPP Message Error"
+msgstr "Mensaxe de erro de XMPP"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/gu.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/gu.po	Tue May 01 05:53:57 2007 +0000
@@ -832,10 +832,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"爲む�爲�� 爲項�爻�爲� 爲�爲��爻�爲� 爲迦�爲鉦�-爲�爲о�爲萎�爲� 爲��爲萎�爲�爻�爲�爻�爲迦� (Jabber, MSN, IRC, TOC) 爲��爲� 爲��爲�爲迦�爲� 爲��爲�爻� "
+"爲む�爲�� 爲項�爻�爲� 爲�爲��爻�爲� 爲迦�爲鉦�-爲�爲о�爲萎�爲� 爲��爲萎�爲�爻�爲�爻�爲迦� (XMPP, MSN, IRC, TOC) 爲��爲� 爲��爲�爲迦�爲� 爲��爲�爻� "
 "爲��爲朽�爲��爻� 爲�爲�� 爲�爻�. 爲��爲�爲迦�爲� 爲��爲�爻� 爲��爲萎�爻�爲� 爲��爲�爻�爲伍�爲鉦� 'Enter' 爲��爲鉦�爻�. 爲÷�爲�� 爲朽�爲��爲÷� 爲�爻�爲�."
 
 #: plugins/relnot.c:63
@@ -2735,8 +2735,8 @@
 msgstr "libfaim 爲�爲鉦�爲朽�爲鉦�"
 
 #: src/gtkdialogs.c:92
-msgid "Jabber developer"
-msgstr "Jabber 爲朽�爲�爲鉦�爲�爲萎�爲む�"
+msgid "XMPP developer"
+msgstr "XMPP 爲朽�爲�爲鉦�爲�爲萎�爲む�"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -2905,10 +2905,10 @@
 #: src/gtkdialogs.c:226
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
-"Gaim 爲� 爲��爲÷�爲��爲� 爲伍�爲��爲謹�爲朽�爲��爲項�爲� 爲�爻�爲迦�爲�爲��爲� 爲�爻� 爲�爻� AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, "
+"Gaim 爲� 爲��爲÷�爲��爲� 爲伍�爲��爲謹�爲朽�爲��爲項�爲� 爲�爻�爲迦�爲�爲��爲� 爲�爻� 爲�爻� AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, "
 "Novell GroupWise, Napster, Zephyr, 爲�爲�� Gadu-Gadu 爲��爲� 爲踽� 爲伍�爲ム� 爲朽�爲��爲朽� 爲��爲�爻� 爲伍�爲萎�爲� "
 "爲�爻�.  爲む� Gtk+ 爲�� 爲��爲��爻� 爲迦�爲鉦�爻�爲� 爲�爻� 爲�爲�� GPL 爲項�爲�爲� 爲迦�爲�爲伍�爻�爲� 爲�爲��爲��爲� 爲�爻�.<BR><BR>"
 
@@ -5560,8 +5560,8 @@
 msgstr "爲�爲��爲��爲逗�爲�"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard 爲��爲� 爲��爲萎�爲鉦� 爲�爲萎�"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard 爲��爲� 爲��爲萎�爲鉦� 爲�爲萎�"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5572,8 +5572,8 @@
 "爲�爲��爲〝�爻�."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5651,7 +5651,7 @@
 msgstr "爲��爲�爻� 爲む�爲鉦�爻� 爲謹�爲о�爲鉦� 爲��爲逗�爲鉦�爻� 爲�爻�"
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "爲�爻�爲�爲�� 爲��爲む�爲� 爲�爲��爲� 爲朽�爲萎�爲謹�爲萎�爲む�爲�爲�� 爲謹�爲о�爲� 爲��爲�爻� 爲踽� 爲�爲ム�爲� 爲朽�爻� 爲�爻�爲劇�爲む�爲萎�爲��爲� 爲〝�爻�."
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5669,7 +5669,7 @@
 msgstr "爲�-爲��爲�爲� 爲伍�爲��爲��爲�"
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "爲�爲��爲� 爲朽�爲萎�爲謹�爲萎�爲む� 爲��爲�爻� 爲謹�爲� 爲�爲萎�"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5790,8 +5790,8 @@
 msgstr "爲伍�爲�爻�爲� 爲��爲鉦�爲朽�爲��爲� 爲�爲伍�爲萎�爲�"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "爲�爲��爲�爻�爲� Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "爲�爲��爲�爻�爲� XMPP ID"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -5837,8 +5837,8 @@
 msgstr "爲��爻�爲萎�爲鉦�爻� 爲�爲萎�爲�� 爲��爻�爲� 爲�爲鉦�爻�爲� 爲萎�爻�爲伍�爲�爲� 爲�爲萎�爲朽�爲� 爲��爲�爻� 爲��爲�爻�爲�� 爲�爲鉦�爲�爲鉦�爻� 爲〝�爻�."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "爲��爻�爲� Jabber 爲�爲鉦�爻�爲� 爲萎�爻�爲伍�爲�爲� 爲�爲萎�"
+msgid "Register New XMPP Account"
+msgstr "爲��爻�爲� XMPP 爲�爲鉦�爻�爲� 爲萎�爻�爲伍�爲�爲� 爲�爲萎�"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -5909,8 +5909,8 @@
 msgstr "爲��爲伍�爲萎�爲� (爲��爻�)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Jabber 爲��爲伍�爲萎�爲� 爲��爲迦�"
+msgid "Change XMPP Password"
+msgstr "XMPP 爲��爲伍�爲萎�爲� 爲��爲迦�"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -5959,8 +5959,8 @@
 msgstr "爲朽�爻�爲む� 爲��爻� 爲��爻�"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "爲��爻�爲� Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "爲��爻�爲� XMPP ID"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6205,8 +6205,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber 爲��爲萎�爲�爻�爲�爻�爲� 爲��爲迦�爲�爲�"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP 爲��爲萎�爲�爻�爲�爻�爲� 爲��爲迦�爲�爲�"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6254,8 +6254,8 @@
 msgstr "%s 爲�� 爲伍�爲��爲謹� 爲��爻�爲�爲�爲鉦�爲朽�爲��爲� 爲��爲劇�爲��: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber 爲伍�爲��爲謹� 爲�爻�爲劇�爲�"
+msgid "XMPP Message Error"
+msgstr "XMPP 爲伍�爲��爲謹� 爲�爻�爲劇�爲�"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -11887,8 +11887,8 @@
 msgid "Invalid nickname"
 msgstr "爲�爲��爲�爻�爲� 爲��爲�"
 
-msgid "Jabber Profile"
-msgstr "Jabber 爲萎�爲��爻�爲�爲�"
+msgid "XMPP Profile"
+msgstr "XMPP 爲萎�爲��爻�爲�爲�"
 
 msgid "Roomlist Error"
 msgstr "爲�爲�爻�爲劇�爲鉦�爻� 爲�爻�爲劇�爲�"
--- a/po/he.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/he.po	Tue May 01 05:53:57 2007 +0000
@@ -2706,10 +2706,10 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "��廨� ������廬-廩��� ���廚�廣 ��廨 ��廩廨 ��廩� 廡廩廨 �廬����� ��廬�� ���廣�.  �� 廣��� "
-"廣��廨 AIM, ICQ, Jabber, Sametime, Yahoo!"
+"廣��廨 AIM, ICQ, XMPP, Sametime, Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -2986,8 +2986,8 @@
 msgstr "�廩��� AIM"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "�廩��� Jabber"
+msgid "XMPP Account"
+msgstr "�廩��� XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4152,8 +4152,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "廣廨�� �廬 �-Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "廣廨�� �廬 �-XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4266,7 +4266,7 @@
 msgid "The following are the results of your search"
 msgstr "���� 廬�廢��廬 ���廚�廩 廩��"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4291,8 +4291,8 @@
 msgstr "�����廬 廩廨廬: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "�廩 ����� ��� �� ��廬廨 �� �廩��廬 ���廢�廣 ��廚�廩 廩� �廩廬�廩� Jabber �廬�����."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "�廩 ����� ��� �� ��廬廨 �� �廩��廬 ���廢�廣 ��廚�廩 廩� �廩廬�廩� XMPP �廬�����."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4303,8 +4303,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "�廚廩 �廩廬�廩� Jabber"
+msgid "Search for XMPP users"
+msgstr "�廚廩 �廩廬�廩� XMPP"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4447,8 +4447,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "����� �廩廬�廩 Jabber �� 廬廡��"
+msgid "Invalid XMPP ID"
+msgstr "����� �廩廬�廩 XMPP �� 廬廡��"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4502,8 +4502,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "廨廩�� �廩��� Jabber ��廩"
+msgid "Register New XMPP Account"
+msgstr "廨廩�� �廩��� XMPP ��廩"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4577,7 +4577,7 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "�廖�廖�� 廩�� 廩��廬� ��廢���"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
@@ -4632,8 +4632,8 @@
 msgstr "廚廨�� �� ��廢�"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "����� �廩廬�廩 Jabber �� 廬廡��"
+msgid "Malformed XMPP ID"
+msgstr "����� �廩廬�廩 XMPP �� 廬廡��"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -4899,8 +4899,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "廬�廖廝 廚廨���廡�� Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "廬�廖廝 廚廨���廡�� XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -4942,8 +4942,8 @@
 msgstr "廬廡�� ��廩��� ���廣� �� %s: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "���廣廬 廩���� �� ���廨廬 (Jabber)"
+msgid "XMPP Message Error"
+msgstr "���廣廬 廩���� �� ���廨廬 (XMPP)"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12223,8 +12223,8 @@
 msgstr "�廬��廬 ���� 廚��� - 廣廢��"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "�廚廬� Jabber"
+msgid "XMPP developer"
+msgstr "�廚廬� XMPP"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12496,7 +12496,7 @@
 #: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12506,7 +12506,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "%s ���� 廬���廬 廩���廬 ���廣�廬 ������廬 �����廨�廬 ���廚廩廨廬 廩���廩 � AIM, MSN,  "
-"Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novel GroupWise, Lotus Sametime, "
+"Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, Gadu-Gadu, QQ ������ ��-����廬. �廬���� ��廬�� �廣�廨廬 GTK+."
 "<BR><BR>��廬廨 �廣廨�� 廩������ ���廚�廛 �廬 �廬���� 廬�廬 �����廬 廨�廩��� �GPL (�廨廖� 2 "
 "�����). ��廬廨). �廣廬廡 廩� �-GPL ���� �廬�� �廡��廛 'COPYING' ���廚廛 廣� %s. %s "
@@ -14856,10 +14856,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"��廚廩廨 �� �廩��� ���廣 ����� �廚廨���廡���� 廣� �廖�廖 �廡廖� ���� Jabber, MSN, IRC, "
+"��廚廩廨 �� �廩��� ���廣 ����� �廚廨���廡���� 廣� �廖�廖 �廡廖� ���� XMPP, MSN, IRC, "
 "TOC.��廛 'Enter' �廬��廬 ����� �廩���. 廢廚� ����� ��廚�� ������."
 
 #: ../pidgin/plugins/relnot.c:71
@@ -15897,8 +15897,8 @@
 #~ msgid "Change password"
 #~ msgstr "廩�� 廖�廖��"
 
-#~ msgid "Jabber ID"
-#~ msgstr "����� Jabber"
+#~ msgid "XMPP ID"
+#~ msgstr "����� XMPP"
 
 #~ msgid "Error processing event or response (%s)."
 #~ msgstr "廩���� �廣���� ��廨�廣 �� �廩�� (%s)."
@@ -16177,8 +16177,8 @@
 #~ msgid "Buddy Information for %s"
 #~ msgstr "���廣 廣� ��廩 �廡廩廨 %s"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "廚廨�廚�� Jabber"
+#~ msgid "XMPP Profile"
+#~ msgstr "廚廨�廚�� XMPP"
 
 #~ msgid "User Properties"
 #~ msgstr "��廚���� ��廩廬�廩"
--- a/po/hi.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/hi.po	Tue May 01 05:53:57 2007 +0000
@@ -974,7 +974,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "爐�爐�爛�爐劇ぐ 爐�爐оぞ爐萎た爐� 爐��爐萎�爐�爛�爐�爛�爐� 爐�ぐ 爐�爐��爐萎�爐� 爐�爐�お爛�爐� 爐〝�爐�爐�� 爐��爐むぞ 爐項�. (爐�爛�爐�ぐ, 爐踱��爐伍�爐�, 爐�爐�爐�爐萎じ爛�, 爐�爛�爐�爐伍�). "
@@ -3033,7 +3033,7 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "爐��爐萎�爐� 爐�爛�爐�ぐ 爐÷�爐朽げ爐�ぐ爛�爐�"
 
 #: src/gtkdialogs.c:93
@@ -3206,7 +3206,7 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "爐�爛�爐� 爐踱� 爐�ぞ爐÷�爐��爐迦ぐ 爐�爐�爐伍�爐�爛�爐�爐� 爐��爐伍�爐��爐�爐逗�爐� 爐�爛�爐迦ぞ爐�え爛�爐� 爐項� 爐�爛� 爐踱�爐�爐踱�, 爐�爐�爐伍�爐�爛�爐��, 爐�ぞ爐項�!, 爐踱��爐伍�爐�, 爐�爐�爐�爐萎じ爛�, "
@@ -5973,7 +5973,7 @@
 msgstr "爐�爐��爐�う爐逗え"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr "爐�爛�爐�ぐ 爐朽�爐�爐鉦ぐ爛�爐� 爐�爐� 爐伍�爐�ぞ爐�え 爐�爐萎�爐�"
 
 #: src/protocols/jabber/buddy.c:569
@@ -5983,7 +5983,7 @@
 msgstr "爐伍が 爐�爛�爐�爐酌�爐� 爐朽�爐�爐迦�爐�た爐� 爐項�爐�爛� 爐�爐逗じ 爐�爐鉦え爐�爐鉦ぐ爛� 爐�爛� 爐〝ぐ爐�� 爐��爐� 爐�爐��爛� 爐�爛� 爐伍ぎ爐伍�爐�ぞ 爐� 爐項� 爐�爛�爐朽げ 爐朽す爛� 爐〝ぐ爛�爐�爛�"
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
+msgid "XMPP ID"
 msgstr "爐�爛�爐�ぐ 爐�爐� 爐÷�"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
@@ -6062,7 +6062,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -6081,7 +6081,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "爐�ぁ爛�爐÷� 爐�爛� 爐�爛�爐� 爐�爐��爐� 爐�い爐� 爐��爐朽ぞ爐萎ぞ 爐�爐萎�爐�"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -6207,8 +6207,8 @@
 msgstr "爐伍�爐�爛�爐� 爐�え爐鉦え爛� 爐��爐� 爐�爐伍ぎ爐萎�爐�"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "爐�爐朽�爐� 爐�爛�爐�ぐ 爐�爐�爐÷�(Jabber ID)"
+msgid "Invalid XMPP ID"
+msgstr "爐�爐朽�爐� 爐�爛�爐�ぐ 爐�爐�爐÷�(XMPP ID)"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6258,7 +6258,7 @@
 msgstr "爐�爛�爐�く爐� 爐�く爐� 爐�く爐� 爐�爐鉦い爐� 爐萎�爐�爐逗じ爛�爐�爐� 爐�爐萎え爛� 爐�爛� 爐迦た爐� 爐��爐�爛� 爐�� 爐�爐�� 爐�爐鉦え爐�爐鉦ぐ爛� 爐〝ぐ爛�爐�爛�"
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "爐�く爐� 爐�爛�爐�ぐ 爐�爐鉦い爐� 爐萎�爐�爐逗じ爛�爐�爐� 爐�爐萎�爐�"
 
 #: src/protocols/jabber/jabber.c:842
@@ -6331,8 +6331,8 @@
 msgstr "爐�ぞ爐伍さ爐萎�爐� (爐�た爐� 爐伍�)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "爐�爛�爐�ぐ(Jabber) 爐�ぞ爐伍さ爐萎�爐� 爐�う爐迦�爐�"
+msgid "Change XMPP Password"
+msgstr "爐�爛�爐�ぐ(XMPP) 爐�ぞ爐伍さ爐萎�爐� 爐�う爐迦�爐�"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6382,8 +6382,8 @@
 msgstr "爐�爛�爐�爐� 爐�す爛�爐� 爐�た爐迦�"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "爐�爐�ぞ爐��爐� 爐�爛�爐�ぐ(Jabber) 爐�爐� 爐÷�"
+msgid "Malformed XMPP ID"
+msgstr "爐�爐�ぞ爐��爐� 爐�爛�爐�ぐ(XMPP) 爐�爐� 爐÷�"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6646,7 +6646,7 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr "爐�爛�爐�ぐ 爐��爐萎�爐�爛�爐�爛�爐� 爐��爐迦�爐�爐�"
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6697,7 +6697,7 @@
 msgstr "%s 爐�爛� 爐伍�爐��爐� 爐〝�爐�爐�ぞ 爐朽た爐�げ: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr "爐�爛�爐�ぐ 爐伍�爐��爐� 爐む�爐萎�爐�爐� "
 
 #: src/protocols/jabber/message.c:297
@@ -12481,7 +12481,7 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "爐�爐朽�爐� 爐�爐�く爛�爐�爐�爐萎�爐むぞ-爐�ぞ爐�"
 
-#~ msgid "Jabber Profile"
+#~ msgid "XMPP Profile"
 #~ msgstr "爐�爛�爐酌が爐� 爐��爐萎�爐�ぜ爐鉦�爐�"
 
 #~ msgid "Roomlist Error"
--- a/po/hu.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/hu.po	Tue May 01 05:53:57 2007 +0000
@@ -2305,8 +2305,8 @@
 msgstr "hacker 辿s kijel旦lt vezet�"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber fejleszt�"
+msgid "XMPP developer"
+msgstr "XMPP fejleszt�"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2538,7 +2538,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2546,7 +2546,7 @@
 "the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
-"A Gaim egy modul叩ris 端zenetk端ld� kliens AIM, MSN, Yahoo!, Jabber, ICQ, IRC, "
+"A Gaim egy modul叩ris 端zenetk端ld� kliens AIM, MSN, Yahoo!, XMPP, ICQ, IRC, "
 "SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
 "Gadu-Gadu 辿s QQ protokollok egyidej撤 haszn叩lat叩nak k辿pess辿g辿vel. A Gtk+ "
 "haszn叩lat叩val k辿sz端l 辿s GPL licenc alatt terjeszthet�.<BR><BR>A programot "
@@ -5152,10 +5152,10 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Nyers adatk端ld辿sre ad lehet�s辿get sz旦vegalap炭 protokollok sz叩m叩ra (Jabber, "
+"Nyers adatk端ld辿sre ad lehet�s辿get sz旦vegalap炭 protokollok sz叩m叩ra (XMPP, "
 "MSN, IRC, TOC). Nyomja meg az \"Enter\" billenty撤t a k端ld辿shez. Figyelje a "
 "hibakeres� ablakot."
 
@@ -6763,10 +6763,10 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Hat叩s叩ra a t叩rsalg叩si ablakok megjelennek, amint m叩s felhaszn叩l坦k elkezdik "
-"端zenet端ket 鱈rni.  Ez az AIM, ICQ, Jabber, Sametime 辿s Yahoo! protokollokkal "
+"端zenet端ket 鱈rni.  Ez az AIM, ICQ, XMPP, Sametime 辿s Yahoo! protokollokkal "
 "m撤k旦dik."
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7018,8 +7018,8 @@
 msgstr "AIM fi坦k"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Jabber fi坦k"
+msgid "XMPP Account"
+msgstr "XMPP fi坦k"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -8134,8 +8134,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard szerkeszt辿se"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard szerkeszt辿se"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8250,7 +8250,7 @@
 msgid "The following are the results of your search"
 msgstr "A keres辿s eredm辿nyei a k旦vetkez�k"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8275,8 +8275,8 @@
 msgstr "Kiszolg叩l坦utas鱈t叩sok: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "T旦lts旦n ki legal叩bb egy mez�t a megfelel� Jabber felhaszn叩l坦k keres辿s辿hez."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "T旦lts旦n ki legal叩bb egy mez�t a megfelel� XMPP felhaszn叩l坦k keres辿s辿hez."
 
 #: ../libgaim/protocols/jabber/buddy.c:1749
 #: ../libgaim/protocols/novell/novell.c:1488
@@ -8287,8 +8287,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1758
 #: ../libgaim/protocols/jabber/buddy.c:1759
-msgid "Search for Jabber users"
-msgstr "Jabber felhaszn叩l坦k keres辿se"
+msgid "Search for XMPP users"
+msgstr "XMPP felhaszn叩l坦k keres辿se"
 
 #: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
@@ -8417,8 +8417,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "�rv辿nytelen Jabber azonos鱈t坦"
+msgid "Invalid XMPP ID"
+msgstr "�rv辿nytelen XMPP azonos鱈t坦"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8471,8 +8471,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "�j Jabber fi坦k regisztr叩l叩sa"
+msgid "Register New XMPP Account"
+msgstr "�j XMPP fi坦k regisztr叩l叩sa"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8535,8 +8535,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "Jabber jelsz坦 megv叩ltoztat叩sa"
+msgid "Change XMPP Password"
+msgstr "XMPP jelsz坦 megv叩ltoztat叩sa"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8590,8 +8590,8 @@
 msgstr "Az elem nem tal叩lhat坦"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "Rosszul form叩zott Jabber azonos鱈t坦"
+msgid "Malformed XMPP ID"
+msgstr "Rosszul form叩zott XMPP azonos鱈t坦"
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
@@ -8860,8 +8860,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber protokollb�v鱈tm辿ny"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP protokollb�v鱈tm辿ny"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
@@ -8903,8 +8903,8 @@
 msgstr "Az 端zenet eljuttat叩sa a k旦vetkez�h旦z: %s sikertelen: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Jabber 端zenethiba"
+msgid "XMPP Message Error"
+msgstr "XMPP 端zenethiba"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/id.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/id.po	Tue May 01 05:53:57 2007 +0000
@@ -2294,8 +2294,8 @@
 msgstr "hacker dan driver yang ditujukan [si pemalas]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Pengembang Jabber"
+msgid "XMPP developer"
+msgstr "Pengembang XMPP"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2529,7 +2529,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2538,7 +2538,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim adalah klien pengiriman pesan modular yang dapat menggunakanAIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, Gadu-Gadu, dan QQ secara bersamaan.  Ditulis menggunakan GTK+."
 "<BR><BR>Anda dapat memodifikasi dan mendistribusikan program ini sesuai aturan "
 "GPL (versi 2 atau setelahnya).  Sebuah salinan GPL tercantum dalam bagian 'COPYING' "
@@ -5055,10 +5055,10 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Membiarkan anda mengirim input mentah ke protokol berbasis teks (Jabber, MSN, IRC, "
+"Membiarkan anda mengirim input mentah ke protokol berbasis teks (XMPP, MSN, IRC, "
 "TOC). Tekan 'Enter' dalam kotak tempat memasukkan untuk mengirim. Perhatikan jendela debug."
 
 #: ../gtk/plugins/relnot.c:69
@@ -6668,10 +6668,10 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Menyebabkan jendela percakapan muncul ketika pengguna lain mulai mengirim pesan pada anda.  "
-"Ini berfungsi untuk AIM, ICQ, Jabber, Sametime, dan Yahoo!"
+"Ini berfungsi untuk AIM, ICQ, XMPP, Sametime, dan Yahoo!"
 
 #: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -6924,8 +6924,8 @@
 msgstr "Akun AIM"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Akun Jabber"
+msgid "XMPP Account"
+msgstr "Akun XMPP"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -8035,8 +8035,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Rubah vCard Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Rubah vCard XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8151,7 +8151,7 @@
 msgid "The following are the results of your search"
 msgstr "Berikut ini adalah hasil pencarian anda"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8176,8 +8176,8 @@
 msgstr "Instruksi Server: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Masukkan satu atau beberapa bagian untuk mencari pengguna Jabber yang sesuai."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Masukkan satu atau beberapa bagian untuk mencari pengguna XMPP yang sesuai."
 
 #: ../libgaim/protocols/jabber/buddy.c:1749
 #: ../libgaim/protocols/novell/novell.c:1488
@@ -8188,8 +8188,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1758
 #: ../libgaim/protocols/jabber/buddy.c:1759
-msgid "Search for Jabber users"
-msgstr "Cari pengguna Jabber"
+msgid "Search for XMPP users"
+msgstr "Cari pengguna XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
@@ -8318,8 +8318,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "ID Jabber tidak valid"
+msgid "Invalid XMPP ID"
+msgstr "ID XMPP tidak valid"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8372,8 +8372,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "Daftarkan Akun Jabber Baru"
+msgid "Register New XMPP Account"
+msgstr "Daftarkan Akun XMPP Baru"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8436,8 +8436,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "Ganti Kata Sandi Jabber"
+msgid "Change XMPP Password"
+msgstr "Ganti Kata Sandi XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8491,8 +8491,8 @@
 msgstr "Item Tidak Ditemukan"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "ID Jabber salah bentuk"
+msgid "Malformed XMPP ID"
+msgstr "ID XMPP salah bentuk"
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
@@ -8759,8 +8759,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "Plugin Protokol Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Plugin Protokol XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
@@ -8802,8 +8802,8 @@
 msgstr "Pengiriman pesan ke %s gagal: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Kesalahan Pesan Jabber"
+msgid "XMPP Message Error"
+msgstr "Kesalahan Pesan XMPP"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/it.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/it.po	Tue May 01 05:53:57 2007 +0000
@@ -2873,8 +2873,8 @@
 msgstr "Modalit� psichica per le conversazioni in ingresso"
 
 #: ../libpurple/plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "Fa s狸 che la finestra di conversazione appaia non appena un altro utente inizia a scriverti. Funziona con AIM, ICQ, Jabber, Sametime e Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Fa s狸 che la finestra di conversazione appaia non appena un altro utente inizia a scriverti. Funziona con AIM, ICQ, XMPP, Sametime e Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -3152,8 +3152,8 @@
 msgstr "Account AIM"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Account Jabber"
+msgid "XMPP Account"
+msgstr "Account XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4300,8 +4300,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Modifica la vCard di Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Modifica la vCard di XMPP"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
@@ -4413,7 +4413,7 @@
 msgid "The following are the results of your search"
 msgstr "Ecco i risultati della tua ricerca"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
 msgstr ""
@@ -4436,7 +4436,7 @@
 msgstr "Informazioni sul server"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
@@ -4448,8 +4448,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Cerca utenti Jabber"
+msgid "Search for XMPP users"
+msgstr "Cerca utenti XMPP"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4593,8 +4593,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "ID Jabber non valido"
+msgid "Invalid XMPP ID"
+msgstr "ID XMPP non valido"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4648,8 +4648,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Registra un nuovo account Jabber"
+msgid "Register New XMPP Account"
+msgstr "Registra un nuovo account XMPP"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875
@@ -4724,8 +4724,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Cambia la password di Jabber"
+msgid "Change XMPP Password"
+msgstr "Cambia la password di XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4779,8 +4779,8 @@
 msgstr "Elemento non trovato"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Formato ID Jabber non valido"
+msgid "Malformed XMPP ID"
+msgstr "Formato ID XMPP non valido"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -5038,8 +5038,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1977
 #: ../libpurple/protocols/jabber/jabber.c:1979
-msgid "Jabber Protocol Plugin"
-msgstr "Plugin per il protocollo Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Plugin per il protocollo XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Force old (port 5223) SSL"
@@ -5083,8 +5083,8 @@
 msgstr "Invio del messaggio a %s fallito: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Errore messaggio Jabber"
+msgid "XMPP Message Error"
+msgstr "Errore messaggio XMPP"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12284,8 +12284,8 @@
 msgstr "hacker e autista designato [lazy bum]"
 
 #: ../pidgin/gtkdialogs.c:114
-msgid "Jabber developer"
-msgstr "Sviluppatore per Jabber"
+msgid "XMPP developer"
+msgstr "Sviluppatore per XMPP"
 
 #: ../pidgin/gtkdialogs.c:115
 msgid "original author"
@@ -12598,8 +12598,8 @@
 
 #: ../pidgin/gtkdialogs.c:360
 #, c-format
-msgid "%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 竪 un client modulare di messaggistica in grado di usare allo stesso tempo i protocolli AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu e QQ. � scritto utilizzando GTK+.<BR><BR>� possibile modificare e ridistribuire il programma nei termini della licenza GPL (versione 2 o successiva).  Una copia della GPL 竪 contenuta nel file 'COPYING' distribuito con %s. Il copyright di %s appartiene ai suoi autori. Per una lista completa degli autori, vedere il file 'COPYRIGHT'.  Il programma 竪 fornito senza nessuna garanzia.<BR><BR>"
+msgid "%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 竪 un client modulare di messaggistica in grado di usare allo stesso tempo i protocolli AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu e QQ. � scritto utilizzando GTK+.<BR><BR>� possibile modificare e ridistribuire il programma nei termini della licenza GPL (versione 2 o successiva).  Una copia della GPL 竪 contenuta nel file 'COPYING' distribuito con %s. Il copyright di %s appartiene ai suoi autori. Per una lista completa degli autori, vedere il file 'COPYRIGHT'.  Il programma 竪 fornito senza nessuna garanzia.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:375
 #, fuzzy
@@ -14915,8 +14915,8 @@
 msgstr "Permette di inviare input raw ai protocolli text-based."
 
 #: ../pidgin/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "Permette di inviare input raw ai protocolli text-based (Jabber, MSN, IRC, TOC). Premi 'Invio' nella casella di immissione per inviare il testo. Controlla la finestra di debug."
+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 "Permette di inviare input raw ai protocolli text-based (XMPP, MSN, IRC, TOC). Premi 'Invio' nella casella di immissione per inviare il testo. Controlla la finestra di debug."
 
 #: ../pidgin/plugins/relnot.c:71
 #, fuzzy, c-format
@@ -15875,12 +15875,12 @@
 #, fuzzy
 #~ msgid ""
 #~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
 #~ "all at once.  It is written using GTK+ and is licensed under the GNU GPL."
 #~ "<BR><BR>"
 #~ msgstr ""
 #~ "Gaim 竪 un client modulare per messaggi immediati in grado di usare AIM, "
-#~ "MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr e "
+#~ "MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr e "
 #~ "Gadu-Gadu allo stesso tempo. � scritto utilizzando Gtk+ ed 竪 distribuito "
 #~ "sotto licenza GPL.<BR><BR>"
 #~ msgid "Active Developers"
@@ -15937,8 +15937,8 @@
 #~ msgstr "Cambia password"
 #~ msgid "Realname"
 #~ msgstr "Vero nome"
-#~ msgid "Jabber ID"
-#~ msgstr "ID Jabber"
+#~ msgid "XMPP ID"
+#~ msgstr "ID XMPP"
 #~ msgid "Email Address"
 #~ msgstr "Indirizzo e-mail"
 #~ msgid "Error processing event or response (%s)."
@@ -16560,8 +16560,8 @@
 #~ msgstr "Informazioni sul contatto per %s"
 #~ msgid "Invalid nickname '%s'"
 #~ msgstr "Nickname '%s' non valido"
-#~ msgid "Jabber Profile"
-#~ msgstr "Profilo di Jabber"
+#~ msgid "XMPP Profile"
+#~ msgstr "Profilo di XMPP"
 #~ msgid "Roomlist Error"
 #~ msgstr "Errore nella lista delle stanze"
 #~ msgid "The user %s wants to add you to their buddy list."
--- a/po/ja.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ja.po	Tue May 01 05:53:57 2007 +0000
@@ -2299,8 +2299,8 @@
 msgstr "����ù�若����絎����������ゃ�� [lazy bum]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber �����肴��"
+msgid "XMPP developer"
+msgstr "XMPP �����肴��"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2532,7 +2532,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2540,7 +2540,7 @@
 "the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
-"Gaim �� AIM��MSN��Yahoo!��Jabber��ICQ��IRC��SILC��SIP/SIMPLE��Novell "
+"Gaim �� AIM��MSN��Yahoo!��XMPP��ICQ��IRC��SILC��SIP/SIMPLE��Novell "
 "GroupWise��Lotus Sametime��Bonjour��Zephyr��Gadu-Gadu��QQ �����c�����㏍���潟��"
 "�����������������с������GTK+ ���若���㏍�������∞�������≪�吾�ャ�若�������<���祉�若�吾��"
 "�����ゃ�≪�潟���с����<BR><BR>GPL ���ゃ�祉�潟�� (膃������������������篁ラ������) ��絎�"
@@ -5146,10 +5146,10 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"�ュ�����������若�帥�����㏍�鴻��綵√������㏍���潟�� (Jabber, MSN, IRC, TOC) �檎��篆<�с��"
+"�ュ�����������若�帥�����㏍�鴻��綵√������㏍���潟�� (XMPP, MSN, IRC, TOC) �檎��篆<�с��"
 "�障������篆<���������ュ���������鴻��賢�� [ENTER] �㏍�若���若������������������違��"
 "���c�潟�����ч��篆≦��絎鴻���h������������"
 
@@ -6772,9 +6772,9 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"篁臥�����ュ�������<���祉�若�吾��篌�荅宴���c�潟�������贋・茵�ず���障�� (AIM��ICQ��Jabber��"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"篁臥�����ュ�������<���祉�若�吾��篌�荅宴���c�潟�������贋・茵�ず���障�� (AIM��ICQ��XMPP��"
 "Sametime��Yahoo!�у��篏����障��)��"
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7030,8 +7030,8 @@
 msgstr "AIM ���≪�����潟��"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Jabber ���≪�����潟��"
+msgid "XMPP Account"
+msgstr "XMPP ���≪�����潟��"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -8140,8 +8140,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard ��隈��"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard ��隈��"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8256,7 +8256,7 @@
 msgid "The following are the results of your search"
 msgstr "罎�膣∝����с��"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8281,8 +8281,8 @@
 msgstr "�泣�若��������: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Jabber ���若�吟��罎�膣≪����������や札筝�����������������:"
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "XMPP ���若�吟��罎�膣≪����������や札筝�����������������:"
 
 #: ../libgaim/protocols/jabber/buddy.c:1749
 #: ../libgaim/protocols/novell/novell.c:1488
@@ -8293,8 +8293,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1758
 #: ../libgaim/protocols/jabber/buddy.c:1759
-msgid "Search for Jabber users"
-msgstr "Jabber ���若�吟���膣�"
+msgid "Search for XMPP users"
+msgstr "XMPP ���若�吟���膣�"
 
 #: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
@@ -8423,8 +8423,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "筝�罩c�� Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "筝�罩c�� XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8477,8 +8477,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "�違���� Jabber �≪�����潟�����脂��"
+msgid "Register New XMPP Account"
+msgstr "�違���� XMPP �≪�����潟�����脂��"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8541,8 +8541,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "Jabber ���鴻���若�������"
+msgid "Change XMPP Password"
+msgstr "XMPP ���鴻���若�������"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8596,8 +8596,8 @@
 msgstr "�≪�ゃ������荀��ゃ�����障����"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "�������� Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "�������� XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
@@ -8869,8 +8869,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber ���㏍���潟���������違�ゃ��"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP ���㏍���潟���������違�ゃ��"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
@@ -8912,8 +8912,8 @@
 msgstr "%s �����吾���<���祉�若�吾��������け��: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Jabber �<���祉�若�吾�祉������"
+msgid "XMPP Message Error"
+msgstr "XMPP �<���祉�若�吾�祉������"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/ka.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ka.po	Tue May 01 05:53:57 2007 +0000
@@ -1214,7 +1214,7 @@
 
 #: ../plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -3285,8 +3285,8 @@
 
 #: ../src/gtkdialogs.c:98
 #, fuzzy
-msgid "Jabber developer"
-msgstr "Jabber"
+msgid "XMPP developer"
+msgstr "XMPP"
 
 #: ../src/gtkdialogs.c:99
 msgid "original author"
@@ -3473,7 +3473,7 @@
 #: ../src/gtkdialogs.c:250
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
 "and Gadu-Gadu 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 "
@@ -6381,8 +6381,8 @@
 msgstr "������������������ ������"
 
 #: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard-���� ���������メ�≡����������"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard-���� ���������メ�≡����������"
 
 #: ../src/protocols/jabber/buddy.c:569
 msgid ""
@@ -6466,7 +6466,7 @@
 msgstr ""
 
 #: ../src/protocols/jabber/buddy.c:1381
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../src/protocols/jabber/buddy.c:1385 ../src/protocols/jabber/jabber.c:701
@@ -6484,7 +6484,7 @@
 msgstr "E-Mail �����=������������"
 
 #: ../src/protocols/jabber/buddy.c:1409 ../src/protocols/jabber/buddy.c:1410
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr ""
 
 #: ../src/protocols/jabber/buddy.c:1424
@@ -6605,8 +6605,8 @@
 msgstr "������ ���メ������ �=�������≡��"
 
 #: ../src/protocols/jabber/jabber.c:451 ../src/protocols/jabber/jabber.c:788
-msgid "Invalid Jabber ID"
-msgstr "�������=�������� Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "�������=�������� XMPP ID"
 
 #: ../src/protocols/jabber/jabber.c:521
 #, c-format
@@ -6653,8 +6653,8 @@
 msgstr ""
 
 #: ../src/protocols/jabber/jabber.c:752 ../src/protocols/jabber/jabber.c:753
-msgid "Register New Jabber Account"
-msgstr "���������� Jabber ������������������ ���������=�≡����������"
+msgid "Register New XMPP Account"
+msgstr "���������� XMPP ������������������ ���������=�≡����������"
 
 #: ../src/protocols/jabber/jabber.c:897
 #, fuzzy
@@ -6721,8 +6721,8 @@
 msgstr "������������ (���������� ������������)"
 
 #: ../src/protocols/jabber/jabber.c:1230 ../src/protocols/jabber/jabber.c:1231
-msgid "Change Jabber Password"
-msgstr "�������������� Jabber ������������"
+msgid "Change XMPP Password"
+msgstr "�������������� XMPP ������������"
 
 #: ../src/protocols/jabber/jabber.c:1231
 msgid "Please enter your new password"
@@ -6773,8 +6773,8 @@
 msgstr ""
 
 #: ../src/protocols/jabber/jabber.c:1341
-msgid "Malformed Jabber ID"
-msgstr "�������=�������� Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "�������=�������� XMPP ID"
 
 #: ../src/protocols/jabber/jabber.c:1343
 msgid "Not Acceptable"
@@ -7021,8 +7021,8 @@
 #. *  summary
 #. *  description
 #: ../src/protocols/jabber/jabber.c:1766 ../src/protocols/jabber/jabber.c:1768
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber �������≡������������ ��������������"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP �������≡������������ ��������������"
 
 #: ../src/protocols/jabber/jabber.c:1794
 msgid "Use TLS if available"
@@ -7070,8 +7070,8 @@
 msgstr ""
 
 #: ../src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber �����≡�п���������������� ��������������"
+msgid "XMPP Message Error"
+msgstr "XMPP �����≡�п���������������� ��������������"
 
 #: ../src/protocols/jabber/message.c:297
 #, c-format
--- a/po/kn.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/kn.po	Tue May 01 05:53:57 2007 +0000
@@ -2100,7 +2100,7 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:102
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:103
@@ -2317,7 +2317,7 @@
 #: ../gtk/gtkdialogs.c:321
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, 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 Gaim.  "
@@ -4910,7 +4910,7 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -6022,7 +6022,7 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #. This is a quote from Star Wars.  You should
@@ -6277,7 +6277,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/bonjour/bonjour.c:592
-msgid "Jabber Account"
+msgid "XMPP Account"
 msgstr ""
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
@@ -7414,7 +7414,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:588
 #: ../libgaim/protocols/jabber/buddy.c:589
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:590
@@ -7527,7 +7527,7 @@
 "牴�何牴��牴� 牴項�牴÷�牴�牾�牴朽何牴�牾�牴� "
 "牴�臆牴逗欧牴鉦�牴謹�牴橿� 牴�牴迦�牴迦何牴朽�"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1633
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -7550,7 +7550,7 @@
 msgstr "牴伍屋牾�牴朽屋牾� 牴伍�牴�牴��牴�牴橿� %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1695
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:1715
@@ -7562,7 +7562,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1724
 #: ../libgaim/protocols/jabber/buddy.c:1725
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:1739
@@ -7695,7 +7695,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:532
 #: ../libgaim/protocols/jabber/jabber.c:875
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:603
@@ -7752,7 +7752,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:838
 #: ../libgaim/protocols/jabber/jabber.c:839
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1004
@@ -7824,8 +7824,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1343
 #: ../libgaim/protocols/jabber/jabber.c:1344
-msgid "Change Jabber Password"
-msgstr "Jabber 牴��牴萎乙牾�牴謹鴎牴� 牴�王牴迦何牴伍何..."
+msgid "Change XMPP Password"
+msgstr "XMPP 牴��牴萎乙牾�牴謹鴎牴� 牴�王牴迦何牴伍何..."
 
 #: ../libgaim/protocols/jabber/jabber.c:1344
 msgid "Please enter your new password"
@@ -7879,7 +7879,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1454
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1456
@@ -8147,7 +8147,7 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1933
 #: ../libgaim/protocols/jabber/jabber.c:1935
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1961
@@ -8200,7 +8200,7 @@
 msgstr " %s 牴萎何牴�牾� 牴伍�牴��牴� 牴朽何牴む屋牴�� 牴朽何牴�臆 : %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/message.c:316
--- a/po/ko.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ko.po	Tue May 01 05:53:57 2007 +0000
@@ -839,7 +839,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -2779,8 +2779,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "���� ���(Jabber) 螳�覦���"
+msgid "XMPP developer"
+msgstr "���� ���(XMPP) 螳�覦���"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -2955,10 +2955,10 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
-"蟆����� AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, "
+"蟆����� AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, "
 "Zephyr, Gadu-Gadu襯� ��蟶朱��� 讌������� 覈��� 蠍磯��� 覃�����������.  Gtk+襯� �伎��"
 "���� 襷��れ�伎��朱� GPL �殊�伎�殊�るゼ �磯�����.<BR><BR>"
 
@@ -5612,8 +5612,8 @@
 msgstr "��������"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard 螻�豺�蠍�"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard 螻�豺�蠍�"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5624,7 +5624,7 @@
 "�語��."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
+msgid "XMPP ID"
 msgstr "��� ���企��"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
@@ -5703,7 +5703,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5722,7 +5722,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "覃��� 譯殊��襦� 豺�蟲� 谿剰鍵"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5849,7 +5849,7 @@
 msgstr "��貅��� 襷��� �� ����"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr "��覈視�� ��� ���企��"
 
 #: src/protocols/jabber/jabber.c:473
@@ -5896,7 +5896,7 @@
 msgstr "�� 螻����� 襷����る� ������ ��覲企ゼ 豈���譯殊�語��."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "�� ��� 螻��� �焔�"
 
 #: src/protocols/jabber/jabber.c:842
@@ -5969,7 +5969,7 @@
 msgstr "�� �伎��蠍� (�れ��)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "��� �伎��蠍� 覦�蠑瑚鍵"
 
 #: src/protocols/jabber/jabber.c:1161
@@ -6020,7 +6020,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr "��覈視�� ��� ���企��"
 
 #: src/protocols/jabber/jabber.c:1273
@@ -6284,8 +6284,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber ��襦���貊� ����係��"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP ��襦���貊� ����係��"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6336,7 +6336,7 @@
 
 #: src/protocols/jabber/message.c:233
 #, fuzzy
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr "��� �る�"
 
 #: src/protocols/jabber/message.c:297
@@ -11863,7 +11863,7 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "��覈視�� ������ �企�"
 
-#~ msgid "Jabber Profile"
+#~ msgid "XMPP Profile"
 #~ msgstr "��� ��襦���"
 
 #~ msgid "Roomlist Error"
--- a/po/ku.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ku.po	Tue May 01 05:53:57 2007 +0000
@@ -1003,10 +1003,10 @@
 #: ../plugins/psychic.c:24
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Dema kes棚n din ji te re peyam niv樽sand w棚 bixweber paceya axaftin棚 vebe. Ev "
-"ji bo AIM,ICQ, Jabber, Sametime 短 Yahoo dixebite."
+"ji bo AIM,ICQ, XMPP, Sametime 短 Yahoo dixebite."
 
 #: ../plugins/psychic.c:60
 msgid "You feel a disturbance in the force..."
@@ -1034,10 +1034,10 @@
 
 #: ../plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"dih棚le ku tu t棚ketan棚n negihi�t樽 bi�樽n樽 protokol棚n niv樽sk樽 (Jabber, MSN, "
+"dih棚le ku tu t棚ketan棚n negihi�t樽 bi�樽n樽 protokol棚n niv樽sk樽 (XMPP, MSN, "
 "IRC, TOC). ji bo �andin棚  'Enter' bitik樽ne.li Paceya vebijartin棚 binh棚re."
 
 #: ../plugins/relnot.c:63
@@ -2408,7 +2408,7 @@
 #: ../src/gtkblist.c:3545
 #, fuzzy
 msgid "Re-enable Account"
-msgstr "Hesabeke N短 ya Jabber Biafir樽ne"
+msgstr "Hesabeke N短 ya XMPP Biafir樽ne"
 
 #: ../src/gtkblist.c:3566
 #, c-format
@@ -3038,8 +3038,8 @@
 msgstr "Hacker 短 p棚�k棚�kera sepand樽 [lazy bum]"
 
 #: ../src/gtkdialogs.c:101
-msgid "Jabber developer"
-msgstr "P棚�vebir棚 Jabber"
+msgid "XMPP developer"
+msgstr "P棚�vebir棚 XMPP"
 
 #: ../src/gtkdialogs.c:102
 msgid "original author"
@@ -3239,7 +3239,7 @@
 #: ../src/gtkdialogs.c:261
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
 "and Gadu-Gadu 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 "
@@ -6210,8 +6210,8 @@
 msgstr "Roja day樽kb短n棚"
 
 #: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "VCarda Jabber serast bike"
+msgid "Edit XMPP vCard"
+msgstr "VCarda XMPP serast bike"
 
 #: ../src/protocols/jabber/buddy.c:569
 msgid ""
@@ -6307,7 +6307,7 @@
 msgstr "Avaker棚n p棚�k棚�ker: %s"
 
 #: ../src/protocols/jabber/buddy.c:1392
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/novell/novell.c:1490
@@ -6316,8 +6316,8 @@
 msgstr "Navn樽�ana E-peyam棚"
 
 #: ../src/protocols/jabber/buddy.c:1420 ../src/protocols/jabber/buddy.c:1421
-msgid "Search for Jabber users"
-msgstr "Bikarh棚ner棚n Jabber Bigere"
+msgid "Search for XMPP users"
+msgstr "Bikarh棚ner棚n XMPP Bigere"
 
 #: ../src/protocols/jabber/buddy.c:1435
 msgid "Invalid Directory"
@@ -6438,8 +6438,8 @@
 msgstr "Gir棚dan venabe"
 
 #: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
-msgid "Invalid Jabber ID"
-msgstr "ID'a Jabber a nederbasdar"
+msgid "Invalid XMPP ID"
+msgstr "ID'a XMPP a nederbasdar"
 
 #: ../src/protocols/jabber/jabber.c:590
 #, c-format
@@ -6485,8 +6485,8 @@
 msgstr "Ji bo tomarb短n棚, agahiy棚n li j棚r biqed樽ne."
 
 #: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
-msgid "Register New Jabber Account"
-msgstr "Hesabeke N短 ya Jabber Biafir樽ne"
+msgid "Register New XMPP Account"
+msgstr "Hesabeke N短 ya XMPP Biafir樽ne"
 
 #: ../src/protocols/jabber/jabber.c:983
 msgid "Initializing Stream"
@@ -6549,8 +6549,8 @@
 msgstr "�樽fre�(d樽sa)"
 
 #: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
-msgid "Change Jabber Password"
-msgstr "�樽freya Jabber biguher樽ne"
+msgid "Change XMPP Password"
+msgstr "�樽freya XMPP biguher樽ne"
 
 #: ../src/protocols/jabber/jabber.c:1318
 msgid "Please enter your new password"
@@ -6599,8 +6599,8 @@
 msgstr "Bireser Nehat D樽tin"
 
 #: ../src/protocols/jabber/jabber.c:1428
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Malformed XMPP ID"
 
 #: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Acceptable"
@@ -6862,8 +6862,8 @@
 #. *< version
 #. *  summary
 #: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
-msgid "Jabber Protocol Plugin"
-msgstr "P棚veke Protokola Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "P棚veke Protokola XMPP"
 
 #: ../src/protocols/jabber/jabber.c:1911
 msgid "Use TLS if available"
@@ -6910,8 +6910,8 @@
 msgstr "Peyam ji %s re nehat �andin: %s"
 
 #: ../src/protocols/jabber/message.c:227
-msgid "Jabber Message Error"
-msgstr "Xeletiya Peyam a Jabber"
+msgid "XMPP Message Error"
+msgstr "Xeletiya Peyam a XMPP"
 
 #: ../src/protocols/jabber/message.c:295
 #, c-format
@@ -12791,8 +12791,8 @@
 #~ msgid "<main>/Conversation/Close"
 #~ msgstr "<main>/Niv樽sandin/Bigire"
 
-#~ msgid "former Jabber developer"
-#~ msgstr "P棚�xistinkara Jabber"
+#~ msgid "former XMPP developer"
+#~ msgstr "P棚�xistinkara XMPP"
 
 #~ msgid "Azerbaijani"
 #~ msgstr "Azerbaijani"
@@ -12833,11 +12833,11 @@
 
 #~ msgid ""
 #~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 #~ "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 #~ msgstr ""
 #~ "Gaim; p棚�k棚�kareke peyaman a modul樽 ye 短 di heman dem棚 de dikar樽 xwe bi "
-#~ "hesab棚n xwe y棚n AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, "
+#~ "hesab棚n xwe y棚n AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, "
 #~ "Napster, Zephyr, 短 Gadu-Gadu ve gir棚 bid樽. Bi GTK+ hatiye niv樽sandin 短 di "
 #~ "bin ban棚 l樽sansa GPL de ye.<BR><BR>"
 
@@ -13329,11 +13329,11 @@
 #~ msgid "Invalid nickname '%s'"
 #~ msgstr "Nicka nederbasdar '%s'"
 
-#~ msgid "Jabber ID"
-#~ msgstr "ID ya Jabber"
-
-#~ msgid "Jabber Profile"
-#~ msgstr "Prof樽la Jabber"
+#~ msgid "XMPP ID"
+#~ msgstr "ID ya XMPP"
+
+#~ msgid "XMPP Profile"
+#~ msgstr "Prof樽la XMPP"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Xeletiya L樽steya Odey棚"
--- a/po/lt.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/lt.po	Tue May 01 05:53:57 2007 +0000
@@ -2365,8 +2365,8 @@
 msgstr "hakeris ir negeriantis, nes prie vairo [tingus netik�lis]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber k笛r�jas"
+msgid "XMPP developer"
+msgstr "XMPP k笛r�jas"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2598,7 +2598,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2607,7 +2607,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim yra modulin� pokalbi迭 programa, su kuria galima bendrauti AIM, MSN, "
-"Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
+"Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
 "Sametime, Bonjour, Zephyr, Gadu-Gadu ir QQ tinkluose �� visuose vienu metu.  "
 "Gaim para邸yta naudojanat GTK+.<br><br>J笛s galite keisti ir platinti 邸i� "
 "program� GPL (2 ar v�lesn�s versijos) s�lygomis.  GPL kopija yra faile "
@@ -5327,10 +5327,10 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Leid転ia Jums si迭sti neapdorot� 眺vesti tekstiniams protokolams (Jabber, MSN, "
+"Leid転ia Jums si迭sti neapdorot� 眺vesti tekstiniams protokolams (XMPP, MSN, "
 "IRC, TOC). Paspauskite 'Enter' 眺vedimo langelyje i邸siuntimui. Steb�kite "
 "derinimo lang�."
 
@@ -6998,10 +6998,10 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Atidaro pokalbi迭 langus, kai kiti vartotojai tik pradeda ra邸yti Jums "
-"転inut�.  �i funkcija veikia AIM, ICQ, Jabber, Sametime ir Yahoo! "
+"転inut�.  �i funkcija veikia AIM, ICQ, XMPP, Sametime ir Yahoo! "
 "protokoluose."
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7292,8 +7292,8 @@
 msgstr "AIM paskyra"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Jabber paskyra"
+msgid "XMPP Account"
+msgstr "XMPP paskyra"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -8425,8 +8425,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Redaguoti Jabber vCard vizitin� kortel�"
+msgid "Edit XMPP vCard"
+msgstr "Redaguoti XMPP vCard vizitin� kortel�"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8542,7 +8542,7 @@
 msgid "The following are the results of your search"
 msgstr "Toliau yra J笛s迭 paie邸kos rezultatai"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8567,8 +8567,8 @@
 msgstr "Serverio instrukcijos: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "U転pildykite vien� ar daugiau lauk迭 Jabber vartotoj迭 paie邸kai."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "U転pildykite vien� ar daugiau lauk迭 XMPP vartotoj迭 paie邸kai."
 
 #: ../libgaim/protocols/jabber/buddy.c:1749
 #: ../libgaim/protocols/novell/novell.c:1488
@@ -8579,8 +8579,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1758
 #: ../libgaim/protocols/jabber/buddy.c:1759
-msgid "Search for Jabber users"
-msgstr "Ie邸koti Jabber vartotoj迭"
+msgid "Search for XMPP users"
+msgstr "Ie邸koti XMPP vartotoj迭"
 
 #: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
@@ -8709,8 +8709,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "Neteisingas Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Neteisingas XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8763,8 +8763,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "Registruoti nauj� Jabber abonent�"
+msgid "Register New XMPP Account"
+msgstr "Registruoti nauj� XMPP abonent�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8827,8 +8827,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "Pakeisti Jabber slapta転od眺"
+msgid "Change XMPP Password"
+msgstr "Pakeisti XMPP slapta転od眺"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8882,8 +8882,8 @@
 msgstr "Nerastas elementas"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "Neteisingai suformuotas Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Neteisingai suformuotas XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
@@ -9155,8 +9155,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber protokolo papildinys"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP protokolo papildinys"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
@@ -9198,8 +9198,8 @@
 msgstr "貼inut�s pristatymas gav�jui %s nepavyko: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Jabber prane邸imo klaida"
+msgid "XMPP Message Error"
+msgstr "XMPP prane邸imo klaida"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/mk.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/mk.po	Tue May 01 05:53:57 2007 +0000
@@ -837,10 +837,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"�亳 仂于仂亰仄仂亢�于舒 亟舒 亳�仗�舒�舒�亠 �亳��亳 于仍亠亰仆亳 仗仂亟舒�仂�亳 亟仂 �亠从���舒仍仆仂-弍舒亰亳�舒仆亳 仗�仂�仂从仂仍亳. (Jabber, MSN, IRC, "
+"�亳 仂于仂亰仄仂亢�于舒 亟舒 亳�仗�舒�舒�亠 �亳��亳 于仍亠亰仆亳 仗仂亟舒�仂�亳 亟仂 �亠从���舒仍仆仂-弍舒亰亳�舒仆亳 仗�仂�仂从仂仍亳. (XMPP, MSN, IRC, "
 "TOC). ��亳�亳�仆亠�亠 仆舒 ��Enter�� 于仂 仗仂仍亠�仂 亰舒 于仆亠��于舒�亠 亰舒 亟舒 亳亰仗�舒�亳�亠. �仍亠亟舒��亠 亞仂 仗�仂亰仂�亠�仂� 亰舒 亟亠弍舒亞亳�舒�亠."
 
 #: plugins/relnot.c:63
@@ -2757,7 +2757,7 @@
 msgstr "仂亟亟�亢�于舒� 仆舒 libfaim"
 
 #: src/gtkdialogs.c:92
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "�舒弍亠� 仗�仂亞�舒仄亠�"
 
 #: src/gtkdialogs.c:93
@@ -2927,11 +2927,11 @@
 #: src/gtkdialogs.c:226
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim 亠 仄仂亟�仍舒�亠仆 从仍亳亠仆� 亰舒 仗仂�舒从亳 �仗仂�仂弍亠仆 亰舒 从仂�亳��亠�亠 �仂 AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr 亳 Gadu-Gadu 亳��仂于�亠仄亠仆仂. "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr 亳 Gadu-Gadu 亳��仂于�亠仄亠仆仂. "
 "  �舒仗亳�舒仆 亠 �仂 从仂�亳��亠�亠 仆舒 GTK+ 亳 亠 仍亳�亠仆�亳�舒仆 �仂 GNU GPL.<BR><BR> "
 
 #: src/gtkdialogs.c:235
@@ -5579,8 +5579,8 @@
 msgstr "�仂亟亠仆亟亠仆"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "丕�亠亟亳 vCard 亰舒 Jabber"
+msgid "Edit XMPP vCard"
+msgstr "丕�亠亟亳 vCard 亰舒 XMPP"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5591,8 +5591,8 @@
 "亟亠从舒 �亠 仗仂��亠弍仆亳,"
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ��"
+msgid "XMPP ID"
+msgstr "XMPP ��"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5670,8 +5670,8 @@
 msgstr "弌仍亠亟仆亳于亠 �亠 �亠亰�仍�舒�亳�亠 仂亟 �舒�亠�仂 仗�亠弍舒��于舒�亠"
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "�仂仗仂仍仆亠�亠 亠亟仆仂 亳仍亳 仗仂于亠�亠 仗仂仍亳�舒 亰舒 亟舒 弍舒�舒�亠 从仂�亳�仆亳�亳 仆舒 Jabber 从仂亳 �亠 �仂于仗舒�舒舒�."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "�仂仗仂仍仆亠�亠 亠亟仆仂 亳仍亳 仗仂于亠�亠 仗仂仍亳�舒 亰舒 亟舒 弍舒�舒�亠 从仂�亳�仆亳�亳 仆舒 XMPP 从仂亳 �亠 �仂于仗舒�舒舒�."
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
 #: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
@@ -5688,8 +5688,8 @@
 msgstr "�亟�亠�舒 亰舒 亠-仗仂��舒"
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
-msgstr "�舒�舒� 从仂�亳�仆亳�亳 仆舒 Jabber"
+msgid "Search for XMPP users"
+msgstr "�舒�舒� 从仂�亳�仆亳�亳 仆舒 XMPP"
 
 #: src/protocols/jabber/buddy.c:1370
 msgid "Invalid Directory"
@@ -5809,8 +5809,8 @@
 msgstr "�亠 仄仂亢舒仄 亟舒 从�亠亳�舒仄 �仂从亠�"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "�亠于舒仍亳亟仆仂 �亟. 亰舒 Jabber"
+msgid "Invalid XMPP ID"
+msgstr "�亠于舒仍亳亟仆仂 �亟. 亰舒 XMPP"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -5856,8 +5856,8 @@
 msgstr "�亠 仄仂仍舒仄, 仗仂仗仂仍仆亠�亠 亞亳 亳仆�仂�仄舒�亳亳�亠 仗仂亟仂仍� 亰舒 亟舒 �舒 �亠亞亳���亳�舒�亠 �舒�舒�舒 仆仂于舒 �仄亠�从舒."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "�亠亞亳���亳�舒� 仆仂于舒 �仄亠�从舒 亰舒 Jabber"
+msgid "Register New XMPP Account"
+msgstr "�亠亞亳���亳�舒� 仆仂于舒 �仄亠�从舒 亰舒 XMPP"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -5928,8 +5928,8 @@
 msgstr "�仂亰亳仆从舒 (仗仂于�仂�仆仂)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "��仂仄亠仆亳 �舒 仍仂亰亳仆从舒�舒 亰舒 Jabber"
+msgid "Change XMPP Password"
+msgstr "��仂仄亠仆亳 �舒 仍仂亰亳仆从舒�舒 亰舒 XMPP"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -5978,8 +5978,8 @@
 msgstr "��亠亟仄亠�仂� 仆亠 亠 仗�仂仆舒�亟亠仆"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "�亠�仂�仆a �� 亰舒 Jabber"
+msgid "Malformed XMPP ID"
+msgstr "�亠�仂�仆a �� 亰舒 XMPP"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6222,8 +6222,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "��亳从仍��仂从 亰舒 Jabber 仗�仂�仂从仂仍仂�"
+msgid "XMPP Protocol Plugin"
+msgstr "��亳从仍��仂从 亰舒 XMPP 仗�仂�仂从仂仍仂�"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6271,8 +6271,8 @@
 msgstr "�仂��舒于�于舒�亠�仂 仆舒 仗仂�舒从舒�舒 亟仂 %s 仆亠 ��仗亠舒: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "��亠�从舒 于仂 Jabber 仗仂�舒从舒�舒"
+msgid "XMPP Message Error"
+msgstr "��亠�从舒 于仂 XMPP 仗仂�舒从舒�舒"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
--- a/po/my_MM.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/my_MM.po	Tue May 01 05:53:57 2007 +0000
@@ -848,10 +848,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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."
 
 #: plugins/relnot.c:63
@@ -2821,8 +2821,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "former Jabber developer"
+msgid "XMPP developer"
+msgstr "former XMPP developer"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -2996,11 +2996,11 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:235
@@ -5002,7 +5002,7 @@
 #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "Register New Jabber Account"
+msgstr "Register New XMPP Account"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
@@ -5724,8 +5724,8 @@
 msgstr "Birthday"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Edit XMPP vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5736,8 +5736,8 @@
 "comfortable."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5815,7 +5815,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5834,7 +5834,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "Search for a buddy by e-mail address"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5960,8 +5960,8 @@
 msgstr "Unable to create socket"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Invalid XMPP ID"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6007,8 +6007,8 @@
 msgstr "Please fill out the information below to register your new account."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "Register New Jabber Account"
+msgid "Register New XMPP Account"
+msgstr "Register New XMPP Account"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6080,8 +6080,8 @@
 msgstr "Password (again)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Change Jabber Password"
+msgid "Change XMPP Password"
+msgstr "Change XMPP Password"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6131,8 +6131,8 @@
 msgstr "Item Not Found"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Malformed XMPP ID"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6378,8 +6378,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protocol Plugin"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6429,8 +6429,8 @@
 msgstr "Message delivery to %s failed: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber Message Error"
+msgid "XMPP Message Error"
+msgstr "XMPP Message Error"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12169,8 +12169,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Invalid Username"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber Profile"
+#~ msgid "XMPP Profile"
+#~ msgstr "XMPP Profile"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Roomlist Error"
--- a/po/nb.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/nb.po	Tue May 01 05:53:57 2007 +0000
@@ -900,10 +900,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Lar deg sende direktekommandoer til tekstbaserte protokoller (Jabber, MSN, "
+"Lar deg sende direktekommandoer til tekstbaserte protokoller (XMPP, MSN, "
 "IRC, TOC). Trykk 'Enter' for � sende, og sjekk avlusningsvinduet."
 
 #: plugins/relnot.c:63
@@ -2889,7 +2889,7 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "tidligere jabber-utvikler"
 
 #
@@ -3071,11 +3071,11 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim er en modulbasert klient for direktemeldinger som kan bruke AIM, MSN, "
-"Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, og Gadu-"
+"Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, og Gadu-"
 "Gadu samtidig. Programmet er bygget p� Gtk+ og er lisensiert under GPL."
 "<BR><BR>"
 
@@ -5791,8 +5791,8 @@
 msgstr "F�dselsdag"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Rediger vCard for Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Rediger vCard for XMPP"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5803,8 +5803,8 @@
 "informasjonen du �nsker"
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber-feil"
+msgid "XMPP ID"
+msgstr "XMPP-feil"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5882,8 +5882,8 @@
 msgstr "F�lgende resultat fra ditt s�k"
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Fyll inn ett eller flere felt for � s�ke etter matchende Jabber brukere."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Fyll inn ett eller flere felt for � s�ke etter matchende XMPP brukere."
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
 #: src/protocols/oscar/oscar.c:5962 src/protocols/silc/ops.c:810
@@ -5901,7 +5901,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "Kontakts�k etter e-postadresse"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -6032,7 +6032,7 @@
 msgstr "Kunne ikke opprette socket"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr "Ugyldig jabber-ID"
 
 #: src/protocols/jabber/jabber.c:473
@@ -6079,7 +6079,7 @@
 msgstr "Fyll ut feltene under for � registrere den nye kontoen din."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "Registrere ny jabber-konto"
 
 #: src/protocols/jabber/jabber.c:842
@@ -6155,7 +6155,7 @@
 msgstr "Passord (igjen)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "Bytt jabber-passord"
 
 #: src/protocols/jabber/jabber.c:1161
@@ -6207,7 +6207,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr "Ugyldig jabber-ID"
 
 #: src/protocols/jabber/jabber.c:1273
@@ -6457,8 +6457,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber-protokolltillegg"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP-protokolltillegg"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6508,8 +6508,8 @@
 msgstr "Beskjedlevering til %s feilet: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber beskjedfeil"
+msgid "XMPP Message Error"
+msgstr "XMPP beskjedfeil"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12302,8 +12302,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Ugyldig brukernavn"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber-profil"
+#~ msgid "XMPP Profile"
+#~ msgstr "XMPP-profil"
 
 #
 #~ msgid "Roomlist Error"
--- a/po/ne.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ne.po	Tue May 01 05:53:57 2007 +0000
@@ -831,9 +831,9 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 "爐�ぞ爐� 爐�爐оぞ爐萎た爐� 爐��爐萎�爐�爛�爐�爐�(Jabber, MSN, IRC, TOC)爐項ぐ爛�爐�ぞ 爐�爐�爛�爐�爐� 爐�爐�爐� 爐��爐鉦�爐� 爐伍�爛�爐��爐項�爐��爐� 爛� 爐��爐萎さ爐逗し爛�爐�爐� 爐朽ぞ爐�爐伍ぎ爐� 爐��爐鉦�爐� 爐��爐萎さ爐逗し爛�爐�爐逗ぎ爐� 爐項た爐� 爐�爐萎�爐��爐項�爐伍� 爛� 爐÷た爐�� 爐伍�爛�爐�爛�爐�ぞ爐� 爐項�爐萎�爐��爐項�爐伍� 爛�"
+msgstr "爐�ぞ爐� 爐�爐оぞ爐萎た爐� 爐��爐萎�爐�爛�爐�爐�(XMPP, MSN, IRC, TOC)爐項ぐ爛�爐�ぞ 爐�爐�爛�爐�爐� 爐�爐�爐� 爐��爐鉦�爐� 爐伍�爛�爐��爐項�爐��爐� 爛� 爐��爐萎さ爐逗し爛�爐�爐� 爐朽ぞ爐�爐伍ぎ爐� 爐��爐鉦�爐� 爐��爐萎さ爐逗し爛�爐�爐逗ぎ爐� 爐項た爐� 爐�爐萎�爐��爐項�爐伍� 爛� 爐÷た爐�� 爐伍�爛�爐�爛�爐�ぞ爐� 爐項�爐萎�爐��爐項�爐伍� 爛�"
 
 #: plugins/relnot.c:63
 #, c-format
@@ -2936,7 +2936,7 @@
 msgstr "爐��爐萎�爐� 爐伍ぎ爛�爐〝ぞ爐萎�爐萎�爐むぞ"
 
 #: src/gtkdialogs.c:95
-msgid "former Jabber developer"
+msgid "former XMPP developer"
 msgstr "爐��爐萎�爐� 爐�爐��爐�ぞ爐� 爐朽た爐�爐鉦じ爐�爐萎�爐むぞ"
 
 #: src/gtkdialogs.c:96
@@ -3151,11 +3151,11 @@
 #: src/gtkdialogs.c:250
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 msgstr ""
 "爐�爐鉦�爐� 爐踱�爛� 爐��爐� AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, 爐� Gadu-Gadu 爐伍が爛� 爐��爐萎く爛�爐� 爐�爐萎た爐�� 爐�爛�爐劇ぎ爐鉦い爐� 爐〝�爐�爛� 爐踱�爐�爐� 爐��爐÷�爐��爐迦ぐ 爐伍え爛�爐��爐� 爐�爛�爐萎ぞ爐項� 爐項� 爛�  爐�� Gtk+ 爐��爐萎く爛�爐� 爐�爐萎�爐� 爐迦�爐�爐逗え爛�爐� 爐� GPL.<BR><BR> 爐�爐��爐むぐ爛�爐�爐� 爐�爐��爐�い爐� 爐��爐萎ぞ爐��爐� 爐項�爐��爐�"
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, 爐� Gadu-Gadu 爐伍が爛� 爐��爐萎く爛�爐� 爐�爐萎た爐�� 爐�爛�爐劇ぎ爐鉦い爐� 爐〝�爐�爛� 爐踱�爐�爐� 爐��爐÷�爐��爐迦ぐ 爐伍え爛�爐��爐� 爐�爛�爐萎ぞ爐項� 爐項� 爛�  爐�� Gtk+ 爐��爐萎く爛�爐� 爐�爐萎�爐� 爐迦�爐�爐逗え爛�爐� 爐� GPL.<BR><BR> 爐�爐��爐むぐ爛�爐�爐� 爐�爐��爐�い爐� 爐��爐萎ぞ爐��爐� 爐項�爐��爐�"
 
 #: src/gtkdialogs.c:260
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -5753,7 +5753,7 @@
 msgstr "爐�爐��爐�う爐逗え"
 
 #: src/protocols/jabber/buddy.c:509 src/protocols/jabber/buddy.c:510
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr "爐�爛�爐�ぞ爐�ぐ vCard 爐伍ぎ爛�爐�ぞ爐�え 爐�爐萎�爐��爐項�爐伍�"
 
 #: src/protocols/jabber/buddy.c:511
@@ -5763,7 +5763,7 @@
 msgstr "爐むげ 爐�た爐�爐踱�爐� 爐伍が爛� 爐朽じ爛�爐む�爐項ぐ爛� 爐踳�爐�爛�爐�爐逗� 爐項�爐�� 爛� 爐む�爐�じ爛�爐む� 爐�爐鉦え爐�爐鉦ぐ爛�爐項ぐ爛� 爐�ぞ爐む�爐� 爐��爐萎さ爐逗し爛�爐�爐� 爐�爐萎ぞ爐�爐��爐項�爐伍� 爐�爛�爐� 爐�爐鉦す爐� 爐むお爐鉦�爐�爐�爛� 爐朽た爐�爐鉦ぐ爐�ぞ 爐�爐�く爛�爐�爛�爐� 爐項�爐��爐� 爛�"
 
 #: src/protocols/jabber/buddy.c:556
-msgid "Jabber ID"
+msgid "XMPP ID"
 msgstr "爐�爛�爐�ぞ爐�ぐ ID"
 
 #: src/protocols/jabber/buddy.c:566 src/protocols/jabber/buddy.c:573
@@ -5798,7 +5798,7 @@
 msgstr "爐迦�爐�爛�"
 
 #: src/protocols/jabber/buddy.c:786
-msgid "Jabber Profile"
+msgid "XMPP Profile"
 msgstr "爐�爛�爐�ぞ爐�ぐ 爐��爐萎�爐�ぞ爐�爐�"
 
 #: src/protocols/jabber/buddy.c:941
@@ -5937,7 +5937,7 @@
 msgstr "SSL 爐項�爐�ぞ爐��爐÷じ爛�爐� 爐�爐伍か爐� 爐〝く爛�"
 
 #: src/protocols/jabber/jabber.c:378 src/protocols/jabber/jabber.c:711
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr "爐�爐朽�爐� 爐�爛�爐�ぞ爐�ぐ ID"
 
 #: src/protocols/jabber/jabber.c:409 src/protocols/jabber/jabber.c:741
@@ -5999,7 +5999,7 @@
 msgstr "爐�爛�爐�く爐� 爐むお爐鉦�爐�爐�爛� 爐�く爐鉦� 爐�爐鉦い爐鉦ぎ爐� 爐萎�爐逗し爛�爐�爐鉦ぐ 爐�爐萎�爐� 爐むげ爐�爛� 爐�爐鉦え爐�爐鉦ぐ爛� 爐〝え爛�爐�ぞ 爐�ぞ爐項た爐� 爐〝ぐ爛�爐��爐項�爐伍� 爛�"
 
 #: src/protocols/jabber/jabber.c:675 src/protocols/jabber/jabber.c:676
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "爐�く爐鉦� 爐�爛�爐�ぞ爐�ぐ 爐�爐鉦い爐� 爐萎�爐逗し爛�爐�爐鉦ぐ 爐�爐萎�爐��爐項�爐伍�"
 
 #: src/protocols/jabber/jabber.c:759
@@ -6086,7 +6086,7 @@
 msgstr "爐�ぞ爐伍さ爐萎�爐�(爐��爐萎た)"
 
 #: src/protocols/jabber/jabber.c:1086 src/protocols/jabber/jabber.c:1087
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "爐�爛�爐�ぞ爐�ぐ 爐�ぞ爐伍さ爐萎�爐� 爐�ぐ爐逗さ爐萎�爐むえ 爐�爐萎�爐��爐項�爐伍�"
 
 #: src/protocols/jabber/jabber.c:1087
@@ -6126,7 +6126,7 @@
 msgstr "爐朽じ爛�爐む� 爐��爐迦ぞ 爐�ぐ爛�爐�"
 
 #: src/protocols/jabber/jabber.c:1193
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr "爐��爐迦か爐萎�爐�ぁ 爐�爛�爐�ぞ爐�ぐ ID"
 
 #: src/protocols/jabber/jabber.c:1195
@@ -6374,7 +6374,7 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1630 src/protocols/jabber/jabber.c:1632
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr "爐�爛�爐�ぞ爐�ぐ 爐��爐萎�爐�爛�爐�爐� 爐��爐迦�爐�爐�"
 
 #: src/protocols/jabber/jabber.c:1655
@@ -6419,7 +6419,7 @@
 msgstr "%s 爐�ぞ 爐伍え爛�爐��爐� 爐項じ爛�爐むぞ爐��爐むぐ爐� 爐�爐伍か爐� 爐〝く爛�:%s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr "爐�爛�爐�ぞ爐�ぐ 爐伍え爛�爐��爐� 爐む�爐萎�爐�爐�"
 
 #: src/protocols/jabber/message.c:297
--- a/po/nl.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/nl.po	Tue May 01 05:53:57 2007 +0000
@@ -2246,8 +2246,8 @@
 msgstr "hacker en BOB (luie donder)"
 
 #: ../gtk/gtkdialogs.c:102
-msgid "Jabber developer"
-msgstr "ontwikkelaar van Jabber"
+msgid "XMPP developer"
+msgstr "ontwikkelaar van XMPP"
 
 #: ../gtk/gtkdialogs.c:103
 msgid "original author"
@@ -2503,8 +2503,8 @@
 msgstr "Gaim info"
 
 #: ../gtk/gtkdialogs.c:321
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, and Gadu-Gadu 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 Gaim.  Gaim 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 "Gaim is een modulair programma voor expresberichten en kan gebruik maken van de netwerken van AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, en Gadu-Gadu. En nog allemaal tegelijk ook. Het 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 nieuwe). Er is een kopie van deze licentie meegeleverd in het bestandje 'COPYING'. Het copyright van gaim ligt bij de mensen die hebben meegewerkt hiereen. Zie voor een volledige lijst het bestandje 'COPYRIGHT'. Dit programma wordt geleverd zonder enige garantie.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, and Gadu-Gadu 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 Gaim.  Gaim 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 "Gaim is een modulair programma voor expresberichten en kan gebruik maken van de netwerken van AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, en Gadu-Gadu. En nog allemaal tegelijk ook. Het 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 nieuwe). Er is een kopie van deze licentie meegeleverd in het bestandje 'COPYING'. Het copyright van gaim ligt bij de mensen die hebben meegewerkt hiereen. Zie voor een volledige lijst het bestandje 'COPYRIGHT'. Dit programma wordt geleverd zonder enige garantie.<BR><BR>"
 
 #: ../gtk/gtkdialogs.c:335
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -5123,8 +5123,8 @@
 msgstr "Geeft u de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde protocollen."
 
 #: ../gtk/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "Geeft u de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde protocollen (Jabber, 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 u de mogelijkheid om tekst direct door te sturen via tekst-gebaseerde protocollen (XMPP, MSN, IRC, TOC). Druk op 'Enter' om te sturen en houd het debugvenster in de gaten."
 
 #: ../gtk/plugins/relnot.c:69
 #, c-format
@@ -6220,8 +6220,8 @@
 msgstr "Paragnost-stand voor inkomend gesprek"
 
 #: ../libgaim/plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "Zorgt ervoor dat gespreksvensters verschijnen wanneer gebruikers berichten sturen.  Dit werkt met AIM, ICQ, Jabber, 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!"
 
 #. This is a quote from Star Wars.  You should
 #. probably not translate it literally.  If
@@ -6491,8 +6491,8 @@
 msgstr "AIM-account"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:592
-msgid "Jabber Account"
-msgstr "Jabber-account"
+msgid "XMPP Account"
+msgstr "XMPP-account"
 
 #: ../libgaim/protocols/bonjour/jabber.c:374
 #, c-format
@@ -7600,8 +7600,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:588
 #: ../libgaim/protocols/jabber/buddy.c:589
-msgid "Edit Jabber vCard"
-msgstr "Jabber vCard bewerken"
+msgid "Edit XMPP vCard"
+msgstr "XMPP vCard bewerken"
 
 #: ../libgaim/protocols/jabber/buddy.c:590
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
@@ -7707,7 +7707,7 @@
 msgid "The following are the results of your search"
 msgstr "Resultaten van uw zoekopdracht"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1633
 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 (%)."
@@ -7728,8 +7728,8 @@
 msgstr "Server-instructies: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1695
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Vul een of meer velden in om naar te zoeken bij Jabber-gebruikers."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Vul een of meer velden in om naar te zoeken bij XMPP-gebruikers."
 
 #: ../libgaim/protocols/jabber/buddy.c:1715
 #: ../libgaim/protocols/novell/novell.c:1488
@@ -7740,8 +7740,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1724
 #: ../libgaim/protocols/jabber/buddy.c:1725
-msgid "Search for Jabber users"
-msgstr "Zoeken naar Jabbergebruikers"
+msgid "Search for XMPP users"
+msgstr "Zoeken naar XMPPgebruikers"
 
 #: ../libgaim/protocols/jabber/buddy.c:1739
 msgid "Invalid Directory"
@@ -7872,8 +7872,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:528
 #: ../libgaim/protocols/jabber/jabber.c:866
-msgid "Invalid Jabber ID"
-msgstr "Ongeldige Jabber-ID"
+msgid "Invalid XMPP ID"
+msgstr "Ongeldige XMPP-ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:598
 #, c-format
@@ -7927,8 +7927,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:829
 #: ../libgaim/protocols/jabber/jabber.c:830
-msgid "Register New Jabber Account"
-msgstr "Nieuw Jabber account registreren"
+msgid "Register New XMPP Account"
+msgstr "Nieuw XMPP account registreren"
 
 #: ../libgaim/protocols/jabber/jabber.c:992
 msgid "Initializing Stream"
@@ -7999,8 +7999,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1330
 #: ../libgaim/protocols/jabber/jabber.c:1331
-msgid "Change Jabber Password"
-msgstr "Jabber-wachtwoord veranderen"
+msgid "Change XMPP Password"
+msgstr "XMPP-wachtwoord veranderen"
 
 #: ../libgaim/protocols/jabber/jabber.c:1331
 msgid "Please enter your new password"
@@ -8054,8 +8054,8 @@
 msgstr "Item niet gevonden"
 
 #: ../libgaim/protocols/jabber/jabber.c:1441
-msgid "Malformed Jabber ID"
-msgstr "Ongeldig Jabber-ID"
+msgid "Malformed XMPP ID"
+msgstr "Ongeldig XMPP-ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:1443
 msgid "Not Acceptable"
@@ -8312,8 +8312,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1896
 #: ../libgaim/protocols/jabber/jabber.c:1898
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber-protocol plugin"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP-protocol plugin"
 
 #: ../libgaim/protocols/jabber/jabber.c:1924
 msgid "Use TLS if available"
@@ -8363,8 +8363,8 @@
 msgstr "Bericht aan %s niet aangekomen: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Jabber bericht-fout"
+msgid "XMPP Message Error"
+msgstr "XMPP bericht-fout"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
@@ -14734,20 +14734,20 @@
 #~ msgstr "ex-hoofdontwikkelaar"
 #~ msgid "former maintainer"
 #~ msgstr "ex-beheerder"
-#~ msgid "former Jabber developer"
-#~ msgstr "ex-ontwikkelaar van Jabber"
+#~ msgid "former XMPP developer"
+#~ msgstr "ex-ontwikkelaar van XMPP"
 #~ 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 "
+#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
 #~ "all at once.  It is written using Gtk+ and is licensed under the GPL."
 #~ "<BR><BR>"
 #~ msgstr ""
 #~ "Gaim is een modulair programma om expresberichten uit te wisselen via "
-#~ "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell Groupwise, Napster, "
+#~ "AIM, MSN, Yahoo!, XMPP, 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"
@@ -15139,10 +15139,10 @@
 #~ msgstr "whois &lt;bijnaam&gt;:  Informatie over een gebruiker opvragen."
 #~ 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 "XMPP ID"
+#~ msgstr "XMPP ID"
+#~ msgid "XMPP Profile"
+#~ msgstr "XMPP 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."
--- a/po/nn.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/nn.po	Tue May 01 05:53:57 2007 +0000
@@ -855,10 +855,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Let deg sende direktekommandoar i tekstbaserte protokollar (t.d. Jabber, "
+"Let deg sende direktekommandoar i tekstbaserte protokollar (t.d. XMPP, "
 "MSN, IRC). Trykk 'Enter' for 奪 sende og sjekk avlusingsvindauget."
 
 #: plugins/relnot.c:63
@@ -2821,8 +2821,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "tidlegare Jabber-utviklar"
+msgid "XMPP developer"
+msgstr "tidlegare XMPP-utviklar"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -2994,11 +2994,11 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim er ein modulbasert lynmeldingsklient der du kan nytte AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr og Gadu-Gadu "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr og Gadu-Gadu "
 "samstundes. Programmet er skrive i Gtk+ og lisensiert under GPL (Gnome "
 "Public License).<BR><BR>"
 
@@ -5002,7 +5002,7 @@
 #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "Registrer ein ny Jabberkonto"
+msgstr "Registrer ein ny XMPPkonto"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
@@ -5708,8 +5708,8 @@
 msgstr "F淡dselsdag"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Endre Jabber-vCard"
+msgid "Edit XMPP vCard"
+msgstr "Endre XMPP-vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5720,8 +5720,8 @@
 "komfortabel med 奪 gje fr奪 deg."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5799,7 +5799,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5817,7 +5817,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5944,8 +5944,8 @@
 msgstr "Klarte ikkje 奪 lage ein sokket"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "Ugyldig Jabber-ID"
+msgid "Invalid XMPP ID"
+msgstr "Ugyldig XMPP-ID"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -5991,8 +5991,8 @@
 msgstr "Fyll ut informasjonen under for 奪 registrere den nye kontoen din."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "Registrer ein ny Jabberkonto"
+msgid "Register New XMPP Account"
+msgstr "Registrer ein ny XMPPkonto"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6064,8 +6064,8 @@
 msgstr "Passord (om att)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Endre Jabber-passord"
+msgid "Change XMPP Password"
+msgstr "Endre XMPP-passord"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6115,8 +6115,8 @@
 msgstr "Elementet vart ikkje funne"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "Misdanna Jabber-ID"
+msgid "Malformed XMPP ID"
+msgstr "Misdanna XMPP-ID"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6369,8 +6369,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber-protokolltillegg"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP-protokolltillegg"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6420,8 +6420,8 @@
 msgstr "Meldinga til %s kom ikkje fram (%s)"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber meldingsfeil"
+msgid "XMPP Message Error"
+msgstr "XMPP meldingsfeil"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -11967,8 +11967,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Ugyldig kallenamn"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabberprofil"
+#~ msgid "XMPP Profile"
+#~ msgstr "XMPPprofil"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Feil i romlista"
--- a/po/pa.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/pa.po	Tue May 01 05:53:57 2007 +0000
@@ -808,10 +808,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"爬�┥爬� 爬�爬о┥爬萎┸爬� 爬��爬萎�爬�爰�爬�爬鉦┣爬鉦� (Jabber, MSN, IRC, TOC) 爬迦� 爬�爰園�爰� 爬�爰萎┴爰�爰園� 爬〝�爬�爬� 爬迦� 爬伍┨爬鉦�爬� 爬項�爛� 爬�┥爬� 爬��爰� "
+"爬�┥爬� 爬�爬о┥爬萎┸爬� 爬��爬萎�爬�爰�爬�爬鉦┣爬鉦� (XMPP, MSN, IRC, TOC) 爬迦� 爬�爰園�爰� 爬�爰萎┴爰�爰園� 爬〝�爬�爬� 爬迦� 爬伍┨爬鉦�爬� 爬項�爛� 爬�┥爬� 爬��爰� "
 "爬��爬伍� 爬朽┸爰園� 爬〝�爬�爬� 爬迦� 'Enter' 爬�━爬鉦�爛� 爬÷�爬��爬� 爬�爬萎�爬�爬� 爬朽�爬�爰�爛�"
 
 #: plugins/relnot.c:63
@@ -2706,7 +2706,7 @@
 msgstr "libfaim 爬�┛爬��爬о�"
 
 #: src/gtkdialogs.c:92
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "爬�爰園━爬� 爬�爰�爬�爰�"
 
 #: src/gtkdialogs.c:93
@@ -2876,10 +2876,10 @@
 #: src/gtkdialogs.c:226
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
-"爬�爰�爬� AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, "
+"爬�爰�爬� AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, "
 "Zephyr, 爬�爬む� Gadu-Gadu 爬�爬�┸ 爬�� 爬�爰園� 爬伍┏爰�爬� 爬朽┛爬む�爬� 爬�爬萎┬ 爬迦� 爬伍┨爬鉦�爬� 爬��爬÷�爬迦┛ "
 "爬伍�爬��爬項┥ 爬�爬迦┥爬�爬�爬� 爬項�爛� 爬�爬� 爬��爰� GTK+ 爬�� 爬朽┛爬む�爬� 爬�爬萎�爰� 爬む┸爬�爬� 爬�爰�爬む┥ 爬�爬逗� 爬項� 爬�爬む� "
 "GPL 爬�爬о�爬� 爬�爬鉦┛爰� 爬�爰�爬む┥ 爬�爬逗� 爬項�爛�<BR><BR>"
@@ -5521,7 +5521,7 @@
 msgstr "爬�爬�┏爬�┸爬�"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:569
@@ -5531,8 +5531,8 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5610,7 +5610,7 @@
 msgstr "爬む�爬項┥爬÷� 爬�爰�爬� 爬�� 爬項�爬� 爬�┸爰園┐爰� 爬�┐爰�爬�爰� 爬項┬"
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5628,7 +5628,7 @@
 msgstr "爬�-爬��爬む┛ 爬伍┸爬萎┬爬鉦┻爬鉦�"
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "爬�爰園━爬� 爬�爬�┃爰�爬�爰�爬�爬� 爬迦� 爬�爰�爬�"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5749,7 +5749,7 @@
 msgstr "爬伍┥爬�爬� 爬�┌爬鉦�爬� 爬迦� 爬�爬伍┼爬�"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:473
@@ -5796,7 +5796,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:842
@@ -5868,7 +5868,7 @@
 msgstr "爬�爰�爬�┐-爬�爰�爬� (爬��爰�)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1161
@@ -5918,7 +5918,7 @@
 msgstr "爬�爬�爬鉦� 爬迦�爬〝� 爬�┨爰�爬�"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1273
@@ -6162,7 +6162,7 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6211,7 +6211,7 @@
 msgstr ""
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr ""
 
 #: src/protocols/jabber/message.c:297
--- a/po/pl.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/pl.po	Tue May 01 05:53:57 2007 +0000
@@ -2742,10 +2742,10 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "W��czenie tej wtyczki powoduje, 甜e okna rozm坦w b�d� si� pojawia�y gdy tylko "
-"kto� rozpocznie do Ciebie pisa�. Wtyczka dzia�a z AIM, ICQ, Jabberem, "
+"kto� rozpocznie do Ciebie pisa�. Wtyczka dzia�a z AIM, ICQ, XMPPem, "
 "Sametime i Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
@@ -3022,8 +3022,8 @@
 msgstr "Konto AIM"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Konto w sieci Jabber"
+msgid "XMPP Account"
+msgstr "Konto w sieci XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4226,7 +4226,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr "Modyfikacja wizyt坦wki (vCard)"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
@@ -4342,7 +4342,7 @@
 msgid "The following are the results of your search"
 msgstr "Poni甜ej znajduj� si� wyniki wyszukiwania"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4367,8 +4367,8 @@
 msgstr "Instrukcje z serwera: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Wype�nij jedno lub wi�cej p坦l, aby wyszuka� u甜ytkownik坦w sieci Jabber."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Wype�nij jedno lub wi�cej p坦l, aby wyszuka� u甜ytkownik坦w sieci XMPP."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4379,8 +4379,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Szukaj u甜ytkownik坦w sieci Jabber"
+msgid "Search for XMPP users"
+msgstr "Szukaj u甜ytkownik坦w sieci XMPP"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4527,7 +4527,7 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr "Niew�a�ciwy identyfikator jabbera"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
@@ -4582,7 +4582,7 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "Rejestracja nowego konta jabbera"
 
 #. Register button
@@ -4658,8 +4658,8 @@
 # FIXME - te cztery poni甜sze to elementy menu czy tytu�y?
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Zmiana has�a Jabbera"
+msgid "Change XMPP Password"
+msgstr "Zmiana has�a XMPPa"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4713,8 +4713,8 @@
 msgstr "Obiekt nie zosta� znaleziony"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Uszkodzony identyfikator Jabbera"
+msgid "Malformed XMPP ID"
+msgstr "Uszkodzony identyfikator XMPPa"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -4991,8 +4991,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1977
 #: ../libpurple/protocols/jabber/jabber.c:1979
-msgid "Jabber Protocol Plugin"
-msgstr "Wtyczka protoko�u Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Wtyczka protoko�u XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Force old (port 5223) SSL"
@@ -5043,8 +5043,8 @@
 msgstr "Dostarczenie wiadomo�ci do %s nie powiod�o si�: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "B��d wiadomo�ci Jabbera"
+msgid "XMPP Message Error"
+msgstr "B��d wiadomo�ci XMPPa"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12593,7 +12593,7 @@
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:114
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "programista odpowiedzialny za jabbera"
 
 #: ../pidgin/gtkdialogs.c:115
@@ -12864,7 +12864,7 @@
 #: ../pidgin/gtkdialogs.c:360
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12874,7 +12874,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "%s jest modularnym komunikatorem, kt坦ry umo甜liwia jednoczesn� komunikacj� "
-"z nast�puj�cymi sieciami: AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/"
+"z nast�puj�cymi sieciami: AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/"
 "SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu i QQ. "
 "Program jest napisany z wykorzystaniem GTK+.<BR><BR>Mo甜esz go rozprowadza� i "
 "modyfikowa� na warunkach Powszechnej Licencji Publicznej GNU, (wersji 2-giej "
@@ -15260,11 +15260,11 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "Pozwala na wysy�anie niesformatowanego strumienia w protoko�ach tekstowych "
-"(Jabber, MSN, IRC, TOC). Naci�nij \"Enter\" w polu do wprowadzania tekstu "
+"(XMPP, MSN, IRC, TOC). Naci�nij \"Enter\" w polu do wprowadzania tekstu "
 "aby wys�a� tekst. Obserwuj okno debugera."
 
 #: ../pidgin/plugins/relnot.c:71
--- a/po/ps.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ps.po	Tue May 01 05:53:57 2007 +0000
@@ -2242,7 +2242,7 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:109
@@ -2475,7 +2475,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -4957,7 +4957,7 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -6491,7 +6491,7 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -6740,7 +6740,7 @@
 msgstr "惆 悖�� 愆��惘�"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
+msgid "XMPP Account"
 msgstr "惆 悴悋惡�惘 愆��惘�"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
@@ -7803,7 +7803,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:584
@@ -7917,7 +7917,7 @@
 msgid "The following are the results of your search"
 msgstr ""
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1672
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -7940,7 +7940,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:1734
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:1754
@@ -7952,7 +7952,7 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1763
 #: ../libgaim/protocols/jabber/buddy.c:1764
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:1778
@@ -8082,7 +8082,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:623
@@ -8136,7 +8136,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "��� 悴悋惡�惘 愆��惘� 惓惡惠 擧��"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
@@ -8200,7 +8200,7 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
@@ -8255,7 +8255,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
@@ -8518,7 +8518,7 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
@@ -8561,7 +8561,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/message.c:316
--- a/po/pt.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/pt.po	Tue May 01 05:53:57 2007 +0000
@@ -1250,11 +1250,11 @@
 #: ../plugins/psychic.c:24
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Faz com que as janelas de conversa巽探es apare巽am quando os outros "
 "utilizadores come巽am a escrever para si.  Isto funciona para AIM, ICQ, "
-"Jabber, Sametime e Yahoo!"
+"XMPP, Sametime e Yahoo!"
 
 #: ../plugins/psychic.c:60
 msgid "You feel a disturbance in the force..."
@@ -1282,10 +1282,10 @@
 
 #: ../plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Permite enviar entrada pura para protocolos (Jabber, MSN, IRC, TOC) baseados "
+"Permite enviar entrada pura para protocolos (XMPP, MSN, IRC, TOC) baseados "
 "em texto. Pressione 'Enter' na caixa de entrada para enviar. Verifique a "
 "janela de debug."
 
@@ -3329,8 +3329,8 @@
 msgstr "hacker e dirigente designado [vagabundo pregui巽oso]"
 
 #: ../src/gtkdialogs.c:101
-msgid "Jabber developer"
-msgstr "desenvolvedor do Jabber"
+msgid "XMPP developer"
+msgstr "desenvolvedor do XMPP"
 
 #: ../src/gtkdialogs.c:102
 msgid "original author"
@@ -3522,7 +3522,7 @@
 #: ../src/gtkdialogs.c:257
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
 "and Gadu-Gadu 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 "
@@ -3531,7 +3531,7 @@
 "program.<BR><BR>"
 msgstr ""
 "O Gaim 辿 um cliente de mensagens modular capaz de usar o AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zepyhr, e "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zepyhr, e "
 "Gadu-Gadu todos ao mesmo tempo.  Est叩 escrito usando GTK+.<BR><BR>Pode "
 "modificar e redistribuir o programa sob os termos da GPL (vers達o 2 ou "
 "posterior).  Uma c坦pia da GPL est叩 contida no ficheiro 'COPYING' distribu鱈do "
@@ -6549,8 +6549,8 @@
 msgstr "Data de nascimento"
 
 #: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Editar vCard do Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Editar vCard do XMPP"
 
 #: ../src/protocols/jabber/buddy.c:569
 msgid ""
@@ -6635,9 +6635,9 @@
 msgstr "Os seguintes s達o os resultados da sua pesquisa"
 
 #: ../src/protocols/jabber/buddy.c:1388
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-"Preencha um ou mais campos para procurar todos os utilizadores Jabber que "
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+"Preencha um ou mais campos para procurar todos os utilizadores XMPP que "
 "correspondem."
 
 #: ../src/protocols/jabber/buddy.c:1392 ../src/protocols/jabber/jabber.c:770
@@ -6655,8 +6655,8 @@
 msgstr "Endere巽o de e-mail"
 
 #: ../src/protocols/jabber/buddy.c:1416 ../src/protocols/jabber/buddy.c:1417
-msgid "Search for Jabber users"
-msgstr "Pesquisar Utilizadores Jabber"
+msgid "Search for XMPP users"
+msgstr "Pesquisar Utilizadores XMPP"
 
 #: ../src/protocols/jabber/buddy.c:1431
 msgid "Invalid Directory"
@@ -6777,8 +6777,8 @@
 msgstr "Imposs鱈vel criar socket"
 
 #: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
-msgid "Invalid Jabber ID"
-msgstr "Identificador Jabber Inv叩lido"
+msgid "Invalid XMPP ID"
+msgstr "Identificador XMPP Inv叩lido"
 
 #: ../src/protocols/jabber/jabber.c:590
 #, c-format
@@ -6821,8 +6821,8 @@
 "Por favor preencha a seguinte inform巽a達o para registar a sua nova conta."
 
 #: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
-msgid "Register New Jabber Account"
-msgstr "Registar Nova Conta Jabber"
+msgid "Register New XMPP Account"
+msgstr "Registar Nova Conta XMPP"
 
 #: ../src/protocols/jabber/jabber.c:983
 msgid "Initializing Stream"
@@ -6885,8 +6885,8 @@
 msgstr "Senha (novamente)"
 
 #: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
-msgid "Change Jabber Password"
-msgstr "Alterar Senha do Jabber"
+msgid "Change XMPP Password"
+msgstr "Alterar Senha do XMPP"
 
 #: ../src/protocols/jabber/jabber.c:1318
 msgid "Please enter your new password"
@@ -6937,8 +6937,8 @@
 msgstr "�tem N達o Encontrado"
 
 #: ../src/protocols/jabber/jabber.c:1428
-msgid "Malformed Jabber ID"
-msgstr "ID Jabber Inv叩lido"
+msgid "Malformed XMPP ID"
+msgstr "ID XMPP Inv叩lido"
 
 #: ../src/protocols/jabber/jabber.c:1430
 msgid "Not Acceptable"
@@ -7205,8 +7205,8 @@
 #. *  summary
 #. *  description
 #: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
-msgid "Jabber Protocol Plugin"
-msgstr "Plugin do Protocolo Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Plugin do Protocolo XMPP"
 
 #: ../src/protocols/jabber/jabber.c:1911
 msgid "Use TLS if available"
@@ -7254,8 +7254,8 @@
 msgstr "Entrega de Mensagem para %s falhou: %s"
 
 #: ../src/protocols/jabber/message.c:227
-msgid "Jabber Message Error"
-msgstr "Erro de Mensagem do Jabber"
+msgid "XMPP Message Error"
+msgstr "Erro de Mensagem do XMPP"
 
 #: ../src/protocols/jabber/message.c:295
 #, c-format
--- a/po/pt_BR.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/pt_BR.po	Tue May 01 05:53:57 2007 +0000
@@ -2767,11 +2767,11 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Faz com que mensagens de conversa apare巽am enquanto os outros usu叩rios "
 "come巽am a redigir uma mensagem para voc棚. Isto funciona com o AIM, ICQ, "
-"Jabber, Sametime e com o Yahoo!"
+"XMPP, Sametime e com o Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -3049,8 +3049,8 @@
 msgstr "Conta do AIM"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Conta do Jabber"
+msgid "XMPP Account"
+msgstr "Conta do XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4233,8 +4233,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Editar vCard do Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Editar vCard do XMPP"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4337,7 +4337,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1563
 msgid "JID"
-msgstr "ID Jabber"
+msgstr "ID XMPP"
 
 #: ../libpurple/protocols/jabber/buddy.c:1567
 #: ../libpurple/protocols/jabber/buddy.c:1746
@@ -4349,7 +4349,7 @@
 msgid "The following are the results of your search"
 msgstr "Os seguintes s達o os resultados da sua busca"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4374,9 +4374,9 @@
 msgstr "Instru巽探es do servidor: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr ""
-"Preencha um ou mais campos para procurar um usu叩rio Jabber que satisfa巽a "
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+"Preencha um ou mais campos para procurar um usu叩rio XMPP que satisfa巽a "
 "este crit辿rio."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
@@ -4388,8 +4388,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Procurar usu叩rios Jabber"
+msgid "Search for XMPP users"
+msgstr "Procurar usu叩rios XMPP"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4532,8 +4532,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "ID do Jabber inv叩lido"
+msgid "Invalid XMPP ID"
+msgstr "ID do XMPP inv叩lido"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4588,8 +4588,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Registrar nova conta do Jabber"
+msgid "Register New XMPP Account"
+msgstr "Registrar nova conta do XMPP"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4663,8 +4663,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Alterar senha do Jabber"
+msgid "Change XMPP Password"
+msgstr "Alterar senha do XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4718,8 +4718,8 @@
 msgstr "Item n達o encontrado"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "ID do Jabber em formato inv叩lido"
+msgid "Malformed XMPP ID"
+msgstr "ID do XMPP em formato inv叩lido"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -4987,8 +4987,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Plugin do protocolo Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Plugin do protocolo XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -5030,8 +5030,8 @@
 msgstr "A entrega de mensagens para %s falhou: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Erro de mensagem do Jabber"
+msgid "XMPP Message Error"
+msgstr "Erro de mensagem do XMPP"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12463,8 +12463,8 @@
 msgstr "hacker e dirigente designado [vagabundo pregui巽oso]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "desenvolvedor do Jabber"
+msgid "XMPP developer"
+msgstr "desenvolvedor do XMPP"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12736,7 +12736,7 @@
 #: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12746,7 +12746,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "O %s 辿 um cliente de mensagens modular capaz de usar o AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, Gadu-Gadu e QQ de uma vez s坦. Ele 辿 escrito usando o GTK+."
 "<BR><BR>Voc棚 pode modificar e redistribuir o programa sob os termos da GPL "
 "(vers達o 2 ou superior). Uma c坦pia da GPL est叩 contida no arquivo 'COPYING' "
@@ -15159,10 +15159,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Permite enviar entrada pura para protocolos baseados em texto (Jabber, MSN, "
+"Permite enviar entrada pura para protocolos baseados em texto (XMPP, MSN, "
 "IRC, TOC). Pressione 'Enter' na caixa de entrada para enviar. Verifique a "
 "janela de depura巽達o."
 
--- a/po/ro.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ro.po	Tue May 01 05:53:57 2007 +0000
@@ -2363,8 +2363,8 @@
 msgstr "hacker �i �ofer de serviciu"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "programator Jabber"
+msgid "XMPP developer"
+msgstr "programator XMPP"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2596,7 +2596,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2605,7 +2605,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim este un client modular de mesagerie capabil s� comunice simultan "
-"utiliz但nd protocoalele AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, "
+"utiliz但nd protocoalele AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
 "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu �i QQ. Gaim "
 "utilizeaz� GTK+.<BR><BR>Pute釘i modifica Gaim 樽n termenii licen釘ei GPL "
 "(versiunea 2 sau mai nou�). O copie a licen釘ei GPL este distribut� cu Gaim "
@@ -5221,10 +5221,10 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Permite introducerea brut� a comenzilor 樽n protocoalele tip text (Jabber, "
+"Permite introducerea brut� a comenzilor 樽n protocoalele tip text (XMPP, "
 "MSN, IRC, TOC). Comenzile se trimit cu ENTER. Urm�ri釘i rezultatul comenzilor "
 "樽n fereastra de depanare."
 
@@ -6851,10 +6851,10 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Deschide ferestrele sau taburile de discu釘ii 樽nainte ca interlocutorii s� v� "
-"trimit� ce 樽ncepuser� s� scrie. Merge cu AIM, ICQ, Jabber, Sametime �i Yahoo!"
+"trimit� ce 樽ncepuser� s� scrie. Merge cu AIM, ICQ, XMPP, Sametime �i Yahoo!"
 
 #: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -7105,8 +7105,8 @@
 msgstr "Cont AIM"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Cont Jabber"
+msgid "XMPP Account"
+msgstr "Cont XMPP"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -8218,8 +8218,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Editare vCard Jabber"
+msgid "Edit XMPP vCard"
+msgstr "Editare vCard XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8334,7 +8334,7 @@
 msgid "The following are the results of your search"
 msgstr "Acestea sunt rezultatele c�ut�rii:"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1672
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8358,10 +8358,10 @@
 msgstr "Instruc釘iuni server: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1734
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Completa釘i unul sau mai multe c但mpuri pentru a specifica criterii de c�utare "
-"a utilizatorilor Jabber."
+"a utilizatorilor XMPP."
 
 #: ../libgaim/protocols/jabber/buddy.c:1754
 #: ../libgaim/protocols/novell/novell.c:1488
@@ -8372,8 +8372,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1763
 #: ../libgaim/protocols/jabber/buddy.c:1764
-msgid "Search for Jabber users"
-msgstr "Caut� utilizatori Jabber"
+msgid "Search for XMPP users"
+msgstr "Caut� utilizatori XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:1778
 msgid "Invalid Directory"
@@ -8502,8 +8502,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "Identitate Jabber invalid�"
+msgid "Invalid XMPP ID"
+msgstr "Identitate XMPP invalid�"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8556,8 +8556,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "�nregistrare cont nou Jabber"
+msgid "Register New XMPP Account"
+msgstr "�nregistrare cont nou XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8620,8 +8620,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "Schimbare parol� Jabber"
+msgid "Change XMPP Password"
+msgstr "Schimbare parol� XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8675,8 +8675,8 @@
 msgstr "Elementul nu a fost g�sit"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "ID Jabber invalid"
+msgid "Malformed XMPP ID"
+msgstr "ID XMPP invalid"
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
@@ -8945,8 +8945,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "Modul de protocol Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Modul de protocol XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
@@ -8988,8 +8988,8 @@
 msgstr "Trimiterea mesajului c�tre %s a e�uat: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Eroare de mesaj Jabber"
+msgid "XMPP Message Error"
+msgstr "Eroare de mesaj XMPP"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/ru.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ru.po	Tue May 01 05:53:57 2007 +0000
@@ -2290,8 +2290,8 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber-�舒亰�舒弍仂��亳从"
+msgid "XMPP developer"
+msgstr "XMPP-�舒亰�舒弍仂��亳从"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2523,7 +2523,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2532,7 +2532,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim - 仄仂亟�仍�仆�亶 从仍亳亠仆� 仂弍仄亠仆舒 �仂仂弍�亠仆亳�仄亳, 仗仂亰于仂仍���亳亶 亳�仗仂仍�亰仂于舒�� AIM, "
-"MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
+"MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
 "Sametime, Bonjour, Zephyr, Gadu-Gadu 亳 QQ 仂亟仆仂于�亠仄亠仆仆仂.  �舒仗亳�舒仆 � "
 "亳�仗仂仍�亰仂于舒仆亳亠仄 GTK+.<BR><BR>�� 仄仂亢亠�亠 亳亰仄亠仆��� 亳 �舒�仗�仂���舒仆��� 仗�仂亞�舒仄仄� 仗仂 "
 "��仍仂于亳�仄 GPL (于亠��亳亳 2 亳仍亳 弍仂仍亠亠 仗仂亰亟仆亠亶).  �仂仗亳� GPL �仂亟亠�亢亳��� 于 �舒亶仍亠 "
@@ -5099,11 +5099,11 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "�仂亰于仂仍�亠� 于舒仄 仂�仗�舒于仍��� 仆亠仂弍�舒弍仂�舒仆仆�亶 于于仂亟, 亳�仗仂仍�亰�� 仗�仂�仂从仂仍�, "
-"弍舒亰亳����亳亠�� 仆舒 �亠从��亠 (Jabber, MSN, IRC, TOC). �仍� 仂�仗�舒于从亳 仆舒亢仄亳�亠 'Enter' "
+"弍舒亰亳����亳亠�� 仆舒 �亠从��亠 (XMPP, MSN, IRC, TOC). �仍� 仂�仗�舒于从亳 仆舒亢仄亳�亠 'Enter' "
 "于 仂弍仍舒��亳 于于仂亟舒. 弌仄仂��亳�亠 亰舒 仂从仆仂仄 仂�仍舒亟从亳."
 
 #: ../gtk/plugins/relnot.c:69
@@ -6697,7 +6697,7 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -6949,8 +6949,8 @@
 msgstr "丕���仆舒� 亰舒仗亳�� AIM"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "丕���仆舒� 亰舒仗亳�� Jabber"
+msgid "XMPP Account"
+msgstr "丕���仆舒� 亰舒仗亳�� XMPP"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -8048,8 +8048,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "�亰仄亠仆亳�� Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "�亰仄亠仆亳�� XMPP vCard"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8163,7 +8163,7 @@
 msgid "The following are the results of your search"
 msgstr "弌仍亠亟���亠亠 �于仍�亠��� �亠亰�仍��舒�舒仄亳 于舒�亠亞仂 仗仂亳�从舒"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1673
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8186,7 +8186,7 @@
 msgstr "�仆����从�亳亳 �亠�于亠�舒: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1735
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:1755
@@ -8198,8 +8198,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1764
 #: ../libgaim/protocols/jabber/buddy.c:1765
-msgid "Search for Jabber users"
-msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍亠亶 Jabber"
+msgid "Search for XMPP users"
+msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍亠亶 XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:1779
 msgid "Invalid Directory"
@@ -8328,8 +8328,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:555
 #: ../libgaim/protocols/jabber/jabber.c:898
-msgid "Invalid Jabber ID"
-msgstr "�亠于亠�仆�亶 Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "�亠于亠�仆�亶 XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:626
 #, c-format
@@ -8382,8 +8382,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:861
 #: ../libgaim/protocols/jabber/jabber.c:862
-msgid "Register New Jabber Account"
-msgstr "�舒�亠亞亳���亳�仂于舒�� 仆仂于�� ����仆�� 亰舒仗亳�� Jabber"
+msgid "Register New XMPP Account"
+msgstr "�舒�亠亞亳���亳�仂于舒�� 仆仂于�� ����仆�� 亰舒仗亳�� XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1030
 msgid "Initializing Stream"
@@ -8446,8 +8446,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1367
 #: ../libgaim/protocols/jabber/jabber.c:1368
-msgid "Change Jabber Password"
-msgstr "�亰仄亠仆亳�� 仗舒�仂仍� Jabber"
+msgid "Change XMPP Password"
+msgstr "�亰仄亠仆亳�� 仗舒�仂仍� XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1368
 msgid "Please enter your new password"
@@ -8501,8 +8501,8 @@
 msgstr "亅仍亠仄亠仆� 仆亠 仆舒亶亟亠仆"
 
 #: ../libgaim/protocols/jabber/jabber.c:1478
-msgid "Malformed Jabber ID"
-msgstr "�亠于亠�仆�亶 Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "�亠于亠�仆�亶 XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:1480
 msgid "Not Acceptable"
@@ -8768,8 +8768,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1967
 #: ../libgaim/protocols/jabber/jabber.c:1969
-msgid "Jabber Protocol Plugin"
-msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1995
 msgid "Force old (port 5223) SSL"
@@ -8811,8 +8811,8 @@
 msgstr "�亠 �亟舒仍仂�� 亟仂��舒于亳�� �仂仂弍�亠仆亳亠 亟仍� %s: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "��亳弍从舒 �仂仂弍�亠仆亳� Jabber"
+msgid "XMPP Message Error"
+msgstr "��亳弍从舒 �仂仂弍�亠仆亳� XMPP"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/sk.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/sk.po	Tue May 01 05:53:57 2007 +0000
@@ -2358,8 +2358,8 @@
 msgstr "hacker a vymenovan箪 邸of辿r [leniv箪 zadok]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber v箪voj叩r"
+msgid "XMPP developer"
+msgstr "XMPP v箪voj叩r"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2587,7 +2587,7 @@
 #: ../gtk/gtkdialogs.c:332
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -2596,7 +2596,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim je modul叩rny IM klient, ktor箪 podporuje protokol AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
 "a Gadu-Gadu.  Je vytvoren箪 pomocou kni転nice GTK+.<BR><BR>Tento program "
 "m担転ete upravova泥 a distribuova泥 pod直a podmienok licencie GPL (vo verzii 2 alebo "
 "nov邸ej).  K坦pia licencie GPL sa nach叩dza v s炭bore 'COPYING', ktor箪 je dod叩van箪 "
@@ -5103,10 +5103,10 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"Nech叩 v叩s odosla泥 priamy vstup textovo-zalo転en箪m protokolom (Jabber, MSN, "
+"Nech叩 v叩s odosla泥 priamy vstup textovo-zalo転en箪m protokolom (XMPP, MSN, "
 "IRC, TOC). Pre odoslanie stla�te Enter vo vstupnom poli. Sledujte ladiace "
 "okno."
 
@@ -6365,11 +6365,11 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Sp担sob鱈, 転e okn叩 konverz叩cie sa objavia v momente, ke� v叩m ostatn鱈 "
 "pou転鱈vatelia za�n炭 p鱈sa泥 spr叩vu.  Funguje pre protokoly AIM, ICQ, "
-"Jabber, Sametime a Yahoo!"
+"XMPP, Sametime a Yahoo!"
 
 #: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -6639,8 +6639,8 @@
 msgstr "AIM 炭�et"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:593
-msgid "Jabber Account"
-msgstr "Jabber 炭�et"
+msgid "XMPP Account"
+msgstr "XMPP 炭�et"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -7755,8 +7755,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:585
 #: ../libgaim/protocols/jabber/buddy.c:586
-msgid "Edit Jabber vCard"
-msgstr "Upravi泥 Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Upravi泥 XMPP vCard"
 
 #: ../libgaim/protocols/jabber/buddy.c:587
 msgid ""
@@ -7874,7 +7874,7 @@
 msgid "The following are the results of your search"
 msgstr "Ni転邸ie s炭 v箪sledky v叩邸ho vyh直ad叩vania"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1637
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -7899,7 +7899,7 @@
 msgstr "In邸trukcie serveru: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1699
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "Vypl�te jedno alebo viac pol鱈�ok na h直adanie "
 
 #: ../libgaim/protocols/jabber/buddy.c:1719
@@ -7911,8 +7911,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1728
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Search for Jabber users"
-msgstr "Vyh直ad叩va泥 pou転鱈vate直ov Jabber"
+msgid "Search for XMPP users"
+msgstr "Vyh直ad叩va泥 pou転鱈vate直ov XMPP"
 
 #: ../libgaim/protocols/jabber/buddy.c:1743
 msgid "Invalid Directory"
@@ -8041,8 +8041,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:549
 #: ../libgaim/protocols/jabber/jabber.c:892
-msgid "Invalid Jabber ID"
-msgstr "Nespr叩vne Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Nespr叩vne XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:620
 #, c-format
@@ -8095,8 +8095,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:855
 #: ../libgaim/protocols/jabber/jabber.c:856
-msgid "Register New Jabber Account"
-msgstr "Registrova泥 nov箪 Jabber 炭�et"
+msgid "Register New XMPP Account"
+msgstr "Registrova泥 nov箪 XMPP 炭�et"
 
 #: ../libgaim/protocols/jabber/jabber.c:1020
 msgid "Initializing Stream"
@@ -8159,8 +8159,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1356
 #: ../libgaim/protocols/jabber/jabber.c:1357
-msgid "Change Jabber Password"
-msgstr "Zmeni泥 Jabber heslo"
+msgid "Change XMPP Password"
+msgstr "Zmeni泥 XMPP heslo"
 
 #: ../libgaim/protocols/jabber/jabber.c:1357
 msgid "Please enter your new password"
@@ -8214,8 +8214,8 @@
 msgstr "Polo転ka nen叩jden叩"
 
 #: ../libgaim/protocols/jabber/jabber.c:1467
-msgid "Malformed Jabber ID"
-msgstr "Chybn辿 Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Chybn辿 XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:1469
 msgid "Not Acceptable"
@@ -8480,8 +8480,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1956
 #: ../libgaim/protocols/jabber/jabber.c:1958
-msgid "Jabber Protocol Plugin"
-msgstr "Modul protokolu Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Modul protokolu XMPP"
 
 #: ../libgaim/protocols/jabber/jabber.c:1984
 msgid "Force old (port 5223) SSL"
@@ -8523,8 +8523,8 @@
 msgstr "Doru�enie spr叩vy pou転鱈vate直ovi %s zlyhalo: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Chyba spr叩vy Jabber"
+msgid "XMPP Message Error"
+msgstr "Chyba spr叩vy XMPP"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/sl.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/sl.po	Tue May 01 05:53:57 2007 +0000
@@ -2945,8 +2945,8 @@
 msgstr "Telepatski na�in za dohodne pogovore"
 
 #: ../libpurple/plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "Povzro�i pojavitev pogovornih oken, ko vam za�nejo drugi uporabniki sporo�ati. To deluje za AIM, ICQ, Jabber, Sametime in Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "Povzro�i pojavitev pogovornih oken, ko vam za�nejo drugi uporabniki sporo�ati. To deluje za AIM, ICQ, XMPP, Sametime in Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -3221,8 +3221,8 @@
 msgstr "Ra�un AIM"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Ra�un Jabber"
+msgid "XMPP Account"
+msgstr "Ra�un XMPP"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4358,8 +4358,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Urejanje Jabber vVizitke"
+msgid "Edit XMPP vCard"
+msgstr "Urejanje XMPP vVizitke"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
@@ -4471,7 +4471,7 @@
 msgid "The following are the results of your search"
 msgstr "To so rezultati va邸ega iskanja"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
 msgstr "Najdi stik z vnosom iskalnih kriterijev v dana polja. Opomba: vsa polja dovoljujejo iskanje z nadomestnimi znaki (%)."
@@ -4492,8 +4492,8 @@
 msgstr "Ukazi stre転niku: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Izpolnite eno ali ve� polj za iskanje uporabnikov Jabberja."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Izpolnite eno ali ve� polj za iskanje uporabnikov XMPPja."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4504,8 +4504,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "I邸�i uporabnike Jabberja"
+msgid "Search for XMPP users"
+msgstr "I邸�i uporabnike XMPPja"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4648,8 +4648,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Neveljaven Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Neveljaven XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4703,8 +4703,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Registrirajte nov ra�un za Jabber"
+msgid "Register New XMPP Account"
+msgstr "Registrirajte nov ra�un za XMPP"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875
@@ -4779,8 +4779,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Spremeni geslo za Jabber"
+msgid "Change XMPP Password"
+msgstr "Spremeni geslo za XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4834,8 +4834,8 @@
 msgstr "Predmeta ni mogo�e najti"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Nepravilen Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Nepravilen XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -5093,8 +5093,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Dodatek za protokol Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Dodatek za protokol XMPP"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -5136,8 +5136,8 @@
 msgstr "Dostava sporo�ila za uporabnika %s ni uspela: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Napaka sporo�ila Jabber"
+msgid "XMPP Message Error"
+msgstr "Napaka sporo�ila XMPP"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12236,8 +12236,8 @@
 msgstr "heker in uradni vodja [lenoba]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "razvijalec podpore protokola Jabber"
+msgid "XMPP developer"
+msgstr "razvijalec podpore protokola XMPP"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12544,8 +12544,8 @@
 
 #: ../pidgin/gtkdialogs.c:359
 #, c-format
-msgid "%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 je modularen odjemalec za neposredna sporo�ila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu in QQ. Napisan je s pomo�jo Gtk+.<BR><BR>Program lahko spreminjate in raz邸irjate pod pogoji licence GPL (razli�ice 2 ali novej邸e).  Kopija licence GPL je v datoteki 'COPYING', ki je distribuirana s programom %s.  %s je za邸�itena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakr邸na garancija.<BR><BR>"
+msgid "%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 je modularen odjemalec za neposredna sporo�ila, ki lahko hkrati uporablja protokole AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu in QQ. Napisan je s pomo�jo Gtk+.<BR><BR>Program lahko spreminjate in raz邸irjate pod pogoji licence GPL (razli�ice 2 ali novej邸e).  Kopija licence GPL je v datoteki 'COPYING', ki je distribuirana s programom %s.  %s je za邸�itena znamka svojih avtorjev.  Oglejte si datoteko 'COPYRIGHT' za popoln seznam sodelavcev.  Za program ni na voljo nikakr邸na garancija.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
@@ -14861,8 +14861,8 @@
 msgstr "Omogo�a neposreden vnos v protokole."
 
 #: ../pidgin/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "Omogo�a po邸iljanje golih ukazov za protokole, ki temeljijo na besedilu (Jabber, MSN, IRC, TOC). Pritisnite 'Enter' za po邸iljanje in opazujte kodno okno."
+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 "Omogo�a po邸iljanje golih ukazov za protokole, ki temeljijo na besedilu (XMPP, MSN, IRC, TOC). Pritisnite 'Enter' za po邸iljanje in opazujte kodno okno."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
--- a/po/sq.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/sq.po	Tue May 01 05:53:57 2007 +0000
@@ -892,8 +892,8 @@
 msgstr "Ju lejon t谷 d谷rgoni input bruto te protokolle me baz谷 teksti "
 
 #: plugins/raw.c:154
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "Ju lejon t谷 fusni t谷 dh谷na bruto n谷 protokolle me baz谷 teksti (Jabber, MSN, IRC, TOC). P谷r t谷 d谷rguar, shtypni 'Enter' te kuti futjesh. Kqyrni dritare \"debug\"."
+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 "Ju lejon t谷 fusni t谷 dh谷na bruto n谷 protokolle me baz谷 teksti (XMPP, MSN, IRC, TOC). P谷r t谷 d谷rguar, shtypni 'Enter' te kuti futjesh. Kqyrni dritare \"debug\"."
 
 #: plugins/relnot.c:63
 #, c-format
@@ -2943,8 +2943,8 @@
 msgstr "mir谷mbajt谷si i libfaim"
 
 #: src/gtkdialogs.c:92
-msgid "Jabber developer"
-msgstr "zhvillues i Jabber-it"
+msgid "XMPP developer"
+msgstr "zhvillues i XMPP-it"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -3133,8 +3133,8 @@
 msgstr "Rreth Gaim"
 
 #: src/gtkdialogs.c:226
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr "Gaim-i 谷sht谷 nj谷 klient modular shk谷mbimi mesazhesh i aft谷 t谷 p谷rdor谷 nj谷herazi AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, dhe Gadu-Gadu.  �sht谷 shkruajtur duke p谷rdorur Gtk+ dhe licensuar sipas GNU GPL.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+msgstr "Gaim-i 谷sht谷 nj谷 klient modular shk谷mbimi mesazhesh i aft谷 t谷 p谷rdor谷 nj谷herazi AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, dhe Gadu-Gadu.  �sht谷 shkruajtur duke p谷rdorur Gtk+ dhe licensuar sipas GNU GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:235
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -5856,16 +5856,16 @@
 
 #: src/protocols/jabber/buddy.c:567
 #: src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "P谷rpuno vCard p谷r Jabber"
+msgid "Edit XMPP vCard"
+msgstr "P谷rpuno vCard p谷r XMPP"
 
 #: src/protocols/jabber/buddy.c:569
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
 msgstr "T谷r谷 element谷t m谷 posht谷 jan谷 si mund谷si. Jepni vet谷m t谷 dh谷nat t谷 cilat mendoni se nuk ju prishin pun谷. "
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "ID Jabber"
+msgid "XMPP ID"
+msgstr "ID XMPP"
 
 #: src/protocols/jabber/buddy.c:642
 #: src/protocols/jabber/jabber.c:1711
@@ -5955,8 +5955,8 @@
 msgstr "�ka vijon 谷sht谷 p谷rfundimi i k谷rkimit tuaj"
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Plot谷soni nj谷 ose m谷 tep谷r fusha p谷r k谷rkim t谷 cilitdo p谷rdorues Jabber q谷 ka p谷rputhje."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Plot谷soni nj谷 ose m谷 tep谷r fusha p谷r k谷rkim t谷 cilitdo p谷rdorues XMPP q谷 ka p谷rputhje."
 
 #  First Name
 #: src/protocols/jabber/buddy.c:1331
@@ -5980,8 +5980,8 @@
 
 #: src/protocols/jabber/buddy.c:1355
 #: src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
-msgstr "K谷rko p谷r p谷rdoruesas Jabber"
+msgid "Search for XMPP users"
+msgstr "K谷rko p谷r p谷rdoruesas XMPP"
 
 #: src/protocols/jabber/buddy.c:1370
 msgid "Invalid Directory"
@@ -6110,8 +6110,8 @@
 
 #: src/protocols/jabber/jabber.c:403
 #: src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "ID Jabber i pavlefsh谷m"
+msgid "Invalid XMPP ID"
+msgstr "ID XMPP i pavlefsh谷m"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6166,8 +6166,8 @@
 
 #: src/protocols/jabber/jabber.c:704
 #: src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "Regjistro Llogari t谷 Re Jabber"
+msgid "Register New XMPP Account"
+msgstr "Regjistro Llogari t谷 Re XMPP"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6247,8 +6247,8 @@
 
 #: src/protocols/jabber/jabber.c:1160
 #: src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Ndrysho Fjal谷kalim Jabber-i"
+msgid "Change XMPP Password"
+msgstr "Ndrysho Fjal谷kalim XMPP-i"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6301,8 +6301,8 @@
 msgstr "Objekt i Pagjetur"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "ID Jabber-i i Keqform谷suar"
+msgid "Malformed XMPP ID"
+msgstr "ID XMPP-i i Keqform谷suar"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6549,8 +6549,8 @@
 #. *  summary
 #: src/protocols/jabber/jabber.c:1686
 #: src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Protokoll Shtojce Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Protokoll Shtojce XMPP"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6600,8 +6600,8 @@
 msgstr "D谷shtoi shp谷rndarja e mesazhit p谷r %s: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Gabim Mesazhi Jabber "
+msgid "XMPP Message Error"
+msgstr "Gabim Mesazhi XMPP "
 
 #: src/protocols/jabber/message.c:297
 #, c-format
--- a/po/sr.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/sr.po	Tue May 01 05:53:57 2007 +0000
@@ -836,7 +836,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "�仄仂亞��舒于舒 亟舒 仗仂�舒�亠�亠 亳亰于仂�仆亳 �亠从�� 仗�仂�仂从仂仍亳仄舒 从仂�亳 亞舒 仗�亳�于舒�舒�� (�舒弍亠�, "
@@ -2745,7 +2745,7 @@
 msgstr "仂亟�亢舒于舒仍舒� libfaim-舒"
 
 #: src/gtkdialogs.c:92
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "�舒弍亠� 仗�仂亞�舒仄亠�"
 
 #: src/gtkdialogs.c:93
@@ -2915,7 +2915,7 @@
 #: src/gtkdialogs.c:226
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "�舒亳仄 �亠 仗�仂�亳�亳于亳 从仍亳�亠仆� 亰舒 弍�亰亠 仗仂��从亠 从仂�亳 仄仂亢亠 亟舒 从仂�亳��亳 ���, ICQ, "
@@ -5567,7 +5567,7 @@
 msgstr "�仂�亠仆亟舒仆"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr "丕�亠�亳于舒�亠 �舒弍亠� 于亳亰亳�-从舒��亠"
 
 #: src/protocols/jabber/buddy.c:569
@@ -5577,7 +5577,7 @@
 msgstr "弌于亠 亟仂仍亠 仆舒于亠亟亠仆亠 仂仗�亳�亠 仆亳�� 仂弍舒于亠亰仆亠. 丕仆亠�亳�亠 �舒仄仂 仗仂亟舒�从亠 从仂�亠 亢亠仍亳�亠."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
+msgid "XMPP ID"
 msgstr "�舒弍亠� ��"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
@@ -5662,7 +5662,7 @@
 msgstr "�仂仍亠 �� �亠亰�仍�舒�亳 于舒�亠 仗�亠��舒亞亠"
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "�仂仗�仆亳�亠 �亠亟仆仂 亳仍亳 于亳�亠 仗仂�舒 亟舒 弍亳��亠 ��舒亢亳仍亳 �舒弍亠� 从仂�亳�仆亳从亠."
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5680,7 +5680,7 @@
 msgstr "�亟�亠�舒 亠-仗仂��亠"
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "丐�舒亢亳 �舒弍亠� 从仂�亳�仆亳从亠"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5801,7 +5801,7 @@
 msgstr "�亠 仄仂亞� 仆舒�亳仆亳�亳 �仂从亠�"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr "�亠亳�仗�舒于舒仆 �舒弍亠� ��"
 
 #: src/protocols/jabber/jabber.c:473
@@ -5848,7 +5848,7 @@
 msgstr "�仂仍亳仄 亳�仗�仆亳�亠 仗仂亟舒�从亠 亳�仗仂亟 亟舒 �亠亞亳�����亠�亠 仆仂于亳 仆舒仍仂亞."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "�亠亞亳����� 仆仂于亳 �舒弍亠� 仆舒仍仂亞"
 
 #: src/protocols/jabber/jabber.c:842
@@ -5920,7 +5920,7 @@
 msgstr "�仂亰亳仆从舒 (仗仂仆仂于亳�亠)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "�亰仄亠仆亳�亠 �舒弍亠� 仍仂亰亳仆从�"
 
 #: src/protocols/jabber/jabber.c:1161
@@ -5970,7 +5970,7 @@
 msgstr "�亳�亠 仆舒�亠仆仂"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr "�亠亳�仗�舒于舒仆 �舒弍亠� ��"
 
 #: src/protocols/jabber/jabber.c:1273
@@ -6215,7 +6215,7 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr "�仂亟舒�舒从 亰舒 �舒弍亠� 仗�仂�仂从仂仍"
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6264,7 +6264,7 @@
 msgstr "��仗仂��从舒 仗仂��从亠 亰舒 %s 仆亳�亠 ��仗亠仍舒: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr "�舒弍亠� 亞�亠�从舒 仗仂��从亠"
 
 #: src/protocols/jabber/message.c:297
--- a/po/sr@Latn.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/sr@Latn.po	Tue May 01 05:53:57 2007 +0000
@@ -855,7 +855,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "Omogu�ava da po邸aljete izvorni tekst protokolima koji ga prihvataju (D貼aber, "
@@ -2824,7 +2824,7 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "biv邸i D貼aber programer"
 
 #: src/gtkdialogs.c:93
@@ -2997,7 +2997,7 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim je pro邸irivi klijent za brze poruke koji mo転e da koristi AIM, ICQ, "
@@ -5731,7 +5731,7 @@
 msgstr "Ro�endan"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr "Ure�ivanje D貼aber vizit-karte"
 
 #: src/protocols/jabber/buddy.c:569
@@ -5742,7 +5742,7 @@
 "Sve dole navedene opcije nisu obavezne. Unesite samo podatke koje 転elite."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
+msgid "XMPP ID"
 msgstr "D貼aber ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
@@ -5828,7 +5828,7 @@
 msgstr "Dole su rezultati pretrage: "
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5847,7 +5847,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "Tra転i drugara"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5973,7 +5973,7 @@
 msgstr "Ne mogu na�initi soket"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr "Neispravan D貼aber IB"
 
 #: src/protocols/jabber/jabber.c:473
@@ -6020,7 +6020,7 @@
 msgstr "Molim ispunite podatke ispod da registrujete novi nalog."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "Registruj novi D貼aber nalog"
 
 #: src/protocols/jabber/jabber.c:842
@@ -6093,7 +6093,7 @@
 msgstr "Lozinka (ponovite)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "Izmenite D貼aber lozinku"
 
 #: src/protocols/jabber/jabber.c:1161
@@ -6144,7 +6144,7 @@
 msgstr "Nije na�eno"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr "Neispravan D貼aber IB"
 
 #: src/protocols/jabber/jabber.c:1273
@@ -6392,7 +6392,7 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr "Dodatak za D貼aber protokol"
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6443,7 +6443,7 @@
 msgstr "Isporuka poruke za %s nije uspela: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr "D貼aber gre邸ka poruke"
 
 #: src/protocols/jabber/message.c:297
@@ -12244,7 +12244,7 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Neispravan nadimak"
 
-#~ msgid "Jabber Profile"
+#~ msgid "XMPP Profile"
 #~ msgstr "D貼aber profil"
 
 #~ msgid "Roomlist Error"
@@ -13114,11 +13114,11 @@
 #~ "Lozinka koju ste uneli je ista kao i Va邸a sada邸nja lozinka. Va邸a lozinka "
 #~ "ostaje ista."
 
-#~ msgid "Jabber Error %s"
+#~ msgid "XMPP Error %s"
 #~ msgstr "D貼aber gre邸ka %s"
 
 #~ msgid ""
-#~ "The Jabber user %s does not exist and was therefore not added to your "
+#~ "The XMPP user %s does not exist and was therefore not added to your "
 #~ "roster."
 #~ msgstr ""
 #~ "D貼aber korisnik %s ne postoji, i zato nije dodat u Va邸 spisak drugara."
@@ -13138,7 +13138,7 @@
 #~ msgid "Requesting Authentication Method"
 #~ msgstr "Zahtev na�ina identifikacije"
 
-#~ msgid "The user %s is an invalid Jabber I.D. and was therefore not added."
+#~ msgid "The user %s is an invalid XMPP I.D. and was therefore not added."
 #~ msgstr "Korisnik %s je neispravno D貼aber ime, i stoga nije dodat."
 
 #~ msgid "View Error Msg"
@@ -13289,7 +13289,7 @@
 #~ "  Adam Fritzler (former libfaim maintainer)<BR>  Eric Warmenhoven (former "
 #~ "lead developer)&lt;<A HREF=\"mailto:warmenhoven@yahoo.com"
 #~ "\">warmenhoven@yahoo.com</A>&gt;<BR>  Jim Duchek (former maintainer)<BR>  "
-#~ "Jim Seymour (former Jabber developer)<BR>  Mark Spencer (original author) "
+#~ "Jim Seymour (former XMPP developer)<BR>  Mark Spencer (original author) "
 #~ "&lt;<A HREF=\"mailto:markster@marko.net\">markster@marko.net</A>&gt;<BR>  "
 #~ "Syd Logan (hacker and designated driver [lazy bum])<BR><BR>"
 #~ msgstr ""
--- a/po/sv.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/sv.po	Tue May 01 05:53:57 2007 +0000
@@ -2565,8 +2565,8 @@
 msgstr "hacker och fyllechaffis [lat typ]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber-utvecklare"
+msgid "XMPP developer"
+msgstr "XMPP-utvecklare"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2835,8 +2835,8 @@
 msgstr "Om Gaim"
 
 #: ../gtk/gtkdialogs.c:332
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 Gaim.  Gaim 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 "Gaim 辰r en modul辰r meddelandeklient kapabel att anv辰nda AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu och QQ samtidigt.  Det 辰r skrivet med GTK+.<BR><BR>Du kan 辰ndra och distribuera programmet enligt GPL (version 2 eller senare).  En kopia av GPL finns i filen 'COPYING' som kommer med Gaim.  Gaim 辰r kopieringsskyddad av dess bidragsgivare.  Se filen 'COPYRIGHT' f旦r en komplett lista av bidragsgivare.  Vi ger inga garantier f旦r detta program.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, 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 Gaim.  Gaim 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 "Gaim 辰r en modul辰r meddelandeklient kapabel att anv辰nda AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu och QQ samtidigt.  Det 辰r skrivet med GTK+.<BR><BR>Du kan 辰ndra och distribuera programmet enligt GPL (version 2 eller senare).  En kopia av GPL finns i filen 'COPYING' som kommer med Gaim.  Gaim 辰r kopieringsskyddad av dess bidragsgivare.  Se filen 'COPYRIGHT' f旦r en komplett lista av bidragsgivare.  Vi ger inga garantier f旦r detta program.<BR><BR>"
 
 #: ../gtk/gtkdialogs.c:347
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -5356,8 +5356,8 @@
 msgstr "L奪ter dig skicka r奪 indata till textbaserade protokoll."
 
 #: ../gtk/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "L奪ter dig skicka r奪 indata till textbaserade protokoll (Jabber, MSN, IRC, TOC). Tryck \"Enter\" i inmatningsrutan f旦r att skicka. Titta i fels旦kningsf旦nstret."
+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 "L奪ter dig skicka r奪 indata till textbaserade protokoll (XMPP, MSN, IRC, TOC). Tryck \"Enter\" i inmatningsrutan f旦r att skicka. Titta i fels旦kningsf旦nstret."
 
 #: ../gtk/plugins/relnot.c:69
 #, c-format
@@ -6585,8 +6585,8 @@
 msgstr "Siande l辰ge f旦r inkommande konversation"
 
 #: ../libgaim/plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "F奪r konversationsf旦nster att dyka upp d奪 andra anv辰ndare b旦rjar att skicka meddelande till dig. Detta fungerar f旦r AIM, ICQ, Jabber, Sametime och Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr "F奪r konversationsf旦nster att dyka upp d奪 andra anv辰ndare b旦rjar att skicka meddelande till dig. Detta fungerar f旦r AIM, ICQ, XMPP, Sametime och Yahoo!"
 
 #: ../libgaim/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -6841,8 +6841,8 @@
 msgstr "AIM-konto"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Jabber-konto"
+msgid "XMPP Account"
+msgstr "XMPP-konto"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -7924,12 +7924,12 @@
 msgid "Birthday"
 msgstr "F旦delsedag"
 
-# "vCard" fattar ingen som inte insatt i Jabber vad det betyder.
+# "vCard" fattar ingen som inte insatt i XMPP vad det betyder.
 # Visitkort k辰nner d辰remot de flesta till.
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Redigera Jabber-visitkort"
+msgid "Edit XMPP vCard"
+msgstr "Redigera XMPP-visitkort"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid "All items below are optional. Enter only the information with which you feel comfortable."
@@ -7947,7 +7947,7 @@
 
 # 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
+# att 奪tminstone de som k辰nner till vad Resource betyder i XMPP
 # fattar vad det 辰r."Resurs" anv辰nds ocks奪 i str辰ngen "Resurskonflikt"
 # p奪 ett annat st辰lle i denna fil.
 #: ../libgaim/protocols/jabber/buddy.c:654
@@ -8046,7 +8046,7 @@
 msgid "The following are the results of your search"
 msgstr "Din s旦kning gav f旦ljande resultat"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1637
 msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
 msgstr "Hitta en kontakt genom att ange s旦kkriteriet i de givna f辰lten. Notera: Alla f辰lten st旦djer wild card s旦kningar (%)"
@@ -8067,8 +8067,8 @@
 msgstr "Serverinstruktioner: %s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1699
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Fyll i ett eller flera f辰lt f旦r att s旦ka efter matchande Jabberanv辰ndare."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Fyll i ett eller flera f辰lt f旦r att s旦ka efter matchande XMPPanv辰ndare."
 
 #: ../libgaim/protocols/jabber/buddy.c:1719
 #: ../libgaim/protocols/novell/novell.c:1488
@@ -8079,8 +8079,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1728
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Search for Jabber users"
-msgstr "S旦k efter Jabberanv辰ndare"
+msgid "Search for XMPP users"
+msgstr "S旦k efter XMPPanv辰ndare"
 
 #: ../libgaim/protocols/jabber/buddy.c:1743
 msgid "Invalid Directory"
@@ -8211,8 +8211,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:550
 #: ../libgaim/protocols/jabber/jabber.c:893
-msgid "Invalid Jabber ID"
-msgstr "Ogiltigt Jabber-ID"
+msgid "Invalid XMPP ID"
+msgstr "Ogiltigt XMPP-ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:621
 #, c-format
@@ -8266,8 +8266,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:856
 #: ../libgaim/protocols/jabber/jabber.c:857
-msgid "Register New Jabber Account"
-msgstr "Registrera nytt Jabber-konto"
+msgid "Register New XMPP Account"
+msgstr "Registrera nytt XMPP-konto"
 
 #: ../libgaim/protocols/jabber/jabber.c:1023
 msgid "Initializing Stream"
@@ -8330,8 +8330,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 #: ../libgaim/protocols/jabber/jabber.c:1364
-msgid "Change Jabber Password"
-msgstr "Byt Jabber-l旦senord"
+msgid "Change XMPP Password"
+msgstr "Byt XMPP-l旦senord"
 
 #: ../libgaim/protocols/jabber/jabber.c:1364
 msgid "Please enter your new password"
@@ -8385,8 +8385,8 @@
 msgstr "F旦rem奪let hittades inte"
 
 #: ../libgaim/protocols/jabber/jabber.c:1474
-msgid "Malformed Jabber ID"
-msgstr "Felformaterat Jabber-ID"
+msgid "Malformed XMPP ID"
+msgstr "Felformaterat XMPP-ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:1476
 msgid "Not Acceptable"
@@ -8643,8 +8643,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1963
 #: ../libgaim/protocols/jabber/jabber.c:1965
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber-insticksmodul"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP-insticksmodul"
 
 #: ../libgaim/protocols/jabber/jabber.c:1991
 msgid "Force old (port 5223) SSL"
@@ -8686,8 +8686,8 @@
 msgstr "Leverans av meddelande till %s misslyckades: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Jabber-meddelandefel"
+msgid "XMPP Message Error"
+msgstr "XMPP-meddelandefel"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/ta.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/ta.po	Tue May 01 05:53:57 2007 +0000
@@ -1025,7 +1025,7 @@
 msgstr "牀�牀橿�牀朽�牆�牀�� 牀�牀萎�牀��牀�牀迦�牀�牆�牀�牆� 牀�牀橿�牀逗�牀迦� 牀��牀園�牀��"
 
 #: ../plugins/psychic.c:24
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr "牀��牆�牀� 牀��牀��牆�牀�牀橿� 牀�牆�牀��牀む�牀�牀橿� 牀�牀��牀��牀��牆� 牀む�牀朽�牆�牀�牀逗�牀鉦�牆� 牀�牀萎�牀��牀�牀迦� 牀�牀鉦�牀萎�牆�牀�牀橿� 牀�牀萎�牀朽�牀�牆�牀�牆�牀��. 牀蹍�牀��牆� 牀�牀�牆�牀�牆�牀�� 牀�牀鉦�牆�牀��牀萎� 牀�牆�牀��牀�牆�牀�� 牀��牆�牀園�牀�� 牀��牀�牆�! 牀�牀�牀�� 牀朽�牀迦� 牀�牆�牀��牀��牀��."
 
 #: ../plugins/psychic.c:60
@@ -1053,7 +1053,7 @@
 msgstr "牀��牆�牀む�牀む� 牀�牀�牀逗�牆�牀��牆�牀��牀� 牀�牆�牀��牀� 牀�牆�牀萎�牀�牆�牀��牀萎�牀橿�牀�牆�牀�牆� 牀�牀橿�牀橿�牆� 牀�牀橿�牀橿�牀�牀� 牀�牀橿�牀� 牀�牀橿�牀橿�牀�牆�牀�牀橿� 牀�牆�牀�牆�牀�牆�牀� 牀�牀��牀��牀逗�牆�牀�牀逗�牀む�."
 
 #: ../plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+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 "牀��牆�牀む�牀む� 牀��牀園� 牀朽�牆�牀��牀園�牀�牆�牀�牆� 牀�牀橿�牀橿�牀�牆�牀�牀橿� 牀�牀��牀��牀逗�牆� 牀�牀��牀��牀� 牀�牀��牀��牀逗�牆�牀�牀逗�牀む� (牀�牀鉦�牆�牀��牆�, 牀��牆�牀��牆�牀��牆�, 牀�牀�牀萎�牀�牀�, 牀�牀逗�牀�牀�). 牀��牀巌�牀朽� 牀��牀�牆�牀�牀逗�牀逗�牆�  'Enter' 牀� 牀�牆�牀�牆�牀�牆�牀�牆�牀朽�牀�� 牀��牀迦�牆� 牀�牀��牀��牀��牀鉦�牆�. 牀��牀巌�牀��牀逗�牆�牀�牆� 牀�牀鉦�牀萎�牆�牀む� 牀�牀朽�牀逗�牆�牀�牀朽�牀��."
 
 #: ../plugins/relnot.c:63
@@ -3157,7 +3157,7 @@
 msgstr "牀�牀む�牀む�牀��牀園�牆� 牀��牆�牀園�牀�� 牀��牀� 牀�牀��牆�牀朽� 牀�牆�牀��牀��牆� 牀��牆�牀� 牀�牀��牆�牀�牆�牀��牆� [lazy bum]"
 
 #: ../src/gtkdialogs.c:101
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "牀�牀鉦�牆�牀��牆� 牀�牀萎�牀朽�牀�牆�牀�牆�牀��牀萎�"
 
 #: ../src/gtkdialogs.c:102
@@ -3391,7 +3391,7 @@
 msgstr "牀�牆�牀��牀�� 牀��牆�牀園�"
 
 #: ../src/gtkdialogs.c:261
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu 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 Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, and Gadu-Gadu 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 Gaim.  Gaim 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 "牀�牆�牀��牀�� 牀蹍�牀��牆�, 牀��牆�牀��牆�牀��牆�, 牀��牀�牆�, 牀�牀��牀��牀萎�, 牀�牀�牀逗�牆�牀��, 牀�牀�牀萎�牀�牀�, 牀��牆�牀�牀��牆�牀�牀�, 牀��牀朽�牀迦�, 牀�牆�牀萎�牀��牀朽�牀伍�, 牀迦�牀�牆�牀�牀伍� 牀�牆�牀�� 牀�牆�牀��, 牀��牀��牀伍�牀�牀萎�, 牀�牆�牀��牆�牀萎�, 牀�牀鉦�牆�-牀�牀鉦�牆� 牀�牀�牀逗� 牀�� 牀�牆�牀園�牀�牀橿�牀��牀�� 牀�牀��牆�牀�牀逗�牆�牀�牀�牆� 牀�牆�牀�牀逗� 牀む�牀朽�牆� 牀む�牀�牀萎�牀��牀橿�牆�. GTK+ 牀� 牀�牀��牆�牀�牀逗�牆�牀む� 牀�牀む� 牀��牆�牀む�牆� 牀��牆�牀�牆� 牀�牀橿�牀橿�牆�. <BR><BR> 牀��牀�牆�牀�牀橿� 牀�牀逗�牀逗�牀迦� ( 2 牀�牀�� 牀��牀逗�牆�牀�� 牀�牀迦�牀迦�牆� 牀�牀む�牆�牀�牆�牀�� 牀��牀む�牀�)  牀�牀�� 牀朽�牀園�牀�牆�牀�牆� 牀�牀�牆� 牀��牆�牀�牆� 牀�牀む� 牀��牀園�牀園�牀鉦�牆�, 牀��牆� 牀��牀逗�牀鉦�牆�牀園�牆� 牀�牆�牀��牀��牀鉦�牆�.  牀�牀逗�牀逗�牀迦� 牀�牀�� 牀��牀萎�牀� 牀�牆�牀��牀�� 牀�牀�牀�� 'COPYING' 牀��牆�牀� 牀�牆�牀��牀��牀迦� 牀�牀橿�牀橿�牆�. 牀�牆�牀��牀�� 牀�牀迦� 牀�牀む�牆� 牀��牆�牀�牀橿�牀��牀��牀萎�牀�牀橿�牀�牆�牀�牆� 牀�牀鉦�牆�牀��牀萎�牀�� 牀�牀橿�牀橿�牆�. 'COPYRIGHT' 牀�牆�牀��牀��牀迦� 牀�牀朽�牆�牀�牀橿� 牀��牆�牀�牀逗�牀迦� 牀��牀萎�牀�牆�牀�牀迦�牀��. 牀�牀��牀� 牀��牀萎�牆�牀�牆�牀�牆� 牀��牆�牀む�牀逗� 牀�牀む�牀む�牀萎�牀鉦�牀��牀�� 牀�牀逗�牆�牀��牀む�.<BR><BR>"
 
 #: ../src/gtkdialogs.c:275
@@ -6409,7 +6409,7 @@
 
 #: ../src/protocols/jabber/buddy.c:567
 #: ../src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr "牀�牀鉦�牆�牀��牆� 牀朽�牀�牀鉦�牆�牀�牆� 牀� 牀む�牀�牆�"
 
 #: ../src/protocols/jabber/buddy.c:569
@@ -6514,7 +6514,7 @@
 msgstr "牀�牆�牀朽�牀�� 牀�牀�牆�牀�牀橿�牀�牀橿�: %s"
 
 #: ../src/protocols/jabber/buddy.c:1392
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "牀�牀鉦�牆�牀��牆� 牀��牀��牀橿�牆�牀�牀橿� 牀む�牀� 牀�牀��牀園� 牀�牀迦�牀迦�牆� 牀��牀園�牀��牆�牀� 牀��牀迦�牆�牀�牀橿� 牀��牀萎�牀む�牀む� 牀�牆�牀��牀�."
 
 #: ../src/protocols/jabber/buddy.c:1411
@@ -6526,7 +6526,7 @@
 
 #: ../src/protocols/jabber/buddy.c:1420
 #: ../src/protocols/jabber/buddy.c:1421
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "牀�牀鉦�牆�牀��牆� 牀��牀��牀橿�牆�牀�牀橿� 牀む�牀�牆�牀�牀逗�牀む�"
 
 #: ../src/protocols/jabber/buddy.c:1435
@@ -6658,7 +6658,7 @@
 
 #: ../src/protocols/jabber/jabber.c:520
 #: ../src/protocols/jabber/jabber.c:857
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr "牀�牆�牀迦�牀迦�牀� 牀�牀鉦�牆�牀��牆� 牀�牀�牆�牀��牀橿�牆�"
 
 #: ../src/protocols/jabber/jabber.c:590
@@ -6713,7 +6713,7 @@
 
 #: ../src/protocols/jabber/jabber.c:821
 #: ../src/protocols/jabber/jabber.c:822
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "牀��牀む�牀� 牀�牀鉦�牆�牀��牆� 牀�牀��牆�牀�牆� 牀��牀逗�牆� 牀�牆�牀��"
 
 #: ../src/protocols/jabber/jabber.c:983
@@ -6785,7 +6785,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1317
 #: ../src/protocols/jabber/jabber.c:1318
-msgid "Change Jabber Password"
+msgid "Change XMPP Password"
 msgstr "牀�牀鉦�牆�牀��牆� 牀�牀�牀朽�牀�牆�牀�牆�牀迦�牀迦� 牀��牀園�牀園�"
 
 #: ../src/protocols/jabber/jabber.c:1318
@@ -6838,7 +6838,7 @@
 msgstr "牀�牀萎�牀��牀��牀� 牀�牀鉦� 牀朽�牀迦�牀迦�"
 
 #: ../src/protocols/jabber/jabber.c:1428
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr "牀�牆�牀�牀鉦� 牀�牀鉦�牆�牀��牆� 牀�牀�牆�牀��牀橿�牆�"
 
 #: ../src/protocols/jabber/jabber.c:1430
@@ -7095,7 +7095,7 @@
 #. *  summary
 #: ../src/protocols/jabber/jabber.c:1883
 #: ../src/protocols/jabber/jabber.c:1885
-msgid "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
 msgstr "牀�牀鉦�牆�牀��牆� 牀��牀園�牀��牀園� 牀�牆�牀萎�牀�牆�牀��牀萎�牀橿�"
 
 #: ../src/protocols/jabber/jabber.c:1911
@@ -7145,7 +7145,7 @@
 msgstr "%s 牀�牆�牀�牆� 牀�牀��牀��牀��牀� 牀む�牀朽�牆� 牀��牆�牀�牆�牀朽�牀�牀� 牀�牆�牀��牀��牆�牀む�牀園�牀��牆�: %s"
 
 #: ../src/protocols/jabber/message.c:227
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr "牀�牀鉦�牆�牀��牆� 牀む�牀朽�牆� 牀��牀巌�"
 
 #: ../src/protocols/jabber/message.c:295
--- a/po/te.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/te.po	Tue May 01 05:53:57 2007 +0000
@@ -978,10 +978,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"牋�牘�牋�牘���牋伍�牋�牘���牋�� 牋�牋о鮎牋萎葵牋÷或牋� 牋��牋萎�牋�牘�牋�牋鉦芦牘�牋伍� (Jabber, MSN, IRC, TOC) 牋�牘� 牋�牋伍�牋��牋萎�牋� 牋�牋����牋��牋�牘���牋�� 牋��牋��牋�牋�牘� "
+"牋�牘�牋�牘���牋伍�牋�牘���牋�� 牋�牋о鮎牋萎葵牋÷或牋� 牋��牋萎�牋�牘�牋�牋鉦芦牘�牋伍� (XMPP, MSN, IRC, TOC) 牋�牘� 牋�牋伍�牋��牋萎�牋� 牋�牋����牋��牋�牘���牋�� 牋��牋��牋�牋�牘� "
 "牋�牋朽�牋鉦斡牋�或牋�牘�牋�牘�牋��. "
 
 #: plugins/relnot.c:63
@@ -3029,7 +3029,7 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr "牋��牋萎�牋� 牋�牋鉦穐牋萎� 牋÷�牋朽芦牋�旭牘� "
 
 #: src/gtkdialogs.c:93
@@ -3202,10 +3202,10 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
-"牋�牘�牋�或牋�� 牋�牋� 牋�鮎牋÷�牋��牋迦旭牘� 牋�愛牘�牋о阿牋逗芦牘� 牋伍�牋��牋謹鮎牋迦姶牘� 牋�牋�牋�或牋�牋�牘� 牋�牘�牋迦�牋�牋�牘�. 牋�牋�或 AIM, MSN, Yahoo!, Jabber, ICQ, "
+"牋�牘�牋�或牋�� 牋�牋� 牋�鮎牋÷�牋��牋迦旭牘� 牋�愛牘�牋о阿牋逗芦牘� 牋伍�牋��牋謹鮎牋迦姶牘� 牋�牋�牋�或牋�牋�牘� 牋�牘�牋迦�牋�牋�牘�. 牋�牋�或 AIM, MSN, Yahoo!, XMPP, ICQ, "
 "IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu 牋�牋��牋�或牋�牋�牋逗姶牘� 牋む�牘�牋劇娃牋�� "
 "牋朽鮎牋÷�牋�牘�牋�牋�牘�牋�牋�或. Gtk+ 牋�� 牋朽鮎牋÷或 牋�牋�或 牋朽�牋萎鮎牋�穐牋÷或, GPL 牋�牘� 牋迦�牋伍�牋��牋伍� 牋�牋朽�牋朽穐牋÷或牋�牋�或. <BR><BR>"
 
@@ -5963,7 +5963,7 @@
 msgstr "牋��牋�牘�牋�牋逗姶牋萎�牋�牘� "
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr "牋�牋鉦穐牋萎� 牋�牋鉦旭牘�牋÷���牋�� 牋�亜牋逗�牘� 牋�牘�牋��牋÷或. "
 
 #: src/protocols/jabber/buddy.c:569
@@ -5973,8 +5973,8 @@
 msgstr "牋� 牋�牘�牋萎或牋�牋�或 牋項�牋謹握牘�牋迦姶牘�牋�� 牋�牋��牋劇姶牋迦�. 牋��牋萎� 牋伍�牋む�牋��牋む或牋�牋萎握牋�或 牋〝鮎牋朽或牋�牋�牋逗姶 牋伍握牋鉦�牋鉦旭牋鉦姶牘�牋�或 牋��牋�牋萎� 牋�牘�牋��牋÷或. "
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -6052,7 +6052,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -6071,7 +6071,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "牋�-牋��牋�或牋迦� 牋�牋÷�牋萎宛牘���牋む� 牋�或牋む�牋萎�牋�或 牋�牋��牋�牘�牋��牋÷或. "
 
 #: src/protocols/jabber/buddy.c:1370
@@ -6197,8 +6197,8 @@
 msgstr "牋伍鮎牋�牘�牋�牘���牋�� 牋伍�牋劇�牋�牋逗�牋�牋迦�牋��. "
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "牋朽或牋迦�牋朽芦牘�牋�或 Jabber ID."
+msgid "Invalid XMPP ID"
+msgstr "牋朽或牋迦�牋朽芦牘�牋�或 XMPP ID."
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6248,7 +6248,7 @@
 msgstr "牋�� 牋�牘�牋む�牋� 牋�牋鉦阿牋鉦姶牘� 牋萎�牋�牋逗宛牘�牋�牋萎� 牋�牘�牋�亜牋鉦姶牋逗�牋� 牋� 牋�牘�牋萎或牋�牋� 牋伍握牋鉦�牋鉦旭牋鉦姶牘�牋�或 牋��牋萎或牋�牋�牋�牋÷或."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
+msgid "Register New XMPP Account"
 msgstr "牋�牘�牋む�牋� 牋�牋鉦穐牋萎� 牋��牘�牋�牋�牘���牋�� 牋萎或牋�牋逗宛牘�牋�牋萎� 牋�牘�牋��牋÷或."
 
 #: src/protocols/jabber/jabber.c:842
@@ -6321,8 +6321,8 @@
 msgstr "牋�鮎牋伍���牋朽旭牘�牋≠�� (牋�旭牘�牋伍鮎牋萎或)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Jabber 牋�鮎牋伍���牋朽旭牘�牋÷���牋�� 牋�鮎牋萎�牋�牘�牋��."
+msgid "Change XMPP Password"
+msgstr "XMPP 牋�鮎牋伍���牋朽旭牘�牋÷���牋�� 牋�鮎牋萎�牋�牘�牋��."
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6372,8 +6372,8 @@
 msgstr "牋�牋�牋�� 牋��牋萎�牋迦�牋��. "
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Malformed XMPP ID"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6636,8 +6636,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protocol Plugin"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6687,8 +6687,8 @@
 msgstr "%s 牋�牘� 牋伍�牋��牋謹� 牋��牋�亜牋� 牋朽或牋�芦牋��牋�牋�或: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber Message 牋��牋萎葵牋鉦�牘�."
+msgid "XMPP Message Error"
+msgstr "XMPP Message 牋��牋萎葵牋鉦�牘�."
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12476,7 +12476,7 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "牋朽或牋迦�牋朽芦牘�牋�或 牋�牋�姶牋鉦握牋�."
 
-#~ msgid "Jabber Profile"
+#~ msgid "XMPP Profile"
 #~ msgstr "牋�牋鉦穐牋萎� 牋��牋迦�"
 
 #~ msgid "Roomlist Error"
--- a/po/th.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/th.po	Tue May 01 05:53:57 2007 +0000
@@ -1204,7 +1204,7 @@
 #: ../plugins/psychic.c:24
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../plugins/psychic.c:60
@@ -1233,7 +1233,7 @@
 
 #: ../plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -3228,7 +3228,7 @@
 msgstr ""
 
 #: ../src/gtkdialogs.c:101
-msgid "Jabber developer"
+msgid "XMPP developer"
 msgstr ""
 
 #: ../src/gtkdialogs.c:102
@@ -3429,7 +3429,7 @@
 #: ../src/gtkdialogs.c:261
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
 "and Gadu-Gadu 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 "
@@ -6352,8 +6352,8 @@
 msgstr "廃項《�"
 
 #: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "瓠蜆� Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "瓠蜆� XMPP vCard"
 
 #: ../src/protocols/jabber/buddy.c:569
 msgid ""
@@ -6451,7 +6451,7 @@
 msgstr ""
 
 #: ../src/protocols/jabber/buddy.c:1392
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr "|諭∫輿拇燹寤打}瑳揄礫薹寤級友〈辰藕牧"
 
 #: ../src/protocols/jabber/buddy.c:1411 ../src/protocols/novell/novell.c:1490
@@ -6460,8 +6460,8 @@
 msgstr "荊萢泰萢它租"
 
 #: ../src/protocols/jabber/buddy.c:1420 ../src/protocols/jabber/buddy.c:1421
-msgid "Search for Jabber users"
-msgstr "ら綱匱揄礫� Jabber"
+msgid "Search for XMPP users"
+msgstr "ら綱匱揄礫� XMPP"
 
 #: ../src/protocols/jabber/buddy.c:1435
 msgid "Invalid Directory"
@@ -6582,7 +6582,7 @@
 msgstr ""
 
 #: ../src/protocols/jabber/jabber.c:520 ../src/protocols/jabber/jabber.c:857
-msgid "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
 msgstr ""
 
 #: ../src/protocols/jabber/jabber.c:590
@@ -6629,8 +6629,8 @@
 msgstr "|愕辧値、虱匝塔后卉擢経犧嫗杭儉�邪蜒�稻争"
 
 #: ../src/protocols/jabber/jabber.c:821 ../src/protocols/jabber/jabber.c:822
-msgid "Register New Jabber Account"
-msgstr "擢経犧嫗梗揄礫� Jabber 稻争"
+msgid "Register New XMPP Account"
+msgstr "擢経犧嫗梗揄礫� XMPP 稻争"
 
 #: ../src/protocols/jabber/jabber.c:983
 msgid "Initializing Stream"
@@ -6693,8 +6693,8 @@
 msgstr "男冓取匚 (��)"
 
 #: ../src/protocols/jabber/jabber.c:1317 ../src/protocols/jabber/jabber.c:1318
-msgid "Change Jabber Password"
-msgstr "犹鍍菎甲朴兵菻� Jabber"
+msgid "Change XMPP Password"
+msgstr "犹鍍菎甲朴兵菻� XMPP"
 
 #: ../src/protocols/jabber/jabber.c:1318
 msgid "Please enter your new password"
@@ -6745,7 +6745,7 @@
 msgstr ""
 
 #: ../src/protocols/jabber/jabber.c:1428
-msgid "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
 msgstr ""
 
 #: ../src/protocols/jabber/jabber.c:1430
@@ -7006,8 +7006,8 @@
 #. *  summary
 #. *  description
 #: ../src/protocols/jabber/jabber.c:1883 ../src/protocols/jabber/jabber.c:1885
-msgid "Jabber Protocol Plugin"
-msgstr "仕刳〕垤 Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "仕刳〕垤 XMPP"
 
 #: ../src/protocols/jabber/jabber.c:1911
 msgid "Use TLS if available"
@@ -7055,7 +7055,7 @@
 msgstr ""
 
 #: ../src/protocols/jabber/message.c:227
-msgid "Jabber Message Error"
+msgid "XMPP Message Error"
 msgstr ""
 
 #: ../src/protocols/jabber/message.c:295
--- a/po/tr.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/tr.po	Tue May 01 05:53:57 2007 +0000
@@ -829,7 +829,7 @@
 msgstr ""
 
 #: plugins/raw.c:154
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+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 ""
 
 #: plugins/relnot.c:63
@@ -2833,8 +2833,8 @@
 msgstr "libfaim bak�mc�s�"
 
 #: src/gtkdialogs.c:92
-msgid "Jabber developer"
-msgstr "Jabber geli�tiricisi"
+msgid "XMPP developer"
+msgstr "XMPP geli�tiricisi"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -3022,8 +3022,8 @@
 msgstr "Gaim Hakk�nda"
 
 #: src/gtkdialogs.c:226
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
-msgstr "Gaim; AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu hesaplar�n�za ayn� anda ba�lanman�z� sa�layan mod�ler bir mesaj program�d�r. GTK+ kullan�larak yaz�lm� olup GNU GPL lisans� alt�ndad�r.<BR><BR>"
+msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
+msgstr "Gaim; AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu hesaplar�n�za ayn� anda ba�lanman�z� sa�layan mod�ler bir mesaj program�d�r. GTK+ kullan�larak yaz�lm� olup GNU GPL lisans� alt�ndad�r.<BR><BR>"
 
 #: src/gtkdialogs.c:235
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
@@ -5717,7 +5717,7 @@
 
 #: src/protocols/jabber/buddy.c:567
 #: src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
 msgstr "VCard Dosyas�n� D�zenle"
 
 #: src/protocols/jabber/buddy.c:569
@@ -5725,8 +5725,8 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642
 #: src/protocols/jabber/jabber.c:1711
@@ -5814,7 +5814,7 @@
 msgstr "Arama sonu�lar�n�z"
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331
@@ -5836,8 +5836,8 @@
 
 #: src/protocols/jabber/buddy.c:1355
 #: src/protocols/jabber/buddy.c:1356
-msgid "Search for Jabber users"
-msgstr "Jabber kullan�c�lar� ara"
+msgid "Search for XMPP users"
+msgstr "XMPP kullan�c�lar� ara"
 
 #: src/protocols/jabber/buddy.c:1370
 msgid "Invalid Directory"
@@ -5966,8 +5966,8 @@
 
 #: src/protocols/jabber/jabber.c:403
 #: src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "Ge�ersiz Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Ge�ersiz XMPP ID"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6021,8 +6021,8 @@
 
 #: src/protocols/jabber/jabber.c:704
 #: src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "Yeni Jabber Hesab� Olu�tur"
+msgid "Register New XMPP Account"
+msgstr "Yeni XMPP Hesab� Olu�tur"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6102,8 +6102,8 @@
 
 #: src/protocols/jabber/jabber.c:1160
 #: src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Jabber �ifresini De�i�tir"
+msgid "Change XMPP Password"
+msgstr "XMPP �ifresini De�i�tir"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6155,8 +6155,8 @@
 msgstr "Nesne Bulunamad�"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Malformed XMPP ID"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6399,8 +6399,8 @@
 #. *  description
 #: src/protocols/jabber/jabber.c:1686
 #: src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protokol Eklentisi"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protokol Eklentisi"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6449,8 +6449,8 @@
 msgstr "%s i�in mesaj g�nderimi ba�ar�s�z: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber Mesaj Hatas�"
+msgid "XMPP Message Error"
+msgstr "XMPP Mesaj Hatas�"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -11498,8 +11498,8 @@
 #, fuzzy
 #~ msgid "Invalid nickname"
 #~ msgstr "Ge�ersiz Kullan�c� Ad�"
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber Profili"
+#~ msgid "XMPP Profile"
+#~ msgstr "XMPP Profili"
 #~ msgid "Roomlist Error"
 #~ msgstr "Oda Listesi Hatas�"
 #~ msgid "Logged out"
--- a/po/uk.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/uk.po	Tue May 01 05:53:57 2007 +0000
@@ -857,11 +857,11 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "�仂亰于仂仍�� 仆舒亟��仍舒�亳 仆亠仂弍�仂弍仍亠仆亳亶 于于�亟, 于亳从仂�亳��仂于���亳 仗�仂�仂从仂仍亳 仆舒 仂�仆仂于� "
-"�亠从��� (Jabber, MSN, IRC, TOC). �仍� 仆舒亟�亳仍舒仆仆� 仆舒�亳�仆��� �nter � 仂弍仍舒��� "
+"�亠从��� (XMPP, MSN, IRC, TOC). �仍� 仆舒亟�亳仍舒仆仆� 仆舒�亳�仆��� �nter � 仂弍仍舒��� "
 "于于仂亟�. 弌仍�亟从�亶�亠 亰舒 于�从仆仂仄 仆舒仍舒亞仂亟亢亠仆仆�."
 
 #: plugins/relnot.c:63
@@ -2831,8 +2831,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "仗仂仗亠�亠亟仆�亶 �仂亰�仂弍仆亳从 Jabber"
+msgid "XMPP developer"
+msgstr "仗仂仗亠�亠亟仆�亶 �仂亰�仂弍仆亳从 XMPP"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -3004,11 +3004,11 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "GaimGaim - 仄仂亟�仍�仆亳亶 从仍��仆� 仂弍仄�仆� 仗仂于�亟仂仄仍亠仆仆�仄亳, �仂 亟仂亰于仂仍�� "
-"于亳从仂�亳��仂于�于舒�亳 AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, "
+"于亳从仂�亳��仂于�于舒�亳 AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, "
 "Napster, Zephyr, �舒 Gadu-Gadu 仂亟�舒亰�.  ��仆 仆舒仗亳�舒仆亳亶 亰 于亳从仂�亳��舒仆仆�仄 Gtk+ �舒 "
 "仗仂�亳������� 仆舒 �仄仂于舒� GPL.<BR><BR>"
 
@@ -5017,7 +5017,7 @@
 #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "�舒�亠�����于舒�亳 仆仂于亳亶 仂弍仍�从仂于亳亶 亰舒仗亳� Jabber"
+msgstr "�舒�亠�����于舒�亳 仆仂于亳亶 仂弍仍�从仂于亳亶 亰舒仗亳� XMPP"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
@@ -5744,8 +5744,8 @@
 msgstr "�亠仆� 仆舒�仂亟亢亠仆仆�"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "�仄�仆亳�亳 从舒��从� Jabber "
+msgid "Edit XMPP vCard"
+msgstr "�仄�仆亳�亳 从舒��从� XMPP "
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5754,8 +5754,8 @@
 msgstr "��� 仆舒���仗仆� 亠仍亠仄亠仆�亳 � 仆亠仂弍仂于'�亰从仂于亳仄亳. �舒仗仂于仆�亶�亠 仆舒 于仍舒�仆亳亶 �仂亰��亟."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5833,7 +5833,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5852,7 +5852,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "丿�从舒�亳 从仂�亳���于舒�舒 亰舒 舒亟�亠�仂� 亠仍.仗仂��亳"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5978,8 +5978,8 @@
 msgstr "�亠 于亟舒����� ��于仂�亳�亳 �仂从亠�"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "�亠仗�舒于亳仍�仆亳亶 Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "�亠仗�舒于亳仍�仆亳亶 XMPP ID"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6025,8 +6025,8 @@
 msgstr "�舒仗仂于仆��� 仆舒���仗仆� 仗仂仍� 亟仍� �亠����舒��� 仆仂于仂亞仂 仂弍仍�从仂于仂亞仂 亰舒仗亳��."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "�舒�亠�����于舒�亳 仆仂于亳亶 仂弍仍�从仂于亳亶 亰舒仗亳� Jabber"
+msgid "Register New XMPP Account"
+msgstr "�舒�亠�����于舒�亳 仆仂于亳亶 仂弍仍�从仂于亳亶 亰舒仗亳� XMPP"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6098,8 +6098,8 @@
 msgstr "�舒�仂仍� (�亠 �舒亰)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "�仄�仆亳�亳 仗舒�仂仍� Jabber"
+msgid "Change XMPP Password"
+msgstr "�仄�仆亳�亳 仗舒�仂仍� XMPP"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6149,8 +6149,8 @@
 msgstr "�仍亠仄亠仆� 仆亠 亰仆舒亶亟亠仆仂"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "�亠仗�舒于亳仍�仆亳亶 Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "�亠仗�舒于亳仍�仆亳亶 XMPP ID"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6397,8 +6397,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "�仂亟�仍� 仗�仂�仂从仂仍� Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "�仂亟�仍� 仗�仂�仂从仂仍� XMPP"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6448,8 +6448,8 @@
 msgstr "�亠 于亟舒����� 亟仂��舒于亳�亳 仗仂于�亟仂仄仍亠仆仆� 亟仍� %s: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "�仂仄亳仍从舒 仗仂于�亟仂仄仍亠仆仆� Jabber"
+msgid "XMPP Message Error"
+msgstr "�仂仄亳仍从舒 仗仂于�亟仂仄仍亠仆仆� XMPP"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12252,8 +12252,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "�亠仗�舒于亳仍�仆亠 仗��亰于亳��从仂"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "��仂��仍� Jabber"
+#~ msgid "XMPP Profile"
+#~ msgstr "��仂��仍� XMPP"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "�仂仄亳仍从舒 �仗亳�从� 从�仄仆舒�"
--- a/po/vi.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/vi.po	Tue May 01 05:53:57 2007 +0000
@@ -871,10 +871,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"�畛� b畉�n g畛�i d畛� li畛�u nh畉�p �畉�n giao th畛�c d畛�a tr棚n v�n b畉�n (Jabber, MSN, IRC, "
+"�畛� b畉�n g畛�i d畛� li畛�u nh畉�p �畉�n giao th畛�c d畛�a tr棚n v�n b畉�n (XMPP, MSN, IRC, "
 "TOC). Nh畉�n 'Enter' trong h畛�p nh畉�p �畛� g畛�i �i. Theo d探i c畛�a s畛� g畛� r畛�i."
 
 #: plugins/relnot.c:63
@@ -2845,8 +2845,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "ng動畛�i l畉�p tr狸nh Jabber tr動畛�c �但y"
+msgid "XMPP developer"
+msgstr "ng動畛�i l畉�p tr狸nh XMPP tr動畛�c �但y"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -3022,11 +3022,11 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim l� tr狸nh kh叩ch nh畉�n tin c坦 kh畉� n�ng s畛� d畛�ng AIM, ICQ, Yahoo!, MSN, IRC, "
-"Jabber, Napster, Zephyr, v� Gadu-Gadu. Gaim s畛� d畛�ng Gtk+ v� ��ng k箪 theo GPL."
+"XMPP, Napster, Zephyr, v� Gadu-Gadu. Gaim s畛� d畛�ng Gtk+ v� ��ng k箪 theo GPL."
 "<BR><BR>"
 
 #: src/gtkdialogs.c:235
@@ -5058,7 +5058,7 @@
 #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "��ng k箪 t�i kho畉�n Jabber m畛�i"
+msgstr "��ng k箪 t�i kho畉�n XMPP m畛�i"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
@@ -5745,8 +5745,8 @@
 msgstr "Ng�y sinh"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "So畉�n Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "So畉�n XMPP vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5755,8 +5755,8 @@
 msgstr "M畛�i m畛�c b棚n d動畛�i l� t湛y ch畛�n. Ch畛� nh畉�p th担ng tin b畉�n th畉�y c畉�n thi畉�t."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5834,7 +5834,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5853,7 +5853,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "T狸m ki畉�m buddy b畉�ng �畛�a ch畛� e-mail"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5982,8 +5982,8 @@
 msgstr "Kh担ng t畉�o �動畛�c socket"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "ID Jabber kh担ng h畛�p l畛�"
+msgid "Invalid XMPP ID"
+msgstr "ID XMPP kh担ng h畛�p l畛�"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6029,8 +6029,8 @@
 msgstr "H達y �i畛�n th担ng tin b棚n d動畛�i �畛� ��ng k箪 t�i kho畉�n m畛�i cho b畉�n."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "��ng k箪 t�i kho畉�n Jabber m畛�i"
+msgid "Register New XMPP Account"
+msgstr "��ng k箪 t�i kho畉�n XMPP m畛�i"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6107,8 +6107,8 @@
 msgstr "Nh畉�p l畉�i m畉�t kh畉�u"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "�畛�i m畉�t kh畉�u Jabber"
+msgid "Change XMPP Password"
+msgstr "�畛�i m畉�t kh畉�u XMPP"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6162,8 +6162,8 @@
 
 #: src/protocols/jabber/jabber.c:1271
 #, fuzzy
-msgid "Malformed Jabber ID"
-msgstr "ID Jabber kh担ng h畛�p l畛�"
+msgid "Malformed XMPP ID"
+msgstr "ID XMPP kh担ng h畛�p l畛�"
 
 #: src/protocols/jabber/jabber.c:1273
 #, fuzzy
@@ -6421,8 +6421,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Plugin giao th畛�c Jabber"
+msgid "XMPP Protocol Plugin"
+msgstr "Plugin giao th畛�c XMPP"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6472,8 +6472,8 @@
 msgstr "Kh担ng g畛�i �動畛�c th担ng �i畛�p t畛�i %s: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "L畛�i Th担ng �i畛�p Jabber"
+msgid "XMPP Message Error"
+msgstr "L畛�i Th担ng �i畛�p XMPP"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12229,8 +12229,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "T棚n ng動畛�i d湛ng kh担ng h畛�p l畛�"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "L箪 l畛�ch Jabber"
+#~ msgid "XMPP Profile"
+#~ msgstr "L箪 l畛�ch XMPP"
 
 #, fuzzy
 #~ msgid "Roomlist Error"
--- a/po/xh.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/xh.po	Tue May 01 05:53:57 2007 +0000
@@ -859,11 +859,11 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
 "Ikwenza uthumele ungeniso kwiiprothokholi ezingalungiswanga ezisekwe "
-"kumbhalo (Jabber, MSN, IRC, TOC). Cofa u-'Enter' kwibhokisi lokuqalisa "
+"kumbhalo (XMPP, MSN, IRC, TOC). Cofa u-'Enter' kwibhokisi lokuqalisa "
 "ukuthumela. Jonga ifestile yokulungisa isiphene."
 
 #: plugins/relnot.c:63
@@ -2839,8 +2839,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "umphuhlisi wangaphambili weJabber"
+msgid "XMPP developer"
+msgstr "umphuhlisi wangaphambili weXMPP"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -3013,11 +3013,11 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "I-Gaim ngumxhasi omiselweyo wemiyalezo okwaziyo ukusebenzisa iAIM, iMSN, "
-"iYahoo!, iJabber, iICQ, iSILC, iNovell GroupWise, iNapster, iZephyr, neGadu-"
+"iYahoo!, iXMPP, iICQ, iSILC, iNovell GroupWise, iNapster, iZephyr, neGadu-"
 "Gadu zonke ngexexha elinye.  Ibhalwa kusetyenziswa iGtk+ yaye inelayisensi "
 "ngaphantsi kweGPL.<BR><BR>"
 
@@ -5024,7 +5024,7 @@
 #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "Bhalisa i-Akhawunti eNtsha yeJabber"
+msgstr "Bhalisa i-Akhawunti eNtsha yeXMPP"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
@@ -5757,8 +5757,8 @@
 msgstr "Umhla wokuZalwa"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Hlela i-Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Hlela i-XMPP vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5769,8 +5769,8 @@
 "ukhululekile ngalo."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "ISazizi seJabber"
+msgid "XMPP ID"
+msgstr "ISazizi seXMPP"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5848,7 +5848,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5867,7 +5867,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "Zingela umhlobo ngedilesi ye-imeyile"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5993,8 +5993,8 @@
 msgstr "Akukwazeki ukuyila isokethi"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "ISazisi esingasebenziyo seJabber"
+msgid "Invalid XMPP ID"
+msgstr "ISazisi esingasebenziyo seXMPP"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6040,8 +6040,8 @@
 msgstr "Nceda uzalise ulwazi ngezantsi ukubhalisa i-akhawunti yakho entsha."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "Bhalisa i-Akhawunti eNtsha yeJabber"
+msgid "Register New XMPP Account"
+msgstr "Bhalisa i-Akhawunti eNtsha yeXMPP"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6113,8 +6113,8 @@
 msgstr "I-Password (kwakhona)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Tshintsha i-password yeJabber"
+msgid "Change XMPP Password"
+msgstr "Tshintsha i-password yeXMPP"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6164,8 +6164,8 @@
 msgstr "Into ayiFunyanwanga"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "Isazisi seJabber esakheke kakubi"
+msgid "Malformed XMPP ID"
+msgstr "Isazisi seXMPP esakheke kakubi"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6412,8 +6412,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "ImiThetho yokuSebenza yokuNgenisa iJabber"
+msgid "XMPP Protocol Plugin"
+msgstr "ImiThetho yokuSebenza yokuNgenisa iXMPP"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6463,8 +6463,8 @@
 msgstr "Akuphumelelekanga ukunikela %s yomyalezo: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "ImPazamo yoMyalezo weJabber"
+msgid "XMPP Message Error"
+msgstr "ImPazamo yoMyalezo weXMPP"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12287,8 +12287,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "IGama lomSebenzisi elingaSebenziyo"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Inkangeleko yeJabber"
+#~ msgid "XMPP Profile"
+#~ msgstr "Inkangeleko yeXMPP"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Impazamo yoLuhlu lweGumbi"
--- a/po/zh_CN.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/zh_CN.po	Tue May 01 05:53:57 2007 +0000
@@ -2275,8 +2275,8 @@
 msgstr "薨�絎√��筝�絮�薊怨���綺�[lazy bum]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber 綣�����"
+msgid "XMPP developer"
+msgstr "XMPP 綣�����"
 
 #: ../gtk/gtkdialogs.c:109
 msgid "original author"
@@ -2509,7 +2509,7 @@
 #: ../gtk/gtkdialogs.c:335
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
 "Bonjour, Zephyr, 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' "
@@ -5048,10 +5048,10 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"��莅御���莨��ュ��桁���膸��坂��������顒�(Jabber鐚�MSN鐚�IRC鐚�TOC)������ユ�筝㊥����莉�"
+"��莅御���莨��ュ��桁���膸��坂��������顒�(XMPP鐚�MSN鐚�IRC鐚�TOC)������ユ�筝㊥����莉�"
 "���札����������莪�莚�腦��c��"
 
 #: ../gtk/plugins/relnot.c:69
@@ -6621,7 +6621,7 @@
 #: ../libgaim/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -6871,8 +6871,8 @@
 msgstr "AIM 茣���"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Jabber 茣���"
+msgid "XMPP Account"
+msgstr "XMPP 茣���"
 
 #: ../libgaim/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -7002,7 +7002,7 @@
 #: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "羈����亥�� Jabber 茣���"
+msgstr "羈����亥�� XMPP 茣���"
 
 #: ../libgaim/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
@@ -7959,8 +7959,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:582
 #: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "膽�莨� Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "膽�莨� XMPP vCard"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8073,7 +8073,7 @@
 msgid "The following are the results of your search"
 msgstr "筝��∽������膣∝��膸���"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libgaim/protocols/jabber/buddy.c:1667
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -8096,7 +8096,7 @@
 msgstr "���≦����篁わ�%s"
 
 #: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:1749
@@ -8108,8 +8108,8 @@
 
 #: ../libgaim/protocols/jabber/buddy.c:1758
 #: ../libgaim/protocols/jabber/buddy.c:1759
-msgid "Search for Jabber users"
-msgstr "��膣� Jabber ����"
+msgid "Search for XMPP users"
+msgstr "��膣� XMPP ����"
 
 #: ../libgaim/protocols/jabber/buddy.c:1773
 msgid "Invalid Directory"
@@ -8238,8 +8238,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:552
 #: ../libgaim/protocols/jabber/jabber.c:895
-msgid "Invalid Jabber ID"
-msgstr "������ Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "������ XMPP ID"
 
 #: ../libgaim/protocols/jabber/jabber.c:623
 #, c-format
@@ -8292,8 +8292,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:858
 #: ../libgaim/protocols/jabber/jabber.c:859
-msgid "Register New Jabber Account"
-msgstr "羈����亥�� Jabber 茣���"
+msgid "Register New XMPP Account"
+msgstr "羈����亥�� XMPP 茣���"
 
 #: ../libgaim/protocols/jabber/jabber.c:1025
 msgid "Initializing Stream"
@@ -8356,8 +8356,8 @@
 
 #: ../libgaim/protocols/jabber/jabber.c:1362
 #: ../libgaim/protocols/jabber/jabber.c:1363
-msgid "Change Jabber Password"
-msgstr "�贋�� Jabber 絲���"
+msgid "Change XMPP Password"
+msgstr "�贋�� XMPP 絲���"
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
 msgid "Please enter your new password"
@@ -8411,8 +8411,8 @@
 msgstr "蕁合�����上��"
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed Jabber ID"
-msgstr "Jabber ID �弱���莚�"
+msgid "Malformed XMPP ID"
+msgstr "XMPP ID �弱���莚�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1475
 msgid "Not Acceptable"
@@ -8674,8 +8674,8 @@
 #. *  description
 #: ../libgaim/protocols/jabber/jabber.c:1962
 #: ../libgaim/protocols/jabber/jabber.c:1964
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber �顒��篁�"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP �顒��篁�"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 msgid "Force old (port 5223) SSL"
@@ -8717,8 +8717,8 @@
 msgstr "������ %s ��羔���け茣�: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Jabber 羔�����莚�"
+msgid "XMPP Message Error"
+msgstr "XMPP 羔�����莚�"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/zh_HK.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/zh_HK.po	Tue May 01 05:53:57 2007 +0000
@@ -930,7 +930,7 @@
 msgstr "���九�育�灸散鐚�"
 
 # FIXME check - 20061025
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From"
 msgstr "綏画�茘�絨���"
@@ -2832,9 +2832,9 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"絨��剛���紮�����困茫�鐚�絨援��恰����篋よ�荀�腦��������� AIM��ICQ��Jabber��Sametime �� "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"絨��剛���紮�����困茫�鐚�絨援��恰����篋よ�荀�腦��������� AIM��ICQ��XMPP��Sametime �� "
 "Yahoo��"
 
 #: ../libpurple/plugins/psychic.c:66
@@ -3113,8 +3113,8 @@
 msgstr "AIM 絽活��"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber 絽活��"
+msgid "XMPP Account"
+msgstr "XMPP 絽活��"
 
 # NOTE ������荐���絎���腮縁�筝������顄�
 #: ../libpurple/protocols/bonjour/bonjour.h:35
@@ -3613,7 +3613,7 @@
 msgstr "�≧��e�遺失����"
 
 # FIXME ambiguous - 20061025
-# NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
+# NOTE XMPP ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX ��罩g����������≧��g��活�茘���������腴��羣���鐚�筝������g�紊掩����鐚�荀�筝�����腴�鐚�
 #: ../libpurple/protocols/irc/irc.c:424
@@ -4302,8 +4302,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "膩�鹿 Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "膩�鹿 XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4324,7 +4324,7 @@
 
 # TODO Untranslated
 # NOTE 茘������� by Ambrose
-# NOTE Jabber ��絎�����Resource��筝�荅���絽娯���筝�腮�戎���������絖�筝駕�
+# NOTE XMPP ��絎�����Resource��筝�荅���絽娯���筝�腮�戎���������絖�筝駕�
 # NOTE ��札茵�ず������井�劫�����糸�ヤ�����綵≫�鐚�������絲����臀�
 # NOTE 荀� http://www.jabber.org/user/userguide.html
 #: ../libpurple/protocols/jabber/buddy.c:668
@@ -4387,7 +4387,7 @@
 msgid "(Re-)Request authorization"
 msgstr "荀�羆������域�羆�茯�茘�"
 
-# NOTE Jabber��絎�����Subscribe��筝�荅�箙������ュソ�������������
+# NOTE XMPP��鎘�����Subscribe��筝�荅�箙������ュソ�������������
 # NOTE 頳� http://www.jabber.org/user/userguide.html
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
@@ -4427,7 +4427,7 @@
 msgid "The following are the results of your search"
 msgstr "篁ヤ��堺��絨�腟���"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4452,8 +4452,8 @@
 msgstr "篌堺������篁わ�%s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "紂��ヤ�����紊���罨�篏�鐚�篁ユ��絨�Jabber篏睡������"
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "紂��ヤ�����紊���罨�篏�鐚�篁ユ��絨�XMPP篏睡������"
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4464,8 +4464,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "��絨�Jabber篏睡����"
+msgid "Search for XMPP users"
+msgstr "��絨�XMPP篏睡����"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4618,8 +4618,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Jabber 絽活���≧��"
+msgid "Invalid XMPP ID"
+msgstr "XMPP 絽活���≧��"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4673,8 +4673,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "荐糸���亥�� Jabber 絽恰��"
+msgid "Register New XMPP Account"
+msgstr "荐糸���亥�� XMPP 絽恰��"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4712,17 +4712,17 @@
 msgid "Both"
 msgstr "綏俄��梧�茘�"
 
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "From (To pending)"
 msgstr "綏画�茘�絨��刻�篏�篁�膈�緇�絨��壕�茘����"
 
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "To"
 msgstr "綏牙�峨��壕�茘�"
 
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "None (To pending)"
 msgstr "�¥�篏�罩g�緇�絨��壕�茘����"
@@ -4733,7 +4733,7 @@
 msgid "None"
 msgstr "��"
 
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Subscription"
 msgstr "茯�茘�����"
@@ -4757,8 +4757,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "篆��� Jabber 絲�腆�"
+msgid "Change XMPP Password"
+msgstr "篆��� XMPP 絲�腆�"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4787,7 +4787,7 @@
 msgid "Bad Request"
 msgstr "�渇��膓峨�����主��篋�筝��������"
 
-#  NOTE Jabber ��� <conflict/>鐚�茵�ず綏臥�����鋇���腮掩������筝�篏���鐚�篁ョ�後���� Resource
+#  NOTE XMPP ��� <conflict/>鐚�茵�ず綏臥�����鋇���腮掩������筝�篏���鐚�篁ョ�後���� Resource
 #  NOTE鐚�紊ф�篆����糸�ョ����篏睡�������絖�筝駕���綏ヤ�����糸�ワ�篁ヨ�雁�≧�絖���
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 茘����翫�� by Ambrose
@@ -4799,13 +4799,13 @@
 msgid "Feature Not Implemented"
 msgstr "荅峨���遵����篏�"
 
-#  NOTE Jabber ��� <forbidden/>鐚����閫e幻鐚�茵�ず罨���筝�紊�鐚�
+#  NOTE XMPP ��� <forbidden/>鐚����閫e幻鐚�茵�ず罨���筝�紊�鐚�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Forbidden"
 msgstr "罨���筝�紊�"
 
-#  NOTE Jabber ��� <gone/>鐚�茵�ず篏睡������篌堺�����丞�筝�膩�鐚�緇�箴��≫�膩�
+#  NOTE XMPP ��� <gone/>鐚�茵�ず篏睡������篌堺�����丞�筝�膩�鐚�緇�箴��≫�膩�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Gone"
@@ -4821,10 +4821,10 @@
 msgstr "�������上��"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "�後���� Jabber ID"
-
-#  NOTE Jabber ��� <not-acceptable/>鐚�茵�ず�����榊��荀�羆����初���遺失�������銀散篋堺��荐�筝���
+msgid "Malformed XMPP ID"
+msgstr "�後���� XMPP ID"
+
+#  NOTE XMPP ��� <not-acceptable/>鐚�茵�ず�����榊��荀�羆����初���遺失�������銀散篋堺��荐�筝���
 #  NOTE 罌�篁駈�箴�絋�荐���賢����胼�絖�鐚�鐚�篁ヨ�雁�≧�絖���
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #: ../libpurple/protocols/jabber/jabber.c:1483
@@ -4839,7 +4839,7 @@
 msgid "Payment Required"
 msgstr "綽���篁�罨�"
 
-#  NOTE Jabber ��� <recipient-unavailable/>
+#  NOTE XMPP ��� <recipient-unavailable/>
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE�������≧���機����荅我���筝�絖���������
 #  NOTE 茘����翫�� by Ambrose
@@ -4863,14 +4863,14 @@
 msgid "Server Overloaded"
 msgstr "篌堺�����莠�"
 
-#  NOTE Jabber ��� <service-unavailable/>鐚�茵�ず篌堺�����九�遺����靸��������篁�
+#  NOTE XMPP ��� <service-unavailable/>鐚�茵�ず篌堺�����九�遺����靸��������篁�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 茘����翫�� by Ambrose
 #: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Service Unavailable"
 msgstr "筝���箴�荅臥������"
 
-#  NOTE Jabber ��� <subscription-required/>鐚�茵�ず篏睡������������
+#  NOTE XMPP ��� <subscription-required/>鐚�茵�ず篏睡������������
 #  NOTE 綽���篋�����緇���Subscription��鐚�茯�茘�鐚�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #: ../libpurple/protocols/jabber/jabber.c:1505
@@ -4919,10 +4919,10 @@
 msgstr "�≧���� Namespace Prefix"
 
 # FIXME 緇�筝�����鐚�茘�����緇��拷��
-# NOTE Jabber ��絎�����Resource��筝�荅��坂戎���������筝�腮��筝駕�
+# NOTE XMPP ��絎�����Resource��筝�荅��坂戎���������筝�腮��筝駕�
 # NOTE 茵�ず������井�劫�����糸�ヤ�����綵≫�鐚�������絲����臀�
 # NOTE 荀� http://www.jabber.org/user/userguide.html
-# NOTE Jabber ��絎�筝� Stanza Error ��筝�腮���� <conflict/>
+# NOTE XMPP ��絎�筝� Stanza Error ��筝�腮���� <conflict/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1544
 msgid "Resource Conflict"
@@ -4933,13 +4933,13 @@
 msgid "Connection Timeout"
 msgstr "�g�綏臥�丈��"
 
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <host-gone/>
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <host-gone/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Host Gone"
 msgstr "篌堺����群筝�����吚��腟����篌堺������腮�"
 
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <host-unknown/>
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <host-unknown/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Host Unknown"
@@ -4963,45 +4963,45 @@
 msgstr "�≧���� XML"
 
 # XXX ������⑮鐚�茘�����緇��拷��
-# NOTE Jabber ��絎�筝㊦����nonmatching-hosts��
+# NOTE XMPP ��絎�筝㊦����nonmatching-hosts��
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Non-matching Hosts"
 msgstr "筝紙���腮延��娯�"
 
 # XXX ������⑮鐚�茘�����緇��拷�蚊��筝���ソ�������鋋咲��罔e�鐚�紊ф�羃���紊�ぇ���馹�
-# NOTE Jabber ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <policy-violation/>
+# NOTE XMPP ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <policy-violation/>
 # NOTE 荀� http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
 #: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Policy Violation"
 msgstr "����篋������睡�"
 
-# NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
+# NOTE XMPP ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Remote Connection Failed"
 msgstr "�≧��g��活�茘���������腴��羣�"
 
-# NOTE Jabber ��絎� Stream Error ��筝�腮���� <resource-constraint/>
+# NOTE XMPP ��絎� Stream Error ��筝�腮���� <resource-constraint/>
 # NOTE ����茖�� Resource 鋇�荅����糸�ユ��篏睡���������� Resource 筝�荅��靸�研筝��後��
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1570
 msgid "Resource Constraint"
 msgstr "篌堺�����羣��㊦失"
 
-# NOTE Jabber ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <restricted-xml/>
+# NOTE XMPP ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <restricted-xml/>
 # NOTE 荀� http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
 #: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Restricted XML"
-msgstr "XML 筝㊤����� Jabber ��絎�筝�絎壕┗�� XML ��膣�"
-
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <see-other-host/>
+msgstr "XML 筝㊤����� XMPP ��絎�筝�絎壕┗�� XML ��膣�"
+
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <see-other-host/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "See Other Host"
 msgstr "篌堺�������茘�����荀�羆�篋����医����喝Ί�篌堺����"
 
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <system-shutdown/>
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <system-shutdown/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "System Shutdown"
@@ -5017,13 +5017,13 @@
 msgid "Unsupported Encoding"
 msgstr "篌堺�������吡畿絎���絖���膩�⊆"
 
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-stanza-type/>
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <unsupported-stanza-type/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
 #: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Unsupported Stanza Type"
 msgstr "篌堺�������吡畿絎���罧笈�初��� (Stanza Type)"
 
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-version/>
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <unsupported-version/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
 #: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Unsupported Version"
@@ -5144,8 +5144,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber ��絎�罔∞�"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP ��絎�罔∞�"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -5188,8 +5188,8 @@
 msgstr "�≧��渇��荐����� %s鐚�%s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber 荐������"
+msgid "XMPP Message Error"
+msgstr "XMPP 荐������"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12660,8 +12660,8 @@
 msgstr "腮�綣靣�����惹��絎��御� [罩紙�狗�]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber ���取��"
+msgid "XMPP developer"
+msgstr "XMPP ���取��"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12959,7 +12959,7 @@
 #: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12968,7 +12968,7 @@
 "'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
-"%s 篆�筝���篁� GTK+ ���主��罔∞���荐����綣��������箴� AIM��MSN��Yahoo!��Jabber��"
+"%s 篆�筝���篁� GTK+ ���主��罔∞���荐����綣��������箴� AIM��MSN��Yahoo!��XMPP��"
 "ICQ��IRC��SILC��SIP/SIMPLE��Novell GroupWise��Lotus Sametime��Bonjour��"
 "Zephyr��Gadu-Gadu �� QQ 膈����純��<BR><BR>���ユ�����篆��号���寂�����腮�綣��������"
 "�� GPL鐚�膃������篁私�篁ュ����������罌�罨上�喝��%s �у群����筝�篁� GPL, �狗��������"
@@ -15381,10 +15381,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎�鐚�箴�絋� Jabber��MSN��IRC �� TOC鐚��画�"
+"莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎�鐚�箴�絋� XMPP��MSN��IRC �� TOC鐚��画�"
 "��篏�����叱�ユ�篏�莠後�ユ��篁わ��� Enter 緇��級���削��檎��莖�荐������ら���腦�蕁�ず��"
 
 # XXX ��⑮
@@ -15748,7 +15748,7 @@
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>�����g��� XMPP</font>"
 
-#  NOTE Jabber ����stanza��茘���罧笈�純��鐚�筝���
+#  NOTE XMPP ����stanza��茘���罧笈�純��鐚�筝���
 #: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "���� <iq/> 罧笈�純��"
@@ -16517,10 +16517,10 @@
 #~ msgid "_Warn"
 #~ msgstr "茘���(_W)"
 
-#~ msgid "Jabber ID"
-#~ msgstr "Jabber 絽活��"
-
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#~ msgid "XMPP ID"
+#~ msgstr "XMPP 絽活��"
+
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #~ msgid "(pending)"
 #~ msgstr "鐚�膈�緇�茯�茘�鐚�"
 
--- a/po/zh_TW.po	Tue May 01 02:30:37 2007 +0000
+++ b/po/zh_TW.po	Tue May 01 05:53:57 2007 +0000
@@ -930,7 +930,7 @@
 msgstr "���九�育�灸散鐚�"
 
 # FIXME check - 20061025
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From"
 msgstr "綏画�茘�絨���"
@@ -2832,9 +2832,9 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr ""
-"絨��剛���紮�����困茫�鐚�絨援��恰����篋よ�荀�腦��������� AIM��ICQ��Jabber��Sametime �� "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"絨��剛���紮�����困茫�鐚�絨援��恰����篋よ�荀�腦��������� AIM��ICQ��XMPP��Sametime �� "
 "Yahoo��"
 
 #: ../libpurple/plugins/psychic.c:66
@@ -3113,8 +3113,8 @@
 msgstr "AIM 絽活��"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber 絽活��"
+msgid "XMPP Account"
+msgstr "XMPP 絽活��"
 
 # NOTE ������荐���絎���腮縁�筝������顄�
 #: ../libpurple/protocols/bonjour/bonjour.h:35
@@ -3613,7 +3613,7 @@
 msgstr "�≧��e�遺失����"
 
 # FIXME ambiguous - 20061025
-# NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
+# NOTE XMPP ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX ��罩g����������≧��g��活�茘���������腴��羣���鐚�筝������g�紊掩����鐚�荀�筝�����腴�鐚�
 #: ../libpurple/protocols/irc/irc.c:424
@@ -4302,8 +4302,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "膩�鹿 Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "膩�鹿 XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4324,7 +4324,7 @@
 
 # TODO Untranslated
 # NOTE 茘������� by Ambrose
-# NOTE Jabber ��絎�����Resource��筝�荅���絽娯���筝�腮�戎���������絖�筝駕�
+# NOTE XMPP ��絎�����Resource��筝�荅���絽娯���筝�腮�戎���������絖�筝駕�
 # NOTE ��札茵�ず������井�劫�����糸�ヤ�����綵≫�鐚�������絲����臀�
 # NOTE 荀� http://www.jabber.org/user/userguide.html
 #: ../libpurple/protocols/jabber/buddy.c:668
@@ -4387,7 +4387,7 @@
 msgid "(Re-)Request authorization"
 msgstr "荀�羆������域�羆�茯�茘�"
 
-# NOTE Jabber��絎�����Subscribe��筝�荅�箙������ュソ�������������
+# NOTE XMPP��鎘�����Subscribe��筝�荅�箙������ュソ�������������
 # NOTE 頳� http://www.jabber.org/user/userguide.html
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
@@ -4427,7 +4427,7 @@
 msgid "The following are the results of your search"
 msgstr "篁ヤ��堺��絨�腟���"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4452,8 +4452,8 @@
 msgstr "篌堺������篁わ�%s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "紂��ヤ�����紊���罨�篏�鐚�篁ユ��絨�Jabber篏睡������"
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "紂��ヤ�����紊���罨�篏�鐚�篁ユ��絨�XMPP篏睡������"
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4464,8 +4464,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "��絨�Jabber篏睡����"
+msgid "Search for XMPP users"
+msgstr "��絨�XMPP篏睡����"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4618,8 +4618,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Jabber 絽活���≧��"
+msgid "Invalid XMPP ID"
+msgstr "XMPP 絽活���≧��"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4673,8 +4673,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "荐糸���亥�� Jabber 絽恰��"
+msgid "Register New XMPP Account"
+msgstr "荐糸���亥�� XMPP 絽恰��"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4712,17 +4712,17 @@
 msgid "Both"
 msgstr "綏俄��梧�茘�"
 
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "From (To pending)"
 msgstr "綏画�茘�絨��刻�篏�篁�膈�緇�絨��壕�茘����"
 
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "To"
 msgstr "綏牙�峨��壕�茘�"
 
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "None (To pending)"
 msgstr "�¥�篏�罩g�緇�絨��壕�茘����"
@@ -4733,7 +4733,7 @@
 msgid "None"
 msgstr "��"
 
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Subscription"
 msgstr "茯�茘�����"
@@ -4757,8 +4757,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "篆��� Jabber 絲�腆�"
+msgid "Change XMPP Password"
+msgstr "篆��� XMPP 絲�腆�"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4787,7 +4787,7 @@
 msgid "Bad Request"
 msgstr "�渇��膓峨�����主��篋�筝��������"
 
-#  NOTE Jabber ��� <conflict/>鐚�茵�ず綏臥�����鋇���腮掩������筝�篏���鐚�篁ョ�後���� Resource
+#  NOTE XMPP ��� <conflict/>鐚�茵�ず綏臥�����鋇���腮掩������筝�篏���鐚�篁ョ�後���� Resource
 #  NOTE鐚�紊ф�篆����糸�ョ����篏睡�������絖�筝駕���綏ヤ�����糸�ワ�篁ヨ�雁�≧�絖���
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 茘����翫�� by Ambrose
@@ -4799,13 +4799,13 @@
 msgid "Feature Not Implemented"
 msgstr "荅峨���遵����篏�"
 
-#  NOTE Jabber ��� <forbidden/>鐚����閫e幻鐚�茵�ず罨���筝�紊�鐚�
+#  NOTE XMPP ��� <forbidden/>鐚����閫e幻鐚�茵�ず罨���筝�紊�鐚�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Forbidden"
 msgstr "罨���筝�紊�"
 
-#  NOTE Jabber ��� <gone/>鐚�茵�ず篏睡������篌堺�����丞�筝�膩�鐚�緇�箴��≫�膩�
+#  NOTE XMPP ��� <gone/>鐚�茵�ず篏睡������篌堺�����丞�筝�膩�鐚�緇�箴��≫�膩�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Gone"
@@ -4821,10 +4821,10 @@
 msgstr "�������上��"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "�後���� Jabber ID"
-
-#  NOTE Jabber ��� <not-acceptable/>鐚�茵�ず�����榊��荀�羆����初���遺失�������銀散篋堺��荐�筝���
+msgid "Malformed XMPP ID"
+msgstr "�後���� XMPP ID"
+
+#  NOTE XMPP ��� <not-acceptable/>鐚�茵�ず�����榊��荀�羆����初���遺失�������銀散篋堺��荐�筝���
 #  NOTE 罌�篁駈�箴�絋�荐���賢����胼�絖�鐚�鐚�篁ヨ�雁�≧�絖���
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #: ../libpurple/protocols/jabber/jabber.c:1483
@@ -4839,7 +4839,7 @@
 msgid "Payment Required"
 msgstr "綽���篁�罨�"
 
-#  NOTE Jabber ��� <recipient-unavailable/>
+#  NOTE XMPP ��� <recipient-unavailable/>
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE�������≧���機����荅我���筝�絖���������
 #  NOTE 茘����翫�� by Ambrose
@@ -4863,14 +4863,14 @@
 msgid "Server Overloaded"
 msgstr "篌堺�����莠�"
 
-#  NOTE Jabber ��� <service-unavailable/>鐚�茵�ず篌堺�����九�遺����靸��������篁�
+#  NOTE XMPP ��� <service-unavailable/>鐚�茵�ず篌堺�����九�遺����靸��������篁�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #  NOTE 茘����翫�� by Ambrose
 #: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Service Unavailable"
 msgstr "筝���箴�荅臥������"
 
-#  NOTE Jabber ��� <subscription-required/>鐚�茵�ず篏睡������������
+#  NOTE XMPP ��� <subscription-required/>鐚�茵�ず篏睡������������
 #  NOTE 綽���篋�����緇���Subscription��鐚�茯�茘�鐚�
 #  NOTE 荅活� http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #: ../libpurple/protocols/jabber/jabber.c:1505
@@ -4919,10 +4919,10 @@
 msgstr "�≧���� Namespace Prefix"
 
 # FIXME 緇�筝�����鐚�茘�����緇��拷��
-# NOTE Jabber ��絎�����Resource��筝�荅��坂戎���������筝�腮��筝駕�
+# NOTE XMPP ��絎�����Resource��筝�荅��坂戎���������筝�腮��筝駕�
 # NOTE 茵�ず������井�劫�����糸�ヤ�����綵≫�鐚�������絲����臀�
 # NOTE 荀� http://www.jabber.org/user/userguide.html
-# NOTE Jabber ��絎�筝� Stanza Error ��筝�腮���� <conflict/>
+# NOTE XMPP ��絎�筝� Stanza Error ��筝�腮���� <conflict/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1544
 msgid "Resource Conflict"
@@ -4933,13 +4933,13 @@
 msgid "Connection Timeout"
 msgstr "�g�綏臥�丈��"
 
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <host-gone/>
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <host-gone/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Host Gone"
 msgstr "篌堺����群筝�����吚��腟����篌堺������腮�"
 
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <host-unknown/>
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <host-unknown/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Host Unknown"
@@ -4963,45 +4963,45 @@
 msgstr "�≧���� XML"
 
 # XXX ������⑮鐚�茘�����緇��拷��
-# NOTE Jabber ��絎�筝㊦����nonmatching-hosts��
+# NOTE XMPP ��絎�筝㊦����nonmatching-hosts��
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Non-matching Hosts"
 msgstr "筝紙���腮延��娯�"
 
 # XXX ������⑮鐚�茘�����緇��拷�蚊��筝���ソ�������鋋咲��罔e�鐚�紊ф�羃���紊�ぇ���馹�
-# NOTE Jabber ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <policy-violation/>
+# NOTE XMPP ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <policy-violation/>
 # NOTE 荀� http://www.jabber.org/ietf/draft-ietf-xmpp-core-19.html
 #: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Policy Violation"
 msgstr "����篋������睡�"
 
-# NOTE Jabber ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
+# NOTE XMPP ��絎� Stream Error ��筝�腮���� <remote-connection-failed/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Remote Connection Failed"
 msgstr "�≧��g��活�茘���������腴��羣�"
 
-# NOTE Jabber ��絎� Stream Error ��筝�腮���� <resource-constraint/>
+# NOTE XMPP ��絎� Stream Error ��筝�腮���� <resource-constraint/>
 # NOTE ����茖�� Resource 鋇�荅����糸�ユ��篏睡���������� Resource 筝�荅��靸�研筝��後��
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1570
 msgid "Resource Constraint"
 msgstr "篌堺�����羣��㊦失"
 
-# NOTE Jabber ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <restricted-xml/>
+# NOTE XMPP ��絎� xmpp-core 筝� Stream Error ��筝�腮���� <restricted-xml/>
 # NOTE 荀� http://www.jabber.org/ietf/draft-ietf-xmpp-core-18.html
 #: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Restricted XML"
-msgstr "XML 筝㊤����� Jabber ��絎�筝�絎壕┗�� XML ��膣�"
-
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <see-other-host/>
+msgstr "XML 筝㊤����� XMPP ��絎�筝�絎壕┗�� XML ��膣�"
+
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <see-other-host/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "See Other Host"
 msgstr "篌堺�������茘�����荀�羆�篋����医����喝Ί�篌堺����"
 
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <system-shutdown/>
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <system-shutdown/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 #: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "System Shutdown"
@@ -5017,13 +5017,13 @@
 msgid "Unsupported Encoding"
 msgstr "篌堺�������吡畿絎���絖���膩�⊆"
 
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-stanza-type/>
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <unsupported-stanza-type/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
 #: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Unsupported Stanza Type"
 msgstr "篌堺�������吡畿絎���罧笈�初��� (Stanza Type)"
 
-# NOTE Jabber ��絎�筝� Stream Error ��筝�腮���� <unsupported-version/>
+# NOTE XMPP ��絎�筝� Stream Error ��筝�腮���� <unsupported-version/>
 # NOTE 荀� http://www.jabber.org/pipermail/xmppwg/2003-March/000752.html
 #: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Unsupported Version"
@@ -5144,8 +5144,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber ��絎�罔∞�"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP ��絎�罔∞�"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -5188,8 +5188,8 @@
 msgstr "�≧��渇��荐����� %s鐚�%s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber 荐������"
+msgid "XMPP Message Error"
+msgstr "XMPP 荐������"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12660,8 +12660,8 @@
 msgstr "腮�綣靣�����惹��絎��御� [罩紙�狗�]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "Jabber developer"
-msgstr "Jabber ���取��"
+msgid "XMPP developer"
+msgstr "XMPP ���取��"
 
 #: ../pidgin/gtkdialogs.c:114
 msgid "original author"
@@ -12959,7 +12959,7 @@
 #: ../pidgin/gtkdialogs.c:359
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, 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 "
@@ -12968,7 +12968,7 @@
 "'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
-"%s 篆�筝���篁� GTK+ ���主��罔∞���荐����綣��������箴� AIM��MSN��Yahoo!��Jabber��"
+"%s 篆�筝���篁� GTK+ ���主��罔∞���荐����綣��������箴� AIM��MSN��Yahoo!��XMPP��"
 "ICQ��IRC��SILC��SIP/SIMPLE��Novell GroupWise��Lotus Sametime��Bonjour��"
 "Zephyr��Gadu-Gadu �� QQ 膈����純��<BR><BR>���ユ�����篆��号���寂�����腮�綣��������"
 "�� GPL鐚�膃������篁私�篁ュ����������罌�罨上�喝��%s �у群����筝�篁� GPL, �狗��������"
@@ -15381,10 +15381,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"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 ""
-"莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎�鐚�箴�絋� Jabber��MSN��IRC �� TOC鐚��画�"
+"莅����贋・莠後�ユ��篁ゅ���腮���絖�罔≦�����荐���絎�鐚�箴�絋� XMPP��MSN��IRC �� TOC鐚��画�"
 "��篏�����叱�ユ�篏�莠後�ユ��篁わ��� Enter 緇��級���削��檎��莖�荐������ら���腦�蕁�ず��"
 
 # XXX ��⑮
@@ -15748,7 +15748,7 @@
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>�����g��� XMPP</font>"
 
-#  NOTE Jabber ����stanza��茘���罧笈�純��鐚�筝���
+#  NOTE XMPP ����stanza��茘���罧笈�純��鐚�筝���
 #: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "���� <iq/> 罧笈�純��"
@@ -16517,10 +16517,10 @@
 #~ msgid "_Warn"
 #~ msgstr "茘���(_W)"
 
-#~ msgid "Jabber ID"
-#~ msgstr "Jabber 絽活��"
-
-#  NOTE Jabber 茵�茯�鐚�荀�筝�
+#~ msgid "XMPP ID"
+#~ msgstr "XMPP 絽活��"
+
+#  NOTE XMPP 茵�茯�鐚�荀�筝�
 #~ msgid "(pending)"
 #~ msgstr "鐚�膈�緇�茯�茘�鐚�"