# HG changeset patch
# User Nathan Walp <nwalp@pidgin.im>
# Date 1172949527 0
# Node ID 2d739b7a14acabc30db6f7fe23c764ccb9fedebf
# Parent  51dd9ae01585e122ea54adec9fb4b4eacaadd54b# Parent  d318c66720112316c0d6385a8907ee69c7a767da
merge of '2b313747a0b3a95319fb19451b6848937518b2ad'
     and '77fb229680f0342a6684d001bebbd722f3f4d194'

diff -r 51dd9ae01585 -r 2d739b7a14ac Makefile.am
--- a/Makefile.am	Sat Mar 03 19:18:38 2007 +0000
+++ b/Makefile.am	Sat Mar 03 19:18:47 2007 +0000
@@ -15,7 +15,6 @@
 		gaim.apspec.in \
 		pidgin.desktop.in \
 		gaim.service.in \
-		gaim-installer.nsi \
 		intltool-extract.in \
 		intltool-merge.in \
 		intltool-update.in \
diff -r 51dd9ae01585 -r 2d739b7a14ac Makefile.mingw
--- a/Makefile.mingw	Sat Mar 03 19:18:38 2007 +0000
+++ b/Makefile.mingw	Sat Mar 03 19:18:47 2007 +0000
@@ -10,7 +10,7 @@
 
 # Generate a X.X.X.X version for the installer file versioning header
 # The last digit will be 99 for a final release, 0 for dev or unknown, or the beta number
-GAIM_PRODUCT_VERSION = $(shell \
+PIDGIN_PRODUCT_VERSION = $(shell \
 awk 'BEGIN {FS="."} { \
     if (int($$3) == $$3) { \
         $$4 = "99"; \
@@ -38,7 +38,7 @@
 
 # Any *.dll or *.exe files included in win32-install-dir that we don't compile
 # should be included in this list so they don't get stripped
-NON_GAIM_DLLS = \
+EXTERNAL_DLLS = \
 	freebl3.dll \
 	libgtkspell.dll \
 	libmeanwhile-1.dll \
@@ -54,7 +54,7 @@
 	ssl3.dll
 
 #build an expression for `find` to use to ignore the above files
-NON_GAIM_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(NON_GAIM_DLLS))
+EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(EXTERNAL_DLLS))
 
 .PHONY: all install installer installer_nogtk installer_debug installers clean uninstall create_release_install_dir
 
@@ -72,16 +72,19 @@
 	rm -rf $(GAIM_INSTALL_DIR).release
 	cp -R $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release
 	find $(GAIM_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \
-	 -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';'
+	 -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';'
 
 installer: create_release_install_dir
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	mv pidgin/win32/nsis/pidgin*.exe ./
 
 installer_nogtk: create_release_install_dir
-	$(MAKENSIS) -V3 -DGAIM_VERSION="$(GAIM_VERSION)" -DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" -DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	mv pidgin/win32/nsis/pidgin*.exe ./
 
 installer_debug: install
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	mv pidgin/win32/nsis/pidgin*.exe ./
 
 installers: installer installer_nogtk installer_debug
 
@@ -89,7 +92,7 @@
 	$(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
 	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
 	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	rm -f $(GAIM_CONFIG_H) VERSION gaim*.exe
+	rm -f $(GAIM_CONFIG_H) VERSION pidgin*.exe
 
 uninstall:
 	rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release
diff -r 51dd9ae01585 -r 2d739b7a14ac console/Makefile.am
--- a/console/Makefile.am	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/Makefile.am	Sat Mar 03 19:18:47 2007 +0000
@@ -17,6 +17,7 @@
 	gntdebug.c \
 	gntft.c \
 	gntgaim.c \
+	gntidle.c \
 	gntnotify.c \
 	gntplugin.c \
 	gntpounce.c \
@@ -33,6 +34,7 @@
 	gntdebug.h \
 	gntft.h \
 	gntgaim.h \
+	gntidle.h \
 	gntnotify.h \
 	gntplugin.h \
 	gntpounce.h \
diff -r 51dd9ae01585 -r 2d739b7a14ac console/gntblist.c
--- a/console/gntblist.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/gntblist.c	Sat Mar 03 19:18:47 2007 +0000
@@ -2073,7 +2073,9 @@
 	gnt_menu_add_item(GNT_MENU(sub), item);
 	gnt_menuitem_set_callback(GNT_MENUITEM(item), send_im_select, NULL);
 
-	item = gnt_menuitem_new(_("Toggle offline buddies"));
+	item = gnt_menuitem_check_new(_("Toggle offline buddies"));
+	gnt_menuitem_check_set_checked(GNT_MENUITEM_CHECK(item),
+				gaim_prefs_get_bool(PREF_ROOT "/showoffline"));
 	gnt_menu_add_item(GNT_MENU(sub), item);
 	gnt_menuitem_set_callback(GNT_MENUITEM(item), show_offline_cb, NULL);
 
diff -r 51dd9ae01585 -r 2d739b7a14ac console/gntconv.c
--- a/console/gntconv.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/gntconv.c	Sat Mar 03 19:18:47 2007 +0000
@@ -25,6 +25,7 @@
 #include <string.h>
 
 #include <cmds.h>
+#include <idle.h>
 #include <prefs.h>
 #include <util.h>
 
@@ -152,6 +153,7 @@
 					g_return_val_if_reached(FALSE);
 			}
 			g_free(escape);
+			gaim_idle_touch();
 		}
 		gnt_entry_add_to_history(GNT_ENTRY(ggconv->entry), text);
 		gnt_entry_clear(GNT_ENTRY(ggconv->entry));
diff -r 51dd9ae01585 -r 2d739b7a14ac console/gntgaim.c
--- a/console/gntgaim.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/gntgaim.c	Sat Mar 03 19:18:47 2007 +0000
@@ -41,6 +41,7 @@
 #include "gntgaim.h"
 #include "gntprefs.h"
 #include "gntui.h"
+#include "gntidle.h"
 
 #define _GNU_SOURCE
 #include <getopt.h>
@@ -339,6 +340,7 @@
 
 	gaim_core_set_ui_ops(gnt_core_get_ui_ops());
 	gaim_eventloop_set_ui_ops(gnt_eventloop_get_ui_ops());
+	gaim_idle_set_ui_ops(gg_idle_get_ui_ops());
 
 	path = g_build_filename(gaim_user_dir(), "plugins", NULL);
 	gaim_plugins_add_search_path(path);
diff -r 51dd9ae01585 -r 2d739b7a14ac console/gntidle.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/console/gntidle.c	Sat Mar 03 19:18:47 2007 +0000
@@ -0,0 +1,45 @@
+/*
+ * gaim
+ *
+ * Gaim is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#include "internal.h"
+#include "gntidle.h"
+#include "gntwm.h"
+
+#include "idle.h"
+
+static time_t
+gg_get_idle_time()
+{
+	return gnt_wm_get_idle_time();
+}
+
+static GaimIdleUiOps ui_ops =
+{
+	gg_get_idle_time
+};
+
+GaimIdleUiOps *
+gg_idle_get_ui_ops()
+{
+	return &ui_ops;
+}
diff -r 51dd9ae01585 -r 2d739b7a14ac console/gntidle.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/console/gntidle.h	Sat Mar 03 19:18:47 2007 +0000
@@ -0,0 +1,44 @@
+/**
+ * @file gntidle.h GNT Idle API
+ * @ingroup gntui
+ *
+ * gaim
+ *
+ * Pidgin is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _GNT_IDLE_H_
+#define _GNT_IDLE_H_
+
+#include "idle.h"
+
+/**************************************************************************/
+/** @name GNT Idle API                                                    */
+/**************************************************************************/
+/*@{*/
+
+/**
+ * Returns the GNT idle UI ops.
+ *
+ * @return The UI operations structure.
+ */
+GaimIdleUiOps *gg_idle_get_ui_ops(void);
+
+/*@}*/
+
+#endif /* _GG_IDLE_H_ */
diff -r 51dd9ae01585 -r 2d739b7a14ac console/gntprefs.c
--- a/console/gntprefs.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/gntprefs.c	Sat Mar 03 19:18:47 2007 +0000
@@ -23,6 +23,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 #include <prefs.h>
+#include <savedstatuses.h>
 
 #include "gntgaim.h"
 #include "gntprefs.h"
@@ -30,6 +31,8 @@
 
 #include <string.h>
 
+static GList *freestrings;  /* strings to be freed when the pref-window is closed */
+
 void gg_prefs_init()
 {
 	gaim_prefs_add_none("/gaim");
@@ -57,6 +60,36 @@
 	return gaim_log_logger_get_options();
 }
 
+static GList *
+get_idle_options()
+{
+	GList *list = NULL;
+	list = g_list_append(list, "Based on keyboard use"); /* XXX: string freeze */
+	list = g_list_append(list, "system");
+	list = g_list_append(list, (char*)_("From last sent message"));
+	list = g_list_append(list, "gaim");
+	list = g_list_append(list, (char*)_("Never"));
+	list = g_list_append(list, "never");
+	return list;
+}
+
+static GList *
+get_status_titles()
+{
+	GList *list = NULL;
+	const GList *iter;
+	for (iter = gaim_savedstatuses_get_all(); iter; iter = iter->next) {
+		char *str;
+		if (gaim_savedstatus_is_transient(iter->data))
+			continue;
+		str = g_strdup_printf("%ld", gaim_savedstatus_get_creation_time(iter->data));
+		list = g_list_append(list, (char*)gaim_savedstatus_get_title(iter->data));
+		list = g_list_append(list, str);
+		freestrings = g_list_prepend(freestrings, str);
+	}
+	return list;
+}
+
 static GaimRequestField *
 get_pref_field(Prefs *prefs)
 {
@@ -85,20 +118,24 @@
 	else
 	{
 		GList *list = prefs->lv(), *iter;
-		field = gaim_request_field_list_new(prefs->pref, _(prefs->label));
+		if (list)
+			field = gaim_request_field_list_new(prefs->pref, _(prefs->label));
 		for (iter = list; iter; iter = iter->next)
 		{
 			gboolean select = FALSE;
 			const char *data = iter->data;
+			int idata;
 			iter = iter->next;
 			switch (prefs->type)
 			{
 				case GAIM_PREF_BOOLEAN:
-					if (gaim_prefs_get_bool(prefs->pref) == GPOINTER_TO_INT(iter->data))
+					sscanf(iter->data, "%d", &idata);
+					if (gaim_prefs_get_bool(prefs->pref) == idata)
 						select = TRUE;
 					break;
 				case GAIM_PREF_INT:
-					if (gaim_prefs_get_int(prefs->pref) == GPOINTER_TO_INT(iter->data))
+					sscanf(iter->data, "%d", &idata);
+					if (gaim_prefs_get_int(prefs->pref) == idata)
 						select = TRUE;
 					break;
 				case GAIM_PREF_STRING:
@@ -140,6 +177,24 @@
 	{GAIM_PREF_NONE, NULL, NULL, NULL},
 };
 
+/* XXX: Translate after the freeze */
+static Prefs idle[] =
+{
+	{GAIM_PREF_STRING, "/core/away/idle_reporting", "Report Idle time", get_idle_options},
+	{GAIM_PREF_BOOLEAN, "/core/away/away_when_idle", "Change status when idle", NULL},
+	{GAIM_PREF_INT, "/core/away/mins_before_away", "Minutes before changing status", NULL},
+	{GAIM_PREF_INT, "/core/savedstatus/idleaway", "Change status to", get_status_titles},
+	{GAIM_PREF_NONE, NULL, NULL, NULL},
+};
+
+static void
+free_strings()
+{
+	g_list_foreach(freestrings, (GFunc)g_free, NULL);
+	g_list_free(freestrings);
+	freestrings = NULL;
+}
+
 static void
 save_cb(void *data, GaimRequestFields *allfields)
 {
@@ -179,6 +234,8 @@
 			switch (pt)
 			{
 				case GAIM_PREF_INT:
+					if (type == GAIM_REQUEST_FIELD_LIST) /* Lists always return string */
+						sscanf(val, "%ld", (long int *)&val);
 					gaim_prefs_set_int(id, GPOINTER_TO_INT(val));
 					break;
 				case GAIM_PREF_BOOLEAN:
@@ -192,6 +249,7 @@
 			}
 		}
 	}
+	free_strings();
 }
 
 static void
@@ -206,7 +264,8 @@
 	for (i = 0; prefs[i].pref; i++)
 	{
 		field = get_pref_field(prefs + i);
-		gaim_request_field_group_add_field(group, field);
+		if (field)
+			gaim_request_field_group_add_field(group, field);
 	}
 }
 
@@ -219,8 +278,9 @@
 	add_pref_group(fields, _("Buddy List"), blist);
 	add_pref_group(fields, _("Conversations"), convs);
 	add_pref_group(fields, _("Logging"), logging);
+	add_pref_group(fields, _("Idle"), idle);
 
 	gaim_request_fields(NULL, _("Preferences"), NULL, NULL, fields,
-			_("Save"), G_CALLBACK(save_cb), _("Cancel"), NULL, NULL);
+			_("Save"), G_CALLBACK(save_cb), _("Cancel"), free_strings, NULL);
 }
 
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/Makefile.am
--- a/console/libgnt/Makefile.am	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/Makefile.am	Sat Mar 03 19:18:47 2007 +0000
@@ -13,6 +13,7 @@
 	gntbox.c \
 	gntbutton.c \
 	gntcheckbox.c \
+	gntclipboard.c \
 	gntcolors.c \
 	gntcombobox.c \
 	gntentry.c \
@@ -36,6 +37,7 @@
 	gntbox.h \
 	gntbutton.h \
 	gntcheckbox.h \
+	gntclipboard.h \
 	gntcolors.h \
 	gntcombobox.h \
 	gntentry.h \
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gnt.h
--- a/console/libgnt/gnt.h	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/gnt.h	Sat Mar 03 19:18:47 2007 +0000
@@ -1,5 +1,6 @@
 #include <glib.h>
 #include "gntwidget.h"
+#include "gntclipboard.h"
 #include "gntcolors.h"
 #include "gntkeys.h"
 
@@ -33,3 +34,8 @@
 
 void gnt_quit();
 
+GntClipboard *gnt_get_clipboard();
+
+gchar *gnt_get_clipboard_string();
+
+void gnt_set_clipboard_string(gchar *);
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gntclipboard.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/console/libgnt/gntclipboard.c	Sat Mar 03 19:18:47 2007 +0000
@@ -0,0 +1,74 @@
+#include "gntclipboard.h"
+
+gchar *string;
+
+enum {
+	SIG_CLIPBOARD = 0,
+	SIGS
+};
+
+static guint signals[SIGS] = { 0 };
+
+static void
+gnt_clipboard_class_init(GntClipboardClass *klass)
+{
+	signals[SIG_CLIPBOARD] = 
+		g_signal_new("clipboard_changed",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 0,
+					 NULL, NULL,
+					 g_cclosure_marshal_VOID__POINTER,
+					 G_TYPE_NONE, 1, G_TYPE_POINTER);
+
+}
+
+static GObjectClass *parent_class = NULL;
+/******************************************************************************
+ * GntClipboard API
+ *****************************************************************************/
+
+void
+gnt_clipboard_set_string(GntClipboard *clipboard, gchar *string)
+{
+	g_free(clipboard->string);
+	clipboard->string = g_strdup(string);
+	g_signal_emit(clipboard, signals[SIG_CLIPBOARD], 0, clipboard->string);
+}
+
+gchar *
+gnt_clipboard_get_string(GntClipboard *clipboard)
+{
+	return g_strdup(clipboard->string);
+}
+
+static void gnt_clipboard_init(GTypeInstance *instance, gpointer class) {
+	GntClipboard *clipboard = GNT_CLIPBOARD(instance);
+	clipboard->string = g_strdup("");
+}
+
+GType
+gnt_clipboard_get_gtype(void)
+{
+	static GType type = 0;
+
+	if (type == 0) {
+		static const GTypeInfo info = {
+			sizeof(GntClipboardClass),
+			NULL,					/* base_init		*/
+			NULL,					/* base_finalize	*/
+			(GClassInitFunc)gnt_clipboard_class_init,
+			NULL,
+			NULL,					/* class_data		*/
+			sizeof(GntClipboard),
+			0,						/* n_preallocs		*/
+			gnt_clipboard_init,		/* instance_init	*/
+		};
+
+		type = g_type_register_static(G_TYPE_OBJECT,
+									  "GntClipboard",
+									  &info, 0);
+	}
+
+	return type;
+}
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gntclipboard.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/console/libgnt/gntclipboard.h	Sat Mar 03 19:18:47 2007 +0000
@@ -0,0 +1,46 @@
+#ifndef GNT_CLIPBOARD_H
+#define GNT_CLIPBOARD_H
+
+#include <stdio.h>
+#include <glib.h>
+#include <glib-object.h>
+
+#define GNT_TYPE_CLIPBOARD				(gnt_clipboard_get_gtype())
+#define GNT_CLIPBOARD(obj)				(G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_CLIPBOARD, GntClipboard))
+#define GNT_CLIPBOARD_CLASS(klass)		(G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_CLIPBOARD, GntClipboardClass))
+#define GNT_IS_CLIPBOARD(obj)			(G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_CLIPBOARD))
+#define GNT_IS_CLIPBOARD_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_CLIPBOARD))
+#define GNT_CLIPBOARD_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS((obj), GNT_TYPE_CLIPBOARD, GntClipboardClass))
+
+#define	GNTDEBUG	g_printerr("%s\n", __FUNCTION__)
+
+typedef struct _GnClipboard			GntClipboard;
+typedef struct _GnClipboardClass		GntClipboardClass;
+
+struct _GnClipboard
+{
+	GObject inherit;
+	gchar *string;
+};
+
+struct _GnClipboardClass
+{
+	GObjectClass parent;
+
+	void (*gnt_reserved1)(void);
+	void (*gnt_reserved2)(void);
+	void (*gnt_reserved3)(void);
+	void (*gnt_reserved4)(void);
+};
+
+G_BEGIN_DECLS
+
+GType gnt_clipboard_get_gtype(void);
+
+gchar *gnt_clipboard_get_string(GntClipboard *);
+
+void gnt_clipboard_set_string(GntClipboard *, gchar *);
+
+G_END_DECLS
+
+#endif
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gntcombobox.c
--- a/console/libgnt/gntcombobox.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/gntcombobox.c	Sat Mar 03 19:18:47 2007 +0000
@@ -33,6 +33,18 @@
 }
 
 static void
+hide_popup(GntComboBox *box, gboolean set)
+{
+	gnt_widget_set_size(box->dropdown,
+		box->dropdown->priv.width - 1, box->dropdown->priv.height);
+	if (set)
+		set_selection(box, gnt_tree_get_selection_data(GNT_TREE(box->dropdown)));
+	else
+		gnt_tree_set_selected(GNT_TREE(box->dropdown), box->selected);
+	gnt_widget_hide(box->dropdown->parent);
+}
+
+static void
 gnt_combo_box_draw(GntWidget *widget)
 {
 	GntComboBox *box = GNT_COMBO_BOX(widget);
@@ -121,12 +133,11 @@
 			{
 				case '\r':
 				case '\t':
-					set_selection(box, gnt_tree_get_selection_data(GNT_TREE(box->dropdown)));
+					hide_popup(box, TRUE);
+					return TRUE;
 				case 27:
-					gnt_tree_set_selected(GNT_TREE(box->dropdown), box->selected);
-					gnt_widget_hide(box->dropdown->parent);
+					hide_popup(box, FALSE);
 					return TRUE;
-					break;
 			}
 		}
 		if (gnt_widget_key_pressed(box->dropdown, text))
@@ -159,7 +170,7 @@
 {
 	GntComboBox *combo = GNT_COMBO_BOX(widget);
 	if (GNT_WIDGET_IS_FLAG_SET(combo->dropdown->parent, GNT_WIDGET_MAPPED))
-		gnt_widget_hide(GNT_COMBO_BOX(widget)->dropdown->parent);
+		hide_popup(combo, FALSE);
 	widget_lost_focus(widget);
 }
 
@@ -177,8 +188,7 @@
 			gnt_widget_key_pressed(box->dropdown, GNT_KEY_DOWN);
 	} else if (event == GNT_LEFT_MOUSE_DOWN) {
 		if (dshowing) {
-			set_selection(box, gnt_tree_get_selection_data(GNT_TREE(box->dropdown)));
-			gnt_widget_hide(box->dropdown->parent);
+			hide_popup(box, TRUE);
 		} else {
 			popup_dropdown(GNT_COMBO_BOX(widget));
 		}
@@ -188,6 +198,13 @@
 }
 
 static void
+gnt_combo_box_size_changed(GntWidget *widget, int oldw, int oldh)
+{
+	GntComboBox *box = GNT_COMBO_BOX(widget);
+	gnt_widget_set_size(box->dropdown, widget->priv.width - 1, box->dropdown->priv.height);
+}
+
+static void
 gnt_combo_box_class_init(GntComboBoxClass *klass)
 {
 	parent_class = GNT_WIDGET_CLASS(klass);
@@ -198,6 +215,7 @@
 	parent_class->size_request = gnt_combo_box_size_request;
 	parent_class->key_pressed = gnt_combo_box_key_pressed;
 	parent_class->clicked = gnt_combo_box_clicked;
+	parent_class->size_changed = gnt_combo_box_size_changed;
 
 	widget_lost_focus = parent_class->lost_focus;
 	parent_class->lost_focus = gnt_combo_box_lost_focus;
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gntentry.c
--- a/console/libgnt/gntentry.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/gntentry.c	Sat Mar 03 19:18:47 2007 +0000
@@ -299,6 +299,26 @@
 }
 
 static gboolean
+clipboard_paste(GntBindable *bind, GList *n)
+{
+	GntEntry *entry = GNT_ENTRY(bind);
+	gchar *i;
+	gchar *text = i = gnt_get_clipboard_string();
+	while (*i != '\0') {
+		i = g_utf8_next_char(i);
+		if (*i == '\r' || *i == '\n')
+			*i = ' ';
+	}
+	char *a = g_strndup(entry->start, entry->cursor - entry->start);
+	char *all = g_strconcat(a, text, entry->cursor, NULL);
+	gnt_entry_set_text_internal(entry, all);
+	g_free(a);
+	g_free(text);
+	g_free(all);
+	return TRUE;
+}
+
+static gboolean
 suggest_show(GntBindable *bind, GList *null)
 {
 	return show_suggest_dropdown(GNT_ENTRY(bind));
@@ -673,6 +693,8 @@
 				GNT_KEY_CTRL_DOWN, NULL);
 	gnt_bindable_class_register_action(bindable, "history-next", history_next,
 				GNT_KEY_CTRL_UP, NULL);
+	gnt_bindable_class_register_action(bindable, "clipboard-past", clipboard_paste,
+				GNT_KEY_CTRL_V, NULL);
 
 	gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));
 	GNTDEBUG;
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gntmain.c
--- a/console/libgnt/gntmain.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/gntmain.c	Sat Mar 03 19:18:47 2007 +0000
@@ -10,6 +10,7 @@
 #include "gnt.h"
 #include "gntbox.h"
 #include "gntcolors.h"
+#include "gntclipboard.h"
 #include "gntkeys.h"
 #include "gntmenu.h"
 #include "gntstyle.h"
@@ -48,6 +49,7 @@
 static gboolean refresh_screen();
 
 GntWM *wm;
+static GntClipboard *clipboard;
 
 /**
  * Mouse support:
@@ -347,6 +349,8 @@
 	g_type_init();
 
 	init_wm();
+
+	clipboard = g_object_new(GNT_TYPE_CLIPBOARD, NULL);
 }
 
 void gnt_main()
@@ -475,3 +479,16 @@
 	return TRUE;
 }
 
+void gnt_set_clipboard_string(gchar *string)
+{
+	gnt_clipboard_set_string(clipboard, string);
+}
+
+GntClipboard *gnt_get_clipboard()
+{
+	return clipboard;
+}
+gchar *gnt_get_clipboard_string()
+{
+	return gnt_clipboard_get_string(clipboard);
+}
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gnttextview.c
--- a/console/libgnt/gnttextview.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/gnttextview.c	Sat Mar 03 19:18:47 2007 +0000
@@ -32,6 +32,10 @@
 
 static GntWidgetClass *parent_class = NULL;
 
+static gchar *select_start;
+static gchar *select_end;
+static gboolean double_click;
+
 static void
 gnt_text_view_draw(GntWidget *widget)
 {
@@ -54,9 +58,29 @@
 			GntTextSegment *seg = iter->data;
 			char *end = view->string->str + seg->end;
 			char back = *end;
+			chtype fl = seg->flags;
 			*end = '\0';
-			wattrset(widget->window, seg->flags);
-			wprintw(widget->window, "%s", (view->string->str + seg->start));
+			if (select_start < view->string->str + seg->start && select_end > view->string->str + seg->end) {
+				fl |= A_REVERSE;
+				wattrset(widget->window, fl);
+				wprintw(widget->window, "%s", (view->string->str + seg->start));
+			} else if (select_start && select_end &&
+				((select_start >= view->string->str + seg->start && select_start <= view->string->str + seg->end) ||
+				(select_end <= view->string->str + seg->end && select_start <= view->string->str + seg->start))) {
+				char *cur = view->string->str + seg->start;
+				while (*cur != '\0') {
+					if (cur >= select_start && cur <= select_end)
+						fl |= A_REVERSE;
+					else
+						fl = seg->flags;
+					wattrset(widget->window, fl);
+					waddch(widget->window, *cur);
+					cur++;
+				}
+			} else {
+				wattrset(widget->window, fl);
+				wprintw(widget->window, "%s", (view->string->str + seg->start));
+			}
 			*end = back;
 		}
 		wattroff(widget->window, A_UNDERLINE | A_BLINK | A_REVERSE);
@@ -160,6 +184,67 @@
 	g_string_free(view->string, TRUE);
 }
 
+static char *
+gnt_text_view_get_p(GntTextView *view, int x, int y)
+{
+	int i;
+	GntWidget *wid = GNT_WIDGET(view);
+	GntTextLine *line;
+	GList *lines;
+	GList *segs;
+	GntTextSegment *seg;
+
+	y = wid->priv.height - y;
+	if (g_list_length(view->list) < y) {
+		x = 0;
+		y = g_list_length(view->list);
+	}
+
+	lines = g_list_nth(view->list, y - 1);
+	do {
+		line = lines->data;
+		lines = lines->next;
+	} while (line && !line->segments);
+
+	if (!line) /* no valid line */
+		return NULL;
+	segs = line->segments;
+	seg = (GntTextSegment *)segs->data;
+	i = 0;
+	return view->string->str + seg->start + MIN(x, line->length);
+}
+
+static GString *
+select_word_text(GntTextView *view, gchar *c)
+{
+	gchar *start = c;
+	gchar *end = c;
+	gchar *t;
+	while (t = g_utf8_prev_char(start)) {
+		if (!g_ascii_isspace(*t)) {
+			if (start == view->string->str)
+				break;
+			start = t;
+		} else
+			break;
+	}
+	while (t = g_utf8_next_char(end)) {
+		if (!g_ascii_isspace(*t))
+			end = t;
+		else
+			break;
+	}
+	select_start = start;
+	select_end = end;
+	return g_string_new_len(start, end - start + 1);
+}
+
+static gboolean too_slow(gpointer n)
+{
+	double_click = FALSE;
+	return FALSE;
+}
+
 static gboolean
 gnt_text_view_clicked(GntWidget *widget, GntMouseEvent event, int x, int y)
 {
@@ -167,6 +252,36 @@
 		gnt_text_view_scroll(GNT_TEXT_VIEW(widget), -1);
 	} else if (event == GNT_MOUSE_SCROLL_DOWN) {
 		gnt_text_view_scroll(GNT_TEXT_VIEW(widget), 1);
+	} else if (event == GNT_LEFT_MOUSE_DOWN) {
+		select_start = gnt_text_view_get_p(GNT_TEXT_VIEW(widget), x - widget->priv.x, y - widget->priv.y);
+		g_timeout_add(500, too_slow, NULL);
+	} else if (event == GNT_MOUSE_UP) {
+		if (select_start) {
+			GString *clip;
+			select_end = gnt_text_view_get_p(GNT_TEXT_VIEW(widget), x - widget->priv.x, y - widget->priv.y);
+			if (select_end < select_start) {
+				gchar *t = select_start;
+				select_start = select_end;
+				select_end = t;
+			}
+			if (select_start == select_end) {
+				if (double_click) {
+					clip = select_word_text(GNT_TEXT_VIEW(widget), select_start);
+					double_click = FALSE;
+				} else {
+					double_click = TRUE;
+					select_start = 0;
+					select_end = 0;
+					gnt_widget_draw(widget);
+					return;
+				}
+			} else {
+				clip = g_string_new_len(select_start, select_end - select_start + 1);
+			}
+			gnt_widget_draw(widget);
+			gnt_set_clipboard_string(clip->str);
+			g_string_free(clip, TRUE);
+		}
 	} else
 		return FALSE;
 	return TRUE;
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gnttree.c
--- a/console/libgnt/gnttree.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/gnttree.c	Sat Mar 03 19:18:47 2007 +0000
@@ -835,7 +835,7 @@
 	tree->show_separator = TRUE;
 	GNT_WIDGET_SET_FLAGS(widget, GNT_WIDGET_GROW_X | GNT_WIDGET_GROW_Y);
 	widget->priv.minw = 4;
-	widget->priv.minh = 4;
+	widget->priv.minh = 1;
 	GNTDEBUG;
 }
 
@@ -1275,16 +1275,20 @@
 	g_return_val_if_fail(!r || !r->choice, NULL);
 
 	if (bigbro == NULL) {
-		r = g_hash_table_lookup(tree->hash, parent);
-		if (!r)
-			r = tree->root;
-		else
-			r = r->child;
-		if (r) {
-			while (r->next)
-				r = r->next;
-			bigbro = r->key;
-		} 
+		if (tree->compare)
+			bigbro = find_position(tree, key, parent);
+		else {
+			r = g_hash_table_lookup(tree->hash, parent);
+			if (!r)
+				r = tree->root;
+			else
+				r = r->child;
+			if (r) {
+				while (r->next)
+					r = r->next;
+				bigbro = r->key;
+			} 
+		}
 	}
 	row = gnt_tree_add_row_after(tree, key, row, parent, bigbro);
 	row->choice = TRUE;
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gntwidget.c
--- a/console/libgnt/gntwidget.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/gntwidget.c	Sat Mar 03 19:18:47 2007 +0000
@@ -323,6 +323,7 @@
 
 	if (widget->window == NULL)
 	{
+#if 0
 		int x, y, maxx, maxy, w, h;
 		int oldw, oldh;
 		gboolean shadow = TRUE;
@@ -355,9 +356,9 @@
 			widget->priv.height = h - shadow;
 			g_signal_emit(widget, signals[SIG_SIZE_CHANGED], 0, oldw, oldh);
 		}
-
-		widget->window = newwin(widget->priv.height + shadow, widget->priv.width + shadow,
-						widget->priv.y, widget->priv.x);
+#else
+		widget->window = newpad(150, 350);  /* XXX: */
+#endif
 		init_widget(widget);
 	}
 
@@ -524,7 +525,6 @@
 
 		if (widget->window)
 		{
-			wresize(widget->window, height + shadow, width + shadow);
 			init_widget(widget);
 		}
 		if (GNT_WIDGET_IS_FLAG_SET(widget, GNT_WIDGET_MAPPED))
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gntwm.c
--- a/console/libgnt/gntwm.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/gntwm.c	Sat Mar 03 19:18:47 2007 +0000
@@ -19,6 +19,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#define IDLE_CHECK_INTERVAL 5 /* 5 seconds */
+
 enum
 {
 	SIG_NEW_WIN,
@@ -45,6 +47,8 @@
 
 static gboolean write_already(gpointer data);
 static int write_timeout;
+static time_t last_active_time;
+static gboolean idle_update;
 
 static GList *
 g_list_bring_to_front(GList *list, gpointer data)
@@ -115,6 +119,20 @@
 
 	wrefresh(taskbar);
 }
+
+static void
+copy_win(GntWidget *widget, GntNode *node)
+{
+	WINDOW *src, *dst;
+	int shadow;
+	if (!node)
+		return;
+	src = widget->window;
+	dst = node->window;
+	shadow = gnt_widget_has_shadow(widget) ? 1 : 0;
+	copywin(src, dst, node->scroll, 0, 0, 0, getmaxy(dst) - 1, getmaxx(dst) - 1, 0);
+}
+
 static gboolean
 update_screen(GntWM *wm)
 {
@@ -230,6 +248,15 @@
 #endif
 }
 
+static gboolean check_idle(gpointer n)
+{
+	if (idle_update) {
+		time(&last_active_time);
+		idle_update = FALSE;
+	}
+	return TRUE;
+}
+
 static void
 gnt_wm_init(GTypeInstance *instance, gpointer class)
 {
@@ -243,6 +270,8 @@
 	wm->positions = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
 	if (gnt_style_get_bool(GNT_STYLE_REMPOS, TRUE))
 		read_window_positions(wm);
+	g_timeout_add(IDLE_CHECK_INTERVAL * 1000, check_idle, NULL);
+	time(&last_active_time);
 }
 
 static void
@@ -322,6 +351,55 @@
 	}
 	return TRUE;
 }
+
+static gboolean
+window_scroll_up(GntBindable *bindable, GList *null)
+{
+	GntWM *wm = GNT_WM(bindable);
+	GntWidget *window;
+	GntNode *node;
+	int w, h;
+
+	if (!wm->ordered)
+		return TRUE;
+
+	window = wm->ordered->data;
+	node = g_hash_table_lookup(wm->nodes, window);
+	if (!node)
+		return TRUE;
+
+	if (node->scroll) {
+		node->scroll--;
+		copy_win(window, node);
+		update_screen(wm);
+	}
+}
+
+static gboolean
+window_scroll_down(GntBindable *bindable, GList *null)
+{
+	GntWM *wm = GNT_WM(bindable);
+	GntWidget *window;
+	GntNode *node;
+	int w, h;
+
+	if (!wm->ordered)
+		return TRUE;
+
+	window = wm->ordered->data;
+	node = g_hash_table_lookup(wm->nodes, window);
+	if (!node)
+		return TRUE;
+
+	gnt_widget_get_size(window, &w, &h);
+	if (h - node->scroll > getmaxy(node->window)) {
+		node->scroll++;
+		copy_win(window, node);
+		update_screen(wm);
+	}
+	return TRUE;
+}
+
 static gboolean
 window_close(GntBindable *bindable, GList *null)
 {
@@ -703,7 +781,7 @@
 }
 
 static void
-window_reverse(GntWidget *win, gboolean set)
+window_reverse(GntWidget *win, gboolean set, GntWM *wm)
 {
 	int i;
 	int w, h;
@@ -728,7 +806,8 @@
 	for (i = 0; i < h; i += reverse_char(d, i, 0, set));
 	for (i = 0; i < h; i += reverse_char(d, i, w-1, set));
 
-	wrefresh(win->window);
+	copy_win(win, g_hash_table_lookup(wm->nodes, win));
+	update_screen(wm);
 }
 
 static gboolean
@@ -741,7 +820,7 @@
 		return TRUE;
 
 	wm->mode = GNT_KP_MODE_MOVE;
-	window_reverse(GNT_WIDGET(wm->ordered->data), TRUE);
+	window_reverse(GNT_WIDGET(wm->ordered->data), TRUE, wm);
 
 	return TRUE;
 }
@@ -756,7 +835,7 @@
 		return TRUE;
 
 	wm->mode = GNT_KP_MODE_RESIZE;
-	window_reverse(GNT_WIDGET(wm->ordered->data), TRUE);
+	window_reverse(GNT_WIDGET(wm->ordered->data), TRUE, wm);
 
 	return TRUE;
 }
@@ -919,6 +998,10 @@
 				"\033" "l", NULL);
 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "switch-window-n", switch_window_n,
 				NULL, NULL);
+	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "window-scroll-down", window_scroll_down,
+				"\033" GNT_KEY_CTRL_J, NULL);
+	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "window-scroll-up", window_scroll_up,
+				"\033" GNT_KEY_CTRL_K, NULL);
 
 	gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));
 	GNTDEBUG;
@@ -979,6 +1062,7 @@
 
 	node = g_new0(GntNode, 1);
 	node->me = widget;
+	node->scroll = 0;
 
 	g_hash_table_replace(wm->nodes, widget, node);
 
@@ -986,7 +1070,38 @@
 
 	transient = !!GNT_WIDGET_IS_FLAG_SET(node->me, GNT_WIDGET_TRANSIENT);
 
-	node->panel = new_panel(node->me->window);
+#if 1
+	{
+		int x, y, w, h, maxx, maxy;
+		gboolean shadow = TRUE;
+
+		if (!gnt_widget_has_shadow(widget))
+			shadow = FALSE;
+		x = widget->priv.x;
+		y = widget->priv.y;
+		w = widget->priv.width;
+		h = widget->priv.height;
+
+		getmaxyx(stdscr, maxy, maxx);
+		maxy -= 1;              /* room for the taskbar */
+		maxy -= shadow;
+		maxx -= shadow;
+
+		x = MAX(0, x);
+		y = MAX(0, y);
+		if (x + w >= maxx)
+			x = MAX(0, maxx - w);
+		if (y + h >= maxy)
+			y = MAX(0, maxy - h);
+
+		w = MIN(w, maxx);
+		h = MIN(h, maxy);
+		node->window = newwin(h + shadow, w + shadow, y, x);
+		copy_win(widget, node);
+	}
+#endif
+
+	node->panel = new_panel(node->window);
 	set_panel_userptr(node->panel, node);
 
 	if (!transient) {
@@ -1089,10 +1204,17 @@
 	draw_taskbar(wm, FALSE);
 }
 
+time_t gnt_wm_get_idle_time()
+{
+	return time(NULL) - last_active_time;
+}
+
 void gnt_wm_process_input(GntWM *wm, const char *keys)
 {
 	keys = gnt_bindable_remap_keys(GNT_BINDABLE(wm), keys);
 
+	idle_update = TRUE;
+
 	if (gnt_bindable_perform_action_key(GNT_BINDABLE(wm), keys))
 		return;
 
@@ -1124,7 +1246,7 @@
 			}
 			if (ox != x || oy != y) {
 				gnt_screen_move_widget(widget, x, y);
-				window_reverse(widget, TRUE);
+				window_reverse(widget, TRUE, wm);
 				return;
 			}
 		} else if (wm->mode == GNT_KP_MODE_RESIZE) {
@@ -1141,12 +1263,12 @@
 			}
 			if (oh != h || ow != w) {
 				gnt_screen_resize_widget(widget, w, h);
-				window_reverse(widget, TRUE);
+				window_reverse(widget, TRUE, wm);
 				return;
 			}
 		}
 		if (strcmp(keys, "\r") == 0 || strcmp(keys, "\033") == 0) {
-			window_reverse(widget, FALSE);
+			window_reverse(widget, FALSE, wm);
 			wm->mode = GNT_KP_MODE_NORMAL;
 		}
 		return;
@@ -1187,8 +1309,7 @@
 static void
 gnt_wm_win_resized(GntWM *wm, GntNode *node)
 {
-	refresh_node(node->me, node, NULL);
-	replace_panel(node->panel, node->me->window);
+	/*refresh_node(node->me, node, NULL);*/
 }
 
 static void
@@ -1201,6 +1322,8 @@
 {
 	gboolean ret = TRUE;
 	GntNode *node;
+	int shadow;
+	int maxx, maxy;
 	
 	while (widget->parent)
 		widget = widget->parent;
@@ -1215,6 +1338,14 @@
 	gnt_widget_set_size(widget, width, height);
 	gnt_widget_draw(widget);
 
+	shadow = gnt_widget_has_shadow(widget) ? 1 : 0;
+	maxx = getmaxx(stdscr) - shadow;
+	maxy = getmaxy(stdscr) - 1 - shadow;
+	height = MIN(height, maxy);
+	width = MIN(width, maxx);
+	wresize(node->window, height + shadow, width + shadow);
+	replace_panel(node->panel, node->window);
+
 	g_signal_emit(wm, signals[SIG_RESIZED], 0, node);
 
 	show_panel(node->panel);
@@ -1338,12 +1469,14 @@
 	} else
 		g_signal_emit(wm, signals[SIG_UPDATE_WIN], 0, node);
 
+	copy_win(widget, node);
 	update_screen(wm);
 	draw_taskbar(wm, FALSE);
 }
 
 gboolean gnt_wm_process_click(GntWM *wm, GntMouseEvent event, int x, int y, GntWidget *widget)
 {
+	idle_update = TRUE;
 	gboolean ret = TRUE;
 	g_signal_emit(wm, signals[SIG_MOUSE_CLICK], 0, event, x, y, widget, &ret);
 	return ret;
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/gntwm.h
--- a/console/libgnt/gntwm.h	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/gntwm.h	Sat Mar 03 19:18:47 2007 +0000
@@ -22,6 +22,8 @@
 {
 	GntWidget *me;
 
+	WINDOW *window;
+	int scroll;
 	PANEL *panel;
 } GntNode;
 
@@ -161,4 +163,6 @@
 
 void gnt_wm_raise_window(GntWM *wm, GntWidget *widget);
 
+time_t gnt_wm_get_idle_time(void);
+
 G_END_DECLS
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/test/key.c
--- a/console/libgnt/test/key.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/test/key.c	Sat Mar 03 19:18:47 2007 +0000
@@ -7,7 +7,7 @@
 
 	noecho();
 
-	while ((ch = getch()) != 27) {
+	while ((ch = getch())) {
 		printw("%d ", ch);
 		refresh();
 	}
diff -r 51dd9ae01585 -r 2d739b7a14ac console/libgnt/wms/s.c
--- a/console/libgnt/wms/s.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/console/libgnt/wms/s.c	Sat Mar 03 19:18:47 2007 +0000
@@ -3,6 +3,8 @@
 #include "gntmenu.h"
 #include "gntstyle.h"
 #include "gntwm.h"
+#include "gntwindow.h"
+#include "gntlabel.h"
 
 #include "blist.h"
 
@@ -165,6 +167,32 @@
 	return TRUE;
 }
 
+static gboolean
+toggle_clipboard(GntBindable *bindable, GList *n)
+{
+	static GntWidget *clip;
+	gchar *text;
+	int maxx, maxy;
+	if (clip) {
+		gnt_widget_destroy(clip);
+		clip = NULL;
+		return TRUE;
+	}
+	getmaxyx(stdscr, maxy, maxx);
+	text = gnt_get_clipboard_string();
+	clip = gnt_hwindow_new(FALSE);
+	GNT_WIDGET_SET_FLAGS(clip, GNT_WIDGET_TRANSIENT);
+	GNT_WIDGET_UNSET_FLAGS(clip, GNT_WIDGET_NO_BORDER);
+	gnt_box_set_pad(GNT_BOX(clip), 0);
+	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" "));
+	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(text));
+	gnt_box_add_widget(GNT_BOX(clip), gnt_label_new(" "));
+	gnt_widget_set_position(clip, 0, 0);
+	gnt_widget_draw(clip);
+	g_free(text);
+	return TRUE;
+}
+
 static void
 s_class_init(SClass *klass)
 {
@@ -179,6 +207,8 @@
 
 	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "toggle-buddylist",
 				toggle_buddylist, "\033" "b", NULL);
+	gnt_bindable_class_register_action(GNT_BINDABLE_CLASS(klass), "toggle-clipboard",
+				toggle_clipboard, "\033" "C", NULL);
 	gnt_style_read_actions(G_OBJECT_CLASS_TYPE(klass), GNT_BINDABLE_CLASS(klass));
 	GNTDEBUG;
 }
diff -r 51dd9ae01585 -r 2d739b7a14ac console/plugins/gntclipboard.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/console/plugins/gntclipboard.c	Sat Mar 03 19:18:47 2007 +0000
@@ -0,0 +1,157 @@
+/**
+ * @file gntclipboard.c
+ *
+ * Copyright (C) 2007 Richard Nelson <wabz@whatsbeef.net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+
+#include "internal.h"
+#include <glib.h>
+
+#define PLUGIN_STATIC_NAME	"GntClipboard"
+
+#ifdef HAVE_X11
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/Xatom.h>
+#endif
+
+#include <glib.h>
+
+#include <plugin.h>
+#include <version.h>
+#include <debug.h>
+#include <gntwm.h>
+
+#include <gntplugin.h>
+
+static gboolean stop = FALSE;
+
+static gulong sig_handle;
+
+static gpointer *
+set_clip(gchar *string)
+{
+#ifdef HAVE_X11
+	Window w;
+	XEvent e, respond;
+	XSelectionRequestEvent *req;
+	const char *ids;
+	Display *dpy = XOpenDisplay(NULL);
+
+	if (!dpy)
+		return NULL;
+	ids = getenv("WINDOWID");
+	if (ids == NULL)
+		return NULL;
+	w = atoi(ids);
+	XSetSelectionOwner(dpy, XA_PRIMARY, w, CurrentTime);
+	XFlush(dpy);
+	XSelectInput(dpy, w, StructureNotifyMask);
+	while (!stop) {
+		XNextEvent(dpy, &e);
+		req = &e.xselectionrequest;
+		if (e.type == SelectionRequest) {
+			XChangeProperty(dpy,
+				req->requestor,
+				req->property,
+				XA_STRING,
+				8, PropModeReplace,
+				(unsigned char *)string,
+				strlen(string));
+			respond.xselection.property = req->property;
+			respond.xselection.type = SelectionNotify;
+			respond.xselection.display = req->display;
+			respond.xselection.requestor = req->requestor;
+			respond.xselection.selection = req->selection;
+			respond.xselection.target= req->target;
+			respond.xselection.time = req->time;
+			XSendEvent(dpy, req->requestor, 0, 0, &respond);
+			XFlush (dpy);
+		} else if (e.type == SelectionClear) {
+			return NULL;
+		}
+	}
+#endif
+	return NULL;
+}
+
+static void
+clipboard_changed(GntWM *wm, gchar *string)
+{
+#ifdef HAVE_X11
+	static GThread *thread = NULL;
+	if (thread) {
+		stop = TRUE;
+		thread = g_thread_join(thread);
+	}
+	g_thread_create((GThreadFunc)set_clip, string, TRUE, NULL);
+#endif
+}
+
+static gboolean
+plugin_load(GaimPlugin *plugin)
+{
+	if (!XOpenDisplay(NULL))
+		gaim_debug_warning("gntclipboard", "Couldn't find X display\n");
+	if (!getenv("WINDOWID"))
+		gaim_debug_warning("gntclipboard", "Couldn't find window\n");
+	sig_handle = g_signal_connect(G_OBJECT(gnt_get_clipboard()), "clipboard_changed", G_CALLBACK(clipboard_changed), NULL);
+	return TRUE;
+}
+
+static gboolean
+plugin_unload(GaimPlugin *plugin)
+{
+	g_signal_handler_disconnect(G_OBJECT(gnt_get_clipboard()), sig_handle);
+	return TRUE;
+}
+
+static GaimPluginInfo info =
+{
+	GAIM_PLUGIN_MAGIC,
+	GAIM_MAJOR_VERSION,
+	GAIM_MINOR_VERSION,
+	GAIM_PLUGIN_STANDARD,
+	GAIM_GNT_PLUGIN_TYPE,
+	0,
+	NULL,
+	GAIM_PRIORITY_DEFAULT,
+	"gntclipboard",
+	N_("GntClipboard"),
+	VERSION,
+	N_("Clipboard plugin"),
+	N_("When the gnt clipboard contents change, "
+		"the contents are made available to X, if possible."),
+	"Richard Nelson <wabz@whatsbeef.net>",
+	"http://gaim.sourceforge.net",
+	plugin_load,
+	plugin_unload,
+	NULL,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+
+static void
+init_plugin(GaimPlugin *plugin)
+{
+	g_thread_init(NULL);
+}
+
+GAIM_INIT_PLUGIN(PLUGIN_STATIC_NAME, init_plugin, info)
diff -r 51dd9ae01585 -r 2d739b7a14ac gaim-installer.nsi
--- a/gaim-installer.nsi	Sat Mar 03 19:18:38 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1661 +0,0 @@
-; Installer script for win32 Gaim
-; Original Author: Herman Bloggs <hermanator12002@yahoo.com>
-; Updated By: Daniel Atallah <daniel_atallah@yahoo.com>
-
-; NOTE: this .NSI script is intended for NSIS 2.08
-;
-
-;--------------------------------
-;Global Variables
-Var name
-Var GTK_FOLDER
-Var GTK_THEME_SEL
-Var ISSILENT
-Var STARTUP_RUN_KEY
-Var SPELLCHECK_SEL
-
-;--------------------------------
-;Configuration
-
-;The name var is set in .onInit
-Name $name
-
-!ifdef WITH_GTK
-OutFile "gaim-${GAIM_VERSION}.exe"
-!else
-!ifdef DEBUG
-OutFile "gaim-${GAIM_VERSION}-debug.exe"
-!else
-OutFile "gaim-${GAIM_VERSION}-no-gtk.exe"
-!endif
-!endif
-
-SetCompressor /SOLID lzma
-ShowInstDetails show
-ShowUninstDetails show
-SetDateSave on
-
-; $name and $INSTDIR are set in .onInit function..
-
-!include "MUI.nsh"
-!include "Sections.nsh"
-
-!include "FileFunc.nsh"
-!insertmacro GetParameters
-!insertmacro GetOptions
-!insertmacro GetParent
-
-!include "WordFunc.nsh"
-!insertmacro VersionCompare
-
-!include "TextFunc.nsh"
-!insertmacro ConfigWriteS
-
-;--------------------------------
-;Defines
-
-!define GAIM_NSIS_INCLUDE_PATH			".\gtk\win32\nsis"
-!define GAIM_INSTALLER_DEPS			"..\win32-dev\gaim-inst-deps"
-
-!define GAIM_REG_KEY				"SOFTWARE\gaim"
-!define GAIM_UNINSTALL_KEY			"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gaim"
-!define HKLM_APP_PATHS_KEY			"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\gaim.exe"
-!define GAIM_STARTUP_RUN_KEY			"SOFTWARE\Microsoft\Windows\CurrentVersion\Run"
-!define GAIM_UNINST_EXE				"gaim-uninst.exe"
-
-!define GTK_MIN_VERSION				"2.6.10"
-!define GTK_REG_KEY				"SOFTWARE\GTK\2.0"
-!define PERL_REG_KEY				"SOFTWARE\Perl"
-!define PERL_DLL				"perl58.dll"
-!define GTK_DEFAULT_INSTALL_PATH		"$COMMONFILES\GTK\2.0"
-!define GTK_RUNTIME_INSTALLER			"..\gtk_installer\gtk-runtime*.exe"
-
-!define ASPELL_REG_KEY				"SOFTWARE\Aspell"
-!define DOWNLOADER_URL				"http://gaim.sourceforge.net/win32/download_redir.php"
-
-;--------------------------------
-;Version resource
-VIProductVersion "${GAIM_PRODUCT_VERSION}"
-VIAddVersionKey "ProductName" "Gaim"
-VIAddVersionKey "FileVersion" "${GAIM_VERSION}"
-VIAddVersionKey "ProductVersion" "${GAIM_VERSION}"
-VIAddVersionKey "LegalCopyright" ""
-!ifdef WITH_GTK
-VIAddVersionKey "FileDescription" "Gaim Installer (w/ GTK+ Installer)"
-!else
-!ifdef DEBUG
-VIAddVersionKey "FileDescription" "Gaim Installer (Debug Version)"
-!else
-VIAddVersionKey "FileDescription" "Gaim Installer (w/o GTK+ Installer)"
-!endif
-!endif
-
-;--------------------------------
-;Modern UI Configuration
-
-  !define MUI_ICON				".\gtk\pixmaps\gaim-install.ico"
-  !define MUI_UNICON				".\gtk\pixmaps\gaim-install.ico"
-  !define MUI_WELCOMEFINISHPAGE_BITMAP		".\gtk\win32\nsis\gaim-intro.bmp"
-  !define MUI_HEADERIMAGE
-  !define MUI_HEADERIMAGE_BITMAP		".\gtk\win32\nsis\gaim-header.bmp"
-
-  ; Alter License section
-  !define MUI_LICENSEPAGE_BUTTON		$(GAIM_LICENSE_BUTTON)
-  !define MUI_LICENSEPAGE_TEXT_BOTTOM		$(GAIM_LICENSE_BOTTOM_TEXT)
-
-  !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
-  !define MUI_LANGDLL_REGISTRY_KEY ${GAIM_REG_KEY}
-  !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
-
-  !define MUI_COMPONENTSPAGE_SMALLDESC
-  !define MUI_ABORTWARNING
-
-  ;Finish Page config
-  !define MUI_FINISHPAGE_RUN			"$INSTDIR\gaim.exe"
-  !define MUI_FINISHPAGE_RUN_NOTCHECKED
-  !define MUI_FINISHPAGE_LINK			$(GAIM_FINISH_VISIT_WEB_SITE)
-  !define MUI_FINISHPAGE_LINK_LOCATION          "http://gaim.sourceforge.net/win32"
-
-;--------------------------------
-;Pages
-
-  !define MUI_PAGE_CUSTOMFUNCTION_PRE		preWelcomePage
-  !insertmacro MUI_PAGE_WELCOME
-  !insertmacro MUI_PAGE_LICENSE			"./COPYING"
-  !insertmacro MUI_PAGE_COMPONENTS
-
-!ifdef WITH_GTK
-  ; GTK+ install dir page
-  !define MUI_PAGE_CUSTOMFUNCTION_PRE		preGtkDirPage
-  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE		postGtkDirPage
-  !define MUI_DIRECTORYPAGE_VARIABLE		$GTK_FOLDER
-  !insertmacro MUI_PAGE_DIRECTORY
-!endif
-
-  ; Gaim install dir page
-  !insertmacro MUI_PAGE_DIRECTORY
-
-  !insertmacro MUI_PAGE_INSTFILES
-  !insertmacro MUI_PAGE_FINISH
-
-  !insertmacro MUI_UNPAGE_WELCOME
-  !insertmacro MUI_UNPAGE_CONFIRM
-  !insertmacro MUI_UNPAGE_INSTFILES
-  !insertmacro MUI_UNPAGE_FINISH
-
-;--------------------------------
-;Languages
-
-  ;; English goes first because its the default. The rest are
-  ;; in alphabetical order (at least the strings actually displayed
-  ;; will be).
-
-  !insertmacro MUI_LANGUAGE "English"
-
-  !insertmacro MUI_LANGUAGE "Albanian"
-  !insertmacro MUI_LANGUAGE "Bulgarian"
-  !insertmacro MUI_LANGUAGE "Catalan"
-  !insertmacro MUI_LANGUAGE "Czech"
-  !insertmacro MUI_LANGUAGE "Danish"
-  !insertmacro MUI_LANGUAGE "SimpChinese"
-  !insertmacro MUI_LANGUAGE "TradChinese"
-  !insertmacro MUI_LANGUAGE "German"
-  !insertmacro MUI_LANGUAGE "Spanish"
-  !insertmacro MUI_LANGUAGE "French"
-  !insertmacro MUI_LANGUAGE "Hebrew"
-  !insertmacro MUI_LANGUAGE "Italian"
-  !insertmacro MUI_LANGUAGE "Japanese"
-  !insertmacro MUI_LANGUAGE "Korean"
-  !insertmacro MUI_LANGUAGE "Kurdish"
-  !insertmacro MUI_LANGUAGE "Lithuanian"
-  !insertmacro MUI_LANGUAGE "Hungarian"
-  !insertmacro MUI_LANGUAGE "Dutch"
-  !insertmacro MUI_LANGUAGE "Norwegian"
-  !insertmacro MUI_LANGUAGE "Polish"
-  !insertmacro MUI_LANGUAGE "PortugueseBR"
-  !insertmacro MUI_LANGUAGE "Portuguese"
-  !insertmacro MUI_LANGUAGE "Romanian"
-  !insertmacro MUI_LANGUAGE "Russian"
-  !insertmacro MUI_LANGUAGE "Serbian"
-  !insertmacro MUI_LANGUAGE "Slovak"
-  !insertmacro MUI_LANGUAGE "Slovenian"
-  !insertmacro MUI_LANGUAGE "Finnish"
-  !insertmacro MUI_LANGUAGE "Swedish"
-
-;--------------------------------
-;Translations
-
-  !define GAIM_DEFAULT_LANGFILE "${GAIM_NSIS_INCLUDE_PATH}\translations\english.nsh"
-
-  !include "${GAIM_NSIS_INCLUDE_PATH}\langmacros.nsh"
-
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "ALBANIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\albanian.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "BULGARIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\bulgarian.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "CATALAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\catalan.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "CZECH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\czech.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "DANISH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\danish.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "DUTCH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\dutch.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "ENGLISH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\english.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "FINNISH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\finnish.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "FRENCH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\french.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "GERMAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\german.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "HEBREW"		"${GAIM_NSIS_INCLUDE_PATH}\translations\hebrew.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "HUNGARIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\hungarian.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "ITALIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\italian.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "JAPANESE"		"${GAIM_NSIS_INCLUDE_PATH}\translations\japanese.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "KOREAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\korean.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "KURDISH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\kurdish.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "LITHUANIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\lithuanian.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "NORWEGIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\norwegian.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "POLISH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\polish.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "PORTUGUESE"		"${GAIM_NSIS_INCLUDE_PATH}\translations\portuguese.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "PORTUGUESEBR"	"${GAIM_NSIS_INCLUDE_PATH}\translations\portuguese-br.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "ROMANIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\romanian.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "RUSSIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\russian.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "SERBIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\serbian-latin.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "SIMPCHINESE"	"${GAIM_NSIS_INCLUDE_PATH}\translations\simp-chinese.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "SLOVAK"		"${GAIM_NSIS_INCLUDE_PATH}\translations\slovak.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "SLOVENIAN"		"${GAIM_NSIS_INCLUDE_PATH}\translations\slovenian.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "SPANISH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\spanish.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "SWEDISH"		"${GAIM_NSIS_INCLUDE_PATH}\translations\swedish.nsh"
-  !insertmacro GAIM_MACRO_INCLUDE_LANGFILE "TRADCHINESE"	"${GAIM_NSIS_INCLUDE_PATH}\translations\trad-chinese.nsh"
-
-;--------------------------------
-;Reserve Files
-  ; Only need this if using bzip2 compression
-
-  !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
-  !insertmacro MUI_RESERVEFILE_LANGDLL
-  ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
-
-
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Start Install Sections ;;
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-;--------------------------------
-;Uninstall any old version of Gaim
-
-Section -SecUninstallOldGaim
-  ; Check install rights..
-  Call CheckUserInstallRights
-  Pop $R0
-
-  ;If gaim is currently set to run on startup,
-  ;  save the section of the Registry where the setting is before uninstalling,
-  ;  so we can put it back after installing the new version
-  ClearErrors
-  ReadRegStr $STARTUP_RUN_KEY HKCU "${GAIM_STARTUP_RUN_KEY}" "Gaim"
-  IfErrors +3
-  StrCpy $STARTUP_RUN_KEY "HKCU"
-  Goto +4
-  ClearErrors
-  ReadRegStr $STARTUP_RUN_KEY HKLM "${GAIM_STARTUP_RUN_KEY}" "Gaim"
-  IfErrors +2
-  StrCpy $STARTUP_RUN_KEY "HKLM"
-
-  StrCmp $R0 "HKLM" gaim_hklm
-  StrCmp $R0 "HKCU" gaim_hkcu done
-
-  gaim_hkcu:
-      ReadRegStr $R1 HKCU ${GAIM_REG_KEY} ""
-      ReadRegStr $R2 HKCU ${GAIM_REG_KEY} "Version"
-      ReadRegStr $R3 HKCU "${GAIM_UNINSTALL_KEY}" "UninstallString"
-      Goto try_uninstall
-
-  gaim_hklm:
-      ReadRegStr $R1 HKLM ${GAIM_REG_KEY} ""
-      ReadRegStr $R2 HKLM ${GAIM_REG_KEY} "Version"
-      ReadRegStr $R3 HKLM "${GAIM_UNINSTALL_KEY}" "UninstallString"
-
-  ; If previous version exists .. remove
-  try_uninstall:
-    StrCmp $R1 "" done
-      ; Version key started with 0.60a3. Prior versions can't be
-      ; automaticlly uninstalled.
-      StrCmp $R2 "" uninstall_problem
-        ; Check if we have uninstall string..
-        IfFileExists $R3 0 uninstall_problem
-          ; Have uninstall string.. go ahead and uninstall.
-          SetOverwrite on
-          ; Need to copy uninstaller outside of the install dir
-          ClearErrors
-          CopyFiles /SILENT $R3 "$TEMP\${GAIM_UNINST_EXE}"
-          SetOverwrite off
-          IfErrors uninstall_problem
-            ; Ready to uninstall..
-            ClearErrors
-            ExecWait '"$TEMP\${GAIM_UNINST_EXE}" /S _?=$R1'
-            IfErrors exec_error
-              Delete "$TEMP\${GAIM_UNINST_EXE}"
-            Goto done
-
-            exec_error:
-              Delete "$TEMP\${GAIM_UNINST_EXE}"
-              Goto uninstall_problem
-
-        uninstall_problem:
-          ; We can't uninstall.  Either the user must manually uninstall or we ignore and reinstall over it.
-          MessageBox MB_OKCANCEL $(GAIM_PROMPT_CONTINUE_WITHOUT_UNINSTALL) /SD IDOK IDOK done
-          Quit
-  done:
-SectionEnd
-
-
-;--------------------------------
-;GTK+ Runtime Install Section
-
-!ifdef WITH_GTK
-Section $(GTK_SECTION_TITLE) SecGtk
-  SectionIn 1 RO
-
-  Call CheckUserInstallRights
-  Pop $R1
-
-  SetOutPath $TEMP
-  SetOverwrite on
-  File /oname=gtk-runtime.exe ${GTK_RUNTIME_INSTALLER}
-  SetOverwrite off
-
-  Call DoWeNeedGtk
-  Pop $R0
-  Pop $R6
-
-  StrCmp $R0 "0" have_gtk
-  StrCmp $R0 "1" upgrade_gtk
-  StrCmp $R0 "2" upgrade_gtk
-  StrCmp $R0 "3" no_gtk no_gtk
-
-  no_gtk:
-    StrCmp $R1 "NONE" gtk_no_install_rights
-    ClearErrors
-    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
-    IfErrors gtk_install_error done
-
-  upgrade_gtk:
-    StrCpy $GTK_FOLDER $R6
-    StrCmp $R0 "2" +2 ; Upgrade isn't optional
-    MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done
-    ClearErrors
-    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE /S /D=$GTK_FOLDER'
-    IfErrors gtk_install_error done
-
-    gtk_install_error:
-      Delete "$TEMP\gtk-runtime.exe"
-      MessageBox MB_OK $(GTK_INSTALL_ERROR) /SD IDOK
-      Quit
-
-  have_gtk:
-    StrCpy $GTK_FOLDER $R6
-    StrCmp $R1 "NONE" done ; If we have no rights.. can't re-install..
-    ; Even if we have a sufficient version of GTK+, we give user choice to re-install.
-    ClearErrors
-    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT'
-    IfErrors gtk_install_error
-    Goto done
-
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ; end got_install rights
-
-  gtk_no_install_rights:
-    ; Install GTK+ to Gaim install dir
-    StrCpy $GTK_FOLDER $INSTDIR
-    ClearErrors
-    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
-    IfErrors gtk_install_error
-      SetOverwrite on
-      ClearErrors
-      CopyFiles /FILESONLY "$GTK_FOLDER\bin\*.dll" $GTK_FOLDER
-      SetOverwrite off
-      IfErrors gtk_install_error
-        Delete "$GTK_FOLDER\bin\*.dll"
-        Goto done
-  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-  ; end gtk_no_install_rights
-
-  done:
-    Delete "$TEMP\gtk-runtime.exe"
-SectionEnd ; end of GTK+ section
-!endif
-
-;--------------------------------
-;Gaim Install Section
-
-Section $(GAIM_SECTION_TITLE) SecGaim
-  SectionIn 1 RO
-
-  ; Check install rights..
-  Call CheckUserInstallRights
-  Pop $R0
-
-  ; Get GTK+ lib dir if we have it..
-
-  StrCmp $R0 "NONE" gaim_none
-  StrCmp $R0 "HKLM" gaim_hklm gaim_hkcu
-
-  gaim_hklm:
-    ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path"
-    WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "" "$INSTDIR\gaim.exe"
-    WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R1\bin"
-    WriteRegStr HKLM ${GAIM_REG_KEY} "" "$INSTDIR"
-    WriteRegStr HKLM ${GAIM_REG_KEY} "Version" "${GAIM_VERSION}"
-    WriteRegStr HKLM "${GAIM_UNINSTALL_KEY}" "DisplayName" $(GAIM_UNINSTALL_DESC)
-    WriteRegStr HKLM "${GAIM_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${GAIM_UNINST_EXE}"
-    ; Sets scope of the desktop and Start Menu entries for all users.
-    SetShellVarContext "all"
-    Goto gaim_install_files
-
-  gaim_hkcu:
-    ReadRegStr $R1 HKCU ${GTK_REG_KEY} "Path"
-    StrCmp $R1 "" 0 gaim_hkcu1
-      ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path"
-    gaim_hkcu1:
-    WriteRegStr HKCU ${GAIM_REG_KEY} "" "$INSTDIR"
-    WriteRegStr HKCU ${GAIM_REG_KEY} "Version" "${GAIM_VERSION}"
-    WriteRegStr HKCU "${GAIM_UNINSTALL_KEY}" "DisplayName" $(GAIM_UNINSTALL_DESC)
-    WriteRegStr HKCU "${GAIM_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${GAIM_UNINST_EXE}"
-    Goto gaim_install_files
-
-  gaim_none:
-    ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path"
-
-  gaim_install_files:
-    SetOutPath "$INSTDIR"
-    ; Gaim files
-    SetOverwrite on
-    File /r ${GAIM_INSTALL_DIR}\*.*
-    !ifdef DEBUG
-    File "${GAIM_INSTALLER_DEPS}\exchndl.dll"
-    !endif
-
-    ; Install shfolder.dll if need be..
-    SearchPath $R4 "shfolder.dll"
-    StrCmp $R4 "" 0 got_shfolder
-      SetOutPath "$SYSDIR"
-      File "${GAIM_INSTALLER_DEPS}\shfolder.dll"
-      SetOutPath "$INSTDIR"
-    got_shfolder:
-
-    ; Check if Perl is installed, if so add it to the AppPaths
-    ReadRegStr $R2 HKLM ${PERL_REG_KEY} ""
-    StrCmp $R2 "" 0 perl_exists
-      ReadRegStr $R2 HKCU ${PERL_REG_KEY} ""
-      StrCmp $R2 "" perl_done perl_exists
-
-      perl_exists:
-        IfFileExists "$R2\bin\${PERL_DLL}" 0 perl_done
-        StrCmp $R0 "HKLM" 0 perl_done
-          ReadRegStr $R3 HKLM "${HKLM_APP_PATHS_KEY}" "Path"
-          WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R3;$R2\bin"
-
-    perl_done:
-
-    ; If this is under NT4, delete the SILC support stuff
-    ; there is a bug that will prevent any account from connecting
-    ; See https://lists.silcnet.org/pipermail/silc-devel/2005-January/001588.html
-    Call GetWindowsVersion
-    Pop $R2
-    StrCmp $R2 "NT 4.0" +1 +4
-    Delete "$INSTDIR\plugins\libsilc.dll"
-    Delete "$INSTDIR\silcclient.dll"
-    Delete "$INSTDIR\silc.dll"
-
-    SetOutPath "$INSTDIR"
-
-    ; If we don't have install rights.. we're done
-    StrCmp $R0 "NONE" done
-    SetOverwrite off
-
-    ; write out uninstaller
-    SetOverwrite on
-    WriteUninstaller "$INSTDIR\${GAIM_UNINST_EXE}"
-    SetOverwrite off
-
-    ; If we previously had gaim setup to run on startup, make it do so again
-    StrCmp $STARTUP_RUN_KEY "HKCU" +1 +2
-    WriteRegStr HKCU "${GAIM_STARTUP_RUN_KEY}" "Gaim" "$INSTDIR\gaim.exe"
-    StrCmp $STARTUP_RUN_KEY "HKLM" +1 +2
-    WriteRegStr HKLM "${GAIM_STARTUP_RUN_KEY}" "Gaim" "$INSTDIR\gaim.exe"
-
-  done:
-SectionEnd ; end of default Gaim section
-
-;--------------------------------
-;Shortcuts
-
-SectionGroup /e $(GAIM_SHORTCUTS_SECTION_TITLE) SecShortcuts
-  Section /o $(GAIM_DESKTOP_SHORTCUT_SECTION_TITLE) SecDesktopShortcut
-    SetOverwrite on
-    CreateShortCut "$DESKTOP\Gaim.lnk" "$INSTDIR\gaim.exe"
-    SetOverwrite off
-  SectionEnd
-  Section $(GAIM_STARTMENU_SHORTCUT_SECTION_TITLE) SecStartMenuShortcut
-    SetOverwrite on
-    CreateDirectory "$SMPROGRAMS\Gaim"
-    CreateShortCut "$SMPROGRAMS\Gaim\Gaim.lnk" "$INSTDIR\gaim.exe"
-    SetOverwrite off
-  SectionEnd
-SectionGroupEnd
-
-;--------------------------------
-;GTK+ Themes
-
-SectionGroup /e $(GTK_THEMES_SECTION_TITLE) SecGtkThemes
-  Section /o $(GTK_NOTHEME_SECTION_TITLE) SecGtkNone
-    Push "Raleigh"
-    Call WriteGtkThemeConfig
-  SectionEnd
-
-  Section $(GTK_WIMP_SECTION_TITLE) SecGtkWimp
-    Push "MS-Windows"
-    Call WriteGtkThemeConfig
-  SectionEnd
-
-  Section /o $(GTK_BLUECURVE_SECTION_TITLE) SecGtkBluecurve
-    Push "Bluecurve"
-    Call WriteGtkThemeConfig
-  SectionEnd
-
-  Section /o $(GTK_LIGHTHOUSEBLUE_SECTION_TITLE) SecGtkLighthouseblue
-    Push "Lighthouseblue"
-    Call WriteGtkThemeConfig
-  SectionEnd
-SectionGroupEnd
-
-;--------------------------------
-;Spell Checking
-
-SectionGroup /e $(GAIM_SPELLCHECK_SECTION_TITLE) SecSpellCheck
-  Section /o $(GAIM_SPELLCHECK_BRETON) SecSpellCheckBreton
-    Push ${SecSpellCheckBreton}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_CATALAN) SecSpellCheckCatalan
-    Push ${SecSpellCheckCatalan}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_CZECH) SecSpellCheckCzech
-    Push ${SecSpellCheckCzech}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_WELSH) SecSpellCheckWelsh
-    Push ${SecSpellCheckWelsh}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_DANISH) SecSpellCheckDanish
-    Push ${SecSpellCheckDanish}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_GERMAN) SecSpellCheckGerman
-    Push ${SecSpellCheckGerman}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_GREEK) SecSpellCheckGreek
-    Push ${SecSpellCheckGreek}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_ENGLISH) SecSpellCheckEnglish
-    Push ${SecSpellCheckEnglish}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_ESPERANTO) SecSpellCheckEsperanto
-    Push ${SecSpellCheckEsperanto}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_SPANISH) SecSpellCheckSpanish
-    Push ${SecSpellCheckSpanish}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_FAROESE) SecSpellCheckFaroese
-    Push ${SecSpellCheckFaroese}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_FRENCH) SecSpellCheckFrench
-    Push ${SecSpellCheckFrench}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_ITALIAN) SecSpellCheckItalian
-    Push ${SecSpellCheckItalian}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_DUTCH) SecSpellCheckDutch
-    Push ${SecSpellCheckDutch}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_NORWEGIAN) SecSpellCheckNorwegian
-    Push ${SecSpellCheckNorwegian}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_POLISH) SecSpellCheckPolish
-    Push ${SecSpellCheckPolish}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_PORTUGUESE) SecSpellCheckPortuguese
-    Push ${SecSpellCheckPortuguese}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_ROMANIAN) SecSpellCheckRomanian
-    Push ${SecSpellCheckRomanian}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_RUSSIAN) SecSpellCheckRussian
-    Push ${SecSpellCheckRussian}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_SLOVAK) SecSpellCheckSlovak
-    Push ${SecSpellCheckSlovak}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_SWEDISH) SecSpellCheckSwedish
-    Push ${SecSpellCheckSwedish}
-    Call InstallAspellAndDict
-  SectionEnd
-  Section /o $(GAIM_SPELLCHECK_UKRAINIAN) SecSpellCheckUkrainian
-    Push ${SecSpellCheckUkrainian}
-    Call InstallAspellAndDict
-  SectionEnd
-SectionGroupEnd
-
-;--------------------------------
-;Uninstaller Section
-
-
-Section Uninstall
-  Call un.CheckUserInstallRights
-  Pop $R0
-  StrCmp $R0 "NONE" no_rights
-  StrCmp $R0 "HKCU" try_hkcu try_hklm
-
-  try_hkcu:
-    ReadRegStr $R0 HKCU ${GAIM_REG_KEY} ""
-    StrCmp $R0 $INSTDIR 0 cant_uninstall
-      ; HKCU install path matches our INSTDIR.. so uninstall
-      DeleteRegKey HKCU ${GAIM_REG_KEY}
-      DeleteRegKey HKCU "${GAIM_UNINSTALL_KEY}"
-      Goto cont_uninstall
-
-  try_hklm:
-    ReadRegStr $R0 HKLM ${GAIM_REG_KEY} ""
-    StrCmp $R0 $INSTDIR 0 try_hkcu
-      ; HKLM install path matches our INSTDIR.. so uninstall
-      DeleteRegKey HKLM ${GAIM_REG_KEY}
-      DeleteRegKey HKLM "${GAIM_UNINSTALL_KEY}"
-      DeleteRegKey HKLM "${HKLM_APP_PATHS_KEY}"
-      ; Sets start menu and desktop scope to all users..
-      SetShellVarContext "all"
-
-  cont_uninstall:
-    ; The WinPrefs plugin may have left this behind..
-    DeleteRegValue HKCU "${GAIM_STARTUP_RUN_KEY}" "Gaim"
-    DeleteRegValue HKLM "${GAIM_STARTUP_RUN_KEY}" "Gaim"
-    ; Remove Language preference info
-    DeleteRegKey HKCU ${GAIM_REG_KEY} ;${MUI_LANGDLL_REGISTRY_ROOT} ${MUI_LANGDLL_REGISTRY_KEY}
-
-    RMDir /r "$INSTDIR\locale"
-    RMDir /r "$INSTDIR\pixmaps"
-    RMDir /r "$INSTDIR\perlmod"
-    Delete "$INSTDIR\plugins\autoaccept.dll"
-    Delete "$INSTDIR\plugins\autoreply.dll"
-    Delete "$INSTDIR\plugins\buddynote.dll"
-    Delete "$INSTDIR\plugins\convcolors.dll"
-    Delete "$INSTDIR\plugins\extplacement.dll"
-    Delete "$INSTDIR\plugins\gaimrc.dll"
-    Delete "$INSTDIR\plugins\history.dll"
-    Delete "$INSTDIR\plugins\iconaway.dll"
-    Delete "$INSTDIR\plugins\idle.dll"
-    Delete "$INSTDIR\plugins\libaim.dll"
-    Delete "$INSTDIR\plugins\libgg.dll"
-    Delete "$INSTDIR\plugins\libicq.dll"
-    Delete "$INSTDIR\plugins\libirc.dll"
-    Delete "$INSTDIR\plugins\libjabber.dll"
-    Delete "$INSTDIR\plugins\libmsn.dll"
-    Delete "$INSTDIR\plugins\libnapster.dll"
-    Delete "$INSTDIR\plugins\libnovell.dll"
-    Delete "$INSTDIR\plugins\libqq.dll"
-    Delete "$INSTDIR\plugins\libsametime.dll"
-    Delete "$INSTDIR\plugins\libsilc.dll"
-    Delete "$INSTDIR\plugins\libsimple.dll"
-    Delete "$INSTDIR\plugins\libtoc.dll"
-    Delete "$INSTDIR\plugins\libyahoo.dll"
-    Delete "$INSTDIR\plugins\log_reader.dll"
-    Delete "$INSTDIR\plugins\markerline.dll"
-    Delete "$INSTDIR\plugins\newline.dll"
-    Delete "$INSTDIR\plugins\notify.dll"
-    Delete "$INSTDIR\plugins\offlinemsg.dll"
-    Delete "$INSTDIR\plugins\perl.dll"
-    Delete "$INSTDIR\plugins\psychic.dll"
-    Delete "$INSTDIR\plugins\relnot.dll"
-    Delete "$INSTDIR\plugins\spellchk.dll"
-    Delete "$INSTDIR\plugins\ssl-nss.dll"
-    Delete "$INSTDIR\plugins\ssl.dll"
-    Delete "$INSTDIR\plugins\statenotify.dll"
-    Delete "$INSTDIR\plugins\tcl.dll"
-    Delete "$INSTDIR\plugins\ticker.dll"
-    Delete "$INSTDIR\plugins\timestamp.dll"
-    Delete "$INSTDIR\plugins\timestamp_format.dll"
-    Delete "$INSTDIR\plugins\win2ktrans.dll"
-    Delete "$INSTDIR\plugins\winprefs.dll"
-    RMDir "$INSTDIR\plugins"
-    Delete "$INSTDIR\sounds\gaim\alert.wav"
-    Delete "$INSTDIR\sounds\gaim\login.wav"
-    Delete "$INSTDIR\sounds\gaim\logout.wav"
-    Delete "$INSTDIR\sounds\gaim\receive.wav"
-    Delete "$INSTDIR\sounds\gaim\send.wav"
-    RMDir "$INSTDIR\sounds\gaim"
-    RMDir "$INSTDIR\sounds"
-    Delete "$INSTDIR\freebl3.dll"
-    Delete "$INSTDIR\gaim.exe"
-    Delete "$INSTDIR\gtkgaim.dll"
-    Delete "$INSTDIR\idletrack.dll"
-    Delete "$INSTDIR\libgaim.dll"
-    Delete "$INSTDIR\libgtkspell.dll"
-    Delete "$INSTDIR\liboscar.dll"
-    Delete "$INSTDIR\libmeanwhile-1.dll"
-    Delete "$INSTDIR\libxml2.dll"
-    Delete "$INSTDIR\nspr4.dll"
-    Delete "$INSTDIR\nss3.dll"
-    Delete "$INSTDIR\nssckbi.dll"
-    Delete "$INSTDIR\plc4.dll"
-    Delete "$INSTDIR\plds4.dll"
-    Delete "$INSTDIR\silc.dll"
-    Delete "$INSTDIR\silcclient.dll"
-    Delete "$INSTDIR\softokn3.dll"
-    Delete "$INSTDIR\ssl3.dll"
-    Delete "$INSTDIR\${GAIM_UNINST_EXE}"
-    !ifdef DEBUG
-    Delete "$INSTDIR\exchndl.dll"
-    !endif
-    Delete "$INSTDIR\install.log"
-
-    ;Try to remove Gaim install dir .. if empty
-    RMDir "$INSTDIR"
-
-    ; Shortcuts..
-    RMDir /r "$SMPROGRAMS\Gaim"
-    Delete "$DESKTOP\Gaim.lnk"
-
-    Goto done
-
-  cant_uninstall:
-    MessageBox MB_OK $(un.GAIM_UNINSTALL_ERROR_1) /SD IDOK
-    Quit
-
-  no_rights:
-    MessageBox MB_OK $(un.GAIM_UNINSTALL_ERROR_2) /SD IDOK
-    Quit
-
-  done:
-SectionEnd ; end of uninstall section
-
-;--------------------------------
-;Descriptions
-!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGaim} \
-        $(GAIM_SECTION_DESCRIPTION)
-!ifdef WITH_GTK
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtk} \
-        $(GTK_SECTION_DESCRIPTION)
-!endif
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkThemes} \
-        $(GTK_THEMES_SECTION_DESCRIPTION)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkNone} \
-        $(GTK_NO_THEME_DESC)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkWimp} \
-        $(GTK_WIMP_THEME_DESC)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkBluecurve} \
-        $(GTK_BLUECURVE_THEME_DESC)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkLighthouseblue} \
-        $(GTK_LIGHTHOUSEBLUE_THEME_DESC)
-
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} \
-        $(GAIM_SHORTCUTS_SECTION_DESCRIPTION)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopShortcut} \
-        $(GAIM_DESKTOP_SHORTCUT_DESC)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenuShortcut} \
-        $(GAIM_STARTMENU_SHORTCUT_DESC)
-
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheck} \
-        $(GAIM_SPELLCHECK_SECTION_DESCRIPTION)
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckBreton} \
-        "$(GAIM_SPELLCHECK_BRETON) (862kb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckCatalan} \
-        "$(GAIM_SPELLCHECK_CATALAN) (3.9Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckCzech} \
-        "$(GAIM_SPELLCHECK_CZECH) (17Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckWelsh} \
-        "$(GAIM_SPELLCHECK_WELSH) (4.2Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckDanish} \
-        "$(GAIM_SPELLCHECK_DANISH) (6.9Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckGerman} \
-        "$(GAIM_SPELLCHECK_GERMAN) (5.4Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckGreek} \
-        "$(GAIM_SPELLCHECK_GREEK) (7.1Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckEnglish} \
-        "$(GAIM_SPELLCHECK_ENGLISH) (2.3Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckEsperanto} \
-        "$(GAIM_SPELLCHECK_ESPERANTO) (5.7Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSpanish} \
-        "$(GAIM_SPELLCHECK_SPANISH) (7.0Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckFaroese} \
-        "$(GAIM_SPELLCHECK_FAROESE) (913kb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckFrench} \
-        "$(GAIM_SPELLCHECK_FRENCH) (9.3Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckItalian} \
-        "$(GAIM_SPELLCHECK_ITALIAN) (770kb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckDutch} \
-        "$(GAIM_SPELLCHECK_DUTCH) (3.7Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckNorwegian} \
-        "$(GAIM_SPELLCHECK_NORWEGIAN) (3.2Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckPolish} \
-        "$(GAIM_SPELLCHECK_POLISH) (9.3Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckPortuguese} \
-        "$(GAIM_SPELLCHECK_PORTUGUESE) (5.5Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckRomanian} \
-        "$(GAIM_SPELLCHECK_ROMANIAN) (906kb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckRussian} \
-        "$(GAIM_SPELLCHECK_RUSSIAN) (11Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSlovak} \
-        "$(GAIM_SPELLCHECK_SLOVAK) (8.0Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSwedish} \
-        "$(GAIM_SPELLCHECK_SWEDISH) (2.2Mb)"
-  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckUkrainian} \
-        "$(GAIM_SPELLCHECK_UKRAINIAN) (12Mb)"
-!insertmacro MUI_FUNCTION_DESCRIPTION_END
-
-;--------------------------------
-;Functions
-
-Function WriteGtkThemeConfig
-  Exch $0
-  Push $1
-  Push $2
-  Push $3
-
-  Call CheckUserInstallRights
-  Pop $2
-  StrCmp $2 "HKLM" 0 user_theme
-
-  ; Global Theme
-  ClearErrors
-  ReadRegStr $2 HKLM ${GTK_REG_KEY} "Path"
-  IfErrors user_theme
-  StrCpy $3 "$2\etc\gtk-2.0\gtkrc"
-  Goto update_theme
-  user_theme:
-  StrCpy $3 "$PROFILE\.gtkrc-2.0"
-
-  update_theme:
-  IfFileExists $3 0 new_file
-  ${ConfigWriteS} $3 "gtk-theme-name =" " $\"$0$\"" $1
-  Goto done
-
-  new_file:
-  FileOpen $1 $3 w
-  FileWrite $1 "gtk-theme-name = $\"$0$\""
-  FileClose $1
-
-  done:
-  Pop $3
-  Pop $2
-  Pop $1
-  Pop $0
-FunctionEnd
-
-!macro CheckUserInstallRightsMacro UN
-Function ${UN}CheckUserInstallRights
-  Push $0
-  Push $1
-  ClearErrors
-  UserInfo::GetName
-  IfErrors Win9x
-  Pop $0
-  UserInfo::GetAccountType
-  Pop $1
-
-  StrCmp $1 "Admin" 0 +3
-    StrCpy $1 "HKLM"
-    Goto done
-  StrCmp $1 "Power" 0 +3
-    StrCpy $1 "HKLM"
-    Goto done
-  StrCmp $1 "User" 0 +3
-    StrCpy $1 "HKCU"
-    Goto done
-  StrCmp $1 "Guest" 0 +3
-    StrCpy $1 "NONE"
-    Goto done
-  ; Unknown error
-  StrCpy $1 "NONE"
-  Goto done
-
-  Win9x:
-    StrCpy $1 "HKLM"
-
-  done:
-    Exch $1
-    Exch
-    Pop $0
-FunctionEnd
-!macroend
-!insertmacro CheckUserInstallRightsMacro ""
-!insertmacro CheckUserInstallRightsMacro "un."
-
-;
-; Usage:
-;   Push $0 ; Path string
-;   Call VerifyDir
-;   Pop $0 ; 0 - Bad path  1 - Good path
-;
-Function VerifyDir
-  Exch $0
-  Push $1
-  Push $2
-  Loop:
-    IfFileExists $0 dir_exists
-    StrCpy $1 $0 ; save last
-    ${GetParent} $0 $0
-    StrLen $2 $0
-    ; IfFileExists "C:" on xp returns true and on win2k returns false
-    ; So we're done in such a case..
-    IntCmp $2 2 loop_done
-    ; GetParent of "C:" returns ""
-    IntCmp $2 0 loop_done
-    Goto Loop
-
-  loop_done:
-    StrCpy $1 "$0\GaImFooB"
-    ; Check if we can create dir on this drive..
-    ClearErrors
-    CreateDirectory $1
-    IfErrors DirBad DirGood
-
-  dir_exists:
-    ClearErrors
-    FileOpen $1 "$0\gaimfoo.bar" w
-    IfErrors PathBad PathGood
-
-    DirGood:
-      RMDir $1
-      Goto PathGood1
-
-    DirBad:
-      RMDir $1
-      Goto PathBad1
-
-    PathBad:
-      FileClose $1
-      Delete "$0\gaimfoo.bar"
-      PathBad1:
-      StrCpy $0 "0"
-      Push $0
-      Goto done
-
-    PathGood:
-      FileClose $1
-      Delete "$0\gaimfoo.bar"
-      PathGood1:
-      StrCpy $0 "1"
-      Push $0
-
-  done:
-  Exch 3 ; The top of the stack contains the output variable
-  Pop $0
-  Pop $2
-  Pop $1
-FunctionEnd
-
-Function .onVerifyInstDir
-  Push $0
-  Push $INSTDIR
-  Call VerifyDir
-  Pop $0
-  StrCmp $0 "0" 0 dir_good
-  Pop $0
-  Abort
-
-  dir_good:
-  Pop $0
-FunctionEnd
-
-;
-; Usage:
-; Call DoWeNeedGtk
-; First Pop:
-;   0 - We have the correct version
-;       Second Pop: Key where Version was found
-;   1 - We have an old version that should work, prompt user for optional upgrade
-;       Second Pop: HKLM or HKCU depending on where GTK was found.
-;   2 - We have an old version that needs to be upgraded
-;       Second Pop: HKLM or HKCU depending on where GTK was found.
-;   3 - We don't have Gtk+ at all
-;       Second Pop: "NONE, HKLM or HKCU" depending on our rights..
-;
-Function DoWeNeedGtk
-  ; Logic should be:
-  ; - Check what user rights we have (HKLM or HKCU)
-  ;   - If HKLM rights..
-  ;     - Only check HKLM key for GTK+
-  ;       - If installed to HKLM, check it and return.
-  ;   - If HKCU rights..
-  ;     - First check HKCU key for GTK+
-  ;       - if good or bad exists stop and ret.
-  ;     - If no hkcu gtk+ install, check HKLM
-  ;       - If HKLM ver exists but old, return as if no ver exits.
-  ;   - If no rights
-  ;     - Check HKLM
-  Push $0
-  Push $1
-  Push $2
-  Push $3
-
-  Call CheckUserInstallRights
-  Pop $1
-  StrCmp $1 "HKLM" check_hklm
-  StrCmp $1 "HKCU" check_hkcu check_hklm
-    check_hkcu:
-      ReadRegStr $0 HKCU ${GTK_REG_KEY} "Version"
-      StrCpy $2 "HKCU"
-      StrCmp $0 "" check_hklm have_gtk
-
-    check_hklm:
-      ReadRegStr $0 HKLM ${GTK_REG_KEY} "Version"
-      StrCpy $2 "HKLM"
-      StrCmp $0 "" no_gtk have_gtk
-
-  have_gtk:
-    ; GTK+ is already installed.. check version.
-    ${VersionCompare} ${GTK_INSTALL_VERSION} $0 $3
-    IntCmp $3 1 +1 good_version good_version
-    ${VersionCompare} ${GTK_MIN_VERSION} $0 $3
-
-      ; Bad version. If hklm ver and we have hkcu or no rights.. return no gtk
-      StrCmp $1 "NONE" no_gtk ; if no rights.. can't upgrade
-      StrCmp $1 "HKCU" 0 +2   ; if HKLM can upgrade..
-      StrCmp $2 "HKLM" no_gtk ; have hkcu rights.. if found hklm ver can't upgrade..
-      Push $2
-    IntCmp $3 1 +3
-      Push "1" ; Optional Upgrade
-      Goto done
-      Push "2" ; Mandatory Upgrade
-      Goto done
-
-  good_version:
-    StrCmp $2 "HKLM" have_hklm_gtk have_hkcu_gtk
-      have_hkcu_gtk:
-        ; Have HKCU version
-        ReadRegStr $0 HKCU ${GTK_REG_KEY} "Path"
-        Goto good_version_cont
-
-      have_hklm_gtk:
-        ReadRegStr $0 HKLM ${GTK_REG_KEY} "Path"
-        Goto good_version_cont
-
-    good_version_cont:
-      Push $0  ; The path to existing GTK+
-      Push "0"
-      Goto done
-
-  no_gtk:
-    Push $1 ; our rights
-    Push "3"
-    Goto done
-
-  done:
-  ; The top two items on the stack are what we want to return
-  Exch 4 
-  Pop $0
-  Exch 4
-  Pop $3
-  Pop $2
-  Pop $1
-FunctionEnd
-
-
-!macro RunCheckMacro UN
-Function ${UN}RunCheck
-  Push $R0
-  System::Call 'kernel32::OpenMutex(i 2031617, b 0, t "gaim_is_running") i .R0'
-  IntCmp $R0 0 done
-    MessageBox MB_OK|MB_ICONEXCLAMATION $(GAIM_IS_RUNNING) /SD IDOK
-    Abort
-  done:
-  Pop $R0
-FunctionEnd
-!macroend
-!insertmacro RunCheckMacro ""
-!insertmacro RunCheckMacro "un."
-
-Function .onInit
-  Push $R0
-  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "gaim_installer_running") i .r1 ?e'
-  Pop $R0
-  StrCmp $R0 0 +3
-    MessageBox MB_OK|MB_ICONEXCLAMATION $(INSTALLER_IS_RUNNING) /SD IDOK
-    Abort
-  Call RunCheck
-  StrCpy $name "Gaim ${GAIM_VERSION}"
-  StrCpy $GTK_THEME_SEL ${SecGtkWimp}
-  StrCpy $SPELLCHECK_SEL ""
-
-  !insertmacro SetSectionFlag ${SecGtkThemes} ${SF_RO}
-  !insertmacro UnselectSection ${SecGtkThemes}
-  !insertmacro SelectSection $GTK_THEME_SEL
-  !insertmacro SetSectionFlag ${SecSpellCheck} ${SF_RO}
-  !insertmacro UnselectSection ${SecSpellCheck}
-
-  ;Mark the dictionaries that are already installed as readonly
-  Call SelectAndDisableInstalledDictionaries
-
-  StrCpy $ISSILENT "/NOUI"
-
-  ; GTK installer has two silent states.. one with Message boxes, one without
-  ; If gaim installer was run silently, we want to supress gtk installer msg boxes.
-  IfSilent 0 set_gtk_normal
-      StrCpy $ISSILENT "/S"
-  set_gtk_normal:
-
-  ${GetParameters} $R0
-  ClearErrors
-  ${GetOptions} $R0 "/L=" $R0
-  IfErrors +3
-  StrCpy $LANGUAGE $R0
-  Goto skip_lang
-
-  ; Select Language
-    ; Display Language selection dialog
-    !insertmacro MUI_LANGDLL_DISPLAY
-    skip_lang:
-
-  ; If install path was set on the command, use it.
-  StrCmp $INSTDIR "" 0 instdir_done
-
-  ;  If gaim is currently intalled, we should default to where it is currently installed
-  ClearErrors
-  ReadRegStr $INSTDIR HKCU "${GAIM_REG_KEY}" ""
-  IfErrors +2
-  StrCmp $INSTDIR "" 0 instdir_done
-  ClearErrors
-  ReadRegStr $INSTDIR HKLM "${GAIM_REG_KEY}" ""
-  IfErrors +2
-  StrCmp $INSTDIR "" 0 instdir_done
-
-  Call CheckUserInstallRights
-  Pop $R0
-
-  StrCmp $R0 "HKLM" 0 user_dir
-    StrCpy $INSTDIR "$PROGRAMFILES\Gaim"
-    Goto instdir_done
-  user_dir:
-    Push $SMPROGRAMS
-    ${GetParent} $SMPROGRAMS $R2
-    ${GetParent} $R2 $R2
-    StrCpy $INSTDIR "$R2\Gaim"
-
-  instdir_done:
-  Pop $R0
-FunctionEnd
-
-Function un.onInit
-  Call un.RunCheck
-  StrCpy $name "Gaim ${GAIM_VERSION}"
-
-  ; Get stored language preference
-  !insertmacro MUI_UNGETLANGUAGE
-
-FunctionEnd
-
-; This is a modified StartRadioButtons (from Sections.nsh)
-; The only difference is that it allows for nothing in the group to be selected
-; In that case, the default variable should be set to ""
-!macro StartRadioButtonsUnselectable var
-
-  !define StartRadioButtons_Var "${var}"
-
-  Push $R0
-  Push $R1
-
-   ;If we have no selection, don't try to unselect it
-   StrCmp "${StartRadioButtons_Var}" "" +4
-   SectionGetFlags "${StartRadioButtons_Var}" $R0
-   IntOp $R1 $R0 & ${SF_SELECTED}
-   IntOp $R0 $R0 & ${SECTION_OFF}
-   SectionSetFlags "${StartRadioButtons_Var}" $R0
-
-   ; If the previous value isn't currently selected,
-   ; we don't want to select it at the end
-   IntCmp $R1 ${SF_SELECTED} +2
-   StrCpy "${StartRadioButtons_Var}" ""
-
-   StrCpy $R1 "${StartRadioButtons_Var}"
-
-!macroend
-
-Function .onSelChange
-  Push $0
-  Push $1
-  Push $2
-
-  !insertmacro StartRadioButtonsUnselectable $GTK_THEME_SEL
-    !insertmacro RadioButton ${SecGtkNone}
-    !insertmacro RadioButton ${SecGtkWimp}
-    !insertmacro RadioButton ${SecGtkBluecurve}
-    !insertmacro RadioButton ${SecGtkLighthouseblue}
-  !insertmacro EndRadioButtons
-
-  ; Check that at most one of the non-readonly spelling dictionaries are selected
-  ; We can't use $R0 or $R1 in this block since they're used in the macros
-  !insertmacro StartRadioButtonsUnselectable $SPELLCHECK_SEL
-    ; Start with the first language dictionary
-    IntOp $2 ${SecSpellCheck} + 1
-
-    start_spellcheck_radio:
-    SectionGetFlags $2 $0
-
-    IntOp $1 $0 & ${SF_SECGRPEND}
-    ; If it is the end of the section group, stop
-    IntCmp $1 ${SF_SECGRPEND} end_spellcheck_radio
-
-    IntOp $0 $0 & ${SF_RO}
-    IntCmp $0 ${SF_RO} after_button_insert
-    ; If !readonly, then it is part of the radiobutton group
-    !insertmacro RadioButton $2
-    after_button_insert:
-
-    IntOp $2 $2 + 1 ;Advance to the next section
-    Goto start_spellcheck_radio
-
-    end_spellcheck_radio:
-  !insertmacro EndRadioButtons
-
-  Pop $2
-  Pop $1
-  Pop $0
-FunctionEnd
-
-; Page enter and exit functions..
-
-Function preWelcomePage
-  Push R0
-
-!ifndef WITH_GTK
-  ; If this installer dosn't have GTK, check whether we need it.
-  ; We do this here an not in .onInit because language change in
-  ; .onInit doesn't take effect until it is finished.
-  Call DoWeNeedGtk
-  Pop $R0
-  Pop $GTK_FOLDER
-
-  IntCmp $R0 1 done done
-  MessageBox MB_OK $(GTK_INSTALLER_NEEDED) /SD IDOK
-  Quit
-
-  done:
-
-!else
-  Push R1
-
-  ; If on Win95/98/ME warn them that the GTK+ version wont work
-  Call GetWindowsVersion
-  Pop $R1
-  StrCmp $R1 "95" win_ver_bad
-  StrCmp $R1 "98" win_ver_bad
-  StrCmp $R1 "ME" win_ver_bad
-  Goto done
-
-  win_ver_bad:
-    !insertmacro UnselectSection ${SecGtk}
-    !insertmacro SetSectionFlag ${SecGtkNone} ${SF_RO}
-    !insertmacro UnselectSection ${SecGtkNone}
-    !insertmacro SetSectionFlag ${SecGtkWimp} ${SF_RO}
-    !insertmacro UnselectSection ${SecGtkWimp}
-    !insertmacro SetSectionFlag ${SecGtkBluecurve} ${SF_RO}
-    !insertmacro UnselectSection ${SecGtkBluecurve}
-    !insertmacro SetSectionFlag ${SecGtkLighthouseblue} ${SF_RO}
-    !insertmacro UnselectSection ${SecGtkLighthouseblue}
-    MessageBox MB_OK $(GTK_WINDOWS_INCOMPATIBLE) /SD IDOK
-    Call DoWeNeedGtk
-    Pop $R0
-    Pop $R1
-    IntCmp $R0 1 done done ; Upgrade isn't optional - abort if we don't have a suitable version
-    Quit
-
-  done:
-  Pop $R1
-!endif
-  Pop $R0
-FunctionEnd
-
-!ifdef WITH_GTK
-Function preGtkDirPage
-  Push $R0
-  Push $R1
-  Call DoWeNeedGtk
-  Pop $R0
-  Pop $R1
-
-  IntCmp $R0 2 +2 +2 no_gtk
-  StrCmp $R0 "3" no_gtk no_gtk
-
-  ; Don't show dir selector.. Upgrades are done to existing path..
-  Pop $R1
-  Pop $R0
-  Abort
-
-  no_gtk:
-    StrCmp $R1 "NONE" 0 no_gtk_cont
-      ; Got no install rights..
-      Pop $R1
-      Pop $R0
-      Abort
-    no_gtk_cont:
-      ; Suggest path..
-      StrCmp $R1 "HKCU" 0 hklm1
-        ${GetParent} $SMPROGRAMS $R0
-        ${GetParent} $R0 $R0
-        StrCpy $R0 "$R0\GTK\2.0"
-        Goto got_path
-      hklm1:
-        StrCpy $R0 "${GTK_DEFAULT_INSTALL_PATH}"
-
-   got_path:
-     StrCpy $name "GTK+ ${GTK_INSTALL_VERSION}"
-     StrCpy $GTK_FOLDER $R0
-     Pop $R1
-     Pop $R0
-FunctionEnd
-
-Function postGtkDirPage
-  Push $R0
-  StrCpy $name "Gaim ${GAIM_VERSION}"
-  Push $GTK_FOLDER
-  Call VerifyDir
-  Pop $R0
-  StrCmp $R0 "0" 0 done
-    MessageBox MB_OK $(GTK_BAD_INSTALL_PATH) /SD IDOK
-    Pop $R0
-    Abort
-  done:
-  Pop $R0
-FunctionEnd
-!endif
-
-; GetWindowsVersion
-;
-; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
-; Updated by Joost Verburg
-;
-; Returns on top of stack
-;
-; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista)
-; or
-; '' (Unknown Windows Version)
-;
-; Usage:
-;   Call GetWindowsVersion
-;   Pop $R0
-;
-; at this point $R0 is "NT 4.0" or whatnot
-Function GetWindowsVersion
-
-  Push $R0
-  Push $R1
-
-  ClearErrors
-  ReadRegStr $R0 HKLM \
-  "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
-
-  IfErrors 0 lbl_winnt
-
-  ; we are not NT
-  ReadRegStr $R0 HKLM \
-  "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
-
-  StrCpy $R1 $R0 1
-  StrCmp $R1 '4' 0 lbl_error
-
-  StrCpy $R1 $R0 3
-
-  StrCmp $R1 '4.0' lbl_win32_95
-  StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
-
-  lbl_win32_95:
-    StrCpy $R0 '95'
-  Goto lbl_done
-
-  lbl_win32_98:
-    StrCpy $R0 '98'
-  Goto lbl_done
-
-  lbl_win32_ME:
-    StrCpy $R0 'ME'
-  Goto lbl_done
-
-  lbl_winnt:
-    StrCpy $R1 $R0 1
-
-    StrCmp $R1 '3' lbl_winnt_x
-    StrCmp $R1 '4' lbl_winnt_x
-
-    StrCpy $R1 $R0 3
-
-    StrCmp $R1 '5.0' lbl_winnt_2000
-    StrCmp $R1 '5.1' lbl_winnt_XP
-    StrCmp $R1 '5.2' lbl_winnt_2003
-    StrCmp $R1 '6.0' lbl_winnt_vista lbl_error
-
-  lbl_winnt_x:
-    StrCpy $R0 "NT $R0" 6
-  Goto lbl_done
-
-  lbl_winnt_2000:
-    Strcpy $R0 '2000'
-  Goto lbl_done
-
-  lbl_winnt_XP:
-    Strcpy $R0 'XP'
-  Goto lbl_done
-
-  lbl_winnt_2003:
-    Strcpy $R0 '2003'
-  Goto lbl_done
-
-  lbl_winnt_vista:
-    Strcpy $R0 'Vista'
-  Goto lbl_done
-
-  lbl_error:
-    Strcpy $R0 ''
-  lbl_done:
-
-  Pop $R1
-  Exch $R0
-FunctionEnd
-
-; SpellChecker Related Functions
-;-------------------------------
-
-; Convert the a Section index to the language code
-; Push the section index onto the stack and pop off the language code after the call
-; This will set the error code, if no match is found
-Function GetLangCodeForSection
-  ClearErrors
-  Push $R0
-  Exch
-  Pop $R0 ;This is the section index
-
-  IntCmp $R0 ${SecSpellCheckBreton} 0 +3 +3
-  StrCpy $R0 "br"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckCatalan} 0 +3 +3
-  StrCpy $R0 "ca"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckCzech} 0 +3 +3
-  StrCpy $R0 "cs"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckWelsh} 0 +3 +3
-  StrCpy $R0 "cy"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckDanish} 0 +3 +3
-  StrCpy $R0 "da"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckGerman} 0 +3 +3
-  StrCpy $R0 "de"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckGreek} 0 +3 +3
-  StrCpy $R0 "el"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckEnglish} 0 +3 +3
-  StrCpy $R0 "en"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckEsperanto} 0 +3 +3
-  StrCpy $R0 "eo"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckSpanish} 0 +3 +3
-  StrCpy $R0 "es"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckFaroese} 0 +3 +3
-  StrCpy $R0 "fo"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckFrench} 0 +3 +3
-  StrCpy $R0 "fr"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckItalian} 0 +3 +3
-  StrCpy $R0 "it"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckDutch} 0 +3 +3
-  StrCpy $R0 "nl"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckNorwegian} 0 +3 +3
-  StrCpy $R0 "no"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckPolish} 0 +3 +3
-  StrCpy $R0 "pl"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckPortuguese} 0 +3 +3
-  StrCpy $R0 "pt"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckRomanian} 0 +3 +3
-  StrCpy $R0 "ro"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckRussian} 0 +3 +3
-  StrCpy $R0 "ru"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckSlovak} 0 +3 +3
-  StrCpy $R0 "sk"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckSwedish} 0 +3 +3
-  StrCpy $R0 "sv"
-  Goto done
-  IntCmp $R0 ${SecSpellCheckUkrainian} 0 +3 +3
-  StrCpy $R0 "uk"
-  Goto done
-
-  SetErrors
-
-  done:
-  Exch $R0
-FunctionEnd ;GetLangCodeForSection
-
-; Select and Disable any Sections that have currently installed dictionaries
-Function SelectAndDisableInstalledDictionaries
-  Push $R0
-  Push $R1
-  Push $R2
-
-  ; Start with the first language dictionary
-  IntOp $R0 ${SecSpellCheck} + 1
-
-  start:
-  ; If it is the end of the section group, stop
-  SectionGetFlags $R0 $R1
-  IntOp $R2 $R1 & ${SF_SECGRPEND}
-  IntCmp $R2 ${SF_SECGRPEND} done
-
-  Push $R0
-  Call GetLangCodeForSection
-  Pop $R2
-  IfErrors end_loop
-  ReadRegStr $R2 HKLM "${ASPELL_REG_KEY}-$R2" "" ; Check that the dictionary is installed
-  StrCmp $R2 "" end_loop ; If it isn't installed, skip to the next item
-  IntOp $R1 $R1 | ${SF_RO} ; Mark Readonly
-  IntOp $R1 $R1 | ${SF_SELECTED} ; Select
-  SectionSetFlags $R0 $R1
-
-  end_loop:
-  IntOp $R0 $R0 + 1 ;Advance to the next section
-  Goto start
-
-  done:
-  Pop $R2
-  Pop $R1
-  Pop $R0
-FunctionEnd
-
-Function InstallAspellAndDict
-  Push $R0
-  Exch
-  Call GetLangCodeForSection
-  Pop $R0 ;This is the language code
-  Push $R1
-
-  IfErrors done ; We weren't able to convert the section to lang code
-
-  retry:
-    Call InstallAspell
-    Pop $R1
-    StrCmp $R1 "" +3
-    StrCmp $R1 "cancel" done
-    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_ERROR) : $R1" /SD IDCANCEL IDRETRY retry IDCANCEL done
-
-  retry_dict:
-    Push $R0
-    Call InstallAspellDictionary
-    Pop $R1
-    StrCmp $R1 "" +3
-    StrCmp $R1 "cancel" done
-    MessageBox MB_RETRYCANCEL "$(GAIM_SPELLCHECK_DICT_ERROR) : $R1" /SD IDCANCEL IDRETRY retry_dict
-
-  done:
-
-  Pop $R1
-  Pop $R0
-FunctionEnd
-
-Function InstallAspell
-  Push $R0
-  Push $R1
-  Push $R2
-
-  check:
-  ClearErrors
-  ReadRegDWORD $R0 HKLM ${ASPELL_REG_KEY} "AspellVersion"
-  IntCmp $R0 15 installed
-
-  ; If this is the check after installation, don't infinite loop on failure
-  StrCmp $R1 "$TEMP\aspell_installer.exe" 0 +3
-    StrCpy $R0 $(ASPELL_INSTALL_FAILED)
-    Goto done
-
-  ; We need to download and install aspell
-  StrCpy $R1 "$TEMP\aspell_installer.exe"
-  StrCpy $R2 "${DOWNLOADER_URL}?version=${GAIM_VERSION}&dl_pkg=aspell_core"
-  DetailPrint "Downloading Aspell... ($R2)"
-  NSISdl::download $R2 $R1
-  Pop $R0
-  StrCmp $R0 "success" +2
-    Goto done
-  ExecWait '"$R1"'
-  Delete $R1
-  Goto check ; Check that it is now installed correctly
-
-  installed: ;Aspell is currently installed, no error message
-    DetailPrint "Aspell is installed"
-    StrCpy $R0 ''
-
-  done:
-  Pop $R2
-  Pop $R1
-  Exch $R0
-FunctionEnd
-
-Function InstallAspellDictionary
-  Push $R0
-  Exch
-  Pop $R0 ;This is the language code
-  Push $R1
-  Push $R2
-  Push $R3
-
-  check:
-  ClearErrors
-  ReadRegStr $R2 HKLM "${ASPELL_REG_KEY}-$R0" ""
-  StrCmp $R2 "" 0 installed
-
-  ; If this is the check after installation, don't infinite loop on failure
-  StrCmp $R1 "$TEMP\aspell_dict-$R0.exe" 0 +3
-    StrCpy $R0 $(ASPELL_INSTALL_FAILED)
-    Goto done
-
-  ; We need to download and install aspell
-  StrCpy $R1 "$TEMP\aspell_dict-$R0.exe"
-  StrCpy $R3 "${DOWNLOADER_URL}?version=${GAIM_VERSION}&dl_pkg=lang_$R0"
-  DetailPrint "Downloading the Aspell $R0 Dictionary... ($R3)"
-  NSISdl::download $R3 $R1
-  Pop $R3
-  StrCmp $R3 "success" +3
-    StrCpy $R0 $R3
-    Goto done
-  ExecWait '"$R1"'
-  Delete $R1
-  Goto check ; Check that it is now installed correctly
-
-  installed: ;The dictionary is currently installed, no error message
-    DetailPrint "Aspell $R0 Dictionary is installed"
-    StrCpy $R0 ''
-
-  done:
-  Pop $R3
-  Pop $R2
-  Pop $R1
-  Exch $R0
-FunctionEnd
diff -r 51dd9ae01585 -r 2d739b7a14ac libpurple/protocols/jabber/presence.c
--- a/libpurple/protocols/jabber/presence.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sat Mar 03 19:18:47 2007 +0000
@@ -392,7 +392,7 @@
 		static int i = 1;
 		char *room_jid = g_strdup_printf("%s@%s", jid->node, jid->domain);
 
-		if(state == JABBER_BUDDY_STATE_ERROR) {
+		if(state == JABBER_BUDDY_STATE_ERROR && jid->resource == NULL) {
 			char *title, *msg = jabber_parse_error(js, packet);
 
 			if(chat->conv) {
diff -r 51dd9ae01585 -r 2d739b7a14ac libpurple/protocols/msn/table.c
--- a/libpurple/protocols/msn/table.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/libpurple/protocols/msn/table.c	Sat Mar 03 19:18:47 2007 +0000
@@ -41,7 +41,7 @@
 
 	table = g_new0(MsnTable, 1);
 
-	table->cmds = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
+	table->cmds = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, (GDestroyNotify)g_hash_table_destroy);
 	table->msgs = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
 	table->errors = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
 
diff -r 51dd9ae01585 -r 2d739b7a14ac libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sat Mar 03 19:18:47 2007 +0000
@@ -3592,7 +3592,8 @@
 	if (gaim_account_get_user_info(account) != NULL)
 		serv_set_info(gc, gaim_account_get_user_info(account));
 
-	oscar_format_screenname(gc, account->username);
+	if (!od->icq)
+		oscar_format_screenname(gc, account->username);
 
 	/* Set our available message based on the current status */
 	status = gaim_account_get_active_status(account);
diff -r 51dd9ae01585 -r 2d739b7a14ac libpurple/protocols/yahoo/yahoo.c
--- a/libpurple/protocols/yahoo/yahoo.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Sat Mar 03 19:18:47 2007 +0000
@@ -52,8 +52,12 @@
 
 /* #define YAHOO_DEBUG */
 
+/* #define TRY_WEBMESSENGER_LOGIN 0 */
+
 static void yahoo_add_buddy(GaimConnection *gc, GaimBuddy *, GaimGroup *);
+#ifdef TRY_WEBMESSENGER_LOGIN
 static void yahoo_login_page_cb(GaimUtilFetchUrlData *url_data, gpointer user_data, const gchar *url_text, size_t len, const gchar *error_message);
+#endif
 static void yahoo_set_status(GaimAccount *account, GaimStatus *status);
 
 static void
@@ -1885,7 +1889,9 @@
 
 static void yahoo_process_authresp(GaimConnection *gc, struct yahoo_packet *pkt)
 {
+#ifdef TRY_WEBMESSENGER_LOGIN
 	struct yahoo_data *yd = gc->proto_data;
+#endif
 	GSList *l = pkt->hash;
 	int err = 0;
 	char *msg;
@@ -1908,6 +1914,7 @@
 		msg = g_strdup(_("Invalid screen name."));
 		break;
 	case 13:
+#ifdef TRY_WEBMESSENGER_LOGIN
 		if (!yd->wm) {
 			GaimUtilFetchUrlData *url_data;
 			yd->wm = TRUE;
@@ -1921,6 +1928,7 @@
 				yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
 			return;
 		}
+#endif
 		msg = g_strdup(_("Incorrect password."));
 		break;
 	case 14:
@@ -2364,6 +2372,7 @@
 	gc->inpa = gaim_input_add(yd->fd, GAIM_INPUT_READ, yahoo_pending, gc);
 }
 
+#ifdef TRY_WEBMESSENGER_LOGIN
 static void yahoo_got_web_connected(gpointer data, gint source, const gchar *error_message)
 {
 	GaimConnection *gc = data;
@@ -2585,6 +2594,13 @@
 
 	yd->url_datas = g_slist_remove(yd->url_datas, url_data);
 
+	if (error_message != NULL)
+	{
+		/* TODO: Include error_message in the message below */
+		gaim_connection_error(gc, _("Unable to connect."));
+		return;
+	}
+
 	url = g_string_append(url, sn);
 	url = g_string_append(url, "&passwd=");
 
@@ -2636,6 +2652,7 @@
 
 	gaim_cipher_context_destroy(context);
 }
+#endif
 
 static void yahoo_server_check(GaimAccount *account)
 {
diff -r 51dd9ae01585 -r 2d739b7a14ac libpurple/server.c
--- a/libpurple/server.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/libpurple/server.c	Sat Mar 03 19:18:47 2007 +0000
@@ -448,6 +448,7 @@
 	 * been given us by the prpls. So we create temp holders and pass
 	 * those instead. It's basically just to avoid segfaults.
 	 */
+	/* TODO: MAX(message, BUF_LONG) is pretty ugly. */
 	buffy = g_malloc(MAX(strlen(msg) + 1, BUF_LONG));
 	strcpy(buffy, msg);
 	angel = g_strdup(who);
@@ -771,7 +772,7 @@
 	 * data is binary, plugins don't see it. Bitch all you want; i really
 	 * don't want you to be dealing with it.
 	 */
-
+	/* TODO: MAX(message, BUF_LONG) is pretty ugly. */
 	buffy = g_malloc(MAX(strlen(message) + 1, BUF_LONG));
 	strcpy(buffy, message);
 	angel = g_strdup(who);
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/Makefile.am
--- a/pidgin/Makefile.am	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/Makefile.am	Sat Mar 03 19:18:47 2007 +0000
@@ -20,9 +20,11 @@
 		win32/winpidgin.c \
 		win32/wspell.c \
 		win32/wspell.h \
-		win32/nsis/gaim-header.bmp \
-		win32/nsis/gaim-intro.bmp \
-		win32/nsis/gaim-plugin.nsh \
+		win32/nsis/pixmaps/pidgin-header.bmp \
+		win32/nsis/pixmaps/pidgin-intro.bmp \
+		win32/nsis/pixmaps/pidgin-install.ico \
+		win32/nsis/pidgin-installer.nsi \
+		win32/nsis/pidgin-plugin.nsh \
 		win32/nsis/langmacros.nsh \
 		win32/nsis/translations/albanian.nsh \
 		win32/nsis/translations/bulgarian.nsh \
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/gtkconv.c
--- a/pidgin/gtkconv.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/gtkconv.c	Sat Mar 03 19:18:47 2007 +0000
@@ -2355,9 +2355,6 @@
 		l = pidgin_conv_get_tab_icons(conv);
 
 		gtk_window_set_icon_list(GTK_WINDOW(win->window), l);
-
-		if (status != NULL)
-			g_object_unref(status);
 	}
 }
 
@@ -5882,8 +5879,10 @@
 			l = pidgin_conv_get_tab_icons(conv);
 		}
 		gtk_window_set_icon_list(GTK_WINDOW(win->window), l);
-		if (window_icon != NULL)
+		if (window_icon != NULL) {
 			g_object_unref(G_OBJECT(window_icon));
+			g_list_free(l);
+		}
 	}
 }
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/gtkmain.c
--- a/pidgin/gtkmain.c	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/gtkmain.c	Sat Mar 03 19:18:47 2007 +0000
@@ -171,6 +171,11 @@
  * function that can be called by applications to disable forking
  * during initialization.  But it's not in 0.10.0, so we shouldn't
  * use it.
+ *
+ * All of this child process reaping stuff is currently only used for
+ * processes that were forked to play sounds.  It's not needed for
+ * forked DNS child, which have their own waitpid() call.  It might
+ * be wise to move this code into gtksound.c.
  */
 static void
 clean_pid()
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/pixmaps/Makefile.am	Sat Mar 03 19:18:47 2007 +0000
@@ -47,7 +47,6 @@
 		typed.png			\
 		typing.png			\
 		Makefile.mingw			\
-		gaim-install.ico		\
 		gaim.ico			
 
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/pixmaps/gaim-install.ico
Binary file pidgin/pixmaps/gaim-install.ico has changed
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/pixmaps/status/48/Makefile.mingw
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/pixmaps/status/48/Makefile.mingw	Sat Mar 03 19:18:47 2007 +0000
@@ -0,0 +1,20 @@
+#
+# Makefile.mingw
+#
+# Description: Makefile for win32 (mingw) version of Pidgin pixmaps
+#
+
+GAIM_TOP := ../../../..
+include $(GAIM_TOP)/libpurple/win32/global.mak
+
+datadir = $(GAIM_INSTALL_DIR)
+include ./Makefile.am
+
+.PHONY: install
+
+install:
+	if test '$(pidginstatuspix_DATA)'; then \
+	  mkdir -p $(pidginstatuspixdir); \
+	  cp $(pidginstatuspix_DATA) $(pidginstatuspixdir); \
+	fi;
+
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/pixmaps/status/Makefile.am
--- a/pidgin/pixmaps/status/Makefile.am	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/pixmaps/status/Makefile.am	Sat Mar 03 19:18:47 2007 +0000
@@ -4,5 +4,6 @@
 	Makefile.mingw \
 	16/Makefile.mingw \
 	22/Makefile.mingw \
-	32/Makefile.mingw
+	32/Makefile.mingw \
+	48/Makefile.mingw
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/gaim-header.bmp
Binary file pidgin/win32/nsis/gaim-header.bmp has changed
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/gaim-intro.bmp
Binary file pidgin/win32/nsis/gaim-intro.bmp has changed
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/gaim-plugin.nsh
--- a/pidgin/win32/nsis/gaim-plugin.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-;;
-;; Windows Gaim NSIS installer plugin helper utilities
-;; Copyright 2005, Daniel Atallah <daniel_atallah@yahoo.com>
-;;
-;; Include in plugin installer scripts using:
-;;   !addincludedir "${PATH_TO_GAIM_SRC}\gtkgaim\win32\nsis"
-;;   !include "gaim-plugin.nsh"
-;;
-
-!define GAIM_REG_KEY              "SOFTWARE\gaim"
-
-!define GAIM_VERSION_OK           0
-!define GAIM_VERSION_INCOMPATIBLE 1
-!define GAIM_VERSION_UNDEFINED    2
-
-; Extract the Gaim Version from the registry
-; This will set the Error flag if unable to determine the value
-; Pop the value of the stack after calling this to get the value (unless Error Flag is set)
-Function GetGaimVersion
-  Push $R0
-
-  ; Read the gaim version
-  ClearErrors
-  ReadRegStr $R0 HKLM ${GAIM_REG_KEY} "Version"
-  IfErrors +1 GetGaimVersion_found
-  ; fall back to the HKCU registry key
-  ReadRegStr $R0 HKCU ${GAIM_REG_KEY} "Version"
-  IfErrors GetGaimVersion_done ; Keep the error flag set
-
-  GetGaimVersion_found:
-  Push $R0 ; Push the value onto the stack
-  Exch
-
-  GetGaimVersion_done:
-  ; restore $R0
-  Pop $R0
-FunctionEnd
-
-; Check that the currently installed gaim version is compatible
-; with the plugin version we are installing
-; Push the Plugin's Gaim Version onto the Stack before calling
-; After calling, the top of the Stack will contain the result of the check:
-;   GAIM_VERSION_OK - If the installed gaim version is compatible w/ the version specified
-;   GAIM_VERSION_INCOMPATIBLE - If the installed gaim version isn't compatible w/ the version specified
-;   GAIM_VERSION_UNDEFINED - If the installed gaim version can't be determined 
-Function CheckGaimVersion
-  ; Save the Variable values that we will use in the stack
-  Push $R4
-  Exch
-  Pop $R4 ; Get the plugin's Gaim Version
-  Push $R0
-  Push $R1
-  Push $R2
-
-  ; Read the gaim version
-  Call GetGaimVersion
-  IfErrors checkGaimVersion_noGaimInstallFound
-  Pop $R0
-
-  ;If they are exactly the same, we don't need to look at anything else
-  StrCmp $R0 $R4 checkGaimVersion_VersionOK 
-
-  ; Versions are in the form of X.Y.Z
-  ; If X is different or plugin's Y > gaim's Y, then we shouldn't install
-
-  ;Check the Major Version
-  Push $R0
-  Push 0
-  Call GetVersionComponent
-  IfErrors checkGaimVersion_noGaimInstallFound ;We couldn't extract 'X' from the installed gaim version
-  Pop $R2
-  Push $R4
-  Push 0
-  Call GetVersionComponent
-  IfErrors checkGaimVersion_BadVersion ; this isn't a valid version, so don't bother even checking
-  Pop $R1
-  ;Check that both versions' X is the same
-  StrCmp $R1 $R2 +1 checkGaimVersion_BadVersion
-
-  ;Check the Minor Version
-  Push $R0
-  Push 1
-  Call GetVersionComponent
-  IfErrors checkGaimVersion_noGaimInstallFound ;We couldn't extract 'Y' from the installed gaim version
-  Pop $R2
-  Push $R4
-  Push 1
-  Call GetVersionComponent
-  IfErrors checkGaimVersion_BadVersion ; this isn't a valid version, so don't bother even checking
-  Pop $R1
-  ;Check that plugin's Y <= gaim's Y
-  IntCmp $R1 $R2 checkGaimVersion_VersionOK checkGaimVersion_VersionOK checkGaimVersion_BadVersion
-
-  checkGaimVersion_BadVersion:
-    Push ${GAIM_VERSION_INCOMPATIBLE}
-    goto checkGaimVersion_done
-  checkGaimVersion_noGaimInstallFound:
-    Push ${GAIM_VERSION_UNDEFINED}
-    goto checkGaimVersion_done
-  checkGaimVersion_VersionOK:
-    Push ${GAIM_VERSION_OK}
-
-  checkGaimVersion_done:
-  ; Restore the Variables that we used
-  Exch
-  Pop $R2
-  Exch
-  Pop $R1
-  Exch
-  Pop $R0
-  Exch
-  Pop $R4
-FunctionEnd
-
-; Extract the part of a string prior to "." (or the whole string if there is no ".")
-; If no "." was found, the ErrorFlag will be set
-; Before this is called, Push ${VERSION_STRING} must be called, and then Push 0 for Major, 1 for Minor, etc
-; Pop should be called after to retrieve the new value
-Function GetVersionComponent
-  ClearErrors
-
-  ; Save the Variable values that we will use in the stack
-  Push $1
-  Exch
-  Pop $1 ;The version component which we want to extract (0, 1, 2)
-  Exch
-  Push $0
-  Exch
-  Pop $0 ;The string from which to extract the version component
-
-  Push $2
-  Push $3
-  Push $4
-  Push $5
-  Push $6
-  Push $7
-
-  StrCpy $2 "0" ;Initialize our string index counter
-  StrCpy $7 "0" ;Index of last "."
-  StrCpy $3 "0" ;Initialize our version index counter
-
-  startGetVersionComponentLoop:
-    ;avoid infinite loop (if we have gotten the whole initial string, exit the loop and set the error flag)
-    StrCmp $6 $0 GetVersionComponentSetErrorFlag
-    IntOp $2 $2 + 1
-    StrCpy $6 $0 $2 ;Update the infinite loop preventing string
-    ;Determine the correct substring (only the current index component)
-    IntOp $5 $2 - $7
-    StrCpy $4 $0 $5 $7 ;Append the current character in $0 to $4
-    StrCpy $5 $0 1 $2 ;store the next character in $5
-
-    ;if the next character is ".", $4 will contain the version component prior to "."
-    StrCmp $5 "." +1 startGetVersionComponentLoop
-    StrCmp $3 $1 doneGetVersionComponent ;If it is the version component we're looking for, stop
-    IntOp $3 $3 + 1 ;Increment the version index counter
-    IntOp $2 $2 + 1 ;Increment the version string index to "." (so it will be skipped)
-    StrCpy $7 $2 ;Keep track of the index of the last "."
-    StrCpy $6 $0 $2 ;Update the infinite loop preventing string
-    goto startGetVersionComponentLoop
-
-  GetVersionComponentSetErrorFlag:
-    SetErrors
-
-  doneGetVersionComponent:
-  ; Restore the Variables that we used
-  Pop $7
-  Pop $6
-  Pop $5
-  Push $4 ;This is the value we're returning
-  Exch
-  Pop $4
-  Exch
-  Pop $3
-  Exch
-  Pop $2
-  Exch
-  Pop $0
-  Exch
-  Pop $1
-FunctionEnd
-
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/langmacros.nsh
--- a/pidgin/win32/nsis/langmacros.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/langmacros.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,8 +1,8 @@
 ;;
-;; Windows Gaim NSIS installer language macros
+;; Windows Pidgin NSIS installer language macros
 ;;
 
-!macro GAIM_MACRO_DEFAULT_STRING LABEL VALUE
+!macro PIDGIN_MACRO_DEFAULT_STRING LABEL VALUE
   !ifndef "${LABEL}"
     !define "${LABEL}" "${VALUE}"
     !ifdef INSERT_DEFAULT
@@ -11,110 +11,110 @@
   !endif
 !macroend
 
-!macro GAIM_MACRO_LANGSTRING_INSERT LABEL LANG
+!macro PIDGIN_MACRO_LANGSTRING_INSERT LABEL LANG
   LangString "${LABEL}" "${LANG_${LANG}}" "${${LABEL}}"
   !undef "${LABEL}"
 !macroend
 
-!macro GAIM_MACRO_LANGUAGEFILE_BEGIN LANG
+!macro PIDGIN_MACRO_LANGUAGEFILE_BEGIN LANG
   !define CUR_LANG "${LANG}"
 !macroend
 
-!macro GAIM_MACRO_LANGUAGEFILE_END
+!macro PIDGIN_MACRO_LANGUAGEFILE_END
   !define INSERT_DEFAULT
-  !include "${GAIM_DEFAULT_LANGFILE}"
+  !include "${PIDGIN_DEFAULT_LANGFILE}"
   !undef INSERT_DEFAULT
 
   ; GAIM Language file Version 3
   ; String labels should match those from the default language file.
 
   ; Startup checks
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT INSTALLER_IS_RUNNING		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_IS_RUNNING			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_INSTALLER_NEEDED		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT INSTALLER_IS_RUNNING		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_IS_RUNNING			${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_INSTALLER_NEEDED		${CUR_LANG}
 
   ; License Page
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_LICENSE_BUTTON			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_LICENSE_BOTTOM_TEXT		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_LICENSE_BUTTON			${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_LICENSE_BOTTOM_TEXT		${CUR_LANG}
 
   ; Components Page
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SECTION_TITLE			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_SECTION_TITLE			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_TITLE		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_NOTHEME_SECTION_TITLE		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_WIMP_SECTION_TITLE		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_SECTION_TITLE		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SHORTCUTS_SECTION_TITLE	${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_DESKTOP_SHORTCUT_SECTION_TITLE ${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SECTION_DESCRIPTION		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_SECTION_DESCRIPTION		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_DESCRIPTION	${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_NO_THEME_DESC			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_WIMP_THEME_DESC			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_THEME_DESC		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_THEME_DESC	${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SHORTCUTS_SECTION_DESCRIPTION	${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_DESKTOP_SHORTCUT_DESC		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_STARTMENU_SHORTCUT_DESC	${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SECTION_TITLE			${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_SECTION_TITLE			${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_TITLE		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_NOTHEME_SECTION_TITLE		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_WIMP_SECTION_TITLE		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_SECTION_TITLE		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_SECTION_TITLE	${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SHORTCUTS_SECTION_TITLE	${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE ${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SECTION_DESCRIPTION		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_SECTION_DESCRIPTION		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_THEMES_SECTION_DESCRIPTION	${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_NO_THEME_DESC			${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_WIMP_THEME_DESC			${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_BLUECURVE_THEME_DESC		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_LIGHTHOUSEBLUE_THEME_DESC	${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_DESKTOP_SHORTCUT_DESC		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_STARTMENU_SHORTCUT_DESC	${CUR_LANG}
 
   ; GTK+ Directory Page
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_UPGRADE_PROMPT			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_WINDOWS_INCOMPATIBLE		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_UPGRADE_PROMPT			${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_WINDOWS_INCOMPATIBLE		${CUR_LANG}
 
   ; Installer Finish Page
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_FINISH_VISIT_WEB_SITE		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_FINISH_VISIT_WEB_SITE		${CUR_LANG}
 
-  ; Gaim Section Prompts and Texts
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_UNINSTALL_DESC			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_PROMPT_CONTINUE_WITHOUT_UNINSTALL	${CUR_LANG}
+  ; Pidgin Section Prompts and Texts
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_UNINSTALL_DESC			${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	${CUR_LANG}
 
   ; GTK+ Section Prompts
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_INSTALL_ERROR			${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_BAD_INSTALL_PATH		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_INSTALL_ERROR			${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_BAD_INSTALL_PATH		${CUR_LANG}
 
   ; GTK+ Themes section
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GTK_NO_THEME_INSTALL_RIGHTS		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT GTK_NO_THEME_INSTALL_RIGHTS		${CUR_LANG}
 
   ; Uninstall Section Prompts
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT un.GAIM_UNINSTALL_ERROR_1		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT un.GAIM_UNINSTALL_ERROR_2		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT un.PIDGIN_UNINSTALL_ERROR_1		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT un.PIDGIN_UNINSTALL_ERROR_2		${CUR_LANG}
 
   ; Spellcheck Section Prompts
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SECTION_TITLE	${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ERROR		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_DICT_ERROR		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SECTION_DESCRIPTION	${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT ASPELL_INSTALL_FAILED		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_BRETON		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_CATALAN		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_CZECH		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_WELSH		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_DANISH		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_GERMAN		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ENGLISH		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_GREEK		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ESPERANTO		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SPANISH		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_FAROESE		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_FRENCH		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ITALIAN		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_DUTCH		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_NORWEGIAN		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_POLISH		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_PORTUGUESE		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_ROMANIAN		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_RUSSIAN		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SLOVAK		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_SWEDISH		${CUR_LANG}
-  !insertmacro GAIM_MACRO_LANGSTRING_INSERT GAIM_SPELLCHECK_UKRAINIAN		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SECTION_TITLE	${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_ERROR		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_DICT_ERROR		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT ASPELL_INSTALL_FAILED		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_BRETON		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_CATALAN		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_CZECH		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_WELSH		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_DANISH		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_GERMAN		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_ENGLISH		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_GREEK		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_ESPERANTO		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SPANISH		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_FAROESE		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_FRENCH		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_ITALIAN		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_DUTCH		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_NORWEGIAN		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_POLISH		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_PORTUGUESE		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_ROMANIAN		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_RUSSIAN		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SLOVAK		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_SWEDISH		${CUR_LANG}
+  !insertmacro PIDGIN_MACRO_LANGSTRING_INSERT PIDGIN_SPELLCHECK_UKRAINIAN		${CUR_LANG}
 
   !undef CUR_LANG
 !macroend
 
-!macro GAIM_MACRO_INCLUDE_LANGFILE LANG FILE
-  !insertmacro GAIM_MACRO_LANGUAGEFILE_BEGIN "${LANG}"
+!macro PIDGIN_MACRO_INCLUDE_LANGFILE LANG FILE
+  !insertmacro PIDGIN_MACRO_LANGUAGEFILE_BEGIN "${LANG}"
   !include "${FILE}"
-  !insertmacro GAIM_MACRO_LANGUAGEFILE_END
+  !insertmacro PIDGIN_MACRO_LANGUAGEFILE_END
 !macroend
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/pidgin-installer.nsi
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Sat Mar 03 19:18:47 2007 +0000
@@ -0,0 +1,1699 @@
+; Installer script for win32 Pidgin
+; Original Author: Herman Bloggs <hermanator12002@yahoo.com>
+; Updated By: Daniel Atallah <daniel_atallah@yahoo.com>
+
+; NOTE: this .NSI script is intended for NSIS 2.08
+;
+
+;--------------------------------
+;Global Variables
+Var name
+Var GTK_FOLDER
+Var GTK_THEME_SEL
+Var ISSILENT
+Var STARTUP_RUN_KEY
+Var SPELLCHECK_SEL
+
+;--------------------------------
+;Configuration
+
+;The name var is set in .onInit
+Name $name
+
+!ifdef WITH_GTK
+OutFile "pidgin-${PIDGIN_VERSION}.exe"
+!else
+!ifdef DEBUG
+OutFile "pidgin-${PIDGIN_VERSION}-debug.exe"
+!else
+OutFile "pidgin-${PIDGIN_VERSION}-no-gtk.exe"
+!endif
+!endif
+
+SetCompressor /SOLID lzma
+ShowInstDetails show
+ShowUninstDetails show
+SetDateSave on
+
+; $name and $INSTDIR are set in .onInit function..
+
+!include "MUI.nsh"
+!include "Sections.nsh"
+
+!include "FileFunc.nsh"
+!insertmacro GetParameters
+!insertmacro GetOptions
+!insertmacro GetParent
+
+!include "WordFunc.nsh"
+!insertmacro VersionCompare
+
+!include "TextFunc.nsh"
+!insertmacro ConfigWriteS
+
+;--------------------------------
+;Defines
+
+!define PIDGIN_NSIS_INCLUDE_PATH		"."
+!define PIDGIN_INSTALLER_DEPS			"..\..\..\..\win32-dev\pidgin-inst-deps"
+
+; Remove these and the stuff that uses them at some point
+!define OLD_GAIM_REG_KEY			"SOFTWARE\gaim"
+!define OLD_GAIM_UNINSTALL_KEY			"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gaim"
+!define OLD_GAIM_UNINST_EXE			"gaim-uninst.exe"
+
+!define PIDGIN_REG_KEY				"SOFTWARE\pidgin"
+!define PIDGIN_UNINSTALL_KEY			"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Pidgin"
+
+!define HKLM_APP_PATHS_KEY			"SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\pidgin.exe"
+!define STARTUP_RUN_KEY				"SOFTWARE\Microsoft\Windows\CurrentVersion\Run"
+!define PIDGIN_UNINST_EXE			"pidgin-uninst.exe"
+
+!define GTK_MIN_VERSION				"2.6.10"
+!define GTK_REG_KEY				"SOFTWARE\GTK\2.0"
+!define PERL_REG_KEY				"SOFTWARE\Perl"
+!define PERL_DLL				"perl58.dll"
+!define GTK_DEFAULT_INSTALL_PATH		"$COMMONFILES\GTK\2.0"
+!define GTK_RUNTIME_INSTALLER			"..\..\..\..\gtk_installer\gtk-runtime*.exe"
+
+!define ASPELL_REG_KEY				"SOFTWARE\Aspell"
+!define DOWNLOADER_URL				"http://www.pidgin.im/win32/download_redir.php"
+
+;--------------------------------
+;Version resource
+VIProductVersion "${PIDGIN_PRODUCT_VERSION}"
+VIAddVersionKey "ProductName" "Pidgin"
+VIAddVersionKey "FileVersion" "${PIDGIN_VERSION}"
+VIAddVersionKey "ProductVersion" "${PIDGIN_VERSION}"
+VIAddVersionKey "LegalCopyright" ""
+!ifdef WITH_GTK
+VIAddVersionKey "FileDescription" "Pidgin Installer (w/ GTK+ Installer)"
+!else
+!ifdef DEBUG
+VIAddVersionKey "FileDescription" "Pidgin Installer (Debug Version)"
+!else
+VIAddVersionKey "FileDescription" "Pidgin Installer (w/o GTK+ Installer)"
+!endif
+!endif
+
+;--------------------------------
+;Modern UI Configuration
+
+  !define MUI_ICON				".\pixmaps\pidgin-install.ico"
+  !define MUI_UNICON				".\pixmaps\pidgin-install.ico"
+  !define MUI_WELCOMEFINISHPAGE_BITMAP		".\pixmaps\pidgin-intro.bmp"
+  !define MUI_HEADERIMAGE
+  !define MUI_HEADERIMAGE_BITMAP		".\pixmaps\pidgin-header.bmp"
+
+  ; Alter License section
+  !define MUI_LICENSEPAGE_BUTTON		$(PIDGIN_LICENSE_BUTTON)
+  !define MUI_LICENSEPAGE_TEXT_BOTTOM		$(PIDGIN_LICENSE_BOTTOM_TEXT)
+
+  !define MUI_LANGDLL_REGISTRY_ROOT "HKCU"
+  !define MUI_LANGDLL_REGISTRY_KEY ${PIDGIN_REG_KEY}
+  !define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language"
+
+  !define MUI_COMPONENTSPAGE_SMALLDESC
+  !define MUI_ABORTWARNING
+
+  ;Finish Page config
+  !define MUI_FINISHPAGE_RUN			"$INSTDIR\pidgin.exe"
+  !define MUI_FINISHPAGE_RUN_NOTCHECKED
+  !define MUI_FINISHPAGE_LINK			$(PIDGIN_FINISH_VISIT_WEB_SITE)
+  !define MUI_FINISHPAGE_LINK_LOCATION		"http://www.pidgin.im/win32"
+
+;--------------------------------
+;Pages
+
+  !define MUI_PAGE_CUSTOMFUNCTION_PRE		preWelcomePage
+  !insertmacro MUI_PAGE_WELCOME
+  !insertmacro MUI_PAGE_LICENSE			"../../../COPYING"
+  !insertmacro MUI_PAGE_COMPONENTS
+
+!ifdef WITH_GTK
+  ; GTK+ install dir page
+  !define MUI_PAGE_CUSTOMFUNCTION_PRE		preGtkDirPage
+  !define MUI_PAGE_CUSTOMFUNCTION_LEAVE		postGtkDirPage
+  !define MUI_DIRECTORYPAGE_VARIABLE		$GTK_FOLDER
+  !insertmacro MUI_PAGE_DIRECTORY
+!endif
+
+  ; Pidgin install dir page
+  !insertmacro MUI_PAGE_DIRECTORY
+
+  !insertmacro MUI_PAGE_INSTFILES
+  !insertmacro MUI_PAGE_FINISH
+
+  !insertmacro MUI_UNPAGE_WELCOME
+  !insertmacro MUI_UNPAGE_CONFIRM
+  !insertmacro MUI_UNPAGE_INSTFILES
+  !insertmacro MUI_UNPAGE_FINISH
+
+;--------------------------------
+;Languages
+
+  ;; English goes first because its the default. The rest are
+  ;; in alphabetical order (at least the strings actually displayed
+  ;; will be).
+
+  !insertmacro MUI_LANGUAGE "English"
+
+  !insertmacro MUI_LANGUAGE "Albanian"
+  !insertmacro MUI_LANGUAGE "Bulgarian"
+  !insertmacro MUI_LANGUAGE "Catalan"
+  !insertmacro MUI_LANGUAGE "Czech"
+  !insertmacro MUI_LANGUAGE "Danish"
+  !insertmacro MUI_LANGUAGE "SimpChinese"
+  !insertmacro MUI_LANGUAGE "TradChinese"
+  !insertmacro MUI_LANGUAGE "German"
+  !insertmacro MUI_LANGUAGE "Spanish"
+  !insertmacro MUI_LANGUAGE "French"
+  !insertmacro MUI_LANGUAGE "Hebrew"
+  !insertmacro MUI_LANGUAGE "Italian"
+  !insertmacro MUI_LANGUAGE "Japanese"
+  !insertmacro MUI_LANGUAGE "Korean"
+  !insertmacro MUI_LANGUAGE "Kurdish"
+  !insertmacro MUI_LANGUAGE "Lithuanian"
+  !insertmacro MUI_LANGUAGE "Hungarian"
+  !insertmacro MUI_LANGUAGE "Dutch"
+  !insertmacro MUI_LANGUAGE "Norwegian"
+  !insertmacro MUI_LANGUAGE "Polish"
+  !insertmacro MUI_LANGUAGE "PortugueseBR"
+  !insertmacro MUI_LANGUAGE "Portuguese"
+  !insertmacro MUI_LANGUAGE "Romanian"
+  !insertmacro MUI_LANGUAGE "Russian"
+  !insertmacro MUI_LANGUAGE "Serbian"
+  !insertmacro MUI_LANGUAGE "Slovak"
+  !insertmacro MUI_LANGUAGE "Slovenian"
+  !insertmacro MUI_LANGUAGE "Finnish"
+  !insertmacro MUI_LANGUAGE "Swedish"
+
+;--------------------------------
+;Translations
+
+  !define PIDGIN_DEFAULT_LANGFILE "${PIDGIN_NSIS_INCLUDE_PATH}\translations\english.nsh"
+
+  !include "${PIDGIN_NSIS_INCLUDE_PATH}\langmacros.nsh"
+
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ALBANIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\albanian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "BULGARIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\bulgarian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "CATALAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\catalan.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "CZECH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\czech.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "DANISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\danish.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "DUTCH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\dutch.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ENGLISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\english.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "FINNISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\finnish.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "FRENCH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\french.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "GERMAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\german.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "HEBREW"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\hebrew.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "HUNGARIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\hungarian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ITALIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\italian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "JAPANESE"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\japanese.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "KOREAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\korean.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "KURDISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\kurdish.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "LITHUANIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\lithuanian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "NORWEGIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\norwegian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "POLISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\polish.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "PORTUGUESE"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\portuguese.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "PORTUGUESEBR"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\portuguese-br.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "ROMANIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\romanian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "RUSSIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\russian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SERBIAN"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\serbian-latin.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SIMPCHINESE"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\simp-chinese.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SLOVAK"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\slovak.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SLOVENIAN"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\slovenian.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SPANISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\spanish.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "SWEDISH"		"${PIDGIN_NSIS_INCLUDE_PATH}\translations\swedish.nsh"
+  !insertmacro PIDGIN_MACRO_INCLUDE_LANGFILE "TRADCHINESE"	"${PIDGIN_NSIS_INCLUDE_PATH}\translations\trad-chinese.nsh"
+
+;--------------------------------
+;Reserve Files
+  ; Only need this if using bzip2 compression
+
+  !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+  !insertmacro MUI_RESERVEFILE_LANGDLL
+  ReserveFile "${NSISDIR}\Plugins\UserInfo.dll"
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Start Install Sections ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;--------------------------------
+;Uninstall any old version of Pidgin (or Gaim)
+
+Section -SecUninstallOldPidgin
+  ; Check install rights..
+  Call CheckUserInstallRights
+  Pop $R0
+
+  ;First try to uninstall Pidgin
+  StrCpy $R4 ${PIDGIN_REG_KEY}
+  StrCpy $R5 ${PIDGIN_UNINSTALL_KEY}
+  StrCpy $R6 ${PIDGIN_UNINST_EXE}
+  StrCpy $R7 "Pidgin"
+
+  start_comparison:
+  ;If pidgin is currently set to run on startup,
+  ;  save the section of the Registry where the setting is before uninstalling,
+  ;  so we can put it back after installing the new version
+  ClearErrors
+  ReadRegStr $STARTUP_RUN_KEY HKCU "${STARTUP_RUN_KEY}" $R7
+  IfErrors +3
+  StrCpy $STARTUP_RUN_KEY "HKCU"
+  Goto +4
+  ClearErrors
+  ReadRegStr $STARTUP_RUN_KEY HKLM "${STARTUP_RUN_KEY}" $R7
+  IfErrors +2
+  StrCpy $STARTUP_RUN_KEY "HKLM"
+
+  StrCmp $R0 "HKLM" compare_hklm
+  StrCmp $R0 "HKCU" compare_hkcu done
+
+  compare_hkcu:
+      ReadRegStr $R1 HKCU $R4 ""
+      ReadRegStr $R2 HKCU $R4 "Version"
+      ReadRegStr $R3 HKCU "$R5" "UninstallString"
+      Goto try_uninstall
+
+  compare_hklm:
+      ReadRegStr $R1 HKLM $R4 ""
+      ReadRegStr $R2 HKLM $R4 "Version"
+      ReadRegStr $R3 HKLM "$R5" "UninstallString"
+
+  ; If previous version exists .. remove
+  try_uninstall:
+    StrCmp $R1 "" done
+      ; Version key started with 0.60a3. Prior versions can't be
+      ; automaticlly uninstalled.
+      StrCmp $R2 "" uninstall_problem
+        ; Check if we have uninstall string..
+        IfFileExists $R3 0 uninstall_problem
+          ; Have uninstall string.. go ahead and uninstall.
+          SetOverwrite on
+          ; Need to copy uninstaller outside of the install dir
+          ClearErrors
+          CopyFiles /SILENT $R3 "$TEMP\$R6"
+          SetOverwrite off
+          IfErrors uninstall_problem
+            ; Ready to uninstall..
+            ClearErrors
+            ExecWait '"$TEMP\$R6" /S _?=$R1'
+            IfErrors exec_error
+              Delete "$TEMP\$R6"
+            Goto done
+
+            exec_error:
+              Delete "$TEMP\$R6"
+              Goto uninstall_problem
+
+        uninstall_problem:
+          ; If we couldn't uninstall Pidgin, try to uninstall Gaim
+          StrCmp $R4 ${PIDGIN_REG_KEY} cannot_uninstall
+          StrCpy $R4 ${OLD_GAIM_REG_KEY}
+          StrCpy $R5 ${OLD_GAIM_UNINSTALL_KEY}
+          StrCpy $R6 ${OLD_GAIM_UNINST_EXE}
+          StrCpy $R7 "Gaim"
+          Goto start_comparison
+
+          cannot_uninstall:
+          ; We can't uninstall.  Either the user must manually uninstall or we ignore and reinstall over it.
+          MessageBox MB_OKCANCEL $(PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL) /SD IDOK IDOK done
+          Quit
+  done:
+SectionEnd
+
+
+;--------------------------------
+;GTK+ Runtime Install Section
+
+!ifdef WITH_GTK
+Section $(GTK_SECTION_TITLE) SecGtk
+  SectionIn 1 RO
+
+  Call CheckUserInstallRights
+  Pop $R1
+
+  SetOutPath $TEMP
+  SetOverwrite on
+  File /oname=gtk-runtime.exe ${GTK_RUNTIME_INSTALLER}
+  SetOverwrite off
+
+  Call DoWeNeedGtk
+  Pop $R0
+  Pop $R6
+
+  StrCmp $R0 "0" have_gtk
+  StrCmp $R0 "1" upgrade_gtk
+  StrCmp $R0 "2" upgrade_gtk
+  StrCmp $R0 "3" no_gtk no_gtk
+
+  no_gtk:
+    StrCmp $R1 "NONE" gtk_no_install_rights
+    ClearErrors
+    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
+    IfErrors gtk_install_error done
+
+  upgrade_gtk:
+    StrCpy $GTK_FOLDER $R6
+    StrCmp $R0 "2" +2 ; Upgrade isn't optional
+    MessageBox MB_YESNO $(GTK_UPGRADE_PROMPT) /SD IDYES IDNO done
+    ClearErrors
+    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE /S /D=$GTK_FOLDER'
+    IfErrors gtk_install_error done
+
+    gtk_install_error:
+      Delete "$TEMP\gtk-runtime.exe"
+      MessageBox MB_OK $(GTK_INSTALL_ERROR) /SD IDOK
+      Quit
+
+  have_gtk:
+    StrCpy $GTK_FOLDER $R6
+    StrCmp $R1 "NONE" done ; If we have no rights.. can't re-install..
+    ; Even if we have a sufficient version of GTK+, we give user choice to re-install.
+    ClearErrors
+    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT'
+    IfErrors gtk_install_error
+    Goto done
+
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  ; end got_install rights
+
+  gtk_no_install_rights:
+    ; Install GTK+ to Pidgin install dir
+    StrCpy $GTK_FOLDER $INSTDIR
+    ClearErrors
+    ExecWait '"$TEMP\gtk-runtime.exe" /L=$LANGUAGE $ISSILENT /D=$GTK_FOLDER'
+    IfErrors gtk_install_error
+      SetOverwrite on
+      ClearErrors
+      CopyFiles /FILESONLY "$GTK_FOLDER\bin\*.dll" $GTK_FOLDER
+      SetOverwrite off
+      IfErrors gtk_install_error
+        Delete "$GTK_FOLDER\bin\*.dll"
+        Goto done
+  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+  ; end gtk_no_install_rights
+
+  done:
+    Delete "$TEMP\gtk-runtime.exe"
+SectionEnd ; end of GTK+ section
+!endif
+
+;--------------------------------
+;Pidgin Install Section
+
+Section $(PIDGIN_SECTION_TITLE) SecPidgin
+  SectionIn 1 RO
+
+  ; Check install rights..
+  Call CheckUserInstallRights
+  Pop $R0
+
+  ; Get GTK+ lib dir if we have it..
+
+  StrCmp $R0 "NONE" pidgin_none
+  StrCmp $R0 "HKLM" pidgin_hklm pidgin_hkcu
+
+  pidgin_hklm:
+    ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path"
+    WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "" "$INSTDIR\pidgin.exe"
+    WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R1\bin"
+    WriteRegStr HKLM ${PIDGIN_REG_KEY} "" "$INSTDIR"
+    WriteRegStr HKLM ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
+    WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "DisplayName" $(PIDGIN_UNINSTALL_DESC)
+    WriteRegStr HKLM "${PIDGIN_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${PIDGIN_UNINST_EXE}"
+    ; Sets scope of the desktop and Start Menu entries for all users.
+    SetShellVarContext "all"
+    Goto pidgin_install_files
+
+  pidgin_hkcu:
+    ReadRegStr $R1 HKCU ${GTK_REG_KEY} "Path"
+    StrCmp $R1 "" 0 +2
+      ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path"
+
+    WriteRegStr HKCU ${PIDGIN_REG_KEY} "" "$INSTDIR"
+    WriteRegStr HKCU ${PIDGIN_REG_KEY} "Version" "${PIDGIN_VERSION}"
+    WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "DisplayName" $(PIDGIN_UNINSTALL_DESC)
+    WriteRegStr HKCU "${PIDGIN_UNINSTALL_KEY}" "UninstallString" "$INSTDIR\${PIDGIN_UNINST_EXE}"
+    Goto pidgin_install_files
+
+  pidgin_none:
+    ReadRegStr $R1 HKLM ${GTK_REG_KEY} "Path"
+
+  pidgin_install_files:
+    SetOutPath "$INSTDIR"
+    ; Pidgin files
+    SetOverwrite on
+    File /r ..\..\..\${PIDGIN_INSTALL_DIR}\*.*
+    !ifdef DEBUG
+    File "${PIDGIN_INSTALLER_DEPS}\exchndl.dll"
+    !endif
+
+    ; Install shfolder.dll if need be..
+    SearchPath $R4 "shfolder.dll"
+    StrCmp $R4 "" 0 got_shfolder
+      SetOutPath "$SYSDIR"
+      File "${PIDGIN_INSTALLER_DEPS}\shfolder.dll"
+      SetOutPath "$INSTDIR"
+    got_shfolder:
+
+    ; Check if Perl is installed, if so add it to the AppPaths
+    ReadRegStr $R2 HKLM ${PERL_REG_KEY} ""
+    StrCmp $R2 "" 0 perl_exists
+      ReadRegStr $R2 HKCU ${PERL_REG_KEY} ""
+      StrCmp $R2 "" perl_done perl_exists
+
+      perl_exists:
+        IfFileExists "$R2\bin\${PERL_DLL}" 0 perl_done
+        StrCmp $R0 "HKLM" 0 perl_done
+          ReadRegStr $R3 HKLM "${HKLM_APP_PATHS_KEY}" "Path"
+          WriteRegStr HKLM "${HKLM_APP_PATHS_KEY}" "Path" "$R3;$R2\bin"
+
+    perl_done:
+
+    ; If this is under NT4, delete the SILC support stuff
+    ; there is a bug that will prevent any account from connecting
+    ; See https://lists.silcnet.org/pipermail/silc-devel/2005-January/001588.html
+    Call GetWindowsVersion
+    Pop $R2
+    StrCmp $R2 "NT 4.0" +1 +4
+    Delete "$INSTDIR\plugins\libsilc.dll"
+    Delete "$INSTDIR\silcclient.dll"
+    Delete "$INSTDIR\silc.dll"
+
+    SetOutPath "$INSTDIR"
+
+    ; If we don't have install rights.. we're done
+    StrCmp $R0 "NONE" done
+    SetOverwrite off
+
+    ; write out uninstaller
+    SetOverwrite on
+    WriteUninstaller "$INSTDIR\${PIDGIN_UNINST_EXE}"
+    SetOverwrite off
+
+    ; If we previously had pidgin set up to run on startup, make it do so again
+    StrCmp $STARTUP_RUN_KEY "HKCU" +1 +2
+    WriteRegStr HKCU "${STARTUP_RUN_KEY}" "Pidgin" "$INSTDIR\pidgin.exe"
+    StrCmp $STARTUP_RUN_KEY "HKLM" +1 +2
+    WriteRegStr HKLM "${STARTUP_RUN_KEY}" "Pidgin" "$INSTDIR\pidgin.exe"
+
+  done:
+SectionEnd ; end of default Pidgin section
+
+;--------------------------------
+;Shortcuts
+
+SectionGroup /e $(PIDGIN_SHORTCUTS_SECTION_TITLE) SecShortcuts
+  Section /o $(PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE) SecDesktopShortcut
+    SetOverwrite on
+    CreateShortCut "$DESKTOP\Pidgin.lnk" "$INSTDIR\pidgin.exe"
+    SetOverwrite off
+  SectionEnd
+  Section $(PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE) SecStartMenuShortcut
+    SetOverwrite on
+    CreateDirectory "$SMPROGRAMS\Pidgin"
+    CreateShortCut "$SMPROGRAMS\Pidgin\Pidgin.lnk" "$INSTDIR\pidgin.exe"
+    SetOverwrite off
+  SectionEnd
+SectionGroupEnd
+
+;--------------------------------
+;GTK+ Themes
+
+SectionGroup /e $(GTK_THEMES_SECTION_TITLE) SecGtkThemes
+  Section /o $(GTK_NOTHEME_SECTION_TITLE) SecGtkNone
+    Push "Raleigh"
+    Call WriteGtkThemeConfig
+  SectionEnd
+
+  Section $(GTK_WIMP_SECTION_TITLE) SecGtkWimp
+    Push "MS-Windows"
+    Call WriteGtkThemeConfig
+  SectionEnd
+
+  Section /o $(GTK_BLUECURVE_SECTION_TITLE) SecGtkBluecurve
+    Push "Bluecurve"
+    Call WriteGtkThemeConfig
+  SectionEnd
+
+  Section /o $(GTK_LIGHTHOUSEBLUE_SECTION_TITLE) SecGtkLighthouseblue
+    Push "Lighthouseblue"
+    Call WriteGtkThemeConfig
+  SectionEnd
+SectionGroupEnd
+
+;--------------------------------
+;Spell Checking
+
+SectionGroup /e $(PIDGIN_SPELLCHECK_SECTION_TITLE) SecSpellCheck
+  Section /o $(PIDGIN_SPELLCHECK_BRETON) SecSpellCheckBreton
+    Push ${SecSpellCheckBreton}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_CATALAN) SecSpellCheckCatalan
+    Push ${SecSpellCheckCatalan}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_CZECH) SecSpellCheckCzech
+    Push ${SecSpellCheckCzech}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_WELSH) SecSpellCheckWelsh
+    Push ${SecSpellCheckWelsh}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_DANISH) SecSpellCheckDanish
+    Push ${SecSpellCheckDanish}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_GERMAN) SecSpellCheckGerman
+    Push ${SecSpellCheckGerman}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_GREEK) SecSpellCheckGreek
+    Push ${SecSpellCheckGreek}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_ENGLISH) SecSpellCheckEnglish
+    Push ${SecSpellCheckEnglish}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_ESPERANTO) SecSpellCheckEsperanto
+    Push ${SecSpellCheckEsperanto}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_SPANISH) SecSpellCheckSpanish
+    Push ${SecSpellCheckSpanish}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_FAROESE) SecSpellCheckFaroese
+    Push ${SecSpellCheckFaroese}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_FRENCH) SecSpellCheckFrench
+    Push ${SecSpellCheckFrench}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_ITALIAN) SecSpellCheckItalian
+    Push ${SecSpellCheckItalian}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_DUTCH) SecSpellCheckDutch
+    Push ${SecSpellCheckDutch}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_NORWEGIAN) SecSpellCheckNorwegian
+    Push ${SecSpellCheckNorwegian}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_POLISH) SecSpellCheckPolish
+    Push ${SecSpellCheckPolish}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_PORTUGUESE) SecSpellCheckPortuguese
+    Push ${SecSpellCheckPortuguese}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_ROMANIAN) SecSpellCheckRomanian
+    Push ${SecSpellCheckRomanian}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_RUSSIAN) SecSpellCheckRussian
+    Push ${SecSpellCheckRussian}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_SLOVAK) SecSpellCheckSlovak
+    Push ${SecSpellCheckSlovak}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_SWEDISH) SecSpellCheckSwedish
+    Push ${SecSpellCheckSwedish}
+    Call InstallAspellAndDict
+  SectionEnd
+  Section /o $(PIDGIN_SPELLCHECK_UKRAINIAN) SecSpellCheckUkrainian
+    Push ${SecSpellCheckUkrainian}
+    Call InstallAspellAndDict
+  SectionEnd
+SectionGroupEnd
+
+;--------------------------------
+;Uninstaller Section
+
+
+Section Uninstall
+  Call un.CheckUserInstallRights
+  Pop $R0
+  StrCmp $R0 "NONE" no_rights
+  StrCmp $R0 "HKCU" try_hkcu try_hklm
+
+  try_hkcu:
+    ReadRegStr $R0 HKCU ${PIDGIN_REG_KEY} ""
+    StrCmp $R0 $INSTDIR 0 cant_uninstall
+      ; HKCU install path matches our INSTDIR.. so uninstall
+      DeleteRegKey HKCU ${PIDGIN_REG_KEY}
+      DeleteRegKey HKCU "${PIDGIN_UNINSTALL_KEY}"
+      Goto cont_uninstall
+
+  try_hklm:
+    ReadRegStr $R0 HKLM ${PIDGIN_REG_KEY} ""
+    StrCmp $R0 $INSTDIR 0 try_hkcu
+      ; HKLM install path matches our INSTDIR.. so uninstall
+      DeleteRegKey HKLM ${PIDGIN_REG_KEY}
+      DeleteRegKey HKLM "${PIDGIN_UNINSTALL_KEY}"
+      DeleteRegKey HKLM "${HKLM_APP_PATHS_KEY}"
+      ; Sets start menu and desktop scope to all users..
+      SetShellVarContext "all"
+
+  cont_uninstall:
+    ; The WinPrefs plugin may have left this behind..
+    DeleteRegValue HKCU "${STARTUP_RUN_KEY}" "Pidgin"
+    DeleteRegValue HKLM "${STARTUP_RUN_KEY}" "Pidgin"
+    ; Remove Language preference info (TODO: check if NSIS removes this)
+
+    RMDir /r "$INSTDIR\locale"
+    RMDir /r "$INSTDIR\pixmaps"
+    RMDir /r "$INSTDIR\perlmod"
+    Delete "$INSTDIR\plugins\autoaccept.dll"
+    Delete "$INSTDIR\plugins\autoreply.dll"
+    Delete "$INSTDIR\plugins\buddynote.dll"
+    Delete "$INSTDIR\plugins\convcolors.dll"
+    Delete "$INSTDIR\plugins\extplacement.dll"
+    Delete "$INSTDIR\plugins\gaimrc.dll"
+    Delete "$INSTDIR\plugins\history.dll"
+    Delete "$INSTDIR\plugins\iconaway.dll"
+    Delete "$INSTDIR\plugins\idle.dll"
+    Delete "$INSTDIR\plugins\libaim.dll"
+    Delete "$INSTDIR\plugins\libgg.dll"
+    Delete "$INSTDIR\plugins\libicq.dll"
+    Delete "$INSTDIR\plugins\libirc.dll"
+    Delete "$INSTDIR\plugins\libjabber.dll"
+    Delete "$INSTDIR\plugins\libmsn.dll"
+    Delete "$INSTDIR\plugins\libnapster.dll"
+    Delete "$INSTDIR\plugins\libnovell.dll"
+    Delete "$INSTDIR\plugins\libqq.dll"
+    Delete "$INSTDIR\plugins\libsametime.dll"
+    Delete "$INSTDIR\plugins\libsilc.dll"
+    Delete "$INSTDIR\plugins\libsimple.dll"
+    Delete "$INSTDIR\plugins\libtoc.dll"
+    Delete "$INSTDIR\plugins\libyahoo.dll"
+    Delete "$INSTDIR\plugins\log_reader.dll"
+    Delete "$INSTDIR\plugins\markerline.dll"
+    Delete "$INSTDIR\plugins\newline.dll"
+    Delete "$INSTDIR\plugins\notify.dll"
+    Delete "$INSTDIR\plugins\offlinemsg.dll"
+    Delete "$INSTDIR\plugins\perl.dll"
+    Delete "$INSTDIR\plugins\psychic.dll"
+    Delete "$INSTDIR\plugins\relnot.dll"
+    Delete "$INSTDIR\plugins\spellchk.dll"
+    Delete "$INSTDIR\plugins\ssl-nss.dll"
+    Delete "$INSTDIR\plugins\ssl.dll"
+    Delete "$INSTDIR\plugins\statenotify.dll"
+    Delete "$INSTDIR\plugins\tcl.dll"
+    Delete "$INSTDIR\plugins\ticker.dll"
+    Delete "$INSTDIR\plugins\timestamp.dll"
+    Delete "$INSTDIR\plugins\timestamp_format.dll"
+    Delete "$INSTDIR\plugins\win2ktrans.dll"
+    Delete "$INSTDIR\plugins\winprefs.dll"
+    RMDir "$INSTDIR\plugins"
+    Delete "$INSTDIR\sounds\gaim\alert.wav"
+    Delete "$INSTDIR\sounds\gaim\login.wav"
+    Delete "$INSTDIR\sounds\gaim\logout.wav"
+    Delete "$INSTDIR\sounds\gaim\receive.wav"
+    Delete "$INSTDIR\sounds\gaim\send.wav"
+    RMDir "$INSTDIR\sounds\gaim"
+    RMDir "$INSTDIR\sounds"
+    Delete "$INSTDIR\freebl3.dll"
+    Delete "$INSTDIR\idletrack.dll"
+    Delete "$INSTDIR\libgtkspell.dll"
+    Delete "$INSTDIR\liboscar.dll"
+    Delete "$INSTDIR\libpurple.dll"
+    Delete "$INSTDIR\libmeanwhile-1.dll"
+    Delete "$INSTDIR\libxml2.dll"
+    Delete "$INSTDIR\nspr4.dll"
+    Delete "$INSTDIR\nss3.dll"
+    Delete "$INSTDIR\nssckbi.dll"
+    Delete "$INSTDIR\pidgin.exe"
+    Delete "$INSTDIR\pidgin.dll"
+    Delete "$INSTDIR\plc4.dll"
+    Delete "$INSTDIR\plds4.dll"
+    Delete "$INSTDIR\silc.dll"
+    Delete "$INSTDIR\silcclient.dll"
+    Delete "$INSTDIR\softokn3.dll"
+    Delete "$INSTDIR\ssl3.dll"
+    Delete "$INSTDIR\${PIDGIN_UNINST_EXE}"
+    !ifdef DEBUG
+    Delete "$INSTDIR\exchndl.dll"
+    !endif
+    Delete "$INSTDIR\install.log"
+
+    ;Try to remove Pidgin install dir .. if empty
+    RMDir "$INSTDIR"
+
+    ; Shortcuts..
+    RMDir /r "$SMPROGRAMS\Pidgin"
+    Delete "$DESKTOP\Pidgin.lnk"
+
+    Goto done
+
+  cant_uninstall:
+    MessageBox MB_OK $(un.PIDGIN_UNINSTALL_ERROR_1) /SD IDOK
+    Quit
+
+  no_rights:
+    MessageBox MB_OK $(un.PIDGIN_UNINSTALL_ERROR_2) /SD IDOK
+    Quit
+
+  done:
+SectionEnd ; end of uninstall section
+
+;--------------------------------
+;Descriptions
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecPidgin} \
+        $(PIDGIN_SECTION_DESCRIPTION)
+!ifdef WITH_GTK
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtk} \
+        $(GTK_SECTION_DESCRIPTION)
+!endif
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkThemes} \
+        $(GTK_THEMES_SECTION_DESCRIPTION)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkNone} \
+        $(GTK_NO_THEME_DESC)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkWimp} \
+        $(GTK_WIMP_THEME_DESC)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkBluecurve} \
+        $(GTK_BLUECURVE_THEME_DESC)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecGtkLighthouseblue} \
+        $(GTK_LIGHTHOUSEBLUE_THEME_DESC)
+
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} \
+        $(PIDGIN_SHORTCUTS_SECTION_DESCRIPTION)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecDesktopShortcut} \
+        $(PIDGIN_DESKTOP_SHORTCUT_DESC)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecStartMenuShortcut} \
+        $(PIDGIN_STARTMENU_SHORTCUT_DESC)
+
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheck} \
+        $(PIDGIN_SPELLCHECK_SECTION_DESCRIPTION)
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckBreton} \
+        "$(PIDGIN_SPELLCHECK_BRETON) (862kb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckCatalan} \
+        "$(PIDGIN_SPELLCHECK_CATALAN) (3.9Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckCzech} \
+        "$(PIDGIN_SPELLCHECK_CZECH) (17Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckWelsh} \
+        "$(PIDGIN_SPELLCHECK_WELSH) (4.2Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckDanish} \
+        "$(PIDGIN_SPELLCHECK_DANISH) (6.9Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckGerman} \
+        "$(PIDGIN_SPELLCHECK_GERMAN) (5.4Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckGreek} \
+        "$(PIDGIN_SPELLCHECK_GREEK) (7.1Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckEnglish} \
+        "$(PIDGIN_SPELLCHECK_ENGLISH) (2.3Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckEsperanto} \
+        "$(PIDGIN_SPELLCHECK_ESPERANTO) (5.7Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSpanish} \
+        "$(PIDGIN_SPELLCHECK_SPANISH) (7.0Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckFaroese} \
+        "$(PIDGIN_SPELLCHECK_FAROESE) (913kb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckFrench} \
+        "$(PIDGIN_SPELLCHECK_FRENCH) (9.3Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckItalian} \
+        "$(PIDGIN_SPELLCHECK_ITALIAN) (770kb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckDutch} \
+        "$(PIDGIN_SPELLCHECK_DUTCH) (3.7Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckNorwegian} \
+        "$(PIDGIN_SPELLCHECK_NORWEGIAN) (3.2Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckPolish} \
+        "$(PIDGIN_SPELLCHECK_POLISH) (9.3Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckPortuguese} \
+        "$(PIDGIN_SPELLCHECK_PORTUGUESE) (5.5Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckRomanian} \
+        "$(PIDGIN_SPELLCHECK_ROMANIAN) (906kb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckRussian} \
+        "$(PIDGIN_SPELLCHECK_RUSSIAN) (11Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSlovak} \
+        "$(PIDGIN_SPELLCHECK_SLOVAK) (8.0Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckSwedish} \
+        "$(PIDGIN_SPELLCHECK_SWEDISH) (2.2Mb)"
+  !insertmacro MUI_DESCRIPTION_TEXT ${SecSpellCheckUkrainian} \
+        "$(PIDGIN_SPELLCHECK_UKRAINIAN) (12Mb)"
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+;--------------------------------
+;Functions
+
+Function WriteGtkThemeConfig
+  Exch $0
+  Push $1
+  Push $2
+  Push $3
+
+  Call CheckUserInstallRights
+  Pop $2
+  StrCmp $2 "HKLM" 0 user_theme
+
+  ; Global Theme
+  ClearErrors
+  ReadRegStr $2 HKLM ${GTK_REG_KEY} "Path"
+  IfErrors user_theme
+  StrCpy $3 "$2\etc\gtk-2.0\gtkrc"
+  Goto update_theme
+  user_theme:
+  StrCpy $3 "$PROFILE\.gtkrc-2.0"
+
+  update_theme:
+  IfFileExists $3 0 new_file
+  ${ConfigWriteS} $3 "gtk-theme-name =" " $\"$0$\"" $1
+  Goto done
+
+  new_file:
+  FileOpen $1 $3 w
+  FileWrite $1 "gtk-theme-name = $\"$0$\""
+  FileClose $1
+
+  done:
+  Pop $3
+  Pop $2
+  Pop $1
+  Pop $0
+FunctionEnd
+
+!macro CheckUserInstallRightsMacro UN
+Function ${UN}CheckUserInstallRights
+  Push $0
+  Push $1
+  ClearErrors
+  UserInfo::GetName
+  IfErrors Win9x
+  Pop $0
+  UserInfo::GetAccountType
+  Pop $1
+
+  StrCmp $1 "Admin" 0 +3
+    StrCpy $1 "HKLM"
+    Goto done
+  StrCmp $1 "Power" 0 +3
+    StrCpy $1 "HKLM"
+    Goto done
+  StrCmp $1 "User" 0 +3
+    StrCpy $1 "HKCU"
+    Goto done
+  StrCmp $1 "Guest" 0 +3
+    StrCpy $1 "NONE"
+    Goto done
+  ; Unknown error
+  StrCpy $1 "NONE"
+  Goto done
+
+  Win9x:
+    StrCpy $1 "HKLM"
+
+  done:
+    Exch $1
+    Exch
+    Pop $0
+FunctionEnd
+!macroend
+!insertmacro CheckUserInstallRightsMacro ""
+!insertmacro CheckUserInstallRightsMacro "un."
+
+;
+; Usage:
+;   Push $0 ; Path string
+;   Call VerifyDir
+;   Pop $0 ; 0 - Bad path  1 - Good path
+;
+Function VerifyDir
+  Exch $0
+  Push $1
+  Push $2
+  Loop:
+    IfFileExists $0 dir_exists
+    StrCpy $1 $0 ; save last
+    ${GetParent} $0 $0
+    StrLen $2 $0
+    ; IfFileExists "C:" on xp returns true and on win2k returns false
+    ; So we're done in such a case..
+    IntCmp $2 2 loop_done
+    ; GetParent of "C:" returns ""
+    IntCmp $2 0 loop_done
+    Goto Loop
+
+  loop_done:
+    StrCpy $1 "$0\GaImFooB"
+    ; Check if we can create dir on this drive..
+    ClearErrors
+    CreateDirectory $1
+    IfErrors DirBad DirGood
+
+  dir_exists:
+    ClearErrors
+    FileOpen $1 "$0\pidginfoo.bar" w
+    IfErrors PathBad PathGood
+
+    DirGood:
+      RMDir $1
+      Goto PathGood1
+
+    DirBad:
+      RMDir $1
+      Goto PathBad1
+
+    PathBad:
+      FileClose $1
+      Delete "$0\pidginfoo.bar"
+      PathBad1:
+      StrCpy $0 "0"
+      Push $0
+      Goto done
+
+    PathGood:
+      FileClose $1
+      Delete "$0\pidginfoo.bar"
+      PathGood1:
+      StrCpy $0 "1"
+      Push $0
+
+  done:
+  Exch 3 ; The top of the stack contains the output variable
+  Pop $0
+  Pop $2
+  Pop $1
+FunctionEnd
+
+Function .onVerifyInstDir
+  Push $0
+  Push $INSTDIR
+  Call VerifyDir
+  Pop $0
+  StrCmp $0 "0" 0 dir_good
+  Pop $0
+  Abort
+
+  dir_good:
+  Pop $0
+FunctionEnd
+
+;
+; Usage:
+; Call DoWeNeedGtk
+; First Pop:
+;   0 - We have the correct version
+;       Second Pop: Key where Version was found
+;   1 - We have an old version that should work, prompt user for optional upgrade
+;       Second Pop: HKLM or HKCU depending on where GTK was found.
+;   2 - We have an old version that needs to be upgraded
+;       Second Pop: HKLM or HKCU depending on where GTK was found.
+;   3 - We don't have Gtk+ at all
+;       Second Pop: "NONE, HKLM or HKCU" depending on our rights..
+;
+Function DoWeNeedGtk
+  ; Logic should be:
+  ; - Check what user rights we have (HKLM or HKCU)
+  ;   - If HKLM rights..
+  ;     - Only check HKLM key for GTK+
+  ;       - If installed to HKLM, check it and return.
+  ;   - If HKCU rights..
+  ;     - First check HKCU key for GTK+
+  ;       - if good or bad exists stop and ret.
+  ;     - If no hkcu gtk+ install, check HKLM
+  ;       - If HKLM ver exists but old, return as if no ver exits.
+  ;   - If no rights
+  ;     - Check HKLM
+  Push $0
+  Push $1
+  Push $2
+  Push $3
+
+  Call CheckUserInstallRights
+  Pop $1
+  StrCmp $1 "HKLM" check_hklm
+  StrCmp $1 "HKCU" check_hkcu check_hklm
+    check_hkcu:
+      ReadRegStr $0 HKCU ${GTK_REG_KEY} "Version"
+      StrCpy $2 "HKCU"
+      StrCmp $0 "" check_hklm have_gtk
+
+    check_hklm:
+      ReadRegStr $0 HKLM ${GTK_REG_KEY} "Version"
+      StrCpy $2 "HKLM"
+      StrCmp $0 "" no_gtk have_gtk
+
+  have_gtk:
+    ; GTK+ is already installed.. check version.
+    ${VersionCompare} ${GTK_INSTALL_VERSION} $0 $3
+    IntCmp $3 1 +1 good_version good_version
+    ${VersionCompare} ${GTK_MIN_VERSION} $0 $3
+
+      ; Bad version. If hklm ver and we have hkcu or no rights.. return no gtk
+      StrCmp $1 "NONE" no_gtk ; if no rights.. can't upgrade
+      StrCmp $1 "HKCU" 0 +2   ; if HKLM can upgrade..
+      StrCmp $2 "HKLM" no_gtk ; have hkcu rights.. if found hklm ver can't upgrade..
+      Push $2
+    IntCmp $3 1 +3
+      Push "1" ; Optional Upgrade
+      Goto done
+      Push "2" ; Mandatory Upgrade
+      Goto done
+
+  good_version:
+    StrCmp $2 "HKLM" have_hklm_gtk have_hkcu_gtk
+      have_hkcu_gtk:
+        ; Have HKCU version
+        ReadRegStr $0 HKCU ${GTK_REG_KEY} "Path"
+        Goto good_version_cont
+
+      have_hklm_gtk:
+        ReadRegStr $0 HKLM ${GTK_REG_KEY} "Path"
+        Goto good_version_cont
+
+    good_version_cont:
+      Push $0  ; The path to existing GTK+
+      Push "0"
+      Goto done
+
+  no_gtk:
+    Push $1 ; our rights
+    Push "3"
+    Goto done
+
+  done:
+  ; The top two items on the stack are what we want to return
+  Exch 4 
+  Pop $0
+  Exch 4
+  Pop $3
+  Pop $2
+  Pop $1
+FunctionEnd
+
+
+!macro RunCheckMacro UN
+Function ${UN}RunCheck
+  Push $R0
+  System::Call 'kernel32::OpenMutex(i 2031617, b 0, t "pidgin_is_running") i .R0'
+  IntCmp $R0 0 done
+    MessageBox MB_OK|MB_ICONEXCLAMATION $(PIDGIN_IS_RUNNING) /SD IDOK
+    Abort
+  done:
+  Pop $R0
+FunctionEnd
+!macroend
+!insertmacro RunCheckMacro ""
+!insertmacro RunCheckMacro "un."
+
+Function .onInit
+  Push $R0
+  System::Call 'kernel32::CreateMutexA(i 0, i 0, t "pidgin_installer_running") i .r1 ?e'
+  Pop $R0
+  StrCmp $R0 0 +3
+    MessageBox MB_OK|MB_ICONEXCLAMATION $(INSTALLER_IS_RUNNING) /SD IDOK
+    Abort
+  Call RunCheck
+  StrCpy $name "Pidgin ${PIDGIN_VERSION}"
+  StrCpy $GTK_THEME_SEL ${SecGtkWimp}
+  StrCpy $SPELLCHECK_SEL ""
+
+  ;Try to copy the old Gaim installer Lang Reg. key
+  ClearErrors
+  ReadRegStr $R0 HKCU "${PIDGIN_REG_KEY}" "Installer Language"
+  IfErrors 0 +5
+  ClearErrors
+  ReadRegStr $R0 HKCU "SOFTWARE\gaim" "Installer Language"
+  IfErrors +2
+  WriteRegStr HKCU "${PIDGIN_REG_KEY}" "Installer Language" "$R0"
+
+  !insertmacro SetSectionFlag ${SecGtkThemes} ${SF_RO}
+  !insertmacro UnselectSection ${SecGtkThemes}
+  !insertmacro SelectSection $GTK_THEME_SEL
+  !insertmacro SetSectionFlag ${SecSpellCheck} ${SF_RO}
+  !insertmacro UnselectSection ${SecSpellCheck}
+
+  ;Mark the dictionaries that are already installed as readonly
+  Call SelectAndDisableInstalledDictionaries
+
+  StrCpy $ISSILENT "/NOUI"
+
+  ; GTK installer has two silent states.. one with Message boxes, one without
+  ; If pidgin installer was run silently, we want to supress gtk installer msg boxes.
+  IfSilent 0 set_gtk_normal
+      StrCpy $ISSILENT "/S"
+  set_gtk_normal:
+
+  ${GetParameters} $R0
+  ClearErrors
+  ${GetOptions} $R0 "/L=" $R0
+  IfErrors +3
+  StrCpy $LANGUAGE $R0
+  Goto skip_lang
+
+  ; Select Language
+    ; Display Language selection dialog
+    !insertmacro MUI_LANGDLL_DISPLAY
+    skip_lang:
+
+  ; If install path was set on the command, use it.
+  StrCmp $INSTDIR "" 0 instdir_done
+
+  ;  If pidgin or gaim is currently installed, we should default to where it is currently installed
+  ClearErrors
+  ReadRegStr $INSTDIR HKCU "${PIDGIN_REG_KEY}" ""
+  IfErrors +2
+  StrCmp $INSTDIR "" 0 instdir_done
+  ClearErrors
+  ReadRegStr $INSTDIR HKLM "${PIDGIN_REG_KEY}" ""
+  IfErrors +2
+  StrCmp $INSTDIR "" 0 instdir_done
+  ClearErrors
+  ReadRegStr $INSTDIR HKCU "${OLD_GAIM_REG_KEY}" ""
+  IfErrors +2
+  StrCmp $INSTDIR "" 0 instdir_done
+  ClearErrors
+  ReadRegStr $INSTDIR HKLM "${OLD_GAIM_REG_KEY}" ""
+  IfErrors +2
+  StrCmp $INSTDIR "" 0 instdir_done
+
+  Call CheckUserInstallRights
+  Pop $R0
+
+  StrCmp $R0 "HKLM" 0 user_dir
+    StrCpy $INSTDIR "$PROGRAMFILES\Pidgin"
+    Goto instdir_done
+  user_dir:
+    Push $SMPROGRAMS
+    ${GetParent} $SMPROGRAMS $R2
+    ${GetParent} $R2 $R2
+    StrCpy $INSTDIR "$R2\Pidgin"
+
+  instdir_done:
+  Pop $R0
+FunctionEnd
+
+Function un.onInit
+  Call un.RunCheck
+  StrCpy $name "Pidgin ${PIDGIN_VERSION}"
+
+  ; Get stored language preference
+  !insertmacro MUI_UNGETLANGUAGE
+
+FunctionEnd
+
+; This is a modified StartRadioButtons (from Sections.nsh)
+; The only difference is that it allows for nothing in the group to be selected
+; In that case, the default variable should be set to ""
+!macro StartRadioButtonsUnselectable var
+
+  !define StartRadioButtons_Var "${var}"
+
+  Push $R0
+  Push $R1
+
+   ;If we have no selection, don't try to unselect it
+   StrCmp "${StartRadioButtons_Var}" "" +4
+   SectionGetFlags "${StartRadioButtons_Var}" $R0
+   IntOp $R1 $R0 & ${SF_SELECTED}
+   IntOp $R0 $R0 & ${SECTION_OFF}
+   SectionSetFlags "${StartRadioButtons_Var}" $R0
+
+   ; If the previous value isn't currently selected,
+   ; we don't want to select it at the end
+   IntCmp $R1 ${SF_SELECTED} +2
+   StrCpy "${StartRadioButtons_Var}" ""
+
+   StrCpy $R1 "${StartRadioButtons_Var}"
+
+!macroend
+
+Function .onSelChange
+  Push $0
+  Push $1
+  Push $2
+
+  !insertmacro StartRadioButtonsUnselectable $GTK_THEME_SEL
+    !insertmacro RadioButton ${SecGtkNone}
+    !insertmacro RadioButton ${SecGtkWimp}
+    !insertmacro RadioButton ${SecGtkBluecurve}
+    !insertmacro RadioButton ${SecGtkLighthouseblue}
+  !insertmacro EndRadioButtons
+
+  ; Check that at most one of the non-readonly spelling dictionaries are selected
+  ; We can't use $R0 or $R1 in this block since they're used in the macros
+  !insertmacro StartRadioButtonsUnselectable $SPELLCHECK_SEL
+    ; Start with the first language dictionary
+    IntOp $2 ${SecSpellCheck} + 1
+
+    start_spellcheck_radio:
+    SectionGetFlags $2 $0
+
+    IntOp $1 $0 & ${SF_SECGRPEND}
+    ; If it is the end of the section group, stop
+    IntCmp $1 ${SF_SECGRPEND} end_spellcheck_radio
+
+    IntOp $0 $0 & ${SF_RO}
+    IntCmp $0 ${SF_RO} after_button_insert
+    ; If !readonly, then it is part of the radiobutton group
+    !insertmacro RadioButton $2
+    after_button_insert:
+
+    IntOp $2 $2 + 1 ;Advance to the next section
+    Goto start_spellcheck_radio
+
+    end_spellcheck_radio:
+  !insertmacro EndRadioButtons
+
+  Pop $2
+  Pop $1
+  Pop $0
+FunctionEnd
+
+; Page enter and exit functions..
+
+Function preWelcomePage
+  Push R0
+
+!ifndef WITH_GTK
+  ; If this installer dosn't have GTK, check whether we need it.
+  ; We do this here an not in .onInit because language change in
+  ; .onInit doesn't take effect until it is finished.
+  Call DoWeNeedGtk
+  Pop $R0
+  Pop $GTK_FOLDER
+
+  IntCmp $R0 1 done done
+  MessageBox MB_OK $(GTK_INSTALLER_NEEDED) /SD IDOK
+  Quit
+
+  done:
+
+!else
+  Push R1
+
+  ; If on Win95/98/ME warn them that the GTK+ version wont work
+  Call GetWindowsVersion
+  Pop $R1
+  StrCmp $R1 "95" win_ver_bad
+  StrCmp $R1 "98" win_ver_bad
+  StrCmp $R1 "ME" win_ver_bad
+  Goto done
+
+  win_ver_bad:
+    !insertmacro UnselectSection ${SecGtk}
+    !insertmacro SetSectionFlag ${SecGtkNone} ${SF_RO}
+    !insertmacro UnselectSection ${SecGtkNone}
+    !insertmacro SetSectionFlag ${SecGtkWimp} ${SF_RO}
+    !insertmacro UnselectSection ${SecGtkWimp}
+    !insertmacro SetSectionFlag ${SecGtkBluecurve} ${SF_RO}
+    !insertmacro UnselectSection ${SecGtkBluecurve}
+    !insertmacro SetSectionFlag ${SecGtkLighthouseblue} ${SF_RO}
+    !insertmacro UnselectSection ${SecGtkLighthouseblue}
+    MessageBox MB_OK $(GTK_WINDOWS_INCOMPATIBLE) /SD IDOK
+    Call DoWeNeedGtk
+    Pop $R0
+    Pop $R1
+    IntCmp $R0 1 done done ; Upgrade isn't optional - abort if we don't have a suitable version
+    Quit
+
+  done:
+  Pop $R1
+!endif
+  Pop $R0
+FunctionEnd
+
+!ifdef WITH_GTK
+Function preGtkDirPage
+  Push $R0
+  Push $R1
+  Call DoWeNeedGtk
+  Pop $R0
+  Pop $R1
+
+  IntCmp $R0 2 +2 +2 no_gtk
+  StrCmp $R0 "3" no_gtk no_gtk
+
+  ; Don't show dir selector.. Upgrades are done to existing path..
+  Pop $R1
+  Pop $R0
+  Abort
+
+  no_gtk:
+    StrCmp $R1 "NONE" 0 no_gtk_cont
+      ; Got no install rights..
+      Pop $R1
+      Pop $R0
+      Abort
+    no_gtk_cont:
+      ; Suggest path..
+      StrCmp $R1 "HKCU" 0 hklm1
+        ${GetParent} $SMPROGRAMS $R0
+        ${GetParent} $R0 $R0
+        StrCpy $R0 "$R0\GTK\2.0"
+        Goto got_path
+      hklm1:
+        StrCpy $R0 "${GTK_DEFAULT_INSTALL_PATH}"
+
+   got_path:
+     StrCpy $name "GTK+ ${GTK_INSTALL_VERSION}"
+     StrCpy $GTK_FOLDER $R0
+     Pop $R1
+     Pop $R0
+FunctionEnd
+
+Function postGtkDirPage
+  Push $R0
+  StrCpy $name "Pidgin ${PIDGIN_VERSION}"
+  Push $GTK_FOLDER
+  Call VerifyDir
+  Pop $R0
+  StrCmp $R0 "0" 0 done
+    MessageBox MB_OK $(GTK_BAD_INSTALL_PATH) /SD IDOK
+    Pop $R0
+    Abort
+  done:
+  Pop $R0
+FunctionEnd
+!endif
+
+; GetWindowsVersion
+;
+; Based on Yazno's function, http://yazno.tripod.com/powerpimpit/
+; Updated by Joost Verburg
+;
+; Returns on top of stack
+;
+; Windows Version (95, 98, ME, NT x.x, 2000, XP, 2003, Vista)
+; or
+; '' (Unknown Windows Version)
+;
+; Usage:
+;   Call GetWindowsVersion
+;   Pop $R0
+;
+; at this point $R0 is "NT 4.0" or whatnot
+Function GetWindowsVersion
+
+  Push $R0
+  Push $R1
+
+  ClearErrors
+  ReadRegStr $R0 HKLM \
+  "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+
+  IfErrors 0 lbl_winnt
+
+  ; we are not NT
+  ReadRegStr $R0 HKLM \
+  "SOFTWARE\Microsoft\Windows\CurrentVersion" VersionNumber
+
+  StrCpy $R1 $R0 1
+  StrCmp $R1 '4' 0 lbl_error
+
+  StrCpy $R1 $R0 3
+
+  StrCmp $R1 '4.0' lbl_win32_95
+  StrCmp $R1 '4.9' lbl_win32_ME lbl_win32_98
+
+  lbl_win32_95:
+    StrCpy $R0 '95'
+  Goto lbl_done
+
+  lbl_win32_98:
+    StrCpy $R0 '98'
+  Goto lbl_done
+
+  lbl_win32_ME:
+    StrCpy $R0 'ME'
+  Goto lbl_done
+
+  lbl_winnt:
+    StrCpy $R1 $R0 1
+
+    StrCmp $R1 '3' lbl_winnt_x
+    StrCmp $R1 '4' lbl_winnt_x
+
+    StrCpy $R1 $R0 3
+
+    StrCmp $R1 '5.0' lbl_winnt_2000
+    StrCmp $R1 '5.1' lbl_winnt_XP
+    StrCmp $R1 '5.2' lbl_winnt_2003
+    StrCmp $R1 '6.0' lbl_winnt_vista lbl_error
+
+  lbl_winnt_x:
+    StrCpy $R0 "NT $R0" 6
+  Goto lbl_done
+
+  lbl_winnt_2000:
+    Strcpy $R0 '2000'
+  Goto lbl_done
+
+  lbl_winnt_XP:
+    Strcpy $R0 'XP'
+  Goto lbl_done
+
+  lbl_winnt_2003:
+    Strcpy $R0 '2003'
+  Goto lbl_done
+
+  lbl_winnt_vista:
+    Strcpy $R0 'Vista'
+  Goto lbl_done
+
+  lbl_error:
+    Strcpy $R0 ''
+  lbl_done:
+
+  Pop $R1
+  Exch $R0
+FunctionEnd
+
+; SpellChecker Related Functions
+;-------------------------------
+
+; Convert the a Section index to the language code
+; Push the section index onto the stack and pop off the language code after the call
+; This will set the error code, if no match is found
+Function GetLangCodeForSection
+  ClearErrors
+  Push $R0
+  Exch
+  Pop $R0 ;This is the section index
+
+  IntCmp $R0 ${SecSpellCheckBreton} 0 +3 +3
+  StrCpy $R0 "br"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckCatalan} 0 +3 +3
+  StrCpy $R0 "ca"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckCzech} 0 +3 +3
+  StrCpy $R0 "cs"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckWelsh} 0 +3 +3
+  StrCpy $R0 "cy"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckDanish} 0 +3 +3
+  StrCpy $R0 "da"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckGerman} 0 +3 +3
+  StrCpy $R0 "de"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckGreek} 0 +3 +3
+  StrCpy $R0 "el"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckEnglish} 0 +3 +3
+  StrCpy $R0 "en"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckEsperanto} 0 +3 +3
+  StrCpy $R0 "eo"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckSpanish} 0 +3 +3
+  StrCpy $R0 "es"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckFaroese} 0 +3 +3
+  StrCpy $R0 "fo"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckFrench} 0 +3 +3
+  StrCpy $R0 "fr"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckItalian} 0 +3 +3
+  StrCpy $R0 "it"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckDutch} 0 +3 +3
+  StrCpy $R0 "nl"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckNorwegian} 0 +3 +3
+  StrCpy $R0 "no"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckPolish} 0 +3 +3
+  StrCpy $R0 "pl"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckPortuguese} 0 +3 +3
+  StrCpy $R0 "pt"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckRomanian} 0 +3 +3
+  StrCpy $R0 "ro"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckRussian} 0 +3 +3
+  StrCpy $R0 "ru"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckSlovak} 0 +3 +3
+  StrCpy $R0 "sk"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckSwedish} 0 +3 +3
+  StrCpy $R0 "sv"
+  Goto done
+  IntCmp $R0 ${SecSpellCheckUkrainian} 0 +3 +3
+  StrCpy $R0 "uk"
+  Goto done
+
+  SetErrors
+
+  done:
+  Exch $R0
+FunctionEnd ;GetLangCodeForSection
+
+; Select and Disable any Sections that have currently installed dictionaries
+Function SelectAndDisableInstalledDictionaries
+  Push $R0
+  Push $R1
+  Push $R2
+
+  ; Start with the first language dictionary
+  IntOp $R0 ${SecSpellCheck} + 1
+
+  start:
+  ; If it is the end of the section group, stop
+  SectionGetFlags $R0 $R1
+  IntOp $R2 $R1 & ${SF_SECGRPEND}
+  IntCmp $R2 ${SF_SECGRPEND} done
+
+  Push $R0
+  Call GetLangCodeForSection
+  Pop $R2
+  IfErrors end_loop
+  ReadRegStr $R2 HKLM "${ASPELL_REG_KEY}-$R2" "" ; Check that the dictionary is installed
+  StrCmp $R2 "" end_loop ; If it isn't installed, skip to the next item
+  IntOp $R1 $R1 | ${SF_RO} ; Mark Readonly
+  IntOp $R1 $R1 | ${SF_SELECTED} ; Select
+  SectionSetFlags $R0 $R1
+
+  end_loop:
+  IntOp $R0 $R0 + 1 ;Advance to the next section
+  Goto start
+
+  done:
+  Pop $R2
+  Pop $R1
+  Pop $R0
+FunctionEnd
+
+Function InstallAspellAndDict
+  Push $R0
+  Exch
+  Call GetLangCodeForSection
+  Pop $R0 ;This is the language code
+  Push $R1
+
+  IfErrors done ; We weren't able to convert the section to lang code
+
+  retry:
+    Call InstallAspell
+    Pop $R1
+    StrCmp $R1 "" +3
+    StrCmp $R1 "cancel" done
+    MessageBox MB_RETRYCANCEL "$(PIDGIN_SPELLCHECK_ERROR) : $R1" /SD IDCANCEL IDRETRY retry IDCANCEL done
+
+  retry_dict:
+    Push $R0
+    Call InstallAspellDictionary
+    Pop $R1
+    StrCmp $R1 "" +3
+    StrCmp $R1 "cancel" done
+    MessageBox MB_RETRYCANCEL "$(PIDGIN_SPELLCHECK_DICT_ERROR) : $R1" /SD IDCANCEL IDRETRY retry_dict
+
+  done:
+
+  Pop $R1
+  Pop $R0
+FunctionEnd
+
+Function InstallAspell
+  Push $R0
+  Push $R1
+  Push $R2
+
+  check:
+  ClearErrors
+  ReadRegDWORD $R0 HKLM ${ASPELL_REG_KEY} "AspellVersion"
+  IntCmp $R0 15 installed
+
+  ; If this is the check after installation, don't infinite loop on failure
+  StrCmp $R1 "$TEMP\aspell_installer.exe" 0 +3
+    StrCpy $R0 $(ASPELL_INSTALL_FAILED)
+    Goto done
+
+  ; We need to download and install aspell
+  StrCpy $R1 "$TEMP\aspell_installer.exe"
+  StrCpy $R2 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=aspell_core"
+  DetailPrint "Downloading Aspell... ($R2)"
+  NSISdl::download $R2 $R1
+  Pop $R0
+  StrCmp $R0 "success" +2
+    Goto done
+  ExecWait '"$R1"'
+  Delete $R1
+  Goto check ; Check that it is now installed correctly
+
+  installed: ;Aspell is currently installed, no error message
+    DetailPrint "Aspell is installed"
+    StrCpy $R0 ''
+
+  done:
+  Pop $R2
+  Pop $R1
+  Exch $R0
+FunctionEnd
+
+Function InstallAspellDictionary
+  Push $R0
+  Exch
+  Pop $R0 ;This is the language code
+  Push $R1
+  Push $R2
+  Push $R3
+
+  check:
+  ClearErrors
+  ReadRegStr $R2 HKLM "${ASPELL_REG_KEY}-$R0" ""
+  StrCmp $R2 "" 0 installed
+
+  ; If this is the check after installation, don't infinite loop on failure
+  StrCmp $R1 "$TEMP\aspell_dict-$R0.exe" 0 +3
+    StrCpy $R0 $(ASPELL_INSTALL_FAILED)
+    Goto done
+
+  ; We need to download and install aspell
+  StrCpy $R1 "$TEMP\aspell_dict-$R0.exe"
+  StrCpy $R3 "${DOWNLOADER_URL}?version=${PIDGIN_VERSION}&dl_pkg=lang_$R0"
+  DetailPrint "Downloading the Aspell $R0 Dictionary... ($R3)"
+  NSISdl::download $R3 $R1
+  Pop $R3
+  StrCmp $R3 "success" +3
+    StrCpy $R0 $R3
+    Goto done
+  ExecWait '"$R1"'
+  Delete $R1
+  Goto check ; Check that it is now installed correctly
+
+  installed: ;The dictionary is currently installed, no error message
+    DetailPrint "Aspell $R0 Dictionary is installed"
+    StrCpy $R0 ''
+
+  done:
+  Pop $R3
+  Pop $R2
+  Pop $R1
+  Exch $R0
+FunctionEnd
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/pidgin-plugin.nsh
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pidgin/win32/nsis/pidgin-plugin.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -0,0 +1,181 @@
+;;
+;; Windows Pidgin NSIS installer plugin helper utilities
+;; Copyright 2005, Daniel Atallah <daniel_atallah@yahoo.com>
+;;
+;; Include in plugin installer scripts using:
+;;   !addincludedir "${PATH_TO_PIDGIN_SRC}\pidgin\win32\nsis"
+;;   !include "pidgin-plugin.nsh"
+;;
+
+!define PIDGIN_REG_KEY              "SOFTWARE\pidgin"
+
+!define PIDGIN_VERSION_OK           0
+!define PIDGIN_VERSION_INCOMPATIBLE 1
+!define PIDGIN_VERSION_UNDEFINED    2
+
+; Extract the Pidgin Version from the registry
+; This will set the Error flag if unable to determine the value
+; Pop the value of the stack after calling this to get the value (unless Error Flag is set)
+Function GetPidginVersion
+  Push $R0
+
+  ; Read the pidgin version
+  ClearErrors
+  ReadRegStr $R0 HKLM ${PIDGIN_REG_KEY} "Version"
+  IfErrors +1 GetPidginVersion_found
+  ; fall back to the HKCU registry key
+  ReadRegStr $R0 HKCU ${PIDGIN_REG_KEY} "Version"
+  IfErrors GetPidginVersion_done ; Keep the error flag set
+
+  GetPidginVersion_found:
+  Push $R0 ; Push the value onto the stack
+  Exch
+
+  GetPidginVersion_done:
+  ; restore $R0
+  Pop $R0
+FunctionEnd
+
+; Check that the currently installed Pidgin version is compatible
+; with the plugin version we are installing
+; Push the Plugin's Pidgin Version onto the Stack before calling
+; After calling, the top of the Stack will contain the result of the check:
+;   PIDGIN_VERSION_OK - If the installed Pidgin version is compatible w/ the version specified
+;   PIDGIN_VERSION_INCOMPATIBLE - If the installed Pidgin version isn't compatible w/ the version specified
+;   PIDGIN_VERSION_UNDEFINED - If the installed Pidgin version can't be determined 
+Function CheckPidginVersion
+  ; Save the Variable values that we will use in the stack
+  Push $R4
+  Exch
+  Pop $R4 ; Get the plugin's Pidgin Version
+  Push $R0
+  Push $R1
+  Push $R2
+
+  ; Read the pidgin version
+  Call GetPidginVersion
+  IfErrors checkPidginVersion_noPidginInstallFound
+  Pop $R0
+
+  ;If they are exactly the same, we don't need to look at anything else
+  StrCmp $R0 $R4 checkPidginVersion_VersionOK 
+
+  ; Versions are in the form of X.Y.Z
+  ; If X is different or plugin's Y > pidgin's Y, then we shouldn't install
+
+  ;Check the Major Version
+  Push $R0
+  Push 0
+  Call GetVersionComponent
+  IfErrors checkPidginVersion_noPidginInstallFound ;We couldn't extract 'X' from the installed pidgin version
+  Pop $R2
+  Push $R4
+  Push 0
+  Call GetVersionComponent
+  IfErrors checkPidginVersion_BadVersion ; this isn't a valid version, so don't bother even checking
+  Pop $R1
+  ;Check that both versions' X is the same
+  StrCmp $R1 $R2 +1 checkPidginVersion_BadVersion
+
+  ;Check the Minor Version
+  Push $R0
+  Push 1
+  Call GetVersionComponent
+  IfErrors checkPidginVersion_noPidginInstallFound ;We couldn't extract 'Y' from the installed pidgin version
+  Pop $R2
+  Push $R4
+  Push 1
+  Call GetVersionComponent
+  IfErrors checkPidginVersion_BadVersion ; this isn't a valid version, so don't bother even checking
+  Pop $R1
+  ;Check that plugin's Y <= pidgin's Y
+  IntCmp $R1 $R2 checkPidginVersion_VersionOK checkPidginVersion_VersionOK checkPidginVersion_BadVersion
+
+  checkPidginVersion_BadVersion:
+    Push ${PIDGIN_VERSION_INCOMPATIBLE}
+    goto checkPidginVersion_done
+  checkPidginVersion_noPidginInstallFound:
+    Push ${PIDGIN_VERSION_UNDEFINED}
+    goto checkPidginVersion_done
+  checkPidginVersion_VersionOK:
+    Push ${PIDGIN_VERSION_OK}
+
+  checkPidginVersion_done:
+  ; Restore the Variables that we used
+  Exch
+  Pop $R2
+  Exch
+  Pop $R1
+  Exch
+  Pop $R0
+  Exch
+  Pop $R4
+FunctionEnd
+
+; Extract the part of a string prior to "." (or the whole string if there is no ".")
+; If no "." was found, the ErrorFlag will be set
+; Before this is called, Push ${VERSION_STRING} must be called, and then Push 0 for Major, 1 for Minor, etc
+; Pop should be called after to retrieve the new value
+Function GetVersionComponent
+  ClearErrors
+
+  ; Save the Variable values that we will use in the stack
+  Push $1
+  Exch
+  Pop $1 ;The version component which we want to extract (0, 1, 2)
+  Exch
+  Push $0
+  Exch
+  Pop $0 ;The string from which to extract the version component
+
+  Push $2
+  Push $3
+  Push $4
+  Push $5
+  Push $6
+  Push $7
+
+  StrCpy $2 "0" ;Initialize our string index counter
+  StrCpy $7 "0" ;Index of last "."
+  StrCpy $3 "0" ;Initialize our version index counter
+
+  startGetVersionComponentLoop:
+    ;avoid infinite loop (if we have gotten the whole initial string, exit the loop and set the error flag)
+    StrCmp $6 $0 GetVersionComponentSetErrorFlag
+    IntOp $2 $2 + 1
+    StrCpy $6 $0 $2 ;Update the infinite loop preventing string
+    ;Determine the correct substring (only the current index component)
+    IntOp $5 $2 - $7
+    StrCpy $4 $0 $5 $7 ;Append the current character in $0 to $4
+    StrCpy $5 $0 1 $2 ;store the next character in $5
+
+    ;if the next character is ".", $4 will contain the version component prior to "."
+    StrCmp $5 "." +1 startGetVersionComponentLoop
+    StrCmp $3 $1 doneGetVersionComponent ;If it is the version component we're looking for, stop
+    IntOp $3 $3 + 1 ;Increment the version index counter
+    IntOp $2 $2 + 1 ;Increment the version string index to "." (so it will be skipped)
+    StrCpy $7 $2 ;Keep track of the index of the last "."
+    StrCpy $6 $0 $2 ;Update the infinite loop preventing string
+    goto startGetVersionComponentLoop
+
+  GetVersionComponentSetErrorFlag:
+    SetErrors
+
+  doneGetVersionComponent:
+  ; Restore the Variables that we used
+  Pop $7
+  Pop $6
+  Pop $5
+  Push $4 ;This is the value we're returning
+  Exch
+  Pop $4
+  Exch
+  Pop $3
+  Exch
+  Pop $2
+  Exch
+  Pop $0
+  Exch
+  Pop $1
+FunctionEnd
+
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/pixmaps/pidgin-header.bmp
Binary file pidgin/win32/nsis/pixmaps/pidgin-header.bmp has changed
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/pixmaps/pidgin-install.ico
Binary file pidgin/win32/nsis/pixmaps/pidgin-install.ico has changed
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/pixmaps/pidgin-intro.bmp
Binary file pidgin/win32/nsis/pixmaps/pidgin-intro.bmp has changed
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/albanian.nsh
--- a/pidgin/win32/nsis/translations/albanian.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/albanian.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  albanian.nsh
 ;;
-;;  Albanian language strings for the Windows Gaim NSIS installer.
+;;  Albanian language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Version 2
@@ -12,19 +12,19 @@
 !define GTK_INSTALLER_NEEDED			"Ose mungon mjedisi GTK+ runtime ose lyp përditësim.$\rJu lutem instaloni GTK+ runtime v${GTK_MIN_VERSION} ose më të vonshëm"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Më tej >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) qarkullon nën licensën GPL. Licensa këtu sillet vetëm për qëllime njoftimi. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Më tej >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) qarkullon nën licensën GPL. Licensa këtu sillet vetëm për qëllime njoftimi. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Klient Shkëmbimi Mesazhesh të Atypëratyshëm Gaim (i nevojshëm)"
+!define PIDGIN_SECTION_TITLE			"Klient Shkëmbimi Mesazhesh të Atypëratyshëm Pidgin (i nevojshëm)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (i nevojshëm)"
 !define GTK_THEMES_SECTION_TITLE		"Tema GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Pa Tema"
 !define GTK_WIMP_SECTION_TITLE		"Temë Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Temë Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Temë Light House Blue"
-!define GAIM_SECTION_DESCRIPTION		"Kartela dhe dll bazë të Gaim-it"
-!define GTK_SECTION_DESCRIPTION		"Një grup mjetesh shumëplatformësh për GUI, përdorur nga Gaim-i"
+!define PIDGIN_SECTION_DESCRIPTION		"Kartela dhe dll bazë të Pidgin-it"
+!define GTK_SECTION_DESCRIPTION		"Një grup mjetesh shumëplatformësh për GUI, përdorur nga Pidgin-i"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Temat GTK+ mund të ndryshojnë pamjen dhe sjelljen e zbatimeve GTK+."
 !define GTK_NO_THEME_DESC			"Mos instalo temë GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) është një temë GTK që ndërthuret mirë mjedisin Windows."
@@ -32,13 +32,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"U gjet një version i vjetër për GTK+ runtime. Doni të përditësohet?$\rShënim: Gaim-i mund të mos punojë nëse nuk e bëni."
+!define GTK_UPGRADE_PROMPT			"U gjet një version i vjetër për GTK+ runtime. Doni të përditësohet?$\rShënim: Pidgin-i mund të mos punojë nëse nuk e bëni."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Vizitoni Faqen Web të Gaim-it për Windows"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Vizitoni Faqen Web të Pidgin-it për Windows"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (vetëm hiq)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"Pidgin (vetëm hiq)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"gabim gjatë instalimit të GTK+ runtime."
@@ -48,5 +48,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Nuk keni leje të instaloni tema GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Çinstaluesi nuk gjeti dot zëra regjistri për Gaim-in.$\rKa mundësi që këtë zbatim ta ketë instaluar një tjetër përdorues."
-!define un.GAIM_UNINSTALL_ERROR_2		"Nuk keni leje të çinstaloni këtë zbatim."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Çinstaluesi nuk gjeti dot zëra regjistri për Pidgin-in.$\rKa mundësi që këtë zbatim ta ketë instaluar një tjetër përdorues."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Nuk keni leje të çinstaloni këtë zbatim."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/bulgarian.nsh
--- a/pidgin/win32/nsis/translations/bulgarian.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/bulgarian.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  bulgarian.nsh
 ;;
-;;  Bulgarian language strings for the Windows Gaim NSIS installer.
+;;  Bulgarian language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1251
 ;;
 ;;  Author: Hristo Todorov <igel@bofh.bg>
@@ -12,26 +12,26 @@
 !define GTK_INSTALLER_NEEDED			"GTK+ runtime ������ ��� ������ �� ���� ��������.$\r���� ������������ ������ v${GTK_MIN_VERSION} ��� ��-����"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim ������ �� ����� ��������� (������� ��)"
+!define PIDGIN_SECTION_TITLE			"Pidgin ������ �� ����� ��������� (������� ��)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime ����� (required)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ ����"
 !define GTK_NOTHEME_SECTION_TITLE		"��� ����"
-!define GTK_WIMP_SECTION_TITLE		"Wimp ����"
+!define GTK_WIMP_SECTION_TITLE			"Wimp ����"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve ����"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue ����"
-!define GAIM_SECTION_DESCRIPTION		"������� �� ������ �� Gaim � ����������"
-!define GTK_SECTION_DESCRIPTION		"�������������� ��� �� �������� ������, ��������� �� Gaim"
-!define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ ������ ����� �� �������� ������� �� GTK+ ����������."
+!define PIDGIN_SECTION_DESCRIPTION		"������� �� ������ �� Pidgin � ����������"
+!define GTK_SECTION_DESCRIPTION			"�������������� ��� �� �������� ������, ��������� �� Pidgin"
+!define GTK_THEMES_SECTION_DESCRIPTION		"GTK+ ������ ����� �� �������� ������� �� GTK+ ����������."
 !define GTK_NO_THEME_DESC			"�� ������������ GTK+ ����"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) � GTK ���� ����� �� ������ ����� ��� Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve ������."
-!define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue ������."
+!define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblue ������."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"����� ������ GTK+ runtime � �������. ������ �� �� ��������?$\rNote: Gaim ���� �� �� ������� ��� �� �� ���������."
+!define GTK_UPGRADE_PROMPT			"����� ������ GTK+ runtime � �������. ������ �� �� ��������?$\rNote: Pidgin ���� �� �� ������� ��� �� �� ���������."
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (���� ����������)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (���� ����������)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"������ ��� ����������� �� GTK+ runtime."
@@ -41,5 +41,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"������ ����� �� �� ����������� GTK+ ����."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "����������� �� ���� �� ������ ������ � ��������� �� Gaim.$\r�������� � ��� ���������� �� ���� ����������."
-!define un.GAIM_UNINSTALL_ERROR_2         "������ ����� �� ������������� ���� ��������."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"����������� �� ���� �� ������ ������ � ��������� �� Pidgin.$\r�������� � ��� ���������� �� ���� ����������."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"������ ����� �� ������������� ���� ��������."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/catalan.nsh
--- a/pidgin/win32/nsis/translations/catalan.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/catalan.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -2,7 +2,7 @@
 ;;
 ;;  catalan.nsh
 ;;
-;;  Catalan language strings for the Windows Gaim NSIS installer.
+;;  Catalan language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: "Bernat L�pez" <bernatl@adequa.net>
@@ -11,44 +11,44 @@
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"L'instal.lador encara est� executant-se."
-!define GAIM_IS_RUNNING				"Hi ha una inst�ncia del Gaim executant-se. Surt del Gaim i torna a intentar-ho."
+!define PIDGIN_IS_RUNNING			"Hi ha una inst�ncia del Pidgin executant-se. Surt del Pidgin i torna a intentar-ho."
 !define GTK_INSTALLER_NEEDED			"L'entorn d'execuci� GTK+ no existeix o necessita �sser actualitzat.$\rSius plau instal.la la versi�${GTK_MIN_VERSION} o superior de l'entonr GTK+"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Seg�ent >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) �s distribu�t sota llic�ncia GPL. Podeu consultar la llic�ncia, nom�s per proposits informatius, aqu�.  $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Seg�ent >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �s distribu�t sota llic�ncia GPL. Podeu consultar la llic�ncia, nom�s per proposits informatius, aqu�.  $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Client Gaim de Missatgeria Instant�nia (necessari)"
+!define PIDGIN_SECTION_TITLE			"Client Pidgin de Missatgeria Instant�nia (necessari)"
 !define GTK_SECTION_TITLE			"Entorn d'Execuci� GTK+ (necessari)"
 !define GTK_THEMES_SECTION_TITLE		"Temes GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Sense tema"
 !define GTK_WIMP_SECTION_TITLE			"Tema Imwi"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema Corba Blava"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
-!define GAIM_SHORTCUTS_SECTION_TITLE		"Enlla�os directes"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Escriptori"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Inici"
-!define GAIM_SECTION_DESCRIPTION		"Fitxers i dlls del nucli de Gaim"
-!define GTK_SECTION_DESCRIPTION			"Una eina IGU multiplataforma, utilitzada per Gaim"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Enlla�os directes"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Escriptori"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu Inici"
+!define PIDGIN_SECTION_DESCRIPTION		"Fitxers i dlls del nucli de Pidgin"
+!define GTK_SECTION_DESCRIPTION			"Una eina IGU multiplataforma, utilitzada per Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION		"Els temes GTK+ poden modificar l'aspecte de les aplicacions GTK+."
 !define GTK_NO_THEME_DESC			"No instal.lis un tema GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Imwi (imitador Windows) �s un tema GTK que s'integra perfectament en un entorn d'escriptori Windows."
 !define GTK_BLUECURVE_THEME_DESC		"El tema Corba Blava."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC		"The Lighthouseblue theme."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Enlla�os directes per iniciar el Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC		"Afegir un enlla� directe al Gaim a l'Escriptori"
-!define GAIM_STARTMENU_SHORTCUT_DESC		"Crear una entrada Gaim al Menu Inici"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Enlla�os directes per iniciar el Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Afegir un enlla� directe al Pidgin a l'Escriptori"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Crear una entrada Pidgin al Menu Inici"
 
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"S'ha trobat una versi� antiga de l'entorn d'execuci� GTK. Vols actualitzar-la?$\rNota: Gaim no funcionar� sino ho fas."
+!define GTK_UPGRADE_PROMPT			"S'ha trobat una versi� antiga de l'entorn d'execuci� GTK. Vols actualitzar-la?$\rNota: $(^Name) no funcionar� sino ho fas."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visita la p�gina web de Gaim per Windows"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la p�gina web de Pidgin per Windows"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (nom�s esborrar)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (nom�s esborrar)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error installlant l'entorn d'execuci� GTK+."
@@ -58,35 +58,35 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"No tens permisos per instal.lar un tema GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"L'instal.lador podria no trobar les entrades del registre de Gaim.$\rProbablement un altre usuari ha instal.lat aquesta aplicaci�."
-!define un.GAIM_UNINSTALL_ERROR_2		"No tens perm�s per desinstal.lar aquesta aplicaci�."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"L'instal.lador podria no trobar les entrades del registre de Pidgin.$\rProbablement un altre usuari ha instal.lat aquesta aplicaci�."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"No tens perm�s per desinstal.lar aquesta aplicaci�."
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"Suport a la Verificaci� de l'Ortografia "
-!define GAIM_SPELLCHECK_ERROR			"Error instal.lant verificaci� de l'ortografia"
-!define GAIM_SPELLCHECK_DICT_ERROR		"Error Instal.lant Diccionari  per a Verificaci� de l'Ortografia"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Suport per a Verificaci� de l'Ortografia.  (�s necesaria connexi� a internet per dur a terme la instal.laci�)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Suport a la Verificaci� de l'Ortografia "
+!define PIDGIN_SPELLCHECK_ERROR			"Error instal.lant verificaci� de l'ortografia"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Error Instal.lant Diccionari  per a Verificaci� de l'Ortografia"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Suport per a Verificaci� de l'Ortografia.  (�s necesaria connexi� a internet per dur a terme la instal.laci�)"
 !define ASPELL_INSTALL_FAILED			"La instal.laci� ha fallat"
-!define GAIM_SPELLCHECK_BRETON			"Bret�"
-!define GAIM_SPELLCHECK_CATALAN			"Catal�"
-!define GAIM_SPELLCHECK_CZECH			"Txec"
-!define GAIM_SPELLCHECK_WELSH			"Gal�l�s"
-!define GAIM_SPELLCHECK_DANISH			"Dan�s"
-!define GAIM_SPELLCHECK_GERMAN			"Alemany"
-!define GAIM_SPELLCHECK_GREEK			"Grec"
-!define GAIM_SPELLCHECK_ENGLISH			"Angl�s"
-!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
-!define GAIM_SPELLCHECK_SPANISH			"Espanyol"
-!define GAIM_SPELLCHECK_FAROESE			"Fero�s"
-!define GAIM_SPELLCHECK_FRENCH			"Franc�s"
-!define GAIM_SPELLCHECK_ITALIAN			"Itali�"
-!define GAIM_SPELLCHECK_DUTCH			"Holand�s"
-!define GAIM_SPELLCHECK_NORWEGIAN		"Noruec"
-!define GAIM_SPELLCHECK_POLISH			"Polon�s"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portugu�s"
-!define GAIM_SPELLCHECK_ROMANIAN		"Roman�s"
-!define GAIM_SPELLCHECK_RUSSIAN			"Rus"
-!define GAIM_SPELLCHECK_SLOVAK			"Eslovac"
-!define GAIM_SPELLCHECK_SWEDISH			"Suec"
-!define GAIM_SPELLCHECK_UKRAINIAN		"Ucra�n�s"
+!define PIDGIN_SPELLCHECK_BRETON			"Bret�"
+!define PIDGIN_SPELLCHECK_CATALAN			"Catal�"
+!define PIDGIN_SPELLCHECK_CZECH			"Txec"
+!define PIDGIN_SPELLCHECK_WELSH			"Gal�l�s"
+!define PIDGIN_SPELLCHECK_DANISH			"Dan�s"
+!define PIDGIN_SPELLCHECK_GERMAN			"Alemany"
+!define PIDGIN_SPELLCHECK_GREEK			"Grec"
+!define PIDGIN_SPELLCHECK_ENGLISH			"Angl�s"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH			"Espanyol"
+!define PIDGIN_SPELLCHECK_FAROESE			"Fero�s"
+!define PIDGIN_SPELLCHECK_FRENCH			"Franc�s"
+!define PIDGIN_SPELLCHECK_ITALIAN			"Itali�"
+!define PIDGIN_SPELLCHECK_DUTCH			"Holand�s"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Noruec"
+!define PIDGIN_SPELLCHECK_POLISH			"Polon�s"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugu�s"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Roman�s"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"Rus"
+!define PIDGIN_SPELLCHECK_SLOVAK			"Eslovac"
+!define PIDGIN_SPELLCHECK_SWEDISH			"Suec"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ucra�n�s"
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/czech.nsh
--- a/pidgin/win32/nsis/translations/czech.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/czech.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  czech.nsh
 ;;
-;;  Czech language strings for the Windows Gaim NSIS installer.
+;;  Czech language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: Jan Kolar <jan@e-kolar.net>
@@ -12,19 +12,19 @@
 !define GTK_INSTALLER_NEEDED			"GTK+ runtime bu�to chyb�, nebo je pot�eba prov�st upgrade.$\rProve�te instalaci verze${GTK_MIN_VERSION} nebo vy���."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Dal�� >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"K pou�it� $(^Name) se vztahuje GPL licence. Licence je zde uvedena pouze pro Va�� informaci. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Dal�� >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"K pou�it� $(^Name) se vztahuje GPL licence. Licence je zde uvedena pouze pro Va�� informaci. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (nutn�)"
+!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (nutn�)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (nutn�)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ t�mata"
 !define GTK_NOTHEME_SECTION_TITLE		"Bez t�mat"
 !define GTK_WIMP_SECTION_TITLE		"Wimp t�ma"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve t�ma"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue t�ma"
-!define GAIM_SECTION_DESCRIPTION		"Z�kladn� soubory a DLL pro Gaim"
-!define GTK_SECTION_DESCRIPTION		"Multi-platform GUI toolkit pou��van� Gaimem"
+!define PIDGIN_SECTION_DESCRIPTION		"Z�kladn� soubory a DLL pro Pidgin"
+!define GTK_SECTION_DESCRIPTION		"Multi-platform GUI toolkit pou��van� Pidginem"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ t�mata umo��uj� m�nit vzhled a zp�sob ovl�d�n� GTK+ aplikac�."
 !define GTK_NO_THEME_DESC			"Neinstalovat GTK+ t�ma"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK t�ma kter� zapadne do Va�eho pracovn�ho prost�ed� ve Windows."
@@ -32,13 +32,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue t�ma."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Byla nalezena star�� verze GTK+ runtime. Chcete prov�st upgrade?$\rUpozorn�n�: Bez upgradu Gaim nemus� pracovat spr�vn�."
+!define GTK_UPGRADE_PROMPT			"Byla nalezena star�� verze GTK+ runtime. Chcete prov�st upgrade?$\rUpozorn�n�: Bez upgradu $(^Name) nemus� pracovat spr�vn�."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Nav�t�vit Windows Gaim Web Page"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Nav�t�vit Windows Pidgin Web Page"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (odinstalovat)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (odinstalovat)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba p�i instalaci GTK+ runtime."
@@ -48,5 +48,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Nem�te opr�vn�n� k instalaci GTK+ t�matu."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Odinstal�n� proces nem��e naj�t z�znamy pro Gaim v registrech.$\rPravd�podobn� instalaci t�to aplikace provedl jin� u�ivatel."
-!define un.GAIM_UNINSTALL_ERROR_2		"Nem�te opr�vn�n� k odinstalaci t�to aplikace."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Odinstal�n� proces nem��e naj�t z�znamy pro Pidgin v registrech.$\rPravd�podobn� instalaci t�to aplikace provedl jin� u�ivatel."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Nem�te opr�vn�n� k odinstalaci t�to aplikace."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/danish.nsh
--- a/pidgin/win32/nsis/translations/danish.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/danish.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  danish.nsh
 ;;
-;;  Danish language strings for the Windows Gaim NSIS installer.
+;;  Danish language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: Ewan Andreasen <wiredloose@myrealbox.com>
@@ -12,19 +12,19 @@
 !define GTK_INSTALLER_NEEDED			"GTK+ runtime environment enten mangler eller skal opgraderes.$\rInstall�r venligst GTK+ runtime version v${GTK_MIN_VERSION} eller h�jere."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"N�ste >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) er frigivet under GPL licensen. Licensen er kun medtaget her til generel orientering. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"N�ste >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) er frigivet under GPL licensen. Licensen er kun medtaget her til generel orientering. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (obligatorisk)"
+!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (obligatorisk)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ Temaer"
 !define GTK_NOTHEME_SECTION_TITLE		"Intet Tema"
 !define GTK_WIMP_SECTION_TITLE		"Wimp Tema"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Tema"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Tema"
-!define GAIM_SECTION_DESCRIPTION		"Basale Gaim filer og biblioteker"
-!define GTK_SECTION_DESCRIPTION		"Et multi-platform grafisk interface udviklingsv�rkt�j, bruges af Gaim"
+!define PIDGIN_SECTION_DESCRIPTION		"Basale Pidgin filer og biblioteker"
+!define GTK_SECTION_DESCRIPTION		"Et multi-platform grafisk interface udviklingsv�rkt�j, bruges af Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Temaer kan �ndre GTK+ programmers generelle udseende."
 !define GTK_NO_THEME_DESC			"Install�r ikke noget GTK+ tema"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows efterligner) er et GTK tema som falder i med Windows skrivebordsmilj�et."
@@ -32,13 +32,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue tema."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Der blev fundet en �ldre version af GTK+ runtime. �nsker du at opgradere?$\rNB: Gaim virker muligvis ikke uden denne opgradering."
+!define GTK_UPGRADE_PROMPT			"Der blev fundet en �ldre version af GTK+ runtime. �nsker du at opgradere?$\rNB: $(^Name) virker muligvis ikke uden denne opgradering."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Bes�g Windows Gaim's hjemmeside"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�g Windows Pidgin's hjemmeside"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (fjern)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (fjern)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fejl under installeringen af GTK+ runtime."
@@ -48,6 +48,6 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Du har ikke tilladelse til at installere et GTK+ tema."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Afinstallationen kunne ikke finde Gaim i registreringsdatabasen.$\rMuligvis har en anden bruger installeret programmet."
-!define un.GAIM_UNINSTALL_ERROR_2		"Du har ikke tilladelse til at afinstallere dette program."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Afinstallationen kunne ikke finde Pidgin i registreringsdatabasen.$\rMuligvis har en anden bruger installeret programmet."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Du har ikke tilladelse til at afinstallere dette program."
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/dutch.nsh
--- a/pidgin/win32/nsis/translations/dutch.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/dutch.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -2,7 +2,7 @@
 ;;
 ;;  dutch.nsh
 ;;
-;;  Default language strings for the Windows Gaim NSIS installer.
+;;  Default language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: Vincent van Adrighem <vincent@dirck.mine.nu>
@@ -10,24 +10,24 @@
 ;;
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"Er is al een installatie actief."
-!define GAIM_IS_RUNNING			"Gaim wordt op dit moment uitgevoerd. Sluit Gaim af en start de installatie opnieuw."
+!define PIDGIN_IS_RUNNING			"Pidgin wordt op dit moment uitgevoerd. Sluit Pidgin af en start de installatie opnieuw."
 !define GTK_INSTALLER_NEEDED			"De GTK+ runtime-omgeving is niet aanwezig of moet vernieuwd worden.$\rInstalleer v${GTK_MIN_VERSION} of nieuwer van de GTK+ runtime-omgeving"
 
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Volgende >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) wordt uitgegeven onder de GPL licentie. Deze licentie wordt hier slechts ter informatie aangeboden. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Volgende >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) wordt uitgegeven onder de GPL licentie. Deze licentie wordt hier slechts ter informatie aangeboden. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (vereist)"
+!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (vereist)"
 !define GTK_SECTION_TITLE			"GTK+ runtime-omgeving (vereist)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ thema's"
 !define GTK_NOTHEME_SECTION_TITLE		"Geen thema"
 !define GTK_WIMP_SECTION_TITLE		"Wimp thema"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve thema"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue thema"
-!define GAIM_SECTION_DESCRIPTION		"Gaim hoofdbestanden en dlls"
-!define GTK_SECTION_DESCRIPTION		"Een multi-platform gebruikersinterface, gebruikt door Gaim"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidgin hoofdbestanden en dlls"
+!define GTK_SECTION_DESCRIPTION		"Een multi-platform gebruikersinterface, gebruikt door Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ thema's veranderen het uiterlijk en gedrag van GTK+ programma's."
 !define GTK_NO_THEME_DESC			"Geen GTK+ thema installeren"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is een GTK+ thema wat goed past in een windows omgeving."
@@ -35,13 +35,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Het Lighthouseblue thema."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Er is een oude versie van GTK+ gevonden. Wilt u deze bijwerken?$\rLet op: Gaim werkt misschien niet als u dit niet doet."
+!define GTK_UPGRADE_PROMPT			"Er is een oude versie van GTK+ gevonden. Wilt u deze bijwerken?$\rLet op: $(^Name) werkt misschien niet als u dit niet doet."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Neem een kijkje op de Windows Gaim webpagina"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Neem een kijkje op de Windows Pidgin webpagina"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (alleen verwijderen)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (alleen verwijderen)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fout bij installatie van GTK+ runtime omgeving."
@@ -51,35 +51,35 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"U heeft geen toestemming om een GTK+ thema te installeren."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "Het verwijderingsprogramma voor Gaim kon geen register-ingangen voor Gaim vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma ge�nstalleerd."
-!define un.GAIM_UNINSTALL_ERROR_2         "U mag dit programma niet verwijderen."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Het verwijderingsprogramma voor Pidgin kon geen register-ingangen voor Pidgin vinden.$\rWaarschijnlijk heeft een andere gebruiker het programma ge�nstalleerd."
+!define un.PIDGIN_UNINSTALL_ERROR_2         "U mag dit programma niet verwijderen."
 
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"Spellingscontrole"
-!define GAIM_SPELLCHECK_ERROR			"Fout bij installatie van spellingscontrole"
-!define GAIM_SPELLCHECK_DICT_ERROR		"Fout bij installatie van woordenboek voor spellingscontrole"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Ondersteuning voor spellingscontrole. (Internetverbinding nodig voor installatie)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Spellingscontrole"
+!define PIDGIN_SPELLCHECK_ERROR			"Fout bij installatie van spellingscontrole"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Fout bij installatie van woordenboek voor spellingscontrole"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Ondersteuning voor spellingscontrole. (Internetverbinding nodig voor installatie)"
 !define ASPELL_INSTALL_FAILED			"Installatie mislukt"
-!define GAIM_SPELLCHECK_BRETON			"Bretons"
-!define GAIM_SPELLCHECK_CATALAN			"Catalaans"
-!define GAIM_SPELLCHECK_CZECH			"Tsjechisch"
-!define GAIM_SPELLCHECK_WELSH			"Welsh"
-!define GAIM_SPELLCHECK_DANISH			"Deens"
-!define GAIM_SPELLCHECK_GERMAN			"Duits"
-!define GAIM_SPELLCHECK_GREEK			"Grieks"
-!define GAIM_SPELLCHECK_ENGLISH			"Engels"
-!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
-!define GAIM_SPELLCHECK_SPANISH			"Spaans"
-!define GAIM_SPELLCHECK_FAROESE			"Faroese"
-!define GAIM_SPELLCHECK_FRENCH			"Frans"
-!define GAIM_SPELLCHECK_ITALIAN			"Italiaans"
-!define GAIM_SPELLCHECK_DUTCH			"Nederlands"
-!define GAIM_SPELLCHECK_NORWEGIAN		"Noors"
-!define GAIM_SPELLCHECK_POLISH			"Pools"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portugees"
-!define GAIM_SPELLCHECK_ROMANIAN			"Roemeens"
-!define GAIM_SPELLCHECK_RUSSIAN			"Russisch"
-!define GAIM_SPELLCHECK_SLOVAK			"Slowaaks"
-!define GAIM_SPELLCHECK_SWEDISH			"Zweeds"
-!define GAIM_SPELLCHECK_UKRAINIAN		"Oekra�ns"
+!define PIDGIN_SPELLCHECK_BRETON			"Bretons"
+!define PIDGIN_SPELLCHECK_CATALAN			"Catalaans"
+!define PIDGIN_SPELLCHECK_CZECH			"Tsjechisch"
+!define PIDGIN_SPELLCHECK_WELSH			"Welsh"
+!define PIDGIN_SPELLCHECK_DANISH			"Deens"
+!define PIDGIN_SPELLCHECK_GERMAN			"Duits"
+!define PIDGIN_SPELLCHECK_GREEK			"Grieks"
+!define PIDGIN_SPELLCHECK_ENGLISH			"Engels"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH			"Spaans"
+!define PIDGIN_SPELLCHECK_FAROESE			"Faroese"
+!define PIDGIN_SPELLCHECK_FRENCH			"Frans"
+!define PIDGIN_SPELLCHECK_ITALIAN			"Italiaans"
+!define PIDGIN_SPELLCHECK_DUTCH			"Nederlands"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Noors"
+!define PIDGIN_SPELLCHECK_POLISH			"Pools"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugees"
+!define PIDGIN_SPELLCHECK_ROMANIAN			"Roemeens"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"Russisch"
+!define PIDGIN_SPELLCHECK_SLOVAK			"Slowaaks"
+!define PIDGIN_SPELLCHECK_SWEDISH			"Zweeds"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Oekra�ns"
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/english.nsh
--- a/pidgin/win32/nsis/translations/english.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/english.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,95 +1,95 @@
 ;;
 ;;  english.nsh
 ;;
-;;  Default language strings for the Windows Gaim NSIS installer.
+;;  Default language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Version 3
-;;  Note: If translating this file, replace "!insertmacro GAIM_MACRO_DEFAULT_STRING"
+;;  Note: If translating this file, replace "!insertmacro PIDGIN_MACRO_DEFAULT_STRING"
 ;;  with "!define".
 
-; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
+; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
 ; langmacros.nsh when updating this file
 
 ; Startup Checks
-!insertmacro GAIM_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING			"The installer is already running."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_IS_RUNNING				"An instance of Gaim is currently running. Exit Gaim and then try again."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED			"The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_MIN_VERSION} or higher of the GTK+ runtime"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING INSTALLER_IS_RUNNING			"The installer is already running."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_IS_RUNNING			"An instance of Pidgin is currently running.  Please exit Pidgin and try again."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_INSTALLER_NEEDED			"The GTK+ runtime environment is either missing or needs to be upgraded.$\rPlease install v${GTK_MIN_VERSION} or higher of the GTK+ runtime"
 
 ; License Page
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BUTTON			"Next >"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_LICENSE_BOTTOM_TEXT			"$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_LICENSE_BUTTON			"Next >"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) is released under the GNU General Public License (GPL). The license is provided here for information purposes only. $_CLICK"
 
 ; Components Page
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (required)"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_TITLE			"GTK+ Runtime Environment (required)"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_TITLE			"GTK+ Themes"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NOTHEME_SECTION_TITLE		"No Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_SECTION_TITLE			"Wimp Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_SECTION_TITLE		"Light House Blue Theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_TITLE		"Shortcuts"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Menu"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SECTION_DESCRIPTION			"Core Gaim files and dlls"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION			"A multi-platform GUI toolkit, used by Gaim"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_DESCRIPTION		"GTK+ Themes can change the look and feel of GTK+ applications."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_DESC			"Don't install a GTK+ theme"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BLUECURVE_THEME_DESC			"The Bluecurve theme."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_THEME_DESC		"The Lighthouseblue theme."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Shortcuts for starting Gaim"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_DESKTOP_SHORTCUT_DESC		"Create a shortcut to Gaim on the Desktop"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_STARTMENU_SHORTCUT_DESC		"Create a Start Menu entry for Gaim"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (required)"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_SECTION_TITLE			"GTK+ Runtime Environment (required)"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_TITLE		"GTK+ Themes"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_NOTHEME_SECTION_TITLE		"No Theme"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_WIMP_SECTION_TITLE			"MS-Windows (WIMP) Theme"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Theme"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Theme"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SHORTCUTS_SECTION_TITLE		"Shortcuts"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Menu"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SECTION_DESCRIPTION		"Core Pidgin files and dlls"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_SECTION_DESCRIPTION		"A multi-platform GUI toolkit, used by Pidgin"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_THEMES_SECTION_DESCRIPTION		"GTK+ Themes can change the look and feel of GTK+ applications."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_NO_THEME_DESC			"Don't install a GTK+ theme"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) is a GTK theme that blends well into the Windows desktop environment."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_BLUECURVE_THEME_DESC		"The Bluecurve theme."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_LIGHTHOUSEBLUE_THEME_DESC		"The Lighthouseblue theme."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Shortcuts for starting Pidgin"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_DESKTOP_SHORTCUT_DESC		"Create a shortcut to Pidgin on the Desktop"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_STARTMENU_SHORTCUT_DESC		"Create a Start Menu entry for Pidgin"
 
 ; GTK+ Directory Page
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_UPGRADE_PROMPT			"An old version of the GTK+ runtime was found. Do you wish to upgrade?$\rNote: Gaim may not work unless you do."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_WINDOWS_INCOMPATIBLE			"Windows 95/98/Me are incompatible with GTK+ 2.8.0 or newer.  GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} or newer already installed, installation will now abort."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_UPGRADE_PROMPT			"An old version of the GTK+ runtime was found. Do you wish to upgrade?$\rNote: $(^Name) may not work unless you do."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me are incompatible with GTK+ 2.8.0 or newer.  GTK+ ${GTK_INSTALL_VERSION} will not be installed.$\rIf you don't have GTK+ ${GTK_MIN_VERSION} or newer already installed, installation will now abort."
 
 ; Installer Finish Page
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_FINISH_VISIT_WEB_SITE		"Visit the Windows Gaim Web Page"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_FINISH_VISIT_WEB_SITE		"Visit the WinPidgin Web Page"
 
-; Gaim Section Prompts and Texts
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_UNINSTALL_DESC			"Gaim (remove only)"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Unable to uninstall the currently installed version of Gaim. The new version will be installed without removing the currently installed version."
+; Pidgin Section Prompts and Texts
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_UNINSTALL_DESC			"$(^Name) (remove only)"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Unable to uninstall the currently installed version of Pidgin. The new version will be installed without removing the currently installed version."
 
 ; GTK+ Section Prompts
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_INSTALL_ERROR			"Error installing GTK+ runtime."
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_BAD_INSTALL_PATH			"The path you entered can not be accessed or created."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_INSTALL_ERROR			"Error installing GTK+ runtime."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_BAD_INSTALL_PATH			"The path you entered can not be accessed or created."
 
 ; GTK+ Themes section
-!insertmacro GAIM_MACRO_DEFAULT_STRING GTK_NO_THEME_INSTALL_RIGHTS		"You do not have permission to install a GTK+ theme."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING GTK_NO_THEME_INSTALL_RIGHTS		"You do not have permission to install a GTK+ theme."
 
 ; Uninstall Section Prompts
-!insertmacro GAIM_MACRO_DEFAULT_STRING un.GAIM_UNINSTALL_ERROR_1		"The uninstaller could not find registry entries for Gaim.$\rIt is likely that another user installed this application."
-!insertmacro GAIM_MACRO_DEFAULT_STRING un.GAIM_UNINSTALL_ERROR_2		"You do not have permission to uninstall this application."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING un.PIDGIN_UNINSTALL_ERROR_1		"The uninstaller could not find registry entries for Pidgin.$\rIt is likely that another user installed this application."
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING un.PIDGIN_UNINSTALL_ERROR_2		"You do not have permission to uninstall this application."
 
 ; Spellcheck Section Prompts
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SECTION_TITLE		"Spellchecking Support"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ERROR			"Error Installing Spellchecking"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_DICT_ERROR		"Error Installing Spellchecking Dictionary"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Support for Spellchecking.  (Internet connection required for installation)"
-!insertmacro GAIM_MACRO_DEFAULT_STRING ASPELL_INSTALL_FAILED			"Installation Failed"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_BRETON			"Breton"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_CATALAN			"Catalan"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_CZECH			"Czech"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_WELSH			"Welsh"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_DANISH			"Danish"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_GERMAN			"German"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_GREEK			"Greek"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ENGLISH			"English"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SPANISH			"Spanish"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_FAROESE			"Faroese"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_FRENCH			"French"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ITALIAN			"Italian"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_DUTCH			"Dutch"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_NORWEGIAN		"Norwegian"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_POLISH			"Polish"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_PORTUGUESE		"Portuguese"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_ROMANIAN			"Romanian"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_RUSSIAN			"Russian"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SLOVAK			"Slovak"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_SWEDISH			"Swedish"
-!insertmacro GAIM_MACRO_DEFAULT_STRING GAIM_SPELLCHECK_UKRAINIAN		"Ukrainian"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SECTION_TITLE	"Spellchecking Support"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_ERROR		"Error Installing Spellchecking"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_DICT_ERROR		"Error Installing Spellchecking Dictionary"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Support for Spellchecking.  (Internet connection required for installation)"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING ASPELL_INSTALL_FAILED			"Installation Failed"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_BRETON		"Breton"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_CATALAN		"Catalan"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_CZECH		"Czech"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_WELSH		"Welsh"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_DANISH		"Danish"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_GERMAN		"German"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_GREEK		"Greek"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_ENGLISH		"English"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SPANISH		"Spanish"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_FAROESE		"Faroese"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_FRENCH		"French"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_ITALIAN		"Italian"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_DUTCH		"Dutch"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_NORWEGIAN		"Norwegian"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_POLISH		"Polish"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_PORTUGUESE		"Portuguese"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_ROMANIAN		"Romanian"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_RUSSIAN		"Russian"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SLOVAK		"Slovak"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_SWEDISH		"Swedish"
+!insertmacro PIDGIN_MACRO_DEFAULT_STRING PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainian"
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/finnish.nsh
--- a/pidgin/win32/nsis/translations/finnish.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/finnish.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  finish.nsh
 ;;
-;;  Finish language strings for the Windows Gaim NSIS installer.
+;;  Finish language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: "Toni_"Daigle"_Impi�" <toni.impio@pp1.inet.fi>
@@ -12,19 +12,19 @@
 !define GTK_INSTALLER_NEEDED			"GTK+ runtime ymp�rist� joko puuttuu tai tarvitsee p�ivityst�.$\rOle hyv� ja asenna v${GTK_MIN_VERSION} tai uudempi GTK+ runtime"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Seuraava >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) on julkaistu GPL lisenssin alla. Lisenssi esitet��n t�ss� vain tiedotuksena. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Seuraava >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) on julkaistu GPL lisenssin alla. Lisenssi esitet��n t�ss� vain tiedotuksena. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Suoraviestint�ohjelma (required)"
+!define PIDGIN_SECTION_TITLE			"Pidgin Suoraviestint�ohjelma (required)"
 !define GTK_SECTION_TITLE			"GTK+ runtime ymp�rist� (required)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ Teemat"
 !define GTK_NOTHEME_SECTION_TITLE		"Ei teemaa"
 !define GTK_WIMP_SECTION_TITLE		"Wimp Teema"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Teema"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Teema"
-!define GAIM_SECTION_DESCRIPTION		"Gaimin ytimen tiedostot ja dll:t"
-!define GTK_SECTION_DESCRIPTION		"Monipohjainen GUI (k�ytt�j�ulkoasu) ty�kalupakki, Gaimin k�ytt�m�"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidfinin ytimen tiedostot ja dll:t"
+!define GTK_SECTION_DESCRIPTION		"Monipohjainen GUI (k�ytt�j�ulkoasu) ty�kalupakki, Pidginin k�ytt�m�"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ teemat voivat muuttaa GTK+ ohjelmien ulkon�k�� ja tuntua."
 !define GTK_NO_THEME_DESC			"�l� asenna GTK+ teemoja"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windowsiin mukautuminen) on GTK teema joka sulautuu hyvin Windowsin ymp�rist��n."
@@ -32,13 +32,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue teema."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Vanha versio GTK+ runtimest� l�ytynyt. Tahdotko p�ivitt��?$\rHuomio: Gaim ei v�ltt�m�tt� toimi mik�li j�t�t p�ivitt�m�tt�."
+!define GTK_UPGRADE_PROMPT			"Vanha versio GTK+ runtimest� l�ytynyt. Tahdotko p�ivitt��?$\rHuomio: $(^Name) ei v�ltt�m�tt� toimi mik�li j�t�t p�ivitt�m�tt�."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Vieraile Gaimin Windows -sivustolla"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Vieraile Pidinin Windows -sivustolla"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (vain poisto)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (vain poisto)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Virhe asennettaessa GTK+ runtime."
@@ -48,5 +48,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Sinulla ei ole valtuuksia asentaa GTK+ teemaa."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Asennuksen poistaja ei l�yt�nyt reksiterist� tietoja Gaimista.$\rOn todenn�k�ist� ett� joku muu k�ytt�j� on asentanut ohjelman."
-!define un.GAIM_UNINSTALL_ERROR_2		"Sinulla ei ole valtuuksia poistaa ohjelmaa."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Asennuksen poistaja ei l�yt�nyt reksiterist� tietoja Pidginista.$\rOn todenn�k�ist� ett� joku muu k�ytt�j� on asentanut ohjelman."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Sinulla ei ole valtuuksia poistaa ohjelmaa."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/french.nsh
--- a/pidgin/win32/nsis/translations/french.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/french.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -2,55 +2,55 @@
 ;;
 ;;  french.nsh
 ;;
-;;  French language strings for the Windows Gaim NSIS installer.
+;;  French language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Version 3
 ;;  Author: Eric Boumaour <zongo_fr@users.sourceforge.net>, 2003-2005.
 ;;
 
-; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
+; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
 ; langmacros.nsh when updating this file
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"Le programme d'installation est d�j� en cours d'ex�cution."
-!define GAIM_IS_RUNNING				"Une instance de Gaim est en cours d'ex�cution. Veuillez quitter Gaim et r�essayer."
+!define PIDGIN_IS_RUNNING				"Une instance de Pidgin est en cours d'ex�cution. Veuillez quitter Pidgin et r�essayer."
 !define GTK_INSTALLER_NEEDED			"Les biblioth�ques de l'environnement GTK+ ne sont pas install�es ou ont besoin d'une mise � jour.$\rVeuillez installer la version ${GTK_MIN_VERSION} ou plus r�cente des biblioth�ques GTK+."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Suivant >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) est disponible sous licence GNU General Public License (GPL). Le texte de licence suivant est fourni uniquement � titre informatif. $_CLICK" 
+!define PIDGIN_LICENSE_BUTTON			"Suivant >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) est disponible sous licence GNU General Public License (GPL). Le texte de licence suivant est fourni uniquement � titre informatif. $_CLICK" 
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim client de messagerie instantan�e (obligatoire)"
+!define PIDGIN_SECTION_TITLE			"Pidgin client de messagerie instantan�e (obligatoire)"
 !define GTK_SECTION_TITLE			"Biblioth�ques GTK+ (obligatoire)"
 !define GTK_THEMES_SECTION_TITLE		"Th�mes GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Pas de th�me"
 !define GTK_WIMP_SECTION_TITLE			"Th�me Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Th�me Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Th�me Light House Blue"
-!define GAIM_SHORTCUTS_SECTION_TITLE		"Raccourcis"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Bureau"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu D�marrer"
-!define GAIM_SECTION_DESCRIPTION		"Fichiers et DLLs de base de Gaim"
-!define GTK_SECTION_DESCRIPTION			"Un ensemble d'outils pour interfaces graphiques multi-plateforme, utilis� par Gaim"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Raccourcis"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Bureau"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Menu D�marrer"
+!define PIDGIN_SECTION_DESCRIPTION		"Fichiers et DLLs de base de Pidgin"
+!define GTK_SECTION_DESCRIPTION			"Un ensemble d'outils pour interfaces graphiques multi-plateforme, utilis� par Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION		"Les th�mes GTK+ permettent de changer l'aspect des applications GTK+."
 !define GTK_NO_THEME_DESC			"Ne pas installer de th�me GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (imitateur de Windows) est un th�me de GTK+ qui se fond dans l'environnement graphique de Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Th�me Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Th�me Lighthouseblue"
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Raccourcis pour lancer Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC		"Cr�er un raccourci pour Gaim sur le bureau"
-!define GAIM_STARTMENU_SHORTCUT_DESC		"Cr�er un raccourci pour Gaim dans le menu D�marrer"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Raccourcis pour lancer Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Cr�er un raccourci pour Pidgin sur le bureau"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Cr�er un raccourci pour Pidgin dans le menu D�marrer"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Une ancienne version des biblioth�ques GTK+ a �t� trouv�e. Voulez-vous la mettre � jour ?$\rNote : Gaim peut ne pas fonctionner si vous ne le faites pas."
+!define GTK_UPGRADE_PROMPT			"Une ancienne version des biblioth�ques GTK+ a �t� trouv�e. Voulez-vous la mettre � jour ?$\rNote : $(^Name) peut ne pas fonctionner si vous ne le faites pas."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visitez la page web de Gaim Windows" 
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visitez la page web de Pidgin Windows" 
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (supprimer uniquement)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (supprimer uniquement)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erreur lors de l'installation des biblioth�ques GTK+"
@@ -60,34 +60,34 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Vous n'avez pas les permissions pour installer un th�me GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Le programme de d�sinstallation n'a pas retrouv� les entr�es de Gaim dans la base de registres.$\rL'application a peut-�tre �t� install�e par un utilisateur diff�rent."
-!define un.GAIM_UNINSTALL_ERROR_2		"Vous n'avez pas les permissions pour supprimer cette application."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Le programme de d�sinstallation n'a pas retrouv� les entr�es de Pidgin dans la base de registres.$\rL'application a peut-�tre �t� install�e par un utilisateur diff�rent."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Vous n'avez pas les permissions pour supprimer cette application."
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"Correction orthographique"
-!define GAIM_SPELLCHECK_ERROR			"Erreur � l'installation du correcteur orthographique"
-!define GAIM_SPELLCHECK_DICT_ERROR		"Erreur � l'installation du dictionnaire pour le correcteur orthographique"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Correction orthogaphique. (Une connexion internet est n�cessaire pour son installation)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Correction orthographique"
+!define PIDGIN_SPELLCHECK_ERROR			"Erreur � l'installation du correcteur orthographique"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Erreur � l'installation du dictionnaire pour le correcteur orthographique"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Correction orthogaphique. (Une connexion internet est n�cessaire pour son installation)"
 !define ASPELL_INSTALL_FAILED			"�chec de l'installation"
-!define GAIM_SPELLCHECK_BRETON			"Breton"
-!define GAIM_SPELLCHECK_CATALAN			"Catalan"
-!define GAIM_SPELLCHECK_CZECH			"Tch�que"
-!define GAIM_SPELLCHECK_WELSH			"Gallois"
-!define GAIM_SPELLCHECK_DANISH			"Danois"
-!define GAIM_SPELLCHECK_GERMAN			"Allemand"
-!define GAIM_SPELLCHECK_GREEK			"Grec"
-!define GAIM_SPELLCHECK_ENGLISH			"Anglais"
-!define GAIM_SPELLCHECK_ESPERANTO		"Esp�ranto"
-!define GAIM_SPELLCHECK_SPANISH			"Espagnol"
-!define GAIM_SPELLCHECK_FAROESE			"F�ringien"
-!define GAIM_SPELLCHECK_FRENCH			"Fran�ais"
-!define GAIM_SPELLCHECK_ITALIAN			"Italien"
-!define GAIM_SPELLCHECK_DUTCH			"Hollandais"
-!define GAIM_SPELLCHECK_NORWEGIAN		"Norv�gien"
-!define GAIM_SPELLCHECK_POLISH			"Polonais"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portugais"
-!define GAIM_SPELLCHECK_ROMANIAN		"Roumain"
-!define GAIM_SPELLCHECK_RUSSIAN			"Russe"
-!define GAIM_SPELLCHECK_SLOVAK			"Slovaque"
-!define GAIM_SPELLCHECK_SWEDISH			"Su�dois"
-!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrainien"
+!define PIDGIN_SPELLCHECK_BRETON			"Breton"
+!define PIDGIN_SPELLCHECK_CATALAN			"Catalan"
+!define PIDGIN_SPELLCHECK_CZECH			"Tch�que"
+!define PIDGIN_SPELLCHECK_WELSH			"Gallois"
+!define PIDGIN_SPELLCHECK_DANISH			"Danois"
+!define PIDGIN_SPELLCHECK_GERMAN			"Allemand"
+!define PIDGIN_SPELLCHECK_GREEK			"Grec"
+!define PIDGIN_SPELLCHECK_ENGLISH			"Anglais"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esp�ranto"
+!define PIDGIN_SPELLCHECK_SPANISH			"Espagnol"
+!define PIDGIN_SPELLCHECK_FAROESE			"F�ringien"
+!define PIDGIN_SPELLCHECK_FRENCH			"Fran�ais"
+!define PIDGIN_SPELLCHECK_ITALIAN			"Italien"
+!define PIDGIN_SPELLCHECK_DUTCH			"Hollandais"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norv�gien"
+!define PIDGIN_SPELLCHECK_POLISH			"Polonais"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugais"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Roumain"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"Russe"
+!define PIDGIN_SPELLCHECK_SLOVAK			"Slovaque"
+!define PIDGIN_SPELLCHECK_SWEDISH			"Su�dois"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainien"
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/galician.nsh
--- a/pidgin/win32/nsis/translations/galician.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/galician.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  galician.nsh
 ;;
-;;  Galician language strings for the Windows Gaim NSIS installer.
+;;  Galician language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Translator: Ignacio Casal Quinteiro 
@@ -12,19 +12,19 @@
 !define GTK_INSTALLER_NEEDED			"O entorno de execuci�n de GTK+ falta ou necesita ser actualizado.$\rPor favor, instale a versi�n v${GTK_MIN_VERSION} do executable GTK+ ou algunha posterior."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Seguinte >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) distrib�ese baixo a licencia GPL. Esta licencia incl�ese aqu� s� con prop�sito informativo: $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Seguinte >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) distrib�ese baixo a licencia GPL. Esta licencia incl�ese aqu� s� con prop�sito informativo: $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Cliente de mensaxer�a instant�nea de Gaim (necesario)"
+!define PIDGIN_SECTION_TITLE			"Cliente de mensaxer�a instant�nea de Pidgin (necesario)"
 !define GTK_SECTION_TITLE			"Entorno de execuci�n de GTK+ (necesario)"
 !define GTK_THEMES_SECTION_TITLE		"Temas GTK+" 
 !define GTK_NOTHEME_SECTION_TITLE		"Sen tema"
 !define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
-!define GAIM_SECTION_DESCRIPTION		"Ficheiros e dlls principais de Core"
-!define GTK_SECTION_DESCRIPTION		"Unha suite de ferramentas GUI multiplataforma, utilizada por Gaim"
+!define PIDGIN_SECTION_DESCRIPTION		"Ficheiros e dlls principais de Core"
+!define GTK_SECTION_DESCRIPTION		"Unha suite de ferramentas GUI multiplataforma, utilizada por Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Os temas poden cambiar a apariencia de aplicaci�ns GTK+."
 !define GTK_NO_THEME_DESC			"Non instalar un tema GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) � un tema GTK que se mestura moi bien co entorno de escritorio de Windows."
@@ -32,13 +32,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema Lighthouseblue."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Atopouse unha versi�n antiga do executable de GTK+. �Desexa actualizala?$\rObservaci�n: Gaim non funcionar� a menos que o faga."
+!define GTK_UPGRADE_PROMPT			"Atopouse unha versi�n antiga do executable de GTK+. �Desexa actualizala?$\rObservaci�n: $(^Name) non funcionar� a menos que o faga."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visite a p�xina Web de Gaim Windows"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a p�xina Web de Pidgin Windows"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (s�lo eliminar)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (s�lo eliminar)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o executable GTK+."
@@ -48,5 +48,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Non ten permisos para instalar un tema GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "O desinstalador non puido atopar as entradas no rexistro de Gaim.$\r� probable que outro usuario instalara a aplicaci�n."
-!define un.GAIM_UNINSTALL_ERROR_2         "Non ten permisos para desinstalar esta aplicaci�n."
+!define un.PIDGIN_UNINSTALL_ERROR_1         "O desinstalador non puido atopar as entradas no rexistro de Pidgin.$\r� probable que outro usuario instalara a aplicaci�n."
+!define un.PIDGIN_UNINSTALL_ERROR_2         "Non ten permisos para desinstalar esta aplicaci�n."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/german.nsh
--- a/pidgin/win32/nsis/translations/german.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/german.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -2,7 +2,7 @@
 ;;
 ;;  german.nsh
 ;;
-;;  German language strings for the Windows Gaim NSIS installer.
+;;  German language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: Bjoern Voigt <bjoern@cs.tu-berlin.de>, 2006.
@@ -11,43 +11,43 @@
  
 ; Startup checks
 !define INSTALLER_IS_RUNNING			"Der Installer l�uft schon."
-!define GAIM_IS_RUNNING				"Eine Instanz von Gaim l�uft momentan schon. Beenden Sie Gaim und versuchen Sie es nochmal."
+!define PIDGIN_IS_RUNNING				"Eine Instanz von Pidgin l�uft momentan schon. Beenden Sie Pidgin und versuchen Sie es nochmal."
 !define GTK_INSTALLER_NEEDED			"Die GTK+ Runtime Umgebung fehlt entweder oder mu� aktualisiert werden.$\rBitte installieren Sie v${GTK_MIN_VERSION} oder h�her der GTK+ Runtime"
  
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Weiter >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) wird unter der GNU General Public License (GPL) ver�ffentlicht. Die Lizenz dient hier nur der Information. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Weiter >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) wird unter der GNU General Public License (GPL) ver�ffentlicht. Die Lizenz dient hier nur der Information. $_CLICK"
  
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (erforderlich)"
+!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (erforderlich)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Umgebung (erforderlich)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ Themen"
 !define GTK_NOTHEME_SECTION_TITLE		"Kein Thema"
 !define GTK_WIMP_SECTION_TITLE		"Wimp Thema"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Thema"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Thema"
-!define GAIM_SHORTCUTS_SECTION_TITLE	"Verkn�pfungen"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmen�"
-!define GAIM_SECTION_DESCRIPTION		"Gaim-Basisdateien und -DLLs"
-!define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform-GUI-Toolkit, verwendet von Gaim"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE	"Verkn�pfungen"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmen�"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidgin-Basisdateien und -DLLs"
+!define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform-GUI-Toolkit, verwendet von Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themen k�nnen Aussehen und Bedienung von GTK+ Anwendungen ver�ndern."
 !define GTK_NO_THEME_DESC			"Installiere kein GTK+ Thema"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows Imitator) ist ein GTK Theme, das sich besonders gut in den Windows Desktop integriert."
 !define GTK_BLUECURVE_THEME_DESC		"Das Bluecurve Thema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Das Lighthouseblue Thema."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Verkn�pfungen zum Starten von Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC   "Erstellt eine Verkn�pfung zu Gaim auf dem Desktop"
-!define GAIM_STARTMENU_SHORTCUT_DESC   "Erstellt einen Eintrag f�r Gaim im Startmen�"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Verkn�pfungen zum Starten von Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC   "Erstellt eine Verkn�pfung zu Pidgin auf dem Desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Erstellt einen Eintrag f�r Pidgin im Startmen�"
  
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. M�chten Sie aktualisieren?$\rHinweis: Gaim funktioniert evtl. nicht, wenn Sie nicht aktualisieren."
+!define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. M�chten Sie aktualisieren?$\rHinweis: $(^Name) funktioniert evtl. nicht, wenn Sie nicht aktualisieren."
  
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Besuchen Sie die Windows Gaim Webseite"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Besuchen Sie die Windows Pidgin Webseite"
  
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (nur entfernen)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (nur entfernen)"
  
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fehler beim Installieren der GTK+ Runtime."
@@ -57,34 +57,34 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Sie haben keine Berechtigung, um ein GTK+ Theme zu installieren."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Der Deinstaller konnte keine Registrierungsschl�ssel f�r Gaim finden.$\rEs ist wahrscheinlich, da� ein anderer Benutzer diese Anwendunng installiert hat."
-!define un.GAIM_UNINSTALL_ERROR_2		"Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Der Deinstaller konnte keine Registrierungsschl�ssel f�r Pidgin finden.$\rEs ist wahrscheinlich, da� ein anderer Benutzer diese Anwendunng installiert hat."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"Unterst�tzung f�r Rechtschreibkontrolle"
-!define GAIM_SPELLCHECK_ERROR			"Fehler bei der Installation der Rechtschreibkontrolle"
-!define GAIM_SPELLCHECK_DICT_ERROR		"Fehler bei der Installation des W�rterbuches f�r die Rechtschreibkontrolle"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Unterst�tzung f�r Rechtschreibkontrolle.  (F�r die Installation ist eine Internet-Verbindung n�tig)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Unterst�tzung f�r Rechtschreibkontrolle"
+!define PIDGIN_SPELLCHECK_ERROR			"Fehler bei der Installation der Rechtschreibkontrolle"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Fehler bei der Installation des W�rterbuches f�r die Rechtschreibkontrolle"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Unterst�tzung f�r Rechtschreibkontrolle.  (F�r die Installation ist eine Internet-Verbindung n�tig)"
 !define ASPELL_INSTALL_FAILED			"Installation gescheitert"
-!define GAIM_SPELLCHECK_BRETON			"Bretonisch"
-!define GAIM_SPELLCHECK_CATALAN			"Katalanisch"
-!define GAIM_SPELLCHECK_CZECH			"Tschechisch"
-!define GAIM_SPELLCHECK_WELSH			"Walisisch"
-!define GAIM_SPELLCHECK_DANISH			"D�nisch"
-!define GAIM_SPELLCHECK_GERMAN			"Deutsch"
-!define GAIM_SPELLCHECK_GREEK			"Griechisch"
-!define GAIM_SPELLCHECK_ENGLISH			"Englisch"
-!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
-!define GAIM_SPELLCHECK_SPANISH			"Spanisch"
-!define GAIM_SPELLCHECK_FAROESE			"Far�ersprache"
-!define GAIM_SPELLCHECK_FRENCH			"Franz�sisch"
-!define GAIM_SPELLCHECK_ITALIAN			"Italienisch"
-!define GAIM_SPELLCHECK_DUTCH			"Holl�ndisch"
-!define GAIM_SPELLCHECK_NORWEGIAN		"Norwegisch"
-!define GAIM_SPELLCHECK_POLISH			"Polnisch"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portugiesisch"
-!define GAIM_SPELLCHECK_ROMANIAN		"Rum�nisch"
-!define GAIM_SPELLCHECK_RUSSIAN			"Russisch"
-!define GAIM_SPELLCHECK_SLOVAK			"Slowakisch"
-!define GAIM_SPELLCHECK_SWEDISH			"Schwedisch"
-!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrainisch"
+!define PIDGIN_SPELLCHECK_BRETON			"Bretonisch"
+!define PIDGIN_SPELLCHECK_CATALAN			"Katalanisch"
+!define PIDGIN_SPELLCHECK_CZECH			"Tschechisch"
+!define PIDGIN_SPELLCHECK_WELSH			"Walisisch"
+!define PIDGIN_SPELLCHECK_DANISH			"D�nisch"
+!define PIDGIN_SPELLCHECK_GERMAN			"Deutsch"
+!define PIDGIN_SPELLCHECK_GREEK			"Griechisch"
+!define PIDGIN_SPELLCHECK_ENGLISH			"Englisch"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH			"Spanisch"
+!define PIDGIN_SPELLCHECK_FAROESE			"Far�ersprache"
+!define PIDGIN_SPELLCHECK_FRENCH			"Franz�sisch"
+!define PIDGIN_SPELLCHECK_ITALIAN			"Italienisch"
+!define PIDGIN_SPELLCHECK_DUTCH			"Holl�ndisch"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norwegisch"
+!define PIDGIN_SPELLCHECK_POLISH			"Polnisch"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugiesisch"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Rum�nisch"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"Russisch"
+!define PIDGIN_SPELLCHECK_SLOVAK			"Slowakisch"
+!define PIDGIN_SPELLCHECK_SWEDISH			"Schwedisch"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainisch"
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/hebrew.nsh
--- a/pidgin/win32/nsis/translations/hebrew.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/hebrew.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  hebrew.nsh
 ;;
-;;  Hebrew language strings for the Windows Gaim NSIS installer.
+;;  Hebrew language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1255
 ;;
 ;;  Author: Eugene Shcherbina <eugene@websterworlds.com>
@@ -12,18 +12,18 @@
 !define GTK_INSTALLER_NEEDED			".�� ����� �� ����� ������ GTK+ �����$\r����� ���� v${GTK_MIN_VERSION} .GTK+ �� ����� ���� �� �����"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"��� >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) .������� ���� ��� ����� ���� ���� .GPL ������ ��� ������ $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"��� >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) .������� ���� ��� ����� ���� ���� .GPL ������ ��� ������ $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"(����) .GAIM �����"
+!define PIDGIN_SECTION_TITLE			"(����) .Pidgin �����"
 !define GTK_SECTION_TITLE			"(����) .GTK+ �����"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ ����� ��"
 !define GTK_NOTHEME_SECTION_TITLE		"��� ����"
 !define GTK_WIMP_SECTION_TITLE		"Wimp ����"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve ����"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue ����"
-!define GAIM_SECTION_DESCRIPTION		".������� DLL-� GAIM ����"
+!define PIDGIN_SECTION_DESCRIPTION		".������� DLL-� Pidgin ����"
 !define GTK_SECTION_DESCRIPTION		".�����-���������� GUI ���"
 !define GTK_THEMES_SECTION_DESCRIPTION	" .GTK+ ������ ����� �� ����� �� ������ GTK+ �����"
 !define GTK_NO_THEME_DESC			".GTK+ �� ������ ���� ��"
@@ -32,13 +32,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	".Lighthouseblue����� ��"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"A?�����. ����� GTK+ ����� ���� ��$\rNote: .���� �� ����� �� �� GAIM"
+!define GTK_UPGRADE_PROMPT			"A?�����. ����� GTK+ ����� ���� ��$\rNote: .���� �� ����� �� �� $(^Name)"
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		".GAIM���� ���� ��"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		".Pidgin���� ���� ��"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"GAIM (����� ����)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (����� ����)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			".GTK+ ����� ������ �����"
@@ -48,5 +48,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		".GTK+ ��� �� ���� ������ ���� ��"
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		".GTK+ ������ �� ���� �� �������� ��$\r.���� ����� ������� ��� ����� �� ������ ����"
-!define un.GAIM_UNINSTALL_ERROR_2		".��� �� ���� ����� ����� ���"
+!define un.PIDGIN_UNINSTALL_ERROR_1		".GTK+ ������ �� ���� �� �������� ��$\r.���� ����� ������� ��� ����� �� ������ ����"
+!define un.PIDGIN_UNINSTALL_ERROR_2		".��� �� ���� ����� ����� ���"
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/hungarian.nsh
--- a/pidgin/win32/nsis/translations/hungarian.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/hungarian.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  hungarian.nsh
 ;;
-;;  Default language strings for the Windows Gaim NSIS installer.
+;;  Default language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1250
 ;;
 ;;  Authors: Sutto Zoltan <suttozoltan@chello.hu>, 2003
@@ -11,42 +11,42 @@
 ; Startup Checks
 !define GTK_INSTALLER_NEEDED			"A GTK+ futtat� k�rnyezet hi�nyzik vagy friss�t�se sz�ks�ges.$\rK�rem telep�tse a v${GTK_MIN_VERSION} vagy magasabb verzi�j� GTK+ futtat� k�rnyezetet."
 !define INSTALLER_IS_RUNNING			"A telep�to m�r fut."
-!define GAIM_IS_RUNNING				"Jelenleg fut a Gaim egy p�ld�nya. L�pjen ki a Gaimb�l �s azut�n pr�b�lja �jra."
+!define PIDGIN_IS_RUNNING				"Jelenleg fut a Pidgin egy p�ld�nya. L�pjen ki a Pidginb�l �s azut�n pr�b�lja �jra."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Tov�bb >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"A $(^Name) a GNU General Public License (GPL) alatt ker�l terjeszt�sre. Az itt olvashat� licenc csak t�j�koztat�si c�lt szolg�l. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Tov�bb >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"A $(^Name) a GNU General Public License (GPL) alatt ker�l terjeszt�sre. Az itt olvashat� licenc csak t�j�koztat�si c�lt szolg�l. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim azonnali �zeno kliens (sz�ks�ges)"
+!define PIDGIN_SECTION_TITLE			"Pidgin azonnali �zeno kliens (sz�ks�ges)"
 !define GTK_SECTION_TITLE			"GTK+ futtat� k�rnyezet (sz�ks�ges)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ t�m�k"
 !define GTK_NOTHEME_SECTION_TITLE		"Nincs t�ma"
 !define GTK_WIMP_SECTION_TITLE			"Wimp t�ma"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve t�ma"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue t�ma"
-!define GAIM_SHORTCUTS_SECTION_TITLE		"Parancsikonok"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Asztal"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Men�"
-!define GAIM_SECTION_DESCRIPTION		"Gaim f�jlok �s dll-ek"
-!define GTK_SECTION_DESCRIPTION			"A Gaim �ltal haszn�lt t�bbplatformos grafikus k�rnyezet"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Parancsikonok"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Asztal"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Start Men�"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidgin f�jlok �s dll-ek"
+!define GTK_SECTION_DESCRIPTION			"A Pidgin �ltal haszn�lt t�bbplatformos grafikus k�rnyezet"
 !define GTK_THEMES_SECTION_DESCRIPTION		"A GTK+ t�m�k megv�ltoztatj�k a GTK+ alkalmaz�sok kin�zet�t."
 !define GTK_NO_THEME_DESC			"Ne telep�tse a GTK+ t�m�kat"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows ut�nzat) egy Windows k�rnyezettel harmoniz�l� GTK t�ma."
 !define GTK_BLUECURVE_THEME_DESC		"A Bluecurve t�ma."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC		"A Lighthouseblue t�ma."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Parancsikonok a Gaim ind�t�s�hoz"
-!define GAIM_DESKTOP_SHORTCUT_DESC		"Parancsikon l�trehoz�sa a Gaimhoz az asztalon"
-!define GAIM_STARTMENU_SHORTCUT_DESC		"Start Men� bejegyz�s l�trehoz�sa a Gaimhoz"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Parancsikonok a Pidgin ind�t�s�hoz"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Parancsikon l�trehoz�sa a Pidginhoz az asztalon"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Start Men� bejegyz�s l�trehoz�sa a Pidginhoz"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Egy r�gi verzi�j� GTK+ futtat�k�rnyezet van telep�tve. K�v�nja friss�teni?$\rMegjegyz�s: a Gaim nem fog muk�dni, ha nem friss�ti."
+!define GTK_UPGRADE_PROMPT			"Egy r�gi verzi�j� GTK+ futtat�k�rnyezet van telep�tve. K�v�nja friss�teni?$\rMegjegyz�s: a $(^Name) nem fog muk�dni, ha nem friss�ti."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"A Windows Gaim weboldal�nak felkeres�se"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"A Windows Pidgin weboldal�nak felkeres�se"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (csak elt�vol�t�s)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (csak elt�vol�t�s)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Hiba a GTK+ futtat�k�rnyezet telep�t�se k�zben."
@@ -56,35 +56,35 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Nincs jogosults�ga a GTK+ t�m�k telep�t�s�hez."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Az elt�vol�t� nem tal�lta a Gaim registry bejegyz�seket.$\rVal�sz�n�leg egy m�sik felhaszn�l� telep�tette az alkalmaz�st."
-!define un.GAIM_UNINSTALL_ERROR_2		"Nincs jogosults�ga az alkalmaz�s elt�vol�t�s�hoz."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Az elt�vol�t� nem tal�lta a Pidgin registry bejegyz�seket.$\rVal�sz�n�leg egy m�sik felhaszn�l� telep�tette az alkalmaz�st."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Nincs jogosults�ga az alkalmaz�s elt�vol�t�s�hoz."
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"Helyes�r�sellenorz�s t�mogat�sa"
-!define GAIM_SPELLCHECK_ERROR			"Hiba a helyes�r�sellenorz�s telep�t�se k�zben"
-!define GAIM_SPELLCHECK_DICT_ERROR		"Hiba a helyes�r�sellenorz�si sz�t�r telep�t�se k�zben"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Helyes�r�sellenorz�s t�mogat�sa. (Internetkapcsolat sz�ks�ges a telep�t�shez)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Helyes�r�sellenorz�s t�mogat�sa"
+!define PIDGIN_SPELLCHECK_ERROR			"Hiba a helyes�r�sellenorz�s telep�t�se k�zben"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Hiba a helyes�r�sellenorz�si sz�t�r telep�t�se k�zben"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Helyes�r�sellenorz�s t�mogat�sa. (Internetkapcsolat sz�ks�ges a telep�t�shez)"
 !define ASPELL_INSTALL_FAILED			"A telep�t�s sikertelen"
-!define GAIM_SPELLCHECK_BRETON			"Breton"
-!define GAIM_SPELLCHECK_CATALAN			"Katal�n"
-!define GAIM_SPELLCHECK_CZECH			"Cseh"
-!define GAIM_SPELLCHECK_WELSH			"Walesi"
-!define GAIM_SPELLCHECK_DANISH			"D�n"
-!define GAIM_SPELLCHECK_GERMAN			"N�met"
-!define GAIM_SPELLCHECK_GREEK			"G�r�g"
-!define GAIM_SPELLCHECK_ENGLISH			"Angol"
-!define GAIM_SPELLCHECK_ESPERANTO		"Eszperant�"
-!define GAIM_SPELLCHECK_SPANISH			"Spanyol"
-!define GAIM_SPELLCHECK_FAROESE			"Far�ai"
-!define GAIM_SPELLCHECK_FRENCH			"Francia"
-!define GAIM_SPELLCHECK_ITALIAN			"Olasz"
-!define GAIM_SPELLCHECK_DUTCH			"Holland"
-!define GAIM_SPELLCHECK_NORWEGIAN		"Norv�g"
-!define GAIM_SPELLCHECK_POLISH			"Lengyel"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portug�l"
-!define GAIM_SPELLCHECK_ROMANIAN		"Rom�n"
-!define GAIM_SPELLCHECK_RUSSIAN			"Orosz"
-!define GAIM_SPELLCHECK_SLOVAK			"Szlov�k"
-!define GAIM_SPELLCHECK_SWEDISH			"Sv�d"
-!define GAIM_SPELLCHECK_UKRAINIAN		"Ukr�n"
+!define PIDGIN_SPELLCHECK_BRETON			"Breton"
+!define PIDGIN_SPELLCHECK_CATALAN			"Katal�n"
+!define PIDGIN_SPELLCHECK_CZECH			"Cseh"
+!define PIDGIN_SPELLCHECK_WELSH			"Walesi"
+!define PIDGIN_SPELLCHECK_DANISH			"D�n"
+!define PIDGIN_SPELLCHECK_GERMAN			"N�met"
+!define PIDGIN_SPELLCHECK_GREEK			"G�r�g"
+!define PIDGIN_SPELLCHECK_ENGLISH			"Angol"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Eszperant�"
+!define PIDGIN_SPELLCHECK_SPANISH			"Spanyol"
+!define PIDGIN_SPELLCHECK_FAROESE			"Far�ai"
+!define PIDGIN_SPELLCHECK_FRENCH			"Francia"
+!define PIDGIN_SPELLCHECK_ITALIAN			"Olasz"
+!define PIDGIN_SPELLCHECK_DUTCH			"Holland"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norv�g"
+!define PIDGIN_SPELLCHECK_POLISH			"Lengyel"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portug�l"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Rom�n"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"Orosz"
+!define PIDGIN_SPELLCHECK_SLOVAK			"Szlov�k"
+!define PIDGIN_SPELLCHECK_SWEDISH			"Sv�d"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukr�n"
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/italian.nsh
--- a/pidgin/win32/nsis/translations/italian.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/italian.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  italian.nsh
 ;;
-;;  Italian language strings for the Windows Gaim NSIS installer.
+;;  Italian language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: Claudio Satriano <satriano@na.infn.it>, 2003.
@@ -12,19 +12,19 @@
 !define GTK_INSTALLER_NEEDED			"L'ambiente di runtime GTK+ non � presente o deve essere aggiornato.$\rInstallare GTK+ versione ${GTK_MIN_VERSION} o maggiore"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Avanti >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) � distribuito sotto licenza GPL. La licenza � mostrata qui solamente a scopo informativo. $_CLICK" 
+!define PIDGIN_LICENSE_BUTTON			"Avanti >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) � distribuito sotto licenza GPL. La licenza � mostrata qui solamente a scopo informativo. $_CLICK" 
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim - Client per Messaggi Immediati (richiesto)"
+!define PIDGIN_SECTION_TITLE			"Pidgin - Client per Messaggi Immediati (richiesto)"
 !define GTK_SECTION_TITLE			"Ambiente di Runtime GTK+ (richiesto)"
 !define GTK_THEMES_SECTION_TITLE		"Temi GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Nessun Tema"
 !define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
-!define GAIM_SECTION_DESCRIPTION		"File principali di Gaim e dll"
-!define GTK_SECTION_DESCRIPTION		"Un toolkit multipiattaforma per interfacce grafiche, usato da Gaim"
+!define PIDGIN_SECTION_DESCRIPTION		"File principali di Pidgin e dll"
+!define GTK_SECTION_DESCRIPTION		"Un toolkit multipiattaforma per interfacce grafiche, usato da Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"I temi GTK+ modificano l'aspetto delle applicazioni GTK+."
 !define GTK_NO_THEME_DESC			"Non installare nessun tema GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) � un tema GTK che si adatta bene all'aspetto di Windows."
@@ -32,13 +32,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Il tema Lighthouseblue."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"� stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: Gaim potrebbe non funzionare senza l'aggiornamento."
+!define GTK_UPGRADE_PROMPT			"� stata trovata una versione precedente di GTK+. Vuoi aggiornarla?$\rNota: $(^Name) potrebbe non funzionare senza l'aggiornamento."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Gaim per Windows" 
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina web di Pidgin per Windows" 
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (solo rimozione)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (solo rimozione)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Errore di installazione di GTK+."
@@ -48,5 +48,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Non hai il permesso per installare un tema GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "Il programma di rimozione non � in grado di trovare le voci di registro per Gaim.$\rProbabilmente un altro utente ha installato questa applicazione."
-!define un.GAIM_UNINSTALL_ERROR_2         "Non hai il permesso per rimuovere questa applicazione."
+!define un.PIDGIN_UNINSTALL_ERROR_1         "Il programma di rimozione non � in grado di trovare le voci di registro per Pidgin.$\rProbabilmente un altro utente ha installato questa applicazione."
+!define un.PIDGIN_UNINSTALL_ERROR_2         "Non hai il permesso per rimuovere questa applicazione."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/japanese.nsh
--- a/pidgin/win32/nsis/translations/japanese.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/japanese.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -2,7 +2,7 @@
 ;;
 ;;  japanese.nsh
 ;;
-;;  Japanese language strings for the Windows Gaim NSIS installer.
+;;  Japanese language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 932
 ;;
 ;;  Author: "Takeshi Kurosawa" <t-kuro@abox23.so-net.ne.jp>
@@ -11,43 +11,43 @@
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"�C���X�g�[�������Ɏ��s����Ă��܂�"
-!define GAIM_IS_RUNNING				"Gaim �����s����Ă��܂��BGaim ���I�����Ă���ēx���s���Ă�������"
+!define PIDGIN_IS_RUNNING				"Pidgin �����s����Ă��܂��BPidgin ���I�����Ă���ēx���s���Ă�������"
 !define GTK_INSTALLER_NEEDED			"GTK+�����^�C���‹����������������̓A�b�v�O���[�h����K�v������܂��B$\rv${GTK_MIN_VERSION}�������͂���ȏ��GTK+�����^�C�����C���X�g�[�����Ă��������B"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"���� >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name)��GPL���C�Z���X�̌��Ń����[�X����Ă��܂��B���C�Z���X�͂����ɎQ�l�̂��߂����ɒ񋟂���Ă��܂��B $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"���� >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name)��GPL���C�Z���X�̌��Ń����[�X����Ă��܂��B���C�Z���X�͂����ɎQ�l�̂��߂����ɒ񋟂���Ă��܂��B $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim�C���X�^���g���b�Z���W�� (�K�{)"
+!define PIDGIN_SECTION_TITLE			"Pidgin�C���X�^���g���b�Z���W�� (�K�{)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (�K�{)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+�̃e�[�}"
 !define GTK_NOTHEME_SECTION_TITLE		"�e�[�}�Ȃ�"
 !define GTK_WIMP_SECTION_TITLE			"Wimp�e�[�}"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve�e�[�}"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue�e�[�}"
-!define GAIM_SHORTCUTS_SECTION_TITLE		"�V���[�g�J�b�g"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"�f�X�N�g�b�v"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"�X�^�[�g�A�b�v"
-!define GAIM_SECTION_DESCRIPTION		"Gaim�̊j�ƂȂ�t�@�C����dll"
-!define GTK_SECTION_DESCRIPTION			"Gaim�̎g���Ă���}���`�v���b�g�t�H�[��GUI�c�[���L�b�g"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"�V���[�g�J�b�g"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"�f�X�N�g�b�v"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"�X�^�[�g�A�b�v"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidgin�̊j�ƂȂ�t�@�C����dll"
+!define GTK_SECTION_DESCRIPTION			"Pidgin�̎g���Ă���}���`�v���b�g�t�H�[��GUI�c�[���L�b�g"
 !define GTK_THEMES_SECTION_DESCRIPTION		"GTK+�̃e�[�}�́AGTK+�̃A�v���P�[�V�����̃��b�N���t�B�[����ς����܂��B"
 !define GTK_NO_THEME_DESC			"GTK+�̃e�[�}���C���X�g�[�����Ȃ�"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator)��Windows�̃f�X�N�g�b�v�‹��Ƃ悭���a�����e�[�}�ł��B"
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve�e�[�}�B"
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblue�e�[�}�B"
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Gaim �����s���邽�߂̃V���[�g�J�b�g"
-!define GAIM_DESKTOP_SHORTCUT_DESC		"�f�X�N�g�b�v�� Gaim �̃V���[�g�J�b�g���쐬����"
-!define GAIM_STARTMENU_SHORTCUT_DESC		"�X�^�[�g���j���[�� Gaim �̍��ڂ��쐬����"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Pidgin �����s���邽�߂̃V���[�g�J�b�g"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"�f�X�N�g�b�v�� Pidgin �̃V���[�g�J�b�g���쐬����"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"�X�^�[�g���j���[�� Pidgin �̍��ڂ��쐬����"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"�Â��o�[�W������GTK+�����^�C�������‚���܂����B�A�b�v�O���[�h���܂���?$\r����: Gaim�̓A�b�v�O���[�h���Ȃ����蓮���Ȃ��ł��傤�B"
+!define GTK_UPGRADE_PROMPT			"�Â��o�[�W������GTK+�����^�C�������‚���܂����B�A�b�v�O���[�h���܂���?$\r����: $(^Name)�̓A�b�v�O���[�h���Ȃ����蓮���Ȃ��ł��傤�B"
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Windows Gaim��Web�y�[�W��K����������B"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Windows Pidgin��Web�y�[�W��K����������B"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (�폜�̂�)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (�폜�̂�)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+�����^�C���̃C���X�g�[���ŃG���[���������܂����B"
@@ -57,35 +57,35 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"���Ȃ���GTK+�̃e�[�}���C���X�g�[�����錠���������Ă��܂���B"
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"�A���C���X�g�[����Gaim�̃��W�X�g���G���g���𔭌��ł��܂���ł����B$\r�����炭�ʂ̃��[�U�ɃC���X�g�[�����ꂽ�ł��傤�B"
-!define un.GAIM_UNINSTALL_ERROR_2		"���Ȃ��͂��̃A�v���P�[�V�������A���C���X�g�[�����錠���������Ă��܂���B"
+!define un.PIDGIN_UNINSTALL_ERROR_1		"�A���C���X�g�[����Pidgin�̃��W�X�g���G���g���𔭌��ł��܂���ł����B$\r�����炭�ʂ̃��[�U�ɃC���X�g�[�����ꂽ�ł��傤�B"
+!define un.PIDGIN_UNINSTALL_ERROR_2		"���Ȃ��͂��̃A�v���P�[�V�������A���C���X�g�[�����錠���������Ă��܂���B"
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"�X�y���`�F�b�N�̃T�|�[�g"
-!define GAIM_SPELLCHECK_ERROR			"�X�y���`�F�b�N�̃C���X�g�[���Ɏ��s���܂���"
-!define GAIM_SPELLCHECK_DICT_ERROR		"�X�y���`�F�b�N�����̃C���X�g�[���Ɏ��s���܂����B"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"�X�y���`�F�b�N�̃T�|�[�g  (�C���^�[�l�b�g�ڑ����C���X�g�[���ɕK�v�ł�)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"�X�y���`�F�b�N�̃T�|�[�g"
+!define PIDGIN_SPELLCHECK_ERROR			"�X�y���`�F�b�N�̃C���X�g�[���Ɏ��s���܂���"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"�X�y���`�F�b�N�����̃C���X�g�[���Ɏ��s���܂����B"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"�X�y���`�F�b�N�̃T�|�[�g  (�C���^�[�l�b�g�ڑ����C���X�g�[���ɕK�v�ł�)"
 !define ASPELL_INSTALL_FAILED			"�C���X�g�[���Ɏ��s���܂���"
-!define GAIM_SPELLCHECK_BRETON			"�u���^�[�j����"
-!define GAIM_SPELLCHECK_CATALAN			"�J�^���[�j����"
-!define GAIM_SPELLCHECK_CZECH			"�`�F�R��"
-!define GAIM_SPELLCHECK_WELSH			"�E�F�[���Y��"
-!define GAIM_SPELLCHECK_DANISH			"�f���}�[�N��"
-!define GAIM_SPELLCHECK_GERMAN			"�h�C�c��"
-!define GAIM_SPELLCHECK_GREEK			"�M���V����"
-!define GAIM_SPELLCHECK_ENGLISH			"�p��"
-!define GAIM_SPELLCHECK_ESPERANTO		"�G�X�y�����g��"
-!define GAIM_SPELLCHECK_SPANISH			"�X�y�C����"
-!define GAIM_SPELLCHECK_FAROESE			"�t�F���[��"
-!define GAIM_SPELLCHECK_FRENCH			"�t�����X��"
-!define GAIM_SPELLCHECK_ITALIAN			"�C�^���A��"
-!define GAIM_SPELLCHECK_DUTCH			"�I�����_��"
-!define GAIM_SPELLCHECK_NORWEGIAN		"�m���E�F�[��"
-!define GAIM_SPELLCHECK_POLISH			"�|�[�����h��"
-!define GAIM_SPELLCHECK_PORTUGUESE		"�|���g�K����"
-!define GAIM_SPELLCHECK_ROMANIAN		"���[�}�j�A��"
-!define GAIM_SPELLCHECK_RUSSIAN			"���V�A��"
-!define GAIM_SPELLCHECK_SLOVAK			"�X�����@�L�A��"
-!define GAIM_SPELLCHECK_SWEDISH			"�X�E�F�[�f����"
-!define GAIM_SPELLCHECK_UKRAINIAN		"�E�N���C�i��"
+!define PIDGIN_SPELLCHECK_BRETON			"�u���^�[�j����"
+!define PIDGIN_SPELLCHECK_CATALAN			"�J�^���[�j����"
+!define PIDGIN_SPELLCHECK_CZECH			"�`�F�R��"
+!define PIDGIN_SPELLCHECK_WELSH			"�E�F�[���Y��"
+!define PIDGIN_SPELLCHECK_DANISH			"�f���}�[�N��"
+!define PIDGIN_SPELLCHECK_GERMAN			"�h�C�c��"
+!define PIDGIN_SPELLCHECK_GREEK			"�M���V����"
+!define PIDGIN_SPELLCHECK_ENGLISH			"�p��"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"�G�X�y�����g��"
+!define PIDGIN_SPELLCHECK_SPANISH			"�X�y�C����"
+!define PIDGIN_SPELLCHECK_FAROESE			"�t�F���[��"
+!define PIDGIN_SPELLCHECK_FRENCH			"�t�����X��"
+!define PIDGIN_SPELLCHECK_ITALIAN			"�C�^���A��"
+!define PIDGIN_SPELLCHECK_DUTCH			"�I�����_��"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"�m���E�F�[��"
+!define PIDGIN_SPELLCHECK_POLISH			"�|�[�����h��"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"�|���g�K����"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"���[�}�j�A��"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"���V�A��"
+!define PIDGIN_SPELLCHECK_SLOVAK			"�X�����@�L�A��"
+!define PIDGIN_SPELLCHECK_SWEDISH			"�X�E�F�[�f����"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"�E�N���C�i��"
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/korean.nsh
--- a/pidgin/win32/nsis/translations/korean.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/korean.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  korean.nsh
 ;;
-;;  Korean language strings for the Windows Gaim NSIS installer.
+;;  Korean language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 949
 ;;
 ;;  Author: Kyung-uk Son <vvs740@chol.com>
@@ -11,14 +11,14 @@
 !define GTK_INSTALLER_NEEDED			"GTK+ ��Ÿ�� ȯ�濡 ������ �ְų� ���׷��̵尡 �ʿ��մϴ�.$\rGTK+ ��Ÿ�� ȯ���� v${GTK_MIN_VERSION}�̳� �� �̻� �������� ��ġ���ּ���."
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"���� �޽��� (�ʼ�)"
+!define PIDGIN_SECTION_TITLE			"���� �޽��� (�ʼ�)"
 !define GTK_SECTION_TITLE			"GTK+ ��Ÿ�� ȯ�� (�ʼ�)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ �׸�"
 !define GTK_NOTHEME_SECTION_TITLE		"�׸� ����"
 !define GTK_WIMP_SECTION_TITLE		"���� �׸�"
 !define GTK_BLUECURVE_SECTION_TITLE		"����Ŀ�� �׸�"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue �׸�"
-!define GAIM_SECTION_DESCRIPTION		"������ �ھ� ���ϰ� dll"
+!define PIDGIN_SECTION_DESCRIPTION		"������ �ھ� ���ϰ� dll"
 !define GTK_SECTION_DESCRIPTION		"������ ����ϴ� ��Ƽ �÷��� GUI ��Ŷ"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ �׸��� GTK+ ���α׷��� ������� �ٲ� �� �ֽ��ϴ�."
 !define GTK_NO_THEME_DESC			"GTK+ �׸��� ��ġ���� �ʽ��ϴ�."
@@ -29,8 +29,8 @@
 ; GTK+ Directory Page
 !define GTK_UPGRADE_PROMPT			"���� ���� GTK+ ��Ÿ���� ã�ҽ��ϴ�. ���׷��̵��ұ��?$\rNote: ���׷��̵����� ������ ������ �������� ���� ���� �ֽ��ϴ�."
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (remove only)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (remove only)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ ��Ÿ�� ��ġ �� ���� �߻�."
@@ -40,5 +40,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"GTK+ �׸��� ��ġ�� ������ �����ϴ�."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "���ν��緯�� ������ ������Ʈ�� ��Ʈ���� ã�� �� �����ϴ�.$\r�� ���α׷��� �ٸ� ���� �������� ��ġ�� �� �����ϴ�."
-!define un.GAIM_UNINSTALL_ERROR_2         "�� ���α׷��� ������ �� �ִ� ������ �����ϴ�."
+!define un.PIDGIN_UNINSTALL_ERROR_1         "���ν��緯�� ������ ������Ʈ�� ��Ʈ���� ã�� �� �����ϴ�.$\r�� ���α׷��� �ٸ� ���� �������� ��ġ�� �� �����ϴ�."
+!define un.PIDGIN_UNINSTALL_ERROR_2         "�� ���α׷��� ������ �� �ִ� ������ �����ϴ�."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/kurdish.nsh
--- a/pidgin/win32/nsis/translations/kurdish.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/kurdish.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,53 +1,53 @@
 ;;
 ;;  Kurdish.nsh
 ;;
-;;  Kurdish translation if the language strings for the Windows Gaim NSIS installer.
+;;  Kurdish translation if the language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1254
 ;;
 ;;  Erdal Ronahi <erdal.ronahi@gmail.com>
 
-; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
+; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
 ; langmacros.nsh when updating this file
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"Sazker jixwe dime�e."
-!define GAIM_IS_RUNNING			"Gaim niha jixwe dime�e. Ji Gaim� derkeve � careke din bicerib�ne."
+!define PIDGIN_IS_RUNNING			"Pidgin niha jixwe dime�e. Ji Pidgin � derkeve � careke din bicerib�ne."
 !define GTK_INSTALLER_NEEDED			"Derdora runtime ya GTK+ an tune an rojanekirina w� p�w�st e. $\rJi kerema xwe v${GTK_MIN_VERSION} an bilindtir a GTK+ saz bike."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"P�� >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) bin l�sansa L�sansa Gelempera Gist� ya GNU (GPL) hatiye we�andin. Ji bo agah�, ev l�sans li vir t� xwendin. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"P�� >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) bin l�sansa L�sansa Gelempera Gist� ya GNU (GPL) hatiye we�andin. Ji bo agah�, ev l�sans li vir t� xwendin. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Client (p�w�st)"
+!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (p�w�st)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (p�w�st)"
 !define GTK_THEMES_SECTION_TITLE		"Dirb�n GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Dirb tunebe"
 !define GTK_WIMP_SECTION_TITLE		"Dirb� Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE	"Dirb� Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Dirb� Light House Blue"
-!define GAIM_SHORTCUTS_SECTION_TITLE "Riy�n kin"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Sermas�"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Menuya destp�k�"
-!define GAIM_SECTION_DESCRIPTION		"Dosiy�n cevher� ya Gaim � dll"
-!define GTK_SECTION_DESCRIPTION		"Paketa am�r�n GUI ji bo gelek platforman, ji h�la Gaim t� bikaran�n."
+!define PIDGIN_SHORTCUTS_SECTION_TITLE "Riy�n kin"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Sermas�"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menuya destp�k�"
+!define PIDGIN_SECTION_DESCRIPTION		"Dosiy�n cevher� ya Pidgin � dll"
+!define GTK_SECTION_DESCRIPTION		"Paketa am�r�n GUI ji bo gelek platforman, ji h�la Pidgin t� bikaran�n."
 !define GTK_THEMES_SECTION_DESCRIPTION	"Dirb�n GTK+ dikarin ruy� bernamey�n GTK biguher�nin."
 !define GTK_NO_THEME_DESC			"Dirbeke GTK+ saz neke"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) dirbeyke GTK ya wek� derdora sermasey� ya Windows�."
 !define GTK_BLUECURVE_THEME_DESC		"Dirb� Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Dirb� Lighthouseblue."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "r�ya kin a ji bo destp�kirina Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC   "r�ya kin a Gaim di sermas�y� de ��ke"
-!define GAIM_STARTMENU_SHORTCUT_DESC   "Gaim� biniv�se menuya destp�k"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "r�ya kin a ji bo destp�kirina Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC   "r�ya kin a Pidgin di sermas�y� de ��ke"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Pidgin � biniv�se menuya destp�k"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Guhertoyeke kevn a GTK+ hatiye d�tin. Tu dixwaz� bilind bik�?$\rNot: Heke tu nek�, dibe ku Gaim naxebite."
+!define GTK_UPGRADE_PROMPT			"Guhertoyeke kevn a GTK+ hatiye d�tin. Tu dixwaz� bilind bik�?$\rNot: Heke tu nek�, dibe ku $(^Name) naxebite."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Were Malpera Gaim a Windows�"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Were Malpera Pidgin a Windows�"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (bi ten� rake)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (bi ten� rake)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Di sazkirina GTK+ de �ewt� derket."
@@ -57,35 +57,35 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS	"Dest�ra sazkirina dirbek� GTK+ tune."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Raker t�ketiy�n registry y�n Gaim ned�t. $\rQey bikarh�nereke din v� bername saz kir."
-!define un.GAIM_UNINSTALL_ERROR_2		"Dest�ra te ji bo rakirina v� bernamey� tune."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Raker t�ketiy�n registry y�n Pidgin ned�t. $\rQey bikarh�nereke din v� bername saz kir."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Dest�ra te ji bo rakirina v� bernamey� tune."
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"Desteka kontrola rastniv�s�"
-!define GAIM_SPELLCHECK_ERROR			"Di sazkirina kontrola rastniv�s� de �ewt� derket."
-!define GAIM_SPELLCHECK_DICT_ERROR		"Di sazkirina ferhenga rastniv�s� de �ewt� derket."
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Desteka kontrola rastniv�s�.  (Ji bo sazkirin� �nternet p�w�st e)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Desteka kontrola rastniv�s�"
+!define PIDGIN_SPELLCHECK_ERROR			"Di sazkirina kontrola rastniv�s� de �ewt� derket."
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Di sazkirina ferhenga rastniv�s� de �ewt� derket."
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Desteka kontrola rastniv�s�.  (Ji bo sazkirin� �nternet p�w�st e)"
 !define ASPELL_INSTALL_FAILED			"Sazkirin Serneket"
-!define GAIM_SPELLCHECK_BRETON			"Breton�"
-!define GAIM_SPELLCHECK_CATALAN			"Catalan"
-!define GAIM_SPELLCHECK_CZECH			"�ek�"
-!define GAIM_SPELLCHECK_WELSH			"Welsh"
-!define GAIM_SPELLCHECK_DANISH			"Danik�"
-!define GAIM_SPELLCHECK_GERMAN			"Alman�"
-!define GAIM_SPELLCHECK_GREEK			"Yewnan�"
-!define GAIM_SPELLCHECK_ENGLISH			"�ngil�z�"
-!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
-!define GAIM_SPELLCHECK_SPANISH			"Span�"
-!define GAIM_SPELLCHECK_FAROESE			"Faroese"
-!define GAIM_SPELLCHECK_FRENCH			"Frans�"
-!define GAIM_SPELLCHECK_ITALIAN			"�tal�"
-!define GAIM_SPELLCHECK_DUTCH			"Dutch"
-!define GAIM_SPELLCHECK_NORWEGIAN		"Norwec�"
-!define GAIM_SPELLCHECK_POLISH			"Pol�"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portekiz�"
-!define GAIM_SPELLCHECK_ROMANIAN			"Roman�"
-!define GAIM_SPELLCHECK_RUSSIAN			"Rus�"
-!define GAIM_SPELLCHECK_SLOVAK			"Slovak�"
-!define GAIM_SPELLCHECK_SWEDISH			"Sw�d�"
-!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrayn�"
+!define PIDGIN_SPELLCHECK_BRETON			"Breton�"
+!define PIDGIN_SPELLCHECK_CATALAN			"Catalan"
+!define PIDGIN_SPELLCHECK_CZECH			"�ek�"
+!define PIDGIN_SPELLCHECK_WELSH			"Welsh"
+!define PIDGIN_SPELLCHECK_DANISH			"Danik�"
+!define PIDGIN_SPELLCHECK_GERMAN			"Alman�"
+!define PIDGIN_SPELLCHECK_GREEK			"Yewnan�"
+!define PIDGIN_SPELLCHECK_ENGLISH			"�ngil�z�"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH			"Span�"
+!define PIDGIN_SPELLCHECK_FAROESE			"Faroese"
+!define PIDGIN_SPELLCHECK_FRENCH			"Frans�"
+!define PIDGIN_SPELLCHECK_ITALIAN			"�tal�"
+!define PIDGIN_SPELLCHECK_DUTCH			"Dutch"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norwec�"
+!define PIDGIN_SPELLCHECK_POLISH			"Pol�"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portekiz�"
+!define PIDGIN_SPELLCHECK_ROMANIAN			"Roman�"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"Rus�"
+!define PIDGIN_SPELLCHECK_SLOVAK			"Slovak�"
+!define PIDGIN_SPELLCHECK_SWEDISH			"Sw�d�"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrayn�"
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/lithuanian.nsh
--- a/pidgin/win32/nsis/translations/lithuanian.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/lithuanian.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,50 +1,50 @@
 ;;
 ;;  lithuanian.nsh
 ;;
-;;  Lithuanian translation strings for the Windows Gaim NSIS installer.
+;;  Lithuanian translation strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1257
 ;;
 ;;  Version 1
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"Diegimo programa jau paleista."
-!define GAIM_IS_RUNNING				"�iuo metu Gaim yra paleistas. U�darykite �i� program� ir pabandykite i� naujo."
+!define PIDGIN_IS_RUNNING				"�iuo metu Pidgin yra paleistas. U�darykite �i� program� ir pabandykite i� naujo."
 !define GTK_INSTALLER_NEEDED			"GTK+ vykdymo meto aplinkos n�ra arba ji turi b�ti atnaujinta.$\r�diekite v${GTK_MIN_VERSION} arba naujesn� GTK+ vykdymo meto aplinkos versij�"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Toliau >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) yra i�leistas GNU bendrosios vie�osios licenzijos (GPL) s�lygomis.  Licenzija �ia yra pateikta tik susipa�inimo tikslams. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Toliau >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) yra i�leistas GNU bendrosios vie�osios licenzijos (GPL) s�lygomis.  Licenzija �ia yra pateikta tik susipa�inimo tikslams. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim pokalbi� klientas (b�tinas)"
+!define PIDGIN_SECTION_TITLE			"Pidgin pokalbi� klientas (b�tinas)"
 !define GTK_SECTION_TITLE			"GTK+ vykdymo meto aplinka (b�tina)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ apipavidalinimai"
 !define GTK_NOTHEME_SECTION_TITLE		"Jokio apipavidalinimo"
 !define GTK_WIMP_SECTION_TITLE			"Wimp apipavidalinimas"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve apipavidalinimas"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue apipavidalinimas"
-!define GAIM_SHORTCUTS_SECTION_TITLE		"Nuorodos"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Darbalaukyje"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Pradiniame meniu"
-!define GAIM_SECTION_DESCRIPTION		"Pagrindiniai Gaim failai"
-!define GTK_SECTION_DESCRIPTION			"Daugiaplatforminis vartotojo s�sajos priemoni� komplektas, naudojamas Gaim."
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Nuorodos"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Darbalaukyje"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Pradiniame meniu"
+!define PIDGIN_SECTION_DESCRIPTION		"Pagrindiniai Pidgin failai"
+!define GTK_SECTION_DESCRIPTION			"Daugiaplatforminis vartotojo s�sajos priemoni� komplektas, naudojamas Pidgin."
 !define GTK_THEMES_SECTION_DESCRIPTION		"GTK+ apipavidalinimai gali pakeisti GTK+ program� i�vaizd�."
 !define GTK_NO_THEME_DESC			"Ne�diegti GTK+ apipavidalinimo."
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows imitatorius) yra gerai Windows aplinkoje derantis GTK apipavidalinimas."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve apipavidalinimas."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblue apipavidalinimas."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Gaim paleidimo nuorodos"
-!define GAIM_DESKTOP_SHORTCUT_DESC		"Sukurti nuorod� � Gaim darbastalyje."
-!define GAIM_STARTMENU_SHORTCUT_DESC		"Sukurti pradinio meniu �ra��, skirt� Gaim."
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Pidgin paleidimo nuorodos"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Sukurti nuorod� � Pidgin darbastalyje."
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Sukurti pradinio meniu �ra��, skirt� Pidgin."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Rasta sena GTK+ vykdymo meto aplinkos versija. Ar norite j� atnaujinti?$\rPastaba: skland�iam Gaim darbui atnaujinimas gali b�ti reikalingas."
+!define GTK_UPGRADE_PROMPT			"Rasta sena GTK+ vykdymo meto aplinkos versija. Ar norite j� atnaujinti?$\rPastaba: skland�iam $(^Name) darbui atnaujinimas gali b�ti reikalingas."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Aplankyti Windows Gaim tinklalap�"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Aplankyti Windows Pidgin tinklalap�"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (tik pa�alinti)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (tik pa�alinti)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"GTK+ vykdymo meto aplinkos diegimo klaida."
@@ -54,34 +54,34 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Neturite teisi� �diegti GTK+ apipavidalinim�."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"�alinimo programa nerado Gaim registro �ra��.$\rGalb�t kitas vartotojas instaliavo �i� program�."
-!define un.GAIM_UNINSTALL_ERROR_2		"Neturite teisi� pa�alinti �ios programos."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"�alinimo programa nerado Pidgin registro �ra��.$\rGalb�t kitas vartotojas instaliavo �i� program�."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Neturite teisi� pa�alinti �ios programos."
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"Ra�ybos tikrinimo palaikymas"
-!define GAIM_SPELLCHECK_ERROR			"Ra�ybos tikrinimo diegimo klaida"
-!define GAIM_SPELLCHECK_DICT_ERROR		"Ra�ybos tikrinimo �odyno diegimo klaida"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Ra�ybos tikrinimo palaikymas.  �diegimui b�tina interneto jungtis."
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Ra�ybos tikrinimo palaikymas"
+!define PIDGIN_SPELLCHECK_ERROR			"Ra�ybos tikrinimo diegimo klaida"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Ra�ybos tikrinimo �odyno diegimo klaida"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Ra�ybos tikrinimo palaikymas.  �diegimui b�tina interneto jungtis."
 !define ASPELL_INSTALL_FAILED			"Diegimas nepavyko"
-!define GAIM_SPELLCHECK_BRETON			"Breton� kalba"
-!define GAIM_SPELLCHECK_CATALAN			"Katalon� kalba"
-!define GAIM_SPELLCHECK_CZECH			"�ek� kalba"
-!define GAIM_SPELLCHECK_WELSH			"Val� kalba"
-!define GAIM_SPELLCHECK_DANISH			"Dan� kalba"
-!define GAIM_SPELLCHECK_GERMAN			"Vokie�i� kalba"
-!define GAIM_SPELLCHECK_GREEK			"Graik� kalba"
-!define GAIM_SPELLCHECK_ENGLISH			"Angl� kalba"
-!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto kalba"
-!define GAIM_SPELLCHECK_SPANISH			"Ispan� kalba"
-!define GAIM_SPELLCHECK_FAROESE			"Farer� kalba"
-!define GAIM_SPELLCHECK_FRENCH			"Pranc�z� kalba"
-!define GAIM_SPELLCHECK_ITALIAN			"Ital� kalba"
-!define GAIM_SPELLCHECK_DUTCH			"Oland� kalba"
-!define GAIM_SPELLCHECK_NORWEGIAN		"Norveg� kalba"
-!define GAIM_SPELLCHECK_POLISH			"Lenk� kalba"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portugal� kalba"
-!define GAIM_SPELLCHECK_ROMANIAN		"Rumun� kalba"
-!define GAIM_SPELLCHECK_RUSSIAN			"Rus� kalba"
-!define GAIM_SPELLCHECK_SLOVAK			"Slovak� kalba"
-!define GAIM_SPELLCHECK_SWEDISH			"�ved� kalba"
-!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrainie�i� kalba"
+!define PIDGIN_SPELLCHECK_BRETON			"Breton� kalba"
+!define PIDGIN_SPELLCHECK_CATALAN			"Katalon� kalba"
+!define PIDGIN_SPELLCHECK_CZECH			"�ek� kalba"
+!define PIDGIN_SPELLCHECK_WELSH			"Val� kalba"
+!define PIDGIN_SPELLCHECK_DANISH			"Dan� kalba"
+!define PIDGIN_SPELLCHECK_GERMAN			"Vokie�i� kalba"
+!define PIDGIN_SPELLCHECK_GREEK			"Graik� kalba"
+!define PIDGIN_SPELLCHECK_ENGLISH			"Angl� kalba"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto kalba"
+!define PIDGIN_SPELLCHECK_SPANISH			"Ispan� kalba"
+!define PIDGIN_SPELLCHECK_FAROESE			"Farer� kalba"
+!define PIDGIN_SPELLCHECK_FRENCH			"Pranc�z� kalba"
+!define PIDGIN_SPELLCHECK_ITALIAN			"Ital� kalba"
+!define PIDGIN_SPELLCHECK_DUTCH			"Oland� kalba"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norveg� kalba"
+!define PIDGIN_SPELLCHECK_POLISH			"Lenk� kalba"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugal� kalba"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Rumun� kalba"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"Rus� kalba"
+!define PIDGIN_SPELLCHECK_SLOVAK			"Slovak� kalba"
+!define PIDGIN_SPELLCHECK_SWEDISH			"�ved� kalba"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainie�i� kalba"
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/norwegian.nsh
--- a/pidgin/win32/nsis/translations/norwegian.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/norwegian.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  norwegian.nsh
 ;;
-;;  Norwegian language strings for the Windows Gaim NSIS installer.
+;;  Norwegian language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  J�rgen_Vinne_Iversen <jorgenvi@tihlde.org>
@@ -10,43 +10,43 @@
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"Installeren kj�rer allerede."
-!define GAIM_IS_RUNNING				"En instans av Gaim kj�rer fra f�r. Avslutt Gaim og pr�v igjen."
+!define PIDGIN_IS_RUNNING				"En instans av Pidgin kj�rer fra f�r. Avslutt Pidgin og pr�v igjen."
 !define GTK_INSTALLER_NEEDED			"GTK+ runtime environment mangler eller trenger en oppgradering.$\rVennligst install�r GTK+ v${GTK_MIN_VERSION} eller h�yere"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Neste >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) er utgitt under GPL (GNU General Public License). Lisensen er oppgitt her kun med henblikk p� informasjon. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Neste >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) er utgitt under GPL (GNU General Public License). Lisensen er oppgitt her kun med henblikk p� informasjon. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Hurtigmeldingsklient (obligatorisk)"
+!define PIDGIN_SECTION_TITLE			"Pidgin Hurtigmeldingsklient (obligatorisk)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (obligatorisk)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ Tema"
 !define GTK_NOTHEME_SECTION_TITLE		"Ingen tema"
 !define GTK_WIMP_SECTION_TITLE			"Wimp-tema"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve-tema"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
-!define GAIM_SHORTCUTS_SECTION_TITLE		"Snarveier"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Skrivebord"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmeny"
-!define GAIM_SECTION_DESCRIPTION		"Gaims kjernefiler og dll'er"
-!define GTK_SECTION_DESCRIPTION			"Et GUI-verkt�y for flere ulike plattformer, brukes av Gaim."
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Snarveier"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Skrivebord"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmeny"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidgins kjernefiler og dll'er"
+!define GTK_SECTION_DESCRIPTION			"Et GUI-verkt�y for flere ulike plattformer, brukes av Pidgin."
 !define GTK_THEMES_SECTION_DESCRIPTION		"GTK+ Tema kan endre utseendet og f�lelsen av GTK+ applikasjoner."
 !define GTK_NO_THEME_DESC			"Ikke install�r noe GTK+ tema."
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows-imitator) er et GTK-tema som passer godt inn i Windows-milj�."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve-tema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblue-tema."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Snarveier for � starte Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC		"Lag en snarvei til Gaim p� Skrivebordet"
-!define GAIM_STARTMENU_SHORTCUT_DESC		"Legg til Gaim i Startmenyen"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Snarveier for � starte Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Lag en snarvei til Pidgin p� Skrivebordet"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Legg til Pidgin i Startmenyen"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"En eldre versjon av GTK+ runtime ble funnet. �nsker du � oppgradere?$\rMerk: Gaim vil kanskje ikke virke hvis du ikke oppgraderer."
+!define GTK_UPGRADE_PROMPT			"En eldre versjon av GTK+ runtime ble funnet. �nsker du � oppgradere?$\rMerk: $(^Name) vil kanskje ikke virke hvis du ikke oppgraderer."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Bes�k Gaim for Windows' Nettside"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Pidgin for Windows' Nettside"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (kun avinstallering)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (kun avinstallering)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"En feil oppstod ved installering av GTK+ runtime."
@@ -56,36 +56,36 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Du har ikke rettigheter til � installere et GTK+ tema."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Avinstalleringsprogrammet kunne ikke finne noen registeroppf�ring for Gaim.$\rTrolig har en annen bruker avinstallert denne applikasjonen."
-!define un.GAIM_UNINSTALL_ERROR_2		"Du har ikke rettigheter til � avinstallere denne applikasjonen."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Avinstalleringsprogrammet kunne ikke finne noen registeroppf�ring for Pidgin.$\rTrolig har en annen bruker avinstallert denne applikasjonen."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Du har ikke rettigheter til � avinstallere denne applikasjonen."
 
 
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"St�tte for stavekontroll"
-!define GAIM_SPELLCHECK_ERROR			"Det oppstod en feil ved installering av stavekontroll"
-!define GAIM_SPELLCHECK_DICT_ERROR		"Det oppstod en feil ved installering av ordboken for stavekontroll"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"St�tte for stavekontroll. (Internettoppkobling p�krevd for installasjon)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"St�tte for stavekontroll"
+!define PIDGIN_SPELLCHECK_ERROR			"Det oppstod en feil ved installering av stavekontroll"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Det oppstod en feil ved installering av ordboken for stavekontroll"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"St�tte for stavekontroll. (Internettoppkobling p�krevd for installasjon)"
 !define ASPELL_INSTALL_FAILED			"Installasjonen mislyktes."
-!define GAIM_SPELLCHECK_BRETON			"Bretagnsk"
-!define GAIM_SPELLCHECK_CATALAN			"Katalansk"
-!define GAIM_SPELLCHECK_CZECH			"Tsjekkisk"
-!define GAIM_SPELLCHECK_WELSH			"Walisisk"
-!define GAIM_SPELLCHECK_DANISH			"Dansk"
-!define GAIM_SPELLCHECK_GERMAN			"Tysk"
-!define GAIM_SPELLCHECK_GREEK			"Gresk"
-!define GAIM_SPELLCHECK_ENGLISH			"Engelsk"
-!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
-!define GAIM_SPELLCHECK_SPANISH			"Spansk"
-!define GAIM_SPELLCHECK_FAROESE			"F�r�ysk"
-!define GAIM_SPELLCHECK_FRENCH			"Fransk"
-!define GAIM_SPELLCHECK_ITALIAN			"Italiensk"
-!define GAIM_SPELLCHECK_DUTCH			"Nederlandsk"
-!define GAIM_SPELLCHECK_NORWEGIAN		"Norsk"
-!define GAIM_SPELLCHECK_POLISH			"Polsk"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portugisisk"
-!define GAIM_SPELLCHECK_ROMANIAN		"Rumensk"
-!define GAIM_SPELLCHECK_RUSSIAN			"Russisk"
-!define GAIM_SPELLCHECK_SLOVAK			"Slovakisk"
-!define GAIM_SPELLCHECK_SWEDISH			"Svensk"
-!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrainsk"
+!define PIDGIN_SPELLCHECK_BRETON			"Bretagnsk"
+!define PIDGIN_SPELLCHECK_CATALAN			"Katalansk"
+!define PIDGIN_SPELLCHECK_CZECH			"Tsjekkisk"
+!define PIDGIN_SPELLCHECK_WELSH			"Walisisk"
+!define PIDGIN_SPELLCHECK_DANISH			"Dansk"
+!define PIDGIN_SPELLCHECK_GERMAN			"Tysk"
+!define PIDGIN_SPELLCHECK_GREEK			"Gresk"
+!define PIDGIN_SPELLCHECK_ENGLISH			"Engelsk"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH			"Spansk"
+!define PIDGIN_SPELLCHECK_FAROESE			"F�r�ysk"
+!define PIDGIN_SPELLCHECK_FRENCH			"Fransk"
+!define PIDGIN_SPELLCHECK_ITALIAN			"Italiensk"
+!define PIDGIN_SPELLCHECK_DUTCH			"Nederlandsk"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norsk"
+!define PIDGIN_SPELLCHECK_POLISH			"Polsk"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugisisk"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Rumensk"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"Russisk"
+!define PIDGIN_SPELLCHECK_SLOVAK			"Slovakisk"
+!define PIDGIN_SPELLCHECK_SWEDISH			"Svensk"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainsk"
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/polish.nsh
--- a/pidgin/win32/nsis/translations/polish.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/polish.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  polish.nsh
 ;;
-;;  Polish language strings for the Windows Gaim NSIS installer.
+;;  Polish language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1250
 ;;
 ;;  Author: Jan Eldenmalm <jan.eldenmalm@amazingports.com>
@@ -12,19 +12,19 @@
 !define GTK_INSTALLER_NEEDED			"Runtime �rodowiska GTK+ zosta� zagubiony lub wymaga upgrade-u.$\r Prosz� zainstaluj v${GTK_MIN_VERSION} albo wy�sz� wersj� runtime-u GTK+."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Dalej >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) jest wydzielone w licencji GPL. Udziela si� licencji wy��cznie do cel�w informacyjnych. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Dalej >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) jest wydzielone w licencji GPL. Udziela si� licencji wy��cznie do cel�w informacyjnych. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Wymagany jest Gaim Instant Messaging Client"
+!define PIDGIN_SECTION_TITLE			"Wymagany jest Pidgin Instant Messaging Client"
 !define GTK_SECTION_TITLE			"Wymagany jest runtime �rodowiska GTK+"
 !define GTK_THEMES_SECTION_TITLE		"Temat GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Brak temat�w"
 !define GTK_WIMP_SECTION_TITLE		"Temat Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Temat Bluecurve "
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Temat Light House Blue"
-!define GAIM_SECTION_DESCRIPTION		"Zbiory Core Gaim oraz dll"
-!define GTK_SECTION_DESCRIPTION		"Wieloplatformowe narz�dzie GUI, u�ywane w Gaim"
+!define PIDGIN_SECTION_DESCRIPTION		"Zbiory Core Pidgin oraz dll"
+!define GTK_SECTION_DESCRIPTION		"Wieloplatformowe narz�dzie GUI, u�ywane w Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Tematy GTK+ mog� zmieni� wygl�d i dzia�anie aplikacji GTK+ ."
 !define GTK_NO_THEME_DESC			"Nie instaluj temat�w GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) to temat GTK kt�ry doskonale wkomponowuje si� w �rodowisko systemu Windows."
@@ -32,13 +32,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Temat Lighthouseblue."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Znaleziono star� wersj� runtime-u GTK+. Czy chcesz upgrade-owa�?$\rNote: Gaim mo�e nie dzia�a� je�li nie wykonasz procedury."
+!define GTK_UPGRADE_PROMPT			"Znaleziono star� wersj� runtime-u GTK+. Czy chcesz upgrade-owa�?$\rNote: $(^Name) mo�e nie dzia�a� je�li nie wykonasz procedury."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Wejd� na stron� Gaim Web Page"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Wejd� na stron� Pidgin Web Page"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (usu� program)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (usu� program)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"B��d instalacji runtime-a GTK+."
@@ -48,5 +48,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Nie masz uprawnie� do zainstalowania tematu GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Deinstalator nie mo�e znale�� rejestr�w dla Gaim.$\r Wskazuje to na to, �e instalacj� przeprowadzi� inny u�ytkownik."
-!define un.GAIM_UNINSTALL_ERROR_2		"Nie masz uprawnie� do deinstalacji tej aplikacji."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Deinstalator nie mo�e znale�� rejestr�w dla Pidgin.$\r Wskazuje to na to, �e instalacj� przeprowadzi� inny u�ytkownik."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Nie masz uprawnie� do deinstalacji tej aplikacji."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/portuguese-br.nsh
--- a/pidgin/win32/nsis/translations/portuguese-br.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/portuguese-br.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  portuguese-br.nsh
 ;;
-;;  Portuguese (BR) language strings for the Windows Gaim NSIS installer.
+;;  Portuguese (BR) language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: Maur�cio de Lemos Rodrigues Collares Neto <mauricioc@myrealbox.com>, 2003-2005.
@@ -12,36 +12,36 @@
 !define GTK_INSTALLER_NEEDED			"O ambiente de tempo de execu��o do GTK+ est� ausente ou precisa ser atualizado.$\rFavor instalar a vers�o v${GTK_MIN_VERSION} ou superior do ambiente de tempo de execu��o do GTK+."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Avan�ar >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) � distribu�do sob a licen�a GPL. Esta licen�a � disponibilizada aqui apenas para fins informativos. $_CLICK" 
+!define PIDGIN_LICENSE_BUTTON			"Avan�ar >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) � distribu�do sob a licen�a GPL. Esta licen�a � disponibilizada aqui apenas para fins informativos. $_CLICK" 
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Cliente de mensagens instant�neas Gaim (requerido)"
+!define PIDGIN_SECTION_TITLE			"Cliente de mensagens instant�neas Pidgin (requerido)"
 !define GTK_SECTION_TITLE			"Ambiente de tempo de execu��o do GTK+ (requerido)"
 !define GTK_THEMES_SECTION_TITLE		"Temas do GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Nenhum tema"
 !define GTK_WIMP_SECTION_TITLE		"Tema 'Wimp'"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema 'Bluecurve'"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema 'Light House Blue'"
-!define GAIM_SHORTCUTS_SECTION_TITLE "Atalhos"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "�rea de Trabalho"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Menu Iniciar"
-!define GAIM_SECTION_DESCRIPTION		"Arquivos e bibliotecas principais do Gaim"
-!define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas multi-plataforma para interface do usu�rio, usado pelo Gaim"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE "Atalhos"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "�rea de Trabalho"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu Iniciar"
+!define PIDGIN_SECTION_DESCRIPTION		"Arquivos e bibliotecas principais do Pidgin"
+!define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas multi-plataforma para interface do usu�rio, usado pelo Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Os temas do GTK+ podem mudar a apar�ncia e o funcionamento dos aplicativos GTK+."
 !define GTK_NO_THEME_DESC			"N�o instalar um tema do GTK+"
 !define GTK_WIMP_THEME_DESC			"O tema 'GTK-Wimp' ('Windows impersonator', personificador do Windows) � um tema GTK que combina bem com o ambiente de �rea de trabalho do Windows."
 !define GTK_BLUECURVE_THEME_DESC		"O tema 'Bluecurve'."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema 'Lighthouseblue'."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Atalhos para iniciar o Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC   "Crie um atalho para o Gaim na �rea de Trabalho"
-!define GAIM_STARTMENU_SHORTCUT_DESC   "Crie uma entrada no Menu Iniciar para o Gaim"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "Atalhos para iniciar o Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC   "Crie um atalho para o Pidgin na �rea de Trabalho"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Crie uma entrada no Menu Iniciar para o Pidgin"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Uma vers�o antiga do ambiente de tempo de execu��o do GTK+ foi encontrada. Voc� deseja atualiz�-lo?$\rNota: O Gaim poder� n�o funcionar a menos que voc� o fa�a."
+!define GTK_UPGRADE_PROMPT			"Uma vers�o antiga do ambiente de tempo de execu��o do GTK+ foi encontrada. Voc� deseja atualiz�-lo?$\rNota: O $(^Name) poder� n�o funcionar a menos que voc� o fa�a."
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (apenas remover)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (apenas remover)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de tempo de execu��o do GTK+."
@@ -51,8 +51,8 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Voc� n�o tem permiss�o para instalar um tema do GTK+."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visite a p�gina da web do Gaim para Windows"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a p�gina da web do Pidgin para Windows"
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"O desinstalador n�o p�de encontrar entradas de registro do Gaim.$\r� prov�vel que outro usu�rio tenha instalado esta aplica��o."
-!define un.GAIM_UNINSTALL_ERROR_2		"Voc� n�o tem permiss�o para desinstalar essa aplica��o."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"O desinstalador n�o p�de encontrar entradas de registro do Pidgin.$\r� prov�vel que outro usu�rio tenha instalado esta aplica��o."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Voc� n�o tem permiss�o para desinstalar essa aplica��o."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/portuguese.nsh
--- a/pidgin/win32/nsis/translations/portuguese.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/portuguese.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  portuguese.nsh
 ;;
-;;  Portuguese (PT) language strings for the Windows Gaim NSIS installer.
+;;  Portuguese (PT) language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: Duarte Henriques <duarte.henriques@gmail.com>, 2003-2005.
@@ -10,43 +10,43 @@
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"O instalador j� est� a ser executado."
-!define GAIM_IS_RUNNING			"Uma inst�ncia do Gaim j� est� a ser executada. Saia do Gaim e tente de novo."
+!define PIDGIN_IS_RUNNING			"Uma inst�ncia do Pidgin j� est� a ser executada. Saia do Pidgin e tente de novo."
 !define GTK_INSTALLER_NEEDED			"O ambiente de GTK+ est� ausente ou precisa de ser actualizado.$\rPor favor instale a vers�o v${GTK_MIN_VERSION} ou mais recente do ambiente de GTK+."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Seguinte >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) est� dispon�vel sob a licen�a GNU General Public License (GPL). O texto da licen�a � fornecido aqui meramente a t�tulo informativo. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Seguinte >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) est� dispon�vel sob a licen�a GNU General Public License (GPL). O texto da licen�a � fornecido aqui meramente a t�tulo informativo. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Cliente de Mensagens Instant�neas Gaim (obrigat�rio)"
+!define PIDGIN_SECTION_TITLE			"Cliente de Mensagens Instant�neas Pidgin (obrigat�rio)"
 !define GTK_SECTION_TITLE			"Ambiente de Execu��o GTK+ (obrigat�rio)"
 !define GTK_THEMES_SECTION_TITLE		"Temas do GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Nenhum tema"
 !define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
-!define GAIM_SHORTCUTS_SECTION_TITLE "Atalhos"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Ambiente de Trabalho"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Menu de Iniciar"
-!define GAIM_SECTION_DESCRIPTION		"Ficheiros e bibliotecas principais do Gaim"
-!define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas de interface gr�fica multi-plataforma, usado pelo Gaim"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE "Atalhos"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Ambiente de Trabalho"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Menu de Iniciar"
+!define PIDGIN_SECTION_DESCRIPTION		"Ficheiros e bibliotecas principais do Pidgin"
+!define GTK_SECTION_DESCRIPTION		"Um conjunto de ferramentas de interface gr�fica multi-plataforma, usado pelo Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Os Temas do GTK+ podem mudar a apar�ncia dos programas GTK+."
 !define GTK_NO_THEME_DESC			"N�o instalar um tema do GTK+"
 !define GTK_WIMP_THEME_DESC			"O tema GTK-Wimp (Windows impersonator, personificador do Windows) � um tema GTK+ que combina bem com o ambiente de trabalho do Windows."
 !define GTK_BLUECURVE_THEME_DESC		"O tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"O tema Lighthouseblue."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Atalhos para iniciar o Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC   "Criar um atalho para o Gaim no Ambiente de Trabalho"
-!define GAIM_STARTMENU_SHORTCUT_DESC   "Criar uma entrada para o Gaim na Barra de Iniciar"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "Atalhos para iniciar o Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC   "Criar um atalho para o Pidgin no Ambiente de Trabalho"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Criar uma entrada para o Pidgin na Barra de Iniciar"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Foi encontrada uma vers�o antiga do ambiente de execu��o GTK+. Deseja actualiz�-lo?$\rNota: O Gaim poder� n�o funcionar se n�o o fizer."
+!define GTK_UPGRADE_PROMPT			"Foi encontrada uma vers�o antiga do ambiente de execu��o GTK+. Deseja actualiz�-lo?$\rNota: O $(^Name) poder� n�o funcionar se n�o o fizer."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visite a P�gina Web do Gaim para Windows"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite a P�gina Web do Pidgin para Windows"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (remover apenas)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (remover apenas)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro ao instalar o ambiente de execu��o GTK+."
@@ -56,5 +56,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS	"N�o tem permiss�o para instalar um tema do GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"O desinstalador n�o encontrou entradas de registo do Gaim.$\r� prov�vel que outro utilizador tenha instalado este programa."
-!define un.GAIM_UNINSTALL_ERROR_2		"N�o tem permiss�o para desinstalar este programa."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"O desinstalador n�o encontrou entradas de registo do Pidgin.$\r� prov�vel que outro utilizador tenha instalado este programa."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"N�o tem permiss�o para desinstalar este programa."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/romanian.nsh
--- a/pidgin/win32/nsis/translations/romanian.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/romanian.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  romanian.nsh
 ;;
-;;  Romanian language strings for the Windows Gaim NSIS installer.
+;;  Romanian language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1250
 ;;
 ;;  Author: Mi�u Moldovan <dumol@gnome.ro>, (c) 2004 - 2005.
@@ -9,43 +9,43 @@
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING                     "Instalarea este deja pornit�."
-!define GAIM_IS_RUNNING                  "O instan�� a programului Gaim este deja pornit�. �nchide�i-o �i �ncerca�i din nou."
+!define PIDGIN_IS_RUNNING                  "O instan�� a programului Pidgin este deja pornit�. �nchide�i-o �i �ncerca�i din nou."
 !define GTK_INSTALLER_NEEDED			"Mediul GTK+ nu e prezent sau ave�i o versiune prea veche.$\rInstala�i cel pu�in versiunea v${GTK_MIN_VERSION} a mediului GTK+"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON                      "�nainte >"
-!define GAIM_LICENSE_BOTTOM_TEXT         "$(^Name) are licen�� GPL (GNU Public License). Licen�a este inclus� aici doar pentru scopuri informative. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON                      "�nainte >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT         "$(^Name) are licen�� GPL (GNU Public License). Licen�a este inclus� aici doar pentru scopuri informative. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Client de mesagerie instant (obligatoriu)"
+!define PIDGIN_SECTION_TITLE			"Client de mesagerie instant (obligatoriu)"
 !define GTK_SECTION_TITLE			"Mediu GTK+ (obligatoriu)"
 !define GTK_THEMES_SECTION_TITLE		"Teme GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"F�r� teme"
 !define GTK_WIMP_SECTION_TITLE		"Tem� Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tem� Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tem� Light House Blue"
-!define GAIM_SHORTCUTS_SECTION_TITLE "Scurt�turi"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Meniu Start"
-!define GAIM_SECTION_DESCRIPTION		"Fi�iere Gaim �i dll-uri"
-!define GTK_SECTION_DESCRIPTION		"Un mediu de dezvoltare multiplatform� utilizat de Gaim"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE "Scurt�turi"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Meniu Start"
+!define PIDGIN_SECTION_DESCRIPTION		"Fi�iere Pidgin �i dll-uri"
+!define GTK_SECTION_DESCRIPTION		"Un mediu de dezvoltare multiplatform� utilizat de Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Temele GTK+ schimb� aparen�a aplica�iilor GTK+."
 !define GTK_NO_THEME_DESC			"F�r� teme GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp este o tem� GTK+ ce imit� mediul grafic Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Tema Lighthouseblue."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Scurt�turi pentru pornirea Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC   "Creeaz� iconi�e Gaim pe Desktop"
-!define GAIM_STARTMENU_SHORTCUT_DESC   "Creeaz� o intrare Gaim �n meniul Start"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "Scurt�turi pentru pornirea Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC   "Creeaz� iconi�e Pidgin pe Desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Creeaz� o intrare Pidgin �n meniul Start"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Ave�i o versiune veche a mediului GTK+. Dori�i s� o actualiza�i?$\rNot�: E posibil ca Gaim s� nu func�ioneze cu versiunea veche."
+!define GTK_UPGRADE_PROMPT			"Ave�i o versiune veche a mediului GTK+. Dori�i s� o actualiza�i?$\rNot�: E posibil ca $(^Name) s� nu func�ioneze cu versiunea veche."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE               "Vizita�i pagina de web Windows Gaim"
+!define PIDGIN_FINISH_VISIT_WEB_SITE               "Vizita�i pagina de web Windows Pidgin"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (doar dezinstalare)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (doar dezinstalare)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Eroare la instalarea mediului GTK+."
@@ -55,5 +55,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Nu ave�i drepturile de acces necesare instal�rii unei teme GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "Programul de dezinstalare nu a g�sit intr�ri Gaim �n regi�tri.$\rProbabil un alt utilizator a instalat aceast� aplica�ie."
-!define un.GAIM_UNINSTALL_ERROR_2         "Nu ave�i drepturile de acces necesare dezinstal�rii acestei aplica�ii."
+!define un.PIDGIN_UNINSTALL_ERROR_1         "Programul de dezinstalare nu a g�sit intr�ri Pidgin �n regi�tri.$\rProbabil un alt utilizator a instalat aceast� aplica�ie."
+!define un.PIDGIN_UNINSTALL_ERROR_2         "Nu ave�i drepturile de acces necesare dezinstal�rii acestei aplica�ii."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/russian.nsh
--- a/pidgin/win32/nsis/translations/russian.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/russian.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -12,18 +12,18 @@
 !define GTK_INSTALLER_NEEDED			"��������� ��� ������� GTK+ ���������� ��� ��������� � ����������.$\r���������� ���������� v${GTK_MIN_VERSION} ��� ����� ������� ������ GTK+."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"��������� >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) �������� ��� ��������� GPL. �������� ��������� ����� ��� ��������������� �����. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"��������� >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �������� ��� ��������� GPL. �������� ��������� ����� ��� ��������������� �����. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim - ������ ��� ����������� ������ ����������� �� ��������� ���������� (����������)."
+!define PIDGIN_SECTION_TITLE			"Gaim - ������ ��� ����������� ������ ����������� �� ��������� ���������� (����������)."
 !define GTK_SECTION_TITLE			"GTK+ ��������� ��� ������� (����������)."
 !define GTK_THEMES_SECTION_TITLE		"���� ��� GTK+."
 !define GTK_NOTHEME_SECTION_TITLE		"��� ����."
 !define GTK_WIMP_SECTION_TITLE		"���� 'Wimp Theme'"
 !define GTK_BLUECURVE_SECTION_TITLE		"���� 'Bluecurve'."
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"���� 'Light House Blue'."
-!define GAIM_SECTION_DESCRIPTION		"�������� ����� Gaim � ����������."
+!define PIDGIN_SECTION_DESCRIPTION		"�������� ����� Gaim � ����������."
 !define GTK_SECTION_DESCRIPTION		"������������������� ����������� ��������������, ������������ Gaim."
 !define GTK_THEMES_SECTION_DESCRIPTION	"���� ��� GTK+ �������� ��� ������� ��� � ���������� �������������."
 !define GTK_NO_THEME_DESC			"�� ������������� ���� ��� GTK+."
@@ -35,10 +35,10 @@
 !define GTK_UPGRADE_PROMPT			"������� ������ ������ GTK+. �� �� ������ �� �������� � ?$\r����������: Gaim ����� �� �������� ���� �� �� �������� �����."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"�������� ���-�������� Gaim ��� ������������� Windows."
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"�������� ���-�������� Gaim ��� ������������� Windows."
 
 ; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (������ ��������)"
+!define PIDGIN_UNINSTALL_DESC			"Gaim (������ ��������)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"������ ��� ��������� ��������� GTK+."
@@ -48,5 +48,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"� ��� ��� ���� �� ������������ ���� ��� GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"��������� �������� �� ����� ����� ������ Gaim � ��������..$\r�������� ��� ���������� ��������� ������ ������������."
-!define un.GAIM_UNINSTALL_ERROR_2		"� ��� ��� ���� �� �������� ����� ����������."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"��������� �������� �� ����� ����� ������ Gaim � ��������..$\r�������� ��� ���������� ��������� ������ ������������."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"� ��� ��� ���� �� �������� ����� ����������."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/serbian-latin.nsh
--- a/pidgin/win32/nsis/translations/serbian-latin.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/serbian-latin.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  serbian-latin.nsh
 ;;
-;;  Serbian (Latin) language strings for the Windows Gaim NSIS installer.
+;;  Serbian (Latin) language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1250
 ;;
 ;;  Author: Danilo Segan <dsegan@gmx.net>
@@ -11,15 +11,15 @@
 !define GTK_INSTALLER_NEEDED			"GTK+ okolina za izvr�avanje ili nije na�ena ili se moraunaprediti.$\rMolimo instalirajte v${GTK_MIN_VERSION} ili ve�u GTK+ okoline za izvr�avanje"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim klijent za brze poruke (neophodno)"
+!define PIDGIN_SECTION_TITLE			"Pidgin klijent za brze poruke (neophodno)"
 !define GTK_SECTION_TITLE			"GTK+ okolina za izvr�avanje (neophodno)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ teme"
 !define GTK_NOTHEME_SECTION_TITLE		"Bez teme"
 !define GTK_WIMP_SECTION_TITLE		"Wimp tema"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve tema"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue tema"
-!define GAIM_SECTION_DESCRIPTION		"Osnovne Gaim datoteke i dinami�ke biblioteke"
-!define GTK_SECTION_DESCRIPTION		"Skup oru�a za grafi�ko okru�enje, za vi�e platformi, koristi ga Gaim"
+!define PIDGIN_SECTION_DESCRIPTION		"Osnovne Pidgin datoteke i dinami�ke biblioteke"
+!define GTK_SECTION_DESCRIPTION		"Skup oru�a za grafi�ko okru�enje, za vi�e platformi, koristi ga Pidgin "
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ teme menjaju izgled i na�in rada GTK+ aplikacija."
 !define GTK_NO_THEME_DESC			"Ne instaliraj GTK+ temu"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows imitator) je GTK tema koja se dobro uklapa u Windows radno okru�enje."
@@ -27,10 +27,10 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue tema."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Na�ena je stara verzija GTK+ izvr�ne okoline. Da li �elite da je unapredite?$\rPrimedba: Ukoliko to ne uradite, Gaim mo�da ne�e raditi."
+!define GTK_UPGRADE_PROMPT			"Na�ena je stara verzija GTK+ izvr�ne okoline. Da li �elite da je unapredite?$\rPrimedba: Ukoliko to ne uradite, $(^Name) mo�da ne�e raditi."
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (samo uklanjanje)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (samo uklanjanje)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Gre�ka prilikom instalacije GTK+ okoline za izvr�avanje."
@@ -40,5 +40,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Nemate ovla��enja za instalaciju GTK+ teme."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "Program za uklanjanje instalacije ne mo�e da prona�e stavke registra za Gaim.$\rVerovatno je ovu aplikaciju instalirao drugi korisnik."
-!define un.GAIM_UNINSTALL_ERROR_2         "Nemate ovla��enja za deinstalaciju ove aplikacije."
+!define un.PIDGIN_UNINSTALL_ERROR_1         "Program za uklanjanje instalacije ne mo�e da prona�e stavke registra za Pidgin.$\rVerovatno je ovu aplikaciju instalirao drugi korisnik."
+!define un.PIDGIN_UNINSTALL_ERROR_2         "Nemate ovla��enja za deinstalaciju ove aplikacije."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/simp-chinese.nsh
--- a/pidgin/win32/nsis/translations/simp-chinese.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/simp-chinese.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;  vim:syn=winbatch:encoding=8bit-cp936:fileencoding=8bit-cp936:
 ;;  simp-chinese.nsh
 ;;
-;;  Simplified Chinese language strings for the Windows Gaim NSIS installer.
+;;  Simplified Chinese language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 936
 ;;
 ;;  Author: Funda Wang" <fundawang@linux.net.cn>
@@ -10,43 +10,43 @@
 
 ; Startup GTK+ check
 !define INSTALLER_IS_RUNNING			"��װ�����Ѿ����С�"
-!define GAIM_IS_RUNNING			"Gaim ��ʵ�����������С����˳� Gaim Ȼ������һ�Ρ�"
+!define PIDGIN_IS_RUNNING			"Pidgin ��ʵ�����������С����˳� Pidgin Ȼ������һ�Ρ�"
 !define GTK_INSTALLER_NEEDED			"����ȱ�� GTK+ ����ʱ�̻�����������Ҫ���¸û�����$\r�밲װ v${GTK_MIN_VERSION} ����߰汾�� GTK+ ����ʱ�̻���"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"��һ�� >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) �� GPL ���ɷ������ڴ��ṩ�����ɽ�Ϊ�ο���$_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"��һ�� >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �� GPL ���ɷ������ڴ��ṩ�����ɽ�Ϊ�ο���$_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim ��ʱͨѶ����(����)"
+!define PIDGIN_SECTION_TITLE			"Pidgin ��ʱͨѶ����(����)"
 !define GTK_SECTION_TITLE			"GTK+ ����ʱ�̻���(����)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ ����"
 !define GTK_NOTHEME_SECTION_TITLE		"������"
 !define GTK_WIMP_SECTION_TITLE		"Wimp ����"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve ����"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue ����"
-!define GAIM_SHORTCUTS_SECTION_TITLE "��ݷ�ʽ"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "����"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "��ʼ�˵�"
-!define GAIM_SECTION_DESCRIPTION		"Gaim �����ļ��� DLLs"
-!define GTK_SECTION_DESCRIPTION		"Gaim ���õĶ�ƽ̨ GUI ���߰�"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE "��ݷ�ʽ"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "����"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "��ʼ�˵�"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidgin �����ļ��� DLLs"
+!define GTK_SECTION_DESCRIPTION		"Pidgin ���õĶ�ƽ̨ GUI ���߰�"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ ������Ը��� GTK+ ����Ĺ۸С�"
 !define GTK_NO_THEME_DESC			"����װ GTK+ ����"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp ���ʺ� Windows ���滷���� GTK+ ���⡣"
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve ���⡣"
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue ���⡣"
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "���� Gaim �Ŀ�ݷ�ʽ"
-!define GAIM_DESKTOP_SHORTCUT_DESC   "�������ϴ��� Gaim �Ŀ�ݷ�ʽ"
-!define GAIM_STARTMENU_SHORTCUT_DESC   "�ڿ�ʼ�˵��д��� Gaim �Ŀ�ݷ�ʽ"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "���� Pidgin �Ŀ�ݷ�ʽ"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC   "�������ϴ��� Pidgin �Ŀ�ݷ�ʽ"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC   "�ڿ�ʼ�˵��д��� Pidgin �Ŀ�ݷ�ʽ"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"�����˾ɰ汾�� GTK+ ����ʱ�̡�����Ҫ������?$\rע��: �������������������� Gaim �����޷�������"
+!define GTK_UPGRADE_PROMPT			"�����˾ɰ汾�� GTK+ ����ʱ�̡�����Ҫ������?$\rע��: �������������������� $(^Name) �����޷�������"
 
 ; Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"��� Windows Gaim ��ҳ"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"��� Windows Pidgin ��ҳ"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (ֻ��ɾ��)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (ֻ��ɾ��)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"��װ GTK+ ����ʱ��ʧ�ܡ�"
@@ -56,34 +56,34 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"��û��Ȩ�ް�װ GTK+ ���⡣"
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "ж�س����Ҳ��� Gaim ��ע�����Ŀ��$\r������������û���װ�˴˳���"
-!define un.GAIM_UNINSTALL_ERROR_2         "��û��Ȩ��ж�ش˳���"
+!define un.PIDGIN_UNINSTALL_ERROR_1         "ж�س����Ҳ��� Pidgin ��ע�����Ŀ��$\r������������û���װ�˴˳���"
+!define un.PIDGIN_UNINSTALL_ERROR_2         "��û��Ȩ��ж�ش˳���"
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"ƴд���֧��"
-!define GAIM_SPELLCHECK_ERROR			"��װƴд������"
-!define GAIM_SPELLCHECK_DICT_ERROR		"��װƴд����ֵ����"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"ƴд���֧�֡�(��װ��Ҫ���ӵ� Internet)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"ƴд���֧��"
+!define PIDGIN_SPELLCHECK_ERROR			"��װƴд������"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"��װƴд����ֵ����"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"ƴд���֧�֡�(��װ��Ҫ���ӵ� Internet)"
 !define ASPELL_INSTALL_FAILED			"��װʧ��"
-!define GAIM_SPELLCHECK_BRETON			"���������"
-!define GAIM_SPELLCHECK_CATALAN			"��̩��������"
-!define GAIM_SPELLCHECK_CZECH			"�ݿ���"
-!define GAIM_SPELLCHECK_WELSH			"����ʿ��"
-!define GAIM_SPELLCHECK_DANISH			"������"
-!define GAIM_SPELLCHECK_GERMAN			"����"
-!define GAIM_SPELLCHECK_GREEK			"ϣ����"
-!define GAIM_SPELLCHECK_ENGLISH			"Ӣ��"
-!define GAIM_SPELLCHECK_ESPERANTO		"������"
-!define GAIM_SPELLCHECK_SPANISH			"��������"
-!define GAIM_SPELLCHECK_FAROESE			"������"
-!define GAIM_SPELLCHECK_FRENCH			"����"
-!define GAIM_SPELLCHECK_ITALIAN			"�������"
-!define GAIM_SPELLCHECK_DUTCH			"������"
-!define GAIM_SPELLCHECK_NORWEGIAN		"Ų����"
-!define GAIM_SPELLCHECK_POLISH			"������"
-!define GAIM_SPELLCHECK_PORTUGUESE		"��������"
-!define GAIM_SPELLCHECK_ROMANIAN			"����������"
-!define GAIM_SPELLCHECK_RUSSIAN			"����"
-!define GAIM_SPELLCHECK_SLOVAK			"˹�工����"
-!define GAIM_SPELLCHECK_SWEDISH			"�����"
-!define GAIM_SPELLCHECK_UKRAINIAN		"�ڿ�����"
+!define PIDGIN_SPELLCHECK_BRETON			"���������"
+!define PIDGIN_SPELLCHECK_CATALAN			"��̩��������"
+!define PIDGIN_SPELLCHECK_CZECH			"�ݿ���"
+!define PIDGIN_SPELLCHECK_WELSH			"����ʿ��"
+!define PIDGIN_SPELLCHECK_DANISH			"������"
+!define PIDGIN_SPELLCHECK_GERMAN			"����"
+!define PIDGIN_SPELLCHECK_GREEK			"ϣ����"
+!define PIDGIN_SPELLCHECK_ENGLISH			"Ӣ��"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"������"
+!define PIDGIN_SPELLCHECK_SPANISH			"��������"
+!define PIDGIN_SPELLCHECK_FAROESE			"������"
+!define PIDGIN_SPELLCHECK_FRENCH			"����"
+!define PIDGIN_SPELLCHECK_ITALIAN			"�������"
+!define PIDGIN_SPELLCHECK_DUTCH			"������"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Ų����"
+!define PIDGIN_SPELLCHECK_POLISH			"������"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"��������"
+!define PIDGIN_SPELLCHECK_ROMANIAN			"����������"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"����"
+!define PIDGIN_SPELLCHECK_SLOVAK			"˹�工����"
+!define PIDGIN_SPELLCHECK_SWEDISH			"�����"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"�ڿ�����"
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/slovak.nsh
--- a/pidgin/win32/nsis/translations/slovak.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovak.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -2,7 +2,7 @@
 ;;
 ;;  slovak.nsh
 ;;
-;;  Slovak language strings for the Windows Gaim NSIS installer.
+;;  Slovak language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1250
 ;;
 ;;  Author: dominik@internetkosice.sk
@@ -10,43 +10,43 @@
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"In�tal�cia je u� spusten�"
-!define GAIM_IS_RUNNING				"Gaim je pr�ve spusten�. Vypnite ho a sk�ste znova."
+!define PIDGIN_IS_RUNNING				"Pidgin je pr�ve spusten�. Vypnite ho a sk�ste znova."
 !define GTK_INSTALLER_NEEDED			"GTK+ runtime prostredie ch�ba alebo mus� by� upgradovan�.$\rNain�talujte, pros�m, GTK+ runtime verziu v${GTK_MIN_VERSION}, alebo nov�iu"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"�alej >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) je vydan� pod GPL licenciou. T�to licencia je len pre informa�n� ��ely. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"�alej >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) je vydan� pod GPL licenciou. T�to licencia je len pre informa�n� ��ely. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Instant Messaging Klient (nevyhnutn�)"
+!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Klient (nevyhnutn�)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime prostredie (nevyhnutn�)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ t�my"
 !define GTK_NOTHEME_SECTION_TITLE		"�iadna grafick� t�ma"
 !define GTK_WIMP_SECTION_TITLE			"Wimp grafick� t�ma"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve grafick� t�ma"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue grafick� t�ma"
-!define GAIM_SHORTCUTS_SECTION_TITLE		"Z�stupcovia"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Plocha"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"�tart Menu"
-!define GAIM_SECTION_DESCRIPTION		"Jadro Gaim-u a nevyhnutn� DLL s�bory"
-!define GTK_SECTION_DESCRIPTION			"Multiplatformov� GUI n�stroje, pou��van� Gaim-om"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Z�stupcovia"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Plocha"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"�tart Menu"
+!define PIDGIN_SECTION_DESCRIPTION		"Jadro Pidgin-u a nevyhnutn� DLL s�bory"
+!define GTK_SECTION_DESCRIPTION			"Multiplatformov� GUI n�stroje, pou��van� Pidgin-om"
 !define GTK_THEMES_SECTION_DESCRIPTION		"Pomocou GTK+ grafick�ch t�m m��ete zmeni� vzh�ad GTK+ aplik�ci�."
 !define GTK_NO_THEME_DESC			"Nein�talova� GTK+ grafick� t�mu"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) je GTK grafick� t�ma, ktor� pekne lad� s prostred�m Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Bluecurve grafick� t�ma."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Lighthouseblue grafick� t�ma"
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Z�stupcovia pre Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC		"Vytvori� z�stupcu pre Gaim na pracovnej ploche"
-!define GAIM_STARTMENU_SHORTCUT_DESC		"Vytvori� odkaz na Gaim v �tart Menu"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Z�stupcovia pre Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Vytvori� z�stupcu pre Pidgin na pracovnej ploche"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Vytvori� odkaz na Pidgin v �tart Menu"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Bola n�jden� star�ia verzia GTK+ runtime. Prajete si upgradova� s��asn� verziu?$\rPozn�mka: Gaim nemus� po upgradovan� fungova� spr�vne."
+!define GTK_UPGRADE_PROMPT			"Bola n�jden� star�ia verzia GTK+ runtime. Prajete si upgradova� s��asn� verziu?$\rPozn�mka: $(^Name) nemus� po upgradovan� fungova� spr�vne."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Nav�t�vi� webstr�nku Windows Gaim"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Nav�t�vi� webstr�nku Windows Pidgin"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (len odstr�ni�)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (len odstr�ni�)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Chyba pri in�tal�cii GTK+ runtime."
@@ -56,35 +56,35 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Nem�te opr�vnenie na in�tal�ciu GTK+ grafickej t�my."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"In�tal�toru sa nepodarilo n�js� polo�ky v registri pre Gaim.$\rJe mo�n�, �e t�to aplik�ciu nain�taloval in� pou��vate�."
-!define un.GAIM_UNINSTALL_ERROR_2		"Nem�te opr�vnenie na odin�tal�ciu tejto aplik�cie."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"In�tal�toru sa nepodarilo n�js� polo�ky v registri pre Pidgin.$\rJe mo�n�, �e t�to aplik�ciu nain�taloval in� pou��vate�."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Nem�te opr�vnenie na odin�tal�ciu tejto aplik�cie."
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"Podpora kontroly pravopisu"
-!define GAIM_SPELLCHECK_ERROR			"Chyba pri in�tal�cii kontroly pravopisu"
-!define GAIM_SPELLCHECK_DICT_ERROR		"Chyba pri in�tal�cii slovn�ka kontroly pravopisu"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Podpora kontroly pravopisu (Nutn� pripojenie k Internetu)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Podpora kontroly pravopisu"
+!define PIDGIN_SPELLCHECK_ERROR			"Chyba pri in�tal�cii kontroly pravopisu"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Chyba pri in�tal�cii slovn�ka kontroly pravopisu"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Podpora kontroly pravopisu (Nutn� pripojenie k Internetu)"
 !define ASPELL_INSTALL_FAILED			"In�tal�cia zlyhala"
-!define GAIM_SPELLCHECK_BRETON			"Bret�nsky"
-!define GAIM_SPELLCHECK_CATALAN			"Katal�nsky"
-!define GAIM_SPELLCHECK_CZECH			"�esk�"
-!define GAIM_SPELLCHECK_WELSH			"Welshsk�"
-!define GAIM_SPELLCHECK_DANISH			"D�nsky"
-!define GAIM_SPELLCHECK_GERMAN			"Nemeck�"
-!define GAIM_SPELLCHECK_GREEK			"Gr�cky"
-!define GAIM_SPELLCHECK_ENGLISH			"Anglick�"
-!define GAIM_SPELLCHECK_ESPERANTO		"Esperantsk�"
-!define GAIM_SPELLCHECK_SPANISH			"�panielsk�"
-!define GAIM_SPELLCHECK_FAROESE			"Faroesk�"
-!define GAIM_SPELLCHECK_FRENCH			"Franc�zsky"
-!define GAIM_SPELLCHECK_ITALIAN			"Taliansk�"
-!define GAIM_SPELLCHECK_DUTCH			"Holandsk�"
-!define GAIM_SPELLCHECK_NORWEGIAN		"N�rsky"
-!define GAIM_SPELLCHECK_POLISH			"Po�sk�"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portugalsk�"
-!define GAIM_SPELLCHECK_ROMANIAN		"Rumunsk�"
-!define GAIM_SPELLCHECK_RUSSIAN			"Rusk�"
-!define GAIM_SPELLCHECK_SLOVAK			"Slovensk�"
-!define GAIM_SPELLCHECK_SWEDISH			"�v�dsky"
-!define GAIM_SPELLCHECK_UKRAINIAN		"Ukrajinsk�"
+!define PIDGIN_SPELLCHECK_BRETON			"Bret�nsky"
+!define PIDGIN_SPELLCHECK_CATALAN			"Katal�nsky"
+!define PIDGIN_SPELLCHECK_CZECH			"�esk�"
+!define PIDGIN_SPELLCHECK_WELSH			"Welshsk�"
+!define PIDGIN_SPELLCHECK_DANISH			"D�nsky"
+!define PIDGIN_SPELLCHECK_GERMAN			"Nemeck�"
+!define PIDGIN_SPELLCHECK_GREEK			"Gr�cky"
+!define PIDGIN_SPELLCHECK_ENGLISH			"Anglick�"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperantsk�"
+!define PIDGIN_SPELLCHECK_SPANISH			"�panielsk�"
+!define PIDGIN_SPELLCHECK_FAROESE			"Faroesk�"
+!define PIDGIN_SPELLCHECK_FRENCH			"Franc�zsky"
+!define PIDGIN_SPELLCHECK_ITALIAN			"Taliansk�"
+!define PIDGIN_SPELLCHECK_DUTCH			"Holandsk�"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"N�rsky"
+!define PIDGIN_SPELLCHECK_POLISH			"Po�sk�"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugalsk�"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Rumunsk�"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"Rusk�"
+!define PIDGIN_SPELLCHECK_SLOVAK			"Slovensk�"
+!define PIDGIN_SPELLCHECK_SWEDISH			"�v�dsky"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrajinsk�"
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/slovenian.nsh
--- a/pidgin/win32/nsis/translations/slovenian.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/slovenian.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  slovenian.nsh
 ;;
-;;  Slovenian language strings for the Windows Gaim NSIS installer.
+;;  Slovenian language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1250
 ;;
 ;;  Author: Martin Srebotnjak <miles@filmsi.net>
@@ -10,43 +10,43 @@
 
 ; Startup GTK+ check
 !define INSTALLER_IS_RUNNING			"Name��anje �e poteka."
-!define GAIM_IS_RUNNING				"Trenutno �e te�e razli�ica Gaima. Prosimo zaprite Gaim in poskusite znova."
+!define PIDGIN_IS_RUNNING				"Trenutno �e te�e razli�ica Pidgin. Prosimo zaprite Pidgin in poskusite znova."
 !define GTK_INSTALLER_NEEDED			"Izvajalno okolje GTK+ manjka ali pa ga je potrebno nadgraditi.$\rProsimo namestite v${GTK_MIN_VERSION} ali vi�jo razli�ico izvajalnega okolja GTK+"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Naprej >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) je na voljo pod licenco GPL. Ta licenca je tu na voljo le v informativne namene. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Naprej >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) je na voljo pod licenco GPL. Ta licenca je tu na voljo le v informativne namene. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim - odjemalec za klepet (zahtevano)"
+!define PIDGIN_SECTION_TITLE			"Pidgin - odjemalec za klepet (zahtevano)"
 !define GTK_SECTION_TITLE			"GTK+ izvajalno okolje (zahtevano)"
 !define GTK_THEMES_SECTION_TITLE		"Teme GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Brez teme"
 !define GTK_WIMP_SECTION_TITLE			"Tema Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
-!define GAIM_SHORTCUTS_SECTION_TITLE		"Bli�njice"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"Namizje"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE	"Za�etni meni"
-!define GAIM_SECTION_DESCRIPTION		"Temeljne datoteke Gaima"
-!define GTK_SECTION_DESCRIPTION			"Ve�platformna orodjarna GUI, ki jo uporablja Gaim"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"Bli�njice"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Namizje"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Za�etni meni"
+!define PIDGIN_SECTION_DESCRIPTION		"Temeljne datoteke Pidgin"
+!define GTK_SECTION_DESCRIPTION			"Ve�platformna orodjarna GUI, ki jo uporablja Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION		"Teme GTK+ lahko spremenijo izgled programov GTK+."
 !define GTK_NO_THEME_DESC			"Brez namestitve teme GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (opona�evalec Oken) je tema GTK, ki se lepo vklaplja v namizno okolje Windows."
 !define GTK_BLUECURVE_THEME_DESC		"Tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC		"Tema Lighthouseblue."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"Bli�njice za zagon Gaima"
-!define GAIM_DESKTOP_SHORTCUT_DESC		"Ustvari bli�njico za Gaim na namizju"
-!define GAIM_STARTMENU_SHORTCUT_DESC		"Ustvari vnos Gaim v meniju Start"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Bli�njice za zagon Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"Ustvari bli�njico za Pidgin na namizju"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"Ustvari vnos Pidgin v meniju Start"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Na�el sem starej�o razli�ico izvajalnega okolja GTK+. Jo �elite nadgraditi?$\rOpomba: �e je ne boste nadgradili, Gaim morda ne bo deloval."
+!define GTK_UPGRADE_PROMPT			"Na�el sem starej�o razli�ico izvajalnega okolja GTK+. Jo �elite nadgraditi?$\rOpomba: �e je ne boste nadgradili, $(^Name) morda ne bo deloval."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Obi��ite spletno stran Windows Gaim"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Obi��ite spletno stran Windows Pidgin"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (samo odstrani)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (samo odstrani)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Napaka pri namestitvi izvajalnega okolja GTK+."
@@ -56,35 +56,35 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Za namestitev teme GTK+ nimate ustreznih pravic."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Ne morem najti vnosov v registru za Gaim.$\rNajverjetneje je ta program namestil drug uporabnik."
-!define un.GAIM_UNINSTALL_ERROR_2		"Za odstranitev programa nimate ustreznih pravic."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Ne morem najti vnosov v registru za Pidgin.$\rNajverjetneje je ta program namestil drug uporabnik."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Za odstranitev programa nimate ustreznih pravic."
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"Podpora preverjanja �rkovanja"
-!define GAIM_SPELLCHECK_ERROR			"Napaka pri name��anju preverjanja �rkovanja"
-!define GAIM_SPELLCHECK_DICT_ERROR		"Napaka pri name��anju slovarja za preverjanje �rkovanja"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Podpora preverjanja �rkovanja.  (Za namestitev je potrebna spletna povezava)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Podpora preverjanja �rkovanja"
+!define PIDGIN_SPELLCHECK_ERROR			"Napaka pri name��anju preverjanja �rkovanja"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Napaka pri name��anju slovarja za preverjanje �rkovanja"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Podpora preverjanja �rkovanja.  (Za namestitev je potrebna spletna povezava)"
 !define ASPELL_INSTALL_FAILED			"Namestitev ni uspela."
-!define GAIM_SPELLCHECK_BRETON			"bretonski"
-!define GAIM_SPELLCHECK_CATALAN			"katalonski"
-!define GAIM_SPELLCHECK_CZECH			"�e�ki"
-!define GAIM_SPELLCHECK_WELSH			"vel�ki"
-!define GAIM_SPELLCHECK_DANISH			"danski"
-!define GAIM_SPELLCHECK_GERMAN			"nem�ki"
-!define GAIM_SPELLCHECK_GREEK			"gr�ki"
-!define GAIM_SPELLCHECK_ENGLISH			"angle�ki"
-!define GAIM_SPELLCHECK_ESPERANTO		"esperantski"
-!define GAIM_SPELLCHECK_SPANISH			"�panski"
-!define GAIM_SPELLCHECK_FAROESE			"farojski"
-!define GAIM_SPELLCHECK_FRENCH			"francoski"
-!define GAIM_SPELLCHECK_ITALIAN			"italijanski"
-!define GAIM_SPELLCHECK_DUTCH			"nizozemski"
-!define GAIM_SPELLCHECK_NORWEGIAN		"norve�ki"
-!define GAIM_SPELLCHECK_POLISH			"poljski"
-!define GAIM_SPELLCHECK_PORTUGUESE		"portugalski"
-!define GAIM_SPELLCHECK_ROMANIAN		"romunski"
-!define GAIM_SPELLCHECK_RUSSIAN			"ruski"
-!define GAIM_SPELLCHECK_SLOVAK			"slova�ki"
-!define GAIM_SPELLCHECK_SLOVENIAN		"slovenski"
-!define GAIM_SPELLCHECK_SWEDISH			"�vedski"
-!define GAIM_SPELLCHECK_UKRAINIAN		"ukrajinski"
+!define PIDGIN_SPELLCHECK_BRETON			"bretonski"
+!define PIDGIN_SPELLCHECK_CATALAN			"katalonski"
+!define PIDGIN_SPELLCHECK_CZECH			"�e�ki"
+!define PIDGIN_SPELLCHECK_WELSH			"vel�ki"
+!define PIDGIN_SPELLCHECK_DANISH			"danski"
+!define PIDGIN_SPELLCHECK_GERMAN			"nem�ki"
+!define PIDGIN_SPELLCHECK_GREEK			"gr�ki"
+!define PIDGIN_SPELLCHECK_ENGLISH			"angle�ki"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"esperantski"
+!define PIDGIN_SPELLCHECK_SPANISH			"�panski"
+!define PIDGIN_SPELLCHECK_FAROESE			"farojski"
+!define PIDGIN_SPELLCHECK_FRENCH			"francoski"
+!define PIDGIN_SPELLCHECK_ITALIAN			"italijanski"
+!define PIDGIN_SPELLCHECK_DUTCH			"nizozemski"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"norve�ki"
+!define PIDGIN_SPELLCHECK_POLISH			"poljski"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"portugalski"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"romunski"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"ruski"
+!define PIDGIN_SPELLCHECK_SLOVAK			"slova�ki"
+!define PIDGIN_SPELLCHECK_SLOVENIAN		"slovenski"
+!define PIDGIN_SPELLCHECK_SWEDISH			"�vedski"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"ukrajinski"
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/spanish.nsh
--- a/pidgin/win32/nsis/translations/spanish.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/spanish.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  spanish.nsh
 ;;
-;;  Spanish language strings for the Windows Gaim NSIS installer.
+;;  Spanish language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;  Translator: Javier Fernandez-Sanguino Pe�a
 ;;
@@ -12,19 +12,19 @@
 !define GTK_INSTALLER_NEEDED			"El entorno de ejecuci�n de GTK+ falta o necesita ser actualizado.$\rPor favor, instale la versi�n v${GTK_MIN_VERSION} del ejecutable GTK+ o alguna posterior."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Siguiente >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) se distribuye bajo la licencia GPL. Esta licencia se incluye aqu� s�lo con prop�sito informativo: $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Siguiente >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) se distribuye bajo la licencia GPL. Esta licencia se incluye aqu� s�lo con prop�sito informativo: $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Cliente de mensajer�a instant�nea de Gaim (necesario)"
+!define PIDGIN_SECTION_TITLE			"Cliente de mensajer�a instant�nea de Pidgin (necesario)"
 !define GTK_SECTION_TITLE			"Entorno de ejecuci�n de GTK+ (necesario)"
 !define GTK_THEMES_SECTION_TITLE		"Temas GTK+" 
 !define GTK_NOTHEME_SECTION_TITLE		"Sin tema"
 !define GTK_WIMP_SECTION_TITLE		"Tema Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
-!define GAIM_SECTION_DESCRIPTION		"Ficheros y dlls principales de Core"
-!define GTK_SECTION_DESCRIPTION		"Una suite de herramientas GUI multiplataforma, utilizada por Gaim"
+!define PIDGIN_SECTION_DESCRIPTION		"Ficheros y dlls principales de Core"
+!define GTK_SECTION_DESCRIPTION		"Una suite de herramientas GUI multiplataforma, utilizada por Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"Los temas pueden cambiar la apariencia de aplicaciones GTK+."
 !define GTK_NO_THEME_DESC			"No instalar un tema GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) es un tema GTK que se fusiona muy bien con el entorno de escritorio de Windows."
@@ -32,13 +32,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"El tema Lighthouseblue."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Se ha encontrado una versi�n antig�a del ejecutable de GTK+. �Desea actualizarla?$\rObservaci�n: Gaim no funcionar� a menos que lo haga."
+!define GTK_UPGRADE_PROMPT			"Se ha encontrado una versi�n antig�a del ejecutable de GTK+. �Desea actualizarla?$\rObservaci�n: $(^Name) no funcionar� a menos que lo haga."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visite la p�gina Web de Gaim Windows"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visite la p�gina Web de Pidgin Windows"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (s�lo eliminar)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (s�lo eliminar)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Error al instalar el ejecutable GTK+."
@@ -48,5 +48,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"No tiene permisos para instalar un tema GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "El desinstalador no pudo encontrar las entradas en el registro de Gaim.$\rEs probable que otro usuario instalara la aplicaci�n."
-!define un.GAIM_UNINSTALL_ERROR_2         "No tiene permisos para desinstalar esta aplicaci�n."
+!define un.PIDGIN_UNINSTALL_ERROR_1         "El desinstalador no pudo encontrar las entradas en el registro de Pidgin.$\rEs probable que otro usuario instalara la aplicaci�n."
+!define un.PIDGIN_UNINSTALL_ERROR_2         "No tiene permisos para desinstalar esta aplicaci�n."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/swedish.nsh
--- a/pidgin/win32/nsis/translations/swedish.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/swedish.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,55 +1,55 @@
 ;;
 ;;  swedish.nsh
 ;;
-;;  Swedish language strings for the Windows Gaim NSIS installer.
+;;  Swedish language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Author: Tore Lundqvist <tlt@mima.x.se>, 2003.
 ;;  Author: Peter Hjalmarsson <xake@telia.com>, 2005.
 ;;  Version 3
 
-; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
+; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
 ; langmacros.nsh when updating this file
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"Installationsprogrammet k�rs redan."
-!define GAIM_IS_RUNNING			"En instans av Giam k�rs redan. Avsluta Gaim och f�rs�k igen."
+!define PIDGIN_IS_RUNNING			"En instans av Pidgin k�rs redan. Avsluta Pidgin och f�rs�k igen."
 !define GTK_INSTALLER_NEEDED			"K�rmilj�n GTK+ �r antingen inte installerat eller beh�ver uppgraderas.$\rVar god installera v${GTK_MIN_VERSION} eller h�gre av GTK+-k�rmilj�n."
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"N�sta >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) �r utgivet under GPL. Licensen finns tillg�nglig h�r f�r infromationssyften enbart. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"N�sta >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �r utgivet under GPL. Licensen finns tillg�nglig h�r f�r infromationssyften enbart. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim Snabbmeddelandeklient (obligatorisk)"
+!define PIDGIN_SECTION_TITLE			"Pidgin Snabbmeddelandeklient (obligatorisk)"
 !define GTK_SECTION_TITLE			"GTK+-k�rmilj� (obligatorisk)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+-teman"
 !define GTK_NOTHEME_SECTION_TITLE		"Inget tema"
 !define GTK_WIMP_SECTION_TITLE		"Wimp-tema"
 !define GTK_BLUECURVE_SECTION_TITLE	"Bluecurve-tema"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue-tema"
-!define GAIM_SHORTCUTS_SECTION_TITLE "Genv�gar"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE "Skrivbord"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny"
-!define GAIM_SECTION_DESCRIPTION		"Gaims k�rnfiler och DLL:er"
-!define GTK_SECTION_DESCRIPTION		"En GUI-verktygsupps�ttning f�r flera olika plattformar som Gaim anv�nder."
+!define PIDGIN_SHORTCUTS_SECTION_TITLE "Genv�gar"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Skrivbord"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidgin k�rnfiler och DLL:er"
+!define GTK_SECTION_DESCRIPTION		"En GUI-verktygsupps�ttning f�r flera olika plattformar som Pidgin anv�nder."
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+-teman kan �ndra k�nslan av och utseendet p� GTK+-applikationer."
 !define GTK_NO_THEME_DESC			"Installera inte n�got GTK+-tema"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) ett GTK-tema som sm�lter bra in i Windows-milj�n."
 !define GTK_BLUECURVE_THEME_DESC		"The Bluecurve-tema."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"The Lighthouseblue-tema."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   "Genv�gar f�r att starta Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC   "Skapar en genv�g till Gaim p� skrivbordet"
-!define GAIM_STARTMENU_SHORTCUT_DESC   "Skapar ett till�gg i startmenyn f�r Gaim"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "Genv�gar f�r att starta Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC   "Skapar en genv�g till Pidgin p� skrivbordet"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Skapar ett till�gg i startmenyn f�r Pidgin"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"En �ldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! Gaim kommer kanske inte att fungera om du inte uppgraderar."
+!define GTK_UPGRADE_PROMPT			"En �ldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! $(^Name) kommer kanske inte att fungera om du inte uppgraderar."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Bes�k Windows-Gaims hemsida"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Windows-Pidgin hemsida"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (enbart f�r avinstallation)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (enbart f�r avinstallation)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."
@@ -59,5 +59,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Du har inte r�ttigheter att installera ett GTK+tema."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1         "Avinstalleraren kunde inte hitta registerv�rden f�r Gaim.$\rAntagligen har en annan anv�ndare installerat applikationen."
-!define un.GAIM_UNINSTALL_ERROR_2         "Du har inte r�ttigheter att avinstallera den h�r applikationen."
+!define un.PIDGIN_UNINSTALL_ERROR_1         "Avinstalleraren kunde inte hitta registerv�rden f�r Pidgin.$\rAntagligen har en annan anv�ndare installerat applikationen."
+!define un.PIDGIN_UNINSTALL_ERROR_2         "Du har inte r�ttigheter att avinstallera den h�r applikationen."
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/trad-chinese.nsh
--- a/pidgin/win32/nsis/translations/trad-chinese.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/trad-chinese.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,7 +1,7 @@
 ;;
 ;;  trad-chinese.nsh
 ;;
-;;  Traditional Chineese language strings for the Windows Gaim NSIS installer.
+;;  Traditional Chineese language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page:950
 ;;
 ;;  Author: Paladin R. Liu <paladin@ms1.hinet.net>
@@ -12,43 +12,43 @@
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"�w�˵{�����b���椤�C"
-!define GAIM_IS_RUNNING				"Gaim ���b���椤�A�Х������o�ӵ{����A��w�ˡC"
+!define PIDGIN_IS_RUNNING				"Pidgin ���b���椤�A�Х������o�ӵ{����A��w�ˡC"
 !define GTK_INSTALLER_NEEDED			"�䤣��ŦX�� GTK+ �������ҩάO�ݭn�Q��s�C$\r�Цw�� v${GTK_MIN_VERSION} �H�W������ GTK+ �������ҡC"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"�U�@�B >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) �ĥ� GNU General Public License (GPL) ���v�o�G�C�b���C�X���v�ѡA�ȧ@���ѦҤ��ΡC$_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"�U�@�B >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �ĥ� GNU General Public License (GPL) ���v�o�G�C�b���C�X���v�ѡA�ȧ@���ѦҤ��ΡC$_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Gaim �D�{�� (����)"
+!define PIDGIN_SECTION_TITLE			"Pidgin �D�{�� (����)"
 !define GTK_SECTION_TITLE			"GTK+ �������� (����)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ �G���D�D"
 !define GTK_NOTHEME_SECTION_TITLE		"���w�˧G���D�D"
 !define GTK_WIMP_SECTION_TITLE			"Wimp �G���D�D"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve �G���D�D"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue �G���D�D"
-!define GAIM_SHORTCUTS_SECTION_TITLE		"���|"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE	"�ୱ���|"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE "�}�l�\���"
-!define GAIM_SECTION_DESCRIPTION		"Gaim �֤��ɮפΰʺA�禡�w"
-!define GTK_SECTION_DESCRIPTION			"Gaim �ҨϥΪ��󥭥x�ϧΤ����禡�w"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE		"���|"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"�ୱ���|"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "�}�l�\���"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidgin �֤��ɮפΰʺA�禡�w"
+!define GTK_SECTION_DESCRIPTION			"Pidgin �ҨϥΪ��󥭥x�ϧΤ����禡�w"
 !define GTK_THEMES_SECTION_DESCRIPTION		"GTK+ �G���D�D�i�H�Ψӧ��� GTK+ ���ε{�����~�[�C"
 !define GTK_NO_THEME_DESC			"���w�� GTK+ �G���D�D"
 !define GTK_WIMP_THEME_DESC			"�uGTK-Wimp�v(Windows impersonator) �D�D�i�� GTK+ �ĤJ Windows �������������C"
 !define GTK_BLUECURVE_THEME_DESC		"�uBluecurve�v�D�D"
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC		"�uLighthouseblue�v�D�D�C"
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION	"�إ� Gaim ���|"
-!define GAIM_DESKTOP_SHORTCUT_DESC		"�b�ୱ�إ߱��|"
-!define GAIM_STARTMENU_SHORTCUT_DESC		"�b�}�l�\����إ߱��|"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"�إ� Pidgin ���|"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC		"�b�ୱ�إ߱��|"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC		"�b�}�l�\����إ߱��|"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"�o�{�@���ª��� GTK+ �������ҡC�z�n�N���ɯŶܡH$\r�Ъ`�N�G�p�G�z���ɯšAGaim �i��L�k���T���Q����C"
+!define GTK_UPGRADE_PROMPT			"�o�{�@���ª��� GTK+ �������ҡC�z�n�N���ɯŶܡH$\r�Ъ`�N�G�p�G�z���ɯšA $(^Name) �i��L�k���T���Q����C"
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"���X Windows Gaim ����"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"���X Windows Pidgin ����"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim v${GAIM_VERSION} (�u�Ѳ���)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (�u�Ѳ���)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"�w�� GTK+ �������Үɵo�Ϳ��~�C"
@@ -58,5 +58,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"�z�ثe���v���L�k�w�� GTK+ �G���D�D�C"
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"�����{���L�k��� Gaim ���w�˸�T�C$\r�o���ӬO����L���ϥΪ̭��s�w�ˤF�o�ӵ{���C"
-!define un.GAIM_UNINSTALL_ERROR_2		"�z�ثe���v���L�k���� Gaim�C"
+!define un.PIDGIN_UNINSTALL_ERROR_1		"�����{���L�k��� Pidgin ���w�˸�T�C$\r�o���ӬO����L���ϥΪ̭��s�w�ˤF�o�ӵ{���C"
+!define un.PIDGIN_UNINSTALL_ERROR_2		"�z�ثe���v���L�k���� Pidgin �C"
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/valencian.nsh
--- a/pidgin/win32/nsis/translations/valencian.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/valencian.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,55 +1,55 @@
 ;;
 ;;  valencian.nsh
 ;;
-;;  Valencian language strings for the Windows Gaim NSIS installer.
+;;  Valencian language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1252
 ;;
 ;;  Version 3
-;;  Note: If translating this file, replace "!insertmacro GAIM_MACRO_DEFAULT_STRING"
+;;  Note: If translating this file, replace "!insertmacro PIDGIN_MACRO_DEFAULT_STRING"
 ;;  with "!define".
 
-; Make sure to update the GAIM_MACRO_LANGUAGEFILE_END macro in
+; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
 ; langmacros.nsh when updating this file
 
 ; Startup Checks
 !define INSTALLER_IS_RUNNING			"L'instalador encara est� eixecutant-se."
-!define GAIM_IS_RUNNING				"Una instancia de Gaim est� eixecutant-se. Ix del Gaim i torna a intentar-ho."
+!define PIDGIN_IS_RUNNING				"Una instancia de Pidgin est� eixecutant-se. Ix del Pidgin i torna a intentar-ho."
 !define GTK_INSTALLER_NEEDED			"L'entorn d'eixecucio GTK+ no es troba o necessita ser actualisat.$\rPer favor instala la versio${GTK_MIN_VERSION} o superior de l'entorn GTK+"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Seg�ent >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) es distribuit baix llicencia GNU General Public License (GPL). La llicencia es proporcionada per proposits informatius aci. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Seg�ent >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) es distribuit baix llicencia GNU General Public License (GPL). La llicencia es proporcionada per proposits informatius aci. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Client Mensageria Instantanea Gaim (necessari)"
+!define PIDGIN_SECTION_TITLE			"Client Mensageria Instantanea Pidgin (necessari)"
 !define GTK_SECTION_TITLE			"Entorn d'Eixecucio GTK+ (necessari)"
 !define GTK_THEMES_SECTION_TITLE		"Temes GTK+"
 !define GTK_NOTHEME_SECTION_TITLE		"Sense Tema"
 !define GTK_WIMP_SECTION_TITLE			"Tema Wimp"
 !define GTK_BLUECURVE_SECTION_TITLE		"Tema Bluecurve"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Tema Light House Blue"
-!define GAIM_SHORTCUTS_SECTION_TITLE 		"Enlla�os directes"
-!define GAIM_DESKTOP_SHORTCUT_SECTION_TITLE 	"Escritori"
-!define GAIM_STARTMENU_SHORTCUT_SECTION_TITLE 	"Menu d'Inici"
-!define GAIM_SECTION_DESCRIPTION		"Archius i dlls del nucleu de Gaim"
-!define GTK_SECTION_DESCRIPTION			"Una ferramenta multi-plataforma GUI, usada per Gaim"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE 		"Enlla�os directes"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE 	"Escritori"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE 	"Menu d'Inici"
+!define PIDGIN_SECTION_DESCRIPTION		"Archius i dlls del nucleu de Pidgin"
+!define GTK_SECTION_DESCRIPTION			"Una ferramenta multi-plataforma GUI, usada per Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION		"Els Temes GTK+ poden canviar l'aspecte de les aplicacions GTK+."
 !define GTK_NO_THEME_DESC			"No instalar un tema GTK+"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (imitador Windows) es un tema GTK que s'integra perfectament en l'entorn d'escritori de Windows."
 !define GTK_BLUECURVE_THEME_DESC		"El tema Bluecurve."
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC		"El tema Lighthouseblue."
-!define GAIM_SHORTCUTS_SECTION_DESCRIPTION   	"Enlla�os directes per a iniciar Gaim"
-!define GAIM_DESKTOP_SHORTCUT_DESC   		"Crear un enlla� directe a Gaim en l'Escritori"
-!define GAIM_STARTMENU_SHORTCUT_DESC   		"Crear una entrada per a Gaim en Menu Inici"
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   	"Enlla�os directes per a iniciar Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC   		"Crear un enlla� directe a Pidgin en l'Escritori"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC   		"Crear una entrada per a Pidgin en Menu Inici"
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Una versio antiua de l'entorn GTK+ fon trobada. �Vols actualisar-la?$\rNota: Gaim no funcionar� si no ho fas."
+!define GTK_UPGRADE_PROMPT			"Una versio antiua de l'entorn GTK+ fon trobada. �Vols actualisar-la?$\rNota: $(^Name) no funcionar� si no ho fas."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Visita la pagina de Gaim per a Windows"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Visita la pagina de Pidgin per a Windows"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (nomes borrar)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (nomes borrar)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Erro instalant l'entorn GTK+."
@@ -59,35 +59,35 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"No tens permissos per a instalar un tema GTK+."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"El desinstalador podria no trobar les entrades del registre de Gaim.$\rProbablement un atre usuari instal� esta aplicacio."
-!define un.GAIM_UNINSTALL_ERROR_2		"No tens permis per a desinstalar esta aplicacio."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"El desinstalador podria no trobar les entrades del registre de Pidgin.$\rProbablement un atre usuari instal� esta aplicacio."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"No tens permis per a desinstalar esta aplicacio."
 
 ; Spellcheck Section Prompts
-!define GAIM_SPELLCHECK_SECTION_TITLE		"Soport de Correccio Ortografica"
-!define GAIM_SPELLCHECK_ERROR			"Erro Instalant Correccio Ortografica"
-!define GAIM_SPELLCHECK_DICT_ERROR		"Erro Instalant Diccionari de Correccio Ortografica"
-!define GAIM_SPELLCHECK_SECTION_DESCRIPTION	"Soport per a Correccio Ortografica.  (es requerix conexio a Internet per a fer l'instalacio)"
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"Soport de Correccio Ortografica"
+!define PIDGIN_SPELLCHECK_ERROR			"Erro Instalant Correccio Ortografica"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Erro Instalant Diccionari de Correccio Ortografica"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Soport per a Correccio Ortografica.  (es requerix conexio a Internet per a fer l'instalacio)"
 !define ASPELL_INSTALL_FAILED			"L'Instalacio fall�"
-!define GAIM_SPELLCHECK_BRETON			"Breto"
-!define GAIM_SPELLCHECK_CATALAN			"Catal�"
-!define GAIM_SPELLCHECK_CZECH			"Chec"
-!define GAIM_SPELLCHECK_WELSH			"Gal�s"
-!define GAIM_SPELLCHECK_DANISH			"Danes"
-!define GAIM_SPELLCHECK_GERMAN			"Alem�"
-!define GAIM_SPELLCHECK_GREEK			"Grec"
-!define GAIM_SPELLCHECK_ENGLISH			"Angles"
-!define GAIM_SPELLCHECK_ESPERANTO		"Esperanto"
-!define GAIM_SPELLCHECK_SPANISH			"Espanyol"
-!define GAIM_SPELLCHECK_FAROESE			"Feroes"
-!define GAIM_SPELLCHECK_FRENCH			"Frances"
-!define GAIM_SPELLCHECK_ITALIAN			"Itali�"
-!define GAIM_SPELLCHECK_DUTCH			"Holandes"
-!define GAIM_SPELLCHECK_NORWEGIAN		"Noruec"
-!define GAIM_SPELLCHECK_POLISH			"Polac"
-!define GAIM_SPELLCHECK_PORTUGUESE		"Portugues"
-!define GAIM_SPELLCHECK_ROMANIAN		"Romanes"
-!define GAIM_SPELLCHECK_RUSSIAN			"Rus"
-!define GAIM_SPELLCHECK_SLOVAK			"Eslovac"
-!define GAIM_SPELLCHECK_SWEDISH			"Suec"
-!define GAIM_SPELLCHECK_UKRAINIAN		"Ucrani�"
+!define PIDGIN_SPELLCHECK_BRETON			"Breto"
+!define PIDGIN_SPELLCHECK_CATALAN			"Catal�"
+!define PIDGIN_SPELLCHECK_CZECH			"Chec"
+!define PIDGIN_SPELLCHECK_WELSH			"Gal�s"
+!define PIDGIN_SPELLCHECK_DANISH			"Danes"
+!define PIDGIN_SPELLCHECK_GERMAN			"Alem�"
+!define PIDGIN_SPELLCHECK_GREEK			"Grec"
+!define PIDGIN_SPELLCHECK_ENGLISH			"Angles"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH			"Espanyol"
+!define PIDGIN_SPELLCHECK_FAROESE			"Feroes"
+!define PIDGIN_SPELLCHECK_FRENCH			"Frances"
+!define PIDGIN_SPELLCHECK_ITALIAN			"Itali�"
+!define PIDGIN_SPELLCHECK_DUTCH			"Holandes"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Noruec"
+!define PIDGIN_SPELLCHECK_POLISH			"Polac"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugues"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Romanes"
+!define PIDGIN_SPELLCHECK_RUSSIAN			"Rus"
+!define PIDGIN_SPELLCHECK_SLOVAK			"Eslovac"
+!define PIDGIN_SPELLCHECK_SWEDISH			"Suec"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ucrani�"
 
diff -r 51dd9ae01585 -r 2d739b7a14ac pidgin/win32/nsis/translations/vietnamese.nsh
--- a/pidgin/win32/nsis/translations/vietnamese.nsh	Sat Mar 03 19:18:38 2007 +0000
+++ b/pidgin/win32/nsis/translations/vietnamese.nsh	Sat Mar 03 19:18:47 2007 +0000
@@ -1,31 +1,31 @@
 ;;
 ;;  vietnamese.nsh
 ;;
-;;  Vietnamese language strings for the Windows Gaim NSIS installer.
+;;  Vietnamese language strings for the Windows Pidgin NSIS installer.
 ;;  Windows Code page: 1258
 ;;
 ;;  Version 2
 ;;  Note: The NSIS Installer does not yet have Vietnamese translations. Until
-;;  it does, these Gaim translations can not be used. 
+;;  it does, these translations can not be used. 
 ;;
 
 ; Startup GTK+ check
 !define GTK_INSTALLER_NEEDED			"The GTK+ runtime environment không có hoặc cần được nâng cấp.$\rHãy cài đặt GTK+ runtime v${GTK_MIN_VERSION} hoặc mới hơn"
 
 ; License Page
-!define GAIM_LICENSE_BUTTON			"Tiếp theo >"
-!define GAIM_LICENSE_BOTTOM_TEXT		"$(^Name) được phát hành theo giấy  phép GPL. Giấy phép thấy ở đây chỉ là để cung cấp thông tin mà thôi. $_CLICK"
+!define PIDGIN_LICENSE_BUTTON			"Tiếp theo >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) được phát hành theo giấy  phép GPL. Giấy phép thấy ở đây chỉ là để cung cấp thông tin mà thôi. $_CLICK"
 
 ; Components Page
-!define GAIM_SECTION_TITLE			"Trình Khách Thông Điệp Tức Thời Gaim  (phải có)"
+!define PIDGIN_SECTION_TITLE			"Trình Khách Thông Điệp Tức Thời Pidgin (phải có)"
 !define GTK_SECTION_TITLE			"GTK+ Runtime Environment (phải có)"
 !define GTK_THEMES_SECTION_TITLE		"GTK+ Theme"
 !define GTK_NOTHEME_SECTION_TITLE		"Không có Theme"
 !define GTK_WIMP_SECTION_TITLE		"Wimp Theme"
 !define GTK_BLUECURVE_SECTION_TITLE		"Bluecurve Theme"
 !define GTK_LIGHTHOUSEBLUE_SECTION_TITLE	"Light House Blue Theme"
-!define GAIM_SECTION_DESCRIPTION		"Các tập tin Gaim chính và dlls"
-!define GTK_SECTION_DESCRIPTION		"Bộ công cụ giao diện đồ họa đa nền để dùng cho Gaim"
+!define PIDGIN_SECTION_DESCRIPTION		"Các tập tin Pidgin chính và dlls"
+!define GTK_SECTION_DESCRIPTION		"Bộ công cụ giao diện đồ họa đa nền để dùng cho Pidgin"
 !define GTK_THEMES_SECTION_DESCRIPTION	"GTK+ Themes có thể thay đổi diệm mạo và sác thái của các ứng dụng GTK+."
 !define GTK_NO_THEME_DESC			"Không cài đặt GTK+ theme"
 !define GTK_WIMP_THEME_DESC			"GTK-Wimp (Windows impersonator) là một GTK theme tích hợp tốt trong môi trường desktop của Windows."
@@ -33,13 +33,13 @@
 !define GTK_LIGHTHOUSEBLUE_THEME_DESC	"Lighthouseblue theme."
 
 ; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Phát hiện thấy có phiên bản cũ của  GTK+ runtime. Bạn muốn nâng cấp không?$\rNote: Gaim có thể không chạy nếu không nâng cấp."
+!define GTK_UPGRADE_PROMPT			"Phát hiện thấy có phiên bản cũ của  GTK+ runtime. Bạn muốn nâng cấp không?$\rNote: $(^Name) có thể không chạy nếu không nâng cấp."
 
 ; Installer Finish Page
-!define GAIM_FINISH_VISIT_WEB_SITE		"Hãy xem trang chủ Windows Gaim"
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Hãy xem trang chủ Windows Pidgin"
 
-; Gaim Section Prompts and Texts
-!define GAIM_UNINSTALL_DESC			"Gaim (chỉ bỏ cài đặt)"
+; Pidgin Section Prompts and Texts
+!define PIDGIN_UNINSTALL_DESC			"$(^Name) (chỉ bỏ cài đặt)"
 
 ; GTK+ Section Prompts
 !define GTK_INSTALL_ERROR			"Lỗi cài đặt GTK+ runtime."
@@ -49,5 +49,5 @@
 !define GTK_NO_THEME_INSTALL_RIGHTS		"Bạn không có quyền hạn để cài đặt GTK+ theme."
 
 ; Uninstall Section Prompts
-!define un.GAIM_UNINSTALL_ERROR_1		"Trình gỡ cài đặt không tìm được các  registry entry cho Gaim.$\rCó thể là chương trình được người dùng khác cài đặt."
-!define un.GAIM_UNINSTALL_ERROR_2		"Bạn không có quyền hạn để gỡ bỏ chương trình này."
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Trình gỡ cài đặt không tìm được các  registry entry cho Pidgin.$\rCó thể là chương trình được người dùng khác cài đặt."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Bạn không có quyền hạn để gỡ bỏ chương trình này."