Mercurial > pidgin.yaz

changeset 25480:50a9c82d32a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head 00dc566bfedcca2a9b44f91cf7e9a73f8270b63a) to branch 'im.pidgin.pidgin.yaz' (head 5ae8e199c660399480c0c75277dd4b0ab69e6e9d)
author Yoshiki Yazawa <yaz@honeyplanet.jp>
date Mon, 07 May 2007 01:58:53 +0000
parents 9a568611fa4a (diff) f35329c1094e (current diff)
children 48ef40b32eb7
files autogen.sh configure.ac libpurple/protocols/jabber/jabber.c libpurple/protocols/jabber/message.c libpurple/protocols/oscar/oscar.c libpurple/util.c pidgin/gtkconv.c pidgin/gtkmain.c
diffstat 56 files changed, 311 insertions(+), 263 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Sat May 05 08:00:03 2007 +0000
+++ b/AUTHORS	Mon May 07 01:58:53 2007 +0000
@@ -14,7 +14,7 @@
 	ICQ: 96642211
 	Yahoo:	SeanEgn
 	MSN:  seanegn@hotmail.com
-	Jabber:  seanegn@jabber.org
+	XMPP:  seanegn@jabber.org
 	Gadu-Gadu:  1511497
 
 Daniel 'datallah' Atallah - Developer
@@ -55,7 +55,7 @@
 Rob Flynn <gaim@robflynn.com> - maintainer
 Adam Fritzler - libfaim maintainer
 Syd Logan - hacker and designated driver [lazy bum]
-Jim Seymour - Jabber developer
+Jim Seymour - XMPP developer
 Mark Spencer <markster@marko.net> - original author
 Eric Warmenhoven <eric@warmenhoven.org> - lead developer
 
--- a/ChangeLog	Sat May 05 08:00:03 2007 +0000
+++ b/ChangeLog	Mon May 07 01:58:53 2007 +0000
@@ -4,6 +4,13 @@
 	* Buddy list update speedups when buddy icons are not being
 	  displayed.  (Scott Wolchok)
 
+	Finch:
+	* Userlist in chat windows, which can be turned on or off using
+	  "/users" command.
+	* Menus in the conversation windows.
+	* Improved tab completion support.
+	* Ctrl+c prompts with a dialog before exiting.
+
 version 2.0.0 (5/3/2007):
 	* The project has new names - libpurple for the core, Pidgin for the
 	  GTK+ UI and Finch for the ncurses based console UI (AOL LLC)
--- a/README	Sat May 05 08:00:03 2007 +0000
+++ b/README	Mon May 07 01:58:53 2007 +0000
@@ -4,7 +4,7 @@
 
 libpurple is a library intended to be used by programmers seeking
 to write an IM client that connects to many IM networks.  It supports
-AIM, ICQ, Jabber, MSN and Yahoo!, among others.
+AIM, ICQ, XMPP, MSN and Yahoo!, among others.
 
 Pidgin is an graphical IM client written in C which uses the GTK+
 toolkit.
--- a/autogen.sh	Sat May 05 08:00:03 2007 +0000
+++ b/autogen.sh	Mon May 07 01:58:53 2007 +0000
@@ -2,7 +2,7 @@
 
 CONFIGURE_ARGS=""
 if [ -f configure.args ] ; then
-	CONFIGURE_ARGS="${CONFIGURE_ARGS} `cat configure.args`"
+	. configure.args
 fi
 
 (glib-gettextize --version) < /dev/null > /dev/null 2>&1 || {
--- a/configure.ac	Sat May 05 08:00:03 2007 +0000
+++ b/configure.ac	Mon May 07 01:58:53 2007 +0000
@@ -93,8 +93,6 @@
 GNT_LT_VERSION_INFO="gnt_lt_current:gnt_micro_version:gnt_minor_version"
 AC_SUBST(GNT_LT_VERSION_INFO)
 
-AC_DEFINE(PIDGIN_NAME, "Pidgin", [The user-visible application name])
-
 AC_PATH_PROG(sedpath, sed)
 
 dnl Storing configure arguments
@@ -1922,6 +1920,7 @@
 AC_CHECK_HEADERS(sys/file.h sys/filio.h sys/ioctl.h sys/msgbuf.h)
 AC_CHECK_HEADERS(sys/select.h sys/uio.h sys/utsname.h sys/wait.h)
 AC_CHECK_HEADERS(termios.h)
+AC_CHECK_HEADERS(sys/sysctl.h sys/socket.h)
 AC_VAR_TIMEZONE_EXTERNALS
 
 AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
--- a/doc/finch.1.in	Sat May 05 08:00:03 2007 +0000
+++ b/doc/finch.1.in	Mon May 07 01:58:53 2007 +0000
@@ -30,7 +30,7 @@
 .SH DESCRIPTION
 .PP
 \fBfinch\fR is a console-based modular messaging client capable of using
-AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime,
+AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, Novell GroupWise, Lotus Sametime,
 Zephyr, Gadu-Gadu, and QQ all at once. It has many common features found in
 other clients, as well as many unique features.  Finch is not endorsed by or
 affiliated with America Online, ICQ, Microsoft, or Yahoo.
--- a/doc/funniest_home_convos.txt	Sat May 05 08:00:03 2007 +0000
+++ b/doc/funniest_home_convos.txt	Mon May 07 01:58:53 2007 +0000
@@ -460,3 +460,15 @@
 23:59 -!- beta7 was kicked from #pidgin by elb [getting feisty, are we?]
 23:59 -!- mode/#pidgin [-o elb] by ChanServ
 23:59 <marv> elb: good job getting beta7 out
+
+14:07 <elb> rizzo: I actually prefer elb, and used it for a long time -- but 
+            switched to Paco-Paco because people kept asking me what an 'elb'
+            was
+14:08 <rizzo> elb: tell them it's short for "elbow", and don't explain any 
+              further
+14:08 <elb> rizzo: I actually had people ASK about that
+14:08 <elb> 'is your nick elbow?'
+14:08 <elb> "... yes"
+14:08 <elb> I mean, what do you say
+14:08 <Robot101> elb: was their nick "idi"?
+          
--- a/doc/pidgin.1.in	Sat May 05 08:00:03 2007 +0000
+++ b/doc/pidgin.1.in	Mon May 07 01:58:53 2007 +0000
@@ -28,7 +28,7 @@
 
 .SH DESCRIPTION
 .PP
-Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber,
+Pidgin is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP,
 ICQ, IRC, SILC, SIP/SIMPLE Novell GroupWise, Lotus Sametime, Bonjour,
 Zephyr, Gadu-Gadu, and QQ all at once.  It has many common features found in
 other clients, as well as many unique features.  Pidgin is not endorsed by or
--- a/finch/finch.c	Sat May 05 08:00:03 2007 +0000
+++ b/finch/finch.c	Mon May 07 01:58:53 2007 +0000
@@ -274,7 +274,7 @@
 	}
 	/* show version message */
 	if (opt_version) {
-		printf("Finch %s\n", VERSION);
+		printf("%s %s\n", _("Finch"), VERSION);
 		return 0;
 	}
 
@@ -303,7 +303,7 @@
 			char *text = g_strdup_printf(_(
 				"%s encountered errors migrating your settings "
 				"from %s to %s. Please investigate and complete the "
-				"migration by hand. Please report this error at http://developer.pidgin.im"), "Finch",
+				"migration by hand. Please report this error at http://developer.pidgin.im"), _("Finch"),
 				old, purple_user_dir());
 
 			g_free(old);
