Mercurial > pidgin.yaz

changeset 16728:1ac4039a2634

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disapproval of revision 'c0c4c168411c9fbc5ccb9790a43e21a62f6dcd55'
author Luke Schierer <lschiere@pidgin.im>
date Tue, 01 May 2007 14:11:35 +0000
parents 3bd360f26a9e
children 728785ce47b7
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 05:53:57 2007 +0000
+++ b/AUTHORS	Tue May 01 14:11:35 2007 +0000
@@ -14,7 +14,7 @@
 	ICQ: 96642211
 	Yahoo:	SeanEgn
 	MSN:  seanegn@hotmail.com
-	XMPP:  seanegn@jabber.org
+	Jabber:  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 - XMPP developer
+Jim Seymour - Jabber developer
 Mark Spencer <markster@marko.net> - original author
 Eric Warmenhoven <eric@warmenhoven.org> - lead developer
 
--- a/README	Tue May 01 05:53:57 2007 +0000
+++ b/README	Tue May 01 14:11:35 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, XMPP, MSN and Yahoo!, among others.
+AIM, ICQ, Jabber, 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 05:53:57 2007 +0000
+++ b/doc/finch.1.in	Tue May 01 14:11:35 2007 +0000
@@ -30,7 +30,7 @@
 .SH DESCRIPTION
 .PP
 \fBfinch\fR is a console-based modular messaging client capable of using
-AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime,
+AIM, MSN, Yahoo!, Jabber, 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 05:53:57 2007 +0000
+++ b/doc/pidgin.1.in	Tue May 01 14:11:35 2007 +0000
@@ -28,7 +28,7 @@
 
 .SH DESCRIPTION
 .PP
-Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP,
+Pidgin 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 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 05:53:57 2007 +0000
+++ b/libpurple/plugins/psychic.c	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!")
+			   " AIM, ICQ, Jabber, Sametime, and Yahoo!")
 #define PLUGIN_AUTHOR   "Christopher O'Brien <siege@preoccupied.net>"
 
 
