changeset 16120:e5af828c2f54

merge of 'aa2170e50c202539ea83f299b04eedf9a5d62178' and 'e6a776d806e488fa79eada7619f40300fdecda61'
author Nathan Walp <nwalp@pidgin.im>
date Sun, 15 Apr 2007 00:15:32 +0000
parents e57d9d5e5c86 (diff) ac1a32ebd62c (current diff)
children 6167ee79ecd0
files libpurple/plugins/perl/common/Pidgin.xs libpurple/prefix.c libpurple/prefix.h
diffstat 77 files changed, 9695 insertions(+), 9619 deletions(-) [+]
line wrap: on
line diff
--- a/.mtn-ignore	Sun Apr 15 00:14:34 2007 +0000
+++ b/.mtn-ignore	Sun Apr 15 00:15:32 2007 +0000
@@ -25,10 +25,11 @@
 doc/finch.1
 doc/pidgin.1
 doc/html
-gaim.apspec
+pidgin.apspec
 pidgin.desktop
-gaim.service
-gaim.spec
+pidgin.spec
+pidgin-.*.tar.gz
+pidgin-.*.tar.bz2
 pidgin/pidgin
 pidgin/plugins/musicmessaging/music-messaging-bindings.c
 pidgin/plugins/perl/common/Makefile.PL
@@ -38,10 +39,8 @@
 libpurple/dbus-bindings.c
 libpurple/dbus-types.c
 libpurple/dbus-types.h
-libpurple/gaim-client-bindings.c
-libpurple/gaim-client-bindings.h
-libpurple/gaim-client-example
-libpurple/gconf/gaim.schemas
+libpurple/example/nullclient
+libpurple/gconf/purple.schemas
 libpurple/plugins/dbus-example-bindings.c
 libpurple/plugins/perl/common/Makefile.PL
 libpurple/plugins/perl/common/const-c.inc
--- a/COPYRIGHT	Sun Apr 15 00:14:34 2007 +0000
+++ b/COPYRIGHT	Sun Apr 15 00:15:32 2007 +0000
@@ -198,6 +198,7 @@
 Syd Logan
 Lokheed
 Norberto Lopes
+Shlomi Loubaton
 Uli Luckas
 Matthew Luckie
 Mike Lundy
@@ -320,6 +321,7 @@
 Sun Microsystems
 Mårten Svantesson (fursten)
 Robert T.
+Greg Taeger
 Peter Tang
 Brian Tarricone
 Peter Teichman
--- a/ChangeLog	Sun Apr 15 00:14:34 2007 +0000
+++ b/ChangeLog	Sun Apr 15 00:15:32 2007 +0000
@@ -77,6 +77,7 @@
 	   button on the toolbar.)
 	* Performance while joining large chat rooms has been significantly
 	  improved (Aaron Sheldon, Google Summer of Code)
+	* Bi-Directional text support improvements for GtkIMHtml (Shlomi Loubaton)
 
 	Sounds:
 	* Beautiful new default sounds (Brad Turcotte)
@@ -138,6 +139,7 @@
 	* Added support for sending (with the /nudge command) and receiving
 	  "nudges" (Julien Cegarra, Martin Bayard)
 	* Added an account action to open your Hotmail inbox from MSN
+	* Bi-directional text is correctly handled now (Shlomi Loubaton)
 
 	Yahoo Features:
 	* Stealth Settings have been implemented
@@ -192,6 +194,8 @@
 	* Removed the Napster and TOC protocols plugins
 
 	Other Noteworthy Changes:
+	* The project has new names - libpurple for the core, Pidgin for the Gtk+
+	  UI and Finch for the ncurses based console UI (AOL LLC)
 	* UPnP and NAT traversal support (Adam J. Warrington, Google Summer of
 	  Code)
 	* The modify account dialog now contains two tabs, which should display
@@ -217,6 +221,7 @@
 	  time instead of X11 idle time (Michael Culbertson)
 	* Autocomplete in the buddy pounce dialog (Sadrul Habib Chowdhury)
 	* Non-blocking socket I/O is used in most protocol plugins
+	* All-new icons all over the place (Hylke Bons)
 
 	Preference Changes:
 	* Preferences have been substantially reorganized and cleaned up
--- a/ChangeLog.API	Sun Apr 15 00:14:34 2007 +0000
+++ b/ChangeLog.API	Sun Apr 15 00:15:32 2007 +0000
@@ -1,6 +1,16 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
 version 2.0.0:
+	Please note all functions, defines, and data structures have been
+	re-namespaced to match the new names of Pidgin, Finch, and libpurple.
+	All gaim_gtk_* functions are now pidgin_*, former libgaim functions are
+	now purple_*.  Please consult our doxygen documentation for a complete
+	reference.
+
+	The gaim-compat.h header exists to provide an API compatibility layer
+	for libpurple functions.  As an API compatibility layer, it must be
+	included at compile time to be of use.
+
 	Changed:
 	* All the status stuff.  Yay!
 	* gaim_prefs_connect_callback(), added handle parameter
@@ -222,6 +232,7 @@
 	* GaimGtkRoomlistDialog: Nothing used it outside of the file it was in.
 	* gaim_gtk_roomlist_dialog_new: use gaim_gtk_roomlist_show
 	* gaim_gtk_roomlist_dialog_new_with_account: use gaim_gtk_roomlist_show_with_account
+	* binreloc functions
 
 	Added:
 	* gaim_prefs_disconnect_by_handle()
@@ -360,6 +371,8 @@
 	* gaim_gtk_blist_set_headline
 	* gaim_gtk_set_urgent
 	* GtkGaimScrollBook and its functions.
+	* purple_markup_unescape_entity()
+	* purple_markup_get_css_property()
 
 	Signals - Changed:  (See the Doxygen docs for details on all signals.)
 	* Signal propagation now stops after a handler returns a non-NULL value.
--- a/README.SVN	Sun Apr 15 00:14:34 2007 +0000
+++ b/README.SVN	Sun Apr 15 00:15:32 2007 +0000
@@ -1,41 +1,39 @@
-If you plan to use gaim SVN, PLEASE read this message in its entirety!
+If you plan to use Pidgin, Finch & libpurple mtn, PLEASE read this message in its entirety!
 
-Gaim is a fast-moving project with a somewhat regular release schedule.
-Due to the rate of gaim development, SVN undergoes frequent bursts of
-massive changes, often leaving behind brokenness and partial
-functionality while the responsible developers rewrite some portion of
-code or seek to add new features.
+Pidgin, Finch & libpurple is a fast-moving project with a somewhat regular
+release schedule. Due to the rate of Pidgin, Finch & libpurple development,
+mtn undergoes frequent bursts of massive changes, often leaving behind
+brokenness and partial functionality while the responsible developers rewrite
+some portion of code or seek to add new features.
 
-What this all boils down to is that SVN _WILL_ sometimes be broken.
+What this all boils down to is that mtn _WILL_ sometimes be broken.
 Because of this, we ask that users who are not interested in
 personally tracking down bugs and fixing them (without a lot of
-assistance from the developers!) avoid SVN and use releases.  Since
+assistance from the developers!) avoid mtn and use releases.  Since
 releases will be made often, this should not prevent anyone from using
 the newest, shiniest features -- but it will prevent users from having
 to deal with ugly development bugs that we already know about but
 haven't gotten around to fixing.
 
-If you are interested in hacking on gaim, please read README and
-HACKING, and take note of the issues in PROGRAMMING_NOTES.  (Note that
-they may be somewhat out of date at times.) Win32 developers, please
+If you are interested in hacking on Pidgin, Finch & libpurple, please read
+README and HACKING, and take note of the issues in PROGRAMMING_NOTES.  (Note
+that they may be somewhat out of date at times.) Win32 developers, please
 read README.mingw.
 
 By far the best documentation, however, is the documented code.  Not
-all parts of gaim have yet been documented, but the major subsystems
-are falling fast.  If you have doxygen, you can use the Doxyfile in
+all parts of Pidgin, Finch & libpurple have yet been documented, but the major
+subsystems are falling fast.  If you have doxygen, you can use the Doxyfile in
 the toplevel directory to generate pretty documentation.  Otherwise
 (or even if you do!), the header files for each subsystem contain
 documentation for the functions they contain.  For instance,
-conversation.h contains documentation for the entire
-gaim_conversation_* API, and account.h contains documentation for the
-gaim_account_* API.
+conversation.h contains documentation for the entire purple_conversation_*
+API, and account.h contains documentation for the purple_account_* API.
 
-If you have questions, please feel free to contact the gaim developers
-by email at gaim-devel@lists.sourceforge.net, on IRC at
-irc.freenode.net in #gaim, or via the sourceforge forums at
-http://www.sourceforge.net/projects/gaim.  Please do as much homework
-as you can before contacting us; the more you know about your
-question, the faster and more effectively we can help you!
+If you have questions, please feel free to contact the Pidgin, Finch &
+libpurple developers by email at devel@pidgin.im or on IRC at irc.freenode.net
+in #pidgin.  Please do as much homework as you can before contacting us; the
+more you know about your question, the faster and more effectively we can help
+you!
 
-Send patches to gaim-devel@lists.sourceforge.net or post them in the
-Sourceforge forums at http://www.sourceforge.net/projects/gaim.
+Send patches to Pidgin, Finch & libpurple mailing list, devel@pidgin.im, or
+post them in the tracker at http://developer.pidgin.im.
--- a/TODO	Sun Apr 15 00:14:34 2007 +0000
+++ b/TODO	Sun Apr 15 00:15:32 2007 +0000
@@ -26,7 +26,7 @@
 }}}
 * buddy list {{{
 	* we have not committed any gobjectification, so this is not a blocker for 2.0.0 until we do.
-		* if we do, it is only a blocker to the extent that gaim needs to run.  That is, we do not
+		* if we do, it is only a blocker to the extent that pidgin & finch need to run.  That is, we do not
 		  *necessarily* have to gobjectifiy everything as long as we preserve functionality.
 		* That being said, my understanding of the signals mess says that it is probly more work to
 		  try to do this in stages than to start it or not start it.
@@ -40,12 +40,6 @@
 	* bugs
 		* wrong buddy given priority
 }}}
-* build targets {{{
-  * this is not a blocker
-  * we need build targets for libgaim, we need to test them, and make sure they work.
-  * we ought to use our own build targets to build the executable itself.
-  * due to the limitations of cvs, this cannot accompany moving files to other directories at this time.
-}}}
 * status {{{
 	* Error messages aren't particularly usable currently.  we need to be able to see the full text of
 	  the error, and what account is in that error condition.
@@ -74,9 +68,9 @@
 	* on upgrade from 1.x, the timestamp preference often gets lost.
 }}}
 * system log {{{
-	* The system log minimally should tell me what _I_ do in gaim.  It should (minimally) tell me about
+	* The system log minimally should tell me what _I_ do in Pidgin.  It should (minimally) tell me about
 	  my accounts and actions.  It should thus list
-	  * gaim start and quit
+	  * Pidgin start and quit
 	  * Account connection
 	  * account disconnection, and reason if caused by error.
 	  * account state changes, IFF we are logging that for buddies.
--- a/configure.ac	Sun Apr 15 00:14:34 2007 +0000
+++ b/configure.ac	Sun Apr 15 00:15:32 2007 +0000
@@ -1807,8 +1807,6 @@
 	LDFLAGS="$orig_LDFLAGS"
 fi
 
-AM_BINRELOC
-
 AC_MSG_CHECKING(for me pot o' gold)
 AC_MSG_RESULT(no)
 AC_CHECK_FUNCS(gethostid lrand48)
--- a/finch/finch.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/finch/finch.c	Sun Apr 15 00:15:32 2007 +0000
@@ -27,7 +27,6 @@
 #include "ft.h"
 #include "log.h"
 #include "notify.h"
-#include "prefix.h"
 #include "prefs.h"
 #include "prpl.h"
 #include "pounce.h"
@@ -159,66 +158,6 @@
 	return &eventloop_ops;
 }
 
-/* This is copied from gtkpurple */
-static char *
-gnt_find_binary_location(void *symbol, void *data)
-{
-	static char *fullname = NULL;
-	static gboolean first = TRUE;
-
-	char *argv0 = data;
-	struct stat st;
-	char *basebuf, *linkbuf, *fullbuf;
-
-	if (!first)
-		/* We've already been through this. */
-		return strdup(fullname);
-
-	first = FALSE;
-
-	if (!argv0)
-		return NULL;
-
-
-	basebuf = g_find_program_in_path(argv0);
-
-	/* But we still need to deal with symbolic links */
-	g_lstat(basebuf, &st);
-	while ((st.st_mode & S_IFLNK) == S_IFLNK) {
-		int written;
-		linkbuf = g_malloc(1024);
-		written = readlink(basebuf, linkbuf, 1024 - 1);
-		if (written == -1)
-		{
-			/* This really shouldn't happen, but do we
-			 * need something better here? */
-			g_free(linkbuf);
-			continue;
-		}
-		linkbuf[written] = '\0';
-		if (linkbuf[0] == G_DIR_SEPARATOR) {
-			/* an absolute path */
-			fullbuf = g_strdup(linkbuf);
-		} else {
-			char *dirbuf = g_path_get_dirname(basebuf);
-			/* a relative path */
-			fullbuf = g_strdup_printf("%s%s%s",
-					dirbuf, G_DIR_SEPARATOR_S,
-					linkbuf);
-			g_free(dirbuf);
-		}
-		/* There's no memory leak here.  Really! */
-		g_free(linkbuf);
-		g_free(basebuf);
-		basebuf = fullbuf;
-		g_lstat(basebuf, &st);
-	}
-
-	fullname = basebuf;
-	return strdup(fullname);
-}
-
-
 /* This is mostly copied from gtkpurple's source tree */
 static void
 show_usage(const char *name, gboolean terse)
@@ -263,8 +202,6 @@
 		{0, 0, 0, 0}
 	};
 
-	purple_br_set_locate_fallback_func(gnt_find_binary_location, argv[0]);
-
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -320,7 +257,7 @@
 	}
 	/* show version message */
 	if (opt_version) {
-		printf("purple-text %s\n", VERSION);
+		printf("Finch %s\n", VERSION);
 		return 0;
 	}
 
--- a/finch/gntblist.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/finch/gntblist.c	Sun Apr 15 00:15:32 2007 +0000
@@ -446,6 +446,8 @@
 		return;
 	node->ui_data = gnt_tree_add_row_after(GNT_TREE(ggblist->tree), group,
 			gnt_tree_create_row(GNT_TREE(ggblist->tree), get_display_name(node)), NULL, NULL);
+	gnt_tree_set_expanded(GNT_TREE(ggblist->tree), node,
+		!purple_blist_node_get_bool(node, "collapsed"));
 }
 
 static const char *
@@ -2105,6 +2107,13 @@
 }
 
 static void
+group_collapsed(GntWidget *widget, PurpleBlistNode *node, gboolean collapsed, gpointer null)
+{
+	if (PURPLE_BLIST_NODE_IS_GROUP(node))
+		purple_blist_node_set_bool(node, "collapsed", collapsed);
+}
+
+static void
 blist_show(PurpleBuddyList *list)
 {
 	if (ggblist == NULL)
@@ -2171,6 +2180,7 @@
 	g_signal_connect(G_OBJECT(ggblist->tree), "selection_changed", G_CALLBACK(selection_changed), ggblist);
 	g_signal_connect(G_OBJECT(ggblist->tree), "key_pressed", G_CALLBACK(key_pressed), ggblist);
 	g_signal_connect(G_OBJECT(ggblist->tree), "context-menu", G_CALLBACK(context_menu), ggblist);
+	g_signal_connect(G_OBJECT(ggblist->tree), "collapse-toggled", G_CALLBACK(group_collapsed), NULL);
 	g_signal_connect_after(G_OBJECT(ggblist->tree), "clicked", G_CALLBACK(blist_clicked), ggblist);
 	g_signal_connect(G_OBJECT(ggblist->tree), "activate", G_CALLBACK(selection_activate), ggblist);
 	g_signal_connect_data(G_OBJECT(ggblist->tree), "gained-focus", G_CALLBACK(draw_tooltip),
--- a/finch/libgnt/genmarshal	Sun Apr 15 00:14:34 2007 +0000
+++ b/finch/libgnt/genmarshal	Sun Apr 15 00:15:32 2007 +0000
@@ -8,3 +8,4 @@
 BOOLEAN:POINTER,POINTER,POINTER
 BOOLEAN:INT,INT,INT,POINTER
 VOID:STRING,STRING
+VOID:POINTER,BOOLEAN
--- a/finch/libgnt/gnttree.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/finch/libgnt/gnttree.c	Sun Apr 15 00:15:32 2007 +0000
@@ -13,6 +13,7 @@
 	SIG_SELECTION_CHANGED,
 	SIG_SCROLLED,
 	SIG_TOGGLED,
+	SIG_COLLAPSED,
 	SIGS,
 };
 
@@ -702,6 +703,7 @@
 		{
 			row->collapsed = !row->collapsed;
 			redraw_tree(tree);
+			g_signal_emit(tree, signals[SIG_COLLAPSED], 0, row->key, row->collapsed);
 		}
 		else if (row && row->choice)
 		{
@@ -855,6 +857,14 @@
 					 NULL, NULL,
 					 g_cclosure_marshal_VOID__POINTER,
 					 G_TYPE_NONE, 1, G_TYPE_POINTER);
+	signals[SIG_COLLAPSED] = 
+		g_signal_new("collapse-toggled",
+					 G_TYPE_FROM_CLASS(klass),
+					 G_SIGNAL_RUN_LAST,
+					 0,
+					 NULL, NULL,
+					 gnt_closure_marshal_VOID__POINTER_BOOLEAN,
+					 G_TYPE_NONE, 2, G_TYPE_POINTER, G_TYPE_BOOLEAN);
 
 	gnt_bindable_class_register_action(bindable, "move-up", action_up,
 				GNT_KEY_UP, NULL);
--- a/libpurple/Makefile.am	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/Makefile.am	Sun Apr 15 00:15:32 2007 +0000
@@ -56,7 +56,6 @@
 	plugin.c \
 	pluginpref.c \
 	pounce.c \
-	prefix.c \
 	prefs.c \
 	privacy.c \
 	proxy.c \
@@ -212,8 +211,7 @@
 	$(dbus_sources)
 
 noinst_HEADERS= \
-	internal.h \
-	prefix.h
+	internal.h 
 
 libpurpleincludedir=$(includedir)/libpurple
 libpurpleinclude_HEADERS = \
--- a/libpurple/core.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/core.c	Sun Apr 15 00:15:32 2007 +0000
@@ -70,6 +70,9 @@
 	g_return_val_if_fail(ui != NULL, FALSE);
 	g_return_val_if_fail(purple_get_core() == NULL, FALSE);
 
+#ifdef ENABLE_NLS
+	bindtextdomain(PACKAGE, LOCALEDIR);
+#endif
 #ifdef _WIN32
 	wpurple_init();
 #endif
--- a/libpurple/example/nullclient.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/example/nullclient.c	Sun Apr 15 00:15:32 2007 +0000
@@ -28,7 +28,6 @@
 #include "ft.h"
 #include "log.h"
 #include "notify.h"
-#include "prefix.h"
 #include "prefs.h"
 #include "prpl.h"
 #include "pounce.h"
--- a/libpurple/internal.h	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/internal.h	Sun Apr 15 00:15:32 2007 +0000
@@ -43,7 +43,7 @@
 #ifdef ENABLE_NLS
 #  include <locale.h>
 #  include <libintl.h>
-#  define _(String) ((const char *)gettext(String))
+#  define _(String) ((const char *)dgettext(PACKAGE, String))
 #  ifdef gettext_noop
 #    define N_(String) gettext_noop (String)
 #  else
@@ -56,6 +56,7 @@
 #    define _(String) ((const char *)String)
 #  endif
 #  define ngettext(Singular, Plural, Number) ((Number == 1) ? ((const char *)Singular) : ((const char *)Plural))
+#  define dngettext(Domain, Singular, Plural, Number) ((Number == 1) ? ((const char *)Singular) : ((const char *)Plural))
 #endif
 
 #ifdef HAVE_ENDIAN_H
@@ -183,10 +184,4 @@
 
 #define PURPLE_WEBSITE "http://pidgin.im/"
 
-#ifndef _WIN32
-/* Everything needs to include this, because
- * everything gets the autoconf macros */
-#include "prefix.h"
-#endif /* _WIN32 */
-
 #endif /* _PURPLE_INTERNAL_H_ */
--- a/libpurple/log.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/log.c	Sun Apr 15 00:15:32 2007 +0000
@@ -253,7 +253,7 @@
 	g_return_val_if_fail(log != NULL, FALSE);
 	g_return_val_if_fail(log->logger != NULL, FALSE);
 
-	if (log->logger->delete == NULL)
+	if (log->logger->remove == NULL)
 		return FALSE;
 
 	if (log->logger->is_deletable != NULL)
@@ -267,8 +267,8 @@
 	g_return_val_if_fail(log != NULL, FALSE);
 	g_return_val_if_fail(log->logger != NULL, FALSE);
 
-	if (log->logger->delete != NULL)
-		return log->logger->delete(log);
+	if (log->logger->remove != NULL)
+		return log->logger->remove(log);
 
 	return FALSE;
 }
@@ -344,7 +344,7 @@
 				int(*total_size)(PurpleLogType type, const char *name, PurpleAccount *account),
 				GList*(*list_syslog)(PurpleAccount *account),
 				void(*get_log_sets)(PurpleLogSetCallback cb, GHashTable *sets),
-				gboolean(*delete)(PurpleLog *log),
+				gboolean(*remove)(PurpleLog *log),
 				gboolean(*is_deletable)(PurpleLog *log))
 {
 #endif
@@ -380,7 +380,7 @@
 	if (functions >= 9)
 		logger->get_log_sets = va_arg(args, void *);
 	if (functions >= 10)
-		logger->delete = va_arg(args, void *);
+		logger->remove = va_arg(args, void *);
 	if (functions >= 11)
 		logger->is_deletable = va_arg(args, void *);
 
--- a/libpurple/log.h	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/log.h	Sun Apr 15 00:15:32 2007 +0000
@@ -105,7 +105,7 @@
 	void (*get_log_sets)(PurpleLogSetCallback cb, GHashTable *sets);
 
 	/* Attempts to delete the specified log, indicating success or failure */
-	gboolean (*delete)(PurpleLog *log);
+	gboolean (*remove)(PurpleLog *log);
 
 	/* Tests whether a log is deletable */
 	gboolean (*is_deletable)(PurpleLog *log);
@@ -472,7 +472,7 @@
  *                     functions are currently available (in order): @c create,
  *                     @c write, @c finalize, @c list, @c read, @c size,
  *                     @c total_size, @c list_syslog, @c get_log_sets,
- *                     @c delete, @c is_deletable.
+ *                     @c remove, @c is_deletable.
  *                     For details on these functions, see PurpleLogLogger.
  *                     Functions may not be skipped. For example, passing
  *                     @c create and @c write is acceptable (for a total of
--- a/libpurple/plugins/buddynote.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/plugins/buddynote.c	Sun Apr 15 00:15:32 2007 +0000
@@ -75,27 +75,24 @@
 static PurplePluginInfo info =
 {
 	PURPLE_PLUGIN_MAGIC,
-	PURPLE_MAJOR_VERSION,								/**< major version	*/
-	PURPLE_MINOR_VERSION,
+	PURPLE_MAJOR_VERSION,							/**< major version	*/
+	PURPLE_MINOR_VERSION,							/**< minor version	*/
 	PURPLE_PLUGIN_STANDARD,							/**< type			*/
 	NULL,											/**< ui_requirement	*/
 	0,												/**< flags			*/
 	NULL,											/**< dependencies	*/
-	PURPLE_PRIORITY_DEFAULT,							/**< priority		*/
-
+	PURPLE_PRIORITY_DEFAULT,						/**< priority		*/
 	"core-plugin_pack-buddynote",					/**< id				*/
 	N_("Buddy Notes"),								/**< name			*/
 	VERSION,										/**< version		*/
-	N_("Store notes on particular buddies."),		/**  summary		*/
+	N_("Store notes on particular buddies."),		/**< summary		*/
 	N_("Adds the option to store notes for buddies "
-	   "on your buddy list."),						/**  description	*/
+	   "on your buddy list."),						/**< description	*/
 	"Stu Tomlinson <stu@nosnilmot.com>",			/**< author			*/
 	PURPLE_WEBSITE,									/**< homepage		*/
-
 	plugin_load,									/**< load			*/
 	NULL,											/**< unload			*/
 	NULL,											/**< destroy		*/
-
 	NULL,											/**< ui_info		*/
 	NULL,											/**< extra_info		*/
 	NULL,											/**< prefs_info		*/
--- a/libpurple/plugins/mono/api/Makefile.am	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/plugins/mono/api/Makefile.am	Sun Apr 15 00:15:32 2007 +0000
@@ -1,4 +1,4 @@
-monodir=$(libdir)/purple
+monodir=$(libdir)/libpurple
 
 mono_sources = \
 	BlistNode.cs \
--- a/libpurple/plugins/mono/loader/Makefile.am	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/plugins/mono/loader/Makefile.am	Sun Apr 15 00:15:32 2007 +0000
@@ -1,4 +1,4 @@
-plugindir = $(libdir)/purple
+plugindir = $(libdir)/libpurple
 
 plugin_LTLIBRARIES = mono.la
 
--- a/libpurple/plugins/newline.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/plugins/newline.c	Sun Apr 15 00:15:32 2007 +0000
@@ -55,22 +55,22 @@
 
 static PurplePluginInfo info =
 {
-	PURPLE_PLUGIN_MAGIC,								/**< magic			*/
-	PURPLE_MAJOR_VERSION,								/**< major version	*/
-	PURPLE_MINOR_VERSION,								/**< minor version	*/
+	PURPLE_PLUGIN_MAGIC,							/**< magic			*/
+	PURPLE_MAJOR_VERSION,							/**< major version	*/
+	PURPLE_MINOR_VERSION,							/**< minor version	*/
 	PURPLE_PLUGIN_STANDARD,							/**< type			*/
 	NULL,											/**< ui_requirement	*/
 	0,												/**< flags			*/
 	NULL,											/**< dependencies	*/
-	PURPLE_PRIORITY_DEFAULT,							/**< priority		*/
+	PURPLE_PRIORITY_DEFAULT,						/**< priority		*/
 
 	"core-plugin_pack-newline",						/**< id				*/
 	N_("New Line"),									/**< name			*/
 	VERSION,										/**< version		*/
-	N_("Prepends a newline to displayed message."),	/**  summary		*/
+	N_("Prepends a newline to displayed message."),	/**< summary		*/
 	N_("Prepends a newline to messages so that the "
 	   "rest of the message appears below the "
-	   "screen name in the conversation window."),	/**  description	*/
+	   "screen name in the conversation window."),	/**< description	*/
 	"Stu Tomlinson <stu@nosnilmot.com>",			/**< author			*/
 	PURPLE_WEBSITE,									/**< homepage		*/
 
--- a/libpurple/plugins/perl/Makefile.am	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/plugins/perl/Makefile.am	Sun Apr 15 00:15:32 2007 +0000
@@ -68,6 +68,7 @@
         common/Proxy.xs \
         common/Prpl.xs \
         common/Purple.pm \
+        common/Purple.xs \
         common/Request.xs \
         common/Roomlist.xs \
         common/SSLConn.xs \
--- a/libpurple/plugins/perl/common/Makefile.mingw	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/plugins/perl/common/Makefile.mingw	Sun Apr 15 00:15:32 2007 +0000
@@ -44,7 +44,7 @@
 				Core.xs \
 				Debug.xs \
 				FT.xs \
-				Pidgin.xs \
+				Purple.xs \
 				ImgStore.xs \
 				Log.xs \
 				Network.xs \
--- a/libpurple/plugins/perl/common/Pidgin.xs	Sun Apr 15 00:14:34 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-#include "module.h"
-#include "../perl-handlers.h"
-#include "const-c.inc"
-
-/* Prototypes for the BOOT section below. */
-PURPLE_PERL_BOOT_PROTO(Account);
-PURPLE_PERL_BOOT_PROTO(Account__Option);
-PURPLE_PERL_BOOT_PROTO(Buddy__Icon);
-PURPLE_PERL_BOOT_PROTO(BuddyList);
-PURPLE_PERL_BOOT_PROTO(Cipher);
-PURPLE_PERL_BOOT_PROTO(Cmd);
-PURPLE_PERL_BOOT_PROTO(Connection);
-PURPLE_PERL_BOOT_PROTO(Conversation);
-PURPLE_PERL_BOOT_PROTO(Core);
-PURPLE_PERL_BOOT_PROTO(Debug);
-PURPLE_PERL_BOOT_PROTO(Xfer);
-PURPLE_PERL_BOOT_PROTO(ImgStore);
-PURPLE_PERL_BOOT_PROTO(Log);
-PURPLE_PERL_BOOT_PROTO(Network);
-PURPLE_PERL_BOOT_PROTO(Notify);
-PURPLE_PERL_BOOT_PROTO(Plugin);
-PURPLE_PERL_BOOT_PROTO(PluginPref);
-PURPLE_PERL_BOOT_PROTO(Pounce);
-PURPLE_PERL_BOOT_PROTO(Prefs);
-PURPLE_PERL_BOOT_PROTO(Privacy);
-PURPLE_PERL_BOOT_PROTO(Proxy);
-PURPLE_PERL_BOOT_PROTO(Prpl);
-PURPLE_PERL_BOOT_PROTO(Request);
-PURPLE_PERL_BOOT_PROTO(Roomlist);
-PURPLE_PERL_BOOT_PROTO(SSL);
-PURPLE_PERL_BOOT_PROTO(SavedStatus);
-PURPLE_PERL_BOOT_PROTO(Serv);
-PURPLE_PERL_BOOT_PROTO(Signal);
-PURPLE_PERL_BOOT_PROTO(Sound);
-PURPLE_PERL_BOOT_PROTO(Status);
-PURPLE_PERL_BOOT_PROTO(Stringref);
-PURPLE_PERL_BOOT_PROTO(Util);
-PURPLE_PERL_BOOT_PROTO(XMLNode);
-
-MODULE = Purple PACKAGE = Purple PREFIX = purple_
-PROTOTYPES: ENABLE
-
-INCLUDE: const-xs.inc
-
-BOOT:
-	PURPLE_PERL_BOOT(Account);
-	PURPLE_PERL_BOOT(Account__Option);
-	PURPLE_PERL_BOOT(Buddy__Icon);
-	PURPLE_PERL_BOOT(BuddyList);
-	PURPLE_PERL_BOOT(Cipher);
-	PURPLE_PERL_BOOT(Cmd);
-	PURPLE_PERL_BOOT(Connection);
-	PURPLE_PERL_BOOT(Conversation);
-	PURPLE_PERL_BOOT(Core);
-	PURPLE_PERL_BOOT(Debug);
-	PURPLE_PERL_BOOT(Xfer);
-	PURPLE_PERL_BOOT(ImgStore);
-	PURPLE_PERL_BOOT(Log);
-	PURPLE_PERL_BOOT(Network);
-	PURPLE_PERL_BOOT(Notify);
-	PURPLE_PERL_BOOT(Plugin);
-	PURPLE_PERL_BOOT(PluginPref);
-	PURPLE_PERL_BOOT(Pounce);
-	PURPLE_PERL_BOOT(Prefs);
-	PURPLE_PERL_BOOT(Privacy);
-	PURPLE_PERL_BOOT(Proxy);
-	PURPLE_PERL_BOOT(Prpl);
-	PURPLE_PERL_BOOT(Request);
-	PURPLE_PERL_BOOT(Roomlist);
-	PURPLE_PERL_BOOT(SSL);
-	PURPLE_PERL_BOOT(SavedStatus);
-	PURPLE_PERL_BOOT(Serv);
-	PURPLE_PERL_BOOT(Signal);
-	PURPLE_PERL_BOOT(Sound);
-	PURPLE_PERL_BOOT(Status);
-	PURPLE_PERL_BOOT(Stringref);
-	PURPLE_PERL_BOOT(Util);
-	PURPLE_PERL_BOOT(XMLNode);
-
-void
-timeout_add(plugin, seconds, callback, data = 0)
-	Purple::Plugin plugin
-	int seconds
-	SV *callback
-	SV *data
-CODE:
-	purple_perl_timeout_add(plugin, seconds, callback, data);
-
-void
-deinit()
-CODE:
-	purple_perl_timeout_clear();
-
-
-MODULE = Purple PACKAGE = Purple PREFIX = purple_
-PROTOTYPES: ENABLE
-
-Purple::Core
-purple_get_core()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/plugins/perl/common/Purple.xs	Sun Apr 15 00:15:32 2007 +0000
@@ -0,0 +1,99 @@
+#include "module.h"
+#include "../perl-handlers.h"
+#include "const-c.inc"
+
+/* Prototypes for the BOOT section below. */
+PURPLE_PERL_BOOT_PROTO(Account);
+PURPLE_PERL_BOOT_PROTO(Account__Option);
+PURPLE_PERL_BOOT_PROTO(Buddy__Icon);
+PURPLE_PERL_BOOT_PROTO(BuddyList);
+PURPLE_PERL_BOOT_PROTO(Cipher);
+PURPLE_PERL_BOOT_PROTO(Cmd);
+PURPLE_PERL_BOOT_PROTO(Connection);
+PURPLE_PERL_BOOT_PROTO(Conversation);
+PURPLE_PERL_BOOT_PROTO(Core);
+PURPLE_PERL_BOOT_PROTO(Debug);
+PURPLE_PERL_BOOT_PROTO(Xfer);
+PURPLE_PERL_BOOT_PROTO(ImgStore);
+PURPLE_PERL_BOOT_PROTO(Log);
+PURPLE_PERL_BOOT_PROTO(Network);
+PURPLE_PERL_BOOT_PROTO(Notify);
+PURPLE_PERL_BOOT_PROTO(Plugin);
+PURPLE_PERL_BOOT_PROTO(PluginPref);
+PURPLE_PERL_BOOT_PROTO(Pounce);
+PURPLE_PERL_BOOT_PROTO(Prefs);
+PURPLE_PERL_BOOT_PROTO(Privacy);
+PURPLE_PERL_BOOT_PROTO(Proxy);
+PURPLE_PERL_BOOT_PROTO(Prpl);
+PURPLE_PERL_BOOT_PROTO(Request);
+PURPLE_PERL_BOOT_PROTO(Roomlist);
+PURPLE_PERL_BOOT_PROTO(SSL);
+PURPLE_PERL_BOOT_PROTO(SavedStatus);
+PURPLE_PERL_BOOT_PROTO(Serv);
+PURPLE_PERL_BOOT_PROTO(Signal);
+PURPLE_PERL_BOOT_PROTO(Sound);
+PURPLE_PERL_BOOT_PROTO(Status);
+PURPLE_PERL_BOOT_PROTO(Stringref);
+PURPLE_PERL_BOOT_PROTO(Util);
+PURPLE_PERL_BOOT_PROTO(XMLNode);
+
+MODULE = Purple PACKAGE = Purple PREFIX = purple_
+PROTOTYPES: ENABLE
+
+INCLUDE: const-xs.inc
+
+BOOT:
+	PURPLE_PERL_BOOT(Account);
+	PURPLE_PERL_BOOT(Account__Option);
+	PURPLE_PERL_BOOT(Buddy__Icon);
+	PURPLE_PERL_BOOT(BuddyList);
+	PURPLE_PERL_BOOT(Cipher);
+	PURPLE_PERL_BOOT(Cmd);
+	PURPLE_PERL_BOOT(Connection);
+	PURPLE_PERL_BOOT(Conversation);
+	PURPLE_PERL_BOOT(Core);
+	PURPLE_PERL_BOOT(Debug);
+	PURPLE_PERL_BOOT(Xfer);
+	PURPLE_PERL_BOOT(ImgStore);
+	PURPLE_PERL_BOOT(Log);
+	PURPLE_PERL_BOOT(Network);
+	PURPLE_PERL_BOOT(Notify);
+	PURPLE_PERL_BOOT(Plugin);
+	PURPLE_PERL_BOOT(PluginPref);
+	PURPLE_PERL_BOOT(Pounce);
+	PURPLE_PERL_BOOT(Prefs);
+	PURPLE_PERL_BOOT(Privacy);
+	PURPLE_PERL_BOOT(Proxy);
+	PURPLE_PERL_BOOT(Prpl);
+	PURPLE_PERL_BOOT(Request);
+	PURPLE_PERL_BOOT(Roomlist);
+	PURPLE_PERL_BOOT(SSL);
+	PURPLE_PERL_BOOT(SavedStatus);
+	PURPLE_PERL_BOOT(Serv);
+	PURPLE_PERL_BOOT(Signal);
+	PURPLE_PERL_BOOT(Sound);
+	PURPLE_PERL_BOOT(Status);
+	PURPLE_PERL_BOOT(Stringref);
+	PURPLE_PERL_BOOT(Util);
+	PURPLE_PERL_BOOT(XMLNode);
+
+void
+timeout_add(plugin, seconds, callback, data = 0)
+	Purple::Plugin plugin
+	int seconds
+	SV *callback
+	SV *data
+CODE:
+	purple_perl_timeout_add(plugin, seconds, callback, data);
+
+void
+deinit()
+CODE:
+	purple_perl_timeout_clear();
+
+
+MODULE = Purple PACKAGE = Purple PREFIX = purple_
+PROTOTYPES: ENABLE
+
+Purple::Core
+purple_get_core()
--- a/libpurple/plugins/perl/perl-handlers.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/plugins/perl/perl-handlers.c	Sun Apr 15 00:15:32 2007 +0000
@@ -183,6 +183,9 @@
 {
 	timeout_handlers = g_list_remove(timeout_handlers, handler);
 
+	if (handler->iotag > 0)
+		g_source_remove(handler->iotag);
+
 	if (handler->callback != NULL)
 		SvREFCNT_dec(handler->callback);
 
@@ -207,7 +210,7 @@
 	g_free(handler);
 }
 
-static int
+static gboolean
 perl_timeout_cb(gpointer data)
 {
 	PurplePerlTimeoutHandler *handler = (PurplePerlTimeoutHandler *)data;
@@ -225,9 +228,12 @@
 	FREETMPS;
 	LEAVE;
 
+	/* We're returning FALSE, so no need to manually remove the source */
+	handler->iotag = 0;
+
 	destroy_timeout_handler(handler);
 
-	return 0;
+	return FALSE;
 }
 
 typedef void *DATATYPE;
--- a/libpurple/plugins/ssl/ssl-nss.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/plugins/ssl/ssl-nss.c	Sun Apr 15 00:15:32 2007 +0000
@@ -112,7 +112,7 @@
 
 	/* TODO: Fix this so autoconf does the work trying to find this lib. */
 #ifndef _WIN32
-	lib = g_strdup(BR_LIBDIR("/libnssckbi.so"));
+	lib = g_strdup(LIBDIR "/libnssckbi.so");
 #else
 	lib = g_strdup("nssckbi.dll");
 #endif
--- a/libpurple/prefix.c	Sun Apr 15 00:14:34 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,476 +0,0 @@
-/*
- * BinReloc - a library for creating relocatable executables
- * Written by: Mike Hearn <mike@theoretic.com>
- *             Hongli Lai <h.lai@chello.nl>
- * http://autopackage.org/
- * 
- * This source code is public domain. You can relicense this code
- * under whatever license you want.
- *
- * NOTE: if you're using C++ and are getting "undefined reference
- * to br_*", try renaming prefix.c to prefix.cpp
- */
-
-/* WARNING, BEFORE YOU MODIFY PREFIX.C:
- *
- * If you make changes to any of the functions in prefix.c, you MUST
- * change the BR_NAMESPACE macro (in prefix.h).
- * This way you can avoid symbol table conflicts with other libraries
- * that also happen to use BinReloc.
- *
- * Example:
- * #define BR_NAMESPACE(funcName) foobar_ ## funcName
- * --> expands br_locate to foobar_br_locate
- */
-
-#ifndef _PREFIX_C_
-#define _PREFIX_C_
-
-#ifdef HAVE_CONFIG_H
-	#include "config.h"
-#endif
-
-#ifndef BR_PTHREADS
-	/* Change 1 to 0 if you don't want pthread support */
-	#define BR_PTHREADS 1
-#endif /* BR_PTHREADS */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <limits.h>
-#include <string.h>
-#include "prefix.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#undef NULL
-#define NULL ((void *) 0)
-
-#ifdef __GNUC__
-	#define br_return_val_if_fail(expr,val) if (!(expr)) {fprintf (stderr, "** BinReloc (%s): assertion %s failed\n", __PRETTY_FUNCTION__, #expr); return val;}
-#else
-	#define br_return_val_if_fail(expr,val) if (!(expr)) return val
-#endif /* __GNUC__ */
-
-
-static br_locate_fallback_func fallback_func = NULL;
-static void *fallback_data = NULL;
-
-
-#ifdef ENABLE_BINRELOC
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/param.h>
-#include <unistd.h>
-
-
-/**
- * br_locate:
- * symbol: A symbol that belongs to the app/library you want to locate.
- * Returns: A newly allocated string containing the full path of the
- *	    app/library that func belongs to, or NULL on error. This
- *	    string should be freed when not when no longer needed.
- *
- * Finds out to which application or library symbol belongs, then locate
- * the full path of that application or library.
- * Note that symbol cannot be a pointer to a function. That will not work.
- *
- * Example:
- * --> main.c
- * #include "prefix.h"
- * #include "libfoo.h"
- *
- * int main (int argc, char *argv[]) {
- *	printf ("Full path of this app: %s\n", br_locate (&argc));
- *	libfoo_start ();
- *	return 0;
- * }
- *
- * --> libfoo.c starts here
- * #include "prefix.h"
- *
- * void libfoo_start () {
- *	--> "" is a symbol that belongs to libfoo (because it's called
- *	--> from libfoo_start()); that's why this works.
- *	printf ("libfoo is located in: %s\n", br_locate (""));
- * }
- */
-char *
-br_locate (void *symbol)
-{
-	char line[5000];
-	FILE *f;
-	char *path;
-
-	br_return_val_if_fail (symbol != NULL, NULL);
-
-	f = fopen ("/proc/self/maps", "r");
-	if (!f) {
-		if (fallback_func)
-			return fallback_func(symbol, fallback_data);
-		else
-			return NULL;
-	}
-
-	while (!feof (f))
-	{
-		unsigned long start, end;
-
-		if (!fgets (line, sizeof (line), f))
-			continue;
-		if (!strstr (line, " r-xp ") || !strchr (line, '/'))
-			continue;
-
-		sscanf (line, "%lx-%lx ", &start, &end);
-		if (symbol >= (void *) start && symbol < (void *) end)
-		{
-			char *tmp;
-			size_t len;
-
-			/* Extract the filename; it is always an absolute path */
-			path = strchr (line, '/');
-
-			/* Get rid of the newline */
-			tmp = strrchr (path, '\n');
-			if (tmp) *tmp = 0;
-
-			/* Get rid of "(deleted)" */
-			len = strlen (path);
-			if (len > 10 && strcmp (path + len - 10, " (deleted)") == 0)
-			{
-				tmp = path + len - 10;
-				*tmp = 0;
-			}
-
-			fclose(f);
-			return strdup (path);
-		}
-	}
-
-	fclose (f);
-	return NULL;
-}
-
-
-/**
- * br_locate_prefix:
- * symbol: A symbol that belongs to the app/library you want to locate.
- * Returns: A prefix. This string should be freed when no longer needed.
- *
- * Locates the full path of the app/library that symbol belongs to, and return
- * the prefix of that path, or NULL on error.
- * Note that symbol cannot be a pointer to a function. That will not work.
- *
- * Example:
- * --> This application is located in /usr/bin/foo
- * br_locate_prefix (&argc);   --> returns: "/usr"
- */
-char *
-br_locate_prefix (void *symbol)
-{
-	char *path, *prefix;
-
-	br_return_val_if_fail (symbol != NULL, NULL);
-
-	path = br_locate (symbol);
-	if (!path) return NULL;
-
-	prefix = br_extract_prefix (path);
-	free (path);
-	return prefix;
-}
-
-
-/**
- * br_prepend_prefix:
- * symbol: A symbol that belongs to the app/library you want to locate.
- * path: The path that you want to prepend the prefix to.
- * Returns: The new path, or NULL on error. This string should be freed when no
- *	    longer needed.
- *
- * Gets the prefix of the app/library that symbol belongs to. Prepend that prefix to path.
- * Note that symbol cannot be a pointer to a function. That will not work.
- *
- * Example:
- * --> The application is /usr/bin/foo
- * br_prepend_prefix (&argc, "/share/foo/data.png");   --> Returns "/usr/share/foo/data.png"
- */
-char *
-br_prepend_prefix (void *symbol, char *path)
-{
-	char *tmp, *newpath;
-
-	br_return_val_if_fail (symbol != NULL, NULL);
-	br_return_val_if_fail (path != NULL, NULL);
-
-	tmp = br_locate_prefix (symbol);
-	if (!tmp) return NULL;
-
-	if (strcmp (tmp, "/") == 0)
-		newpath = strdup (path);
-	else
-		newpath = br_strcat (tmp, path);
-
-	/* Get rid of compiler warning ("br_prepend_prefix never used") */
-	if (0) br_prepend_prefix (NULL, NULL);
-
-	free (tmp);
-	return newpath;
-}
-
-#endif /* ENABLE_BINRELOC */
-
-
-/* Pthread stuff for thread safetiness */
-#if BR_PTHREADS
-
-#include <pthread.h>
-
-static pthread_key_t br_thread_key;
-static pthread_once_t br_thread_key_once = PTHREAD_ONCE_INIT;
-
-
-static void
-br_thread_local_store_fini ()
-{
-	char *specific;
-
-	specific = (char *) pthread_getspecific (br_thread_key);
-	if (specific)
-	{
-		free (specific);
-		pthread_setspecific (br_thread_key, NULL);
-	}
-	pthread_key_delete (br_thread_key);
-	br_thread_key = 0;
-}
-
-
-static void
-br_str_free (void *str)
-{
-	if (str)
-		free (str);
-}
-
-
-static void
-br_thread_local_store_init ()
-{
-	if (pthread_key_create (&br_thread_key, br_str_free) == 0)
-		atexit (br_thread_local_store_fini);
-}
-
-#else /* BR_PTHREADS */
-
-static char *br_last_value = (char *) NULL;
-
-static void
-br_free_last_value ()
-{
-	if (br_last_value)
-		free (br_last_value);
-}
-
-#endif /* BR_PTHREADS */
-
-
-/**
- * br_thread_local_store:
- * str: A dynamically allocated string.
- * Returns: str. This return value must not be freed.
- *
- * Store str in a thread-local variable and return str. The next
- * you run this function, that variable is freed too.
- * This function is created so you don't have to worry about freeing
- * strings. Just be careful about doing this sort of thing:
- *
- * some_function( BR_DATADIR("/one.png"), BR_DATADIR("/two.png") )
- *
- * Examples:
- * char *foo;
- * foo = br_thread_local_store (strdup ("hello")); --> foo == "hello"
- * foo = br_thread_local_store (strdup ("world")); --> foo == "world"; "hello" is now freed.
- */
-const char *
-br_thread_local_store (char *str)
-{
-	#if BR_PTHREADS
-		char *specific;
-
-		pthread_once (&br_thread_key_once, br_thread_local_store_init);
-
-		specific = (char *) pthread_getspecific (br_thread_key);
-		br_str_free (specific);
-		pthread_setspecific (br_thread_key, str);
-
-	#else /* BR_PTHREADS */
-		static int initialized = 0;
-
-		if (!initialized)
-		{
-			atexit (br_free_last_value);
-			initialized = 1;
-		}
-
-		if (br_last_value)
-			free (br_last_value);
-		br_last_value = str;
-	#endif /* BR_PTHREADS */
-
-	return (const char *) str;
-}
-
-
-/**
- * br_strcat:
- * str1: A string.
- * str2: Another string.
- * Returns: A newly-allocated string. This string should be freed when no longer needed.
- *
- * Concatenate str1 and str2 to a newly allocated string.
- */
-char *
-br_strcat (const char *str1, const char *str2)
-{
-	char *result;
-	size_t len1, len2;
-
-	if (!str1) str1 = "";
-	if (!str2) str2 = "";
-
-	len1 = strlen (str1);
-	len2 = strlen (str2);
-
-	result = (char *) malloc (len1 + len2 + 1);
-	memcpy (result, str1, len1);
-	memcpy (result + len1, str2, len2);
-	result[len1 + len2] = '\0';
-
-	return result;
-}
-
-
-/* Emulates glibc's strndup() */
-static char *
-br_strndup (char *str, size_t size)
-{
-	char *result = (char *) NULL;
-	size_t len;
-
-	br_return_val_if_fail (str != (char *) NULL, (char *) NULL);
-
-	len = strlen (str);
-	if (!len) return strdup ("");
-	if (size > len) size = len;
-
-	result = (char *) calloc (sizeof (char), len + 1);
-	memcpy (result, str, size);
-	return result;
-}
-
-
-/**
- * br_extract_dir:
- * path: A path.
- * Returns: A directory name. This string should be freed when no longer needed.
- *
- * Extracts the directory component of path. Similar to g_dirname() or the dirname
- * commandline application.
- *
- * Example:
- * br_extract_dir ("/usr/local/foobar");  --> Returns: "/usr/local"
- */
-char *
-br_extract_dir (const char *path)
-{
-	char *end, *result;
-
-	br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
-
-	end = strrchr (path, '/');
-	if (!end) return strdup (".");
-
-	while (end > path && *end == '/')
-		end--;
-	result = br_strndup ((char *) path, end - path + 1);
-	if (!*result)
-	{
-		free (result);
-		return strdup ("/");
-	} else
-		return result;
-}
-
-
-/**
- * br_extract_prefix:
- * path: The full path of an executable or library.
- * Returns: The prefix, or NULL on error. This string should be freed when no longer needed.
- *
- * Extracts the prefix from path. This function assumes that your executable
- * or library is installed in an LSB-compatible directory structure.
- *
- * Example:
- * br_extract_prefix ("/usr/bin/gnome-panel");       --> Returns "/usr"
- * br_extract_prefix ("/usr/local/lib/libfoo.so");   --> Returns "/usr/local"
- * br_extract_prefix ("/usr/local/libfoo.so");       --> Returns "/usr"
- */
-char *
-br_extract_prefix (const char *path)
-{
-	char *end, *tmp, *result;
-
-	br_return_val_if_fail (path != (char *) NULL, (char *) NULL);
-
-	if (!*path) return strdup ("/");
-	end = strrchr (path, '/');
-	if (!end) return strdup (path);
-
-	tmp = br_strndup ((char *) path, end - path);
-	if (!*tmp)
-	{
-		free (tmp);
-		return strdup ("/");
-	}
-	end = strrchr (tmp, '/');
-	if (!end) return tmp;
-
-	result = br_strndup (tmp, end - tmp);
-	free (tmp);
-
-	if (!*result)
-	{
-		free (result);
-		result = strdup ("/");
-	}
-
-	return result;
-}
-
-
-/**
- * br_set_fallback_function:
- * func: A function to call to find the binary.
- * data: User data to pass to func.
- *
- * Sets a function to call to find the path to the binary, in
- * case "/proc/self/maps" can't be opened. The function set should
- * return a string that is safe to free with free().
- */
-void
-br_set_locate_fallback_func (br_locate_fallback_func func, void *data)
-{
-	fallback_func = func;
-	fallback_data = data;
-}
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _PREFIX_C */
--- a/libpurple/prefix.h	Sun Apr 15 00:14:34 2007 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-/*
- * I made the following modifications, be sure to readd these when
- * upgrading these files.
- *
- * Added this comment.
- * Added "purple_ ## " to the namespace
- * Changed the lib macro to use /lib/purple instead of just /lib
- *  (why does purple do that in the -DLIBDIR autoconf thing anyway?)
- *
- */
-
-/*
- * BinReloc - a library for creating relocatable executables
- * Written by: Mike Hearn <mike@theoretic.com>
- *             Hongli Lai <h.lai@chello.nl>
- * http://autopackage.org/
- *
- * This source code is public domain. You can relicense this code
- * under whatever license you want.
- *
- * See http://autopackage.org/docs/binreloc/ for
- * more information and how to use this.
- *
- * NOTE: if you're using C++ and are getting "undefined reference
- * to br_*", try renaming prefix.c to prefix.cpp
- */
-
-#ifndef _PREFIX_H_
-#define _PREFIX_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* WARNING, BEFORE YOU MODIFY PREFIX.C:
- *
- * If you make changes to any of the functions in prefix.c, you MUST
- * change the BR_NAMESPACE macro.
- * This way you can avoid symbol table conflicts with other libraries
- * that also happen to use BinReloc.
- *
- * Example:
- * #define BR_NAMESPACE(funcName) foobar_ ## funcName
- * --> expands br_locate to foobar_br_locate
- */
-#undef BR_NAMESPACE
-#define BR_NAMESPACE(funcName) purple_ ## funcName
-
-
-#ifdef ENABLE_BINRELOC
-
-#define br_thread_local_store BR_NAMESPACE(br_thread_local_store)
-#define br_locate BR_NAMESPACE(br_locate)
-#define br_locate_prefix BR_NAMESPACE(br_locate_prefix)
-#define br_prepend_prefix BR_NAMESPACE(br_prepend_prefix)
-
-#ifndef BR_NO_MACROS
-	/* These are convenience macros that replace the ones usually used
-	   in Autoconf/Automake projects */
-	#undef SELFPATH
-	#undef PREFIX
-	#undef PREFIXDIR
-	#undef BINDIR
-	#undef SBINDIR
-	#undef DATADIR
-	#undef LIBDIR
-	#undef LIBEXECDIR
-	#undef ETCDIR
-	#undef SYSCONFDIR
-	#undef CONFDIR
-	#undef LOCALEDIR
-
-	#define SELFPATH	(br_thread_local_store (br_locate ((void *) "")))
-	#define PREFIX		(br_thread_local_store (br_locate_prefix ((void *) "")))
-	#define PREFIXDIR	(br_thread_local_store (br_locate_prefix ((void *) "")))
-	#define BINDIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/bin")))
-	#define SBINDIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/sbin")))
-	#define DATADIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/share")))
-	#define LIBDIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/lib/libpurple")))
-	#define LIBEXECDIR	(br_thread_local_store (br_prepend_prefix ((void *) "", "/libexec")))
-	#define ETCDIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/etc")))
-	#define SYSCONFDIR	(br_thread_local_store (br_prepend_prefix ((void *) "", "/etc")))
-	#define CONFDIR		(br_thread_local_store (br_prepend_prefix ((void *) "", "/etc")))
-	#define LOCALEDIR	(br_thread_local_store (br_prepend_prefix ((void *) "", "/share/locale")))
-#endif /* BR_NO_MACROS */
-
-
-/* The following functions are used internally by BinReloc
-   and shouldn't be used directly in applications. */
-
-char *br_locate		(void *symbol);
-char *br_locate_prefix	(void *symbol);
-char *br_prepend_prefix	(void *symbol, char *path);
-
-#endif /* ENABLE_BINRELOC */
-
-const char *br_thread_local_store (char *str);
-
-
-/* These macros and functions are not guarded by the ENABLE_BINRELOC
- * macro because they are portable. You can use these functions.
- */
-
-#define br_strcat BR_NAMESPACE(br_strcat)
-#define br_extract_dir BR_NAMESPACE(br_extract_dir)
-#define br_extract_prefix BR_NAMESPACE(br_extract_prefix)
-#define br_set_locate_fallback_func BR_NAMESPACE(br_set_locate_fallback_func)
-
-#ifndef BR_NO_MACROS
-	/* Convenience functions for concatenating paths */
-
-	/* Each time you call one, the previous result will be freed. So don't do this:
-	 *
-	 *   some_function( BR_DATADIR("/one"), BR_DATADIR("/two") )
-	 *
-	 * as the first parameter will now be bogus!
-	 */
-
-	#define BR_SELFPATH(suffix)	(br_thread_local_store (br_strcat (SELFPATH, suffix)))
-	#define BR_PREFIX(suffix)	(br_thread_local_store (br_strcat (PREFIX, suffix)))
-	#define BR_PREFIXDIR(suffix)	(br_thread_local_store (br_strcat (BR_PREFIX, suffix)))
-	#define BR_BINDIR(suffix)	(br_thread_local_store (br_strcat (BINDIR, suffix)))
-	#define BR_SBINDIR(suffix)	(br_thread_local_store (br_strcat (SBINDIR, suffix)))
-	#define BR_DATADIR(suffix)	(br_thread_local_store (br_strcat (DATADIR, suffix)))
-	#define BR_LIBDIR(suffix)	(br_thread_local_store (br_strcat (LIBDIR, suffix)))
-	#define BR_LIBEXECDIR(suffix)	(br_thread_local_store (br_strcat (LIBEXECDIR, suffix)))
-	#define BR_ETCDIR(suffix)	(br_thread_local_store (br_strcat (ETCDIR, suffix)))
-	#define BR_SYSCONFDIR(suffix)	(br_thread_local_store (br_strcat (SYSCONFDIR, suffix)))
-	#define BR_CONFDIR(suffix)	(br_thread_local_store (br_strcat (CONFDIR, suffix)))
-	#define BR_LOCALEDIR(suffix)	(br_thread_local_store (br_strcat (LOCALEDIR, suffix)))
-#endif
-
-char *br_strcat	(const char *str1, const char *str2);
-char *br_extract_dir	(const char *path);
-char *br_extract_prefix(const char *path);
-typedef char *(*br_locate_fallback_func) (void *symbol, void *data);
-void br_set_locate_fallback_func (br_locate_fallback_func func, void *data);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* _PREFIX_H_ */
--- a/libpurple/protocols/irc/irc.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/irc/irc.c	Sun Apr 15 00:15:32 2007 +0000
@@ -462,6 +462,8 @@
 
 	purple_circ_buffer_destroy(irc->outbuf);
 
+	g_free(irc->mode_chars);
+
 	g_free(irc);
 }
 
@@ -476,7 +478,7 @@
 	else
 		args[0] = who;
 
-	plain = purple_unescape_html(what);
+	purple_markup_html_to_xhtml(what, NULL, &plain);
 	args[1] = plain;
 
 	irc_cmd_privmsg(irc, "msg", NULL, args);
@@ -688,7 +690,7 @@
 		return irc_parse_cmd(irc, convo->name, what + 1);
 	}
 #endif
-	tmp = purple_unescape_html(what);
+	purple_markup_html_to_xhtml(what, NULL, &tmp);
 	args[0] = convo->name;
 	args[1] = tmp;
 
--- a/libpurple/protocols/irc/irc.h	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/irc/irc.h	Sun Apr 15 00:15:32 2007 +0000
@@ -84,6 +84,8 @@
 	guint writeh;
 
 	time_t recv_time;
+
+	char *mode_chars;
 };
 
 struct irc_buddy {
--- a/libpurple/protocols/irc/msgs.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/irc/msgs.c	Sun Apr 15 00:15:32 2007 +0000
@@ -40,8 +40,6 @@
                                    const char *from, const char *to,
                                    const char *rawmsg, gboolean notice);
 
-static char *mode_chars = NULL;
-
 static char *irc_mask_nick(const char *mask)
 {
 	char *end, *buf;
@@ -90,7 +88,7 @@
 		char *val;
 		if (!strncmp(features[i], "PREFIX=", 7)) {
 			if ((val = strchr(features[i] + 7, ')')) != NULL)
-				mode_chars = g_strdup(val + 1);
+				irc->mode_chars = g_strdup(val + 1);
 		}
 	}
 }
@@ -477,8 +475,8 @@
 				} else if(*cur == '+') {
 					f = PURPLE_CBFLAGS_VOICE;
 					cur++;
-				} else if(mode_chars
-					  && strchr(mode_chars, *cur)) {
+				} else if(irc->mode_chars
+					  && strchr(irc->mode_chars, *cur)) {
 					cur++;
 				}
 				tmp = g_strndup(cur, end - cur);
--- a/libpurple/protocols/jabber/xdata.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/jabber/xdata.c	Sun Apr 15 00:15:32 2007 +0000
@@ -200,8 +200,7 @@
 
 			g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_TEXT_SINGLE));
 
-			if(value)
-				g_free(value);
+			g_free(value);
 		} else if(!strcmp(type, "text-multi") || !strcmp(type, "jid-multi")) {
 			GString *str = g_string_new("");
 
@@ -283,8 +282,7 @@
 
 			g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_BOOLEAN));
 
-			if(value)
-				g_free(value);
+			g_free(value);
 		} else if(!strcmp(type, "fixed") && value) {
 			if((valuenode = xmlnode_get_child(fn, "value")))
 				value = xmlnode_get_data(valuenode);
@@ -292,8 +290,7 @@
 			field = purple_request_field_label_new("", value);
 			purple_request_field_group_add_field(group, field);
 
-			if(value)
-				g_free(value);
+			g_free(value);
 		} else if(!strcmp(type, "hidden")) {
 			if((valuenode = xmlnode_get_child(fn, "value")))
 				value = xmlnode_get_data(valuenode);
@@ -305,8 +302,7 @@
 
 			g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_TEXT_SINGLE));
 
-			if(value)
-				g_free(value);
+			g_free(value);
 		} else { /* text-single, jid-single, and the default */
 			if((valuenode = xmlnode_get_child(fn, "value")))
 				value = xmlnode_get_data(valuenode);
@@ -322,8 +318,7 @@
 				g_hash_table_replace(data->fields, g_strdup(var), GINT_TO_POINTER(JABBER_X_DATA_TEXT_SINGLE));
 			}
 
-			if(value)
-				g_free(value);
+			g_free(value);
 		}
 	}
 
@@ -337,10 +332,8 @@
 			_("OK"), G_CALLBACK(jabber_x_data_ok_cb),
 			_("Cancel"), G_CALLBACK(jabber_x_data_cancel_cb), data);
 
-	if(title)
-		g_free(title);
-	if(instructions)
-		g_free(instructions);
+	g_free(title);
+	g_free(instructions);
 
 	return handle;
 }
--- a/libpurple/protocols/msn/msn-utils.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/msn/msn-utils.c	Sun Apr 15 00:15:32 2007 +0000
@@ -110,6 +110,18 @@
 		}
 	}
 
+	cur = strstr(mime, "RL=");
+
+	if (cur && (*(cur = cur + 3) != ';'))
+	{
+		if (*cur == '1')
+		{
+			/* RTL text was received */
+			pre = g_string_append(pre, "<SPAN style=\"direction:rtl;text-align:right;\">");
+			post = g_string_prepend(post, "</SPAN>");
+		}
+	}
+
 	cur = g_strdup(purple_url_decode(pre->str));
 	g_string_free(pre, TRUE);
 
@@ -161,7 +173,7 @@
  * and converts it to msn formatting. It doesn't deal with the tag closing,
  * but gtkimhtml widgets give valid html.
  * It currently deals properly with <b>, <u>, <i>, <font face=...>,
- * <font color=...>.
+ * <font color=...>, <span dir=...>, <span style="direction: ...">.
  * It ignores <font back=...> and <font size=...>
  */
 void
@@ -173,6 +185,7 @@
 	char *fontface = NULL;
 	char fonteffect[4];
 	char fontcolor[7];
+	char direction = '0';
 
 	gboolean has_bold = FALSE;
 	gboolean has_italic = FALSE;
@@ -256,6 +269,48 @@
 				if (*c != '\0')
 					c += 4;
 			}
+			else if (!g_ascii_strncasecmp(c + 1, "span", 4))
+			{
+				/* Bi-directional text support using CSS properties in span tags */
+				c += 5;
+
+				while (*c != '\0' && *c != '>')
+				{
+					while (*c == ' ')
+						c++;
+					if (!g_ascii_strncasecmp(c, "dir=\"rtl\"", 9))
+					{
+						c += 9;
+						direction = '1';
+					}
+					else if (!g_ascii_strncasecmp(c, "style=\"", 7))
+					{
+						/* Parse inline CSS attributes */
+						char *attributes;
+						int attr_len = 0;
+						c += 7;
+						while (*(c + attr_len) != '\0' && *(c + attr_len) != '"')
+							attr_len++;
+						if (*(c + attr_len) == '"')
+						{
+							char *attr_dir;
+							attributes = g_strndup(c, attr_len);
+							attr_dir = purple_markup_get_css_property(attributes, "direction");
+							if (attr_dir && (!strncasecmp(attr_dir, "RTL", 3)))
+								direction = '1';
+							g_free(attr_dir);
+							g_free(attributes);
+						}
+
+					}
+					else
+					{
+						c++;
+					}
+				}
+				if (*c == '>')
+					c++;
+			}
 			else if (!g_ascii_strncasecmp(c + 1, "font", 4))
 			{
 				c += 5;
@@ -354,9 +409,9 @@
 	if (fontface == NULL)
 		fontface = g_strdup("MS Sans Serif");
 
-	*attributes = g_strdup_printf("FN=%s; EF=%s; CO=%s; PF=0",
+	*attributes = g_strdup_printf("FN=%s; EF=%s; CO=%s; PF=0; RL=%c",
 								  encode_spaces(fontface),
-								  fonteffect, fontcolor);
+								  fonteffect, fontcolor, direction);
 	*message = g_strdup(msg);
 
 	g_free(fontface);
--- a/libpurple/protocols/msn/nexus.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/msn/nexus.c	Sun Apr 15 00:15:32 2007 +0000
@@ -252,6 +252,10 @@
 
 		msn_session_set_error(session, MSN_ERROR_AUTH, error);
 	}
+	else if (strstr(nexus->read_buf, "HTTP/1.1 503 Service Unavailable"))
+	{
+		msn_session_set_error(session, MSN_ERROR_SERV_UNAVAILABLE, NULL);
+	}
 	else if (strstr(nexus->read_buf, "HTTP/1.1 200 OK"))
 	{
 		char *base, *c;
--- a/libpurple/protocols/msn/notification.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/msn/notification.c	Sun Apr 15 00:15:32 2007 +0000
@@ -1310,7 +1310,7 @@
 		{
 			case 1:
 				minutes = atoi(g_hash_table_lookup(table, "Arg1"));
-				g_snprintf(buf, sizeof(buf), ngettext(
+				g_snprintf(buf, sizeof(buf), dngettext(PACKAGE, 
 							"The MSN server will shut down for maintenance "
 							"in %d minute. You will automatically be "
 							"signed out at that time.  Please finish any "
--- a/libpurple/protocols/novell/novell.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/novell/novell.c	Sun Apr 15 00:15:32 2007 +0000
@@ -1495,13 +1495,10 @@
 _show_info(PurpleConnection * gc, NMUserRecord * user_record)
 {
 	PurpleNotifyUserInfo *user_info =	purple_notify_user_info_new();
-	GString *info_text;
 	int count, i;
 	NMProperty *property;
 	const char *tag, *value;
 
-	info_text = g_string_new("");
-
 	tag = _("User ID");
 	value = nm_user_record_get_userid(user_record);
 	if (value) {
--- a/libpurple/protocols/oscar/oscar.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Sun Apr 15 00:15:32 2007 +0000
@@ -1785,11 +1785,13 @@
 	else
 	{
 		PurpleBuddy *b = purple_find_buddy(account, info->sn);
-		PurpleStatus *status;
-		const char *active_status_id;
-
-		status = purple_presence_get_active_status(purple_buddy_get_presence(b));
-		active_status_id = purple_status_get_id(status);
+		PurpleStatus *status = NULL;
+		const char *active_status_id = NULL;
+
+		if (b != NULL) {
+			status = purple_presence_get_active_status(purple_buddy_get_presence(b));
+			active_status_id = purple_status_get_id(status);
+		}
 
 		if (!active_status_id || strcmp(active_status_id, status_id))
 			purple_prpl_got_user_status(account, info->sn, status_id, NULL);
@@ -2556,7 +2558,7 @@
 	switch(reason) {
 		case 0: /* Invalid (0) */
 			buf = g_strdup_printf(
-				   ngettext(
+				   dngettext(PACKAGE, 
 				   "You missed %hu message from %s because it was invalid.",
 				   "You missed %hu messages from %s because they were invalid.",
 				   nummissed),
@@ -2565,7 +2567,7 @@
 			break;
 		case 1: /* Message too large */
 			buf = g_strdup_printf(
-				   ngettext(
+				   dngettext(PACKAGE, 
 				   "You missed %hu message from %s because it was too large.",
 				   "You missed %hu messages from %s because they were too large.",
 				   nummissed),
@@ -2574,7 +2576,7 @@
 			break;
 		case 2: /* Rate exceeded */
 			buf = g_strdup_printf(
-				   ngettext(
+				   dngettext(PACKAGE, 
 				   "You missed %hu message from %s because the rate limit has been exceeded.",
 				   "You missed %hu messages from %s because the rate limit has been exceeded.",
 				   nummissed),
@@ -2583,7 +2585,7 @@
 			break;
 		case 3: /* Evil Sender */
 			buf = g_strdup_printf(
-				   ngettext(
+				   dngettext(PACKAGE, 
 				   "You missed %hu message from %s because he/she was too evil.",
 				   "You missed %hu messages from %s because he/she was too evil.",
 				   nummissed),
@@ -2592,7 +2594,7 @@
 			break;
 		case 4: /* Evil Receiver */
 			buf = g_strdup_printf(
-				   ngettext(
+				   dngettext(PACKAGE, 
 				   "You missed %hu message from %s because you are too evil.",
 				   "You missed %hu messages from %s because you are too evil.",
 				   nummissed),
@@ -2601,7 +2603,7 @@
 			break;
 		default:
 			buf = g_strdup_printf(
-				   ngettext(
+				   dngettext(PACKAGE, 
 				   "You missed %hu message from %s for an unknown reason.",
 				   "You missed %hu messages from %s for an unknown reason.",
 				   nummissed),
@@ -3916,7 +3918,7 @@
 	}
 
 	secondary = g_strdup_printf(
-					ngettext("The following screen name is associated with %s",
+					dngettext(PACKAGE, "The following screen name is associated with %s",
 						 "The following screen names are associated with %s",
 						 num),
 					email);
@@ -4296,11 +4298,11 @@
 		 */
 		if (aim_sn_is_sms(name)) {
 			/* Messaging an SMS (mobile) user */
-			tmp2 = purple_unescape_html(tmp1);
+			tmp2 = purple_markup_strip_html(tmp1);
 		} else if (aim_sn_is_icq(purple_account_get_username(account))) {
 			if (aim_sn_is_icq(name))
 				/* From ICQ to ICQ */
-				tmp2 = purple_unescape_html(tmp1);
+				tmp2 = purple_markup_strip_html(tmp1);
 			else
 				/* From ICQ to AIM */
 				tmp2 = g_strdup(tmp1);
@@ -4474,7 +4476,7 @@
 		if (infolen > od->rights.maxsiglen)
 		{
 			gchar *errstr;
-			errstr = g_strdup_printf(ngettext("The maximum profile length of %d byte "
+			errstr = g_strdup_printf(dngettext(PACKAGE, "The maximum profile length of %d byte "
 									 "has been exceeded.  It has been truncated it for you.",
 									 "The maximum profile length of %d bytes "
 									 "has been exceeded.  It has been truncated it for you.",
@@ -4524,7 +4526,7 @@
 		{
 			gchar *errstr;
 
-			errstr = g_strdup_printf(ngettext("The maximum away message length of %d byte "
+			errstr = g_strdup_printf(dngettext(PACKAGE, "The maximum away message length of %d byte "
 									 "has been exceeded.  It has been truncated for you.",
 									 "The maximum away message length of %d bytes "
 									 "has been exceeded.  It has been truncated for you.",
--- a/libpurple/protocols/sametime/sametime.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Sun Apr 15 00:15:32 2007 +0000
@@ -4347,9 +4347,9 @@
   PurpleConnection *gc;
   struct mwPurplePluginData *pd;
 
-  if (data) {
-    buddy = data->buddy;
-  }
+  g_return_if_fail(data != NULL);
+
+  buddy = data->buddy;
 
   gc = purple_account_get_connection(buddy->account);
   pd = gc->proto_data;
--- a/libpurple/protocols/toc/toc.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/toc/toc.c	Sun Apr 15 00:15:32 2007 +0000
@@ -2205,7 +2205,7 @@
 			index++;
 		}
 		g_snprintf(buf, sizeof(buf), 
-				ngettext(
+				dngettext(PACKAGE, 
 				"%s requests %s to accept %d file: %s (%.2f %s)%s%s",
 				"%s requests %s to accept %d files: %s (%.2f %s)%s%s",
 				ft->files),
--- a/libpurple/protocols/yahoo/util.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/protocols/yahoo/util.c	Sun Apr 15 00:15:32 2007 +0000
@@ -622,6 +622,18 @@
 								break;
 							}
 						}
+					} else if (!g_ascii_strncasecmp(&src[i+1], "SPAN", j - i - 1)) { /* drop span tags */
+						while (1) {
+							if (++j >= len) {
+								g_string_append(dest, &src[i]);
+								i = len;
+								break;
+							}
+							if (src[j] == '>') {
+								i = j;
+								break;
+							}
+						}
 					} else if (g_ascii_strncasecmp(&src[i+1], "FONT", j - i - 1)) { /* not interested! */
 						while (1) {
 							if (++j >= len) {
@@ -668,6 +680,8 @@
 							g_string_append_c(dest, '\n');
 						} else if (!g_ascii_strncasecmp(&src[i+1], "/BODY", sublen)) {
 							/* mmm, </body> tags. *BURP* */
+						} else if (!g_ascii_strncasecmp(&src[i+1], "/SPAN", sublen)) {
+							/* </span> tags. dangerously close to </spam> */
 						} else if (!g_ascii_strncasecmp(&src[i+1], "/FONT", sublen) && g_queue_peek_tail(tags)) {
 							char *etag, *cl;
 
--- a/libpurple/purple-uninstalled.pc.in	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/purple-uninstalled.pc.in	Sun Apr 15 00:15:32 2007 +0000
@@ -9,5 +9,5 @@
 Description: libpurple is a GLib-based instant messenger library.
 Version: @VERSION@
 Requires: glib-2.0
-Cflags: -I${pc_top_builddir}/${pcfiledir}
-Libs: ${pc_top_builddir}/${pcfiledir}/libpurple.la
+Cflags: -I${pcfiledir}
+Libs: ${pcfiledir}/libpurple.la
--- a/libpurple/util.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/util.c	Sun Apr 15 00:15:32 2007 +0000
@@ -861,10 +861,8 @@
  * Markup Functions
  **************************************************************************/
 
-/* Returns a NULL-terminated string after unescaping an entity
- * (eg. &amp;, &lt; &#38 etc.) starting at s. Returns NULL on failure.*/
-static const char *
-detect_entity(const char *text, int *length)
+const char *
+purple_markup_unescape_entity(const char *text, int *length)
 {
 	const char *pln;
 	int len, pound;
@@ -909,6 +907,69 @@
 	return pln;
 }
 
+char *
+purple_markup_get_css_property(const gchar *style,
+				const gchar *opt)
+{
+	const gchar *css_str = style;
+	const gchar *css_value_start;
+	const gchar *css_value_end;
+	gchar *tmp;
+	gchar *ret;
+
+	if (!css_str)
+		return NULL;
+
+	/* find the CSS property */
+	while (1)
+	{
+		/* skip whitespace characters */
+		while (*css_str && g_ascii_isspace(*css_str))
+			css_str++;
+		if (!g_ascii_isalpha(*css_str))
+			return NULL;
+		if (g_ascii_strncasecmp(css_str, opt, strlen(opt)))
+		{
+			/* go to next css property positioned after the next ';' */
+			while (*css_str && *css_str != '"' && *css_str != ';')
+				css_str++;
+			if(*css_str != ';')
+				return NULL;
+			css_str++;
+		}
+		else
+			break;
+	}
+
+	/* find the CSS value position in the string */
+	css_str += strlen(opt);
+	while (*css_str && g_ascii_isspace(*css_str))
+		css_str++;
+	if (*css_str != ':')
+		return NULL;
+	css_str++;
+	while (*css_str && g_ascii_isspace(*css_str))
+		css_str++;
+	if (*css_str == '\0' || *css_str == '"' || *css_str == ';')
+		return NULL;
+
+	/* mark the CSS value */
+	css_value_start = css_str;
+	while (*css_str && *css_str != '"' && *css_str != ';')
+		css_str++;
+	css_value_end = css_str - 1;
+
+	/* Removes trailing whitespace */
+	while (css_value_end > css_value_start && g_ascii_isspace(*css_value_end))
+		css_value_end--;
+
+	tmp = g_strndup(css_value_start, css_value_end - css_value_start + 1);
+	ret = purple_unescape_html(tmp);
+	g_free(tmp);
+
+	return ret;
+}
+
 gboolean
 purple_markup_find_tag(const char *needle, const char *haystack,
 					 const char **start, const char **end, GData **attributes)
@@ -1509,7 +1570,7 @@
 			const char *pln;
 			int len;
 
-			if ((pln = detect_entity(c, &len)) == NULL) {
+			if ((pln = purple_markup_unescape_entity(c, &len)) == NULL) {
 				len = 1;
 				g_snprintf(buf, sizeof(buf), "%c", *c);
 				pln = buf;
@@ -1714,7 +1775,7 @@
 			visible = TRUE;
 		}
 
-		if (str2[i] == '&' && (ent = detect_entity(str2 + i, &entlen)) != NULL)
+		if (str2[i] == '&' && (ent = purple_markup_unescape_entity(str2 + i, &entlen)) != NULL)
 		{
 			while (*ent)
 				str2[j++] = *ent++;
@@ -2032,7 +2093,7 @@
 			int len;
 			const char *ent;
 
-			if ((ent = detect_entity(c, &len)) != NULL) {
+			if ((ent = purple_markup_unescape_entity(c, &len)) != NULL) {
 				ret = g_string_append(ret, ent);
 				c += len;
 			} else if (!strncmp(c, "<br>", 4)) {
@@ -2932,7 +2993,7 @@
 
 	if (secs < 60)
 	{
-		return g_strdup_printf(ngettext("%d second", "%d seconds", secs), secs);
+		return g_strdup_printf(dngettext(PACKAGE, "%d second", "%d seconds", secs), secs);
 	}
 
 	days = secs / (60 * 60 * 24);
@@ -2944,7 +3005,7 @@
 
 	if (days > 0)
 	{
-		ret = g_strdup_printf(ngettext("%d day", "%d days", days), days);
+		ret = g_strdup_printf(dngettext(PACKAGE, "%d day", "%d days", days), days);
 	}
 
 	if (hrs > 0)
@@ -2952,13 +3013,13 @@
 		if (ret != NULL)
 		{
 			char *tmp = g_strdup_printf(
-					ngettext("%s, %d hour", "%s, %d hours", hrs),
+					dngettext(PACKAGE, "%s, %d hour", "%s, %d hours", hrs),
 							ret, hrs);
 			g_free(ret);
 			ret = tmp;
 		}
 		else
-			ret = g_strdup_printf(ngettext("%d hour", "%d hours", hrs), hrs);
+			ret = g_strdup_printf(dngettext(PACKAGE, "%d hour", "%d hours", hrs), hrs);
 	}
 
 	if (mins > 0)
@@ -2966,13 +3027,13 @@
 		if (ret != NULL)
 		{
 			char *tmp = g_strdup_printf(
-					ngettext("%s, %d minute", "%s, %d minutes", mins),
+					dngettext(PACKAGE, "%s, %d minute", "%s, %d minutes", mins),
 							ret, mins);
 			g_free(ret);
 			ret = tmp;
 		}
 		else
-			ret = g_strdup_printf(ngettext("%d minute", "%d minutes", mins), mins);
+			ret = g_strdup_printf(dngettext(PACKAGE, "%d minute", "%d minutes", mins), mins);
 	}
 
 	return ret;
--- a/libpurple/util.h	Sun Apr 15 00:14:34 2007 +0000
+++ b/libpurple/util.h	Sun Apr 15 00:15:32 2007 +0000
@@ -462,6 +462,43 @@
  */
 char *purple_markup_get_tag_name(const char *tag);
 
+/**
+ * Returns a constant string of the character representation of the HTML
+ * entity pointed to by @a text. For example, purple_markup_unescape_entity("&amp;")
+ * will return "&". The @a text variable is expected to point to an '&',
+ * the first character of the entity. If given an unrecognized entity, the function
+ * returns @c NULL.
+ *
+ * Note that this function, unlike purple_unescape_html(), does not search 
+ * the string for the entity, does not replace the entity, and does not
+ * return a newly allocated string.
+ *
+ * @param text   A string containing an HTML entity.
+ * @param length If not @c NULL, the string length of the entity is stored in this location.
+ *
+ * @return A constant string containing the character representation of the given entity.
+ */
+const char * purple_markup_unescape_entity(const char *text, int *length);
+
+/**
+ * Returns a newly allocated string containing the value of the CSS property specified
+ * in opt. The @a style argument is expected to point to a HTML inline CSS.
+ * (i.e. <span style="[inline css]"> ) The function will seek for the CSS property and
+ * return its value.
+ *
+ * For example, purple_markup_get_css_property("direction:rtl;color:#dc4d1b;", "color")
+ * would return "#dc4d1b".
+ *
+ * On error or if the requested property was not found, the function returns @c NULL.
+ *
+ * @param style A string containing the inline CSS text.
+ * @param opt   The requested CSS property.
+ *
+ * @return The value of the requested CSS property.
+ */
+char * purple_markup_get_css_property(const gchar *style, const gchar *opt);
+
+
 /*@}*/
 
 
--- a/pidgin.spec.in	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin.spec.in	Sun Apr 15 00:15:32 2007 +0000
@@ -74,48 +74,62 @@
 %package devel
 Summary:    Development headers, documentation, and libraries for Pidgin
 Group:      Applications/Internet
-Requires:   pkgconfig, pidgin = %{epoch}:%{version}
+Requires:   pkgconfig, pidgin = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version}
+
+%package -n libpurple
+Summary:    libpurple library for IM clients like Pidgin and Finch
+Group:      Applications/Internet
+
+%package -n libpurple-devel
+Summary:    Development headers, documentation, and libraries for libpurple
+Group:      Applications/Internet
+Requires:	libpurple = %{epoch}:%{version}
 
 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
-%package bonjour
+%package -n libpurple-bonjour
 Summary:    Bonjour plugin for Pidgin
 Group:      Applications/Internet
-Requires:   pidgin = %{epoch}:%{version}
+Requires:   libpurple = %{epoch}:%{version}
 %endif
 
 %if 0%{?_with_meanwhile:1}
-%package meanwhile
+%package -n libpurple-meanwhile
 Summary:    Lotus Sametime plugin for Pidgin using the Meanwhile library
 Group:      Applications/Internet
-Requires:   pidgin = %{epoch}:%{version}
+Requires:   libpurple = %{epoch}:%{version}
 %endif
 
 %if 0%{?_with_mono:1}
-%package mono
+%package -n libpurple-mono
 Summary:    Mono .NET plugin support for Pidgin
 Group:      Applications/Internet
-Requires:   pidgin = %{epoch}:%{version}
+Requires:   libpurple = %{epoch}:%{version}
 %endif
 
 %if 0%{?_with_silc:1}
-%package silc
+%package -n libpurple-silc
 Summary:    SILC (Secure Internet Live Conferencing) plugin for Pidgin
 Group:      Applications/Internet
-Requires:   pidgin = %{epoch}:%{version}
+Requires:   libpurple = %{epoch}:%{version}
 %endif
 
 %if 0%{?_with_tcl:1}
-%package tcl
+%package -n libpurple-tcl
 Summary:    Tcl scripting support for Pidgin
 Group:      Applications/Internet
-Requires:   pidgin = %{epoch}:%{version}
+Requires:   libpurple = %{epoch}:%{version}
 %endif
 
 %if 0%{!?_without_text:1}
 %package -n finch
 Summary:    A text-based user interface for Pidgin
 Group:      Applications/Internet
-Requires:   pidgin = %{epoch}:%{version}
+Requires:   libpurple = %{epoch}:%{version}
+
+%package -n finch-devel
+Summary:	Headers etc. for finch stuffs
+Group:      Applications/Internet
+Requires:   finch = %{epoch}:%{version}, libpurple-devel = %{epoch}:%{version}
 %endif
 
 %description
@@ -137,24 +151,30 @@
 documentation, and libraries required for development of Pidgin scripts
 and plugins.
 
+%description -n libpurple
+someone write a good description of libpurple please
+
+%description -n libpurple-devel
+someone write a good description of libpurple-devel please
+
 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
-%description bonjour
+%description -n libpurple-bonjour
 Bonjour plugin for Pidgin.
 %endif
 
 %if 0%{?_with_meanwhile:1}
-%description meanwhile
+%description -n libpurple-meanwhile
 Lotus Sametime plugin for Pidgin using the Meanwhile library.
 %endif
 
 %if 0%{?_with_mono:1}
-%description mono
+%description -n libpurple-mono
 Mono plugin loader for Pidgin.  This package will allow you to write or
 use Pidgin plugins written in the .NET programming language.
 %endif
 
 %if 0%{?_with_silc:1}
-%description silc
+%description -n libpurple-silc
 SILC (Secure Internet Live Conferencing) plugin for Pidgin.
 %endif
 
@@ -164,10 +184,13 @@
 standard text console or from a terminal within X Windows.  It
 uses ncurses and our homegrown gnt library for drawing windows
 and text.
+
+%description -n finch-devel
+Finch devel blah blah
 %endif
 
 %if 0%{?_with_tcl:1}
-%description tcl
+%description -n libpurple-tcl
 Tcl plugin loader for Pidgin.  This package will allow you to write or
 use Pidgin plugins written in the Tcl programming language.
 %endif
@@ -214,12 +237,14 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/finch/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/private/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
 # do we want to ship the nullclient ?
 rm -f $RPM_BUILD_ROOT%{_bindir}/nullclient
+rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gaim.svg
 
 %if 0%{!?_with_howl:1} && 0%{!?_with_avahi:1}
 rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/libbonjour.so
@@ -250,7 +275,7 @@
 
 %find_lang %{name}
 
-find $RPM_BUILD_ROOT%{_libdir}/pidgin $RPM_BUILD_ROOT%{_libdir}/libpurple -xtype f -print | \
+find $RPM_BUILD_ROOT%{_libdir}/libpurple -xtype f -print | \
         sed "s@^$RPM_BUILD_ROOT@@g" | \
         grep -v /libbonjour.so | \
         grep -v /libsilcpurple.so | \
@@ -258,10 +283,18 @@
         grep -v /mono.so | \
         grep -v /tcl.so | \
         grep -v ".dll$" | \
-        grep -v ".tcl$" > %{name}-%{version}-coreplugins
+        grep -v ".tcl$" > %{name}-%{version}-purpleplugins
+
+find $RPM_BUILD_ROOT%{_libdir}/pidgin -xtype f -print | \
+        sed "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-pidginplugins
+
+find $RPM_BUILD_ROOT%{_libdir}/finch -xtype f -print | \
+        sed "s@^$RPM_BUILD_ROOT@@g" > %{name}-%{version}-finchplugins
 
 # files -f file can only take one filename :(
-cat %{name}.lang >> %{name}-%{version}-coreplugins
+cat %{name}.lang >> %{name}-%{version}-purpleplugins
+cat %{name}.lang >> %{name}-%{version}-pidginplugins
+cat %{name}.lang >> %{name}-%{version}-finchplugins
 
 %clean
 rm -rf %{buildroot}
@@ -293,7 +326,7 @@
 
 %postun -p /sbin/ldconfig
 
-%files -f %{name}-%{version}-coreplugins
+%files -f %{name}-%{version}-pidginplugins
 %defattr(-, root, root)
 
 %doc AUTHORS
@@ -309,17 +342,30 @@
 %doc %{_mandir}/man3*/*
 
 %dir %{_libdir}/pidgin
-%dir %{_libdir}/libpurple
-%attr(755, root, root) %{perl_vendorarch}/Purple*
-%attr(755, root, root) %{perl_vendorarch}/auto/Purple
+%dir %{perl_vendorarch}/Purple
+%attr(755, root, root) %{perl_vendorarch}/Purple/*
+%attr(755, root, root) %{perl_vendorarch}/auto/Purple/GtkUI*
 
 %{_bindir}/pidgin
-%{_datadir}/pixmaps/*
+%{_datadir}/pixmaps/pidgin
+%{_datadir}/pixmaps/pidgin.svg
 %dir %{_datadir}/sounds/pidgin
 %{_datadir}/sounds/pidgin/*
 %{_datadir}/applications/*
+%{_sysconfdir}/gconf/schemas/purple.schemas
+
+
+%files -f %{name}-%{version}-purpleplugins -n libpurple
+%defattr(-, root, root)
+
 %{_libdir}/libpurple.so.*
-%{_sysconfdir}/gconf/schemas/purple.schemas
+%dir %{_libdir}/libpurple
+%attr(755, root, root) %{perl_vendorarch}/Purple.pm
+%dir %{perl_vendorarch}/auto/Purple
+%attr(755, root, root) %{perl_vendorarch}/auto/Purple/Purple.so
+%attr(755, root, root) %{perl_vendorarch}/auto/Purple/autosplit.ix
+
+%{_datadir}/pixmaps/purple
 
 %if 0%{?_with_dbus:1}
 %{_bindir}/purple-client-example
@@ -335,46 +381,44 @@
 
 %files devel
 %defattr(-, root, root)
+%dir %{_includedir}/pidgin
+%{_includedir}/pidgin/*.h
+%{_libdir}/pkgconfig/pidgin.pc
+
+%files -n libpurple-devel
+%defattr(-, root, root)
 
 %doc ChangeLog.API
 %doc HACKING
 %doc PLUGIN_HOWTO
 %doc PROGRAMMING_NOTES
 
-%dir %{_includedir}/finch
-%dir %{_includedir}/gnt
 %dir %{_includedir}/libpurple
-%dir %{_includedir}/pidgin
-%{_includedir}/finch/*.h
-%{_includedir}/gnt/*.h
 %{_includedir}/libpurple/*.h
-%{_includedir}/pidgin/*.h
 %{_libdir}/libpurple.so
-%{_libdir}/libgnt.so
 %{_libdir}/pkgconfig/purple.pc
-%{_libdir}/pkgconfig/pidgin.pc
-%{_libdir}/pkgconfig/gnt.pc
 %{_datadir}/aclocal/purple.m4
 %if 0%{?_with_dbus:1}
 %{_libdir}/libpurple-client.so
 %endif
 
+
 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
-%files bonjour
+%files -n libpurple-bonjour
 %defattr(-, root, root)
 
 %{_libdir}/libpurple/libbonjour.*
 %endif
 
 %if 0%{?_with_meanwhile:1}
-%files meanwhile
+%files -n libpurple-meanwhile
 %defattr(-, root, root)
 
 %{_libdir}/libpurple/libsametime.*
 %endif
 
 %if 0%{?_with_mono:1}
-%files mono
+%files libpurple-mono
 %defattr(-, root, root)
 
 %{_libdir}/libpurple/mono.so
@@ -382,30 +426,46 @@
 %endif
 
 %if 0%{?_with_silc:1}
-%files silc
+%files -n libpurple-silc
 %defattr(-, root, root)
 
 %{_libdir}/libpurple/libsilcpurple.*
 %endif
 
 %if 0%{?_with_tcl:1}
-%files tcl
+%files -n libpurple-tcl
 %defattr(-, root, root)
 
 %{_libdir}/libpurple/tcl.so
 %endif
 
 %if 0%{!?_without_text:1}
-%files -n finch
+%files -f %{name}-%{version}-finchplugins -n finch
 %defattr(-, root, root)
 
 %doc %{_mandir}/man1/finch.*
 %{_bindir}/finch
-%{_libdir}/finch/*.so
 %{_libdir}/libgnt.so.*
+
+%files -n finch-devel
+%defattr(-, root, root)
+%dir %{_includedir}/finch
+%{_includedir}/finch/*.h
+# libgnt
+%dir %{_includedir}/gnt
+%{_includedir}/gnt/*.h
+%{_libdir}/pkgconfig/gnt.pc
+%{_libdir}/libgnt.so
+
 %endif
 
 %changelog
+* Thu Apr 12 2007 Stu Tomlinson <stu@nosnilmot.com>
+- Actually move libpurple.so.* to the libpurple RPM
+
+* Wed Apr 11 2007 Stu Tomlinson <stu@nosnilmot.com>
+- Separate out libpurple, libpurple-devel and finch-devel
+
 * Sat Mar 24 2007 Stu Tomlinson <stu@nosnilmot.com>
 - Update to reflect renaming to pidgin/libpurple
 
--- a/pidgin/gtkaccount.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkaccount.c	Sun Apr 15 00:15:32 2007 +0000
@@ -1159,9 +1159,9 @@
 			purple_account_set_buddy_icon_path(account, dialog->icon_path);
 			purple_account_set_buddy_icon(account, dialog->cached_icon_path);
 		}
-		else if (purple_prefs_get_path("/purple/gtk/accounts/buddyicon") && icon_change)
+		else if (purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon") && icon_change)
 		{
-			const char *filename = purple_prefs_get_path("/purple/gtk/accounts/buddyicon");
+			const char *filename = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon");
 			char *icon = pidgin_convert_buddy_icon(dialog->plugin, filename);
 			purple_account_set_buddy_icon_path(account, filename);
 			purple_account_set_buddy_icon(account, icon);
@@ -1783,12 +1783,12 @@
 configure_cb(GtkWidget *w, GdkEventConfigure *event, AccountsWindow *dialog)
 {
 	if (GTK_WIDGET_VISIBLE(w)) {
-		int old_width = purple_prefs_get_int("/purple/gtk/accounts/dialog/width");
+		int old_width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/width");
 		int col_width;
 		int difference;
 
-		purple_prefs_set_int("/purple/gtk/accounts/dialog/width",  event->width);
-		purple_prefs_set_int("/purple/gtk/accounts/dialog/height", event->height);
+		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/accounts/dialog/width",  event->width);
+		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/accounts/dialog/height", event->height);
 
 		col_width = gtk_tree_view_column_get_width(dialog->screenname_col);
 
@@ -1989,7 +1989,7 @@
 			buddyicon = g_object_ref(G_OBJECT(global_buddyicon));
 		/* This is for when set_account() is called for a single account */
 		else
-			path = purple_prefs_get_path("/purple/gtk/accounts/buddyicon");
+			path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon");
 	} else
 		path = purple_account_get_ui_string(account, PIDGIN_UI, "non-global-buddyicon-path", NULL);
 
@@ -2029,6 +2029,7 @@
 	gtk_notebook_set_current_page(GTK_NOTEBOOK(accounts_window->notebook),1);
 
 	set_account(accounts_window->model, &iter, account, global_buddyicon);
+	gtk_window_present(pidgin_blist_get_default_gtk_blist()->window);
 }
 
 static gboolean
@@ -2041,7 +2042,7 @@
 
 	gtk_list_store_clear(dialog->model);
 
-	if ((path = purple_prefs_get_path("/purple/gtk/accounts/buddyicon")) != NULL) {
+	if ((path = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon")) != NULL) {
 		GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file(path, NULL);
 		if (pixbuf != NULL) {
 			global_buddyicon = gdk_pixbuf_scale_simple(pixbuf, 22, 22, GDK_INTERP_HYPER);
@@ -2263,8 +2264,8 @@
 
 	accounts_window = dialog = g_new0(AccountsWindow, 1);
 
-	width  = purple_prefs_get_int("/purple/gtk/accounts/dialog/width");
-	height = purple_prefs_get_int("/purple/gtk/accounts/dialog/height");
+	width  = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/width");
+	height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/accounts/dialog/height");
 
 	dialog->window = win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(win), width, height);
@@ -2334,7 +2335,7 @@
 	                    accounts_window,
 	                    PURPLE_CALLBACK(account_modified_cb), accounts_window);
 	purple_prefs_connect_callback(accounts_window,
-	                    "/purple/gtk/accounts/buddyicon",
+	                    PIDGIN_PREFS_ROOT "/accounts/buddyicon",
 	                    global_buddyicon_changed, accounts_window);
 
 	gtk_widget_show(win);
@@ -2566,10 +2567,10 @@
 pidgin_account_init(void)
 {
 	char *default_avatar = NULL;
-	purple_prefs_add_none("/purple/gtk/accounts");
-	purple_prefs_add_none("/purple/gtk/accounts/dialog");
-	purple_prefs_add_int("/purple/gtk/accounts/dialog/width",  520);
-	purple_prefs_add_int("/purple/gtk/accounts/dialog/height", 321);
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/accounts");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/accounts/dialog");
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/accounts/dialog/width",  520);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/accounts/dialog/height", 321);
 	default_avatar = g_build_filename(g_get_home_dir(), ".face.icon", NULL);
 	if (!g_file_test(default_avatar, G_FILE_TEST_EXISTS)) {
 		g_free(default_avatar);
@@ -2580,7 +2581,7 @@
 		}
 	}
 
-	purple_prefs_add_path("/purple/gtk/accounts/buddyicon", default_avatar);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon", default_avatar);
 	g_free(default_avatar);
 
 	purple_signal_register(pidgin_account_get_handle(), "account-modified",
--- a/pidgin/gtkblist.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkblist.c	Sun Apr 15 00:15:32 2007 +0000
@@ -179,18 +179,18 @@
 {
 	if(event->changed_mask & GDK_WINDOW_STATE_WITHDRAWN) {
 		if(event->new_window_state & GDK_WINDOW_STATE_WITHDRAWN)
-			purple_prefs_set_bool("/purple/gtk/blist/list_visible", FALSE);
+			purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", FALSE);
 		else {
-			purple_prefs_set_bool("/purple/gtk/blist/list_visible", TRUE);
+			purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", TRUE);
 			pidgin_blist_refresh_timer(purple_get_blist());
 		}
 	}
 
 	if(event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) {
 		if(event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED)
-			purple_prefs_set_bool("/purple/gtk/blist/list_maximized", TRUE);
+			purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized", TRUE);
 		else
-			purple_prefs_set_bool("/purple/gtk/blist/list_maximized", FALSE);
+			purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized", FALSE);
 	}
 
 	/* Refresh gtkblist if un-iconifying */
@@ -239,10 +239,10 @@
 #endif
 
 	/* don't save if nothing changed */
-	if (x == purple_prefs_get_int("/purple/gtk/blist/x") &&
-		y == purple_prefs_get_int("/purple/gtk/blist/y") &&
-		event->width  == purple_prefs_get_int("/purple/gtk/blist/width") &&
-		event->height == purple_prefs_get_int("/purple/gtk/blist/height")) {
+	if (x == purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/x") &&
+		y == purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/y") &&
+		event->width  == purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width") &&
+		event->height == purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/height")) {
 
 		return FALSE; /* carry on normally */
 	}
@@ -257,17 +257,17 @@
 	}
 
 	/* ignore changes when maximized */
-	if(purple_prefs_get_bool("/purple/gtk/blist/list_maximized"))
+	if(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized"))
 		return FALSE;
 
 	/* store the position */
-	purple_prefs_set_int("/purple/gtk/blist/x",      x);
-	purple_prefs_set_int("/purple/gtk/blist/y",      y);
-	purple_prefs_set_int("/purple/gtk/blist/width",  event->width);
-	purple_prefs_set_int("/purple/gtk/blist/height", event->height);
+	purple_prefs_set_int(PIDGIN_PREFS_ROOT "/blist/x",      x);
+	purple_prefs_set_int(PIDGIN_PREFS_ROOT "/blist/y",      y);
+	purple_prefs_set_int(PIDGIN_PREFS_ROOT "/blist/width",  event->width);
+	purple_prefs_set_int(PIDGIN_PREFS_ROOT "/blist/height", event->height);
 
 	gtk_widget_set_size_request(gtkblist->headline_label,
-				    purple_prefs_get_int("/purple/gtk/blist/width")-25,-1);
+				    purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width")-25,-1);
 	/* continue to handle event normally */
 	return FALSE;
 }
@@ -1231,7 +1231,7 @@
 	struct _pidgin_blist_node *gtknode = (struct _pidgin_blist_node *)node->ui_data;
 	GtkWidget *menu;
 	GtkWidget *menuitem;
-	gboolean show_offline = purple_prefs_get_bool("/purple/gtk/blist/show_offline_buddies");
+	gboolean show_offline = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies");
 
 	menu = gtk_menu_new();
 	pidgin_blist_make_buddy_menu(menu, b, FALSE);
@@ -1443,7 +1443,7 @@
 {
 	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 
-	purple_prefs_set_bool("/purple/gtk/blist/show_buddy_icons",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons",
 			    gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));
 
 	pidgin_clear_cursor(gtkblist->window);
@@ -1453,7 +1453,7 @@
 {
 	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 
-	purple_prefs_set_bool("/purple/gtk/blist/show_idle_time",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time",
 			    gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));
 
 	pidgin_clear_cursor(gtkblist->window);
@@ -1463,7 +1463,7 @@
 {
 	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 
-	purple_prefs_set_bool("/purple/gtk/blist/show_empty_groups",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/show_empty_groups",
 			gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(item)));
 
 	pidgin_clear_cursor(gtkblist->window);
@@ -1474,7 +1474,7 @@
 {
 	pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 
-	purple_prefs_set_bool("/purple/gtk/blist/show_offline_buddies",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies",
 			gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(checkitem)));
 
 	pidgin_clear_cursor(gtkblist->window);
@@ -1482,7 +1482,7 @@
 
 static void pidgin_blist_mute_sounds_cb(gpointer data, guint action, GtkWidget *item)
 {
-	purple_prefs_set_bool("/purple/gtk/sound/mute", GTK_CHECK_MENU_ITEM(item)->active);
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/sound/mute", GTK_CHECK_MENU_ITEM(item)->active);
 }
 
 static void
@@ -2050,6 +2050,51 @@
 	}
 }
 
+static void
+roundify(GdkPixbuf *pixbuf) {
+	int width, height, rowstride;
+	guchar *pixels;
+
+	if (!gdk_pixbuf_get_has_alpha(pixbuf))
+		return;
+
+	width = gdk_pixbuf_get_width(pixbuf);
+	height = gdk_pixbuf_get_height(pixbuf);
+	rowstride = gdk_pixbuf_get_rowstride(pixbuf);
+	pixels = gdk_pixbuf_get_pixels(pixbuf);
+
+	if (width < 6 || height < 6)
+		return;
+	
+	/* Top left */
+	pixels[3] = 0;
+	pixels[7] = 0x80;
+	pixels[11] = 0xC0;
+	pixels[rowstride + 3] = 0x80;
+	pixels[rowstride * 2 + 3] = 0xC0;
+	
+	/* Top right */
+	pixels[width * 4 - 1] = 0;
+	pixels[width * 4 - 5] = 0x80;
+	pixels[width * 4 - 9] = 0xC0;
+	pixels[rowstride + (width * 4) - 1] = 0x80;
+	pixels[(2 * rowstride) + (width * 4) - 1] = 0xC0;
+	
+	/* Bottom left */
+	pixels[(height - 1) * rowstride + 3] = 0;
+	pixels[(height - 1) * rowstride + 7] = 0x80;
+	pixels[(height - 1) * rowstride + 11] = 0xC0;
+	pixels[(height - 2) * rowstride + 3] = 0x80;
+	pixels[(height - 3) * rowstride + 3] = 0xC0;
+	
+	/* Bottom right */
+	pixels[height * rowstride - 1] = 0;
+	pixels[(height - 1) * rowstride - 1] = 0x80;
+	pixels[(height - 2) * rowstride - 1] = 0xC0;
+	pixels[height * rowstride - 5] = 0x80;
+	pixels[height * rowstride - 9] = 0xC0;
+}
+
 /* Altered from do_colorshift in gnome-panel */
 static void
 do_alphashift (GdkPixbuf *dest, GdkPixbuf *src, int shift)
@@ -2121,7 +2166,7 @@
 		prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(account->gc->prpl);
 
 #if 0
-	if (!purple_prefs_get_bool("/purple/gtk/blist/show_buddy_icons"))
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"))
 		return NULL;
 #endif
 
@@ -2196,6 +2241,8 @@
 			ret = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, 32, 32);
 			gdk_pixbuf_fill(ret, 0x00000000);
 			gdk_pixbuf_scale(buf, ret, (32-scale_width)/2, (32-scale_height)/2, scale_width, scale_height, (32-scale_width)/2, (32-scale_height)/2, (double)scale_width/(double)orig_width, (double)scale_height/(double)orig_height, GDK_INTERP_BILINEAR);
+			if (pidgin_gdk_pixbuf_is_opaque(ret))
+				roundify(ret);
 		} else {
 			ret = gdk_pixbuf_scale_simple(buf,scale_width,scale_height, GDK_INTERP_BILINEAR);
 		}
@@ -2504,7 +2551,7 @@
 	return (purple_account_is_connected(buddy->account) &&
 			(purple_presence_is_online(buddy->presence) ||
 			 (gtknode && gtknode->recent_signonoff) ||
-			 purple_prefs_get_bool("/purple/gtk/blist/show_offline_buddies") ||
+			 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies") ||
 			 purple_blist_node_get_bool((PurpleBlistNode*)buddy, "show_offline")));
 }
 
@@ -2565,10 +2612,11 @@
 				}
 				max_text_width = MAX(max_text_width, MAX(td->width, td->name_width));
 				max_avatar_width = MAX(max_avatar_width, td->avatar_width);
-				h += MAX(TOOLTIP_BORDER + MAX(STATUS_SIZE,td->avatar_height) + TOOLTIP_BORDER,
-						TOOLTIP_BORDER + td->height + td->name_height + TOOLTIP_BORDER);
+				h += MAX(TOOLTIP_BORDER + MAX(STATUS_SIZE,td->avatar_height),
+						TOOLTIP_BORDER + td->height + td->name_height);
 			}
 		}
+		h += TOOLTIP_BORDER;
 		w = TOOLTIP_BORDER + STATUS_SIZE + SMALL_SPACE + max_text_width + SMALL_SPACE + max_avatar_width + TOOLTIP_BORDER;
 	} else {
 		gtk_widget_destroy(gtkblist->tipwindow);
@@ -2687,7 +2735,7 @@
 	GtkTreePath *path;
 	int delay;
 
-	delay = purple_prefs_get_int("/purple/gtk/blist/tooltip_delay");
+	delay = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/tooltip_delay");
 
 	if (delay == 0)
 		return FALSE;
@@ -2743,8 +2791,8 @@
 static void
 toggle_debug(void)
 {
-	purple_prefs_set_bool("/purple/gtk/debug/enabled",
-			!purple_prefs_get_bool("/purple/gtk/debug/enabled"));
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/debug/enabled",
+			!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"));
 }
 
 
@@ -3220,7 +3268,7 @@
 
 	presence = purple_buddy_get_presence(b);
 
-	if (!purple_prefs_get_bool("/purple/gtk/blist/show_buddy_icons"))
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"))
 	{
 		if (!selected && purple_presence_is_idle(presence))
 		{
@@ -3304,7 +3352,7 @@
 		text = g_strdup(esc);
 
 	if (purple_presence_is_idle(presence)) {
-		if (purple_prefs_get_bool("/purple/gtk/blist/show_idle_time")) {
+		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time")) {
 			time_t idle_secs = purple_presence_get_idle_time(presence);
 
 			if (idle_secs > 0) {
@@ -3374,16 +3422,16 @@
 {
 	int blist_x, blist_y, blist_width, blist_height;
 
-	blist_width = purple_prefs_get_int("/purple/gtk/blist/width");
+	blist_width = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width");
 
 	/* if the window exists, is hidden, we're saving positions, and the
 	 * position is sane... */
 	if (gtkblist && gtkblist->window &&
 		!GTK_WIDGET_VISIBLE(gtkblist->window) && blist_width != 0) {
 
-		blist_x      = purple_prefs_get_int("/purple/gtk/blist/x");
-		blist_y      = purple_prefs_get_int("/purple/gtk/blist/y");
-		blist_height = purple_prefs_get_int("/purple/gtk/blist/height");
+		blist_x      = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/x");
+		blist_y      = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/y");
+		blist_height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/height");
 
 		/* ...check position is on screen... */
 		if (blist_x >= gdk_screen_width())
@@ -3399,7 +3447,7 @@
 		/* ...and move it back. */
 		gtk_window_move(GTK_WINDOW(gtkblist->window), blist_x, blist_y);
 		gtk_window_resize(GTK_WINDOW(gtkblist->window), blist_width, blist_height);
-		if (purple_prefs_get_bool("/purple/gtk/blist/list_maximized"))
+		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized"))
 			gtk_window_maximize(GTK_WINDOW(gtkblist->window));
 	}
 }
@@ -3680,7 +3728,7 @@
 	pidgin_blist_sort_method_reg("status", _("By status"), sort_method_status);
 	pidgin_blist_sort_method_reg("log_size", _("By log size"), sort_method_log);
 #endif
-	pidgin_blist_sort_method_set(purple_prefs_get_string("/purple/gtk/blist/sort_type"));
+	pidgin_blist_sort_method_set(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/sort_type"));
 }
 
 static void _prefs_change_redo_list()
@@ -3719,7 +3767,7 @@
 static void _prefs_change_sort_method(const char *pref_name, PurplePrefType type,
 									  gconstpointer val, gpointer data)
 {
-	if(!strcmp(pref_name, "/purple/gtk/blist/sort_type"))
+	if(!strcmp(pref_name, PIDGIN_PREFS_ROOT "/blist/sort_type"))
 		pidgin_blist_sort_method_set(val);
 }
 
@@ -4119,7 +4167,7 @@
 				{"application/x-im-contact", 0, DRAG_BUDDY},
 				{"text/x-vcard", 0, DRAG_VCARD }};
 	if (gtkblist && gtkblist->window) {
-		purple_blist_set_visible(purple_prefs_get_bool("/purple/gtk/blist/list_visible"));
+		purple_blist_set_visible(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_visible"));
 		return;
 	}
 
@@ -4189,7 +4237,7 @@
 	pretty = pidgin_make_pretty_arrows(tmp);
 	g_free(tmp);
 	label = gtk_label_new(NULL);
-	gtk_widget_set_size_request(label, purple_prefs_get_int("/purple/gtk/blist/width") - 12, -1);
+	gtk_widget_set_size_request(label, purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width") - 12, -1);
 	gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.2);
 	gtk_label_set_markup(GTK_LABEL(label), pretty);
@@ -4212,7 +4260,7 @@
 	gtk_misc_set_alignment(GTK_MISC(gtkblist->headline_image), 0.0, 0);
 	gtkblist->headline_label = gtk_label_new(NULL);
 	gtk_widget_set_size_request(gtkblist->headline_label,
-				    purple_prefs_get_int("/purple/gtk/blist/width")-25,-1);
+				    purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width")-25,-1);
 	gtk_label_set_line_wrap(GTK_LABEL(gtkblist->headline_label), TRUE);
 	gtk_box_pack_start(GTK_BOX(gtkblist->headline_hbox), gtkblist->headline_image, FALSE, FALSE, 0);
 	gtk_box_pack_start(GTK_BOX(gtkblist->headline_hbox), gtkblist->headline_label, TRUE, TRUE, 0);
@@ -4369,7 +4417,7 @@
 					    NULL);
 
 	rend = gtk_cell_renderer_pixbuf_new();
-	g_object_set(rend, "xalign", 1.0, "yalign", 0.5, "ypad", 0, NULL);
+	g_object_set(rend, "xalign", 1.0, "yalign", 0.5, "ypad", 0, "xpad", 3, NULL);
 	gtk_tree_view_column_pack_start(column, rend, FALSE);
 	gtk_tree_view_column_set_attributes(column, rend, "pixbuf", EMBLEM_COLUMN,
 #if GTK_CHECK_VERSION(2,6,0)
@@ -4423,21 +4471,21 @@
 	 * after the treeview or faceprint gets mad. -Robot101
 	 */
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show Offline Buddies"))),
-			purple_prefs_get_bool("/purple/gtk/blist/show_offline_buddies"));
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies"));
 
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show Empty Groups"))),
-			purple_prefs_get_bool("/purple/gtk/blist/show_empty_groups"));
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_empty_groups"));
 
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Tools/Mute Sounds"))),
-			purple_prefs_get_bool("/purple/gtk/sound/mute"));
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/mute"));
 
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show Buddy Details"))),
-			purple_prefs_get_bool("/purple/gtk/blist/show_buddy_icons"));
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"));
 
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(gtk_item_factory_get_item (gtkblist->ift, N_("/Buddies/Show Idle Times"))),
-			purple_prefs_get_bool("/purple/gtk/blist/show_idle_time"));
-
-	if(!strcmp(purple_prefs_get_string("/purple/gtk/sound/method"), "none"))
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time"));
+
+	if(!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none"))
 		gtk_widget_set_sensitive(gtk_item_factory_get_widget(gtkblist->ift, N_("/Tools/Mute Sounds")), FALSE);
 
 	/* Update some dynamic things */
@@ -4450,7 +4498,7 @@
 	pidgin_blist_restore_position();
 	gtk_widget_show_all(GTK_WIDGET(gtkblist->vbox));
 	gtk_widget_realize(GTK_WIDGET(gtkblist->window));
-	purple_blist_set_visible(purple_prefs_get_bool("/purple/gtk/blist/list_visible"));
+	purple_blist_set_visible(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_visible"));
 
 	/* start the refresh timer */
 	gtkblist->refresh_timer = g_timeout_add(30000, (GSourceFunc)pidgin_blist_refresh_timer, list);
@@ -4458,23 +4506,23 @@
 	handle = pidgin_blist_get_handle();
 
 	/* things that affect how buddies are displayed */
-	purple_prefs_connect_callback(handle, "/purple/gtk/blist/show_buddy_icons",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/show_buddy_icons",
 			_prefs_change_redo_list, NULL);
-	purple_prefs_connect_callback(handle, "/purple/gtk/blist/show_idle_time",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/show_idle_time",
 			_prefs_change_redo_list, NULL);
-	purple_prefs_connect_callback(handle, "/purple/gtk/blist/show_empty_groups",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/show_empty_groups",
 			_prefs_change_redo_list, NULL);
-	purple_prefs_connect_callback(handle, "/purple/gtk/blist/show_offline_buddies",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/show_offline_buddies",
 			_prefs_change_redo_list, NULL);
 
 	/* sorting */
-	purple_prefs_connect_callback(handle, "/purple/gtk/blist/sort_type",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/blist/sort_type",
 			_prefs_change_sort_method, NULL);
 
 	/* menus */
-	purple_prefs_connect_callback(handle, "/purple/gtk/sound/mute",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/sound/mute",
 			pidgin_blist_mute_pref_cb, NULL);
-	purple_prefs_connect_callback(handle, "/purple/gtk/sound/method",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/sound/method",
 			pidgin_blist_sound_method_pref_cb, NULL);
 
 	/* Setup some purple signal handlers. */
@@ -4729,12 +4777,12 @@
 
 	group = (PurpleGroup*)gnode;
 
-	if(purple_prefs_get_bool("/purple/gtk/blist/show_offline_buddies"))
+	if(purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies"))
 		count = purple_blist_get_group_size(group, FALSE);
 	else
 		count = purple_blist_get_group_online_count(group);
 
-	if (count > 0 || purple_prefs_get_bool("/purple/gtk/blist/show_empty_groups"))
+	if (count > 0 || purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_empty_groups"))
 		show = TRUE;
 	else if (PURPLE_BLIST_NODE_IS_BUDDY(node)){ /* Or chat? */
 		if (buddy_is_displayable((PurpleBuddy*)node))
@@ -4815,7 +4863,7 @@
 	char *idle = NULL;
 	gboolean expanded = ((struct _pidgin_blist_node *)(node->parent->ui_data))->contact_expanded;
 	gboolean selected = (gtkblist->selected_node == node);
-	gboolean biglist = purple_prefs_get_bool("/purple/gtk/blist/show_buddy_icons");
+	gboolean biglist = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons");
 	presence = purple_buddy_get_presence(buddy);
 
 	status = pidgin_blist_get_status_icon((PurpleBlistNode*)buddy,
@@ -4832,9 +4880,9 @@
 	emblem = pidgin_blist_get_emblem((PurpleBlistNode*) buddy);
 	mark = pidgin_blist_get_name_markup(buddy, selected);
 
-	if (purple_prefs_get_bool("/purple/gtk/blist/show_idle_time") &&
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time") &&
 		purple_presence_is_idle(presence) &&
-		!purple_prefs_get_bool("/purple/gtk/blist/show_buddy_icons"))
+		!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"))
 	{
 		time_t idle_secs = purple_presence_get_idle_time(presence);
 
@@ -5012,7 +5060,7 @@
 				STATUS_ICON_COLUMN, status,
 				STATUS_ICON_VISIBLE_COLUMN, TRUE,
 				BUDDY_ICON_COLUMN, avatar ? avatar : gtkblist->empty_avatar,
-				BUDDY_ICON_VISIBLE_COLUMN,  purple_prefs_get_bool("/purple/gtk/blist/show_buddy_icons"),
+				BUDDY_ICON_VISIBLE_COLUMN,  purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"),
 			        EMBLEM_COLUMN, emblem,
 				EMBLEM_VISIBLE_COLUMN, emblem != NULL,
 				NAME_COLUMN, mark,
@@ -5888,19 +5936,19 @@
 						NULL);
 
 	/* Initialize prefs */
-	purple_prefs_add_none("/purple/gtk/blist");
-	purple_prefs_add_bool("/purple/gtk/blist/show_buddy_icons", TRUE);
-	purple_prefs_add_bool("/purple/gtk/blist/show_empty_groups", FALSE);
-	purple_prefs_add_bool("/purple/gtk/blist/show_idle_time", TRUE);
-	purple_prefs_add_bool("/purple/gtk/blist/show_offline_buddies", FALSE);
-	purple_prefs_add_bool("/purple/gtk/blist/list_visible", TRUE);
-	purple_prefs_add_bool("/purple/gtk/blist/list_maximized", FALSE);
-	purple_prefs_add_string("/purple/gtk/blist/sort_type", "alphabetical");
-	purple_prefs_add_int("/purple/gtk/blist/x", 0);
-	purple_prefs_add_int("/purple/gtk/blist/y", 0);
-	purple_prefs_add_int("/purple/gtk/blist/width", 250); /* Golden ratio, baby */
-	purple_prefs_add_int("/purple/gtk/blist/height", 405); /* Golden ratio, baby */
-	purple_prefs_add_int("/purple/gtk/blist/tooltip_delay", 500);
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/blist");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons", TRUE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/show_empty_groups", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/show_idle_time", TRUE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/show_offline_buddies", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/list_visible", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/blist/list_maximized", FALSE);
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/blist/sort_type", "alphabetical");
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/blist/x", 0);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/blist/y", 0);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/blist/width", 250); /* Golden ratio, baby */
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/blist/height", 405); /* Golden ratio, baby */
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/blist/tooltip_delay", 500);
 
 	/* Register our signals */
 	purple_signal_register(gtk_blist_handle, "gtkblist-hiding",
@@ -6524,7 +6572,7 @@
 		pidgin_set_cursor(gtkblist->window, GDK_WATCH);
 		/* This is redundant. I think. */
 		/* pidgin_blist_sort_method_set(id); */
-		purple_prefs_set_string("/purple/gtk/blist/sort_type", id);
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/blist/sort_type", id);
 
 		pidgin_clear_cursor(gtkblist->window);
 	}
@@ -6538,7 +6586,7 @@
 	GList *l;
 	GSList *sl = NULL;
 	GtkWidget *sortmenu;
-	const char *m = purple_prefs_get_string("/purple/gtk/blist/sort_type");
+	const char *m = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/sort_type");
 
 	if ((gtkblist == NULL) || (gtkblist->ift == NULL))
 		return;
--- a/pidgin/gtkconv.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkconv.c	Sun Apr 15 00:15:32 2007 +0000
@@ -214,7 +214,7 @@
 static gboolean
 lbox_size_allocate_cb(GtkWidget *w, GtkAllocation *allocation, gpointer data)
 {
-	purple_prefs_set_int("/purple/gtk/conversations/chat/userlist_width", allocation->width == 1 ? 0 : allocation->width);
+	purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/chat/userlist_width", allocation->width == 1 ? 0 : allocation->width);
 
 	return FALSE;
 }
@@ -243,20 +243,20 @@
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
 	{
 		if (w == gtkconv->imhtml) {
-			purple_prefs_set_int("/purple/gtk/conversations/im/default_width", allocation->width);
-			purple_prefs_set_int("/purple/gtk/conversations/im/default_height", allocation->height);
+			purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width", allocation->width);
+			purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height", allocation->height);
 		}
 		if (w == gtkconv->lower_hbox)
-			purple_prefs_set_int("/purple/gtk/conversations/im/entry_height", allocation->height);
+			purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/im/entry_height", allocation->height);
 	}
 	else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)
 	{
 		if (w == gtkconv->imhtml) {
-			purple_prefs_set_int("/purple/gtk/conversations/chat/default_width", allocation->width);
-			purple_prefs_set_int("/purple/gtk/conversations/chat/default_height", allocation->height);
+			purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_width", allocation->width);
+			purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_height", allocation->height);
 		}
 		if (w == gtkconv->lower_hbox)
-			purple_prefs_set_int("/purple/gtk/conversations/chat/entry_height", allocation->height);
+			purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/chat/entry_height", allocation->height);
 	}
 
 	return FALSE;
@@ -272,30 +272,30 @@
 		char color[8];
 		GdkColor fg_color, bg_color;
 
-		if (purple_prefs_get_bool("/purple/gtk/conversations/send_bold") != GTK_IMHTML(c->entry)->edit.bold)
+		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold") != GTK_IMHTML(c->entry)->edit.bold)
 			gtk_imhtml_toggle_bold(GTK_IMHTML(c->entry));
 
-		if (purple_prefs_get_bool("/purple/gtk/conversations/send_italic") != GTK_IMHTML(c->entry)->edit.italic)
+		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/send_italic") != GTK_IMHTML(c->entry)->edit.italic)
 			gtk_imhtml_toggle_italic(GTK_IMHTML(c->entry));
 
-		if (purple_prefs_get_bool("/purple/gtk/conversations/send_underline") != GTK_IMHTML(c->entry)->edit.underline)
+		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/send_underline") != GTK_IMHTML(c->entry)->edit.underline)
 			gtk_imhtml_toggle_underline(GTK_IMHTML(c->entry));
 
 		gtk_imhtml_toggle_fontface(GTK_IMHTML(c->entry),
-			purple_prefs_get_string("/purple/gtk/conversations/font_face"));
+			purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/font_face"));
 
 		if (!(conv->features & PURPLE_CONNECTION_NO_FONTSIZE))
 		{
-			int size = purple_prefs_get_int("/purple/gtk/conversations/font_size");
+			int size = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/font_size");
 
 			/* 3 is the default. */
 			if (size != 3)
 				gtk_imhtml_font_set_size(GTK_IMHTML(c->entry), size);
 		}
 
-		if(strcmp(purple_prefs_get_string("/purple/gtk/conversations/fgcolor"), "") != 0)
+		if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor"), "") != 0)
 		{
-			gdk_color_parse(purple_prefs_get_string("/purple/gtk/conversations/fgcolor"),
+			gdk_color_parse(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor"),
 							&fg_color);
 			g_snprintf(color, sizeof(color), "#%02x%02x%02x",
 									fg_color.red   / 256,
@@ -307,9 +307,9 @@
 		gtk_imhtml_toggle_forecolor(GTK_IMHTML(c->entry), color);
 
 		if(!(conv->features & PURPLE_CONNECTION_NO_BGCOLOR) &&
-		   strcmp(purple_prefs_get_string("/purple/gtk/conversations/bgcolor"), "") != 0)
+		   strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor"), "") != 0)
 		{
-			gdk_color_parse(purple_prefs_get_string("/purple/gtk/conversations/bgcolor"),
+			gdk_color_parse(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor"),
 							&bg_color);
 			g_snprintf(color, sizeof(color), "#%02x%02x%02x",
 									bg_color.red   / 256,
@@ -459,10 +459,10 @@
 	PurpleConversation *conv = gtkconv->active_conv;
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)
 		gtk_widget_set_size_request(gtkconv->lower_hbox, -1,
-					    purple_prefs_get_int("/purple/gtk/conversations/chat/entry_height"));
+					    purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/entry_height"));
 	else
 		gtk_widget_set_size_request(gtkconv->lower_hbox, -1,
-					    purple_prefs_get_int("/purple/gtk/conversations/im/entry_height"));
+					    purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/entry_height"));
 }
 
 static gboolean
@@ -1356,7 +1356,7 @@
 static void
 menu_toolbar_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	purple_prefs_set_bool("/purple/gtk/conversations/show_formatting_toolbar",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar",
 	                    gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));
 }
 
@@ -1381,7 +1381,7 @@
 static void
 menu_timestamps_cb(gpointer data, guint action, GtkWidget *widget)
 {
-	purple_prefs_set_bool("/purple/gtk/conversations/show_timestamps",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps",
 		gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget)));
 }
 
@@ -3031,14 +3031,14 @@
 	win->menu.sounds =
 		gtk_item_factory_get_widget(win->menu.item_factory,
 		                            N_("/Options/Enable Sounds"));
-	method = purple_prefs_get_string("/purple/gtk/sound/method");
-	if (!strcmp(method, "none"))
+	method = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method");
+	if (method != NULL && !strcmp(method, "none"))
 	{
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds),
 		                               FALSE);
 		gtk_widget_set_sensitive(win->menu.sounds, FALSE);
 	}
-	purple_prefs_connect_callback(win, "/purple/gtk/sound/method",
+	purple_prefs_connect_callback(win, PIDGIN_PREFS_ROOT "/sound/method",
 				    sound_method_pref_changed_cb, win);
 
 	win->menu.show_formatting_toolbar =
@@ -3050,13 +3050,13 @@
 	win->menu.show_icon =
 		gtk_item_factory_get_widget(win->menu.item_factory,
 		                            N_("/Options/Show Buddy Icon"));
-	if (!purple_prefs_get_bool("/purple/gtk/conversations/im/show_buddy_icons"))
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons"))
 	{
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_icon),
 		                               FALSE);
 		gtk_widget_set_sensitive(win->menu.show_icon, FALSE);
 	}
-	purple_prefs_connect_callback(win, "/purple/gtk/conversations/im/show_buddy_icons",
+	purple_prefs_connect_callback(win, PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons",
 				    show_buddy_icons_pref_changed_cb, win);
 
 	win->menu.tray = pidgin_menu_tray_new();
@@ -4192,8 +4192,8 @@
 	                               imhtml_sw_hscroll, GTK_POLICY_ALWAYS);
 
 	gtk_widget_set_size_request(gtkconv->imhtml,
-			purple_prefs_get_int("/purple/gtk/conversations/chat/default_width"),
-			purple_prefs_get_int("/purple/gtk/conversations/chat/default_height"));
+			purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_width"),
+			purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_height"));
 	g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate",
 					 G_CALLBACK(size_allocate_cb), gtkconv);
 
@@ -4237,7 +4237,7 @@
 	gtk_tree_view_column_set_sizing(col, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
 	gtk_tree_view_append_column(GTK_TREE_VIEW(list), col);
 	gtk_widget_set_size_request(lbox,
-	                            purple_prefs_get_int("/purple/gtk/conversations/chat/userlist_width"), -1);
+	                            purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/userlist_width"), -1);
 
 	g_signal_connect(G_OBJECT(list), "button_press_event",
 					 G_CALLBACK(right_click_chat_cb), gtkconv);
@@ -4304,7 +4304,7 @@
 	gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry),
 								 purple_account_get_protocol_name(conv->account));
 	gtk_widget_set_size_request(gtkconv->lower_hbox, -1,
-			purple_prefs_get_int("/purple/gtk/conversations/chat/entry_height"));
+			purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/chat/entry_height"));
 	gtkconv->entry_buffer =
 		gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));
 	g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", gtkconv);
@@ -4366,8 +4366,8 @@
 	                               imhtml_sw_hscroll, GTK_POLICY_ALWAYS);
 
 	gtk_widget_set_size_request(gtkconv->imhtml,
-			purple_prefs_get_int("/purple/gtk/conversations/im/default_width"),
-			purple_prefs_get_int("/purple/gtk/conversations/im/default_height"));
+			purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width"),
+			purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height"));
 	g_signal_connect(G_OBJECT(gtkconv->imhtml), "size-allocate",
 	                 G_CALLBACK(size_allocate_cb), gtkconv);
 
@@ -4403,7 +4403,7 @@
 	gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->entry),
 								 purple_account_get_protocol_name(conv->account));
 	gtk_widget_set_size_request(gtkconv->lower_hbox, -1,
-			purple_prefs_get_int("/purple/gtk/conversations/im/entry_height"));
+			purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/im/entry_height"));
 	gtkconv->entry_buffer =
 		gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->entry));
 	g_object_set_data(G_OBJECT(gtkconv->entry_buffer), "user_data", gtkconv);
@@ -4432,7 +4432,7 @@
 	g_signal_connect_after(G_OBJECT(gtkconv->entry), "format_function_clear",
 						   G_CALLBACK(clear_formatting_cb), gtkconv);
 
-	gtkconv->u.im->animate = purple_prefs_get_bool("/purple/gtk/conversations/im/animate_buddy_icons");
+	gtkconv->u.im->animate = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons");
 	gtkconv->u.im->show_icon = TRUE;
 
 	/*
@@ -4682,13 +4682,13 @@
 
 	gtkconv->make_sound = TRUE;
 
-	if (purple_prefs_get_bool("/purple/gtk/conversations/show_formatting_toolbar"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar"))
 		gtk_widget_show(gtkconv->toolbar);
 	else
 		gtk_widget_hide(gtkconv->toolbar);
 
 	gtk_imhtml_show_comments(GTK_IMHTML(gtkconv->imhtml),
-		purple_prefs_get_bool("/purple/gtk/conversations/show_timestamps"));
+		purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps"));
 	gtk_imhtml_set_protocol_name(GTK_IMHTML(gtkconv->imhtml),
 								 purple_account_get_protocol_name(conv->account));
 
@@ -4728,7 +4728,7 @@
 		return;
 
 	/* create hidden conv if hide_new pref is always */
-	if (strcmp(purple_prefs_get_string("/purple/gtk/conversations/im/hide_new"), "always") == 0)
+	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always") == 0)
 	{
 		ui_ops->create_conversation = pidgin_conv_new_hidden;
 		purple_conversation_new(PURPLE_CONV_TYPE_IM, account, sender);
@@ -4737,7 +4737,7 @@
 	}
 
 	/* create hidden conv if hide_new pref is away and account is away */
-	if (strcmp(purple_prefs_get_string("/purple/gtk/conversations/im/hide_new"), "away") == 0 &&
+	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away") == 0 &&
 	    !purple_status_is_available(purple_account_get_active_status(account)))
 	{
 		ui_ops->create_conversation = pidgin_conv_new_hidden;
@@ -4895,6 +4895,72 @@
 	gtkconv->newday = mktime(tm);
 }
 
+/* Detect string direction and encapsulate the string in RLE/LRE/PDF unicode characters 
+   str - pointer to string (string is re-allocated and the pointer updated) */
+static void
+str_embed_direction_chars(char **str)
+{
+	char pre_str[4];
+	char post_str[10];
+	char *ret = g_malloc(strlen(*str)+13);
+
+	if (PANGO_DIRECTION_RTL == pango_find_base_dir(*str, -1))
+	{
+		g_sprintf(pre_str, "%c%c%c", 
+				0xE2, 0x80, 0xAB);	/* RLE */
+		g_sprintf(post_str, "%c%c%c%c%c%c%c%c%c", 
+				0xE2, 0x80, 0xAC,	/* PDF */
+				0xE2, 0x80, 0x8E,	/* LRM */
+				0xE2, 0x80, 0xAC);	/* PDF */
+	}
+	else
+	{
+		g_sprintf(pre_str, "%c%c%c", 
+				0xE2, 0x80, 0xAA);	/* LRE */
+		g_sprintf(post_str, "%c%c%c%c%c%c%c%c%c", 
+				0xE2, 0x80, 0xAC,	/* PDF */
+				0xE2, 0x80, 0x8F,	/* RLM */
+				0xE2, 0x80, 0xAC);	/* PDF */
+	}
+
+	g_sprintf(ret, "%s%s%s", pre_str, *str, post_str);
+
+	g_free(*str);
+	*str = ret;
+}
+
+/* Returns true if the given HTML contains RTL text */
+static gboolean 
+html_is_rtl(const char *html)
+{
+	GData *attributes;
+	const gchar *start, *end;
+	gboolean res = FALSE;
+
+	if (purple_markup_find_tag("span", html, &start, &end, &attributes)) 
+	{
+		/* tmp is a member of attributes and is free with g_datalist_clear call */
+		const char *tmp = g_datalist_get_data(&attributes, "dir");
+		if (tmp && !g_ascii_strcasecmp(tmp, "RTL"))
+			res = TRUE;
+		if (!res)
+		{
+			tmp = g_datalist_get_data(&attributes, "style");
+			if (tmp)
+			{
+				char *tmp2 = purple_markup_get_css_property(tmp, "direction");
+				if (tmp2 && !g_ascii_strcasecmp(tmp2, "RTL"))
+					res = TRUE;
+				g_free(tmp2);
+			}
+
+		}
+		g_datalist_clear(&attributes);
+	}
+	return res;
+}
+
+
 static void
 pidgin_conv_write_conv(PurpleConversation *conv, const char *name, const char *alias,
 						const char *message, PurpleMessageFlags flags,
@@ -4922,6 +4988,7 @@
 	gboolean plugin_return;
 	char *bracket;
 	int tag_count = 0;
+	gboolean is_rtl_message = FALSE;
 
 	g_return_if_fail(conv != NULL);
 	gtkconv = PIDGIN_CONVERSATION(conv);
@@ -4986,7 +5053,7 @@
 				gtkconv->imhtml)));
 
 	max_scrollback_lines = purple_prefs_get_int(
-		"/purple/gtk/conversations/scrollback_lines");
+		PIDGIN_PREFS_ROOT "/conversations/scrollback_lines");
 	/* If we're sitting at more than 100 lines more than the
 	   max scrollback, trim down to max scrollback */
 	if (max_scrollback_lines > 0
@@ -5013,7 +5080,7 @@
 		g_free(tmp);
 	}
 
-	if (purple_prefs_get_bool("/purple/gtk/conversations/use_smooth_scrolling"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling"))
 		gtk_font_options_all |= GTK_IMHTML_USE_SMOOTHSCROLLING;
 
 	if (gtk_text_buffer_get_char_count(gtk_text_view_get_buffer(GTK_TEXT_VIEW(gtkconv->imhtml))))
@@ -5034,11 +5101,19 @@
 	if (mdate == NULL)
 	{
 		struct tm *tm = localtime(&mtime);
+		const char *tmp;
 		if (show_date)
-			mdate = g_strdup(purple_date_format_long(tm));
+			tmp = purple_date_format_long(tm);
 		else
-			mdate = g_strdup(purple_time_format(tm));
-	}
+			tmp = purple_time_format(tm);
+		mdate = g_strdup_printf("(%s)", tmp);
+	}
+
+	/* Bi-Directional support - set timestamp direction using unicode characters */
+	is_rtl_message = html_is_rtl(message);
+	/* Enforce direction only if message is RTL - doesn't effect LTR users */
+	if (is_rtl_message)
+		str_embed_direction_chars(&mdate);
 
 	if (mtime >= gtkconv->newday)
 		pidgin_conv_calculate_newday(gtkconv, mtime);
@@ -5048,7 +5123,7 @@
 	gtk_font_options |= GTK_IMHTML_NO_COMMENTS;
 
 	if ((flags & PURPLE_MESSAGE_RECV) &&
-			!purple_prefs_get_bool("/purple/gtk/conversations/show_incoming_formatting"))
+			!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting"))
 		gtk_font_options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES | GTK_IMHTML_NO_FORMATTING;
 
 	/* this is gonna crash one day, I can feel it. */
@@ -5063,14 +5138,14 @@
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), message, gtk_font_options_all);
 	} else if (flags & PURPLE_MESSAGE_SYSTEM) {
 		g_snprintf(buf2, sizeof(buf2),
-			   "<FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT>",
+			   "<FONT %s><FONT SIZE=\"2\"><!--%s --></FONT><B>%s</B></FONT>",
 			   sml_attrib ? sml_attrib : "", mdate, displaying);
 
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all);
 
 	} else if (flags & PURPLE_MESSAGE_ERROR) {
 		g_snprintf(buf2, sizeof(buf2),
-			   "<FONT COLOR=\"#ff0000\"><FONT %s><FONT SIZE=\"2\"><!--(%s) --></FONT><B>%s</B></FONT></FONT>",
+			   "<FONT COLOR=\"#ff0000\"><FONT %s><FONT SIZE=\"2\"><!--%s --></FONT><B>%s</B></FONT></FONT>",
 			   sml_attrib ? sml_attrib : "", mdate, displaying);
 
 		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all);
@@ -5091,6 +5166,10 @@
 		GtkSmileyTree *tree = NULL;
 		GHashTable *smiley_data = NULL;
 
+		/* Enforce direction on alias */
+		if (is_rtl_message)
+			str_embed_direction_chars(&alias_escaped);
+
 		if (flags & PURPLE_MESSAGE_SEND)
 		{
 			/* Temporarily revert to the original smiley-data to avoid showing up
@@ -5178,12 +5257,12 @@
 			    flags & PURPLE_MESSAGE_NICK ||
 			    purple_find_buddy(account, name) != NULL) {
 				g_snprintf(buf2, BUF_LONG,
-					   "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\"><!--(%s) --></FONT>"
+					   "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\"><!--%s --></FONT>"
 					   "<B>%s</B></FONT> ",
 					   color, sml_attrib ? sml_attrib : "", mdate, str);
 			} else {
 				g_snprintf(buf2, BUF_LONG,
-					   "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\"><!--(%s) --></FONT>"
+					   "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\"><!--%s --></FONT>"
 					   "%s</FONT> ",
 					   color, sml_attrib ? sml_attrib : "", mdate, str);
 
@@ -5191,7 +5270,7 @@
 		} else {
 			/* Bold everyone's name to make the name stand out from the message. */
 			g_snprintf(buf2, BUF_LONG,
-				   "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\"><!--(%s) --></FONT>"
+				   "<FONT COLOR=\"%s\" %s><FONT SIZE=\"2\"><!--%s --></FONT>"
 				   "<B>%s</B></FONT> ",
 				   color, sml_attrib ? sml_attrib : "", mdate, str);
 		}
@@ -6166,7 +6245,7 @@
 
 	gtkconv->u.im->iter = NULL;
 
-	if (!purple_prefs_get_bool("/purple/gtk/conversations/im/show_buddy_icons"))
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons"))
 		return;
 
 	if (purple_conversation_get_gc(conv) == NULL)
@@ -6496,7 +6575,7 @@
 	PidginConversation *gtkconv;
 	PidginWindow *win;
 
-	if (!purple_prefs_get_bool("/purple/gtk/conversations/im/show_buddy_icons"))
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons"))
 		return;
 
 	/* Set the "animate" flag for each icon based on the new preference */
@@ -6532,7 +6611,7 @@
 conv_placement_usetabs_cb(const char *name, PurplePrefType type,
 						  gconstpointer value, gpointer data)
 {
-	purple_prefs_trigger_callback("/purple/gtk/conversations/placement");
+	purple_prefs_trigger_callback(PIDGIN_PREFS_ROOT "/conversations/placement");
 }
 
 static void
@@ -6543,7 +6622,7 @@
 	PurpleConversation *conv = NULL;
 	PidginConversation *gtkconv;
 
-	if(strcmp(purple_prefs_get_string("/purple/gtk/conversations/im/hide_new"), "away")!=0)
+	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")!=0)
 		return;
 
 	if(purple_status_is_available(oldstatus) || !purple_status_is_available(newstatus))
@@ -6583,10 +6662,10 @@
 	if(!hidden_convwin)
 		return;
 
-	if(strcmp(purple_prefs_get_string("/purple/gtk/conversations/im/hide_new"), "always")==0)
+	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "always")==0)
 		return;
 
-	if(strcmp(purple_prefs_get_string("/purple/gtk/conversations/im/hide_new"), "away")==0)
+	if(strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new"), "away")==0)
 		when_away = TRUE;
 
 	while ((l = hidden_convwin->gtkconvs) != NULL)
@@ -6612,7 +6691,7 @@
 {
 	PidginConvPlacementFunc func;
 
-	if (strcmp(name, "/purple/gtk/conversations/placement"))
+	if (strcmp(name, PIDGIN_PREFS_ROOT "/conversations/placement"))
 		return;
 
 	func = pidgin_conv_placement_get_fnc(value);
@@ -6793,71 +6872,71 @@
 	void *blist_handle = purple_blist_get_handle();
 
 	/* Conversations */
-	purple_prefs_add_none("/purple/gtk/conversations");
-	purple_prefs_add_bool("/purple/gtk/conversations/use_smooth_scrolling", TRUE);
-	purple_prefs_add_bool("/purple/gtk/conversations/close_on_tabs", TRUE);
-	purple_prefs_add_bool("/purple/gtk/conversations/send_bold", FALSE);
-	purple_prefs_add_bool("/purple/gtk/conversations/send_italic", FALSE);
-	purple_prefs_add_bool("/purple/gtk/conversations/send_underline", FALSE);
-	purple_prefs_add_bool("/purple/gtk/conversations/spellcheck", TRUE);
-	purple_prefs_add_bool("/purple/gtk/conversations/show_incoming_formatting", TRUE);
-
-	purple_prefs_add_bool("/purple/gtk/conversations/show_timestamps", TRUE);
-	purple_prefs_add_bool("/purple/gtk/conversations/show_formatting_toolbar", TRUE);
-
-	purple_prefs_add_string("/purple/gtk/conversations/placement", "last");
-	purple_prefs_add_int("/purple/gtk/conversations/placement_number", 1);
-	purple_prefs_add_string("/purple/gtk/conversations/bgcolor", "");
-	purple_prefs_add_string("/purple/gtk/conversations/fgcolor", "");
-	purple_prefs_add_string("/purple/gtk/conversations/font_face", "");
-	purple_prefs_add_int("/purple/gtk/conversations/font_size", 3);
-	purple_prefs_add_bool("/purple/gtk/conversations/tabs", TRUE);
-	purple_prefs_add_int("/purple/gtk/conversations/tab_side", GTK_POS_TOP);
-	purple_prefs_add_int("/purple/gtk/conversations/scrollback_lines", 4000);
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", TRUE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs", TRUE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/send_italic", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/send_underline", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck", TRUE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", TRUE);
+
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps", TRUE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar", TRUE);
+
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/placement", "last");
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/placement_number", 1);
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor", "");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor", "");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/font_face", "");
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/font_size", 3);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/tabs", TRUE);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/tab_side", GTK_POS_TOP);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/scrollback_lines", 4000);
 
 	/* Conversations -> Chat */
-	purple_prefs_add_none("/purple/gtk/conversations/chat");
-	purple_prefs_add_int("/purple/gtk/conversations/chat/default_width", 410);
-	purple_prefs_add_int("/purple/gtk/conversations/chat/default_height", 160);
-	purple_prefs_add_int("/purple/gtk/conversations/chat/entry_height", 50);
-	purple_prefs_add_int("/purple/gtk/conversations/chat/userlist_width", 80);
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations/chat");
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_width", 410);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/chat/default_height", 160);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/chat/entry_height", 50);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/chat/userlist_width", 80);
 	/* Conversations -> IM */
-	purple_prefs_add_none("/purple/gtk/conversations/im");
-
-	purple_prefs_add_bool("/purple/gtk/conversations/im/animate_buddy_icons", TRUE);
-
-	purple_prefs_add_int("/purple/gtk/conversations/im/default_width", 410);
-	purple_prefs_add_int("/purple/gtk/conversations/im/default_height", 160);
-	purple_prefs_add_int("/purple/gtk/conversations/im/entry_height", 50);
-	purple_prefs_add_bool("/purple/gtk/conversations/im/show_buddy_icons", TRUE);
-
-	purple_prefs_add_string("/purple/gtk/conversations/im/hide_new", "never");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/conversations/im");
+
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons", TRUE);
+
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/im/default_width", 410);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/im/default_height", 160);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/conversations/im/entry_height", 50);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", TRUE);
+
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "never");
 
 	/* Connect callbacks. */
-	purple_prefs_connect_callback(handle, "/purple/gtk/conversations/close_on_tabs",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/close_on_tabs",
 								close_on_tabs_pref_cb, NULL);
-	purple_prefs_connect_callback(handle, "/purple/gtk/conversations/show_timestamps",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/show_timestamps",
 								show_timestamps_pref_cb, NULL);
-	purple_prefs_connect_callback(handle, "/purple/gtk/conversations/show_formatting_toolbar",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar",
 								show_formatting_toolbar_pref_cb, NULL);
-	purple_prefs_connect_callback(handle, "/purple/gtk/conversations/spellcheck",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/spellcheck",
 								spellcheck_pref_cb, NULL);
-	purple_prefs_connect_callback(handle, "/purple/gtk/conversations/tab_side",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/tab_side",
 								tab_side_pref_cb, NULL);
 
-	purple_prefs_connect_callback(handle, "/purple/gtk/conversations/tabs",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/tabs",
 								conv_placement_usetabs_cb, NULL);
 
-	purple_prefs_connect_callback(handle, "/purple/gtk/conversations/placement",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/placement",
 								conv_placement_pref_cb, NULL);
-	purple_prefs_trigger_callback("/purple/gtk/conversations/placement");
+	purple_prefs_trigger_callback(PIDGIN_PREFS_ROOT "/conversations/placement");
 
 	/* IM callbacks */
-	purple_prefs_connect_callback(handle, "/purple/gtk/conversations/im/animate_buddy_icons",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons",
 								animate_buddy_icons_pref_cb, NULL);
-	purple_prefs_connect_callback(handle, "/purple/gtk/conversations/im/show_buddy_icons",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons",
 								show_buddy_icons_pref_cb, NULL);
-	purple_prefs_connect_callback(handle, "/purple/gtk/conversations/im/hide_new",
+	purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/conversations/im/hide_new",
                                 hide_new_pref_cb, NULL);
 
 
@@ -7745,19 +7824,19 @@
 
 	pidgin_conv_switch_active_conversation(conv);
 
-	sound_method = purple_prefs_get_string("/purple/gtk/sound/method");
+	sound_method = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method");
 	if (strcmp(sound_method, "none") != 0)
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.sounds),
 		                               gtkconv->make_sound);
 
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_formatting_toolbar),
-	                               purple_prefs_get_bool("/purple/gtk/conversations/show_formatting_toolbar"));
+	                               purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_formatting_toolbar"));
 
 	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_timestamps),
-	                               purple_prefs_get_bool("/purple/gtk/conversations/show_timestamps"));
+	                               purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_timestamps"));
 
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM &&
-	    purple_prefs_get_bool("/purple/gtk/conversations/im/show_buddy_icons"))
+	    purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons"))
 	{
 		gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(win->menu.show_icon),
 		                               gtkconv->u.im->show_icon);
@@ -7844,7 +7923,7 @@
 	/* Create the notebook. */
 	win->notebook = gtk_notebook_new();
 
-	pos = purple_prefs_get_int("/purple/gtk/conversations/tab_side");
+	pos = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side");
 
 #if 0
 	gtk_notebook_set_tab_hborder(GTK_NOTEBOOK(win->notebook), 0);
@@ -7975,12 +8054,12 @@
 	win->gtkconvs = g_list_append(win->gtkconvs, gtkconv);
 	gtkconv->win = win;
 
-	if (purple_prefs_get_int("/purple/gtk/conversations/tab_side") == GTK_POS_LEFT ||
-	    purple_prefs_get_int("/purple/gtk/conversations/tab_side") == GTK_POS_RIGHT)
+	if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_LEFT ||
+	    purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == GTK_POS_RIGHT)
 		tabs_side = TRUE;
-	else if (purple_prefs_get_int("/purple/gtk/conversations/tab_side") == (GTK_POS_LEFT|8))
+	else if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == (GTK_POS_LEFT|8))
 		angle = 90;
-	else if (purple_prefs_get_int("/purple/gtk/conversations/tab_side") == (GTK_POS_RIGHT|8))
+	else if (purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/tab_side") == (GTK_POS_RIGHT|8))
 		angle = 270;
 
 	if (angle)
@@ -8069,7 +8148,7 @@
 		gtk_box_pack_start(GTK_BOX(tabby), gtkconv->icon, FALSE, FALSE, 0);
 	else
 		gtk_box_pack_start(GTK_BOX(tabby), gtkconv->close, FALSE, FALSE, 0);
-	if (purple_prefs_get_bool("/purple/gtk/conversations/close_on_tabs"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/close_on_tabs"))
 		gtk_widget_show(gtkconv->close);
 
 	gtk_widget_show(tabby);
@@ -8090,7 +8169,7 @@
 		gtk_notebook_set_current_page(GTK_NOTEBOOK(win->notebook), 0);
 
 		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
-		                           purple_prefs_get_bool("/purple/gtk/conversations/tabs"));
+		                           purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs"));
 	} else
 		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook), TRUE);
 
@@ -8119,7 +8198,7 @@
 	/* go back to tabless if need be */
 	if (pidgin_conv_window_get_gtkconv_count(win) <= 2) {
 		gtk_notebook_set_show_tabs(GTK_NOTEBOOK(win->notebook),
-		                           purple_prefs_get_bool("/purple/gtk/conversations/tabs"));
+		                           purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs"));
 	}
 
 	win->gtkconvs = g_list_remove(win->gtkconvs, gtkconv);
@@ -8568,7 +8647,7 @@
 	g_return_if_fail(func != NULL);
 
 	/* If tabs are enabled, set the function, otherwise, NULL it out. */
-	if (purple_prefs_get_bool("/purple/gtk/conversations/tabs"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs"))
 		place_conv = func;
 	else
 		place_conv = NULL;
--- a/pidgin/gtkdebug.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkdebug.c	Sun Apr 15 00:15:32 2007 +0000
@@ -96,7 +96,7 @@
 		g_source_remove(debug_win->timer);
 
 		text = gtk_entry_get_text(GTK_ENTRY(debug_win->expression));
-		purple_prefs_set_string("/purple/gtk/debug/regex", text);
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/debug/regex", text);
 	}
 
 	regfree(&debug_win->regex);
@@ -108,7 +108,7 @@
 	g_free(debug_win);
 	debug_win = NULL;
 
-	purple_prefs_set_bool("/purple/gtk/debug/enabled", FALSE);
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/debug/enabled", FALSE);
 
 	return FALSE;
 }
@@ -117,8 +117,8 @@
 configure_cb(GtkWidget *w, GdkEventConfigure *event, DebugWindow *win)
 {
 	if (GTK_WIDGET_VISIBLE(w)) {
-		purple_prefs_set_int("/purple/gtk/debug/width",  event->width);
-		purple_prefs_set_int("/purple/gtk/debug/height", event->height);
+		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/debug/width",  event->width);
+		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/debug/height", event->height);
 	}
 
 	return FALSE;
@@ -384,7 +384,7 @@
 
 	gtk_tree_model_get(m, iter, 0, &text, 1, &level, -1);
 
-	if (level >= purple_prefs_get_int("/purple/gtk/debug/filterlevel"))
+	if (level >= purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel"))
 		regex_match(win, text);
 
 	g_free(text);
@@ -412,7 +412,7 @@
 	PurpleDebugLevel level;
 
 	gtk_tree_model_get(m, iter, 0, &text, 1, &level, -1);
-	if (level >= purple_prefs_get_int("/purple/gtk/debug/filterlevel"))
+	if (level >= purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel"))
 		gtk_imhtml_append_text(GTK_IMHTML(win->text), text, 0);
 	g_free(text);
 
@@ -533,7 +533,7 @@
 
 	gtk_tree_model_get(model, iter, 0, &text, 1, &level, -1);
 
-	if (level >= purple_prefs_get_int("/purple/gtk/debug/filterlevel")) {
+	if (level >= purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel")) {
 		if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win->filter))) {
 			regex_match(win, text);
 		} else {
@@ -549,7 +549,7 @@
 	const gchar *text;
 
 	text = gtk_entry_get_text(GTK_ENTRY(win->expression));
-	purple_prefs_set_string("/purple/gtk/debug/regex", text);
+	purple_prefs_set_string(PIDGIN_PREFS_ROOT "/debug/regex", text);
 
 	win->timer = 0;
 
@@ -593,10 +593,10 @@
 	pidgin_separator(menu);
 	pidgin_new_check_item(menu, _("Invert"),
 						G_CALLBACK(regex_menu_cb),
-						"/purple/gtk/debug/invert", win->invert);
+						PIDGIN_PREFS_ROOT "/debug/invert", win->invert);
 	pidgin_new_check_item(menu, _("Highlight matches"),
 						G_CALLBACK(regex_menu_cb),
-						"/purple/gtk/debug/highlight", win->highlight);
+						PIDGIN_PREFS_ROOT "/debug/highlight", win->highlight);
 }
 
 static void
@@ -605,7 +605,7 @@
 
 	active = gtk_toggle_button_get_active(button);
 
-	purple_prefs_set_bool("/purple/gtk/debug/filter", active);
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/debug/filter", active);
 
 	if(!GTK_IS_IMHTML(win->text))
 		return;
@@ -633,7 +633,7 @@
 static void
 filter_level_changed_cb(GtkWidget *combo, gpointer null)
 {
-	purple_prefs_set_int("/purple/gtk/debug/filterlevel",
+	purple_prefs_set_int(PIDGIN_PREFS_ROOT "/debug/filterlevel",
 				gtk_combo_box_get_active(GTK_COMBO_BOX(combo)));
 }
 
@@ -647,7 +647,7 @@
 toolbar_icon_pref_changed(GtkWidget *item, GtkWidget *toolbar)
 {
 	int style = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(item), "user_data"));
-	purple_prefs_set_int("/purple/gtk/debug/style", style);
+	purple_prefs_set_int(PIDGIN_PREFS_ROOT "/debug/style", style);
 }
 
 static gboolean
@@ -671,7 +671,7 @@
 		item = gtk_check_menu_item_new_with_mnemonic(text[i]);
 		g_object_set_data(G_OBJECT(item), "user_data", GINT_TO_POINTER(value[i]));
 		g_signal_connect(G_OBJECT(item), "activate", G_CALLBACK(toolbar_icon_pref_changed), toolbar);
-		if (value[i] == purple_prefs_get_int("/purple/gtk/debug/style"))
+		if (value[i] == purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/style"))
 			gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), TRUE);
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
 	}
@@ -696,8 +696,8 @@
 
 	win = g_new0(DebugWindow, 1);
 
-	width  = purple_prefs_get_int("/purple/gtk/debug/width");
-	height = purple_prefs_get_int("/purple/gtk/debug/height");
+	width  = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/width");
+	height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/height");
 
 	PIDGIN_DIALOG(win->window);
 	purple_debug_info("gtkdebug", "Setting dimensions to %d, %d\n",
@@ -732,7 +732,7 @@
 	vbox = gtk_vbox_new(FALSE, 0);
 	gtk_container_add(GTK_CONTAINER(win->window), vbox);
 
-	if (purple_prefs_get_bool("/purple/gtk/debug/toolbar")) {
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/toolbar")) {
 		/* Setup our top button bar thingie. */
 		toolbar = gtk_toolbar_new();
 		gtk_toolbar_set_tooltips(GTK_TOOLBAR(toolbar), TRUE);
@@ -742,8 +742,8 @@
 		g_signal_connect(G_OBJECT(toolbar), "button-press-event", G_CALLBACK(toolbar_context), win);
 
 		gtk_toolbar_set_style(GTK_TOOLBAR(toolbar),
-		                      purple_prefs_get_int("/purple/gtk/debug/style"));
-		purple_prefs_connect_callback(handle, "/purple/gtk/debug/style",
+		                      purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/style"));
+		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/style",
 	                                toolbar_style_pref_changed_cb, toolbar);
 		gtk_toolbar_set_icon_size(GTK_TOOLBAR(toolbar),
 		                          GTK_ICON_SIZE_SMALL_TOOLBAR);
@@ -810,8 +810,8 @@
 		 */
 		gtk_widget_set_sensitive(win->filter, FALSE);
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win->filter),
-									 purple_prefs_get_bool("/purple/gtk/debug/filter"));
-		purple_prefs_connect_callback(handle, "/purple/gtk/debug/filter",
+									 purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/filter"));
+		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/filter",
 									regex_pref_filter_cb, win);
 
 		/* regex entry */
@@ -826,21 +826,21 @@
 		g_signal_connect(G_OBJECT(win->expression), "changed",
 						 G_CALLBACK(regex_changed_cb), win);
 		gtk_entry_set_text(GTK_ENTRY(win->expression),
-						   purple_prefs_get_string("/purple/gtk/debug/regex"));
+						   purple_prefs_get_string(PIDGIN_PREFS_ROOT "/debug/regex"));
 		g_signal_connect(G_OBJECT(win->expression), "populate-popup",
 						 G_CALLBACK(regex_popup_cb), win);
 		g_signal_connect(G_OBJECT(win->expression), "key-release-event",
 						 G_CALLBACK(regex_key_release_cb), win);
-		purple_prefs_connect_callback(handle, "/purple/gtk/debug/regex",
+		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/regex",
 									regex_pref_expression_cb, win);
 
 		/* connect the rest of our pref callbacks */
-		win->invert = purple_prefs_get_bool("/purple/gtk/debug/invert");
-		purple_prefs_connect_callback(handle, "/purple/gtk/debug/invert",
+		win->invert = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/invert");
+		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/invert",
 									regex_pref_invert_cb, win);
 
-		win->highlight = purple_prefs_get_bool("/purple/gtk/debug/highlight");
-		purple_prefs_connect_callback(handle, "/purple/gtk/debug/highlight",
+		win->highlight = purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/highlight");
+		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/highlight",
 									regex_pref_highlight_cb, win);
 
 #endif /* HAVE_REGEX_H */
@@ -864,9 +864,9 @@
 		gtk_combo_box_append_text(GTK_COMBO_BOX(win->filterlevel), _("Error "));
 		gtk_combo_box_append_text(GTK_COMBO_BOX(win->filterlevel), _("Fatal Error"));
 		gtk_combo_box_set_active(GTK_COMBO_BOX(win->filterlevel),
-					purple_prefs_get_int("/purple/gtk/debug/filterlevel"));
+					purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel"));
 #ifdef HAVE_REGEX_H
-		purple_prefs_connect_callback(handle, "/purple/gtk/debug/filterlevel",
+		purple_prefs_connect_callback(handle, PIDGIN_PREFS_ROOT "/debug/filterlevel",
 						filter_level_pref_changed, win);
 #endif
 		g_signal_connect(G_OBJECT(win->filterlevel), "changed",
@@ -966,26 +966,26 @@
 	 *       configure event, which overrides the width and height! :P
 	 */
 
-	purple_prefs_add_none("/purple/gtk/debug");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/debug");
 
 	/* Controls printing to the debug window */
-	purple_prefs_add_bool("/purple/gtk/debug/enabled", FALSE);
-	purple_prefs_add_int("/purple/gtk/debug/filterlevel", PURPLE_DEBUG_ALL);
-	purple_prefs_add_int("/purple/gtk/debug/style", GTK_TOOLBAR_BOTH_HORIZ);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/enabled", FALSE);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/debug/filterlevel", PURPLE_DEBUG_ALL);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/debug/style", GTK_TOOLBAR_BOTH_HORIZ);
 
-	purple_prefs_add_bool("/purple/gtk/debug/toolbar", TRUE);
-	purple_prefs_add_int("/purple/gtk/debug/width",  450);
-	purple_prefs_add_int("/purple/gtk/debug/height", 250);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/toolbar", TRUE);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/debug/width",  450);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/debug/height", 250);
 
 #ifdef HAVE_REGEX_H
-	purple_prefs_add_string("/purple/gtk/debug/regex", "");
-	purple_prefs_add_bool("/purple/gtk/debug/filter", FALSE);
-	purple_prefs_add_bool("/purple/gtk/debug/invert", FALSE);
-	purple_prefs_add_bool("/purple/gtk/debug/case_insensitive", FALSE);
-	purple_prefs_add_bool("/purple/gtk/debug/highlight", FALSE);
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/debug/regex", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/filter", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/invert", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/case_insensitive", FALSE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/debug/highlight", FALSE);
 #endif /* HAVE_REGEX_H */
 
-	purple_prefs_connect_callback(NULL, "/purple/gtk/debug/enabled",
+	purple_prefs_connect_callback(NULL, PIDGIN_PREFS_ROOT "/debug/enabled",
 								debug_enabled_cb, NULL);
 
 #define REGISTER_G_LOG_HANDLER(name) \
@@ -1023,7 +1023,7 @@
 
 	gtk_widget_show(debug_win->window);
 
-	purple_prefs_set_bool("/purple/gtk/debug/enabled", TRUE);
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/debug/enabled", TRUE);
 }
 
 void
@@ -1047,7 +1047,7 @@
 	gchar *esc_s, *cat_s, *tmp, *s;
 
 	if (debug_win == NULL ||
-		!purple_prefs_get_bool("/purple/gtk/debug/enabled"))
+		!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"))
 	{
 		return;
 	}
@@ -1097,7 +1097,7 @@
 	gtk_list_store_append(debug_win->store, &iter);
 	gtk_list_store_set(debug_win->store, &iter, 0, s, 1, level, -1);
 #else /* HAVE_REGEX_H */
-	if(!debug_win->paused && level >= purple_prefs_get_int("/purple/gtk/debug/filterlevel"))
+	if(!debug_win->paused && level >= purple_prefs_get_int(PIDGIN_PREFS_ROOT "/debug/filterlevel"))
 		gtk_imhtml_append_text(GTK_IMHTML(debug_win->text), s, 0);
 #endif /* !HAVE_REGEX_H */
 
@@ -1108,7 +1108,7 @@
 pidgin_debug_is_enabled(PurpleDebugLevel level, const char *category)
 {
 	return (debug_win != NULL &&
-			purple_prefs_get_bool("/purple/gtk/debug/enabled"));
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"));
 }
 
 static PurpleDebugUiOps ops =
--- a/pidgin/gtkdialogs.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkdialogs.c	Sun Apr 15 00:15:32 2007 +0000
@@ -77,6 +77,7 @@
 	{"Christian 'ChipX86' Hammond",	N_("developer & webmaster"), NULL},
 	{"Gary 'grim' Kramlich",		N_("developer"), NULL},
 	{"Richard 'rlaager' Laager",	N_("developer"), NULL},
+	{"Richard 'wabz' Nelson",		N_("developer"), NULL},
 	{"Christopher 'siege' O'Brien", N_("developer"), "taliesein@users.sf.net"},
 	{"Bartosz Oler",		N_("developer"), NULL},
 	{"Etan 'deryni' Reisner",       N_("developer"), NULL},
@@ -493,12 +494,6 @@
 #else
 	g_string_append(str, "  <b>Print debugging messages:</b> No<br/>");
 #endif
-
-#ifdef ENABLE_BINRELOC
-	g_string_append(str, "  <b>Binary relocation:</b> Enabled<br/>");
-#else
-	g_string_append(str, "  <b>Binary relocation:</b> Disabled<br/>");
-#endif
 #endif
 
 #ifdef PURPLE_PLUGINS
--- a/pidgin/gtkdocklet.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkdocklet.c	Sun Apr 15 00:15:32 2007 +0000
@@ -121,7 +121,7 @@
 	/* determine if any ims have unseen messages */
 	convs = get_pending_list(DOCKLET_TOOLTIP_LINE_LIMIT);
 
-	if (!strcmp(purple_prefs_get_string("/purple/gtk/docklet/show"), "pending")) {
+	if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "pending")) {
 		if (convs && ui_ops->create && !visible) {
 			g_list_free(convs);
 			ui_ops->create();
@@ -168,7 +168,7 @@
 		g_list_free(convs);
 
 	} else if (ui_ops->set_tooltip) {
-		ui_ops->set_tooltip(NULL);
+		ui_ops->set_tooltip(PIDGIN_NAME);
 	}
 
 	for(l = purple_accounts_get_all(); l != NULL; l = l->next) {
@@ -212,7 +212,7 @@
 			ui_ops->update_icon(status);
 
 		/* and schedule the blinker function if messages are pending */
-		if (purple_prefs_get_bool("/purple/gtk/docklet/blink") &&
+		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink") &&
 		    status == DOCKLET_STATUS_PENDING
 		    && docklet_blinking_timer == 0) {
 			docklet_blinking_timer = g_timeout_add(500, docklet_blink_icon, NULL);
@@ -316,13 +316,13 @@
 static void
 docklet_toggle_mute(GtkWidget *toggle, void *data)
 {
-	purple_prefs_set_bool("/purple/gtk/sound/mute", GTK_CHECK_MENU_ITEM(toggle)->active);
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/sound/mute", GTK_CHECK_MENU_ITEM(toggle)->active);
 }
 
 static void
 docklet_toggle_blink(GtkWidget *toggle, void *data)
 {
-	purple_prefs_set_bool("/purple/gtk/docklet/blink", GTK_CHECK_MENU_ITEM(toggle)->active);
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/docklet/blink", GTK_CHECK_MENU_ITEM(toggle)->active);
 }
 
 static void
@@ -373,6 +373,10 @@
 {
 	PurpleSavedStatus *saved_status;
 	saved_status = purple_savedstatus_get_current();
+
+	if (purple_savedstatus_get_type(saved_status) == PURPLE_STATUS_AVAILABLE)
+		saved_status = purple_savedstatus_new(NULL, PURPLE_STATUS_AWAY);
+
 	pidgin_status_editor_show(FALSE,
 		purple_savedstatus_is_transient(saved_status) ? saved_status : NULL);
 }
@@ -493,7 +497,7 @@
 	menu = gtk_menu_new();
 
 	menuitem = gtk_check_menu_item_new_with_label(_("Show Buddy List"));
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool("/purple/gtk/blist/list_visible"));
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/list_visible"));
 	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_blist), NULL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
@@ -534,14 +538,14 @@
 	pidgin_separator(menu);
 
 	menuitem = gtk_check_menu_item_new_with_label(_("Mute Sounds"));
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool("/purple/gtk/sound/mute"));
-	if (!strcmp(purple_prefs_get_string("/purple/gtk/sound/method"), "none"))
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/mute"));
+	if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none"))
 		gtk_widget_set_sensitive(GTK_WIDGET(menuitem), FALSE);
 	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_mute), NULL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
 	menuitem = gtk_check_menu_item_new_with_label(_("Blink on new message"));
-	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool("/purple/gtk/docklet/blink"));
+	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/docklet/blink"));
 	g_signal_connect(G_OBJECT(menuitem), "toggled", G_CALLBACK(docklet_toggle_blink), NULL);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
@@ -591,7 +595,7 @@
 pidgin_docklet_embedded()
 {
 	if (!visibility_manager
-	    && strcmp(purple_prefs_get_string("/purple/gtk/docklet/show"), "pending")) {
+	    && strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "pending")) {
 		pidgin_blist_visibility_manager_add();
 		visibility_manager = TRUE;
 	}
@@ -639,14 +643,14 @@
 	void *accounts_handle = purple_accounts_get_handle();
 	void *docklet_handle = pidgin_docklet_get_handle();
 
-	purple_prefs_add_none("/purple/gtk/docklet");
-	purple_prefs_add_bool("/purple/gtk/docklet/blink", FALSE);
-	purple_prefs_add_string("/purple/gtk/docklet/show", "always");
-	purple_prefs_connect_callback(docklet_handle, "/purple/gtk/docklet/show",
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/docklet");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/docklet/blink", FALSE);
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/docklet/show", "always");
+	purple_prefs_connect_callback(docklet_handle, PIDGIN_PREFS_ROOT "/docklet/show",
 				    docklet_show_pref_changed_cb, NULL);
 
 	docklet_ui_init();
-	if (!strcmp(purple_prefs_get_string("/purple/gtk/docklet/show"), "always") && ui_ops && ui_ops->create)
+	if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/docklet/show"), "always") && ui_ops && ui_ops->create)
 		ui_ops->create();
 
 	purple_signal_connect(conn_handle, "signed-on",
--- a/pidgin/gtkft.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkft.c	Sun Apr 15 00:15:32 2007 +0000
@@ -418,7 +418,7 @@
 toggle_keep_open_cb(GtkWidget *w, PidginXferDialog *dialog)
 {
 	dialog->keep_open = !dialog->keep_open;
-	purple_prefs_set_bool("/purple/gtk/filetransfer/keep_open",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/filetransfer/keep_open",
 						dialog->keep_open);
 }
 
@@ -426,7 +426,7 @@
 toggle_clear_finished_cb(GtkWidget *w, PidginXferDialog *dialog)
 {
 	dialog->auto_clear = !dialog->auto_clear;
-	purple_prefs_set_bool("/purple/gtk/filetransfer/clear_finished",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/filetransfer/clear_finished",
 						dialog->auto_clear);
 }
 
@@ -753,9 +753,9 @@
 
 	dialog = g_new0(PidginXferDialog, 1);
 	dialog->keep_open =
-		purple_prefs_get_bool("/purple/gtk/filetransfer/keep_open");
+		purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/filetransfer/keep_open");
 	dialog->auto_clear =
-		purple_prefs_get_bool("/purple/gtk/filetransfer/clear_finished");
+		purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/filetransfer/clear_finished");
 
 	/* Create the window. */
 	dialog->window = window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
@@ -1231,9 +1231,9 @@
 void
 pidgin_xfers_init(void)
 {
-	purple_prefs_add_none("/purple/gtk/filetransfer");
-	purple_prefs_add_bool("/purple/gtk/filetransfer/clear_finished", TRUE);
-	purple_prefs_add_bool("/purple/gtk/filetransfer/keep_open", FALSE);
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/filetransfer");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/filetransfer/clear_finished", TRUE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/filetransfer/keep_open", FALSE);
 }
 
 void
--- a/pidgin/gtkimhtml.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkimhtml.c	Sun Apr 15 00:15:32 2007 +0000
@@ -100,7 +100,6 @@
 static void delete_cb(GtkTextBuffer *buffer, GtkTextIter *iter, GtkTextIter *end, GtkIMHtml *imhtml);
 static void insert_ca_cb(GtkTextBuffer *buffer, GtkTextIter *arg1, GtkTextChildAnchor *arg2, gpointer user_data);
 static void gtk_imhtml_apply_tags_on_insert(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *end);
-static gboolean gtk_imhtml_is_amp_escape (const gchar *string, gchar **replace, gint *length);
 void gtk_imhtml_close_tags(GtkIMHtml *imhtml, GtkTextIter *iter);
 static void gtk_imhtml_link_drop_cb(GtkWidget *widget, GdkDragContext *context, gint x, gint y, guint time, gpointer user_data);
 static void gtk_imhtml_link_drag_rcv_cb(GtkWidget *widget, GdkDragContext *dc, guint x, guint y, GtkSelectionData *sd, guint info, guint t, GtkIMHtml *imhtml);
@@ -1736,7 +1735,7 @@
 	GtkSmileyTree *t = tree;
 	const gchar *x = text;
 	gint len = 0;
-	gchar *amp;
+	const gchar *amp;
 	gint alen;
 
 	while (*x) {
@@ -1745,7 +1744,7 @@
 		if (!t->values)
 			break;
 
-		if(*x == '&' && gtk_imhtml_is_amp_escape(x, &amp, &alen)) {
+		if(*x == '&' && (amp = purple_markup_unescape_entity(x, &alen))) {
 			gboolean matched = TRUE;
 			/* Make sure all chars of the unescaped value match */
 			while (*(amp + 1)) {
@@ -1928,62 +1927,6 @@
 
 
 static gboolean
-gtk_imhtml_is_amp_escape (const gchar *string,
-			  gchar       **replace,
-			  gint        *length)
-{
-	static char buf[7];
-	g_return_val_if_fail (string != NULL, FALSE);
-	g_return_val_if_fail (replace != NULL, FALSE);
-	g_return_val_if_fail (length != NULL, FALSE);
-
-	if (!g_ascii_strncasecmp (string, "&amp;", 5)) {
-		*replace = "&";
-		*length = 5;
-	} else if (!g_ascii_strncasecmp (string, "&lt;", 4)) {
-		*replace = "<";
-		*length = 4;
-	} else if (!g_ascii_strncasecmp (string, "&gt;", 4)) {
-		*replace = ">";
-		*length = 4;
-	} else if (!g_ascii_strncasecmp (string, "&nbsp;", 6)) {
-		*replace = " ";
-		*length = 6;
-	} else if (!g_ascii_strncasecmp (string, "&copy;", 6)) {
-		*replace = "©";
-		*length = 6;
-	} else if (!g_ascii_strncasecmp (string, "&quot;", 6)) {
-		*replace = "\"";
-		*length = 6;
-	} else if (!g_ascii_strncasecmp (string, "&reg;", 5)) {
-		*replace = "®";
-		*length = 5;
-	} else if (!g_ascii_strncasecmp (string, "&apos;", 6)) {
-		*replace = "\'";
-		*length = 6;
-	} else if (*(string + 1) == '#') {
-		guint pound = 0;
-		if ((sscanf (string, "&#%u;", &pound) == 1) && pound != 0) {
-			int buflen;
-			if (*(string + 3 + (gint)log10 (pound)) != ';')
-				return FALSE;
-			buflen = g_unichar_to_utf8((gunichar)pound, buf);
-			buf[buflen] = '\0';
-			*replace = buf;
-			*length = 2;
-			while (isdigit ((gint) string [*length])) (*length)++;
-			if (string [*length] == ';') (*length)++;
-		} else {
-			return FALSE;
-		}
-	} else {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-static gboolean
 gtk_imhtml_is_tag (const gchar *string,
 		   gchar      **tag,
 		   gint        *len,
@@ -2084,7 +2027,7 @@
 	gchar *e, *a;
 	gchar *val;
 	gint len;
-	gchar *c;
+	const gchar *c;
 	GString *ret;
 
 	while (g_ascii_strncasecmp (t, opt, strlen (opt))) {
@@ -2120,7 +2063,7 @@
 	ret = g_string_new("");
 	e = val;
 	while(*e) {
-		if(gtk_imhtml_is_amp_escape(e, &c, &len)) {
+		if((c = purple_markup_unescape_entity(e, &len))) {
 			ret = g_string_append(ret, c);
 			e += len;
 		} else {
@@ -2134,71 +2077,6 @@
 	return g_string_free(ret, FALSE);
 }
 
-/* Inline CSS Support - Douglas Thrift */
-static gchar*
-gtk_imhtml_get_css_opt (gchar       *style,
-			 const gchar *opt)
-{
-	gchar *t = style;
-	gchar *e, *a;
-	gchar *val;
-	gint len;
-	gchar *c;
-	GString *ret;
-
-	while (g_ascii_strncasecmp (t, opt, strlen (opt))) {
-/*		gboolean quote = FALSE; */
-		if (*t == '\0') break;
-		while (*t && !((*t == ' ') /*&& !quote*/)) {
-/*			if (*t == '\"')
-				quote = ! quote; */
-			t++;
-		}
-		while (*t && (*t == ' ')) t++;
-	}
-
-	if (!g_ascii_strncasecmp (t, opt, strlen (opt))) {
-		t += strlen (opt);
-		while (*t && (*t == ' ')) t++;
-		if (!*t)
-			return NULL;
-	} else {
-		return NULL;
-	}
-
-/*	if ((*t == '\"') || (*t == '\'')) {
-		e = a = ++t;
-		while (*e && (*e != *(t - 1))) e++;
-		if  (*e == '\0') {
-			return NULL;
-		} else
-			val = g_strndup(a, e - a);
-	} else {
-		e = a = t;
-		while (*e && !isspace ((gint) *e)) e++;
-		val = g_strndup(a, e - a);
-	}*/
-
-	e = a = t;
-	while (*e && *e != ';') e++;
-	val = g_strndup(a, e - a);
-
-	ret = g_string_new("");
-	e = val;
-	while(*e) {
-		if(gtk_imhtml_is_amp_escape(e, &c, &len)) {
-			ret = g_string_append(ret, c);
-			e += len;
-		} else {
-			ret = g_string_append_c(ret, *e);
-			e++;
-		}
-	}
-	g_free(val);
-
-	return g_string_free(ret, FALSE);
-}
-
 static const char *accepted_protocols[] = {
 	"http://",
 	"https://",
@@ -2369,7 +2247,7 @@
 	gint tlen, smilelen, wpos=0;
 	gint type;
 	const gchar *c;
-	gchar *amp;
+	const gchar *amp;
 	gint len_protocol;
 
 	guint	bold = 0,
@@ -2382,6 +2260,9 @@
 		pre = 0;
 
 	gboolean br = FALSE;
+	gboolean align_right = FALSE;
+	gboolean rtl_direction = FALSE;
+	gint align_line = 0;
 
 	GSList *fonts = NULL;
 	GObject *object;
@@ -2748,28 +2629,32 @@
 					 * font-size
 					 * text-decoration: underline
 					 * font-weight: bold
+					 * direction: rtl
+					 * text-align: right
 					 *
 					 * TODO:
 					 * background-color
 					 * font-style
 					 */
 					{
-						gchar *style, *color, *background, *family, *size;
+						gchar *style, *color, *background, *family, *size, *direction, *alignment;
 						gchar *textdec, *weight;
 						GtkIMHtmlFontDetail *font, *oldfont = NULL;
 						style = gtk_imhtml_get_html_opt (tag, "style=");
 
 						if (!style) break;
 
-						color = gtk_imhtml_get_css_opt (style, "color:");
-						background = gtk_imhtml_get_css_opt (style, "background:");
-						family = gtk_imhtml_get_css_opt (style,
-							"font-family:");
-						size = gtk_imhtml_get_css_opt (style, "font-size:");
-						textdec = gtk_imhtml_get_css_opt (style, "text-decoration:");
-						weight = gtk_imhtml_get_css_opt (style, "font-weight:");
-
-						if (!(color || family || size || background || textdec || weight)) {
+						color = purple_markup_get_css_property (style, "color");
+						background = purple_markup_get_css_property (style, "background");
+						family = purple_markup_get_css_property (style, "font-family");
+						size = purple_markup_get_css_property (style, "font-size");
+						textdec = purple_markup_get_css_property (style, "text-decoration");
+						weight = purple_markup_get_css_property (style, "font-weight");
+						direction = purple_markup_get_css_property (style, "direction");
+						alignment = purple_markup_get_css_property (style, "text-align");
+
+
+						if (!(color || family || size || background || textdec || weight || direction || alignment)) {
 							g_free(style);
 							break;
 						}
@@ -2779,6 +2664,25 @@
 						ws[0] = '\0'; wpos = 0;
 						/* NEW_BIT (NEW_TEXT_BIT); */
 
+						/* Bi-Directional text support */
+						if (direction && (!strncasecmp(direction, "RTL", 3))) {
+							rtl_direction = TRUE;
+							/* insert RLE character to set direction */
+							ws[wpos++]  = 0xE2;
+							ws[wpos++]  = 0x80;
+							ws[wpos++]  = 0xAB;
+							ws[wpos]  = '\0';
+							gtk_text_buffer_insert(imhtml->text_buffer, iter, ws, wpos);
+							ws[0] = '\0'; wpos = 0;
+						}
+						g_free(direction);
+
+						if (alignment && (!strncasecmp(alignment, "RIGHT", 5))) {
+							align_right = TRUE;
+							align_line = gtk_text_iter_get_line(iter);
+						}
+						g_free(alignment);
+
 						font = g_new0 (GtkIMHtmlFontDetail, 1);
 						if (fonts)
 							oldfont = fonts->data;
@@ -2987,7 +2891,7 @@
 			pos += smilelen;
 			wpos = 0;
 			ws[0] = 0;
-		} else if (*c == '&' && gtk_imhtml_is_amp_escape (c, &amp, &tlen)) {
+		} else if (*c == '&' && (amp = purple_markup_unescape_entity(c, &tlen))) {
 			while(*amp) {
 				ws [wpos++] = *amp++;
 			}
@@ -3035,6 +2939,32 @@
 
 	/* NEW_BIT(NEW_TEXT_BIT); */
 
+	if(align_right) {
+		/* insert RLM+LRM at beginning of the line to set alignment */
+		GtkTextIter line_iter;
+		line_iter = *iter;
+		gtk_text_iter_set_line(&line_iter, align_line);
+		/* insert RLM character to set alignment */
+		ws[wpos++]  = 0xE2;
+		ws[wpos++]  = 0x80;
+		ws[wpos++]  = 0x8F;
+    
+		if (!rtl_direction)
+		{
+			/* insert LRM character to set direction */
+			/* (alignment=right and direction=LTR) */
+			ws[wpos++]  = 0xE2;
+			ws[wpos++]  = 0x80;
+			ws[wpos++]  = 0x8E;
+		}
+
+		ws[wpos]  = '\0';
+		gtk_text_buffer_insert(imhtml->text_buffer, &line_iter, ws, wpos);
+		gtk_text_buffer_get_end_iter(gtk_text_iter_get_buffer(&line_iter), iter);
+		ws[0] = '\0';
+		wpos = 0;
+	}
+
 	while (fonts) {
 		GtkIMHtmlFontDetail *font = fonts->data;
 		fonts = g_slist_remove (fonts, font);
@@ -4626,7 +4556,8 @@
 char *gtk_imhtml_get_markup_range(GtkIMHtml *imhtml, GtkTextIter *start, GtkTextIter *end)
 {
 	gunichar c;
-	GtkTextIter iter, nextiter;
+	GtkTextIter iter, next_iter, non_neutral_iter;
+	gboolean is_rtl_message = FALSE;
 	GString *str = g_string_new("");
 	GSList *tags, *sl;
 	GQueue *q, *r;
@@ -4637,8 +4568,17 @@
 
 
 	gtk_text_iter_order(start, end);
-	nextiter = iter = *start;
-	gtk_text_iter_forward_char(&nextiter);
+	non_neutral_iter = next_iter = iter = *start;
+	gtk_text_iter_forward_char(&next_iter);
+
+	/* Bi-directional text support */
+	/* Get to the first non-neutral character */
+	while ((PANGO_DIRECTION_NEUTRAL == pango_unichar_direction(gtk_text_iter_get_char(&non_neutral_iter)))
+		&& gtk_text_iter_forward_char(&non_neutral_iter));
+	if (PANGO_DIRECTION_RTL == pango_unichar_direction(gtk_text_iter_get_char(&non_neutral_iter))) {
+		is_rtl_message = TRUE;
+		g_string_append(str, "<SPAN style=\"direction:rtl;text-align:right;\">");
+	}
 
 	/* First add the tags that are already in progress (we don't care about non-printing tags)*/
 	tags = gtk_text_iter_get_tags(start);
@@ -4692,7 +4632,7 @@
 		for (sl = tags; sl; sl = sl->next) {
 			tag = sl->data;
 			/** don't worry about non-printing tags ending */
-			if (tag_ends_here(tag, &iter, &nextiter) && strlen(tag_to_html_end(tag)) > 0) {
+			if (tag_ends_here(tag, &iter, &next_iter) && strlen(tag_to_html_end(tag)) > 0) {
 
 				GtkTextTag *tmp;
 
@@ -4700,7 +4640,7 @@
 					if (tmp == NULL)
 						break;
 
-					if (!tag_ends_here(tmp, &iter, &nextiter) && strlen(tag_to_html_end(tmp)) > 0)
+					if (!tag_ends_here(tmp, &iter, &next_iter) && strlen(tag_to_html_end(tmp)) > 0)
 						g_queue_push_tail(r, tmp);
 					g_string_append(str, tag_to_html_end(GTK_TEXT_TAG(tmp)));
 				}
@@ -4719,12 +4659,16 @@
 
 		g_slist_free(tags);
 		gtk_text_iter_forward_char(&iter);
-		gtk_text_iter_forward_char(&nextiter);
+		gtk_text_iter_forward_char(&next_iter);
 	}
 
 	while ((tag = g_queue_pop_tail(q)))
 		g_string_append(str, tag_to_html_end(GTK_TEXT_TAG(tag)));
 
+	/* Bi-directional text support - close tags */
+	if (is_rtl_message)
+		g_string_append(str, "</SPAN>");
+
 	g_queue_free(q);
 	g_queue_free(r);
 	return g_string_free(str, FALSE);
--- a/pidgin/gtkmain.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkmain.c	Sun Apr 15 00:15:32 2007 +0000
@@ -414,65 +414,6 @@
 }
 #endif /* HAVE_STARTUP_NOTIFICATION */
 
-#ifndef _WIN32
-static char *pidgin_find_binary_location(void *symbol, void *data)
-{
-	static char *fullname = NULL;
-	static gboolean first = TRUE;
-
-	char *argv0 = data;
-	struct stat st;
-	char *basebuf, *linkbuf, *fullbuf;
-
-	if (!first)
-		/* We've already been through this. */
-		return strdup(fullname);
-
-	first = FALSE;
-
-	if (!argv0)
-		return NULL;
-
-
-	basebuf = g_find_program_in_path(argv0);
-
-	/* But we still need to deal with symbolic links */
-	g_lstat(basebuf, &st);
-	while ((st.st_mode & S_IFLNK) == S_IFLNK) {
-		int written;
-		linkbuf = g_malloc(1024);
-		written = readlink(basebuf, linkbuf, 1024 - 1);
-		if (written == -1)
-		{
-			/* This really shouldn't happen, but do we
-			 * need something better here? */
-			g_free(linkbuf);
-			continue;
-		}
-		linkbuf[written] = '\0';
-		if (linkbuf[0] == G_DIR_SEPARATOR) {
-			/* an absolute path */
-			fullbuf = g_strdup(linkbuf);
-		} else {
-			char *dirbuf = g_path_get_dirname(basebuf);
-			/* a relative path */
-			fullbuf = g_strdup_printf("%s%s%s",
-						  dirbuf, G_DIR_SEPARATOR_S,
-						  linkbuf);
-			g_free(dirbuf);
-		}
-		/* There's no memory leak here.  Really! */
-		g_free(linkbuf);
-		g_free(basebuf);
-		basebuf = fullbuf;
-		g_lstat(basebuf, &st);
-	}
-
-	fullname = basebuf;
-	return strdup(fullname);
-}
-#endif /* #ifndef _WIN32 */
-
 /* FUCKING GET ME A TOWEL! */
 #ifdef _WIN32
 /* suppress gcc "no previous prototype" warning */
@@ -528,9 +469,6 @@
 	g_log_set_always_fatal(G_LOG_LEVEL_CRITICAL);
 #endif
 
-#ifndef _WIN32
-	br_set_locate_fallback_func(pidgin_find_binary_location, argv[0]);
-#endif
 #ifdef ENABLE_NLS
 	bindtextdomain(PACKAGE, LOCALEDIR);
 	bind_textdomain_codeset(PACKAGE, "UTF-8");
@@ -742,7 +680,7 @@
 	pidgin_prefs_update_old();
 
 	/* load plugins we had when we quit */
-	purple_plugins_load_saved("/purple/gtk/plugins/loaded");
+	purple_plugins_load_saved(PIDGIN_PREFS_ROOT "/plugins/loaded");
 	pidgin_docklet_init();
 
 	/* TODO: Move pounces loading into purple_pounces_init() */
@@ -784,7 +722,7 @@
 	 */
 	purple_blist_show();
 
-	if (purple_prefs_get_bool("/purple/gtk/debug/enabled"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled"))
 		pidgin_debug_window_show();
 
 	if (opt_login) {
--- a/pidgin/gtknotify.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtknotify.c	Sun Apr 15 00:15:32 2007 +0000
@@ -615,7 +615,7 @@
 					 G_CALLBACK(formatted_input_cb), NULL);
 
 	/* Add the text to the gtkimhtml */
-	if (!purple_prefs_get_bool("/purple/gtk/conversations/show_incoming_formatting"))
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting"))
 		options |= GTK_IMHTML_NO_COLOURS | GTK_IMHTML_NO_FONTS | GTK_IMHTML_NO_SIZES;
 
 	options |= GTK_IMHTML_NO_COMMENTS;
@@ -953,8 +953,8 @@
 	const char *web_browser;
 	int place;
 
-	web_browser = purple_prefs_get_string("/purple/gtk/browsers/browser");
-	place = purple_prefs_get_int("/purple/gtk/browsers/place");
+	web_browser = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser");
+	place = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/browsers/place");
 
 	/* if they are running gnome, use the gnome web browser */
 	if (purple_running_gnome() == TRUE)
@@ -1057,7 +1057,7 @@
 	{
 		const char *web_command;
 
-		web_command = purple_prefs_get_path("/purple/gtk/browsers/command");
+		web_command = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command");
 
 		if (web_command == NULL || *web_command == '\0')
 		{
--- a/pidgin/gtkplugin.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkplugin.c	Sun Apr 15 00:15:32 2007 +0000
@@ -90,7 +90,7 @@
 void
 pidgin_plugins_save(void)
 {
-	purple_plugins_save_loaded("/purple/gtk/plugins/loaded");
+	purple_plugins_save_loaded(PIDGIN_PREFS_ROOT "/plugins/loaded");
 }
 
 static void
--- a/pidgin/gtkpounce.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkpounce.c	Sun Apr 15 00:15:32 2007 +0000
@@ -332,15 +332,15 @@
 									 "reason", reason);
 
 	/* Set the defaults for next time. */
-	purple_prefs_set_bool("/purple/gtk/pounces/default_actions/open-window",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/open-window",
 		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->open_win)));
-	purple_prefs_set_bool("/purple/gtk/pounces/default_actions/popup-notify",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/popup-notify",
 		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->popup)));
-	purple_prefs_set_bool("/purple/gtk/pounces/default_actions/send-message",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/send-message",
 		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->send_msg)));
-	purple_prefs_set_bool("/purple/gtk/pounces/default_actions/execute-command",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/execute-command",
 		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->exec_cmd)));
-	purple_prefs_set_bool("/purple/gtk/pounces/default_actions/play-sound",
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/play-sound",
 		gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->play_sound)));
 
 	purple_pounce_set_save(dialog->pounce,
@@ -964,15 +964,15 @@
 		}
 
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->open_win),
-			purple_prefs_get_bool("/purple/gtk/pounces/default_actions/open-window"));
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/open-window"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->popup),
-			purple_prefs_get_bool("/purple/gtk/pounces/default_actions/popup-notify"));
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/popup-notify"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->send_msg),
-			purple_prefs_get_bool("/purple/gtk/pounces/default_actions/send-message"));
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/send-message"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->exec_cmd),
-			purple_prefs_get_bool("/purple/gtk/pounces/default_actions/execute-command"));
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/execute-command"));
 		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->play_sound),
-			purple_prefs_get_bool("/purple/gtk/pounces/default_actions/play-sound"));
+			purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/play-sound"));
 	}
 
 	gtk_widget_show_all(vbox2);
@@ -983,8 +983,8 @@
 pounces_manager_configure_cb(GtkWidget *widget, GdkEventConfigure *event, PouncesManager *dialog)
 {
 	if (GTK_WIDGET_VISIBLE(widget)) {
-		purple_prefs_set_int("/purple/gtk/pounces/dialog/width",  event->width);
-		purple_prefs_set_int("/purple/gtk/pounces/dialog/height", event->height);
+		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/pounces/dialog/width",  event->width);
+		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/pounces/dialog/height", event->height);
 	}
 
 	return FALSE;
@@ -1316,8 +1316,8 @@
 
 	pounces_manager = dialog = g_new0(PouncesManager, 1);
 
-	width  = purple_prefs_get_int("/purple/gtk/pounces/dialog/width");
-	height = purple_prefs_get_int("/purple/gtk/pounces/dialog/height");
+	width  = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/pounces/dialog/width");
+	height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/pounces/dialog/height");
 
 	dialog->window = win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(win), width, height);
@@ -1641,21 +1641,21 @@
 	purple_pounces_register_handler(PIDGIN_UI, pounce_cb, new_pounce,
 								  free_pounce);
 
-	purple_prefs_add_none("/purple/gtk/pounces");
-	purple_prefs_add_none("/purple/gtk/pounces/default_actions");
-	purple_prefs_add_bool("/purple/gtk/pounces/default_actions/open-window",
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/pounces");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/pounces/default_actions");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/open-window",
 						FALSE);
-	purple_prefs_add_bool("/purple/gtk/pounces/default_actions/popup-notify",
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/popup-notify",
 						TRUE);
-	purple_prefs_add_bool("/purple/gtk/pounces/default_actions/send-message",
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/send-message",
 						FALSE);
-	purple_prefs_add_bool("/purple/gtk/pounces/default_actions/execute-command",
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/execute-command",
 						FALSE);
-	purple_prefs_add_bool("/purple/gtk/pounces/default_actions/play-sound",
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/pounces/default_actions/play-sound",
 						FALSE);
-	purple_prefs_add_none("/purple/gtk/pounces/dialog");
-	purple_prefs_add_int("/purple/gtk/pounces/dialog/width",  520);
-	purple_prefs_add_int("/purple/gtk/pounces/dialog/height", 321);
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/pounces/dialog");
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/pounces/dialog/width",  520);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/pounces/dialog/height", 321);
 
 	purple_signal_connect(purple_connections_get_handle(), "signed-on",
 						pidgin_pounces_get_handle(),
--- a/pidgin/gtkprefs.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkprefs.c	Sun Apr 15 00:15:32 2007 +0000
@@ -375,7 +375,7 @@
 	gtk_tree_model_get_value(model, &iter, 3, &val);
 	path = gtk_tree_model_get_path(model, &iter);
 	themename = g_value_get_string(&val);
-	purple_prefs_set_string("/purple/gtk/smileys/theme", themename);
+	purple_prefs_set_string(PIDGIN_PREFS_ROOT "/smileys/theme", themename);
 	g_value_unset (&val);
 
 	/* current_smiley_theme is set in callback for the above pref change */
@@ -710,21 +710,21 @@
 								  &bold, &italic, &uline);
 
 	if (buttons & GTK_IMHTML_BOLD)
-		purple_prefs_set_bool("/purple/gtk/conversations/send_bold", bold);
+		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold", bold);
 	if (buttons & GTK_IMHTML_ITALIC)
-		purple_prefs_set_bool("/purple/gtk/conversations/send_italic", italic);
+		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_italic", italic);
 	if (buttons & GTK_IMHTML_UNDERLINE)
-		purple_prefs_set_bool("/purple/gtk/conversations/send_underline", uline);
+		purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_underline", uline);
 
 	if (buttons & GTK_IMHTML_GROW || buttons & GTK_IMHTML_SHRINK)
-		purple_prefs_set_int("/purple/gtk/conversations/font_size",
+		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/font_size",
 						   gtk_imhtml_get_current_fontsize(GTK_IMHTML(imhtml)));
 	if (buttons & GTK_IMHTML_FACE) {
 		char *face = gtk_imhtml_get_current_fontface(GTK_IMHTML(imhtml));
 		if (!face)
 			face = g_strdup("");
 
-		purple_prefs_set_string("/purple/gtk/conversations/font_face", face);
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/font_face", face);
 		g_free(face);
 	}
 
@@ -733,7 +733,7 @@
 		if (!color)
 			color = g_strdup("");
 
-		purple_prefs_set_string("/purple/gtk/conversations/fgcolor", color);
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor", color);
 		g_free(color);
 	}
 
@@ -767,7 +767,7 @@
 		if (!color)
 			color = g_strdup("");
 
-		purple_prefs_set_string("/purple/gtk/conversations/bgcolor", color);
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor", color);
 		g_free(color);
 	}
 }
@@ -775,15 +775,15 @@
 static void
 formatting_clear_cb(GtkIMHtml *imhtml, void *data)
 {
-	purple_prefs_set_bool("/purple/gtk/conversations/send_bold", FALSE);
-	purple_prefs_set_bool("/purple/gtk/conversations/send_italic", FALSE);
-	purple_prefs_set_bool("/purple/gtk/conversations/send_underline", FALSE);
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold", FALSE);
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_italic", FALSE);
+	purple_prefs_set_bool(PIDGIN_PREFS_ROOT "/conversations/send_underline", FALSE);
 
-	purple_prefs_set_int("/purple/gtk/conversations/font_size", 3);
+	purple_prefs_set_int(PIDGIN_PREFS_ROOT "/conversations/font_size", 3);
 
-	purple_prefs_set_string("/purple/gtk/conversations/font_face", "");
-	purple_prefs_set_string("/purple/gtk/conversations/fgcolor", "");
-	purple_prefs_set_string("/purple/gtk/conversations/bgcolor", "");
+	purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/font_face", "");
+	purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor", "");
+	purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor", "");
 }
 
 static void
@@ -815,7 +815,7 @@
 
 	vbox = pidgin_make_frame(ret, _("System Tray Icon"));
 	label = pidgin_prefs_dropdown(vbox, _("_Show system tray icon:"), PURPLE_PREF_STRING,
-					"/purple/gtk/docklet/show",
+					PIDGIN_PREFS_ROOT "/docklet/show",
 					_("Always"), "always",
 					_("Never"), "never",
 					_("On unread messages"), "pending",
@@ -825,7 +825,7 @@
 	
 	vbox = pidgin_make_frame(ret, _("Conversation Window Hiding"));
 	label = pidgin_prefs_dropdown(vbox, _("_Hide new IM conversations:"),
-					PURPLE_PREF_STRING, "/purple/gtk/conversations/im/hide_new",
+					PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/im/hide_new",
 					_("Never"), "never",
 					_("When away"), "away",
 					_("Always"), "always",
@@ -838,7 +838,7 @@
 	vbox = pidgin_make_frame(ret, _("Tabs"));
 	
 	pidgin_prefs_checkbox(_("Show IMs and chats in _tabbed windows"),
-							"/purple/gtk/conversations/tabs", vbox);
+							PIDGIN_PREFS_ROOT "/conversations/tabs", vbox);
 
 	/*
 	 * Connect a signal to the above preference.  When conversations are not
@@ -846,16 +846,16 @@
 	 */
 	vbox2 = gtk_vbox_new(FALSE, 9);
 	gtk_box_pack_start(GTK_BOX(vbox), vbox2, FALSE, FALSE, 0);
-	purple_prefs_connect_callback(prefs, "/purple/gtk/conversations/tabs",
+	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/conversations/tabs",
 	                            conversation_usetabs_cb, vbox2);
-	if (!purple_prefs_get_bool("/purple/gtk/conversations/tabs"))
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/tabs"))
 	  gtk_widget_set_sensitive(vbox2, FALSE);
 
 	pidgin_prefs_checkbox(_("Show close b_utton on tabs"),
-				"/purple/gtk/conversations/close_on_tabs", vbox2);
+				PIDGIN_PREFS_ROOT "/conversations/close_on_tabs", vbox2);
 
 	label = pidgin_prefs_dropdown(vbox2, _("_Placement:"), PURPLE_PREF_INT,
-					"/purple/gtk/conversations/tab_side",
+					PIDGIN_PREFS_ROOT "/conversations/tab_side",
 					_("Top"), GTK_POS_TOP,
 					_("Bottom"), GTK_POS_BOTTOM,
 					_("Left"), GTK_POS_LEFT,
@@ -870,7 +870,7 @@
 		
 	names = pidgin_conv_placement_get_options();
 	label = pidgin_prefs_dropdown_from_list(vbox2, _("N_ew conversations:"),
-				PURPLE_PREF_STRING, "/purple/gtk/conversations/placement", names);
+				PURPLE_PREF_STRING, PIDGIN_PREFS_ROOT "/conversations/placement", names);
 	gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5);
 			
 	gtk_size_group_add_widget(sg, label);
@@ -898,13 +898,13 @@
 	vbox = pidgin_make_frame(ret, _("Conversations"));
 
 	pidgin_prefs_checkbox(_("Show _formatting on incoming messages"),
-				"/purple/gtk/conversations/show_incoming_formatting", vbox);
+				PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox);
 
 	iconpref1 = pidgin_prefs_checkbox(_("Show buddy _icons"),
-			"/purple/gtk/conversations/im/show_buddy_icons", vbox);
+			PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", vbox);
 	iconpref2 = pidgin_prefs_checkbox(_("Enable buddy ic_on animation"),
-			"/purple/gtk/conversations/im/animate_buddy_icons", vbox);
-	if (!purple_prefs_get_bool("/purple/gtk/conversations/im/show_buddy_icons"))
+			PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons", vbox);
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons"))
 		gtk_widget_set_sensitive(iconpref2, FALSE);
 	g_signal_connect(G_OBJECT(iconpref1), "clicked",
 					 G_CALLBACK(pidgin_toggle_sensitive), iconpref2);
@@ -913,13 +913,13 @@
 			"/core/conversations/im/send_typing", vbox);
 #ifdef USE_GTKSPELL
 	pidgin_prefs_checkbox(_("Highlight _misspelled words"),
-			"/purple/gtk/conversations/spellcheck", vbox);
+			PIDGIN_PREFS_ROOT "/conversations/spellcheck", vbox);
 #endif
 
-	pidgin_prefs_checkbox(_("Use smooth-scrolling"), "/purple/gtk/conversations/use_smooth_scrolling", vbox);
+	pidgin_prefs_checkbox(_("Use smooth-scrolling"), PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", vbox);
 
 #ifdef _WIN32
-	pidgin_prefs_checkbox(_("F_lash window when IMs are received"), "/purple/gtk/win32/blink_im", vbox);
+	pidgin_prefs_checkbox(_("F_lash window when IMs are received"), PIDGIN_PREFS_ROOT "/win32/blink_im", vbox);
 #endif
 
 	vbox = pidgin_make_frame(ret, _("Default Formatting"));
@@ -942,17 +942,17 @@
 
 	gtk_box_pack_start(GTK_BOX(vbox), frame, FALSE, FALSE, 0);
 
-	if (purple_prefs_get_bool("/purple/gtk/conversations/send_bold"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/send_bold"))
 		gtk_imhtml_toggle_bold(GTK_IMHTML(imhtml));
-	if (purple_prefs_get_bool("/purple/gtk/conversations/send_italic"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/send_italic"))
 		gtk_imhtml_toggle_italic(GTK_IMHTML(imhtml));
-	if (purple_prefs_get_bool("/purple/gtk/conversations/send_underline"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/send_underline"))
 		gtk_imhtml_toggle_underline(GTK_IMHTML(imhtml));
 
-	gtk_imhtml_font_set_size(GTK_IMHTML(imhtml), purple_prefs_get_int("/purple/gtk/conversations/font_size"));
-	gtk_imhtml_toggle_forecolor(GTK_IMHTML(imhtml), purple_prefs_get_string("/purple/gtk/conversations/fgcolor"));
-	gtk_imhtml_toggle_background(GTK_IMHTML(imhtml), purple_prefs_get_string("/purple/gtk/conversations/bgcolor"));
-	gtk_imhtml_toggle_fontface(GTK_IMHTML(imhtml), purple_prefs_get_string("/purple/gtk/conversations/font_face"));
+	gtk_imhtml_font_set_size(GTK_IMHTML(imhtml), purple_prefs_get_int(PIDGIN_PREFS_ROOT "/conversations/font_size"));
+	gtk_imhtml_toggle_forecolor(GTK_IMHTML(imhtml), purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/fgcolor"));
+	gtk_imhtml_toggle_background(GTK_IMHTML(imhtml), purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/bgcolor"));
+	gtk_imhtml_toggle_fontface(GTK_IMHTML(imhtml), purple_prefs_get_string(PIDGIN_PREFS_ROOT "/conversations/font_face"));
 
 	g_signal_connect_after(G_OBJECT(imhtml), "format_function_toggle",
 					 G_CALLBACK(formatting_toggle_cb), toolbar);
@@ -1198,7 +1198,7 @@
 static gboolean manual_browser_set(GtkWidget *entry, GdkEventFocus *event, gpointer data) {
 	const char *program = gtk_entry_get_text(GTK_ENTRY(entry));
 
-	purple_prefs_set_path("/purple/gtk/browsers/command", program);
+	purple_prefs_set_path(PIDGIN_PREFS_ROOT "/browsers/command", program);
 
 	/* carry on normally */
 	return FALSE;
@@ -1228,7 +1228,7 @@
 
 	GList *browsers = NULL;
 	int i = 0;
-	char *browser_setting = (char *)purple_prefs_get_string("/purple/gtk/browsers/browser");
+	char *browser_setting = (char *)purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser");
 
 	browsers = g_list_prepend(browsers, (gpointer)"custom");
 	browsers = g_list_prepend(browsers, (gpointer)_("Manual"));
@@ -1244,7 +1244,7 @@
 	}
 
 	if(browser_setting)
-		purple_prefs_set_string("/purple/gtk/browsers/browser", "custom");
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/browsers/browser", "custom");
 
 	return browsers;
 }
@@ -1289,7 +1289,7 @@
 	browsers = get_available_browsers();
 	if (browsers != NULL) {
 		label = pidgin_prefs_dropdown_from_list(vbox,_("_Browser:"), PURPLE_PREF_STRING,
-										 "/purple/gtk/browsers/browser",
+										 PIDGIN_PREFS_ROOT "/browsers/browser",
 										 browsers);
 		g_list_free(browsers);
 		gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
@@ -1297,7 +1297,7 @@
 
 		hbox = gtk_hbox_new(FALSE, 0);
 		label = pidgin_prefs_dropdown(hbox, _("_Open link in:"), PURPLE_PREF_INT,
-			"/purple/gtk/browsers/place",
+			PIDGIN_PREFS_ROOT "/browsers/place",
 			_("Browser default"), PIDGIN_BROWSER_DEFAULT,
 			_("Existing window"), PIDGIN_BROWSER_CURRENT,
 			_("New window"), PIDGIN_BROWSER_NEW_WINDOW,
@@ -1307,9 +1307,9 @@
 		gtk_size_group_add_widget(sg, label);
 		gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 
-		if (!strcmp(purple_prefs_get_string("/purple/gtk/browsers/browser"), "custom"))
+		if (!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom"))
 			gtk_widget_set_sensitive(hbox, FALSE);
-		purple_prefs_connect_callback(prefs, "/purple/gtk/browsers/browser",
+		purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/browsers/browser",
 									browser_changed1_cb, hbox);
 	}
 
@@ -1323,15 +1323,15 @@
 	entry = gtk_entry_new();
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
 
-	if (strcmp(purple_prefs_get_string("/purple/gtk/browsers/browser"), "custom"))
+	if (strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/browsers/browser"), "custom"))
 		gtk_widget_set_sensitive(hbox, FALSE);
-	purple_prefs_connect_callback(prefs, "/purple/gtk/browsers/browser",
+	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/browsers/browser",
 								browser_changed2_cb, hbox);
 
 	gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
 
 	gtk_entry_set_text(GTK_ENTRY(entry),
-					   purple_prefs_get_path("/purple/gtk/browsers/command"));
+					   purple_prefs_get_path(PIDGIN_PREFS_ROOT "/browsers/command"));
 	g_signal_connect(G_OBJECT(entry), "focus-out-event",
 					 G_CALLBACK(manual_browser_set), NULL);
 	pidgin_set_accessible_label (entry, label);
@@ -1375,7 +1375,7 @@
 #ifndef _WIN32
 static gint sound_cmd_yeah(GtkEntry *entry, gpointer d)
 {
-	purple_prefs_set_path("/purple/gtk/sound/command",
+	purple_prefs_set_path(PIDGIN_PREFS_ROOT "/sound/command",
 			gtk_entry_get_text(GTK_ENTRY(entry)));
 	return TRUE;
 }
@@ -1445,7 +1445,7 @@
 	char *pref;
 	gboolean temp_value;
 
-	pref = g_strdup_printf("/purple/gtk/sound/enabled/%s",
+	pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/enabled/%s",
 			pidgin_sound_get_event_option(sound_row_sel));
 
 	temp_value = purple_prefs_get_bool(pref);
@@ -1467,7 +1467,7 @@
 {
 	gchar *pref;
 
-	pref = g_strdup_printf("/purple/gtk/sound/file/%s",
+	pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s",
 						   pidgin_sound_get_event_option(sound_row_sel));
 	purple_prefs_set_path(pref, "");
 	g_free(pref);
@@ -1484,7 +1484,7 @@
 	sound = GPOINTER_TO_INT(user_data);
 
 	/* Set it -- and forget it */
-	pref = g_strdup_printf("/purple/gtk/sound/file/%s",
+	pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s",
 						   pidgin_sound_get_event_option(sound));
 	purple_prefs_set_path(pref, filename);
 	g_free(pref);
@@ -1502,7 +1502,7 @@
 	gchar *pref;
 	const char *filename;
 
-	pref = g_strdup_printf("/purple/gtk/sound/file/%s",
+	pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s",
 						   pidgin_sound_get_event_option(sound_row_sel));
 	filename = purple_prefs_get_path(pref);
 	g_free(pref);
@@ -1537,7 +1537,7 @@
 static void prefs_sound_volume_changed(GtkRange *range)
 {
 	int val = (int)gtk_range_get_value(GTK_RANGE(range));
-	purple_prefs_set_int("/purple/gtk/sound/volume", val);
+	purple_prefs_set_int(PIDGIN_PREFS_ROOT "/sound/volume", val);
 }
 #endif
 
@@ -1554,7 +1554,7 @@
 	gtk_tree_model_get_value (model, &iter, 3, &val);
 	sound_row_sel = g_value_get_uint(&val);
 
-	pref = g_strdup_printf("/purple/gtk/sound/file/%s",
+	pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s",
 			pidgin_sound_get_event_option(sound_row_sel));
 	file = purple_prefs_get_path(pref);
 	g_free(pref);
@@ -1595,7 +1595,7 @@
 #ifndef _WIN32
 	vbox = pidgin_make_frame (ret, _("Sound Method"));
 	dd = pidgin_prefs_dropdown(vbox, _("_Method:"), PURPLE_PREF_STRING,
-			"/purple/gtk/sound/method",
+			PIDGIN_PREFS_ROOT "/sound/method",
 			_("Console beep"), "beep",
 #ifdef USE_GSTREAMER
 			_("Automatic"), "automatic",
@@ -1619,7 +1619,7 @@
 	gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
 
 	gtk_editable_set_editable(GTK_EDITABLE(entry), TRUE);
-	cmd = purple_prefs_get_path("/purple/gtk/sound/command");
+	cmd = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/sound/command");
 	if(cmd)
 		gtk_entry_set_text(GTK_ENTRY(entry), cmd);
 
@@ -1627,10 +1627,10 @@
 	g_signal_connect(G_OBJECT(entry), "changed",
 					 G_CALLBACK(sound_cmd_yeah), NULL);
 
-	purple_prefs_connect_callback(prefs, "/purple/gtk/sound/method",
+	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/method",
 								sound_changed1_cb, hbox);
 	gtk_widget_set_sensitive(hbox,
-			!strcmp(purple_prefs_get_string("/purple/gtk/sound/method"),
+			!strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"),
 					"custom"));
 
 	pidgin_set_accessible_label (entry, label);
@@ -1638,7 +1638,7 @@
 
 	vbox = pidgin_make_frame (ret, _("Sound Options"));
 	pidgin_prefs_checkbox(_("Sounds when conversation has _focus"),
-				   "/purple/gtk/sound/conv_focus", vbox);
+				   PIDGIN_PREFS_ROOT "/sound/conv_focus", vbox);
 	pidgin_prefs_dropdown(vbox, _("Enable sounds:"),
 				 PURPLE_PREF_INT, "/core/sound/while_status",
 				_("Only when available"), 1,
@@ -1656,7 +1656,7 @@
 
 	sw = gtk_hscale_new_with_range(0.0, 100.0, 5.0);
 	gtk_range_set_increments(GTK_RANGE(sw), 5.0, 25.0);
-	gtk_range_set_value(GTK_RANGE(sw), purple_prefs_get_int("/purple/gtk/sound/volume"));
+	gtk_range_set_value(GTK_RANGE(sw), purple_prefs_get_int(PIDGIN_PREFS_ROOT "/sound/volume"));
 	g_signal_connect (G_OBJECT (sw), "format-value",
 			  G_CALLBACK (prefs_sound_volume_format),
 			  NULL);
@@ -1665,16 +1665,16 @@
 			  NULL);
 	gtk_box_pack_start(GTK_BOX(hbox), sw, TRUE, TRUE, 0);
 
-	purple_prefs_connect_callback(prefs, "/purple/gtk/sound/method",
+	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/method",
 								sound_changed3_cb, hbox);
-	sound_changed3_cb("/purple/gtk/sound/method", PURPLE_PREF_STRING,
-			  purple_prefs_get_string("/purple/gtk/sound/method"), hbox);
+	sound_changed3_cb(PIDGIN_PREFS_ROOT "/sound/method", PURPLE_PREF_STRING,
+			  purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), hbox);
 #endif
 
 #ifndef _WIN32
 	gtk_widget_set_sensitive(vbox,
-			strcmp(purple_prefs_get_string("/purple/gtk/sound/method"), "none"));
-	purple_prefs_connect_callback(prefs, "/purple/gtk/sound/method",
+			strcmp(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method"), "none"));
+	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/sound/method",
 								sound_changed2_cb, vbox);
 #endif
 
@@ -1697,7 +1697,7 @@
 	event_store = gtk_list_store_new (4, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_UINT);
 
 	for (j=0; j < PURPLE_NUM_SOUNDS; j++) {
-		char *pref = g_strdup_printf("/purple/gtk/sound/enabled/%s",
+		char *pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/enabled/%s",
 					     pidgin_sound_get_event_option(j));
 		const char *label = pidgin_sound_get_event_label(j);
 
@@ -1747,7 +1747,7 @@
 	hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
 	gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
 	sound_entry = gtk_entry_new();
-	pref = g_strdup_printf("/purple/gtk/sound/file/%s",
+	pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s",
 			       pidgin_sound_get_event_option(0));
 	file = purple_prefs_get_path(pref);
 	g_free(pref);
@@ -2027,99 +2027,100 @@
 void
 pidgin_prefs_init(void)
 {
-	purple_prefs_add_none("/purple");
-	purple_prefs_add_none("/purple/gtk");
+	/* only change this when we have a sane prefs migration path */
+	purple_prefs_add_none("/gaim");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "");
 	purple_prefs_add_none("/plugins/gtk");
 
 #ifndef _WIN32
 	/* Browsers */
-	purple_prefs_add_none("/purple/gtk/browsers");
-	purple_prefs_add_int("/purple/gtk/browsers/place", PIDGIN_BROWSER_DEFAULT);
-	purple_prefs_add_path("/purple/gtk/browsers/command", "");
-	purple_prefs_add_string("/purple/gtk/browsers/browser", "mozilla");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/browsers");
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/browsers/place", PIDGIN_BROWSER_DEFAULT);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/browsers/command", "");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/browsers/browser", "mozilla");
 #endif
 
 	/* Plugins */
-	purple_prefs_add_none("/purple/gtk/plugins");
-	purple_prefs_add_path_list("/purple/gtk/plugins/loaded", NULL);
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/plugins");
+	purple_prefs_add_path_list(PIDGIN_PREFS_ROOT "/plugins/loaded", NULL);
 
 	/* File locations */
-	purple_prefs_add_none("/purple/gtk/filelocations");
-	purple_prefs_add_path("/purple/gtk/filelocations/last_save_folder", "");
-	purple_prefs_add_path("/purple/gtk/filelocations/last_open_folder", "");
-	purple_prefs_add_path("/purple/gtk/filelocations/last_icon_folder", "");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/filelocations");
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder", "");
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder", "");
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder", "");
 
 	/* Smiley Themes */
-	purple_prefs_add_none("/purple/gtk/smileys");
-	purple_prefs_add_string("/purple/gtk/smileys/theme", "Default");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/smileys");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/smileys/theme", "Default");
 
 	/* Smiley Callbacks */
-	purple_prefs_connect_callback(prefs, "/purple/gtk/smileys/theme",
+	purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/smileys/theme",
 								smiley_theme_pref_cb, NULL);
 }
 
 void pidgin_prefs_update_old() {
 	/* Rename some old prefs */
-	purple_prefs_rename("/purple/gtk/logging/log_ims", "/core/logging/log_ims");
-	purple_prefs_rename("/purple/gtk/logging/log_chats", "/core/logging/log_chats");
+	purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_ims", "/core/logging/log_ims");
+	purple_prefs_rename(PIDGIN_PREFS_ROOT "/logging/log_chats", "/core/logging/log_chats");
 	purple_prefs_rename("/core/conversations/placement",
-					  "/purple/gtk/conversations/placement");
+					  PIDGIN_PREFS_ROOT "/conversations/placement");
 
-	purple_prefs_rename("/purple/gtk/debug/timestamps", "/core/debug/timestamps");
-	purple_prefs_rename("/purple/gtk/conversations/im/raise_on_events", "/plugins/gtk/X11/notify/method_raise");
+	purple_prefs_rename(PIDGIN_PREFS_ROOT "/debug/timestamps", "/core/debug/timestamps");
+	purple_prefs_rename(PIDGIN_PREFS_ROOT "/conversations/im/raise_on_events", "/plugins/gtk/X11/notify/method_raise");
 
-	purple_prefs_rename_boolean_toggle("/purple/gtk/conversations/ignore_colors",
-									 "/purple/gtk/conversations/show_incoming_formatting");
+	purple_prefs_rename_boolean_toggle(PIDGIN_PREFS_ROOT "/conversations/ignore_colors",
+									 PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting");
 
 	/* this string pref moved into the core, try to be friendly */
-	purple_prefs_rename("/purple/gtk/idle/reporting_method", "/core/away/idle_reporting");
+	purple_prefs_rename(PIDGIN_PREFS_ROOT "/idle/reporting_method", "/core/away/idle_reporting");
 
 	/* Remove some no-longer-used prefs */
-	purple_prefs_remove("/purple/gtk/blist/auto_expand_contacts");
-	purple_prefs_remove("/purple/gtk/blist/button_style");
-	purple_prefs_remove("/purple/gtk/blist/grey_idle_buddies");
-	purple_prefs_remove("/purple/gtk/blist/raise_on_events");
-	purple_prefs_remove("/purple/gtk/blist/show_group_count");
-	purple_prefs_remove("/purple/gtk/blist/show_warning_level");
-	purple_prefs_remove("/purple/gtk/conversations/button_type");
-	purple_prefs_remove("/purple/gtk/conversations/ctrl_enter_sends");
-	purple_prefs_remove("/purple/gtk/conversations/enter_sends");
-	purple_prefs_remove("/purple/gtk/conversations/escape_closes");
-	purple_prefs_remove("/purple/gtk/conversations/html_shortcuts");
-	purple_prefs_remove("/purple/gtk/conversations/icons_on_tabs");
-	purple_prefs_remove("/purple/gtk/conversations/send_formatting");
-	purple_prefs_remove("/purple/gtk/conversations/show_smileys");
-	purple_prefs_remove("/purple/gtk/conversations/show_urls_as_links");
-	purple_prefs_remove("/purple/gtk/conversations/smiley_shortcuts");
-	purple_prefs_remove("/purple/gtk/conversations/use_custom_bgcolor");
-	purple_prefs_remove("/purple/gtk/conversations/use_custom_fgcolor");
-	purple_prefs_remove("/purple/gtk/conversations/use_custom_font");
-	purple_prefs_remove("/purple/gtk/conversations/use_custom_size");
-	purple_prefs_remove("/purple/gtk/conversations/chat/old_tab_complete");
-	purple_prefs_remove("/purple/gtk/conversations/chat/tab_completion");
-	purple_prefs_remove("/purple/gtk/conversations/im/hide_on_send");
-	purple_prefs_remove("/purple/gtk/conversations/chat/color_nicks");
-	purple_prefs_remove("/purple/gtk/conversations/chat/raise_on_events");
-	purple_prefs_remove("/purple/gtk/conversations/ignore_fonts");
-	purple_prefs_remove("/purple/gtk/conversations/ignore_font_sizes");
-	purple_prefs_remove("/purple/gtk/conversations/passthrough_unknown_commands");
-	purple_prefs_remove("/purple/gtk/idle");
-	purple_prefs_remove("/purple/gtk/logging/individual_logs");
-	purple_prefs_remove("/purple/gtk/sound/signon");
-	purple_prefs_remove("/purple/gtk/sound/silent_signon");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/auto_expand_contacts");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/button_style");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/grey_idle_buddies");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/raise_on_events");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/show_group_count");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/blist/show_warning_level");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/button_type");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/ctrl_enter_sends");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/enter_sends");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/escape_closes");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/html_shortcuts");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/icons_on_tabs");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/send_formatting");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/show_smileys");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/show_urls_as_links");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/smiley_shortcuts");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/use_custom_bgcolor");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/use_custom_fgcolor");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/use_custom_font");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/use_custom_size");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/chat/old_tab_complete");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/chat/tab_completion");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/im/hide_on_send");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/chat/color_nicks");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/chat/raise_on_events");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/ignore_fonts");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/ignore_font_sizes");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/conversations/passthrough_unknown_commands");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/idle");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/logging/individual_logs");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/sound/signon");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/sound/silent_signon");
 
 	/* Convert old queuing prefs to hide_new 3-way pref. */
 	if (purple_prefs_exists("/plugins/gtk/docklet/queue_messages") &&
 	    purple_prefs_get_bool("/plugins/gtk/docklet/queue_messages"))
 	{
-		purple_prefs_set_string("/purple/gtk/conversations/im/hide_new", "always");
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "always");
 	}
-	else if (purple_prefs_exists("/purple/gtk/away/queue_messages") &&
-	         purple_prefs_get_bool("/purple/gtk/away/queue_messages"))
+	else if (purple_prefs_exists(PIDGIN_PREFS_ROOT "/away/queue_messages") &&
+	         purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/away/queue_messages"))
 	{
-		purple_prefs_set_string("/purple/gtk/conversations/im/hide_new", "away");
+		purple_prefs_set_string(PIDGIN_PREFS_ROOT "/conversations/im/hide_new", "away");
 	}
-	purple_prefs_remove("/purple/gtk/away/queue_messages");
-	purple_prefs_remove("/purple/gtk/away");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/away/queue_messages");
+	purple_prefs_remove(PIDGIN_PREFS_ROOT "/away");
 	purple_prefs_remove("/plugins/gtk/docklet/queue_messages");
 }
--- a/pidgin/gtkrequest.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkrequest.c	Sun Apr 15 00:15:32 2007 +0000
@@ -405,7 +405,7 @@
 
 			gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
 
-			if (purple_prefs_get_bool("/purple/gtk/conversations/spellcheck"))
+			if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck"))
 				pidgin_setup_gtkspell(GTK_TEXT_VIEW(entry));
 
 			gtk_container_add(GTK_CONTAINER(sw), entry);
@@ -726,7 +726,7 @@
 		gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(textview),
 									GTK_WRAP_WORD_CHAR);
 
-		if (purple_prefs_get_bool("/purple/gtk/conversations/spellcheck"))
+		if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck"))
 			pidgin_setup_gtkspell(GTK_TEXT_VIEW(textview));
 
 		gtk_container_add(GTK_CONTAINER(widget), textview);
@@ -1415,9 +1415,9 @@
 	current_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(data->dialog));
 	if (current_folder != NULL) {
 		if (data->u.file.savedialog) {
-			purple_prefs_set_path("/purple/gtk/filelocations/last_save_folder", current_folder);
+			purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder", current_folder);
 		} else {
-			purple_prefs_set_path("/purple/gtk/filelocations/last_open_folder", current_folder);
+			purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder", current_folder);
 		}
 		g_free(current_folder);
 	}
@@ -1455,9 +1455,9 @@
 
 	if (current_folder != NULL) {
 		if (data->u.file.savedialog) {
-			purple_prefs_set_path("/purple/gtk/filelocations/last_save_folder", current_folder);
+			purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder", current_folder);
 		} else {
-			purple_prefs_set_path("/purple/gtk/filelocations/last_open_folder", current_folder);
+			purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder", current_folder);
 		}
 		g_free(current_folder);
 	}
@@ -1524,9 +1524,9 @@
 	gtk_dialog_set_default_response(GTK_DIALOG(filesel), GTK_RESPONSE_ACCEPT);
 
 	if (savedialog) {
-		current_folder = purple_prefs_get_path("/purple/gtk/filelocations/last_save_folder");
+		current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder");
 	} else {
-		current_folder = purple_prefs_get_path("/purple/gtk/filelocations/last_open_folder");
+		current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder");
 	}
 
 	if ((filename != NULL) && (*filename != '\0')) {
@@ -1559,9 +1559,9 @@
 			title ? title : (savedialog ? _("Save File...")
 				: _("Open File...")));
 	if (savedialog) {
-		current_folder = purple_prefs_get_path("/purple/gtk/filelocations/last_save_folder");
+		current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_save_folder");
 	} else {
-		current_folder = purple_prefs_get_path("/purple/gtk/filelocations/last_open_folder");
+		current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_open_folder");
 	}
 	if (current_folder != NULL) {
 		gchar *path = g_strdup_printf("%s%s", current_folder, G_DIR_SEPARATOR_S);
--- a/pidgin/gtksavedstatuses.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtksavedstatuses.c	Sun Apr 15 00:15:32 2007 +0000
@@ -521,8 +521,8 @@
 {
 	if (GTK_WIDGET_VISIBLE(widget))
 	{
-		purple_prefs_set_int("/purple/gtk/status/dialog/width",  event->width);
-		purple_prefs_set_int("/purple/gtk/status/dialog/height", event->height);
+		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/status/dialog/width",  event->width);
+		purple_prefs_set_int(PIDGIN_PREFS_ROOT "/status/dialog/height", event->height);
 	}
 
 	return FALSE;
@@ -547,8 +547,8 @@
 
 	status_window = dialog = g_new0(StatusWindow, 1);
 
-	width  = purple_prefs_get_int("/purple/gtk/status/dialog/width");
-	height = purple_prefs_get_int("/purple/gtk/status/dialog/height");
+	width  = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/status/dialog/width");
+	height = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/status/dialog/height");
 
 	dialog->window = win = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_default_size(GTK_WINDOW(win), width, height);
@@ -1768,10 +1768,10 @@
 void
 pidgin_status_init(void)
 {
-	purple_prefs_add_none("/purple/gtk/status");
-	purple_prefs_add_none("/purple/gtk/status/dialog");
-	purple_prefs_add_int("/purple/gtk/status/dialog/width",  550);
-	purple_prefs_add_int("/purple/gtk/status/dialog/height", 250);
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/status");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/status/dialog");
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/status/dialog/width",  550);
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/status/dialog/height", 250);
 }
 
 void
--- a/pidgin/gtksound.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtksound.c	Sun Apr 15 00:15:32 2007 +0000
@@ -126,7 +126,7 @@
 		has_focus = purple_conversation_has_focus(conv);
 
 		if (!gtkconv->make_sound ||
-			(has_focus && !purple_prefs_get_bool("/purple/gtk/sound/conv_focus")))
+			(has_focus && !purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/conv_focus")))
 		{
 			return;
 		}
@@ -273,36 +273,36 @@
 						gtk_sound_handle, PURPLE_CALLBACK(account_signon_cb),
 						NULL);
 
-	purple_prefs_add_none("/purple/gtk/sound");
-	purple_prefs_add_none("/purple/gtk/sound/enabled");
-	purple_prefs_add_none("/purple/gtk/sound/file");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/login", TRUE);
-	purple_prefs_add_path("/purple/gtk/sound/file/login", "");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/logout", TRUE);
-	purple_prefs_add_path("/purple/gtk/sound/file/logout", "");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/im_recv", TRUE);
-	purple_prefs_add_path("/purple/gtk/sound/file/im_recv", "");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/first_im_recv", FALSE);
-	purple_prefs_add_path("/purple/gtk/sound/file/first_im_recv", "");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/send_im", TRUE);
-	purple_prefs_add_path("/purple/gtk/sound/file/send_im", "");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/join_chat", FALSE);
-	purple_prefs_add_path("/purple/gtk/sound/file/join_chat", "");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/left_chat", FALSE);
-	purple_prefs_add_path("/purple/gtk/sound/file/left_chat", "");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/send_chat_msg", FALSE);
-	purple_prefs_add_path("/purple/gtk/sound/file/send_chat_msg", "");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/chat_msg_recv", FALSE);
-	purple_prefs_add_path("/purple/gtk/sound/file/chat_msg_recv", "");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/nick_said", FALSE);
-	purple_prefs_add_path("/purple/gtk/sound/file/nick_said", "");
-	purple_prefs_add_bool("/purple/gtk/sound/enabled/pounce_default", TRUE);
-	purple_prefs_add_path("/purple/gtk/sound/file/pounce_default", "");
-	purple_prefs_add_bool("/purple/gtk/sound/conv_focus", TRUE);
-	purple_prefs_add_bool("/purple/gtk/sound/mute", FALSE);
-	purple_prefs_add_path("/purple/gtk/sound/command", "");
-	purple_prefs_add_string("/purple/gtk/sound/method", "automatic");
-	purple_prefs_add_int("/purple/gtk/sound/volume", 50);
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/sound");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/sound/enabled");
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/sound/file");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/login", TRUE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/login", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/logout", TRUE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/logout", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/im_recv", TRUE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/im_recv", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/first_im_recv", FALSE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/first_im_recv", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/send_im", TRUE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/send_im", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/join_chat", FALSE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/join_chat", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/left_chat", FALSE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/left_chat", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/send_chat_msg", FALSE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/send_chat_msg", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/chat_msg_recv", FALSE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/chat_msg_recv", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/nick_said", FALSE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/nick_said", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/enabled/pounce_default", TRUE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/file/pounce_default", "");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/conv_focus", TRUE);
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/sound/mute", FALSE);
+	purple_prefs_add_path(PIDGIN_PREFS_ROOT "/sound/command", "");
+	purple_prefs_add_string(PIDGIN_PREFS_ROOT "/sound/method", "automatic");
+	purple_prefs_add_int(PIDGIN_PREFS_ROOT "/sound/volume", 50);
 
 #ifdef USE_GSTREAMER
 	purple_debug_info("sound", "Initializing sound output drivers.\n");
@@ -397,10 +397,10 @@
 	GstBus *bus = NULL;
 #endif
 
-	if (purple_prefs_get_bool("/purple/gtk/sound/mute"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/sound/mute"))
 		return;
 
-	method = purple_prefs_get_string("/purple/gtk/sound/method");
+	method = purple_prefs_get_string(PIDGIN_PREFS_ROOT "/sound/method");
 
 	if (!strcmp(method, "none")) {
 		return;
@@ -420,7 +420,7 @@
 		char *command;
 		GError *error = NULL;
 
-		sound_cmd = purple_prefs_get_path("/purple/gtk/sound/command");
+		sound_cmd = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/sound/command");
 
 		if (!sound_cmd || *sound_cmd == '\0') {
 			purple_debug_error("gtksound",
@@ -445,7 +445,7 @@
 #ifdef USE_GSTREAMER
 	if (gst_init_failed)  /* Perhaps do gdk_beep instead? */
 		return;
-	volume = (float)(CLAMP(purple_prefs_get_int("/purple/gtk/sound/volume"),0,100)) / 50;
+	volume = (float)(CLAMP(purple_prefs_get_int(PIDGIN_PREFS_ROOT "/sound/volume"),0,100)) / 50;
 	if (!strcmp(method, "automatic")) {
 		if (purple_running_gnome()) {
 			sink = gst_element_factory_make("gconfaudiosink", "sink");
@@ -468,7 +468,11 @@
 	}
 
 	play = gst_element_factory_make("playbin", "play");
-
+	
+	if (play == NULL) {
+		return;
+	}
+	
 	uri = g_strdup_printf("file://%s", filename);
 
 	g_object_set(G_OBJECT(play), "uri", uri,
@@ -520,9 +524,9 @@
 		return;
 	}
 
-	enable_pref = g_strdup_printf("/purple/gtk/sound/enabled/%s",
+	enable_pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/enabled/%s",
 			sounds[event].pref);
-	file_pref = g_strdup_printf("/purple/gtk/sound/file/%s", sounds[event].pref);
+	file_pref = g_strdup_printf(PIDGIN_PREFS_ROOT "/sound/file/%s", sounds[event].pref);
 
 	/* check NULL for sounds that don't have an option, ie buddy pounce */
 	if (purple_prefs_get_bool(enable_pref)) {
--- a/pidgin/gtkstatusbox.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Sun Apr 15 00:15:32 2007 +0000
@@ -249,7 +249,7 @@
 		menu_item = pidgin_new_item_from_stock(box->icon_box_menu, _("Remove"), GTK_STOCK_REMOVE,
 						     G_CALLBACK(remove_buddy_icon_cb),
 						     box, 0, 0, NULL);
-		if (purple_prefs_get_path("/purple/gtk/accounts/buddyicon") == NULL)
+		if (purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon") == NULL)
 			gtk_widget_set_sensitive(menu_item, FALSE);
 
 		gtk_menu_popup(GTK_MENU(box->icon_box_menu), NULL, NULL, NULL, NULL,
@@ -379,7 +379,7 @@
 	}
 	else
 	{
-		pidgin_status_box_set_buddy_icon(status_box, purple_prefs_get_path("/purple/gtk/accounts/buddyicon"));
+		pidgin_status_box_set_buddy_icon(status_box, purple_prefs_get_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon"));
 	}
 
 	status_box->hand_cursor = gdk_cursor_new (GDK_HAND2);
@@ -1496,7 +1496,7 @@
 {
 	if (box->account == NULL)
 		/* The pref-connect callback does the actual work */
-		purple_prefs_set_path("/purple/gtk/accounts/buddyicon", NULL);
+		purple_prefs_set_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon", NULL);
 	else
 		buddy_icon_set_cb(NULL, box);
 
@@ -1511,7 +1511,7 @@
 	if (filename) {
 		if (box->account == NULL)
 			/* The pref-connect callback does the actual work */
-			purple_prefs_set_path("/purple/gtk/accounts/buddyicon", filename);
+			purple_prefs_set_path(PIDGIN_PREFS_ROOT "/accounts/buddyicon", filename);
 		else
 			buddy_icon_set_cb(filename, box);
 	}
@@ -1732,7 +1732,7 @@
 	g_signal_connect_swapped(G_OBJECT(status_box->imhtml), "message_send", G_CALLBACK(remove_typing_cb), status_box);
 	gtk_imhtml_set_editable(GTK_IMHTML(status_box->imhtml), TRUE);
 #ifdef USE_GTKSPELL
-	if (purple_prefs_get_bool("/purple/gtk/conversations/spellcheck"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck"))
 		pidgin_setup_gtkspell(GTK_TEXT_VIEW(status_box->imhtml));
 #endif
 	gtk_widget_set_parent(status_box->vbox, GTK_WIDGET(status_box));
@@ -1771,9 +1771,9 @@
 						PURPLE_CALLBACK(account_status_changed_cb),
 						status_box);
 
-	purple_prefs_connect_callback(status_box, "/purple/gtk/conversations/spellcheck",
+	purple_prefs_connect_callback(status_box, PIDGIN_PREFS_ROOT "/conversations/spellcheck",
 								spellcheck_prefs_cb, status_box);
-	purple_prefs_connect_callback(status_box, "/purple/gtk/accounts/buddyicon",
+	purple_prefs_connect_callback(status_box, PIDGIN_PREFS_ROOT "/accounts/buddyicon",
 	                            update_buddyicon_cb, status_box);
 	purple_signal_connect(purple_get_core(), "uri-handler", status_box,
 					PURPLE_CALLBACK(statusbox_uri_handler), status_box);
@@ -1875,7 +1875,7 @@
 		GtkTextDirection dir = gtk_widget_get_direction(widget);
 		parent_alc.width -= (parent_alc.height + border_width);
 		icon_alc = parent_alc;
-		icon_alc.height = MAX(1,req.height) - (border_width*2) -2;
+		icon_alc.height = MAX(1, icon_alc.height) - 2;
 		icon_alc.width = icon_alc.height;
 		if (dir == GTK_TEXT_DIR_RTL) {
 			icon_alc.x = parent_alc.x;
@@ -2416,6 +2416,8 @@
 		{
 			PurpleSavedStatus *saved_status;
 			saved_status = purple_savedstatus_get_current();
+			if (purple_savedstatus_get_type(saved_status) == PURPLE_STATUS_AVAILABLE)
+				saved_status = purple_savedstatus_new(NULL, PURPLE_STATUS_AWAY);
 			pidgin_status_editor_show(FALSE,
 				purple_savedstatus_is_transient(saved_status)
 					? saved_status : NULL);
--- a/pidgin/gtkthemes.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkthemes.c	Sun Apr 15 00:15:32 2007 +0000
@@ -318,7 +318,7 @@
 {
 	GSList *l;
 	const char *current_theme =
-		purple_prefs_get_string("/purple/gtk/smileys/theme");
+		purple_prefs_get_string(PIDGIN_PREFS_ROOT "/smileys/theme");
 
 	pidginthemes_smiley_theme_probe();
 
--- a/pidgin/gtkutils.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/gtkutils.c	Sun Apr 15 00:15:32 2007 +0000
@@ -161,7 +161,7 @@
 	gtk_imhtml_set_format_functions(GTK_IMHTML(imhtml), GTK_IMHTML_ALL ^ GTK_IMHTML_IMAGE);
 	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(imhtml), GTK_WRAP_WORD_CHAR);
 #ifdef USE_GTKSPELL
-	if (editable && purple_prefs_get_bool("/purple/gtk/conversations/spellcheck"))
+	if (editable && purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/spellcheck"))
 		pidgin_setup_gtkspell(GTK_TEXT_VIEW(imhtml));
 #endif
 	gtk_widget_show(imhtml);
@@ -2209,7 +2209,7 @@
 	filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog->icon_filesel));
 	current_folder = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dialog->icon_filesel));
 	if (current_folder != NULL) {
-		purple_prefs_set_path("/purple/gtk/filelocations/last_icon_folder", current_folder);
+		purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder", current_folder);
 		g_free(current_folder);
 	}
 
@@ -2232,7 +2232,7 @@
 
 	current_folder = g_path_get_dirname(filename);
 	if (current_folder != NULL) {
-		purple_prefs_set_path("/purple/gtk/filelocations/last_icon_folder", current_folder);
+		purple_prefs_set_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder", current_folder);
 		g_free(current_folder);
 	}
 
@@ -2329,7 +2329,7 @@
 		return NULL;
 	}
 
-	current_folder = purple_prefs_get_path("/purple/gtk/filelocations/last_icon_folder");
+	current_folder = purple_prefs_get_path(PIDGIN_PREFS_ROOT "/filelocations/last_icon_folder");
 #if GTK_CHECK_VERSION(2,4,0) /* FILECHOOSER */
 
 	dialog->icon_filesel = gtk_file_chooser_dialog_new(_("Buddy Icon"),
@@ -2940,7 +2940,7 @@
 		   primary_esc, secondary ? "\n" : "", secondary?secondary_esc:"");
 	g_free(primary_esc);
 	label = gtk_label_new(NULL);
-	gtk_widget_set_size_request(label, purple_prefs_get_int("/purple/gtk/blist/width")-25,-1);
+	gtk_widget_set_size_request(label, purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/width")-25,-1);
 	gtk_label_set_markup(GTK_LABEL(label), label_text);
         gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
         gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
--- a/pidgin/pidgin-uninstalled.pc.in	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/pidgin-uninstalled.pc.in	Sun Apr 15 00:15:32 2007 +0000
@@ -9,4 +9,4 @@
 Description: Pidgin is a GTK2-based instant messenger application.
 Version: @VERSION@
 Requires: gtk+-2.0 purple
-Cflags: -I${pc_top_builddir}/${pcfiledir}
+Cflags: -I${pcfiledir}
--- a/pidgin/pidgin.h	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/pidgin.h	Sun Apr 15 00:15:32 2007 +0000
@@ -39,7 +39,11 @@
 /**
  * Our UI's identifier.
  */
-#define PIDGIN_UI "pidgin"
+/* leave this as gtk-gaim until we have a decent way to migrate UI-prefs */
+#define PIDGIN_UI "gtk-gaim"
+
+/* change this only when we have a sane upgrade path for old prefs */
+#define PIDGIN_PREFS_ROOT "/gaim/gtk"
 
 #ifndef _WIN32
 # define PIDGIN_ALERT_TITLE ""
@@ -68,7 +72,7 @@
 #if !GTK_CHECK_VERSION(2,6,0)
 #   include "gtkcellview.h"
 #   include "gtkcellviewmenuitem.h"
-#   include "purplecombobox.h"
+#   include "pidgincombobox.h"
 #   if !GTK_CHECK_VERSION(2,4,0)
 #       include "gtkcelllayout.h"
 #   endif /* Less than GTK+ 2.4 */
--- a/pidgin/plugins/crazychat/configure.ac	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/plugins/crazychat/configure.ac	Sun Apr 15 00:15:32 2007 +0000
@@ -1376,8 +1376,6 @@
 	LDFLAGS="$orig_LDFLAGS"
 fi
 
-AM_BINRELOC
-
 AC_MSG_CHECKING(for me pot o' gold)
 AC_MSG_RESULT(no)
 AC_CHECK_FUNCS(gethostid lrand48)
--- a/pidgin/plugins/extplacement.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/plugins/extplacement.c	Sun Apr 15 00:15:32 2007 +0000
@@ -79,7 +79,7 @@
 {
 	pidgin_conv_placement_add_fnc("number", _("By conversation count"),
 							   &conv_placement_by_number);
-	purple_prefs_trigger_callback("/purple/gtk/conversations/placement");
+	purple_prefs_trigger_callback(PIDGIN_PREFS_ROOT "/conversations/placement");
 	return TRUE;
 }
 
@@ -87,7 +87,7 @@
 plugin_unload(PurplePlugin *plugin)
 {
 	pidgin_conv_placement_remove_fnc("number");
-	purple_prefs_trigger_callback("/purple/gtk/conversations/placement");
+	purple_prefs_trigger_callback(PIDGIN_PREFS_ROOT "/conversations/placement");
 	return TRUE;
 }
 
@@ -127,10 +127,10 @@
 	PURPLE_MAJOR_VERSION,
 	PURPLE_MINOR_VERSION,
 	PURPLE_PLUGIN_STANDARD,							/**< type			*/
-	PIDGIN_PLUGIN_TYPE,							/**< ui_requirement	*/
+	PIDGIN_PLUGIN_TYPE,								/**< ui_requirement	*/
 	0,												/**< flags			*/
 	NULL,											/**< dependencies	*/
-	PURPLE_PRIORITY_DEFAULT,							/**< priority		*/
+	PURPLE_PRIORITY_DEFAULT,						/**< priority		*/
 	"gtk-extplacement",								/**< id				*/
 	N_("ExtPlacement"),								/**< name			*/
 	VERSION,										/**< version		*/
--- a/pidgin/plugins/musicmessaging/Makefile.am	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/plugins/musicmessaging/Makefile.am	Sun Apr 15 00:15:32 2007 +0000
@@ -1,14 +1,14 @@
 EXTRA_DIST = \
 	music.png
 
-musicmessagingdir = $(libdir)/gaim
+musicmessagingdir = $(libdir)/pidgin
 
 musicmessaging_la_LDFLAGS = -module -avoid-version
 
 if PLUGINS
 if ENABLE_DBUS
 
-musicmessagingpixdir = $(datadir)/pixmaps/gaim/buttons
+musicmessagingpixdir = $(datadir)/pixmaps/pidgin/buttons
 musicmessagingpix_DATA = music.png
 
 musicmessaging_LTLIBRARIES = musicmessaging.la
--- a/pidgin/plugins/musicmessaging/musicmessaging.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/plugins/musicmessaging/musicmessaging.c	Sun Apr 15 00:15:32 2007 +0000
@@ -683,7 +683,7 @@
 static void
 init_plugin(PurplePlugin *plugin) {
 	purple_prefs_add_none("/plugins/gtk/musicmessaging");
-	purple_prefs_add_string("/plugins/gtk/musicmessaging/editor_path", "/usr/local/bin/gscore");
+	purple_prefs_add_string("/plugins/gtk/musicmessaging/editor_path", "/usr/bin/gscore");
 }
 
 PURPLE_INIT_PLUGIN(musicmessaging, init_plugin, info);
--- a/pidgin/plugins/timestamp.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/plugins/timestamp.c	Sun Apr 15 00:15:32 2007 +0000
@@ -31,6 +31,7 @@
 
 #include "gtkimhtml.h"
 #include "gtkplugin.h"
+#include "gtkprefs.h"
 #include "gtkutils.h"
 
 #define TIMESTAMP_PLUGIN_ID "gtk-timestamp"
@@ -63,7 +64,7 @@
 	if (((y + height) - (rect.y + rect.height)) > height &&
 	    gtk_text_buffer_get_char_count(buffer)) {
 		gboolean smooth = purple_prefs_get_bool(
-			"/purple/gtk/conversations/use_smooth_scrolling");
+			PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling");
 		gtk_imhtml_scroll_to_end(GTK_IMHTML(imhtml), smooth);
 	}
 }
--- a/pidgin/plugins/win32/winprefs/winprefs.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/plugins/win32/winprefs/winprefs.c	Sun Apr 15 00:15:32 2007 +0000
@@ -164,7 +164,7 @@
 	if (handle != NULL)
 		blist_visible_cb_id =
 			purple_prefs_connect_callback(handle,
-				"/purple/gtk/blist/list_visible",
+				PIDGIN_PREFS_ROOT "/blist/list_visible",
 				blist_visible_cb, NULL);
 
 	return FALSE;
--- a/pidgin/win32/gtkwin32dep.c	Sun Apr 15 00:14:34 2007 +0000
+++ b/pidgin/win32/gtkwin32dep.c	Sun Apr 15 00:15:32 2007 +0000
@@ -318,7 +318,7 @@
 winpidgin_conv_im_blink(PurpleAccount *account, const char *who, char **message,
 		PurpleConversation *conv, PurpleMessageFlags flags, void *data)
 {
-	if (purple_prefs_get_bool("/purple/gtk/win32/blink_im"))
+	if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/win32/blink_im"))
 		winpidgin_conv_blink(conv, flags);
 	return FALSE;
 }
@@ -346,8 +346,8 @@
 
 void winpidgin_post_init(void) {
 
-	purple_prefs_add_none("/purple/gtk/win32");
-	purple_prefs_add_bool("/purple/gtk/win32/blink_im", TRUE);
+	purple_prefs_add_none(PIDGIN_PREFS_ROOT "/win32");
+	purple_prefs_add_bool(PIDGIN_PREFS_ROOT "/win32/blink_im", TRUE);
 
 	purple_signal_connect(pidgin_conversations_get_handle(),
 		"displaying-im-msg", &gtkwin32_handle, PURPLE_CALLBACK(winpidgin_conv_im_blink),
--- a/po/ChangeLog	Sun Apr 15 00:14:34 2007 +0000
+++ b/po/ChangeLog	Sun Apr 15 00:15:32 2007 +0000
@@ -1,14 +1,3 @@
-2007-01-24  gettextize  <bug-gnu-gettext@gnu.org>
-
-	* Makefile.in.in: Upgrade to gettext-0.14.5.
-	* Rules-quot: New file, from gettext-0.14.5.
-	* boldquot.sed: New file, from gettext-0.14.5.
-	* en@boldquot.header: New file, from gettext-0.14.5.
-	* en@quot.header: New file, from gettext-0.14.5.
-	* insert-header.sin: New file, from gettext-0.14.5.
-	* quot.sed: New file, from gettext-0.14.5.
-	* remove-potcdate.sin: New file, from gettext-0.14.5.
-
 Gaim: The Pimpin' Penguin IM Clone that's good for the soul!
 
 version 2.0.0:
--- a/po/eo.po	Sun Apr 15 00:14:34 2007 +0000
+++ b/po/eo.po	Sun Apr 15 00:15:32 2007 +0000
@@ -1,16 +1,14 @@
-# translation of eo.po to Esperanto
-# Gaim Esperanto translation
+# translation of pidgin.po to Esperanto
 #
 # Copyright (C) 2006, Stéphane Fillod <fillods@users.sourceforge.net>
 #
 # Stéphane Fillod <f8cfe@free.fr>, 2006, 2007.
-# This file is distributed under the same license as the Gaim package.
-msgid ""
-msgstr ""
-"Project-Id-Version: eo\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-25 00:00-0500\n"
-"PO-Revision-Date: 2007-03-31 14:24+0100\n"
+# This file is distributed under the same license as the Pidgin package.
+msgid ""
+msgstr ""
+"Project-Id-Version: pidgin\n"
+"POT-Creation-Date: 2007-04-09 08:32-0400\n"
+"PO-Revision-Date: 2007-04-13 13:01+0200\n"
 "Last-Translator: Stéphane Fillod <f8cfe@free.fr>\n"
 "Language-Team: Esperanto <kde-i18n-eo@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -19,678 +17,12 @@
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: ../gaim.desktop.in.h:1
-msgid "Gaim Internet Messenger"
-msgstr "Gaim Interreta Mesaĝilo"
-
-#: ../gaim.desktop.in.h:2
-msgid "Internet Messenger"
-msgstr "Interreta Mesaĝilo"
-
-#: ../gaim.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "Sendu tujmesaĝojn per pluraj protokoloj"
-
-#: ../console/gntaccount.c:119 ../console/gntblist.c:272
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
-#: ../console/gntplugin.c:154 ../console/gntplugin.c:199
-#: ../console/gntstatus.c:291 ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c:1399
-#: ../libgaim/protocols/jabber/chat.c:679
-#: ../libgaim/protocols/jabber/chat.c:690
-#: ../libgaim/protocols/jabber/jabber.c:1210
-#: ../libgaim/protocols/qq/group_join.c:324
-#: ../libgaim/protocols/silc/ops.c:1451
-msgid "Error"
-msgstr "Eraro"
-
-#: ../console/gntaccount.c:119
-msgid "Account was not added"
-msgstr "Konto ne estis aldonita"
-
-#: ../console/gntaccount.c:120
-msgid "Screenname of an account must be non-empty."
-msgstr "Ekrannomo de konto ne devas esti malplena."
-
-#: ../console/gntaccount.c:423 ../gtk/gtkaccount.c:567
-msgid "New mail notifications"
-msgstr "Nova retpoŝto avizoj"
-
-#: ../console/gntaccount.c:433 ../gtk/gtkaccount.c:496
-msgid "Remember password"
-msgstr "Memoru pasvorton"
-
-#: ../console/gntaccount.c:474 ../gtk/gtkaccount.c:1430 ../gtk/gtkblist.c:3868
-msgid "Modify Account"
-msgstr "Ŝanĝu Konton"
-
-#: ../console/gntaccount.c:474
-msgid "New Account"
-msgstr "Nova Konto"
-
-#: ../console/gntaccount.c:500 ../gtk/gtkaccount.c:407 ../gtk/gtkft.c:695
-msgid "Protocol:"
-msgstr "Protokolo:"
-
-#: ../console/gntaccount.c:508 ../gtk/gtkaccount.c:412 ../gtk/gtkblist.c:5229
-#: ../gtk/plugins/gevolution/new_person_dialog.c:295
-msgid "Screen name:"
-msgstr "Ekrannomo:"
-
-#: ../console/gntaccount.c:521 ../gtk/gtkaccount.c:487
-msgid "Password:"
-msgstr "Pasvorton:"
-
-#: ../console/gntaccount.c:531 ../gtk/gtkblist.c:5250 ../gtk/gtkblist.c:5613
-msgid "Alias:"
-msgstr "Alinomo:"
-
-#. Cancel
-#: ../console/gntaccount.c:554 ../console/gntaccount.c:615
-#: ../console/gntaccount.c:834 ../console/gntblist.c:313
-#: ../console/gntblist.c:380 ../console/gntblist.c:413
-#: ../console/gntblist.c:737 ../console/gntblist.c:906
-#: ../console/gntblist.c:997 ../console/gntblist.c:2021
-#: ../console/gntprefs.c:224 ../console/gntstatus.c:139
-#: ../console/gntstatus.c:472 ../console/gntstatus.c:597
-#: ../gtk/gtkaccount.c:1866 ../gtk/gtkaccount.c:2433 ../gtk/gtkblist.c:5669
-#: ../gtk/gtkdialogs.c:685 ../gtk/gtkdialogs.c:822 ../gtk/gtkdialogs.c:913
-#: ../gtk/gtkdialogs.c:932 ../gtk/gtkdialogs.c:954 ../gtk/gtkdialogs.c:974
-#: ../gtk/gtkdialogs.c:1018 ../gtk/gtkdialogs.c:1056 ../gtk/gtkdialogs.c:1110
-#: ../gtk/gtkdialogs.c:1147 ../gtk/gtkdialogs.c:1172
-#: ../gtk/gtkimhtmltoolbar.c:419 ../gtk/gtkplugin.c:286
-#: ../gtk/gtkpounce.c:1098 ../gtk/gtkprivacy.c:566 ../gtk/gtkprivacy.c:579
-#: ../gtk/gtkprivacy.c:604 ../gtk/gtkprivacy.c:615 ../gtk/gtkrequest.c:270
-#: ../gtk/gtksavedstatuses.c:336 ../libgaim/account.c:961
-#: ../libgaim/account.c:1149 ../libgaim/account.c:1183
-#: ../libgaim/conversation.c:1164 ../libgaim/plugins/buddynote.c:51
-#: ../libgaim/protocols/gg/gg.c:498 ../libgaim/protocols/gg/gg.c:656
-#: ../libgaim/protocols/gg/gg.c:792 ../libgaim/protocols/gg/gg.c:871
-#: ../libgaim/protocols/jabber/buddy.c:588
-#: ../libgaim/protocols/jabber/buddy.c:1761
-#: ../libgaim/protocols/jabber/buddy.c:1795
-#: ../libgaim/protocols/jabber/chat.c:788
-#: ../libgaim/protocols/jabber/jabber.c:861
-#: ../libgaim/protocols/jabber/jabber.c:1365
-#: ../libgaim/protocols/jabber/xdata.c:338 ../libgaim/protocols/msn/msn.c:249
-#: ../libgaim/protocols/msn/msn.c:264 ../libgaim/protocols/msn/msn.c:279
-#: ../libgaim/protocols/msn/msn.c:294 ../libgaim/protocols/msn/msn.c:311
-#: ../libgaim/protocols/oscar/oscar.c:6043
-#: ../libgaim/protocols/oscar/peer.c:1021
-#: ../libgaim/protocols/qq/buddy_info.c:484
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/buddy_opt.c:402 ../libgaim/protocols/qq/group.c:124
-#: ../libgaim/protocols/qq/group_join.c:138
-#: ../libgaim/protocols/qq/group_join.c:359
-#: ../libgaim/protocols/qq/group_opt.c:142
-#: ../libgaim/protocols/qq/group_opt.c:392
-#: ../libgaim/protocols/qq/sys_msg.c:104 ../libgaim/protocols/qq/sys_msg.c:159
-#: ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:3410
-#: ../libgaim/protocols/sametime/sametime.c:3495
-#: ../libgaim/protocols/sametime/sametime.c:3665
-#: ../libgaim/protocols/sametime/sametime.c:5409
-#: ../libgaim/protocols/sametime/sametime.c:5498
-#: ../libgaim/protocols/sametime/sametime.c:5622
-#: ../libgaim/protocols/silc/buddy.c:467
-#: ../libgaim/protocols/silc/buddy.c:1078
-#: ../libgaim/protocols/silc/buddy.c:1183 ../libgaim/protocols/silc/chat.c:597
-#: ../libgaim/protocols/silc/chat.c:726 ../libgaim/protocols/silc/ops.c:1912
-#: ../libgaim/protocols/silc/silc.c:750 ../libgaim/protocols/silc/silc.c:955
-#: ../libgaim/protocols/yahoo/yahoo.c:961
-#: ../libgaim/protocols/yahoo/yahoo.c:3208
-#: ../libgaim/protocols/yahoo/yahoo.c:3217
-msgid "Cancel"
-msgstr "Rezignu"
-
-#. Save
-#: ../console/gntaccount.c:558 ../console/gntprefs.c:224
-#: ../console/gntstatus.c:475 ../console/gntstatus.c:585 ../gtk/gtkdebug.c:762
-#: ../gtk/gtkrequest.c:276 ../libgaim/account.c:1182
-#: ../libgaim/plugins/buddynote.c:50 ../libgaim/protocols/jabber/buddy.c:587
-msgid "Save"
-msgstr "Konservu"
-
-#: ../console/gntaccount.c:610 ../gtk/gtkaccount.c:1860
-#: ../gtk/gtksavedstatuses.c:328
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "Ĉu vi certas vi volas forigi %s-n?"
-
-#. Close any other opened delete window
-#: ../console/gntaccount.c:614
-msgid "Delete Account"
-msgstr "Forigu Konton"
-
-#: ../console/gntaccount.c:615 ../console/gntaccount.c:681
-#: ../console/gntstatus.c:139 ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1865 ../gtk/gtkpounce.c:1097 ../gtk/gtkrequest.c:273
-#: ../gtk/gtksavedstatuses.c:335
-msgid "Delete"
-msgstr "Forigu"
-
-#: ../console/gntaccount.c:644 ../console/gntblist.c:1927
-#: ../console/gntui.c:70 ../gtk/gtkaccount.c:2259 ../gtk/gtkdocklet.c:543
-msgid "Accounts"
-msgstr "Kontoj"
-
-#: ../console/gntaccount.c:650
-msgid "You can enable/disable accounts from the following list."
-msgstr "Vi povas ŝalti/malŝalti kontojn de la jena listo."
-
-#: ../console/gntaccount.c:673 ../console/gntaccount.c:833
-#: ../console/gntblist.c:313 ../console/gntblist.c:380
-#: ../console/gntblist.c:413 ../console/gntnotify.c:309
-#: ../console/gntstatus.c:191 ../gtk/gtkaccount.c:2432 ../gtk/gtkblist.c:5668
-#: ../gtk/gtkconv.c:1654 ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870 ../libgaim/protocols/qq/sys_msg.c:104
-#: ../libgaim/protocols/qq/sys_msg.c:159 ../libgaim/protocols/qq/sys_msg.c:247
-#: ../libgaim/protocols/sametime/sametime.c:5497
-#: ../libgaim/protocols/silc/chat.c:596
-msgid "Add"
-msgstr "Aldonu"
-
-#: ../console/gntaccount.c:677
-msgid "Modify"
-msgstr "Ŝanĝu"
-
-#: ../console/gntaccount.c:758 ../gtk/gtkaccount.c:2379
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s faris %s-n sia kunul%s%s"
-
-#: ../console/gntaccount.c:831 ../gtk/gtkaccount.c:2431
-msgid "Add buddy to your list?"
-msgstr "Aldonu kunulon al via listo?"
-
-#: ../console/gntblist.c:264
-msgid "You must provide a screename for the buddy."
-msgstr "Vi devas enigi ekrannomon por la kunul."
-
-#: ../console/gntblist.c:266
-msgid "You must provide a group."
-msgstr "Vi devas enigi grupon."
-
-#: ../console/gntblist.c:268
-msgid "You must select an account."
-msgstr "Vi devas elekti konton."
-
-#: ../console/gntblist.c:272
-msgid "Error adding buddy"
-msgstr "Eraro aldonante kunul"
-
-#: ../console/gntblist.c:297 ../gtk/gtkaccount.c:1941
-#: ../gtk/gtksavedstatuses.c:923 ../libgaim/protocols/oscar/oscar.c:2849
-msgid "Screen Name"
-msgstr "Ekranonomo"
-
-#: ../console/gntblist.c:300 ../console/gntblist.c:372 ../gtk/gtkdialogs.c:931
-#: ../gtk/gtkdialogs.c:953 ../gtk/gtkdialogs.c:973 ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/msn/msn.c:1362 ../libgaim/protocols/silc/chat.c:587
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
-#: ../libgaim/protocols/zephyr/zephyr.c:789
-#: ../libgaim/protocols/zephyr/zephyr.c:1207
-msgid "Alias"
-msgstr "Alinomo"
-
-#: ../console/gntblist.c:303 ../console/gntblist.c:375
-msgid "Group"
-msgstr "Grupo"
-
-#: ../console/gntblist.c:306 ../console/gntblist.c:363
-#: ../console/gntblist.c:1166 ../console/gntnotify.c:155
-#: ../console/gntstatus.c:563 ../gtk/gtkblist.c:2710 ../gtk/gtknotify.c:467
-#: ../gtk/gtkpounce.c:1265 ../gtk/plugins/gevolution/gevolution.c:444
-#: ../libgaim/plugins/idle.c:153 ../libgaim/plugins/idle.c:189
-msgid "Account"
-msgstr "Konto"
-
-#: ../console/gntblist.c:312 ../console/gntblist.c:784 ../gtk/gtkblist.c:5183
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:447
-#: ../libgaim/protocols/silc/buddy.c:736
-#: ../libgaim/protocols/silc/buddy.c:1030
-#: ../libgaim/protocols/silc/buddy.c:1075
-#: ../libgaim/protocols/silc/buddy.c:1174
-#: ../libgaim/protocols/yahoo/yahoo.c:3122
-msgid "Add Buddy"
-msgstr "Aldonu Kunulon"
-
-#: ../console/gntblist.c:312
-msgid "Please enter buddy information."
-msgstr "B.v. enigi kunul informon."
-
-#: ../console/gntblist.c:335 ../libgaim/blist.c:1195
-msgid "Chats"
-msgstr "Babilejoj"
-
-#. Extract their Name and put it in
-#: ../console/gntblist.c:369 ../gtk/gtkplugin.c:579 ../gtk/gtkroomlist.c:621
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
-#: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:792
-#: ../libgaim/protocols/msn/msn.c:1535 ../libgaim/protocols/msn/msn.c:1600
-#: ../libgaim/protocols/msn/msn.c:1627 ../libgaim/protocols/qq/buddy_info.c:44
-msgid "Name"
-msgstr "Nomo"
-
-#: ../console/gntblist.c:378 ../console/gntblist.c:786 ../gtk/gtkblist.c:5559
-msgid "Add Chat"
-msgstr "Aldonu Babilejon"
-
-#: ../console/gntblist.c:379
-msgid "You can edit more information from the context menu later."
-msgstr "Vi povas redakti plian informon per la ĉirkaŭteksto menuo poste."
-
-#: ../console/gntblist.c:390 ../console/gntblist.c:403
-msgid "Error adding group"
-msgstr "Eraro aldonante grupo"
-
-#: ../console/gntblist.c:391
-msgid "You must give a name for the group to add."
-msgstr "Vi devas enigi nomon de la grupo aldonenda."
-
-#: ../console/gntblist.c:404
-msgid "A group with the name already exists."
-msgstr "Grupo samnomita jam ekzistas."
-
-#: ../console/gntblist.c:411 ../console/gntblist.c:788 ../gtk/gtkblist.c:5665
-#: ../libgaim/protocols/sametime/sametime.c:5408
-#: ../libgaim/protocols/sametime/sametime.c:5495
-msgid "Add Group"
-msgstr "Aldonu Grupon"
-
-#: ../console/gntblist.c:411
-msgid "Enter the name of the group"
-msgstr "B.v. enigi la nomon de la grupo"
-
-#: ../console/gntblist.c:736
-msgid "Edit Chat"
-msgstr "Redaktu Babilejon"
-
-#: ../console/gntblist.c:736
-msgid "Please Update the necessary fields."
-msgstr "B.v. Aktualigi la necesajn kampojn."
-
-#: ../console/gntblist.c:737 ../console/gntstatus.c:196
-msgid "Edit"
-msgstr "Redaktu"
-
-#: ../console/gntblist.c:751
-msgid "Auto-join"
-msgstr "Aŭtomate-aliĝu"
-
-#: ../console/gntblist.c:760
-msgid "Edit Settings"
-msgstr "Agordu"
-
-#: ../console/gntblist.c:806 ../libgaim/protocols/silc/chat.c:878
-msgid "Get Info"
-msgstr "Ricevu Informon"
-
-#: ../console/gntblist.c:811
-msgid "Add Buddy Pounce"
-msgstr "Aldonu Kunul Atentigon"
-
-#: ../console/gntblist.c:818 ../gtk/gtkconv.c:1602
-#: ../libgaim/protocols/oscar/oscar.c:633
-msgid "Send File"
-msgstr "Sendu Dosieron"
-
-#: ../console/gntblist.c:822
-msgid "View Log"
-msgstr "Montru Protokolon"
-
-#: ../console/gntblist.c:902
-#, c-format
-msgid "Please enter the new name for %s"
-msgstr "B.v. enigi la novan nomon por %s"
-
-#: ../console/gntblist.c:904 ../console/gntblist.c:905
-#: ../console/gntblist.c:1116
-msgid "Rename"
-msgstr "Alinomu"
-
-#: ../console/gntblist.c:904
-msgid "Enter empty string to reset the name."
-msgstr "Enigu malplenan ĉenon por forviŝi la nomon."
-
-#: ../console/gntblist.c:977
-msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "Forigi tiun kontakton ankaŭ forigos ĉiujn kunulojn en la kontakto"
-
-#: ../console/gntblist.c:985
-msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Forigi tiun grupon ankaŭ forigos ĉiujn kunulojn en la grupo"
-
-#: ../console/gntblist.c:990
-#, c-format
-msgid "Are you sure you want to remove %s?"
-msgstr "Ĉu vi certas vi volas forigi %s?"
-
-#. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:993
-msgid "Confirm Remove"
-msgstr "Konfirmu Forigon"
-
-#: ../console/gntblist.c:996 ../console/gntblist.c:1118 ../gtk/gtkblist.c:1106
-#: ../gtk/gtkconv.c:1651 ../gtk/gtkrequest.c:275 ../gtk/gtkstatusbox.c:248
-msgid "Remove"
-msgstr "Forigu"
-
-#. Buddy List
-#: ../console/gntblist.c:1093 ../console/gntblist.c:2088
-#: ../console/gntprefs.c:219 ../console/gntui.c:71 ../gtk/gtkblist.c:4091
-#: ../gtk/plugins/win32/winprefs/winprefs.c:327
-msgid "Buddy List"
-msgstr "Kunul Listo"
-
-#: ../console/gntblist.c:1123
-msgid "Place tagged"
-msgstr "Loko etikedita"
-
-#: ../console/gntblist.c:1128
-msgid "Toggle Tag"
-msgstr "Inversiga Etikedo"
-
-#. General
-#: ../console/gntblist.c:1161 ../gtk/gtkblist.c:2734
-#: ../libgaim/protocols/gg/gg.c:627 ../libgaim/protocols/gg/gg.c:1035
-#: ../libgaim/protocols/gg/gg.c:1110 ../libgaim/protocols/gg/gg.c:2207
-#: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:814
-#: ../libgaim/protocols/jabber/buddy.c:1562
-#: ../libgaim/protocols/jabber/buddy.c:1744
-#: ../libgaim/protocols/jabber/jabber.c:802
-#: ../libgaim/protocols/msn/msn.c:1370 ../libgaim/protocols/msn/msn.c:1538
-#: ../libgaim/protocols/qq/buddy_info.c:43
-#: ../libgaim/protocols/silc/buddy.c:1528 ../libgaim/protocols/silc/ops.c:1036
-#: ../libgaim/protocols/silc/ops.c:1179 ../libgaim/protocols/silc/ops.c:1328
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1042
-msgid "Nickname"
-msgstr "Karesnomo"
-
-#. Idle stuff
-#: ../console/gntblist.c:1181 ../gtk/gtkblist.c:2754 ../gtk/gtkblist.c:3307
-#: ../gtk/gtkprefs.c:1807 ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:645
-#: ../libgaim/protocols/jabber/buddy.c:683 ../libgaim/protocols/msn/msn.c:548
-#: ../libgaim/protocols/msn/state.c:32
-#: ../libgaim/protocols/novell/novell.c:2860
-#: ../libgaim/protocols/oscar/oscar.c:2873
-#: ../libgaim/protocols/yahoo/yahoo.c:2876
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:686
-msgid "Idle"
-msgstr "Senfara"
-
-#: ../console/gntblist.c:1270
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"Konektita: %d\n"
-"Entute: %d"
-
-#: ../console/gntblist.c:1279
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Konto: %s (%s)"
-
-#: ../console/gntblist.c:1291
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"Laste vidita: antaŭ %s"
-
-#: ../console/gntblist.c:1540 ../gtk/gtkdocklet.c:491
-#: ../gtk/gtkstatusbox.c:1000
-msgid "New..."
-msgstr "Nova..."
-
-#: ../console/gntblist.c:1547 ../gtk/gtkdocklet.c:492
-#: ../gtk/gtkstatusbox.c:1001
-msgid "Saved..."
-msgstr "Konservita..."
-
-#: ../console/gntblist.c:1895 ../console/gntplugin.c:216 ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:544 ../gtk/gtkplugin.c:528
-msgid "Plugins"
-msgstr "Kromaĵoj"
-
-#: ../console/gntblist.c:2002 ../gtk/gtkdialogs.c:666 ../gtk/gtkdialogs.c:803
-#: ../gtk/gtkdialogs.c:883
-msgid "_Name"
-msgstr "_Nomo"
-
-#: ../console/gntblist.c:2007 ../gtk/gtkdialogs.c:671 ../gtk/gtkdialogs.c:808
-#: ../gtk/gtkdialogs.c:888
-msgid "_Account"
-msgstr "_Konto"
-
-#: ../console/gntblist.c:2015 ../gtk/gtkdialogs.c:679
-msgid "New Instant Message"
-msgstr "Nova Tuj Mesaĝo"
-
-#: ../console/gntblist.c:2017 ../gtk/gtkdialogs.c:681
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "B.v. enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias TM-i."
-
-#: ../console/gntblist.c:2020 ../console/gntnotify.c:79 ../gtk/gtkblist.c:3867
-#: ../gtk/gtkdialogs.c:684 ../gtk/gtkdialogs.c:821 ../gtk/gtkdialogs.c:912
-#: ../gtk/gtkrequest.c:269 ../libgaim/account.c:960 ../libgaim/account.c:1148
-#: ../libgaim/protocols/gg/gg.c:497 ../libgaim/protocols/gg/gg.c:655
-#: ../libgaim/protocols/gg/gg.c:791 ../libgaim/protocols/jabber/jabber.c:1364
-#: ../libgaim/protocols/jabber/xdata.c:337 ../libgaim/protocols/msn/msn.c:248
-#: ../libgaim/protocols/msn/msn.c:263 ../libgaim/protocols/msn/msn.c:278
-#: ../libgaim/protocols/msn/msn.c:293 ../libgaim/protocols/oscar/oscar.c:6042
-#: ../libgaim/protocols/silc/buddy.c:466
-#: ../libgaim/protocols/silc/buddy.c:1182 ../libgaim/protocols/silc/chat.c:424
-#: ../libgaim/protocols/silc/chat.c:462 ../libgaim/protocols/silc/chat.c:725
-#: ../libgaim/protocols/silc/ops.c:1297 ../libgaim/protocols/silc/ops.c:1911
-#: ../libgaim/protocols/silc/silc.c:749 ../libgaim/protocols/yahoo/yahoo.c:960
-#: ../libgaim/protocols/yahoo/yahoo.c:3207
-#: ../libgaim/protocols/yahoo/yahoo.c:3216
-msgid "OK"
-msgstr "Daŭrigu"
-
-#. Create the "Options" frame.
-#: ../console/gntblist.c:2039 ../gtk/gtkpounce.c:776
-msgid "Options"
-msgstr "Opcioj"
-
-#: ../console/gntblist.c:2045
-msgid "Send IM..."
-msgstr "Sendu TM-n..."
-
-#: ../console/gntblist.c:2049
-msgid "Toggle offline buddies"
-msgstr "Inversigi senkonektajn kunulojn"
-
-#: ../console/gntblist.c:2053
-msgid "Sort by status"
-msgstr "Ordigi laŭ stato"
-
-#: ../console/gntblist.c:2057
-msgid "Sort alphabetically"
-msgstr "Ordigi alfabete"
-
-#: ../console/gntblist.c:2061
-msgid "Sort by log size"
-msgstr "Oridgi laŭ protokolo grandeco"
-
-#: ../console/gntconn.c:36
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../console/gntconn.c:39
-#, c-format
-msgid "%s disconnected."
-msgstr "%s malkontaktita."
-
-#: ../console/gntconn.c:40
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s estis diskonektigita pro la jena eraro:\n"
-"%s"
-
-#: ../console/gntconn.c:43 ../gtk/gtkblist.c:3865 ../libgaim/account.c:988
-#: ../libgaim/connection.c:107
-msgid "Connection Error"
-msgstr "Konekteraro"
-
-#: ../console/gntconv.c:102
-msgid "No such command."
-msgstr "Nenia komando."
-
-#: ../console/gntconv.c:106 ../gtk/gtkconv.c:505
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr ""
-
-#: ../console/gntconv.c:111 ../gtk/gtkconv.c:510
-msgid "Your command failed for an unknown reason."
-msgstr "Via komanda malsukcesis pro nekonata kialo."
-
-#: ../console/gntconv.c:116 ../gtk/gtkconv.c:516
-msgid "That command only works in chats, not IMs."
-msgstr "Tiu komando nur funkcias en babilejoj, ne TM-oj."
-
-#: ../console/gntconv.c:119 ../gtk/gtkconv.c:519
-msgid "That command only works in IMs, not chats."
-msgstr "Tiu komando nur funkcias en TM-oj, ne babilejoj."
-
-#: ../console/gntconv.c:123 ../gtk/gtkconv.c:523
-msgid "That command doesn't work on this protocol."
-msgstr "Tiu komando ne funkcias je tiu protokolo."
-
-#: ../console/gntconv.c:130
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Komandoj estas ne akceptitaj nune. Mesaĝo NE estis sendita."
-
-#: ../console/gntconv.c:232
-#, c-format
-msgid "%s (%s -- %s)"
-msgstr "%s (%s -- %s)"
-
-#: ../console/gntconv.c:255
-#, c-format
-msgid "%s [%s]"
-msgstr "%s [%s]"
-
-#: ../console/gntconv.c:260 ../console/gntconv.c:432
-#, c-format
-msgid ""
-"\n"
-"%s is typing..."
-msgstr ""
-"\n"
-"%s tajpas..."
-
-#: ../console/gntconv.c:399
-msgid "<AUTO-REPLY> "
-msgstr "<AŬTO-RESPONDO> "
-
-#. Print the list of users in the room
-#: ../console/gntconv.c:501
-msgid "List of users:\n"
-msgstr "Uzantoj Listo:\n"
-
-#: ../console/gntconv.c:625 ../gtk/gtkconv.c:386
-msgid "Supported debug options are:  version"
-msgstr "Subtenitaj sencimigopcioj estas:  versio"
-
-#: ../console/gntconv.c:660 ../gtk/gtkconv.c:422
-msgid "No such command (in this context)."
-msgstr "Nenia komando (en tiu kunteksto)."
-
-#: ../console/gntconv.c:663 ../gtk/gtkconv.c:425
-msgid ""
-"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
-"The following commands are available in this context:\n"
-msgstr ""
-"Uzu \"/help &lt;komandon&gt;\" por helpo pri speciala komando.\n"
-"La komandoj aktuale disponeblaj estas:\n"
-
-#: ../console/gntconv.c:702 ../gtk/gtkconv.c:6824
-msgid ""
-"say &lt;message&gt;:  Send a message normally as if you weren't using a "
-"command."
-msgstr ""
-
-#: ../console/gntconv.c:705 ../gtk/gtkconv.c:6827
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr ""
-
-#: ../console/gntconv.c:708 ../gtk/gtkconv.c:6830
-msgid ""
-"debug &lt;option&gt;:  Send various debug information to the current "
-"conversation."
-msgstr ""
-
-#: ../console/gntconv.c:711 ../gtk/gtkconv.c:6833
-msgid "clear: Clears the conversation scrollback."
-msgstr ""
-
-#: ../console/gntconv.c:714 ../gtk/gtkconv.c:6836
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr ""
-
-#: ../console/gntconv.c:719
-msgid "plugins: Show the plugins window."
-msgstr ""
-
-#: ../console/gntconv.c:722
-msgid "buddylist: Show the buddylist."
-msgstr ""
-
-#: ../console/gntconv.c:725
-msgid "accounts: Show the accounts window."
-msgstr ""
-
-#: ../console/gntconv.c:728
-msgid "debugwin: Show the debug window."
-msgstr ""
-
-#: ../console/gntconv.c:731
-msgid "prefs: Show the preference window."
-msgstr ""
-
-#: ../console/gntconv.c:734
-msgid "statuses: Show the savedstatuses window."
-msgstr ""
-
-#: ../console/gntdebug.c:214 ../console/gntui.c:72 ../gtk/gtkdebug.c:708
-msgid "Debug Window"
-msgstr "Sencimigo Fenestro"
-
-#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
-#. * it's necessary to make the width of the debug window resizable ... like I said,
-#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
-#.
-#: ../console/gntdebug.c:235 ../gtk/gtkdebug.c:767
-msgid "Clear"
-msgstr "Forviŝu"
-
-#: ../console/gntdebug.c:240 ../gtk/gtkdebug.c:776
-msgid "Pause"
-msgstr "Paŭzu"
-
-#: ../console/gntdebug.c:245 ../gtk/gtkdebug.c:783 ../gtk/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "Tempomarkojn"
-
-#: ../console/gntgaim.c:227
+#: ../finch/finch.c:229
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Provu `%s -h' por plia informo.\n"
 
-#: ../console/gntgaim.c:229
+#: ../finch/finch.c:231
 #, c-format
 msgid ""
 "%s\n"
@@ -711,75 +43,878 @@
 "  -n, --nologin       ne aŭtomate ensalutu\n"
 "  -v, --version       vidigu la aktualan version kaj finu\n"
 
-#: ../console/gntnotify.c:146
+#: ../finch/gntaccount.c:119 ../finch/gntblist.c:274 ../finch/gntblist.c:393
+#: ../finch/gntblist.c:406 ../finch/gntplugin.c:154 ../finch/gntplugin.c:199
+#: ../finch/gntstatus.c:291 ../finch/gntstatus.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1406
+#: ../libpurple/protocols/jabber/chat.c:679
+#: ../libpurple/protocols/jabber/chat.c:690
+#: ../libpurple/protocols/jabber/jabber.c:1216
+#: ../libpurple/protocols/qq/group_join.c:324
+#: ../libpurple/protocols/silc/ops.c:1451
+msgid "Error"
+msgstr "Eraro"
+
+#: ../finch/gntaccount.c:119
+msgid "Account was not added"
+msgstr "Konto ne estis aldonita"
+
+#: ../finch/gntaccount.c:120
+msgid "Screenname of an account must be non-empty."
+msgstr "Ekrannomo de konto ne devas esti malplena."
+
+#: ../finch/gntaccount.c:423 ../pidgin/gtkaccount.c:567
+msgid "New mail notifications"
+msgstr "Nova retpoŝto avizoj"
+
+#: ../finch/gntaccount.c:433 ../pidgin/gtkaccount.c:496
+msgid "Remember password"
+msgstr "Memoru pasvorton"
+
+#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1430
+#: ../pidgin/gtkblist.c:3891
+msgid "Modify Account"
+msgstr "Ŝanĝu Konton"
+
+#: ../finch/gntaccount.c:474
+msgid "New Account"
+msgstr "Nova Konto"
+
+#: ../finch/gntaccount.c:500 ../pidgin/gtkaccount.c:407 ../pidgin/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protokolo:"
+
+#: ../finch/gntaccount.c:508 ../pidgin/gtkaccount.c:412
+#: ../pidgin/gtkblist.c:5293
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+msgid "Screen name:"
+msgstr "Ekrannomo:"
+
+#: ../finch/gntaccount.c:521 ../pidgin/gtkaccount.c:487
+msgid "Password:"
+msgstr "Pasvorton:"
+
+#: ../finch/gntaccount.c:531 ../pidgin/gtkblist.c:5314
+#: ../pidgin/gtkblist.c:5677
+msgid "Alias:"
+msgstr "Alinomo:"
+
+#. Cancel button
+#. Cancel
+#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:615
+#: ../finch/gntaccount.c:834 ../finch/gntblist.c:316 ../finch/gntblist.c:383
+#: ../finch/gntblist.c:416 ../finch/gntblist.c:740 ../finch/gntblist.c:926
+#: ../finch/gntblist.c:1017 ../finch/gntblist.c:2049 ../finch/gntpounce.c:456
+#: ../finch/gntpounce.c:652 ../finch/gntprefs.c:284 ../finch/gntstatus.c:139
+#: ../finch/gntstatus.c:472 ../finch/gntstatus.c:597
+#: ../libpurple/account.c:969 ../libpurple/account.c:1218
+#: ../libpurple/account.c:1252 ../libpurple/conversation.c:1164
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:498
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:792
+#: ../libpurple/protocols/gg/gg.c:871
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1768
+#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/chat.c:788
+#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/xdata.c:338
+#: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
+#: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
+#: ../libpurple/protocols/msn/msn.c:312
+#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/peer.c:1021
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:212
+#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: ../libpurple/protocols/qq/group.c:124
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_opt.c:392
+#: ../libpurple/protocols/qq/sys_msg.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:159
+#: ../libpurple/protocols/qq/sys_msg.c:247
+#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/sametime/sametime.c:3474
+#: ../libpurple/protocols/sametime/sametime.c:3644
+#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5477
+#: ../libpurple/protocols/sametime/sametime.c:5601
+#: ../libpurple/protocols/silc/buddy.c:467
+#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/ops.c:1912
+#: ../libpurple/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3237 ../pidgin/gtkaccount.c:1866
+#: ../pidgin/gtkaccount.c:2446 ../pidgin/gtkblist.c:5733
+#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:861
+#: ../pidgin/gtkdialogs.c:952 ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:993 ../pidgin/gtkdialogs.c:1013
+#: ../pidgin/gtkdialogs.c:1057 ../pidgin/gtkdialogs.c:1095
+#: ../pidgin/gtkdialogs.c:1149 ../pidgin/gtkdialogs.c:1186
+#: ../pidgin/gtkdialogs.c:1211 ../pidgin/gtkimhtmltoolbar.c:419
+#: ../pidgin/gtklog.c:294 ../pidgin/gtkplugin.c:286 ../pidgin/gtkpounce.c:1098
+#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:579
+#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:615
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:336
+msgid "Cancel"
+msgstr "Rezignu"
+
+#. Save button
+#. Save
+#: ../finch/gntaccount.c:558 ../finch/gntpounce.c:462 ../finch/gntprefs.c:284
+#: ../finch/gntstatus.c:475 ../finch/gntstatus.c:585
+#: ../libpurple/account.c:1251 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:762
+#: ../pidgin/gtkrequest.c:276
+msgid "Save"
+msgstr "Konservu"
+
+#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1860
+#: ../pidgin/gtksavedstatuses.c:328
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "Ĉu vi certas vi volas forigi %s-n?"
+
+#: ../finch/gntaccount.c:614
+msgid "Delete Account"
+msgstr "Forigu Konton"
+
+#. Delete button
+#: ../finch/gntaccount.c:615 ../finch/gntaccount.c:681
+#: ../finch/gntpounce.c:651 ../finch/gntpounce.c:712 ../finch/gntstatus.c:139
+#: ../finch/gntstatus.c:201 ../pidgin/gtkaccount.c:1865 ../pidgin/gtklog.c:294
+#: ../pidgin/gtkpounce.c:1097 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:335
+msgid "Delete"
+msgstr "Forigu"
+
+#: ../finch/gntaccount.c:644 ../finch/gntblist.c:1955 ../finch/gntui.c:76
+#: ../pidgin/gtkaccount.c:2272 ../pidgin/gtkdocklet.c:530
+msgid "Accounts"
+msgstr "Kontoj"
+
+#: ../finch/gntaccount.c:650
+msgid "You can enable/disable accounts from the following list."
+msgstr "Vi povas ŝalti/malŝalti kontojn de la jena listo."
+
+#. Add button
+#: ../finch/gntaccount.c:673 ../finch/gntaccount.c:833 ../finch/gntblist.c:316
+#: ../finch/gntblist.c:383 ../finch/gntblist.c:416 ../finch/gntnotify.c:309
+#: ../finch/gntpounce.c:697 ../finch/gntstatus.c:191
+#: ../libpurple/protocols/gg/gg.c:870 ../libpurple/protocols/qq/sys_msg.c:104
+#: ../libpurple/protocols/qq/sys_msg.c:159
+#: ../libpurple/protocols/qq/sys_msg.c:247
+#: ../libpurple/protocols/sametime/sametime.c:5476
+#: ../libpurple/protocols/silc/chat.c:596 ../pidgin/gtkaccount.c:2445
+#: ../pidgin/gtkblist.c:5732 ../pidgin/gtkconv.c:1651
+#: ../pidgin/gtkrequest.c:274
+msgid "Add"
+msgstr "Aldonu"
+
+#. Modify button
+#: ../finch/gntaccount.c:677 ../finch/gntpounce.c:704
+msgid "Modify"
+msgstr "Ŝanĝu"
+
+#: ../finch/gntaccount.c:758 ../pidgin/gtkaccount.c:2392
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s faris %s-n sia kunul%s%s"
+
+#: ../finch/gntaccount.c:831 ../pidgin/gtkaccount.c:2444
+msgid "Add buddy to your list?"
+msgstr "Aldonu kunulon al via listo?"
+
+#: ../finch/gntaccount.c:883 ../pidgin/gtkaccount.c:2496
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s volas aldoni %s-n al sia kunullisto%s%s"
+
+#: ../finch/gntaccount.c:903 ../finch/gntaccount.c:908
+#: ../pidgin/gtkaccount.c:2519 ../pidgin/gtkaccount.c:2525
+msgid "Authorize buddy?"
+msgstr "Permesi kunulon?"
+
+#: ../finch/gntaccount.c:905 ../finch/gntaccount.c:910
+#: ../pidgin/gtkaccount.c:2520 ../pidgin/gtkaccount.c:2526
+msgid "Authorize"
+msgstr "Permesi"
+
+#: ../finch/gntaccount.c:906 ../finch/gntaccount.c:911
+#: ../pidgin/gtkaccount.c:2521 ../pidgin/gtkaccount.c:2527
+msgid "Deny"
+msgstr "Rifuzi"
+
+#: ../finch/gntblist.c:266
+msgid "You must provide a screename for the buddy."
+msgstr "Vi devas enigi ekrannomon por la kunul."
+
+#: ../finch/gntblist.c:268
+msgid "You must provide a group."
+msgstr "Vi devas enigi grupon."
+
+#: ../finch/gntblist.c:270
+msgid "You must select an account."
+msgstr "Vi devas elekti konton."
+
+#: ../finch/gntblist.c:274
+msgid "Error adding buddy"
+msgstr "Eraro aldonante kunul"
+
+#: ../finch/gntblist.c:299 ../libpurple/protocols/oscar/oscar.c:2851
+#: ../pidgin/gtkaccount.c:1941 ../pidgin/gtksavedstatuses.c:923
+msgid "Screen Name"
+msgstr "Ekranonomo"
+
+#: ../finch/gntblist.c:302 ../finch/gntblist.c:375
+#: ../libpurple/protocols/msn/msn.c:1340
+#: ../libpurple/protocols/silc/chat.c:587
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1206 ../pidgin/gtkdialogs.c:970
+#: ../pidgin/gtkdialogs.c:992 ../pidgin/gtkdialogs.c:1012
+#: ../pidgin/gtkrequest.c:277
+msgid "Alias"
+msgstr "Alinomo"
+
+#: ../finch/gntblist.c:305 ../finch/gntblist.c:378
+msgid "Group"
+msgstr "Grupo"
+
+#: ../finch/gntblist.c:309 ../finch/gntblist.c:366 ../finch/gntblist.c:1186
+#: ../finch/gntnotify.c:155 ../finch/gntstatus.c:563
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:189
+#: ../pidgin/gtkblist.c:2890 ../pidgin/gtknotify.c:476
+#: ../pidgin/gtkpounce.c:1265 ../pidgin/plugins/gevolution/gevolution.c:444
+msgid "Account"
+msgstr "Konto"
+
+#: ../finch/gntblist.c:315 ../finch/gntblist.c:787
+#: ../libpurple/protocols/silc/buddy.c:736
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/buddy.c:1075
+#: ../libpurple/protocols/silc/buddy.c:1174
+#: ../libpurple/protocols/yahoo/yahoo.c:3142 ../pidgin/gtkblist.c:5247
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+msgid "Add Buddy"
+msgstr "Aldonu Kunulon"
+
+#: ../finch/gntblist.c:315
+msgid "Please enter buddy information."
+msgstr "B.v. enigi kunul informon."
+
+#: ../finch/gntblist.c:338 ../libpurple/blist.c:1197
+msgid "Chats"
+msgstr "Babilejoj"
+
+#. Extract their Name and put it in
+#: ../finch/gntblist.c:372 ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/msn/msn.c:1513 ../libpurple/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:579
+#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+msgid "Name"
+msgstr "Nomo"
+
+#: ../finch/gntblist.c:381 ../finch/gntblist.c:789 ../pidgin/gtkblist.c:5623
+msgid "Add Chat"
+msgstr "Aldonu Babilejon"
+
+#: ../finch/gntblist.c:382
+msgid "You can edit more information from the context menu later."
+msgstr "Vi povas redakti plian informon per la ĉirkaŭteksto menuo poste."
+
+#: ../finch/gntblist.c:393 ../finch/gntblist.c:406
+msgid "Error adding group"
+msgstr "Eraro aldonante grupo"
+
+#: ../finch/gntblist.c:394
+msgid "You must give a name for the group to add."
+msgstr "Vi devas enigi nomon de la grupo aldonenda."
+
+#: ../finch/gntblist.c:407
+msgid "A group with the name already exists."
+msgstr "Grupo samnomita jam ekzistas."
+
+#: ../finch/gntblist.c:414 ../finch/gntblist.c:791
+#: ../libpurple/protocols/sametime/sametime.c:5387
+#: ../libpurple/protocols/sametime/sametime.c:5474 ../pidgin/gtkblist.c:5729
+msgid "Add Group"
+msgstr "Aldonu Grupon"
+
+#: ../finch/gntblist.c:414
+msgid "Enter the name of the group"
+msgstr "B.v. enigi la nomon de la grupo"
+
+#: ../finch/gntblist.c:739
+msgid "Edit Chat"
+msgstr "Redaktu Babilejon"
+
+#: ../finch/gntblist.c:739
+msgid "Please Update the necessary fields."
+msgstr "B.v. Aktualigi la necesajn kampojn."
+
+#: ../finch/gntblist.c:740 ../finch/gntstatus.c:196
+msgid "Edit"
+msgstr "Redaktu"
+
+#: ../finch/gntblist.c:754
+msgid "Auto-join"
+msgstr "Aŭtomate-aliĝu"
+
+#: ../finch/gntblist.c:763
+msgid "Edit Settings"
+msgstr "Agordu"
+
+#: ../finch/gntblist.c:827 ../libpurple/protocols/silc/chat.c:878
+msgid "Get Info"
+msgstr "Ricevu Informon"
+
+#: ../finch/gntblist.c:831
+msgid "Add Buddy Pounce"
+msgstr "Aldonu Kunul Atentigon"
+
+#: ../finch/gntblist.c:838 ../libpurple/protocols/oscar/oscar.c:635
+#: ../pidgin/gtkconv.c:1599
+msgid "Send File"
+msgstr "Sendu Dosieron"
+
+#: ../finch/gntblist.c:842
+msgid "View Log"
+msgstr "Montru Protokolon"
+
+#: ../finch/gntblist.c:922
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "B.v. enigi la novan nomon por %s"
+
+#: ../finch/gntblist.c:924 ../finch/gntblist.c:925 ../finch/gntblist.c:1136
+msgid "Rename"
+msgstr "Alinomu"
+
+#: ../finch/gntblist.c:924
+msgid "Enter empty string to reset the name."
+msgstr "Enigu malplenan ĉenon por forviŝi la nomon."
+
+#: ../finch/gntblist.c:997
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "Forigi tiun kontakton ankaŭ forigos ĉiujn kunulojn en la kontakto"
+
+#: ../finch/gntblist.c:1005
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Forigi tiun grupon ankaŭ forigos ĉiujn kunulojn en la grupo"
+
+#: ../finch/gntblist.c:1010
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "Ĉu vi certas vi volas forigi %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../finch/gntblist.c:1013
+msgid "Confirm Remove"
+msgstr "Konfirmu Forigon"
+
+#: ../finch/gntblist.c:1016 ../finch/gntblist.c:1138 ../finch/gntft.c:223
+#: ../pidgin/gtkblist.c:1100 ../pidgin/gtkconv.c:1648
+#: ../pidgin/gtkrequest.c:275 ../pidgin/gtkstatusbox.c:249
+msgid "Remove"
+msgstr "Forigu"
+
+#. Buddy List
+#: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
+#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+msgid "Buddy List"
+msgstr "Kunul Listo"
+
+#: ../finch/gntblist.c:1143
+msgid "Place tagged"
+msgstr "Loko etikedita"
+
+#: ../finch/gntblist.c:1148
+msgid "Toggle Tag"
+msgstr "Inversiga Etikedo"
+
+#. General
+#: ../finch/gntblist.c:1181 ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/gg/gg.c:1035 ../libpurple/protocols/gg/gg.c:1110
+#: ../libpurple/protocols/gg/gg.c:2182
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:1569
+#: ../libpurple/protocols/jabber/buddy.c:1751
+#: ../libpurple/protocols/jabber/jabber.c:817
+#: ../libpurple/protocols/msn/msn.c:1348 ../libpurple/protocols/msn/msn.c:1516
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1528
+#: ../libpurple/protocols/silc/ops.c:1036
+#: ../libpurple/protocols/silc/ops.c:1179
+#: ../libpurple/protocols/silc/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2914
+msgid "Nickname"
+msgstr "Karesnomo"
+
+#. Idle stuff
+#: ../finch/gntblist.c:1201 ../finch/gntprefs.c:281
+#: ../libpurple/protocols/bonjour/bonjour.c:322
+#: ../libpurple/protocols/jabber/buddy.c:646
+#: ../libpurple/protocols/jabber/buddy.c:686
+#: ../libpurple/protocols/msn/msn.c:513 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2826
+#: ../libpurple/protocols/oscar/oscar.c:2875
+#: ../libpurple/protocols/yahoo/yahoo.c:2896
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:2934
+#: ../pidgin/gtkblist.c:3323 ../pidgin/gtkprefs.c:1807
+msgid "Idle"
+msgstr "Senfara"
+
+#: ../finch/gntblist.c:1290
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Konektita: %d\n"
+"Entute: %d"
+
+#: ../finch/gntblist.c:1299
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Konto: %s (%s)"
+
+#: ../finch/gntblist.c:1311
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"Laste vidita: antaŭ %s"
+
+#: ../finch/gntblist.c:1560 ../pidgin/gtkdocklet.c:478
+#: ../pidgin/gtkstatusbox.c:1102
+msgid "New..."
+msgstr "Nova..."
+
+#: ../finch/gntblist.c:1567 ../pidgin/gtkdocklet.c:479
+#: ../pidgin/gtkstatusbox.c:1103
+msgid "Saved..."
+msgstr "Konservita..."
+
+#: ../finch/gntblist.c:1923 ../finch/gntplugin.c:216 ../finch/gntui.c:81
+#: ../pidgin/gtkdocklet.c:531 ../pidgin/gtkplugin.c:528
+msgid "Plugins"
+msgstr "Kromaĵoj"
+
+#: ../finch/gntblist.c:2030 ../pidgin/gtkdialogs.c:705
+#: ../pidgin/gtkdialogs.c:842 ../pidgin/gtkdialogs.c:922
+msgid "_Name"
+msgstr "_Nomo"
+
+#: ../finch/gntblist.c:2035 ../pidgin/gtkdialogs.c:710
+#: ../pidgin/gtkdialogs.c:847 ../pidgin/gtkdialogs.c:927
+msgid "_Account"
+msgstr "_Konto"
+
+#: ../finch/gntblist.c:2043 ../pidgin/gtkdialogs.c:718
+msgid "New Instant Message"
+msgstr "Nova Tuj Mesaĝo"
+
+#: ../finch/gntblist.c:2045 ../pidgin/gtkdialogs.c:720
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr "B.v. enigi la ekrannomon aŭ alinomon de persono kiun vi dezrias TM-i."
+
+#: ../finch/gntblist.c:2048 ../finch/gntconn.c:47 ../finch/gntnotify.c:79
+#: ../libpurple/account.c:968 ../libpurple/account.c:1217
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:655
+#: ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/jabber/jabber.c:1370
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
+#: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
+#: ../libpurple/protocols/oscar/oscar.c:6038
+#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc/chat.c:424
+#: ../libpurple/protocols/silc/chat.c:462
+#: ../libpurple/protocols/silc/chat.c:725
+#: ../libpurple/protocols/silc/ops.c:1297
+#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
+#: ../libpurple/protocols/yahoo/yahoo.c:3236 ../pidgin/gtkblist.c:3890
+#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:860
+#: ../pidgin/gtkdialogs.c:951 ../pidgin/gtkrequest.c:269
+msgid "OK"
+msgstr "Daŭrigu"
+
+#. Create the "Options" frame.
+#: ../finch/gntblist.c:2067 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:776
+msgid "Options"
+msgstr "Opcioj"
+
+#: ../finch/gntblist.c:2073
+msgid "Send IM..."
+msgstr "Sendu TM-n..."
+
+#: ../finch/gntblist.c:2077
+msgid "Toggle offline buddies"
+msgstr "Inversigi senkonektajn kunulojn"
+
+#: ../finch/gntblist.c:2083
+msgid "Sort by status"
+msgstr "Ordigi laŭ stato"
+
+#: ../finch/gntblist.c:2087
+msgid "Sort alphabetically"
+msgstr "Ordigi alfabete"
+
+#: ../finch/gntblist.c:2091
+msgid "Sort by log size"
+msgstr "Oridgi laŭ protokolo grandeco"
+
+#: ../finch/gntconn.c:38
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../finch/gntconn.c:41
+#, c-format
+msgid "%s disconnected."
+msgstr "%s malkontaktita."
+
+#: ../finch/gntconn.c:42
+#, c-format
+msgid ""
+"%s was disconnected due to the following error:\n"
+"%s"
+msgstr ""
+"%s estis diskonektigita pro la jena eraro:\n"
+"%s"
+
+#: ../finch/gntconn.c:45 ../libpurple/account.c:996
+#: ../libpurple/connection.c:107 ../pidgin/gtkblist.c:3888
+msgid "Connection Error"
+msgstr "Konekteraro"
+
+#: ../finch/gntconn.c:48 ../libpurple/protocols/sametime/sametime.c:3643
+#: ../pidgin/gtkblist.c:3892
+msgid "Connect"
+msgstr "Kontaktu"
+
+#: ../finch/gntconv.c:103
+msgid "No such command."
+msgstr "Nenia komando."
+
+#: ../finch/gntconv.c:107 ../pidgin/gtkconv.c:507
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr ""
+
+#: ../finch/gntconv.c:112 ../pidgin/gtkconv.c:512
+msgid "Your command failed for an unknown reason."
+msgstr "Via komanda malsukcesis pro nekonata kialo."
+
+#: ../finch/gntconv.c:117 ../pidgin/gtkconv.c:518
+msgid "That command only works in chats, not IMs."
+msgstr "Tiu komando nur funkcias en babilejoj, ne TM-oj."
+
+#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:521
+msgid "That command only works in IMs, not chats."
+msgstr "Tiu komando nur funkcias en TM-oj, ne babilejoj."
+
+#: ../finch/gntconv.c:124 ../pidgin/gtkconv.c:525
+msgid "That command doesn't work on this protocol."
+msgstr "Tiu komando ne funkcias je tiu protokolo."
+
+#: ../finch/gntconv.c:131
+msgid "Commands are not supported yet. Message was NOT sent."
+msgstr "Komandoj estas ne akceptitaj nune. Mesaĝo NE estis sendita."
+
+#: ../finch/gntconv.c:234
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../finch/gntconv.c:257
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../finch/gntconv.c:262 ../finch/gntconv.c:436
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s tajpas..."
+
+#: ../finch/gntconv.c:403
+msgid "<AUTO-REPLY> "
+msgstr "<AŬTO-RESPONDO> "
+
+#. Print the list of users in the room
+#: ../finch/gntconv.c:505
+msgid "List of users:\n"
+msgstr "Uzantoj Listo:\n"
+
+#: ../finch/gntconv.c:629 ../pidgin/gtkconv.c:388
+msgid "Supported debug options are:  version"
+msgstr "Subtenitaj sencimigopcioj estas:  versio"
+
+#: ../finch/gntconv.c:664 ../pidgin/gtkconv.c:424
+msgid "No such command (in this context)."
+msgstr "Nenia komando (en tiu kunteksto)."
+
+#: ../finch/gntconv.c:667 ../pidgin/gtkconv.c:427
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Uzu \"/help &lt;komandon&gt;\" por helpo pri speciala komando.\n"
+"La komandoj aktuale disponeblaj estas:\n"
+
+#: ../finch/gntconv.c:706 ../pidgin/gtkconv.c:6949
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+
+#: ../finch/gntconv.c:709 ../pidgin/gtkconv.c:6952
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+
+#: ../finch/gntconv.c:712 ../pidgin/gtkconv.c:6955
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+
+#: ../finch/gntconv.c:715 ../pidgin/gtkconv.c:6958
+msgid "clear: Clears the conversation scrollback."
+msgstr ""
+
+#: ../finch/gntconv.c:718 ../pidgin/gtkconv.c:6961
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr ""
+
+#: ../finch/gntconv.c:723
+msgid "plugins: Show the plugins window."
+msgstr ""
+
+#: ../finch/gntconv.c:726
+msgid "buddylist: Show the buddylist."
+msgstr ""
+
+#: ../finch/gntconv.c:729
+msgid "accounts: Show the accounts window."
+msgstr ""
+
+#: ../finch/gntconv.c:732
+msgid "debugwin: Show the debug window."
+msgstr ""
+
+#: ../finch/gntconv.c:735
+msgid "prefs: Show the preference window."
+msgstr ""
+
+#: ../finch/gntconv.c:738
+msgid "statuses: Show the savedstatuses window."
+msgstr ""
+
+#: ../finch/gntdebug.c:225 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:708
+msgid "Debug Window"
+msgstr "Sencimigo Fenestro"
+
+#. XXX: Setting the GROW_Y for the following widgets don't make sense. But right now
+#. * it's necessary to make the width of the debug window resizable ... like I said,
+#. * it doesn't make sense. The bug is likely in the packing in gntbox.c.
+#.
+#: ../finch/gntdebug.c:246 ../pidgin/gtkdebug.c:767
+msgid "Clear"
+msgstr "Forviŝu"
+
+#: ../finch/gntdebug.c:251 ../pidgin/gtkdebug.c:776
+msgid "Pause"
+msgstr "Paŭzu"
+
+#: ../finch/gntdebug.c:256 ../pidgin/gtkdebug.c:783 ../pidgin/gtkdebug.c:784
+msgid "Timestamps"
+msgstr "Tempomarkojn"
+
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Dosiero alŝuto - %d%% je %d dosieroj"
+
+#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+msgid "File Transfers"
+msgstr "Dosiero Alŝutoj"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+msgid "Progress"
+msgstr "Progreso"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+msgid "Filename"
+msgstr "Dosiernomo"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+msgid "Size"
+msgstr "Grandeco"
+
+#: ../finch/gntft.c:197
+msgid "Speed"
+msgstr "Rapideco"
+
+#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+msgid "Remaining"
+msgstr "Restanta"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../finch/gntft.c:197 ../finch/gntstatus.c:534 ../finch/gntstatus.c:563
+#: ../libpurple/protocols/bonjour/bonjour.c:326
+#: ../libpurple/protocols/gg/gg.c:1024 ../libpurple/protocols/gg/gg.c:1563
+#: ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/jabber/buddy.c:637
+#: ../libpurple/protocols/jabber/buddy.c:641
+#: ../libpurple/protocols/jabber/buddy.c:676
+#: ../libpurple/protocols/jabber/jabber.c:1201
+#: ../libpurple/protocols/msn/msn.c:512
+#: ../libpurple/protocols/novell/novell.c:2836
+#: ../libpurple/protocols/oscar/oscar.c:802
+#: ../libpurple/protocols/oscar/oscar.c:807
+#: ../libpurple/protocols/oscar/oscar.c:809
+#: ../libpurple/protocols/oscar/oscar.c:2664
+#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/sametime/sametime.c:3264
+#: ../libpurple/protocols/sametime/sametime.c:4149
+#: ../libpurple/protocols/yahoo/yahoo.c:3047 ../pidgin/gtkblist.c:2978
+#: ../pidgin/gtkblist.c:2991 ../pidgin/gtkblist.c:2993
+#: ../pidgin/gtksavedstatuses.c:942 ../pidgin/gtksavedstatuses.c:1089
+msgid "Status"
+msgstr "Stato"
+
+#: ../finch/gntft.c:207
+msgid "Close this window when all transfers finish"
+msgstr "Fermu tiun fenestron kiam ĉiuj transmetoj finas"
+
+#: ../finch/gntft.c:214
+msgid "Clear finished transfers"
+msgstr "Forviŝu finitajn transmetojn"
+
+#: ../finch/gntft.c:228
+msgid "Stop"
+msgstr "Haltu"
+
+#. Close button
+#: ../finch/gntft.c:233 ../finch/gntnotify.c:163 ../finch/gntplugin.c:178
+#: ../finch/gntplugin.c:259 ../finch/gntpounce.c:720 ../finch/gntstatus.c:206
+#: ../libpurple/protocols/msn/msn.c:356 ../libpurple/protocols/silc/util.c:377
+#: ../pidgin/gtkaccount.c:2419 ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "Fermu"
+
+#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+msgid "Waiting for transfer to begin"
+msgstr "Atendante la alŝutoeko"
+
+#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+msgid "Canceled"
+msgstr "Rezignita"
+
+#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+msgid "Failed"
+msgstr "Malsukcesita"
+
+#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KB/s"
+msgstr "%.2f KB/s"
+
+#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1118
+msgid "Finished"
+msgstr "Finita"
+
+#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:346
+msgid "Transferring"
+msgstr ""
+
+#: ../finch/gntnotify.c:146
 msgid "Emails"
 msgstr "Retadresoj"
 
-#: ../console/gntnotify.c:152 ../console/gntnotify.c:206
+#: ../finch/gntnotify.c:152 ../finch/gntnotify.c:206
 msgid "You have mail!"
 msgstr "Vi ricevis retmesaĝon!"
 
-#: ../console/gntnotify.c:155 ../libgaim/protocols/jabber/jabber.c:1155
+#: ../finch/gntnotify.c:155 ../libpurple/protocols/jabber/jabber.c:1161
 msgid "From"
 msgstr "De"
 
-#: ../console/gntnotify.c:155 ../gtk/gtknotify.c:481
+#: ../finch/gntnotify.c:155 ../pidgin/gtknotify.c:490
 msgid "Subject"
 msgstr "Subjekto"
 
-#: ../console/gntnotify.c:163 ../console/gntplugin.c:178
-#: ../console/gntplugin.c:259 ../console/gntstatus.c:206
-#: ../gtk/gtkaccount.c:2406 ../gtk/gtkrequest.c:272
-#: ../libgaim/protocols/msn/msn.c:355 ../libgaim/protocols/silc/util.c:377
-msgid "Close"
-msgstr "Fermu"
-
-#: ../console/gntnotify.c:182
+#: ../finch/gntnotify.c:182
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) havas %d novan mesaĝon."
 msgstr[1] "%s (%s) havas %d novajn mesaĝojn."
 
-#: ../console/gntnotify.c:206 ../gtk/gtknotify.c:322
+#: ../finch/gntnotify.c:206 ../pidgin/gtknotify.c:329
 msgid "New Mail"
 msgstr "Nova Retmesaĝo"
 
-#: ../console/gntnotify.c:230 ../gtk/gtknotify.c:856
+#: ../finch/gntnotify.c:230 ../pidgin/gtknotify.c:866
 #, c-format
 msgid "Info for %s"
 msgstr "Informo pri %s"
 
-#: ../console/gntnotify.c:232 ../gtk/gtknotify.c:858
-#: ../libgaim/protocols/toc/toc.c:476
+#: ../finch/gntnotify.c:232 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:868
 msgid "Buddy Information"
 msgstr "Kunul Informo"
 
-#: ../console/gntnotify.c:306
+#: ../finch/gntnotify.c:306
 msgid "Continue"
 msgstr "Daŭrigu"
 
-#: ../console/gntnotify.c:312 ../gtk/gtkconv.c:1630 ../gtk/gtkdebug.c:862
+#: ../finch/gntnotify.c:312 ../pidgin/gtkconv.c:1627 ../pidgin/gtkdebug.c:862
 msgid "Info"
 msgstr "Informo"
 
-#: ../console/gntnotify.c:315 ../gtk/gtkconv.c:1591
+#: ../finch/gntnotify.c:315 ../pidgin/gtkconv.c:1588
 msgid "IM"
 msgstr "TM"
 
-#: ../console/gntnotify.c:318
+#: ../finch/gntnotify.c:318
 msgid "Join"
 msgstr "Aliĝu"
 
-#: ../console/gntnotify.c:321 ../libgaim/protocols/sametime/sametime.c:3494
+#: ../finch/gntnotify.c:321 ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Invitu"
 
-#: ../console/gntnotify.c:324
+#: ../finch/gntnotify.c:324
 msgid "(none)"
 msgstr "(neniu)"
 
-#: ../console/gntplugin.c:102
+#: ../finch/gntplugin.c:102
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -796,290 +931,466 @@
 "Retejo: %s\n"
 "Dosiernomo: %s\n"
 
-#: ../console/gntplugin.c:155
+#: ../finch/gntplugin.c:155
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Necesas ŝarĝi kromaĵon por agordi ĝin."
 
-#: ../console/gntplugin.c:193
+#: ../finch/gntplugin.c:193
 msgid "..."
 msgstr "..."
 
-#: ../console/gntplugin.c:194
+#: ../finch/gntplugin.c:194
 msgid "Still need to do something about this."
 msgstr ""
 
-#: ../console/gntplugin.c:200
+#: ../finch/gntplugin.c:200
 msgid "No configuration options for this plugin."
 msgstr "Neniuj agordaj opcioj por tiu kromaĵo."
 
-#: ../console/gntplugin.c:221
+#: ../finch/gntplugin.c:221
 msgid "You can (un)load plugins from the following list."
 msgstr "Vi povas (mal)ŝarĝi kromaĵojn de la jena listo."
 
-#: ../console/gntplugin.c:264
+#: ../finch/gntplugin.c:264
 msgid "Configure Plugin"
 msgstr "Agordu Kromaĵon"
 
-#: ../console/gntprefs.c:122
+#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:251
+msgid "Please enter a buddy to pounce."
+msgstr "B.v. enigi kunulon atentigendan."
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+msgid "New Buddy Pounce"
+msgstr "Nova Kunul Atentigo"
+
+#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:505
+msgid "Edit Buddy Pounce"
+msgstr "Redaktu Kunul Atentigo"
+
+#: ../finch/gntpounce.c:330
+msgid "Pounce Who"
+msgstr "Atentigi Kiun"
+
+#. Account:
+#. Set up stuff for the account box
+#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:443 ../pidgin/gtkblist.c:5341
+#: ../pidgin/gtkblist.c:5657
+msgid "Account:"
+msgstr "Konto:"
+
+#: ../finch/gntpounce.c:355
+msgid "Buddy name:"
+msgstr "Kunul nomo:"
+
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:370 ../pidgin/gtkpounce.c:575
+msgid "Pounce When Buddy..."
+msgstr "Atentigu kiam Kunul..."
+
+#: ../finch/gntpounce.c:372
+msgid "Signs on"
+msgstr "Ensalutas"
+
+#: ../finch/gntpounce.c:373
+msgid "Signs off"
+msgstr "Audiaŭas"
+
+#: ../finch/gntpounce.c:374
+msgid "Goes away"
+msgstr "Foriĝas"
+
+#: ../finch/gntpounce.c:375
+msgid "Returns from away"
+msgstr "Ekmalforiĝas"
+
+#: ../finch/gntpounce.c:376
+msgid "Becomes idle"
+msgstr "Eksenfaras"
+
+#: ../finch/gntpounce.c:377
+msgid "Is no longer idle"
+msgstr "Ekfaras"
+
+#: ../finch/gntpounce.c:378
+msgid "Starts typing"
+msgstr "Ektajpas"
+
+#: ../finch/gntpounce.c:379
+msgid "Pauses while typing"
+msgstr "Paŭzas tajpante"
+
+#: ../finch/gntpounce.c:380
+msgid "Stops typing"
+msgstr "Maltajpas"
+
+#: ../finch/gntpounce.c:381
+msgid "Sends a message"
+msgstr "Sendas mesagôn"
+
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:636
+msgid "Action"
+msgstr "Ago"
+
+#: ../finch/gntpounce.c:413
+msgid "Open an IM window"
+msgstr "Malfermu TM-n fenestron"
+
+#: ../finch/gntpounce.c:414
+msgid "Pop up a notification"
+msgstr "Ŝprucigu avizon"
+
+#: ../finch/gntpounce.c:415
+msgid "Send a message"
+msgstr "Sendu mesaĝon"
+
+#: ../finch/gntpounce.c:416
+msgid "Execute a command"
+msgstr "Lanĉu komandon"
+
+#: ../finch/gntpounce.c:417
+msgid "Play a sound"
+msgstr "Ludu sonon"
+
+#: ../finch/gntpounce.c:445
+msgid "Pounce only when my status is not available"
+msgstr "Atentigi nur kiam mia stato ne disponeblas"
+
+#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1278
+msgid "Recurring"
+msgstr "Rikuranta"
+
+#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1095
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr ""
+
+#: ../finch/gntpounce.c:680 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1325
+msgid "Buddy Pounces"
+msgstr "Kunul Atentigoj"
+
+#: ../finch/gntpounce.c:792 ../pidgin/gtkpounce.c:1452
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s ektajpis al vi (%s)"
+
+#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1454
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s paŭzis tajpante al vi (%s)"
+
+#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1456
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s ensalutis (%s)"
+
+#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1458
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s revenis el senfarado (%s)"
+
+#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1460
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s revenis el forado (%s)"
+
+#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1462
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s ekmaltajpis vin (%s)"
+
+#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1464
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s malsalutis (%s)"
+
+#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1466
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s senfariĝis (%s)"
+
+#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1468
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s foriĝis. (%s)"
+
+#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1470
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s sendis mesaĝon al vi. (%s)"
+
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1471
+msgid "Unknown pounce event. Please report this!"
+msgstr ""
+
+#: ../finch/gntprefs.c:69 ../pidgin/gtkprefs.c:1812
+msgid "From last sent message"
+msgstr "Ekde lasta sendita mesaĝo"
+
+#: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
+#: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
+#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
+msgid "Never"
+msgstr "Neniam"
+
+#: ../finch/gntprefs.c:159
 msgid "Show Idle Time"
 msgstr "Montru Senfaran Tempon"
 
-#: ../console/gntprefs.c:123
+#: ../finch/gntprefs.c:160
 msgid "Show Offline Buddies"
 msgstr "Montru Senkonektajn Kunulojn"
 
-#: ../console/gntprefs.c:129
+#: ../finch/gntprefs.c:166
 msgid "Show Timestamps"
 msgstr "Montru Tempomarkojn"
 
-#: ../console/gntprefs.c:130
+#: ../finch/gntprefs.c:167
 msgid "Notify buddies when you are typing"
 msgstr "Avizu kunulojn kiam vi estas tajpante"
 
-#: ../console/gntprefs.c:136
+#: ../finch/gntprefs.c:173
 msgid "Log format"
 msgstr "Protokolo formato"
 
-#: ../console/gntprefs.c:137
+#: ../finch/gntprefs.c:174
 msgid "Log IMs"
 msgstr "Protokolu TM-ojn"
 
-#: ../console/gntprefs.c:138
+#: ../finch/gntprefs.c:175
 msgid "Log chats"
 msgstr "Protokolu babilojn"
 
-#: ../console/gntprefs.c:139
+#: ../finch/gntprefs.c:176
 msgid "Log status change events"
 msgstr "Protokolu stato ŝanĝeventojn"
 
 #. Conversations
-#: ../console/gntprefs.c:220 ../gtk/gtkprefs.c:898 ../gtk/gtkprefs.c:1915
-#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+#: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Konversacioj"
 
-#: ../console/gntprefs.c:221 ../gtk/gtkprefs.c:1355 ../gtk/gtkprefs.c:1926
+#: ../finch/gntprefs.c:280 ../pidgin/gtkprefs.c:1355 ../pidgin/gtkprefs.c:1926
 msgid "Logging"
 msgstr "Protokolado"
 
-#: ../console/gntprefs.c:223 ../console/gntui.c:74 ../gtk/gtkdocklet.c:545
-#: ../gtk/gtkprefs.c:1951
+#: ../finch/gntprefs.c:283 ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:532
+#: ../pidgin/gtkprefs.c:1951
 msgid "Preferences"
 msgstr "Agordo"
 
-#: ../console/gntrequest.c:495
+#: ../finch/gntrequest.c:521
 msgid "Not implemented yet."
 msgstr "Ne jam programita."
 
-#: ../console/gntstatus.c:135
+#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1514
+#: ../pidgin/gtkrequest.c:1559
+msgid "Save File..."
+msgstr "Konservu Dosieron..."
+
+#: ../finch/gntrequest.c:583 ../pidgin/gtkrequest.c:1515
+#: ../pidgin/gtkrequest.c:1560
+msgid "Open File..."
+msgstr "Malfermu Dosieron..."
+
+#: ../finch/gntstatus.c:135
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Ĉu vi certas vi volas forigi \"%s\""
 
-#: ../console/gntstatus.c:138
+#: ../finch/gntstatus.c:138
 msgid "Delete Status"
 msgstr "Forigu Staton"
 
-#: ../console/gntstatus.c:167 ../gtk/gtksavedstatuses.c:556
+#: ../finch/gntstatus.c:167 ../pidgin/gtksavedstatuses.c:556
 msgid "Saved Statuses"
 msgstr "Konservitaj Statoj"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:526
-#: ../gtk/gtksavedstatuses.c:463 ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:931
-#: ../libgaim/protocols/novell/novell.c:1484
+#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:526
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:463
 msgid "Title"
 msgstr "Titolon"
 
-#: ../console/gntstatus.c:174 ../gtk/gtksavedstatuses.c:478
+#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:478
 msgid "Type"
 msgstr "Tipo"
 
-#: ../console/gntstatus.c:174 ../console/gntstatus.c:551
-#: ../console/gntstatus.c:563 ../gtk/gtksavedstatuses.c:489
-#: ../gtk/gtksavedstatuses.c:953 ../libgaim/protocols/bonjour/bonjour.c:256
-#: ../libgaim/protocols/bonjour/bonjour.c:263
-#: ../libgaim/protocols/bonjour/bonjour.c:339
-#: ../libgaim/protocols/gg/gg.c:1062 ../libgaim/protocols/gg/gg.c:1591
-#: ../libgaim/protocols/gg/gg.c:1609 ../libgaim/protocols/gg/gg.c:1619
-#: ../libgaim/protocols/gg/gg.c:1625 ../libgaim/protocols/gg/gg.c:1634
-#: ../libgaim/protocols/gg/gg.c:1639 ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1227
-#: ../libgaim/protocols/jabber/jabber.c:1237
-#: ../libgaim/protocols/jabber/jabber.c:1247
-#: ../libgaim/protocols/jabber/jabber.c:1257
-#: ../libgaim/protocols/jabber/jabber.c:1267
-#: ../libgaim/protocols/jabber/jabber.c:1279
-#: ../libgaim/protocols/novell/novell.c:2873
-#: ../libgaim/protocols/novell/novell.c:2976
-#: ../libgaim/protocols/novell/novell.c:2982
-#: ../libgaim/protocols/novell/novell.c:2988
-#: ../libgaim/protocols/oscar/oscar.c:5501
-#: ../libgaim/protocols/oscar/oscar.c:5729
-#: ../libgaim/protocols/oscar/oscar.c:5741
-#: ../libgaim/protocols/oscar/oscar.c:5754
-#: ../libgaim/protocols/oscar/oscar.c:5761
-#: ../libgaim/protocols/oscar/oscar.c:5768
-#: ../libgaim/protocols/sametime/sametime.c:3308
-#: ../libgaim/protocols/sametime/sametime.c:3314
-#: ../libgaim/protocols/sametime/sametime.c:3320
-#: ../libgaim/protocols/sametime/sametime.c:3399
-#: ../libgaim/protocols/silc/buddy.c:1544
-#: ../libgaim/protocols/simple/simple.c:246
-#: ../libgaim/protocols/yahoo/yahoo.c:3450
-#: ../libgaim/protocols/yahoo/yahoo.c:3456
-#: ../libgaim/protocols/zephyr/zephyr.c:2337
+#: ../finch/gntstatus.c:174 ../finch/gntstatus.c:551 ../finch/gntstatus.c:563
+#: ../libpurple/protocols/bonjour/bonjour.c:258
+#: ../libpurple/protocols/bonjour/bonjour.c:265
+#: ../libpurple/protocols/bonjour/bonjour.c:328
+#: ../libpurple/protocols/gg/gg.c:1062 ../libpurple/protocols/gg/gg.c:1566
+#: ../libpurple/protocols/gg/gg.c:1584 ../libpurple/protocols/gg/gg.c:1594
+#: ../libpurple/protocols/gg/gg.c:1600 ../libpurple/protocols/gg/gg.c:1609
+#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1233
+#: ../libpurple/protocols/jabber/jabber.c:1243
+#: ../libpurple/protocols/jabber/jabber.c:1253
+#: ../libpurple/protocols/jabber/jabber.c:1263
+#: ../libpurple/protocols/jabber/jabber.c:1273
+#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2942
+#: ../libpurple/protocols/novell/novell.c:2948
+#: ../libpurple/protocols/novell/novell.c:2954
+#: ../libpurple/protocols/oscar/oscar.c:5492
+#: ../libpurple/protocols/oscar/oscar.c:5720
+#: ../libpurple/protocols/oscar/oscar.c:5734
+#: ../libpurple/protocols/oscar/oscar.c:5750
+#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/oscar/oscar.c:5764
+#: ../libpurple/protocols/sametime/sametime.c:3287
+#: ../libpurple/protocols/sametime/sametime.c:3293
+#: ../libpurple/protocols/sametime/sametime.c:3299
+#: ../libpurple/protocols/sametime/sametime.c:3378
+#: ../libpurple/protocols/silc/buddy.c:1544
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3470
+#: ../libpurple/protocols/yahoo/yahoo.c:3476
+#: ../libpurple/protocols/zephyr/zephyr.c:2336
+#: ../pidgin/gtksavedstatuses.c:489 ../pidgin/gtksavedstatuses.c:953
 msgid "Message"
 msgstr "Mesaĝo"
 
 #. Use
-#: ../console/gntstatus.c:186 ../console/gntstatus.c:580
+#: ../finch/gntstatus.c:186 ../finch/gntstatus.c:580
 msgid "Use"
 msgstr "Uzu"
 
-#: ../console/gntstatus.c:291
+#: ../finch/gntstatus.c:291
 msgid "Invalid title"
 msgstr "Malvalida titolo"
 
-#: ../console/gntstatus.c:292
+#: ../finch/gntstatus.c:292
 msgid "Please enter a non-empty title for the status."
 msgstr "B.v. enigi malmalplenan titolon por la stato."
 
-#: ../console/gntstatus.c:299
+#: ../finch/gntstatus.c:299
 msgid "Duplicate title"
 msgstr "Duplikata titolo"
 
-#: ../console/gntstatus.c:300
+#: ../finch/gntstatus.c:300
 msgid "Please enter a different title for the status."
 msgstr "B.v. enigi malsimilan titolon por la stato."
 
-#: ../console/gntstatus.c:440
+#: ../finch/gntstatus.c:440
 msgid "Substatus"
 msgstr "Substato"
 
-#. Set up stuff for the account box
-#: ../console/gntstatus.c:443 ../gtk/gtkblist.c:5277 ../gtk/gtkblist.c:5593
-msgid "Account:"
-msgstr "Konto:"
-
-#: ../console/gntstatus.c:451 ../gtk/gtkft.c:698
+#: ../finch/gntstatus.c:451 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Stato"
 
-#: ../console/gntstatus.c:466
+#: ../finch/gntstatus.c:466
 msgid "Message:"
 msgstr "Mesaĝo:"
 
-#: ../console/gntstatus.c:515
+#: ../finch/gntstatus.c:515
 msgid "Edit Status"
 msgstr "Redaktu Staton"
 
-#. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../console/gntstatus.c:534 ../console/gntstatus.c:563
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:2811 ../gtk/gtkblist.c:2813
-#: ../gtk/gtksavedstatuses.c:942 ../gtk/gtksavedstatuses.c:1089
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/gg/gg.c:1024 ../libgaim/protocols/gg/gg.c:1588
-#: ../libgaim/protocols/gg/gg.c:1596 ../libgaim/protocols/jabber/buddy.c:637
-#: ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:674
-#: ../libgaim/protocols/jabber/jabber.c:1195
-#: ../libgaim/protocols/msn/msn.c:547
-#: ../libgaim/protocols/novell/novell.c:2870
-#: ../libgaim/protocols/oscar/oscar.c:800
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:2655
-#: ../libgaim/protocols/sametime/sametime.c:3285
-#: ../libgaim/protocols/sametime/sametime.c:4170
-#: ../libgaim/protocols/yahoo/yahoo.c:3027
-msgid "Status"
-msgstr "Stato"
-
-#: ../console/gntstatus.c:557
+#: ../finch/gntstatus.c:557
 msgid "Use different status for following accounts"
 msgstr "Uzu malsimilan staton por jenaj kontoj"
 
 #. Save & Use
-#: ../console/gntstatus.c:591
+#: ../finch/gntstatus.c:591
 msgid "Save & Use"
 msgstr "Konservu & Uzu"
 
-#: ../console/gntui.c:75
+#: ../finch/gntui.c:83
 msgid "Statuses"
 msgstr "Statoj"
 
-#: ../console/plugins/gntgf.c:209
+#: ../finch/plugins/gntclipboard.c:149
+msgid "GntClipboard"
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:151
+msgid "Clipboard plugin"
+msgstr ""
+
+#: ../finch/plugins/gntclipboard.c:152
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+
+#: ../finch/plugins/gntgf.c:209
 #, c-format
 msgid "%s just signed on"
 msgstr "%s ekensalutis"
 
-#: ../console/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:216
 #, c-format
 msgid "%s just signed off"
 msgstr "%s ekmalsalutis"
 
-#: ../console/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:224
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s sendis mesaĝon al vi"
 
-#: ../console/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:243
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s diris vian karesnomon en %s"
 
-#: ../console/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:245
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s sendis mesaĝon en %s"
 
-#: ../console/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:283
 msgid "Buddy signs on/off"
 msgstr "Kunul en/el-salutas"
 
-#: ../console/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:284
 msgid "You receive an IM"
 msgstr "Vi ricevas TM-on"
 
-#: ../console/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:285
 msgid "Someone speaks in a chat"
 msgstr "Iun babilas en babilejo"
 
-#: ../console/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:286
 msgid "Someone says your name in a chat"
 msgstr "Iun diras vian nomon en babilejo"
 
-#: ../console/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:314
 msgid "Notify with a toaster when"
 msgstr "Avizu per panrostilo kiam"
 
-#: ../console/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:329
 msgid "Beep too!"
 msgstr "Pep ankaŭ!"
 
-#: ../console/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:335
 msgid "Set URGENT for the terminal window."
 msgstr "Difini URĜAN por la terminalfenestro."
 
-#: ../console/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:355
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../console/plugins/gntgf.c:357 ../console/plugins/gntgf.c:358
-msgid "Toaster plugin for Gaim-Text."
-msgstr "Panrostilo kromaĵo por Gaim-Tekst."
-
-#: ../console/plugins/gnthistory.c:116 ../gtk/plugins/history.c:120
+#: ../finch/plugins/gntgf.c:357 ../finch/plugins/gntgf.c:358
+msgid "Toaster plugin"
+msgstr "Panrostilo kromaĵo"
+
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Konversacion kun %s ĉe %s:</b><br>"
 
-#: ../console/plugins/gnthistory.c:138 ../gtk/plugins/history.c:147
+#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Historio Kormaĵo postulas Protokoladon"
 
-#: ../console/plugins/gnthistory.c:139 ../gtk/plugins/history.c:148
+#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:148
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1087,15 +1398,15 @@
 "the same conversation type(s)."
 msgstr ""
 
-#: ../console/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "GntHistorio"
 
-#: ../console/plugins/gnthistory.c:181 ../gtk/plugins/history.c:190
+#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Montru lastatempe protokolatajn konversaciojn en novajn konversaciojn."
 
-#: ../console/plugins/gnthistory.c:182 ../gtk/plugins/history.c:191
+#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:191
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1103,4560 +1414,297 @@
 "Kiam nova konversacio estas malfermita, tiu kromaĵo enmetos la lastan "
 "konversacion en la aktuala konversacio."
 
-#: ../console/plugins/lastlog.c:69
+#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastprotokolo"
 
-#: ../console/plugins/lastlog.c:99
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr ""
 
-#: ../console/plugins/lastlog.c:121
+#: ../finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../console/plugins/lastlog.c:123 ../console/plugins/lastlog.c:124
-msgid "Lastlog plugin for gaim-text."
-msgstr "Lastaprotokolo kromaĵo por gaim-tekst."
-
-#: ../gtk/eggtrayicon.c:129
-msgid "Orientation"
-msgstr "Orientiĝo"
-
-#: ../gtk/eggtrayicon.c:130
-msgid "The orientation of the tray."
-msgstr "La oientiĝo de la pleto."
-
-#: ../gtk/gaimstock.c:137
-msgid "_Alias"
-msgstr "_Alinomo"
-
-#. join button
-#: ../gtk/gaimstock.c:138 ../gtk/gtkblist.c:1186 ../gtk/gtkroomlist.c:306
-#: ../gtk/gtkroomlist.c:463
-msgid "_Join"
-msgstr "_Aliĝu"
-
-#: ../gtk/gaimstock.c:139
-msgid "Close _tabs"
-msgstr "Fermu _langetojn"
-
-#: ../gtk/gaimstock.c:140 ../gtk/gtkblist.c:1069
-msgid "I_M"
-msgstr "T_M"
-
-#: ../gtk/gaimstock.c:141
-msgid "_Get Info"
-msgstr "_Ricevu Informon"
-
-#: ../gtk/gaimstock.c:142
-msgid "_Invite"
-msgstr "_Ivitu"
-
-#: ../gtk/gaimstock.c:143
-msgid "_Modify"
-msgstr "Ŝ_anĝu..."
-
-#: ../gtk/gaimstock.c:144
-msgid "_Open Mail"
-msgstr "_Malfermu retmesaĝon"
-
-#. Pause button
-#: ../gtk/gaimstock.c:145 ../gtk/gtkft.c:835
-msgid "_Pause"
-msgstr "_Paŭzo"
-
-#. Build the login options frame.
-#: ../gtk/gtkaccount.c:390
-msgid "Login Options"
-msgstr "Salutaj Opcioj"
-
-#: ../gtk/gtkaccount.c:492
-msgid "Local alias:"
-msgstr "Loka Alinomo:"
-
-#. Build the user options frame.
-#: ../gtk/gtkaccount.c:554
-msgid "User Options"
-msgstr "Uzantoopcioj"
-
-#. Buddy icon
-#: ../gtk/gtkaccount.c:572
-msgid "Use this buddy icon for this account:"
-msgstr "Uzu tiun kunul piktogramon por tiu konto:"
-
-#. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:684
-#, c-format
-msgid "%s Options"
-msgstr "%s Opcioj"
-
-#: ../gtk/gtkaccount.c:881
-msgid "Use GNOME Proxy Settings"
-msgstr "Uzu GNOME-ajn Prokurilo-Agordojn"
-
-#: ../gtk/gtkaccount.c:882
-msgid "Use Global Proxy Settings"
-msgstr "Uzu Sistemajn Prokurilo-Agordojn"
-
-#: ../gtk/gtkaccount.c:888
-msgid "No Proxy"
-msgstr "Sen Prokurilo"
-
-#: ../gtk/gtkaccount.c:894
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../gtk/gtkaccount.c:900
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: ../gtk/gtkaccount.c:906
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#: ../gtk/gtkaccount.c:912 ../gtk/gtkprefs.c:1100
-msgid "Use Environmental Settings"
-msgstr "Uzu Mediajn Agordojn"
-
-#. This is an easter egg.
-#. It means one of two things, both intended as humourus:
-#. A) your network is really slow and you have nothing better to do than
-#. look at butterflies.
-#. B)You are looking really closely at something that shouldn't matter.
-#: ../gtk/gtkaccount.c:951
-msgid "If you look real closely"
-msgstr "Se vi rigardas sufiĉe proksime"
-
-#. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:954
-msgid "you can see the butterflies mating"
-msgstr "vi povas vidi la Zamenhofan barbon kreski"
-
-#: ../gtk/gtkaccount.c:975
-msgid "Proxy Options"
-msgstr "Prokurilo Opcioj"
-
-#: ../gtk/gtkaccount.c:989 ../gtk/gtkprefs.c:1094
-msgid "Proxy _type:"
-msgstr "Prokurilo _tipo:"
-
-#: ../gtk/gtkaccount.c:998 ../gtk/gtkprefs.c:1115
-msgid "_Host:"
-msgstr "_Retnodo:"
-
-#: ../gtk/gtkaccount.c:1002 ../gtk/gtkprefs.c:1133
-msgid "_Port:"
-msgstr "_Pordo:"
-
-#: ../gtk/gtkaccount.c:1010
-msgid "_Username:"
-msgstr "_Salutnomo:"
-
-#: ../gtk/gtkaccount.c:1017 ../gtk/gtkprefs.c:1170
-msgid "Pa_ssword:"
-msgstr "Pa_svorto:"
-
-#: ../gtk/gtkaccount.c:1428
-msgid "Add Account"
-msgstr "Aldonu Konton"
-
-#: ../gtk/gtkaccount.c:1452
-msgid "_Basic"
-msgstr "_Baza"
-
-#: ../gtk/gtkaccount.c:1463
-msgid "_Advanced"
-msgstr "_Kroma"
-
-#. Register button
-#: ../gtk/gtkaccount.c:1478 ../libgaim/protocols/jabber/jabber.c:860
-msgid "Register"
-msgstr "Registru"
-
-#: ../gtk/gtkaccount.c:1933 ../gtk/gtkplugin.c:566
-msgid "Enabled"
-msgstr "Enŝaltita"
-
-#: ../gtk/gtkaccount.c:1961
-msgid "Protocol"
-msgstr "Protokolo"
-
-#: ../gtk/gtkaccount.c:2133
-msgid ""
-"<span size='larger' weight='bold'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no IM accounts configured. To start connecting with Gaim press the "
-"<b>Add</b> button below and configure your first account. If you want Gaim "
-"to connect to multiple IM accounts, press <b>Add</b> again to configure them "
-"all.\n"
-"\n"
-"You can come back to this window to add, edit, or remove accounts from "
-"<b>Accounts->Add/Edit</b> in the Buddy List window"
-msgstr ""
-
-#: ../gtk/gtkaccount.c:2483
-#, c-format
-msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s%s%s%s volas aldoni %s-n al sia kunullisto%s%s"
-
-#: ../gtk/gtkaccount.c:2506 ../gtk/gtkaccount.c:2512
-msgid "Authorize buddy?"
-msgstr "Permesi kunulon?"
-
-#: ../gtk/gtkaccount.c:2507 ../gtk/gtkaccount.c:2513
-msgid "Authorize"
-msgstr "Permesi"
-
-#: ../gtk/gtkaccount.c:2508 ../gtk/gtkaccount.c:2514
-msgid "Deny"
-msgstr "Rifuzi"
-
-#: ../gtk/gtkblist.c:709
-msgid "Join a Chat"
-msgstr "Aliĝu Babilejon"
-
-#: ../gtk/gtkblist.c:730
-msgid ""
-"Please enter the appropriate information about the chat you would like to "
-"join.\n"
-msgstr "B.v enigi la konvenan informon pri la babilejo kiun vi deziras aliĝi.\n"
-
-#: ../gtk/gtkblist.c:741 ../gtk/gtkpounce.c:529 ../gtk/gtkroomlist.c:399
-msgid "_Account:"
-msgstr "_Konto:"
-
-#: ../gtk/gtkblist.c:1015 ../gtk/gtkprivacy.c:603 ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "_Bloku"
-
-#: ../gtk/gtkblist.c:1015
-msgid "Un_block"
-msgstr "Mal_bloku"
-
-#: ../gtk/gtkblist.c:1066
-msgid "Get _Info"
-msgstr "Ricevu _Informon"
-
-#: ../gtk/gtkblist.c:1075
-msgid "_Send File"
-msgstr "_Sendu Dosieron"
-
-#: ../gtk/gtkblist.c:1082
-msgid "Add Buddy _Pounce"
-msgstr "Aldonu Kunul _Atentigon"
-
-#: ../gtk/gtkblist.c:1086 ../gtk/gtkblist.c:1090 ../gtk/gtkblist.c:1190
-#: ../gtk/gtkblist.c:1213
-msgid "View _Log"
-msgstr "Montru Protoko_lon"
-
-#: ../gtk/gtkblist.c:1103
-msgid "Alias..."
-msgstr "Alinomo..."
-
-#: ../gtk/gtkblist.c:1112 ../gtk/gtkblist.c:1198 ../gtk/gtkblist.c:1219
-msgid "_Alias..."
-msgstr "_Alinomo..."
-
-#: ../gtk/gtkblist.c:1114 ../gtk/gtkblist.c:1200 ../gtk/gtkblist.c:1221
-msgid "_Remove"
-msgstr "Fo_rigu"
-
-#: ../gtk/gtkblist.c:1161
-msgid "Add a _Buddy"
-msgstr "Aldonu K_unulon"
-
-#: ../gtk/gtkblist.c:1163
-msgid "Add a C_hat"
-msgstr "Aldonu Babile_jon"
-
-#: ../gtk/gtkblist.c:1166
-msgid "_Delete Group"
-msgstr "_Forigu Grupon"
-
-#: ../gtk/gtkblist.c:1168
-msgid "_Rename"
-msgstr "_Alinomu"
-
-#: ../gtk/gtkblist.c:1188
-msgid "Auto-Join"
-msgstr "Aŭtomate-aliĝu"
-
-#: ../gtk/gtkblist.c:1226 ../gtk/gtkblist.c:1249
-msgid "_Collapse"
-msgstr "_Maletendu"
-
-#: ../gtk/gtkblist.c:1254
-msgid "_Expand"
-msgstr "_Etendu"
-
-#: ../gtk/gtkblist.c:1500 ../gtk/gtkblist.c:1512 ../gtk/gtkblist.c:4374
-#: ../gtk/gtkblist.c:4384
-msgid "/Tools/Mute Sounds"
-msgstr "/Iloj/Mutu Sonojn"
-
-#: ../gtk/gtkblist.c:1972 ../gtk/gtkconv.c:4415 ../gtk/gtkpounce.c:421
-msgid "You are not currently signed on with an account that can add that buddy."
-msgstr "Vi ne ensalutis nun per konto kiu povas aldoni tiun kunul."
-
-#. Buddies menu
-#: ../gtk/gtkblist.c:2567
-msgid "/_Buddies"
-msgstr "/K_unuloj"
-
-#: ../gtk/gtkblist.c:2568
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Kunuloj/Nova Tuj _Mesaĝo..."
-
-#: ../gtk/gtkblist.c:2569
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Kunuloj/Aliĝu Babile_jon..."
-
-#: ../gtk/gtkblist.c:2570
-msgid "/Buddies/Get User _Info..."
-msgstr "/Kunuloj/Ricevu Uzanto-_Informon..."
-
-#: ../gtk/gtkblist.c:2571
-msgid "/Buddies/View User _Log..."
-msgstr "/Kunuloj/Montru Uzanto-_Protokolon..."
-
-#: ../gtk/gtkblist.c:2573
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Kunuloj/Montru Senk_onektajn Kunulojn"
-
-#: ../gtk/gtkblist.c:2574
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Kunuloj/Montru Malpl_enajn Grupojn"
-
-#: ../gtk/gtkblist.c:2575
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Kunuloj/Montru Kunul-_Detalojn"
-
-#: ../gtk/gtkblist.c:2576
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Kunuloj/Montru Senfarajn _Tempojn"
-
-#: ../gtk/gtkblist.c:2577
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Kunuloj/_Oridgu Kunulojn"
-
-#: ../gtk/gtkblist.c:2579
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Kunuloj/_Aldonu Kunulon..."
-
-#: ../gtk/gtkblist.c:2580
-msgid "/Buddies/Add C_hat..."
-msgstr "/Kunuloj/Aldonu Babile_jon..."
-
-#: ../gtk/gtkblist.c:2581
-msgid "/Buddies/Add _Group..."
-msgstr "/Kunuloj/Aldonu _Grupon..."
-
-#: ../gtk/gtkblist.c:2583
-msgid "/Buddies/_Quit"
-msgstr "/Kunuloj/_Finu"
-
-#. Accounts menu
-#: ../gtk/gtkblist.c:2586
-msgid "/_Accounts"
-msgstr "/_Kontoj"
-
-#: ../gtk/gtkblist.c:2587 ../gtk/gtkblist.c:6279
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Kontoj/Aldonu\\/Redaktu"
-
-#. Tools
-#: ../gtk/gtkblist.c:2590
-msgid "/_Tools"
-msgstr "/_Iloj"
-
-#: ../gtk/gtkblist.c:2591
-msgid "/Tools/Buddy _Pounces"
-msgstr "/Iloj/Kunul _Atentigoj"
-
-#: ../gtk/gtkblist.c:2592
-msgid "/Tools/Plu_gins"
-msgstr "/Iloj/Kromaĵoj"
-
-#: ../gtk/gtkblist.c:2593
-msgid "/Tools/Pr_eferences"
-msgstr "/Iloj/Agordoj"
-
-#: ../gtk/gtkblist.c:2594
-msgid "/Tools/Pr_ivacy"
-msgstr "/Iloj/Pr_ivateco"
-
-#: ../gtk/gtkblist.c:2596
-msgid "/Tools/_File Transfers"
-msgstr "/Iloj/_Dosiero-alŝutoj"
-
-#: ../gtk/gtkblist.c:2597
-msgid "/Tools/R_oom List"
-msgstr "/Iloj/Ĉambro-Listo"
-
-#: ../gtk/gtkblist.c:2598
-msgid "/Tools/System _Log"
-msgstr "/Iloj/Sistemo-_Protokolo"
-
-#: ../gtk/gtkblist.c:2600
-msgid "/Tools/Mute _Sounds"
-msgstr "/Iloj/Mutu _Sonojn"
-
-#. Help
-#: ../gtk/gtkblist.c:2603
-msgid "/_Help"
-msgstr "/_Helpo"
-
-#: ../gtk/gtkblist.c:2604
-msgid "/Help/Online _Help"
-msgstr "/Helpo/Reta _Helpo"
-
-#: ../gtk/gtkblist.c:2605
-msgid "/Help/_Debug Window"
-msgstr "/Helpo/_Sencimig-fenestro"
-
-#: ../gtk/gtkblist.c:2606
-msgid "/Help/_About"
-msgstr "/Helpo/_Pri"
-
-#: ../gtk/gtkblist.c:2638
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Konto:</b> %s"
-
-#: ../gtk/gtkblist.c:2722
-msgid "Buddy Alias"
-msgstr "Kunul Alinomo"
-
-#: ../gtk/gtkblist.c:2743
-msgid "Logged In"
-msgstr "Ensalutita"
-
-#: ../gtk/gtkblist.c:2789
-msgid "Last Seen"
-msgstr "Laste Vidita"
-
-#: ../gtk/gtkblist.c:2798 ../gtk/gtkblist.c:3286 ../gtk/gtkdocklet.c:471
-#: ../gtk/gtkstatusbox.c:990 ../libgaim/protocols/gg/gg.c:993
-#: ../libgaim/protocols/jabber/buddy.c:1401
-#: ../libgaim/protocols/novell/novell.c:2863
-#: ../libgaim/protocols/oscar/oscar.c:807
-#: ../libgaim/protocols/oscar/oscar.c:5551 ../libgaim/protocols/qq/qq.c:170
-#: ../libgaim/protocols/qq/qq.c:177 ../libgaim/protocols/yahoo/yahoo.c:2878
-#: ../libgaim/status.c:154
-msgid "Offline"
-msgstr "Senkonekta"
-
-#: ../gtk/gtkblist.c:2809 ../gtk/gtkprefs.c:680
-#: ../libgaim/protocols/jabber/buddy.c:289
-#: ../libgaim/protocols/jabber/buddy.c:937
-#: ../libgaim/protocols/jabber/chat.c:777
-msgid "Description"
-msgstr "Priskibo"
-
-#: ../gtk/gtkblist.c:2809
-msgid "Spooky"
-msgstr ""
-
-#: ../gtk/gtkblist.c:2811
-msgid "Awesome"
-msgstr ""
-
-#: ../gtk/gtkblist.c:2813
-msgid "Rockin'"
-msgstr ""
-
-#: ../gtk/gtkblist.c:3302
-#, c-format
-msgid "Idle %dh %02dm"
-msgstr "Senfara %dh %02dm"
-
-#: ../gtk/gtkblist.c:3304
-#, c-format
-msgid "Idle %dm"
-msgstr "Senfara %dm"
-
-#: ../gtk/gtkblist.c:3435
-msgid "/Buddies/New Instant Message..."
-msgstr "/Kunuloj/Nova Tuj Mesaĝo..."
-
-#: ../gtk/gtkblist.c:3436 ../gtk/gtkblist.c:3469
-msgid "/Buddies/Join a Chat..."
-msgstr "/Kunuloj/Aliĝu Babilejon..."
-
-#: ../gtk/gtkblist.c:3437
-msgid "/Buddies/Get User Info..."
-msgstr "/Kunuloj/Ricevu Uzanto-Informon..."
-
-#: ../gtk/gtkblist.c:3438
-msgid "/Buddies/Add Buddy..."
-msgstr "/Kunuloj/Aldonu Kunulon..."
-
-#: ../gtk/gtkblist.c:3439 ../gtk/gtkblist.c:3472
-msgid "/Buddies/Add Chat..."
-msgstr "/Kunuloj/Aldonu Babilejon..."
-
-#: ../gtk/gtkblist.c:3440
-msgid "/Buddies/Add Group..."
-msgstr "/Kunuloj/Aldonu Grupon..."
-
-#: ../gtk/gtkblist.c:3475
-msgid "/Tools/Buddy Pounces"
-msgstr "/Iloj/Kunul Atentigoj"
-
-#: ../gtk/gtkblist.c:3478
-msgid "/Tools/Privacy"
-msgstr "/Iloj/Privateco"
-
-#: ../gtk/gtkblist.c:3481
-msgid "/Tools/Room List"
-msgstr "/Iloj/Ĉambro Listo"
-
-#: ../gtk/gtkblist.c:3578 ../gtk/gtkdocklet.c:152
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d nelegita mesaĝo el %s\n"
-msgstr[1] "%d nelegitaj mesaĝoj el %s\n"
-
-#: ../gtk/gtkblist.c:3654
-msgid "Manually"
-msgstr "Mane"
-
-#: ../gtk/gtkblist.c:3656
-msgid "Alphabetically"
-msgstr "Alfabete"
-
-#: ../gtk/gtkblist.c:3657
-msgid "By status"
-msgstr "Laŭ stato"
-
-#: ../gtk/gtkblist.c:3658
-msgid "By log size"
-msgstr "Laŭ protokolo grandeco"
-
-#: ../gtk/gtkblist.c:3860 ../gtk/gtkconn.c:178
-#, c-format
-msgid "%s disconnected"
-msgstr "%s malkontaktita"
-
-#: ../gtk/gtkblist.c:3869 ../libgaim/protocols/sametime/sametime.c:3664
-msgid "Connect"
-msgstr "Kontaktu"
-
-#: ../gtk/gtkblist.c:3869
-msgid "Re-enable Account"
-msgstr "Reŝaltu Konton"
-
-#: ../gtk/gtkblist.c:3890
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s malkontaktita: %s</span>"
-
-#: ../gtk/gtkblist.c:4027
-msgid "<b>Username:</b>"
-msgstr "<b>_Uzantonomo:</b>"
-
-#: ../gtk/gtkblist.c:4034
-msgid "<b>Password:</b>"
-msgstr "<b>Pasvorton:</b>"
-
-#: ../gtk/gtkblist.c:4045
-msgid "_Login"
-msgstr "Sa_lutnomo"
-
-#: ../gtk/gtkblist.c:4127
-msgid "/Accounts"
-msgstr "/Kontoj"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../gtk/gtkblist.c:4141
-msgid ""
-"<span weight='bold' size='larger'>Welcome to Gaim!</span>\n"
-"\n"
-"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
-"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
-"able to sign on, set your status, and talk to your friends."
-msgstr ""
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../gtk/gtkblist.c:4368
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Kunuloj/Montru Senkonektajn Kunulojn"
-
-#: ../gtk/gtkblist.c:4371
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Kunuloj/Montru Malplenajn Grupojn"
-
-#: ../gtk/gtkblist.c:4377
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Kunulojn/Montru Kunul-Detalojn"
-
-#: ../gtk/gtkblist.c:4380
-msgid "/Buddies/Show Idle Times"
-msgstr "/Kunuloj/Montru Senfarajn Tempojn"
-
-#: ../gtk/gtkblist.c:5073 ../gtk/plugins/gevolution/gevolution.c:97
-#: ../gtk/plugins/gevolution/gevo-util.c:64 ../libgaim/blist.c:521
-#: ../libgaim/blist.c:1294 ../libgaim/blist.c:1523
-#: ../libgaim/protocols/jabber/roster.c:68
-msgid "Buddies"
-msgstr "Kunuloj"
-
-#: ../gtk/gtkblist.c:5207
-msgid ""
-"Please enter the screen name of the person you would like to add to your "
-"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
-"The alias will be displayed in place of the screen name whenever possible.\n"
-msgstr ""
-"B.v. enigi la ekranan nomon de la persono kiun vi volas aldoni en via "
-"kunullisto. Vi povas laŭ deziro enigi alinomon, aŭ karesnomon, pri la kunul. "
-"La alinomo estos vidigita anstataŭ la erkrana nomo laŭ kaze.\n"
-
-#: ../gtk/gtkblist.c:5267 ../gtk/gtkblist.c:5628
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
-#: ../gtk/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Grupo:"
-
-#: ../gtk/gtkblist.c:5526
-msgid "This protocol does not support chat rooms."
-msgstr ""
-
-#: ../gtk/gtkblist.c:5542
-msgid ""
-"You are not currently signed on with any protocols that have the ability to "
-"chat."
-msgstr ""
-
-#: ../gtk/gtkblist.c:5583
-msgid ""
-"Please enter an alias, and the appropriate information about the chat you "
-"would like to add to your buddy list.\n"
-msgstr ""
-"B.v. enigi alinomon, kaj la konvenan informon pri la babilejo kiun vi volas "
-"aldoni en via kunullisto.\n"
-
-#: ../gtk/gtkblist.c:5666
-msgid "Please enter the name of the group to be added."
-msgstr "B.v. enigi la nomon de la grupo aldonenda."
-
-#: ../gtk/gtkblist.c:6299
-msgid "<GaimMain>/Accounts/"
-msgstr "<GaimMain>/Kontoj/"
-
-#: ../gtk/gtkblist.c:6324
-msgid "_Edit Account"
-msgstr "_Redaktu Konton"
-
-#: ../gtk/gtkblist.c:6357 ../gtk/gtkblist.c:6363 ../gtk/gtkconv.c:2858
-msgid "No actions available"
-msgstr "Neniu ago disponebla"
-
-#: ../gtk/gtkblist.c:6371
-msgid "_Disable"
-msgstr "_Malŝaltu"
-
-#: ../gtk/gtkblist.c:6383
-msgid "Enable Account"
-msgstr "Ŝaltu Konton"
-
-#: ../gtk/gtkblist.c:6389
-msgid "<GaimMain>/Accounts/Enable Account"
-msgstr ""
-
-#: ../gtk/gtkblist.c:6438
-msgid "/Tools"
-msgstr "/Iloj"
-
-#: ../gtk/gtkblist.c:6508
-msgid "/Buddies/Sort Buddies"
-msgstr "/Kunuloj/Ordigu Kunulojn"
-
-#: ../gtk/gtkconn.c:179
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Gaim will not attempt to reconnect the account until you correct the error "
-"and re-enable the account."
-msgstr ""
-
-#: ../gtk/gtkconv.c:766 ../gtk/gtkconv.c:792
-msgid "That buddy is not on the same protocol as this chat."
-msgstr ""
-
-#: ../gtk/gtkconv.c:786
-msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr ""
-
-#: ../gtk/gtkconv.c:839
-msgid "Invite Buddy Into Chat Room"
-msgstr "Invitu Kunul En Babilejo"
-
-#. Put our happy label in it.
-#: ../gtk/gtkconv.c:869
-msgid ""
-"Please enter the name of the user you wish to invite, along with an optional "
-"invite message."
-msgstr ""
-"B.v. enigi la nomon de uzanto kiun vi deziras inviti, kun fakultativan "
-"invitmesaĝon."
-
-#: ../gtk/gtkconv.c:890
-msgid "_Buddy:"
-msgstr "K_unul:"
-
-#: ../gtk/gtkconv.c:910 ../gtk/gtksavedstatuses.c:1141
-#: ../gtk/gtksavedstatuses.c:1477
-msgid "_Message:"
-msgstr "_Mesaĝo:"
-
-#: ../gtk/gtkconv.c:967 ../gtk/gtkconv.c:2420 ../gtk/gtkdebug.c:218
-#: ../gtk/gtkft.c:542
-msgid "Unable to open file."
-msgstr "Dosiero malfermeblas."
-
-#: ../gtk/gtkconv.c:973
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Konversacio kun %s</h1>\n"
-
-#: ../gtk/gtkconv.c:997
-msgid "Save Conversation"
-msgstr "Konservu Konversacion"
-
-#: ../gtk/gtkconv.c:1144 ../gtk/gtkdebug.c:166 ../gtk/gtkdebug.c:756
-msgid "Find"
-msgstr "Trovu"
-
-#: ../gtk/gtkconv.c:1170 ../gtk/gtkdebug.c:194
-msgid "_Search for:"
-msgstr "_Serĉu:"
-
-#: ../gtk/gtkconv.c:1341
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr ""
-
-#: ../gtk/gtkconv.c:1349
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr ""
-
-#: ../gtk/gtkconv.c:1617
-msgid "Un-Ignore"
-msgstr "Malignoru"
-
-#: ../gtk/gtkconv.c:1620
-msgid "Ignore"
-msgstr "Ignoru"
-
-#: ../gtk/gtkconv.c:1640
-msgid "Get Away Message"
-msgstr "Montru Formesaĝon"
-
-#: ../gtk/gtkconv.c:1663
-msgid "Last said"
-msgstr "Laste diris"
-
-#: ../gtk/gtkconv.c:2428
-msgid "Unable to save icon file to disk."
-msgstr "Ne eblas konservi piktogramodosieron al disko."
-
-#: ../gtk/gtkconv.c:2498
-msgid "Save Icon"
-msgstr "Konservu Piktogramon"
-
-#: ../gtk/gtkconv.c:2547
-msgid "Animate"
-msgstr "Animaciigi"
-
-#: ../gtk/gtkconv.c:2552
-msgid "Hide Icon"
-msgstr "Kaŝu Piktogramon"
-
-#: ../gtk/gtkconv.c:2555
-msgid "Save Icon As..."
-msgstr "Konservu Piktogramon Kiel..."
-
-#: ../gtk/gtkconv.c:2559
-msgid "Set Custom Icon..."
-msgstr "Difinu Propran Piktogramon..."
-
-#: ../gtk/gtkconv.c:2566
-msgid "Remove Custom Icon"
-msgstr "Forigu Propran Piktogramon"
-
-#. Conversation menu
-#: ../gtk/gtkconv.c:2707
-msgid "/_Conversation"
-msgstr "/_Konversacio"
-
-#: ../gtk/gtkconv.c:2709
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Konversacio/Nova Tuj _Mesaĝo..."
-
-#: ../gtk/gtkconv.c:2714
-msgid "/Conversation/_Find..."
-msgstr "/Konversacio/_Trovu..."
-
-#: ../gtk/gtkconv.c:2716
-msgid "/Conversation/View _Log"
-msgstr "/Konversacio/Montru _Protokolon"
-
-#: ../gtk/gtkconv.c:2717
-msgid "/Conversation/_Save As..."
-msgstr "/Konversacio/_Konservu Kiel..."
-
-#: ../gtk/gtkconv.c:2719
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Konversacio/Fo_rviŝu Dialogon"
-
-#: ../gtk/gtkconv.c:2723
-msgid "/Conversation/Se_nd File..."
-msgstr "/Konversacio/Se_ndu Dosieron..."
-
-#: ../gtk/gtkconv.c:2724
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Konversacio/Aldonu Kunul-_Atentigon..."
-
-#: ../gtk/gtkconv.c:2726
-msgid "/Conversation/_Get Info"
-msgstr "/Konversatio/_Ricevu Informon"
-
-#: ../gtk/gtkconv.c:2728
-msgid "/Conversation/In_vite..."
-msgstr "/Konversacio/In_vitu..."
-
-#: ../gtk/gtkconv.c:2730
-msgid "/Conversation/M_ore"
-msgstr "/Konversacio/_Pli"
-
-#: ../gtk/gtkconv.c:2734
-msgid "/Conversation/Al_ias..."
-msgstr "/Konversacio/Al_inomo..."
-
-#: ../gtk/gtkconv.c:2736
-msgid "/Conversation/_Block..."
-msgstr "/KConversacio/_Bloku..."
-
-#: ../gtk/gtkconv.c:2738
-msgid "/Conversation/_Add..."
-msgstr "/Konversacio/_Aldonu..."
-
-#: ../gtk/gtkconv.c:2740
-msgid "/Conversation/_Remove..."
-msgstr "/Konversacio/_Forigu..."
-
-#: ../gtk/gtkconv.c:2745
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Konversacio/Enmetu Ligi_lon..."
-
-#: ../gtk/gtkconv.c:2747
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Konversacio/Enm_etu Bildon..."
-
-#: ../gtk/gtkconv.c:2752
-msgid "/Conversation/_Close"
-msgstr "/Konversacio/_Fermu"
-
-#. Options
-#: ../gtk/gtkconv.c:2756
-msgid "/_Options"
-msgstr "/_Opcioj"
-
-#: ../gtk/gtkconv.c:2757
-msgid "/Options/Enable _Logging"
-msgstr "/Opcioj/Ŝaltu _Protokoladon"
-
-#: ../gtk/gtkconv.c:2758
-msgid "/Options/Enable _Sounds"
-msgstr "/Opcioj/Ŝaltu _Sonojn"
-
-#: ../gtk/gtkconv.c:2759
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Opcioj/Montru Kunul-P_iktogramon"
-
-#: ../gtk/gtkconv.c:2761
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Opcioj/Montru Formato-_Illistelojn"
-
-#: ../gtk/gtkconv.c:2762
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Opcioj/Montru Te_mpomarkojn"
-
-#: ../gtk/gtkconv.c:2837
-msgid "/Conversation/More"
-msgstr "/Konversacio/Pli"
-
-#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
-#. * the 'Conversation' menu pops up.
-#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
-#. * the 'Conversation' menu pops up because the entries can change after the
-#. * conversation is created.
-#: ../gtk/gtkconv.c:2882 ../gtk/gtkconv.c:2914
-msgid "/Conversation"
-msgstr "/Konversacio"
-
-#: ../gtk/gtkconv.c:2922
-msgid "/Conversation/View Log"
-msgstr "/Konversacio/Montru Protokoladon"
-
-#: ../gtk/gtkconv.c:2928
-msgid "/Conversation/Send File..."
-msgstr "/Konversacio/Sendu Dosieron..."
-
-#: ../gtk/gtkconv.c:2932
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Konversacio/Aldonu Kunul-Atentijon..."
-
-#: ../gtk/gtkconv.c:2938
-msgid "/Conversation/Get Info"
-msgstr "/Konversacio/Ricevu Informon"
-
-#: ../gtk/gtkconv.c:2942
-msgid "/Conversation/Invite..."
-msgstr "/Konversacio/Invitu..."
-
-#: ../gtk/gtkconv.c:2948
-msgid "/Conversation/Alias..."
-msgstr "/Konversacio/Alinomo..."
-
-#: ../gtk/gtkconv.c:2952
-msgid "/Conversation/Block..."
-msgstr "/Konversacio/Bloku..."
-
-#: ../gtk/gtkconv.c:2956
-msgid "/Conversation/Add..."
-msgstr "/Konversacion/Aldonu..."
-
-#: ../gtk/gtkconv.c:2960
-msgid "/Conversation/Remove..."
-msgstr "/Konversacio/Forigu..."
-
-#: ../gtk/gtkconv.c:2966
-msgid "/Conversation/Insert Link..."
-msgstr "/Konversacio/Enmetu Ligilon..."
-
-#: ../gtk/gtkconv.c:2970
-msgid "/Conversation/Insert Image..."
-msgstr "/Konversacio/Enmetu Bildon..."
-
-#: ../gtk/gtkconv.c:2976
-msgid "/Options/Enable Logging"
-msgstr "/Opcioj/Ŝaltu Protokoladon"
-
-#: ../gtk/gtkconv.c:2979
-msgid "/Options/Enable Sounds"
-msgstr "/Opcioj/Ŝaltu Sonojn"
-
-#: ../gtk/gtkconv.c:2992
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Opcioj/Montru Formato-Illistelojn"
-
-#: ../gtk/gtkconv.c:2995
-msgid "/Options/Show Timestamps"
-msgstr "/Opcioj/Montru Tempomarkojn"
-
-#: ../gtk/gtkconv.c:2998
-msgid "/Options/Show Buddy Icon"
-msgstr "/Opcioj/Montru Kunul-Piktogramon"
-
-#: ../gtk/gtkconv.c:3074
-msgid "User is typing..."
-msgstr "Uzanto tajpas..."
-
-#: ../gtk/gtkconv.c:3077
-msgid "User has typed something and stopped"
-msgstr "Uzanto tajpis ion kaj haltis"
-
-#. Build the Send To menu
-#: ../gtk/gtkconv.c:3260
-msgid "_Send To"
-msgstr "_Sendu Al"
-
-#: ../gtk/gtkconv.c:3967
-msgid "_Send"
-msgstr "_Sendu"
-
-#: ../gtk/gtkconv.c:4063 ../libgaim/protocols/sametime/sametime.c:3606
-msgid "Topic:"
-msgstr "Temo:"
-
-#. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:4115
-msgid "0 people in room"
-msgstr "0 homo en ĉambro"
-
-#: ../gtk/gtkconv.c:5181 ../gtk/gtkconv.c:5302
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d homo en ĉambro"
-msgstr[1] "%d homoj en ĉambro"
-
-#: ../gtk/gtkconv.c:5855 ../gtk/gtkstatusbox.c:567
-msgid "Typing"
-msgstr "Tajpante"
-
-#: ../gtk/gtkconv.c:5861
-msgid "Stopped Typing"
-msgstr "Ekmaltajpas"
-
-#: ../gtk/gtkconv.c:5866
-msgid "Nick Said"
-msgstr "Karesnomo Diris"
-
-#: ../gtk/gtkconv.c:5871 ../gtk/gtkdocklet.c:513
-msgid "Unread Messages"
-msgstr "Nelegitaj mesaĝoj"
-
-#: ../gtk/gtkconv.c:5876
-msgid "New Event"
-msgstr "Nova Evento"
-
-#: ../gtk/gtkconv.c:6997
-msgid "Confirm close"
-msgstr "Konfirmu fermon"
-
-#: ../gtk/gtkconv.c:7029
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Vi havas nelegitajn mesaĝojn. Ĉu vi certas vi volas fermi la fenestron?"
-
-#: ../gtk/gtkconv.c:7564
-msgid "Close other tabs"
-msgstr "Fermu aliajn langetojn"
-
-#: ../gtk/gtkconv.c:7570
-msgid "Close all tabs"
-msgstr "Fermu ĉiujn langetojn"
-
-#: ../gtk/gtkconv.c:7578
-msgid "Detach this tab"
-msgstr "Deigu tiun langeton"
-
-#: ../gtk/gtkconv.c:7584
-msgid "Close this tab"
-msgstr "Fermu tiun langeton"
-
-#: ../gtk/gtkconv.c:7855
-msgid "Close conversation"
-msgstr "Fermu konversacion"
-
-#: ../gtk/gtkconv.c:8319
-msgid "Last created window"
-msgstr "Lasta kreita fenestro"
-
-#: ../gtk/gtkconv.c:8321
-msgid "Separate IM and Chat windows"
-msgstr "Disigu TM-aj kaj Babilejajn fenestrojn"
-
-#: ../gtk/gtkconv.c:8323 ../gtk/gtkprefs.c:1303
-msgid "New window"
-msgstr "Nova fenestro"
-
-#: ../gtk/gtkconv.c:8325
-msgid "By group"
-msgstr "Laŭ grupo"
-
-#: ../gtk/gtkconv.c:8327
-msgid "By account"
-msgstr "Laŭ konto"
-
-#: ../gtk/gtkdebug.c:233
-msgid "Save Debug Log"
-msgstr "Konservu Sencimigo-Protokolon"
-
-#: ../gtk/gtkdebug.c:594
-msgid "Invert"
-msgstr "Maligu"
-
-#: ../gtk/gtkdebug.c:597
-msgid "Highlight matches"
-msgstr "Emfazu trovojn"
-
-#: ../gtk/gtkdebug.c:664
-msgid "_Icon Only"
-msgstr "Nur _Piktogramo"
-
-#: ../gtk/gtkdebug.c:665
-msgid "_Text Only"
-msgstr "Nur _Teksto"
-
-#: ../gtk/gtkdebug.c:666
-msgid "_Both Icon & Text"
-msgstr "_Ambaŭ Piktogramo & Teksto"
-
-#: ../gtk/gtkdebug.c:802
-msgid "Filter"
-msgstr "Filtrilo"
-
-#: ../gtk/gtkdebug.c:821
-msgid "Right click for more options."
-msgstr "Dektra klako por plia opcioj."
-
-#: ../gtk/gtkdebug.c:851
-msgid "Level "
-msgstr "Nivelo "
-
-#: ../gtk/gtkdebug.c:852 ../gtk/gtkdebug.c:858
-msgid "Select the debug filter level."
-msgstr "Elektu sencimigfiltrilo nivelo."
-
-#: ../gtk/gtkdebug.c:860
-msgid "All"
-msgstr "Ĉiuj"
-
-#: ../gtk/gtkdebug.c:861
-msgid "Misc"
-msgstr "Diversaĵoj"
-
-#: ../gtk/gtkdebug.c:863
-msgid "Warning"
-msgstr "Averto"
-
-#: ../gtk/gtkdebug.c:864
-msgid "Error "
-msgstr "Eraro "
-
-#: ../gtk/gtkdebug.c:865
-msgid "Fatal Error"
-msgstr "Fatala Eraro"
-
-#: ../gtk/gtkdialogs.c:66 ../gtk/gtkdialogs.c:110
-msgid "lead developer"
-msgstr "ĉefa programisto"
-
-#: ../gtk/gtkdialogs.c:67 ../gtk/gtkdialogs.c:68 ../gtk/gtkdialogs.c:69
-#: ../gtk/gtkdialogs.c:70 ../gtk/gtkdialogs.c:71 ../gtk/gtkdialogs.c:73
-#: ../gtk/gtkdialogs.c:74 ../gtk/gtkdialogs.c:75 ../gtk/gtkdialogs.c:76
-#: ../gtk/gtkdialogs.c:77 ../gtk/gtkdialogs.c:78 ../gtk/gtkdialogs.c:81
-#: ../gtk/gtkdialogs.c:82 ../gtk/gtkdialogs.c:83
-msgid "developer"
-msgstr "programisto"
-
-#: ../gtk/gtkdialogs.c:72
-msgid "developer & webmaster"
-msgstr "programisto kaj retestro"
-
-#: ../gtk/gtkdialogs.c:79
-msgid "support"
-msgstr "subteno"
-
-#: ../gtk/gtkdialogs.c:80
-msgid "support/QA"
-msgstr "subteno/Kvalitkontrolo"
-
-#: ../gtk/gtkdialogs.c:102
-msgid "win32 port"
-msgstr "win32 portebliĝo"
-
-#: ../gtk/gtkdialogs.c:103 ../gtk/gtkdialogs.c:104
-msgid "maintainer"
-msgstr "vartulo"
-
-#: ../gtk/gtkdialogs.c:105
-msgid "libfaim maintainer"
-msgstr "libfaim vartulo"
-
-#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../gtk/gtkdialogs.c:107
-msgid "hacker and designated driver [lazy bum]"
-msgstr "artifikulo kaj speciala pelilo"
-
-#: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber programisto"
-
-#: ../gtk/gtkdialogs.c:109
-msgid "original author"
-msgstr "originala aŭtoro"
-
-#: ../gtk/gtkdialogs.c:116
-msgid "Arabic"
-msgstr "Araba"
-
-#: ../gtk/gtkdialogs.c:117 ../gtk/gtkdialogs.c:118 ../gtk/gtkdialogs.c:190
-msgid "Bulgarian"
-msgstr "Bulgara"
-
-#: ../gtk/gtkdialogs.c:119 ../gtk/gtkdialogs.c:120
-msgid "Bengali"
-msgstr "Bengala"
-
-#: ../gtk/gtkdialogs.c:121
-msgid "Bosnian"
-msgstr "Bosna"
-
-#: ../gtk/gtkdialogs.c:122 ../gtk/gtkdialogs.c:191 ../gtk/gtkdialogs.c:192
-msgid "Catalan"
-msgstr "Kataluna"
-
-#: ../gtk/gtkdialogs.c:123 ../gtk/gtkdialogs.c:124
-msgid "Valencian-Catalan"
-msgstr "Valenciana"
-
-#: ../gtk/gtkdialogs.c:125 ../gtk/gtkdialogs.c:193
-msgid "Czech"
-msgstr "Ĉeĥa"
-
-#: ../gtk/gtkdialogs.c:126
-msgid "Danish"
-msgstr "Dana"
-
-#: ../gtk/gtkdialogs.c:127 ../gtk/gtkdialogs.c:128 ../gtk/gtkdialogs.c:194
-msgid "German"
-msgstr "Germana"
-
-#: ../gtk/gtkdialogs.c:129 ../gtk/gtkdialogs.c:130 ../gtk/gtkdialogs.c:131
-msgid "Dzongkha"
-msgstr ""
-
-#: ../gtk/gtkdialogs.c:132 ../gtk/gtkdialogs.c:133
-msgid "Greek"
-msgstr "Greka"
-
-#: ../gtk/gtkdialogs.c:134
-msgid "Australian English"
-msgstr "Aŭstrala Angla"
-
-#: ../gtk/gtkdialogs.c:135
-msgid "Canadian English"
-msgstr "Kanada Angla"
-
-#: ../gtk/gtkdialogs.c:136
-msgid "British English"
-msgstr "Brita Angla"
-
-#: ../gtk/gtkdialogs.c:137
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../gtk/gtkdialogs.c:138 ../gtk/gtkdialogs.c:195 ../gtk/gtkdialogs.c:196
-#: ../gtk/gtkdialogs.c:197 ../gtk/gtkdialogs.c:198
-msgid "Spanish"
-msgstr "Hispana"
-
-#: ../gtk/gtkdialogs.c:139 ../gtk/gtkdialogs.c:140
-msgid "Euskera(Basque)"
-msgstr "Eŭska"
-
-#: ../gtk/gtkdialogs.c:141 ../gtk/gtkdialogs.c:142 ../gtk/gtkdialogs.c:143
-msgid "Persian"
-msgstr "Persa"
-
-#: ../gtk/gtkdialogs.c:144 ../gtk/gtkdialogs.c:199 ../gtk/gtkdialogs.c:200
-msgid "Finnish"
-msgstr "Finna"
-
-#: ../gtk/gtkdialogs.c:145 ../gtk/gtkdialogs.c:201 ../gtk/gtkdialogs.c:202
-#: ../gtk/gtkdialogs.c:203 ../gtk/gtkdialogs.c:204
-msgid "French"
-msgstr "Franca"
-
-#: ../gtk/gtkdialogs.c:146
-msgid "Galician"
-msgstr "Galega"
-
-#: ../gtk/gtkdialogs.c:147 ../gtk/gtkdialogs.c:148
-msgid "Gujarati"
-msgstr "Guĝarata"
-
-#: ../gtk/gtkdialogs.c:149 ../gtk/gtkdialogs.c:205
-msgid "Hebrew"
-msgstr "Hebrea"
-
-#: ../gtk/gtkdialogs.c:150
-msgid "Hindi"
-msgstr "Hindia"
-
-#: ../gtk/gtkdialogs.c:151
-msgid "Hungarian"
-msgstr "Hungara"
-
-#: ../gtk/gtkdialogs.c:152 ../gtk/gtkdialogs.c:206
-msgid "Italian"
-msgstr "Itala"
-
-#: ../gtk/gtkdialogs.c:153 ../gtk/gtkdialogs.c:207 ../gtk/gtkdialogs.c:208
-#: ../gtk/gtkdialogs.c:209
-msgid "Japanese"
-msgstr "Japana"
-
-#: ../gtk/gtkdialogs.c:154 ../gtk/gtkdialogs.c:210
-msgid "Georgian"
-msgstr "Kartvela"
-
-#: ../gtk/gtkdialogs.c:155 ../gtk/gtkdialogs.c:211
-msgid "Korean"
-msgstr "Korea"
-
-#: ../gtk/gtkdialogs.c:156 ../gtk/gtkdialogs.c:157 ../gtk/gtkdialogs.c:158
-msgid "Kurdish"
-msgstr "Kurda"
-
-#: ../gtk/gtkdialogs.c:159 ../gtk/gtkdialogs.c:212 ../gtk/gtkdialogs.c:213
-msgid "Lithuanian"
-msgstr "Litova"
-
-#: ../gtk/gtkdialogs.c:160
-msgid "Macedonian"
-msgstr "Makedona"
-
-#: ../gtk/gtkdialogs.c:161
-msgid "Nepali"
-msgstr "Nepala"
-
-#: ../gtk/gtkdialogs.c:162
-msgid "Dutch, Flemish"
-msgstr "Nederlanda, Flandra"
-
-#: ../gtk/gtkdialogs.c:163
-msgid "Norwegian"
-msgstr "Norvega"
-
-#: ../gtk/gtkdialogs.c:164 ../gtk/gtkdialogs.c:165 ../gtk/gtkdialogs.c:214
-msgid "Polish"
-msgstr "Pola"
-
-#: ../gtk/gtkdialogs.c:166
-msgid "Portuguese"
-msgstr "Portugala"
-
-#: ../gtk/gtkdialogs.c:167
-msgid "Portuguese-Brazil"
-msgstr "Brazil-Portugala"
-
-#: ../gtk/gtkdialogs.c:168
-msgid "Romanian"
-msgstr "Rumana"
-
-#: ../gtk/gtkdialogs.c:169 ../gtk/gtkdialogs.c:215 ../gtk/gtkdialogs.c:216
-msgid "Russian"
-msgstr "Rusa"
-
-#: ../gtk/gtkdialogs.c:170 ../gtk/gtkdialogs.c:171
-msgid "Serbian"
-msgstr "Serba"
-
-#: ../gtk/gtkdialogs.c:172 ../gtk/gtkdialogs.c:217
-msgid "Slovak"
-msgstr "Slovaka"
-
-#: ../gtk/gtkdialogs.c:173 ../gtk/gtkdialogs.c:218
-msgid "Slovenian"
-msgstr "Slovena"
-
-#: ../gtk/gtkdialogs.c:174
-msgid "Albanian"
-msgstr "Albana"
-
-#: ../gtk/gtkdialogs.c:175 ../gtk/gtkdialogs.c:219
-msgid "Swedish"
-msgstr "Sveda"
-
-#: ../gtk/gtkdialogs.c:176
-msgid "Tamil"
-msgstr "Tamila"
-
-#: ../gtk/gtkdialogs.c:177
-msgid "Telugu"
-msgstr "Telugua"
-
-#: ../gtk/gtkdialogs.c:178
-msgid "Thai"
-msgstr "Taja"
-
-#: ../gtk/gtkdialogs.c:179
-msgid "Turkish"
-msgstr "Turka"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "Vietnamese"
-msgstr "Vjetnama"
-
-#: ../gtk/gtkdialogs.c:180
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh kaj la Gnome-Vi Teamo"
-
-#: ../gtk/gtkdialogs.c:181 ../gtk/gtkdialogs.c:220
-msgid "Simplified Chinese"
-msgstr "Simpligita Ĉina"
-
-#: ../gtk/gtkdialogs.c:182 ../gtk/gtkdialogs.c:183 ../gtk/gtkdialogs.c:221
-msgid "Traditional Chinese"
-msgstr "Tradicia Ĉina"
-
-#: ../gtk/gtkdialogs.c:189
-msgid "Amharic"
-msgstr "Amhara"
-
-#: ../gtk/gtkdialogs.c:301
-msgid "About Gaim"
-msgstr "Pri Gaim"
-
-#: ../gtk/gtkdialogs.c:335
-msgid ""
-"Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, "
-"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
-"Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+."
-"<BR><BR>You may modify and redistribute the program under the terms of the "
-"GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' "
-"file distributed with Gaim.  Gaim is copyrighted by its contributors.  See "
-"the 'COPYRIGHT' file for the complete list of contributors.  We provide no "
-"warranty for this program.<BR><BR>"
-msgstr ""
-"Gaim estas modula mesaĝokliento, kapablas uzi AIM, MSN, Yahoo!, Jabber, ICQ, "
-"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-"
-"Gadu kaj QQ ĉiujn samtempe.  Ĝi estas programita per GTK+.<BR><BR>Vi rajtas "
-"modifi kaj pludistribui la programon je la kondiĉoj de la GPL (versio 2 aŭ "
-"posta).  Ekzempleron de la GPL-o enhavas la dosiero 'COPYING' disdonita kun "
-"Gaim.  Gaim estas aŭtorrajtigita de kontribuantoj.  Vidu la dosieron "
-"'COPYRIGHT' pri kompleta listo de kontribuantoj.  Ni provizas nenian "
-"garantion pri tiu programaro.<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:350
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim ĉe irc.freenode.net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:353
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim ĉe irc.freenode.net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:359
-msgid "Current Developers"
-msgstr "Aktualaj Programistoj"
-
-#: ../gtk/gtkdialogs.c:374
-msgid "Crazy Patch Writers"
-msgstr "Frenezaj Flikistoj"
-
-#: ../gtk/gtkdialogs.c:389
-msgid "Retired Developers"
-msgstr "Emeritaj Programistoj"
-
-#: ../gtk/gtkdialogs.c:404
-msgid "Current Translators"
-msgstr "Aktualaj Tradukantoj"
-
-#: ../gtk/gtkdialogs.c:424
-msgid "Past Translators"
-msgstr "Pastintaj Tradukantoj"
-
-#: ../gtk/gtkdialogs.c:442
-msgid "Debugging Information"
-msgstr "Sencimiga Informo"
-
-#: ../gtk/gtkdialogs.c:816
-msgid "Get User Info"
-msgstr "Ricevu Uzanto-Informon"
-
-#: ../gtk/gtkdialogs.c:818
-msgid ""
-"Please enter the screen name or alias of the person whose info you would "
-"like to view."
-msgstr ""
-"B.v. enigi la ekrannomon aŭ alinomon de persono kiesn informon vi dezrias "
-"rigardi."
-
-#: ../gtk/gtkdialogs.c:907
-msgid "View User Log"
-msgstr "Rigardu Uzanto-Protokolon"
-
-#: ../gtk/gtkdialogs.c:909
-msgid ""
-"Please enter the screen name or alias of the person whose log you would like "
-"to view."
-msgstr ""
-"B.v. enigi la ekrannomon aŭ alinomon de persono kiesn protokolon vi dezrias "
-"rigardi."
-
-#: ../gtk/gtkdialogs.c:928
-msgid "Alias Contact"
-msgstr "Alinomo Kontakto"
-
-#: ../gtk/gtkdialogs.c:929
-msgid "Enter an alias for this contact."
-msgstr "Enigu alinomon por tiu kontakto."
-
-#: ../gtk/gtkdialogs.c:949
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "Enigu alinomon por %s."
-
-#: ../gtk/gtkdialogs.c:951
-msgid "Alias Buddy"
-msgstr "Alinomu Kunulon"
-
-#: ../gtk/gtkdialogs.c:970
-msgid "Alias Chat"
-msgstr "Alinomu Babilejon"
-
-#: ../gtk/gtkdialogs.c:971
-msgid "Enter an alias for this chat."
-msgstr "Enigu alinomon por tiu babilejon."
-
-#: ../gtk/gtkdialogs.c:1008
-#, c-format
-msgid ""
-"You are about to remove the contact containing %s and %d other buddy from "
-"your buddy list.  Do you want to continue?"
-msgid_plural ""
-"You are about to remove the contact containing %s and %d other buddies from "
-"your buddy list.  Do you want to continue?"
-msgstr[0] ""
-"Vi estas foriganta la kontakton enhavantan %s kaj %d alia kunul de via "
-"kunullisto. Ĉu vi volas daŭrigi?"
-msgstr[1] ""
-"Vi estas foriganta la kontaktojn enhavantajn %s kaj %d aliaj kunuloj de via "
-"kunullisto. Ĉu vi volas daŭrigi?"
-
-#: ../gtk/gtkdialogs.c:1016
-msgid "Remove Contact"
-msgstr "Forigu Kontakton"
-
-#: ../gtk/gtkdialogs.c:1017
-msgid "_Remove Contact"
-msgstr "_Forigu Kontakton"
-
-#: ../gtk/gtkdialogs.c:1047
-#, c-format
-msgid ""
-"You are about to merge the group called %s into the group called %s. Do you "
-"want to continue?"
-msgstr ""
-"Vi estas kunfandanta la grupon nomita %s en la grupo nomita %s. Ĉu vi volas "
-"daŭrigi?"
-
-#: ../gtk/gtkdialogs.c:1054
-msgid "Merge Groups"
-msgstr "Kunfandu Grupojn"
-
-#: ../gtk/gtkdialogs.c:1055
-msgid "_Merge Groups"
-msgstr "_Kunfandu Grupojn"
-
-#: ../gtk/gtkdialogs.c:1105
-#, c-format
-msgid ""
-"You are about to remove the group %s and all its members from your buddy "
-"list.  Do you want to continue?"
-msgstr ""
-"Vi estas foriganta la grupon %s kaj tutajn membrojn de via kunullisto. Ĉu vi "
-"volas daŭrigi?"
-
-#: ../gtk/gtkdialogs.c:1108
-msgid "Remove Group"
-msgstr "Forigu Grupon"
-
-#: ../gtk/gtkdialogs.c:1109
-msgid "_Remove Group"
-msgstr "_Forigu Grupon"
-
-#: ../gtk/gtkdialogs.c:1142
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "Vi estas foriganta %s de via kunullisto.  Ĉu vi volas daŭrigi?"
-
-#: ../gtk/gtkdialogs.c:1145
-msgid "Remove Buddy"
-msgstr "Forigu Kunulon"
-
-#: ../gtk/gtkdialogs.c:1146
-msgid "_Remove Buddy"
-msgstr "_Forigu Kunulon"
-
-#: ../gtk/gtkdialogs.c:1167
-#, c-format
-msgid ""
-"You are about to remove the chat %s from your buddy list.  Do you want to "
-"continue?"
-msgstr "Vi estas foriganta %s de via kunullisto.  Ĉu vi volas daŭrigi?"
-
-#: ../gtk/gtkdialogs.c:1170
-msgid "Remove Chat"
-msgstr "Forigu Babilejon"
-
-#: ../gtk/gtkdialogs.c:1171
-msgid "_Remove Chat"
-msgstr "_Forigu Babilejon"
-
-#: ../gtk/gtkdocklet.c:149
-msgid "Right-click for more unread messages...\n"
-msgstr "Dektre-klaku por pliaj nelegitaj mesaĝoj...\n"
-
-#: ../gtk/gtkdocklet.c:456
-msgid "Change Status"
-msgstr "Ŝanĝu staton"
-
-#: ../gtk/gtkdocklet.c:459 ../gtk/gtkstatusbox.c:987
-#: ../libgaim/protocols/gg/gg.c:996 ../libgaim/protocols/jabber/buddy.c:1403
-#: ../libgaim/protocols/msn/state.c:29 ../libgaim/protocols/msn/state.c:30
-#: ../libgaim/protocols/msn/state.c:37 ../libgaim/protocols/msn/state.c:38
-#: ../libgaim/protocols/novell/novell.c:2851
-#: ../libgaim/protocols/yahoo/yahoo.c:2880 ../libgaim/status.c:155
-msgid "Available"
-msgstr "Disponebla"
-
-#. Away stuff
-#. get_yahoo_status_from_gaim_status() returns YAHOO_STATUS_CUSTOM for
-#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
-#: ../gtk/gtkdocklet.c:463 ../gtk/gtkprefs.c:1821 ../gtk/gtkstatusbox.c:988
-#: ../libgaim/protocols/gg/gg.c:999 ../libgaim/protocols/irc/irc.c:524
-#: ../libgaim/protocols/irc/msgs.c:226
-#: ../libgaim/protocols/jabber/buddy.c:1407
-#: ../libgaim/protocols/novell/novell.c:2854
-#: ../libgaim/protocols/oscar/oscar.c:712
-#: ../libgaim/protocols/oscar/oscar.c:4498
-#: ../libgaim/protocols/oscar/oscar.c:5579 ../libgaim/protocols/qq/qq.c:180
-#: ../libgaim/protocols/silc/buddy.c:1469
-#: ../libgaim/protocols/yahoo/yahoo.c:3353
-#: ../libgaim/protocols/yahoo/yahoo.c:3426 ../libgaim/status.c:158
-msgid "Away"
-msgstr "Fora"
-
-#: ../gtk/gtkdocklet.c:467 ../gtk/gtkstatusbox.c:989
-#: ../libgaim/protocols/oscar/oscar.c:716 ../libgaim/protocols/qq/qq.c:183
-#: ../libgaim/protocols/yahoo/yahoo.c:2874 ../libgaim/status.c:157
-msgid "Invisible"
-msgstr "Nevidebla"
-
-#: ../gtk/gtkdocklet.c:508
-msgid "Show Buddy List"
-msgstr "Montru kunulliston"
-
-#: ../gtk/gtkdocklet.c:534
-msgid "New Message..."
-msgstr "Nova mesaĝo..."
-
-#: ../gtk/gtkdocklet.c:549
-msgid "Mute Sounds"
-msgstr "Malsonorigu"
-
-#: ../gtk/gtkdocklet.c:556
-msgid "Blink on new message"
-msgstr "Flagri je nova mesaĝo"
-
-#. TODO: need a submenu to change status, this needs to "link"
-#. * to the status in the buddy list gtkstatusbox
-#.
-#: ../gtk/gtkdocklet.c:567
-msgid "Quit"
-msgstr "Finu"
-
-#: ../gtk/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/s"
-
-#: ../gtk/gtkft.c:153
-msgid "Not started"
-msgstr "Malkomencita"
-
-#: ../gtk/gtkft.c:159 ../libgaim/account.c:1714
-#: ../libgaim/protocols/gg/gg.c:1002 ../libgaim/protocols/jabber/buddy.c:641
-#: ../libgaim/protocols/jabber/buddy.c:1397
-#: ../libgaim/protocols/jabber/buddy.c:1414
-#: ../libgaim/protocols/novell/novell.c:2866 ../libgaim/protocols/qq/qq.c:230
-msgid "Unknown"
-msgstr "Nekonata"
-
-#: ../gtk/gtkft.c:162 ../gtk/gtkft.c:1118
-msgid "Finished"
-msgstr "Finita"
-
-#: ../gtk/gtkft.c:165 ../gtk/gtkft.c:1056
-msgid "Canceled"
-msgstr "Rezignita"
-
-#: ../gtk/gtkft.c:168 ../gtk/gtkft.c:975
-msgid "Waiting for transfer to begin"
-msgstr "Atendante la alŝutoeko"
-
-#: ../gtk/gtkft.c:228
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Dosiero alŝuto - %d%% je %d dosieroj"
-
-#: ../gtk/gtkft.c:233 ../gtk/gtkft.c:763
-msgid "File Transfers"
-msgstr "Dosiero Alŝutoj"
-
-#: ../gtk/gtkft.c:273
-msgid "<b>Receiving As:</b>"
-msgstr "<b>Ricevante Kiel:</b>"
-
-#: ../gtk/gtkft.c:275
-msgid "<b>Receiving From:</b>"
-msgstr "<b>Ricevante De:</b>"
-
-#: ../gtk/gtkft.c:279
-msgid "<b>Sending To:</b>"
-msgstr "<b>Sendante Al:</b>"
-
-#: ../gtk/gtkft.c:281
-msgid "<b>Sending As:</b>"
-msgstr "<b>Sendante Kiel:</b>"
-
-#: ../gtk/gtkft.c:497
-msgid "There is no application configured to open this type of file."
-msgstr ""
-
-#: ../gtk/gtkft.c:502
-msgid "An error occurred while opening the file."
-msgstr "Eraro okazis malfermante la dosiero."
-
-#: ../gtk/gtkft.c:539
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "Eraro lanĉante %s: %s"
-
-#: ../gtk/gtkft.c:548
-#, c-format
-msgid "Error running %s"
-msgstr "Eraro lanĉante %s"
-
-#: ../gtk/gtkft.c:549
-#, c-format
-msgid "Process returned error code %d"
-msgstr ""
-
-#: ../gtk/gtkft.c:644
-msgid "Progress"
-msgstr "Progreso"
-
-#: ../gtk/gtkft.c:651
-msgid "Filename"
-msgstr "Dosiernomo"
-
-#: ../gtk/gtkft.c:658
-msgid "Size"
-msgstr "Grandeco"
-
-#: ../gtk/gtkft.c:665
-msgid "Remaining"
-msgstr "Restanta"
-
-#: ../gtk/gtkft.c:696
-msgid "Filename:"
-msgstr "Dosiernomo:"
-
-#: ../gtk/gtkft.c:697
-msgid "Local File:"
-msgstr "Loka Doerisero:"
-
-#: ../gtk/gtkft.c:699
-msgid "Speed:"
-msgstr "Rapideco:"
-
-#: ../gtk/gtkft.c:700
-msgid "Time Elapsed:"
-msgstr "Pasita Tempo:"
-
-#: ../gtk/gtkft.c:701
-msgid "Time Remaining:"
-msgstr "Resta Tempo:"
-
-#: ../gtk/gtkft.c:786
-msgid "Close this window when all transfers _finish"
-msgstr "Fermu tiun fenestron kiam all transmetoj _finas"
-
-#: ../gtk/gtkft.c:796
-msgid "C_lear finished transfers"
-msgstr "F_orviŝu finitajn transmetojn"
-
-#. "Download Details" arrow
-#: ../gtk/gtkft.c:805
-msgid "File transfer _details"
-msgstr "Dosiero-transmeto _detaloj"
-
-#. Resume button
-#: ../gtk/gtkft.c:845
-msgid "_Resume"
-msgstr "_Rekomenci"
-
-#: ../gtk/gtkft.c:1058
-msgid "Failed"
-msgstr "Malsukcesita"
-
-#: ../gtk/gtkimhtml.c:793
-msgid "Paste as Plain _Text"
-msgstr "Enmetu keil Plena _Teksto"
-
-#: ../gtk/gtkimhtml.c:810
-msgid "_Reset formatting"
-msgstr "_Restarigu formatumon"
-
-#: ../gtk/gtkimhtml.c:1295
-msgid "Hyperlink color"
-msgstr "Ligila koloro"
-
-#: ../gtk/gtkimhtml.c:1296
-msgid "Color to draw hyperlinks."
-msgstr "Koloro ligila."
-
-#: ../gtk/gtkimhtml.c:1299
-msgid "Hyperlink prelight color"
-msgstr ""
-
-#: ../gtk/gtkimhtml.c:1300
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr ""
-
-#: ../gtk/gtkimhtml.c:1516
-msgid "_Copy E-Mail Address"
-msgstr "_Kopiu Retadreson"
-
-#: ../gtk/gtkimhtml.c:1528
-msgid "_Open Link in Browser"
-msgstr "_Malfermu Ligilon en Retumilo"
-
-#: ../gtk/gtkimhtml.c:1538
-msgid "_Copy Link Location"
-msgstr "_Kopiu Ligilo-Lokon"
-
-#: ../gtk/gtkimhtml.c:3271
-msgid ""
-"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"<span size='larger' weight='bold'>Nerekonata dosiertipo</span>\n"
-"\n"
-"Apriorigas kiel PNG."
-
-#: ../gtk/gtkimhtml.c:3274
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Nerekonata dosiertipo\n"
-"\n"
-"Apriorigas kiel PNG."
-
-#: ../gtk/gtkimhtml.c:3287
-#, c-format
-msgid ""
-"<span size='larger' weight='bold'>Error saving image</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span size='larger' weight='bold'>Eraro konservante bildon</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3290
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Eraro konservante bildon\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3370 ../gtk/gtkimhtml.c:3382
-msgid "Save Image"
-msgstr "Konservu Bildon"
-
-#: ../gtk/gtkimhtml.c:3410
-msgid "_Save Image..."
-msgstr "_Konservi Bildon..."
-
-#: ../gtk/gtkimhtmltoolbar.c:147
-msgid "Select Font"
-msgstr "Elektu Tiparon"
-
-#: ../gtk/gtkimhtmltoolbar.c:226
-msgid "Select Text Color"
-msgstr "Elektu Tekstan Koloron"
-
-#: ../gtk/gtkimhtmltoolbar.c:305
-msgid "Select Background Color"
-msgstr "Elektu Malantaŭan Koloron"
-
-#: ../gtk/gtkimhtmltoolbar.c:394
-msgid "_URL"
-msgstr "_URL"
-
-#: ../gtk/gtkimhtmltoolbar.c:402
-msgid "_Description"
-msgstr "_Priskribo"
-
-#: ../gtk/gtkimhtmltoolbar.c:405
-msgid ""
-"Please enter the URL and description of the link that you want to insert. "
-"The description is optional."
-msgstr ""
-"B.v. enigi la URL-n kaj priskribon de la ligilo kiun vi volas enmeti. La "
-"priskribo estas fakultativa."
-
-#: ../gtk/gtkimhtmltoolbar.c:409
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "B.v. enigi la URL-n kies ligilon vi volas enmeti."
-
-#: ../gtk/gtkimhtmltoolbar.c:414
-msgid "Insert Link"
-msgstr "Enmetu Ligilon"
-
-#: ../gtk/gtkimhtmltoolbar.c:418
-msgid "_Insert"
-msgstr "_Enmetu"
-
-#: ../gtk/gtkimhtmltoolbar.c:487
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Malsukcesis konservi bildon: %s\n"
-
-#: ../gtk/gtkimhtmltoolbar.c:513 ../gtk/gtkimhtmltoolbar.c:523
-msgid "Insert Image"
-msgstr "Enmetu Bildon"
-
-#: ../gtk/gtkimhtmltoolbar.c:721
-msgid "This theme has no available smileys."
-msgstr "Tiu temo havas neniujn disponeblajn ridmienojn"
-
-#. show everything
-#: ../gtk/gtkimhtmltoolbar.c:735
-msgid "Smile!"
-msgstr "Ridetu!"
-
-#: ../gtk/gtkimhtmltoolbar.c:922 ../gtk/plugins/convcolors.c:278
-msgid "Bold"
-msgstr "Grasa"
-
-#: ../gtk/gtkimhtmltoolbar.c:933 ../gtk/plugins/convcolors.c:285
-msgid "Italic"
-msgstr "Kursiva"
-
-#: ../gtk/gtkimhtmltoolbar.c:944 ../gtk/plugins/convcolors.c:292
-msgid "Underline"
-msgstr "Substrekita"
-
-#: ../gtk/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "Pligranda tiparo grandeco"
-
-#: ../gtk/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Malpligranda tiparo grandeco"
-
-#: ../gtk/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr "Tiparo aspekto"
-
-#: ../gtk/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Antaŭa tiparo koloro"
-
-#: ../gtk/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "Malantaŭa tiparo koloro"
-
-#: ../gtk/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr "Restartigu formatumon"
-
-#: ../gtk/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Enmetu ligilon"
-
-#: ../gtk/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Enmetu bildon"
-
-#: ../gtk/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr "Enmetu ridmienon"
-
-#: ../gtk/gtklog.c:234
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Konversacio en %s ĉe %s</span>"
-
-#: ../gtk/gtklog.c:237
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Konversacio kun %s ĉe %s</span>"
-
-#: ../gtk/gtklog.c:284
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../gtk/gtklog.c:331
-msgid ""
-"System events will only be logged if the \"Log all status changes to system "
-"log\" preference is enabled."
-msgstr ""
-"Sistemeventoj nur estos protokolita se la \"Protokolu ĉiujn ŝanĝojn al "
-"sistem protokolo\" agordo estas ŝaltita."
-
-#: ../gtk/gtklog.c:335
-msgid ""
-"Instant messages will only be logged if the \"Log all instant messages\" "
-"preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:338
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr ""
-
-#: ../gtk/gtklog.c:342
-msgid "No logs were found"
-msgstr "Neniu protokolo trovita"
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../gtk/gtklog.c:357
-msgid "_Browse logs folder"
-msgstr ""
-
-#: ../gtk/gtklog.c:425
-msgid "Total log size:"
-msgstr "Tuta protokolo grandeco:"
-
-#: ../gtk/gtklog.c:494
-#, c-format
-msgid "Conversations in %s"
-msgstr "Konversacioj en %s"
-
-#: ../gtk/gtklog.c:502 ../gtk/gtklog.c:553
-#, c-format
-msgid "Conversations with %s"
-msgstr "Konversacioj kun %s"
-
-#: ../gtk/gtklog.c:578
-msgid "System Log"
-msgstr "Sistemo Protokolo"
-
-#: ../gtk/gtkmain.c:344
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. Provu `%s -h' por plia informo.\n"
-
-#: ../gtk/gtkmain.c:346
-#, c-format
-msgid ""
-"Gaim %s\n"
-"Usage: %s [OPTION]...\n"
-"\n"
-"  -c, --config=DIR    use DIR for config files\n"
-"  -d, --debug         print debugging messages to stdout\n"
-"  -h, --help          display this help and exit\n"
-"  -n, --nologin       don't automatically login\n"
-"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
-"                      account(s) to use, separated by commas)\n"
-"  -v, --version       display the current version and exit\n"
-msgstr ""
-"Gaim %s\n"
-"Uzo: %s [OPCIOJ]...\n"
-"\n"
-"  -c, --config=UJO    uzu UJOn por agordo dosieroj\n"
-"  -d, --debug         montru sencimigajn mesaĝojn al stdout\n"
-"  -h, --help          vidigu tiun helpon kaj finu\n"
-"  -n, --nologin       ne aŭtomate ensalutu\n"
-"  -l, --login[=NOMO]  aŭtomate ensalutu (fakultativa argumento NOMO "
-"specifas\n"
-"                      konto(j)n uzendajn, disigitajn per komoj)\n"
-"  -v, --version       vidigu la aktualan version kaj finu\n"
-
-#: ../gtk/gtkmain.c:528
-#, c-format
-msgid ""
-"Gaim has segfaulted and attempted to dump a core file.\n"
-"This is a bug in the software and has happened through\n"
-"no fault of your own.\n"
-"\n"
-"If you can reproduce the crash, please notify the gaim\n"
-"developers by reporting a bug at\n"
-"%sbug.php\n"
-"\n"
-"Please make sure to specify what you were doing at the time\n"
-"and post the backtrace from the core file.  If you do not know\n"
-"how to get the backtrace, please read the instructions at\n"
-"%sgdb.php\n"
-"\n"
-"If you need further assistance, please IM either SeanEgn or \n"
-"LSchiere (via AIM).  Contact information for Sean and Luke \n"
-"on other protocols is at\n"
-"%scontactinfo.php\n"
-msgstr ""
-
-#: ../gtk/gtknotify.c:328
-msgid "Open All Messages"
-msgstr "Malfermu Ĉiujn Retmesaĝojn"
-
-#: ../gtk/gtknotify.c:380
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Vi ricevis retmesaĝon!</span>"
-
-#: ../gtk/gtknotify.c:474
-msgid "Sender"
-msgstr "Sendanto"
-
-#: ../gtk/gtknotify.c:500
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s havas %d novan mesaĝon."
-msgstr[1] "%s havas %d novajn mesaĝojn."
-
-#: ../gtk/gtknotify.c:511
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../gtk/gtknotify.c:699 ../libgaim/protocols/sametime/sametime.c:5548
-msgid "Search Results"
-msgstr "Serĉ-Rezultojn"
-
-#: ../gtk/gtknotify.c:899
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "La retumila komando \"%s\" estas malvalida."
-
-#: ../gtk/gtknotify.c:901 ../gtk/gtknotify.c:913 ../gtk/gtknotify.c:926
-#: ../gtk/gtknotify.c:1054
-msgid "Unable to open URL"
-msgstr "Malfermeblas URL"
-
-#: ../gtk/gtknotify.c:911 ../gtk/gtknotify.c:924
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "Eraro lanĉante \"%s\": %s"
-
-#: ../gtk/gtknotify.c:1055
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "La 'Mana' foliumilo komando estis elektita, sed nenia komando estis difinita."
-
-#: ../gtk/gtkplugin.c:264
-msgid "The following plugins will be unloaded."
-msgstr "La jenajn kromaĵoj estos malŝarĝitaj."
-
-#: ../gtk/gtkplugin.c:283
-msgid "Multiple plugins will be unloaded."
-msgstr "Pluraj kromaĵoj estos elŝarĝitaj."
-
-#: ../gtk/gtkplugin.c:285
-msgid "Unload Plugins"
-msgstr "Elŝarĝi Kormaĵojn"
-
-#: ../gtk/gtkplugin.c:397
-#, c-format
-msgid ""
-"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
-"<span weight=\"bold\">Website:</span>\t\t%s\n"
-"<span weight=\"bold\">Filename:</span>\t\t%s"
-msgstr ""
-"%s%s<span weight=\"bold\">Skribita de:</span>\t%s\n"
-"<span weight=\"bold\">Retsituo:</span>\t\t%s\n"
-"<span weight=\"bold\">Dosiernomo:</span>\t\t%s"
-
-#: ../gtk/gtkplugin.c:407
-#, c-format
-msgid ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
-"Check the plugin website for an update.</span>"
-msgstr ""
-"%s\n"
-"<span foreground=\"#ff0000\" weight=\"bold\">Eraro: %s\n"
-"Kontrolu kromaĵan retsituon por ĝisdatigo .</span>"
-
-#: ../gtk/gtkplugin.c:533
-msgid "Configure Pl_ugin"
-msgstr "Agrod_u Kromaĵon"
-
-#: ../gtk/gtkplugin.c:596
-msgid "<b>Plugin Details</b>"
-msgstr "<b>Kromaĵo Detaloj</b>"
-
-#: ../gtk/gtkpounce.c:155
-msgid "Select a file"
-msgstr "Elektu dosieron"
-
-#: ../gtk/gtkpounce.c:251
-msgid "Please enter a buddy to pounce."
-msgstr "B.v. enigi kunulon atentigendan."
-
-#: ../gtk/gtkpounce.c:505
-msgid "New Buddy Pounce"
-msgstr "Nova Kunul Atentigo"
-
-#: ../gtk/gtkpounce.c:505
-msgid "Edit Buddy Pounce"
-msgstr "Redaktu Kunul Atentigo"
-
-#. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:522
-msgid "Pounce on Whom"
-msgstr "Atentigi Kiun"
-
-#: ../gtk/gtkpounce.c:549
-msgid "_Buddy name:"
-msgstr "K_unul nomo:"
-
-#. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:575
-msgid "Pounce When Buddy..."
-msgstr "Atentigu kiam Kunul..."
-
-#: ../gtk/gtkpounce.c:583
-msgid "Si_gns on"
-msgstr "En_salutas"
-
-#: ../gtk/gtkpounce.c:585
-msgid "Signs o_ff"
-msgstr "A_udiaŭas"
-
-#: ../gtk/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "Foriĝ_as"
-
-#: ../gtk/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "Ek_malforiĝas"
-
-#: ../gtk/gtkpounce.c:591
-msgid "Becomes _idle"
-msgstr "Eksen_faras"
-
-#: ../gtk/gtkpounce.c:593
-msgid "Is no longer i_dle"
-msgstr "Ekfa_ras"
-
-#: ../gtk/gtkpounce.c:595
-msgid "Starts _typing"
-msgstr "Ta_jpas"
-
-#: ../gtk/gtkpounce.c:597
-msgid "P_auses while typing"
-msgstr "P_aŭzas tajpante"
-
-#: ../gtk/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "Maltajpas"
-
-#: ../gtk/gtkpounce.c:601
-msgid "Sends a _message"
-msgstr "Sendas mesagôn"
-
-#. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:636
-msgid "Action"
-msgstr "Ago"
-
-#: ../gtk/gtkpounce.c:644
-msgid "Ope_n an IM window"
-msgstr "Malfermu TM-n fenestron"
-
-#: ../gtk/gtkpounce.c:646
-msgid "_Pop up a notification"
-msgstr "Ŝ_prucigu avizon"
-
-#: ../gtk/gtkpounce.c:648
-msgid "Send a _message"
-msgstr "Sendu mesaĝon"
-
-#: ../gtk/gtkpounce.c:650
-msgid "E_xecute a command"
-msgstr "Lanĉu komandon"
-
-#: ../gtk/gtkpounce.c:652
-msgid "P_lay a sound"
-msgstr "Ludu sonon"
-
-#: ../gtk/gtkpounce.c:657
-msgid "Brows_e..."
-msgstr "Fol_iumi..."
-
-#: ../gtk/gtkpounce.c:659
-msgid "Br_owse..."
-msgstr "Fol_iumi..."
-
-#: ../gtk/gtkpounce.c:660
-msgid "Pre_view"
-msgstr "Antaŭvidu"
-
-#: ../gtk/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
-msgstr "Atentigi nur kiam mia stato ne disponeblas"
-
-#: ../gtk/gtkpounce.c:789
-msgid "_Recurring"
-msgstr "_Rikuranta"
-
-#: ../gtk/gtkpounce.c:1095
-#, c-format
-msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr ""
-
-#: ../gtk/gtkpounce.c:1243
-msgid "Pounce Target"
-msgstr ""
-
-#: ../gtk/gtkpounce.c:1278
-msgid "Recurring"
-msgstr "Rikuranta"
-
-#: ../gtk/gtkpounce.c:1325
-msgid "Buddy Pounces"
-msgstr "Kunul Atentigoj"
-
-#: ../gtk/gtkpounce.c:1452
-#, c-format
-msgid "%s has started typing to you (%s)"
-msgstr "%s ektajpis al vi (%s)"
-
-#: ../gtk/gtkpounce.c:1454
-#, c-format
-msgid "%s has paused while typing to you (%s)"
-msgstr "%s paŭzis tajpante al vi (%s)"
-
-#: ../gtk/gtkpounce.c:1456
-#, c-format
-msgid "%s has signed on (%s)"
-msgstr "%s ensalutis (%s)"
-
-#: ../gtk/gtkpounce.c:1458
-#, c-format
-msgid "%s has returned from being idle (%s)"
-msgstr "%s revenis el senfarado (%s)"
-
-#: ../gtk/gtkpounce.c:1460
-#, c-format
-msgid "%s has returned from being away (%s)"
-msgstr "%s revenis el forado (%s)"
-
-#: ../gtk/gtkpounce.c:1462
-#, c-format
-msgid "%s has stopped typing to you (%s)"
-msgstr "%s ekmaltajpis vin (%s)"
-
-#: ../gtk/gtkpounce.c:1464
-#, c-format
-msgid "%s has signed off (%s)"
-msgstr "%s malsalutis (%s)"
-
-#: ../gtk/gtkpounce.c:1466
-#, c-format
-msgid "%s has become idle (%s)"
-msgstr "%s senfariĝis (%s)"
-
-#: ../gtk/gtkpounce.c:1468
-#, c-format
-msgid "%s has gone away. (%s)"
-msgstr "%s foriĝis. (%s)"
-
-#: ../gtk/gtkpounce.c:1470
-#, c-format
-msgid "%s has sent you a message. (%s)"
-msgstr "%s sendis mesaĝon al vi. (%s)"
-
-#: ../gtk/gtkpounce.c:1471
-msgid "Unknown pounce event. Please report this!"
-msgstr ""
-
-#: ../gtk/gtkprefs.c:509
-msgid "Smiley theme failed to unpack."
-msgstr ""
-
-#: ../gtk/gtkprefs.c:638
-msgid ""
-"Select a smiley theme that you would like to use from the list below. New "
-"themes can be installed by dragging and dropping them onto the theme list."
-msgstr ""
-"Elektu ridmienotemon kiun vi deziras uzi el la listo sube. Novaj temoj estas "
-"instaleblaj per treni kal faligi ilin sur la temo listo."
-
-#: ../gtk/gtkprefs.c:673
-msgid "Icon"
-msgstr "Piktogramo"
-
-#: ../gtk/gtkprefs.c:816
-msgid "System Tray Icon"
-msgstr "Sistemlistela Piktogramo"
-
-#: ../gtk/gtkprefs.c:817
-msgid "_Show system tray icon:"
-msgstr "_Montru sistemlistelan piktogramon:"
-
-#: ../gtk/gtkprefs.c:819 ../gtk/gtkprefs.c:831 ../gtk/gtkprefs.c:1646
-#: ../gtk/plugins/timestamp_format.c:39 ../gtk/plugins/timestamp_format.c:48
-#: ../gtk/plugins/win32/winprefs/winprefs.c:335
-msgid "Always"
-msgstr "Ĉiam"
-
-#: ../gtk/gtkprefs.c:820 ../gtk/gtkprefs.c:829 ../gtk/gtkprefs.c:1811
-#: ../gtk/gtkprefs.c:1825 ../gtk/plugins/win32/winprefs/winprefs.c:334
-#: ../libgaim/plugins/autoreply.c:360
-msgid "Never"
-msgstr "Neniam"
-
-#: ../gtk/gtkprefs.c:821
-msgid "On unread messages"
-msgstr "Je nelegitaj mesaĝoj"
-
-#: ../gtk/gtkprefs.c:826
-msgid "Conversation Window Hiding"
-msgstr "Konversacio Fenestroj Kaŝeco"
-
-#: ../gtk/gtkprefs.c:827
-msgid "_Hide new IM conversations:"
-msgstr "_Kaŝu novajn TM-ajn konversaciojn:"
-
-#: ../gtk/gtkprefs.c:830 ../gtk/gtkprefs.c:1826
-msgid "When away"
-msgstr "Kiam fora"
-
-#. All the tab options!
-#: ../gtk/gtkprefs.c:838
-msgid "Tabs"
-msgstr "Langetoj"
-
-#: ../gtk/gtkprefs.c:840
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Montru TM-ojn kaj babilojn en lange_taj fenestroj"
-
-#: ../gtk/gtkprefs.c:854
-msgid "Show close b_utton on tabs"
-msgstr "Montru fermi b_utonon en langetoj"
-
-#: ../gtk/gtkprefs.c:857
-msgid "_Placement:"
-msgstr "_Pozicio:"
-
-#: ../gtk/gtkprefs.c:859
-msgid "Top"
-msgstr "Supre"
-
-#: ../gtk/gtkprefs.c:860
-msgid "Bottom"
-msgstr "Malsupre"
-
-#: ../gtk/gtkprefs.c:861
-msgid "Left"
-msgstr "Maldekstre"
-
-#: ../gtk/gtkprefs.c:862
-msgid "Right"
-msgstr "Dekstre"
-
-#: ../gtk/gtkprefs.c:864
-msgid "Left Vertical"
-msgstr "Maldekstra Vertikale"
-
-#: ../gtk/gtkprefs.c:865
-msgid "Right Vertical"
-msgstr "Dekstra Vertikale"
-
-#: ../gtk/gtkprefs.c:872
-msgid "N_ew conversations:"
-msgstr "Novaj konv_ersacioj:"
-
-#: ../gtk/gtkprefs.c:900
-msgid "Show _formatting on incoming messages"
-msgstr "Montru _formatecon en enirantaj mesaĝoj"
-
-#: ../gtk/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "Montru kunul _piktogramojn"
-
-#: ../gtk/gtkprefs.c:905
-msgid "Enable buddy ic_on animation"
-msgstr "Ŝaltu kunul pikt_ogramoanimacion"
-
-#: ../gtk/gtkprefs.c:912
-msgid "_Notify buddies that you are typing to them"
-msgstr "_Avizu kunulojn vi estas tajpante al ili"
-
-#: ../gtk/gtkprefs.c:915
-msgid "Highlight _misspelled words"
-msgstr "Emfazu misliterumitajn vortojn"
-
-#: ../gtk/gtkprefs.c:919
-msgid "Use smooth-scrolling"
-msgstr "Uzu dolĉan rulumon"
-
-#: ../gtk/gtkprefs.c:922
-msgid "F_lash window when IMs are received"
-msgstr "Fu_lmu ekranon kiam TM-oj riceviĝas"
-
-#: ../gtk/gtkprefs.c:925
-msgid "Default Formatting"
-msgstr "Apriora Formatumon"
-
-#: ../gtk/gtkprefs.c:941
-msgid ""
-"This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
-msgstr ""
-"Tiel aspektos vian elirantan mesaĝo tekston kiam vi uzas protokolojn kiuj "
-"subtenas formateblecon. :)"
-
-#: ../gtk/gtkprefs.c:1015 ../libgaim/protocols/oscar/oscar.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3701
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:697
-msgid "IP Address"
-msgstr "IP adreso"
-
-#: ../gtk/gtkprefs.c:1017
-msgid "ST_UN server:"
-msgstr "ST_UN servilo:"
-
-#: ../gtk/gtkprefs.c:1029
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">Ekzemplo: stunserver.org</span>"
-
-#: ../gtk/gtkprefs.c:1033
-msgid "_Autodetect IP address"
-msgstr "_Aŭtodetekti IP adreson"
-
-#: ../gtk/gtkprefs.c:1042
-msgid "Public _IP:"
-msgstr "Publika _IP:"
-
-#: ../gtk/gtkprefs.c:1071
-msgid "Ports"
-msgstr "Pordoj"
-
-#: ../gtk/gtkprefs.c:1074
-msgid "_Manually specify range of ports to listen on"
-msgstr "_Mane difinu intervalon de pordoj aŭskultendaj"
-
-#: ../gtk/gtkprefs.c:1077
-msgid "_Start port:"
-msgstr "_Komenca pordo:"
-
-#: ../gtk/gtkprefs.c:1084
-msgid "_End port:"
-msgstr "_Fina pordo:"
-
-#: ../gtk/gtkprefs.c:1092
-msgid "Proxy Server"
-msgstr "Prokura Servilo"
-
-#: ../gtk/gtkprefs.c:1096
-msgid "No proxy"
-msgstr "Sen prokurilo"
-
-#: ../gtk/gtkprefs.c:1152
-msgid "_User:"
-msgstr "_Uzanto:"
-
-#: ../gtk/gtkprefs.c:1216
-msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../gtk/gtkprefs.c:1217
-msgid "Opera"
-msgstr "Opero"
-
-#: ../gtk/gtkprefs.c:1218
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../gtk/gtkprefs.c:1219
-msgid "Mozilla"
-msgstr "Mozilo"
-
-#: ../gtk/gtkprefs.c:1220
-msgid "Konqueror"
-msgstr "Konkerilo"
-
-#: ../gtk/gtkprefs.c:1221
-msgid "GNOME Default"
-msgstr "GNOME Aprioro"
-
-#: ../gtk/gtkprefs.c:1222
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../gtk/gtkprefs.c:1223
-msgid "Firefox"
-msgstr "Fajrovulpo"
-
-#: ../gtk/gtkprefs.c:1224
-msgid "Firebird"
-msgstr "Fajrobirdo"
-
-#: ../gtk/gtkprefs.c:1225
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../gtk/gtkprefs.c:1234
-msgid "Manual"
-msgstr "Mane"
-
-#: ../gtk/gtkprefs.c:1287
-msgid "Browser Selection"
-msgstr "Retumilo Elekto"
-
-#: ../gtk/gtkprefs.c:1291
-msgid "_Browser:"
-msgstr "_Retumilo:"
-
-#: ../gtk/gtkprefs.c:1299
-msgid "_Open link in:"
-msgstr "_Malfermu ligilon per:"
-
-#: ../gtk/gtkprefs.c:1301
-msgid "Browser default"
-msgstr "Retumilo aprioro"
-
-#: ../gtk/gtkprefs.c:1302
-msgid "Existing window"
-msgstr "Aktuala fenestro"
-
-#: ../gtk/gtkprefs.c:1304
-msgid "New tab"
-msgstr "Nova langeto"
-
-#: ../gtk/gtkprefs.c:1318
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_Mane:\n"
-"(%s por URL)"
-
-#: ../gtk/gtkprefs.c:1358
-msgid "Log _format:"
-msgstr "Protokolo _formato:"
-
-#: ../gtk/gtkprefs.c:1363
-msgid "Log all _instant messages"
-msgstr "Protokolu ĉiujn _tujmesaĝojn"
-
-#: ../gtk/gtkprefs.c:1365
-msgid "Log all c_hats"
-msgstr "Protokolu ĉiujn _babilojn"
-
-#: ../gtk/gtkprefs.c:1367
-msgid "Log all _status changes to system log"
-msgstr "Protokolu ĉiujn _statoŝanĝojn al sistemprotokolo"
-
-#: ../gtk/gtkprefs.c:1513
-msgid "Sound Selection"
-msgstr "Sono Elekto"
-
-#: ../gtk/gtkprefs.c:1521
-msgid "Quietest"
-msgstr "Pli Malaŭta"
-
-#: ../gtk/gtkprefs.c:1523
-msgid "Quieter"
-msgstr "Pli Malaŭte"
-
-#: ../gtk/gtkprefs.c:1525
-msgid "Quiet"
-msgstr "Malaŭte"
-
-#: ../gtk/gtkprefs.c:1527 ../libgaim/protocols/silc/silc.c:666
-msgid "Normal"
-msgstr "Normala"
-
-#: ../gtk/gtkprefs.c:1529
-msgid "Loud"
-msgstr "Laŭte"
-
-#: ../gtk/gtkprefs.c:1531
-msgid "Louder"
-msgstr "Pli Laŭte"
-
-#: ../gtk/gtkprefs.c:1533
-msgid "Loudest"
-msgstr "Pli Laŭta"
-
-#: ../gtk/gtkprefs.c:1596
-msgid "Sound Method"
-msgstr "Sono Metodo"
-
-#: ../gtk/gtkprefs.c:1597
-msgid "_Method:"
-msgstr "_Metodo:"
-
-#: ../gtk/gtkprefs.c:1599
-msgid "Console beep"
-msgstr "Konzolo pepo"
-
-#: ../gtk/gtkprefs.c:1601
-msgid "Automatic"
-msgstr "Aŭtomate"
-
-#: ../gtk/gtkprefs.c:1604
-msgid "Command"
-msgstr "Komando"
-
-#: ../gtk/gtkprefs.c:1605
-msgid "No sounds"
-msgstr "Sen Sono"
-
-#: ../gtk/gtkprefs.c:1613
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"Sono k_omando:\n"
-"(%s por dosiernomo)"
-
-#: ../gtk/gtkprefs.c:1639
-msgid "Sound Options"
-msgstr "Son-opcioj"
-
-#: ../gtk/gtkprefs.c:1640
-msgid "Sounds when conversation has _focus"
-msgstr "Sonu kiam konversacio _fokusas"
-
-#: ../gtk/gtkprefs.c:1642
-msgid "Enable sounds:"
-msgstr "Ŝaltu Sonojn:"
-
-#: ../gtk/gtkprefs.c:1644
-msgid "Only when available"
-msgstr "Nur kiam disponebla"
-
-#: ../gtk/gtkprefs.c:1645
-msgid "Only when not available"
-msgstr "Nur kiam nedisponebla"
-
-#: ../gtk/gtkprefs.c:1653
-msgid "Volume:"
-msgstr "Laŭteco:"
-
-#: ../gtk/gtkprefs.c:1681
-msgid "Sound Events"
-msgstr "Soneventoj"
-
-#: ../gtk/gtkprefs.c:1732
-msgid "Play"
-msgstr "Ludu"
-
-#: ../gtk/gtkprefs.c:1739
-msgid "Event"
-msgstr "Evento"
-
-#: ../gtk/gtkprefs.c:1758
-msgid "Test"
-msgstr "Provo"
-
-#: ../gtk/gtkprefs.c:1762
-msgid "Reset"
-msgstr "Restarigu"
-
-#: ../gtk/gtkprefs.c:1766
-msgid "Choose..."
-msgstr "Elektu..."
-
-#: ../gtk/gtkprefs.c:1809
-msgid "_Report idle time:"
-msgstr "_Raportu senfaran tempon:"
-
-#: ../gtk/gtkprefs.c:1812
-msgid "From last sent message"
-msgstr "Ekde lasta sendita mesaĝo"
-
-#: ../gtk/gtkprefs.c:1814
-msgid "Based on keyboard or mouse use"
-msgstr "Laŭ klavaro aŭ muso uzo"
-
-#: ../gtk/gtkprefs.c:1823
-msgid "_Auto-reply:"
-msgstr "_Aŭto-respondo:"
-
-#: ../gtk/gtkprefs.c:1827
-msgid "When both away and idle"
-msgstr "Kiam ambaŭ fora kaj senfara"
-
-#. Auto-away stuff
-#: ../gtk/gtkprefs.c:1833
-msgid "Auto-away"
-msgstr "Aŭto-fora"
-
-#: ../gtk/gtkprefs.c:1835
-msgid "Change status when _idle"
-msgstr "Ŝanĝu staton kiam _senfara"
-
-#: ../gtk/gtkprefs.c:1839
-msgid "_Minutes before changing status:"
-msgstr "_Minutoj antaŭe ŝanĝenda staton:"
-
-#: ../gtk/gtkprefs.c:1847
-msgid "Change _status to:"
-msgstr "Ŝangû _staton al:"
-
-#. Signon status stuff
-#: ../gtk/gtkprefs.c:1868
-msgid "Status at Startup"
-msgstr "Stato je ensaluto"
-
-#: ../gtk/gtkprefs.c:1870
-msgid "Use status from last _exit at startup"
-msgstr "Uzu stato de lasta malsaluto je sensaluto"
-
-#: ../gtk/gtkprefs.c:1876
-msgid "Status to a_pply at startup:"
-msgstr "Stato aplikenda je ensaluto:"
-
-#: ../gtk/gtkprefs.c:1914
-msgid "Interface"
-msgstr "Interfaco"
-
-#: ../gtk/gtkprefs.c:1916
-msgid "Smiley Themes"
-msgstr "Ridmieno-temo"
-
-#: ../gtk/gtkprefs.c:1917
-msgid "Sounds"
-msgstr "Sonoj"
-
-#: ../gtk/gtkprefs.c:1918 ../libgaim/protocols/silc/silc.c:1848
-msgid "Network"
-msgstr "Reto"
-
-#: ../gtk/gtkprefs.c:1923
-msgid "Browser"
-msgstr "Retumilo"
-
-#: ../gtk/gtkprefs.c:1927
-msgid "Status / Idle"
-msgstr "Stato / Senfara"
-
-#: ../gtk/gtkprivacy.c:79
-msgid "Allow all users to contact me"
-msgstr "Permesu ĉiujn uzantojn kontakti min"
-
-#: ../gtk/gtkprivacy.c:80
-msgid "Allow only the users on my buddy list"
-msgstr "Permesu nur uzantojn en mia kunul listo"
-
-#: ../gtk/gtkprivacy.c:81
-msgid "Allow only the users below"
-msgstr "Permesu nur la jenajn uzantojn"
-
-#: ../gtk/gtkprivacy.c:82
-msgid "Block all users"
-msgstr "Bloku ĉiujn uzantojn"
-
-#: ../gtk/gtkprivacy.c:83
-msgid "Block only the users below"
-msgstr "Bloku nur la jenajn uzantojn"
-
-#: ../gtk/gtkprivacy.c:372
-msgid "Privacy"
-msgstr "Privataj aferoj"
-
-#: ../gtk/gtkprivacy.c:385
-msgid "Changes to privacy settings take effect immediately."
-msgstr "Ŝanĝoj al privatecaj agordoj efikas tuj."
-
-#. "Set privacy for:" label
-#: ../gtk/gtkprivacy.c:397
-msgid "Set privacy for:"
-msgstr "Difinu privatecon por:"
-
-#: ../gtk/gtkprivacy.c:560 ../gtk/gtkprivacy.c:576
-msgid "Permit User"
-msgstr "Permesu Uzanton"
-
-#: ../gtk/gtkprivacy.c:561
-msgid "Type a user you permit to contact you."
-msgstr "Enigu uzanton kiun vi permesas kontakti vin."
-
-#: ../gtk/gtkprivacy.c:562
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "B.v. enigi la nomon de uzanto kiu vi deziras ebligi kontakti vin."
-
-#: ../gtk/gtkprivacy.c:565 ../gtk/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "_Permesu"
-
-#: ../gtk/gtkprivacy.c:570
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "Permesu %s kontakti vin?"
-
-#: ../gtk/gtkprivacy.c:572
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "Ĉu vi certas vi deziras permesi %s-n kontakti vin?"
-
-#: ../gtk/gtkprivacy.c:599 ../gtk/gtkprivacy.c:612
-msgid "Block User"
-msgstr "Bloku Uzanton"
-
-#: ../gtk/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "Tajpu uzanton blokendan."
-
-#: ../gtk/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "B.v. enmetu la nomon de uzanto kiun vi deziras bloki."
-
-#: ../gtk/gtkprivacy.c:608
-#, c-format
-msgid "Block %s?"
-msgstr "Bloku %s?"
-
-#: ../gtk/gtkprivacy.c:610
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "Ĉu vi certas vi volas bloki %s?"
-
-#: ../gtk/gtkrequest.c:267 ../libgaim/plugins/offlinemsg.c:159
-#: ../libgaim/protocols/msn/dialog.c:132 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1918
-#: ../libgaim/protocols/silc/buddy.c:313 ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303
-msgid "Yes"
-msgstr "Jes"
-
-#: ../gtk/gtkrequest.c:268 ../libgaim/plugins/offlinemsg.c:160
-#: ../libgaim/protocols/msn/dialog.c:133 ../libgaim/protocols/msn/msn.c:554
-#: ../libgaim/protocols/msn/msn.c:564
-#: ../libgaim/protocols/novell/novell.c:1919
-#: ../libgaim/protocols/silc/buddy.c:314 ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304
-msgid "No"
-msgstr "Ne"
-
-#: ../gtk/gtkrequest.c:271
-msgid "Apply"
-msgstr "Apliku"
-
-#: ../gtk/gtkrequest.c:1469
-msgid "That file already exists"
-msgstr "Tiu dosiero jam ekzistas"
-
-#: ../gtk/gtkrequest.c:1470
-msgid "Would you like to overwrite it?"
-msgstr "Ĉu vi deziras anstataŭigi ĝin?"
-
-#: ../gtk/gtkrequest.c:1471
-msgid "Overwrite"
-msgstr "Anstataŭigu"
-
-#: ../gtk/gtkrequest.c:1472
-msgid "Choose New Name"
-msgstr "Elektu Novan Nomon"
-
-#: ../gtk/gtkrequest.c:1514 ../gtk/gtkrequest.c:1559
-msgid "Save File..."
-msgstr "Konservu Dosieron..."
-
-#: ../gtk/gtkrequest.c:1515 ../gtk/gtkrequest.c:1560
-msgid "Open File..."
-msgstr "Malfermu Dosieron..."
-
-#: ../gtk/gtkrequest.c:1607 ../gtk/gtkrequest.c:1621
-msgid "Select Folder..."
-msgstr "Elektu Dosierujon..."
-
-#: ../gtk/gtkroomlist.c:308 ../libgaim/protocols/oscar/oscar.c:2466
-msgid "_Add"
-msgstr "_Aldonu"
-
-#: ../gtk/gtkroomlist.c:376
-msgid "Room List"
-msgstr "Babilejoj Listo"
-
-#. list button
-#: ../gtk/gtkroomlist.c:446
-msgid "_Get List"
-msgstr "_Ricevu Liston"
-
-#. add button
-#: ../gtk/gtkroomlist.c:454
-msgid "_Add Chat"
-msgstr "_Aldonu Babilejon"
-
-#: ../gtk/gtksavedstatuses.c:331
-msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Ĉu vi certas vi volas forigi elektitajn konservitajn statuojn?"
-
-#. Use button
-#: ../gtk/gtksavedstatuses.c:579 ../gtk/gtksavedstatuses.c:1213
-msgid "_Use"
-msgstr "_Uzu"
-
-#: ../gtk/gtksavedstatuses.c:725
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Titolo jam uzata. Vi devas elekti unikan titolon."
-
-#: ../gtk/gtksavedstatuses.c:913
-msgid "Different"
-msgstr "Malsama"
-
-#: ../gtk/gtksavedstatuses.c:1106
-msgid "_Title:"
-msgstr "_Titolo:"
-
-#: ../gtk/gtksavedstatuses.c:1125 ../gtk/gtksavedstatuses.c:1446
-msgid "_Status:"
-msgstr "_Stato:"
-
-#. Different status message expander
-#: ../gtk/gtksavedstatuses.c:1157
-msgid "Use a _different status for some accounts"
-msgstr "Uzu _malsimilan staton por kelkaj kontoj"
-
-#. Save & Use button
-#: ../gtk/gtksavedstatuses.c:1221
-msgid "Sa_ve & Use"
-msgstr "Konser_vu & Uzu"
-
-#: ../gtk/gtksavedstatuses.c:1427
-#, c-format
-msgid "Status for %s"
-msgstr "Stato por %s"
-
-#: ../gtk/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Kunul ensalutas"
-
-#: ../gtk/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Kunul elsalutas"
-
-#: ../gtk/gtksound.c:65
-msgid "Message received"
-msgstr "Mesaĝo ricevita"
-
-#: ../gtk/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Ricevita mesaĝo komencas konversacio"
-
-#: ../gtk/gtksound.c:67
-msgid "Message sent"
-msgstr "Mesaĝo sendita"
-
-#: ../gtk/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Persono eniras babilejon"
-
-#: ../gtk/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Persono eliras babilejon"
-
-#: ../gtk/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Vi parolas en babilejo"
-
-#: ../gtk/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Aliaj parolas en babilejo"
-
-#: ../gtk/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "Iun diras vian ekrannomon en babilejo"
-
-#: ../gtk/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer Malsukceso"
-
-#: ../gtk/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer malsukcesis ekon."
-
-#. connect to the server
-#: ../gtk/gtkstatusbox.c:569 ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1021
-#: ../libgaim/protocols/msn/session.c:344
-#: ../libgaim/protocols/novell/novell.c:2183
-#: ../libgaim/protocols/oscar/oscar.c:1267 ../libgaim/protocols/qq/qq.c:136
-#: ../libgaim/protocols/sametime/sametime.c:3742
-#: ../libgaim/protocols/simple/simple.c:1669
-#: ../libgaim/protocols/yahoo/yahoo.c:2710
-#: ../libgaim/protocols/zephyr/zephyr.c:1621
-msgid "Connecting"
-msgstr "Konektante"
-
-#: ../gtk/gtkstatusbox.c:571
-msgid "Waiting for network connection"
-msgstr "Atendante retkonekto"
-
-#: ../gtk/gtkutils.c:1310 ../gtk/gtkutils.c:1333
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "La jena eraro okazis ŝargante %s: %s"
-
-#: ../gtk/gtkutils.c:1313 ../gtk/gtkutils.c:1335
-msgid "Failed to load image"
-msgstr "Malsukcesis ŝargi bildon"
-
-#: ../gtk/gtkutils.c:1410
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "Ne povas sendi dosierujon %s."
-
-#: ../gtk/gtkutils.c:1412
-msgid ""
-"Gaim cannot transfer a folder. You will need to send the files within "
-"individually"
-msgstr ""
-
-#: ../gtk/gtkutils.c:1440 ../gtk/gtkutils.c:1449 ../gtk/gtkutils.c:1454
-msgid "You have dragged an image"
-msgstr "Vi trenis bildon"
-
-#: ../gtk/gtkutils.c:1441
-msgid ""
-"You can send this image as a file transfer, embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: ../gtk/gtkutils.c:1445 ../gtk/gtkutils.c:1460
-msgid "Set as buddy icon"
-msgstr "Difinu kiel kunul piktogramo"
-
-#: ../gtk/gtkutils.c:1446 ../gtk/gtkutils.c:1461
-msgid "Send image file"
-msgstr "Sendu bilddosieron"
-
-#: ../gtk/gtkutils.c:1447 ../gtk/gtkutils.c:1461
-msgid "Insert in message"
-msgstr "Enmetu en mesaĝon"
-
-#: ../gtk/gtkutils.c:1450
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Ĉu vi deziras meti ĝin kiel la kunul piktogramo por tiu uzanto?"
-
-#: ../gtk/gtkutils.c:1455
-msgid ""
-"You can send this image as a file transfer or embed it into this message, or "
-"use it as the buddy icon for this user."
-msgstr ""
-
-#: ../gtk/gtkutils.c:1457
-msgid ""
-"You can insert this image into this message, or use it as the buddy icon for "
-"this user"
-msgstr ""
-
-#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
-#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
-#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
-#. * Probably not.  I'll just give an error and return.
-#. The original patch sent the icon used by the launcher.  That's probably wrong
-#: ../gtk/gtkutils.c:1511
-msgid "Cannot send launcher"
-msgstr ""
-
-#: ../gtk/gtkutils.c:1511
-msgid ""
-"You dragged a desktop launcher. Most likely you wanted to send whatever this "
-"launcher points to instead of this launcher itself."
-msgstr ""
-
-#: ../gtk/gtkutils.c:2343
-#, c-format
-msgid ""
-"<b>File:</b> %s\n"
-"<b>File size:</b> %s\n"
-"<b>Image size:</b> %dx%d"
-msgstr ""
-"<b>Dosiero:</b> %s\n"
-"<b>Dosiero grandeco:</b> %s\n"
-"<b>Bildo grandeco:</b> %dx%d"
-
-#. Label
-#: ../gtk/gtkutils.c:2387 ../gtk/gtkutils.c:2409
-#: ../gtk/plugins/gevolution/new_person_dialog.c:338
-#: ../libgaim/protocols/oscar/oscar.c:618
-msgid "Buddy Icon"
-msgstr "Kunul Piktogramo"
-
-#: ../gtk/gtkutils.c:2653
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr ""
-
-#: ../gtk/gtkutils.c:2655
-msgid "Icon Error"
-msgstr "Piktogramo Eraro"
-
-#: ../gtk/gtkutils.c:2656
-msgid "Could not set icon"
-msgstr "Ne eblis difini piktogramon"
-
-#: ../gtk/gtkutils.c:2757
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Malsukcesis malfermi dosieron '%s': %s"
-
-#: ../gtk/gtkutils.c:2806
-#, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr ""
-
-#: ../gtk/gtkwhiteboard.c:756 ../gtk/gtkwhiteboard.c:775
-msgid "Save File"
-msgstr "Konservu Dosieron"
-
-#: ../gtk/gtkwhiteboard.c:863
-msgid "Select color"
-msgstr "Elektu koloron"
-
-#: ../gtk/plugins/cap/cap.c:446
-msgid "Display Statistics"
-msgstr "Montru Statistikojn"
-
-#: ../gtk/plugins/cap/cap.c:458 ../gtk/plugins/cap/cap.c:461
-msgid "Response Probability:"
-msgstr "Respondo Verŝajneco:"
-
-#: ../gtk/plugins/cap/cap.c:807
-msgid "Statistics Configuration"
-msgstr "Statistikoj Agordo"
-
-#. msg_difference spinner
-#: ../gtk/plugins/cap/cap.c:810
-msgid "Maximum response timeout:"
-msgstr ""
-
-#: ../gtk/plugins/cap/cap.c:813 ../gtk/plugins/cap/cap.c:820
-#: ../gtk/plugins/cap/cap.c:827 ../gtk/plugins/timestamp.c:149
-msgid "minutes"
-msgstr "minutoj"
-
-#. last_seen spinner
-#: ../gtk/plugins/cap/cap.c:817
-msgid "Maximum last-seen difference:"
-msgstr ""
-
-#. threshold spinner
-#: ../gtk/plugins/cap/cap.c:824
-msgid "Threshold:"
-msgstr "Sojlo:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/cap/cap.c:931
-msgid "Contact Availability Prediction"
-msgstr ""
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/cap/cap.c:933
-msgid "Contact Availability Prediction plugin."
-msgstr ""
-
-#. *  summary
-#: ../gtk/plugins/cap/cap.c:934
-msgid ""
-"The contact availability plugin (cap) is used to display statistical "
-"information about buddies in a users contact list."
-msgstr ""
-
-#: ../gtk/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Kunul senokupas"
-
-#: ../gtk/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Kunul foras"
-
-#: ../gtk/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Kunul estas \"daŭre\" fora"
-
-#. Not used yet.
-#: ../gtk/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "Kunul estas movema"
-
-#: ../gtk/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Kunul estas senkonekta"
-
-#: ../gtk/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Poentoj uzendaj kiam..."
-
-#: ../gtk/plugins/contact_priority.c:118
-msgid ""
-"The buddy with the <i>largest score</i> is the buddy who will have priority "
-"in the contact.\n"
-msgstr ""
-
-#: ../gtk/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Uzu lastan kunulon kiam poentoj egalas"
-
-#: ../gtk/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Poentoj uzantenda por konto..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Kontakta Prioritato"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../gtk/plugins/contact_priority.c:185
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Permesas kontroli la poentojn rilatajn al diversaj kunulstatoj."
-
-#. *< description
-#: ../gtk/plugins/contact_priority.c:187
-msgid ""
-"Allows for changing the point values of idle/away/offline states for buddies "
-"in contact priority computations."
-msgstr ""
-"Permesas ŝanĝi la poentojn de neaktiva/fora/senkonekta statoj de kunuloj por "
-"komputi kontaktan prioritaton."
-
-#: ../gtk/plugins/convcolors.c:23
-msgid "Conversation Colors"
-msgstr "Konversaciaj Koloroj"
-
-#: ../gtk/plugins/convcolors.c:25 ../gtk/plugins/convcolors.c:26
-msgid "Customize colors in the conversation window"
-msgstr "Agordu kolorojn en la konversacio-fenestro"
-
-#: ../gtk/plugins/convcolors.c:82
-msgid "Error Messages"
-msgstr "Eraraj Mesaĝoj"
-
-#: ../gtk/plugins/convcolors.c:83
-msgid "Highlighted Messages"
-msgstr "Emfazitaj Mesaĝoj"
-
-#: ../gtk/plugins/convcolors.c:84
-msgid "System Messages"
-msgstr "Sistemo Mesaĝoj"
-
-#: ../gtk/plugins/convcolors.c:85
-msgid "Sent Messages"
-msgstr "Senditaj Mesaĝoj"
-
-#: ../gtk/plugins/convcolors.c:86
-msgid "Received Messages"
-msgstr "Ricevitaj Mesaĝoj"
-
-#: ../gtk/plugins/convcolors.c:201 ../gtk/plugins/gaimrc.c:320
-#, c-format
-msgid "Select Color for %s"
-msgstr "Elektu Koloron por %s"
-
-#: ../gtk/plugins/convcolors.c:300 ../gtk/plugins/gaimrc.c:448
-#: ../libgaim/protocols/msn/msn.c:1532
-msgid "General"
-msgstr "Ĝenerala"
-
-#: ../gtk/plugins/convcolors.c:301
-msgid "Ignore incoming format"
-msgstr ""
-
-#: ../gtk/plugins/convcolors.c:302
-msgid "Apply in Chats"
-msgstr "Apliku en Babilejoj"
-
-#: ../gtk/plugins/convcolors.c:303
-msgid "Apply in IMs"
-msgstr ""
-
-#: ../gtk/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Laŭ konversacio nombriĝo"
-
-#: ../gtk/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Konversacio Loko"
-
-#: ../gtk/plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Nombro de konversacioj po fenestro"
-
-#: ../gtk/plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Apartigu TM-n kaj Babil-n fenestrojn kiam lokante laŭ nombro"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr ""
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr ""
-
-#. *< summary
-#. *  description
-#: ../gtk/plugins/extplacement.c:139
-msgid ""
-"Restrict the number of conversations per windows, optionally separating IMs "
-"and Chats"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim Demonstraĵa Kromaĵo"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Ekzempla kormaĵo kiu umas - vidu priskribon."
-
-#. *  description
-#: ../gtk/plugins/gaiminc.c:96
-msgid ""
-"This is a really cool plugin that does a lot of stuff:\n"
-"- It tells you who wrote the program when you log in\n"
-"- It reverses all incoming text\n"
-"- It sends a message to people on your list immediately when they sign on"
-msgstr ""
-"Estas mojosa kromaĵo kiu multe umas:\n"
-"- Ĝi diras kiu skribis la programon kiam vi ensalutas\n"
-"- Ĝi inversigas ĉiajn enirantan tekston\n"
-"- Ĝi sendas mesaĝon al homoj en via listo tuj kiam ili ensalutas"
-
-#: ../gtk/plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "Kursoro Koloro"
-
-#: ../gtk/plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Dua Kursoro Koloro"
-
-#: ../gtk/plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "Ligilo Koloro"
-
-#: ../gtk/plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr ""
-
-#: ../gtk/plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr ""
-
-#: ../gtk/plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Konversacio Enskribigo"
-
-#: ../gtk/plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Konversacio Historio"
-
-#: ../gtk/plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Protokolo Legilo"
-
-#: ../gtk/plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "Peto Dialogujo"
-
-#: ../gtk/plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Avizo Dialogujo"
-
-#: ../gtk/plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr ""
-
-#: ../gtk/plugins/gaimrc.c:322
-msgid "Select Color"
-msgstr "Elektu Koloron"
-
-#: ../gtk/plugins/gaimrc.c:361
-#, c-format
-msgid "Select Font for %s"
-msgstr "Elektu Tiparon por %s"
-
-#: ../gtk/plugins/gaimrc.c:398
-msgid "Select Interface Font"
-msgstr "Elektu InterfacoTiparon"
-
-#: ../gtk/plugins/gaimrc.c:453
-msgid "GTK+ Interface Font"
-msgstr "GTK+ Interfaco Tiparo"
-
-#: ../gtk/plugins/gaimrc.c:473
-msgid "GTK+ Text Shortcut Theme"
-msgstr ""
-
-#: ../gtk/plugins/gaimrc.c:508
-msgid "Interface colors"
-msgstr "Interfaco koloroj"
-
-#: ../gtk/plugins/gaimrc.c:532
-msgid "Widget Sizes"
-msgstr "Fenestraĵo Grandecoj"
-
-#: ../gtk/plugins/gaimrc.c:553
-msgid "Fonts"
-msgstr "Tiparoj"
-
-#: ../gtk/plugins/gaimrc.c:576
-msgid "Tools"
-msgstr "Iloj"
-
-#: ../gtk/plugins/gaimrc.c:581
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Skribu agordojn al %s%sgtkrc-2.0"
-
-#: ../gtk/plugins/gaimrc.c:589
-msgid "Re-read gtkrc files"
-msgstr "Relegu gtkrc dosierojn"
-
-#: ../gtk/plugins/gaimrc.c:616
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ Etoso Kontrolo"
-
-#: ../gtk/plugins/gaimrc.c:618 ../gtk/plugins/gaimrc.c:619
-msgid "Provides access to commonly used gtkrc settings."
-msgstr ""
-
-#. Configuration frame
-#: ../gtk/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Musgestoj Agordo"
-
-#: ../gtk/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Meza muso butono"
-
-#: ../gtk/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "Deskstra muso butono"
-
-#. "Visual gesture display" checkbox
-#: ../gtk/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Vidgesto vidigo"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Musgestoj"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "Provizu subteno por musgestoj"
-
-#. *  description
-#: ../gtk/plugins/gestures/gestures.c:294
-msgid ""
-"Allows support for mouse gestures in conversation windows.\n"
-"Drag the middle mouse button to perform certain actions:\n"
-"\n"
-"Drag down and then to the right to close a conversation.\n"
-"Drag up and then to the left to switch to the previous conversation.\n"
-"Drag up and then to the right to switch to the next conversation."
-msgstr ""
-
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "Tuj Mesaĝilo"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:460
-msgid "Select a person from your address book below, or add a new person."
-msgstr "Elektu personon el via adresaro sube, aŭ aldonu novan personon."
-
-#. "Search"
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
-#: ../gtk/plugins/gevolution/assoc-buddy.c:358
-#: ../libgaim/protocols/jabber/buddy.c:1760
-#: ../libgaim/protocols/qq/group.c:123 ../libgaim/protocols/qq/group_im.c:139
-#: ../libgaim/protocols/qq/sys_msg.c:162 ../libgaim/protocols/qq/sys_msg.c:232
-#: ../libgaim/protocols/qq/sys_msg.c:250
-#: ../libgaim/protocols/sametime/sametime.c:5621
-msgid "Search"
-msgstr "Serĉu"
-
-#. "New Person" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:580
-#: ../gtk/plugins/gevolution/assoc-buddy.c:469
-#: ../gtk/plugins/gevolution/new_person_dialog.c:251
-msgid "New Person"
-msgstr "Nova persono"
-
-#. "Select Buddy" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
-msgid "Select Buddy"
-msgstr "Elektu Kunulon"
-
-#. Add the label.
-#: ../gtk/plugins/gevolution/assoc-buddy.c:345
-msgid ""
-"Select a person from your address book to add this buddy to, or create a new "
-"person."
-msgstr ""
-"Elektu personon el via adresaro por aldoni tiun kunulon, aŭ kreu novan "
-"personon."
-
-#. Add the expander
-#: ../gtk/plugins/gevolution/assoc-buddy.c:433
-msgid "User _details"
-msgstr "Uzanto _detaloj"
-
-#. "Associate Buddy" button
-#: ../gtk/plugins/gevolution/assoc-buddy.c:486
-msgid "_Associate Buddy"
-msgstr "K_uniĝu Kunulon"
-
-#: ../gtk/plugins/gevolution/eds-utils.c:73
-#: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1162
-msgid "None"
-msgstr "Nenio"
-
-#: ../gtk/plugins/gevolution/gevolution.c:239
-#: ../gtk/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Ne eblas sendi retmesaĝon"
-
-#: ../gtk/plugins/gevolution/gevolution.c:240
-msgid "The evolution executable was not found in the PATH."
-msgstr ""
-
-#: ../gtk/plugins/gevolution/gevolution.c:246
-msgid "An e-mail address was not found for this buddy."
-msgstr ""
-
-#: ../gtk/plugins/gevolution/gevolution.c:272
-msgid "Add to Address Book"
-msgstr "Aldonu al adresaro"
-
-#: ../gtk/plugins/gevolution/gevolution.c:284
-msgid "Send E-Mail"
-msgstr "Sendu retmesaĝon"
-
-#. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:411
-msgid "Evolution Integration Configuration"
-msgstr ""
-
-#. Label
-#: ../gtk/plugins/gevolution/gevolution.c:414
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "Elektu ĉiujn kontojn kiuj kunuloj endas aŭto-aldonita al."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:521
-msgid "Evolution Integration"
-msgstr ""
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:524
-#: ../gtk/plugins/gevolution/gevolution.c:526
-msgid "Provides integration with Evolution."
-msgstr ""
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr ""
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "B.v. enigi la kunul ekrannomo kaj kontotipo sube."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Konto tipo:"
-
-#. Optional Information section
-#: ../gtk/plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Opcia informo:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "Antaŭ nomo:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Familia nomo:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "Retadreso:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK Signaloj Provo"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gtk-signals-test.c:163 ../gtk/plugins/gtk-signals-test.c:165
-msgid "Test to see that all ui signals are working properly."
-msgstr "Provu por vidi ĉu ĉiuj ui signaloj bone funkcias."
-
-#: ../gtk/plugins/history.c:188
-msgid "History"
-msgstr "Historio"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Piktogramiĝu kiam fora"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/iconaway.c:85 ../gtk/plugins/iconaway.c:87
-msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Piktogramigu kunul-liston kaj konversaciojn kiam vi foriras."
-
-#: ../gtk/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr ""
-
-#: ../gtk/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr ""
-
-#: ../gtk/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-
-#: ../gtk/plugins/markerline.c:23
-msgid "Markerline"
-msgstr ""
-
-#: ../gtk/plugins/markerline.c:25 ../gtk/plugins/markerline.c:26
-msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Desegnu linion por indiki novan mesaĝon en konversacio."
-
-#: ../gtk/plugins/markerline.c:246
-msgid "Draw Markerline in "
-msgstr ""
-
-#: ../gtk/plugins/markerline.c:250 ../gtk/plugins/notify.c:674
-msgid "_IM windows"
-msgstr "_TM fenestroj"
-
-#: ../gtk/plugins/markerline.c:254 ../gtk/plugins/notify.c:681
-msgid "C_hat windows"
-msgstr "B_abilfenestroj"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
-msgid ""
-"A music messaging session has been requested. Please click the MM icon to "
-"accept."
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
-msgid "Music Messaging"
-msgstr "Muziko Mesaĝilo"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
-msgid "Error Running Editor"
-msgstr ""
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
-msgid "The following error has occurred:"
-msgstr "La jena eraro okazis:"
-
-#. Configuration frame
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
-msgid "Music Messaging Configuration"
-msgstr "Muzika Mesaĝilo Agordo"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
-msgid "Score Editor Path"
-msgstr "Orkestruma Redaktilo Vojo"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
-msgid "_Apply"
-msgstr "_Apliku"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Muzika Mesaĝilo Kromaĵo por kunlaboranta verkado."
-
-#. *  summary
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:667
-msgid ""
-"The Music Messaging Plugin allows a number of users to simultaneously work "
-"on a piece of music by editting a common score in real-time."
-msgstr ""
-"La Muzika Mesaĝilo Kromaĵo ebligas plurajn uzantojn samtempe labori muzikan "
-"pecon redaktante komunan orkestrumon realtempe."
-
-#. ---------- "Notify For" ----------
-#: ../gtk/plugins/notify.c:670
-msgid "Notify For"
-msgstr "Avizu Por"
-
-#: ../gtk/plugins/notify.c:689
-msgid "\t_Only when someone says your screen name"
-msgstr "\t_Nur kiam iun diras vian ekran nomon"
-
-#: ../gtk/plugins/notify.c:699
-msgid "_Focused windows"
-msgstr "_Fokusitaj fenestoj"
-
-#. ---------- "Notification Methods" ----------
-#: ../gtk/plugins/notify.c:707
-msgid "Notification Methods"
-msgstr "Avizmetodoj"
-
-#: ../gtk/plugins/notify.c:714
-msgid "Prepend _string into window title:"
-msgstr "Prefik_su ĉenon en fenestrotitolo:"
-
-#. Count method button
-#: ../gtk/plugins/notify.c:733
-msgid "Insert c_ount of new messages into window title"
-msgstr "Enmetu n_ombron de novajn mesaĝoj en fenestrotitolo"
-
-#. Count xprop method button
-#: ../gtk/plugins/notify.c:742
-msgid "Insert count of new message into _X property"
-msgstr "Enmetu nombron de novaj mesaĝoj en _X eco"
-
-#. Urgent method button
-#: ../gtk/plugins/notify.c:750
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "Dinifu fenestrtraktilan \"_URĜANTA\" indikon"
-
-#. Raise window method button
-#: ../gtk/plugins/notify.c:759
-msgid "R_aise conversation window"
-msgstr "Startigu konversacio-fenestron"
-
-#. ---------- "Notification Removals" ----------
-#: ../gtk/plugins/notify.c:767
-msgid "Notification Removal"
-msgstr "Avizo Forigo"
-
-#. Remove on focus button
-#: ../gtk/plugins/notify.c:772
-msgid "Remove when conversation window _gains focus"
-msgstr "Forigu kiam konversacio fenestro ricevas _fokuson"
-
-#. Remove on click button
-#: ../gtk/plugins/notify.c:779
-msgid "Remove when conversation window _receives click"
-msgstr "Forigu kiam konversacio fenestro _ricevas alklakon"
-
-#. Remove on type button
-#: ../gtk/plugins/notify.c:787
-msgid "Remove when _typing in conversation window"
-msgstr "Forigu kiam _tajpante en konversacio fenestro"
-
-#. Remove on message send button
-#: ../gtk/plugins/notify.c:795
-msgid "Remove when a _message gets sent"
-msgstr "Forigu kiam _mesaĝo sendiĝas"
-
-#. Remove on conversation switch button
-#: ../gtk/plugins/notify.c:804
-msgid "Remove on switch to conversation ta_b"
-msgstr "Forigu je ŝaĝo al konversacio l_angeto"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/notify.c:893
-msgid "Message Notification"
-msgstr "Mesaĝavizo"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/notify.c:896 ../gtk/plugins/notify.c:898
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Provizas diversajn rimedojn por atentigi vin pro nelegitaj mesaĝoj."
-
-#: ../gtk/plugins/raw.c:175
-msgid "Raw"
-msgstr "Kruda"
-
-#: ../gtk/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr ""
-
-#: ../gtk/plugins/raw.c:178
-msgid ""
-"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
-"'Enter' in the entry box to send. Watch the debug window."
-msgstr ""
-
-#: ../gtk/plugins/relnot.c:69
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Vi uzas Gaim version %s.  La aktuala versio estas %s.<hr>"
-
-#: ../gtk/plugins/relnot.c:75
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>Ŝanĝprotokolo:</b>\n"
-"%s<br><br>"
-
-#: ../gtk/plugins/relnot.c:80
-#, c-format
-msgid ""
-"You can get version %s from:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-msgstr ""
-"Vi povas obteni version %s el:<br><a href=\"http://gaim.sourceforge.net/"
-"\">http://gaim.sourceforge.net</a>."
-
-#: ../gtk/plugins/relnot.c:84 ../gtk/plugins/relnot.c:85
-msgid "New Version Available"
-msgstr "Nova Versio Disponebla"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "Eldonavizo"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "Kontrolu ofte por novaj eldonoj"
-
-#. *  description
-#: ../gtk/plugins/relnot.c:148
-msgid ""
-"Checks periodically for new releases and notifies the user with the "
-"ChangeLog."
-msgstr "Kontrolu ofte por noaj eldonoj kaj avizu la uzanton kun la ŝanĝprotokolo."
-
-#: ../gtk/plugins/spellchk.c:1965
-msgid "Duplicate Correction"
-msgstr "Duobligo Korekto"
-
-#: ../gtk/plugins/spellchk.c:1966
-msgid "The specified word already exists in the correction list."
-msgstr "La elektita vorto jam ekzistas en la korektolisto."
-
-#: ../gtk/plugins/spellchk.c:2180
-msgid "Text Replacements"
-msgstr "Teksto anstataŭigoj"
-
-#: ../gtk/plugins/spellchk.c:2203
-msgid "You type"
-msgstr "Vi tajpas"
-
-#: ../gtk/plugins/spellchk.c:2217
-msgid "You send"
-msgstr "Vi sendas"
-
-#: ../gtk/plugins/spellchk.c:2231
-msgid "Whole words only"
-msgstr "Nur plenaj vortoj"
-
-#: ../gtk/plugins/spellchk.c:2243
-msgid "Case sensitive"
-msgstr "Usklecodistinge"
-
-#: ../gtk/plugins/spellchk.c:2269
-msgid "Add a new text replacement"
-msgstr "Aldonu novan teksto-anstataŭigon"
-
-#: ../gtk/plugins/spellchk.c:2285
-msgid "You _type:"
-msgstr "Vi _tajpas:"
-
-#: ../gtk/plugins/spellchk.c:2302
-msgid "You _send:"
-msgstr "Vi _sendas:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2314
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Ekzakta uskleca kongruo (malŝaltita por aŭtomata usklecotrakto)"
-
-#: ../gtk/plugins/spellchk.c:2316
-msgid "Only replace _whole words"
-msgstr "Nur anstataŭigu _planajn vortojn"
-
-#: ../gtk/plugins/spellchk.c:2341
-msgid "General Text Replacement Options"
-msgstr "Ĝenerala Teksto Anstataŭigo Opcioj"
-
-#: ../gtk/plugins/spellchk.c:2342
-msgid "Enable replacement of last word on send"
-msgstr "Ŝaltu anstataŭigon de lasta vorto je sendo"
-
-#: ../gtk/plugins/spellchk.c:2367
-msgid "Text replacement"
-msgstr "Teksto anstataŭigo"
-
-#: ../gtk/plugins/spellchk.c:2369 ../gtk/plugins/spellchk.c:2370
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Anstataŭigu tekston en elirantaj mesaĝoj laŭ uzantodfinitaj reguloj."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/ticker/ticker.c:77 ../gtk/plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Kunul Tiktakilo"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/ticker/ticker.c:358 ../gtk/plugins/ticker/ticker.c:360
-msgid "A horizontal scrolling version of the buddy list."
-msgstr ""
-
-#: ../gtk/plugins/timestamp.c:136
-msgid "Display Timestamps Every"
-msgstr "Montru Tempomarkojn Ĉiu"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp.c:195
-msgid "Timestamp"
-msgstr "Tempomarko"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp.c:198
-msgid "Display iChat-style timestamps"
-msgstr "Montru iChat-ajn Tempomarkojn"
-
-#. *  description
-#: ../gtk/plugins/timestamp.c:200
-msgid "Display iChat-style timestamps every N minutes."
-msgstr "Montru iChat-stilajn tempomarkojn ĉiuj N minutoj."
-
-#: ../gtk/plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Tempomarko Formato Opcioj"
-
-#: ../gtk/plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "_Devigi (tradicia Gaim) 24-horan tempoformaton"
-
-#: ../gtk/plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Montru Datojn en..."
-
-#: ../gtk/plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "Ko_nversacioj:"
-
-#: ../gtk/plugins/timestamp_format.c:37 ../gtk/plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "Por prokataj mesaĝoj"
-
-#: ../gtk/plugins/timestamp_format.c:38 ../gtk/plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "Por prokataj mesaĝoj kaj en babiloj"
-
-#: ../gtk/plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "_Mesaĝo Protokoloj:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp_format.c:149
-msgid "Message Timestamp Formats"
-msgstr "Mesaĝo Tempomarko Formatoj"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp_format.c:152
-msgid "Customizes the message timestamp formats."
-msgstr "Agordu mesaĝo-tempomarko-formatojn."
-
-#. *  description
-#: ../gtk/plugins/timestamp_format.c:154
-msgid ""
-"This plugin allows the user to customize conversation and logging message "
-"timestamp formats."
-msgstr ""
-"Tiu kromaĵo ebligas la uzanto agordi konversaciajn kaj protokolajn mesaĝajn "
-"tempmarkajn formatojn."
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Maltravidebleco:"
-
-#. IM Convo trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "TM Konversacio Fenestroj"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "_TM fenestra travidebleco"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr ""
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr ""
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Ĉiam super"
-
-#. Buddy List trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Kunullisto fenestro"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr ""
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr ""
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Travidebleco"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Variebla Travidebleco por la kunullisto kaj konversacioj."
-
-#. *  description
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:663
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and "
-"the buddy list.\n"
-"\n"
-"* Note: This plugin requires Win2000 or greater."
-msgstr ""
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:306
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ Rultempa Versio"
-
-#. Autostart
-#: ../gtk/plugins/win32/winprefs/winprefs.c:314
-msgid "Startup"
-msgstr "Eko"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:315
-msgid "_Start Gaim on Windows startup"
-msgstr ""
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:328
-msgid "_Dockable Buddy List"
-msgstr ""
-
-#. Blist On Top
-#: ../gtk/plugins/win32/winprefs/winprefs.c:332
-msgid "_Keep Buddy List window on top:"
-msgstr ""
-
-#. XXX: Did this ever work?
-#: ../gtk/plugins/win32/winprefs/winprefs.c:337
-msgid "Only when docked"
-msgstr ""
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:342
-msgid "_Flash window when chat messages are received"
-msgstr ""
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:366
-msgid "WinGaim Options"
-msgstr "WinGaim Opcioj"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:368
-msgid "Options specific to Windows Gaim."
-msgstr ""
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:369
-msgid "Provides options specific to Windows Gaim, such as buddy list docking."
-msgstr ""
-
-#: ../libgaim/account.c:769
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
+msgstr "Lastaprotokolo kromaĵo."
+
+#: ../libpurple/account.c:777
 msgid "accounts"
 msgstr "kontoj"
 
-#: ../libgaim/account.c:915
+#: ../libpurple/account.c:923
 msgid "Password is required to sign on."
 msgstr "Pasvorto estas postulata por en saulti."
 
-#: ../libgaim/account.c:940
+#: ../libpurple/account.c:948
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Enigu pasvorton por %s (%s)"
 
-#: ../libgaim/account.c:947
+#: ../libpurple/account.c:955
 msgid "Enter Password"
 msgstr "Enigu Pasvorton"
 
-#: ../libgaim/account.c:952
+#: ../libpurple/account.c:960
 msgid "Save password"
 msgstr "Konservu pasvorton"
 
-#: ../libgaim/account.c:986 ../libgaim/connection.c:104
+#: ../libpurple/account.c:994 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Mankanta protokolo-kromaĵo por %s"
 
-#: ../libgaim/account.c:1085 ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1317
+#: ../libpurple/account.c:1154 ../libpurple/protocols/gg/gg.c:696
+#: ../libpurple/protocols/jabber/jabber.c:1323
 msgid "New passwords do not match."
 msgstr "Novaj pasvortoj malsamas."
 
-#: ../libgaim/account.c:1094
+#: ../libpurple/account.c:1163
 msgid "Fill out all fields completely."
 msgstr "Enigu ĉiujn kampojn komplete"
 
-#: ../libgaim/account.c:1117
+#: ../libpurple/account.c:1186
 msgid "Original password"
 msgstr "Originala pasvorto"
 
-#: ../libgaim/account.c:1124
+#: ../libpurple/account.c:1193
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: ../libgaim/account.c:1131
+#: ../libpurple/account.c:1200
 msgid "New password (again)"
 msgstr "Nova pasvorto (denove)"
 
-#: ../libgaim/account.c:1137
+#: ../libpurple/account.c:1206
 #, c-format
 msgid "Change password for %s"
 msgstr "Ŝanĝu pasvorton de %s"
 
-#: ../libgaim/account.c:1145
+#: ../libpurple/account.c:1214
 msgid "Please enter your current password and your new password."
 msgstr "B.v. enigi vian aktualan pasvorton kaj vian novan pasvorton."
 
-#: ../libgaim/account.c:1175
+#: ../libpurple/account.c:1244
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ŝanĝu uzanto-informon de %s"
 
-#: ../libgaim/account.c:1178 ../libgaim/protocols/toc/toc.c:1690
+#: ../libpurple/account.c:1247 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Difini Uzanto Informon"
 
-#: ../libgaim/blist.c:548
+#: ../libpurple/account.c:1783 ../libpurple/protocols/gg/gg.c:1002
+#: ../libpurple/protocols/jabber/buddy.c:641
+#: ../libpurple/protocols/jabber/buddy.c:1404
+#: ../libpurple/protocols/jabber/buddy.c:1421
+#: ../libpurple/protocols/novell/novell.c:2832
+#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+msgid "Unknown"
+msgstr "Nekonata"
+
+#: ../libpurple/blist.c:523 ../libpurple/blist.c:1296
+#: ../libpurple/blist.c:1525 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5137 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
+msgid "Buddies"
+msgstr "Kunuloj"
+
+#: ../libpurple/blist.c:550
 msgid "buddy list"
 msgstr "kunullisto"
 
-#: ../libgaim/blist.c:1919
-#, c-format
-msgid ""
-"%d buddy from group %s was not removed because it belongs to an account "
-"which is disabled or offline.  This buddy and the group were not removed.\n"
-msgid_plural ""
-"%d buddies from group %s were not removed because they belong to accounts "
-"which are currently disabled or offline.  These buddies and the group were "
-"not removed.\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../libgaim/blist.c:1929
-msgid "Group not removed"
-msgstr "Grupo ne forigita"
-
-#: ../libgaim/connection.c:106
+#: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Registra Eraro"
 
-#: ../libgaim/connection.c:292
+#: ../libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s ensalutis"
 
-#: ../libgaim/connection.c:322
+#: ../libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s malsalutis"
 
-#: ../libgaim/conversation.c:165
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:321
+msgid "Unknown error"
+msgstr "Nekonata eraro"
+
+#: ../libpurple/conversation.c:165
 msgid "Unable to send message: The message is too large."
 msgstr ""
 
-#: ../libgaim/conversation.c:168 ../libgaim/conversation.c:181
+#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
 #, c-format
 msgid "Unable to send message to %s."
 msgstr ""
 
-#: ../libgaim/conversation.c:169
+#: ../libpurple/conversation.c:169
 msgid "The message is too large."
 msgstr ""
 
-#: ../libgaim/conversation.c:178
+#: ../libpurple/conversation.c:178
 msgid "Unable to send message."
 msgstr ""
 
-#: ../libgaim/conversation.c:1162
+#: ../libpurple/conversation.c:1162
 msgid "Send Message"
 msgstr "Sendu Mesaĝon"
 
-#: ../libgaim/conversation.c:1163
+#: ../libpurple/conversation.c:1163
 msgid "_Send Message"
 msgstr "_Sendu Mesaĝon"
 
-#: ../libgaim/conversation.c:1566
+#: ../libpurple/conversation.c:1566
 #, c-format
 msgid "%s entered the room."
 msgstr "%s eniris la ĉambron."
 
-#: ../libgaim/conversation.c:1569
+#: ../libpurple/conversation.c:1569
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] eniris la ĉambron."
 
-#: ../libgaim/conversation.c:1674
+#: ../libpurple/conversation.c:1674
 #, c-format
 msgid "You are now known as %s"
 msgstr "Vi nun estas konata kiel %s"
 
-#: ../libgaim/conversation.c:1694
+#: ../libpurple/conversation.c:1694
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s nun estas konata kiel %s"
 
-#: ../libgaim/conversation.c:1767
+#: ../libpurple/conversation.c:1767
 #, c-format
 msgid "%s left the room."
 msgstr "%s forlasis la ĉambron."
 
-#: ../libgaim/conversation.c:1770
+#: ../libpurple/conversation.c:1770
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s forlasis la ĉambron (%s)."
 
-#: ../libgaim/desktopitem.c:286 ../libgaim/desktopitem.c:877
-msgid "No name"
-msgstr "Neniu nomo"
-
-#: ../libgaim/dbus-server.c:578
+#: ../libpurple/dbus-server.c:578
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Malsukcesis konekti: %s"
 
-#: ../libgaim/dbus-server.c:590
+#: ../libpurple/dbus-server.c:590
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Malsukcesis ricevi nomon: %s"
 
-#: ../libgaim/dbus-server.c:603
+#: ../libpurple/dbus-server.c:603
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Malsukcesis ricevi servilnomon: %s"
 
-#: ../libgaim/dnsquery.c:491
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+msgid "No name"
+msgstr "Neniu nomo"
+
+#: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:496
+#: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:529 ../libgaim/dnsquery.c:677
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:532 ../libgaim/dnsquery.c:691
-#: ../libgaim/dnsquery.c:799
+#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
+#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:554
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:558
+#: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:735
+#: ../libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr ""
 
-#: ../libgaim/dnsquery.c:736
+#: ../libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "Nekonata kialo"
 
-#: ../libgaim/ft.c:195 ../libgaim/protocols/msn/msn.c:408
+#: ../libpurple/ft.c:204 ../libpurple/protocols/msn/msn.c:409
 #, c-format
 msgid ""
 "Error reading %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:199
+#: ../libpurple/ft.c:208
 #, c-format
 msgid ""
 "Error writing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:203
+#: ../libpurple/ft.c:212
 #, c-format
 msgid ""
 "Error accessing %s: \n"
 "%s.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:239
+#: ../libpurple/ft.c:248
 msgid "Directory is not writable."
 msgstr ""
 
-#: ../libgaim/ft.c:254
+#: ../libpurple/ft.c:263
 msgid "Cannot send a file of 0 bytes."
 msgstr ""
 
-#: ../libgaim/ft.c:264
+#: ../libpurple/ft.c:273
 msgid "Cannot send a directory."
 msgstr ""
 
-#: ../libgaim/ft.c:273
+#: ../libpurple/ft.c:282
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:331
+#: ../libpurple/ft.c:340
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr ""
 
-#: ../libgaim/ft.c:338
+#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you a file"
 msgstr ""
 
-#: ../libgaim/ft.c:379
+#: ../libpurple/ft.c:388
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Akcepti dosier-alŝuton demandon de %s?"
 
-#: ../libgaim/ft.c:383
+#: ../libpurple/ft.c:392
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5664,133 +1712,133 @@
 "Remote port: %d"
 msgstr ""
 
-#: ../libgaim/ft.c:416
+#: ../libpurple/ft.c:425
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr ""
 
-#: ../libgaim/ft.c:468
+#: ../libpurple/ft.c:477
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr ""
 
-#: ../libgaim/ft.c:489
+#: ../libpurple/ft.c:498
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr ""
 
-#: ../libgaim/ft.c:501
+#: ../libpurple/ft.c:510
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr ""
 
-#: ../libgaim/ft.c:655
+#: ../libpurple/ft.c:664
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr ""
 
-#: ../libgaim/ft.c:658
+#: ../libpurple/ft.c:667
 msgid "File transfer complete"
 msgstr "Dosiero alŝuto kompleta"
 
-#: ../libgaim/ft.c:1075
+#: ../libpurple/ft.c:1084
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Vi rezignis la alŝuton de %s"
 
-#: ../libgaim/ft.c:1080
+#: ../libpurple/ft.c:1089
 msgid "File transfer cancelled"
 msgstr "Dosiero alŝuto rezignita"
 
-#: ../libgaim/ft.c:1138
+#: ../libpurple/ft.c:1147
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s rezignis la alŝuton de %s"
 
-#: ../libgaim/ft.c:1143
+#: ../libpurple/ft.c:1152
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s rezignis la dosiero-alŝuton"
 
-#: ../libgaim/ft.c:1200
+#: ../libpurple/ft.c:1209
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Dosiero alŝuto al %s malsukcesis."
 
-#: ../libgaim/ft.c:1202
+#: ../libpurple/ft.c:1211
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Dosiero elŝuto de %s malsukcesis."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Eku komandon en terminalo"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:2
+#: ../libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "La uzata komando por trakti \"aim\" URL-ojn, se enŝaltita."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:3
+#: ../libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "La uzata komando por trakti \"gg\" URL-ojn, se enŝaltita."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:4
+#: ../libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "La uzata komando por trakti \"icq\" URL-ojn, se enŝaltita."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:5
+#: ../libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "La uzata komando por trakti \"irc\" URL-ojn, se enŝaltita."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:6
+#: ../libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "La uzata komando por trakti \"msnim\" URL-ojn, se enŝaltita."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:7
+#: ../libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "La uzata komando por trakti \"sip\" URL-ojn, se enŝaltita."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:8
+#: ../libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "La uzata komando por trakti \"xmpp\" URL-ojn, se enŝaltita."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:9
+#: ../libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "La uzata komando por trakti \"ymsgr\" URL-ojn, se enŝaltita."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "La traktilo por \"aim\" URL-oj"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "La traktilo por \"gg\" URL-oj"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "La traktilo por \"icq\" URL-oj"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "La traktilo por \"irc\" URL-oj"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "La traktilo por \"msnim\" URL-oj"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "La traktilo por \"sip\" URL-oj"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "La traktilo por \"xmpp\" URL-oj"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "La traktilo por \"ymsgr\" URL-oj"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:18
+#: ../libpurple/gconf/purple.schemas.in.h:18
 msgid ""
 "True if the command specified in the \"command\" key should handle \"aim\" "
 "URLs."
@@ -5798,7 +1846,7 @@
 "Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"aim\" URL-"
 "ojn."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:19
+#: ../libpurple/gconf/purple.schemas.in.h:19
 msgid ""
 "True if the command specified in the \"command\" key should handle \"gg\" "
 "URLs."
@@ -5806,7 +1854,7 @@
 "Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"gg\" URL-"
 "ojn."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:20
+#: ../libpurple/gconf/purple.schemas.in.h:20
 msgid ""
 "True if the command specified in the \"command\" key should handle \"icq\" "
 "URLs."
@@ -5814,7 +1862,7 @@
 "Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"icq\" URL-"
 "ojn."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:21
+#: ../libpurple/gconf/purple.schemas.in.h:21
 msgid ""
 "True if the command specified in the \"command\" key should handle \"irc\" "
 "URLs."
@@ -5822,7 +1870,7 @@
 "Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"irc\" URL-"
 "ojn."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:22
+#: ../libpurple/gconf/purple.schemas.in.h:22
 msgid ""
 "True if the command specified in the \"command\" key should handle \"msnim\" "
 "URLs."
@@ -5830,7 +1878,7 @@
 "Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"msnim\" "
 "URL-ojn."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:23
+#: ../libpurple/gconf/purple.schemas.in.h:23
 msgid ""
 "True if the command specified in the \"command\" key should handle \"sip\" "
 "URLs."
@@ -5838,7 +1886,7 @@
 "Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"sip\" URL-"
 "ojn."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:24
+#: ../libpurple/gconf/purple.schemas.in.h:24
 msgid ""
 "True if the command specified in the \"command\" key should handle \"xmpp\" "
 "URLs."
@@ -5846,7 +1894,7 @@
 "Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"xmpp\" URL-"
 "ojn."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:25
+#: ../libpurple/gconf/purple.schemas.in.h:25
 msgid ""
 "True if the command specified in the \"command\" key should handle \"ymsgr\" "
 "URLs."
@@ -5854,7 +1902,7 @@
 "Vera se la komando donita en la \"komando\" ŝlosilo devu trakti \"ymsgr\" "
 "URL-ojn."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:26
+#: ../libpurple/gconf/purple.schemas.in.h:26
 msgid ""
 "True if the command used to handle this type of URL should be run in a "
 "terminal."
@@ -5862,63 +1910,63 @@
 "Vera se la komando uzata por trakti tiun tipon de URL-o devu esti lanĉita en "
 "terminalo."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:27
+#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Ĉu la donita komando devu trakti \"aim\" URL-ojn"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Ĉu la donita komando devu trakti \"gg\" URL-ojn"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Ĉu la donita komando devu trakti \"icq\" URL-ojn"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Ĉu la donita komando devu trakti \"irc\" URL-ojn"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Ĉu la donita komando devu trakti \"msnim\" URL-ojn"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Ĉu la donita komando devu trakti \"sip\" URL-ojn"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Ĉu la donita komando devu trakti \"xmpp\" URL-ojn"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Ĉu la donita komando devu trakti \"ymsgr\" URL-ojn"
 
-#: ../libgaim/log.c:181
+#: ../libpurple/log.c:181
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">La protokolilo ne havas legkapablon</font></b>"
 
-#: ../libgaim/log.c:562
+#: ../libpurple/log.c:593
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libgaim/log.c:573
+#: ../libpurple/log.c:607
 msgid "Plain text"
 msgstr "Plata teksto"
 
-#: ../libgaim/log.c:584
-msgid "Old Gaim"
-msgstr "Malnova Gaim"
-
-#: ../libgaim/log.c:691
+#: ../libpurple/log.c:621
+msgid "Old flat format"
+msgstr ""
+
+#: ../libpurple/log.c:732
 msgid "Logging of this conversation failed."
 msgstr "Protokolado de tiu konversacio malsukcesis."
 
-#: ../libgaim/log.c:1041
+#: ../libpurple/log.c:1175
 msgid "XML"
 msgstr "XML"
 
-#: ../libgaim/log.c:1115
+#: ../libpurple/log.c:1251
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5927,7 +1975,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AŬTO-"
 "RESPONDO&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1117
+#: ../libpurple/log.c:1253
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -5936,161 +1984,157 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AŬTO-"
 "RESPONDO&gt;:</b></font> %s<br/>\n"
 
-#: ../libgaim/log.c:1175 ../libgaim/log.c:1306
+#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr ""
 
-#: ../libgaim/log.c:1187 ../libgaim/log.c:1320
+#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr ""
 
-#: ../libgaim/log.c:1249
+#: ../libpurple/log.c:1385
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AŬTO-RESPONDO>: %s\n"
 
-#: ../libgaim/plugin.c:282 ../libgaim/protocols/jabber/buddy.c:1685
-#: ../libgaim/protocols/msn/servconn.c:139
-#: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2719
-msgid "Unknown error"
-msgstr "Nekonata eraro"
-
-#: ../libgaim/plugin.c:365
+#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr ""
 
-#: ../libgaim/plugin.c:434
+#: ../libpurple/plugin.c:380
+msgid "This plugin has not defined an ID."
+msgstr ""
+
+#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr ""
 
-#: ../libgaim/plugin.c:451
+#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr ""
 
-#: ../libgaim/plugin.c:468
+#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr ""
 
-#: ../libgaim/plugin.c:533
+#: ../libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
 "again."
 msgstr ""
 
-#: ../libgaim/plugin.c:538
-msgid "Gaim encountered errors loading the plugin."
-msgstr ""
-
-#: ../libgaim/plugin.c:560
+#: ../libpurple/plugin.c:552
+msgid "Unable to load the plugin"
+msgstr "Ne eblas ŝargi kromaĵon"
+
+#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr ""
 
-#: ../libgaim/plugin.c:564
-msgid "Gaim was unable to load your plugin."
-msgstr ""
-
-#: ../libgaim/plugin.c:664
+#: ../libpurple/plugin.c:578
+msgid "Unable to load your plugin."
+msgstr "Ne eblas ŝargi vian kromaĵon."
+
+#: ../libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr ""
 
-#: ../libgaim/plugin.c:669
-msgid "Gaim encountered errors unloading the plugin."
-msgstr ""
-
-#: ../libgaim/plugins/autoaccept.c:23
+#: ../libpurple/plugin.c:681
+msgid "There were errors unloading the plugin."
+msgstr ""
+
+#: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Aŭtomate Akcepti"
 
-#: ../libgaim/plugins/autoaccept.c:25 ../libgaim/plugins/autoaccept.c:26
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Aŭtomate Akcepti dosier-alŝuton demandon de elektitaj uzantoj."
 
-#: ../libgaim/plugins/autoaccept.c:80
+#: ../libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr "Aŭtomate akceptita dosier-alŝuto \"%s\" de \"%s\" kompleta."
 
-#: ../libgaim/plugins/autoaccept.c:82
+#: ../libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr ""
 
-#: ../libgaim/plugins/autoaccept.c:160
+#: ../libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Kiam dosier-alŝuto demando alvenas de %s"
 
-#: ../libgaim/plugins/autoaccept.c:162
+#: ../libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr ""
 
-#: ../libgaim/plugins/autoaccept.c:164 ../libgaim/plugins/autoreply.c:225
+#: ../libpurple/plugins/autoaccept.c:164 ../libpurple/plugins/autoreply.c:225
 msgid "_Save"
 msgstr "_Konservu"
 
-#: ../libgaim/plugins/autoaccept.c:165 ../libgaim/plugins/autoreply.c:226
-#: ../libgaim/plugins/idle.c:170 ../libgaim/plugins/idle.c:203
-#: ../libgaim/plugins/idle.c:228 ../libgaim/protocols/oscar/oscar.c:1432
-#: ../libgaim/protocols/oscar/oscar.c:2234
-#: ../libgaim/protocols/oscar/oscar.c:2280
-#: ../libgaim/protocols/oscar/oscar.c:5838
-#: ../libgaim/protocols/oscar/oscar.c:5890
-#: ../libgaim/protocols/oscar/oscar.c:6068
-#: ../libgaim/protocols/oscar/oscar.c:6124
-#: ../libgaim/protocols/oscar/oscar.c:6193 ../libgaim/request.h:1350
-#: ../libgaim/request.h:1360
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/autoreply.c:226
+#: ../libpurple/plugins/idle.c:170 ../libpurple/plugins/idle.c:203
+#: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2289
+#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
+#: ../libpurple/request.h:1360
 msgid "_Cancel"
 msgstr "_Rezignu"
 
-#: ../libgaim/plugins/autoaccept.c:166
+#: ../libpurple/plugins/autoaccept.c:166
 msgid "Ask"
 msgstr ""
 
-#: ../libgaim/plugins/autoaccept.c:167
+#: ../libpurple/plugins/autoaccept.c:167
 msgid "Auto Accept"
 msgstr "Aŭtomate Akcepti"
 
-#: ../libgaim/plugins/autoaccept.c:168
+#: ../libpurple/plugins/autoaccept.c:168
 msgid "Auto Reject"
 msgstr "Aŭtomate Malakcepti"
 
-#: ../libgaim/plugins/autoaccept.c:181
+#: ../libpurple/plugins/autoaccept.c:181
 msgid "Autoaccept File Transfers..."
 msgstr "Aŭtomate Akcepti Dosiero-Alŝutojn..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libgaim/plugins/autoaccept.c:211
+#: ../libpurple/plugins/autoaccept.c:211
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
 msgstr ""
 
-#: ../libgaim/plugins/autoaccept.c:216
+#: ../libpurple/plugins/autoaccept.c:216
 msgid "Automatically reject from users not in buddy list"
 msgstr "Aŭtomate malakcepti uzantojn ekster la kunullisto"
 
-#: ../libgaim/plugins/autoaccept.c:220
+#: ../libpurple/plugins/autoaccept.c:220
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:23
+#: ../libpurple/plugins/autoreply.c:23
 msgid "Autoreply"
 msgstr "Aŭtomate-respondo"
 
-#: ../libgaim/plugins/autoreply.c:25
+#: ../libpurple/plugins/autoreply.c:25
 msgid "Autoreply for all the protocols"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:26
+#: ../libpurple/plugins/autoreply.c:26
 msgid ""
 "This plugin lets you set autoreply message for any protocol. You can set the "
 "global autoreply message from the Plugin-options dialog. To set some "
@@ -6100,93 +2144,93 @@
 msgstr ""
 
 #. XXX: There should be a way to reset to the default/account-default autoreply
-#: ../libgaim/plugins/autoreply.c:218
+#: ../libpurple/plugins/autoreply.c:218
 #, c-format
 msgid "Set autoreply message for %s"
 msgstr "Difini aŭtomatan mesaĝon por %s"
 
-#: ../libgaim/plugins/autoreply.c:220
+#: ../libpurple/plugins/autoreply.c:220
 msgid "Set Autoreply Message"
 msgstr "Difini Aŭtomatan Mesaĝon"
 
-#: ../libgaim/plugins/autoreply.c:221
+#: ../libpurple/plugins/autoreply.c:221
 msgid ""
 "The following message will be sent to the buddy when the buddy sends you a "
 "message and autoreply is enabled."
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:238
+#: ../libpurple/plugins/autoreply.c:238
 msgid "Set _Autoreply Message"
 msgstr "Difinu _Aŭtomatan Mesaĝon"
 
-#: ../libgaim/plugins/autoreply.c:249
+#: ../libpurple/plugins/autoreply.c:249
 msgid "Autoreply message"
 msgstr "Aŭtomata respondo mesaĝo"
 
-#: ../libgaim/plugins/autoreply.c:336
+#: ../libpurple/plugins/autoreply.c:336
 msgid "Send autoreply messages when"
 msgstr "Sendu aŭtomatorespondajn mesaĝojn kiam"
 
-#: ../libgaim/plugins/autoreply.c:340
+#: ../libpurple/plugins/autoreply.c:340
 msgid "When my account is _away"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:344
+#: ../libpurple/plugins/autoreply.c:344
 msgid "When my account is _idle"
 msgstr "Kiam mia konto _senfaras"
 
-#: ../libgaim/plugins/autoreply.c:348
+#: ../libpurple/plugins/autoreply.c:348
 msgid "_Default reply"
 msgstr "Apriora respon_do"
 
-#: ../libgaim/plugins/autoreply.c:354
+#: ../libpurple/plugins/autoreply.c:354
 msgid "Status message"
 msgstr "Stato mesaĝo"
 
-#: ../libgaim/plugins/autoreply.c:358
+#: ../libpurple/plugins/autoreply.c:358
 msgid "Autoreply with status message"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:362
+#: ../libpurple/plugins/autoreply.c:362
 msgid "Always when there is a status message"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:364
+#: ../libpurple/plugins/autoreply.c:364
 msgid "Only when there's no autoreply message"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:369
+#: ../libpurple/plugins/autoreply.c:369
 msgid "Delay between autoreplies"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:373
+#: ../libpurple/plugins/autoreply.c:373
 msgid "_Minimum delay (mins)"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:377
+#: ../libpurple/plugins/autoreply.c:377
 msgid "Times to send autoreplies"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:381
+#: ../libpurple/plugins/autoreply.c:381
 msgid "Ma_ximum count"
 msgstr ""
 
-#: ../libgaim/plugins/autoreply.c:428
+#: ../libpurple/plugins/autoreply.c:428
 msgid ""
 "I am currently not available. Please leave your message, and I will get back "
 "to you as soon as possible."
 msgstr ""
 
-#: ../libgaim/plugins/buddynote.c:46 ../libgaim/protocols/msn/msn.c:1611
-#: ../libgaim/protocols/msn/msn.c:1641
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1589
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Notes"
 msgstr "Notoj"
 
-#: ../libgaim/plugins/buddynote.c:47
+#: ../libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr ""
 
-#: ../libgaim/plugins/buddynote.c:61
+#: ../libpurple/plugins/buddynote.c:61
 msgid "Edit Notes..."
 msgstr ""
 
@@ -6196,18 +2240,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:87
 msgid "Buddy Notes"
 msgstr "Kunul Notoj"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:89
 msgid "Store notes on particular buddies."
 msgstr ""
 
 #. *  summary
-#: ../libgaim/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 
@@ -6217,7 +2261,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ciphertest.c:264
+#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr ""
 
@@ -6225,8 +2269,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ciphertest.c:267 ../libgaim/plugins/ciphertest.c:269
-msgid "Tests the ciphers that ship with gaim."
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
 msgstr ""
 
 #. *< type
@@ -6235,7 +2279,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/dbus-example.c:155
+#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus Ekzamplo"
 
@@ -6243,7 +2287,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/dbus-example.c:158 ../libgaim/plugins/dbus-example.c:160
+#: ../libpurple/plugins/dbus-example.c:158
+#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus Kromaĵo Ekzamplo"
 
@@ -6253,58 +2298,58 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Gaim Dosiero Kontrolo"
+#: ../libpurple/plugins/filectl.c:248
+msgid "File Control"
+msgstr "Dosiero Kontrolo"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/filectl.c:251 ../libgaim/plugins/filectl.c:253
-msgid "Allows you to control Gaim by entering commands in a file."
-msgstr ""
-
-#: ../libgaim/plugins/idle.c:158 ../libgaim/plugins/idle.c:216
+#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+msgid "Allows control by entering commands in a file."
+msgstr ""
+
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:216
 msgid "Minutes"
 msgstr "Minutoj"
 
 #. This is a cultural reference.  Dy'er Mak'er is a song by Led Zeppelin.
 #. If that doesn't translate well into your language, drop the 's before translating.
-#: ../libgaim/plugins/idle.c:165 ../libgaim/plugins/idle.c:198
-#: ../libgaim/plugins/idle.c:223 ../libgaim/plugins/idle.c:315
+#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:198
+#: ../libpurple/plugins/idle.c:223 ../libpurple/plugins/idle.c:315
 msgid "I'dle Mak'er"
 msgstr "S'enfarigilo"
 
-#: ../libgaim/plugins/idle.c:166 ../libgaim/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:255
 msgid "Set Account Idle Time"
 msgstr "Difinu Konton Senfaran Tempon"
 
-#: ../libgaim/plugins/idle.c:169 ../libgaim/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:227
 msgid "_Set"
 msgstr "_Difinu"
 
-#: ../libgaim/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:183
 msgid "None of your accounts are idle."
 msgstr "Neniu el viaj kontoj senfaras."
 
-#: ../libgaim/plugins/idle.c:199 ../libgaim/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:199 ../libpurple/plugins/idle.c:259
 msgid "Unset Account Idle Time"
 msgstr "Maldifinu Konton Senfaran Tempon"
 
-#: ../libgaim/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:202
 msgid "_Unset"
 msgstr "_Malfaru"
 
-#: ../libgaim/plugins/idle.c:224 ../libgaim/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:224 ../libpurple/plugins/idle.c:263
 msgid "Set Idle Time for All Accounts"
 msgstr "Difinu Senfaran Tempon por Ĉiuj Kontoj"
 
-#: ../libgaim/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:268
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Malfaru Senfaran Tempon por Ĉiuj Senfarantaj Kontoj"
 
-#: ../libgaim/plugins/idle.c:317 ../libgaim/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:317 ../libpurple/plugins/idle.c:318
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr ""
 
@@ -6314,19 +2359,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-client.c:87
+#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC Provo Kliento"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-client.c:90
+#: ../libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Provu kromaĵon IP subtenon, kiel kliento."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-client.c:92
+#: ../libpurple/plugins/ipc-test-client.c:92
 msgid ""
 "Test plugin IPC support, as a client. This locates the server plugin and "
 "calls the commands registered."
@@ -6338,116 +2383,158 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-server.c:74
+#: ../libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC Provoservilo"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-server.c:77
+#: ../libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr ""
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-server.c:79
+#: ../libpurple/plugins/ipc-test-server.c:79
 msgid "Test plugin IPC support, as a server. This registers the IPC commands."
 msgstr ""
 
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:233
+msgid "Minimum Room Size"
+msgstr ""
+
+#: ../libpurple/plugins/joinpart.c:239
+msgid "User Inactivity Timeout (in minutes)"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/joinpart.c:264
+msgid "Join/Part Hiding"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/joinpart.c:267
+msgid "Hides extraneous join/part messages."
+msgstr ""
+
+#. *  description
+#: ../libpurple/plugins/joinpart.c:269
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
 #. * it's here just in case.  The parens are to make it clear it's
 #. * not a real timezone.
-#: ../libgaim/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:497
 msgid "(UTC)"
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1552
 msgid "User is offline."
 msgstr "Uzanto senkonektas."
 
-#: ../libgaim/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1558
 msgid "Auto-response sent:"
 msgstr "Aŭto-respondo sendita:"
 
-#: ../libgaim/plugins/log_reader.c:1568 ../libgaim/plugins/log_reader.c:1571
-#: ../libgaim/plugins/statenotify.c:80
+#: ../libpurple/plugins/log_reader.c:1568
+#: ../libpurple/plugins/log_reader.c:1571
+#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s malsalutis."
 
-#: ../libgaim/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1585
 msgid "One or more messages may have been undeliverable."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1595
 msgid "You were disconnected from the server."
 msgstr "Vi estis diskonektita de la servilo."
 
-#: ../libgaim/plugins/log_reader.c:1603
+#: ../libpurple/plugins/log_reader.c:1603
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1618
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 
-#: ../libgaim/plugins/log_reader.c:1623
+#: ../libpurple/plugins/log_reader.c:1623
 msgid "Message could not be sent."
 msgstr "Mesaĝo malsendiĝeblas."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1976 ../libgaim/plugins/log_reader.c:2085
+#: ../libpurple/plugins/log_reader.c:1976
+#: ../libpurple/plugins/log_reader.c:2085
 msgid "Adium"
 msgstr "Adium"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:1989 ../libgaim/plugins/log_reader.c:2090
+#: ../libpurple/plugins/log_reader.c:1989
+#: ../libpurple/plugins/log_reader.c:2090
 msgid "Fire"
 msgstr "Fajro"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2001 ../libgaim/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2001
+#: ../libpurple/plugins/log_reader.c:2094
 msgid "Messenger Plus!"
 msgstr "Messenger Plus!"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2014 ../libgaim/plugins/log_reader.c:2099
+#: ../libpurple/plugins/log_reader.c:2014
+#: ../libpurple/plugins/log_reader.c:2099
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
 #. choose to leave them alone.  Choose what's best for your language.
-#: ../libgaim/plugins/log_reader.c:2026 ../libgaim/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2026
+#: ../libpurple/plugins/log_reader.c:2103
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2067
 msgid "General Log Reading Configuration"
 msgstr "Ĝenerala Protokolo Legado Agordo"
 
-#: ../libgaim/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2071
 msgid "Fast size calculations"
 msgstr "Rapidaj grandeco kalkuloj"
 
-#: ../libgaim/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2075
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2081
 msgid "Log Directory"
 msgstr "Protokolo Dosierujo"
 
@@ -6457,19 +2544,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2126
 msgid "Log Reader"
 msgstr "Protokolo Legilo"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2130
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 
 #. * description
-#: ../libgaim/plugins/log_reader.c:2134
+#: ../libpurple/plugins/log_reader.c:2134
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -6478,12 +2565,12 @@
 "at your own risk!"
 msgstr ""
 
-#: ../libgaim/plugins/mono/loader/mono.c:213
+#: ../libpurple/plugins/mono/loader/mono.c:211
 msgid "Mono Plugin Loader"
 msgstr "Mono Kromaĵo Ŝaĝilo"
 
-#: ../libgaim/plugins/mono/loader/mono.c:215
-#: ../libgaim/plugins/mono/loader/mono.c:216
+#: ../libpurple/plugins/mono/loader/mono.c:213
+#: ../libpurple/plugins/mono/loader/mono.c:214
 msgid "Loads .NET plugins with Mono."
 msgstr "Ŝarĝas .NET-ajn kromaĵojn pere de Mono."
 
@@ -6496,57 +2583,77 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/newline.c:68
+#: ../libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "Nova Linio"
 
 #. *< name
 #. *< version
-#: ../libgaim/plugins/newline.c:70
+#: ../libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr ""
 
 #. *  summary
-#: ../libgaim/plugins/newline.c:71
+#: ../libpurple/plugins/newline.c:71
 msgid ""
 "Prepends a newline to messages so that the rest of the message appears below "
 "the screen name in the conversation window."
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:23
+#: ../libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:25 ../libgaim/plugins/offlinemsg.c:26
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
 msgid "Save messages sent to an offline user as pounce."
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:95
+#: ../libpurple/plugins/offlinemsg.c:95
 msgid ""
 "The rest of the messages will be saved as pounce. You can edit/delete the "
 "pounce from the `Buddy Pounce' dialog."
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:152
+#: ../libpurple/plugins/offlinemsg.c:152
 #, c-format
 msgid ""
 "\"%s\" is currently offline. Do you want to save the rest of the messages in "
 "a pounce and automatically send them when \"%s\" logs back in?"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:156
+#: ../libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr "Senkonekta Mesaĝo"
 
-#: ../libgaim/plugins/offlinemsg.c:157
+#: ../libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:187
+#: ../libpurple/plugins/offlinemsg.c:159
+#: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:313
+#: ../libpurple/protocols/silc/pk.c:117 ../libpurple/protocols/silc/wb.c:303
+#: ../pidgin/gtkrequest.c:267
+msgid "Yes"
+msgstr "Jes"
+
+#: ../libpurple/plugins/offlinemsg.c:160
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:519 ../libpurple/protocols/msn/msn.c:529
+#: ../libpurple/protocols/novell/novell.c:1919
+#: ../libpurple/protocols/silc/buddy.c:314
+#: ../libpurple/protocols/silc/pk.c:118 ../libpurple/protocols/silc/wb.c:304
+#: ../pidgin/gtkrequest.c:268
+msgid "No"
+msgstr "Ne"
+
+#: ../libpurple/plugins/offlinemsg.c:187
 msgid "Save offline messages in pounce"
 msgstr ""
 
-#: ../libgaim/plugins/offlinemsg.c:191
+#: ../libpurple/plugins/offlinemsg.c:191
 msgid "Do not ask. Always save in pounce."
 msgstr ""
 
@@ -6556,26 +2663,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:588
 msgid "Perl Plugin Loader"
 msgstr "Perl Kromaĵo Ŝaĝilo"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libgaim/plugins/perl/perl.c:590 ../libgaim/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:590 ../libpurple/plugins/perl/perl.c:591
 msgid "Provides support for loading perl plugins."
 msgstr "Provizas subteno por ŝarĝi perl-ajn kormaĵojn."
 
-#: ../libgaim/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:19
 msgid "Psychic Mode"
 msgstr "Psiŝika Moduso"
 
-#: ../libgaim/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic mode for incoming conversation"
 msgstr "Psiŝika modo je enen konversacion"
 
-#: ../libgaim/plugins/psychic.c:21
+#: ../libpurple/plugins/psychic.c:21
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
@@ -6583,23 +2690,23 @@
 "Igas aperon de konversacia fenestro kiam alia uzanto komencas mesaĝi vin.  "
 "Tio funkcias por AIM, ICQ, Jabber, Sametime, kaj Yahoo!"
 
-#: ../libgaim/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:66
 msgid "You feel a disturbance in the force..."
 msgstr ""
 
-#: ../libgaim/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:85
 msgid "Only enable for users on the buddy list"
 msgstr "Nur ŝaltu por uzantoj en la kunullisto"
 
-#: ../libgaim/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:90
 msgid "Disable when away"
 msgstr "Malŝaltu kiam fora"
 
-#: ../libgaim/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:94
 msgid "Display notification message in conversations"
 msgstr "Montru avizmesaĝon en konversacioj"
 
-#: ../libgaim/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:99
 msgid "Raise psychic conversations"
 msgstr "Startigu psiŝikajn konversaciojn"
 
@@ -6609,7 +2716,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Signaloj Provo"
 
@@ -6617,7 +2724,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/signals-test.c:687 ../libgaim/plugins/signals-test.c:689
+#: ../libpurple/plugins/signals-test.c:687
+#: ../libpurple/plugins/signals-test.c:689
 msgid "Test to see that all signals are working properly."
 msgstr "Provu por vidi ke ĉiuj signaloj bonfunkcias."
 
@@ -6627,7 +2735,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/simple.c:37
+#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Simpla Kromaĵo"
 
@@ -6635,7 +2743,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/simple.c:40 ../libgaim/plugins/simple.c:42
+#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Provu por vidi ke plej parto de aĵoj bonfunkcias."
 
@@ -6645,7 +2753,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl.c:94
+#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -6653,7 +2761,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl.c:97 ../libgaim/plugins/ssl/ssl.c:99
+#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/plugins/ssl/ssl.c:99
 msgid "Provides a wrapper around SSL support libraries."
 msgstr "Provizas ŝelon ĉirkaŭ SSL subtenantaj bibliotekoj."
 
@@ -6663,7 +2771,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:257
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -6671,8 +2779,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:260
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:262
 msgid "Provides SSL support through GNUTLS."
 msgstr "Provizas SSL-an subtenon per GNUTLS."
 
@@ -6682,7 +2790,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:409
 msgid "NSS"
 msgstr "NSS"
 
@@ -6690,48 +2798,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-nss.c:412 ../libgaim/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:412
+#: ../libpurple/plugins/ssl/ssl-nss.c:414
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Provizas SSL-an subtenon per Mozilla NSS."
 
-#: ../libgaim/plugins/statenotify.c:50
+#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ne plus estas fora."
 
-#: ../libgaim/plugins/statenotify.c:52
+#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s foriĝis."
 
-#: ../libgaim/plugins/statenotify.c:62
+#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s senfariĝis."
 
-#: ../libgaim/plugins/statenotify.c:64
+#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ne plu senfaras."
 
-#: ../libgaim/plugins/statenotify.c:73
+#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s ensalutis."
 
-#: ../libgaim/plugins/statenotify.c:91
+#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Avizu Kiam"
 
-#: ../libgaim/plugins/statenotify.c:94
+#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Kunul _Foriras"
 
-#: ../libgaim/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Kunul _Senfariĝas"
 
-#: ../libgaim/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "Kunul En/El-_Salutas"
 
@@ -6741,7 +2850,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:142
 msgid "Buddy State Notification"
 msgstr "Kunul Stato Avizo"
 
@@ -6749,7 +2858,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/statenotify.c:145 ../libgaim/plugins/statenotify.c:148
+#: ../libpurple/plugins/statenotify.c:145
+#: ../libpurple/plugins/statenotify.c:148
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -6757,28 +2867,48 @@
 "Avizu en konversacio fenestro kiam kunul foriras aŭ revenas de fora aŭ "
 "senfara."
 
-#: ../libgaim/plugins/tcl/tcl.c:413
+#: ../libpurple/plugins/tcl/tcl.c:415
 msgid "Tcl Plugin Loader"
 msgstr "Tcl Kromaĵo Ŝarĝilo"
 
-#: ../libgaim/plugins/tcl/tcl.c:415 ../libgaim/plugins/tcl/tcl.c:416
+#: ../libpurple/plugins/tcl/tcl.c:417 ../libpurple/plugins/tcl/tcl.c:418
 msgid "Provides support for loading Tcl plugins"
 msgstr "Provizas subteno por ŝarĝi Tcl-an kromaĵojn"
 
-#: ../libgaim/plugins/tcl/tcl.c:481
+#: ../libpurple/plugins/tcl/tcl.c:483
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
 msgstr ""
 
 #. Send a message about the connection error
-#: ../libgaim/protocols/bonjour/bonjour.c:111
+#: ../libpurple/protocols/bonjour/bonjour.c:113
 msgid "Unable to listen for incoming IM connections\n"
 msgstr ""
 
-#: ../libgaim/protocols/bonjour/bonjour.c:146
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
-msgstr ""
+#: ../libpurple/protocols/bonjour/bonjour.c:148
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
+msgstr ""
+
+#. get_yahoo_status_from_purple_status() returns YAHOO_STATUS_CUSTOM for
+#. * the generic away state (YAHOO_STATUS_TYPE_AWAY) with no message
+#. Away stuff
+#: ../libpurple/protocols/bonjour/bonjour.c:302
+#: ../libpurple/protocols/gg/gg.c:999 ../libpurple/protocols/irc/irc.c:514
+#: ../libpurple/protocols/irc/msgs.c:299
+#: ../libpurple/protocols/jabber/buddy.c:1414
+#: ../libpurple/protocols/novell/novell.c:2820
+#: ../libpurple/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:4520
+#: ../libpurple/protocols/oscar/oscar.c:5570
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
+#: ../libpurple/protocols/yahoo/yahoo.c:3373
+#: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkprefs.c:1821
+#: ../pidgin/gtkstatusbox.c:1090
+msgid "Away"
+msgstr "Fora"
 
 #. *< type
 #. *< ui_requirement
@@ -6790,384 +2920,414 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/bonjour/bonjour.c:436
-#: ../libgaim/protocols/bonjour/bonjour.c:438
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:474
-#: ../libgaim/protocols/bonjour/bonjour.c:482
-#: ../libgaim/protocols/bonjour/bonjour.c:540
-#: ../libgaim/protocols/silc/silc.c:300
-msgid "Gaim User"
-msgstr "Gaim Uzanto"
+#: ../libpurple/protocols/bonjour/bonjour.c:463
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:528
+msgid "Purple Person"
+msgstr "Purpura Persono"
 
 #. Creating the user splits
-#: ../libgaim/protocols/bonjour/bonjour.c:578
-#: ../libgaim/protocols/silc/silc.c:931
+#: ../libpurple/protocols/bonjour/bonjour.c:567
+#: ../libpurple/protocols/silc/silc.c:925
 msgid "Hostname"
 msgstr "Komputilnomo"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:582 ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/bonjour/bonjour.c:571
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:822
 msgid "First name"
 msgstr "Antaŭ nomo"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:585 ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/bonjour/bonjour.c:574
+#: ../libpurple/protocols/gg/gg.c:617
+#: ../libpurple/protocols/jabber/jabber.c:827
 msgid "Last name"
 msgstr "Familia nomo"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:588 ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:797
-#: ../libgaim/protocols/silc/silc.c:695 ../libgaim/protocols/silc/silc.c:935
+#: ../libpurple/protocols/bonjour/bonjour.c:577
+#: ../libpurple/protocols/gg/gg.c:468
+#: ../libpurple/protocols/jabber/jabber.c:812
+#: ../libpurple/protocols/silc/silc.c:689
+#: ../libpurple/protocols/silc/silc.c:929
 msgid "E-mail"
 msgstr "Retadreso"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:591
+#: ../libpurple/protocols/bonjour/bonjour.c:580
 msgid "AIM Account"
 msgstr "AIM Konto"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:594
+#: ../libpurple/protocols/bonjour/bonjour.c:583
 msgid "Jabber Account"
 msgstr "Jabber Konto"
 
-#: ../libgaim/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:35
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libgaim/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:374
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s fermis la konversacion."
 
-#: ../libgaim/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:461
 msgid "Cannot open socket"
 msgstr ""
 
-#: ../libgaim/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:469
 msgid "Error setting socket options"
 msgstr ""
 
-#: ../libgaim/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:493
 msgid "Could not bind socket to port"
 msgstr ""
 
-#: ../libgaim/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:501
 msgid "Could not listen on socket"
 msgstr ""
 
-#: ../libgaim/protocols/bonjour/jabber.c:594
+#: ../libpurple/protocols/bonjour/jabber.c:599
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:76 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1800
 msgid "Invalid proxy settings"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:77 ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1800
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:115 ../libgaim/protocols/gg/gg.c:137
-#: ../libgaim/protocols/gg/gg.c:180
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:116 ../libgaim/protocols/gg/gg.c:138
-#: ../libgaim/protocols/gg/gg.c:181
+#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
+#: ../libpurple/protocols/gg/gg.c:181
 msgid "Unable to fetch the token.\n"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:269 ../libgaim/protocols/gg/gg.c:288
+#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Konservu Kunulliston..."
 
-#: ../libgaim/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Vian kunullisto estas malplena, nenio estis skribita en la dosieron."
 
-#: ../libgaim/protocols/gg/gg.c:276 ../libgaim/protocols/gg/gg.c:278
+#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Kunullisto konservita sukcese!"
 
-#: ../libgaim/protocols/gg/gg.c:307 ../libgaim/protocols/gg/gg.c:308
+#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Ŝargu Kunulliston..."
 
-#: ../libgaim/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Kunullisto ŝargita sukcese!"
 
-#: ../libgaim/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Konservu kunulliston..."
 
-#: ../libgaim/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:380
 msgid "Fill in the registration fields."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:385
 msgid "Passwords do not match."
 msgstr "Pasvortoj ne kongruas."
 
-#: ../libgaim/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:394
 msgid "Unable to register new account. Error occurred.\n"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:407
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nova Gadu-Gadu-a Konto Registrita"
 
-#: ../libgaim/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:408
 msgid "Registration completed successfully!"
 msgstr "Registro pleniĝis sukcese!"
 
-#: ../libgaim/protocols/gg/gg.c:473 ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:786
-#: ../libgaim/protocols/jabber/jabber.c:1352
+#: ../libpurple/protocols/gg/gg.c:473 ../libpurple/protocols/gg/gg.c:764
+#: ../libpurple/protocols/jabber/jabber.c:801
+#: ../libpurple/protocols/jabber/jabber.c:1358
 msgid "Password"
 msgstr "Pasvorto"
 
-#: ../libgaim/protocols/gg/gg.c:478 ../libgaim/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:478 ../libpurple/protocols/gg/gg.c:769
 msgid "Password (retype)"
 msgstr "Pasvorto (retajpu)"
 
-#: ../libgaim/protocols/gg/gg.c:483 ../libgaim/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:774
 msgid "Enter current token"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:489 ../libgaim/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:489 ../libpurple/protocols/gg/gg.c:780
 msgid "Current token"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:493 ../libgaim/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:494
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registru Novan Gadu-Gadu-an Konton"
 
-#: ../libgaim/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:495
 msgid "Please, fill in the following fields"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:632 ../libgaim/protocols/gg/gg.c:1039
-#: ../libgaim/protocols/gg/gg.c:1113 ../libgaim/protocols/jabber/jabber.c:822
-#: ../libgaim/protocols/oscar/oscar.c:3764
-#: ../libgaim/protocols/oscar/oscar.c:3777
-#: ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libpurple/protocols/gg/gg.c:632 ../libpurple/protocols/gg/gg.c:1039
+#: ../libpurple/protocols/gg/gg.c:1113
+#: ../libpurple/protocols/jabber/jabber.c:837
+#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Urbo"
 
-#: ../libgaim/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:637
 msgid "Year of birth"
 msgstr "Naskiĝjaro"
 
-#: ../libgaim/protocols/gg/gg.c:640 ../libgaim/protocols/msn/msn.c:1540
-#: ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:46 ../libgaim/protocols/qq/qq.c:224
-#: ../libgaim/protocols/qq/qq.c:227 ../libgaim/protocols/qq/qq.c:230
-#: ../libgaim/protocols/qq/qq.c:234
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1067
+#: ../libpurple/protocols/gg/gg.c:640 ../libpurple/protocols/msn/msn.c:1518
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/qq/buddy_info.c:46
+#: ../libpurple/protocols/qq/qq.c:224 ../libpurple/protocols/qq/qq.c:227
+#: ../libpurple/protocols/qq/qq.c:230 ../libpurple/protocols/qq/qq.c:234
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1067
 msgid "Gender"
 msgstr "Sekso"
 
-#: ../libgaim/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:641
 msgid "Male or female"
 msgstr "Malina aŭ ina"
 
-#: ../libgaim/protocols/gg/gg.c:642 ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:83 ../libgaim/protocols/qq/qq.c:224
+#: ../libpurple/protocols/gg/gg.c:642
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Malina"
 
-#: ../libgaim/protocols/gg/gg.c:643 ../libgaim/protocols/oscar/oscar.c:3726
-#: ../libgaim/protocols/qq/buddy_info.c:84 ../libgaim/protocols/qq/qq.c:227
+#: ../libpurple/protocols/gg/gg.c:643
+#: ../libpurple/protocols/oscar/oscar.c:3734
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Ina"
 
-#: ../libgaim/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:647
 msgid "Only online"
 msgstr "Nur konektita"
 
-#: ../libgaim/protocols/gg/gg.c:651 ../libgaim/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/gg/gg.c:652
 msgid "Find buddies"
 msgstr "Trovu kunulojn"
 
-#: ../libgaim/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:653
 msgid "Please, enter your search criteria below"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:690
 msgid "Fill in the fields."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Your current password is different from the one that you specified."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:716
 msgid "Unable to change password. Error occurred.\n"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:725
 msgid "Change password for the Gadu-Gadu account"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:726
 msgid "Password was changed successfully!"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:759
 msgid "Current password"
 msgstr "Aktuala pasvorto"
 
-#: ../libgaim/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:784
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:788 ../libgaim/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:788 ../libpurple/protocols/gg/gg.c:789
 msgid "Change Gadu-Gadu Password"
 msgstr "Ŝanĝu Gadu-Gadu Pasvorton"
 
-#: ../libgaim/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:863
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Elektu babilejon por kunul: %s"
 
-#: ../libgaim/protocols/gg/gg.c:866 ../libgaim/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:866 ../libpurple/protocols/gg/gg.c:867
 msgid "Add to chat..."
 msgstr "Aldonu al babilejo..."
 
-#: ../libgaim/protocols/gg/gg.c:1028 ../libgaim/protocols/gg/gg.c:1104
-#: ../libgaim/protocols/oscar/oscar.c:2654
-#: ../libgaim/protocols/oscar/oscar.c:3693
+#: ../libpurple/protocols/gg/gg.c:993
+#: ../libpurple/protocols/jabber/buddy.c:1408
+#: ../libpurple/protocols/novell/novell.c:2829
+#: ../libpurple/protocols/oscar/oscar.c:809
+#: ../libpurple/protocols/oscar/oscar.c:5542
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
+#: ../pidgin/gtkdocklet.c:458 ../pidgin/gtkstatusbox.c:1092
+msgid "Offline"
+msgstr "Senkonekta"
+
+#: ../libpurple/protocols/gg/gg.c:996
+#: ../libpurple/protocols/jabber/buddy.c:1410
+#: ../libpurple/protocols/msn/state.c:29 ../libpurple/protocols/msn/state.c:30
+#: ../libpurple/protocols/msn/state.c:37 ../libpurple/protocols/msn/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2817
+#: ../libpurple/protocols/yahoo/yahoo.c:2900 ../libpurple/status.c:155
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1089
+msgid "Available"
+msgstr "Disponebla"
+
+#: ../libpurple/protocols/gg/gg.c:1028 ../libpurple/protocols/gg/gg.c:1104
+#: ../libpurple/protocols/oscar/oscar.c:2663
+#: ../libpurple/protocols/oscar/oscar.c:3701
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libgaim/protocols/gg/gg.c:1031 ../libgaim/protocols/gg/gg.c:1107
-#: ../libgaim/protocols/jabber/buddy.c:1558
-#: ../libgaim/protocols/jabber/buddy.c:1734
-#: ../libgaim/protocols/oscar/oscar.c:3704
-#: ../libgaim/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1031 ../libpurple/protocols/gg/gg.c:1107
+#: ../libpurple/protocols/jabber/buddy.c:1565
+#: ../libpurple/protocols/jabber/buddy.c:1741
+#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/silc/ops.c:1024
 msgid "First Name"
 msgstr "Persona Nomo"
 
-#: ../libgaim/protocols/gg/gg.c:1044 ../libgaim/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1116
 msgid "Birth Year"
 msgstr "Naskiĝjaro"
 
-#: ../libgaim/protocols/gg/gg.c:1098 ../libgaim/protocols/gg/gg.c:1167
-#: ../libgaim/protocols/oscar/oscar.c:3886
+#: ../libpurple/protocols/gg/gg.c:1098 ../libpurple/protocols/gg/gg.c:1167
+#: ../libpurple/protocols/oscar/oscar.c:3913
 msgid "Unable to display the search results."
 msgstr "Ne eblas vidigi la serĉo-rezultojn."
 
-#: ../libgaim/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1158
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Publika Katalogo"
 
-#: ../libgaim/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1159
 msgid "Search results"
 msgstr "Serĉo rezultoj"
 
-#: ../libgaim/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1202
 msgid "No matching users found"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1203
 msgid "There are no users matching your search criteria."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1297 ../libgaim/protocols/gg/gg.c:1450
+#: ../libpurple/protocols/gg/gg.c:1297 ../libpurple/protocols/gg/gg.c:1450
 msgid "Unable to read socket"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1382
 msgid "Buddy list downloaded"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1383
 msgid "Your buddy list was downloaded from the server."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list uploaded"
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was stored on the server."
 msgstr ""
 
-#: ../libgaim/protocols/gg/gg.c:1496 ../libgaim/protocols/gg/gg.c:1727
+#: ../libpurple/protocols/gg/gg.c:1496 ../libpurple/protocols/gg/gg.c:1702
 msgid "Connection failed."
 msgstr "Konekto malsukcesis."
 
-#: ../libgaim/protocols/gg/gg.c:1633 ../libgaim/protocols/msn/msn.c:563
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/msn/msn.c:528
 msgid "Blocked"
 msgstr "Blokita"
 
-#: ../libgaim/protocols/gg/gg.c:1656
+#: ../libpurple/protocols/gg/gg.c:1631
 msgid "Add to chat"
 msgstr "Aldonu al babilejo"
 
-#: ../libgaim/protocols/gg/gg.c:1665
+#: ../libpurple/protocols/gg/gg.c:1640
 msgid "Unblock"
 msgstr "Malbloku"
 
-#: ../libgaim/protocols/gg/gg.c:1669
+#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Block"
 msgstr "Bloku"
 
-#: ../libgaim/protocols/gg/gg.c:1686
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Chat _name:"
 msgstr "Babilejo _nomo:"
 
-#: ../libgaim/protocols/gg/gg.c:1926
+#: ../libpurple/protocols/gg/gg.c:1901
 msgid "Chat error"
 msgstr "Babileraro"
 
-#: ../libgaim/protocols/gg/gg.c:1927
+#: ../libpurple/protocols/gg/gg.c:1902
 msgid "This chat name is already in use"
 msgstr "Tiu babil nomo jam estas uzata"
 
-#: ../libgaim/protocols/gg/gg.c:2010
+#: ../libpurple/protocols/gg/gg.c:1985
 msgid "Not connected to the server."
 msgstr "Ne konektita al servilo."
 
-#: ../libgaim/protocols/gg/gg.c:2033
+#: ../libpurple/protocols/gg/gg.c:2008
 msgid "Find buddies..."
 msgstr "Trovu kunulojn..."
 
-#: ../libgaim/protocols/gg/gg.c:2039
+#: ../libpurple/protocols/gg/gg.c:2014
 msgid "Change password..."
 msgstr "Ŝanĝu pasvorton..."
 
-#: ../libgaim/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2020
 msgid "Upload buddylist to Server"
 msgstr "Alŝutu kunulliston al Servilo"
 
-#: ../libgaim/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2024
 msgid "Download buddylist from Server"
 msgstr "Elŝutu kunulliston el Servilo"
 
-#: ../libgaim/protocols/gg/gg.c:2053
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Delete buddylist from Server"
 msgstr "Forigu kunulliston de Servilo"
 
-#: ../libgaim/protocols/gg/gg.c:2057
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Save buddylist to file..."
 msgstr "Konservu kunulliston en dosiero..."
 
-#: ../libgaim/protocols/gg/gg.c:2061
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Load buddylist from file..."
 msgstr "Ŝarĝu kunulliston el dosiero..."
 
@@ -7182,122 +3342,147 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2159
+#: ../libpurple/protocols/gg/gg.c:2134
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu Protokol-Kromaĵo"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2160
+#: ../libpurple/protocols/gg/gg.c:2135
 msgid "Polish popular IM"
 msgstr "Pola fama TM"
 
-#: ../libgaim/protocols/gg/gg.c:2208
+#: ../libpurple/protocols/gg/gg.c:2183
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu Uzanto"
 
-#: ../libgaim/protocols/irc/cmds.c:43 ../libgaim/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1575
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Nekonata komando: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:505 ../libgaim/protocols/jabber/chat.c:593
-#: ../libgaim/protocols/silc/silc.c:1289
+#: ../libpurple/protocols/irc/cmds.c:503
+#: ../libpurple/protocols/jabber/chat.c:593
+#: ../libpurple/protocols/silc/silc.c:1283
 #, c-format
 msgid "current topic is: %s"
 msgstr "aktuala temo estas: %s"
 
-#: ../libgaim/protocols/irc/cmds.c:509 ../libgaim/protocols/jabber/chat.c:597
-#: ../libgaim/protocols/silc/silc.c:1293
+#: ../libpurple/protocols/irc/cmds.c:507
+#: ../libpurple/protocols/jabber/chat.c:597
+#: ../libpurple/protocols/silc/silc.c:1287
 msgid "No topic is set"
 msgstr "Neniu temo estas"
 
-#: ../libgaim/protocols/irc/dcc_send.c:296
-#: ../libgaim/protocols/irc/dcc_send.c:337
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:268
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:277
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:290
+#: ../libpurple/protocols/irc/dcc_send.c:296
+#: ../libpurple/protocols/irc/dcc_send.c:337
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:268
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:277
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:290
 msgid "File Transfer Failed"
 msgstr "Dosiero Transmeto Malsukcesis"
 
-#: ../libgaim/protocols/irc/dcc_send.c:297
-#: ../libgaim/protocols/irc/dcc_send.c:338
-msgid "Gaim could not open a listening port."
-msgstr ""
-
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/dcc_send.c:297
+#: ../libpurple/protocols/irc/dcc_send.c:338
+msgid "Could not open a listening port."
+msgstr ""
+
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Eraro montrante MOTD-n"
 
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Neniu MOTD disponebla"
 
-#: ../libgaim/protocols/irc/irc.c:81
+#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Estas neniu MOTD kuniĝita kun tiu konekto."
 
-#: ../libgaim/protocols/irc/irc.c:84
+#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD por %s"
 
-#: ../libgaim/protocols/irc/irc.c:128 ../libgaim/protocols/irc/irc.c:166
-#: ../libgaim/protocols/irc/irc.c:608 ../libgaim/protocols/irc/irc.c:633
+#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
+#: ../libpurple/protocols/irc/irc.c:598 ../libpurple/protocols/irc/irc.c:623
 msgid "Server has disconnected"
 msgstr "Servilo diskonektis"
 
-#: ../libgaim/protocols/irc/irc.c:259
+#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "Rigardu MOTD-n"
 
-#: ../libgaim/protocols/irc/irc.c:271 ../libgaim/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanalo:"
 
-#: ../libgaim/protocols/irc/irc.c:277 ../libgaim/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/jabber/chat.c:59
 msgid "_Password:"
 msgstr "_Pasvorto:"
 
-#: ../libgaim/protocols/irc/irc.c:308
+#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC karesnomoj ne enhaveblas blankan spacon"
 
-#: ../libgaim/protocols/irc/irc.c:337 ../libgaim/protocols/jabber/jabber.c:582
-#: ../libgaim/protocols/jabber/jabber.c:927
+#. connect to the server
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1038
+#: ../libpurple/protocols/msn/session.c:344
+#: ../libpurple/protocols/novell/novell.c:2183
+#: ../libpurple/protocols/oscar/oscar.c:1269
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3721
+#: ../libpurple/protocols/simple/simple.c:1669
+#: ../libpurple/protocols/yahoo/yahoo.c:2743
+#: ../libpurple/protocols/zephyr/zephyr.c:1620 ../pidgin/gtkstatusbox.c:609
+msgid "Connecting"
+msgstr "Konektante"
+
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:597
+#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "SSL support unavailable"
 msgstr "SSL subteno ne disponeblas"
 
-#: ../libgaim/protocols/irc/irc.c:348 ../libgaim/protocols/simple/simple.c:464
-#: ../libgaim/protocols/simple/simple.c:1584
+#: ../libpurple/protocols/irc/irc.c:338
+#: ../libpurple/protocols/simple/simple.c:464
+#: ../libpurple/protocols/simple/simple.c:1584
 msgid "Couldn't create socket"
 msgstr ""
 
-#: ../libgaim/protocols/irc/irc.c:412 ../libgaim/protocols/jabber/jabber.c:460
-#: ../libgaim/protocols/oscar/oscar.c:1263
+#: ../libpurple/protocols/irc/irc.c:402
+#: ../libpurple/protocols/jabber/jabber.c:466
+#: ../libpurple/protocols/oscar/oscar.c:1265
 msgid "Couldn't connect to host"
 msgstr "Ne povis konekti al servilo"
 
-#: ../libgaim/protocols/irc/irc.c:434 ../libgaim/protocols/jabber/jabber.c:484
+#: ../libpurple/protocols/irc/irc.c:424
+#: ../libpurple/protocols/jabber/jabber.c:495
 msgid "Connection Failed"
 msgstr "Konekto Malsukcesis"
 
-#: ../libgaim/protocols/irc/irc.c:437 ../libgaim/protocols/jabber/jabber.c:487
+#: ../libpurple/protocols/irc/irc.c:427
+#: ../libpurple/protocols/jabber/jabber.c:498
 msgid "SSL Handshake Failed"
 msgstr "SSL kvitanca reĝimo malsukcesis"
 
-#: ../libgaim/protocols/irc/irc.c:605 ../libgaim/protocols/irc/irc.c:630
+#: ../libpurple/protocols/irc/irc.c:595 ../libpurple/protocols/irc/irc.c:620
 msgid "Read error"
 msgstr "Legeraro"
 
-#: ../libgaim/protocols/irc/irc.c:769 ../libgaim/protocols/silc/chat.c:1421
-#: ../libgaim/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:759
+#: ../libpurple/protocols/silc/chat.c:1421
+#: ../libpurple/protocols/yahoo/yahoochat.c:1438
 msgid "Users"
 msgstr "Uzantoj"
 
-#: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3396
-#: ../libgaim/protocols/silc/chat.c:1424 ../libgaim/protocols/silc/ops.c:1382
-#: ../libgaim/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/irc/irc.c:762
+#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/silc/chat.c:1424
+#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1447
 msgid "Topic"
 msgstr "Temo"
 
@@ -7309,204 +3494,212 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libpurple/protocols/irc/irc.c:893
 msgid "IRC Protocol Plugin"
 msgstr "IRC Protokol-Kromaĵo"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:904
+#: ../libpurple/protocols/irc/irc.c:894
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "La IRC Protokolo Kromaĵo kiu Malpli Fekas"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:923 ../libgaim/protocols/irc/msgs.c:239
-#: ../libgaim/protocols/jabber/jabber.c:1984
-#: ../libgaim/protocols/msn/msn.c:2056 ../libgaim/protocols/oscar/libaim.c:133
-#: ../libgaim/protocols/oscar/libicq.c:133 ../libgaim/protocols/qq/qq.c:758
-#: ../libgaim/protocols/sametime/sametime.c:5727
-#: ../libgaim/protocols/silc/ops.c:1244 ../libgaim/protocols/silc/ops.c:1347
-#: ../libgaim/protocols/simple/simple.c:1836
-#: ../libgaim/protocols/toc/toc.c:2347
+#: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
+#: ../libpurple/protocols/jabber/jabber.c:1994
+#: ../libpurple/protocols/msn/msn.c:2099
+#: ../libpurple/protocols/oscar/oscar.c:6621
+#: ../libpurple/protocols/qq/qq.c:746
+#: ../libpurple/protocols/sametime/sametime.c:5706
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1836
+#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Servilo"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:926 ../libgaim/protocols/msn/msn.c:2061
-#: ../libgaim/protocols/oscar/libaim.c:136
-#: ../libgaim/protocols/oscar/libicq.c:136 ../libgaim/protocols/qq/qq.c:761
-#: ../libgaim/protocols/sametime/sametime.c:5732
-#: ../libgaim/protocols/silc/silc.c:1856 ../libgaim/protocols/toc/toc.c:2351
+#: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
+#: ../libpurple/protocols/oscar/oscar.c:6624
+#: ../libpurple/protocols/qq/qq.c:749
+#: ../libpurple/protocols/sametime/sametime.c:5711
+#: ../libpurple/protocols/silc/silc.c:1850
+#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Pordo"
 
-#: ../libgaim/protocols/irc/irc.c:929
+#: ../libpurple/protocols/irc/irc.c:919
 msgid "Encodings"
 msgstr "Kodoprezentoj"
 
-#: ../libgaim/protocols/irc/irc.c:932 ../libgaim/protocols/irc/msgs.c:232
-#: ../libgaim/protocols/jabber/jabber.c:782
-#: ../libgaim/protocols/silc/buddy.c:1532 ../libgaim/protocols/silc/ops.c:1191
-#: ../libgaim/protocols/silc/ops.c:1194 ../libgaim/protocols/silc/ops.c:1340
-#: ../libgaim/protocols/silc/ops.c:1343 ../libgaim/protocols/silc/silc.c:929
+#: ../libpurple/protocols/irc/irc.c:922 ../libpurple/protocols/irc/msgs.c:305
+#: ../libpurple/protocols/jabber/jabber.c:797
+#: ../libpurple/protocols/silc/buddy.c:1532
+#: ../libpurple/protocols/silc/ops.c:1191
+#: ../libpurple/protocols/silc/ops.c:1194
+#: ../libpurple/protocols/silc/ops.c:1340
+#: ../libpurple/protocols/silc/ops.c:1343
+#: ../libpurple/protocols/silc/silc.c:923
 msgid "Username"
 msgstr "Uzantonomo"
 
-#: ../libgaim/protocols/irc/irc.c:935 ../libgaim/protocols/irc/msgs.c:233
-#: ../libgaim/protocols/silc/silc.c:933
+#: ../libpurple/protocols/irc/irc.c:925 ../libpurple/protocols/irc/msgs.c:306
+#: ../libpurple/protocols/silc/silc.c:927
 msgid "Real name"
 msgstr "Vera nomo"
 
 #.
-#. option = gaim_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
+#. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libgaim/protocols/irc/irc.c:943
+#: ../libpurple/protocols/irc/irc.c:933
 msgid "Use SSL"
 msgstr "Uzu SSL-n"
 
-#: ../libgaim/protocols/irc/msgs.c:107
+#: ../libpurple/protocols/irc/msgs.c:180
 msgid "Bad mode"
 msgstr "Malbona moduso"
 
-#: ../libgaim/protocols/irc/msgs.c:118
+#: ../libpurple/protocols/irc/msgs.c:191
 #, c-format
 msgid "You are banned from %s."
 msgstr "Vi estas malpermesita de %s."
 
-#: ../libgaim/protocols/irc/msgs.c:119
+#: ../libpurple/protocols/irc/msgs.c:192
 msgid "Banned"
 msgstr "Malpermesita"
 
-#: ../libgaim/protocols/irc/msgs.c:136
+#: ../libpurple/protocols/irc/msgs.c:209
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Ne povas malpermesi %s: malpermesolisto estas plena"
 
-#: ../libgaim/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:290
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:291
 msgid " <i>(identified)</i>"
 msgstr " <i>(identiĝita)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:219 ../libgaim/protocols/oscar/oscar.c:3694
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:292
+#: ../libpurple/protocols/oscar/oscar.c:3702
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Nick"
 msgstr "Karesnomo"
 
-#: ../libgaim/protocols/irc/msgs.c:245 ../libgaim/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:318
+#: ../libpurple/protocols/silc/ops.c:1272
 msgid "Currently on"
 msgstr "Aktuale ĉe"
 
-#: ../libgaim/protocols/irc/msgs.c:250
+#: ../libpurple/protocols/irc/msgs.c:323
 msgid "Idle for"
 msgstr "Senfara dum"
 
-#: ../libgaim/protocols/irc/msgs.c:253
+#: ../libpurple/protocols/irc/msgs.c:326
 msgid "Online since"
 msgstr "Enrete ek de"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:330
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Difinante adjektivon:</b>"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:330
 msgid "Glorious"
 msgstr "Glora"
 
-#: ../libgaim/protocols/irc/msgs.c:333
+#: ../libpurple/protocols/irc/msgs.c:406
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s ŝanĝis la temon al: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:335
+#: ../libpurple/protocols/irc/msgs.c:408
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s forviŝis la temon."
 
-#: ../libgaim/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:416
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "La temo por %s estas: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:361
+#: ../libpurple/protocols/irc/msgs.c:434
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Nekonata mesaĝo '%s'"
 
-#: ../libgaim/protocols/irc/msgs.c:362
+#: ../libpurple/protocols/irc/msgs.c:435
 msgid "Unknown message"
 msgstr "Nekonata mesaĝo"
 
-#: ../libgaim/protocols/irc/msgs.c:362
-msgid "Gaim has sent a message the IRC server did not understand."
-msgstr "Gaim sendis mesaĝon la IRC servilo ne komprenis."
-
-#: ../libgaim/protocols/irc/msgs.c:385
+#: ../libpurple/protocols/irc/msgs.c:435
+msgid "The IRC server received a message it did not understand."
+msgstr "La IRC servilo ricevis mesaĝon li ne komprenis."
+
+#: ../libpurple/protocols/irc/msgs.c:456
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Uzantoj ĉe %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:515
+#: ../libpurple/protocols/irc/msgs.c:553
 msgid "Time Response"
 msgstr "Tempo Respondo"
 
-#: ../libgaim/protocols/irc/msgs.c:516
+#: ../libpurple/protocols/irc/msgs.c:554
 msgid "The IRC server's local time is:"
 msgstr "La IRC servilo loka tempo estas:"
 
-#: ../libgaim/protocols/irc/msgs.c:527
+#: ../libpurple/protocols/irc/msgs.c:565
 msgid "No such channel"
 msgstr "Neniu tia kanalo"
 
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:538
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "no such channel"
 msgstr "neniu tia kanalo"
 
-#: ../libgaim/protocols/irc/msgs.c:541
+#: ../libpurple/protocols/irc/msgs.c:579
 msgid "User is not logged in"
 msgstr "Uzanto ne estas ensalutita"
 
-#: ../libgaim/protocols/irc/msgs.c:546
+#: ../libpurple/protocols/irc/msgs.c:584
 msgid "No such nick or channel"
 msgstr "Neniu tia karesnomo aŭ kanalo"
 
-#: ../libgaim/protocols/irc/msgs.c:566
+#: ../libpurple/protocols/irc/msgs.c:604
 msgid "Could not send"
 msgstr "Ne sendeblis"
 
-#: ../libgaim/protocols/irc/msgs.c:622
+#: ../libpurple/protocols/irc/msgs.c:660
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Aliĝi %s postulas inviton."
 
-#: ../libgaim/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:661
 msgid "Invitation only"
 msgstr "Nur per invito"
 
-#: ../libgaim/protocols/irc/msgs.c:732
+#: ../libpurple/protocols/irc/msgs.c:773
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Vi estas forigita de %s: (%s)"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:737 ../libgaim/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:778 ../libpurple/protocols/silc/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Forigita de %s (%s)"
 
-#: ../libgaim/protocols/irc/msgs.c:760
+#: ../libpurple/protocols/irc/msgs.c:801
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "moduso (%s %s) de %s"
 
-#: ../libgaim/protocols/irc/msgs.c:845 ../libgaim/protocols/irc/msgs.c:846
+#: ../libpurple/protocols/irc/msgs.c:886 ../libpurple/protocols/irc/msgs.c:887
 msgid "Invalid nickname"
 msgstr "Malvalida karesnomo"
 
-#: ../libgaim/protocols/irc/msgs.c:847
+#: ../libpurple/protocols/irc/msgs.c:888
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7514,7 +3707,7 @@
 "Via elektita karesnomo estas refuzita de la servilo.  Ĝi verŝajne enhavas "
 "malvalidajn signojn."
 
-#: ../libgaim/protocols/irc/msgs.c:852
+#: ../libpurple/protocols/irc/msgs.c:893
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -7522,51 +3715,52 @@
 "Via elektita kontonomo estas refuzita de la servilo.  Ĝi verŝajne enhavas "
 "malvalidajn signojn."
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:932
 msgid "Cannot change nick"
 msgstr "Ne povas ŝanĝi karesnomon"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:932
 msgid "Could not change nick"
 msgstr "Ne povas ŝanĝi karesnomon"
 
-#: ../libgaim/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:953
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr ""
 
-#: ../libgaim/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:995
 msgid "Error: invalid PONG from server"
 msgstr "Eraro: malvalida PONG el servilo"
 
-#: ../libgaim/protocols/irc/msgs.c:956
+#: ../libpurple/protocols/irc/msgs.c:997
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING respondo -- [Lag]: %lu sekundoj"
 
-#: ../libgaim/protocols/irc/msgs.c:1037
+#: ../libpurple/protocols/irc/msgs.c:1078
 #, c-format
 msgid "Cannot join %s:"
 msgstr "Ne povas aliĝi %s:"
 
-#: ../libgaim/protocols/irc/msgs.c:1038 ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1079
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Ne povas aliĝi kanalon"
 
-#: ../libgaim/protocols/irc/msgs.c:1072
+#: ../libpurple/protocols/irc/msgs.c:1113
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Karesnomo aŭ kanalo estas provizore ne disponebla."
 
-#: ../libgaim/protocols/irc/msgs.c:1084
+#: ../libpurple/protocols/irc/msgs.c:1125
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops el %s"
 
-#: ../libgaim/protocols/irc/parse.c:116
+#: ../libpurple/protocols/irc/parse.c:118
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "ago &lt;ago farenda&gt;:  Faru agon."
 
-#: ../libgaim/protocols/irc/parse.c:117
+#: ../libpurple/protocols/irc/parse.c:119
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -7574,1031 +3768,1068 @@
 "fora [mesaĝo]:  Difinu foran mesaĝon, aŭ uzu neniun mesaĝon por reveni el "
 "forado."
 
-#: ../libgaim/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:120
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Sendu komandon al chanserv"
 
-#: ../libgaim/protocols/irc/parse.c:119
+#: ../libpurple/protocols/irc/parse.c:121
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:120
+#: ../libpurple/protocols/irc/parse.c:122
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:121
+#: ../libpurple/protocols/irc/parse.c:123
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:122
+#: ../libpurple/protocols/irc/parse.c:124
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:123
+#: ../libpurple/protocols/irc/parse.c:125
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:124
+#: ../libpurple/protocols/irc/parse.c:126
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:125
+#: ../libpurple/protocols/irc/parse.c:127
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:128
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;ago farenda&gt;:  Faru agon."
 
-#: ../libgaim/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:129
 msgid "memoserv: Send a command to memoserv"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:128
+#: ../libpurple/protocols/irc/parse.c:130
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:129
+#: ../libpurple/protocols/irc/parse.c:131
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "names [channel]:  List the users currently in a channel."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1788
+#: ../libpurple/protocols/irc/parse.c:133
+#: ../libpurple/protocols/jabber/jabber.c:1798
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:134
 msgid "nickserv: Send a command to nickserv"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:133
+#: ../libpurple/protocols/irc/parse.c:135
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:134
+#: ../libpurple/protocols/irc/parse.c:136
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:137
 msgid "operserv: Send a command to operserv"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:136
+#: ../libpurple/protocols/irc/parse.c:138
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:137
+#: ../libpurple/protocols/irc/parse.c:139
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:138
+#: ../libpurple/protocols/irc/parse.c:140
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:140
+#: ../libpurple/protocols/irc/parse.c:142
 msgid "quote [...]:  Send a raw command to the server."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:141
+#: ../libpurple/protocols/irc/parse.c:143
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:144
 msgid "time: Displays the current local time at the IRC server."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:147
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:146
+#: ../libpurple/protocols/irc/parse.c:148
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:147
+#: ../libpurple/protocols/irc/parse.c:149
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:148
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr ""
 
-#: ../libgaim/protocols/irc/parse.c:442
+#: ../libpurple/protocols/irc/parse.c:444
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Responda tempo el %s: %lu sekundoj"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:445
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:445
 msgid "CTCP PING reply"
 msgstr "CTCP PING respondo"
 
-#: ../libgaim/protocols/irc/parse.c:554 ../libgaim/protocols/irc/parse.c:558
-#: ../libgaim/protocols/toc/toc.c:191 ../libgaim/protocols/toc/toc.c:694
-#: ../libgaim/protocols/toc/toc.c:710 ../libgaim/protocols/toc/toc.c:786
+#: ../libpurple/protocols/irc/parse.c:556
+#: ../libpurple/protocols/irc/parse.c:560 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
+#: ../libpurple/protocols/toc/toc.c:786
 msgid "Disconnected."
 msgstr "Malkonektita."
 
-#: ../libgaim/protocols/jabber/auth.c:49
+#: ../libpurple/protocols/jabber/auth.c:51
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:112
+#: ../libpurple/protocols/jabber/auth.c:114
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:232
+#: ../libpurple/protocols/jabber/auth.c:229
 msgid "Server couldn't authenticate you without a password"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:235
-#: ../libgaim/protocols/jabber/auth.c:236
-#: ../libgaim/protocols/jabber/auth.c:404
-#: ../libgaim/protocols/jabber/auth.c:405
-#: ../libgaim/protocols/jabber/auth.c:486
-#: ../libgaim/protocols/jabber/auth.c:487
+#: ../libpurple/protocols/jabber/auth.c:232
+#: ../libpurple/protocols/jabber/auth.c:233
+#: ../libpurple/protocols/jabber/auth.c:407
+#: ../libpurple/protocols/jabber/auth.c:408
+#: ../libpurple/protocols/jabber/auth.c:489
+#: ../libpurple/protocols/jabber/auth.c:490
 msgid "Plaintext Authentication"
 msgstr "Platteksta Aŭtentokontrolo"
 
-#: ../libgaim/protocols/jabber/auth.c:237
-#: ../libgaim/protocols/jabber/auth.c:406
-#: ../libgaim/protocols/jabber/auth.c:488
+#: ../libpurple/protocols/jabber/auth.c:234
+#: ../libpurple/protocols/jabber/auth.c:409
+#: ../libpurple/protocols/jabber/auth.c:491
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:243
-#: ../libgaim/protocols/jabber/auth.c:414
-#: ../libgaim/protocols/jabber/auth.c:496
+#: ../libpurple/protocols/jabber/auth.c:240
+#: ../libpurple/protocols/jabber/auth.c:417
+#: ../libpurple/protocols/jabber/auth.c:499
 msgid "Server does not use any supported authentication method"
 msgstr ""
 
 #. This should never happen!
-#: ../libgaim/protocols/jabber/auth.c:327
-#: ../libgaim/protocols/jabber/auth.c:449
-#: ../libgaim/protocols/jabber/auth.c:617
-#: ../libgaim/protocols/jabber/auth.c:751
-#: ../libgaim/protocols/jabber/auth.c:776
-#: ../libgaim/protocols/jabber/auth.c:795
-#: ../libgaim/protocols/jabber/jabber.c:113
+#: ../libpurple/protocols/jabber/auth.c:330
+#: ../libpurple/protocols/jabber/auth.c:452
+#: ../libpurple/protocols/jabber/auth.c:620
+#: ../libpurple/protocols/jabber/auth.c:754
+#: ../libpurple/protocols/jabber/auth.c:779
+#: ../libpurple/protocols/jabber/auth.c:798
+#: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Malvalida respondo el servilo."
 
-#: ../libgaim/protocols/jabber/auth.c:638
+#: ../libpurple/protocols/jabber/auth.c:641
 msgid "Invalid challenge from server"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:729
 msgid "SASL error"
 msgstr "SASL eraro"
 
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:783
-#: ../libgaim/protocols/sametime/sametime.c:4148
-#: ../libgaim/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:790
+#: ../libpurple/protocols/sametime/sametime.c:4127
+#: ../libpurple/protocols/silc/ops.c:1020
 msgid "Full Name"
 msgstr "Plena Nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/buddy.c:796
-#: ../libgaim/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:803
+#: ../libpurple/protocols/silc/ops.c:1032
 msgid "Family Name"
 msgstr "Familia Nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:807
 msgid "Given Name"
 msgstr "Donita Nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/jabber.c:842
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:857
 msgid "URL"
 msgstr "URL"
 
-#: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:859
 msgid "Street Address"
 msgstr "Strato Adreso"
 
-#: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:855
 msgid "Extended Address"
 msgstr "Plia Adreso"
 
-#: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:863
 msgid "Locality"
 msgstr "Loko"
 
-#: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:867
 msgid "Region"
 msgstr "Regiono"
 
-#: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:871
 msgid "Postal Code"
 msgstr "Poŝto Kodo"
 
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:869
-#: ../libgaim/protocols/silc/silc.c:939
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:876
+#: ../libpurple/protocols/silc/silc.c:933
 msgid "Country"
 msgstr "Lando"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:880
-#: ../libgaim/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:887
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Telephone"
 msgstr "Telfono"
 
-#: ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:898
-#: ../libgaim/protocols/jabber/buddy.c:906
-#: ../libgaim/protocols/jabber/buddy.c:1564
-#: ../libgaim/protocols/silc/ops.c:1075 ../libgaim/protocols/silc/util.c:553
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:283
+#: ../libpurple/protocols/jabber/buddy.c:905
+#: ../libpurple/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:1571
+#: ../libpurple/protocols/silc/ops.c:1075
+#: ../libpurple/protocols/silc/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
 msgid "E-Mail"
 msgstr "Retadreso"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:921
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:928
 msgid "Organization Name"
 msgstr "Organizacio nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:932
 msgid "Organization Unit"
 msgstr "Organizacio Unito"
 
-#: ../libgaim/protocols/jabber/buddy.c:287
-#: ../libgaim/protocols/jabber/buddy.c:934
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:941
 msgid "Role"
 msgstr "Rolo"
 
-#: ../libgaim/protocols/jabber/buddy.c:288
-#: ../libgaim/protocols/jabber/buddy.c:817 ../libgaim/protocols/msn/msn.c:1609
-#: ../libgaim/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:824
+#: ../libpurple/protocols/msn/msn.c:1587
+#: ../libpurple/protocols/oscar/oscar.c:3751
 msgid "Birthday"
 msgstr "Naskiĝdato"
 
-#: ../libgaim/protocols/jabber/buddy.c:582
-#: ../libgaim/protocols/jabber/buddy.c:583
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:944
+#: ../libpurple/protocols/jabber/chat.c:777 ../pidgin/gtkblist.c:2989
+#: ../pidgin/gtkprefs.c:680
+msgid "Description"
+msgstr "Priskibo"
+
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit Jabber vCard"
 msgstr "Redaktu Jabber-n vCard-n"
 
-#: ../libgaim/protocols/jabber/buddy.c:584
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr "Ĉiuj eroj sube opcias. Enskribi nur informon kiu konfortigas vin."
 
-#: ../libgaim/protocols/jabber/buddy.c:652
-#: ../libgaim/protocols/jabber/buddy.c:691
+#: ../libpurple/protocols/jabber/buddy.c:654
+#: ../libpurple/protocols/jabber/buddy.c:695
 msgid "Client"
 msgstr "Kliento"
 
-#: ../libgaim/protocols/jabber/buddy.c:656
-#: ../libgaim/protocols/jabber/buddy.c:695
+#: ../libpurple/protocols/jabber/buddy.c:658
+#: ../libpurple/protocols/jabber/buddy.c:699
 msgid "Operating System"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:666
-#: ../libgaim/protocols/jabber/jabber.c:1987
+#: ../libpurple/protocols/jabber/buddy.c:668
+#: ../libpurple/protocols/jabber/jabber.c:1997
 msgid "Resource"
 msgstr "Rimedo"
 
-#: ../libgaim/protocols/jabber/buddy.c:668
-#: ../libgaim/protocols/jabber/jabber.c:1226
-#: ../libgaim/protocols/jabber/jabber.c:1236
-#: ../libgaim/protocols/jabber/jabber.c:1246
-#: ../libgaim/protocols/jabber/jabber.c:1256
-#: ../libgaim/protocols/jabber/jabber.c:1266
+#: ../libpurple/protocols/jabber/buddy.c:670
+#: ../libpurple/protocols/jabber/jabber.c:1232
+#: ../libpurple/protocols/jabber/jabber.c:1242
+#: ../libpurple/protocols/jabber/jabber.c:1252
+#: ../libpurple/protocols/jabber/jabber.c:1262
+#: ../libpurple/protocols/jabber/jabber.c:1272
 msgid "Priority"
 msgstr "Prioriteco"
 
-#: ../libgaim/protocols/jabber/buddy.c:804
-#: ../libgaim/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:811
+#: ../libpurple/protocols/silc/ops.c:1028
 msgid "Middle Name"
 msgstr "Meza Nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:837
-#: ../libgaim/protocols/jabber/jabber.c:817
-#: ../libgaim/protocols/oscar/oscar.c:3763
-#: ../libgaim/protocols/oscar/oscar.c:3776
-#: ../libgaim/protocols/qq/buddy_info.c:56
-#: ../libgaim/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/jabber/buddy.c:844
+#: ../libpurple/protocols/jabber/jabber.c:832
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1064
 msgid "Address"
 msgstr "Adreso"
 
-#: ../libgaim/protocols/jabber/buddy.c:844
+#: ../libpurple/protocols/jabber/buddy.c:851
 msgid "P.O. Box"
 msgstr "P.O. Kesto"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:965
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libgaim/protocols/jabber/buddy.c:958
+#: ../libpurple/protocols/jabber/buddy.c:965
 msgid "Logo"
 msgstr "Logotipo"
 
-#: ../libgaim/protocols/jabber/buddy.c:1344
+#: ../libpurple/protocols/jabber/buddy.c:1351
 msgid "Un-hide From"
 msgstr "Malkaŝu De"
 
-#: ../libgaim/protocols/jabber/buddy.c:1348
+#: ../libpurple/protocols/jabber/buddy.c:1355
 msgid "Temporarily Hide From"
 msgstr "Provizore Kaŝu De"
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1356
+#: ../libpurple/protocols/jabber/buddy.c:1363
 msgid "Cancel Presence Notification"
 msgstr "Ĉesigu Prezentavizon"
 
-#: ../libgaim/protocols/jabber/buddy.c:1363
+#: ../libpurple/protocols/jabber/buddy.c:1370
 msgid "(Re-)Request authorization"
 msgstr "(Re-)demandu permeson"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1372
+#: ../libpurple/protocols/jabber/buddy.c:1379
 msgid "Unsubscribe"
 msgstr "Eliĝu"
 
-#: ../libgaim/protocols/jabber/buddy.c:1405
-#: ../libgaim/protocols/jabber/jabber.c:1235
+#: ../libpurple/protocols/jabber/buddy.c:1412
+#: ../libpurple/protocols/jabber/jabber.c:1241
 msgid "Chatty"
 msgstr "Babilema"
 
-#: ../libgaim/protocols/jabber/buddy.c:1409 ../libgaim/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1416 ../libpurple/status.c:159
 msgid "Extended Away"
 msgstr "Longfora"
 
-#: ../libgaim/protocols/jabber/buddy.c:1411
-#: ../libgaim/protocols/jabber/jabber.c:1265
-#: ../libgaim/protocols/oscar/oscar.c:706
-#: ../libgaim/protocols/oscar/oscar.c:5760
-#: ../libgaim/protocols/sametime/sametime.c:3319
+#: ../libpurple/protocols/jabber/buddy.c:1418
+#: ../libpurple/protocols/jabber/jabber.c:1271
+#: ../libpurple/protocols/oscar/oscar.c:708
+#: ../libpurple/protocols/oscar/oscar.c:5756
+#: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "Ne Ĝenu"
 
-#: ../libgaim/protocols/jabber/buddy.c:1556
+#: ../libpurple/protocols/jabber/buddy.c:1563
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1560
-#: ../libgaim/protocols/jabber/buddy.c:1739
-#: ../libgaim/protocols/oscar/oscar.c:3705
+#: ../libpurple/protocols/jabber/buddy.c:1567
+#: ../libpurple/protocols/jabber/buddy.c:1746
+#: ../libpurple/protocols/oscar/oscar.c:3713
 msgid "Last Name"
 msgstr "Familia Nomo"
 
-#: ../libgaim/protocols/jabber/buddy.c:1592
+#: ../libpurple/protocols/jabber/buddy.c:1599
 msgid "The following are the results of your search"
 msgstr "La jenaj estas la rezultoj de via serĉo"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1667
+#: ../libpurple/protocols/jabber/buddy.c:1674
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1687
+#: ../libpurple/protocols/jabber/buddy.c:1694
 msgid "Directory Query Failed"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1688
+#: ../libpurple/protocols/jabber/buddy.c:1695
 msgid "Could not query the directory server."
 msgstr ""
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1722
+#: ../libpurple/protocols/jabber/buddy.c:1729
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Servilo instrukcioj: %s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1729
+#: ../libpurple/protocols/jabber/buddy.c:1736
 msgid "Fill in one or more fields to search for any matching Jabber users."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/buddy.c:1749
-#: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3708
-#: ../libgaim/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3716
+#: ../libpurple/protocols/oscar/oscar.c:3725
 msgid "E-Mail Address"
 msgstr "Retadreso"
 
-#: ../libgaim/protocols/jabber/buddy.c:1758
-#: ../libgaim/protocols/jabber/buddy.c:1759
+#: ../libpurple/protocols/jabber/buddy.c:1765
+#: ../libpurple/protocols/jabber/buddy.c:1766
 msgid "Search for Jabber users"
 msgstr "Serĉu Jabber-ajn uzantojn"
 
-#: ../libgaim/protocols/jabber/buddy.c:1773
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:1767
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:139
+#: ../libpurple/protocols/qq/sys_msg.c:162
+#: ../libpurple/protocols/qq/sys_msg.c:232
+#: ../libpurple/protocols/qq/sys_msg.c:250
+#: ../libpurple/protocols/sametime/sametime.c:5600
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+msgid "Search"
+msgstr "Serĉu"
+
+#: ../libpurple/protocols/jabber/buddy.c:1780
 msgid "Invalid Directory"
 msgstr "Malvalida Adreslibro"
 
-#: ../libgaim/protocols/jabber/buddy.c:1790
+#: ../libpurple/protocols/jabber/buddy.c:1797
 msgid "Enter a User Directory"
 msgstr "Enigu Uzanto Adreslibro"
 
-#: ../libgaim/protocols/jabber/buddy.c:1791
+#: ../libpurple/protocols/jabber/buddy.c:1798
 msgid "Select a user directory to search"
 msgstr "Elektu uzantan adreslibron serĉendan"
 
-#: ../libgaim/protocols/jabber/buddy.c:1794
+#: ../libpurple/protocols/jabber/buddy.c:1801
 msgid "Search Directory"
 msgstr "Serŝu Adreslibron"
 
-#: ../libgaim/protocols/jabber/chat.c:41
-#: ../libgaim/protocols/oscar/oscar.c:5228
-#: ../libgaim/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/jabber/chat.c:41
+#: ../libpurple/protocols/oscar/oscar.c:5252
+#: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Ĉambro:"
 
-#: ../libgaim/protocols/jabber/chat.c:47
+#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Servilo:"
 
-#: ../libgaim/protocols/jabber/chat.c:53
+#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Tenilo:"
 
-#: ../libgaim/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:225
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ne estas valida ĉambro nomo"
 
-#: ../libgaim/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:226
 msgid "Invalid Room Name"
 msgstr "Malvalida Ĉambro Nomo"
 
-#: ../libgaim/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:231
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ne estas valida servilo nomo"
 
-#: ../libgaim/protocols/jabber/chat.c:232
-#: ../libgaim/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:232
+#: ../libpurple/protocols/jabber/chat.c:233
 msgid "Invalid Server Name"
 msgstr "Malvalida Servilo Nomo"
 
-#: ../libgaim/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:237
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ne estas valida ĉambro tenilo"
 
-#: ../libgaim/protocols/jabber/chat.c:238
-#: ../libgaim/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:238
+#: ../libpurple/protocols/jabber/chat.c:239
 msgid "Invalid Room Handle"
 msgstr "Malvalida Ĉambro Tenilo"
 
-#: ../libgaim/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:398
 msgid "Configuration error"
 msgstr "Agorderaro"
 
-#: ../libgaim/protocols/jabber/chat.c:407
-#: ../libgaim/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:407
+#: ../libpurple/protocols/jabber/chat.c:550
 msgid "Unable to configure"
 msgstr "Ne eblas agordi"
 
-#: ../libgaim/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:422
 msgid "Room Configuration Error"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:423
 msgid "This room is not capable of being configured"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:472
-#: ../libgaim/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:472
+#: ../libpurple/protocols/jabber/chat.c:541
 msgid "Registration error"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:629
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/chat.c:680
-#: ../libgaim/protocols/jabber/chat.c:691 ../libgaim/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:680
+#: ../libpurple/protocols/jabber/chat.c:691
+#: ../libpurple/protocols/silc/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Eraro ricevante babilejliston"
 
-#: ../libgaim/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:739
 msgid "Invalid Server"
 msgstr "Malvalida Servilo"
 
-#: ../libgaim/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:783
 msgid "Enter a Conference Server"
 msgstr "Enigu Konferencan Servilon"
 
-#: ../libgaim/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:784
 msgid "Select a conference server to query"
 msgstr "Elektu konferencan servilon petendan"
 
-#: ../libgaim/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:787
 msgid "Find Rooms"
 msgstr "Trovu Babilejojn"
 
-#: ../libgaim/protocols/jabber/jabber.c:82
+#: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:241
-#: ../libgaim/protocols/jabber/jabber.c:294
-#: ../libgaim/protocols/jabber/jabber.c:322
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr "Skriberaro"
 
-#: ../libgaim/protocols/jabber/jabber.c:390
-#: ../libgaim/protocols/jabber/jabber.c:427
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr "Legeraro"
 
-#: ../libgaim/protocols/jabber/jabber.c:504
+#: ../libpurple/protocols/jabber/jabber.c:519
 msgid "Unable to create socket"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:552
-#: ../libgaim/protocols/jabber/jabber.c:895
+#: ../libpurple/protocols/jabber/jabber.c:567
+#: ../libpurple/protocols/jabber/jabber.c:910
 msgid "Invalid Jabber ID"
 msgstr "Malvalida Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:623
+#: ../libpurple/protocols/jabber/jabber.c:638
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrado de %s@%s sukcesa"
 
-#: ../libgaim/protocols/jabber/jabber.c:625
-#: ../libgaim/protocols/jabber/jabber.c:626
+#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:641
 msgid "Registration Successful"
 msgstr "Registrado Sukcesa"
 
-#: ../libgaim/protocols/jabber/jabber.c:632
-#: ../libgaim/protocols/jabber/jabber.c:1501
+#: ../libpurple/protocols/jabber/jabber.c:647
+#: ../libpurple/protocols/jabber/jabber.c:1509
 msgid "Unknown Error"
 msgstr "Nekonata Eraro"
 
-#: ../libgaim/protocols/jabber/jabber.c:634
-#: ../libgaim/protocols/jabber/jabber.c:635
+#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:650
 msgid "Registration Failed"
 msgstr "Registrado Malsukcesis"
 
-#: ../libgaim/protocols/jabber/jabber.c:750
-#: ../libgaim/protocols/jabber/jabber.c:751
+#: ../libpurple/protocols/jabber/jabber.c:765
+#: ../libpurple/protocols/jabber/jabber.c:766
 msgid "Already Registered"
 msgstr "Jam Registrita"
 
-#: ../libgaim/protocols/jabber/jabber.c:827
-#: ../libgaim/protocols/oscar/oscar.c:3765
-#: ../libgaim/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/jabber/jabber.c:842
+#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/oscar/oscar.c:3805
 msgid "State"
 msgstr "Ŝato"
 
-#: ../libgaim/protocols/jabber/jabber.c:832
+#: ../libpurple/protocols/jabber/jabber.c:847
 msgid "Postal code"
 msgstr "Poŝtkodo"
 
-#: ../libgaim/protocols/jabber/jabber.c:837
-#: ../libgaim/protocols/silc/ops.c:1069 ../libgaim/protocols/silc/silc.c:697
-#: ../libgaim/protocols/silc/util.c:555
+#: ../libpurple/protocols/jabber/jabber.c:852
+#: ../libpurple/protocols/silc/ops.c:1069
+#: ../libpurple/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/util.c:553
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../libgaim/protocols/jabber/jabber.c:847
+#: ../libpurple/protocols/jabber/jabber.c:862
 msgid "Date"
 msgstr "Dato"
 
-#: ../libgaim/protocols/jabber/jabber.c:855
+#: ../libpurple/protocols/jabber/jabber.c:870
 msgid "Please fill out the information below to register your new account."
 msgstr "B.v. plenigi la informon sube por registradi vian novan konton."
 
-#: ../libgaim/protocols/jabber/jabber.c:858
-#: ../libgaim/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:873
+#: ../libpurple/protocols/jabber/jabber.c:874
 msgid "Register New Jabber Account"
 msgstr "Registradu Novan Jabber-n Konton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1025
+#. Register button
+#: ../libpurple/protocols/jabber/jabber.c:875 ../pidgin/gtkaccount.c:1478
+msgid "Register"
+msgstr "Registru"
+
+#: ../libpurple/protocols/jabber/jabber.c:1042
 msgid "Initializing Stream"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1030
-#: ../libgaim/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1047
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Authenticating"
 msgstr "Aŭtentokontrolante"
 
-#: ../libgaim/protocols/jabber/jabber.c:1039
+#: ../libpurple/protocols/jabber/jabber.c:1056
 msgid "Re-initializing Stream"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1109
-#: ../libgaim/protocols/jabber/jabber.c:1479
-#: ../libgaim/protocols/jabber/jabber.c:1520
-#: ../libgaim/protocols/jabber/jabber.c:1554
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:5549
+#: ../libpurple/protocols/jabber/jabber.c:1115
+#: ../libpurple/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/oscar/oscar.c:807
+#: ../libpurple/protocols/oscar/oscar.c:5540
 msgid "Not Authorized"
 msgstr "Malpermesita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1157
 msgid "Both"
 msgstr "Ambaŭ"
 
-#: ../libgaim/protocols/jabber/jabber.c:1153
+#: ../libpurple/protocols/jabber/jabber.c:1159
 msgid "From (To pending)"
 msgstr "De (Al atendante)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1158
+#: ../libpurple/protocols/jabber/jabber.c:1164
 msgid "To"
 msgstr "Al"
 
-#: ../libgaim/protocols/jabber/jabber.c:1160
+#: ../libpurple/protocols/jabber/jabber.c:1166
 msgid "None (To pending)"
 msgstr "Nenio (Al atendante)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1165
+#: ../libpurple/protocols/jabber/jabber.c:1168
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "Nenio"
+
+#: ../libpurple/protocols/jabber/jabber.c:1171
 msgid "Subscription"
 msgstr "Abono"
 
-#: ../libgaim/protocols/jabber/jabber.c:1295
+#: ../libpurple/protocols/jabber/jabber.c:1301
 msgid "Password Changed"
 msgstr "Pasvorto Ŝanĝita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Your password has been changed."
 msgstr "Via pasvorto estas ŝanĝita."
 
-#: ../libgaim/protocols/jabber/jabber.c:1300
-#: ../libgaim/protocols/jabber/jabber.c:1301
+#: ../libpurple/protocols/jabber/jabber.c:1306
+#: ../libpurple/protocols/jabber/jabber.c:1307
 msgid "Error changing password"
 msgstr "Erara ŝanĝante pasvorton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1357
+#: ../libpurple/protocols/jabber/jabber.c:1363
 msgid "Password (again)"
 msgstr "Pasvorton (denove)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1362
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1368
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Change Jabber Password"
 msgstr "Ŝanĝu Jabber-n Pasvorton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1363
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Please enter your new password"
 msgstr "B.v. tajpi vian novan pasvorton"
 
-#: ../libgaim/protocols/jabber/jabber.c:1373
-#: ../libgaim/protocols/oscar/oscar.c:6355
-#: ../libgaim/protocols/silc/silc.c:1019
+#: ../libpurple/protocols/jabber/jabber.c:1379
+#: ../libpurple/protocols/oscar/oscar.c:6341
+#: ../libpurple/protocols/silc/silc.c:1013
 msgid "Set User Info..."
 msgstr "Difinu Uzanto-Informon..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1378
-#: ../libgaim/protocols/oscar/oscar.c:6366
-#: ../libgaim/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/oscar/oscar.c:6352
+#: ../libpurple/protocols/silc/silc.c:1009
 msgid "Change Password..."
 msgstr "Ŝanĝu Pasvorton..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/jabber.c:1389
 msgid "Search for Users..."
 msgstr "Serĉu Uzantojn..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1459
+#: ../libpurple/protocols/jabber/jabber.c:1467
 msgid "Bad Request"
 msgstr "Malbona Demando"
 
-#: ../libgaim/protocols/jabber/jabber.c:1461
+#: ../libpurple/protocols/jabber/jabber.c:1469
 msgid "Conflict"
 msgstr "Konflikto"
 
-#: ../libgaim/protocols/jabber/jabber.c:1463
+#: ../libpurple/protocols/jabber/jabber.c:1471
 msgid "Feature Not Implemented"
 msgstr "Eblo Malrealigita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1465
+#: ../libpurple/protocols/jabber/jabber.c:1473
 msgid "Forbidden"
 msgstr "Malpermesita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1467
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Gone"
 msgstr "Foririnta"
 
-#: ../libgaim/protocols/jabber/jabber.c:1469
-#: ../libgaim/protocols/jabber/jabber.c:1544
+#: ../libpurple/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Internal Server Error"
 msgstr "Interna Servilo Eraro"
 
-#: ../libgaim/protocols/jabber/jabber.c:1471
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "Item Not Found"
 msgstr "Ero Ne Trovita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1473
+#: ../libpurple/protocols/jabber/jabber.c:1481
 msgid "Malformed Jabber ID"
 msgstr "Misformita Jabber ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1475
+#: ../libpurple/protocols/jabber/jabber.c:1483
 msgid "Not Acceptable"
 msgstr "Ne Aceptinda"
 
-#: ../libgaim/protocols/jabber/jabber.c:1477
+#: ../libpurple/protocols/jabber/jabber.c:1485
 msgid "Not Allowed"
 msgstr "Ne Permesita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1481
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Payment Required"
 msgstr "Pago Postulita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1483
+#: ../libpurple/protocols/jabber/jabber.c:1491
 msgid "Recipient Unavailable"
 msgstr "Ricevanto maldisponebla"
 
-#: ../libgaim/protocols/jabber/jabber.c:1487
+#: ../libpurple/protocols/jabber/jabber.c:1495
 msgid "Registration Required"
 msgstr "Registrado Postulita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1489
+#: ../libpurple/protocols/jabber/jabber.c:1497
 msgid "Remote Server Not Found"
 msgstr "Dista Servia Ne Trovita"
 
-#: ../libgaim/protocols/jabber/jabber.c:1491
+#: ../libpurple/protocols/jabber/jabber.c:1499
 msgid "Remote Server Timeout"
 msgstr "Dista Servilo Ne Respondis"
 
-#: ../libgaim/protocols/jabber/jabber.c:1493
+#: ../libpurple/protocols/jabber/jabber.c:1501
 msgid "Server Overloaded"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1495
+#: ../libpurple/protocols/jabber/jabber.c:1503
 msgid "Service Unavailable"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1497
+#: ../libpurple/protocols/jabber/jabber.c:1505
 msgid "Subscription Required"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1507
 msgid "Unexpected Request"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Authorization Aborted"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1508
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Incorrect encoding in authorization"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1511
+#: ../libpurple/protocols/jabber/jabber.c:1519
 msgid "Invalid authzid"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1514
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Invalid Authorization Mechanism"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1517
+#: ../libpurple/protocols/jabber/jabber.c:1525
 msgid "Authorization mechanism too weak"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1530
 msgid "Temporary Authentication Failure"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:1533
 msgid "Authentication Failure"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1529
+#: ../libpurple/protocols/jabber/jabber.c:1539
 msgid "Bad Format"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1531
+#: ../libpurple/protocols/jabber/jabber.c:1541
 msgid "Bad Namespace Prefix"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1534
+#: ../libpurple/protocols/jabber/jabber.c:1544
 msgid "Resource Conflict"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1536
-#: ../libgaim/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/silc/ops.c:1729
 msgid "Connection Timeout"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Host Gone"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1550
 msgid "Host Unknown"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1542
+#: ../libpurple/protocols/jabber/jabber.c:1552
 msgid "Improper Addressing"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Invalid ID"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1548
+#: ../libpurple/protocols/jabber/jabber.c:1558
 msgid "Invalid Namespace"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1550
+#: ../libpurple/protocols/jabber/jabber.c:1560
 msgid "Invalid XML"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1552
+#: ../libpurple/protocols/jabber/jabber.c:1562
 msgid "Non-matching Hosts"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1556
+#: ../libpurple/protocols/jabber/jabber.c:1566
 msgid "Policy Violation"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1558
+#: ../libpurple/protocols/jabber/jabber.c:1568
 msgid "Remote Connection Failed"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1570
 msgid "Resource Constraint"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1572
 msgid "Restricted XML"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1564
+#: ../libpurple/protocols/jabber/jabber.c:1574
 msgid "See Other Host"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1566
+#: ../libpurple/protocols/jabber/jabber.c:1576
 msgid "System Shutdown"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1568
+#: ../libpurple/protocols/jabber/jabber.c:1578
 msgid "Undefined Condition"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1580
 msgid "Unsupported Encoding"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Unsupported Stanza Type"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1584
 msgid "Unsupported Version"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1576
+#: ../libpurple/protocols/jabber/jabber.c:1586
 msgid "XML Not Well Formed"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1578
+#: ../libpurple/protocols/jabber/jabber.c:1588
 msgid "Stream Error"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1645
+#: ../libpurple/protocols/jabber/jabber.c:1655
 #, c-format
 msgid "Unable to ban user %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1675
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1670
+#: ../libpurple/protocols/jabber/jabber.c:1680
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1689
+#: ../libpurple/protocols/jabber/jabber.c:1699
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1706
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1749
+#: ../libpurple/protocols/jabber/jabber.c:1759
 #, c-format
 msgid "Unable to kick user %s"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1790
 msgid "config:  Configure a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1784
+#: ../libpurple/protocols/jabber/jabber.c:1794
 msgid "configure:  Configure a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1793
+#: ../libpurple/protocols/jabber/jabber.c:1803
 msgid "part [room]:  Leave the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1798
+#: ../libpurple/protocols/jabber/jabber.c:1808
 msgid "register:  Register with a chat room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1804
+#: ../libpurple/protocols/jabber/jabber.c:1814
 msgid "topic [new topic]:  View or change the topic."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1810
+#: ../libpurple/protocols/jabber/jabber.c:1820
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1816
+#: ../libpurple/protocols/jabber/jabber.c:1826
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1822
+#: ../libpurple/protocols/jabber/jabber.c:1832
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1828
+#: ../libpurple/protocols/jabber/jabber.c:1838
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1834
+#: ../libpurple/protocols/jabber/jabber.c:1844
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1840
+#: ../libpurple/protocols/jabber/jabber.c:1850
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr ""
 
-#: ../libgaim/protocols/jabber/jabber.c:1845
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: ../libpurple/protocols/jabber/jabber.c:1855
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 
 #. *< type
@@ -8611,73 +4842,73 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1962
-#: ../libgaim/protocols/jabber/jabber.c:1964
+#: ../libpurple/protocols/jabber/jabber.c:1972
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Jabber Protocol Plugin"
 msgstr "Jabber Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/jabber/jabber.c:1990
+#: ../libpurple/protocols/jabber/jabber.c:2000
 msgid "Force old (port 5223) SSL"
 msgstr "Devigi malnovan (pordo 5223) SSL-n"
 
-#: ../libgaim/protocols/jabber/jabber.c:1995
+#: ../libpurple/protocols/jabber/jabber.c:2005
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permesi plattekstan permeson tra malĉifritaj datumstrioj"
 
-#: ../libgaim/protocols/jabber/jabber.c:2000
-#: ../libgaim/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/jabber.c:2010
+#: ../libpurple/protocols/simple/simple.c:1842
 msgid "Connect port"
 msgstr "Konekto pordo"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:2004
-#: ../libgaim/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/jabber/jabber.c:2014
+#: ../libpurple/protocols/silc/silc.c:1846
 msgid "Connect server"
 msgstr "Konekto servilo"
 
-#: ../libgaim/protocols/jabber/message.c:117
+#: ../libpurple/protocols/jabber/message.c:155
 #, c-format
 msgid "Message from %s"
 msgstr "Mesaĝo de %s"
 
-#: ../libgaim/protocols/jabber/message.c:181
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s ŝanĝis la temon al: %s"
 
-#: ../libgaim/protocols/jabber/message.c:183
+#: ../libpurple/protocols/jabber/message.c:221
 #, c-format
 msgid "The topic is: %s"
 msgstr "La temo estas: %s"
 
-#: ../libgaim/protocols/jabber/message.c:233
+#: ../libpurple/protocols/jabber/message.c:269
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Mesaĝo transdono al %s malsukcesis: %s"
 
-#: ../libgaim/protocols/jabber/message.c:236
+#: ../libpurple/protocols/jabber/message.c:272
 msgid "Jabber Message Error"
 msgstr "Jabber mesaĝo eraro"
 
-#: ../libgaim/protocols/jabber/message.c:316
+#: ../libpurple/protocols/jabber/message.c:352
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kodo %s)"
 
-#: ../libgaim/protocols/jabber/parser.c:192
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/presence.c:280
+#: ../libpurple/protocols/jabber/presence.c:282
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libgaim/protocols/jabber/presence.c:354
-#: ../libgaim/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:356
+#: ../libpurple/protocols/jabber/presence.c:357
 msgid "Create New Room"
 msgstr "Kreu Novan Ĉambron"
 
-#: ../libgaim/protocols/jabber/presence.c:356
+#: ../libpurple/protocols/jabber/presence.c:358
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -8685,626 +4916,643 @@
 "Vi estas kreante nova ĉambro. Ĉu vi deziras agordi ĝin, aŭ akcepti apriorajn "
 "agordojn?"
 
-#: ../libgaim/protocols/jabber/presence.c:359
+#: ../libpurple/protocols/jabber/presence.c:361
 msgid "_Configure Room"
 msgstr "_Agordu Ĉambron"
 
-#: ../libgaim/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:363
 msgid "_Accept Defaults"
 msgstr "_Akceptu Apriorajn"
 
-#: ../libgaim/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:401
 #, c-format
 msgid "Error in chat %s"
 msgstr "Eraro en babilejo %s"
 
-#: ../libgaim/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:404
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Eraro aliĝante babilejon %s"
 
-#: ../libgaim/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:765
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Ne eblis sendu dosieron al %s, uzanto ne subtenas dosiero-transmeton"
 
-#: ../libgaim/protocols/jabber/si.c:766 ../libgaim/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:766
+#: ../libpurple/protocols/jabber/si.c:767
 msgid "File Send Failed"
 msgstr "Dosiersendo malsukcesis"
 
-#: ../libgaim/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/dialog.c:116
+#: ../libpurple/protocols/msn/dialog.c:116
 #, c-format
 msgid ""
 "%s on the local list is inside the group \"%s\" but not on the server list. "
 "Do you want this buddy to be added?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msn/dialog.c:124
 #, c-format
 msgid ""
 "%s is on the local list but not on the server list. Do you want this buddy "
 "to be added?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:35
+#: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:38
-msgid "Syntax Error (probably a Gaim bug)"
-msgstr ""
-
-#: ../libgaim/protocols/msn/error.c:42
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
+msgstr ""
+
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Malvalida retadreso"
 
-#: ../libgaim/protocols/msn/error.c:45
+#: ../libpurple/protocols/msn/error.c:49
 msgid "User does not exist"
 msgstr "Uzanto ne ekzistas"
 
-#: ../libgaim/protocols/msn/error.c:49
+#: ../libpurple/protocols/msn/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:52
+#: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
 msgstr "Jam ensalutita"
 
-#: ../libgaim/protocols/msn/error.c:55
+#: ../libpurple/protocols/msn/error.c:59
 msgid "Invalid screen name"
 msgstr "Malvalida ekranonomo"
 
-#: ../libgaim/protocols/msn/error.c:58
+#: ../libpurple/protocols/msn/error.c:62
 msgid "Invalid friendly name"
 msgstr "Malvalida amika nomo"
 
-#: ../libgaim/protocols/msn/error.c:61
+#: ../libpurple/protocols/msn/error.c:65
 msgid "List full"
 msgstr "Listo plena"
 
-#: ../libgaim/protocols/msn/error.c:64
+#: ../libpurple/protocols/msn/error.c:68
 msgid "Already there"
 msgstr "Jam tie"
 
-#: ../libgaim/protocols/msn/error.c:67
+#: ../libpurple/protocols/msn/error.c:72
 msgid "Not on list"
 msgstr "Ne en listo"
 
-#: ../libgaim/protocols/msn/error.c:70
-#: ../libgaim/protocols/zephyr/zephyr.c:757
+#: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/zephyr/zephyr.c:756
 msgid "User is offline"
 msgstr "Uzanto senkonektas"
 
-#: ../libgaim/protocols/msn/error.c:73
+#: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
 msgstr "Jam en la moduso"
 
-#: ../libgaim/protocols/msn/error.c:76
+#: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
 msgstr "Jam en mala listo"
 
-#: ../libgaim/protocols/msn/error.c:79
+#: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
 msgstr "Tro da groupoj"
 
-#: ../libgaim/protocols/msn/error.c:82
+#: ../libpurple/protocols/msn/error.c:89
 msgid "Invalid group"
 msgstr "Malvalida group"
 
-#: ../libgaim/protocols/msn/error.c:85
+#: ../libpurple/protocols/msn/error.c:92
 msgid "User not in group"
 msgstr "Uzanto ne en grupo"
 
-#: ../libgaim/protocols/msn/error.c:88
+#: ../libpurple/protocols/msn/error.c:95
 msgid "Group name too long"
 msgstr "Gruponomo tro longa"
 
-#: ../libgaim/protocols/msn/error.c:91
+#: ../libpurple/protocols/msn/error.c:98
 msgid "Cannot remove group zero"
 msgstr "Ne povas forigi grupo nulo"
 
-#: ../libgaim/protocols/msn/error.c:95
+#: ../libpurple/protocols/msn/error.c:103
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Provis aldoni uzanton al grupo neekzistanta."
 
-#: ../libgaim/protocols/msn/error.c:99
+#: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:102
+#: ../libpurple/protocols/msn/error.c:111
 msgid "Notify transfer failed"
 msgstr "Dosiero transmeto malsukcesis"
 
-#: ../libgaim/protocols/msn/error.c:106
+#: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:109
+#: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:112 ../libgaim/protocols/oscar/oscar.c:118
+#: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Not logged in"
 msgstr "Ne ensalutita"
 
-#: ../libgaim/protocols/msn/error.c:116
+#: ../libpurple/protocols/msn/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Servilo provizore ne disponebla"
 
-#: ../libgaim/protocols/msn/error.c:119
+#: ../libpurple/protocols/msn/error.c:131
 msgid "Database server error"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:122
+#: ../libpurple/protocols/msn/error.c:135
 msgid "Command disabled"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:125
+#: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:128
+#: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:131
+#: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:135
+#: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
 msgstr "Servilo okupita"
 
-#: ../libgaim/protocols/msn/error.c:138 ../libgaim/protocols/msn/error.c:151
-#: ../libgaim/protocols/msn/error.c:206
+#: ../libpurple/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:170
+#: ../libpurple/protocols/msn/error.c:230
 msgid "Server unavailable"
 msgstr "Servilo disponebla"
 
-#: ../libgaim/protocols/msn/error.c:141
+#: ../libpurple/protocols/msn/error.c:158
 msgid "Peer notification server down"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:144
+#: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
 msgstr "Datumbaso konekto eraro"
 
-#: ../libgaim/protocols/msn/error.c:148
+#: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr ""
 
-#: ../libgaim/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
 msgstr "Eraro kreante konekto"
 
-#: ../libgaim/protocols/msn/error.c:159
+#: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR parametroj estas nekonataj aŭ ne permesitaj"
 
-#: ../libgaim/protocols/msn/error.c:162
+#: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
 msgstr "Ne eblas skribi"
 
-#: ../libgaim/protocols/msn/error.c:165
+#: ../libpurple/protocols/msn/error.c:186
 msgid "Session overload"
 msgstr "Sesio troigita"
 
-#: ../libgaim/protocols/msn/error.c:168
+#: ../libpurple/protocols/msn/error.c:190
 msgid "User is too active"
 msgstr "Uzanto tro aktivas"
 
-#: ../libgaim/protocols/msn/error.c:171
+#: ../libpurple/protocols/msn/error.c:193
 msgid "Too many sessions"
 msgstr "Tro da sesioj"
 
-#: ../libgaim/protocols/msn/error.c:174
+#: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
 msgstr "Pasporto ne kontrolita"
 
-#: ../libgaim/protocols/msn/error.c:177
+#: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
 msgstr "Malbona amikodosiero"
 
-#: ../libgaim/protocols/msn/error.c:180
+#: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
 msgstr "Ne atendita"
 
-#: ../libgaim/protocols/msn/error.c:185
+#: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "Amikonomo ŝangâs tro rapide"
 
-#: ../libgaim/protocols/msn/error.c:194
+#: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
 msgstr "Servilo tro okupita"
 
-#: ../libgaim/protocols/msn/error.c:198
-#: ../libgaim/protocols/oscar/oscar.c:1355
-#: ../libgaim/protocols/silc/ops.c:1718 ../libgaim/protocols/toc/toc.c:728
-#: ../libgaim/proxy.c:1340
+#: ../libpurple/protocols/msn/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1357
+#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
+#: ../libpurple/proxy.c:1351
 msgid "Authentication failed"
 msgstr "Aŭtentokontrolo malsukcesis"
 
-#: ../libgaim/protocols/msn/error.c:201
+#: ../libpurple/protocols/msn/error.c:225
 msgid "Not allowed when offline"
 msgstr "Malpermesita kiam senkonekta"
 
-#: ../libgaim/protocols/msn/error.c:209
+#: ../libpurple/protocols/msn/error.c:233
 msgid "Not accepting new users"
 msgstr "Malakceptas novajn uzantojn"
 
-#: ../libgaim/protocols/msn/error.c:213
+#: ../libpurple/protocols/msn/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "Infana Pasporto sen patra konsento"
 
-#: ../libgaim/protocols/msn/error.c:217
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Pasporta konto ne jam kontrolita"
 
-#: ../libgaim/protocols/msn/error.c:220
+#: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
 msgstr "Malbona bileto"
 
-#: ../libgaim/protocols/msn/error.c:224
+#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Nekonata Eraro Kodo %d"
 
-#: ../libgaim/protocols/msn/error.c:236
+#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN Eraro: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:111
+#: ../libpurple/protocols/msn/msn.c:112
 msgid "You have just sent a Nudge!"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:136
+#: ../libpurple/protocols/msn/msn.c:137
 msgid "Your new MSN friendly name is too long."
 msgstr "Via nova MSN amika nomo estas tro longa."
 
-#: ../libgaim/protocols/msn/msn.c:244
+#: ../libpurple/protocols/msn/msn.c:245
 msgid "Set your friendly name."
 msgstr "Difinu vian amikan nomon."
 
-#: ../libgaim/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:246
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tio estas la nomo kiu aliaj MSN kunuloj vidos vin kiel."
 
-#: ../libgaim/protocols/msn/msn.c:261
+#: ../libpurple/protocols/msn/msn.c:262
 msgid "Set your home phone number."
 msgstr "Difinu vian hejm telefononombron."
 
-#: ../libgaim/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:277
 msgid "Set your work phone number."
 msgstr "Difinu vian labor telefononombron."
 
-#: ../libgaim/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:292
 msgid "Set your mobile phone number."
 msgstr "Difiniu vian poŝtelefona nombron."
 
-#: ../libgaim/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:305
 msgid "Allow MSN Mobile pages?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:306
 msgid ""
 "Do you want to allow or disallow people on your buddy list to send you MSN "
 "Mobile pages to your cell phone or other mobile device?"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:309
+#: ../libpurple/protocols/msn/msn.c:310
 msgid "Allow"
 msgstr "Permesu"
 
-#: ../libgaim/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:311
 msgid "Disallow"
 msgstr "Malpermesu"
 
-#: ../libgaim/protocols/msn/msn.c:326
+#: ../libpurple/protocols/msn/msn.c:327
 msgid "This Hotmail account may not be active."
 msgstr "Tiu Hotmail konto eble ne estas aktiva."
 
-#: ../libgaim/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:353
 msgid "Send a mobile message."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:355
 msgid "Page"
 msgstr "Paĝo"
 
-#: ../libgaim/protocols/msn/msn.c:553
+#: ../libpurple/protocols/msn/msn.c:518
 msgid "Has you"
 msgstr "Havas vin"
 
-#: ../libgaim/protocols/msn/msn.c:583 ../libgaim/protocols/msn/state.c:33
-#: ../libgaim/protocols/yahoo/yahoo.c:2856
-#: ../libgaim/protocols/yahoo/yahoo.c:3460
+#: ../libpurple/protocols/msn/msn.c:548 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2876
+#: ../libpurple/protocols/yahoo/yahoo.c:3480
 msgid "Be Right Back"
 msgstr "Tuj Revenas"
 
-#: ../libgaim/protocols/msn/msn.c:587 ../libgaim/protocols/msn/state.c:31
-#: ../libgaim/protocols/novell/novell.c:2857
-#: ../libgaim/protocols/novell/novell.c:2987
-#: ../libgaim/protocols/silc/buddy.c:1473 ../libgaim/protocols/silc/silc.c:53
-#: ../libgaim/protocols/yahoo/yahoo.c:2858
-#: ../libgaim/protocols/yahoo/yahoo.c:3463
+#: ../libpurple/protocols/msn/msn.c:552 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2823
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/silc/buddy.c:1473
+#: ../libpurple/protocols/silc/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2878
+#: ../libpurple/protocols/yahoo/yahoo.c:3483
 msgid "Busy"
 msgstr "Okupata"
 
-#: ../libgaim/protocols/msn/msn.c:591 ../libgaim/protocols/yahoo/yahoo.c:2866
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+#: ../libpurple/protocols/msn/msn.c:556
+#: ../libpurple/protocols/yahoo/yahoo.c:2886
+#: ../libpurple/protocols/yahoo/yahoo.c:3495
 msgid "On the Phone"
 msgstr "Telefonante"
 
-#: ../libgaim/protocols/msn/msn.c:595 ../libgaim/protocols/yahoo/yahoo.c:2870
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/msn/msn.c:560
+#: ../libpurple/protocols/yahoo/yahoo.c:2890
+#: ../libpurple/protocols/yahoo/yahoo.c:3501
 msgid "Out to Lunch"
 msgstr "Ekstere Tagmanĝanten"
 
-#: ../libgaim/protocols/msn/msn.c:619
+#: ../libpurple/protocols/msn/msn.c:588
 msgid "Set Friendly Name..."
 msgstr "Difinu Amika Nomo..."
 
-#: ../libgaim/protocols/msn/msn.c:624
+#: ../libpurple/protocols/msn/msn.c:593
 msgid "Set Home Phone Number..."
 msgstr "Difinu Hejm-Telefonnumeron..."
 
-#: ../libgaim/protocols/msn/msn.c:628
+#: ../libpurple/protocols/msn/msn.c:597
 msgid "Set Work Phone Number..."
 msgstr "Difinu Labor-Telefonnumeron..."
 
-#: ../libgaim/protocols/msn/msn.c:632
+#: ../libpurple/protocols/msn/msn.c:601
 msgid "Set Mobile Phone Number..."
 msgstr "Difiniu Poŝtelefonan Numeron..."
 
-#: ../libgaim/protocols/msn/msn.c:638
+#: ../libpurple/protocols/msn/msn.c:607
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Ebligu/Malebligu Poŝtelefonajn Ekipaĵojn..."
 
-#: ../libgaim/protocols/msn/msn.c:643
+#: ../libpurple/protocols/msn/msn.c:612
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Ebligu/Malebligu Poŝtelefonajn Paĝojn..."
 
-#: ../libgaim/protocols/msn/msn.c:653
+#: ../libpurple/protocols/msn/msn.c:622
 msgid "Open Hotmail Inbox"
 msgstr "Malfermu Hotmail-an Alkeston"
 
-#: ../libgaim/protocols/msn/msn.c:677
+#: ../libpurple/protocols/msn/msn.c:646
 msgid "Send to Mobile"
 msgstr "Sendu al Poŝtelefono"
 
-#: ../libgaim/protocols/msn/msn.c:687
-#: ../libgaim/protocols/novell/novell.c:3443
+#: ../libpurple/protocols/msn/msn.c:656
+#: ../libpurple/protocols/novell/novell.c:3409
 msgid "Initiate _Chat"
 msgstr "Iniciatu _Babilon"
 
-#: ../libgaim/protocols/msn/msn.c:725
-msgid ""
-"SSL support is needed for MSN. Please install a supported SSL library. See "
-"http://gaim.sf.net/faq-ssl.php for more information."
-msgstr ""
-
-#: ../libgaim/protocols/msn/msn.c:752
+#: ../libpurple/protocols/msn/msn.c:694
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:719
 msgid "Failed to connect to server."
 msgstr "Malsukcesis konekti servilon."
 
-#: ../libgaim/protocols/msn/msn.c:1461 ../libgaim/protocols/msn/msn.c:1806
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1439 ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
 msgid "Error retrieving profile"
 msgstr "Eraro ricevante profilon"
 
-#: ../libgaim/protocols/msn/msn.c:1539 ../libgaim/protocols/oscar/oscar.c:3749
-#: ../libgaim/protocols/qq/buddy_info.c:45 ../libgaim/protocols/qq/qq.c:219
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/msn/msn.c:1510 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:448
+msgid "General"
+msgstr "Ĝenerala"
+
+#: ../libpurple/protocols/msn/msn.c:1517
+#: ../libpurple/protocols/oscar/oscar.c:3757
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
 msgid "Age"
 msgstr "Aĝo"
 
-#: ../libgaim/protocols/msn/msn.c:1541 ../libgaim/protocols/qq/buddy_info.c:51
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/msn/msn.c:1519
+#: ../libpurple/protocols/qq/buddy_info.c:51
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
 msgid "Occupation"
 msgstr "Okupiĝo"
 
-#: ../libgaim/protocols/msn/msn.c:1542
-#: ../libgaim/protocols/novell/novell.c:1478
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
-#: ../libgaim/protocols/zephyr/zephyr.c:799
-#: ../libgaim/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/msn/msn.c:1520
+#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/zephyr/zephyr.c:798
+#: ../libpurple/protocols/zephyr/zephyr.c:1214
 msgid "Location"
 msgstr "Loko"
 
-#: ../libgaim/protocols/msn/msn.c:1547 ../libgaim/protocols/msn/msn.c:1739
-#: ../libgaim/protocols/msn/msn.c:1745 ../libgaim/protocols/msn/msn.c:1752
+#: ../libpurple/protocols/msn/msn.c:1525 ../libpurple/protocols/msn/msn.c:1717
+#: ../libpurple/protocols/msn/msn.c:1723 ../libpurple/protocols/msn/msn.c:1730
 msgid "Hobbies and Interests"
 msgstr "Hobioj kaj Interesiĝoj"
 
-#: ../libgaim/protocols/msn/msn.c:1553 ../libgaim/protocols/msn/msn.c:1673
-#: ../libgaim/protocols/msn/msn.c:1679 ../libgaim/protocols/msn/msn.c:1686
-#: ../libgaim/protocols/msn/msn.c:1694 ../libgaim/protocols/msn/msn.c:1701
+#: ../libpurple/protocols/msn/msn.c:1531 ../libpurple/protocols/msn/msn.c:1651
+#: ../libpurple/protocols/msn/msn.c:1657 ../libpurple/protocols/msn/msn.c:1664
+#: ../libpurple/protocols/msn/msn.c:1672 ../libpurple/protocols/msn/msn.c:1679
 msgid "A Little About Me"
 msgstr "Iomete Pri Mi"
 
-#: ../libgaim/protocols/msn/msn.c:1570
+#: ../libpurple/protocols/msn/msn.c:1548
 msgid "Social"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1572
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1550
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
 msgid "Marital Status"
 msgstr "Edzstato"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1551
 msgid "Interests"
 msgstr "Interesiĝoj"
 
-#: ../libgaim/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1552
 msgid "Pets"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1553
 msgid "Hometown"
 msgstr "Hejmurbo"
 
-#: ../libgaim/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1554
 msgid "Places Lived"
 msgstr "Vivintejoj"
 
-#: ../libgaim/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1555
 msgid "Fashion"
 msgstr "Fasono"
 
-#: ../libgaim/protocols/msn/msn.c:1578
+#: ../libpurple/protocols/msn/msn.c:1556
 msgid "Humor"
 msgstr "Humuro"
 
-#: ../libgaim/protocols/msn/msn.c:1579
+#: ../libpurple/protocols/msn/msn.c:1557
 msgid "Music"
 msgstr "Muziko"
 
-#: ../libgaim/protocols/msn/msn.c:1580 ../libgaim/protocols/msn/msn.c:1761
-#: ../libgaim/protocols/msn/msn.c:1767
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1558 ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msn/msn.c:1745
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
 msgid "Favorite Quote"
 msgstr "Favorita Citaĵo"
 
-#: ../libgaim/protocols/msn/msn.c:1597
+#: ../libpurple/protocols/msn/msn.c:1575
 msgid "Contact Info"
 msgstr "Kontakto Informo"
 
-#: ../libgaim/protocols/msn/msn.c:1598
+#: ../libpurple/protocols/msn/msn.c:1576
 msgid "Personal"
 msgstr "Persona"
 
-#: ../libgaim/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1579
 msgid "Significant Other"
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1602
+#: ../libpurple/protocols/msn/msn.c:1580
 msgid "Home Phone"
 msgstr "Hejmo Telfono"
 
-#: ../libgaim/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1581
 msgid "Home Phone 2"
 msgstr "Hejmo Telfono 2"
 
-#: ../libgaim/protocols/msn/msn.c:1604 ../libgaim/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/msn/msn.c:1582
+#: ../libpurple/protocols/oscar/oscar.c:3795
 msgid "Home Address"
 msgstr "Hejmo Adreso"
 
-#: ../libgaim/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1583
 msgid "Personal Mobile"
 msgstr "Persona Poŝtelefono"
 
-#: ../libgaim/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1584
 msgid "Home Fax"
 msgstr "Hejmfakso"
 
-#: ../libgaim/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/msn/msn.c:1585
 msgid "Personal E-Mail"
 msgstr "Persona Retadreso"
 
-#: ../libgaim/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1586
 msgid "Personal IM"
 msgstr "Persona TM"
 
-#: ../libgaim/protocols/msn/msn.c:1610
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Anniversary"
 msgstr "Naskiĝdato"
 
 #. Business
-#: ../libgaim/protocols/msn/msn.c:1626
+#: ../libpurple/protocols/msn/msn.c:1604
 msgid "Work"
 msgstr "Laboro"
 
-#: ../libgaim/protocols/msn/msn.c:1628 ../libgaim/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/silc/ops.c:1044
 msgid "Job Title"
 msgstr "Laboro Titolo"
 
-#: ../libgaim/protocols/msn/msn.c:1629 ../libgaim/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/msn/msn.c:1607
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Company"
 msgstr "Kompanio"
 
-#: ../libgaim/protocols/msn/msn.c:1630
-#: ../libgaim/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Departemento"
 
-#: ../libgaim/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1609
 msgid "Profession"
 msgstr "Prefesio"
 
-#: ../libgaim/protocols/msn/msn.c:1632
+#: ../libpurple/protocols/msn/msn.c:1610
 msgid "Work Phone"
 msgstr "Labor Telefono"
 
-#: ../libgaim/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1611
 msgid "Work Phone 2"
 msgstr "Labor Telefono 2"
 
-#: ../libgaim/protocols/msn/msn.c:1634 ../libgaim/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/msn/msn.c:1612
+#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Work Address"
 msgstr "Laboro Adreso"
 
-#: ../libgaim/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1613
 msgid "Work Mobile"
 msgstr "Laborpoŝtelefono"
 
-#: ../libgaim/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1614
 msgid "Work Pager"
 msgstr "Laborpaĝilo"
 
-#: ../libgaim/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Work Fax"
 msgstr "Laborfakso"
 
-#: ../libgaim/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Work E-Mail"
 msgstr "Laboro Retadreso"
 
-#: ../libgaim/protocols/msn/msn.c:1639
+#: ../libpurple/protocols/msn/msn.c:1617
 msgid "Work IM"
 msgstr "Laboro TM"
 
-#: ../libgaim/protocols/msn/msn.c:1640
+#: ../libpurple/protocols/msn/msn.c:1618
 msgid "Start Date"
 msgstr "Komenca Dato"
 
-#: ../libgaim/protocols/msn/msn.c:1710 ../libgaim/protocols/msn/msn.c:1716
-#: ../libgaim/protocols/msn/msn.c:1723 ../libgaim/protocols/msn/msn.c:1730
+#: ../libpurple/protocols/msn/msn.c:1688 ../libpurple/protocols/msn/msn.c:1694
+#: ../libpurple/protocols/msn/msn.c:1701 ../libpurple/protocols/msn/msn.c:1708
 msgid "Favorite Things"
 msgstr "Favorataj Aĵoj"
 
-#: ../libgaim/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1753
 msgid "Last Updated"
 msgstr "Laste Aktualigita"
 
-#: ../libgaim/protocols/msn/msn.c:1786 ../libgaim/protocols/qq/buddy_info.c:60
-#: ../libgaim/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/msn/msn.c:1764
+#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/silc/ops.c:1060
 msgid "Homepage"
 msgstr "Hejmpaĝo"
 
-#: ../libgaim/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1785
 msgid "The user has not created a public profile."
 msgstr "La uzanto ne kreis publikan profilon."
 
-#: ../libgaim/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1786
 msgid ""
 "MSN reported not being able to find the user's profile. This either means "
 "that the user does not exist, or that the user exists but has not created a "
 "public profile."
 msgstr ""
 
-#: ../libgaim/protocols/msn/msn.c:1812
-msgid ""
-"Gaim could not find any information in the user's profile. The user most "
-"likely does not exist."
-msgstr ""
-
-#: ../libgaim/protocols/msn/msn.c:1820
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1790
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
 msgid "Profile URL"
 msgstr "Profilo URL"
 
@@ -9318,96 +5566,96 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2035 ../libgaim/protocols/msn/msn.c:2037
+#: ../libpurple/protocols/msn/msn.c:2078 ../libpurple/protocols/msn/msn.c:2080
 msgid "MSN Protocol Plugin"
 msgstr "MSN Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/msn/msn.c:2065
+#: ../libpurple/protocols/msn/msn.c:2108
 msgid "Use HTTP Method"
 msgstr "Uzu HTTP-an metodon"
 
-#: ../libgaim/protocols/msn/msn.c:2070
+#: ../libpurple/protocols/msn/msn.c:2113
 msgid "Show custom smileys"
 msgstr "Montru personajn ridmienojn"
 
-#: ../libgaim/protocols/msn/msn.c:2078
+#: ../libpurple/protocols/msn/msn.c:2121
 msgid "nudge: nudge a user to get their attention"
 msgstr ""
 
-#: ../libgaim/protocols/msn/nexus.c:146
-#: ../libgaim/protocols/msn/servconn.c:133
-#: ../libgaim/protocols/qq/qq_proxy.c:242
-#: ../libgaim/protocols/qq/qq_proxy.c:321
-#: ../libgaim/protocols/qq/qq_proxy.c:366
-#: ../libgaim/protocols/qq/qq_proxy.c:399
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:63
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:163
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:187
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:200
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:229
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:243
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:268
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:302
-#: ../libgaim/protocols/qq/udp_proxy_s5.c:332
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/msn/nexus.c:146
+#: ../libpurple/protocols/msn/servconn.c:133
+#: ../libpurple/protocols/qq/qq_proxy.c:242
+#: ../libpurple/protocols/qq/qq_proxy.c:321
+#: ../libpurple/protocols/qq/qq_proxy.c:366
+#: ../libpurple/protocols/qq/qq_proxy.c:399
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:63
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:163
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:187
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:200
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:229
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:243
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:268
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:302
+#: ../libpurple/protocols/qq/udp_proxy_s5.c:332
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Unable to connect"
 msgstr "Malkonekteblas"
 
-#: ../libgaim/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ne estas valida grupo."
 
-#: ../libgaim/protocols/msn/notification.c:184
-#: ../libgaim/protocols/msn/notification.c:532
-#: ../libgaim/protocols/msn/session.c:329
+#: ../libpurple/protocols/msn/notification.c:184
+#: ../libpurple/protocols/msn/notification.c:532
+#: ../libpurple/protocols/msn/session.c:329
 msgid "Unknown error."
 msgstr "Nekonata eraro."
 
-#: ../libgaim/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s en %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:498
+#: ../libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Ne eblas aldoni uzanto en %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:502
+#: ../libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Ne eblas bloki uzanton ĉe %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:506
+#: ../libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Ne eblas permezi uzanton ĉe %s (%s)"
 
-#: ../libgaim/protocols/msn/notification.c:514
+#: ../libpurple/protocols/msn/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
 msgstr "%s ne aldoneblas ĉar via kunullisto plenumas."
 
-#: ../libgaim/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ne etas valida pasporto konto."
 
-#: ../libgaim/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr ""
 
-#: ../libgaim/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:823
 msgid "Unable to rename group"
 msgstr "Ne eblas alinomigi grupon"
 
-#: ../libgaim/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:878
 msgid "Unable to delete group"
 msgstr "Ne eblas forigi grupo"
 
-#: ../libgaim/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1314
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -9426,417 +5674,415 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Skriberaro"
 
-#: ../libgaim/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Legeraro"
 
-#: ../libgaim/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:307
-#: ../libgaim/protocols/oscar/oscar.c:3467
-#: ../libgaim/protocols/yahoo/yahoo.c:191
+#: ../libpurple/protocols/msn/session.c:307
+#: ../libpurple/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:201
 msgid "You have signed on from another location."
 msgstr "Vi ensalutis el alia loko."
 
-#: ../libgaim/protocols/msn/session.c:310
+#: ../libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:319
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:324
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-
-#: ../libgaim/protocols/msn/session.c:345
-#: ../libgaim/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:324
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/msn/session.c:347
 msgid "Handshaking"
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:346
-msgid "Transferring"
-msgstr ""
-
-#: ../libgaim/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Starting authentication"
 msgstr "Komencas aŭtentokontrolon"
 
-#: ../libgaim/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Getting cookie"
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Sending cookie"
 msgstr ""
 
-#: ../libgaim/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Retrieving buddy list"
 msgstr ""
 
-#: ../libgaim/protocols/msn/state.c:34
+#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr ""
 
-#: ../libgaim/protocols/msn/state.c:35
+#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr ""
 
-#: ../libgaim/protocols/msn/state.c:36
+#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:420
+#: ../libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:424
-msgid "Message could not be sent because an error with the switchboard occurred:"
-msgstr ""
-
-#: ../libgaim/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:424
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+
+#: ../libpurple/protocols/msn/switchboard.c:432
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 
-#: ../libgaim/protocols/msn/switchboard.c:956
+#: ../libpurple/protocols/msn/switchboard.c:956
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr ""
 
-#: ../libgaim/protocols/msn/userlist.c:250
+#: ../libpurple/protocols/msn/userlist.c:250
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s aldonis vin en sia kunul listo."
 
-#: ../libgaim/protocols/msn/userlist.c:319
+#: ../libpurple/protocols/msn/userlist.c:319
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s forigis vin el sia kunul listo."
 
-#: ../libgaim/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Malsukcesis aldoni \"%s\"."
 
-#: ../libgaim/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1879
+#: ../libpurple/protocols/novell/nmuser.c:1878
 msgid "Required parameters not passed in"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1882
+#: ../libpurple/protocols/novell/nmuser.c:1881
 msgid "Unable to write to network"
 msgstr "Malsukcesis skribi reten"
 
-#: ../libgaim/protocols/novell/nmuser.c:1885
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "Unable to read from network"
 msgstr "Malsukcesis ligi el reto"
 
-#: ../libgaim/protocols/novell/nmuser.c:1888
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Error communicating with server"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1892
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Conference not found"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1895
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Conference does not exist"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1899
+#: ../libpurple/protocols/novell/nmuser.c:1898
 msgid "A folder with that name already exists"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1902
+#: ../libpurple/protocols/novell/nmuser.c:1901
 msgid "Not supported"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1906
+#: ../libpurple/protocols/novell/nmuser.c:1905
 msgid "Password has expired"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1909
+#: ../libpurple/protocols/novell/nmuser.c:1908
 msgid "Incorrect password"
 msgstr "Misa pasvorto"
 
-#: ../libgaim/protocols/novell/nmuser.c:1912
+#: ../libpurple/protocols/novell/nmuser.c:1911
 msgid "User not found"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1915
+#: ../libpurple/protocols/novell/nmuser.c:1914
 msgid "Account has been disabled"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1918
+#: ../libpurple/protocols/novell/nmuser.c:1917
 msgid "The server could not access the directory"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1921
+#: ../libpurple/protocols/novell/nmuser.c:1920
 msgid "Your system administrator has disabled this operation"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1924
+#: ../libpurple/protocols/novell/nmuser.c:1923
 msgid "The server is unavailable; try again later"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1927
+#: ../libpurple/protocols/novell/nmuser.c:1926
 msgid "Cannot add a contact to the same folder twice"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1930
+#: ../libpurple/protocols/novell/nmuser.c:1929
 msgid "Cannot add yourself"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1933
+#: ../libpurple/protocols/novell/nmuser.c:1932
 msgid "Master archive is misconfigured"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1937
+#: ../libpurple/protocols/novell/nmuser.c:1936
 msgid "Incorrect screen name or password"
 msgstr "Misa ekrannomo aŭ pasvorto"
 
-#: ../libgaim/protocols/novell/nmuser.c:1940
+#: ../libpurple/protocols/novell/nmuser.c:1939
 msgid "Could not recognize the host of the screen name you entered"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1943
+#: ../libpurple/protocols/novell/nmuser.c:1942
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1946
+#: ../libpurple/protocols/novell/nmuser.c:1945
 msgid "You cannot add the same person twice to a conversation"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1950
+#: ../libpurple/protocols/novell/nmuser.c:1949
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1953
+#: ../libpurple/protocols/novell/nmuser.c:1952
 msgid "You have entered an incorrect screen name"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1956
+#: ../libpurple/protocols/novell/nmuser.c:1955
 msgid "An error occurred while updating the directory"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1959
+#: ../libpurple/protocols/novell/nmuser.c:1958
 msgid "Incompatible protocol version"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1962
+#: ../libpurple/protocols/novell/nmuser.c:1961
 msgid "The user has blocked you"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1965
+#: ../libpurple/protocols/novell/nmuser.c:1964
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1968
+#: ../libpurple/protocols/novell/nmuser.c:1967
 msgid "The user is either offline or you are blocked"
 msgstr ""
 
-#: ../libgaim/protocols/novell/nmuser.c:1971
+#: ../libpurple/protocols/novell/nmuser.c:1970
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:124
+#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:247
+#: ../libpurple/protocols/novell/novell.c:247
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:396
+#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr ""
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libgaim/protocols/novell/novell.c:422
+#: ../libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:493
-#: ../libgaim/protocols/novell/novell.c:985
+#: ../libpurple/protocols/novell/novell.c:493
+#: ../libpurple/protocols/novell/novell.c:985
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:532
+#: ../libpurple/protocols/novell/novell.c:532
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:537
+#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:584
+#: ../libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:632
+#: ../libpurple/protocols/novell/novell.c:632
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:705
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:751
-#: ../libgaim/protocols/novell/novell.c:897
+#: ../libpurple/protocols/novell/novell.c:751
+#: ../libpurple/protocols/novell/novell.c:897
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1650
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1695
 msgid "Error communicating with server. Closing connection."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1505
-#: ../libgaim/protocols/sametime/sametime.c:4142
+#: ../libpurple/protocols/novell/novell.c:1505
+#: ../libpurple/protocols/sametime/sametime.c:4121
 msgid "User ID"
 msgstr ""
 
 #. tag = _("DN");
 #. value = nm_user_record_get_dn(user_record);
 #. if (value) {
-#. gaim_notify_user_info_add_pair(user_info, tag, value);
+#. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libgaim/protocols/novell/novell.c:1518
+#: ../libpurple/protocols/novell/novell.c:1518
 msgid "Full name"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1640
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1671
 msgid "Unable to make SSL connection to server."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1723
 msgid "Authenticating..."
 msgstr "Aŭtentokontrolas..."
 
-#: ../libgaim/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Unable to connect to server."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1738
 msgid "Waiting for response..."
 msgstr "Atendante respondon..."
 
-#: ../libgaim/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1873
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s estas invitita al tiu konversacio."
 
-#: ../libgaim/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Invitation to Conversation"
 msgstr "Invito al Konversacio"
 
-#: ../libgaim/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1902
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -9847,35 +6093,36 @@
 "\n"
 "Sendita: %s"
 
-#: ../libgaim/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1904
 msgid "Would you like to join the conversation?"
 msgstr "Ĉu vi deziras aliĝi al konversacio?"
 
 #. we don't want to reconnect in this case
-#: ../libgaim/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2013
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:2070
-#, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+#: ../libpurple/protocols/novell/novell.c:2070
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 
 #. TODO: Would be nice to prompt if not set!
-#. *  gaim_request_fields(gc, _("Server Address"),...);
+#. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libgaim/protocols/novell/novell.c:2168
+#: ../libpurple/protocols/novell/novell.c:2168
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2196
 msgid "Error. SSL support is not installed."
 msgstr ""
 
-#: ../libgaim/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2505
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tiu konferenco fermiĝis. Ne pliaj mesaĝoj sendiĝeblas."
 
@@ -9889,33 +6136,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3548
-#: ../libgaim/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3514
+#: ../libpurple/protocols/novell/novell.c:3516
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/novell/novell.c:3569
+#: ../libpurple/protocols/novell/novell.c:3535
 msgid "Server address"
 msgstr "Servilo adreso"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libpurple/protocols/novell/novell.c:3539
 msgid "Server port"
 msgstr "Servilo pordo"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:379
-#: ../libgaim/protocols/yahoo/yahoo.c:2263
-#: ../libgaim/protocols/yahoo/yahoo.c:2421
-#: ../libgaim/protocols/yahoo/ycht.c:481 ../libgaim/proxy.c:566
-#: ../libgaim/proxy.c:1074 ../libgaim/proxy.c:1185 ../libgaim/proxy.c:1285
-#: ../libgaim/proxy.c:1413
+#: ../libpurple/protocols/oscar/flap_connection.c:379
+#: ../libpurple/protocols/yahoo/yahoo.c:2287
+#: ../libpurple/protocols/yahoo/yahoo.c:2446
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1085 ../libpurple/proxy.c:1196
+#: ../libpurple/proxy.c:1296 ../libpurple/proxy.c:1424
 msgid "Server closed the connection."
 msgstr "Servilo fermis la konekton."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:381
-#: ../libgaim/protocols/yahoo/yahoo.c:2257
-#: ../libgaim/protocols/yahoo/yahoo.c:2415 ../libgaim/proxy.c:578
-#: ../libgaim/proxy.c:1086 ../libgaim/proxy.c:1197 ../libgaim/proxy.c:1297
-#: ../libgaim/proxy.c:1425
+#: ../libpurple/protocols/oscar/flap_connection.c:381
+#: ../libpurple/protocols/yahoo/yahoo.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:2440 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1097 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -9924,13 +6171,14 @@
 "Perdis konekton kun servilo:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/flap_connection.c:384 ../libgaim/proxy.c:1103
-#: ../libgaim/proxy.c:1210 ../libgaim/proxy.c:1309 ../libgaim/proxy.c:1381
-#: ../libgaim/proxy.c:1438
+#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/proxy.c:1114 ../libpurple/proxy.c:1221
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1392
+#: ../libpurple/proxy.c:1449
 msgid "Received invalid data on connection with server."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/oscar/flap_connection.c:386
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -9947,19 +6195,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libaim.c:112
-#: ../libgaim/protocols/oscar/libaim.c:114
+#: ../libpurple/protocols/oscar/libaim.c:112
+#: ../libpurple/protocols/oscar/libaim.c:114
 msgid "AIM Protocol Plugin"
 msgstr "AIM Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/oscar/libaim.c:140
-msgid ""
-"Always use AIM/ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Ĉiam uzu AIM/ICQ-n prokurservilon por dosiero alŝuto\n"
-"(pli malrapida, sed vualigas vian IP adreson)"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -9970,152 +6210,144 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/oscar/libicq.c:112
-#: ../libgaim/protocols/oscar/libicq.c:114
+#: ../libpurple/protocols/oscar/libicq.c:112
+#: ../libpurple/protocols/oscar/libicq.c:114
 msgid "ICQ Protocol Plugin"
 msgstr "ICQ Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/oscar/libicq.c:139
-#: ../libgaim/protocols/yahoo/yahoo.c:3945
-#: ../libgaim/protocols/zephyr/zephyr.c:2985
+#: ../libpurple/protocols/oscar/libicq.c:135
+#: ../libpurple/protocols/yahoo/yahoo.c:4069
+#: ../libpurple/protocols/zephyr/zephyr.c:2984
 msgid "Encoding"
 msgstr "Kodoprezento"
 
-#: ../libgaim/protocols/oscar/libicq.c:143
-msgid ""
-"Always use ICQ proxy server for file transfers\n"
-"(slower, but does not reveal your IP address)"
-msgstr ""
-"Ĉiam uzi ICQ-n prokurservilon por dosiero alŝutoj\n"
-"(pli malrapida, sed vualigas vian IP adreson)"
-
-#: ../libgaim/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "La dista uzanto fermis la konekton."
 
-#: ../libgaim/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Rekta TM establiĝis"
 
-#: ../libgaim/protocols/oscar/oft.c:657
+#: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:114
+#: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
 msgstr "Malvalida eraro"
 
-#: ../libgaim/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
 msgstr "Malvalida SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr "En loka permeso/rifuzo"
 
-#: ../libgaim/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:327
+#: ../libpurple/protocols/oscar/oscar.c:329
 msgid ""
 "(There was an error receiving this message.  The buddy you are speaking with "
 "is probably using a different encoding than expected.  If you know what "
@@ -10123,132 +6355,152 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:436
+#: ../libpurple/protocols/oscar/oscar.c:438
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
 "different encodings selected, or %s has a buggy client.)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:621
+#. Label
+#: ../libpurple/protocols/oscar/oscar.c:620 ../pidgin/gtkutils.c:2335
+#: ../pidgin/gtkutils.c:2357
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+msgid "Buddy Icon"
+msgstr "Kunul Piktogramo"
+
+#: ../libpurple/protocols/oscar/oscar.c:623
 msgid "Voice"
 msgstr "Voĉo"
 
-#: ../libgaim/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:626
 msgid "AIM Direct IM"
 msgstr "AIM Rekta TM"
 
-#: ../libgaim/protocols/oscar/oscar.c:627 ../libgaim/protocols/silc/silc.c:693
-#: ../libgaim/protocols/silc/util.c:551
+#: ../libpurple/protocols/oscar/oscar.c:629
+#: ../libpurple/protocols/silc/silc.c:687
+#: ../libpurple/protocols/silc/util.c:549
 msgid "Chat"
 msgstr "Babilado"
 
-#: ../libgaim/protocols/oscar/oscar.c:630
-#: ../libgaim/protocols/oscar/oscar.c:5959
+#: ../libpurple/protocols/oscar/oscar.c:632
+#: ../libpurple/protocols/oscar/oscar.c:5955
 msgid "Get File"
 msgstr "Ricevu Dosieron"
 
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libpurple/protocols/oscar/oscar.c:639
 msgid "Games"
 msgstr "Ludoj"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Add-Ins"
 msgstr "Enaldonaĵoj"
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "Send Buddy List"
 msgstr "Sendu Kunulliston"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:648
 msgid "ICQ Direct Connect"
 msgstr "ICQ Rekta Konekto"
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:651
 msgid "AP User"
 msgstr "AP Uzanto"
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:654
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:657
 msgid "Nihilist"
 msgstr "Nihilisto"
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:660
 msgid "ICQ Server Relay"
 msgstr "ICQ Servilo Reludo"
 
-#: ../libgaim/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:663
 msgid "Old ICQ UTF8"
 msgstr "Malnova ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:666
 msgid "Trillian Encryption"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:669
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:672
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libgaim/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:675
 msgid "Security Enabled"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:678
 msgid "Video Chat"
 msgstr "Video Babilado"
 
-#: ../libgaim/protocols/oscar/oscar.c:680
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libgaim/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Live Video"
 msgstr "Viva Video"
 
-#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "Camera"
 msgstr "Kamerao"
 
-#: ../libgaim/protocols/oscar/oscar.c:704
-#: ../libgaim/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/oscar/oscar.c:706
+#: ../libpurple/protocols/oscar/oscar.c:5728
 msgid "Free For Chat"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:708
-#: ../libgaim/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:710
+#: ../libpurple/protocols/oscar/oscar.c:5763
 msgid "Not Available"
 msgstr "Ne Disponebla"
 
-#: ../libgaim/protocols/oscar/oscar.c:710
-#: ../libgaim/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:712
+#: ../libpurple/protocols/oscar/oscar.c:5749
 msgid "Occupied"
 msgstr "Okupata"
 
-#: ../libgaim/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:716
 msgid "Web Aware"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:718
+#: ../libpurple/protocols/oscar/oscar.c:718 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2894 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:454 ../pidgin/gtkstatusbox.c:1091
+msgid "Invisible"
+msgstr "Nevidebla"
+
+#: ../libpurple/protocols/oscar/oscar.c:720
 msgid "Online"
 msgstr "Enrete"
 
-#: ../libgaim/protocols/oscar/oscar.c:824
-#: ../libgaim/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:819
+#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1015
+msgid "IP Address"
+msgstr "IP adreso"
+
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:2854
 msgid "Warning Level"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:834
+#: ../libpurple/protocols/oscar/oscar.c:836
 msgid "Buddy Comment"
 msgstr "Kunul Komento"
 
-#: ../libgaim/protocols/oscar/oscar.c:974
+#: ../libpurple/protocols/oscar/oscar.c:976
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -10257,7 +6509,7 @@
 "Ne povis konekti al aŭtentokontrolo servilo:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:982
+#: ../libpurple/protocols/oscar/oscar.c:984
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -10266,20 +6518,20 @@
 "Ne povis konekti al BOS servilo:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:1024
 msgid "Screen name sent"
 msgstr "Ekrannomo sendita"
 
-#: ../libgaim/protocols/oscar/oscar.c:1027
+#: ../libpurple/protocols/oscar/oscar.c:1029
 msgid "Connection established, cookie sent"
 msgstr "Konekto estabilta, kuketo sendita"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1056
+#: ../libpurple/protocols/oscar/oscar.c:1058
 msgid "Finalizing connection"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1240
+#: ../libpurple/protocols/oscar/oscar.c:1242
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -10287,125 +6539,124 @@
 "letters, numbers and spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1325
-#: ../libgaim/protocols/yahoo/yahoo.c:1900
+#: ../libpurple/protocols/oscar/oscar.c:1327
+#: ../libpurple/protocols/yahoo/yahoo.c:1929
 msgid "Invalid screen name."
 msgstr "Malvalida ekranonomo."
 
-#: ../libgaim/protocols/oscar/oscar.c:1332
-#: ../libgaim/protocols/qq/login_logout.c:483
-#: ../libgaim/protocols/simple/simple.c:1035
-#: ../libgaim/protocols/yahoo/yahoo.c:1923
+#: ../libpurple/protocols/oscar/oscar.c:1334
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1035
+#: ../libpurple/protocols/yahoo/yahoo.c:1947
 msgid "Incorrect password."
 msgstr "Misa pasvorto."
 
-#: ../libgaim/protocols/oscar/oscar.c:1337
+#: ../libpurple/protocols/oscar/oscar.c:1339
 msgid "Your account is currently suspended."
 msgstr ""
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1341
+#: ../libpurple/protocols/oscar/oscar.c:1343
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "La AOL Tuj Mesaĝilo servo estas provizore nedisponebla."
 
-#: ../libgaim/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/oscar/oscar.c:1348
 msgid ""
 "You have been connecting and disconnecting too frequently. Wait ten minutes "
 "and try again. If you continue to try, you will need to wait even longer."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libpurple/protocols/oscar/oscar.c:1388
 msgid "Could Not Connect"
 msgstr "Ne Povas Konekti"
 
-#: ../libgaim/protocols/oscar/oscar.c:1391
+#: ../libpurple/protocols/oscar/oscar.c:1393
 msgid "Received authorization"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1416
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libpurple/protocols/oscar/oscar.c:1430
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1429
+#: ../libpurple/protocols/oscar/oscar.c:1431
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libgaim/protocols/oscar/oscar.c:1431
-#: ../libgaim/protocols/oscar/oscar.c:2233
-#: ../libgaim/protocols/oscar/oscar.c:2279
-#: ../libgaim/protocols/oscar/oscar.c:5837
-#: ../libgaim/protocols/oscar/oscar.c:6067
-#: ../libgaim/protocols/oscar/oscar.c:6123 ../libgaim/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:1433
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2288
+#: ../libpurple/protocols/oscar/oscar.c:5833
+#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
 msgid "_OK"
 msgstr "_Daŭrigu"
 
-#: ../libgaim/protocols/oscar/oscar.c:1469
-#: ../libgaim/protocols/oscar/oscar.c:1512
+#: ../libpurple/protocols/oscar/oscar.c:1471
+#: ../libpurple/protocols/oscar/oscar.c:1514
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
 "fixed.  Check %s for updates."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1472
-#: ../libgaim/protocols/oscar/oscar.c:1515
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:1601
+#: ../libpurple/protocols/oscar/oscar.c:1474
+#: ../libpurple/protocols/oscar/oscar.c:1517
+msgid "Unable to get a valid AIM login hash."
+msgstr "Ne eblas obteni validan AIM-an profilon."
+
+#: ../libpurple/protocols/oscar/oscar.c:1603
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:1604
-msgid "Gaim was unable to get a valid login hash."
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1606
+msgid "Unable to get a valid login hash."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1632
 msgid "Password sent"
 msgstr "Pasvorto sendita"
 
-#: ../libgaim/protocols/oscar/oscar.c:1686
+#: ../libpurple/protocols/oscar/oscar.c:1688
 msgid "Unable to initialize connection"
 msgstr "Ne povas eki konekton"
 
-#: ../libgaim/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2212
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "B.v. permesi min do mi povas aldoni vin al mia kunullisto."
 
-#: ../libgaim/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Permeso Demando Mesaĝo:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "B.v. permesu min!"
 
-#: ../libgaim/protocols/oscar/oscar.c:2271
-#: ../libgaim/protocols/oscar/oscar.c:2278
-#: ../libgaim/protocols/oscar/oscar.c:2404
-#: ../libgaim/protocols/oscar/oscar.c:5197
-#: ../libgaim/protocols/yahoo/yahoo.c:959
+#: ../libpurple/protocols/oscar/oscar.c:2280
+#: ../libpurple/protocols/oscar/oscar.c:2287
+#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:5221
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "No reason given."
 msgstr "Nenia kialo donita."
 
-#: ../libgaim/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2286
 msgid "Authorization Denied Message:"
 msgstr "Permeso Rifuzo Mesaĝo"
 
-#: ../libgaim/protocols/oscar/oscar.c:2404
+#: ../libpurple/protocols/oscar/oscar.c:2413
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -10413,17 +6664,17 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2414
 msgid "ICQ authorization denied."
 msgstr "ICQ permeso rifuzita."
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2421
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2420
+#: ../libpurple/protocols/oscar/oscar.c:2429
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10432,7 +6683,7 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2437
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10441,7 +6692,7 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2445
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10450,324 +6701,317 @@
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2466
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:2472
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Ĉu vi volas aldoni tiun kunul en via kunullisto?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:2475 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "_Aldonu"
+
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "_Decline"
 msgstr "_Rifuzi"
 
-#: ../libgaim/protocols/oscar/oscar.c:2551
+#: ../libpurple/protocols/oscar/oscar.c:2560
 #, c-format
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2569
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2569
-#, c-format
-msgid "You missed %hu message from %s because the rate limit has been exceeded."
-msgid_plural "You missed %hu messages from %s because the rate limit has been exceeded."
+#: ../libpurple/protocols/oscar/oscar.c:2578
+#, c-format
+msgid ""
+"You missed %hu message from %s because the rate limit has been exceeded."
+msgid_plural ""
+"You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2587
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2587
+#: ../libpurple/protocols/oscar/oscar.c:2596
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2605
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:2718
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr ""
-
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2760
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Ne eblas sendi mesaĝon: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2758
-#: ../libgaim/protocols/oscar/oscar.c:2763
-#: ../libgaim/protocols/oscar/oscar.c:2825
-#: ../libgaim/protocols/oscar/oscar.c:2829
+#: ../libpurple/protocols/oscar/oscar.c:2760
+#: ../libpurple/protocols/oscar/oscar.c:2765
+#: ../libpurple/protocols/oscar/oscar.c:2827
+#: ../libpurple/protocols/oscar/oscar.c:2831
 msgid "Unknown reason."
 msgstr "Nekonata kialo."
 
-#: ../libgaim/protocols/oscar/oscar.c:2761
-#: ../libgaim/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2763
+#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Ne eblas sendi mesaĝon al %s:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2827
 #, c-format
 msgid "User information not available: %s"
 msgstr "Uzantoinformo ne disponebla: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:2830
 #, c-format
 msgid "User information for %s unavailable:"
 msgstr "Uzantoinformo des %s ne disponeblas:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2859
 msgid "Online Since"
 msgstr "Enrete Ek De"
 
-#: ../libgaim/protocols/oscar/oscar.c:2862
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2864
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
 msgid "Member Since"
 msgstr "Membro Ek De"
 
-#: ../libgaim/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:2869
 msgid "Capabilities"
 msgstr "Kapablecoj"
 
-#: ../libgaim/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2887
 msgid "Available Message"
 msgstr "Disponeblaj Mesaĝoj"
 
-#: ../libgaim/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2913
 msgid "Profile"
 msgstr "Profilo"
 
-#: ../libgaim/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:2990
 msgid "Your AIM connection may be lost."
 msgstr "Via AIM konekto perdeblas."
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3175
+#: ../libpurple/protocols/oscar/oscar.c:3177
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3396
+#: ../libpurple/protocols/oscar/oscar.c:3398
 msgid "Rate limiting error."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3397
+#: ../libpurple/protocols/oscar/oscar.c:3399
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3469
+#: ../libpurple/protocols/oscar/oscar.c:3471
 msgid "You have been signed off for an unknown reason."
 msgstr "Vi estas malsalutigita pro nekonata kialo."
 
-#: ../libgaim/protocols/oscar/oscar.c:3482 ../libgaim/protocols/toc/toc.c:977
+#: ../libpurple/protocols/oscar/oscar.c:3484
+#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Vi estas diskonektita de babilejo %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3723
-#: ../libgaim/protocols/silc/util.c:583
+#: ../libpurple/protocols/oscar/oscar.c:3731
+#: ../libpurple/protocols/silc/util.c:581
 msgid "Mobile Phone"
 msgstr "Poŝtelefono"
 
-#: ../libgaim/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/oscar/oscar.c:3761
 msgid "Personal Web Page"
 msgstr "Persona ttt-ejo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3758
-#: ../libgaim/protocols/qq/buddy_info.c:40
+#: ../libpurple/protocols/oscar/oscar.c:3785
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Kroma Informo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3766
-#: ../libgaim/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3806
 msgid "Zip Code"
 msgstr "Poŝtkodo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3817
 msgid "Division"
 msgstr "Dividaĵo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "Position"
 msgstr "Pozicio"
 
-#: ../libgaim/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3820
 msgid "Web Page"
 msgstr "TTT-ejo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3823
 msgid "Work Information"
 msgstr "Laborinformo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3852
+#: ../libpurple/protocols/oscar/oscar.c:3879
 msgid "Pop-Up Message"
 msgstr "Ŝpruca Mesaĝo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3919
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "La jena ekrannomo estas kunligita kun %s"
 msgstr[1] "La jenaj ekrannomoj estas kunligitaj kun %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3897
+#: ../libpurple/protocols/oscar/oscar.c:3924
 msgid "Screen name"
 msgstr "Ekrannomo"
 
-#: ../libgaim/protocols/oscar/oscar.c:3923
+#: ../libpurple/protocols/oscar/oscar.c:3950
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3971
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3946
+#: ../libpurple/protocols/oscar/oscar.c:3973
 msgid "Account Confirmation Requested"
 msgstr "Kontokonfirmo demandita"
 
-#: ../libgaim/protocols/oscar/oscar.c:3977
+#: ../libpurple/protocols/oscar/oscar.c:4004
 msgid "Error Changing Account Info"
 msgstr "Eraro ŝanĝante kontoinformon"
 
-#: ../libgaim/protocols/oscar/oscar.c:3980
+#: ../libpurple/protocols/oscar/oscar.c:4007
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "differs from the original."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:4010
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:4013
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
 "is too long."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3989
+#: ../libpurple/protocols/oscar/oscar.c:4016
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
 "request pending for this screen name."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3992
+#: ../libpurple/protocols/oscar/oscar.c:4019
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
 "too many screen names associated with it."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3995
+#: ../libpurple/protocols/oscar/oscar.c:4022
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
 "invalid."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4025
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Eraro 0x%04x: Nekonata eraro."
 
-#: ../libgaim/protocols/oscar/oscar.c:4008
-#, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-"Via ekrannomo estas nun formatumita tiel:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:4009
-#: ../libgaim/protocols/oscar/oscar.c:4016
-msgid "Account Info"
-msgstr "Konto Informo"
-
-#: ../libgaim/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4035
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "La retadreso de %s estas %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4189
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:4441
+#: ../libpurple/protocols/oscar/oscar.c:4037
+msgid "Account Info"
+msgstr "Konto Informo"
+
+#: ../libpurple/protocols/oscar/oscar.c:4210
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4462
 msgid "Unable to set AIM profile."
 msgstr "Ne eblas difini AIM-an profilon."
 
-#: ../libgaim/protocols/oscar/oscar.c:4442
+#: ../libpurple/protocols/oscar/oscar.c:4463
 msgid ""
 "You have probably requested to set your profile before the login procedure "
 "completed.  Your profile remains unset; try setting it again when you are "
 "fully connected."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4456
-#, c-format
-msgid ""
-"The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
-"it for you."
+#: ../libpurple/protocols/oscar/oscar.c:4477
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated it for you."
 msgid_plural ""
-"The maximum profile length of %d bytes has been exceeded.  Gaim has "
+"The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated it for you."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Profile too long."
 msgstr "Profilo tro longa."
 
-#: ../libgaim/protocols/oscar/oscar.c:4505
-#, c-format
-msgid ""
-"The maximum away message length of %d byte has been exceeded.  Gaim has "
-"truncated it for you."
+#: ../libpurple/protocols/oscar/oscar.c:4527
+#, c-format
+msgid ""
+"The maximum away message length of %d byte has been exceeded.  It has been "
+"truncated for you."
 msgid_plural ""
-"The maximum away message length of %d bytes has been exceeded.  Gaim has "
-"truncated it for you."
+"The maximum away message length of %d bytes has been exceeded.  It has been "
+"truncated for you."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4510
+#: ../libpurple/protocols/oscar/oscar.c:4532
 msgid "Away message too long."
 msgstr "Formesaĝo tro longa."
 
-#: ../libgaim/protocols/oscar/oscar.c:4579
+#: ../libpurple/protocols/oscar/oscar.c:4601
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -10775,45 +7019,44 @@
 "spaces, or contain only numbers."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:4581
-#: ../libgaim/protocols/oscar/oscar.c:5004
-#: ../libgaim/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:4603
+#: ../libpurple/protocols/oscar/oscar.c:5028
+#: ../libpurple/protocols/oscar/oscar.c:5042
 msgid "Unable To Add"
 msgstr "Ne eblas Aldoni"
 
-#: ../libgaim/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4707
 msgid "Unable To Retrieve Buddy List"
 msgstr "Ne eblas Ricevi Kunulliston"
 
-#: ../libgaim/protocols/oscar/oscar.c:4686
-msgid ""
-"Gaim was temporarily unable to retrieve your buddy list from the AIM "
-"servers.  Your buddy list is not lost, and will probably become available in "
-"a few hours."
-msgstr ""
-
-#: ../libgaim/protocols/oscar/oscar.c:4890
-#: ../libgaim/protocols/oscar/oscar.c:4891
-#: ../libgaim/protocols/oscar/oscar.c:4896
-#: ../libgaim/protocols/oscar/oscar.c:5072
-#: ../libgaim/protocols/oscar/oscar.c:5073
-#: ../libgaim/protocols/oscar/oscar.c:5078
+#: ../libpurple/protocols/oscar/oscar.c:4708
+msgid ""
+"The AIM servers were temporarily unable to send your buddy list.  Your buddy "
+"list is not lost, and will probably become available in a few hours."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4913
+#: ../libpurple/protocols/oscar/oscar.c:4914
+#: ../libpurple/protocols/oscar/oscar.c:4919
+#: ../libpurple/protocols/oscar/oscar.c:5096
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5102
 msgid "Orphans"
 msgstr "Senpatroj"
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
+#: ../libpurple/protocols/oscar/oscar.c:5026
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
 "list.  Please remove one and try again."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5040
 msgid "(no name)"
 msgstr "(sen nomo)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5040
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -10821,29 +7064,29 @@
 "buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5109
+#: ../libpurple/protocols/oscar/oscar.c:5133
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5115
+#: ../libpurple/protocols/oscar/oscar.c:5139
 msgid "Authorization Given"
 msgstr "Permeso Donita"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5217
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "La uzanto %s koncedis vian demandon aldoni sin al via kunullisto."
 
-#: ../libgaim/protocols/oscar/oscar.c:5194
+#: ../libpurple/protocols/oscar/oscar.c:5218
 msgid "Authorization Granted"
 msgstr "Aŭtentigo Koncedita"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5197
+#: ../libpurple/protocols/oscar/oscar.c:5221
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -10854,114 +7097,115 @@
 "jena kialo:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/oscar/oscar.c:5222
 msgid "Authorization Denied"
 msgstr "Permeso Rifuzita"
 
-#: ../libgaim/protocols/oscar/oscar.c:5234 ../libgaim/protocols/toc/toc.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:5258
+#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Interŝanĝo"
 
-#: ../libgaim/protocols/oscar/oscar.c:5274
+#: ../libpurple/protocols/oscar/oscar.c:5298
 msgid "Invalid chat name specified."
 msgstr "Malvalida babilejonomo enigita."
 
-#: ../libgaim/protocols/oscar/oscar.c:5344
+#: ../libpurple/protocols/oscar/oscar.c:5368
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Via TM-a Bildo ne estis sendita. Vi ne povas sendi TM-ajn Bildojn en AIM "
 "babilejoj."
 
-#: ../libgaim/protocols/oscar/oscar.c:5516
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5507
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Away Message"
 msgstr "Formesaĝo"
 
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(ricevante)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5722
+msgid "iTunes Music Store Link"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kunul Komento por %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5831
 msgid "Buddy Comment:"
 msgstr "Kunul Komento:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5877
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Vi elektis malfermi Rektan TM konekton kun %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:5885
+#: ../libpurple/protocols/oscar/oscar.c:5881
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:5889
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "C_onnect"
 msgstr "K_onektu"
 
-#: ../libgaim/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get AIM Info"
 msgstr "Ricevu AIM Informon"
 
-#: ../libgaim/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5926
 msgid "Edit Buddy Comment"
 msgstr "Redaktu Kunul Komenton"
 
-#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Get Status Msg"
 msgstr "Ricevi Statan Mesaĝon"
 
-#: ../libgaim/protocols/oscar/oscar.c:5951
+#: ../libpurple/protocols/oscar/oscar.c:5947
 msgid "Direct IM"
 msgstr "Rekta TM"
 
-#: ../libgaim/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:5969
 msgid "Re-request Authorization"
 msgstr "Re-petu aŭtentigon"
 
-#: ../libgaim/protocols/oscar/oscar.c:6032
+#: ../libpurple/protocols/oscar/oscar.c:6028
 msgid "Require authorization"
 msgstr "Petu aŭtentigon"
 
-#: ../libgaim/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6040
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privatecaj Opcioj"
 
-#: ../libgaim/protocols/oscar/oscar.c:6057
+#: ../libpurple/protocols/oscar/oscar.c:6053
 msgid "The new formatting is invalid."
 msgstr "La nova formatumo malvalidas."
 
-#: ../libgaim/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6054
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/oscar.c:6065
-msgid "New screen name formatting:"
-msgstr "Nova ekrana nomo formatumo:"
-
-#: ../libgaim/protocols/oscar/oscar.c:6121
+#: ../libpurple/protocols/oscar/oscar.c:6107
 msgid "Change Address To:"
 msgstr "Ŝanĝu adreson al:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6152
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>vi ne atendas aŭtentigon</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6169
+#: ../libpurple/protocols/oscar/oscar.c:6155
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Vi atendas aŭtentigon de la jenaj kunuloj"
 
-#: ../libgaim/protocols/oscar/oscar.c:6170
+#: ../libpurple/protocols/oscar/oscar.c:6156
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -10969,657 +7213,664 @@
 "Vi povas re-peti aŭtentigon el tiuj kunuloj per dekstre-klaki ilin kaj "
 "elekti \"Re-petu aŭtentigon.\""
 
-#: ../libgaim/protocols/oscar/oscar.c:6187
+#: ../libpurple/protocols/oscar/oscar.c:6173
 msgid "Find Buddy by E-Mail"
 msgstr "Trovu kunulon laŭ Retadreso"
 
-#: ../libgaim/protocols/oscar/oscar.c:6188
+#: ../libpurple/protocols/oscar/oscar.c:6174
 msgid "Search for a buddy by e-mail address"
 msgstr "Serĉu kunulon laŭ retadreso"
 
-#: ../libgaim/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6175
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Tajpu retadreson de la kunul kiun vi serĉas."
 
-#: ../libgaim/protocols/oscar/oscar.c:6192
+#: ../libpurple/protocols/oscar/oscar.c:6178
 msgid "_Search"
 msgstr "_Serĉu"
 
-#: ../libgaim/protocols/oscar/oscar.c:6361
+#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Set User Info (URL)..."
 msgstr "Difinu Uzanto-Informon (URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6358
 msgid "Change Password (URL)"
 msgstr "Ŝanĝu Pasvorton (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6376
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Configure IM Forwarding (URL)"
 msgstr "Agordu TM Plusendado (URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6386
+#: ../libpurple/protocols/oscar/oscar.c:6372
 msgid "Set Privacy Options..."
 msgstr "Difinu Privatecajn Opciojn..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6393
-msgid "Format Screen Name..."
-msgstr "Formatu Ekrano-Nomon..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6397
+#: ../libpurple/protocols/oscar/oscar.c:6379
 msgid "Confirm Account"
 msgstr "Konfirmu Konton"
 
-#: ../libgaim/protocols/oscar/oscar.c:6401
+#: ../libpurple/protocols/oscar/oscar.c:6383
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Vidigu Aktualajn Aliĝintajn Retadresojn"
 
-#: ../libgaim/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6387
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ŝanĝu Aktualajn Aliĝintajn Retadresojn.."
 
-#: ../libgaim/protocols/oscar/oscar.c:6412
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Montru Kunulojn Atendante Permeso"
 
-#: ../libgaim/protocols/oscar/oscar.c:6418
+#: ../libpurple/protocols/oscar/oscar.c:6400
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Serĉu Kunulon laŭ Retadreso..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6423
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Search for Buddy by Information"
 msgstr "Serĉu Kunulon laŭ Informo..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Use recent buddies group"
 msgstr "Uzu ĵusan kunulgrupon"
 
-#: ../libgaim/protocols/oscar/oscar.c:6494
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Show how long you have been idle"
 msgstr "Montru kiom longa vi estis senfara"
 
-#: ../libgaim/protocols/oscar/peer.c:674
+#: ../libpurple/protocols/oscar/oscar.c:6628
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Ĉiam uzi ICQ-n prokurservilon por dosiero alŝutoj\n"
+"(pli malrapida, sed vualigas vian IP adreson)"
+
+#: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Demandas %s konekti nin al %s:%hu por Rekta TM."
 
-#: ../libgaim/protocols/oscar/peer.c:759
+#: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Provas konekti al %s:%hu"
 
-#: ../libgaim/protocols/oscar/peer.c:833
+#: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr "Provas konekti pere de prokurservilo."
 
-#: ../libgaim/protocols/oscar/peer.c:1010
+#: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s ĵus petis rektan konekton al %s"
 
-#: ../libgaim/protocols/oscar/peer.c:1014
+#: ../libpurple/protocols/oscar/peer.c:1014
 msgid ""
 "This requires a direct connection between the two computers and is necessary "
 "for IM Images.  Because your IP address will be revealed, this may be "
 "considered a privacy risk."
 msgstr ""
 
-#: ../libgaim/protocols/oscar/peer.c:1020
+#: ../libpurple/protocols/oscar/peer.c:1020
 msgid "_Connect"
 msgstr "_Konektu"
 
-#: ../libgaim/protocols/qq/buddy_info.c:39
+#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Ĉefa Informo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Persono Enkonduko"
 
-#: ../libgaim/protocols/qq/buddy_info.c:42
+#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ Nombro"
 
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Lando/Regiono"
 
-#: ../libgaim/protocols/qq/buddy_info.c:48
+#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provinco/Ŝtato"
 
-#: ../libgaim/protocols/qq/buddy_info.c:50
+#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Horoskopa Simbolo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Zodiaka Signo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:53
+#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Sanga Tipo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Kolegio"
 
-#: ../libgaim/protocols/qq/buddy_info.c:55
+#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "Retadreso"
 
-#: ../libgaim/protocols/qq/buddy_info.c:57
+#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Poŝtkodo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Poŝtelefona Numero"
 
-#: ../libgaim/protocols/qq/buddy_info.c:59
+#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telefonnumero"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Verŝisto"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Fiŝoj"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Ŝafo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Bovo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Ĝemeloj "
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Kankro"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Leono"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Virgulino"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Pesilo "
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Skorpio "
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Pafisto"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Kaprikorno"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Rato"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tigro"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Kuniklo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Drako"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Serpento"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Ĉevalo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Kapro"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Simio"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Virkoko"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Hundo"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Porko"
 
-#: ../libgaim/protocols/qq/buddy_info.c:78
+#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Alia"
 
-#: ../libgaim/protocols/qq/buddy_info.c:481
-#: ../libgaim/protocols/qq/buddy_info.c:482
+#: ../libpurple/protocols/qq/buddy_info.c:481
+#: ../libpurple/protocols/qq/buddy_info.c:482
 msgid "Modify my information"
 msgstr "Ŝanĝu mian informon"
 
-#: ../libgaim/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "Aktualigi mian informon"
 
-#: ../libgaim/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:506
 msgid "Your information has been updated"
 msgstr "Via informo estas aktualigita."
 
-#: ../libgaim/protocols/qq/buddy_info.c:565
-msgid ""
-"You are attempting to set a custom face. Gaim currently only allows the "
-"standard faces. Please choose an image from "
-msgstr ""
-
-#: ../libgaim/protocols/qq/buddy_info.c:582
-#: ../libgaim/protocols/qq/buddy_info.c:595
+#: ../libpurple/protocols/qq/buddy_info.c:565
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+msgstr ""
+
+#: ../libpurple/protocols/qq/buddy_info.c:582
+#: ../libpurple/protocols/qq/buddy_info.c:595
 msgid "Invalid QQ Face"
 msgstr "Malvalida QQ Aspekto"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:207
-#: ../libgaim/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:207
+#: ../libpurple/protocols/qq/group_opt.c:135
 #, c-format
 msgid "You rejected %d's request"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-#: ../libgaim/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/group_opt.c:136
 msgid "Input your reason:"
 msgstr "Enigu vian kialon:"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:210
 msgid "Reject request"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:211
-#: ../libgaim/protocols/qq/group_opt.c:139
+#: ../libpurple/protocols/qq/buddy_opt.c:211
+#: ../libpurple/protocols/qq/group_opt.c:139
 msgid "Sorry, you are not my type..."
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:212
-#: ../libgaim/protocols/qq/group_im.c:136
-#: ../libgaim/protocols/qq/group_opt.c:125
-#: ../libgaim/protocols/qq/sys_msg.c:85 ../libgaim/protocols/qq/sys_msg.c:228
+#: ../libpurple/protocols/qq/buddy_opt.c:212
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_opt.c:125
+#: ../libpurple/protocols/qq/sys_msg.c:85
+#: ../libpurple/protocols/qq/sys_msg.c:228
 msgid "Reject"
 msgstr "Malakceptu"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:272
 msgid "Add buddy with auth request fails"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:303
 msgid "You have successfully removed a buddy"
 msgstr "Vi sukcese forigis kunulon"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:331
 msgid "You have successfully removed yourself from a buddy"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:395
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Uzanto %d bezonas aŭtentokontrolon"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:397
+#: ../libpurple/protocols/qq/group_join.c:134
 msgid "Input request here"
 msgstr ""
 
-#: ../libgaim/protocols/qq/buddy_opt.c:398
-#: ../libgaim/protocols/qq/group_join.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:398
+#: ../libpurple/protocols/qq/group_join.c:135
 msgid "Would you be my friend?"
 msgstr "Ĉu vi estus mia amiko?"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:399
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/buddy_opt.c:399
+#: ../libpurple/protocols/qq/group_join.c:136
+#: ../libpurple/protocols/qq/group_opt.c:140
 msgid "Send"
 msgstr "Sendu"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:406
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "Vi aldonis %d-n en kunullisto"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:503
 msgid "QQid Error"
 msgstr "QQid Eraro"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:504
 msgid "Invalid QQid"
 msgstr "Malvalida QQid"
 
-#: ../libgaim/protocols/qq/group.c:65
+#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libgaim/protocols/qq/group.c:98
+#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "Grupo ID"
 
-#: ../libgaim/protocols/qq/group.c:100
+#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Kreanto"
 
-#: ../libgaim/protocols/qq/group.c:103
+#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Grupo Priskribo"
 
-#: ../libgaim/protocols/qq/group.c:109
+#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Permesi"
 
-#: ../libgaim/protocols/qq/group.c:119
+#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libgaim/protocols/qq/group.c:120
+#: ../libpurple/protocols/qq/group.c:120
 msgid "Please input external group ID"
 msgstr "B.v. enigi eksteran groupon ID-n"
 
-#: ../libgaim/protocols/qq/group.c:121
+#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:122
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "Uzanto %d aliĝpetis grupon %d"
 
-#: ../libgaim/protocols/qq/group_im.c:123
-#: ../libgaim/protocols/qq/group_im.c:172
-#: ../libgaim/protocols/qq/sys_msg.c:180
+#: ../libpurple/protocols/qq/group_im.c:123
+#: ../libpurple/protocols/qq/group_im.c:172
+#: ../libpurple/protocols/qq/sys_msg.c:180
 #, c-format
 msgid "Reason: %s"
 msgstr "Kialo: %s"
 
-#: ../libgaim/protocols/qq/group_im.c:130
-#: ../libgaim/protocols/qq/group_im.c:174
-#: ../libgaim/protocols/qq/group_im.c:214
-#: ../libgaim/protocols/qq/group_im.c:249
-#: ../libgaim/protocols/qq/group_im.c:283
-#: ../libgaim/protocols/qq/group_join.c:229
-#: ../libgaim/protocols/qq/group_join.c:355
-#: ../libgaim/protocols/qq/group_opt.c:230
-#: ../libgaim/protocols/qq/group_opt.c:300
-#: ../libgaim/protocols/qq/group_opt.c:386
+#: ../libpurple/protocols/qq/group_im.c:130
+#: ../libpurple/protocols/qq/group_im.c:174
+#: ../libpurple/protocols/qq/group_im.c:214
+#: ../libpurple/protocols/qq/group_im.c:249
+#: ../libpurple/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:355
+#: ../libpurple/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:386
 msgid "QQ Qun Operation"
 msgstr "QQ Qun Operacio"
 
-#: ../libgaim/protocols/qq/group_im.c:133
-#: ../libgaim/protocols/qq/group_opt.c:127
-#: ../libgaim/protocols/qq/sys_msg.c:87 ../libgaim/protocols/qq/sys_msg.c:230
+#: ../libpurple/protocols/qq/group_im.c:133
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:87
+#: ../libpurple/protocols/qq/sys_msg.c:230
 msgid "Approve"
 msgstr "Aprobi"
 
-#: ../libgaim/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:171
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:212
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:248
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:282
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:283
 msgid "This group has been added to your buddy list"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:41
+#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not member"
 msgstr "Mi ne estas membro"
 
-#: ../libgaim/protocols/qq/group_internal.c:44
+#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Mi estas membro"
 
-#: ../libgaim/protocols/qq/group_internal.c:47
+#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Mi aliĝpetas"
 
-#: ../libgaim/protocols/qq/group_internal.c:50
+#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_internal.c:53
+#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Nekonata stato"
 
-#: ../libgaim/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:80
 msgid "This group does not allow others to join"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:229
 msgid "You have successfully exited the group"
 msgstr "Vi sukcese forlasis la grupon"
 
-#: ../libgaim/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:253
 msgid "QQ Group Auth"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:254
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:325
 msgid "You inputted a group id outside the acceptable range"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:356
 msgid "Are you sure to exit this Qun?"
 msgstr "Ĉu vi certas vi volas forigi tiun Qun-on?"
 
-#: ../libgaim/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:358
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:361
 msgid "Go ahead"
 msgstr "Daŭrigu"
 
-#: ../libgaim/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:90
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Kodo [0x%02X]: %s"
 
-#: ../libgaim/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:91
 msgid "Group Operation Error"
 msgstr "Grupoperacio Eraro"
 
-#: ../libgaim/protocols/qq/group_opt.c:124
-#: ../libgaim/protocols/qq/sys_msg.c:84
+#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/sys_msg.c:84
 msgid "Do you wanna approve the request?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:230
 msgid "You have successfully modify Qun member"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:300
 msgid "You have successfully modify Qun information"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:387
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:389
 msgid "Would you like to set up the Qun details now?"
 msgstr ""
 
-#: ../libgaim/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:390
 msgid "Setup"
 msgstr "Agordo"
 
-#: ../libgaim/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:423
 msgid "System Message"
 msgstr "Sistemo Mesaĝo"
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:567
 msgid "Server ACK"
 msgstr "Servilo ACK"
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:567
 msgid "Send IM fail\n"
 msgstr "TM Sendo malsukcesis\n"
 
-#: ../libgaim/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/keep_alive.c:85
 msgid "Keep alive error, seems connection lost!"
 msgstr ""
 
-#: ../libgaim/protocols/qq/login_logout.c:408
+#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
 msgstr ""
 
-#: ../libgaim/protocols/qq/login_logout.c:486
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr ""
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libgaim/protocols/qq/qq.c:139 ../libgaim/protocols/toc/toc.c:173
-#: ../libgaim/protocols/yahoo/yahoo.c:2351
-#: ../libgaim/protocols/yahoo/yahoo.c:2378
-#: ../libgaim/protocols/yahoo/yahoo.c:2485
-#: ../libgaim/protocols/yahoo/yahoo.c:2506
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:188
-#: ../libgaim/protocols/yahoo/ycht.c:549
+#. TODO: Include error_message in the message below
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo.c:2375
+#: ../libpurple/protocols/yahoo/yahoo.c:2403
+#: ../libpurple/protocols/yahoo/yahoo.c:2510
+#: ../libpurple/protocols/yahoo/yahoo.c:2531
+#: ../libpurple/protocols/yahoo/yahoo.c:2615
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Ne konekteblas."
 
-#: ../libgaim/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Nekonata-%d"
 
-#: ../libgaim/protocols/qq/qq.c:209
+#: ../libpurple/protocols/qq/qq.c:209
 #, c-format
 msgid "%s Address"
 msgstr "%s Adreso"
 
-#: ../libgaim/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:240
 msgid "Level"
 msgstr "Nivelo"
 
-#: ../libgaim/protocols/qq/qq.c:294
+#: ../libpurple/protocols/qq/qq.c:278
 msgid "QQ: Available"
 msgstr "QQ: Disponebla"
 
-#: ../libgaim/protocols/qq/qq.c:298
+#: ../libpurple/protocols/qq/qq.c:282
 msgid "QQ: Away"
 msgstr "QQ: Fora"
 
-#: ../libgaim/protocols/qq/qq.c:302
+#: ../libpurple/protocols/qq/qq.c:286
 msgid "QQ: Invisible"
 msgstr "QQ: Nevidebla"
 
-#: ../libgaim/protocols/qq/qq.c:306
+#: ../libpurple/protocols/qq/qq.c:290
 msgid "QQ: Offline"
 msgstr "QQ: Senkonekta"
 
-#: ../libgaim/protocols/qq/qq.c:383
+#: ../libpurple/protocols/qq/qq.c:371
 msgid "Invalid name"
 msgstr "Malvalida Uzantonomo"
 
-#: ../libgaim/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:462
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:463
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:464
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:468
+#: ../libpurple/protocols/qq/qq.c:456
 msgid "Login Information"
 msgstr "Ensaluta Informo"
 
-#: ../libgaim/protocols/qq/qq.c:543
+#: ../libpurple/protocols/qq/qq.c:531
 msgid "Modify My Information"
 msgstr "Ŝanĝu Mian Informon"
 
-#: ../libgaim/protocols/qq/qq.c:546 ../libgaim/protocols/toc/toc.c:1700
+#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:549
+#: ../libpurple/protocols/qq/qq.c:537
 msgid "Show Login Information"
 msgstr "Montru Ensalutan Informon"
 
-#: ../libgaim/protocols/qq/qq.c:570
+#: ../libpurple/protocols/qq/qq.c:558
 msgid "Exit this QQ Qun"
 msgstr ""
 
@@ -11633,272 +7884,273 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/qq/qq.c:731 ../libgaim/protocols/qq/qq.c:733
+#: ../libpurple/protocols/qq/qq.c:719 ../libpurple/protocols/qq/qq.c:721
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ Protokolo\tKromaĵo"
 
-#: ../libgaim/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:740
 msgid "Login in TCP"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq.c:755
+#: ../libpurple/protocols/qq/qq.c:743
 msgid "Login Hidden"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq_proxy.c:497
+#: ../libpurple/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/qq_proxy.c:500
+#: ../libpurple/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
 msgstr "Konekto malakceptita"
 
-#: ../libgaim/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr ""
 
-#: ../libgaim/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr ""
 
-#: ../libgaim/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:706
 #, c-format
 msgid "%d has declined the file %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/send_file.c:709
-#: ../libgaim/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:709
+#: ../libpurple/protocols/qq/send_file.c:738
 msgid "File Send"
 msgstr ""
 
-#: ../libgaim/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:735
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:122
 msgid "Connection lost"
 msgstr "Konekto perdita"
 
 #. cancel login progress
-#: ../libgaim/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:130
 msgid "Login failed, no reply"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:103
 msgid "Do you wanna add this buddy?"
 msgstr "Ĉu vi volas aldoni tiun kunul?"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:155
 #, c-format
 msgid "You have been added by %s"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:158
 msgid "Would like to add him?"
 msgstr "Ĉu vi deziras aldoni ŝlin?"
 
-#: ../libgaim/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:164
 #, c-format
 msgid "%s has added you [%s]"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:179
 #, c-format
 msgid "User %s rejected your request"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:199
 #, c-format
 msgid "User %s has approved your request"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:222
+#: ../libpurple/protocols/qq/sys_msg.c:222
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:223
 #, c-format
 msgid "Message: %s"
 msgstr "Mesaĝo: %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:244
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr ""
 
-#: ../libgaim/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Would you like to add him?"
 msgstr "Ĉu vi deziras aldoni ŝlin?"
 
-#: ../libgaim/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Koneto fermita (skribante)"
 
-#: ../libgaim/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupo Titolo:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1645
-#, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr ""
-
-#: ../libgaim/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1645
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+
+#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr ""
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1732
-#: ../libgaim/protocols/sametime/sametime.c:3745
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3724
 msgid "Unable to connect to host"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:2960
+#: ../libpurple/protocols/sametime/sametime.c:2960
 msgid "Place Closed"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3251
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Microphone"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3252
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3253
+#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3257
+#: ../libpurple/protocols/sametime/sametime.c:3236
 msgid "File Transfer"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3291
-#: ../libgaim/protocols/sametime/sametime.c:4165
+#: ../libpurple/protocols/sametime/sametime.c:3270
+#: ../libpurple/protocols/sametime/sametime.c:4144
 msgid "Supports"
 msgstr "Subtenas"
 
-#: ../libgaim/protocols/sametime/sametime.c:3296
-#: ../libgaim/protocols/sametime/sametime.c:4139
+#: ../libpurple/protocols/sametime/sametime.c:3275
+#: ../libpurple/protocols/sametime/sametime.c:4118
 msgid "External User"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3402
+#: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Create conference with user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3403
+#: ../libpurple/protocols/sametime/sametime.c:3382
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
 "sent to %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3407
+#: ../libpurple/protocols/sametime/sametime.c:3386
 msgid "New Conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3409
+#: ../libpurple/protocols/sametime/sametime.c:3388
 msgid "Create"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3473
+#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3479
+#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3486
+#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3487
+#: ../libpurple/protocols/sametime/sametime.c:3466
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -11906,150 +8158,154 @@
 "this user to."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3492
+#: ../libpurple/protocols/sametime/sametime.c:3471
 msgid "Invite to Conference"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3582
+#: ../libpurple/protocols/sametime/sametime.c:3561
 msgid "Invite to Conference..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3587
+#: ../libpurple/protocols/sametime/sametime.c:3566
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3634
+#: ../libpurple/protocols/sametime/sametime.c:3585 ../pidgin/gtkconv.c:4161
+msgid "Topic:"
+msgstr "Temo:"
+
+#: ../libpurple/protocols/sametime/sametime.c:3613
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3656
+#: ../libpurple/protocols/sametime/sametime.c:3635
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
 "Please enter one below to continue logging in."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3661
+#: ../libpurple/protocols/sametime/sametime.c:3640
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:3662
+#: ../libpurple/protocols/sametime/sametime.c:3641
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4155
+#: ../libpurple/protocols/sametime/sametime.c:4134
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4157
+#: ../libpurple/protocols/sametime/sametime.c:4136
 msgid "Last Known Client"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4321
-#: ../libgaim/protocols/sametime/sametime.c:5516
+#: ../libpurple/protocols/sametime/sametime.c:4300
+#: ../libpurple/protocols/sametime/sametime.c:5495
 msgid "User Name"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4324
-#: ../libgaim/protocols/sametime/sametime.c:5519
+#: ../libpurple/protocols/sametime/sametime.c:4303
+#: ../libpurple/protocols/sametime/sametime.c:5498
 msgid "Sametime ID"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4348
+#: ../libpurple/protocols/sametime/sametime.c:4327
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4349
+#: ../libpurple/protocols/sametime/sametime.c:4328
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
 "select the correct user from the list below to add them to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4354
+#: ../libpurple/protocols/sametime/sametime.c:4333
 msgid "Select User"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4438
+#: ../libpurple/protocols/sametime/sametime.c:4417
 msgid "Unable to add user: user not found"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4440
+#: ../libpurple/protocols/sametime/sametime.c:4419
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
 "entry has been removed from your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:4445
+#: ../libpurple/protocols/sametime/sametime.c:4424
 msgid "Unable to add user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5031
+#: ../libpurple/protocols/sametime/sametime.c:5010
 #, c-format
 msgid ""
 "Error reading file %s: \n"
 "%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5166
+#: ../libpurple/protocols/sametime/sametime.c:5145
 msgid "Remotely Stored Buddy List"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5171
+#: ../libpurple/protocols/sametime/sametime.c:5150
 msgid "Buddy List Storage Mode"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5174
+#: ../libpurple/protocols/sametime/sametime.c:5153
 msgid "Local Buddy List Only"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5176
+#: ../libpurple/protocols/sametime/sametime.c:5155
 msgid "Merge List from Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5178
+#: ../libpurple/protocols/sametime/sametime.c:5157
 msgid "Merge and Save List to Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5180
+#: ../libpurple/protocols/sametime/sametime.c:5159
 msgid "Synchronize List with Server"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5229
+#: ../libpurple/protocols/sametime/sametime.c:5208
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5268
+#: ../libpurple/protocols/sametime/sametime.c:5247
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5321
+#: ../libpurple/protocols/sametime/sametime.c:5300
 msgid "Unable to add group: group exists"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5322
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5325
-#: ../libgaim/protocols/sametime/sametime.c:5454
+#: ../libpurple/protocols/sametime/sametime.c:5304
+#: ../libpurple/protocols/sametime/sametime.c:5433
 msgid "Unable to add group"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5384
+#: ../libpurple/protocols/sametime/sametime.c:5363
 msgid "Possible Matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5400
+#: ../libpurple/protocols/sametime/sametime.c:5379
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5401
+#: ../libpurple/protocols/sametime/sametime.c:5380
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -12057,37 +8313,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5406
+#: ../libpurple/protocols/sametime/sametime.c:5385
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5448
+#: ../libpurple/protocols/sametime/sametime.c:5427
 msgid "Unable to add group: group not found"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5450
+#: ../libpurple/protocols/sametime/sametime.c:5429
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5491
+#: ../libpurple/protocols/sametime/sametime.c:5470
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5492
+#: ../libpurple/protocols/sametime/sametime.c:5471
 msgid ""
 "Enter the name of a Notes Address Book group in the field below to add the "
 "group and its members to your buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5540
+#: ../libpurple/protocols/sametime/sametime.c:5519
 #, c-format
 msgid "Search results for '%s'"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5541
+#: ../libpurple/protocols/sametime/sametime.c:5520
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -12095,113 +8351,124 @@
 "buttons below."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5573
+#: ../libpurple/protocols/sametime/sametime.c:5527 ../pidgin/gtknotify.c:709
+msgid "Search Results"
+msgstr "Serĉ-Rezultojn"
+
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "No matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5574
+#: ../libpurple/protocols/sametime/sametime.c:5553
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5578
+#: ../libpurple/protocols/sametime/sametime.c:5557
 msgid "No Matches"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5615
+#: ../libpurple/protocols/sametime/sametime.c:5594
 msgid "Search for a user"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5616
+#: ../libpurple/protocols/sametime/sametime.c:5595
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5619
+#: ../libpurple/protocols/sametime/sametime.c:5598
 msgid "User Search"
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5631
+#: ../libpurple/protocols/sametime/sametime.c:5610
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5635
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5639
+#: ../libpurple/protocols/sametime/sametime.c:5618
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5643
+#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "User Search..."
 msgstr ""
 
-#: ../libgaim/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5719
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5729
 msgid "Hide client identity"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:52 ../libgaim/protocols/silc/buddy.c:420
-#: ../libgaim/protocols/silc/buddy.c:545 ../libgaim/protocols/silc/buddy.c:711
-#: ../libgaim/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:52
+#: ../libpurple/protocols/silc/buddy.c:420
+#: ../libpurple/protocols/silc/buddy.c:545
+#: ../libpurple/protocols/silc/buddy.c:711
+#: ../libpurple/protocols/silc/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:53 ../libgaim/protocols/silc/buddy.c:115
-#: ../libgaim/protocols/silc/buddy.c:120 ../libgaim/protocols/silc/buddy.c:124
-#: ../libgaim/protocols/silc/buddy.c:129 ../libgaim/protocols/silc/buddy.c:134
-#: ../libgaim/protocols/silc/buddy.c:139 ../libgaim/protocols/silc/buddy.c:257
+#: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:124
+#: ../libpurple/protocols/silc/buddy.c:129
+#: ../libpurple/protocols/silc/buddy.c:134
+#: ../libpurple/protocols/silc/buddy.c:139
+#: ../libpurple/protocols/silc/buddy.c:257
 msgid "Key Agreement"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:120
 msgid "Key Agreement failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:135
 msgid "Key agreement is already started"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:258 ../libgaim/protocols/silc/buddy.c:388
-#: ../libgaim/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:258
+#: ../libpurple/protocols/silc/buddy.c:388
+#: ../libpurple/protocols/silc/buddy.c:513
 msgid "The remote user is not present in the network any more"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:294
+#: ../libpurple/protocols/silc/buddy.c:294
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
 "agreement?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:298
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -12209,308 +8476,342 @@
 "Remote port: %d"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:311
 msgid "Key Agreement Request"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:387 ../libgaim/protocols/silc/buddy.c:422
-#: ../libgaim/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:387
+#: ../libpurple/protocols/silc/buddy.c:422
+#: ../libpurple/protocols/silc/buddy.c:464
 msgid "IM With Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:423
 msgid "Cannot set IM key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:465
 msgid "Set IM Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:512 ../libgaim/protocols/silc/buddy.c:547
-#: ../libgaim/protocols/silc/ops.c:1494 ../libgaim/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:512
+#: ../libpurple/protocols/silc/buddy.c:547
+#: ../libpurple/protocols/silc/ops.c:1494
+#: ../libpurple/protocols/silc/ops.c:1505
 msgid "Get Public Key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:548 ../libgaim/protocols/silc/ops.c:1495
-#: ../libgaim/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:548
+#: ../libpurple/protocols/silc/ops.c:1495
+#: ../libpurple/protocols/silc/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:634
-#: ../libgaim/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:634
+#: ../libpurple/protocols/silc/buddy.c:1647
 msgid "Show Public Key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:635
-#: ../libgaim/protocols/silc/buddy.c:1030 ../libgaim/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:635
+#: ../libpurple/protocols/silc/buddy.c:1030
+#: ../libpurple/protocols/silc/chat.c:237
 msgid "Could not load public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:712 ../libgaim/protocols/silc/ops.c:1087
-#: ../libgaim/protocols/silc/ops.c:1159 ../libgaim/protocols/silc/ops.c:1294
-#: ../libgaim/protocols/silc/ops.c:1295 ../libgaim/protocols/silc/ops.c:1313
+#: ../libpurple/protocols/silc/buddy.c:712
+#: ../libpurple/protocols/silc/ops.c:1087
+#: ../libpurple/protocols/silc/ops.c:1159
+#: ../libpurple/protocols/silc/ops.c:1294
+#: ../libpurple/protocols/silc/ops.c:1295
+#: ../libpurple/protocols/silc/ops.c:1313
 msgid "User Information"
 msgstr "Uzanto Informo"
 
-#: ../libgaim/protocols/silc/buddy.c:713 ../libgaim/protocols/silc/ops.c:1160
-#: ../libgaim/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:713
+#: ../libpurple/protocols/silc/ops.c:1160
+#: ../libpurple/protocols/silc/ops.c:1314
 msgid "Cannot get user information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:734
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:737
+#: ../libpurple/protocols/silc/buddy.c:737
 msgid ""
 "You cannot receive buddy notifications until you import his/her public key.  "
 "You can use the Get Public Key command to get the public key."
 msgstr ""
 
 #. Open file selector to select the public key.
-#: ../libgaim/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1064
 msgid "Open..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1073
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1076
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1079
 msgid "_Import..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1175
 msgid "Select correct user"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1177
+#: ../libpurple/protocols/silc/buddy.c:1177
 msgid ""
 "More than one user was found with the same public key. Select the correct "
 "user from the list to add to the buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1179
+#: ../libpurple/protocols/silc/buddy.c:1179
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1467
 msgid "Detached"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1471 ../libgaim/protocols/silc/silc.c:55
+#: ../libpurple/protocols/silc/buddy.c:1471
+#: ../libpurple/protocols/silc/silc.c:49
 msgid "Indisposed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1475 ../libgaim/protocols/silc/silc.c:57
+#: ../libpurple/protocols/silc/buddy.c:1475
+#: ../libpurple/protocols/silc/silc.c:51
 msgid "Wake Me Up"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1477 ../libgaim/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1477
+#: ../libpurple/protocols/silc/silc.c:43
 msgid "Hyper Active"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1479
 msgid "Robot"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1486 ../libgaim/protocols/silc/silc.c:668
-#: ../libgaim/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc/silc.c:662
+#: ../libpurple/protocols/silc/util.c:512
 msgid "Happy"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1488 ../libgaim/protocols/silc/silc.c:670
-#: ../libgaim/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1488
+#: ../libpurple/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/util.c:514
 msgid "Sad"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1490 ../libgaim/protocols/silc/silc.c:672
-#: ../libgaim/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1490
+#: ../libpurple/protocols/silc/silc.c:666
+#: ../libpurple/protocols/silc/util.c:516
 msgid "Angry"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1492 ../libgaim/protocols/silc/silc.c:674
-#: ../libgaim/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1492
+#: ../libpurple/protocols/silc/silc.c:668
+#: ../libpurple/protocols/silc/util.c:518
 msgid "Jealous"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1494 ../libgaim/protocols/silc/silc.c:676
-#: ../libgaim/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1494
+#: ../libpurple/protocols/silc/silc.c:670
+#: ../libpurple/protocols/silc/util.c:520
 msgid "Ashamed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1496 ../libgaim/protocols/silc/silc.c:678
-#: ../libgaim/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1496
+#: ../libpurple/protocols/silc/silc.c:672
+#: ../libpurple/protocols/silc/util.c:522
 msgid "Invincible"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1498 ../libgaim/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1498
+#: ../libpurple/protocols/silc/util.c:524
 msgid "In Love"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1500 ../libgaim/protocols/silc/silc.c:682
-#: ../libgaim/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1500
+#: ../libpurple/protocols/silc/silc.c:676
+#: ../libpurple/protocols/silc/util.c:526
 msgid "Sleepy"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1502 ../libgaim/protocols/silc/silc.c:684
-#: ../libgaim/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1502
+#: ../libpurple/protocols/silc/silc.c:678
+#: ../libpurple/protocols/silc/util.c:528
 msgid "Bored"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1504 ../libgaim/protocols/silc/silc.c:686
-#: ../libgaim/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1504
+#: ../libpurple/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/util.c:530
 msgid "Excited"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1506 ../libgaim/protocols/silc/silc.c:688
-#: ../libgaim/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/buddy.c:1506
+#: ../libpurple/protocols/silc/silc.c:682
+#: ../libpurple/protocols/silc/util.c:532
 msgid "Anxious"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1538 ../libgaim/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1538
+#: ../libpurple/protocols/silc/ops.c:1202
 msgid "User Modes"
 msgstr "Uzanto Modusoj"
 
-#: ../libgaim/protocols/silc/buddy.c:1550 ../libgaim/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/buddy.c:1550
+#: ../libpurple/protocols/silc/ops.c:1207
 msgid "Mood"
 msgstr "Etoso"
 
-#: ../libgaim/protocols/silc/buddy.c:1555 ../libgaim/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1555
+#: ../libpurple/protocols/silc/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Preferata Kontakto"
 
-#: ../libgaim/protocols/silc/buddy.c:1560 ../libgaim/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1560
+#: ../libpurple/protocols/silc/ops.c:1224
 msgid "Preferred Language"
 msgstr "Preferata Lingvo"
 
-#: ../libgaim/protocols/silc/buddy.c:1565 ../libgaim/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1565
+#: ../libpurple/protocols/silc/ops.c:1229
 msgid "Device"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1570 ../libgaim/protocols/silc/ops.c:1234
-#: ../libgaim/protocols/silc/silc.c:736 ../libgaim/protocols/silc/silc.c:738
+#: ../libpurple/protocols/silc/buddy.c:1570
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc/silc.c:730
+#: ../libpurple/protocols/silc/silc.c:732
 msgid "Timezone"
 msgstr "Temporegiono"
 
-#: ../libgaim/protocols/silc/buddy.c:1575 ../libgaim/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1575
+#: ../libpurple/protocols/silc/ops.c:1239
 msgid "Geolocation"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1629
 msgid "Reset IM Key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1635
 msgid "IM with Key Exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1640
 msgid "IM with Password"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1653
 msgid "Get Public Key..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1660 ../libgaim/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/ops.c:1624
 msgid "Kill User"
 msgstr ""
 
-#: ../libgaim/protocols/silc/buddy.c:1670 ../libgaim/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1670
+#: ../libpurple/protocols/silc/chat.c:972
 msgid "Draw On Whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc/chat.c:39
 msgid "_Passphrase:"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:81 ../libgaim/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:174
 msgid "Channel Information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc/chat.c:82
 msgid "Cannot get channel information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr ""
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libgaim/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:236
 msgid "Add Channel Public Key"
 msgstr ""
 
 #. Add new public key
-#: ../libgaim/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:291
 msgid "Open Public Key..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:400
 msgid "Channel Passphrase"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:407
 msgid "Channel Public Keys List"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:412
+#: ../libpurple/protocols/silc/chat.c:412
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -12519,316 +8820,331 @@
 "able to join."
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:421 ../libgaim/protocols/silc/chat.c:422
-#: ../libgaim/protocols/silc/chat.c:459 ../libgaim/protocols/silc/chat.c:460
-#: ../libgaim/protocols/silc/chat.c:906
+#: ../libpurple/protocols/silc/chat.c:421
+#: ../libpurple/protocols/silc/chat.c:422
+#: ../libpurple/protocols/silc/chat.c:459
+#: ../libpurple/protocols/silc/chat.c:460
+#: ../libpurple/protocols/silc/chat.c:906
 msgid "Channel Authentication"
 msgstr "Kanalo Aŭtentokontrola"
 
-#: ../libgaim/protocols/silc/chat.c:423 ../libgaim/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc/chat.c:461
 msgid "Add / Remove"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:578
 msgid "Group Name"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:582 ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:944
+#: ../libpurple/protocols/silc/chat.c:582
+#: ../libpurple/protocols/silc/ops.c:1909
+#: ../libpurple/protocols/silc/silc.c:938
 msgid "Passphrase"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:593
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:595
 msgid "Add Channel Private Group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:722
 msgid "User Limit"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:723
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:886
+#: ../libpurple/protocols/silc/chat.c:886
 msgid "Invite List"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:891
 msgid "Ban List"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:899
 msgid "Add Private Group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:912
 msgid "Reset Permanent"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:917
 msgid "Set Permanent"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:925
 msgid "Set User Limit"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:931
 msgid "Reset Topic Restriction"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:936
 msgid "Set Topic Restriction"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:943
 msgid "Reset Private Channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:948
 msgid "Set Private Channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:955
 msgid "Reset Secret Channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:960
 msgid "Set Secret Channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1034
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/chat.c:1038
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1097
-#, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
-msgstr ""
-
-#: ../libgaim/protocols/silc/chat.c:1099
+#: ../libpurple/protocols/silc/chat.c:1097
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+
+#: ../libpurple/protocols/silc/chat.c:1099
 msgid "Join Private Group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1100
+#: ../libpurple/protocols/silc/chat.c:1100
 msgid "Cannot join private group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1294
+#: ../libpurple/protocols/silc/silc.c:1146
 msgid "Call Command"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1294 ../libgaim/protocols/silc/silc.c:1152
+#: ../libpurple/protocols/silc/chat.c:1294
+#: ../libpurple/protocols/silc/silc.c:1146
 msgid "Cannot call command"
 msgstr ""
 
-#: ../libgaim/protocols/silc/chat.c:1295 ../libgaim/protocols/silc/silc.c:1153
+#: ../libpurple/protocols/silc/chat.c:1295
+#: ../libpurple/protocols/silc/silc.c:1147
 msgid "Unknown command"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:89 ../libgaim/protocols/silc/ft.c:92
-#: ../libgaim/protocols/silc/ft.c:96 ../libgaim/protocols/silc/ft.c:100
-#: ../libgaim/protocols/silc/ft.c:104 ../libgaim/protocols/silc/ft.c:205
-#: ../libgaim/protocols/silc/ft.c:210 ../libgaim/protocols/silc/ft.c:215
-#: ../libgaim/protocols/silc/ft.c:221 ../libgaim/protocols/silc/ft.c:340
+#: ../libpurple/protocols/silc/ft.c:89 ../libpurple/protocols/silc/ft.c:92
+#: ../libpurple/protocols/silc/ft.c:96 ../libpurple/protocols/silc/ft.c:100
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:205
+#: ../libpurple/protocols/silc/ft.c:210 ../libpurple/protocols/silc/ft.c:215
+#: ../libpurple/protocols/silc/ft.c:221 ../libpurple/protocols/silc/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Sekura Dosiero Transmeto"
 
-#: ../libgaim/protocols/silc/ft.c:90 ../libgaim/protocols/silc/ft.c:93
-#: ../libgaim/protocols/silc/ft.c:97 ../libgaim/protocols/silc/ft.c:101
-#: ../libgaim/protocols/silc/ft.c:105
+#: ../libpurple/protocols/silc/ft.c:90 ../libpurple/protocols/silc/ft.c:93
+#: ../libpurple/protocols/silc/ft.c:97 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:105
 msgid "Error during file transfer"
 msgstr "Eraro dum dosiero transmeto"
 
-#: ../libgaim/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:94
 msgid "Permission denied"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:98
 msgid "Key agreement failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:102
 msgid "File transfer session does not exist"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:206
 msgid "No file transfer session active"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:211
 msgid "File transfer already started"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:222
 msgid "Could not start the file transfer"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:341
 msgid "Cannot send file"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:554 ../libgaim/protocols/silc/ops.c:563
-#: ../libgaim/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
+#: ../libpurple/protocols/silc/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:742 ../libgaim/protocols/silc/ops.c:747
-#: ../libgaim/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
+#: ../libpurple/protocols/silc/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:773 ../libgaim/protocols/silc/ops.c:778
-#: ../libgaim/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
+#: ../libpurple/protocols/silc/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:829
 msgid "Server signoff"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:1017
 msgid "Personal Information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1040
 msgid "Birth Day"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1048
 msgid "Job Role"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1052 ../libgaim/protocols/silc/silc.c:937
+#: ../libpurple/protocols/silc/ops.c:1052
+#: ../libpurple/protocols/silc/silc.c:931
 msgid "Organization"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1056
 msgid "Unit"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1080
 msgid "Note"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1128
 msgid "Join Chat"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1183 ../libgaim/protocols/silc/ops.c:1332
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1183
+#: ../libpurple/protocols/silc/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
 msgid "Real Name"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1213
 msgid "Status Text"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1285 ../libgaim/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1285
+#: ../libpurple/protocols/silc/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1286 ../libgaim/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1286
+#: ../libpurple/protocols/silc/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1298
 msgid "_More..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1371 ../libgaim/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/silc.c:997
 msgid "Detach From Server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1371
 msgid "Cannot detach"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1382
 msgid "Cannot set topic"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1414
 msgid "Failed to change nickname"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Roomlist"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1462
 msgid "Cannot get room list"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1507
 msgid "No public key was received"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1519 ../libgaim/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1519
+#: ../libpurple/protocols/silc/ops.c:1532
 msgid "Server Information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1520
 msgid "Cannot get server information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1549 ../libgaim/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc/ops.c:1558
 msgid "Server Statistics"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1559
+#: ../libpurple/protocols/silc/ops.c:1559
 msgid "No server statistics available"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -12848,112 +9164,115 @@
 "Total router operators: %d\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1604
 msgid "Network Statistics"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1612 ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1612
 msgid "Ping failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1617
 msgid "Ping reply received from server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1625
 msgid "Could not kill user"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1709
+#: ../libpurple/protocols/silc/ops.c:1709
 msgid "Error during connecting to SILC Server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1714
+#: ../libpurple/protocols/silc/ops.c:1714
 msgid "Key Exchange failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1723
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-
-#: ../libgaim/protocols/silc/ops.c:1758
+#: ../libpurple/protocols/silc/ops.c:1723
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+
+#: ../libpurple/protocols/silc/ops.c:1758
 msgid "Disconnected by server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1820 ../libgaim/protocols/silc/ops.c:1867
-#: ../libgaim/protocols/silc/silc.c:188
+#: ../libpurple/protocols/silc/ops.c:1820
+#: ../libpurple/protocols/silc/ops.c:1867
+#: ../libpurple/protocols/silc/silc.c:182
 msgid "Resuming session"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1822
 msgid "Authenticating connection"
 msgstr "Aŭtentokontrolas konekton"
 
-#: ../libgaim/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1869
 msgid "Verifying server public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1910
 msgid "Passphrase required"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1939
+#: ../libpurple/protocols/silc/ops.c:1939
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1942
+#: ../libpurple/protocols/silc/ops.c:1942
 msgid "Failure: Remote does not trust/support your public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1945
+#: ../libpurple/protocols/silc/ops.c:1945
 msgid "Failure: Remote does not support proposed KE group"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1948
+#: ../libpurple/protocols/silc/ops.c:1948
 msgid "Failure: Remote does not support proposed cipher"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1951
+#: ../libpurple/protocols/silc/ops.c:1951
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1954
+#: ../libpurple/protocols/silc/ops.c:1954
 msgid "Failure: Remote does not support proposed hash function"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1957
+#: ../libpurple/protocols/silc/ops.c:1957
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1959
+#: ../libpurple/protocols/silc/ops.c:1959
 msgid "Failure: Incorrect signature"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1961
+#: ../libpurple/protocols/silc/ops.c:1961
 msgid "Failure: Invalid cookie"
 msgstr ""
 
-#: ../libgaim/protocols/silc/ops.c:1972
+#: ../libpurple/protocols/silc/ops.c:1972
 msgid "Failure: Authentication failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:103
+#: ../libpurple/protocols/silc/pk.c:103
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
 "still like to accept this public key?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:108
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:112
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12962,325 +9281,340 @@
 "%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/pk.c:115 ../libgaim/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc/pk.c:140
 msgid "Verify Public Key"
 msgstr "Kontrolu Publikan Ŝlosilon..."
 
-#: ../libgaim/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:119
 msgid "_View..."
 msgstr "_Rigardu..."
 
-#: ../libgaim/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:141
 msgid "Unsupported public key type"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:159
+#: ../libpurple/protocols/silc/silc.c:153
 msgid "Connection failed"
 msgstr "Konekto malsukcesis"
 
-#: ../libgaim/protocols/silc/silc.c:180
+#: ../libpurple/protocols/silc/silc.c:174
 msgid "Cannot initialize SILC Client connection"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:191
+#: ../libpurple/protocols/silc/silc.c:185
 msgid "Performing key exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc/silc.c:271
 msgid "Out of memory"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:323
+#: ../libpurple/protocols/silc/silc.c:294
+msgid "John Noname"
+msgstr "Sennomulo"
+
+#: ../libpurple/protocols/silc/silc.c:317
 msgid "Cannot initialize SILC protocol"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:330
+#: ../libpurple/protocols/silc/silc.c:324
 msgid "Cannot find/access ~/.silc directory"
 msgstr ""
 
 #. Progress
-#: ../libgaim/protocols/silc/silc.c:335
+#: ../libpurple/protocols/silc/silc.c:329
 msgid "Connecting to SILC Server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:344
+#: ../libpurple/protocols/silc/silc.c:338
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:365
+#: ../libpurple/protocols/silc/silc.c:359
 msgid "Unable to create connection"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/silc.c:658
 msgid "Your Current Mood"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/silc.c:660 ../pidgin/gtkprefs.c:1527
+msgid "Normal"
+msgstr "Normala"
+
+#: ../libpurple/protocols/silc/silc.c:674
 msgid "In love"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/silc.c:685
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:699 ../libgaim/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:693
+#: ../libpurple/protocols/silc/util.c:557
 msgid "SMS"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:701 ../libgaim/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:695
+#: ../libpurple/protocols/silc/util.c:559
 msgid "MMS"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:703
+#: ../libpurple/protocols/silc/silc.c:697
 msgid "Video conferencing"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:708
+#: ../libpurple/protocols/silc/silc.c:702
 msgid "Your Current Status"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:715
+#: ../libpurple/protocols/silc/silc.c:709
 msgid "Online Services"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:712
 msgid "Let others see what services you are using"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:724
+#: ../libpurple/protocols/silc/silc.c:718
 msgid "Let others see what computer you are using"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:731
+#: ../libpurple/protocols/silc/silc.c:725
 msgid "Your VCard File"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:743 ../libgaim/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:737
+#: ../libpurple/protocols/silc/silc.c:738
 msgid "User Online Status Attributes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/silc.c:739
 msgid ""
 "You can let other users see your online status information and your personal "
 "information. Please fill the information you would like other users to see "
 "about yourself."
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:785 ../libgaim/protocols/silc/silc.c:791
-#: ../libgaim/protocols/silc/silc.c:1430
+#: ../libpurple/protocols/silc/silc.c:779
+#: ../libpurple/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:1424
 msgid "Message of the Day"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:779
 msgid "No Message of the Day available"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:786 ../libgaim/protocols/silc/silc.c:1425
+#: ../libpurple/protocols/silc/silc.c:780
+#: ../libpurple/protocols/silc/silc.c:1419
 msgid "There is no Message of the Day associated with this connection"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:837 ../libgaim/protocols/silc/silc.c:881
-#: ../libgaim/protocols/silc/silc.c:952 ../libgaim/protocols/silc/silc.c:953
+#: ../libpurple/protocols/silc/silc.c:831
+#: ../libpurple/protocols/silc/silc.c:875
+#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/silc/silc.c:947
 msgid "Create New SILC Key Pair"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:837
+#: ../libpurple/protocols/silc/silc.c:831
 msgid "Passphrases do not match"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:881
+#: ../libpurple/protocols/silc/silc.c:875
 msgid "Key Pair Generation failed"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:920
+#: ../libpurple/protocols/silc/silc.c:914
 msgid "Key length"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:922
+#: ../libpurple/protocols/silc/silc.c:916
 msgid "Public key file"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/silc.c:918
 msgid "Private key file"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:941
 msgid "Passphrase (retype)"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:954
+#: ../libpurple/protocols/silc/silc.c:948
 msgid "Generate Key Pair"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:992
 msgid "Online Status"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1001
 msgid "View Message of the Day"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc/silc.c:1005
 msgid "Create SILC Key Pair..."
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1110
+#: ../libpurple/protocols/silc/silc.c:1104
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1301
+#: ../libpurple/protocols/silc/silc.c:1295
 msgid "Topic too long"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1382
+#: ../libpurple/protocols/silc/silc.c:1376
 msgid "You must specify a nick"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1484
+#: ../libpurple/protocols/silc/silc.c:1478
 #, c-format
 msgid "channel %s not found"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1483
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1491
+#: ../libpurple/protocols/silc/silc.c:1485
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1504
+#: ../libpurple/protocols/silc/silc.c:1498
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1534
-#, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr ""
-
-#: ../libgaim/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1528
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "Nekonata komando: %s, (povas esti klienta cimo)"
+
+#: ../libpurple/protocols/silc/silc.c:1591
 msgid "part [channel]:  Leave the chat"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1595
 msgid "leave [channel]:  Leave the chat"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1605
+#: ../libpurple/protocols/silc/silc.c:1599
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1604
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1608
 msgid "list:  List channels on this network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1612
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2685
+#: ../libpurple/protocols/silc/silc.c:1616
+#: ../libpurple/protocols/zephyr/zephyr.c:2684
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1620
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1624
 msgid "motd:  View the server's Message Of The Day"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1628
 msgid "detach:  Detach this session"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1632
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1636
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1642
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1646
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1650
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1654
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1658
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1662
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1666
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1670
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1674
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1678
 msgid "info [server]:  View server administrative details"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1682
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1686
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1696
+#: ../libpurple/protocols/silc/silc.c:1690
 msgid "stats:  View server and network statistics"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1700
+#: ../libpurple/protocols/silc/silc.c:1694
 msgid "ping:  Send PING to the connected server"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1699
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1709
+#: ../libpurple/protocols/silc/silc.c:1703
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -13295,111 +9629,116 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1820
+#: ../libpurple/protocols/silc/silc.c:1814
 msgid "SILC Protocol Plugin"
 msgstr "SILC Protokol-Kromaĵo"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1822
+#: ../libpurple/protocols/silc/silc.c:1816
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1842 ../pidgin/gtkprefs.c:1918
+msgid "Network"
+msgstr "Reto"
+
+#: ../libpurple/protocols/silc/silc.c:1853
 msgid "Public Key file"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc/silc.c:1857
 msgid "Private Key file"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1867
 msgid "Cipher"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1877
 msgid "HMAC"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1880
 msgid "Public key authentication"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1883
 msgid "Reject watching by other users"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1886
 msgid "Block invites"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1889
 msgid "Block IMs without Key Exchange"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1892
 msgid "Reject online status attribute requests"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1895
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc/silc.c:1898
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libgaim/protocols/silc/silc.c:1907
+#: ../libpurple/protocols/silc/silc.c:1901
 msgid "Digitally sign and verify all messages"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:207 ../libgaim/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:247
 msgid "Creating SILC key pair..."
 msgstr ""
 
 #. Hint for translators: Please check the tabulator width here and in
 #. the next strings (short strings: 2 tabs, longer strings 1 tab,
 #. sum: 3 tabs or 24 characters)
-#: ../libgaim/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -13407,79 +9746,80 @@
 "\n"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:374 ../libgaim/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:375
 msgid "Public Key Information"
 msgstr "Publika Ŝloŝilo Informo"
 
-#: ../libgaim/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/util.c:555
 msgid "Paging"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:561
 msgid "Video Conferencing"
 msgstr ""
 
-#: ../libgaim/protocols/silc/util.c:581
+#: ../libpurple/protocols/silc/util.c:579
 msgid "Computer"
 msgstr "Komputilo"
 
-#: ../libgaim/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:583
 msgid "PDA"
 msgstr "Poŝkomputilo"
 
-#: ../libgaim/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:585
 msgid "Terminal"
 msgstr "Terminalo"
 
-#: ../libgaim/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
 "whiteboard?"
 msgstr ""
 
-#: ../libgaim/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302
 msgid "Whiteboard"
 msgstr ""
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libgaim/protocols/simple/simple.c:416
+#: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:438
-#: ../libgaim/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/simple/simple.c:1482
 msgid "Could not connect"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1516
-#: ../libgaim/protocols/simple/simple.c:1558
-#: ../libgaim/protocols/simple/simple.c:1571
-#: ../libgaim/protocols/simple/simple.c:1622
+#: ../libpurple/protocols/simple/simple.c:1516
+#: ../libpurple/protocols/simple/simple.c:1558
+#: ../libpurple/protocols/simple/simple.c:1571
+#: ../libpurple/protocols/simple/simple.c:1622
 msgid "Could not create listen socket"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1539
 msgid "Couldn't resolve host"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1630
 msgid "Could not resolve hostname"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1647
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP ekrannomoj ne enhaveblas blankan spacon aŭ @ simbolon"
 
@@ -13491,245 +9831,234 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1816
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokol-Kromaĵo"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1817
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "La SIP/SIMPLE Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1839
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1845
 msgid "Use UDP"
 msgstr "Uzu UDP-n"
 
-#: ../libgaim/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1847
 msgid "Use proxy"
 msgstr "Uzu Prokurilon"
 
-#: ../libgaim/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1849
 msgid "Proxy"
 msgstr "Prokurilo"
 
-#: ../libgaim/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1851
 msgid "Auth User"
 msgstr ""
 
-#: ../libgaim/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Auth Domain"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:139
+#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:148
+#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:201
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:488
+#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:491
+#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:494
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:497
+#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:500
+#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:503
+#: ../libpurple/protocols/toc/toc.c:503
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:506
+#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:509
+#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:512
+#: ../libpurple/protocols/toc/toc.c:512
 #, c-format
 msgid "You missed an IM from %s because it was too big."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:515
+#: ../libpurple/protocols/toc/toc.c:515
 #, c-format
 msgid "You missed an IM from %s because it was sent too fast."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:518
+#: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Malsukceso."
 
-#: ../libgaim/protocols/toc/toc.c:521
+#: ../libpurple/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:524
+#: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:527
+#: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:530
+#: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:533
+#: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:536
+#: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:539
+#: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:543
+#: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Lando ne subtenita."
 
-#: ../libgaim/protocols/toc/toc.c:546
+#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:549
+#: ../libpurple/protocols/toc/toc.c:549
 msgid "Incorrect screen name or password."
 msgstr "Misa ekrannomo aŭ pasvorto."
 
-#: ../libgaim/protocols/toc/toc.c:552
+#: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:555
+#: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:558
+#: ../libpurple/protocols/toc/toc.c:558
 msgid ""
 "You have been connecting and disconnecting too frequently.  Wait ten minutes "
 "and try again.  If you continue to try, you will need to wait even longer."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:560
+#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Nekonata ensaluteraro okazis: %s."
 
-#: ../libgaim/protocols/toc/toc.c:563
+#: ../libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Nekonata eraro, %d, okazis.  Informo: %s"
 
-#: ../libgaim/protocols/toc/toc.c:590
+#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Malvalida Gruponomo"
 
-#: ../libgaim/protocols/toc/toc.c:674
+#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Konekto Fermita"
 
-#: ../libgaim/protocols/toc/toc.c:714
+#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Atendante respondon..."
 
-#: ../libgaim/protocols/toc/toc.c:792
+#: ../libpurple/protocols/toc/toc.c:792
 msgid "TOC has come back from its pause. You may now send messages again."
 msgstr "TOC revenis el sia paŭzo. Vi nun povas sendi mesaĝojn denove."
 
-#: ../libgaim/protocols/toc/toc.c:995
+#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Pasvorto Ŝanĝita Sukcese"
 
-#: ../libgaim/protocols/toc/toc.c:999
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC sendis PAŬZO komandon."
-
-#: ../libgaim/protocols/toc/toc.c:1000
-msgid ""
-"When this happens, TOC ignores any messages sent to it, and may kick you off "
-"if you send a message. Gaim will prevent anything from going through. This "
-"is only temporary, please be patient."
-msgstr ""
-
-#: ../libgaim/protocols/toc/toc.c:1373
+#: ../libpurple/protocols/toc/toc.c:1366
 msgid "_Group:"
 msgstr "_Grupo:"
 
-#: ../libgaim/protocols/toc/toc.c:1555
+#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Ricevu Ujan Informon"
 
-#: ../libgaim/protocols/toc/toc.c:1695
+#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Difini Ujan Informon"
 
-#: ../libgaim/protocols/toc/toc.c:1817
+#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:1853
+#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:1898 ../libgaim/protocols/toc/toc.c:1938
-#: ../libgaim/protocols/toc/toc.c:2062 ../libgaim/protocols/toc/toc.c:2150
+#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
+#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
 msgid "Could not connect for transfer."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:2095
+#: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
 msgstr ""
 
-#: ../libgaim/protocols/toc/toc.c:2195
-msgid "Gaim - Save As..."
-msgstr "Gaim - Konservu Kiel..."
-
-#: ../libgaim/protocols/toc/toc.c:2229
+#: ../libpurple/protocols/toc/toc.c:2175
+msgid "Save As..."
+msgstr "Konservu Kiel..."
+
+#: ../libpurple/protocols/toc/toc.c:2209
 #, c-format
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../libgaim/protocols/toc/toc.c:2236
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr ""
@@ -13744,213 +10073,204 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/toc/toc.c:2326 ../libgaim/protocols/toc/toc.c:2328
+#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:793
+#: ../libpurple/protocols/yahoo/yahoo.c:805
 msgid "Your Yahoo! message did not get sent."
 msgstr "Via Yahoo!-a mesaĝo malsendiĝas."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3732
-msgid "Buzz!!"
-msgstr "Zum!!"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:898
+#: ../libpurple/protocols/yahoo/yahoo.c:875
+msgid "%s just sent you a Buzz!"
+msgstr "%s ĵus sendis al vi Zumon!!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:925
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo! sistem-mesaĝo pro %s:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:958
+#: ../libpurple/protocols/yahoo/yahoo.c:985
 msgid "Authorization denied message:"
 msgstr "Rifuzita permeso mesaĝo:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1064
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1040
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1043
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
 msgid "Add buddy rejected"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1794
+#: ../libpurple/protocols/yahoo/yahoo.c:1821
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
-"method.  This version of Gaim will likely not be able to successfully sign "
-"on to Yahoo.  Check %s for updates."
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1797
+"method.  You will probably not be able to successfully sign on to Yahoo.  "
+"Check %s for updates."
+msgstr ""
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
 msgid "Failed Yahoo! Authentication"
 msgstr "Malsukcesis Yahoo! Aŭtentokontrolo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1863
+#: ../libpurple/protocols/yahoo/yahoo.c:1890
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1866
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
 msgid "Ignore buddy?"
 msgstr "Ignoru Kunulon?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1914
-msgid "Normal authentication failed!"
-msgstr "Normala aŭtentokontrolo malsukcesis!"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1915
-msgid ""
-"The normal authentication method has failed. This means either your password "
-"is incorrect, or Yahoo!'s authentication scheme has changed. Gaim will now "
-"attempt to log in using Web Messenger authentication, which will result in "
-"reduced functionality and features."
-msgstr ""
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1926
+#: ../libpurple/protocols/yahoo/yahoo.c:1950
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/yahoo/yahoo.c:1953
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1983
+#: ../libpurple/protocols/yahoo/yahoo.c:2007
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1986
+#: ../libpurple/protocols/yahoo/yahoo.c:2010
 msgid "Could not add buddy to server list"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2129
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Aŭdebla %s/%s/%s.swf ] %s"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2436
+#: ../libpurple/protocols/yahoo/yahoo.c:2461
 msgid "Received unexpected HTTP response from server."
 msgstr "Ricevis neatendita HTTP respondo de servilo."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2460
-#: ../libgaim/protocols/yahoo/yahoo.c:2632
-#: ../libgaim/protocols/yahoo/yahoo.c:2735
-#: ../libgaim/protocols/yahoo/yahoo.c:2745
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
-#: ../libgaim/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/yahoo.c:2485
+#: ../libpurple/protocols/yahoo/yahoo.c:2664
+#: ../libpurple/protocols/yahoo/yahoo.c:2768
+#: ../libpurple/protocols/yahoo/yahoo.c:2778
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Konektado problemo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2860
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libpurple/protocols/yahoo/yahoo.c:2880
+#: ../libpurple/protocols/yahoo/yahoo.c:3486
 msgid "Not at Home"
 msgstr "Malhejme"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2862
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:2882
+#: ../libpurple/protocols/yahoo/yahoo.c:3489
 msgid "Not at Desk"
 msgstr "Malpupitre"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2864
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libpurple/protocols/yahoo/yahoo.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:3492
 msgid "Not in Office"
 msgstr "Malofice"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2868
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+#: ../libpurple/protocols/yahoo/yahoo.c:2888
+#: ../libpurple/protocols/yahoo/yahoo.c:3498
 msgid "On Vacation"
 msgstr "Feriante"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2872
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+#: ../libpurple/protocols/yahoo/yahoo.c:2892
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Stepped Out"
 msgstr "Ekeliris"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2965
-#: ../libgaim/protocols/yahoo/yahoo.c:2995
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
+#: ../libpurple/protocols/yahoo/yahoo.c:3015
 msgid "Not on server list"
 msgstr "Ne en servilo listo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3012
-#: ../libgaim/protocols/yahoo/yahoo.c:3070
+#: ../libpurple/protocols/yahoo/yahoo.c:3032
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
 msgid "Appear Online"
 msgstr "Aperas Enreta"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3015
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3035
+#: ../libpurple/protocols/yahoo/yahoo.c:3111
 msgid "Appear Permanently Offline"
 msgstr "Aperas Ĉiama Senkonekta"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3033
+#: ../libpurple/protocols/yahoo/yahoo.c:3053
 msgid "Presence"
 msgstr "Ĉeesto"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
 msgid "Appear Offline"
 msgstr "Aperas Senkonekta"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3105
 msgid "Don't Appear Permanently Offline"
 msgstr "Ne Aperas Ĉiama Senkonekta"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3133
+#: ../libpurple/protocols/yahoo/yahoo.c:3153
 msgid "Join in Chat"
 msgstr "Aliĝu Babilejon"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3139
+#: ../libpurple/protocols/yahoo/yahoo.c:3159
 msgid "Initiate Conference"
 msgstr "Iniciati Konferencon"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3167
+#: ../libpurple/protocols/yahoo/yahoo.c:3187
 msgid "Presence Settings"
 msgstr "Ĉeesto Agordoj"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3173
+#: ../libpurple/protocols/yahoo/yahoo.c:3193
 msgid "Start Doodling"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3205
+#: ../libpurple/protocols/yahoo/yahoo.c:3225
 msgid "Active which ID?"
 msgstr "Ŝaltu kiun ID?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libpurple/protocols/yahoo/yahoo.c:3234
 msgid "Join who in chat?"
 msgstr "Kiun kuniĝi en babilejo?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3224
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
 msgid "Activate ID..."
 msgstr "Ŝaltu ID-on..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
 msgid "Join User in Chat..."
 msgstr "Kuniĝu Uzanto en Babilejo..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3791
+#: ../libpurple/protocols/yahoo/yahoo.c:3755
+msgid "You have just sent a Buzz!"
+msgstr "Vi ĵus sendis Zumon!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3814
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3819
 msgid "list: List rooms on the Yahoo network"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3800
+#: ../libpurple/protocols/yahoo/yahoo.c:3823
 msgid "buzz: Buzz a user to get their attention"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3804
+#: ../libpurple/protocols/yahoo/yahoo.c:3827
 msgid "doodle: Request user to start a Doodle session"
 msgstr ""
 
@@ -13964,234 +10284,234 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3899
-#: ../libgaim/protocols/yahoo/yahoo.c:3901
+#: ../libpurple/protocols/yahoo/yahoo.c:4023
+#: ../libpurple/protocols/yahoo/yahoo.c:4025
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3918
+#: ../libpurple/protocols/yahoo/yahoo.c:4042
 msgid "Yahoo Japan"
 msgstr "Yahoo Japanio"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3921
+#: ../libpurple/protocols/yahoo/yahoo.c:4045
 msgid "Pager server"
 msgstr "Paĝila servilo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3924
+#: ../libpurple/protocols/yahoo/yahoo.c:4048
 msgid "Japan Pager server"
 msgstr "Japana Paĝila servilo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3927
+#: ../libpurple/protocols/yahoo/yahoo.c:4051
 msgid "Pager port"
 msgstr "Paĝila pordo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3930
+#: ../libpurple/protocols/yahoo/yahoo.c:4054
 msgid "File transfer server"
 msgstr "Dosieralŝuto servilo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3933
+#: ../libpurple/protocols/yahoo/yahoo.c:4057
 msgid "Japan file transfer server"
 msgstr "Japana dosieralŝuto servilo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3936
+#: ../libpurple/protocols/yahoo/yahoo.c:4060
 msgid "File transfer port"
 msgstr "Dosieralŝuto pordo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3939
+#: ../libpurple/protocols/yahoo/yahoo.c:4063
 msgid "Chat room locale"
 msgstr "Babilejo lokaĵaro"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3942
+#: ../libpurple/protocols/yahoo/yahoo.c:4066
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignoru konferencajn kaj babilejan invitojn"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libpurple/protocols/yahoo/yahoo.c:4074
 msgid "Chat room list URL"
 msgstr "Babilejolisto URL"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4077
 msgid "Yahoo Chat server"
 msgstr "Yahoo Babil servilo"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3956
+#: ../libpurple/protocols/yahoo/yahoo.c:4080
 msgid "Yahoo Chat port"
 msgstr "Yahoo Babilo pordo"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:203
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:205
 msgid "Invitation Rejected"
 msgstr "Invito malakceptita"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:361
 msgid "Failed to join chat"
 msgstr "Malsukcesis aliĝi babilejon"
 
 #. -6
-#: ../libgaim/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:364
 msgid "Unknown room"
 msgstr "Nekonata babilejo"
 
 #. -15
-#: ../libgaim/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:367
 msgid "Maybe the room is full"
 msgstr "Eble la babilejo plenas"
 
 #. -35
-#: ../libgaim/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:370
 msgid "Not available"
 msgstr "Ne disponebla"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:374
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:452
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Vi nun estas babilanta en %s."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:627
 msgid "Failed to join buddy in chat"
 msgstr "Malsukcesis kuniĝi kunulon en babilejo"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Maybe they're not in a chat?"
 msgstr "Eble ili ne estas en babilejo?"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1357
+#: ../libpurple/protocols/yahoo/yahoochat.c:1383
 msgid "Fetching the room list failed."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1441
 msgid "Voices"
 msgstr "Voĉoj"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1444
 msgid "Webcams"
 msgstr "Retkameraoj"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1455
+#: ../libpurple/protocols/yahoo/yahoochat.c:1525
 msgid "Unable to fetch room list."
 msgstr "Ne eblas ricevi babilejliston."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1518
 msgid "User Rooms"
 msgstr "Uzanto Babilejoj"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libgaim/protocols/yahoo/yahoo_doodle.c:98
+#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libgaim/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "Unable to establish file descriptor."
 msgstr "Ne eblas estabi dosierotenilon."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
 msgid "Write Error"
 msgstr "Skriberaro"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japana profilo"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profilo"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1085
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1089
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
 msgid "Hobbies"
 msgstr "Hobioj"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
 msgid "Latest News"
 msgstr "Lastaj Novaĵoj"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
 msgid "Home Page"
 msgstr "Hejmpaĝo"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
 msgid "Cool Link 1"
 msgstr "Mojosa Ligilo 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
 msgid "Cool Link 2"
 msgstr "Mojosa Ligilo 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Cool Link 3"
 msgstr "Mojosa Ligilo 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
 msgid "Last Update"
 msgstr "Lasta Aktualigo"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Uzanto informo pri %s nedisponebla"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
 msgid ""
 "Could not retrieve the user's profile. This most likely means that the user "
 "does not exist; however, Yahoo! sometimes does fail to find a user's "
 "profile. If you know that the user exists, please try again later."
 msgstr ""
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
 msgid "The user's profile is empty."
 msgstr "La uzanto profilo malplenas."
 
-#: ../libgaim/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Konektproblemo kun la YCHT servilo."
 
-#: ../libgaim/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -14200,110 +10520,111 @@
 "Perdis konekto kun prokura servilo\n"
 "%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:355
+#: ../libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:753
+#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:787
-#: ../libgaim/protocols/zephyr/zephyr.c:1204
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1203
 msgid "User"
 msgstr "Uzanto"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:792
-#: ../libgaim/protocols/zephyr/zephyr.c:1210
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1209
 msgid "Hidden or not logged-in"
 msgstr "Kaŝita aŭ ne ensalutita"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:798
-#: ../libgaim/protocols/zephyr/zephyr.c:1212
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1211
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Ĉe %s ek de %s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:1546
-#: ../libgaim/protocols/zephyr/zephyr.c:1547
+#: ../libpurple/protocols/zephyr/zephyr.c:1545
+#: ../libpurple/protocols/zephyr/zephyr.c:1546
 msgid "Anyone"
 msgstr "Iu ajn"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2354
+#: ../libpurple/protocols/zephyr/zephyr.c:2353
 msgid "_Class:"
 msgstr "_Klaso:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2360
+#: ../libpurple/protocols/zephyr/zephyr.c:2359
 msgid "_Instance:"
 msgstr "_Apero:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2366
+#: ../libpurple/protocols/zephyr/zephyr.c:2365
 msgid "_Recipient:"
 msgstr "_Ricevanto:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2377
+#: ../libpurple/protocols/zephyr/zephyr.c:2376
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/zephyr/zephyr.c:2689
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2694
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2699
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2704
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2710
+#: ../libpurple/protocols/zephyr/zephyr.c:2709
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2716
+#: ../libpurple/protocols/zephyr/zephyr.c:2715
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2721
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr ""
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2727
+#: ../libpurple/protocols/zephyr/zephyr.c:2720
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2726
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2733
+#: ../libpurple/protocols/zephyr/zephyr.c:2732
 msgid ""
 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;"
 "<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2739
+#: ../libpurple/protocols/zephyr/zephyr.c:2738
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2744
+#: ../libpurple/protocols/zephyr/zephyr.c:2743
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2850
+#: ../libpurple/protocols/zephyr/zephyr.c:2849
 msgid "Resubscribe"
 msgstr "Realiĝu"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2853
+#: ../libpurple/protocols/zephyr/zephyr.c:2852
 msgid "Retrieve subscriptions from server"
 msgstr ""
 
@@ -14317,111 +10638,112 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2940
-#: ../libgaim/protocols/zephyr/zephyr.c:2942
+#: ../libpurple/protocols/zephyr/zephyr.c:2939
+#: ../libpurple/protocols/zephyr/zephyr.c:2941
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr Protokol-Kromaĵo"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2961
+#: ../libpurple/protocols/zephyr/zephyr.c:2960
 msgid "Use tzc"
 msgstr "Uzu tzc-n"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2964
+#: ../libpurple/protocols/zephyr/zephyr.c:2963
 msgid "tzc command"
 msgstr "tzc komando"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2967
+#: ../libpurple/protocols/zephyr/zephyr.c:2966
 msgid "Export to .anyone"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2970
+#: ../libpurple/protocols/zephyr/zephyr.c:2969
 msgid "Export to .zephyr.subs"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2973
+#: ../libpurple/protocols/zephyr/zephyr.c:2972
 msgid "Import from .anyone"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2976
+#: ../libpurple/protocols/zephyr/zephyr.c:2975
 msgid "Import from .zephyr.subs"
 msgstr ""
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2979
+#: ../libpurple/protocols/zephyr/zephyr.c:2978
 msgid "Realm"
 msgstr "Sfero"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2982
+#: ../libpurple/protocols/zephyr/zephyr.c:2981
 msgid "Exposure"
 msgstr "Montreco"
 
-#: ../libgaim/proxy.c:442 ../libgaim/proxy.c:864 ../libgaim/proxy.c:1021
-#: ../libgaim/proxy.c:1579
+#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
+#: ../libpurple/proxy.c:1588
 #, c-format
 msgid ""
 "Unable to create socket:\n"
 "%s"
 msgstr ""
 
-#: ../libgaim/proxy.c:644
+#: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr ""
 
-#: ../libgaim/proxy.c:672 ../libgaim/proxy.c:718 ../libgaim/proxy.c:756
-#: ../libgaim/proxy.c:768
+#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
+#: ../libpurple/proxy.c:782
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP prokura konekteraro %d"
 
-#: ../libgaim/proxy.c:764
+#: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Aliro nepermesita: HTTP prokura servilo malpermesas pordon %d tunelumadon."
-
-#: ../libgaim/proxy.c:984
+msgstr ""
+"Aliro nepermesita: HTTP prokura servilo malpermesas pordon %d tunelumadon."
+
+#: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr ""
 
-#: ../libgaim/proxy.c:1676
+#: ../libpurple/proxy.c:1685
 msgid "Could not resolve host name"
 msgstr ""
 
 #. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1341
 msgid "_Yes"
 msgstr "_Jes"
 
-#: ../libgaim/request.h:1341
+#: ../libpurple/request.h:1341
 msgid "_No"
 msgstr "_Ne"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libgaim/request.h:1360
+#: ../libpurple/request.h:1360
 msgid "_Accept"
 msgstr "_Akceptu"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libgaim/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:46
 msgid "I'm not here right now"
 msgstr "Mi ne estas tie nun"
 
-#: ../libgaim/savedstatuses.c:525
+#: ../libpurple/savedstatuses.c:526
 msgid "saved statuses"
 msgstr "konservitaj statoj"
 
-#: ../libgaim/server.c:228
+#: ../libpurple/server.c:228
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s nun estas konata kiel %s.\n"
 
-#: ../libgaim/server.c:674
+#: ../libpurple/server.c:670
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14430,153 +10752,4276 @@
 "%s invitis %s al babilejo %s:\n"
 "%s"
 
-#: ../libgaim/server.c:679
+#: ../libpurple/server.c:675
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s invitis %s al babilejo %s\n"
 
-#: ../libgaim/server.c:683
+#: ../libpurple/server.c:679
 msgid "Accept chat invitation?"
 msgstr "Ĉu akceptu babilinviton ?"
 
-#: ../libgaim/status.c:153
+#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Nedifinita"
 
-#: ../libgaim/status.c:156
+#: ../libpurple/status.c:156
 msgid "Unavailable"
 msgstr "Nedisponebla"
 
-#: ../libgaim/status.c:160
+#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Movante"
 
-#: ../libgaim/status.c:611
+#: ../libpurple/status.c:611
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s ŝanĝis staton de %s al %s"
 
-#: ../libgaim/status.c:621
+#: ../libpurple/status.c:621
 #, c-format
 msgid "%s is now %s"
 msgstr "%s nun estas %s"
 
-#: ../libgaim/status.c:626
+#: ../libpurple/status.c:626
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ne plu estas %s"
 
-#: ../libgaim/status.c:1293
+#: ../libpurple/status.c:1293
 #, c-format
 msgid "%s became idle"
 msgstr "%s iĝis senfara"
 
-#: ../libgaim/status.c:1310
+#: ../libpurple/status.c:1310
 #, c-format
 msgid "%s became unidle"
 msgstr "%s iĝis fara"
 
-#: ../libgaim/status.c:1376
+#: ../libpurple/status.c:1376
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s iĝis senfara"
 
-#: ../libgaim/status.c:1378
+#: ../libpurple/status.c:1378
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s iĝis senfara"
 
-#: ../libgaim/util.c:680
+#: ../libpurple/util.c:681
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2434
+#: ../libpurple/util.c:2442
 #, c-format
 msgid "Error Reading %s"
 msgstr "Eraro dum legado %s"
 
-#: ../libgaim/util.c:2435
+#: ../libpurple/util.c:2443
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
 "the old file has been renamed to %s~."
 msgstr ""
 
-#: ../libgaim/util.c:2898
+#: ../libpurple/util.c:2906
 msgid "Calculating..."
 msgstr "Kalkulante..."
 
-#: ../libgaim/util.c:2901
+#: ../libpurple/util.c:2909
 msgid "Unknown."
 msgstr "Nekonata."
 
-#: ../libgaim/util.c:2927
+#: ../libpurple/util.c:2935
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekundo"
 msgstr[1] "%d sekundoj"
 
-#: ../libgaim/util.c:2939
+#: ../libpurple/util.c:2947
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d tago"
 msgstr[1] "%d tagoj"
 
-#: ../libgaim/util.c:2947
+#: ../libpurple/util.c:2955
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d horo"
 msgstr[1] "%s, %d horoj"
 
-#: ../libgaim/util.c:2953
+#: ../libpurple/util.c:2961
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d horo"
 msgstr[1] "%d horoj"
 
-#: ../libgaim/util.c:2961
+#: ../libpurple/util.c:2969
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutoj"
 
-#: ../libgaim/util.c:2967
+#: ../libpurple/util.c:2975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutoj"
 
-#: ../libgaim/util.c:3166 ../libgaim/util.c:3464
+#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Ne konekteblas al %s"
 
-#: ../libgaim/util.c:3292
+#: ../libpurple/util.c:3368
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libgaim/util.c:3327
+#: ../libpurple/util.c:3403
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Eraro legante de %s: %s"
 
-#: ../libgaim/util.c:3358
+#: ../libpurple/util.c:3434
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Eraro skribante al %s: %s"
 
-#: ../libgaim/util.c:3383
+#: ../libpurple/util.c:3459
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Ne konekteblas al %s: %s"
 
+#: ../pidgin.desktop.in.h:1
+msgid "Internet Messenger"
+msgstr "Interreta Mesaĝilo"
+
+#: ../pidgin.desktop.in.h:2
+msgid "Pidgin Internet Messenger"
+msgstr "Piĝin Interreta Mesaĝilo"
+
+#: ../pidgin.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "Sendu tujmesaĝojn per pluraj protokoloj"
+
+#: ../pidgin/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Orientiĝo"
+
+#: ../pidgin/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "La oientiĝo de la pleto."
+
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:390
+msgid "Login Options"
+msgstr "Salutaj Opcioj"
+
+#: ../pidgin/gtkaccount.c:492
+msgid "Local alias:"
+msgstr "Loka Alinomo:"
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:554
+msgid "User Options"
+msgstr "Uzantoopcioj"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:572
+msgid "Use this buddy icon for this account:"
+msgstr "Uzu tiun kunul piktogramon por tiu konto:"
+
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:684
+#, c-format
+msgid "%s Options"
+msgstr "%s Opcioj"
+
+#: ../pidgin/gtkaccount.c:881
+msgid "Use GNOME Proxy Settings"
+msgstr "Uzu GNOME-ajn Prokurilo-Agordojn"
+
+#: ../pidgin/gtkaccount.c:882
+msgid "Use Global Proxy Settings"
+msgstr "Uzu Sistemajn Prokurilo-Agordojn"
+
+#: ../pidgin/gtkaccount.c:888
+msgid "No Proxy"
+msgstr "Sen Prokurilo"
+
+#: ../pidgin/gtkaccount.c:894
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../pidgin/gtkaccount.c:900
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#: ../pidgin/gtkaccount.c:906
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#: ../pidgin/gtkaccount.c:912 ../pidgin/gtkprefs.c:1100
+msgid "Use Environmental Settings"
+msgstr "Uzu Mediajn Agordojn"
+
+#. This is an easter egg.
+#. It means one of two things, both intended as humourus:
+#. A) your network is really slow and you have nothing better to do than
+#. look at butterflies.
+#. B)You are looking really closely at something that shouldn't matter.
+#: ../pidgin/gtkaccount.c:951
+msgid "If you look real closely"
+msgstr "Se vi rigardas sufiĉe proksime"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../pidgin/gtkaccount.c:954
+msgid "you can see the butterflies mating"
+msgstr "vi povas vidi la Zamenhofan barbon kreski"
+
+#: ../pidgin/gtkaccount.c:975
+msgid "Proxy Options"
+msgstr "Prokurilo Opcioj"
+
+#: ../pidgin/gtkaccount.c:989 ../pidgin/gtkprefs.c:1094
+msgid "Proxy _type:"
+msgstr "Prokurilo _tipo:"
+
+#: ../pidgin/gtkaccount.c:998 ../pidgin/gtkprefs.c:1115
+msgid "_Host:"
+msgstr "_Retnodo:"
+
+#: ../pidgin/gtkaccount.c:1002 ../pidgin/gtkprefs.c:1133
+msgid "_Port:"
+msgstr "_Pordo:"
+
+#: ../pidgin/gtkaccount.c:1010
+msgid "_Username:"
+msgstr "_Salutnomo:"
+
+#: ../pidgin/gtkaccount.c:1017 ../pidgin/gtkprefs.c:1170
+msgid "Pa_ssword:"
+msgstr "Pa_svorto:"
+
+#: ../pidgin/gtkaccount.c:1428
+msgid "Add Account"
+msgstr "Aldonu Konton"
+
+#: ../pidgin/gtkaccount.c:1452
+msgid "_Basic"
+msgstr "_Baza"
+
+#: ../pidgin/gtkaccount.c:1463
+msgid "_Advanced"
+msgstr "_Kroma"
+
+#: ../pidgin/gtkaccount.c:1933 ../pidgin/gtkplugin.c:566
+msgid "Enabled"
+msgstr "Enŝaltita"
+
+#: ../pidgin/gtkaccount.c:1961
+msgid "Protocol"
+msgstr "Protokolo"
+
+#: ../pidgin/gtkaccount.c:2144
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Welcome to %s!</span>\n"
+"\n"
+"You have no IM accounts configured. To start connecting with %s press the "
+"<b>Add</b> button below and configure your first account. If you want %s to "
+"connect to multiple IM accounts, press <b>Add</b> again to configure them "
+"all.\n"
+"\n"
+"You can come back to this window to add, edit, or remove accounts from "
+"<b>Accounts->Add/Edit</b> in the Buddy List window"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:704
+msgid "Join a Chat"
+msgstr "Aliĝu Babilejon"
+
+#: ../pidgin/gtkblist.c:725
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr ""
+"B.v enigi la konvenan informon pri la babilejo kiun vi deziras aliĝi.\n"
+
+#: ../pidgin/gtkblist.c:736 ../pidgin/gtkpounce.c:529
+#: ../pidgin/gtkroomlist.c:399
+msgid "_Account:"
+msgstr "_Konto:"
+
+#: ../pidgin/gtkblist.c:1010 ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:614
+msgid "_Block"
+msgstr "_Bloku"
+
+#: ../pidgin/gtkblist.c:1010
+msgid "Un_block"
+msgstr "Mal_bloku"
+
+#: ../pidgin/gtkblist.c:1061
+msgid "Get _Info"
+msgstr "Ricevu _Informon"
+
+#: ../pidgin/gtkblist.c:1064 ../pidgin/pidginstock.c:91
+msgid "I_M"
+msgstr "T_M"
+
+#: ../pidgin/gtkblist.c:1070
+msgid "_Send File"
+msgstr "_Sendu Dosieron"
+
+#: ../pidgin/gtkblist.c:1077
+msgid "Add Buddy _Pounce"
+msgstr "Aldonu Kunul _Atentigon"
+
+#: ../pidgin/gtkblist.c:1081 ../pidgin/gtkblist.c:1085
+#: ../pidgin/gtkblist.c:1184 ../pidgin/gtkblist.c:1207
+msgid "View _Log"
+msgstr "Montru Protoko_lon"
+
+#: ../pidgin/gtkblist.c:1097
+msgid "Alias..."
+msgstr "Alinomo..."
+
+#: ../pidgin/gtkblist.c:1106 ../pidgin/gtkblist.c:1192
+#: ../pidgin/gtkblist.c:1213
+msgid "_Alias..."
+msgstr "_Alinomo..."
+
+#: ../pidgin/gtkblist.c:1108 ../pidgin/gtkblist.c:1194
+#: ../pidgin/gtkblist.c:1215
+msgid "_Remove"
+msgstr "Fo_rigu"
+
+#: ../pidgin/gtkblist.c:1155
+msgid "Add a _Buddy"
+msgstr "Aldonu K_unulon"
+
+#: ../pidgin/gtkblist.c:1157
+msgid "Add a C_hat"
+msgstr "Aldonu Babile_jon"
+
+#: ../pidgin/gtkblist.c:1160
+msgid "_Delete Group"
+msgstr "_Forigu Grupon"
+
+#: ../pidgin/gtkblist.c:1162
+msgid "_Rename"
+msgstr "_Alinomu"
+
+#. join button
+#: ../pidgin/gtkblist.c:1180 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:89
+msgid "_Join"
+msgstr "_Aliĝu"
+
+#: ../pidgin/gtkblist.c:1182
+msgid "Auto-Join"
+msgstr "Aŭtomate-aliĝu"
+
+#: ../pidgin/gtkblist.c:1220 ../pidgin/gtkblist.c:1243
+msgid "_Collapse"
+msgstr "_Maletendu"
+
+#: ../pidgin/gtkblist.c:1248
+msgid "_Expand"
+msgstr "_Etendu"
+
+#: ../pidgin/gtkblist.c:1493 ../pidgin/gtkblist.c:1505
+#: ../pidgin/gtkblist.c:4431 ../pidgin/gtkblist.c:4441
+msgid "/Tools/Mute Sounds"
+msgstr "/Iloj/Mutu Sonojn"
+
+#: ../pidgin/gtkblist.c:1965 ../pidgin/gtkconv.c:4514
+#: ../pidgin/gtkpounce.c:421
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr "Vi ne ensalutis nun per konto kiu povas aldoni tiun kunul."
+
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2757
+msgid "/_Buddies"
+msgstr "/K_unuloj"
+
+#: ../pidgin/gtkblist.c:2758
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Kunuloj/Nova Tuj _Mesaĝo..."
+
+#: ../pidgin/gtkblist.c:2759
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Kunuloj/Aliĝu Babile_jon..."
+
+#: ../pidgin/gtkblist.c:2760
+msgid "/Buddies/Get User _Info..."
+msgstr "/Kunuloj/Ricevu Uzanto-_Informon..."
+
+#: ../pidgin/gtkblist.c:2761
+msgid "/Buddies/View User _Log..."
+msgstr "/Kunuloj/Montru Uzanto-_Protokolon..."
+
+#: ../pidgin/gtkblist.c:2763
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Kunuloj/Montru Senk_onektajn Kunulojn"
+
+#: ../pidgin/gtkblist.c:2764
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Kunuloj/Montru Malpl_enajn Grupojn"
+
+#: ../pidgin/gtkblist.c:2765
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Kunuloj/Montru Kunul-_Detalojn"
+
+#: ../pidgin/gtkblist.c:2766
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Kunuloj/Montru Senfarajn _Tempojn"
+
+#: ../pidgin/gtkblist.c:2767
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Kunuloj/_Oridgu Kunulojn"
+
+#: ../pidgin/gtkblist.c:2769
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Kunuloj/_Aldonu Kunulon..."
+
+#: ../pidgin/gtkblist.c:2770
+msgid "/Buddies/Add C_hat..."
+msgstr "/Kunuloj/Aldonu Babile_jon..."
+
+#: ../pidgin/gtkblist.c:2771
+msgid "/Buddies/Add _Group..."
+msgstr "/Kunuloj/Aldonu _Grupon..."
+
+#: ../pidgin/gtkblist.c:2773
+msgid "/Buddies/_Quit"
+msgstr "/Kunuloj/_Finu"
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2776
+msgid "/_Accounts"
+msgstr "/_Kontoj"
+
+#: ../pidgin/gtkblist.c:2777 ../pidgin/gtkblist.c:6344
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Kontoj/Aldonu\\/Redaktu"
+
+#. Tools
+#: ../pidgin/gtkblist.c:2780
+msgid "/_Tools"
+msgstr "/_Iloj"
+
+#: ../pidgin/gtkblist.c:2781
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Iloj/Kunul _Atentigoj"
+
+#: ../pidgin/gtkblist.c:2782
+msgid "/Tools/Plu_gins"
+msgstr "/Iloj/Kromaĵoj"
+
+#: ../pidgin/gtkblist.c:2783
+msgid "/Tools/Pr_eferences"
+msgstr "/Iloj/Agordoj"
+
+#: ../pidgin/gtkblist.c:2784
+msgid "/Tools/Pr_ivacy"
+msgstr "/Iloj/Pr_ivateco"
+
+#: ../pidgin/gtkblist.c:2786
+msgid "/Tools/_File Transfers"
+msgstr "/Iloj/_Dosiero-alŝutoj"
+
+#: ../pidgin/gtkblist.c:2787
+msgid "/Tools/R_oom List"
+msgstr "/Iloj/Ĉambro-Listo"
+
+#: ../pidgin/gtkblist.c:2788
+msgid "/Tools/System _Log"
+msgstr "/Iloj/Sistemo-_Protokolo"
+
+#: ../pidgin/gtkblist.c:2790
+msgid "/Tools/Mute _Sounds"
+msgstr "/Iloj/Mutu _Sonojn"
+
+#. Help
+#: ../pidgin/gtkblist.c:2793
+msgid "/_Help"
+msgstr "/_Helpo"
+
+#: ../pidgin/gtkblist.c:2794
+msgid "/Help/Online _Help"
+msgstr "/Helpo/Reta _Helpo"
+
+#: ../pidgin/gtkblist.c:2795
+msgid "/Help/_Debug Window"
+msgstr "/Helpo/_Sencimig-fenestro"
+
+#: ../pidgin/gtkblist.c:2796
+msgid "/Help/_About"
+msgstr "/Helpo/_Pri"
+
+#: ../pidgin/gtkblist.c:2824
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>Konto:</b> %s"
+
+#: ../pidgin/gtkblist.c:2902
+msgid "Buddy Alias"
+msgstr "Kunul Alinomo"
+
+#: ../pidgin/gtkblist.c:2923
+msgid "Logged In"
+msgstr "Ensalutita"
+
+#: ../pidgin/gtkblist.c:2969
+msgid "Last Seen"
+msgstr "Laste Vidita"
+
+#: ../pidgin/gtkblist.c:2989
+msgid "Spooky"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2991
+msgid "Awesome"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:2993
+msgid "Rockin'"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:3318
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Senfara %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3320
+#, c-format
+msgid "Idle %dm"
+msgstr "Senfara %dm"
+
+#: ../pidgin/gtkblist.c:3457
+msgid "/Buddies/New Instant Message..."
+msgstr "/Kunuloj/Nova Tuj Mesaĝo..."
+
+#: ../pidgin/gtkblist.c:3458 ../pidgin/gtkblist.c:3491
+msgid "/Buddies/Join a Chat..."
+msgstr "/Kunuloj/Aliĝu Babilejon..."
+
+#: ../pidgin/gtkblist.c:3459
+msgid "/Buddies/Get User Info..."
+msgstr "/Kunuloj/Ricevu Uzanto-Informon..."
+
+#: ../pidgin/gtkblist.c:3460
+msgid "/Buddies/Add Buddy..."
+msgstr "/Kunuloj/Aldonu Kunulon..."
+
+#: ../pidgin/gtkblist.c:3461 ../pidgin/gtkblist.c:3494
+msgid "/Buddies/Add Chat..."
+msgstr "/Kunuloj/Aldonu Babilejon..."
+
+#: ../pidgin/gtkblist.c:3462
+msgid "/Buddies/Add Group..."
+msgstr "/Kunuloj/Aldonu Grupon..."
+
+#: ../pidgin/gtkblist.c:3497
+msgid "/Tools/Buddy Pounces"
+msgstr "/Iloj/Kunul Atentigoj"
+
+#: ../pidgin/gtkblist.c:3500
+msgid "/Tools/Privacy"
+msgstr "/Iloj/Privateco"
+
+#: ../pidgin/gtkblist.c:3503
+msgid "/Tools/Room List"
+msgstr "/Iloj/Ĉambro Listo"
+
+#: ../pidgin/gtkblist.c:3600 ../pidgin/gtkdocklet.c:153
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d nelegita mesaĝo el %s\n"
+msgstr[1] "%d nelegitaj mesaĝoj el %s\n"
+
+#: ../pidgin/gtkblist.c:3677
+msgid "Manually"
+msgstr "Mane"
+
+#: ../pidgin/gtkblist.c:3679
+msgid "Alphabetically"
+msgstr "Alfabete"
+
+#: ../pidgin/gtkblist.c:3680
+msgid "By status"
+msgstr "Laŭ stato"
+
+#: ../pidgin/gtkblist.c:3681
+msgid "By log size"
+msgstr "Laŭ protokolo grandeco"
+
+#: ../pidgin/gtkblist.c:3883 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s malkontaktita"
+
+#: ../pidgin/gtkblist.c:3892
+msgid "Re-enable Account"
+msgstr "Reŝaltu Konton"
+
+#: ../pidgin/gtkblist.c:3913
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s malkontaktita: %s</span>"
+
+#: ../pidgin/gtkblist.c:4066
+msgid "<b>Username:</b>"
+msgstr "<b>_Uzantonomo:</b>"
+
+#: ../pidgin/gtkblist.c:4073
+msgid "<b>Password:</b>"
+msgstr "<b>Pasvorton:</b>"
+
+#: ../pidgin/gtkblist.c:4084
+msgid "_Login"
+msgstr "Sa_lutnomo"
+
+#: ../pidgin/gtkblist.c:4169
+msgid "/Accounts"
+msgstr "/Kontoj"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4183
+#, c-format
+msgid ""
+"<span weight='bold' size='larger'>Welcome to %s!</span>\n"
+"\n"
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Add/Edit</b>. Once you enable accounts, you'll be "
+"able to sign on, set your status, and talk to your friends."
+msgstr ""
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../pidgin/gtkblist.c:4425
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/Kunuloj/Montru Senkonektajn Kunulojn"
+
+#: ../pidgin/gtkblist.c:4428
+msgid "/Buddies/Show Empty Groups"
+msgstr "/Kunuloj/Montru Malplenajn Grupojn"
+
+#: ../pidgin/gtkblist.c:4434
+msgid "/Buddies/Show Buddy Details"
+msgstr "/Kunulojn/Montru Kunul-Detalojn"
+
+#: ../pidgin/gtkblist.c:4437
+msgid "/Buddies/Show Idle Times"
+msgstr "/Kunuloj/Montru Senfarajn Tempojn"
+
+#: ../pidgin/gtkblist.c:5271
+msgid ""
+"Please enter the screen name of the person you would like to add to your "
+"buddy list. You may optionally enter an alias, or nickname,  for the buddy. "
+"The alias will be displayed in place of the screen name whenever possible.\n"
+msgstr ""
+"B.v. enigi la ekranan nomon de la persono kiun vi volas aldoni en via "
+"kunullisto. Vi povas laŭ deziro enigi alinomon, aŭ karesnomon, pri la kunul. "
+"La alinomo estos vidigita anstataŭ la erkrana nomo laŭ kaze.\n"
+
+#: ../pidgin/gtkblist.c:5331 ../pidgin/gtkblist.c:5692
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+msgid "Group:"
+msgstr "Grupo:"
+
+#: ../pidgin/gtkblist.c:5590
+msgid "This protocol does not support chat rooms."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5606
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+
+#: ../pidgin/gtkblist.c:5647
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"B.v. enigi alinomon, kaj la konvenan informon pri la babilejo kiun vi volas "
+"aldoni en via kunullisto.\n"
+
+#: ../pidgin/gtkblist.c:5730
+msgid "Please enter the name of the group to be added."
+msgstr "B.v. enigi la nomon de la grupo aldonenda."
+
+#: ../pidgin/gtkblist.c:6364
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/Kontoj/"
+
+#: ../pidgin/gtkblist.c:6388
+msgid "_Edit Account"
+msgstr "_Redaktu Konton"
+
+#: ../pidgin/gtkblist.c:6401 ../pidgin/gtkconv.c:2920
+msgid "No actions available"
+msgstr "Neniu ago disponebla"
+
+#: ../pidgin/gtkblist.c:6409
+msgid "_Disable"
+msgstr "_Malŝaltu"
+
+#: ../pidgin/gtkblist.c:6421
+msgid "Enable Account"
+msgstr "Ŝaltu Konton"
+
+#: ../pidgin/gtkblist.c:6427
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr ""
+
+#: ../pidgin/gtkblist.c:6476
+msgid "/Tools"
+msgstr "/Iloj"
+
+#: ../pidgin/gtkblist.c:6546
+msgid "/Buddies/Sort Buddies"
+msgstr "/Kunuloj/Ordigu Kunulojn"
+
+#: ../pidgin/gtkconn.c:179
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"%s will not attempt to reconnect the account until you correct the error and "
+"re-enable the account."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
+msgid "That buddy is not on the same protocol as this chat."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:802
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:855
+msgid "Invite Buddy Into Chat Room"
+msgstr "Invitu Kunul En Babilejo"
+
+#. Put our happy label in it.
+#: ../pidgin/gtkconv.c:885
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"B.v. enigi la nomon de uzanto kiun vi deziras inviti, kun fakultativan "
+"invitmesaĝon."
+
+#: ../pidgin/gtkconv.c:906
+msgid "_Buddy:"
+msgstr "K_unul:"
+
+#: ../pidgin/gtkconv.c:926 ../pidgin/gtksavedstatuses.c:1141
+#: ../pidgin/gtksavedstatuses.c:1477
+msgid "_Message:"
+msgstr "_Mesaĝo:"
+
+#: ../pidgin/gtkconv.c:983 ../pidgin/gtkconv.c:2487 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
+msgid "Unable to open file."
+msgstr "Dosiero malfermeblas."
+
+#: ../pidgin/gtkconv.c:989
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Konversacio kun %s</h1>\n"
+
+#: ../pidgin/gtkconv.c:1013
+msgid "Save Conversation"
+msgstr "Konservu Konversacion"
+
+#: ../pidgin/gtkconv.c:1160 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:756
+msgid "Find"
+msgstr "Trovu"
+
+#: ../pidgin/gtkconv.c:1186 ../pidgin/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "_Serĉu:"
+
+#: ../pidgin/gtkconv.c:1338
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:1346
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+
+#: ../pidgin/gtkconv.c:1614
+msgid "Un-Ignore"
+msgstr "Malignoru"
+
+#: ../pidgin/gtkconv.c:1617
+msgid "Ignore"
+msgstr "Ignoru"
+
+#: ../pidgin/gtkconv.c:1637
+msgid "Get Away Message"
+msgstr "Montru Formesaĝon"
+
+#: ../pidgin/gtkconv.c:1660
+msgid "Last said"
+msgstr "Laste diris"
+
+#: ../pidgin/gtkconv.c:2495
+msgid "Unable to save icon file to disk."
+msgstr "Ne eblas konservi piktogramodosieron al disko."
+
+#: ../pidgin/gtkconv.c:2565
+msgid "Save Icon"
+msgstr "Konservu Piktogramon"
+
+#: ../pidgin/gtkconv.c:2614
+msgid "Animate"
+msgstr "Animaciigi"
+
+#: ../pidgin/gtkconv.c:2619
+msgid "Hide Icon"
+msgstr "Kaŝu Piktogramon"
+
+#: ../pidgin/gtkconv.c:2622
+msgid "Save Icon As..."
+msgstr "Konservu Piktogramon Kiel..."
+
+#: ../pidgin/gtkconv.c:2626
+msgid "Set Custom Icon..."
+msgstr "Difinu Propran Piktogramon..."
+
+#: ../pidgin/gtkconv.c:2633
+msgid "Remove Custom Icon"
+msgstr "Forigu Propran Piktogramon"
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2774
+msgid "/_Conversation"
+msgstr "/_Konversacio"
+
+#: ../pidgin/gtkconv.c:2776
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Konversacio/Nova Tuj _Mesaĝo..."
+
+#: ../pidgin/gtkconv.c:2781
+msgid "/Conversation/_Find..."
+msgstr "/Konversacio/_Trovu..."
+
+#: ../pidgin/gtkconv.c:2783
+msgid "/Conversation/View _Log"
+msgstr "/Konversacio/Montru _Protokolon"
+
+#: ../pidgin/gtkconv.c:2784
+msgid "/Conversation/_Save As..."
+msgstr "/Konversacio/_Konservu Kiel..."
+
+#: ../pidgin/gtkconv.c:2786
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Konversacio/Fo_rviŝu Dialogon"
+
+#: ../pidgin/gtkconv.c:2790
+msgid "/Conversation/Se_nd File..."
+msgstr "/Konversacio/Se_ndu Dosieron..."
+
+#: ../pidgin/gtkconv.c:2791
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Konversacio/Aldonu Kunul-_Atentigon..."
+
+#: ../pidgin/gtkconv.c:2793
+msgid "/Conversation/_Get Info"
+msgstr "/Konversatio/_Ricevu Informon"
+
+#: ../pidgin/gtkconv.c:2795
+msgid "/Conversation/In_vite..."
+msgstr "/Konversacio/In_vitu..."
+
+#: ../pidgin/gtkconv.c:2797
+msgid "/Conversation/M_ore"
+msgstr "/Konversacio/_Pli"
+
+#: ../pidgin/gtkconv.c:2801
+msgid "/Conversation/Al_ias..."
+msgstr "/Konversacio/Al_inomo..."
+
+#: ../pidgin/gtkconv.c:2803
+msgid "/Conversation/_Block..."
+msgstr "/KConversacio/_Bloku..."
+
+#: ../pidgin/gtkconv.c:2805
+msgid "/Conversation/_Unblock..."
+msgstr "/KConversacio/_Malbloku..."
+
+#: ../pidgin/gtkconv.c:2807
+msgid "/Conversation/_Add..."
+msgstr "/Konversacio/_Aldonu..."
+
+#: ../pidgin/gtkconv.c:2809
+msgid "/Conversation/_Remove..."
+msgstr "/Konversacio/_Forigu..."
+
+#: ../pidgin/gtkconv.c:2814
+msgid "/Conversation/_Close"
+msgstr "/Konversacio/_Fermu"
+
+#. Options
+#: ../pidgin/gtkconv.c:2818
+msgid "/_Options"
+msgstr "/_Opcioj"
+
+#: ../pidgin/gtkconv.c:2819
+msgid "/Options/Enable _Logging"
+msgstr "/Opcioj/Ŝaltu _Protokoladon"
+
+#: ../pidgin/gtkconv.c:2820
+msgid "/Options/Enable _Sounds"
+msgstr "/Opcioj/Ŝaltu _Sonojn"
+
+#: ../pidgin/gtkconv.c:2821
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Opcioj/Montru Kunul-P_iktogramon"
+
+#: ../pidgin/gtkconv.c:2823
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Opcioj/Montru Formato-_Illistelojn"
+
+#: ../pidgin/gtkconv.c:2824
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Opcioj/Montru Te_mpomarkojn"
+
+#: ../pidgin/gtkconv.c:2899
+msgid "/Conversation/More"
+msgstr "/Konversacio/Pli"
+
+#. The menubar has been deactivated. Make sure the 'More' submenu is regenerated next time
+#. * the 'Conversation' menu pops up.
+#. Make sure the 'Conversation -> More' menuitems are regenerated whenever
+#. * the 'Conversation' menu pops up because the entries can change after the
+#. * conversation is created.
+#: ../pidgin/gtkconv.c:2944 ../pidgin/gtkconv.c:2976
+msgid "/Conversation"
+msgstr "/Konversacio"
+
+#: ../pidgin/gtkconv.c:2984
+msgid "/Conversation/View Log"
+msgstr "/Konversacio/Montru Protokoladon"
+
+#: ../pidgin/gtkconv.c:2990
+msgid "/Conversation/Send File..."
+msgstr "/Konversacio/Sendu Dosieron..."
+
+#: ../pidgin/gtkconv.c:2994
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Konversacio/Aldonu Kunul-Atentijon..."
+
+#: ../pidgin/gtkconv.c:3000
+msgid "/Conversation/Get Info"
+msgstr "/Konversacio/Ricevu Informon"
+
+#: ../pidgin/gtkconv.c:3004
+msgid "/Conversation/Invite..."
+msgstr "/Konversacio/Invitu..."
+
+#: ../pidgin/gtkconv.c:3010
+msgid "/Conversation/Alias..."
+msgstr "/Konversacio/Alinomo..."
+
+#: ../pidgin/gtkconv.c:3014
+msgid "/Conversation/Block..."
+msgstr "/Konversacio/Bloku..."
+
+#: ../pidgin/gtkconv.c:3018
+msgid "/Conversation/Unblock..."
+msgstr "/Konversacio/Malbloku..."
+
+#: ../pidgin/gtkconv.c:3022
+msgid "/Conversation/Add..."
+msgstr "/Konversacion/Aldonu..."
+
+#: ../pidgin/gtkconv.c:3026
+msgid "/Conversation/Remove..."
+msgstr "/Konversacio/Forigu..."
+
+#: ../pidgin/gtkconv.c:3030
+msgid "/Options/Enable Logging"
+msgstr "/Opcioj/Ŝaltu Protokoladon"
+
+#: ../pidgin/gtkconv.c:3033
+msgid "/Options/Enable Sounds"
+msgstr "/Opcioj/Ŝaltu Sonojn"
+
+#: ../pidgin/gtkconv.c:3046
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Opcioj/Montru Formato-Illistelojn"
+
+#: ../pidgin/gtkconv.c:3049
+msgid "/Options/Show Timestamps"
+msgstr "/Opcioj/Montru Tempomarkojn"
+
+#: ../pidgin/gtkconv.c:3052
+msgid "/Options/Show Buddy Icon"
+msgstr "/Opcioj/Montru Kunul-Piktogramon"
+
+#: ../pidgin/gtkconv.c:3136 ../pidgin/gtkconv.c:3173
+msgid "User is typing..."
+msgstr "Uzanto tajpas..."
+
+#: ../pidgin/gtkconv.c:3176
+msgid "User has typed something and stopped"
+msgstr "Uzanto tajpis ion kaj haltis"
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3358
+msgid "_Send To"
+msgstr "_Sendu Al"
+
+#: ../pidgin/gtkconv.c:4065
+msgid "_Send"
+msgstr "_Sendu"
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4213
+msgid "0 people in room"
+msgstr "0 homo en ĉambro"
+
+#: ../pidgin/gtkconv.c:5303 ../pidgin/gtkconv.c:5424
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d homo en ĉambro"
+msgstr[1] "%d homoj en ĉambro"
+
+#: ../pidgin/gtkconv.c:5980 ../pidgin/gtkstatusbox.c:607
+msgid "Typing"
+msgstr "Tajpante"
+
+#: ../pidgin/gtkconv.c:5986
+msgid "Stopped Typing"
+msgstr "Ekmaltajpas"
+
+#: ../pidgin/gtkconv.c:5991
+msgid "Nick Said"
+msgstr "Karesnomo Diris"
+
+#: ../pidgin/gtkconv.c:5996 ../pidgin/gtkdocklet.c:500
+msgid "Unread Messages"
+msgstr "Nelegitaj mesaĝoj"
+
+#: ../pidgin/gtkconv.c:6001
+msgid "New Event"
+msgstr "Nova Evento"
+
+#: ../pidgin/gtkconv.c:7122
+msgid "Confirm close"
+msgstr "Konfirmu fermon"
+
+#: ../pidgin/gtkconv.c:7154
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr ""
+"Vi havas nelegitajn mesaĝojn. Ĉu vi certas vi volas fermi la fenestron?"
+
+#: ../pidgin/gtkconv.c:7689
+msgid "Close other tabs"
+msgstr "Fermu aliajn langetojn"
+
+#: ../pidgin/gtkconv.c:7695
+msgid "Close all tabs"
+msgstr "Fermu ĉiujn langetojn"
+
+#: ../pidgin/gtkconv.c:7703
+msgid "Detach this tab"
+msgstr "Deigu tiun langeton"
+
+#: ../pidgin/gtkconv.c:7709
+msgid "Close this tab"
+msgstr "Fermu tiun langeton"
+
+#: ../pidgin/gtkconv.c:8012
+msgid "Close conversation"
+msgstr "Fermu konversacion"
+
+#: ../pidgin/gtkconv.c:8476
+msgid "Last created window"
+msgstr "Lasta kreita fenestro"
+
+#: ../pidgin/gtkconv.c:8478
+msgid "Separate IM and Chat windows"
+msgstr "Disigu TM-aj kaj Babilejajn fenestrojn"
+
+#: ../pidgin/gtkconv.c:8480 ../pidgin/gtkprefs.c:1303
+msgid "New window"
+msgstr "Nova fenestro"
+
+#: ../pidgin/gtkconv.c:8482
+msgid "By group"
+msgstr "Laŭ grupo"
+
+#: ../pidgin/gtkconv.c:8484
+msgid "By account"
+msgstr "Laŭ konto"
+
+#: ../pidgin/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "Konservu Sencimigo-Protokolon"
+
+#: ../pidgin/gtkdebug.c:594
+msgid "Invert"
+msgstr "Maligu"
+
+#: ../pidgin/gtkdebug.c:597
+msgid "Highlight matches"
+msgstr "Emfazu trovojn"
+
+#: ../pidgin/gtkdebug.c:664
+msgid "_Icon Only"
+msgstr "Nur _Piktogramo"
+
+#: ../pidgin/gtkdebug.c:665
+msgid "_Text Only"
+msgstr "Nur _Teksto"
+
+#: ../pidgin/gtkdebug.c:666
+msgid "_Both Icon & Text"
+msgstr "_Ambaŭ Piktogramo & Teksto"
+
+#: ../pidgin/gtkdebug.c:802
+msgid "Filter"
+msgstr "Filtrilo"
+
+#: ../pidgin/gtkdebug.c:821
+msgid "Right click for more options."
+msgstr "Dektra klako por plia opcioj."
+
+#: ../pidgin/gtkdebug.c:851
+msgid "Level "
+msgstr "Nivelo "
+
+#: ../pidgin/gtkdebug.c:852 ../pidgin/gtkdebug.c:858
+msgid "Select the debug filter level."
+msgstr "Elektu sencimigfiltrilo nivelo."
+
+#: ../pidgin/gtkdebug.c:860
+msgid "All"
+msgstr "Ĉiuj"
+
+#: ../pidgin/gtkdebug.c:861
+msgid "Misc"
+msgstr "Diversaĵoj"
+
+#: ../pidgin/gtkdebug.c:863
+msgid "Warning"
+msgstr "Averto"
+
+#: ../pidgin/gtkdebug.c:864
+msgid "Error "
+msgstr "Eraro "
+
+#: ../pidgin/gtkdebug.c:865
+msgid "Fatal Error"
+msgstr "Fatala Eraro"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:115
+msgid "lead developer"
+msgstr "ĉefa programisto"
+
+#: ../pidgin/gtkdialogs.c:72 ../pidgin/gtkdialogs.c:73
+#: ../pidgin/gtkdialogs.c:74 ../pidgin/gtkdialogs.c:75
+#: ../pidgin/gtkdialogs.c:76 ../pidgin/gtkdialogs.c:78
+#: ../pidgin/gtkdialogs.c:79 ../pidgin/gtkdialogs.c:80
+#: ../pidgin/gtkdialogs.c:81 ../pidgin/gtkdialogs.c:82
+#: ../pidgin/gtkdialogs.c:83 ../pidgin/gtkdialogs.c:86
+#: ../pidgin/gtkdialogs.c:87 ../pidgin/gtkdialogs.c:88
+msgid "developer"
+msgstr "programisto"
+
+#: ../pidgin/gtkdialogs.c:77
+msgid "developer & webmaster"
+msgstr "programisto kaj retestro"
+
+#: ../pidgin/gtkdialogs.c:84
+msgid "support"
+msgstr "subteno"
+
+#: ../pidgin/gtkdialogs.c:85
+msgid "support/QA"
+msgstr "subteno/Kvalitkontrolo"
+
+#: ../pidgin/gtkdialogs.c:107
+msgid "win32 port"
+msgstr "win32 portebliĝo"
+
+#: ../pidgin/gtkdialogs.c:108 ../pidgin/gtkdialogs.c:109
+msgid "maintainer"
+msgstr "vartulo"
+
+#: ../pidgin/gtkdialogs.c:110
+msgid "libfaim maintainer"
+msgstr "libfaim vartulo"
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:112
+msgid "hacker and designated driver [lazy bum]"
+msgstr "artifikulo kaj speciala pelilo"
+
+#: ../pidgin/gtkdialogs.c:113
+msgid "Jabber developer"
+msgstr "Jabber programisto"
+
+#: ../pidgin/gtkdialogs.c:114
+msgid "original author"
+msgstr "originala aŭtoro"
+
+#: ../pidgin/gtkdialogs.c:121
+msgid "Afrikaans"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:122
+msgid "Arabic"
+msgstr "Araba"
+
+#: ../pidgin/gtkdialogs.c:123 ../pidgin/gtkdialogs.c:124
+#: ../pidgin/gtkdialogs.c:205
+msgid "Bulgarian"
+msgstr "Bulgara"
+
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+msgid "Bengali"
+msgstr "Bengala"
+
+#: ../pidgin/gtkdialogs.c:129
+msgid "Bosnian"
+msgstr "Bosna"
+
+#: ../pidgin/gtkdialogs.c:130 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:207
+msgid "Catalan"
+msgstr "Kataluna"
+
+#: ../pidgin/gtkdialogs.c:131 ../pidgin/gtkdialogs.c:132
+msgid "Valencian-Catalan"
+msgstr "Valenciana"
+
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:208
+msgid "Czech"
+msgstr "Ĉeĥa"
+
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:135
+msgid "Danish"
+msgstr "Dana"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: ../pidgin/gtkdialogs.c:209
+msgid "German"
+msgstr "Germana"
+
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:140
+msgid "Dzongkha"
+msgstr ""
+
+#: ../pidgin/gtkdialogs.c:141 ../pidgin/gtkdialogs.c:142
+msgid "Greek"
+msgstr "Greka"
+
+#: ../pidgin/gtkdialogs.c:143
+msgid "Australian English"
+msgstr "Aŭstrala Angla"
+
+#: ../pidgin/gtkdialogs.c:144
+msgid "Canadian English"
+msgstr "Kanada Angla"
+
+#: ../pidgin/gtkdialogs.c:145
+msgid "British English"
+msgstr "Brita Angla"
+
+#: ../pidgin/gtkdialogs.c:146
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../pidgin/gtkdialogs.c:147 ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:211 ../pidgin/gtkdialogs.c:212
+#: ../pidgin/gtkdialogs.c:213
+msgid "Spanish"
+msgstr "Hispana"
+
+#: ../pidgin/gtkdialogs.c:148 ../pidgin/gtkdialogs.c:149
+msgid "Euskera(Basque)"
+msgstr "Eŭska"
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: ../pidgin/gtkdialogs.c:152
+msgid "Persian"
+msgstr "Persa"
+
+#: ../pidgin/gtkdialogs.c:153 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+msgid "Finnish"
+msgstr "Finna"
+
+#: ../pidgin/gtkdialogs.c:154 ../pidgin/gtkdialogs.c:216
+#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219
+msgid "French"
+msgstr "Franca"
+
+#: ../pidgin/gtkdialogs.c:155
+msgid "Galician"
+msgstr "Galega"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:157
+msgid "Gujarati"
+msgstr "Guĝarata"
+
+#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:220
+msgid "Hebrew"
+msgstr "Hebrea"
+
+#: ../pidgin/gtkdialogs.c:159
+msgid "Hindi"
+msgstr "Hindia"
+
+#: ../pidgin/gtkdialogs.c:160
+msgid "Hungarian"
+msgstr "Hungara"
+
+#: ../pidgin/gtkdialogs.c:161
+msgid "Indonesian"
+msgstr "Indonezia"
+
+#: ../pidgin/gtkdialogs.c:162 ../pidgin/gtkdialogs.c:221
+msgid "Italian"
+msgstr "Itala"
+
+#: ../pidgin/gtkdialogs.c:163 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
+msgid "Japanese"
+msgstr "Japana"
+
+#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:225
+msgid "Georgian"
+msgstr "Kartvela"
+
+#: ../pidgin/gtkdialogs.c:165
+msgid "Kannada"
+msgstr "Kanara"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:226
+msgid "Korean"
+msgstr "Korea"
+
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:168
+#: ../pidgin/gtkdialogs.c:169
+msgid "Kurdish"
+msgstr "Kurda"
+
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
+msgid "Lithuanian"
+msgstr "Litova"
+
+#: ../pidgin/gtkdialogs.c:171
+msgid "Macedonian"
+msgstr "Makedona"
+
+#: ../pidgin/gtkdialogs.c:172
+msgid "Bokmål Norwegian"
+msgstr "Bokmål Norvega"
+
+#: ../pidgin/gtkdialogs.c:173
+msgid "Nepali"
+msgstr "Nepala"
+
+#: ../pidgin/gtkdialogs.c:174
+msgid "Dutch, Flemish"
+msgstr "Nederlanda, Flandra"
+
+#: ../pidgin/gtkdialogs.c:175
+msgid "Norwegian"
+msgstr "Norvega"
+
+#: ../pidgin/gtkdialogs.c:176 ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:229
+msgid "Polish"
+msgstr "Pola"
+
+#: ../pidgin/gtkdialogs.c:179
+msgid "Portuguese"
+msgstr "Portugala"
+
+#: ../pidgin/gtkdialogs.c:180
+msgid "Portuguese-Brazil"
+msgstr "Brazil-Portugala"
+
+#: ../pidgin/gtkdialogs.c:181
+msgid "Pashto"
+msgstr "Paŝtua"
+
+#: ../pidgin/gtkdialogs.c:182
+msgid "Romanian"
+msgstr "Rumana"
+
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231
+msgid "Russian"
+msgstr "Rusa"
+
+#: ../pidgin/gtkdialogs.c:184 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
+msgid "Slovak"
+msgstr "Slovaka"
+
+#: ../pidgin/gtkdialogs.c:185
+msgid "Slovack"
+msgstr "Slovaka"
+
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:235
+msgid "Slovenian"
+msgstr "Slovena"
+
+#: ../pidgin/gtkdialogs.c:187
+msgid "Albanian"
+msgstr "Albana"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:189
+msgid "Serbian"
+msgstr "Serba"
+
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:236
+msgid "Swedish"
+msgstr "Sveda"
+
+#: ../pidgin/gtkdialogs.c:191
+msgid "Tamil"
+msgstr "Tamila"
+
+#: ../pidgin/gtkdialogs.c:192
+msgid "Telugu"
+msgstr "Telugua"
+
+#: ../pidgin/gtkdialogs.c:193
+msgid "Thai"
+msgstr "Taja"
+
+#: ../pidgin/gtkdialogs.c:194
+msgid "Turkish"
+msgstr "Turka"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "Vietnamese"
+msgstr "Vjetnama"
+
+#: ../pidgin/gtkdialogs.c:195
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh kaj la Gnome-Vi Teamo"
+
+#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:237
+msgid "Simplified Chinese"
+msgstr "Simpligita Ĉina"
+
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:238
+msgid "Traditional Chinese"
+msgstr "Tradicia Ĉina"
+
+#: ../pidgin/gtkdialogs.c:204
+msgid "Amharic"
+msgstr "Amhara"
+
+#: ../pidgin/gtkdialogs.c:323
+msgid "About %s"
+msgstr "Pri %s"
+
+#: ../pidgin/gtkdialogs.c:359
+msgid ""
+"%s is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, "
+"ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, "
+"Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You "
+"may modify and redistribute the program under the terms of the GPL (version "
+"2 or later).  A copy of the GPL is contained in the 'COPYING' file "
+"distributed with %s.  %s is copyrighted by its contributors.  See the "
+"'COPYRIGHT' file for the complete list of contributors.  We provide no "
+"warranty for this program.<BR><BR>"
+msgstr ""
+"%s estas modula mesaĝokliento, kapablas uzi AIM, MSN, Yahoo!, Jabber, ICQ, "
+"IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, "
+"Gadu-Gadu kaj QQ ĉiujn samtempe.  Ĝi estas programita per GTK+.<BR><BR>Vi "
+"rajtas modifi kaj pludistribui la programon je la kondiĉoj de la GPL (versio "
+"2 aŭ posta).  Ekzempleron de la GPL-o enhavas la dosiero 'COPYING' disdonita "
+"kun %s.  %s estas aŭtorrajtigita de kontribuantoj.  Vidu la dosieron "
+"'COPYRIGHT' pri kompleta listo de kontribuantoj.  Ni provizas nenian "
+"garantion pri tiu programaro.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:374
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin ĉe irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:377
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin ĉe irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:383
+msgid "Current Developers"
+msgstr "Aktualaj Programistoj"
+
+#: ../pidgin/gtkdialogs.c:398
+msgid "Crazy Patch Writers"
+msgstr "Frenezaj Flikistoj"
+
+#: ../pidgin/gtkdialogs.c:413
+msgid "Retired Developers"
+msgstr "Emeritaj Programistoj"
+
+#: ../pidgin/gtkdialogs.c:428
+msgid "Artists"
+msgstr "Artistoj"
+
+#: ../pidgin/gtkdialogs.c:443
+msgid "Current Translators"
+msgstr "Aktualaj Tradukantoj"
+
+#: ../pidgin/gtkdialogs.c:463
+msgid "Past Translators"
+msgstr "Pastintaj Tradukantoj"
+
+#: ../pidgin/gtkdialogs.c:481
+msgid "Debugging Information"
+msgstr "Sencimiga Informo"
+
+#: ../pidgin/gtkdialogs.c:855
+msgid "Get User Info"
+msgstr "Ricevu Uzanto-Informon"
+
+#: ../pidgin/gtkdialogs.c:857
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"B.v. enigi la ekrannomon aŭ alinomon de persono kiesn informon vi dezrias "
+"rigardi."
+
+#: ../pidgin/gtkdialogs.c:946
+msgid "View User Log"
+msgstr "Rigardu Uzanto-Protokolon"
+
+#: ../pidgin/gtkdialogs.c:948
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr ""
+"B.v. enigi la ekrannomon aŭ alinomon de persono kiesn protokolon vi dezrias "
+"rigardi."
+
+#: ../pidgin/gtkdialogs.c:967
+msgid "Alias Contact"
+msgstr "Alinomo Kontakto"
+
+#: ../pidgin/gtkdialogs.c:968
+msgid "Enter an alias for this contact."
+msgstr "Enigu alinomon por tiu kontakto."
+
+#: ../pidgin/gtkdialogs.c:988
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Enigu alinomon por %s."
+
+#: ../pidgin/gtkdialogs.c:990
+msgid "Alias Buddy"
+msgstr "Alinomu Kunulon"
+
+#: ../pidgin/gtkdialogs.c:1009
+msgid "Alias Chat"
+msgstr "Alinomu Babilejon"
+
+#: ../pidgin/gtkdialogs.c:1010
+msgid "Enter an alias for this chat."
+msgstr "Enigu alinomon por tiu babilejon."
+
+#: ../pidgin/gtkdialogs.c:1047
+#, c-format
+msgid ""
+"You are about to remove the contact containing %s and %d other buddy from "
+"your buddy list.  Do you want to continue?"
+msgid_plural ""
+"You are about to remove the contact containing %s and %d other buddies from "
+"your buddy list.  Do you want to continue?"
+msgstr[0] ""
+"Vi estas foriganta la kontakton enhavantan %s kaj %d alia kunul de via "
+"kunullisto. Ĉu vi volas daŭrigi?"
+msgstr[1] ""
+"Vi estas foriganta la kontaktojn enhavantajn %s kaj %d aliaj kunuloj de via "
+"kunullisto. Ĉu vi volas daŭrigi?"
+
+#: ../pidgin/gtkdialogs.c:1055
+msgid "Remove Contact"
+msgstr "Forigu Kontakton"
+
+#: ../pidgin/gtkdialogs.c:1056
+msgid "_Remove Contact"
+msgstr "_Forigu Kontakton"
+
+#: ../pidgin/gtkdialogs.c:1086
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"Vi estas kunfandanta la grupon nomita %s en la grupo nomita %s. Ĉu vi volas "
+"daŭrigi?"
+
+#: ../pidgin/gtkdialogs.c:1093
+msgid "Merge Groups"
+msgstr "Kunfandu Grupojn"
+
+#: ../pidgin/gtkdialogs.c:1094
+msgid "_Merge Groups"
+msgstr "_Kunfandu Grupojn"
+
+#: ../pidgin/gtkdialogs.c:1144
+#, c-format
+msgid ""
+"You are about to remove the group %s and all its members from your buddy "
+"list.  Do you want to continue?"
+msgstr ""
+"Vi estas foriganta la grupon %s kaj tutajn membrojn de via kunullisto. Ĉu vi "
+"volas daŭrigi?"
+
+#: ../pidgin/gtkdialogs.c:1147
+msgid "Remove Group"
+msgstr "Forigu Grupon"
+
+#: ../pidgin/gtkdialogs.c:1148
+msgid "_Remove Group"
+msgstr "_Forigu Grupon"
+
+#: ../pidgin/gtkdialogs.c:1181
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "Vi estas foriganta %s de via kunullisto.  Ĉu vi volas daŭrigi?"
+
+#: ../pidgin/gtkdialogs.c:1184
+msgid "Remove Buddy"
+msgstr "Forigu Kunulon"
+
+#: ../pidgin/gtkdialogs.c:1185
+msgid "_Remove Buddy"
+msgstr "_Forigu Kunulon"
+
+#: ../pidgin/gtkdialogs.c:1206
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr "Vi estas foriganta %s de via kunullisto.  Ĉu vi volas daŭrigi?"
+
+#: ../pidgin/gtkdialogs.c:1209
+msgid "Remove Chat"
+msgstr "Forigu Babilejon"
+
+#: ../pidgin/gtkdialogs.c:1210
+msgid "_Remove Chat"
+msgstr "_Forigu Babilejon"
+
+#: ../pidgin/gtkdocklet.c:150
+msgid "Right-click for more unread messages...\n"
+msgstr "Dektre-klaku por pliaj nelegitaj mesaĝoj...\n"
+
+#: ../pidgin/gtkdocklet.c:443
+msgid "Change Status"
+msgstr "Ŝanĝu staton"
+
+#: ../pidgin/gtkdocklet.c:495
+msgid "Show Buddy List"
+msgstr "Montru kunulliston"
+
+#: ../pidgin/gtkdocklet.c:521
+msgid "New Message..."
+msgstr "Nova mesaĝo..."
+
+#: ../pidgin/gtkdocklet.c:536
+msgid "Mute Sounds"
+msgstr "Malsonorigu"
+
+#: ../pidgin/gtkdocklet.c:543
+msgid "Blink on new message"
+msgstr "Flagri je nova mesaĝo"
+
+#. TODO: need a submenu to change status, this needs to "link"
+#. * to the status in the buddy list gtkstatusbox
+#.
+#: ../pidgin/gtkdocklet.c:554
+msgid "Quit"
+msgstr "Finu"
+
+#: ../pidgin/gtkft.c:153
+msgid "Not started"
+msgstr "Malkomencita"
+
+#: ../pidgin/gtkft.c:273
+msgid "<b>Receiving As:</b>"
+msgstr "<b>Ricevante Kiel:</b>"
+
+#: ../pidgin/gtkft.c:275
+msgid "<b>Receiving From:</b>"
+msgstr "<b>Ricevante De:</b>"
+
+#: ../pidgin/gtkft.c:279
+msgid "<b>Sending To:</b>"
+msgstr "<b>Sendante Al:</b>"
+
+#: ../pidgin/gtkft.c:281
+msgid "<b>Sending As:</b>"
+msgstr "<b>Sendante Kiel:</b>"
+
+#: ../pidgin/gtkft.c:497
+msgid "There is no application configured to open this type of file."
+msgstr ""
+
+#: ../pidgin/gtkft.c:502
+msgid "An error occurred while opening the file."
+msgstr "Eraro okazis malfermante la dosiero."
+
+#: ../pidgin/gtkft.c:539
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "Eraro lanĉante %s: %s"
+
+#: ../pidgin/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr "Eraro lanĉante %s"
+
+#: ../pidgin/gtkft.c:549
+#, c-format
+msgid "Process returned error code %d"
+msgstr ""
+
+#: ../pidgin/gtkft.c:696
+msgid "Filename:"
+msgstr "Dosiernomo:"
+
+#: ../pidgin/gtkft.c:697
+msgid "Local File:"
+msgstr "Loka Doerisero:"
+
+#: ../pidgin/gtkft.c:699
+msgid "Speed:"
+msgstr "Rapideco:"
+
+#: ../pidgin/gtkft.c:700
+msgid "Time Elapsed:"
+msgstr "Pasita Tempo:"
+
+#: ../pidgin/gtkft.c:701
+msgid "Time Remaining:"
+msgstr "Resta Tempo:"
+
+#: ../pidgin/gtkft.c:786
+msgid "Close this window when all transfers _finish"
+msgstr "Fermu tiun fenestron kiam all transmetoj _finas"
+
+#: ../pidgin/gtkft.c:796
+msgid "C_lear finished transfers"
+msgstr "F_orviŝu finitajn transmetojn"
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:805
+msgid "File transfer _details"
+msgstr "Dosiero-transmeto _detaloj"
+
+#. Pause button
+#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:96
+msgid "_Pause"
+msgstr "_Paŭzo"
+
+#. Resume button
+#: ../pidgin/gtkft.c:845
+msgid "_Resume"
+msgstr "_Rekomenci"
+
+#: ../pidgin/gtkimhtml.c:793
+msgid "Paste as Plain _Text"
+msgstr "Enmetu keil Plena _Teksto"
+
+#: ../pidgin/gtkimhtml.c:810
+msgid "_Reset formatting"
+msgstr "_Restarigu formatumon"
+
+#: ../pidgin/gtkimhtml.c:1295
+msgid "Hyperlink color"
+msgstr "Ligila koloro"
+
+#: ../pidgin/gtkimhtml.c:1296
+msgid "Color to draw hyperlinks."
+msgstr "Koloro ligila."
+
+#: ../pidgin/gtkimhtml.c:1299
+msgid "Hyperlink prelight color"
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1300
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr ""
+
+#: ../pidgin/gtkimhtml.c:1516
+msgid "_Copy E-Mail Address"
+msgstr "_Kopiu Retadreson"
+
+#: ../pidgin/gtkimhtml.c:1528
+msgid "_Open Link in Browser"
+msgstr "_Malfermu Ligilon en Retumilo"
+
+#: ../pidgin/gtkimhtml.c:1538
+msgid "_Copy Link Location"
+msgstr "_Kopiu Ligilo-Lokon"
+
+#: ../pidgin/gtkimhtml.c:3271
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>Nerekonata dosiertipo</span>\n"
+"\n"
+"Apriorigas kiel PNG."
+
+#: ../pidgin/gtkimhtml.c:3274
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"Nerekonata dosiertipo\n"
+"\n"
+"Apriorigas kiel PNG."
+
+#: ../pidgin/gtkimhtml.c:3287
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>Eraro konservante bildon</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3290
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"Eraro konservante bildon\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3370 ../pidgin/gtkimhtml.c:3382
+msgid "Save Image"
+msgstr "Konservu Bildon"
+
+#: ../pidgin/gtkimhtml.c:3410
+msgid "_Save Image..."
+msgstr "_Konservi Bildon..."
+
+#: ../pidgin/gtkimhtmltoolbar.c:147
+msgid "Select Font"
+msgstr "Elektu Tiparon"
+
+#: ../pidgin/gtkimhtmltoolbar.c:226
+msgid "Select Text Color"
+msgstr "Elektu Tekstan Koloron"
+
+#: ../pidgin/gtkimhtmltoolbar.c:305
+msgid "Select Background Color"
+msgstr "Elektu Malantaŭan Koloron"
+
+#: ../pidgin/gtkimhtmltoolbar.c:394
+msgid "_URL"
+msgstr "_URL"
+
+#: ../pidgin/gtkimhtmltoolbar.c:402
+msgid "_Description"
+msgstr "_Priskribo"
+
+#: ../pidgin/gtkimhtmltoolbar.c:405
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"B.v. enigi la URL-n kaj priskribon de la ligilo kiun vi volas enmeti. La "
+"priskribo estas fakultativa."
+
+#: ../pidgin/gtkimhtmltoolbar.c:409
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "B.v. enigi la URL-n kies ligilon vi volas enmeti."
+
+#: ../pidgin/gtkimhtmltoolbar.c:414
+msgid "Insert Link"
+msgstr "Enmetu Ligilon"
+
+#: ../pidgin/gtkimhtmltoolbar.c:418
+msgid "_Insert"
+msgstr "_Enmetu"
+
+#: ../pidgin/gtkimhtmltoolbar.c:487
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Malsukcesis konservi bildon: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:513 ../pidgin/gtkimhtmltoolbar.c:523
+msgid "Insert Image"
+msgstr "Enmetu Bildon"
+
+#: ../pidgin/gtkimhtmltoolbar.c:721
+msgid "This theme has no available smileys."
+msgstr "Tiu temo havas neniujn disponeblajn ridmienojn"
+
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:735
+msgid "Smile!"
+msgstr "Ridetu!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:922 ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Grasa"
+
+#: ../pidgin/gtkimhtmltoolbar.c:933 ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursiva"
+
+#: ../pidgin/gtkimhtmltoolbar.c:944 ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Substrekita"
+
+#: ../pidgin/gtkimhtmltoolbar.c:960
+msgid "Larger font size"
+msgstr "Pligranda tiparo grandeco"
+
+#: ../pidgin/gtkimhtmltoolbar.c:972
+msgid "Smaller font size"
+msgstr "Malpligranda tiparo grandeco"
+
+#: ../pidgin/gtkimhtmltoolbar.c:989
+msgid "Font face"
+msgstr "Tiparo aspekto"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1001
+msgid "Foreground font color"
+msgstr "Antaŭa tiparo koloro"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1013
+msgid "Background color"
+msgstr "Malantaŭa tiparo koloro"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1029
+msgid "Reset formatting"
+msgstr "Restartigu formatumon"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1044
+msgid "Insert link"
+msgstr "Enmetu ligilon"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1054
+msgid "Insert image"
+msgstr "Enmetu bildon"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "Insert smiley"
+msgstr "Enmetu ridmienon"
+
+#: ../pidgin/gtklog.c:262
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr "Ĉu vi certas vi volas forigi elektitajn konservitajn statuojn?"
+
+#: ../pidgin/gtklog.c:273
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr "Ĉu vi certas vi volas forigi elektitajn konservitajn statuojn?"
+
+#: ../pidgin/gtklog.c:278
+#, fuzzy, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr "Ĉu vi certas vi volas forigi elektitajn konservitajn statuojn?"
+
+#: ../pidgin/gtklog.c:419
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Konversacio en %s ĉe %s</span>"
+
+#: ../pidgin/gtklog.c:422
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Konversacio kun %s ĉe %s</span>"
+
+#: ../pidgin/gtklog.c:469
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../pidgin/gtklog.c:516
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Sistemeventoj nur estos protokolita se la \"Protokolu ĉiujn ŝanĝojn al "
+"sistem protokolo\" agordo estas ŝaltita."
+
+#: ../pidgin/gtklog.c:520
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:523
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+
+#: ../pidgin/gtklog.c:527
+msgid "No logs were found"
+msgstr "Neniu protokolo trovita"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:542
+msgid "_Browse logs folder"
+msgstr ""
+
+#: ../pidgin/gtklog.c:606
+msgid "Total log size:"
+msgstr "Tuta protokolo grandeco:"
+
+#: ../pidgin/gtklog.c:675
+#, c-format
+msgid "Conversations in %s"
+msgstr "Konversacioj en %s"
+
+#: ../pidgin/gtklog.c:683 ../pidgin/gtklog.c:735
+#, c-format
+msgid "Conversations with %s"
+msgstr "Konversacioj kun %s"
+
+#: ../pidgin/gtklog.c:760
+msgid "System Log"
+msgstr "Sistemo Protokolo"
+
+#: ../pidgin/gtkmain.c:364
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. Provu `%s -h' por plia informo.\n"
+
+#: ../pidgin/gtkmain.c:366
+msgid ""
+"%s %s\n"
+"Usage: %s [OPTION]...\n"
+"\n"
+"  -c, --config=DIR    use DIR for config files\n"
+"  -d, --debug         print debugging messages to stdout\n"
+"  -h, --help          display this help and exit\n"
+"  -n, --nologin       don't automatically login\n"
+"  -l, --login[=NAME]  automatically login (optional argument NAME specifies\n"
+"                      account(s) to use, separated by commas)\n"
+"  -v, --version       display the current version and exit\n"
+msgstr ""
+"%s %s\n"
+"Uzo: %s [OPCIOJ]...\n"
+"\n"
+"  -c, --config=UJO    uzu UJOn por agordo dosieroj\n"
+"  -d, --debug         montru sencimigajn mesaĝojn al stdout\n"
+"  -h, --help          vidigu tiun helpon kaj finu\n"
+"  -n, --nologin       ne aŭtomate ensalutu\n"
+"  -l, --login[=NOMO]  aŭtomate ensalutu (fakultativa argumento NOMO "
+"specifas\n"
+"                      konto(j)n uzendajn, disigitajn per komoj)\n"
+"  -v, --version       vidigu la aktualan version kaj finu\n"
+
+#: ../pidgin/gtkmain.c:550
+#, c-format
+msgid ""
+"%s has segfaulted and attempted to dump a core file.\n"
+"This is a bug in the software and has happened through\n"
+"no fault of your own.\n"
+"\n"
+"If you can reproduce the crash, please notify the Pidgin\n"
+"developers by reporting a bug at\n"
+"%sbug.php\n"
+"\n"
+"Please make sure to specify what you were doing at the time\n"
+"and post the backtrace from the core file.  If you do not know\n"
+"how to get the backtrace, please read the instructions at\n"
+"%sgdb.php\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%scontactinfo.php\n"
+msgstr ""
+
+#: ../pidgin/gtknotify.c:337
+msgid "Open All Messages"
+msgstr "Malfermu Ĉiujn Retmesaĝojn"
+
+#: ../pidgin/gtknotify.c:389
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Vi ricevis retmesaĝon!</span>"
+
+#: ../pidgin/gtknotify.c:483
+msgid "Sender"
+msgstr "Sendanto"
+
+#: ../pidgin/gtknotify.c:509
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s havas %d novan mesaĝon."
+msgstr[1] "%s havas %d novajn mesaĝojn."
+
+#: ../pidgin/gtknotify.c:520
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../pidgin/gtknotify.c:909
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "La retumila komando \"%s\" estas malvalida."
+
+#: ../pidgin/gtknotify.c:911 ../pidgin/gtknotify.c:923
+#: ../pidgin/gtknotify.c:936 ../pidgin/gtknotify.c:1064
+msgid "Unable to open URL"
+msgstr "Malfermeblas URL"
+
+#: ../pidgin/gtknotify.c:921 ../pidgin/gtknotify.c:934
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Eraro lanĉante \"%s\": %s"
+
+#: ../pidgin/gtknotify.c:1065
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"La 'Mana' foliumilo komando estis elektita, sed nenia komando estis difinita."
+
+#: ../pidgin/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "La jenajn kromaĵoj estos malŝarĝitaj."
+
+#: ../pidgin/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "Pluraj kromaĵoj estos elŝarĝitaj."
+
+#: ../pidgin/gtkplugin.c:285
+msgid "Unload Plugins"
+msgstr "Elŝarĝi Kormaĵojn"
+
+#: ../pidgin/gtkplugin.c:397
+#, c-format
+msgid ""
+"%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
+"<span weight=\"bold\">Website:</span>\t\t%s\n"
+"<span weight=\"bold\">Filename:</span>\t\t%s"
+msgstr ""
+"%s%s<span weight=\"bold\">Skribita de:</span>\t%s\n"
+"<span weight=\"bold\">Retsituo:</span>\t\t%s\n"
+"<span weight=\"bold\">Dosiernomo:</span>\t\t%s"
+
+#: ../pidgin/gtkplugin.c:407
+#, c-format
+msgid ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Error: %s\n"
+"Check the plugin website for an update.</span>"
+msgstr ""
+"%s\n"
+"<span foreground=\"#ff0000\" weight=\"bold\">Eraro: %s\n"
+"Kontrolu kromaĵan retsituon por ĝisdatigo .</span>"
+
+#: ../pidgin/gtkplugin.c:533
+msgid "Configure Pl_ugin"
+msgstr "Agrod_u Kromaĵon"
+
+#: ../pidgin/gtkplugin.c:596
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Kromaĵo Detaloj</b>"
+
+#: ../pidgin/gtkpounce.c:155
+msgid "Select a file"
+msgstr "Elektu dosieron"
+
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:522
+msgid "Pounce on Whom"
+msgstr "Atentigi Kiun"
+
+#: ../pidgin/gtkpounce.c:549
+msgid "_Buddy name:"
+msgstr "K_unul nomo:"
+
+#: ../pidgin/gtkpounce.c:583
+msgid "Si_gns on"
+msgstr "En_salutas"
+
+#: ../pidgin/gtkpounce.c:585
+msgid "Signs o_ff"
+msgstr "A_udiaŭas"
+
+#: ../pidgin/gtkpounce.c:587
+msgid "Goes a_way"
+msgstr "Foriĝ_as"
+
+#: ../pidgin/gtkpounce.c:589
+msgid "Ret_urns from away"
+msgstr "Ek_malforiĝas"
+
+#: ../pidgin/gtkpounce.c:591
+msgid "Becomes _idle"
+msgstr "Eksen_faras"
+
+#: ../pidgin/gtkpounce.c:593
+msgid "Is no longer i_dle"
+msgstr "Ekfa_ras"
+
+#: ../pidgin/gtkpounce.c:595
+msgid "Starts _typing"
+msgstr "Ta_jpas"
+
+#: ../pidgin/gtkpounce.c:597
+msgid "P_auses while typing"
+msgstr "P_aŭzas tajpante"
+
+#: ../pidgin/gtkpounce.c:599
+msgid "Stops t_yping"
+msgstr "Maltajpas"
+
+#: ../pidgin/gtkpounce.c:601
+msgid "Sends a _message"
+msgstr "Sendas mesagôn"
+
+#: ../pidgin/gtkpounce.c:644
+msgid "Ope_n an IM window"
+msgstr "Malfermu TM-n fenestron"
+
+#: ../pidgin/gtkpounce.c:646
+msgid "_Pop up a notification"
+msgstr "Ŝ_prucigu avizon"
+
+#: ../pidgin/gtkpounce.c:648
+msgid "Send a _message"
+msgstr "Sendu mesaĝon"
+
+#: ../pidgin/gtkpounce.c:650
+msgid "E_xecute a command"
+msgstr "Lanĉu komandon"
+
+#: ../pidgin/gtkpounce.c:652
+msgid "P_lay a sound"
+msgstr "Ludu sonon"
+
+#: ../pidgin/gtkpounce.c:657
+msgid "Brows_e..."
+msgstr "Fol_iumi..."
+
+#: ../pidgin/gtkpounce.c:659
+msgid "Br_owse..."
+msgstr "Fol_iumi..."
+
+#: ../pidgin/gtkpounce.c:660
+msgid "Pre_view"
+msgstr "Antaŭvidu"
+
+#: ../pidgin/gtkpounce.c:784
+msgid "P_ounce only when my status is not available"
+msgstr "Atentigi nur kiam mia stato ne disponeblas"
+
+#: ../pidgin/gtkpounce.c:789
+msgid "_Recurring"
+msgstr "_Rikuranta"
+
+#: ../pidgin/gtkpounce.c:1243
+msgid "Pounce Target"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:509
+msgid "Smiley theme failed to unpack."
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:638
+msgid ""
+"Select a smiley theme that you would like to use from the list below. New "
+"themes can be installed by dragging and dropping them onto the theme list."
+msgstr ""
+"Elektu ridmienotemon kiun vi deziras uzi el la listo sube. Novaj temoj estas "
+"instaleblaj per treni kal faligi ilin sur la temo listo."
+
+#: ../pidgin/gtkprefs.c:673
+msgid "Icon"
+msgstr "Piktogramo"
+
+#: ../pidgin/gtkprefs.c:816
+msgid "System Tray Icon"
+msgstr "Sistemlistela Piktogramo"
+
+#: ../pidgin/gtkprefs.c:817
+msgid "_Show system tray icon:"
+msgstr "_Montru sistemlistelan piktogramon:"
+
+#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+msgid "Always"
+msgstr "Ĉiam"
+
+#: ../pidgin/gtkprefs.c:821
+msgid "On unread messages"
+msgstr "Je nelegitaj mesaĝoj"
+
+#: ../pidgin/gtkprefs.c:826
+msgid "Conversation Window Hiding"
+msgstr "Konversacio Fenestroj Kaŝeco"
+
+#: ../pidgin/gtkprefs.c:827
+msgid "_Hide new IM conversations:"
+msgstr "_Kaŝu novajn TM-ajn konversaciojn:"
+
+#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1826
+msgid "When away"
+msgstr "Kiam fora"
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:838
+msgid "Tabs"
+msgstr "Langetoj"
+
+#: ../pidgin/gtkprefs.c:840
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Montru TM-ojn kaj babilojn en lange_taj fenestroj"
+
+#: ../pidgin/gtkprefs.c:854
+msgid "Show close b_utton on tabs"
+msgstr "Montru fermi b_utonon en langetoj"
+
+#: ../pidgin/gtkprefs.c:857
+msgid "_Placement:"
+msgstr "_Pozicio:"
+
+#: ../pidgin/gtkprefs.c:859
+msgid "Top"
+msgstr "Supre"
+
+#: ../pidgin/gtkprefs.c:860
+msgid "Bottom"
+msgstr "Malsupre"
+
+#: ../pidgin/gtkprefs.c:861
+msgid "Left"
+msgstr "Maldekstre"
+
+#: ../pidgin/gtkprefs.c:862
+msgid "Right"
+msgstr "Dekstre"
+
+#: ../pidgin/gtkprefs.c:864
+msgid "Left Vertical"
+msgstr "Maldekstra Vertikale"
+
+#: ../pidgin/gtkprefs.c:865
+msgid "Right Vertical"
+msgstr "Dekstra Vertikale"
+
+#: ../pidgin/gtkprefs.c:872
+msgid "N_ew conversations:"
+msgstr "Novaj konv_ersacioj:"
+
+#: ../pidgin/gtkprefs.c:900
+msgid "Show _formatting on incoming messages"
+msgstr "Montru _formatecon en enirantaj mesaĝoj"
+
+#: ../pidgin/gtkprefs.c:903
+msgid "Show buddy _icons"
+msgstr "Montru kunul _piktogramojn"
+
+#: ../pidgin/gtkprefs.c:905
+msgid "Enable buddy ic_on animation"
+msgstr "Ŝaltu kunul pikt_ogramoanimacion"
+
+#: ../pidgin/gtkprefs.c:912
+msgid "_Notify buddies that you are typing to them"
+msgstr "_Avizu kunulojn vi estas tajpante al ili"
+
+#: ../pidgin/gtkprefs.c:915
+msgid "Highlight _misspelled words"
+msgstr "Emfazu misliterumitajn vortojn"
+
+#: ../pidgin/gtkprefs.c:919
+msgid "Use smooth-scrolling"
+msgstr "Uzu dolĉan rulumon"
+
+#: ../pidgin/gtkprefs.c:922
+msgid "F_lash window when IMs are received"
+msgstr "Fu_lmu ekranon kiam TM-oj riceviĝas"
+
+#: ../pidgin/gtkprefs.c:925
+msgid "Default Formatting"
+msgstr "Apriora Formatumon"
+
+#: ../pidgin/gtkprefs.c:941
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting. :)"
+msgstr ""
+"Tiel aspektos vian elirantan mesaĝo tekston kiam vi uzas protokolojn kiuj "
+"subtenas formateblecon. :)"
+
+#: ../pidgin/gtkprefs.c:1017
+msgid "ST_UN server:"
+msgstr "ST_UN servilo:"
+
+#: ../pidgin/gtkprefs.c:1029
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Ekzemplo: stunserver.org</span>"
+
+#: ../pidgin/gtkprefs.c:1033
+msgid "_Autodetect IP address"
+msgstr "_Aŭtodetekti IP adreson"
+
+#: ../pidgin/gtkprefs.c:1042
+msgid "Public _IP:"
+msgstr "Publika _IP:"
+
+#: ../pidgin/gtkprefs.c:1071
+msgid "Ports"
+msgstr "Pordoj"
+
+#: ../pidgin/gtkprefs.c:1074
+msgid "_Manually specify range of ports to listen on"
+msgstr "_Mane difinu intervalon de pordoj aŭskultendaj"
+
+#: ../pidgin/gtkprefs.c:1077
+msgid "_Start port:"
+msgstr "_Komenca pordo:"
+
+#: ../pidgin/gtkprefs.c:1084
+msgid "_End port:"
+msgstr "_Fina pordo:"
+
+#: ../pidgin/gtkprefs.c:1092
+msgid "Proxy Server"
+msgstr "Prokura Servilo"
+
+#: ../pidgin/gtkprefs.c:1096
+msgid "No proxy"
+msgstr "Sen prokurilo"
+
+#: ../pidgin/gtkprefs.c:1152
+msgid "_User:"
+msgstr "_Uzanto:"
+
+#: ../pidgin/gtkprefs.c:1216
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../pidgin/gtkprefs.c:1217
+msgid "Opera"
+msgstr "Opero"
+
+#: ../pidgin/gtkprefs.c:1218
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../pidgin/gtkprefs.c:1219
+msgid "Mozilla"
+msgstr "Mozilo"
+
+#: ../pidgin/gtkprefs.c:1220
+msgid "Konqueror"
+msgstr "Konkerilo"
+
+#: ../pidgin/gtkprefs.c:1221
+msgid "GNOME Default"
+msgstr "GNOME Aprioro"
+
+#: ../pidgin/gtkprefs.c:1222
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../pidgin/gtkprefs.c:1223
+msgid "Firefox"
+msgstr "Fajrovulpo"
+
+#: ../pidgin/gtkprefs.c:1224
+msgid "Firebird"
+msgstr "Fajrobirdo"
+
+#: ../pidgin/gtkprefs.c:1225
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../pidgin/gtkprefs.c:1234
+msgid "Manual"
+msgstr "Mane"
+
+#: ../pidgin/gtkprefs.c:1287
+msgid "Browser Selection"
+msgstr "Retumilo Elekto"
+
+#: ../pidgin/gtkprefs.c:1291
+msgid "_Browser:"
+msgstr "_Retumilo:"
+
+#: ../pidgin/gtkprefs.c:1299
+msgid "_Open link in:"
+msgstr "_Malfermu ligilon per:"
+
+#: ../pidgin/gtkprefs.c:1301
+msgid "Browser default"
+msgstr "Retumilo aprioro"
+
+#: ../pidgin/gtkprefs.c:1302
+msgid "Existing window"
+msgstr "Aktuala fenestro"
+
+#: ../pidgin/gtkprefs.c:1304
+msgid "New tab"
+msgstr "Nova langeto"
+
+#: ../pidgin/gtkprefs.c:1318
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"_Mane:\n"
+"(%s por URL)"
+
+#: ../pidgin/gtkprefs.c:1358
+msgid "Log _format:"
+msgstr "Protokolo _formato:"
+
+#: ../pidgin/gtkprefs.c:1363
+msgid "Log all _instant messages"
+msgstr "Protokolu ĉiujn _tujmesaĝojn"
+
+#: ../pidgin/gtkprefs.c:1365
+msgid "Log all c_hats"
+msgstr "Protokolu ĉiujn _babilojn"
+
+#: ../pidgin/gtkprefs.c:1367
+msgid "Log all _status changes to system log"
+msgstr "Protokolu ĉiujn _statoŝanĝojn al sistemprotokolo"
+
+#: ../pidgin/gtkprefs.c:1513
+msgid "Sound Selection"
+msgstr "Sono Elekto"
+
+#: ../pidgin/gtkprefs.c:1521
+msgid "Quietest"
+msgstr "Pli Malaŭta"
+
+#: ../pidgin/gtkprefs.c:1523
+msgid "Quieter"
+msgstr "Pli Malaŭte"
+
+#: ../pidgin/gtkprefs.c:1525
+msgid "Quiet"
+msgstr "Malaŭte"
+
+#: ../pidgin/gtkprefs.c:1529
+msgid "Loud"
+msgstr "Laŭte"
+
+#: ../pidgin/gtkprefs.c:1531
+msgid "Louder"
+msgstr "Pli Laŭte"
+
+#: ../pidgin/gtkprefs.c:1533
+msgid "Loudest"
+msgstr "Pli Laŭta"
+
+#: ../pidgin/gtkprefs.c:1596
+msgid "Sound Method"
+msgstr "Sono Metodo"
+
+#: ../pidgin/gtkprefs.c:1597
+msgid "_Method:"
+msgstr "_Metodo:"
+
+#: ../pidgin/gtkprefs.c:1599
+msgid "Console beep"
+msgstr "Konzolo pepo"
+
+#: ../pidgin/gtkprefs.c:1601
+msgid "Automatic"
+msgstr "Aŭtomate"
+
+#: ../pidgin/gtkprefs.c:1604
+msgid "Command"
+msgstr "Komando"
+
+#: ../pidgin/gtkprefs.c:1605
+msgid "No sounds"
+msgstr "Sen Sono"
+
+#: ../pidgin/gtkprefs.c:1613
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"Sono k_omando:\n"
+"(%s por dosiernomo)"
+
+#: ../pidgin/gtkprefs.c:1639
+msgid "Sound Options"
+msgstr "Son-opcioj"
+
+#: ../pidgin/gtkprefs.c:1640
+msgid "Sounds when conversation has _focus"
+msgstr "Sonu kiam konversacio _fokusas"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Enable sounds:"
+msgstr "Ŝaltu Sonojn:"
+
+#: ../pidgin/gtkprefs.c:1644
+msgid "Only when available"
+msgstr "Nur kiam disponebla"
+
+#: ../pidgin/gtkprefs.c:1645
+msgid "Only when not available"
+msgstr "Nur kiam nedisponebla"
+
+#: ../pidgin/gtkprefs.c:1653
+msgid "Volume:"
+msgstr "Laŭteco:"
+
+#: ../pidgin/gtkprefs.c:1681
+msgid "Sound Events"
+msgstr "Soneventoj"
+
+#: ../pidgin/gtkprefs.c:1732
+msgid "Play"
+msgstr "Ludu"
+
+#: ../pidgin/gtkprefs.c:1739
+msgid "Event"
+msgstr "Evento"
+
+#: ../pidgin/gtkprefs.c:1758
+msgid "Test"
+msgstr "Provo"
+
+#: ../pidgin/gtkprefs.c:1762
+msgid "Reset"
+msgstr "Restarigu"
+
+#: ../pidgin/gtkprefs.c:1766
+msgid "Choose..."
+msgstr "Elektu..."
+
+#: ../pidgin/gtkprefs.c:1809
+msgid "_Report idle time:"
+msgstr "_Raportu senfaran tempon:"
+
+#: ../pidgin/gtkprefs.c:1814
+msgid "Based on keyboard or mouse use"
+msgstr "Laŭ klavaro aŭ muso uzo"
+
+#: ../pidgin/gtkprefs.c:1823
+msgid "_Auto-reply:"
+msgstr "_Aŭto-respondo:"
+
+#: ../pidgin/gtkprefs.c:1827
+msgid "When both away and idle"
+msgstr "Kiam ambaŭ fora kaj senfara"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1833
+msgid "Auto-away"
+msgstr "Aŭto-fora"
+
+#: ../pidgin/gtkprefs.c:1835
+msgid "Change status when _idle"
+msgstr "Ŝanĝu staton kiam _senfara"
+
+#: ../pidgin/gtkprefs.c:1839
+msgid "_Minutes before changing status:"
+msgstr "_Minutoj antaŭe ŝanĝenda staton:"
+
+#: ../pidgin/gtkprefs.c:1847
+msgid "Change _status to:"
+msgstr "Ŝangû _staton al:"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1868
+msgid "Status at Startup"
+msgstr "Stato je ensaluto"
+
+#: ../pidgin/gtkprefs.c:1870
+msgid "Use status from last _exit at startup"
+msgstr "Uzu stato de lasta malsaluto je sensaluto"
+
+#: ../pidgin/gtkprefs.c:1876
+msgid "Status to a_pply at startup:"
+msgstr "Stato aplikenda je ensaluto:"
+
+#: ../pidgin/gtkprefs.c:1914
+msgid "Interface"
+msgstr "Interfaco"
+
+#: ../pidgin/gtkprefs.c:1916
+msgid "Smiley Themes"
+msgstr "Ridmieno-temo"
+
+#: ../pidgin/gtkprefs.c:1917
+msgid "Sounds"
+msgstr "Sonoj"
+
+#: ../pidgin/gtkprefs.c:1923
+msgid "Browser"
+msgstr "Retumilo"
+
+#: ../pidgin/gtkprefs.c:1927
+msgid "Status / Idle"
+msgstr "Stato / Senfara"
+
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "Permesu ĉiujn uzantojn kontakti min"
+
+#: ../pidgin/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "Permesu nur uzantojn en mia kunul listo"
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "Permesu nur la jenajn uzantojn"
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Bloku ĉiujn uzantojn"
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "Bloku nur la jenajn uzantojn"
+
+#: ../pidgin/gtkprivacy.c:372
+msgid "Privacy"
+msgstr "Privataj aferoj"
+
+#: ../pidgin/gtkprivacy.c:385
+msgid "Changes to privacy settings take effect immediately."
+msgstr "Ŝanĝoj al privatecaj agordoj efikas tuj."
+
+#. "Set privacy for:" label
+#: ../pidgin/gtkprivacy.c:397
+msgid "Set privacy for:"
+msgstr "Difinu privatecon por:"
+
+#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:576
+msgid "Permit User"
+msgstr "Permesu Uzanton"
+
+#: ../pidgin/gtkprivacy.c:561
+msgid "Type a user you permit to contact you."
+msgstr "Enigu uzanton kiun vi permesas kontakti vin."
+
+#: ../pidgin/gtkprivacy.c:562
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr "B.v. enigi la nomon de uzanto kiu vi deziras ebligi kontakti vin."
+
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:578
+msgid "_Permit"
+msgstr "_Permesu"
+
+#: ../pidgin/gtkprivacy.c:570
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "Permesu %s kontakti vin?"
+
+#: ../pidgin/gtkprivacy.c:572
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "Ĉu vi certas vi deziras permesi %s-n kontakti vin?"
+
+#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:612
+msgid "Block User"
+msgstr "Bloku Uzanton"
+
+#: ../pidgin/gtkprivacy.c:600
+msgid "Type a user to block."
+msgstr "Tajpu uzanton blokendan."
+
+#: ../pidgin/gtkprivacy.c:601
+msgid "Please enter the name of the user you wish to block."
+msgstr "B.v. enmetu la nomon de uzanto kiun vi deziras bloki."
+
+#: ../pidgin/gtkprivacy.c:608
+#, c-format
+msgid "Block %s?"
+msgstr "Bloku %s?"
+
+#: ../pidgin/gtkprivacy.c:610
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "Ĉu vi certas vi volas bloki %s?"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "Apliku"
+
+#: ../pidgin/gtkrequest.c:1469
+msgid "That file already exists"
+msgstr "Tiu dosiero jam ekzistas"
+
+#: ../pidgin/gtkrequest.c:1470
+msgid "Would you like to overwrite it?"
+msgstr "Ĉu vi deziras anstataŭigi ĝin?"
+
+#: ../pidgin/gtkrequest.c:1471
+msgid "Overwrite"
+msgstr "Anstataŭigu"
+
+#: ../pidgin/gtkrequest.c:1472
+msgid "Choose New Name"
+msgstr "Elektu Novan Nomon"
+
+#: ../pidgin/gtkrequest.c:1607 ../pidgin/gtkrequest.c:1621
+msgid "Select Folder..."
+msgstr "Elektu Dosierujon..."
+
+#: ../pidgin/gtkroomlist.c:376
+msgid "Room List"
+msgstr "Babilejoj Listo"
+
+#. list button
+#: ../pidgin/gtkroomlist.c:446
+msgid "_Get List"
+msgstr "_Ricevu Liston"
+
+#. add button
+#: ../pidgin/gtkroomlist.c:454
+msgid "_Add Chat"
+msgstr "_Aldonu Babilejon"
+
+#: ../pidgin/gtksavedstatuses.c:331
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr "Ĉu vi certas vi volas forigi elektitajn konservitajn statuojn?"
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:579 ../pidgin/gtksavedstatuses.c:1213
+msgid "_Use"
+msgstr "_Uzu"
+
+#: ../pidgin/gtksavedstatuses.c:725
+msgid "Title already in use.  You must choose a unique title."
+msgstr "Titolo jam uzata. Vi devas elekti unikan titolon."
+
+#: ../pidgin/gtksavedstatuses.c:913
+msgid "Different"
+msgstr "Malsama"
+
+#: ../pidgin/gtksavedstatuses.c:1106
+msgid "_Title:"
+msgstr "_Titolo:"
+
+#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+msgid "_Status:"
+msgstr "_Stato:"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1157
+msgid "Use a _different status for some accounts"
+msgstr "Uzu _malsimilan staton por kelkaj kontoj"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1221
+msgid "Sa_ve & Use"
+msgstr "Konser_vu & Uzu"
+
+#: ../pidgin/gtksavedstatuses.c:1427
+#, c-format
+msgid "Status for %s"
+msgstr "Stato por %s"
+
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Kunul ensalutas"
+
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Kunul elsalutas"
+
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Mesaĝo ricevita"
+
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Ricevita mesaĝo komencas konversacio"
+
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Mesaĝo sendita"
+
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Persono eniras babilejon"
+
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Persono eliras babilejon"
+
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Vi parolas en babilejo"
+
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Aliaj parolas en babilejo"
+
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "Iun diras vian ekrannomon en babilejo"
+
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer Malsukceso"
+
+#: ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer malsukcesis ekon."
+
+#: ../pidgin/gtkstatusbox.c:611
+msgid "Waiting for network connection"
+msgstr "Atendante retkonekto"
+
+#: ../pidgin/gtkutils.c:1320 ../pidgin/gtkutils.c:1343
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "La jena eraro okazis ŝargante %s: %s"
+
+#: ../pidgin/gtkutils.c:1323 ../pidgin/gtkutils.c:1345
+msgid "Failed to load image"
+msgstr "Malsukcesis ŝargi bildon"
+
+#: ../pidgin/gtkutils.c:1420
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "Ne povas sendi dosierujon %s."
+
+#: ../pidgin/gtkutils.c:1421
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1467
+msgid "You have dragged an image"
+msgstr "Vi trenis bildon"
+
+#: ../pidgin/gtkutils.c:1454
+msgid ""
+"You can send this image as a file transfer, embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1458 ../pidgin/gtkutils.c:1473
+msgid "Set as buddy icon"
+msgstr "Difinu kiel kunul piktogramo"
+
+#: ../pidgin/gtkutils.c:1459 ../pidgin/gtkutils.c:1474
+msgid "Send image file"
+msgstr "Sendu bilddosieron"
+
+#: ../pidgin/gtkutils.c:1460 ../pidgin/gtkutils.c:1474
+msgid "Insert in message"
+msgstr "Enmetu en mesaĝon"
+
+#: ../pidgin/gtkutils.c:1463
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Ĉu vi deziras meti ĝin kiel la kunul piktogramo por tiu uzanto?"
+
+#: ../pidgin/gtkutils.c:1468
+msgid ""
+"You can send this image as a file transfer or embed it into this message, or "
+"use it as the buddy icon for this user."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1470
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+
+#. I don't know if we really want to do anything here.  Most of the desktop item types are crap like
+#. * "MIME Type" (I have no clue how that would be a desktop item) and "Comment"... nothing we can really
+#. * send.  The only logical one is "Application," but do we really want to send a binary and nothing else?
+#. * Probably not.  I'll just give an error and return.
+#. The original patch sent the icon used by the launcher.  That's probably wrong
+#: ../pidgin/gtkutils.c:1524
+msgid "Cannot send launcher"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:1524
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2291
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Dosiero:</b> %s\n"
+"<b>Dosiero grandeco:</b> %s\n"
+"<b>Bildo grandeco:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2611
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr ""
+
+#: ../pidgin/gtkutils.c:2613
+msgid "Icon Error"
+msgstr "Piktogramo Eraro"
+
+#: ../pidgin/gtkutils.c:2614
+msgid "Could not set icon"
+msgstr "Ne eblis difini piktogramon"
+
+#: ../pidgin/gtkutils.c:2715
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Malsukcesis malfermi dosieron '%s': %s"
+
+#: ../pidgin/gtkutils.c:2764
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+
+#: ../pidgin/gtkwhiteboard.c:756 ../pidgin/gtkwhiteboard.c:775
+msgid "Save File"
+msgstr "Konservu Dosieron"
+
+#: ../pidgin/gtkwhiteboard.c:863
+msgid "Select color"
+msgstr "Elektu koloron"
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Alias"
+msgstr "_Alinomo"
+
+#: ../pidgin/pidginstock.c:90
+msgid "Close _tabs"
+msgstr "Fermu _langetojn"
+
+#: ../pidgin/pidginstock.c:92
+msgid "_Get Info"
+msgstr "_Ricevu Informon"
+
+#: ../pidgin/pidginstock.c:93
+msgid "_Invite"
+msgstr "_Ivitu"
+
+#: ../pidgin/pidginstock.c:94
+msgid "_Modify"
+msgstr "Ŝ_anĝu..."
+
+#: ../pidgin/pidginstock.c:95
+msgid "_Open Mail"
+msgstr "_Malfermu retmesaĝon"
+
+#: ../pidgin/plugins/cap/cap.c:449
+msgid "Display Statistics"
+msgstr "Montru Statistikojn"
+
+#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+msgid "Response Probability:"
+msgstr "Respondo Verŝajneco:"
+
+#: ../pidgin/plugins/cap/cap.c:810
+msgid "Statistics Configuration"
+msgstr "Statistikoj Agordo"
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:813
+msgid "Maximum response timeout:"
+msgstr ""
+
+#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:149
+msgid "minutes"
+msgstr "minutoj"
+
+#. last_seen spinner
+#: ../pidgin/plugins/cap/cap.c:820
+msgid "Maximum last-seen difference:"
+msgstr ""
+
+#. threshold spinner
+#: ../pidgin/plugins/cap/cap.c:827
+msgid "Threshold:"
+msgstr "Sojlo:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/cap/cap.c:934
+msgid "Contact Availability Prediction"
+msgstr ""
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/cap/cap.c:936
+msgid "Contact Availability Prediction plugin."
+msgstr ""
+
+#. *  summary
+#: ../pidgin/plugins/cap/cap.c:937
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Kunul senokupas"
+
+#: ../pidgin/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Kunul foras"
+
+#: ../pidgin/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Kunul estas \"daŭre\" fora"
+
+#. Not used yet.
+#: ../pidgin/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "Kunul estas movema"
+
+#: ../pidgin/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Kunul estas senkonekta"
+
+#: ../pidgin/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Poentoj uzendaj kiam..."
+
+#: ../pidgin/plugins/contact_priority.c:118
+msgid ""
+"The buddy with the <i>largest score</i> is the buddy who will have priority "
+"in the contact.\n"
+msgstr ""
+
+#: ../pidgin/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Uzu lastan kunulon kiam poentoj egalas"
+
+#: ../pidgin/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Poentoj uzantenda por konto..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/contact_priority.c:182
+msgid "Contact Priority"
+msgstr "Kontakta Prioritato"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:185
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr "Permesas kontroli la poentojn rilatajn al diversaj kunulstatoj."
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:187
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Permesas ŝanĝi la poentojn de neaktiva/fora/senkonekta statoj de kunuloj por "
+"komputi kontaktan prioritaton."
+
+#: ../pidgin/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Konversaciaj Koloroj"
+
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "Agordu kolorojn en la konversacio-fenestro"
+
+#: ../pidgin/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "Eraraj Mesaĝoj"
+
+#: ../pidgin/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "Emfazitaj Mesaĝoj"
+
+#: ../pidgin/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "Sistemo Mesaĝoj"
+
+#: ../pidgin/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "Senditaj Mesaĝoj"
+
+#: ../pidgin/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "Ricevitaj Mesaĝoj"
+
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#, c-format
+msgid "Select Color for %s"
+msgstr "Elektu Koloron por %s"
+
+#: ../pidgin/plugins/convcolors.c:310
+msgid "Ignore incoming format"
+msgstr ""
+
+#: ../pidgin/plugins/convcolors.c:311
+msgid "Apply in Chats"
+msgstr "Apliku en Babilejoj"
+
+#: ../pidgin/plugins/convcolors.c:312
+msgid "Apply in IMs"
+msgstr ""
+
+#: ../pidgin/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Laŭ konversacio nombriĝo"
+
+#: ../pidgin/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Konversacio Loko"
+
+#: ../pidgin/plugins/extplacement.c:106
+msgid "Number of conversations per window"
+msgstr "Nombro de konversacioj po fenestro"
+
+#: ../pidgin/plugins/extplacement.c:112
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Apartigu TM-n kaj Babil-n fenestrojn kiam lokante laŭ nombro"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:135
+msgid "ExtPlacement"
+msgstr ""
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:137
+msgid "Extra conversation placement options."
+msgstr ""
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:139
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gaiminc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Piĝin Demonstraĵa Kromaĵo"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gaiminc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Ekzempla kormaĵo kiu umas - vidu priskribon."
+
+#. *  description
+#: ../pidgin/plugins/gaiminc.c:96
+msgid ""
+"This is a really cool plugin that does a lot of stuff:\n"
+"- It tells you who wrote the program when you log in\n"
+"- It reverses all incoming text\n"
+"- It sends a message to people on your list immediately when they sign on"
+msgstr ""
+"Estas mojosa kromaĵo kiu multe umas:\n"
+"- Ĝi diras kiu skribis la programon kiam vi ensalutas\n"
+"- Ĝi inversigas ĉiajn enirantan tekston\n"
+"- Ĝi sendas mesaĝon al homoj en via listo tuj kiam ili ensalutas"
+
+#. Configuration frame
+#: ../pidgin/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Musgestoj Agordo"
+
+#: ../pidgin/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Meza muso butono"
+
+#: ../pidgin/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "Deskstra muso butono"
+
+#. "Visual gesture display" checkbox
+#: ../pidgin/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "_Vidgesto vidigo"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:289
+msgid "Mouse Gestures"
+msgstr "Musgestoj"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:292
+msgid "Provides support for mouse gestures"
+msgstr "Provizu subteno por musgestoj"
+
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:294
+msgid ""
+"Allows support for mouse gestures in conversation windows.\n"
+"Drag the middle mouse button to perform certain actions:\n"
+"\n"
+"Drag down and then to the right to close a conversation.\n"
+"Drag up and then to the left to switch to the previous conversation.\n"
+"Drag up and then to the right to switch to the next conversation."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Tuj Mesaĝilo"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+msgid "Select a person from your address book below, or add a new person."
+msgstr "Elektu personon el via adresaro sube, aŭ aldonu novan personon."
+
+#. "New Person" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:580
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:469
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:251
+msgid "New Person"
+msgstr "Nova persono"
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+msgid "Select Buddy"
+msgstr "Elektu Kunulon"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"Elektu personon el via adresaro por aldoni tiun kunulon, aŭ kreu novan "
+"personon."
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+msgid "User _details"
+msgstr "Uzanto _detaloj"
+
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+msgid "_Associate Buddy"
+msgstr "K_uniĝu Kunulon"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:245
+msgid "Unable to send e-mail"
+msgstr "Ne eblas sendi retmesaĝon"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+msgid "The evolution executable was not found in the PATH."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "An e-mail address was not found for this buddy."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/gevolution.c:272
+msgid "Add to Address Book"
+msgstr "Aldonu al adresaro"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:284
+msgid "Send E-Mail"
+msgstr "Sendu retmesaĝon"
+
+#. Configuration frame
+#: ../pidgin/plugins/gevolution/gevolution.c:411
+msgid "Evolution Integration Configuration"
+msgstr ""
+
+#. Label
+#: ../pidgin/plugins/gevolution/gevolution.c:414
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "Elektu ĉiujn kontojn kiuj kunuloj endas aŭto-aldonita al."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gevolution/gevolution.c:521
+msgid "Evolution Integration"
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:524
+#: ../pidgin/plugins/gevolution/gevolution.c:526
+msgid "Provides integration with Evolution."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the person's information below."
+msgstr ""
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "B.v. enigi la kunul ekrannomo kaj kontotipo sube."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgid "Account type:"
+msgstr "Konto tipo:"
+
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+msgid "Optional information:"
+msgstr "Opcia informo:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+msgid "First name:"
+msgstr "Antaŭ nomo:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+msgid "Last name:"
+msgstr "Familia nomo:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+msgid "E-mail:"
+msgstr "Retadreso:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK Signaloj Provo"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gtk-signals-test.c:163
+#: ../pidgin/plugins/gtk-signals-test.c:165
+msgid "Test to see that all ui signals are working properly."
+msgstr "Provu por vidi ĉu ĉiuj ui signaloj bone funkcias."
+
+#: ../pidgin/plugins/history.c:188
+msgid "History"
+msgstr "Historio"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Piktogramiĝu kiam fora"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+msgid "Iconifies the buddy list and your conversations when you go away."
+msgstr "Piktogramigu kunul-liston kaj konversaciojn kiam vi foriras."
+
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr ""
+
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr ""
+
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:23
+msgid "Markerline"
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Desegnu linion por indiki novan mesaĝon en konversacio."
+
+#: ../pidgin/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr ""
+
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+msgid "_IM windows"
+msgstr "_TM fenestroj"
+
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+msgid "C_hat windows"
+msgstr "B_abilfenestroj"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+msgid "Music Messaging"
+msgstr "Muziko Mesaĝilo"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+msgid "There was a conflict in running the command:"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+msgid "Error Running Editor"
+msgstr ""
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+msgid "The following error has occurred:"
+msgstr "La jena eraro okazis:"
+
+#. Configuration frame
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+msgid "Music Messaging Configuration"
+msgstr "Muzika Mesaĝilo Agordo"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+msgid "Score Editor Path"
+msgstr "Orkestruma Redaktilo Vojo"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+msgid "_Apply"
+msgstr "_Apliku"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:668
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Muzika Mesaĝilo Kromaĵo por kunlaboranta verkado."
+
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:670
+msgid ""
+"The Music Messaging Plugin allows a number of users to simultaneously work "
+"on a piece of music by editting a common score in real-time."
+msgstr ""
+"La Muzika Mesaĝilo Kromaĵo ebligas plurajn uzantojn samtempe labori muzikan "
+"pecon redaktante komunan orkestrumon realtempe."
+
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:672
+msgid "Notify For"
+msgstr "Avizu Por"
+
+#: ../pidgin/plugins/notify.c:691
+msgid "\t_Only when someone says your screen name"
+msgstr "\t_Nur kiam iun diras vian ekran nomon"
+
+#: ../pidgin/plugins/notify.c:701
+msgid "_Focused windows"
+msgstr "_Fokusitaj fenestoj"
+
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:709
+msgid "Notification Methods"
+msgstr "Avizmetodoj"
+
+#: ../pidgin/plugins/notify.c:716
+msgid "Prepend _string into window title:"
+msgstr "Prefik_su ĉenon en fenestrotitolo:"
+
+#. Count method button
+#: ../pidgin/plugins/notify.c:735
+msgid "Insert c_ount of new messages into window title"
+msgstr "Enmetu n_ombron de novajn mesaĝoj en fenestrotitolo"
+
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:744
+msgid "Insert count of new message into _X property"
+msgstr "Enmetu nombron de novaj mesaĝoj en _X eco"
+
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:752
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "Dinifu fenestrtraktilan \"_URĜANTA\" indikon"
+
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:761
+msgid "R_aise conversation window"
+msgstr "Startigu konversacio-fenestron"
+
+#. ---------- "Notification Removals" ----------
+#: ../pidgin/plugins/notify.c:769
+msgid "Notification Removal"
+msgstr "Avizo Forigo"
+
+#. Remove on focus button
+#: ../pidgin/plugins/notify.c:774
+msgid "Remove when conversation window _gains focus"
+msgstr "Forigu kiam konversacio fenestro ricevas _fokuson"
+
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:781
+msgid "Remove when conversation window _receives click"
+msgstr "Forigu kiam konversacio fenestro _ricevas alklakon"
+
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:789
+msgid "Remove when _typing in conversation window"
+msgstr "Forigu kiam _tajpante en konversacio fenestro"
+
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:797
+msgid "Remove when a _message gets sent"
+msgstr "Forigu kiam _mesaĝo sendiĝas"
+
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:806
+msgid "Remove on switch to conversation ta_b"
+msgstr "Forigu je ŝaĝo al konversacio l_angeto"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:895
+msgid "Message Notification"
+msgstr "Mesaĝavizo"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:898 ../pidgin/plugins/notify.c:900
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Provizas diversajn rimedojn por atentigi vin pro nelegitaj mesaĝoj."
+
+#: ../pidgin/plugins/pidginrc.c:41
+msgid "Cursor Color"
+msgstr "Kursoro Koloro"
+
+#: ../pidgin/plugins/pidginrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Dua Kursoro Koloro"
+
+#: ../pidgin/plugins/pidginrc.c:43
+msgid "Hyperlink Color"
+msgstr "Ligilo Koloro"
+
+#: ../pidgin/plugins/pidginrc.c:56
+msgid "GtkTreeView Expander Size"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:57
+msgid "GtkTreeView Horizontal Separation"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:76
+msgid "Conversation Entry"
+msgstr "Konversacio Enskribigo"
+
+#: ../pidgin/plugins/pidginrc.c:77
+msgid "Conversation History"
+msgstr "Konversacio Historio"
+
+#: ../pidgin/plugins/pidginrc.c:78
+msgid "Log Viewer"
+msgstr "Protokolo Legilo"
+
+#: ../pidgin/plugins/pidginrc.c:79
+msgid "Request Dialog"
+msgstr "Peto Dialogujo"
+
+#: ../pidgin/plugins/pidginrc.c:80
+msgid "Notify Dialog"
+msgstr "Avizo Dialogujo"
+
+#: ../pidgin/plugins/pidginrc.c:91
+msgid "GtkTreeView Indent Expanders"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:322
+msgid "Select Color"
+msgstr "Elektu Koloron"
+
+#: ../pidgin/plugins/pidginrc.c:361
+#, c-format
+msgid "Select Font for %s"
+msgstr "Elektu Tiparon por %s"
+
+#: ../pidgin/plugins/pidginrc.c:398
+msgid "Select Interface Font"
+msgstr "Elektu InterfacoTiparon"
+
+#: ../pidgin/plugins/pidginrc.c:453
+msgid "GTK+ Interface Font"
+msgstr "GTK+ Interfaco Tiparo"
+
+#: ../pidgin/plugins/pidginrc.c:473
+msgid "GTK+ Text Shortcut Theme"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:508
+msgid "Interface colors"
+msgstr "Interfaco koloroj"
+
+#: ../pidgin/plugins/pidginrc.c:532
+msgid "Widget Sizes"
+msgstr "Fenestraĵo Grandecoj"
+
+#: ../pidgin/plugins/pidginrc.c:553
+msgid "Fonts"
+msgstr "Tiparoj"
+
+#: ../pidgin/plugins/pidginrc.c:576
+msgid "Tools"
+msgstr "Iloj"
+
+#: ../pidgin/plugins/pidginrc.c:581
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Skribu agordojn al %s%sgtkrc-2.0"
+
+#: ../pidgin/plugins/pidginrc.c:589
+msgid "Re-read gtkrc files"
+msgstr "Relegu gtkrc dosierojn"
+
+#: ../pidgin/plugins/pidginrc.c:616
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Piĝin GTK+ Etoso Kontrolo"
+
+#: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
+msgid "Provides access to commonly used gtkrc settings."
+msgstr ""
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr "Kruda"
+
+#: ../pidgin/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr ""
+
+#: ../pidgin/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+
+#: ../pidgin/plugins/relnot.c:71
+msgid "You are using %s version %s.  The current version is %s.<hr>"
+msgstr "Vi uzas %s version %s.  La aktuala versio estas %s.<hr>"
+
+#: ../pidgin/plugins/relnot.c:77
+#, c-format
+msgid ""
+"<b>ChangeLog:</b>\n"
+"%s<br><br>"
+msgstr ""
+"<b>Ŝanĝprotokolo:</b>\n"
+"%s<br><br>"
+
+#: ../pidgin/plugins/relnot.c:82
+msgid ""
+"You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
+"im</a>."
+msgstr ""
+"Vi povas obteni version %s el:<br><a href=\"http://pidgin.im/\">http://pidgin."
+"im</a>."
+
+#: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
+msgid "New Version Available"
+msgstr "Nova Versio Disponebla"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:145
+msgid "Release Notification"
+msgstr "Eldonavizo"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:148
+msgid "Checks periodically for new releases."
+msgstr "Kontrolu ofte por novaj eldonoj"
+
+#. *  description
+#: ../pidgin/plugins/relnot.c:150
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Kontrolu ofte por noaj eldonoj kaj avizu la uzanton kun la ŝanĝprotokolo."
+
+#: ../pidgin/plugins/spellchk.c:1965
+msgid "Duplicate Correction"
+msgstr "Duobligo Korekto"
+
+#: ../pidgin/plugins/spellchk.c:1966
+msgid "The specified word already exists in the correction list."
+msgstr "La elektita vorto jam ekzistas en la korektolisto."
+
+#: ../pidgin/plugins/spellchk.c:2180
+msgid "Text Replacements"
+msgstr "Teksto anstataŭigoj"
+
+#: ../pidgin/plugins/spellchk.c:2203
+msgid "You type"
+msgstr "Vi tajpas"
+
+#: ../pidgin/plugins/spellchk.c:2217
+msgid "You send"
+msgstr "Vi sendas"
+
+#: ../pidgin/plugins/spellchk.c:2231
+msgid "Whole words only"
+msgstr "Nur plenaj vortoj"
+
+#: ../pidgin/plugins/spellchk.c:2243
+msgid "Case sensitive"
+msgstr "Usklecodistinge"
+
+#: ../pidgin/plugins/spellchk.c:2269
+msgid "Add a new text replacement"
+msgstr "Aldonu novan teksto-anstataŭigon"
+
+#: ../pidgin/plugins/spellchk.c:2285
+msgid "You _type:"
+msgstr "Vi _tajpas:"
+
+#: ../pidgin/plugins/spellchk.c:2302
+msgid "You _send:"
+msgstr "Vi _sendas:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../pidgin/plugins/spellchk.c:2314
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr "_Ekzakta uskleca kongruo (malŝaltita por aŭtomata usklecotrakto)"
+
+#: ../pidgin/plugins/spellchk.c:2316
+msgid "Only replace _whole words"
+msgstr "Nur anstataŭigu _planajn vortojn"
+
+#: ../pidgin/plugins/spellchk.c:2341
+msgid "General Text Replacement Options"
+msgstr "Ĝenerala Teksto Anstataŭigo Opcioj"
+
+#: ../pidgin/plugins/spellchk.c:2342
+msgid "Enable replacement of last word on send"
+msgstr "Ŝaltu anstataŭigon de lasta vorto je sendo"
+
+#: ../pidgin/plugins/spellchk.c:2367
+msgid "Text replacement"
+msgstr "Teksto anstataŭigo"
+
+#: ../pidgin/plugins/spellchk.c:2369 ../pidgin/plugins/spellchk.c:2370
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "Anstataŭigu tekston en elirantaj mesaĝoj laŭ uzantodfinitaj reguloj."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+msgid "Buddy Ticker"
+msgstr "Kunul Tiktakilo"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+msgid "A horizontal scrolling version of the buddy list."
+msgstr ""
+
+#: ../pidgin/plugins/timestamp.c:136
+msgid "Display Timestamps Every"
+msgstr "Montru Tempomarkojn Ĉiu"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:195
+msgid "Timestamp"
+msgstr "Tempomarko"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:198
+msgid "Display iChat-style timestamps"
+msgstr "Montru iChat-ajn Tempomarkojn"
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:200
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "Montru iChat-stilajn tempomarkojn ĉiuj N minutoj."
+
+#: ../pidgin/plugins/timestamp_format.c:23
+msgid "Timestamp Format Options"
+msgstr "Tempomarko Formato Opcioj"
+
+#: ../pidgin/plugins/timestamp_format.c:26
+msgid "_Force (traditional %s) 24-hour time format"
+msgstr "_Devigi (tradicia %s) 24-horan tempoformaton"
+
+#: ../pidgin/plugins/timestamp_format.c:33
+msgid "Show dates in..."
+msgstr "Montru Datojn en..."
+
+#: ../pidgin/plugins/timestamp_format.c:38
+msgid "Co_nversations:"
+msgstr "Ko_nversacioj:"
+
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
+msgid "For delayed messages"
+msgstr "Por prokataj mesaĝoj"
+
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
+msgid "For delayed messages and in chats"
+msgstr "Por prokataj mesaĝoj kaj en babiloj"
+
+#: ../pidgin/plugins/timestamp_format.c:47
+msgid "_Message Logs:"
+msgstr "_Mesaĝo Protokoloj:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp_format.c:144
+msgid "Message Timestamp Formats"
+msgstr "Mesaĝo Tempomarko Formatoj"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:147
+msgid "Customizes the message timestamp formats."
+msgstr "Agordu mesaĝo-tempomarko-formatojn."
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:149
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Tiu kromaĵo ebligas la uzanto agordi konversaciajn kaj protokolajn mesaĝajn "
+"tempmarkajn formatojn."
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+msgid "Opacity:"
+msgstr "Maltravidebleco:"
+
+#. IM Convo trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+msgid "IM Conversation Windows"
+msgstr "TM Konversacio Fenestroj"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+msgid "_IM window transparency"
+msgstr "_TM fenestra travidebleco"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+msgid "_Show slider bar in IM window"
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+msgid "Remove IM window transparency on focus"
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+msgid "Always on top"
+msgstr "Ĉiam super"
+
+#. Buddy List trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+msgid "Buddy List Window"
+msgstr "Kunullisto fenestro"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+msgid "_Buddy List window transparency"
+msgstr ""
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+msgid "Remove Buddy List window transparency on focus"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:658
+msgid "Transparency"
+msgstr "Travidebleco"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:661
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Variebla Travidebleco por la kunullisto kaj konversacioj."
+
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:663
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ Rultempa Versio"
+
+#. Autostart
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+msgid "Startup"
+msgstr "Eko"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+msgid "_Dockable Buddy List"
+msgstr ""
+
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+msgid "_Keep Buddy List window on top:"
+msgstr ""
+
+#. XXX: Did this ever work?
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+msgid "Only when docked"
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+msgid "_Flash window when chat messages are received"
+msgstr ""
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
+msgid "Pidgwin Options"
+msgstr "Pidgwin Opcioj"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+msgid "Options specific to Pidgin for Windows."
+msgstr "Opcioj apartaj al Piĝin Vindoza"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:665
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr ""
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/xmppconsole.c:745 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr "XMPP Konzolo"
+
+#: ../pidgin/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "Konto: "
+
+#: ../pidgin/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr ""
+
+#: ../pidgin/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr ""
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr ""
+
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr ""
+
+#~ msgid "/Conversation/Insert Lin_k..."
+#~ msgstr "/Konversacio/Enmetu Ligi_lon..."
+
+#~ msgid "/Conversation/Insert Imag_e..."
+#~ msgstr "/Konversacio/Enm_etu Bildon..."
+
+#~ msgid "/Conversation/Insert Link..."
+#~ msgstr "/Konversacio/Enmetu Ligilon..."
+
+#~ msgid "/Conversation/Insert Image..."
+#~ msgstr "/Konversacio/Enmetu Bildon..."
+
+#~ msgid "Group not removed"
+#~ msgstr "Grupo ne forigita"
+
+#~ msgid ""
+#~ "Always use AIM/ICQ proxy server for file transfers\n"
+#~ "(slower, but does not reveal your IP address)"
+#~ msgstr ""
+#~ "Ĉiam uzu AIM/ICQ-n prokurservilon por dosiero alŝuto\n"
+#~ "(pli malrapida, sed vualigas vian IP adreson)"
+
+#~ msgid ""
+#~ "Your screen name is currently formatted as follows:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Via ekrannomo estas nun formatumita tiel:\n"
+#~ "%s"
+
+#~ msgid "New screen name formatting:"
+#~ msgstr "Nova ekrana nomo formatumo:"
+
+#~ msgid "Format Screen Name..."
+#~ msgstr "Formatu Ekrano-Nomon..."
+
+#~ msgid "TOC has sent a PAUSE command."
+#~ msgstr "TOC sendis PAŬZO komandon."
+
+#~ msgid "Buzz!!"
+#~ msgstr "Zum!!"
+
+#~ msgid "Normal authentication failed!"
+#~ msgstr "Normala aŭtentokontrolo malsukcesis!"
--- a/po/es.po	Sun Apr 15 00:14:34 2007 +0000
+++ b/po/es.po	Sun Apr 15 00:15:32 2007 +0000
@@ -53,8 +53,8 @@
 msgstr ""
 "Project-Id-Version: Gaim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-04-07 18:48-0400\n"
-"PO-Revision-Date: 2007-04-08 13:11+0200\n"
+"POT-Creation-Date: 2007-04-09 08:32-0400\n"
+"PO-Revision-Date: 2007-04-09 10:52+0200\n"
 "Last-Translator: Javier Fernández-Sanguino <jfs@debian.org>\n"
 "Language-Team:  Spanish team <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -169,7 +169,7 @@
 #: ../libpurple/protocols/msn/msn.c:250 ../libpurple/protocols/msn/msn.c:265
 #: ../libpurple/protocols/msn/msn.c:280 ../libpurple/protocols/msn/msn.c:295
 #: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6037
+#: ../libpurple/protocols/oscar/oscar.c:6039
 #: ../libpurple/protocols/oscar/peer.c:1021
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:212
@@ -483,7 +483,7 @@
 #. Buddy List
 #: ../finch/gntblist.c:1113 ../finch/gntblist.c:2118 ../finch/gntprefs.c:278
 #: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4133
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Lista de amigos"
 
@@ -595,7 +595,7 @@
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:249 ../libpurple/protocols/msn/msn.c:264
 #: ../libpurple/protocols/msn/msn.c:279 ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6038
 #: ../libpurple/protocols/silc/buddy.c:466
 #: ../libpurple/protocols/silc/buddy.c:1182
 #: ../libpurple/protocols/silc/chat.c:424
@@ -1188,7 +1188,7 @@
 
 #: ../finch/gntprefs.c:71 ../libpurple/plugins/autoreply.c:360
 #: ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829 ../pidgin/gtkprefs.c:1811
-#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:334
+#: ../pidgin/gtkprefs.c:1825 ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Nunca"
 
@@ -1226,7 +1226,7 @@
 
 #. Conversations
 #: ../finch/gntprefs.c:279 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:1915
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Conversaciones"
 
@@ -1296,12 +1296,12 @@
 #: ../libpurple/protocols/novell/novell.c:2942
 #: ../libpurple/protocols/novell/novell.c:2948
 #: ../libpurple/protocols/novell/novell.c:2954
-#: ../libpurple/protocols/oscar/oscar.c:5490
-#: ../libpurple/protocols/oscar/oscar.c:5718
-#: ../libpurple/protocols/oscar/oscar.c:5732
-#: ../libpurple/protocols/oscar/oscar.c:5748
-#: ../libpurple/protocols/oscar/oscar.c:5755
-#: ../libpurple/protocols/oscar/oscar.c:5762
+#: ../libpurple/protocols/oscar/oscar.c:5492
+#: ../libpurple/protocols/oscar/oscar.c:5720
+#: ../libpurple/protocols/oscar/oscar.c:5734
+#: ../libpurple/protocols/oscar/oscar.c:5750
+#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/oscar/oscar.c:5764
 #: ../libpurple/protocols/sametime/sametime.c:3287
 #: ../libpurple/protocols/sametime/sametime.c:3293
 #: ../libpurple/protocols/sametime/sametime.c:3299
@@ -1377,7 +1377,9 @@
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
-msgstr "El entorno de X tiene acceso a Los contenidos del portapapeles de gnt cuando estos cambian, si es posible."
+msgstr ""
+"El entorno de X tiene acceso a Los contenidos del portapapeles de gnt cuando "
+"estos cambian, si es posible."
 
 #: ../finch/plugins/gntgf.c:209
 #, c-format
@@ -2173,10 +2175,10 @@
 #: ../libpurple/plugins/idle.c:228 ../libpurple/protocols/oscar/oscar.c:1434
 #: ../libpurple/protocols/oscar/oscar.c:2243
 #: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5832
-#: ../libpurple/protocols/oscar/oscar.c:5884
-#: ../libpurple/protocols/oscar/oscar.c:6108
-#: ../libpurple/protocols/oscar/oscar.c:6177 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6179 ../libpurple/request.h:1350
 #: ../libpurple/request.h:1360
 msgid "_Cancel"
 msgstr "_Cancelar"
@@ -2545,7 +2547,9 @@
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
-msgstr "Este complemento oculta los mensajes de unir/salir en salas grandes, salvo los de aquellos usuarios que forman parte activa de una conversación."
+msgstr ""
+"Este complemento oculta los mensajes de unir/salir en salas grandes, salvo "
+"los de aquellos usuarios que forman parte activa de una conversación."
 
 #. This is used in the place of a timezone abbreviation if the
 #. * offset is way off.  The user should never really see it, but
@@ -2971,7 +2975,7 @@
 
 #: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
-msgstr "Un amigo se conecta/desconecta"
+msgstr "Un amigo _se conecta/desconecta"
 
 #. *< type
 #. *< ui_requirement
@@ -3034,7 +3038,7 @@
 #: ../libpurple/protocols/novell/novell.c:2820
 #: ../libpurple/protocols/oscar/oscar.c:714
 #: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5568
+#: ../libpurple/protocols/oscar/oscar.c:5570
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1469
 #: ../libpurple/protocols/yahoo/yahoo.c:3373
 #: ../libpurple/protocols/yahoo/yahoo.c:3446 ../libpurple/status.c:158
@@ -3326,7 +3330,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1408
 #: ../libpurple/protocols/novell/novell.c:2829
 #: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../libpurple/protocols/oscar/oscar.c:5542
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/yahoo/yahoo.c:2898 ../libpurple/status.c:154
 #: ../pidgin/gtkblist.c:2978 ../pidgin/gtkblist.c:3302
@@ -3643,7 +3647,7 @@
 #: ../libpurple/protocols/irc/irc.c:913 ../libpurple/protocols/irc/msgs.c:312
 #: ../libpurple/protocols/jabber/jabber.c:1994
 #: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/oscar/oscar.c:6621
 #: ../libpurple/protocols/qq/qq.c:746
 #: ../libpurple/protocols/sametime/sametime.c:5706
 #: ../libpurple/protocols/silc/ops.c:1244
@@ -3655,7 +3659,7 @@
 
 #. port to connect to
 #: ../libpurple/protocols/irc/irc.c:916 ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/oscar/oscar.c:6624
 #: ../libpurple/protocols/qq/qq.c:749
 #: ../libpurple/protocols/sametime/sametime.c:5711
 #: ../libpurple/protocols/silc/silc.c:1850
@@ -4378,7 +4382,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1418
 #: ../libpurple/protocols/jabber/jabber.c:1271
 #: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/oscar/oscar.c:5756
 #: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "No molestar"
@@ -4469,7 +4473,7 @@
 msgstr "Buscar en el directorio"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5250
+#: ../libpurple/protocols/oscar/oscar.c:5252
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Sala:"
@@ -4663,7 +4667,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1528
 #: ../libpurple/protocols/jabber/jabber.c:1564
 #: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5540
 msgid "Not Authorized"
 msgstr "No autorizado"
 
@@ -4720,14 +4724,14 @@
 msgstr "Por favor, indique su nueva contraseña"
 
 #: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6341
 #: ../libpurple/protocols/silc/silc.c:1013
 msgid "Set User Info..."
 msgstr "Establecer su información de usuario..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6350
+#: ../libpurple/protocols/oscar/oscar.c:6352
 #: ../libpurple/protocols/silc/silc.c:1009
 msgid "Change Password..."
 msgstr "Cambiar su contraseña..."
@@ -5525,7 +5529,9 @@
 
 #: ../libpurple/protocols/msn/msn.c:694
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
-msgstr "El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL soportada."
+msgstr ""
+"El soporte SSL es necesario para MSN. Por favor, instale una biblioteca SSL "
+"soportada."
 
 #: ../libpurple/protocols/msn/msn.c:719
 msgid "Failed to connect to server."
@@ -5758,7 +5764,9 @@
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
-msgstr "No se pudo encontrar información en el perfil de usuario. Es probable que el usuario no exista."
+msgstr ""
+"No se pudo encontrar información en el perfil de usuario. Es probable que el "
+"usuario no exista."
 
 #: ../libpurple/protocols/msn/msn.c:1798
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
@@ -6639,7 +6647,7 @@
 msgstr "Charlar"
 
 #: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5953
+#: ../libpurple/protocols/oscar/oscar.c:5955
 msgid "Get File"
 msgstr "Recibir archivo"
 
@@ -6712,17 +6720,17 @@
 msgstr "Cámara"
 
 #: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:5728
 msgid "Free For Chat"
 msgstr "Disponible para conversar"
 
 #: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5763
 msgid "Not Available"
 msgstr "No disponible"
 
 #: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5747
+#: ../libpurple/protocols/oscar/oscar.c:5749
 msgid "Occupied"
 msgstr "Ocupado"
 
@@ -6861,8 +6869,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:1433
 #: ../libpurple/protocols/oscar/oscar.c:2242
 #: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5831
-#: ../libpurple/protocols/oscar/oscar.c:6107 ../libpurple/request.h:1350
+#: ../libpurple/protocols/oscar/oscar.c:5833
+#: ../libpurple/protocols/oscar/oscar.c:6109 ../libpurple/request.h:1350
 msgid "_OK"
 msgstr "_Aceptar"
 
@@ -6913,7 +6921,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:2280
 #: ../libpurple/protocols/oscar/oscar.c:2287
 #: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5219
+#: ../libpurple/protocols/oscar/oscar.c:5221
 #: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "No reason given."
 msgstr "No se indicó una razón."
@@ -7294,8 +7302,10 @@
 msgid_plural ""
 "The maximum profile length of %d bytes has been exceeded.  It has been "
 "truncated it for you."
-msgstr[0] "Se ha excedido el tamaño máximo de perfil de %d byte. Se ha truncado."
-msgstr[1] "Se ha excedido el tamaño máximo de perfil de %d bytes. Se ha truncado."
+msgstr[0] ""
+"Se ha excedido el tamaño máximo de perfil de %d byte. Se ha truncado."
+msgstr[1] ""
+"Se ha excedido el tamaño máximo de perfil de %d bytes. Se ha truncado."
 
 #: ../libpurple/protocols/oscar/oscar.c:4482
 msgid "Profile too long."
@@ -7309,8 +7319,12 @@
 msgid_plural ""
 "The maximum away message length of %d bytes has been exceeded.  It has been "
 "truncated for you."
-msgstr[0] "Se excedió el límite de %d byte de longitud en el mensaje de ausencia. Se ha truncado."
-msgstr[1] "Se excedió el límite de %d bytes de longitud en el mensaje de ausencia. Se ha truncado."
+msgstr[0] ""
+"Se excedió el límite de %d byte de longitud en el mensaje de ausencia. Se ha "
+"truncado."
+msgstr[1] ""
+"Se excedió el límite de %d bytes de longitud en el mensaje de ausencia. Se "
+"ha truncado."
 
 #: ../libpurple/protocols/oscar/oscar.c:4532
 msgid "Away message too long."
@@ -7328,8 +7342,8 @@
 "números y espacios, o contener sólo números."
 
 #: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5028
+#: ../libpurple/protocols/oscar/oscar.c:5042
 msgid "Unable To Add"
 msgstr "No se pudo añadir"
 
@@ -7341,18 +7355,21 @@
 msgid ""
 "The AIM servers were temporarily unable to send your buddy list.  Your buddy "
 "list is not lost, and will probably become available in a few hours."
-msgstr "No se ha podido obtener en este momento la lista de amigos de los servidores de AIM. No se ha perdido la lista de amigos, seguramente volverá a estar disponible en unas horas."
-
-#: ../libpurple/protocols/oscar/oscar.c:4912
+msgstr ""
+"No se ha podido obtener en este momento la lista de amigos de los servidores "
+"de AIM. No se ha perdido la lista de amigos, seguramente volverá a estar "
+"disponible en unas horas."
+
 #: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4918
-#: ../libpurple/protocols/oscar/oscar.c:5094
-#: ../libpurple/protocols/oscar/oscar.c:5095
-#: ../libpurple/protocols/oscar/oscar.c:5100
+#: ../libpurple/protocols/oscar/oscar.c:4914
+#: ../libpurple/protocols/oscar/oscar.c:4919
+#: ../libpurple/protocols/oscar/oscar.c:5096
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5102
 msgid "Orphans"
 msgstr "Huérfanos"
 
-#: ../libpurple/protocols/oscar/oscar.c:5024
+#: ../libpurple/protocols/oscar/oscar.c:5026
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7361,12 +7378,12 @@
 "No se ha podido añadir al amigo %s porque hay demasiados contactos en la "
 "lista de amigos. Por favor, elimine uno y vuelva a probar."
 
-#: ../libpurple/protocols/oscar/oscar.c:5024
-#: ../libpurple/protocols/oscar/oscar.c:5038
+#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5040
 msgid "(no name)"
 msgstr "(sin nombre)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5038
+#: ../libpurple/protocols/oscar/oscar.c:5040
 #, c-format
 msgid ""
 "Could not add the buddy %s for an unknown reason.  The most common reason "
@@ -7377,7 +7394,7 @@
 "habitual es que ha llegado al máximo número de amigos permitidos en su lista "
 "de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5131
+#: ../libpurple/protocols/oscar/oscar.c:5133
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7386,23 +7403,23 @@
 "El usuario %s le ha dado a usted permiso para añadirle a su lista de "
 "amigos.  ¿Desea hacerlo?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5137
+#: ../libpurple/protocols/oscar/oscar.c:5139
 msgid "Authorization Given"
 msgstr "Autorización otorgada"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/oscar/oscar.c:5217
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "El usuario %s ha autorizado su solicitud de añadirlo a su lista de amigos."
 
-#: ../libpurple/protocols/oscar/oscar.c:5216
+#: ../libpurple/protocols/oscar/oscar.c:5218
 msgid "Authorization Granted"
 msgstr "Autorización aceptada"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5219
+#: ../libpurple/protocols/oscar/oscar.c:5221
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7413,52 +7430,52 @@
 "la siguiente razón:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5220
+#: ../libpurple/protocols/oscar/oscar.c:5222
 msgid "Authorization Denied"
 msgstr "Autorización denegada"
 
-#: ../libpurple/protocols/oscar/oscar.c:5256
+#: ../libpurple/protocols/oscar/oscar.c:5258
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Intercambio:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5296
+#: ../libpurple/protocols/oscar/oscar.c:5298
 msgid "Invalid chat name specified."
 msgstr "Se especificó un nombre de chat no válido."
 
-#: ../libpurple/protocols/oscar/oscar.c:5366
+#: ../libpurple/protocols/oscar/oscar.c:5368
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "No se ha enviado su imagen MI. No se pueden enviar imágenes IM en chats AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5505
-#: ../libpurple/protocols/oscar/oscar.c:5510
+#: ../libpurple/protocols/oscar/oscar.c:5507
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Away Message"
 msgstr "Mensajes de ausencia"
 
-#: ../libpurple/protocols/oscar/oscar.c:5510
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "<i>(retrieving)</i>"
 msgstr " <i>(obteniendo)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5720
+#: ../libpurple/protocols/oscar/oscar.c:5722
 msgid "iTunes Music Store Link"
 msgstr "Enlace a la tienda de música de iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5828
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentario de amigo para %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5829
+#: ../libpurple/protocols/oscar/oscar.c:5831
 msgid "Buddy Comment:"
 msgstr "Comentario de amigo:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5875
+#: ../libpurple/protocols/oscar/oscar.c:5877
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Usted pidió abrir una conexión MI directa con %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5879
+#: ../libpurple/protocols/oscar/oscar.c:5881
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7466,66 +7483,66 @@
 "Puede considerarse como un riesgo a su privacidad  ya que hacer ésto revela "
 "su dirección IP. ¿Quiere continuar?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "C_onnect"
 msgstr "C_onectar"
 
 # TBD - comprobar si esto afecta al botón en pantalla
-#: ../libpurple/protocols/oscar/oscar.c:5918
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get AIM Info"
 msgstr "Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5926
 msgid "Edit Buddy Comment"
 msgstr "Editar comentario de amigo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Get Status Msg"
 msgstr "Obtener msj de estado"
 
-#: ../libpurple/protocols/oscar/oscar.c:5945
+#: ../libpurple/protocols/oscar/oscar.c:5947
 msgid "Direct IM"
 msgstr "MI directo"
 
-#: ../libpurple/protocols/oscar/oscar.c:5967
+#: ../libpurple/protocols/oscar/oscar.c:5969
 msgid "Re-request Authorization"
 msgstr "Solicitar autorización otra vez"
 
-#: ../libpurple/protocols/oscar/oscar.c:6026
+#: ../libpurple/protocols/oscar/oscar.c:6028
 msgid "Require authorization"
 msgstr "Solicitar autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6029
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Capacidad web (¡si activa esto hará que recibe SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "ICQ Privacy Options"
 msgstr "Opciones de privacidad de ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6051
+#: ../libpurple/protocols/oscar/oscar.c:6053
 msgid "The new formatting is invalid."
 msgstr "El nuevo formato es inválido."
 
-#: ../libpurple/protocols/oscar/oscar.c:6052
+#: ../libpurple/protocols/oscar/oscar.c:6054
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "El formato del nombre de usuario sólo puede cambiar en la capitalización y "
 "espacios en blanco."
 
-#: ../libpurple/protocols/oscar/oscar.c:6105
+#: ../libpurple/protocols/oscar/oscar.c:6107
 msgid "Change Address To:"
 msgstr "Cambiar dirección a:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6150
+#: ../libpurple/protocols/oscar/oscar.c:6152
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>usted no está esperando autorización</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6153
+#: ../libpurple/protocols/oscar/oscar.c:6155
 msgid "You are awaiting authorization from the following buddies"
 msgstr "En espera de la autorización de los siguientes amigos"
 
-#: ../libpurple/protocols/oscar/oscar.c:6154
+#: ../libpurple/protocols/oscar/oscar.c:6156
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7533,74 +7550,74 @@
 "Puede volver a pedir autorización a estos amigos apretando el botón derecho "
 "del ratón sobre ellos y escogiendo «Solicitar autorización otra vez.»"
 
-#: ../libpurple/protocols/oscar/oscar.c:6171
+#: ../libpurple/protocols/oscar/oscar.c:6173
 msgid "Find Buddy by E-Mail"
 msgstr "Buscar un amigo en base a su correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6172
+#: ../libpurple/protocols/oscar/oscar.c:6174
 msgid "Search for a buddy by e-mail address"
 msgstr "Buscar amigo por la dirección correo electrónico"
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6175
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr ""
 "Escriba la dirección de correo electrónico del amigo que está buscando."
 
-#: ../libpurple/protocols/oscar/oscar.c:6176
+#: ../libpurple/protocols/oscar/oscar.c:6178
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6345
+#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Set User Info (URL)..."
 msgstr "Establecer su información de usuario (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6358
 msgid "Change Password (URL)"
 msgstr "Cambiar su contraseña (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6360
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurar reenvío de MI (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6370
+#: ../libpurple/protocols/oscar/oscar.c:6372
 msgid "Set Privacy Options..."
 msgstr "Configurar las opciones de privacidad..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6377
+#: ../libpurple/protocols/oscar/oscar.c:6379
 msgid "Confirm Account"
 msgstr "Confirmar cuenta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6381
+#: ../libpurple/protocols/oscar/oscar.c:6383
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Mostrar direcciones de correo registradas actualmente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6385
+#: ../libpurple/protocols/oscar/oscar.c:6387
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Cambiar la dirección de correo registrada actualmente..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6392
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Mostrar amigos pendientes de autorización"
 
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6400
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Buscar un amigo por correo electrónico..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Search for Buddy by Information"
 msgstr "Buscar un amigo a través de su información"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Use recent buddies group"
 msgstr "Usar grupo de amigos reciente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6474
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Show how long you have been idle"
 msgstr "Mostrar cuánto tiempo se ha estado inactivo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6628
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7810,7 +7827,8 @@
 #: ../libpurple/protocols/qq/buddy_info.c:565
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
-msgstr "Está vd. intentando fijar una cara a medida. Por favor, escoja una imagen de "
+msgstr ""
+"Está vd. intentando fijar una cara a medida. Por favor, escoja una imagen de "
 
 #: ../libpurple/protocols/qq/buddy_info.c:582
 #: ../libpurple/protocols/qq/buddy_info.c:595
@@ -10572,7 +10590,10 @@
 "The Yahoo server has requested the use of an unrecognized authentication "
 "method.  You will probably not be able to successfully sign on to Yahoo.  "
 "Check %s for updates."
-msgstr "El servidor de Yahoo ha solicitado el uso de un método de autenticación desconocido. Posiblemente no sea capaz de conectarse a Yahoo. Compruebe %s para ver si existe una actualización."
+msgstr ""
+"El servidor de Yahoo ha solicitado el uso de un método de autenticación "
+"desconocido. Posiblemente no sea capaz de conectarse a Yahoo. Compruebe %s "
+"para ver si existe una actualización."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:1824
 msgid "Failed Yahoo! Authentication"
@@ -11303,12 +11324,12 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2435
+#: ../libpurple/util.c:2442
 #, c-format
 msgid "Error Reading %s"
 msgstr "Error al leer %s"
 
-#: ../libpurple/util.c:2436
+#: ../libpurple/util.c:2443
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11317,62 +11338,62 @@
 "Se ha encontrado un error al leer su %s. No se ha cargado, y el archivo "
 "antiguo se ha renombrado a %s~."
 
-#: ../libpurple/util.c:2899
+#: ../libpurple/util.c:2906
 msgid "Calculating..."
 msgstr "Calculando..."
 
-#: ../libpurple/util.c:2902
+#: ../libpurple/util.c:2909
 msgid "Unknown."
 msgstr "Desconocido."
 
-#: ../libpurple/util.c:2928
+#: ../libpurple/util.c:2935
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: ../libpurple/util.c:2940
+#: ../libpurple/util.c:2947
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: ../libpurple/util.c:2948
+#: ../libpurple/util.c:2955
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d hora"
 msgstr[1] "%s, %d horas"
 
-#: ../libpurple/util.c:2954
+#: ../libpurple/util.c:2961
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../libpurple/util.c:2962
+#: ../libpurple/util.c:2969
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuto"
 msgstr[1] "%s, %d minutos"
 
-#: ../libpurple/util.c:2968
+#: ../libpurple/util.c:2975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuto"
 msgstr[1] "%d minutos"
 
-#: ../libpurple/util.c:3235 ../libpurple/util.c:3533
+#: ../libpurple/util.c:3242 ../libpurple/util.c:3540
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "No se pudo conectar a %s"
 
-#: ../libpurple/util.c:3361
+#: ../libpurple/util.c:3368
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11381,17 +11402,17 @@
 "No se pudo obtener suficiente memoria para mantener los contenidos de %s. Es "
 "posible que el servidor web esté intentando algo con malas intenciones."
 
-#: ../libpurple/util.c:3396
+#: ../libpurple/util.c:3403
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Error al leer de %s: %s"
 
-#: ../libpurple/util.c:3427
+#: ../libpurple/util.c:3434
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Error al escribir a %s: %s"
 
-#: ../libpurple/util.c:3452
+#: ../libpurple/util.c:3459
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "No se pudo conectar a %s: %s"
@@ -11542,7 +11563,10 @@
 msgstr ""
 "<span size='larger' weight='bold'>¡Bienvenido a %s!</span>\n"
 "\n"
-"No tiene configurada ninguna cuenta de MI. Para conectarse con %s debe pulsar el botón <b>Añadir</b> que tiene más abajo y configurar su primera cuenta. Si quiere que %s se conecte a múltiples cuentas de MI, deberá pulsar <b>Añadir</b> otra vez para configurarlas todas."
+"No tiene configurada ninguna cuenta de MI. Para conectarse con %s debe "
+"pulsar el botón <b>Añadir</b> que tiene más abajo y configurar su primera "
+"cuenta. Si quiere que %s se conecte a múltiples cuentas de MI, deberá pulsar "
+"<b>Añadir</b> otra vez para configurarlas todas."
 
 #: ../pidgin/gtkblist.c:704
 msgid "Join a Chat"
@@ -11687,7 +11711,7 @@
 
 #: ../pidgin/gtkblist.c:2767
 msgid "/Buddies/_Sort Buddies"
-msgstr "/Amigos/Ordenar amigos"
+msgstr "/Amigos/_Ordenar amigos"
 
 #: ../pidgin/gtkblist.c:2769
 msgid "/Buddies/_Add Buddy..."
@@ -11745,7 +11769,7 @@
 
 #: ../pidgin/gtkblist.c:2788
 msgid "/Tools/System _Log"
-msgstr "/Herramientas/Registro del sistema"
+msgstr "/Herramientas/_Registro del sistema"
 
 #: ../pidgin/gtkblist.c:2790
 msgid "/Tools/Mute _Sounds"
@@ -11912,7 +11936,10 @@
 msgstr ""
 "<span size='larger' weight='bold'>¡Bienvenido a %s!</span>\n"
 "\n"
-"No tiene ninguna cuenta activa. Puede activar sus cuentas de MI en la ventana de <b>Cuentas</b> en <b>Cuentas->Añadir/Editar</b>. Podrá conectarse, fijar su estado y hablar con sus amigos una vez active sus cuentas."
+"No tiene ninguna cuenta activa. Puede activar sus cuentas de MI en la "
+"ventana de <b>Cuentas</b> en <b>Cuentas->Añadir/Editar</b>. Podrá "
+"conectarse, fijar su estado y hablar con sus amigos una vez active sus "
+"cuentas."
 
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
@@ -11988,7 +12015,7 @@
 
 #: ../pidgin/gtkblist.c:6409
 msgid "_Disable"
-msgstr "Deshabilitar"
+msgstr "_Deshabilitar"
 
 #: ../pidgin/gtkblist.c:6421
 msgid "Enable Account"
@@ -12016,7 +12043,8 @@
 msgstr ""
 "%s\n"
 "\n"
-"%s no intentará reconectarse a esta cuenta hasta que corrija el error y reactive la cuenta."
+"%s no intentará reconectarse a esta cuenta hasta que corrija el error y "
+"reactive la cuenta."
 
 #: ../pidgin/gtkconv.c:782 ../pidgin/gtkconv.c:808
 msgid "That buddy is not on the same protocol as this chat."
@@ -12780,11 +12808,21 @@
 "distributed with %s.  %s is copyrighted by its contributors.  See the "
 "'COPYRIGHT' file for the complete list of contributors.  We provide no "
 "warranty for this program.<BR><BR>"
-msgstr "%s es un cliente de mensajería modular capaz de utilizar AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu y QQ todos al mismo tiempo. Está escrito utilizando GTK+.<BR><BR>Puede modificar y redistribuir este programa bajo los términos de la GPL (versión 2 o posterior). Se incluye una copia de la licencia GPL en el archivo «COPYING» que se distribuye con %s. Las personas que han contribuido a %s tienen los derechos de copia. Lea el archivo «COPYRIGHT» si desea consultar la lista completa de personas que han contribuido. Este programa se distribuye sin ninguna garantía.<BR><BR>"
+msgstr ""
+"%s es un cliente de mensajería modular capaz de utilizar AIM, MSN, Yahoo!, "
+"Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, "
+"Bonjour, Zephyr, Gadu-Gadu y QQ todos al mismo tiempo. Está escrito "
+"utilizando GTK+.<BR><BR>Puede modificar y redistribuir este programa bajo "
+"los términos de la GPL (versión 2 o posterior). Se incluye una copia de la "
+"licencia GPL en el archivo «COPYING» que se distribuye con %s. Las personas "
+"que han contribuido a %s tienen los derechos de copia. Lea el archivo "
+"«COPYRIGHT» si desea consultar la lista completa de personas que han "
+"contribuido. Este programa se distribuye sin ninguna garantía.<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:374
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgwin on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> canal #pidgwin en irc.freenode.net<BR><BR>"
+msgstr ""
+"<FONT SIZE=\"4\">IRC:</FONT> canal #pidgwin en irc.freenode.net<BR><BR>"
 
 #: ../pidgin/gtkdialogs.c:377
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
@@ -13051,7 +13089,7 @@
 
 #: ../pidgin/gtkft.c:786
 msgid "Close this window when all transfers _finish"
-msgstr "Cerrar esta ventana cuando todas las transferencias terminen"
+msgstr "Cerrar esta ventana cuando todas las transferencias _terminen"
 
 #: ../pidgin/gtkft.c:796
 msgid "C_lear finished transfers"
@@ -13271,21 +13309,27 @@
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
-msgstr "¿Está seguro que desea borrar de forma permanente el registro de la conversación con %s que empezó en %s?"
+msgstr ""
+"¿Está seguro que desea borrar de forma permanente el registro de la "
+"conversación con %s que empezó en %s?"
 
 #: ../pidgin/gtklog.c:273
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
 "s which started at %s?"
-msgstr "¿Está seguro que desea borrar de forma permanente el registro de la conversación en %s que empezó en %s?"
+msgstr ""
+"¿Está seguro que desea borrar de forma permanente el registro de la "
+"conversación en %s que empezó en %s?"
 
 #: ../pidgin/gtklog.c:278
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
-msgstr "¿Está seguro que desea borrar de forma permanente el registro del sistema que comezó en %s?"
+msgstr ""
+"¿Está seguro que desea borrar de forma permanente el registro del sistema "
+"que comezó en %s?"
 
 #: ../pidgin/gtklog.c:419
 #, c-format
@@ -13373,11 +13417,14 @@
 "%s %s\n"
 "Modo de uso: %s [OPCIÓN]...\n"
 "\n"
-"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de configuración\n"
-"  -d, --debug          imprimir mensajes de depuración en la salida estándar\n"
+"  -c, --config=DIR     utilizar el directorio DIR para los ficheros de "
+"configuración\n"
+"  -d, --debug          imprimir mensajes de depuración en la salida "
+"estándar\n"
 "  -h, --help           mostrar este mensaje y salir\n"
 "  -n, --nologin        no conectarse de forma automática\n"
-"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opción NOMBRE\n"
+"  -l, --login[=NOMBRE] conectarse de forma automática (el argumento opción "
+"NOMBRE\n"
 "                       indica la(s) cuenta(s) a usar, separadas por comas)\n"
 "  -v, --version        mostrar la versión actual y salir\n"
 
@@ -13504,7 +13551,7 @@
 
 #: ../pidgin/gtkplugin.c:533
 msgid "Configure Pl_ugin"
-msgstr "Configurar complemento"
+msgstr "Configurar _complemento"
 
 #: ../pidgin/gtkplugin.c:596
 msgid "<b>Plugin Details</b>"
@@ -13634,9 +13681,9 @@
 msgstr "_Mostrar icono del área de notificación del sistema:"
 
 #: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1646
-#: ../pidgin/plugins/timestamp_format.c:39
-#: ../pidgin/plugins/timestamp_format.c:48
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
 msgid "Always"
 msgstr "Siempre"
 
@@ -13663,7 +13710,7 @@
 
 #: ../pidgin/gtkprefs.c:840
 msgid "Show IMs and chats in _tabbed windows"
-msgstr "Mostrar MIs y chats en ventanas con solapas."
+msgstr "Mostrar MIs y chats en ventanas con _solapas"
 
 #: ../pidgin/gtkprefs.c:854
 msgid "Show close b_utton on tabs"
@@ -14167,7 +14214,7 @@
 #. list button
 #: ../pidgin/gtkroomlist.c:446
 msgid "_Get List"
-msgstr "Obtener la lista"
+msgstr "_Obtener la lista"
 
 #. add button
 #: ../pidgin/gtkroomlist.c:454
@@ -14285,7 +14332,9 @@
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually"
-msgstr "%s no puede transferir una carpeta. Necesita enviar los archivos que contiene individualmente."
+msgstr ""
+"%s no puede transferir una carpeta. Necesita enviar los archivos que "
+"contiene individualmente."
 
 #: ../pidgin/gtkutils.c:1453 ../pidgin/gtkutils.c:1462
 #: ../pidgin/gtkutils.c:1467
@@ -14642,8 +14691,8 @@
 #. *< priority
 #. *< id
 #: ../pidgin/plugins/gaiminc.c:91
-msgid " Demonstration Plugin"
-msgstr "Complemento de demostración"
+msgid "Pidgin Demonstration Plugin"
+msgstr "Complemento de demostración de Pidgin"
 
 #. *< name
 #. *< version
@@ -15168,8 +15217,8 @@
 msgstr "Volver a leer archivos de configuración gtkrc"
 
 #: ../pidgin/plugins/pidginrc.c:616
-msgid " GTK+ Theme Control"
-msgstr "Control de tema GTK+"
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Control de tema GTK+ de Pidgin"
 
 #: ../pidgin/plugins/pidginrc.c:618 ../pidgin/plugins/pidginrc.c:619
 msgid "Provides access to commonly used gtkrc settings."
@@ -15195,8 +15244,9 @@
 "ventana de depuración."
 
 #: ../pidgin/plugins/relnot.c:71
-msgid "You are using "
-msgstr "Usted está utilizando "
+#, c-format
+msgid "You are using %s version %s.  The current version is %s.<hr>"
+msgstr "Usted está utilizado la versión de %s %s. La versión actual es %s.<hr>"
 
 #: ../pidgin/plugins/relnot.c:77
 #, c-format
@@ -15212,7 +15262,9 @@
 msgid ""
 "You can get version %s from:<br><a href=\"http://pidgin.im/\">http://pidgin."
 "im</a>."
-msgstr "Puede obtener la versión %s de:<br><a href=\"http://pidgin.im/\">http://pidgin.im</a>."
+msgstr ""
+"Puede obtener la versión %s de:<br><a href=\"http://pidgin.im/\">http://"
+"pidgin.im</a>."
 
 #: ../pidgin/plugins/relnot.c:86 ../pidgin/plugins/relnot.c:87
 msgid "New Version Available"
@@ -15357,35 +15409,35 @@
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Mostrar una marca de tiempo al estilo iChat cada N minutos."
 
-#: ../pidgin/plugins/timestamp_format.c:22
+#: ../pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Opciones de formato de marca de tiempo"
 
 # JFS: Is this complete? REVIEW
-#: ../pidgin/plugins/timestamp_format.c:27
-#, fuzzy
-msgid "_Force (traditional "
-msgstr "_Forzar formato de tiempo de 24 horas (tradicional "
-
-#: ../pidgin/plugins/timestamp_format.c:30
+#: ../pidgin/plugins/timestamp_format.c:26
+#, c-format
+msgid "_Force (traditional %s) 24-hour time format"
+msgstr "_Forzar formato de tiempo de 24 horas (%s tradicional)"
+
+#: ../pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Mostrar las fechas en..."
 
-#: ../pidgin/plugins/timestamp_format.c:35
+#: ../pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "Co_nversaciones:"
 
-#: ../pidgin/plugins/timestamp_format.c:37
-#: ../pidgin/plugins/timestamp_format.c:46
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "Para mensajes diferidos"
 
-#: ../pidgin/plugins/timestamp_format.c:38
-#: ../pidgin/plugins/timestamp_format.c:47
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "Para mensajes diferidos y para chats"
 
-#: ../pidgin/plugins/timestamp_format.c:44
+#: ../pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "Registro de _mensajes:"
 
@@ -15395,19 +15447,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:141
+#: ../pidgin/plugins/timestamp_format.c:144
 msgid "Message Timestamp Formats"
 msgstr "Formatos de marca de tiempo de mensajes"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:144
+#: ../pidgin/plugins/timestamp_format.c:147
 msgid "Customizes the message timestamp formats."
 msgstr "Configura el formato de la marca de tiempo de mensajes."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:146
+#: ../pidgin/plugins/timestamp_format.c:149
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -15487,51 +15539,53 @@
 "\n"
 "* Nota: Este complemento requiere Win2000 o superior."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:306
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
 msgid "GTK+ Runtime Version"
 msgstr "Versión en ejecución de GTK+"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:314
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
 msgid "Startup"
 msgstr "Inicio"
 
-# JFS: Is this complete? REVIEW
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
-#, fuzzy
-msgid "_Start "
-msgstr "Puerto _inicial:"
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "_Iniciar %s al iniciar Windows"
 
 # Usar empotrable? (jfs)
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:328
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Dockable Buddy List"
 msgstr "Lista de amigos a_pilable "
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:332
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
 msgid "_Keep Buddy List window on top:"
 msgstr "_Mantener la ventana de lista de amigos por encima del resto"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Only when docked"
 msgstr "Solamente cuando se apile"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:342
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
 msgid "_Flash window when chat messages are received"
 msgstr "_Destello de ventana cuando se reciben mensajes de chat"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:366
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
 msgid "Pidgwin Options"
 msgstr "Opciones de Pidgwin"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:368
-msgid "Options specific to Windows "
-msgstr "Opciones específicas de para Windows "
-
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:369
-msgid "Provides options specific to Windows "
-msgstr "Opciones específicas de para Windows "
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
+msgid "Options specific to Pidgin for Windows."
+msgstr "Opciones específicas de %s para Windows."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:372
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+"Contiene las opciones específicas al Pidgin de Windows como el apilado de la "
+"lista de amigos."
 
 #: ../pidgin/plugins/xmppconsole.c:665
 msgid "<font color='#777777'>Logged out.</font>"
@@ -15580,6 +15634,17 @@
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr "Este complemento es útil para depurar clientes o servidores XMPP."
 
+#~ msgid "You are using "
+#~ msgstr "Usted está utilizando "
+
+# JFS: Is this complete? REVIEW
+#, fuzzy
+#~ msgid "_Start "
+#~ msgstr "Puerto _inicial:"
+
+#~ msgid "Provides options specific to Windows "
+#~ msgstr "Opciones específicas de para Windows "
+
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Gaim - cliente de mensajería de Internet"
 
@@ -15602,23 +15667,10 @@
 #~ msgid "Gaim %s. Try `%s -h' for more information.\n"
 #~ msgstr "Gaim %s. Intente `%s -h' para más información.\n"
 
-#~ msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-#~ msgstr ""
-#~ "Usted está utilizado la versión de Gaim %s. La versión actual es %s.<hr>"
-
-#~ msgid "_Start Gaim on Windows startup"
-#~ msgstr "_Iniciar Gaim al iniciar Windows"
-
 #~ msgid "WinGaim Options"
 #~ msgstr "Opciones de WinGaim"
 
 #~ msgid ""
-#~ "Provides options specific to Windows Gaim, such as buddy list docking."
-#~ msgstr ""
-#~ "Contiene las opciones específicas al Gaim de Windows como el apilado de "
-#~ "la lista de amigos."
-
-#~ msgid ""
 #~ "%d buddy from group %s was not removed because it belongs to an account "
 #~ "which is disabled or offline.  This buddy and the group were not "
 #~ "removed.\n"
--- a/po/sl.po	Sun Apr 15 00:14:34 2007 +0000
+++ b/po/sl.po	Sun Apr 15 00:15:32 2007 +0000
@@ -1,5 +1,5 @@
 # Copyright (C) 2004.
-# This file is distributed under the same license as the Pidgin package.
+# This file is distributed under the same license as the Gaim package.
 # Jure Čuhalev <gandalf@owca.info>, 2003.
 # Matjaž Horvat <matjaz@owca.info>, 2004.
 # Martin Srebotnjak <miles@filmsi.net>, 2006.
@@ -9,7 +9,7 @@
 "Project-Id-Version: Pidgin 2.0.0\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-09-08 00:02-0400\n"
-"PO-Revision-Date: 2007-04-09 10:53+0100\n"
+"PO-Revision-Date: 2007-04-11 19:07+0100\n"
 "Last-Translator: Martin Srebotnjak <miles@filmsi.net>\n"
 "Language-Team: Martin Srebotnjak, LUGOS <users@sl.openoffice.org>\n"
 "MIME-Version: 1.0\n"
@@ -154,7 +154,7 @@
 #: ../libpurple/protocols/msn/msn.c:280
 #: ../libpurple/protocols/msn/msn.c:295
 #: ../libpurple/protocols/msn/msn.c:312
-#: ../libpurple/protocols/oscar/oscar.c:6037
+#: ../libpurple/protocols/oscar/oscar.c:6039
 #: ../libpurple/protocols/oscar/peer.c:1021
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:212
@@ -250,7 +250,7 @@
 #: ../pidgin/gtkrequest.c:273
 #: ../pidgin/gtksavedstatuses.c:335
 msgid "Delete"
-msgstr "Zbriši"
+msgstr "Izbriši"
 
 #: ../finch/gntaccount.c:644
 #: ../finch/gntblist.c:1955
@@ -679,7 +679,7 @@
 #: ../libpurple/protocols/msn/msn.c:264
 #: ../libpurple/protocols/msn/msn.c:279
 #: ../libpurple/protocols/msn/msn.c:294
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6038
 #: ../libpurple/protocols/silc/buddy.c:466
 #: ../libpurple/protocols/silc/buddy.c:1182
 #: ../libpurple/protocols/silc/chat.c:424
@@ -1483,12 +1483,12 @@
 #: ../libpurple/protocols/novell/novell.c:2942
 #: ../libpurple/protocols/novell/novell.c:2948
 #: ../libpurple/protocols/novell/novell.c:2954
-#: ../libpurple/protocols/oscar/oscar.c:5490
-#: ../libpurple/protocols/oscar/oscar.c:5718
-#: ../libpurple/protocols/oscar/oscar.c:5732
-#: ../libpurple/protocols/oscar/oscar.c:5748
-#: ../libpurple/protocols/oscar/oscar.c:5755
-#: ../libpurple/protocols/oscar/oscar.c:5762
+#: ../libpurple/protocols/oscar/oscar.c:5492
+#: ../libpurple/protocols/oscar/oscar.c:5720
+#: ../libpurple/protocols/oscar/oscar.c:5734
+#: ../libpurple/protocols/oscar/oscar.c:5750
+#: ../libpurple/protocols/oscar/oscar.c:5757
+#: ../libpurple/protocols/oscar/oscar.c:5764
 #: ../libpurple/protocols/sametime/sametime.c:3287
 #: ../libpurple/protocols/sametime/sametime.c:3293
 #: ../libpurple/protocols/sametime/sametime.c:3299
@@ -2325,10 +2325,10 @@
 #: ../libpurple/protocols/oscar/oscar.c:1434
 #: ../libpurple/protocols/oscar/oscar.c:2243
 #: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:5832
-#: ../libpurple/protocols/oscar/oscar.c:5884
-#: ../libpurple/protocols/oscar/oscar.c:6108
-#: ../libpurple/protocols/oscar/oscar.c:6177
+#: ../libpurple/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5886
+#: ../libpurple/protocols/oscar/oscar.c:6110
+#: ../libpurple/protocols/oscar/oscar.c:6179
 #: ../libpurple/request.h:1350
 #: ../libpurple/request.h:1360
 msgid "_Cancel"
@@ -3156,7 +3156,7 @@
 #: ../libpurple/protocols/novell/novell.c:2820
 #: ../libpurple/protocols/oscar/oscar.c:714
 #: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5568
+#: ../libpurple/protocols/oscar/oscar.c:5570
 #: ../libpurple/protocols/qq/qq.c:180
 #: ../libpurple/protocols/silc/buddy.c:1469
 #: ../libpurple/protocols/yahoo/yahoo.c:3373
@@ -3465,7 +3465,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1408
 #: ../libpurple/protocols/novell/novell.c:2829
 #: ../libpurple/protocols/oscar/oscar.c:809
-#: ../libpurple/protocols/oscar/oscar.c:5540
+#: ../libpurple/protocols/oscar/oscar.c:5542
 #: ../libpurple/protocols/qq/qq.c:170
 #: ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/yahoo/yahoo.c:2898
@@ -3803,7 +3803,7 @@
 #: ../libpurple/protocols/irc/msgs.c:312
 #: ../libpurple/protocols/jabber/jabber.c:1994
 #: ../libpurple/protocols/msn/msn.c:2099
-#: ../libpurple/protocols/oscar/oscar.c:6619
+#: ../libpurple/protocols/oscar/oscar.c:6621
 #: ../libpurple/protocols/qq/qq.c:746
 #: ../libpurple/protocols/sametime/sametime.c:5706
 #: ../libpurple/protocols/silc/ops.c:1244
@@ -3816,7 +3816,7 @@
 #. port to connect to
 #: ../libpurple/protocols/irc/irc.c:916
 #: ../libpurple/protocols/msn/msn.c:2104
-#: ../libpurple/protocols/oscar/oscar.c:6622
+#: ../libpurple/protocols/oscar/oscar.c:6624
 #: ../libpurple/protocols/qq/qq.c:749
 #: ../libpurple/protocols/sametime/sametime.c:5711
 #: ../libpurple/protocols/silc/silc.c:1850
@@ -4452,7 +4452,7 @@
 #: ../libpurple/protocols/jabber/buddy.c:1418
 #: ../libpurple/protocols/jabber/jabber.c:1271
 #: ../libpurple/protocols/oscar/oscar.c:708
-#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/oscar/oscar.c:5756
 #: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "Ne moti"
@@ -4537,7 +4537,7 @@
 msgstr "Imenik iskanja"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5250
+#: ../libpurple/protocols/oscar/oscar.c:5252
 #: ../libpurple/protocols/yahoo/yahoochat.c:999
 msgid "_Room:"
 msgstr "_Soba:"
@@ -4730,7 +4730,7 @@
 #: ../libpurple/protocols/jabber/jabber.c:1528
 #: ../libpurple/protocols/jabber/jabber.c:1564
 #: ../libpurple/protocols/oscar/oscar.c:807
-#: ../libpurple/protocols/oscar/oscar.c:5538
+#: ../libpurple/protocols/oscar/oscar.c:5540
 msgid "Not Authorized"
 msgstr "Nepooblaščeno"
 
@@ -4787,14 +4787,14 @@
 msgstr "Vnesite svoje novo geslo"
 
 #: ../libpurple/protocols/jabber/jabber.c:1379
-#: ../libpurple/protocols/oscar/oscar.c:6339
+#: ../libpurple/protocols/oscar/oscar.c:6341
 #: ../libpurple/protocols/silc/silc.c:1013
 msgid "Set User Info..."
 msgstr "Nastavi informacije o uporabniku ..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/oscar/oscar.c:6350
+#: ../libpurple/protocols/oscar/oscar.c:6352
 #: ../libpurple/protocols/silc/silc.c:1009
 msgid "Change Password..."
 msgstr "Spremeni geslo ..."
@@ -6635,7 +6635,7 @@
 msgstr "Pomenek"
 
 #: ../libpurple/protocols/oscar/oscar.c:632
-#: ../libpurple/protocols/oscar/oscar.c:5953
+#: ../libpurple/protocols/oscar/oscar.c:5955
 msgid "Get File"
 msgstr "Sprejmi datoteko"
 
@@ -6708,17 +6708,17 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:706
-#: ../libpurple/protocols/oscar/oscar.c:5726
+#: ../libpurple/protocols/oscar/oscar.c:5728
 msgid "Free For Chat"
 msgstr "Na voljo za pogovor"
 
 #: ../libpurple/protocols/oscar/oscar.c:710
-#: ../libpurple/protocols/oscar/oscar.c:5761
+#: ../libpurple/protocols/oscar/oscar.c:5763
 msgid "Not Available"
 msgstr "Ni na voljo"
 
 #: ../libpurple/protocols/oscar/oscar.c:712
-#: ../libpurple/protocols/oscar/oscar.c:5747
+#: ../libpurple/protocols/oscar/oscar.c:5749
 msgid "Occupied"
 msgstr "Zaseden"
 
@@ -6847,8 +6847,8 @@
 #: ../libpurple/protocols/oscar/oscar.c:1433
 #: ../libpurple/protocols/oscar/oscar.c:2242
 #: ../libpurple/protocols/oscar/oscar.c:2288
-#: ../libpurple/protocols/oscar/oscar.c:5831
-#: ../libpurple/protocols/oscar/oscar.c:6107
+#: ../libpurple/protocols/oscar/oscar.c:5833
+#: ../libpurple/protocols/oscar/oscar.c:6109
 #: ../libpurple/request.h:1350
 msgid "_OK"
 msgstr "V _redu"
@@ -6896,7 +6896,7 @@
 #: ../libpurple/protocols/oscar/oscar.c:2280
 #: ../libpurple/protocols/oscar/oscar.c:2287
 #: ../libpurple/protocols/oscar/oscar.c:2413
-#: ../libpurple/protocols/oscar/oscar.c:5219
+#: ../libpurple/protocols/oscar/oscar.c:5221
 #: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "No reason given."
 msgstr "Ni podanega razloga."
@@ -7271,8 +7271,8 @@
 msgstr "Ni mogoče dodati prijatelja %s, ker ime ni veljavno. Imena se morajo začeti s črko, vsebujejo lahko le črke, številke in presledke, lahko pa so tudi sestavljena iz samih števil."
 
 #: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+#: ../libpurple/protocols/oscar/oscar.c:5028
+#: ../libpurple/protocols/oscar/oscar.c:5042
 msgid "Unable To Add"
 msgstr "Nemogoče dodati"
 
@@ -7284,51 +7284,51 @@
 msgid "The AIM servers were temporarily unable to send your buddy list.  Your buddy list is not lost, and will probably become available in a few hours."
 msgstr "Vašega seznama prijateljev z AIM strežnikov trenutno ni mogoče pridobiti. Vaš seznam prijateljev ni izgubljen, verjetno pa bo postal dosegljiv v nekaj urah."
 
-#: ../libpurple/protocols/oscar/oscar.c:4912
 #: ../libpurple/protocols/oscar/oscar.c:4913
-#: ../libpurple/protocols/oscar/oscar.c:4918
-#: ../libpurple/protocols/oscar/oscar.c:5094
-#: ../libpurple/protocols/oscar/oscar.c:5095
-#: ../libpurple/protocols/oscar/oscar.c:5100
+#: ../libpurple/protocols/oscar/oscar.c:4914
+#: ../libpurple/protocols/oscar/oscar.c:4919
+#: ../libpurple/protocols/oscar/oscar.c:5096
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5102
 msgid "Orphans"
 msgstr "Sirote"
 
-#: ../libpurple/protocols/oscar/oscar.c:5024
+#: ../libpurple/protocols/oscar/oscar.c:5026
 #, c-format
 msgid "Could not add the buddy %s because you have too many buddies in your buddy list.  Please remove one and try again."
 msgstr "Prijatelja %s ni bilo mogoče dodati, ker imate na seznamu preveč prijateljev. Prosim odstranite enega in poskusite ponovno."
 
-#: ../libpurple/protocols/oscar/oscar.c:5024
-#: ../libpurple/protocols/oscar/oscar.c:5038
+#: ../libpurple/protocols/oscar/oscar.c:5026
+#: ../libpurple/protocols/oscar/oscar.c:5040
 msgid "(no name)"
 msgstr "(brez imena)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5038
+#: ../libpurple/protocols/oscar/oscar.c:5040
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason.  The most common reason for this is that you have the maximum number of allowed buddies in your buddy list."
 msgstr "Prijatelja %s iz neznanega razloga ni bilo mogoče dodati na seznam. Najpogostejši razlog za to je preveliko število prijateljev na vašem seznamu."
 
-#: ../libpurple/protocols/oscar/oscar.c:5131
+#: ../libpurple/protocols/oscar/oscar.c:5133
 #, c-format
 msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
 msgstr "Uporabnik %s vam je dovolil, da ga dodate na svoj seznam prijateljev. Ali ga želite dodati?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5137
+#: ../libpurple/protocols/oscar/oscar.c:5139
 msgid "Authorization Given"
 msgstr "Pooblastilo odobreno"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5215
+#: ../libpurple/protocols/oscar/oscar.c:5217
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "Uporabnik %s je odobril zahtevo, da ga dodate na svoj seznam prijateljev."
 
-#: ../libpurple/protocols/oscar/oscar.c:5216
+#: ../libpurple/protocols/oscar/oscar.c:5218
 msgid "Authorization Granted"
 msgstr "Pooblastilo odobreno"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5219
+#: ../libpurple/protocols/oscar/oscar.c:5221
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the following reason:\n"
@@ -7337,181 +7337,181 @@
 "Uporabnik %s je zavrnil vašo zahtevo, da ga dodate na svoj seznam prijateljev, ker:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5220
+#: ../libpurple/protocols/oscar/oscar.c:5222
 msgid "Authorization Denied"
 msgstr "Pooblastilo zavrnjeno"
 
-#: ../libpurple/protocols/oscar/oscar.c:5256
+#: ../libpurple/protocols/oscar/oscar.c:5258
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Izmenjaj:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5296
+#: ../libpurple/protocols/oscar/oscar.c:5298
 msgid "Invalid chat name specified."
 msgstr "Navedeno je neveljavno ime pomenka."
 
-#: ../libpurple/protocols/oscar/oscar.c:5366
+#: ../libpurple/protocols/oscar/oscar.c:5368
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr "Vaša slika IM ni bila poslana. Slik IM ne morete pošiljati v klepetih AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5505
-#: ../libpurple/protocols/oscar/oscar.c:5510
+#: ../libpurple/protocols/oscar/oscar.c:5507
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "Away Message"
 msgstr "Sporočilo o odsotnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5510
+#: ../libpurple/protocols/oscar/oscar.c:5512
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(pridobivanje ...)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5720
+#: ../libpurple/protocols/oscar/oscar.c:5722
 msgid "iTunes Music Store Link"
 msgstr "Povezava na glasbeno trgovino iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5828
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Komentar o prijatelju %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5829
+#: ../libpurple/protocols/oscar/oscar.c:5831
 msgid "Buddy Comment:"
 msgstr "Komentar prijatelja:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5875
+#: ../libpurple/protocols/oscar/oscar.c:5877
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Izbrali ste neposredno povezovanje z %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5879
+#: ../libpurple/protocols/oscar/oscar.c:5881
 msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
 msgstr "Ker razkrije vaš naslov IP, lahko velja za kršitev zasebnosti. Želite nadaljevati?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5885
 msgid "C_onnect"
 msgstr "Po_veži se"
 
-#: ../libpurple/protocols/oscar/oscar.c:5918
+#: ../libpurple/protocols/oscar/oscar.c:5920
 msgid "Get AIM Info"
 msgstr "Dobi podatke AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5926
 msgid "Edit Buddy Comment"
 msgstr "Uredi komentar prijatelja"
 
-#: ../libpurple/protocols/oscar/oscar.c:5932
+#: ../libpurple/protocols/oscar/oscar.c:5934
 msgid "Get Status Msg"
 msgstr "Poizvedi o stanju"
 
-#: ../libpurple/protocols/oscar/oscar.c:5945
+#: ../libpurple/protocols/oscar/oscar.c:5947
 msgid "Direct IM"
 msgstr "Neposredni pogovor"
 
-#: ../libpurple/protocols/oscar/oscar.c:5967
+#: ../libpurple/protocols/oscar/oscar.c:5969
 msgid "Re-request Authorization"
 msgstr "Ponovno zahtevaj pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6026
+#: ../libpurple/protocols/oscar/oscar.c:6028
 msgid "Require authorization"
 msgstr "Zahtevaj pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6029
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Spletno zaveden (s to funkcijo boste prejemali tudi SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6034
+#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "ICQ Privacy Options"
 msgstr "Možnosti zasebnosti ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6051
+#: ../libpurple/protocols/oscar/oscar.c:6053
 msgid "The new formatting is invalid."
 msgstr "Oblika novega zapisa je neveljavna."
 
-#: ../libpurple/protocols/oscar/oscar.c:6052
+#: ../libpurple/protocols/oscar/oscar.c:6054
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr "Z oblikovanjem imena lahko spreminjate samo velike črke in presledke."
 
-#: ../libpurple/protocols/oscar/oscar.c:6105
+#: ../libpurple/protocols/oscar/oscar.c:6107
 msgid "Change Address To:"
 msgstr "Spremeni naslov v:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6150
+#: ../libpurple/protocols/oscar/oscar.c:6152
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>ne čakate na pooblastilo</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6153
+#: ../libpurple/protocols/oscar/oscar.c:6155
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Pričakujete pooblastila od naslednjih prijateljev"
 
-#: ../libpurple/protocols/oscar/oscar.c:6154
+#: ../libpurple/protocols/oscar/oscar.c:6156
 msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
 msgstr "Če želite, lahko ponovno zahtevate pooblastilo od teh prijateljev, tako da desno kliknete na njih in izberete \"Ponovno zahtevaj pooblastilo.\""
 
-#: ../libpurple/protocols/oscar/oscar.c:6171
+#: ../libpurple/protocols/oscar/oscar.c:6173
 msgid "Find Buddy by E-Mail"
 msgstr "Najdi prijatelja po e-pošti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6172
+#: ../libpurple/protocols/oscar/oscar.c:6174
 msgid "Search for a buddy by e-mail address"
 msgstr "Išči prijatelje po naslovu e-pošte"
 
-#: ../libpurple/protocols/oscar/oscar.c:6173
+#: ../libpurple/protocols/oscar/oscar.c:6175
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Vnesite naslov e-pošte prijatelja, ki ga želite najti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6176
+#: ../libpurple/protocols/oscar/oscar.c:6178
 msgid "_Search"
 msgstr "_Najdi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6345
+#: ../libpurple/protocols/oscar/oscar.c:6347
 msgid "Set User Info (URL)..."
 msgstr "Nastavi informacije o uporabniku (URL) ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6356
+#: ../libpurple/protocols/oscar/oscar.c:6358
 msgid "Change Password (URL)"
 msgstr "Spremeni geslo (URL povezava)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6360
+#: ../libpurple/protocols/oscar/oscar.c:6362
 msgid "Configure IM Forwarding (URL)"
 msgstr "Nastavi posredovanje sporočil (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6370
+#: ../libpurple/protocols/oscar/oscar.c:6372
 msgid "Set Privacy Options..."
 msgstr "Nastavi možnosti zasebnosti ..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6377
+#: ../libpurple/protocols/oscar/oscar.c:6379
 msgid "Confirm Account"
 msgstr "Potrdi račun"
 
-#: ../libpurple/protocols/oscar/oscar.c:6381
+#: ../libpurple/protocols/oscar/oscar.c:6383
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Prikaži trenutno registriran e-naslov"
 
-#: ../libpurple/protocols/oscar/oscar.c:6385
+#: ../libpurple/protocols/oscar/oscar.c:6387
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Spremeni trenutno registriran e-naslov ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6392
+#: ../libpurple/protocols/oscar/oscar.c:6394
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Pokaži prijatelje, ki čakajo na pooblastilo"
 
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6400
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Išči prijatelja po e-naslovu ..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6403
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Search for Buddy by Information"
 msgstr "Išči prijatelja po informaciji"
 
-#: ../libpurple/protocols/oscar/oscar.c:6471
+#: ../libpurple/protocols/oscar/oscar.c:6473
 msgid "Use recent buddies group"
 msgstr "Uporabi nedavno skupino prijateljev"
 
-#: ../libpurple/protocols/oscar/oscar.c:6474
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Show how long you have been idle"
 msgstr "Prikaz časa vaše odsotnosti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6626
+#: ../libpurple/protocols/oscar/oscar.c:6628
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -11018,25 +11018,25 @@
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2435
+#: ../libpurple/util.c:2442
 #, c-format
 msgid "Error Reading %s"
 msgstr "Napaka pri branju %s"
 
-#: ../libpurple/util.c:2436
+#: ../libpurple/util.c:2443
 #, c-format
 msgid "An error was encountered reading your %s.  They have not been loaded, and the old file has been renamed to %s~."
 msgstr "Pri branju vašega %s je prišlo do napake, zato ni bil naložen. Stara datoteka se je preimenovala v %s~."
 
-#: ../libpurple/util.c:2899
+#: ../libpurple/util.c:2906
 msgid "Calculating..."
 msgstr "Preračunavanje ..."
 
-#: ../libpurple/util.c:2902
+#: ../libpurple/util.c:2909
 msgid "Unknown."
 msgstr "Neznano."
 
-#: ../libpurple/util.c:2928
+#: ../libpurple/util.c:2935
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -11045,7 +11045,7 @@
 msgstr[2] "%d sekundi"
 msgstr[3] "%d sekunde"
 
-#: ../libpurple/util.c:2940
+#: ../libpurple/util.c:2947
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -11054,7 +11054,7 @@
 msgstr[2] "%d dneva"
 msgstr[3] "%d dni"
 
-#: ../libpurple/util.c:2948
+#: ../libpurple/util.c:2955
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -11063,7 +11063,7 @@
 msgstr[2] "%s, %d uri"
 msgstr[3] "%s, %d ur"
 
-#: ../libpurple/util.c:2954
+#: ../libpurple/util.c:2961
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -11072,7 +11072,7 @@
 msgstr[2] "%d uri"
 msgstr[3] "%d ure"
 
-#: ../libpurple/util.c:2962
+#: ../libpurple/util.c:2969
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -11081,7 +11081,7 @@
 msgstr[2] "%s, %d minuti"
 msgstr[3] "%s, %d minut"
 
-#: ../libpurple/util.c:2968
+#: ../libpurple/util.c:2975
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -11090,28 +11090,28 @@
 msgstr[2] "%d minuti"
 msgstr[3] "%d minut"
 
-#: ../libpurple/util.c:3235
-#: ../libpurple/util.c:3533
+#: ../libpurple/util.c:3242
+#: ../libpurple/util.c:3540
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Ni se mogoče povezati z %s."
 
-#: ../libpurple/util.c:3361
+#: ../libpurple/util.c:3368
 #, c-format
 msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
 msgstr "Za hrambo vsebine %s ni mogoče pridobiti zadostnega prostora. Spletni strežnik morda poskuša storiti nekaj sovražnega."
 
-#: ../libpurple/util.c:3396
+#: ../libpurple/util.c:3403
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Napaka pri branju iz %s: %s"
 
-#: ../libpurple/util.c:3427
+#: ../libpurple/util.c:3434
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Napaka pri pisanju v %s: %s"
 
-#: ../libpurple/util.c:3452
+#: ../libpurple/util.c:3459
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Napaka pri povezovanju z %s: %s"