--- a/finch/gntblist.c	Sat May 05 08:00:03 2007 +0000
+++ b/finch/gntblist.c	Mon May 07 01:58:53 2007 +0000
@@ -819,6 +819,13 @@
 static void
 finch_blist_get_buddy_info_cb(PurpleBuddy *buddy, PurpleBlistNode *selected)
 {
+	/* Add a userinfo with a "Retrieving information", which will later be updated
+	 * when the server finally returns the information. */
+	PurpleNotifyUserInfo *info = purple_notify_user_info_new();
+	purple_notify_user_info_add_pair(info, _("Information"), _("Retrieving..."));
+	purple_notify_userinfo(buddy->account->gc, purple_buddy_get_name(buddy), info, NULL, NULL);
+	purple_notify_user_info_destroy(info);
+
 	serv_get_info(buddy->account->gc, purple_buddy_get_name(buddy));
 }
 
@@ -2168,7 +2175,7 @@
 	gnt_menu_add_item(GNT_MENU(sub), item);
 	gnt_menuitem_set_callback(GNT_MENU_ITEM(item), send_im_select, NULL);
 
-	item = gnt_menuitem_check_new(_("Toggle offline buddies"));
+	item = gnt_menuitem_check_new(_("Show offline buddies"));
 	gnt_menuitem_check_set_checked(GNT_MENU_ITEM_CHECK(item),
 				purple_prefs_get_bool(PREF_ROOT "/showoffline"));
 	gnt_menu_add_item(GNT_MENU(sub), item);
--- a/finch/gntnotify.c	Sat May 05 08:00:03 2007 +0000
+++ b/finch/gntnotify.c	Mon May 07 01:58:53 2007 +0000
@@ -27,6 +27,7 @@
 #include <gntbutton.h>
 #include <gntlabel.h>
 #include <gnttree.h>
+#include <gntutils.h>
 
 #include <util.h>
 
@@ -72,11 +73,26 @@
 	if (primary)
 		gnt_box_add_widget(GNT_BOX(window),
 				gnt_label_new_with_format(primary, pf));
-	if (secondary)
-		gnt_box_add_widget(GNT_BOX(window),
-				gnt_label_new_with_format(secondary, sf));
 
 	button = gnt_button_new(_("OK"));
+
+	if (secondary) {
+		GntWidget *msg;
+		if (type == PURPLE_NOTIFY_FORMATTED) {
+			int width = -1, height = -1;
+			msg = gnt_text_view_new();
+			gnt_text_view_append_text_with_flags(GNT_TEXT_VIEW(msg), secondary, sf);
+			gnt_text_view_scroll(GNT_TEXT_VIEW(msg), 0);
+			gnt_text_view_attach_scroll_widget(GNT_TEXT_VIEW(msg), button);
+			gnt_util_get_text_bound(secondary, &width, &height);
+			gnt_widget_set_size(msg, width + 3, height + 1);
+		} else {
+			msg = gnt_label_new_with_format(secondary, sf);
+		}
+		gnt_box_add_widget(GNT_BOX(window), msg);
+		g_object_set_data(G_OBJECT(window), "info-widget", msg);
+	}
+
 	gnt_box_add_widget(GNT_BOX(window), button);
 	g_signal_connect_swapped(G_OBJECT(button), "activate",
 			G_CALLBACK(gnt_widget_destroy), window);
@@ -219,19 +235,63 @@
 			url ? &url : NULL);
 }
 
+/** User information. **/
+static GHashTable *userinfo;
+
+static char *
+userinfo_hash(PurpleAccount *account, const char *who)
+{
+	char key[256];
+	snprintf(key, sizeof(key), "%s - %s", purple_account_get_username(account), purple_normalize(account, who));
+	return g_utf8_strup(key, -1);
+}
+
+static void
+remove_userinfo(GntWidget *widget, gpointer key)
+{
+	g_hash_table_remove(userinfo, key);
+}
+
 static void *
 finch_notify_userinfo(PurpleConnection *gc, const char *who, PurpleNotifyUserInfo *user_info)
 {
-	/* Xeroxed from gtknotify.c */
 	char *primary;
 	char *info;
 	void *ui_handle;
-	
-	primary = g_strdup_printf(_("Info for %s"), who);
+	char *key = userinfo_hash(purple_connection_get_account(gc), who);
+
 	info = purple_notify_user_info_get_text_with_newline(user_info, "<BR>");
-	ui_handle = finch_notify_formatted(_("Buddy Information"), primary, NULL, info);
+
+	ui_handle = g_hash_table_lookup(userinfo, key);
+	if (ui_handle != NULL) {
+		GntTextView *msg = GNT_TEXT_VIEW(g_object_get_data(G_OBJECT(ui_handle), "info-widget"));
+		char *strip = purple_markup_strip_html(info);
+		int tvw, tvh, width, height, ntvw, ntvh;
+
+		gnt_widget_get_size(GNT_WIDGET(ui_handle), &width, &height);
+		gnt_widget_get_size(GNT_WIDGET(msg), &tvw, &tvh);
+
+		/* Ideally, I would replace the information in "info". But replacing tagged text is a
+		 * bit nasty right now. So clear the view and add the new stuff instead. */
+		gnt_text_view_clear(msg);
+		gnt_text_view_append_text_with_flags(msg, strip, GNT_TEXT_FLAG_NORMAL);
+		gnt_text_view_scroll(msg, 0);
+		gnt_util_get_text_bound(strip, &ntvw, &ntvh);
+		ntvw += 3;
+		ntvh++;
+
+		gnt_screen_resize_widget(GNT_WIDGET(ui_handle), width + (ntvw - tvw), height + (ntvh - tvh));
+		g_free(strip);
+		g_free(key);
+	} else {
+		primary = g_strdup_printf(_("Info for %s"), who);
+		ui_handle = finch_notify_formatted(_("Buddy Information"), primary, NULL, info);
+		g_hash_table_insert(userinfo, key, ui_handle);
+		g_free(primary);
+		g_signal_connect(G_OBJECT(ui_handle), "destroy", G_CALLBACK(remove_userinfo), key);
+	}
+
 	g_free(info);
-	g_free(primary);
 	return ui_handle;
 }
 
@@ -365,10 +425,12 @@
 
 void finch_notify_init()
 {
+	userinfo = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL);
 }
 
 void finch_notify_uninit()
 {
+	g_hash_table_destroy(userinfo);
 }
 
 
--- a/finch/libgnt/gntentry.c	Sat May 05 08:00:03 2007 +0000
+++ b/finch/libgnt/gntentry.c	Mon May 07 01:58:53 2007 +0000
@@ -75,6 +75,7 @@
 	int count = 0;
 	GList *iter;
 	const char *text = NULL;
+	const char *sgst = NULL;
 
 	if (entry->word)
 	{
@@ -116,6 +117,7 @@
 					gnt_tree_create_row(GNT_TREE(entry->ddown), text),
 					NULL, NULL);
 			count++;
+			sgst = text;
 		}
 	}
 	g_free(suggest);
@@ -125,7 +127,7 @@
 		return FALSE;
 	} else if (count == 1) {
 		destroy_suggest(entry);
-		return complete_suggest(entry, text);
+		return complete_suggest(entry, sgst);
 	} else {
 		gnt_widget_draw(entry->ddown->parent);
 	}
--- a/finch/libgnt/wms/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/finch/libgnt/wms/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -15,7 +15,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir)/finch \
 	-I$(top_srcdir)/finch/libgnt \