--- a/libpurple/protocols/bonjour/bonjour.c	Tue May 01 05:53:57 2007 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Tue May 01 14:11:35 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(_("XMPP Account"), "jid", "");
+	option = purple_account_option_string_new(_("Jabber 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 05:53:57 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Tue May 01 14:11:35 2007 +0000
@@ -575,8 +575,8 @@
 	if(x_vc_data != NULL)
 		xmlnode_free(x_vc_data);
 
-	purple_request_fields(gc, _("Edit XMPP vCard"),
-						_("Edit XMPP vCard"),
+	purple_request_fields(gc, _("Edit Jabber vCard"),
+						_("Edit Jabber 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 XMPP users."));
+						  "for any matching Jabber 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 XMPP users"),
-				_("Search for XMPP users"), instructions, fields,
+		purple_request_fields(js->gc, _("Search for Jabber users"),
+				_("Search for Jabber 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 05:53:57 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Tue May 01 14:11:35 2007 +0000
@@ -562,7 +562,7 @@
 	js->write_buffer = purple_circ_buffer_new(512);
 
 	if(!js->user) {
-		purple_connection_error(gc, _("Invalid XMPP ID"));
+		purple_connection_error(gc, _("Invalid Jabber 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 XMPP Account"),
-				_("Register New XMPP Account"), instructions, fields,
+		purple_request_fields(js->gc, _("Register New Jabber Account"),
+				_("Register New Jabber 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 XMPP ID"));
+		purple_connection_error(gc, _("Invalid Jabber 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 XMPP Password"),
-			_("Change XMPP Password"), _("Please enter your new password"),
+	purple_request_fields(js->gc, _("Change Jabber Password"),
+			_("Change Jabber 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 XMPP ID");
+			text = _("Malformed Jabber 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 05:53:57 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Tue May 01 14:11:35 2007 +0000
@@ -163,9 +163,9 @@
 	"XMPP",                                           /**< name           */
 	VERSION,                                          /**< version        */
 	                                                  /**  summary        */
-	N_("XMPP Protocol Plugin"),
+	N_("Jabber Protocol Plugin"),
 	                                                  /**  description    */
-	N_("XMPP Protocol Plugin"),
+	N_("Jabber Protocol Plugin"),
 	NULL,                                             /**< author         */
 	PURPLE_WEBSITE,                                     /**< homepage       */
 
--- a/libpurple/protocols/jabber/message.c	Tue May 01 05:53:57 2007 +0000
+++ b/libpurple/protocols/jabber/message.c	Tue May 01 14:11:35 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, _("XMPP Message Error"), _("XMPP Message Error"), buf,
+	purple_notify_formatted(jm->js->gc, _("Jabber Message Error"), _("Jabber Message Error"), buf,
 			jm->xhtml ? jm->xhtml : jm->body, NULL, NULL);
 
 	g_free(buf);
--- a/libpurple/prpl.h	Tue May 01 05:53:57 2007 +0000
+++ b/libpurple/prpl.h	Tue May 01 14:11:35 2007 +0000
@@ -99,7 +99,7 @@
 	/**
 	 * Use a unique name, not an alias, for chat rooms.
 	 *
-	 * XMPP lets you choose what name you want for chat.
+	 * Jabber 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 XMPP support this.
+	 * IRC and Jabber support this.
 	 */
 	OPT_PROTO_CHAT_TOPIC = 0x00000008,
 
@@ -145,7 +145,7 @@
 	/**
 	 * Allows font size to be specified in sane point size
 	 *
-	 * Probably just XMPP and Y!M
+	 * Probably just Jabber and Y!M
 	 */
 	OPT_PROTO_USE_POINTSIZE = 0x00000100,
 
--- a/pidgin.apspec.in	Tue May 01 05:53:57 2007 +0000
+++ b/pidgin.apspec.in	Tue May 01 14:11:35 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, XMPP,
+including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, Jabber,
 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 05:53:57 2007 +0000
+++ b/pidgin.spec.in	Tue May 01 14:11:35 2007 +0000
@@ -129,7 +129,7 @@
 
 %description
 Pidgin allows you to talk to anyone using a variety of messaging
-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
+protocols including AIM, MSN, Yahoo!, Jabber, 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!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+Yahoo!, Jabber, 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 05:53:57 2007 +0000
+++ b/pidgin/gtkdialogs.c	Tue May 01 14:11:35 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_("XMPP developer"), NULL},
+	{"Jim Seymour",			N_("Jabber 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!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+		  "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>"
--- a/pidgin/plugins/raw.c	Tue May 01 05:53:57 2007 +0000
+++ b/pidgin/plugins/raw.c	Tue May 01 14:11:35 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 (XMPP, MSN, IRC, "
+	N_("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."),
 	"Eric Warmenhoven <eric@warmenhoven.org>",
 	PURPLE_WEBSITE,
--- a/po/af.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/af.po	Tue May 01 14:11:35 2007 +0000
@@ -2285,8 +2285,8 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "XMPP-programmeerder"
+msgid "Jabber developer"
+msgstr "Jabber-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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -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!, XMPP, ICQ, IRC, "
+"Gaim is 'n modulêre geselskliënt wat AIM, MSN, Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -6836,8 +6836,8 @@
 msgstr "AIM-rekening"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "XMPP Account"
-msgstr "XMPP-rekening"
+msgid "Jabber Account"
+msgstr "Jabber-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 XMPP vCard"
-msgstr "Wysig XMPP-vCard"
+msgid "Edit Jabber vCard"
+msgstr "Wysig Jabber-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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Vul een of meer velde in om te soek vir passende XMPP-gebruikers."
+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."
 
 #: ../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 XMPP users"
-msgstr "Soek vir XMPP-gebruikers"
+msgid "Search for Jabber users"
+msgstr "Soek vir Jabber-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 XMPP ID"
-msgstr "Ongeldige XMPP-ID"
+msgid "Invalid Jabber ID"
+msgstr "Ongeldige Jabber-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 XMPP Account"
-msgstr "Registreer 'n nuwe XMPP-rekening"
+msgid "Register New Jabber Account"
+msgstr "Registreer 'n nuwe Jabber-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 XMPP Password"
-msgstr "Verander XMPP-wagwoord"
+msgid "Change Jabber Password"
+msgstr "Verander Jabber-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 XMPP ID"
-msgstr "Misvormde XMPP-ID"
+msgid "Malformed Jabber ID"
+msgstr "Misvormde Jabber-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 "XMPP Protocol Plugin"
-msgstr "Inprop vir XMPP-protokol"
+msgid "Jabber Protocol Plugin"
+msgstr "Inprop vir Jabber-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 "XMPP Message Error"
-msgstr "XMPP-boodskapfout"
+msgid "Jabber Message Error"
+msgstr "Jabber-boodskapfout"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/am.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/am.po	Tue May 01 14:11:35 2007 +0000
@@ -828,7 +828,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -2743,8 +2743,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
-msgstr "የXMPP ስህተት %s"
+msgid "Jabber developer"
+msgstr "የJabber ስህተት %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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 ""
 
@@ -5570,7 +5570,7 @@
 msgstr "የልደት በዓል"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit XMPP vCard"
+msgid "Edit Jabber vCard"
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:569
@@ -5580,7 +5580,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
+msgid "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr "ሚስጢራዊ ቃልን ለውጥ"
 
 #: src/protocols/jabber/jabber.c:1161
@@ -6001,7 +6001,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6306,8 +6306,8 @@
 
 #: src/protocols/jabber/message.c:233
 #, fuzzy
-msgid "XMPP Message Error"
-msgstr "የXMPP ስህተት %s"
+msgid "Jabber Message Error"
+msgstr "የJabber ስህተት %s"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -6782,7 +6782,7 @@
 #: src/protocols/msn/msn.c:1471
 #, fuzzy
 msgid "MSN Profile"
-msgstr "የXMPP ስህተት %s"
+msgstr "የJabber ስህተት %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 "የXMPP ስህተት %s"
+msgstr "የJabber ስህተት %s"
 
 #: src/protocols/yahoo/yahoo_profile.c:793
 msgid ""
@@ -11193,8 +11193,8 @@
 #~ msgstr "ቅጽል፦"
 
 #, fuzzy
-#~ msgid "XMPP Profile"
-#~ msgstr "የXMPP ስህተት %s"
+#~ msgid "Jabber Profile"
+#~ msgstr "የJabber ስህተት %s"
 
 #, fuzzy
 #~ msgid "Roomlist Error"
--- a/po/ar.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/ar.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, 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 (XMPP, 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 (Jabber, 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 "XMPP developer"
+msgid "Jabber 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!, 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>"
+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 ""
 
 #: ../src/gtkdialogs.c:285
@@ -6034,7 +6034,7 @@
 
 #: ../src/protocols/bonjour/bonjour.c:592
 #, fuzzy
-msgid "XMPP Account"
+msgid "Jabber 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 XMPP vCard"
+msgid "Edit Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr "طلب كلمة المرور"
 
 #: ../src/protocols/jabber/jabber.c:1338
@@ -7764,7 +7764,7 @@
 
 #: ../src/protocols/jabber/jabber.c:1448
 #, fuzzy
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr ":غير موجود MP3  مقبس تصدير "
 
 #: ../src/protocols/jabber/jabber.c:1931
@@ -8107,7 +8107,7 @@
 
 #: ../src/protocols/jabber/message.c:236
 #, fuzzy
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr "خطأ أثناء التحويل: %s"
 
 #: ../src/protocols/jabber/message.c:316
--- a/po/az.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/az.po	Tue May 01 14:11:35 2007 +0000
@@ -823,7 +823,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -2749,8 +2749,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
-msgstr "XMPP Profili"
+msgid "Jabber developer"
+msgstr "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 ""
 
@@ -5552,7 +5552,7 @@
 msgstr "Ad Günü"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit XMPP vCard"
+msgid "Edit Jabber vCard"
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:569
@@ -5562,8 +5562,8 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ID-si"
+msgid "Jabber ID"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1161
@@ -5954,7 +5954,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6249,7 +6249,7 @@
 msgstr ""
 
 #: src/protocols/jabber/message.c:233
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr ""
 
 #: src/protocols/jabber/message.c:297
--- a/po/bg.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/bg.po	Tue May 01 14:11:35 2007 +0000
@@ -2345,8 +2345,8 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "Разработчик на XMPP"
+msgid "Jabber developer"
+msgstr "Разработчик на Jabber"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -2595,7 +2595,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim програма за изпращане на съобщения чрез протоколите AIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, и "
+"Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 "Позволява изпращането на необработени данни до текстово-базирани протоколи "
-"(XMPP, MSN, IRC, TOC). За изпращане - натиснете „Enter“ в полето за "
+"(Jabber, 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7109,7 +7109,7 @@
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
 #, fuzzy
-msgid "XMPP Account"
+msgid "Jabber 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 XMPP vCard"
-msgstr "Редактиране на XMPP-визитка"
+msgid "Edit Jabber vCard"
+msgstr "Редактиране на Jabber-визитка"
 
 #: ../libgaim/protocols/jabber/buddy.c:584
 msgid ""
@@ -8306,7 +8306,7 @@
 msgid "The following are the results of your search"
 msgstr ""
 
-#. current comment from XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "Търсене за потребители на XMPP"
+msgid "Search for Jabber users"
+msgstr "Търсене за потребители на Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Невалиден ID за XMPP"
+msgid "Invalid Jabber ID"
+msgstr "Невалиден ID за Jabber"
 
 #: ../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 XMPP Account"
-msgstr "Регистриране на нов XMPP-абонамент"
+msgid "Register New Jabber Account"
+msgstr "Регистриране на нов Jabber-абонамент"
 
 #: ../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 XMPP Password"
-msgstr "Смяна на парола за XMPP"
+msgid "Change Jabber Password"
+msgstr "Смяна на парола за Jabber"
 
 #: ../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 XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "Модул за протокола XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Модул за протокола Jabber"
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
 #, fuzzy
@@ -8960,8 +8960,8 @@
 msgstr "Съобщението не можа да достигне до %s: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "XMPP Message Error"
-msgstr "Грешка в XMPP-съобщение"
+msgid "Jabber Message Error"
+msgstr "Грешка в Jabber-съобщение"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/bn.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/bn.po	Tue May 01 14:11:35 2007 +0000
@@ -2538,7 +2538,7 @@
 msgstr "হ্যাকার ও নিয়োজিত ড্রাইভার [কুঁড়ের হদ্দো]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
+msgid "Jabber 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!, 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>"
+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 ""
 
 #: ../gtk/gtkdialogs.c:350
@@ -5388,7 +5388,7 @@
 msgstr "টেক্সট-ভিত্তিক প্রোটকলে অরুপান্তরিত ইনপুট পাঠাতে সহায়তা করে।"
 
 #: ../gtk/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
+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 "টেক্সট-ভিত্তিক প্রোটকলগুলোতে অরুপান্তরিত ইনপুট পাঠাতে সহায়তা করে (জ্যাবার, 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, XMPP, Sametime, and Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7205,7 +7205,7 @@
 msgstr "এআইএম অ্যাকাউন্ট"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "XMPP Account"
+msgid "Jabber 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 XMPP vCard"
-msgstr "XMPP vCard সম্পাদন"
+msgid "Edit Jabber vCard"
+msgstr "Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr "জ্যাবার পাসওয়ার্ড পরিবর্তন"
 
 #: ../libgaim/protocols/jabber/jabber.c:1368
@@ -8750,7 +8750,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1478
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr "জ্যাবার প্রোটোকল প্লাগইন"
 
 #: ../libgaim/protocols/jabber/jabber.c:1995
@@ -9051,7 +9051,7 @@
 msgstr "%s কে বার্তা পাঠানো ব্যর্থ হয়েছে: %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr "জ্যবার বার্তা ত্রুটি"
 
 #: ../libgaim/protocols/jabber/message.c:316
--- a/po/bs.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/bs.po	Tue May 01 14:11:35 2007 +0000
@@ -847,10 +847,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Dopušta slanje sirovih podataka u tekst-bazirane protokole (XMPP, MSN, IRC, TOC). Pritisnite "
+"Dopušta slanje sirovih podataka u tekst-bazirane protokole (Jabber, 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 XMPP developer"
-msgstr "bivši XMPP razvijatelj"
+msgid "former Jabber developer"
+msgstr "bivši Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"Jabber, 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!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, i Gadu-Gadu. "
+" AIM, MSN, Yahoo!, Jabber, 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 XMPP vCard"
-msgstr "Uredi XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Uredi Jabber 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 "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber 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 "XMPP Profile"
-msgstr "XMPP profil"
+msgid "Jabber Profile"
+msgstr "Jabber 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 XMPP ID"
-msgstr "Pogrešan XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Pogrešan Jabber 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 XMPP Account"
-msgstr "Registruj novi XMPP account"
+msgid "Register New Jabber Account"
+msgstr "Registruj novi Jabber 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 XMPP Password"
-msgstr "Promjeni XMPP lozinku"
+msgid "Change Jabber Password"
+msgstr "Promjeni Jabber 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 XMPP ID"
-msgstr "Pogrešno formiran XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Pogrešno formiran Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP protokol plugin"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "Greška XMPP poruke"
+msgid "Jabber Message Error"
+msgstr "Greška Jabber poruke"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
--- a/po/ca.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/ca.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "Fa que apareguin finestres de conversa així que altres usuaris us comencin a "
-"enviar missatges. Funciona per a AIM, ICQ, XMPP, Sametime, i Yahoo!"
+"enviar missatges. Funciona per a AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "Compte XMPP"
+msgid "Jabber Account"
+msgstr "Compte Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Edita la vCard del XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Edita la vCard del Jabber"
 
 #: ../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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "Cerca usuaris de XMPP"
+msgid "Search for Jabber users"
+msgstr "Cerca usuaris de Jabber"
 
 #. "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 XMPP ID"
-msgstr "ID XMPP invàlid"
+msgid "Invalid Jabber ID"
+msgstr "ID Jabber 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 XMPP Account"
-msgstr "Registra un compte XMPP nou"
+msgid "Register New Jabber Account"
+msgstr "Registra un compte Jabber 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 XMPP Password"
-msgstr "Canvia la contrasenya per al XMPP"
+msgid "Change Jabber Password"
+msgstr "Canvia la contrasenya per al Jabber"
 
 #: ../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 XMPP ID"
-msgstr "l'ID XMPP està mal format"
+msgid "Malformed Jabber ID"
+msgstr "l'ID Jabber 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 "XMPP Protocol Plugin"
-msgstr "Connector per al protocol XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Connector per al protocol Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Missatge d'error de XMPP"
+msgid "Jabber Message Error"
+msgstr "Missatge d'error de Jabber"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12399,8 +12399,8 @@
 msgstr "hacker i conductor designat"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "XMPP developer"
-msgstr "Desenvolupador de XMPP"
+msgid "Jabber developer"
+msgstr "Desenvolupador de Jabber"
 
 #: ../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!, XMPP, "
+"%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 "
@@ -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!, 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>"
+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>"
 
 #: ../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 (XMPP, MSN, IRC, TOC). Hit "
+"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 (XMPP, MSN, IRC, "
+"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 enviar-les. "
 "Observeu la finestra de depuració."
 
@@ -16327,8 +16327,8 @@
 #~ msgid "Change password"
 #~ msgstr "Canvia la contrasenya"
 
-#~ msgid "XMPP ID"
-#~ msgstr "ID per al XMPP"
+#~ msgid "Jabber ID"
+#~ msgstr "ID per al Jabber"
 
 #~ 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 "XMPP Profile"
-#~ msgstr "Perfil XMPP"
+#~ msgid "Jabber Profile"
+#~ msgstr "Perfil Jabber"
 
 #~ msgid "User Properties"
 #~ msgstr "Propietat de l'usuari"
--- a/po/ca@valencia.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/ca@valencia.po	Tue May 01 14:11:35 2007 +0000
@@ -2570,8 +2570,8 @@
 msgstr "hacker i conductor designat"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "Desenvolupador de XMPP"
+msgid "Jabber developer"
+msgstr "Desenvolupador de Jabber"
 
 #: ../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!, 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>"
+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>"
 
 #: ../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 (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ó."
+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ó."
 
 #: ../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, 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!"
+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!"
 
 #: ../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 "XMPP Account"
-msgstr "Compte XMPP"
+msgid "Jabber Account"
+msgstr "Compte Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Edita la vCard del XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Edita la vCard del Jabber"
 
 #: ../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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "Cerca usuaris de XMPP"
+msgid "Search for Jabber users"
+msgstr "Cerca usuaris de Jabber"
 
 #: ../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 XMPP ID"
-msgstr "ID XMPP invàlid"
+msgid "Invalid Jabber ID"
+msgstr "ID Jabber 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 XMPP Account"
-msgstr "Registra un compte XMPP nou"
+msgid "Register New Jabber Account"
+msgstr "Registra un compte Jabber 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 XMPP Password"
-msgstr "Canvia la contrasenya per al XMPP"
+msgid "Change Jabber Password"
+msgstr "Canvia la contrasenya per al Jabber"
 
 #: ../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 XMPP ID"
-msgstr "l'ID XMPP està mal format"
+msgid "Malformed Jabber ID"
+msgstr "l'ID Jabber 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 "XMPP Protocol Plugin"
-msgstr "Connector per al protocol XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Connector per al protocol Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Missatge d'error de XMPP"
+msgid "Jabber Message Error"
+msgstr "Missatge d'error de Jabber"
 
 #: ../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 "XMPP ID"
-#~ msgstr "ID per al XMPP"
+#~ msgid "Jabber ID"
+#~ msgstr "ID per al Jabber"
 #~ 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 05:53:57 2007 +0000
+++ b/po/cs.po	Tue May 01 14:11:35 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, 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!"
+"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!"
 
 #: ../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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Nechá vás odeslat přímý vstup protokolům založeným na textu (XMPP MSN, "
+"Nechá vás odeslat přímý vstup protokolům založeným na textu (Jabber 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 "XMPP developer"
-msgstr "vývojář XMPPu"
+msgid "Jabber developer"
+msgstr "vývojář Jabberu"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"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>"
-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>"
+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>"
 
 #: ../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 XMPP vCard"
-msgstr "Upravit vCard XMPPu"
+msgid "Edit Jabber vCard"
+msgstr "Upravit vCard Jabberu"
 
 #: ../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 XMPP users."
-msgstr "Vyplňte jedno nebo více polí pro hledání odpovídajících uživatelů XMPPu."
+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."
 
 #: ../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 XMPP users"
-msgstr "Hledat uživatele XMPPu"
+msgid "Search for Jabber users"
+msgstr "Hledat uživatele Jabberu"
 
 #: ../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 XMPP ID"
-msgstr "Neplatné ID XMPPu"
+msgid "Invalid Jabber ID"
+msgstr "Neplatné ID Jabberu"
 
 #: ../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 XMPP Account"
-msgstr "Zaregistrovat nový účet XMPP"
+msgid "Register New Jabber Account"
+msgstr "Zaregistrovat nový účet Jabber"
 
 #: ../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 XMPP Password"
-msgstr "Změnit heslo XMPPu"
+msgid "Change Jabber Password"
+msgstr "Změnit heslo Jabberu"
 
 #: ../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 XMPP ID"
-msgstr "Neplatné ID XMPPu"
+msgid "Malformed Jabber ID"
+msgstr "Neplatné ID Jabberu"
 
 #: ../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 "XMPP Protocol Plugin"
-msgstr "Zásuvný modul protokolu XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Zásuvný modul protokolu Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Chyba zprávy XMPPu"
+msgid "Jabber Message Error"
+msgstr "Chyba zprávy Jabberu"
 
 #: ../src/protocols/jabber/message.c:300
 #, c-format
--- a/po/da.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/da.po	Tue May 01 14:11:35 2007 +0000
@@ -2547,8 +2547,8 @@
 msgstr "hacker and designated driver [lazy bum]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "XMPP udvikler"
+msgid "Jabber developer"
+msgstr "Jabber 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!, 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>"
+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>"
 
 #: ../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 (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."
+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."
 
 #: ../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, 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!"
+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!"
 
 #: ../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 "XMPP Account"
-msgstr "XMPP-konto"
+msgid "Jabber Account"
+msgstr "Jabber-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 XMPP vCard"
-msgstr "Redigér XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Redigér Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Udfyld et eller flere felter for at søge efter XMPP brugere."
+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."
 
 #: ../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 XMPP users"
-msgstr "Søg efter XMPP brugere"
+msgid "Search for Jabber users"
+msgstr "Søg efter Jabber 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 XMPP ID"
-msgstr "Ugyldigt XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Ugyldigt Jabber 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 XMPP Account"
-msgstr "Registrér ny XMPP konto"
+msgid "Register New Jabber Account"
+msgstr "Registrér ny Jabber 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 XMPP Password"
-msgstr "Skift XMPP adgangskode"
+msgid "Change Jabber Password"
+msgstr "Skift Jabber 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 XMPP ID"
-msgstr "Ugyldigt XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Ugyldigt Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP protokolmodul"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPP beskedfejl"
+msgid "Jabber Message Error"
+msgstr "Jabber beskedfejl"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/de.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/de.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "Öffnet Gesprächsfenster, wenn andere Benutzer beginnen, Ihnen eine Nachricht "
-"zu senden.  Das funktioniert mit AIM, ICQ, XMPP, Sametime und Yahoo!"
+"zu senden.  Das funktioniert mit AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "XMPP-Konto"
+msgid "Jabber Account"
+msgstr "Jabber-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 XMPP vCard"
-msgstr "XMPP vCard bearbeiten"
+msgid "Edit Jabber vCard"
+msgstr "Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr ""
-"Füllen sie ein oder mehrere Felder aus, um nach entsprechenden XMPP-"
+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-"
 "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 XMPP users"
-msgstr "Nach XMPP-Benutzern suchen"
+msgid "Search for Jabber users"
+msgstr "Nach Jabber-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 XMPP ID"
-msgstr "Ungültige XMPP-ID"
+msgid "Invalid Jabber ID"
+msgstr "Ungültige Jabber-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 XMPP Account"
-msgstr "Registrierung eines neuen XMPP-Kontos"
+msgid "Register New Jabber Account"
+msgstr "Registrierung eines neuen Jabber-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 XMPP Password"
-msgstr "Ändere das XMPP-Passwort"
+msgid "Change Jabber Password"
+msgstr "Ändere das Jabber-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 XMPP ID"
-msgstr "Falsche XMPP-ID"
+msgid "Malformed Jabber ID"
+msgstr "Falsche Jabber-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 "XMPP Protocol Plugin"
-msgstr "XMPP-Protokoll-Plugin"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber-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 "XMPP Message Error"
-msgstr "XMPP Nachrichtenfehler"
+msgid "Jabber Message Error"
+msgstr "Jabber Nachrichtenfehler"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12533,8 +12533,8 @@
 msgstr "Grafische Benutzeroberfläche"
 
 #: ../pidgin/gtkdialogs.c:114
-msgid "XMPP developer"
-msgstr "XMPP-Entwickler"
+msgid "Jabber developer"
+msgstr "Jabber-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!, XMPP, "
+"%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 "
@@ -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!, XMPP, ICQ, "
+"%s ist ein modularer Nachrichtendienst, der AIM, MSN, Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Erlaubt Ihnen Rohdaten an textbasierte Protokolle (XMPP, MSN, IRC, TOC) zu "
+"Erlaubt Ihnen Rohdaten an textbasierte Protokolle (Jabber, 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 05:53:57 2007 +0000
+++ b/po/dz.po	Tue May 01 14:11:35 2007 +0000
@@ -2445,7 +2445,7 @@
 msgstr "གསང་དཀྲོགས་མི་དང་འདྲེན་བྱེད་བཀོད་སྒྲིག་འབད་འབདཝ [ལེ་ལོ་ཅན bum]"
 
 #: ../gtk/gtkdialogs.c:107
-msgid "XMPP developer"
+msgid "Jabber 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!, 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>"
+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>"
 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 (XMPP, 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 (Jabber, 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, XMPP, Sametime, and Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, 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 "XMPP Account"
+msgid "Jabber 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 XMPP vCard"
+msgid "Edit Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr "ཇབ་བར་ཆོག་ཡིག་ བསྒྱུར་བཅོས་འབད།"
 
 #: ../libgaim/protocols/jabber/jabber.c:1350
@@ -8228,7 +8228,7 @@
 msgstr "རྣམ་གྲངས་མ་ཐོབ།"
 
 #: ../libgaim/protocols/jabber/jabber.c:1460
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr "ཇབ་བར་གནད་སྤེལ་ལམ་ལུགས་ ནང་བསྐྱོད།"
 
 #: ../libgaim/protocols/jabber/jabber.c:1976
@@ -8529,7 +8529,7 @@
 msgstr "%s ལུ་འཕྲིན་དོན་འགྲེམ་སྤེལ་འབད་ནི་འཐུས་ཤོར་བྱུང་ཡོདཔ།%s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "XMPP Message Error"
+msgid "Jabber 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!, "
-#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "Jabber, 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 "XMPP ID"
+#~ msgid "Jabber ID"
 #~ msgstr "ཇབ་བར་ཨའི་ཌི།"
-#~ msgid "XMPP Profile"
+#~ msgid "Jabber Profile"
 #~ msgstr "ཇབ་ཇར་གསལ་སྡུད།"
 #~ msgid "Roomlist Error"
 #~ msgstr "ཁང་མིག་ཐོ་ཡིག་གི་འཛོལ་བ།"
--- a/po/el.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/el.po	Tue May 01 14:11:35 2007 +0000
@@ -2316,8 +2316,8 @@
 msgstr "χάκερ και οδηγάρα [τεμπέλαρος]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "υπεύθυνος ανάπτυξης του XMPP"
+msgid "Jabber developer"
+msgstr "υπεύθυνος ανάπτυξης του Jabber"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -2558,7 +2558,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Το Gaim είναι ένας ευμετάβλητος πελάτης ανταλλαγής μηνυμάτων που μπορεί να "
-"χρησιμοποιεί τα AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu και QQ, όλα ταυτόχρονα.  Είναι γραμμένο με τη χρήση GTK+.<BR><BR>Μπορείτε να τροποποιήσετε και να "
+"χρησιμοποιεί τα AIM, MSN, Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 "Σας επιτρέπει να στέλνετε ακατέργαστη είσοδο σε πρωτόκολλα βασισμένα σε "
-"κείμενο. (XMPP, MSN, IRC, TOC). Πατήστε 'Enter' στο παράθυρο εισόδου για "
+"κείμενο. (Jabber, 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "Προκαλεί την εμφάνιση παραθύρων συζήτησης όταν οι άλλοι χρήστες σας στέλνουν "
-"μηνύματα.  Αυτό δουλεύει για το AIM, το ICQ, το XMPP, το Sametime και το "
+"μηνύματα.  Αυτό δουλεύει για το AIM, το ICQ, το Jabber, το Sametime και το "
 "Yahoo!"
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7010,8 +7010,8 @@
 msgstr "Λογαριασμός AIM"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "XMPP Account"
-msgstr "Λογαριασμός XMPP"
+msgid "Jabber Account"
+msgstr "Λογαριασμός Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Επεξεργασία XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Επεξεργασία Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr ""
-"Συμπληρώστε ένα ή περισσότερα πεδία για την αναζήτηση χρηστών XMPP που "
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr ""
+"Συμπληρώστε ένα ή περισσότερα πεδία για την αναζήτηση χρηστών Jabber που "
 "ταιριάζουν."
 
 #: ../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 XMPP users"
-msgstr "Αναζήτηση χρηστών XMPP"
+msgid "Search for Jabber users"
+msgstr "Αναζήτηση χρηστών Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Μη έγκυρο XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Μη έγκυρο Jabber 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 XMPP Account"
-msgstr "Καταχώρηση νέου λογαριασμού XMPP"
+msgid "Register New Jabber Account"
+msgstr "Καταχώρηση νέου λογαριασμού Jabber"
 
 #: ../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 XMPP Password"
-msgstr "Αλλαγή κωδικού XMPP"
+msgid "Change Jabber Password"
+msgstr "Αλλαγή κωδικού Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Παραμορφωμένο XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Παραμορφωμένο Jabber 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 "XMPP Protocol Plugin"
-msgstr "Πρόσθετο πρωτοκόλλου XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Πρόσθετο πρωτοκόλλου Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Σφάλμα μηνύματος XMPP"
+msgid "Jabber Message Error"
+msgstr "Σφάλμα μηνύματος Jabber"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/en_AU.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/en_AU.po	Tue May 01 14:11:35 2007 +0000
@@ -849,10 +849,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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."
 
 #: plugins/relnot.c:63
@@ -2822,8 +2822,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
-msgstr "former XMPP developer"
+msgid "Jabber developer"
+msgstr "former Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"Jabber, 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 XMPP Account"
+msgstr "Register New Jabber 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 XMPP vCard"
-msgstr "Edit XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Edit Jabber vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5735,8 +5735,8 @@
 "comfortable."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "Invalid XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Invalid Jabber 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 XMPP Account"
-msgstr "Register New XMPP Account"
+msgid "Register New Jabber Account"
+msgstr "Register New Jabber 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 XMPP Password"
-msgstr "Change XMPP Password"
+msgid "Change Jabber Password"
+msgstr "Change Jabber 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 XMPP ID"
-msgstr "Malformed XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPP Message Error"
+msgid "Jabber Message Error"
+msgstr "Jabber Message Error"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12182,8 +12182,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Invalid Username"
 
-#~ msgid "XMPP Profile"
-#~ msgstr "XMPP Profile"
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabber Profile"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Roomlist Error"
--- a/po/en_CA.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/en_CA.po	Tue May 01 14:11:35 2007 +0000
@@ -849,10 +849,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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."
 
 #: plugins/relnot.c:63
@@ -2818,8 +2818,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
-msgstr "former XMPP developer"
+msgid "Jabber developer"
+msgstr "former Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"Jabber, 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 XMPP Account"
+msgstr "Register New Jabber 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 XMPP vCard"
-msgstr "Edit XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Edit Jabber vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5729,8 +5729,8 @@
 "comfortable."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "Invalid XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Invalid Jabber 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 XMPP Account"
-msgstr "Register New XMPP Account"
+msgid "Register New Jabber Account"
+msgstr "Register New Jabber 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 XMPP Password"
-msgstr "Change XMPP Password"
+msgid "Change Jabber Password"
+msgstr "Change Jabber 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 XMPP ID"
-msgstr "Malformed XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPP Message Error"
+msgid "Jabber Message Error"
+msgstr "Jabber Message Error"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12162,8 +12162,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Invalid Username"
 
-#~ msgid "XMPP Profile"
-#~ msgstr "XMPP Profile"
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabber Profile"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Roomlist Error"
--- a/po/en_GB.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/en_GB.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "XMPP Account"
+msgid "Jabber Account"
+msgstr "Jabber 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 XMPP vCard"
-msgstr "Edit XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Edit Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Fill in one or more fields to search for any matching XMPP users."
+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."
 
 #: ../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 XMPP users"
-msgstr "Search for XMPP users"
+msgid "Search for Jabber users"
+msgstr "Search for Jabber 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 XMPP ID"
-msgstr "Invalid XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Invalid Jabber 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 XMPP Account"
-msgstr "Register New XMPP Account"
+msgid "Register New Jabber Account"
+msgstr "Register New Jabber 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 XMPP Password"
-msgstr "Change XMPP Password"
+msgid "Change Jabber Password"
+msgstr "Change Jabber 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 XMPP ID"
-msgstr "Malformed XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP Protocol Plug-in"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPP Message Error"
+msgid "Jabber Message Error"
+msgstr "Jabber 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 "XMPP developer"
-msgstr "XMPP developer"
+msgid "Jabber developer"
+msgstr "Jabber 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!, XMPP, "
+"%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 "
@@ -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!, XMPP, "
+"%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 "
@@ -15035,10 +15035,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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."
 
 #: ../pidgin/plugins/relnot.c:71
--- a/po/eo.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/eo.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "Igas aperon de konversacia fenestro kiam alia uzanto komencas mesaĝi vin.  "
-"Tio funkcias por AIM, ICQ, XMPP, Sametime, kaj Yahoo!"
+"Tio funkcias por AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "XMPP Konto"
+msgid "Jabber Account"
+msgstr "Jabber 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 XMPP vCard"
-msgstr "Redaktu XMPP-n vCard-n"
+msgid "Edit Jabber vCard"
+msgstr "Redaktu Jabber-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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "Serĉu XMPP-ajn uzantojn"
+msgid "Search for Jabber users"
+msgstr "Serĉu Jabber-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 XMPP ID"
-msgstr "Malvalida XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Malvalida Jabber 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 XMPP Account"
-msgstr "Registradu Novan XMPP-n Konton"
+msgid "Register New Jabber Account"
+msgstr "Registradu Novan Jabber-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 XMPP Password"
-msgstr "Ŝanĝu XMPP-n Pasvorton"
+msgid "Change Jabber Password"
+msgstr "Ŝanĝu Jabber-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 XMPP ID"
-msgstr "Misformita XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Misformita Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP Protokol-Kromaĵo"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPP mesaĝo eraro"
+msgid "Jabber Message Error"
+msgstr "Jabber 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 "XMPP developer"
-msgstr "XMPP programisto"
+msgid "Jabber developer"
+msgstr "Jabber 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!, XMPP, "
+"%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 "
@@ -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!, XMPP, ICQ, "
+"%s estas modula mesaĝokliento, kapablas uzi AIM, MSN, Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 
--- a/po/es.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/es.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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, XMPP, Sametime y Yahoo!"
+"enviarle un mensaje. Esto funciona con AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "Cuenta XMPP"
+msgid "Jabber Account"
+msgstr "Cuenta Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Editar vCard de XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Editar vCard de Jabber"
 
 #: ../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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 "Rellene uno o más de los campos mostrados a continuación para buscar a un "
-"usuario XMPP que los tengan."
+"usuario Jabber 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 XMPP users"
-msgstr "Buscar usuarios XMPP"
+msgid "Search for Jabber users"
+msgstr "Buscar usuarios Jabber"
 
 #. "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 XMPP ID"
-msgstr "ID de XMPP no válido"
+msgid "Invalid Jabber ID"
+msgstr "ID de Jabber 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 XMPP Account"
-msgstr "Registrando cuenta nueva de XMPP"
+msgid "Register New Jabber Account"
+msgstr "Registrando cuenta nueva de Jabber"
 
 #. 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 XMPP Password"
-msgstr "Cambiar contraseña de XMPP"
+msgid "Change Jabber Password"
+msgstr "Cambiar contraseña de Jabber"
 
 #: ../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 XMPP ID"
-msgstr "ID de XMPP no válido"
+msgid "Malformed Jabber ID"
+msgstr "ID de Jabber 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 "XMPP Protocol Plugin"
-msgstr "Complemento de protocolo XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Complemento de protocolo Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Mensaje de error de XMPP"
+msgid "Jabber Message Error"
+msgstr "Mensaje de error de Jabber"
 
 #: ../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 "XMPP developer"
-msgstr "desarrollador de XMPP"
+msgid "Jabber developer"
+msgstr "desarrollador de Jabber"
 
 #: ../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!, XMPP, "
+"%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 "
@@ -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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Le permite enviar datos en bruto a protocolos basados en texto (XMPP, MSN, "
+"Le permite enviar datos en bruto a protocolos basados en texto (Jabber, 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 "XMPP ID"
-#~ msgstr "ID XMPP"
+#~ msgid "Jabber ID"
+#~ msgstr "ID Jabber"
 
 #~ 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!, "
-#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, "
+#~ "Jabber, 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!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus "
+#~ "AIM, MSN, Yahoo!, Jabber, 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!, "
-#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "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 es un cliente modular de mensajería instantánea, capaz de utilizar "
-#~ "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, "
+#~ "AIM, MSN, Yahoo!, Jabber, 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 "XMPP Profile"
-#~ msgstr "Perfil XMPP"
+#~ msgid "Jabber Profile"
+#~ msgstr "Perfil Jabber"
 
 #~ 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 "XMPP Error %s"
-#~ msgstr "Error XMPP %s"
-
-#~ msgid ""
-#~ "The XMPP user %s does not exist and was therefore not added to your "
+#~ msgid "Jabber Error %s"
+#~ msgstr "Error Jabber %s"
+
+#~ msgid ""
+#~ "The Jabber user %s does not exist and was therefore not added to your "
 #~ "roster."
 #~ msgstr ""
-#~ "El usuario XMPP %s no existe y por lo tanto no se lo añadirá a su "
+#~ "El usuario Jabber %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 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 "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 "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 XMPP developer)<BR>  Mark Spencer (original author) "
+#~ "Jim Seymour (former Jabber 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 XMPP)<BR>  Mark Spencer "
+#~ "<BR>  Jim Seymour (antiguo desarrollador de Jabber)<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 05:53:57 2007 +0000
+++ b/po/et.po	Tue May 01 14:11:35 2007 +0000
@@ -2232,8 +2232,8 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:107
-msgid "XMPP developer"
-msgstr "XMPPi arendaja"
+msgid "Jabber developer"
+msgstr "Jabberi 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
+"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.  "
@@ -4935,7 +4935,7 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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 "XMPP Account"
+msgid "Jabber 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 XMPP vCard"
-msgstr "XMPP'i vKaardi redigeerimine"
+msgid "Edit Jabber vCard"
+msgstr "Jabber'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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "XMPPikasutajate otsimine"
+msgid "Search for Jabber users"
+msgstr "Jabberikasutajate 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 XMPP ID"
-msgstr "Vigane XMPP'i ID"
+msgid "Invalid Jabber ID"
+msgstr "Vigane Jabber'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 XMPP Account"
-msgstr "Uue XMPP'i konto registreerimine"
+msgid "Register New Jabber Account"
+msgstr "Uue Jabber'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 XMPP Password"
-msgstr "XMPP'i parooli muutmine"
+msgid "Change Jabber Password"
+msgstr "Jabber'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 XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP protokolli plugin"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPPi sõnumi viga"
+msgid "Jabber Message Error"
+msgstr "Jabberi sõnumi viga"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/eu.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/eu.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "Solasaldi lehioa azaltzen da beste erabiltzaile batek  mezua zeuri bidaltzen hasten denean. "
-"Honek funtzionatzen du AIM,ICQ,XMPP,Sametime eta Yahoo!"
+"Honek funtzionatzen du AIM,ICQ,Jabber,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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Testuan oinarritutako protokoloetara (XMPP, MSN, IRC, TOC) formaturik "
+"Testuan oinarritutako protokoloetara (Jabber, 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 "XMPP developer"
-msgstr "XMPP garatzailea"
+msgid "Jabber developer"
+msgstr "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"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 "
@@ -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!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"Gaim berehalako mezuen bezero modularra da  AIM, MSN, Yahoo!, Jabber, 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 XMPP vCard"
-msgstr "Editatu XMPP vCard-a"
+msgid "Edit Jabber vCard"
+msgstr "Editatu Jabber 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 XMPP users."
-msgstr "Bete ezazu bat edo eremu gehiago edozein XMPP erabiltzaileren topaketarako. "
+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. "
 
 #: ../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 XMPP users"
-msgstr "Bilatu XMPP erabiltzaileak"
+msgid "Search for Jabber users"
+msgstr "Bilatu Jabber 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 XMPP ID"
-msgstr "XMPP ID baliogabea"
+msgid "Invalid Jabber ID"
+msgstr "Jabber 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 XMPP Account"
-msgstr "Erregistratu XMPP kontu berria"
+msgid "Register New Jabber Account"
+msgstr "Erregistratu Jabber 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 XMPP Password"
-msgstr "Aldatu XMPP pasahitza"
+msgid "Change Jabber Password"
+msgstr "Aldatu Jabber 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 XMPP ID"
-msgstr "Gaizki osatutako XMPP IDa"
+msgid "Malformed Jabber ID"
+msgstr "Gaizki osatutako Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP protokoloaren plugin-a"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPP mezuaren errorea"
+msgid "Jabber Message Error"
+msgstr "Jabber mezuaren errorea"
 
 #: ../src/protocols/jabber/message.c:295
 #, c-format
--- a/po/fa.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/fa.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "باعث می‌شود یه محض این که کاربران دیگر شروع به وارد کردن پیغام برای شما "
 "می‌کنند، پنجرهٔ گفتگویشان برای شما ظاهر شود.این قابلیت برای "
-"AIM، ‏ICQ، ‏XMPP، ‏Sametime و یاهو کار می‌کند."
+"AIM، ‏ICQ، ‏Jabber، ‏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 "XMPP Account"
-msgstr "حساب XMPP"
+msgid "Jabber Account"
+msgstr "حساب Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "ویرایش کارت مجازی XMPP‏"
+msgid "Edit Jabber vCard"
+msgstr "ویرایش کارت مجازی Jabber‏"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4284,7 +4284,7 @@
 msgid "The following are the results of your search"
 msgstr "نتایج جستجوی شما در زیر آمده است"
 
-#. current comment from XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr ""
-"برای جستجو به دنبال کاربران XMPP یکی یا چند تا از فیلدهای زیر را پر کنید."
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr ""
+"برای جستجو به دنبال کاربران Jabber یکی یا چند تا از فیلدهای زیر را پر کنید."
 
 #: ../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 XMPP users"
-msgstr "جستجو به دنبال کاربران XMPP"
+msgid "Search for Jabber users"
+msgstr "جستجو به دنبال کاربران Jabber"
 
 #. "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 XMPP ID"
-msgstr "شناسهٔ XMPP نامعتبر"
+msgid "Invalid Jabber ID"
+msgstr "شناسهٔ Jabber نامعتبر"
 
 #: ../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 XMPP Account"
-msgstr "ثبت حساب XMPP جدید"
+msgid "Register New Jabber Account"
+msgstr "ثبت حساب Jabber جدید"
 
 #. 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 XMPP Password"
-msgstr "تغییر گذرواژهٔ XMPP"
+msgid "Change Jabber Password"
+msgstr "تغییر گذرواژهٔ Jabber"
 
 #: ../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 XMPP ID"
-msgstr "شناسهٔ XMPP معیوب"
+msgid "Malformed Jabber ID"
+msgstr "شناسهٔ Jabber معیوب"
 
 #: ../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 "XMPP Protocol Plugin"
-msgstr "متصل شوندهٔ قرارداد XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "متصل شوندهٔ قرارداد Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "خطای پیغام XMPP"
+msgid "Jabber Message Error"
+msgstr "خطای پیغام Jabber"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12272,8 +12272,8 @@
 msgstr "هَکر و رانندهٔ انتخابی (علاف)"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "XMPP developer"
-msgstr "برنامه‌ساز XMPP"
+msgid "Jabber developer"
+msgstr "برنامه‌ساز Jabber"
 
 #: ../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!, XMPP, "
+"%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 "
@@ -12557,7 +12557,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "‏%s یک کارگیر پیغام‌رسانی پیمانه‌ای است که قابلیت استغادهٔ هم‌زمان از "
-"AIM، ‏MSN، ‏Yahoo!‎، ‏XMPP، ‏ICQ، ‏IRC، SILC، SIP/SIMPLE، ‏Novell Groupwise، ‏Lotus Sametime، Bonjour، Zephyr "
+"AIM، ‏MSN، ‏Yahoo!‎، ‏Jabber، ‏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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"شما را قادر می‌سازد ورودی خام را به قراردادهای متنی (XMPP، ‏MSN‏، ‏IRC، ‏TOC) "
+"شما را قادر می‌سازد ورودی خام را به قراردادهای متنی (Jabber، ‏MSN‏، ‏IRC، ‏TOC) "
 "ارسال کنید. برای ارسال در جعبهٔ مدخل کلید «ورود» را فشار دهید. مراقب پنجرهٔ "
 "اشکال‌زدایی باشید."
 
@@ -16255,7 +16255,7 @@
 
 #~ msgid ""
 #~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "Jabber, 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 "XMPP ID"
-#~ msgstr "شناسهٔ XMPP‏"
-
-#~ msgid "XMPP Profile"
-#~ msgstr "مجموعه تنظیمات XMPP"
+#~ msgid "Jabber ID"
+#~ msgstr "شناسهٔ Jabber‏"
+
+#~ msgid "Jabber Profile"
+#~ msgstr "مجموعه تنظیمات Jabber"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "خطای فهرست اتاق‌ها"
--- a/po/fi.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/fi.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "Keskusteluikkunat ilmestyvät, kun muut käyttäjät alkavat kirjoittaa viestiä "
-"sinulle. Tämä toimii AIM-, ICQ-, XMPP-, Sametime- ja Yahoo!-"
+"sinulle. Tämä toimii AIM-, ICQ-, Jabber-, 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 "XMPP Account"
-msgstr "XMPP-tili"
+msgid "Jabber Account"
+msgstr "Jabber-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 XMPP vCard"
-msgstr "Muokkaa XMPPin vCardia"
+msgid "Edit Jabber vCard"
+msgstr "Muokkaa Jabberin 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Täytä yksi tai useampia kentistä etsiäksesi XMPP-käyttäjiä."
+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ä."
 
 #: ../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 XMPP users"
-msgstr "Etsi XMPP-käyttäjiä"
+msgid "Search for Jabber users"
+msgstr "Etsi Jabber-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 XMPP ID"
-msgstr "Epäkelpo XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Epäkelpo Jabber 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 XMPP Account"
-msgstr "Rekisteröi uusi XMPP-tili"
+msgid "Register New Jabber Account"
+msgstr "Rekisteröi uusi Jabber-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 XMPP Password"
-msgstr "Vaihda XMPP-salasana"
+msgid "Change Jabber Password"
+msgstr "Vaihda Jabber-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 XMPP ID"
-msgstr "Epäkelpo XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Epäkelpo Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP-yhteyskäytäntöliitännäinen"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber-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 "XMPP Message Error"
-msgstr "XMPP viestivirhe"
+msgid "Jabber Message Error"
+msgstr "Jabber viestivirhe"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12404,8 +12404,8 @@
 msgstr "hakkeri ja kuski [laiska pummi]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "XMPP developer"
-msgstr "XMPP-kehittäjä"
+msgid "Jabber developer"
+msgstr "Jabber-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!, XMPP, "
+"%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 "
@@ -12687,7 +12687,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "%s on modulaarinen pikaviestinsovellus, joka kykenee käyttämään AIM-, MSN-, "
-"Yahoo!-, XMPP-, ICQ-, IRC-, SILC-, SIP/SIMPLE-, Novell GroupWise-, Lotus "
+"Yahoo!-, Jabber-, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 "Antaa sinun lähettää raakamuotoista syötettä tekstipohjaisilla  "
-"yhteyskäytännöillä (XMPP MSN, IRC, TOC). Paina \"Enter\" "
+"yhteyskäytännöillä (Jabber 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 XMPP user directory "
+#~ "Could not query the directory server. Either the Jabber user directory "
 #~ "specified is invalid or directory server could not be reached."
 #~ msgstr ""
-#~ "Ei voitu tehdä hakua hakemistopalvelimelle. Joko määritelty XMPP-"
+#~ "Ei voitu tehdä hakua hakemistopalvelimelle. Joko määritelty Jabber-"
 #~ "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 "XMPP ID"
-#~ msgstr "XMPP ID"
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
 
 #~ msgid "(pending)"
 #~ msgstr "(odottaa)"
@@ -16704,8 +16704,8 @@
 #~ msgid "Buddy Information for %s"
 #~ msgstr "Tuttavan %s tiedot"
 
-#~ msgid "XMPP Profile"
-#~ msgstr "XMPP-profiili"
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabber-profiili"
 
 #~ msgid "User Properties"
 #~ msgstr "Käyttäjän valinnat"
--- a/po/fr.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/fr.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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, XMPP, "
+"commence à vous écrire un message. Cela fonctionne pour AIM, ICQ, Jabber, "
 "Sametime et Yahoo."
 
 #: ../libpurple/plugins/psychic.c:66
@@ -3069,8 +3069,8 @@
 msgstr "Compte AIM"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "XMPP Account"
-msgstr "Compte XMPP"
+msgid "Jabber Account"
+msgstr "Compte Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Modifier la carte de visite XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Modifier la carte de visite Jabber"
 
 #: ../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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Saisissez un ou plusieurs critères de recherche d'utilisateurs XMPP."
+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."
 
 #: ../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 XMPP users"
-msgstr "Rechercher des utilisateurs XMPP"
+msgid "Search for Jabber users"
+msgstr "Rechercher des utilisateurs Jabber"
 
 #. "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 XMPP ID"
-msgstr "Identifiant XMPP non valide"
+msgid "Invalid Jabber ID"
+msgstr "Identifiant Jabber 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 XMPP Account"
-msgstr "Enregistrer un nouveau compte XMPP"
+msgid "Register New Jabber Account"
+msgstr "Enregistrer un nouveau compte Jabber"
 
 #. 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 XMPP Password"
-msgstr "Changer de mot de passe XMPP"
+msgid "Change Jabber Password"
+msgstr "Changer de mot de passe Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Identifiant XMPP non valide."
+msgid "Malformed Jabber ID"
+msgstr "Identifiant Jabber 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 "XMPP Protocol Plugin"
-msgstr "Plugin pour le protocole XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Plugin pour le protocole Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Erreur message XMPP"
+msgid "Jabber Message Error"
+msgstr "Erreur message Jabber"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12502,8 +12502,8 @@
 msgstr "hacker et conducteur désigné [feignasse]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "XMPP developer"
-msgstr "codeur XMPP"
+msgid "Jabber developer"
+msgstr "codeur Jabber"
 
 #: ../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!, XMPP, "
+"%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 "
@@ -12785,7 +12785,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "%s est un client de messagerie modulaire compatible avec AIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 d'envoyer des données bruts aux protocoles en mode texte (XMPP, "
+"Permet d'envoyer des données bruts aux protocoles en mode texte (Jabber, "
 "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 "XMPP ID"
-#~ msgstr "Identifiant XMPP"
+#~ msgid "Jabber ID"
+#~ msgstr "Identifiant Jabber"
 
 #~ msgid "Use last matching buddy"
 #~ msgstr "À valeur égale, choisir le dernier trouvé"
--- a/po/gl.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/gl.po	Tue May 01 14:11:35 2007 +0000
@@ -2308,8 +2308,8 @@
 msgstr "hacker e deseñador de controladores [lazy bum]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "desenvolvedor de XMPP"
+msgid "Jabber developer"
+msgstr "desenvolvedor de Jabber"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -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!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, "
+"MSN, Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Permítelle enviar datos en bruto a protocolos baseados en texto (XMPP, "
+"Permítelle enviar datos en bruto a protocolos baseados en texto (Jabber, "
 "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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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, XMPP, Sametime e Yahoo!"
+"unha mensaxe. Isto funciona con AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "Conta de XMPP"
+msgid "Jabber Account"
+msgstr "Conta de Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Editar vCard de XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Editar vCard de Jabber"
 
 #: ../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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 "Encha un ou máis dos campos amosados a seguir para localizar usuarios "
-"XMPP."
+"Jabber."
 
 #: ../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 XMPP users"
-msgstr "Localizar usuarios de XMPP"
+msgid "Search for Jabber users"
+msgstr "Localizar usuarios de Jabber"
 
 #: ../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 XMPP ID"
-msgstr "ID de XMPP non válido"
+msgid "Invalid Jabber ID"
+msgstr "ID de Jabber 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 XMPP Account"
-msgstr "Rexistrando a conta nova de XMPP"
+msgid "Register New Jabber Account"
+msgstr "Rexistrando a conta nova de Jabber"
 
 #: ../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 XMPP Password"
-msgstr "Modificar o contrasinal de XMPP"
+msgid "Change Jabber Password"
+msgstr "Modificar o contrasinal de Jabber"
 
 #: ../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 XMPP ID"
-msgstr "ID de XMPP inválido"
+msgid "Malformed Jabber ID"
+msgstr "ID de Jabber 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 "XMPP Protocol Plugin"
-msgstr "Complemento de protocolo XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Complemento de protocolo Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Mensaxe de erro de XMPP"
+msgid "Jabber Message Error"
+msgstr "Mensaxe de erro de Jabber"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/gu.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/gu.po	Tue May 01 14:11:35 2007 +0000
@@ -832,10 +832,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"તમને હરોળ ઈનપુટ લખાણ-આધારિત પ્રોટોકોલો (XMPP, MSN, IRC, TOC) માં મોકલવા માટે "
+"તમને હરોળ ઈનપુટ લખાણ-આધારિત પ્રોટોકોલો (Jabber, MSN, IRC, TOC) માં મોકલવા માટે "
 "પરવાનગી આપે છે. મોકલવા માટે પ્રવેશ બોક્સમાં 'Enter' દબાવો. ડિબગ વિન્ડો જુઓ."
 
 #: plugins/relnot.c:63
@@ -2735,8 +2735,8 @@
 msgstr "libfaim જાળવનાર"
 
 #: src/gtkdialogs.c:92
-msgid "XMPP developer"
-msgstr "XMPP વિકાસકર્તા"
+msgid "Jabber developer"
+msgstr "Jabber વિકાસકર્તા"
 
 #: 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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!, XMPP, ICQ, IRC, SILC, "
+"Gaim એ મોડ્યુલ સંદેશાવ્યવહાર ક્લાઈન્ટ છે જે AIM, MSN, Yahoo!, Jabber, 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 XMPP vCard"
-msgstr "XMPP vCard માં ફેરફાર કરો"
+msgid "Edit Jabber vCard"
+msgstr "Jabber vCard માં ફેરફાર કરો"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5572,8 +5572,8 @@
 "અનુભવો."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "અયોગ્ય XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "અયોગ્ય Jabber 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 XMPP Account"
-msgstr "નવું XMPP ખાતું રજીસ્ટર કરો"
+msgid "Register New Jabber Account"
+msgstr "નવું Jabber ખાતું રજીસ્ટર કરો"
 
 #: 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 XMPP Password"
-msgstr "XMPP પાસવર્ડ બદલો"
+msgid "Change Jabber Password"
+msgstr "Jabber પાસવર્ડ બદલો"
 
 #: 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 XMPP ID"
-msgstr "મલીન XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "મલીન Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP પ્રોટોકોલ પ્લગઈન"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber પ્રોટોકોલ પ્લગઈન"
 
 #: 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 "XMPP Message Error"
-msgstr "XMPP સંદેશા ક્ષતિ"
+msgid "Jabber Message Error"
+msgstr "Jabber સંદેશા ક્ષતિ"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -11887,8 +11887,8 @@
 msgid "Invalid nickname"
 msgstr "અયોગ્ય નામ"
 
-msgid "XMPP Profile"
-msgstr "XMPP રૂપરેખા"
+msgid "Jabber Profile"
+msgstr "Jabber રૂપરેખા"
 
 msgid "Roomlist Error"
 msgstr "કક્ષયાદી ક્ષતિ"
--- a/po/he.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/he.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "גורם לחלונות-שיחה להופיע כבר כאשר אנשי קשר מתחילים לכתוב הודעה.  זה עובד "
-"עבור AIM, ICQ, XMPP, Sametime, Yahoo!"
+"עבור AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "חשבון XMPP"
+msgid "Jabber Account"
+msgstr "חשבון Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "ערוך את ב-XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "ערוך את ב-Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "יש להזין אחד או יותר מן השדות לביצוע חיפוש של משתמשי XMPP מתאימים."
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr "יש להזין אחד או יותר מן השדות לביצוע חיפוש של משתמשי Jabber מתאימים."
 
 #: ../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 XMPP users"
-msgstr "חפש משתמשי XMPP"
+msgid "Search for Jabber users"
+msgstr "חפש משתמשי Jabber"
 
 #. "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 XMPP ID"
-msgstr "זיהוי משתמש XMPP לא תקין"
+msgid "Invalid Jabber ID"
+msgstr "זיהוי משתמש Jabber לא תקין"
 
 #: ../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 XMPP Account"
-msgstr "רשום חשבון XMPP חדש"
+msgid "Register New Jabber Account"
+msgstr "רשום חשבון Jabber חדש"
 
 #. 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr "הסיסמה שלך שונתה בהצלחה"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
@@ -4632,8 +4632,8 @@
 msgstr "פריט לא נמצא"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed XMPP ID"
-msgstr "זיהוי משתמש XMPP לא תקין"
+msgid "Malformed Jabber ID"
+msgstr "זיהוי משתמש Jabber לא תקין"
 
 #: ../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 "XMPP Protocol Plugin"
-msgstr "תוסף פרוטוקול XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "תוסף פרוטוקול Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "הודעת שגיאה לא מוכרת (XMPP)"
+msgid "Jabber Message Error"
+msgstr "הודעת שגיאה לא מוכרת (Jabber)"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12223,8 +12223,8 @@
 msgstr "מתכנת ונהג פיכח - עצלן"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "XMPP developer"
-msgstr "מפתח XMPP"
+msgid "Jabber developer"
+msgstr "מפתח Jabber"
 
 #: ../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!, XMPP, "
+"%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 "
@@ -12506,7 +12506,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "%s הינה תוכנת שליחת הודעות מיידיות מודולרית המאפשרת שימוש ב AIM, MSN,  "
-"Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novel GroupWise, Lotus Sametime, "
+"Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט כגון XMPP, MSN, IRC, "
+"מאפשר לך לשלוח מידע גולמי לפרוטוקולים על בסיס טקסט כגון Jabber, MSN, IRC, "
 "TOC.לחץ 'Enter' בתיבת ההזנה לשלוח. צפה בחלון ניפוי הבאגים."
 
 #: ../pidgin/plugins/relnot.c:71
@@ -15897,8 +15897,8 @@
 #~ msgid "Change password"
 #~ msgstr "שנה סיסמא"
 
-#~ msgid "XMPP ID"
-#~ msgstr "זיהוי XMPP"
+#~ msgid "Jabber ID"
+#~ msgstr "זיהוי Jabber"
 
 #~ msgid "Error processing event or response (%s)."
 #~ msgstr "שגיאה בעיבוד אירוע או משוב (%s)."
@@ -16177,8 +16177,8 @@
 #~ msgid "Buddy Information for %s"
 #~ msgstr "מידע על איש הקשר %s"
 
-#~ msgid "XMPP Profile"
-#~ msgstr "פרופיל XMPP"
+#~ msgid "Jabber Profile"
+#~ msgstr "פרופיל Jabber"
 
 #~ msgid "User Properties"
 #~ msgstr "מאפייני המשתמש"
--- a/po/hi.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/hi.po	Tue May 01 14:11:35 2007 +0000
@@ -974,7 +974,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 "अक्षर आधारित प्रोटॅकोल पर अपूर्ण इनपुट भेजने देता है. (जैबर, एमएसएन, आईआरसी, टीओसी). "
@@ -3033,7 +3033,7 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
+msgid "Jabber developer"
 msgstr "पूर्व जेबर डेवलपर्स"
 
 #: src/gtkdialogs.c:93
@@ -3206,7 +3206,7 @@
 #, fuzzy
 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 "
+"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 ""
 "गेम एक माड्यूलर इंस्टेंट मैसेन्जिंग क्लायन्ट है जो एआईएम, आईसीक्यू, याहू!, एमएसएन, आईआरसी, "
@@ -5973,7 +5973,7 @@
 msgstr "जन्मदिन"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit XMPP vCard"
+msgid "Edit Jabber vCard"
 msgstr "जैबर वीकार्ड का संपादन करें"
 
 #: src/protocols/jabber/buddy.c:569
@@ -5983,7 +5983,7 @@
 msgstr "सब चीज़ें वैकल्पिक हैं। जिस जानकारी को भरने में आपको को समस्या न हो केवल वही भरें।"
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
+msgid "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "अवौध जैबर आईडी(XMPP ID)"
+msgid "Invalid Jabber ID"
+msgstr "अवौध जैबर आईडी(Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
-msgstr "जैबर(XMPP) पासवर्ड बदलें"
+msgid "Change Jabber Password"
+msgstr "जैबर(Jabber) पासवर्ड बदलें"
 
 #: 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 XMPP ID"
-msgstr "अमान्य जैबर(XMPP) आइ डी"
+msgid "Malformed Jabber ID"
+msgstr "अमान्य जैबर(Jabber) आइ डी"
 
 #: 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr "जैबर प्रोटॅकोल प्लगइन"
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6697,7 +6697,7 @@
 msgstr "%s को संदेश भेजना विफल: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr "जैबर संदेश त्रुटि "
 
 #: src/protocols/jabber/message.c:297
@@ -12481,7 +12481,7 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "अवैध उपयोगकर्ता-नाम"
 
-#~ msgid "XMPP Profile"
+#~ msgid "Jabber Profile"
 #~ msgstr "जै़बर प्रोफ़ाइल"
 
 #~ msgid "Roomlist Error"
--- a/po/hu.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/hu.po	Tue May 01 14:11:35 2007 +0000
@@ -2305,8 +2305,8 @@
 msgstr "hacker és kijelölt vezető"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "XMPP fejlesztő"
+msgid "Jabber developer"
+msgstr "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -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!, XMPP, ICQ, IRC, "
+"A Gaim egy moduláris üzenetküldő kliens AIM, MSN, Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (XMPP, "
+"Nyers adatküldésre ad lehetőséget szövegalapú protokollok számára (Jabber, "
 "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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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, XMPP, Sametime és Yahoo! protokollokkal "
+"üzenetüket írni.  Ez az AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "XMPP fiók"
+msgid "Jabber Account"
+msgstr "Jabber 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 XMPP vCard"
-msgstr "XMPP vCard szerkesztése"
+msgid "Edit Jabber vCard"
+msgstr "Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Töltsön ki legalább egy mezőt a megfelelő XMPP felhasználók kereséséhez."
+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."
 
 #: ../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 XMPP users"
-msgstr "XMPP felhasználók keresése"
+msgid "Search for Jabber users"
+msgstr "Jabber 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 XMPP ID"
-msgstr "Érvénytelen XMPP azonosító"
+msgid "Invalid Jabber ID"
+msgstr "Érvénytelen Jabber 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 XMPP Account"
-msgstr "Új XMPP fiók regisztrálása"
+msgid "Register New Jabber Account"
+msgstr "Új Jabber 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 XMPP Password"
-msgstr "XMPP jelszó megváltoztatása"
+msgid "Change Jabber Password"
+msgstr "Jabber 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 XMPP ID"
-msgstr "Rosszul formázott XMPP azonosító"
+msgid "Malformed Jabber ID"
+msgstr "Rosszul formázott Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP protokollbővítmény"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPP üzenethiba"
+msgid "Jabber Message Error"
+msgstr "Jabber üzenethiba"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/id.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/id.po	Tue May 01 14:11:35 2007 +0000
@@ -2294,8 +2294,8 @@
 msgstr "hacker dan driver yang ditujukan [si pemalas]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "Pengembang XMPP"
+msgid "Jabber developer"
+msgstr "Pengembang Jabber"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -2538,7 +2538,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim adalah klien pengiriman pesan modular yang dapat menggunakanAIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Membiarkan anda mengirim input mentah ke protokol berbasis teks (XMPP, MSN, IRC, "
+"Membiarkan anda mengirim input mentah ke protokol berbasis teks (Jabber, 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "Menyebabkan jendela percakapan muncul ketika pengguna lain mulai mengirim pesan pada anda.  "
-"Ini berfungsi untuk AIM, ICQ, XMPP, Sametime, dan Yahoo!"
+"Ini berfungsi untuk AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "Akun XMPP"
+msgid "Jabber Account"
+msgstr "Akun Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Rubah vCard XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Rubah vCard Jabber"
 
 #: ../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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Masukkan satu atau beberapa bagian untuk mencari pengguna XMPP yang sesuai."
+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."
 
 #: ../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 XMPP users"
-msgstr "Cari pengguna XMPP"
+msgid "Search for Jabber users"
+msgstr "Cari pengguna Jabber"
 
 #: ../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 XMPP ID"
-msgstr "ID XMPP tidak valid"
+msgid "Invalid Jabber ID"
+msgstr "ID Jabber 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 XMPP Account"
-msgstr "Daftarkan Akun XMPP Baru"
+msgid "Register New Jabber Account"
+msgstr "Daftarkan Akun Jabber 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 XMPP Password"
-msgstr "Ganti Kata Sandi XMPP"
+msgid "Change Jabber Password"
+msgstr "Ganti Kata Sandi Jabber"
 
 #: ../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 XMPP ID"
-msgstr "ID XMPP salah bentuk"
+msgid "Malformed Jabber ID"
+msgstr "ID Jabber 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 "XMPP Protocol Plugin"
-msgstr "Plugin Protokol XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Plugin Protokol Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Kesalahan Pesan XMPP"
+msgid "Jabber Message Error"
+msgstr "Kesalahan Pesan Jabber"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/it.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/it.po	Tue May 01 14:11:35 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, 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!"
+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!"
 
 #: ../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 "XMPP Account"
-msgstr "Account XMPP"
+msgid "Jabber Account"
+msgstr "Account Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Modifica la vCard di XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Modifica la vCard di Jabber"
 
 #: ../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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "Cerca utenti XMPP"
+msgid "Search for Jabber users"
+msgstr "Cerca utenti Jabber"
 
 #. "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 XMPP ID"
-msgstr "ID XMPP non valido"
+msgid "Invalid Jabber ID"
+msgstr "ID Jabber 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 XMPP Account"
-msgstr "Registra un nuovo account XMPP"
+msgid "Register New Jabber Account"
+msgstr "Registra un nuovo account Jabber"
 
 #. 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 XMPP Password"
-msgstr "Cambia la password di XMPP"
+msgid "Change Jabber Password"
+msgstr "Cambia la password di Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Formato ID XMPP non valido"
+msgid "Malformed Jabber ID"
+msgstr "Formato ID Jabber 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 "XMPP Protocol Plugin"
-msgstr "Plugin per il protocollo XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Plugin per il protocollo Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Errore messaggio XMPP"
+msgid "Jabber Message Error"
+msgstr "Errore messaggio Jabber"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12284,8 +12284,8 @@
 msgstr "hacker e autista designato [lazy bum]"
 
 #: ../pidgin/gtkdialogs.c:114
-msgid "XMPP developer"
-msgstr "Sviluppatore per XMPP"
+msgid "Jabber developer"
+msgstr "Sviluppatore per Jabber"
 
 #: ../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!, 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>"
+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>"
 
 #: ../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 (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."
+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."
 
 #: ../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!, "
-#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "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 è un client modulare per messaggi immediati in grado di usare AIM, "
-#~ "MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr e "
+#~ "MSN, Yahoo!, Jabber, 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 "XMPP ID"
-#~ msgstr "ID XMPP"
+#~ msgid "Jabber ID"
+#~ msgstr "ID Jabber"
 #~ 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 "XMPP Profile"
-#~ msgstr "Profilo di XMPP"
+#~ msgid "Jabber Profile"
+#~ msgstr "Profilo di Jabber"
 #~ 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 05:53:57 2007 +0000
+++ b/po/ja.po	Tue May 01 14:11:35 2007 +0000
@@ -2299,8 +2299,8 @@
 msgstr "ハッカーと指定したドライバ [lazy bum]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "XMPP の開発者"
+msgid "Jabber developer"
+msgstr "Jabber の開発者"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -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!、XMPP、ICQ、IRC、SILC、SIP/SIMPLE、Novell "
+"Gaim は AIM、MSN、Yahoo!、Jabber、ICQ、IRC、SILC、SIP/SIMPLE、Novell "
 "GroupWise、Lotus Sametime、Bonjour、Zephyr、Gadu-Gadu、QQ といったプロトコル"
 "を全て同時に利用できる、GTK+ ツールキットを採用したモジュール型のメッセージ・"
 "クライアントです。<BR><BR>GPL ライセンス (第二版、あるいはそれ以降の版) が定"
@@ -5146,10 +5146,10 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"入力した生データをテキスト形式のプロトコル (XMPP, MSN, IRC, TOC) へ送信でき"
+"入力した生データをテキスト形式のプロトコル (Jabber, MSN, IRC, TOC) へ送信でき"
 "ます。送信する際は入力ボックスの中で [ENTER] キーを押して下さい。デバッグ・"
 "ウィンドウで送信内容を監視して下さい。"
 
@@ -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, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"仲間が入力したメッセージを会話ウィンドウに直接表示します (AIM、ICQ、XMPP、"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"仲間が入力したメッセージを会話ウィンドウに直接表示します (AIM、ICQ、Jabber、"
 "Sametime、Yahoo!で動作します)。"
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7030,8 +7030,8 @@
 msgstr "AIM のアカウント"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "XMPP Account"
-msgstr "XMPP のアカウント"
+msgid "Jabber Account"
+msgstr "Jabber のアカウント"
 
 #: ../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 XMPP vCard"
-msgstr "XMPP vCard の編集"
+msgid "Edit Jabber vCard"
+msgstr "Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "XMPP ユーザを検索するには一つ以上の欄を埋めて下さい:"
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr "Jabber ユーザを検索するには一つ以上の欄を埋めて下さい:"
 
 #: ../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 XMPP users"
-msgstr "XMPP ユーザの検索"
+msgid "Search for Jabber users"
+msgstr "Jabber ユーザの検索"
 
 #: ../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 XMPP ID"
-msgstr "不正な XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "不正な Jabber 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 XMPP Account"
-msgstr "新しい XMPP アカウントの登録"
+msgid "Register New Jabber Account"
+msgstr "新しい Jabber アカウントの登録"
 
 #: ../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 XMPP Password"
-msgstr "XMPP パスワードの変更"
+msgid "Change Jabber Password"
+msgstr "Jabber パスワードの変更"
 
 #: ../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 XMPP ID"
-msgstr "おかしな XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "おかしな Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP プロトコルのプラグイン"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber プロトコルのプラグイン"
 
 #: ../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 "XMPP Message Error"
-msgstr "XMPP メッセージ・エラー"
+msgid "Jabber Message Error"
+msgstr "Jabber メッセージ・エラー"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/ka.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/ka.po	Tue May 01 14:11:35 2007 +0000
@@ -1214,7 +1214,7 @@
 
 #: ../plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -3285,8 +3285,8 @@
 
 #: ../src/gtkdialogs.c:98
 #, fuzzy
-msgid "XMPP developer"
-msgstr "XMPP"
+msgid "Jabber developer"
+msgstr "Jabber"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"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 "
@@ -6381,8 +6381,8 @@
 msgstr "დაბადების დღე"
 
 #: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
-msgid "Edit XMPP vCard"
-msgstr "XMPP vCard-ის რედაქტირება"
+msgid "Edit Jabber vCard"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "არასწორი XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "არასწორი Jabber 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 XMPP Account"
-msgstr "ახალი XMPP ანგარიშის რეგისტრაცია"
+msgid "Register New Jabber Account"
+msgstr "ახალი Jabber ანგარიშის რეგისტრაცია"
 
 #: ../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 XMPP Password"
-msgstr "შეცვალე XMPP პაროლი"
+msgid "Change Jabber Password"
+msgstr "შეცვალე Jabber პაროლი"
 
 #: ../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 XMPP ID"
-msgstr "არასწორი XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "არასწორი Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP პროტოკოლის პლაგინი"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber პროტოკოლის პლაგინი"
 
 #: ../src/protocols/jabber/jabber.c:1794
 msgid "Use TLS if available"
@@ -7070,8 +7070,8 @@
 msgstr ""
 
 #: ../src/protocols/jabber/message.c:233
-msgid "XMPP Message Error"
-msgstr "XMPP შეტყობინების შეცდომა"
+msgid "Jabber Message Error"
+msgstr "Jabber შეტყობინების შეცდომა"
 
 #: ../src/protocols/jabber/message.c:297
 #, c-format
--- a/po/kn.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/kn.po	Tue May 01 14:11:35 2007 +0000
@@ -2100,7 +2100,7 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:102
-msgid "XMPP developer"
+msgid "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, "
+"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.  "
@@ -4910,7 +4910,7 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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 "XMPP Account"
+msgid "Jabber 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 XMPP vCard"
+msgid "Edit Jabber vCard"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/buddy.c:590
@@ -7527,7 +7527,7 @@
 "ನಿಮ್ಮ ಹುಡುಕುವಿಕೆಯ "
 "ಫಲಿತಾಂಶಗಳು ಇಲ್ಲಿವೆ"
 
-#. current comment from XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
-msgstr "XMPP ಪ್ರವೇಶಪದ ಬದಲಿಸಿ..."
+msgid "Change Jabber Password"
+msgstr "Jabber ಪ್ರವೇಶಪದ ಬದಲಿಸಿ..."
 
 #: ../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 XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1961
@@ -8200,7 +8200,7 @@
 msgstr " %s ರಿಗೆ ಸಂದೇಶ ವಿತರಣೆ ವಿಫಲ : %s"
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/message.c:316
--- a/po/ko.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/ko.po	Tue May 01 14:11:35 2007 +0000
@@ -839,7 +839,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -2779,8 +2779,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
-msgstr "예전 재버(XMPP) 개발자"
+msgid "Jabber developer"
+msgstr "예전 재버(Jabber) 개발자"
 
 #: 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 ""
-"게임은 AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, "
+"게임은 AIM, MSN, Yahoo!, Jabber, 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 XMPP vCard"
-msgstr "XMPP vCard 고치기"
+msgid "Edit Jabber vCard"
+msgstr "Jabber vCard 고치기"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5624,7 +5624,7 @@
 "세요."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
+msgid "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr "재버 열쇠글 바꾸기"
 
 #: src/protocols/jabber/jabber.c:1161
@@ -6020,7 +6020,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP 프로토콜 플러그인"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 프로토콜 플러그인"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6336,7 +6336,7 @@
 
 #: src/protocols/jabber/message.c:233
 #, fuzzy
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr "재버 오류"
 
 #: src/protocols/jabber/message.c:297
@@ -11863,7 +11863,7 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "잘못된 사용자 이름"
 
-#~ msgid "XMPP Profile"
+#~ msgid "Jabber Profile"
 #~ msgstr "재버 프로필"
 
 #~ msgid "Roomlist Error"
--- a/po/ku.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/ku.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "Dema kesên din ji te re peyam nivîsand wê bixweber paceya axaftinê vebe. Ev "
-"ji bo AIM,ICQ, XMPP, Sametime û Yahoo dixebite."
+"ji bo AIM,ICQ, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"dihêle ku tu têketanên negihiştî bişînî protokolên nivîskî (XMPP, MSN, "
+"dihêle ku tu têketanên negihiştî bişînî protokolên nivîskî (Jabber, 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 XMPP Biafirîne"
+msgstr "Hesabeke Nû ya Jabber 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 "XMPP developer"
-msgstr "Pêşvebirê XMPP"
+msgid "Jabber developer"
+msgstr "Pêşvebirê Jabber"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"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 "
@@ -6210,8 +6210,8 @@
 msgstr "Roja dayîkbûnê"
 
 #: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
-msgid "Edit XMPP vCard"
-msgstr "VCarda XMPP serast bike"
+msgid "Edit Jabber vCard"
+msgstr "VCarda Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "Bikarhênerên XMPP Bigere"
+msgid "Search for Jabber users"
+msgstr "Bikarhênerên Jabber 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 XMPP ID"
-msgstr "ID'a XMPP a nederbasdar"
+msgid "Invalid Jabber ID"
+msgstr "ID'a Jabber 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 XMPP Account"
-msgstr "Hesabeke Nû ya XMPP Biafirîne"
+msgid "Register New Jabber Account"
+msgstr "Hesabeke Nû ya Jabber 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 XMPP Password"
-msgstr "Şîfreya XMPP biguherîne"
+msgid "Change Jabber Password"
+msgstr "Şîfreya Jabber 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 XMPP ID"
-msgstr "Malformed XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "Pêveke Protokola XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Pêveke Protokola Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Xeletiya Peyam a XMPP"
+msgid "Jabber Message Error"
+msgstr "Xeletiya Peyam a Jabber"
 
 #: ../src/protocols/jabber/message.c:295
 #, c-format
@@ -12791,8 +12791,8 @@
 #~ msgid "<main>/Conversation/Close"
 #~ msgstr "<main>/Nivîsandin/Bigire"
 
-#~ msgid "former XMPP developer"
-#~ msgstr "Pêşxistinkara XMPP"
+#~ msgid "former Jabber developer"
+#~ msgstr "Pêşxistinkara Jabber"
 
 #~ msgid "Azerbaijani"
 #~ msgstr "Azerbaijani"
@@ -12833,11 +12833,11 @@
 
 #~ 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 "
+#~ "Jabber, 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!, XMPP, ICQ, IRC, SILC, Novell GroupWise, "
+#~ "hesabên xwe yên AIM, MSN, Yahoo!, Jabber, 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 "XMPP ID"
-#~ msgstr "ID ya XMPP"
-
-#~ msgid "XMPP Profile"
-#~ msgstr "Profîla XMPP"
+#~ msgid "Jabber ID"
+#~ msgstr "ID ya Jabber"
+
+#~ msgid "Jabber Profile"
+#~ msgstr "Profîla Jabber"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Xeletiya Lîsteya Odeyê"
--- a/po/lt.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/lt.po	Tue May 01 14:11:35 2007 +0000
@@ -2365,8 +2365,8 @@
 msgstr "hakeris ir negeriantis, nes prie vairo [tingus netikėlis]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "XMPP kūrėjas"
+msgid "Jabber developer"
+msgstr "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -2607,7 +2607,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim yra modulinė pokalbių programa, su kuria galima bendrauti AIM, MSN, "
-"Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
+"Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Leidžia Jums siųsti neapdorotą įvesti tekstiniams protokolams (XMPP, MSN, "
+"Leidžia Jums siųsti neapdorotą įvesti tekstiniams protokolams (Jabber, 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 "Atidaro pokalbių langus, kai kiti vartotojai tik pradeda rašyti Jums "
-"žinutę.  Ši funkcija veikia AIM, ICQ, XMPP, Sametime ir Yahoo! "
+"žinutę.  Ši funkcija veikia AIM, ICQ, Jabber, Sametime ir Yahoo! "
 "protokoluose."
 
 #: ../libgaim/plugins/psychic.c:66
@@ -7292,8 +7292,8 @@
 msgstr "AIM paskyra"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "XMPP Account"
-msgstr "XMPP paskyra"
+msgid "Jabber Account"
+msgstr "Jabber 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 XMPP vCard"
-msgstr "Redaguoti XMPP vCard vizitinę kortelę"
+msgid "Edit Jabber vCard"
+msgstr "Redaguoti Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Užpildykite vieną ar daugiau laukų XMPP vartotojų paieškai."
+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."
 
 #: ../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 XMPP users"
-msgstr "Ieškoti XMPP vartotojų"
+msgid "Search for Jabber users"
+msgstr "Ieškoti Jabber 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 XMPP ID"
-msgstr "Neteisingas XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Neteisingas Jabber 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 XMPP Account"
-msgstr "Registruoti naują XMPP abonentą"
+msgid "Register New Jabber Account"
+msgstr "Registruoti naują Jabber 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 XMPP Password"
-msgstr "Pakeisti XMPP slaptažodį"
+msgid "Change Jabber Password"
+msgstr "Pakeisti Jabber 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 XMPP ID"
-msgstr "Neteisingai suformuotas XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Neteisingai suformuotas Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP protokolo papildinys"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPP pranešimo klaida"
+msgid "Jabber Message Error"
+msgstr "Jabber pranešimo klaida"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/mk.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/mk.po	Tue May 01 14:11:35 2007 +0000
@@ -837,10 +837,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Ви овозможува да испраќате чисти влезни податоци до текстуално-базирани протоколи. (XMPP, MSN, IRC, "
+"Ви овозможува да испраќате чисти влезни податоци до текстуално-базирани протоколи. (Jabber, MSN, IRC, "
 "TOC). Притиснете на „Enter“ во полето за внесување за да изпратите. Гледајте го прозорецот за дебагирање."
 
 #: plugins/relnot.c:63
@@ -2757,7 +2757,7 @@
 msgstr "оддржувач на libfaim"
 
 #: src/gtkdialogs.c:92
-msgid "XMPP developer"
+msgid "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr и Gadu-Gadu истовремено. "
+"Jabber, 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 XMPP vCard"
-msgstr "Уреди vCard за XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Уреди vCard за Jabber"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5591,8 +5591,8 @@
 "дека се потребни,"
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ИД"
+msgid "Jabber ID"
+msgstr "Jabber ИД"
 
 #: 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 XMPP users."
-msgstr "Пополнете едно или повеќе полиња за да барате корисници на XMPP кои се совпаѓаат."
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr "Пополнете едно или повеќе полиња за да барате корисници на Jabber кои се совпаѓаат."
 
 #: 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 XMPP users"
-msgstr "Барај корисници на XMPP"
+msgid "Search for Jabber users"
+msgstr "Барај корисници на Jabber"
 
 #: 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 XMPP ID"
-msgstr "Невалидно Ид. за XMPP"
+msgid "Invalid Jabber ID"
+msgstr "Невалидно Ид. за Jabber"
 
 #: 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 XMPP Account"
-msgstr "Регистрирај нова сметка за XMPP"
+msgid "Register New Jabber Account"
+msgstr "Регистрирај нова сметка за Jabber"
 
 #: 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 XMPP Password"
-msgstr "Промени ја лозинката за XMPP"
+msgid "Change Jabber Password"
+msgstr "Промени ја лозинката за Jabber"
 
 #: 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 XMPP ID"
-msgstr "Неточнa ИД за XMPP"
+msgid "Malformed Jabber ID"
+msgstr "Неточнa ИД за Jabber"
 
 #: 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 "XMPP Protocol Plugin"
-msgstr "Приклучок за XMPP протоколот"
+msgid "Jabber Protocol Plugin"
+msgstr "Приклучок за Jabber протоколот"
 
 #: 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 "XMPP Message Error"
-msgstr "Грешка во XMPP пораката"
+msgid "Jabber Message Error"
+msgstr "Грешка во Jabber пораката"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
--- a/po/my_MM.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/my_MM.po	Tue May 01 14:11:35 2007 +0000
@@ -848,10 +848,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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."
 
 #: plugins/relnot.c:63
@@ -2821,8 +2821,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
-msgstr "former XMPP developer"
+msgid "Jabber developer"
+msgstr "former Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"Jabber, 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 XMPP Account"
+msgstr "Register New Jabber 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 XMPP vCard"
-msgstr "Edit XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Edit Jabber vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5736,8 +5736,8 @@
 "comfortable."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "Invalid XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Invalid Jabber 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 XMPP Account"
-msgstr "Register New XMPP Account"
+msgid "Register New Jabber Account"
+msgstr "Register New Jabber 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 XMPP Password"
-msgstr "Change XMPP Password"
+msgid "Change Jabber Password"
+msgstr "Change Jabber 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 XMPP ID"
-msgstr "Malformed XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPP Message Error"
+msgid "Jabber Message Error"
+msgstr "Jabber Message Error"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12169,8 +12169,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Invalid Username"
 
-#~ msgid "XMPP Profile"
-#~ msgstr "XMPP Profile"
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabber Profile"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Roomlist Error"
--- a/po/nb.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/nb.po	Tue May 01 14:11:35 2007 +0000
@@ -900,10 +900,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Lar deg sende direktekommandoer til tekstbaserte protokoller (XMPP, MSN, "
+"Lar deg sende direktekommandoer til tekstbaserte protokoller (Jabber, MSN, "
 "IRC, TOC). Trykk 'Enter' for  sende, og sjekk avlusningsvinduet."
 
 #: plugins/relnot.c:63
@@ -2889,7 +2889,7 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
+msgid "Jabber developer"
 msgstr "tidligere jabber-utvikler"
 
 #
@@ -3071,11 +3071,11 @@
 #, fuzzy
 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 "
+"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 er en modulbasert klient for direktemeldinger som kan bruke AIM, MSN, "
-"Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, og Gadu-"
+"Yahoo!, Jabber, 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 "Fdselsdag"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit XMPP vCard"
-msgstr "Rediger vCard for XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Rediger vCard for Jabber"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5803,8 +5803,8 @@
 "informasjonen du nsker"
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP-feil"
+msgid "Jabber ID"
+msgstr "Jabber-feil"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5882,8 +5882,8 @@
 msgstr "Flgende resultat fra ditt sk"
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching XMPP users."
-msgstr "Fyll inn ett eller flere felt for  ske etter matchende XMPP brukere."
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr "Fyll inn ett eller flere felt for  ske etter matchende Jabber 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 XMPP users"
+msgid "Search for Jabber users"
 msgstr "Kontaktsk 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr "Bytt jabber-passord"
 
 #: src/protocols/jabber/jabber.c:1161
@@ -6207,7 +6207,7 @@
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP-protokolltillegg"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber-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 "XMPP Message Error"
-msgstr "XMPP beskjedfeil"
+msgid "Jabber Message Error"
+msgstr "Jabber beskjedfeil"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12302,8 +12302,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Ugyldig brukernavn"
 
-#~ msgid "XMPP Profile"
-#~ msgstr "XMPP-profil"
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabber-profil"
 
 #
 #~ msgid "Roomlist Error"
--- a/po/ne.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/ne.po	Tue May 01 14:11:35 2007 +0000
@@ -831,9 +831,9 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 "पाठ आधारित प्रोटोकल(XMPP, MSN, IRC, TOC)हरूमा कच्चा आगत पठाउन सक्नुहुन्छ । प्रविष्टि वाकसमा पठाउन प्रविष्टिमा हिट गर्नुहोस् । डिबग सञ्झ्याल हेर्नुहोस् ।"
+msgstr "पाठ आधारित प्रोटोकल(Jabber, MSN, IRC, TOC)हरूमा कच्चा आगत पठाउन सक्नुहुन्छ । प्रविष्टि वाकसमा पठाउन प्रविष्टिमा हिट गर्नुहोस् । डिबग सञ्झ्याल हेर्नुहोस् ।"
 
 #: plugins/relnot.c:63
 #, c-format
@@ -2936,7 +2936,7 @@
 msgstr "पूर्व सम्भारकर्ता"
 
 #: src/gtkdialogs.c:95
-msgid "former XMPP developer"
+msgid "former Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"Jabber, 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, र Gadu-Gadu सबै प्रयोग गरिने क्षमाता भएको एउटा मोड्युलर सन्देश ग्राहक हो ।  यो Gtk+ प्रयोग गरेर लेखिन्छ र GPL.<BR><BR> अन्तर्गत अनुमति प्राप्त हुन्छ"
+"Jabber, 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 XMPP vCard"
+msgid "Edit Jabber vCard"
 msgstr "ज्याबर vCard सम्पादन गर्नुहोस्"
 
 #: src/protocols/jabber/buddy.c:511
@@ -5763,7 +5763,7 @@
 msgstr "तल दिइएका सबै वस्तुहरू एेच्छिक हुन् । त्यस्तो जानकारीहरू मात्र प्रविष्टि गराउनुहोस् जुन चाहि तपाईँको विचारमा उपयुक्त हुन्छ ।"
 
 #: src/protocols/jabber/buddy.c:556
-msgid "XMPP ID"
+msgid "Jabber 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 "XMPP Profile"
+msgid "Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr "ज्याबर पासवर्ड परिवर्तन गर्नुहोस्"
 
 #: src/protocols/jabber/jabber.c:1087
@@ -6126,7 +6126,7 @@
 msgstr "वस्तु फेला परेन"
 
 #: src/protocols/jabber/jabber.c:1193
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr "ज्याबर प्रोटोकल प्लगइन"
 
 #: src/protocols/jabber/jabber.c:1655
@@ -6419,7 +6419,7 @@
 msgstr "%s मा सन्देश हस्तान्तरण असफल भयो:%s"
 
 #: src/protocols/jabber/message.c:233
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr "ज्याबर सन्देश त्रुटि"
 
 #: src/protocols/jabber/message.c:297
--- a/po/nl.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/nl.po	Tue May 01 14:11:35 2007 +0000
@@ -2246,8 +2246,8 @@
 msgstr "hacker en BOB (luie donder)"
 
 #: ../gtk/gtkdialogs.c:102
-msgid "XMPP developer"
-msgstr "ontwikkelaar van XMPP"
+msgid "Jabber developer"
+msgstr "ontwikkelaar van Jabber"
 
 #: ../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!, 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>"
+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>"
 
 #: ../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 (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."
+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."
 
 #: ../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, XMPP, Sametime, and Yahoo!"
-msgstr "Zorgt ervoor dat gespreksvensters verschijnen wanneer gebruikers berichten sturen.  Dit werkt met AIM, ICQ, XMPP, Sametime, en Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr "Zorgt ervoor dat gespreksvensters verschijnen wanneer gebruikers berichten sturen.  Dit werkt met AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "XMPP-account"
+msgid "Jabber Account"
+msgstr "Jabber-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 XMPP vCard"
-msgstr "XMPP vCard bewerken"
+msgid "Edit Jabber vCard"
+msgstr "Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Vul een of meer velden in om naar te zoeken bij XMPP-gebruikers."
+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."
 
 #: ../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 XMPP users"
-msgstr "Zoeken naar XMPPgebruikers"
+msgid "Search for Jabber users"
+msgstr "Zoeken naar Jabbergebruikers"
 
 #: ../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 XMPP ID"
-msgstr "Ongeldige XMPP-ID"
+msgid "Invalid Jabber ID"
+msgstr "Ongeldige Jabber-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 XMPP Account"
-msgstr "Nieuw XMPP account registreren"
+msgid "Register New Jabber Account"
+msgstr "Nieuw Jabber 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 XMPP Password"
-msgstr "XMPP-wachtwoord veranderen"
+msgid "Change Jabber Password"
+msgstr "Jabber-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 XMPP ID"
-msgstr "Ongeldig XMPP-ID"
+msgid "Malformed Jabber ID"
+msgstr "Ongeldig Jabber-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 "XMPP Protocol Plugin"
-msgstr "XMPP-protocol plugin"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber-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 "XMPP Message Error"
-msgstr "XMPP bericht-fout"
+msgid "Jabber Message Error"
+msgstr "Jabber 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 XMPP developer"
-#~ msgstr "ex-ontwikkelaar van XMPP"
+#~ msgid "former Jabber developer"
+#~ msgstr "ex-ontwikkelaar van Jabber"
 #~ msgid "Dutch; Flemish"
 #~ msgstr "Nederlands; Vlaams"
 #~ msgid "Chinese"
 #~ msgstr "Chinees"
 #~ msgid ""
 #~ "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-#~ "XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu "
+#~ "Jabber, 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!, XMPP, ICQ, IRC, SILC, Novell Groupwise, Napster, "
+#~ "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell Groupwise, Napster, "
 #~ "Zephyr en GaduGadu en dat allemaal tegelijk! Het is geschreven m.b.v. Gtk"
 #~ "+ en wordt verspreid onder een GPL-licentie.<BR><BR>"
 #~ msgid "Active Developers"
@@ -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 "XMPP ID"
-#~ msgstr "XMPP ID"
-#~ msgid "XMPP Profile"
-#~ msgstr "XMPP profiel"
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber ID"
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabber profiel"
 #~ msgid "invite &lt;user&gt; [room]:  Invite a user to the room."
 #~ msgstr ""
 #~ "invite &lt;bijnaam&gt; [ruimte]:  Een gebruiker uitnodigen in een ruimte."
--- a/po/nn.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/nn.po	Tue May 01 14:11:35 2007 +0000
@@ -855,10 +855,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Let deg sende direktekommandoar i tekstbaserte protokollar (t.d. XMPP, "
+"Let deg sende direktekommandoar i tekstbaserte protokollar (t.d. Jabber, "
 "MSN, IRC). Trykk 'Enter' for å sende og sjekk avlusingsvindauget."
 
 #: plugins/relnot.c:63
@@ -2821,8 +2821,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
-msgstr "tidlegare XMPP-utviklar"
+msgid "Jabber developer"
+msgstr "tidlegare Jabber-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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 er ein modulbasert lynmeldingsklient der du kan nytte AIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr og Gadu-Gadu "
+"Jabber, 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 XMPPkonto"
+msgstr "Registrer ein ny Jabberkonto"
 
 #: 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 XMPP vCard"
-msgstr "Endre XMPP-vCard"
+msgid "Edit Jabber vCard"
+msgstr "Endre Jabber-vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5720,8 +5720,8 @@
 "komfortabel med å gje frå deg."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "Ugyldig XMPP-ID"
+msgid "Invalid Jabber ID"
+msgstr "Ugyldig Jabber-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 XMPP Account"
-msgstr "Registrer ein ny XMPPkonto"
+msgid "Register New Jabber Account"
+msgstr "Registrer ein ny Jabberkonto"
 
 #: 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 XMPP Password"
-msgstr "Endre XMPP-passord"
+msgid "Change Jabber Password"
+msgstr "Endre Jabber-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 XMPP ID"
-msgstr "Misdanna XMPP-ID"
+msgid "Malformed Jabber ID"
+msgstr "Misdanna Jabber-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 "XMPP Protocol Plugin"
-msgstr "XMPP-protokolltillegg"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber-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 "XMPP Message Error"
-msgstr "XMPP meldingsfeil"
+msgid "Jabber Message Error"
+msgstr "Jabber meldingsfeil"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -11967,8 +11967,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Ugyldig kallenamn"
 
-#~ msgid "XMPP Profile"
-#~ msgstr "XMPPprofil"
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabberprofil"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Feil i romlista"
--- a/po/pa.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/pa.po	Tue May 01 14:11:35 2007 +0000
@@ -808,10 +808,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"ਪਾਠ ਆਧਾਰਿਤ ਪ੍ਰੋਟੋਕਾਲਾਂ (XMPP, MSN, IRC, TOC) ਲਈ ਕੱਚੀ ਇੰਪੁੱਟ ਭੇਜਣ ਲਈ ਸਹਾਇਕ ਹੈ। ਪਾਠ ਨੂੰ "
+"ਪਾਠ ਆਧਾਰਿਤ ਪ੍ਰੋਟੋਕਾਲਾਂ (Jabber, MSN, IRC, TOC) ਲਈ ਕੱਚੀ ਇੰਪੁੱਟ ਭੇਜਣ ਲਈ ਸਹਾਇਕ ਹੈ। ਪਾਠ ਨੂੰ "
 "ਬਕਸੇ ਵਿੱਚ ਭੇਜਣ ਲਈ 'Enter' ਦਬਾਉ। ਡੀਬੱਗ ਝਰੋਖਾ ਵੇਖੋ।"
 
 #: plugins/relnot.c:63
@@ -2706,7 +2706,7 @@
 msgstr "libfaim ਪਰਬੰਧਕ"
 
 #: src/gtkdialogs.c:92
-msgid "XMPP developer"
+msgid "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 ""
-"ਗੇਮ AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, "
+"ਗੇਮ AIM, MSN, Yahoo!, Jabber, 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 XMPP vCard"
+msgid "Edit Jabber vCard"
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:569
@@ -5531,8 +5531,8 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1161
@@ -5918,7 +5918,7 @@
 msgstr "ਇਕਾਈ ਲੱਭੀ ਨਹੀਂ"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr ""
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6211,7 +6211,7 @@
 msgstr ""
 
 #: src/protocols/jabber/message.c:233
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr ""
 
 #: src/protocols/jabber/message.c:297
--- a/po/pl.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/pl.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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, XMPPem, "
+"ktoś rozpocznie do Ciebie pisać. Wtyczka działa z AIM, ICQ, Jabberem, "
 "Sametime i Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
@@ -3022,8 +3022,8 @@
 msgstr "Konto AIM"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "XMPP Account"
-msgstr "Konto w sieci XMPP"
+msgid "Jabber Account"
+msgstr "Konto w sieci Jabber"
 
 #: ../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 XMPP vCard"
+msgid "Edit Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Wypełnij jedno lub więcej pól, aby wyszukać użytkowników sieci XMPP."
+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."
 
 #: ../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 XMPP users"
-msgstr "Szukaj użytkowników sieci XMPP"
+msgid "Search for Jabber users"
+msgstr "Szukaj użytkowników sieci Jabber"
 
 #. "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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
-msgstr "Zmiana hasła XMPPa"
+msgid "Change Jabber Password"
+msgstr "Zmiana hasła Jabbera"
 
 #: ../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 XMPP ID"
-msgstr "Uszkodzony identyfikator XMPPa"
+msgid "Malformed Jabber ID"
+msgstr "Uszkodzony identyfikator Jabbera"
 
 #: ../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 "XMPP Protocol Plugin"
-msgstr "Wtyczka protokołu XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Wtyczka protokołu Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Błąd wiadomości XMPPa"
+msgid "Jabber Message Error"
+msgstr "Błąd wiadomości Jabbera"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12593,7 +12593,7 @@
 msgstr ""
 
 #: ../pidgin/gtkdialogs.c:114
-msgid "XMPP developer"
+msgid "Jabber 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!, XMPP, "
+"%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 "
@@ -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!, XMPP, ICQ, IRC, SILC, SIP/"
+"z następującymi sieciami: AIM, MSN, Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 "Pozwala na wysyłanie niesformatowanego strumienia w protokołach tekstowych "
-"(XMPP, MSN, IRC, TOC). Naciśnij \"Enter\" w polu do wprowadzania tekstu "
+"(Jabber, 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 05:53:57 2007 +0000
+++ b/po/ps.po	Tue May 01 14:11:35 2007 +0000
@@ -2242,7 +2242,7 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
+msgid "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -4957,7 +4957,7 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -6740,7 +6740,7 @@
 msgstr "د أېم شمېرل"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "XMPP Account"
+msgid "Jabber 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 XMPP vCard"
+msgid "Edit Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1363
@@ -8255,7 +8255,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1473
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/jabber.c:1990
@@ -8561,7 +8561,7 @@
 msgstr ""
 
 #: ../libgaim/protocols/jabber/message.c:236
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr ""
 
 #: ../libgaim/protocols/jabber/message.c:316
--- a/po/pt.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/pt.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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, "
-"XMPP, Sametime e Yahoo!"
+"Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Permite enviar entrada pura para protocolos (XMPP, MSN, IRC, TOC) baseados "
+"Permite enviar entrada pura para protocolos (Jabber, 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 "XMPP developer"
-msgstr "desenvolvedor do XMPP"
+msgid "Jabber developer"
+msgstr "desenvolvedor do Jabber"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"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 "
@@ -3531,7 +3531,7 @@
 "program.<BR><BR>"
 msgstr ""
 "O Gaim é um cliente de mensagens modular capaz de usar o AIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zepyhr, e "
+"Jabber, 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 XMPP vCard"
-msgstr "Editar vCard do XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Editar vCard do Jabber"
 
 #: ../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 XMPP users."
-msgstr ""
-"Preencha um ou mais campos para procurar todos os utilizadores XMPP que "
+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 "
 "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 XMPP users"
-msgstr "Pesquisar Utilizadores XMPP"
+msgid "Search for Jabber users"
+msgstr "Pesquisar Utilizadores Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Identificador XMPP Inválido"
+msgid "Invalid Jabber ID"
+msgstr "Identificador Jabber 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 XMPP Account"
-msgstr "Registar Nova Conta XMPP"
+msgid "Register New Jabber Account"
+msgstr "Registar Nova Conta Jabber"
 
 #: ../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 XMPP Password"
-msgstr "Alterar Senha do XMPP"
+msgid "Change Jabber Password"
+msgstr "Alterar Senha do Jabber"
 
 #: ../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 XMPP ID"
-msgstr "ID XMPP Inválido"
+msgid "Malformed Jabber ID"
+msgstr "ID Jabber 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 "XMPP Protocol Plugin"
-msgstr "Plugin do Protocolo XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Plugin do Protocolo Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Erro de Mensagem do XMPP"
+msgid "Jabber Message Error"
+msgstr "Erro de Mensagem do Jabber"
 
 #: ../src/protocols/jabber/message.c:295
 #, c-format
--- a/po/pt_BR.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/pt_BR.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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, "
-"XMPP, Sametime e com o Yahoo!"
+"Jabber, 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 "XMPP Account"
-msgstr "Conta do XMPP"
+msgid "Jabber Account"
+msgstr "Conta do Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Editar vCard do XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Editar vCard do Jabber"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4337,7 +4337,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1563
 msgid "JID"
-msgstr "ID XMPP"
+msgstr "ID Jabber"
 
 #: ../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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr ""
-"Preencha um ou mais campos para procurar um usuário XMPP que satisfaça "
+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 "
 "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 XMPP users"
-msgstr "Procurar usuários XMPP"
+msgid "Search for Jabber users"
+msgstr "Procurar usuários Jabber"
 
 #. "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 XMPP ID"
-msgstr "ID do XMPP inválido"
+msgid "Invalid Jabber ID"
+msgstr "ID do Jabber 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 XMPP Account"
-msgstr "Registrar nova conta do XMPP"
+msgid "Register New Jabber Account"
+msgstr "Registrar nova conta do Jabber"
 
 #. 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 XMPP Password"
-msgstr "Alterar senha do XMPP"
+msgid "Change Jabber Password"
+msgstr "Alterar senha do Jabber"
 
 #: ../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 XMPP ID"
-msgstr "ID do XMPP em formato inválido"
+msgid "Malformed Jabber ID"
+msgstr "ID do Jabber 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 "XMPP Protocol Plugin"
-msgstr "Plugin do protocolo XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Plugin do protocolo Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Erro de mensagem do XMPP"
+msgid "Jabber Message Error"
+msgstr "Erro de mensagem do Jabber"
 
 #: ../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 "XMPP developer"
-msgstr "desenvolvedor do XMPP"
+msgid "Jabber developer"
+msgstr "desenvolvedor do Jabber"
 
 #: ../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!, XMPP, "
+"%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 "
@@ -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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Permite enviar entrada pura para protocolos baseados em texto (XMPP, MSN, "
+"Permite enviar entrada pura para protocolos baseados em texto (Jabber, MSN, "
 "IRC, TOC). Pressione 'Enter' na caixa de entrada para enviar. Verifique a "
 "janela de depuração."
 
--- a/po/ro.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/ro.po	Tue May 01 14:11:35 2007 +0000
@@ -2363,8 +2363,8 @@
 msgstr "hacker şi şofer de serviciu"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "programator XMPP"
+msgid "Jabber developer"
+msgstr "programator Jabber"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -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!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"utilizând protocoalele AIM, MSN, Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Permite introducerea brută a comenzilor în protocoalele tip text (XMPP, "
+"Permite introducerea brută a comenzilor în protocoalele tip text (Jabber, "
 "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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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, XMPP, Sametime şi Yahoo!"
+"trimită ce începuseră să scrie. Merge cu AIM, ICQ, Jabber, 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 "XMPP Account"
-msgstr "Cont XMPP"
+msgid "Jabber Account"
+msgstr "Cont Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Editare vCard XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Editare vCard Jabber"
 
 #: ../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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 "Completaţi unul sau mai multe câmpuri pentru a specifica criterii de căutare "
-"a utilizatorilor XMPP."
+"a utilizatorilor Jabber."
 
 #: ../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 XMPP users"
-msgstr "Caută utilizatori XMPP"
+msgid "Search for Jabber users"
+msgstr "Caută utilizatori Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Identitate XMPP invalidă"
+msgid "Invalid Jabber ID"
+msgstr "Identitate Jabber 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 XMPP Account"
-msgstr "Înregistrare cont nou XMPP"
+msgid "Register New Jabber Account"
+msgstr "Înregistrare cont nou Jabber"
 
 #: ../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 XMPP Password"
-msgstr "Schimbare parolă XMPP"
+msgid "Change Jabber Password"
+msgstr "Schimbare parolă Jabber"
 
 #: ../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 XMPP ID"
-msgstr "ID XMPP invalid"
+msgid "Malformed Jabber ID"
+msgstr "ID Jabber 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 "XMPP Protocol Plugin"
-msgstr "Modul de protocol XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Modul de protocol Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Eroare de mesaj XMPP"
+msgid "Jabber Message Error"
+msgstr "Eroare de mesaj Jabber"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/ru.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/ru.po	Tue May 01 14:11:35 2007 +0000
@@ -2290,8 +2290,8 @@
 msgstr ""
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "XMPP-разработчик"
+msgid "Jabber developer"
+msgstr "Jabber-разработчик"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -2532,7 +2532,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim - модульный клиент обмена сообщениями, позволяющий использовать AIM, "
-"MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus "
+"MSN, Yahoo!, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 "Позволяет вам отправлять необработанный ввод, используя протоколы, "
-"базирующиеся на тексте (XMPP, MSN, IRC, TOC). Для отправки нажмите 'Enter' "
+"базирующиеся на тексте (Jabber, 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -6949,8 +6949,8 @@
 msgstr "Учётная запись AIM"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "XMPP Account"
-msgstr "Учётная запись XMPP"
+msgid "Jabber Account"
+msgstr "Учётная запись Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Изменить XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Изменить Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "Искать пользователей XMPP"
+msgid "Search for Jabber users"
+msgstr "Искать пользователей Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Неверный XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Неверный Jabber 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 XMPP Account"
-msgstr "Зарегистрировать новую учётную запись XMPP"
+msgid "Register New Jabber Account"
+msgstr "Зарегистрировать новую учётную запись Jabber"
 
 #: ../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 XMPP Password"
-msgstr "Изменить пароль XMPP"
+msgid "Change Jabber Password"
+msgstr "Изменить пароль Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Неверный XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Неверный Jabber 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 "XMPP Protocol Plugin"
-msgstr "Модуль протокола XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Модуль протокола Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Ошибка сообщения XMPP"
+msgid "Jabber Message Error"
+msgstr "Ошибка сообщения Jabber"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/sk.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/sk.po	Tue May 01 14:11:35 2007 +0000
@@ -2358,8 +2358,8 @@
 msgstr "hacker a vymenovaný šofér [lenivý zadok]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "XMPP vývojár"
+msgid "Jabber developer"
+msgstr "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -2596,7 +2596,7 @@
 "warranty for this program.<BR><BR>"
 msgstr ""
 "Gaim je modulárny IM klient, ktorý podporuje protokol AIM, MSN, Yahoo!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Nechá vás odoslať priamy vstup textovo-založeným protokolom (XMPP, MSN, "
+"Nechá vás odoslať priamy vstup textovo-založeným protokolom (Jabber, 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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, "
-"XMPP, Sametime a Yahoo!"
+"Jabber, 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 "XMPP Account"
-msgstr "XMPP účet"
+msgid "Jabber Account"
+msgstr "Jabber úč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 XMPP vCard"
-msgstr "Upraviť XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Upraviť Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "Vyhľadávať používateľov XMPP"
+msgid "Search for Jabber users"
+msgstr "Vyhľadávať používateľov Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Nesprávne XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Nesprávne Jabber 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 XMPP Account"
-msgstr "Registrovať nový XMPP účet"
+msgid "Register New Jabber Account"
+msgstr "Registrovať nový Jabber úč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 XMPP Password"
-msgstr "Zmeniť XMPP heslo"
+msgid "Change Jabber Password"
+msgstr "Zmeniť Jabber 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 XMPP ID"
-msgstr "Chybné XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Chybné Jabber 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 "XMPP Protocol Plugin"
-msgstr "Modul protokolu XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Modul protokolu Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Chyba správy XMPP"
+msgid "Jabber Message Error"
+msgstr "Chyba správy Jabber"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/sl.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/sl.po	Tue May 01 14:11:35 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, 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!"
+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!"
 
 #: ../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 "XMPP Account"
-msgstr "Račun XMPP"
+msgid "Jabber Account"
+msgstr "Račun Jabber"
 
 #: ../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 XMPP vCard"
-msgstr "Urejanje XMPP vVizitke"
+msgid "Edit Jabber vCard"
+msgstr "Urejanje Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Izpolnite eno ali več polj za iskanje uporabnikov XMPPja."
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr "Izpolnite eno ali več polj za iskanje uporabnikov Jabberja."
 
 #: ../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 XMPP users"
-msgstr "Išči uporabnike XMPPja"
+msgid "Search for Jabber users"
+msgstr "Išči uporabnike Jabberja"
 
 #. "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 XMPP ID"
-msgstr "Neveljaven XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Neveljaven Jabber 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 XMPP Account"
-msgstr "Registrirajte nov račun za XMPP"
+msgid "Register New Jabber Account"
+msgstr "Registrirajte nov račun za Jabber"
 
 #. 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 XMPP Password"
-msgstr "Spremeni geslo za XMPP"
+msgid "Change Jabber Password"
+msgstr "Spremeni geslo za Jabber"
 
 #: ../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 XMPP ID"
-msgstr "Nepravilen XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Nepravilen Jabber 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 "XMPP Protocol Plugin"
-msgstr "Dodatek za protokol XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Dodatek za protokol Jabber"
 
 #: ../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 "XMPP Message Error"
-msgstr "Napaka sporočila XMPP"
+msgid "Jabber Message Error"
+msgstr "Napaka sporočila Jabber"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12236,8 +12236,8 @@
 msgstr "heker in uradni vodja [lenoba]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "XMPP developer"
-msgstr "razvijalec podpore protokola XMPP"
+msgid "Jabber developer"
+msgstr "razvijalec podpore protokola Jabber"
 
 #: ../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!, 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>"
+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>"
 
 #: ../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 (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."
+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."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
--- a/po/sq.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/sq.po	Tue May 01 14:11:35 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 (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\"."
+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\"."
 
 #: plugins/relnot.c:63
 #, c-format
@@ -2943,8 +2943,8 @@
 msgstr "mirëmbajtësi i libfaim"
 
 #: src/gtkdialogs.c:92
-msgid "XMPP developer"
-msgstr "zhvillues i XMPP-it"
+msgid "Jabber developer"
+msgstr "zhvillues i Jabber-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!, 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>"
+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>"
 
 #: 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 XMPP vCard"
-msgstr "Përpuno vCard për XMPP"
+msgid "Edit Jabber vCard"
+msgstr "Përpuno vCard për Jabber"
 
 #: 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 "XMPP ID"
-msgstr "ID XMPP"
+msgid "Jabber ID"
+msgstr "ID Jabber"
 
 #: 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 XMPP users."
-msgstr "Plotësoni një ose më tepër fusha për kërkim të cilitdo përdorues XMPP që ka përputhje."
+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."
 
 #  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 XMPP users"
-msgstr "Kërko për përdoruesas XMPP"
+msgid "Search for Jabber users"
+msgstr "Kërko për përdoruesas Jabber"
 
 #: 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 XMPP ID"
-msgstr "ID XMPP i pavlefshëm"
+msgid "Invalid Jabber ID"
+msgstr "ID Jabber 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 XMPP Account"
-msgstr "Regjistro Llogari të Re XMPP"
+msgid "Register New Jabber Account"
+msgstr "Regjistro Llogari të Re Jabber"
 
 #: 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 XMPP Password"
-msgstr "Ndrysho Fjalëkalim XMPP-i"
+msgid "Change Jabber Password"
+msgstr "Ndrysho Fjalëkalim Jabber-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 XMPP ID"
-msgstr "ID XMPP-i i Keqformësuar"
+msgid "Malformed Jabber ID"
+msgstr "ID Jabber-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 "XMPP Protocol Plugin"
-msgstr "Protokoll Shtojce XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Protokoll Shtojce Jabber"
 
 #: 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 "XMPP Message Error"
-msgstr "Gabim Mesazhi XMPP "
+msgid "Jabber Message Error"
+msgstr "Gabim Mesazhi Jabber "
 
 #: src/protocols/jabber/message.c:297
 #, c-format
--- a/po/sr.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/sr.po	Tue May 01 14:11:35 2007 +0000
@@ -836,7 +836,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 "Омогућава да пошаљете изворни текст протоколима који га прихватају (Џабер, "
@@ -2745,7 +2745,7 @@
 msgstr "одржавалац libfaim-а"
 
 #: src/gtkdialogs.c:92
-msgid "XMPP developer"
+msgid "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 ""
 "Гаим је прошириви клијент за брзе поруке који може да користи АИМ, ICQ, "
@@ -5567,7 +5567,7 @@
 msgstr "Рођендан"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit XMPP vCard"
+msgid "Edit Jabber vCard"
 msgstr "Уређивање Џабер визит-карте"
 
 #: src/protocols/jabber/buddy.c:569
@@ -5577,7 +5577,7 @@
 msgstr "Све доле наведене опције нису обавезне. Унесите само податке које желите."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
+msgid "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr "Измените Џабер лозинку"
 
 #: src/protocols/jabber/jabber.c:1161
@@ -5970,7 +5970,7 @@
 msgstr "Није нађено"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr "Додатак за Џабер протокол"
 
 #: src/protocols/jabber/jabber.c:1714
@@ -6264,7 +6264,7 @@
 msgstr "Испорука поруке за %s није успела: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr "Џабер грешка поруке"
 
 #: src/protocols/jabber/message.c:297
--- a/po/sr@Latn.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/sr@Latn.po	Tue May 01 14:11:35 2007 +0000
@@ -855,7 +855,7 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 "Omogućava da pošaljete izvorni tekst protokolima koji ga prihvataju (DŽaber, "
@@ -2824,7 +2824,7 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
+msgid "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 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 XMPP vCard"
+msgid "Edit Jabber 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 "XMPP ID"
+msgid "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber 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 XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber 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 "XMPP Message Error"
+msgid "Jabber 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 "XMPP Profile"
+#~ msgid "Jabber 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 "XMPP Error %s"
+#~ msgid "Jabber Error %s"
 #~ msgstr "DŽaber greška %s"
 
 #~ msgid ""
-#~ "The XMPP user %s does not exist and was therefore not added to your "
+#~ "The Jabber 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 XMPP I.D. and was therefore not added."
+#~ msgid "The user %s is an invalid Jabber 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 XMPP developer)<BR>  Mark Spencer (original author) "
+#~ "Jim Seymour (former Jabber 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 05:53:57 2007 +0000
+++ b/po/sv.po	Tue May 01 14:11:35 2007 +0000
@@ -2565,8 +2565,8 @@
 msgstr "hacker och fyllechaffis [lat typ]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "XMPP-utvecklare"
+msgid "Jabber developer"
+msgstr "Jabber-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!, 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>"
+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>"
 
 #: ../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 (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."
+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."
 
 #: ../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, 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!"
+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!"
 
 #: ../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 "XMPP Account"
-msgstr "XMPP-konto"
+msgid "Jabber Account"
+msgstr "Jabber-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 XMPP vad det betyder.
+# "vCard" fattar ingen som inte insatt i Jabber 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 XMPP vCard"
-msgstr "Redigera XMPP-visitkort"
+msgid "Edit Jabber vCard"
+msgstr "Redigera Jabber-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 XMPP
+# att åtminstone de som känner till vad Resource betyder i Jabber
 # 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "Fyll i ett eller flera fält för att söka efter matchande XMPPanvändare."
+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."
 
 #: ../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 XMPP users"
-msgstr "Sök efter XMPPanvändare"
+msgid "Search for Jabber users"
+msgstr "Sök efter Jabberanvä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 XMPP ID"
-msgstr "Ogiltigt XMPP-ID"
+msgid "Invalid Jabber ID"
+msgstr "Ogiltigt Jabber-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 XMPP Account"
-msgstr "Registrera nytt XMPP-konto"
+msgid "Register New Jabber Account"
+msgstr "Registrera nytt Jabber-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 XMPP Password"
-msgstr "Byt XMPP-lösenord"
+msgid "Change Jabber Password"
+msgstr "Byt Jabber-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 XMPP ID"
-msgstr "Felformaterat XMPP-ID"
+msgid "Malformed Jabber ID"
+msgstr "Felformaterat Jabber-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 "XMPP Protocol Plugin"
-msgstr "XMPP-insticksmodul"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber-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 "XMPP Message Error"
-msgstr "XMPP-meddelandefel"
+msgid "Jabber Message Error"
+msgstr "Jabber-meddelandefel"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/ta.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/ta.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, 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 (XMPP, 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 (Jabber, 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 "XMPP developer"
+msgid "Jabber 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!, 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>"
+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>"
 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 XMPP vCard"
+msgid "Edit Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
+msgid "Change Jabber Password"
 msgstr "ஜாப்பர் கடவுச்சொல்லை மாற்று"
 
 #: ../src/protocols/jabber/jabber.c:1318
@@ -6838,7 +6838,7 @@
 msgstr "உருப்படி காண வில்லை"
 
 #: ../src/protocols/jabber/jabber.c:1428
-msgid "Malformed XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
 msgstr "ஜாப்பர் நெறிமுறை சொருகுபொருள்"
 
 #: ../src/protocols/jabber/jabber.c:1911
@@ -7145,7 +7145,7 @@
 msgstr "%s க்கு அனுப்பிய தகவல் பட்டுவாடா செய்யத்தவறியது: %s"
 
 #: ../src/protocols/jabber/message.c:227
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr "ஜாப்பர் தகவல் பிழை"
 
 #: ../src/protocols/jabber/message.c:295
--- a/po/te.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/te.po	Tue May 01 14:11:35 2007 +0000
@@ -978,10 +978,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"టెక్‌స్ట్‌పై ఆధారపడిన ప్రోటోకాల్స్ (XMPP, MSN, IRC, TOC) కు అసంపూర్ణ ఇన్‌పుట్‌ను పంపుటకు "
+"టెక్‌స్ట్‌పై ఆధారపడిన ప్రోటోకాల్స్ (Jabber, MSN, IRC, TOC) కు అసంపూర్ణ ఇన్‌పుట్‌ను పంపుటకు "
 "అవకాశమిచ్చును. "
 
 #: plugins/relnot.c:63
@@ -3029,7 +3029,7 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
+msgid "Jabber developer"
 msgstr "పూర్వ జాబర్ డెవలపర్ "
 
 #: src/gtkdialogs.c:93
@@ -3202,10 +3202,10 @@
 #, fuzzy
 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 "
+"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 ""
-"గెయిమ్ ఒక మాడ్యులర్ పద్ధతిలో సందేశాలను అందించే క్లైంట్. ఇది AIM, MSN, Yahoo!, XMPP, ICQ, "
+"గెయిమ్ ఒక మాడ్యులర్ పద్ధతిలో సందేశాలను అందించే క్లైంట్. ఇది AIM, MSN, Yahoo!, Jabber, 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 XMPP vCard"
+msgid "Edit Jabber vCard"
 msgstr "జాబర్ కార్డ్‌ను ఎడిట్ చేయండి. "
 
 #: src/protocols/jabber/buddy.c:569
@@ -5973,8 +5973,8 @@
 msgstr "ఈ క్రింది హంశములన్నీ ఆప్షనల్. మీరు సంతృప్తికరమని భావించిన సమాచారాన్ని ఎంటర్ చేయండి. "
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "విలువలేని XMPP ID."
+msgid "Invalid Jabber ID"
+msgstr "విలువలేని Jabber 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 XMPP Account"
+msgid "Register New Jabber 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 XMPP Password"
-msgstr "XMPP పాస్‌వర్డ్‌ను మార్చుము."
+msgid "Change Jabber Password"
+msgstr "Jabber పాస్‌వర్డ్‌ను మార్చుము."
 
 #: 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 XMPP ID"
-msgstr "Malformed XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP Protocol Plugin"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 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 "XMPP Message Error"
-msgstr "XMPP Message పొరపాటు."
+msgid "Jabber Message Error"
+msgstr "Jabber Message పొరపాటు."
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12476,7 +12476,7 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "విలువలేని ఉపనామం."
 
-#~ msgid "XMPP Profile"
+#~ msgid "Jabber Profile"
 #~ msgstr "జాబర్ ఫైల్"
 
 #~ msgid "Roomlist Error"
--- a/po/th.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/th.po	Tue May 01 14:11:35 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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, 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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 
@@ -3228,7 +3228,7 @@
 msgstr ""
 
 #: ../src/gtkdialogs.c:101
-msgid "XMPP developer"
+msgid "Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime, Napster, Zephyr, "
+"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 "
@@ -6352,8 +6352,8 @@
 msgstr "ѹԴ"
 
 #: ../src/protocols/jabber/buddy.c:567 ../src/protocols/jabber/buddy.c:568
-msgid "Edit XMPP vCard"
-msgstr " XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr " Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "Ҽ XMPP"
+msgid "Search for Jabber users"
+msgstr "Ҽ Jabber"
 
 #: ../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 XMPP ID"
+msgid "Invalid Jabber 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 XMPP Account"
-msgstr "ŧ¹ XMPP "
+msgid "Register New Jabber Account"
+msgstr "ŧ¹ Jabber "
 
 #: ../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 XMPP Password"
-msgstr "¹ʼҹ XMPP"
+msgid "Change Jabber Password"
+msgstr "¹ʼҹ Jabber"
 
 #: ../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 XMPP ID"
+msgid "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "Թ XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Թ Jabber"
 
 #: ../src/protocols/jabber/jabber.c:1911
 msgid "Use TLS if available"
@@ -7055,7 +7055,7 @@
 msgstr ""
 
 #: ../src/protocols/jabber/message.c:227
-msgid "XMPP Message Error"
+msgid "Jabber Message Error"
 msgstr ""
 
 #: ../src/protocols/jabber/message.c:295
--- a/po/tr.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/tr.po	Tue May 01 14:11:35 2007 +0000
@@ -829,7 +829,7 @@
 msgstr ""
 
 #: plugins/raw.c:154
-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."
+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 ""
 
 #: plugins/relnot.c:63
@@ -2833,8 +2833,8 @@
 msgstr "libfaim bakmcs"
 
 #: src/gtkdialogs.c:92
-msgid "XMPP developer"
-msgstr "XMPP gelitiricisi"
+msgid "Jabber developer"
+msgstr "Jabber gelitiricisi"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -3022,8 +3022,8 @@
 msgstr "Gaim Hakknda"
 
 #: src/gtkdialogs.c:226
-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 hesaplarnza ayn anda balanmanz salayan modler bir mesaj programdr. GTK+ kullanlarak yazlm olup GNU GPL lisans altndadr.<BR><BR>"
+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 hesaplarnza ayn anda balanmanz salayan modler bir mesaj programdr. GTK+ kullanlarak yazlm olup GNU GPL lisans altndadr.<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 XMPP vCard"
+msgid "Edit Jabber vCard"
 msgstr "VCard Dosyasn Dzenle"
 
 #: src/protocols/jabber/buddy.c:569
@@ -5725,8 +5725,8 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber ID"
 
 #: src/protocols/jabber/buddy.c:642
 #: src/protocols/jabber/jabber.c:1711
@@ -5814,7 +5814,7 @@
 msgstr "Arama sonularnz"
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "XMPP kullanclar ara"
+msgid "Search for Jabber users"
+msgstr "Jabber kullanclar 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 XMPP ID"
-msgstr "Geersiz XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Geersiz Jabber 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 XMPP Account"
-msgstr "Yeni XMPP Hesab Olutur"
+msgid "Register New Jabber Account"
+msgstr "Yeni Jabber Hesab Olutur"
 
 #: 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 XMPP Password"
-msgstr "XMPP ifresini Deitir"
+msgid "Change Jabber Password"
+msgstr "Jabber ifresini Deitir"
 
 #: 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 XMPP ID"
-msgstr "Malformed XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Malformed Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP Protokol Eklentisi"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber Protokol Eklentisi"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6449,8 +6449,8 @@
 msgstr "%s iin mesaj gnderimi baarsz: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "XMPP Message Error"
-msgstr "XMPP Mesaj Hatas"
+msgid "Jabber Message Error"
+msgstr "Jabber Mesaj Hatas"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -11498,8 +11498,8 @@
 #, fuzzy
 #~ msgid "Invalid nickname"
 #~ msgstr "Geersiz Kullanc Ad"
-#~ msgid "XMPP Profile"
-#~ msgstr "XMPP Profili"
+#~ msgid "Jabber Profile"
+#~ msgstr "Jabber Profili"
 #~ msgid "Roomlist Error"
 #~ msgstr "Oda Listesi Hatas"
 #~ msgid "Logged out"
--- a/po/uk.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/uk.po	Tue May 01 14:11:35 2007 +0000
@@ -857,11 +857,11 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 "Дозволяє надіслати необроблений ввід, використовуючи протоколи на основі "
-"тексту (XMPP, MSN, IRC, TOC). Для надсилання натисніть Еnter у області "
+"тексту (Jabber, MSN, IRC, TOC). Для надсилання натисніть Еnter у області "
 "вводу. Слідкуйте за вікном налагодження."
 
 #: plugins/relnot.c:63
@@ -2831,8 +2831,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "XMPP developer"
-msgstr "попередній розробник XMPP"
+msgid "Jabber developer"
+msgstr "попередній розробник Jabber"
 
 #: 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 ""
 "GaimGaim - модульний клієнт обміну повідомленнями, що дозволяє "
-"використовувати AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, "
+"використовувати AIM, MSN, Yahoo!, Jabber, 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 "Зареєструвати новий обліковий запис XMPP"
+msgstr "Зареєструвати новий обліковий запис Jabber"
 
 #: 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 XMPP vCard"
-msgstr "Змінити картку XMPP "
+msgid "Edit Jabber vCard"
+msgstr "Змінити картку Jabber "
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5754,8 +5754,8 @@
 msgstr "Всі наступні елементи є необов'язковими. Заповнюйте на власний розсуд."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "Неправильний XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "Неправильний Jabber 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 XMPP Account"
-msgstr "Зареєструвати новий обліковий запис XMPP"
+msgid "Register New Jabber Account"
+msgstr "Зареєструвати новий обліковий запис Jabber"
 
 #: 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 XMPP Password"
-msgstr "Змінити пароль XMPP"
+msgid "Change Jabber Password"
+msgstr "Змінити пароль Jabber"
 
 #: 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 XMPP ID"
-msgstr "Неправильний XMPP ID"
+msgid "Malformed Jabber ID"
+msgstr "Неправильний Jabber 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 "XMPP Protocol Plugin"
-msgstr "Модуль протоколу XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Модуль протоколу Jabber"
 
 #: 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 "XMPP Message Error"
-msgstr "Помилка повідомлення XMPP"
+msgid "Jabber Message Error"
+msgstr "Помилка повідомлення Jabber"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12252,8 +12252,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Неправильне прізвисько"
 
-#~ msgid "XMPP Profile"
-#~ msgstr "Профіль XMPP"
+#~ msgid "Jabber Profile"
+#~ msgstr "Профіль Jabber"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Помилка списку кімнат"
--- a/po/vi.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/vi.po	Tue May 01 14:11:35 2007 +0000
@@ -871,10 +871,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"Để bạn gửi dữ liệu nhập đến giao thức dựa trên văn bản (XMPP, MSN, IRC, "
+"Để bạn gửi dữ liệu nhập đến giao thức dựa trên văn bản (Jabber, 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 "XMPP developer"
-msgstr "người lập trình XMPP trước đây"
+msgid "Jabber developer"
+msgstr "người lập trình Jabber 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 là trình khách nhắn tin có khả năng sử dụng AIM, ICQ, Yahoo!, MSN, IRC, "
-"XMPP, Napster, Zephyr, và Gadu-Gadu. Gaim sử dụng Gtk+ và đăng ký theo GPL."
+"Jabber, 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 XMPP mới"
+msgstr "Đăng ký tài khoản Jabber 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 XMPP vCard"
-msgstr "Soạn XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Soạn Jabber 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 "XMPP ID"
-msgstr "XMPP ID"
+msgid "Jabber ID"
+msgstr "Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "ID XMPP không hợp lệ"
+msgid "Invalid Jabber ID"
+msgstr "ID Jabber 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 XMPP Account"
-msgstr "Đăng ký tài khoản XMPP mới"
+msgid "Register New Jabber Account"
+msgstr "Đăng ký tài khoản Jabber 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 XMPP Password"
-msgstr "Đổi mật khẩu XMPP"
+msgid "Change Jabber Password"
+msgstr "Đổi mật khẩu Jabber"
 
 #: 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 XMPP ID"
-msgstr "ID XMPP không hợp lệ"
+msgid "Malformed Jabber ID"
+msgstr "ID Jabber 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 "XMPP Protocol Plugin"
-msgstr "Plugin giao thức XMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "Plugin giao thức Jabber"
 
 #: 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 "XMPP Message Error"
-msgstr "Lỗi Thông Điệp XMPP"
+msgid "Jabber Message Error"
+msgstr "Lỗi Thông Điệp Jabber"
 
 #: 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 "XMPP Profile"
-#~ msgstr "Lý lịch XMPP"
+#~ msgid "Jabber Profile"
+#~ msgstr "Lý lịch Jabber"
 
 #, fuzzy
 #~ msgid "Roomlist Error"
--- a/po/xh.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/xh.po	Tue May 01 14:11:35 2007 +0000
@@ -859,11 +859,11 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
 "Ikwenza uthumele ungeniso kwiiprothokholi ezingalungiswanga ezisekwe "
-"kumbhalo (XMPP, MSN, IRC, TOC). Cofa u-'Enter' kwibhokisi lokuqalisa "
+"kumbhalo (Jabber, 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 "XMPP developer"
-msgstr "umphuhlisi wangaphambili weXMPP"
+msgid "Jabber developer"
+msgstr "umphuhlisi wangaphambili weJabber"
 
 #: 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!, "
-"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"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 ""
 "I-Gaim ngumxhasi omiselweyo wemiyalezo okwaziyo ukusebenzisa iAIM, iMSN, "
-"iYahoo!, iXMPP, iICQ, iSILC, iNovell GroupWise, iNapster, iZephyr, neGadu-"
+"iYahoo!, iJabber, 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 yeXMPP"
+msgstr "Bhalisa i-Akhawunti eNtsha yeJabber"
 
 #: 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 XMPP vCard"
-msgstr "Hlela i-XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "Hlela i-Jabber vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5769,8 +5769,8 @@
 "ukhululekile ngalo."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "XMPP ID"
-msgstr "ISazizi seXMPP"
+msgid "Jabber ID"
+msgstr "ISazizi seJabber"
 
 #: 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
+msgid "Search for Jabber 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 XMPP ID"
-msgstr "ISazisi esingasebenziyo seXMPP"
+msgid "Invalid Jabber ID"
+msgstr "ISazisi esingasebenziyo seJabber"
 
 #: 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 XMPP Account"
-msgstr "Bhalisa i-Akhawunti eNtsha yeXMPP"
+msgid "Register New Jabber Account"
+msgstr "Bhalisa i-Akhawunti eNtsha yeJabber"
 
 #: 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 XMPP Password"
-msgstr "Tshintsha i-password yeXMPP"
+msgid "Change Jabber Password"
+msgstr "Tshintsha i-password yeJabber"
 
 #: 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 XMPP ID"
-msgstr "Isazisi seXMPP esakheke kakubi"
+msgid "Malformed Jabber ID"
+msgstr "Isazisi seJabber 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 "XMPP Protocol Plugin"
-msgstr "ImiThetho yokuSebenza yokuNgenisa iXMPP"
+msgid "Jabber Protocol Plugin"
+msgstr "ImiThetho yokuSebenza yokuNgenisa iJabber"
 
 #: 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 "XMPP Message Error"
-msgstr "ImPazamo yoMyalezo weXMPP"
+msgid "Jabber Message Error"
+msgstr "ImPazamo yoMyalezo weJabber"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12287,8 +12287,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "IGama lomSebenzisi elingaSebenziyo"
 
-#~ msgid "XMPP Profile"
-#~ msgstr "Inkangeleko yeXMPP"
+#~ msgid "Jabber Profile"
+#~ msgstr "Inkangeleko yeJabber"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Impazamo yoLuhlu lweGumbi"
--- a/po/zh_CN.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/zh_CN.po	Tue May 01 14:11:35 2007 +0000
@@ -2275,8 +2275,8 @@
 msgstr "骇客和专属驱动程序[lazy bum]"
 
 #: ../gtk/gtkdialogs.c:108
-msgid "XMPP developer"
-msgstr "XMPP 开发者"
+msgid "Jabber developer"
+msgstr "Jabber 开发者"
 
 #: ../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!, "
-"XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"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' "
@@ -5048,10 +5048,10 @@
 
 #: ../gtk/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"允许您将输入原样发送给基于文本的协议(XMPP，MSN，IRC，TOC)。在输入框中按回车"
+"允许您将输入原样发送给基于文本的协议(Jabber，MSN，IRC，TOC)。在输入框中按回车"
 "键可以发送。看看调试窗口。"
 
 #: ../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, XMPP, Sametime, and Yahoo!"
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
 msgstr ""
 
 #: ../libgaim/plugins/psychic.c:66
@@ -6871,8 +6871,8 @@
 msgstr "AIM 账户"
 
 #: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "XMPP Account"
-msgstr "XMPP 账户"
+msgid "Jabber Account"
+msgstr "Jabber 账户"
 
 #: ../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 "注册新的 XMPP 账户"
+msgstr "注册新的 Jabber 账户"
 
 #: ../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 XMPP vCard"
-msgstr "编辑 XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "编辑 Jabber 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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
+msgid "Fill in one or more fields to search for any matching Jabber 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 XMPP users"
-msgstr "搜索 XMPP 用户"
+msgid "Search for Jabber users"
+msgstr "搜索 Jabber 用户"
 
 #: ../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 XMPP ID"
-msgstr "无效的 XMPP ID"
+msgid "Invalid Jabber ID"
+msgstr "无效的 Jabber 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 XMPP Account"
-msgstr "注册新的 XMPP 账户"
+msgid "Register New Jabber Account"
+msgstr "注册新的 Jabber 账户"
 
 #: ../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 XMPP Password"
-msgstr "更改 XMPP 密码"
+msgid "Change Jabber Password"
+msgstr "更改 Jabber 密码"
 
 #: ../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 XMPP ID"
-msgstr "XMPP ID 格式错误"
+msgid "Malformed Jabber ID"
+msgstr "Jabber 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 "XMPP Protocol Plugin"
-msgstr "XMPP 协议插件"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 协议插件"
 
 #: ../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 "XMPP Message Error"
-msgstr "XMPP 消息错误"
+msgid "Jabber Message Error"
+msgstr "Jabber 消息错误"
 
 #: ../libgaim/protocols/jabber/message.c:316
 #, c-format
--- a/po/zh_HK.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/zh_HK.po	Tue May 01 14:11:35 2007 +0000
@@ -930,7 +930,7 @@
 msgstr "您收到郵件！"
 
 # FIXME check - 20061025
-#  NOTE XMPP 術語，見上
+#  NOTE Jabber 術語，見上
 #: ../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, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"對方一開始與您交談，就立即打開交談視窗。適用於 AIM、ICQ、XMPP、Sametime 及 "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"對方一開始與您交談，就立即打開交談視窗。適用於 AIM、ICQ、Jabber、Sametime 及 "
 "Yahoo。"
 
 #: ../libpurple/plugins/psychic.c:66
@@ -3113,8 +3113,8 @@
 msgstr "AIM 帳號"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "XMPP Account"
-msgstr "XMPP 帳號"
+msgid "Jabber Account"
+msgstr "Jabber 帳號"
 
 # NOTE 這是通訊協定名稱，不是問候語
 #: ../libpurple/protocols/bonjour/bonjour.h:35
@@ -3613,7 +3613,7 @@
 msgstr "無法連到伺服器"
 
 # FIXME ambiguous - 20061025
-# NOTE XMPP 協定 Stream Error 的一種，即 <remote-connection-failed/>
+# NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章）
 #: ../libpurple/protocols/irc/irc.c:424
@@ -4302,8 +4302,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit XMPP vCard"
-msgstr "編輯 XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "編輯 Jabber vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4324,7 +4324,7 @@
 
 # TODO Untranslated
 # NOTE 譯文刪除 by Ambrose
-# NOTE XMPP 協定的「Resource」一詞通常係指一種使用者自定的字串，
+# NOTE Jabber 協定的「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 XMPP協定的「Subscribe」一詞乃「加入好友名單」的意思
+# NOTE Jabber協定的「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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr "填入一個或多個欄位，以搜尋Jabber使用者。"
 
 #: ../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 XMPP users"
-msgstr "搜尋XMPP使用者"
+msgid "Search for Jabber users"
+msgstr "搜尋Jabber使用者"
 
 #. "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 XMPP ID"
-msgstr "XMPP 帳號無效"
+msgid "Invalid Jabber ID"
+msgstr "Jabber 帳號無效"
 
 #: ../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 XMPP Account"
-msgstr "註冊新的 XMPP 帳戶"
+msgid "Register New Jabber Account"
+msgstr "註冊新的 Jabber 帳戶"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4712,17 +4712,17 @@
 msgid "Both"
 msgstr "已互相認證"
 
-#  NOTE XMPP 術語，見上
+#  NOTE Jabber 術語，見上
 #: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "From (To pending)"
 msgstr "已認證對方（但仍等待對方認證您）"
 
-#  NOTE XMPP 術語，見上
+#  NOTE Jabber 術語，見上
 #: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "To"
 msgstr "已獲對方認證"
 
-#  NOTE XMPP 術語，見上
+#  NOTE Jabber 術語，見上
 #: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "None (To pending)"
 msgstr "無（但正等待對方認證您）"
@@ -4733,7 +4733,7 @@
 msgid "None"
 msgstr "無"
 
-#  NOTE XMPP 術語，見上
+#  NOTE Jabber 術語，見上
 #: ../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 XMPP Password"
-msgstr "修改 XMPP 密碼"
+msgid "Change Jabber Password"
+msgstr "修改 Jabber 密碼"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4787,7 +4787,7 @@
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
-#  NOTE XMPP 錯誤 <conflict/>，表示已透過同一名稱或在同一位址，以相同的 Resource
+#  NOTE Jabber 錯誤 <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 XMPP 錯誤 <forbidden/>，意思正常（表示權限不夠）
+#  NOTE Jabber 錯誤 <forbidden/>，意思正常（表示權限不夠）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Forbidden"
 msgstr "權限不夠"
 
-#  NOTE XMPP 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
+#  NOTE Jabber 錯誤 <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 XMPP ID"
-msgstr "畸型的 XMPP ID"
-
-#  NOTE XMPP 錯誤 <not-acceptable/>，表示所送出的要求未能達到伺服器或收件人所訂下的
+msgid "Malformed Jabber ID"
+msgstr "畸型的 Jabber ID"
+
+#  NOTE Jabber 錯誤 <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 XMPP 錯誤 <recipient-unavailable/>
+#  NOTE Jabber 錯誤 <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 XMPP 錯誤 <service-unavailable/>，表示伺服器收到一個意義不明的指令
+#  NOTE Jabber 錯誤 <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 XMPP 錯誤 <subscription-required/>，表示使用「服務」前
+#  NOTE Jabber 錯誤 <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 XMPP 協定的「Resource」一詞為使用者自定的一種字串，
+# NOTE Jabber 協定的「Resource」一詞為使用者自定的一種字串，
 # NOTE 表示在多處地方同時登入了的情形下，目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-# NOTE XMPP 協定中 Stanza Error 的一種，即 <conflict/>
+# NOTE Jabber 協定中 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 "連線已逾時"
 
-# NOTE XMPP 協定中 Stream Error 的一種，即 <host-gone/>
+# NOTE Jabber 協定中 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 XMPP 協定中 Stream Error 的一種，即 <host-unknown/>
+# NOTE Jabber 協定中 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 XMPP 協定中的「nonmatching-hosts」
+# NOTE Jabber 協定中的「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 這是暫譯，譯文有待改進。不過好像真的有人這樣寫，大概沒有太大的問題
-# NOTE XMPP 協定 xmpp-core 中 Stream Error 的一種，即 <policy-violation/>
+# NOTE Jabber 協定 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 XMPP 協定 Stream Error 的一種，即 <remote-connection-failed/>
+# NOTE Jabber 協定 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 "無法連線至認證所需的遠端資源"
 
-# NOTE XMPP 協定 Stream Error 的一種，即 <resource-constraint/>
+# NOTE Jabber 協定 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 XMPP 協定 xmpp-core 中 Stream Error 的一種，即 <restricted-xml/>
+# NOTE Jabber 協定 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 中存在有 XMPP 協定不容許的 XML 元素"
-
-# NOTE XMPP 協定中 Stream Error 的一種，即 <see-other-host/>
+msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
+
+# NOTE Jabber 協定中 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 XMPP 協定中 Stream Error 的一種，即 <system-shutdown/>
+# NOTE Jabber 協定中 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 XMPP 協定中 Stream Error 的一種，即 <unsupported-stanza-type/>
+# NOTE Jabber 協定中 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 XMPP 協定中 Stream Error 的一種，即 <unsupported-version/>
+# NOTE Jabber 協定中 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 "XMPP Protocol Plugin"
-msgstr "XMPP 協定模組"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 協定模組"
 
 #: ../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 "XMPP Message Error"
-msgstr "XMPP 訊息錯誤"
+msgid "Jabber Message Error"
+msgstr "Jabber 訊息錯誤"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12660,8 +12660,8 @@
 msgstr "程式編寫者兼指定司機 [死懶鬼]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "XMPP developer"
-msgstr "XMPP 開發者"
+msgid "Jabber developer"
+msgstr "Jabber 開發者"
 
 #: ../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!, XMPP, "
+"%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 "
@@ -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!、XMPP、"
+"%s 係一個以 GTK+ 開發的模組化訊息程式，同時提供 AIM、MSN、Yahoo!、Jabber、"
 "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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"讓您直接輸入指令對各種文字模式的通訊協定（例如 XMPP、MSN、IRC 及 TOC）進行"
+"讓您直接輸入指令對各種文字模式的通訊協定（例如 Jabber、MSN、IRC 及 TOC）進行"
 "操作。在輸入欄位輸入指令，按 Enter 後鍵送出；相關資訊會在除錯視窗顯示。"
 
 # XXX 暫譯
@@ -15748,7 +15748,7 @@
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未有連線至 XMPP</font>"
 
-#  NOTE XMPP 的「stanza」譯「段落」，下同
+#  NOTE Jabber 的「stanza」譯「段落」，下同
 #: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "插入 <iq/> 段落。"
@@ -16517,10 +16517,10 @@
 #~ msgid "_Warn"
 #~ msgstr "警告(_W)"
 
-#~ msgid "XMPP ID"
-#~ msgstr "XMPP 帳號"
-
-#  NOTE XMPP 術語，見上
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber 帳號"
+
+#  NOTE Jabber 術語，見上
 #~ msgid "(pending)"
 #~ msgstr "（等待認證）"
 
--- a/po/zh_TW.po	Tue May 01 05:53:57 2007 +0000
+++ b/po/zh_TW.po	Tue May 01 14:11:35 2007 +0000
@@ -930,7 +930,7 @@
 msgstr "您收到郵件！"
 
 # FIXME check - 20061025
-#  NOTE XMPP 術語，見上
+#  NOTE Jabber 術語，見上
 #: ../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, XMPP, Sametime, and Yahoo!"
-msgstr ""
-"對方一開始與您交談，就立即打開交談視窗。適用於 AIM、ICQ、XMPP、Sametime 及 "
+"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+msgstr ""
+"對方一開始與您交談，就立即打開交談視窗。適用於 AIM、ICQ、Jabber、Sametime 及 "
 "Yahoo。"
 
 #: ../libpurple/plugins/psychic.c:66
@@ -3113,8 +3113,8 @@
 msgstr "AIM 帳號"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "XMPP Account"
-msgstr "XMPP 帳號"
+msgid "Jabber Account"
+msgstr "Jabber 帳號"
 
 # NOTE 這是通訊協定名稱，不是問候語
 #: ../libpurple/protocols/bonjour/bonjour.h:35
@@ -3613,7 +3613,7 @@
 msgstr "無法連到伺服器"
 
 # FIXME ambiguous - 20061025
-# NOTE XMPP 協定 Stream Error 的一種，即 <remote-connection-failed/>
+# NOTE Jabber 協定 Stream Error 的一種，即 <remote-connection-failed/>
 # NOTE 見 http://www.jabber.org/pipermail/xmppwg/2003-June/001226.html
 # XXX 真正的意思是「無法連線至認證所需的遠端資源」，不是「連線失敗」（見上列文章）
 #: ../libpurple/protocols/irc/irc.c:424
@@ -4302,8 +4302,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit XMPP vCard"
-msgstr "編輯 XMPP vCard"
+msgid "Edit Jabber vCard"
+msgstr "編輯 Jabber vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4324,7 +4324,7 @@
 
 # TODO Untranslated
 # NOTE 譯文刪除 by Ambrose
-# NOTE XMPP 協定的「Resource」一詞通常係指一種使用者自定的字串，
+# NOTE Jabber 協定的「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 XMPP協定的「Subscribe」一詞乃「加入好友名單」的意思
+# NOTE Jabber協定的「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 XMPP User Directory users.jabber.org
+#. current comment from Jabber 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 XMPP users."
-msgstr "填入一個或多個欄位，以搜尋XMPP使用者。"
+msgid "Fill in one or more fields to search for any matching Jabber users."
+msgstr "填入一個或多個欄位，以搜尋Jabber使用者。"
 
 #: ../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 XMPP users"
-msgstr "搜尋XMPP使用者"
+msgid "Search for Jabber users"
+msgstr "搜尋Jabber使用者"
 
 #. "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 XMPP ID"
-msgstr "XMPP 帳號無效"
+msgid "Invalid Jabber ID"
+msgstr "Jabber 帳號無效"
 
 #: ../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 XMPP Account"
-msgstr "註冊新的 XMPP 帳戶"
+msgid "Register New Jabber Account"
+msgstr "註冊新的 Jabber 帳戶"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4712,17 +4712,17 @@
 msgid "Both"
 msgstr "已互相認證"
 
-#  NOTE XMPP 術語，見上
+#  NOTE Jabber 術語，見上
 #: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "From (To pending)"
 msgstr "已認證對方（但仍等待對方認證您）"
 
-#  NOTE XMPP 術語，見上
+#  NOTE Jabber 術語，見上
 #: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "To"
 msgstr "已獲對方認證"
 
-#  NOTE XMPP 術語，見上
+#  NOTE Jabber 術語，見上
 #: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "None (To pending)"
 msgstr "無（但正等待對方認證您）"
@@ -4733,7 +4733,7 @@
 msgid "None"
 msgstr "無"
 
-#  NOTE XMPP 術語，見上
+#  NOTE Jabber 術語，見上
 #: ../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 XMPP Password"
-msgstr "修改 XMPP 密碼"
+msgid "Change Jabber Password"
+msgstr "修改 Jabber 密碼"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4787,7 +4787,7 @@
 msgid "Bad Request"
 msgstr "傳送網址時發生了不明的錯誤"
 
-#  NOTE XMPP 錯誤 <conflict/>，表示已透過同一名稱或在同一位址，以相同的 Resource
+#  NOTE Jabber 錯誤 <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 XMPP 錯誤 <forbidden/>，意思正常（表示權限不夠）
+#  NOTE Jabber 錯誤 <forbidden/>，意思正常（表示權限不夠）
 #  NOTE 詳見 http://www.jabber.org/ietf/draft-ietf-xmpp-core-23.txt
 #: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Forbidden"
 msgstr "權限不夠"
 
-#  NOTE XMPP 錯誤 <gone/>，表示使用者或伺服器曾經上線，後來離了線
+#  NOTE Jabber 錯誤 <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 XMPP ID"
-msgstr "畸型的 XMPP ID"
-
-#  NOTE XMPP 錯誤 <not-acceptable/>，表示所送出的要求未能達到伺服器或收件人所訂下的
+msgid "Malformed Jabber ID"
+msgstr "畸型的 Jabber ID"
+
+#  NOTE Jabber 錯誤 <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 XMPP 錯誤 <recipient-unavailable/>
+#  NOTE Jabber 錯誤 <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 XMPP 錯誤 <service-unavailable/>，表示伺服器收到一個意義不明的指令
+#  NOTE Jabber 錯誤 <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 XMPP 錯誤 <subscription-required/>，表示使用「服務」前
+#  NOTE Jabber 錯誤 <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 XMPP 協定的「Resource」一詞為使用者自定的一種字串，
+# NOTE Jabber 協定的「Resource」一詞為使用者自定的一種字串，
 # NOTE 表示在多處地方同時登入了的情形下，目前的實在位置
 # NOTE 見 http://www.jabber.org/user/userguide.html
-# NOTE XMPP 協定中 Stanza Error 的一種，即 <conflict/>
+# NOTE Jabber 協定中 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 "連線已逾時"
 
-# NOTE XMPP 協定中 Stream Error 的一種，即 <host-gone/>
+# NOTE Jabber 協定中 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 XMPP 協定中 Stream Error 的一種，即 <host-unknown/>
+# NOTE Jabber 協定中 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 XMPP 協定中的「nonmatching-hosts」
+# NOTE Jabber 協定中的「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 這是暫譯，譯文有待改進。不過好像真的有人這樣寫，大概沒有太大的問題
-# NOTE XMPP 協定 xmpp-core 中 Stream Error 的一種，即 <policy-violation/>
+# NOTE Jabber 協定 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 XMPP 協定 Stream Error 的一種，即 <remote-connection-failed/>
+# NOTE Jabber 協定 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 "無法連線至認證所需的遠端資源"
 
-# NOTE XMPP 協定 Stream Error 的一種，即 <resource-constraint/>
+# NOTE Jabber 協定 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 XMPP 協定 xmpp-core 中 Stream Error 的一種，即 <restricted-xml/>
+# NOTE Jabber 協定 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 中存在有 XMPP 協定不容許的 XML 元素"
-
-# NOTE XMPP 協定中 Stream Error 的一種，即 <see-other-host/>
+msgstr "XML 中存在有 Jabber 協定不容許的 XML 元素"
+
+# NOTE Jabber 協定中 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 XMPP 協定中 Stream Error 的一種，即 <system-shutdown/>
+# NOTE Jabber 協定中 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 XMPP 協定中 Stream Error 的一種，即 <unsupported-stanza-type/>
+# NOTE Jabber 協定中 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 XMPP 協定中 Stream Error 的一種，即 <unsupported-version/>
+# NOTE Jabber 協定中 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 "XMPP Protocol Plugin"
-msgstr "XMPP 協定模組"
+msgid "Jabber Protocol Plugin"
+msgstr "Jabber 協定模組"
 
 #: ../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 "XMPP Message Error"
-msgstr "XMPP 訊息錯誤"
+msgid "Jabber Message Error"
+msgstr "Jabber 訊息錯誤"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12660,8 +12660,8 @@
 msgstr "程式編寫者兼指定司機 [死懶鬼]"
 
 #: ../pidgin/gtkdialogs.c:113
-msgid "XMPP developer"
-msgstr "XMPP 開發者"
+msgid "Jabber developer"
+msgstr "Jabber 開發者"
 
 #: ../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!, XMPP, "
+"%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 "
@@ -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!、XMPP、"
+"%s 係一個以 GTK+ 開發的模組化訊息程式，同時提供 AIM、MSN、Yahoo!、Jabber、"
 "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 (XMPP, MSN, IRC, TOC). Hit "
+"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 ""
-"讓您直接輸入指令對各種文字模式的通訊協定（例如 XMPP、MSN、IRC 及 TOC）進行"
+"讓您直接輸入指令對各種文字模式的通訊協定（例如 Jabber、MSN、IRC 及 TOC）進行"
 "操作。在輸入欄位輸入指令，按 Enter 後鍵送出；相關資訊會在除錯視窗顯示。"
 
 # XXX 暫譯
@@ -15748,7 +15748,7 @@
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>未有連線至 XMPP</font>"
 
-#  NOTE XMPP 的「stanza」譯「段落」，下同
+#  NOTE Jabber 的「stanza」譯「段落」，下同
 #: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "插入 <iq/> 段落。"
@@ -16517,10 +16517,10 @@
 #~ msgid "_Warn"
 #~ msgstr "警告(_W)"
 
-#~ msgid "XMPP ID"
-#~ msgstr "XMPP 帳號"
-
-#  NOTE XMPP 術語，見上
+#~ msgid "Jabber ID"
+#~ msgstr "Jabber 帳號"
+
+#  NOTE Jabber 術語，見上
 #~ msgid "(pending)"
 #~ msgstr "（等待認證）"