--- a/finch/plugins/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/finch/plugins/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -32,7 +32,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir) \
--- a/libpurple/dnssrv.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/dnssrv.c	Mon May 07 01:58:53 2007 +0000
@@ -192,11 +192,19 @@
 	PurpleSrvCallback cb = query_data->cb;
 	int status;
 
-	read(source, &size, sizeof(int));
-	purple_debug_info("dnssrv","found %d SRV entries\n", size);
-	tmp = res = g_new0(PurpleSrvResponse, size);
-	for (i = 0; i < size; i++) {
-		read(source, tmp++, sizeof(PurpleSrvResponse));
+	if (read(source, &size, sizeof(int)) > 0)
+	{
+		purple_debug_info("dnssrv","found %d SRV entries\n", size);
+		tmp = res = g_new0(PurpleSrvResponse, size);
+		for (i = 0; i < size; i++) {
+			read(source, tmp++, sizeof(PurpleSrvResponse));
+		}
+	}
+	else
+	{
+		purple_debug_info("dnssrv","found 0 SRV entries; errno is %i\n", errno);
+		size = 0;
+		res = NULL;
 	}
 
 	cb(res, size, query_data->extradata);
--- a/libpurple/internal.h	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/internal.h	Mon May 07 01:58:53 2007 +0000
@@ -183,6 +183,7 @@
 #define purple_strlcat(dest, src) g_strlcat(dest, src, sizeof(dest))
 
 #define PURPLE_WEBSITE "http://pidgin.im/"
+#define PURPLE_DEVEL_WEBSITE "http://developer.pidgin.im/"
 
 /* This is for the accounts code to notify the buddy icon code that
  * it's done loading.  We may want to replace this with a signal. */
--- a/libpurple/nat-pmp.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/nat-pmp.c	Mon May 07 01:58:53 2007 +0000
@@ -29,64 +29,58 @@
  */
 
 #include "nat-pmp.h"
+#include "internal.h"
 #include "debug.h"
 #include "signals.h"
 #include "network.h"
 
-#include <sys/types.h>
-#ifndef _WIN32
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/socket.h>
+#ifdef HAVE_SYS_SYSCTL_H
 #include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/route.h>
-
-#include <netdb.h>
-#include <err.h>
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 
-#include <errno.h>
+/* We will need sysctl() and NET_RT_DUMP, both of which are not present
+ * on all platforms, to continue. */
+#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP)
 
-#ifdef NET_RT_DUMP
+#include <sys/types.h>
+#include <net/route.h>
 
 #define PMP_DEBUG	1
 
 typedef struct {
-	uint8_t	version;
-	uint8_t opcode;
+	guint8	version;
+	guint8 opcode;
 } PurplePmpIpRequest;
 
 typedef struct {
-	uint8_t		version;
-	uint8_t		opcode; /* 128 + n */
-	uint16_t	resultcode;
-	uint32_t	epoch;
-	uint32_t	address;
+	guint8		version;
+	guint8		opcode; /* 128 + n */
+	guint16		resultcode;
+	guint32		epoch;
+	guint32		address;
 } PurplePmpIpResponse;
 
 typedef struct {
-	uint8_t		version;
-	uint8_t		opcode;
+	guint8		version;
+	guint8		opcode;
 	char		reserved[2];
-	uint16_t	privateport;
-	uint16_t	publicport;
-	uint32_t	lifetime;
+	guint16		privateport;
+	guint16		publicport;
+	guint32		lifetime;
 } PurplePmpMapRequest;
 
 struct _PurplePmpMapResponse {
-	uint8_t		version;
-	uint8_t		opcode;
-	uint16_t	resultcode;
-	uint32_t	epoch;
-	uint16_t	privateport;
-	uint16_t	publicport;
-	uint32_t	lifetime;
+	guint8		version;
+	guint8		opcode;
+	guint16		resultcode;
+	guint32		epoch;
+	guint16		privateport;
+	guint16		publicport;
+	guint32		lifetime;
 };
 
 typedef struct _PurplePmpMapResponse PurplePmpMapResponse;
@@ -549,4 +543,4 @@
 {
 
 }
-#endif /* #ifndef NET_RT_DUMP */
+#endif /* #if !(defined(HAVE_SYS_SYCTL_H) && defined(NET_RT_DUMP)) */
--- a/libpurple/nat-pmp.h	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/nat-pmp.h	Mon May 07 01:58:53 2007 +0000
@@ -31,7 +31,6 @@
 #ifndef _PURPLE_NAT_PMP_H
 #define _PURPLE_NAT_PMP_H
 
-#include <stdint.h>
 #include <glib.h>
 
 #define PURPLE_PMP_LIFETIME	3600	/* 3600 seconds */
--- a/libpurple/plugins/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/plugins/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -127,7 +127,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	$(DEBUG_CFLAGS) \
--- a/libpurple/plugins/mono/loader/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/plugins/mono/loader/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -17,7 +17,6 @@
 mono_la_LIBADD = $(MONO_LIBS)
 
 AM_CPPFLAGS = \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
 	$(DEBUG_CFLAGS) \
--- a/libpurple/plugins/perl/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -152,7 +152,6 @@
 	fi
 
 AM_CPPFLAGS = \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
--- a/libpurple/plugins/psychic.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/plugins/psychic.c	Mon May 07 01:58:53 2007 +0000
@@ -21,7 +21,7 @@
 #define PLUGIN_SUMMARY  N_("Psychic mode for incoming conversation")
 #define PLUGIN_DESC     N_("Causes conversation windows to appear as other" \
 			   " users begin to message you.  This works for" \
-			   " AIM, ICQ, Jabber, Sametime, and Yahoo!")
+			   " AIM, ICQ, XMPP, Sametime, and Yahoo!")
 #define PLUGIN_AUTHOR   "Christopher O'Brien <siege@preoccupied.net>"
 
 
--- a/libpurple/plugins/tcl/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/plugins/tcl/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -12,7 +12,6 @@
 EXTRA_DIST = signal-test.tcl Makefile.mingw
 
 AM_CPPFLAGS = \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
--- a/libpurple/protocols/bonjour/bonjour.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/protocols/bonjour/bonjour.c	Mon May 07 01:58:53 2007 +0000
@@ -602,7 +602,7 @@
 	option = purple_account_option_string_new(_("AIM Account"), "AIM", "");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
-	option = purple_account_option_string_new(_("Jabber Account"), "jid", "");
+	option = purple_account_option_string_new(_("XMPP Account"), "jid", "");
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	my_protocol = plugin;
--- a/libpurple/protocols/irc/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/protocols/irc/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -1,4 +1,4 @@
-EXTRA_DIST = PROTOCOL Makefile.mingw
+EXTRA_DIST = Makefile.mingw
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
--- a/libpurple/protocols/jabber/buddy.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/protocols/jabber/buddy.c	Mon May 07 01:58:53 2007 +0000
@@ -575,8 +575,8 @@
 	if(x_vc_data != NULL)
 		xmlnode_free(x_vc_data);
 
-	purple_request_fields(gc, _("Edit Jabber vCard"),
-						_("Edit Jabber vCard"),
+	purple_request_fields(gc, _("Edit XMPP vCard"),
+						_("Edit XMPP vCard"),
 						_("All items below are optional. Enter only the "
 						  "information with which you feel comfortable."),
 						fields,
@@ -1729,7 +1729,7 @@
 		if(!instructions)
 		{
 			instructions = g_strdup(_("Fill in one or more fields to search "
-						  "for any matching Jabber users."));
+						  "for any matching XMPP users."));
 		}
 
 		if(xmlnode_get_child(query, "first")) {
@@ -1757,8 +1757,8 @@
 		usi->js = js;
 		usi->directory_server = g_strdup(from);
 
-		purple_request_fields(js->gc, _("Search for Jabber users"),
-				_("Search for Jabber users"), instructions, fields,
+		purple_request_fields(js->gc, _("Search for XMPP users"),
+				_("Search for XMPP users"), instructions, fields,
 				_("Search"), G_CALLBACK(user_search_cb),
 				_("Cancel"), G_CALLBACK(user_search_cancel_cb),
 				NULL, NULL, NULL,
--- a/libpurple/protocols/jabber/jabber.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Mon May 07 01:58:53 2007 +0000
@@ -563,7 +563,7 @@
 	js->write_buffer = purple_circ_buffer_new(512);
 
 	if(!js->user) {
-		purple_connection_error(gc, _("Invalid Jabber ID"));
+		purple_connection_error(gc, _("Invalid XMPP ID"));
 		return;
 	}
 
@@ -869,8 +869,8 @@
 			instructions = g_strdup(_("Please fill out the information below "
 						"to register your new account."));
 
-		purple_request_fields(js->gc, _("Register New Jabber Account"),
-				_("Register New Jabber Account"), instructions, fields,
+		purple_request_fields(js->gc, _("Register New XMPP Account"),
+				_("Register New XMPP Account"), instructions, fields,
 				_("Register"), G_CALLBACK(jabber_register_cb),
 				_("Cancel"), G_CALLBACK(jabber_register_cancel_cb),
 				purple_connection_get_account(js->gc), NULL, NULL,
@@ -908,7 +908,7 @@
 	js->next_id = g_random_int();
 
 	if(!js->user) {
-		purple_connection_error(gc, _("Invalid Jabber ID"));
+		purple_connection_error(gc, _("Invalid XMPP ID"));
 		return;
 	}
 
@@ -1375,8 +1375,8 @@
 	purple_request_field_string_set_masked(field, TRUE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields(js->gc, _("Change Jabber Password"),
-			_("Change Jabber Password"), _("Please enter your new password"),
+	purple_request_fields(js->gc, _("Change XMPP Password"),
+			_("Change XMPP Password"), _("Please enter your new password"),
 			fields, _("OK"), G_CALLBACK(jabber_password_change_cb),
 			_("Cancel"), NULL,
 			purple_connection_get_account(gc), NULL, NULL,			  
@@ -1490,7 +1490,7 @@
 		} else if(xmlnode_get_child(error, "item-not-found")) {
 			text = _("Item Not Found");
 		} else if(xmlnode_get_child(error, "jid-malformed")) {
-			text = _("Malformed Jabber ID");
+			text = _("Malformed XMPP ID");
 		} else if(xmlnode_get_child(error, "not-acceptable")) {
 			text = _("Not Acceptable");
 		} else if(xmlnode_get_child(error, "not-allowed")) {
--- a/libpurple/protocols/jabber/libxmpp.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/protocols/jabber/libxmpp.c	Mon May 07 01:58:53 2007 +0000
@@ -163,9 +163,9 @@
 	"XMPP",                                           /**< name           */
 	VERSION,                                          /**< version        */
 	                                                  /**  summary        */
-	N_("Jabber Protocol Plugin"),
+	N_("XMPP Protocol Plugin"),
 	                                                  /**  description    */
-	N_("Jabber Protocol Plugin"),
+	N_("XMPP Protocol Plugin"),
 	NULL,                                             /**< author         */
 	PURPLE_WEBSITE,                                     /**< homepage       */
 
--- a/libpurple/protocols/jabber/message.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/protocols/jabber/message.c	Mon May 07 01:58:53 2007 +0000
@@ -267,7 +267,7 @@
 	buf = g_strdup_printf(_("Message delivery to %s failed: %s"),
 			jm->from, jm->error ? jm->error : "");
 
-	purple_notify_formatted(jm->js->gc, _("Jabber Message Error"), _("Jabber Message Error"), buf,
+	purple_notify_formatted(jm->js->gc, _("XMPP Message Error"), _("XMPP Message Error"), buf,
 			jm->xhtml ? jm->xhtml : jm->body, NULL, NULL);
 
 	g_free(buf);
--- a/libpurple/protocols/oscar/family_feedbag.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/protocols/oscar/family_feedbag.c	Mon May 07 01:58:53 2007 +0000
@@ -588,9 +588,7 @@
 	od->ssi.waiting_for_ack = TRUE;
 
 	/* Now go mail off our data and wait 4 to 6 weeks */
-	aim_ssi_addmoddel(od);
-
-	return 0;
+	return aim_ssi_addmoddel(od);;
 }
 
 /**
@@ -714,9 +712,7 @@
 		aim_ssi_itemlist_del(&od->ssi.local, cur);
 
 	/* If we've made any changes then sync our list with the server's */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -769,9 +765,7 @@
 	aim_ssi_itemlist_rebuildgroup(od->ssi.local, group);
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -795,9 +789,7 @@
 	aim_ssi_itemlist_add(&od->ssi.local, name, 0x0000, 0xFFFF, AIM_SSI_TYPE_PERMIT, NULL);
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -821,9 +813,7 @@
 	aim_ssi_itemlist_add(&od->ssi.local, name, 0x0000, 0xFFFF, AIM_SSI_TYPE_DENY, NULL);
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -865,9 +855,7 @@
 	}
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -892,9 +880,7 @@
 	aim_ssi_itemlist_del(&od->ssi.local, del);
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -919,9 +905,7 @@
 	aim_ssi_itemlist_del(&od->ssi.local, del);
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -977,9 +961,7 @@
 		aim_tlvlist_remove(&tmp->data, 0x0131);
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -1009,9 +991,7 @@
 		aim_tlvlist_remove(&tmp->data, 0x013c);
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -1037,9 +1017,7 @@
 	strcpy(group->name, newgn);
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -1079,9 +1057,7 @@
 	aim_tlvlist_replace_32(&tmp->data, 0x00cb, vismask);
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /**
@@ -1171,9 +1147,7 @@
 	aim_tlvlist_replace_32(&tmp->data, 0x00c9, presence);
 
 	/* Sync our local list with the server list */
-	aim_ssi_sync(od);
-
-	return 0;
+	return aim_ssi_sync(od);
 }
 
 /*
--- a/libpurple/protocols/oscar/oscar.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Mon May 07 01:58:53 2007 +0000
@@ -5125,7 +5125,6 @@
 	purple_debug_info("oscar",
 			   "ssi: %s has given you permission to add him to your buddy list\n", sn);
 
-	/* XXX Should data->nick store the alias and nombre just have the sn? -evands */
 	buddy = purple_find_buddy(gc->account, sn);
 	if (buddy && (purple_buddy_get_alias_only(buddy)))
 		nombre = g_strdup_printf("%s (%s)", sn, purple_buddy_get_alias_only(buddy));
@@ -5133,10 +5132,12 @@
 		nombre = g_strdup(sn);
 
 	dialog_msg = g_strdup_printf(_("The user %s has given you permission to add you to their buddy list.  Do you want to add them?"), nombre);
+	g_free(nombre);
+
 	data = g_new(struct name_data, 1);
 	data->gc = gc;
 	data->name = g_strdup(sn);
-	data->nick = NULL;
+	data->nick = (buddy ? g_strdup(purple_buddy_get_alias_only(buddy)) : NULL);
 
 	purple_request_yes_no(gc, NULL, _("Authorization Given"), dialog_msg,
 						PURPLE_DEFAULT_ACTION_NONE,
@@ -5144,9 +5145,7 @@
 						data,
 						G_CALLBACK(purple_icq_buddyadd),
 						G_CALLBACK(oscar_free_name_data));
-
 	g_free(dialog_msg);
-	g_free(nombre);
 
 	return 1;
 }
@@ -5157,7 +5156,6 @@
 	char *sn;
 	char *msg;
 	PurpleAccount *account = purple_connection_get_account(gc);
-	gchar *nombre;
 	gchar *reason = NULL;
 	struct name_data *data;
 	PurpleBuddy *buddy;
@@ -5171,10 +5169,6 @@
 			   "ssi: received authorization request from %s\n", sn);
 
 	buddy = purple_find_buddy(account, sn);
-	if (buddy && (purple_buddy_get_alias_only(buddy)))
-		nombre = g_strdup_printf("%s (%s)", sn, purple_buddy_get_alias_only(buddy));
-	else
-		nombre = g_strdup(sn);
 
 	if (msg != NULL)
 		reason = purple_plugin_oscar_decode_im_part(account, sn, AIM_CHARSET_CUSTOM, 0x0000, msg, strlen(msg));
@@ -5182,12 +5176,12 @@
 	data = g_new(struct name_data, 1);
 	data->gc = gc;
 	data->name = g_strdup(sn);
-	data->nick = NULL;
-
-	purple_account_request_authorization(account, nombre, NULL, NULL,
+	data->nick = (buddy ? g_strdup(purple_buddy_get_alias_only(buddy)) : NULL);
+
+	purple_account_request_authorization(account, sn, NULL,
+			(buddy ? purple_buddy_get_alias_only(buddy) : NULL),
 			reason, buddy != NULL, G_CALLBACK(purple_auth_grant),
 			G_CALLBACK(purple_auth_dontgrant_msgprompt), data);
-	g_free(nombre);
 	g_free(reason);
 
 	return 1;
@@ -5818,8 +5812,8 @@
 	comment_utf8 = comment ? oscar_utf8_try_convert(gc->account, comment) : NULL;
 
 	data->gc = gc;
-	data->name = g_strdup(buddy->name);
-	data->nick = NULL;
+	data->name = g_strdup(purple_buddy_get_name(buddy));
+	data->nick = g_strdup(purple_buddy_get_alias_only(buddy));
 
 	title = g_strdup_printf(_("Buddy Comment for %s"), data->name);
 	purple_request_input(gc, title, _("Buddy Comment:"), NULL,
--- a/libpurple/protocols/qq/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/protocols/qq/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -94,7 +94,6 @@
 AM_CPPFLAGS = \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
-	-DVERSION=\"$(VERSION)\" \
 	-DQQ_BUDDY_ICON_DIR=\"$(datadir)/pixmaps/purple/buddy_icons/qq\" \
 	$(DEBUG_CFLAGS) \
 	$(GLIB_CFLAGS)
--- a/libpurple/prpl.h	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/prpl.h	Mon May 07 01:58:53 2007 +0000
@@ -99,7 +99,7 @@
 	/**
 	 * Use a unique name, not an alias, for chat rooms.
 	 *
-	 * Jabber lets you choose what name you want for chat.
+	 * XMPP lets you choose what name you want for chat.
 	 * So it shouldn't be pulling the alias for when you're in chat;
 	 * it gets annoying.
 	 */
@@ -108,7 +108,7 @@
 	/**
 	 * Chat rooms have topics.
 	 *
-	 * IRC and Jabber support this.
+	 * IRC and XMPP support this.
 	 */
 	OPT_PROTO_CHAT_TOPIC = 0x00000008,
 
@@ -145,7 +145,7 @@
 	/**
 	 * Allows font size to be specified in sane point size
 	 *
-	 * Probably just Jabber and Y!M
+	 * Probably just XMPP and Y!M
 	 */
 	OPT_PROTO_USE_POINTSIZE = 0x00000100,
 
--- a/libpurple/util.c	Sat May 05 08:00:03 2007 +0000
+++ b/libpurple/util.c	Mon May 07 01:58:53 2007 +0000
@@ -1741,6 +1741,7 @@
 				else if (strncasecmp(str2 + i, "<p>", 3) == 0
 				 || strncasecmp(str2 + i, "<tr", 3) == 0
 				 || strncasecmp(str2 + i, "<br", 3) == 0
+				 || strncasecmp(str2 + i, "<hr", 3) == 0
 				 || strncasecmp(str2 + i, "<li", 3) == 0
 				 || strncasecmp(str2 + i, "<div", 4) == 0
 				 || strncasecmp(str2 + i, "</table>", 8) == 0)
@@ -2531,11 +2532,7 @@
 
 	if((tmpdir = (gchar*)g_get_tmp_dir()) != NULL) {
 		if((*fpath = g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", tmpdir, purple_mkstemp_templ)) != NULL) {
-#ifdef _WIN32
 			fd = g_mkstemp(*fpath);
-#else
-			fd = mkstemp(*fpath);
-#endif
 			if(fd == -1) {
 				purple_debug(PURPLE_DEBUG_ERROR, "purple_mkstemp",
 						   "Couldn't make \"%s\", error: %d\n",
--- a/pidgin.apspec.in	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin.apspec.in	Mon May 07 01:58:53 2007 +0000
@@ -14,7 +14,7 @@
 
 [Description]
 Pidgin allows you to talk to anyone using a variety of messaging protocols,
-including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, Jabber,
+including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP,
 Gadu-Gadu, and Zephyr. These protocols are implemented using a
 modular, easy to use design. To use a protocol, just add an account using the
 account editor.
--- a/pidgin.spec.in	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin.spec.in	Mon May 07 01:58:53 2007 +0000
@@ -132,7 +132,7 @@
 
 %description
 Pidgin allows you to talk to anyone using a variety of messaging
-protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu,
+protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu,
 ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
 Zephyr.  These protocols are implemented using a modular, easy to
 use design.  To use a protocol, just add an account using the
@@ -154,7 +154,7 @@
 and Finch.
 
 libpurple supports a variety of messaging protocols including AIM, MSN,
-Yahoo!, Jabber, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
+Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ,
 Lotus Sametime, SILC, Simple and Zephyr.
 
 %description -n libpurple-devel
--- a/pidgin/gtkconv.c	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/gtkconv.c	Mon May 07 01:58:53 2007 +0000
@@ -380,7 +380,7 @@
 	PurpleCmdStatus status;
 
 	if (!g_ascii_strcasecmp(args[0], "version")) {
-		tmp = g_strdup_printf("me is using " PIDGIN_NAME " v%s.", VERSION);
+		tmp = g_strdup_printf("me is using %s v%s.", PIDGIN_NAME, VERSION);
 		markup = g_markup_escape_text(tmp, -1);
 
 		status = purple_cmd_do_command(conv, tmp, markup, error);
--- a/pidgin/gtkdialogs.c	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/gtkdialogs.c	Mon May 07 01:58:53 2007 +0000
@@ -112,7 +112,7 @@
 	{"Adam Fritzler",		N_("libfaim maintainer"), NULL},
 	/* If "lazy bum" translates literally into a serious insult, use something else or omit it. */
 	{"Syd Logan",			N_("hacker and designated driver [lazy bum]"), NULL},
-	{"Jim Seymour",			N_("Jabber developer"), NULL},
+	{"Jim Seymour",			N_("XMPP developer"), NULL},
 	{"Mark Spencer",		N_("original author"), "markster@marko.net"},
 	{"Eric Warmenhoven",	N_("lead developer"), "warmenhoven@yahoo.com"},
 	{NULL, NULL, NULL}
@@ -350,7 +350,9 @@
 	gdk_pixbuf_unref(pixbuf);
 	/* Insert the logo */
 	obj = gtk_widget_get_accessible(logo);
-	atk_object_set_description(obj, PIDGIN_NAME " " VERSION);
+	tmp = g_strconcat(PIDGIN_NAME, " " VERSION, NULL);
+	atk_object_set_description(obj, tmp);
+	g_free(tmp);
 	gtk_box_pack_start(GTK_BOX(vbox), logo, FALSE, FALSE, 0);
 
 	frame = pidgin_create_imhtml(FALSE, &text, NULL, NULL);
@@ -361,7 +363,7 @@
 
 	g_string_append_printf(str,
 		_("%s is a modular messaging client capable of using "
-		  "AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, "
+		  "AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
 		  "Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
 		  "Gadu-Gadu, and QQ all at once.  "
 		  "It is written using GTK+.<BR><BR>"
@@ -506,9 +508,9 @@
 #endif
 
 #ifdef HAVE_SSL
-	g_string_append(str, "  <b>SSL:</b> " PIDGIN_NAME " was compiled with SSL support.<br/>");
+	g_string_append(str, "  <b>SSL:</b> SSL support is present.<br/>");
 #else
-	g_string_append(str, "  <b>SSL:</b> " PIDGIN_NAME " was <b><i>NOT</i></b> compiled with any SSL support!<br/>");
+	g_string_append(str, "  <b>SSL:</b> SSL support was <b><i>NOT</i></b> compiled!<br/>");
 #endif
 
 /* This might be useful elsewhere too, but it is particularly useful for
--- a/pidgin/gtkdocklet.c	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/gtkdocklet.c	Mon May 07 01:58:53 2007 +0000
@@ -171,7 +171,7 @@
 		g_list_free(convs);
 
 	} else if (ui_ops->set_tooltip) {
-		char *tooltip_text = g_strconcat(PIDGIN_NAME " - ",
+		char *tooltip_text = g_strconcat(PIDGIN_NAME, " - ",
 			purple_savedstatus_get_title(saved_status), NULL);
 		ui_ops->set_tooltip(tooltip_text);
 		g_free(tooltip_text);
@@ -486,8 +486,8 @@
 
 	pidgin_separator(submenu);
 
-	new_menu_item_with_status_icon(submenu, _("New..."), PURPLE_STATUS_AVAILABLE, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL);
-	new_menu_item_with_status_icon(submenu, _("Saved..."), PURPLE_STATUS_AVAILABLE, G_CALLBACK(pidgin_status_window_show), NULL, 0, 0, NULL);
+	pidgin_new_item_from_stock(submenu, _("New..."), NULL, G_CALLBACK(show_custom_status_editor_cb), NULL, 0, 0, NULL);
+	pidgin_new_item_from_stock(submenu, _("Saved..."), NULL, G_CALLBACK(pidgin_status_window_show), NULL, 0, 0, NULL);
 
 	return menuitem;
 }
--- a/pidgin/gtkmain.c	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/gtkmain.c	Mon May 07 01:58:53 2007 +0000
@@ -500,18 +500,18 @@
 			"%s has segfaulted and attempted to dump a core file.\n"
 			"This is a bug in the software and has happened through\n"
 			"no fault of your own.\n\n"
-			"If you can reproduce the crash, please notify the Pidgin\n"
-			"developers by reporting a bug at\n"
-			"%sbug.php\n\n"
+			"If you can reproduce the crash, please notify the developers\n"
+			"by reporting a bug at:\n"
+			"%snewticket/\n\n"
 			"Please make sure to specify what you were doing at the time\n"
 			"and post the backtrace from the core file.  If you do not know\n"
 			"how to get the backtrace, please read the instructions at\n"
-			"%sgdb.php\n\n"
+			"%swiki/GetABacktrace\n\n"
 			"If you need further assistance, please IM either SeanEgn or \n"
 			"LSchiere (via AIM).  Contact information for Sean and Luke \n"
 			"on other protocols is at\n"
-			"%scontactinfo.php\n"),
-			PIDGIN_NAME, PURPLE_WEBSITE, PURPLE_WEBSITE, PURPLE_WEBSITE
+			"%swiki/DeveloperPages\n"),
+			PIDGIN_NAME, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE, PURPLE_DEVEL_WEBSITE
 		);
 
 		/* we have to convert the message (UTF-8 to console
@@ -632,7 +632,7 @@
 	}
 	/* show version message */
 	if (opt_version) {
-		printf(PIDGIN_NAME " %s\n", VERSION);
+		printf("%s %s\n", PIDGIN_NAME, VERSION);
 #ifdef HAVE_SIGNAL_H
 		g_free(segfault_message);
 #endif
@@ -669,7 +669,7 @@
 	if (!gui_check) {
 		char *display = gdk_get_display();
 
-		printf(PIDGIN_NAME " %s\n", VERSION);
+		printf("%s %s\n", PIDGIN_NAME, VERSION);
 
 		g_warning("cannot open display: %s", display ? display : "unset");
 		g_free(display);
@@ -729,7 +729,7 @@
 
 	if (!purple_core_init(PIDGIN_UI)) {
 		fprintf(stderr,
-				"Initialization of the " PIDGIN_NAME " core failed. Dumping core.\n"
+				"Initialization of the libpurple core failed. Dumping core.\n"
 				"Please report this!\n");
 #ifdef HAVE_SIGNAL_H
 		g_free(segfault_message);
--- a/pidgin/gtksound.c	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/gtksound.c	Mon May 07 01:58:53 2007 +0000
@@ -430,7 +430,7 @@
 			return;
 		}
 
-		esc_filename = g_strdup_printf("'%s'", filename);
+		esc_filename = g_shell_quote(filename);
 
 		if(strstr(sound_cmd, "%s"))
 			command = purple_strreplace(sound_cmd, "%s", esc_filename);
--- a/pidgin/gtkutils.c	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/gtkutils.c	Mon May 07 01:58:53 2007 +0000
@@ -1417,7 +1417,7 @@
 			char *str, *str2;
 
 			str = g_strdup_printf(_("Cannot send folder %s."), basename);
-			str2 = g_strdup_printf(_("%s cannot transfer a folder. You will need to send the files within individually"), PIDGIN_NAME);
+			str2 = g_strdup_printf(_("%s cannot transfer a folder. You will need to send the files within individually."), PIDGIN_NAME);
 
 			purple_notify_error(NULL, NULL,
 					  str, str2);
--- a/pidgin/pidgin.h	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/pidgin.h	Mon May 07 01:58:53 2007 +0000
@@ -45,6 +45,9 @@
 /* change this only when we have a sane upgrade path for old prefs */
 #define PIDGIN_PREFS_ROOT "/pidgin"
 
+/* Translators may want to transliterate the name. */
+#define PIDGIN_NAME _("Pidgin")
+
 #ifndef _WIN32
 # define PIDGIN_ALERT_TITLE ""
 #else
--- a/pidgin/plugins/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/plugins/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -107,7 +107,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir)/pidgin \
--- a/pidgin/plugins/cap/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/plugins/cap/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -19,7 +19,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
--- a/pidgin/plugins/gestures/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/plugins/gestures/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -19,7 +19,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
--- a/pidgin/plugins/gevolution/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/plugins/gevolution/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -21,7 +21,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
--- a/pidgin/plugins/musicmessaging/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/plugins/musicmessaging/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -36,7 +36,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_srcdir)/pidgin \
--- a/pidgin/plugins/perl/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/plugins/perl/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -95,7 +95,6 @@
 	@rm -f Makefile
 
 AM_CPPFLAGS = \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
--- a/pidgin/plugins/raw.c	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/plugins/raw.c	Mon May 07 01:58:53 2007 +0000
@@ -175,7 +175,7 @@
 	N_("Raw"),
 	VERSION,
 	N_("Lets you send raw input to text-based protocols."),
-	N_("Lets you send raw input to text-based protocols (Jabber, MSN, IRC, "
+	N_("Lets you send raw input to text-based protocols (XMPP, MSN, IRC, "
 	   "TOC). Hit 'Enter' in the entry box to send. Watch the debug window."),
 	"Eric Warmenhoven <eric@warmenhoven.org>",
 	PURPLE_WEBSITE,
--- a/pidgin/plugins/ticker/Makefile.am	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/plugins/ticker/Makefile.am	Mon May 07 01:58:53 2007 +0000
@@ -20,7 +20,6 @@
 
 AM_CPPFLAGS = \
 	-DDATADIR=\"$(datadir)\" \
-	-DVERSION=\"$(VERSION)\" \
 	-I$(top_srcdir)/libpurple \
 	-I$(top_builddir)/libpurple \
 	-I$(top_srcdir)/pidgin \
--- a/pidgin/plugins/timestamp_format.c	Sat May 05 08:00:03 2007 +0000
+++ b/pidgin/plugins/timestamp_format.c	Mon May 07 01:58:53 2007 +0000
@@ -23,7 +23,7 @@
 	ppref = purple_plugin_pref_new_with_label(_("Timestamp Format Options"));
 	purple_plugin_pref_frame_add(frame, ppref);
 
-	tmp = g_strdup_printf(_("_Force (traditional %s) 24-hour time format"), PIDGIN_NAME);
+	tmp = g_strdup_printf(_("_Force 24-hour time format"));
 	ppref = purple_plugin_pref_new_with_name_and_label(
 			"/plugins/gtk/timestamp_format/force_24hr",
 			tmp);
--- a/po/POTFILES.in	Sat May 05 08:00:03 2007 +0000
+++ b/po/POTFILES.in	Mon May 07 01:58:53 2007 +0000
@@ -177,6 +177,7 @@
 pidgin/gtkutils.c
 pidgin/gtkwhiteboard.c
 pidgin/pidgincombobox.c
+pidgin/pidgin.h
 pidgin/pidginstock.c
 pidgin/plugins/cap/cap.c
 pidgin/plugins/contact_priority.c
--- a/po/en_AU.po	Sat May 05 08:00:03 2007 +0000
+++ b/po/en_AU.po	Mon May 07 01:58:53 2007 +0000
@@ -849,10 +849,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 
 #: plugins/relnot.c:63
@@ -2822,8 +2822,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "former Jabber developer"
+msgid "XMPP developer"
+msgstr "former XMPP developer"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -2996,11 +2996,11 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licensed under the GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:235
@@ -5001,7 +5001,7 @@
 #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "Register New Jabber Account"
+msgstr "Register New XMPP Account"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
@@ -5723,8 +5723,8 @@
 msgstr "Birthday"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Edit XMPP vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5735,8 +5735,8 @@
 "comfortable."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5814,7 +5814,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5833,7 +5833,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "Search for a buddy by e-mail address"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5959,8 +5959,8 @@
 msgstr "Unable to create socket"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Invalid XMPP ID"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6006,8 +6006,8 @@
 msgstr "Please fill out the information below to register your new account."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "Register New Jabber Account"
+msgid "Register New XMPP Account"
+msgstr "Register New XMPP Account"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6079,8 +6079,8 @@
 msgstr "Password (again)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Change Jabber Password"
+msgid "Change XMPP Password"
+msgstr "Change XMPP Password"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6130,8 +6130,8 @@
 msgstr "Item Not Found"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Malformed XMPP ID"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6377,8 +6377,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protocol Plugin"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6428,8 +6428,8 @@
 msgstr "Message delivery to %s failed: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber Message Error"
+msgid "XMPP Message Error"
+msgstr "XMPP Message Error"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12182,8 +12182,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Invalid Username"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber Profile"
+#~ msgid "XMPP Profile"
+#~ msgstr "XMPP Profile"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Roomlist Error"
--- a/po/en_CA.po	Sat May 05 08:00:03 2007 +0000
+++ b/po/en_CA.po	Mon May 07 01:58:53 2007 +0000
@@ -849,10 +849,10 @@
 
 #: plugins/raw.c:154
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 
 #: plugins/relnot.c:63
@@ -2818,8 +2818,8 @@
 
 #: src/gtkdialogs.c:92
 #, fuzzy
-msgid "Jabber developer"
-msgstr "former Jabber developer"
+msgid "XMPP developer"
+msgstr "former XMPP developer"
 
 #: src/gtkdialogs.c:93
 msgid "original author"
@@ -2992,11 +2992,11 @@
 #, fuzzy
 msgid ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using GTK+ and is licensed under the GNU GPL.<BR><BR>"
 msgstr ""
 "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
+"XMPP, ICQ, IRC, SILC, Novell GroupWise, Napster, Zephyr, and Gadu-Gadu all "
 "at once.  It is written using Gtk+ and is licenced under the GPL.<BR><BR>"
 
 #: src/gtkdialogs.c:235
@@ -4996,7 +4996,7 @@
 #: src/protocols/gg/gg.c:1495 src/protocols/gg/gg.c:1496
 #, fuzzy
 msgid "Register New Gadu-Gadu Account"
-msgstr "Register New Jabber Account"
+msgstr "Register New XMPP Account"
 
 #: src/protocols/gg/gg.c:1497
 msgid "Please, fill in the following fields"
@@ -5717,8 +5717,8 @@
 msgstr "Birthday"
 
 #: src/protocols/jabber/buddy.c:567 src/protocols/jabber/buddy.c:568
-msgid "Edit Jabber vCard"
-msgstr "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Edit XMPP vCard"
 
 #: src/protocols/jabber/buddy.c:569
 msgid ""
@@ -5729,8 +5729,8 @@
 "comfortable."
 
 #: src/protocols/jabber/buddy.c:616
-msgid "Jabber ID"
-msgstr "Jabber ID"
+msgid "XMPP ID"
+msgstr "XMPP ID"
 
 #: src/protocols/jabber/buddy.c:642 src/protocols/jabber/jabber.c:1711
 msgid "Resource"
@@ -5808,7 +5808,7 @@
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1327
-msgid "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
 #: src/protocols/jabber/buddy.c:1331 src/protocols/jabber/jabber.c:653
@@ -5827,7 +5827,7 @@
 
 #: src/protocols/jabber/buddy.c:1355 src/protocols/jabber/buddy.c:1356
 #, fuzzy
-msgid "Search for Jabber users"
+msgid "Search for XMPP users"
 msgstr "Search for a buddy by e-mail address"
 
 #: src/protocols/jabber/buddy.c:1370
@@ -5953,8 +5953,8 @@
 msgstr "Unable to create socket"
 
 #: src/protocols/jabber/jabber.c:403 src/protocols/jabber/jabber.c:740
-msgid "Invalid Jabber ID"
-msgstr "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Invalid XMPP ID"
 
 #: src/protocols/jabber/jabber.c:473
 #, c-format
@@ -6000,8 +6000,8 @@
 msgstr "Please fill out the information below to register your new account."
 
 #: src/protocols/jabber/jabber.c:704 src/protocols/jabber/jabber.c:705
-msgid "Register New Jabber Account"
-msgstr "Register New Jabber Account"
+msgid "Register New XMPP Account"
+msgstr "Register New XMPP Account"
 
 #: src/protocols/jabber/jabber.c:842
 msgid "Initializing Stream"
@@ -6073,8 +6073,8 @@
 msgstr "Password (again)"
 
 #: src/protocols/jabber/jabber.c:1160 src/protocols/jabber/jabber.c:1161
-msgid "Change Jabber Password"
-msgstr "Change Jabber Password"
+msgid "Change XMPP Password"
+msgstr "Change XMPP Password"
 
 #: src/protocols/jabber/jabber.c:1161
 msgid "Please enter your new password"
@@ -6124,8 +6124,8 @@
 msgstr "Item Not Found"
 
 #: src/protocols/jabber/jabber.c:1271
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Malformed XMPP ID"
 
 #: src/protocols/jabber/jabber.c:1273
 msgid "Not Acceptable"
@@ -6371,8 +6371,8 @@
 #. *  summary
 #. *  description
 #: src/protocols/jabber/jabber.c:1686 src/protocols/jabber/jabber.c:1688
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protocol Plugin"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protocol Plugin"
 
 #: src/protocols/jabber/jabber.c:1714
 msgid "Use TLS if available"
@@ -6422,8 +6422,8 @@
 msgstr "Message delivery to %s failed: %s"
 
 #: src/protocols/jabber/message.c:233
-msgid "Jabber Message Error"
-msgstr "Jabber Message Error"
+msgid "XMPP Message Error"
+msgstr "XMPP Message Error"
 
 #: src/protocols/jabber/message.c:297
 #, c-format
@@ -12162,8 +12162,8 @@
 #~ msgid "Invalid nickname"
 #~ msgstr "Invalid Username"
 
-#~ msgid "Jabber Profile"
-#~ msgstr "Jabber Profile"
+#~ msgid "XMPP Profile"
+#~ msgstr "XMPP Profile"
 
 #~ msgid "Roomlist Error"
 #~ msgstr "Roomlist Error"
--- a/po/en_GB.po	Sat May 05 08:00:03 2007 +0000
+++ b/po/en_GB.po	Mon May 07 01:58:53 2007 +0000
@@ -2744,10 +2744,10 @@
 #: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 msgstr ""
 "Causes conversation windows to appear as other users begin to message you.  "
-"This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
 
 #: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
@@ -3025,8 +3025,8 @@
 msgstr "AIM Account"
 
 #: ../libpurple/protocols/bonjour/bonjour.c:583
-msgid "Jabber Account"
-msgstr "Jabber Account"
+msgid "XMPP Account"
+msgstr "XMPP Account"
 
 #: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
@@ -4204,8 +4204,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:582
 #: ../libpurple/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Edit Jabber vCard"
+msgid "Edit XMPP vCard"
+msgstr "Edit XMPP vCard"
 
 #: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
@@ -4320,7 +4320,7 @@
 msgid "The following are the results of your search"
 msgstr "The following are the results of your search"
 
-#. current comment from Jabber User Directory users.jabber.org
+#. current comment from XMPP User Directory users.jabber.org
 #: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
@@ -4345,8 +4345,8 @@
 msgstr "Server Instructions: %s"
 
 #: ../libpurple/protocols/jabber/buddy.c:1736
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Fill in one or more fields to search for any matching Jabber users."
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr "Fill in one or more fields to search for any matching XMPP users."
 
 #: ../libpurple/protocols/jabber/buddy.c:1756
 #: ../libpurple/protocols/novell/novell.c:1488
@@ -4357,8 +4357,8 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:1765
 #: ../libpurple/protocols/jabber/buddy.c:1766
-msgid "Search for Jabber users"
-msgstr "Search for Jabber users"
+msgid "Search for XMPP users"
+msgstr "Search for XMPP users"
 
 #. "Search"
 #: ../libpurple/protocols/jabber/buddy.c:1767
@@ -4501,8 +4501,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:567
 #: ../libpurple/protocols/jabber/jabber.c:910
-msgid "Invalid Jabber ID"
-msgstr "Invalid Jabber ID"
+msgid "Invalid XMPP ID"
+msgstr "Invalid XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
@@ -4556,8 +4556,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:873
 #: ../libpurple/protocols/jabber/jabber.c:874
-msgid "Register New Jabber Account"
-msgstr "Register New Jabber Account"
+msgid "Register New XMPP Account"
+msgstr "Register New XMPP Account"
 
 #. Register button
 #: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
@@ -4631,8 +4631,8 @@
 
 #: ../libpurple/protocols/jabber/jabber.c:1368
 #: ../libpurple/protocols/jabber/jabber.c:1369
-msgid "Change Jabber Password"
-msgstr "Change Jabber Password"
+msgid "Change XMPP Password"
+msgstr "Change XMPP Password"
 
 #: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
@@ -4686,8 +4686,8 @@
 msgstr "Item Not Found"
 
 #: ../libpurple/protocols/jabber/jabber.c:1481
-msgid "Malformed Jabber ID"
-msgstr "Malformed Jabber ID"
+msgid "Malformed XMPP ID"
+msgstr "Malformed XMPP ID"
 
 #: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
@@ -4954,8 +4954,8 @@
 #. *  description
 #: ../libpurple/protocols/jabber/jabber.c:1972
 #: ../libpurple/protocols/jabber/jabber.c:1974
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber Protocol Plug-in"
+msgid "XMPP Protocol Plugin"
+msgstr "XMPP Protocol Plug-in"
 
 #: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
@@ -4997,8 +4997,8 @@
 msgstr "Message delivery to %s failed: %s"
 
 #: ../libpurple/protocols/jabber/message.c:272
-msgid "Jabber Message Error"
-msgstr "Jabber Message Error"
+msgid "XMPP Message Error"
+msgstr "XMPP Message Error"
 
 #: ../libpurple/protocols/jabber/message.c:352
 #, c-format
@@ -12364,8 +12364,8 @@
 msgstr "hacker and designated driver [lazy bum]"
 
 #: ../pidgin/gtkdialogs.c:114
-msgid "Jabber developer"
-msgstr "Jabber developer"
+msgid "XMPP developer"
+msgstr "XMPP developer"
 
 #: ../pidgin/gtkdialogs.c:115
 msgid "original author"
@@ -12634,7 +12634,7 @@
 #: ../pidgin/gtkdialogs.c:360
 #, c-format
 msgid ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
 "may modify and redistribute the program under the terms of the GPL (version "
@@ -12643,7 +12643,7 @@
 "'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
 msgstr ""
-"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, XMPP, "
 "ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
 "Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
 "may modify and redistribute the program under the terms of the GPL (version "
@@ -15035,10 +15035,10 @@
 
 #: ../pidgin/plugins/raw.c:178
 msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 
 #: ../pidgin/plugins/relnot.c:71